Merge branch 'master' of git.friedersdorff.com:max/gentoo-overlay

diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index 1472a47b87700912adee83a91bec8e9dacee860b..f816437b30488c240996ba2b3fe95f75b86358c8 100644 (file)
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST PyQtWebEngine_gpl-5.12.tar.gz 42122 BLAKE2B 1347d6befe30066056d8ca75caa01318a873336abcfc41a5d2cfcefe7565f8a5845d8a800a10d0c33de6ec17b91c581756bea905edfb035efc088f28028033f5 SHA512 09ed9ecd40370194889f7538dc65f775ca6523e5a113c5aa018ac782089da2203bce55a9b760430b1c7c04695905740aa48f9a9c41ffd8069b32956572d3bece
-EBUILD PyQtWebEngine-5.12.ebuild 2168 BLAKE2B 5e3a25956c1fb7de38e5efd71671db7dce8772aacbdf558143f340b4b0a8eed2c745e14dcde78dbf799865ca7eb46f2fa0d244ca701f6e81ec6fd64414c42db6 SHA512 0877f94f51c944cac00ca007ed07c8d0b14a85b1a5b896a0eeddd1f6b3882968f5b0cd066c22436dd34d72b604da6b14000b5b0612cc79272a37a0c7634379ca
+DIST PyQtWebEngine_gpl-5.12.1.tar.gz 42474 BLAKE2B 6cb333d8e429ae6b9f8c20a7486754767639693351605e85c0226ab3f1f065a549d40d69669d91f501fdf2c30346304a547e36b416d275a8bfe4ea621c0633b7 SHA512 2bcb0e4da51de9cfb5128e03c03ada77f2d4b99b0885da910584717681b96759ce4301c325cbbf43602d46746e2d37d81ed62f77dd63b33359fd5fae74d7f010
+EBUILD PyQtWebEngine-5.12.1.ebuild 2168 BLAKE2B 5e3a25956c1fb7de38e5efd71671db7dce8772aacbdf558143f340b4b0a8eed2c745e14dcde78dbf799865ca7eb46f2fa0d244ca701f6e81ec6fd64414c42db6 SHA512 0877f94f51c944cac00ca007ed07c8d0b14a85b1a5b896a0eeddd1f6b3882968f5b0cd066c22436dd34d72b604da6b14000b5b0612cc79272a37a0c7634379ca
 MISC metadata.xml 685 BLAKE2B b7d7a911016b7ef197564747d4f0bae28a338a9e0ff6a31e20a68dd58bb2082dd8bd6a29100df88d6a967ead67b37706020fdf7b987ec9f334944a43fc5951bf SHA512 c6e29513792ddb34d2502ef44da59c8b77f0ea587a28f27bb4716880ecf2d77b349e38f1675c4ef3ae70ecd58bda4972096e229486f39bc4e6655d0f3833554a
 -----BEGIN PGP SIGNATURE-----
 
-iQEzBAEBCAAdFiEETdUSO77k6gzTbgmzTCaO99ou320FAlyaGQ0ACgkQTCaO99ou
-320eWggApHHBjVhiGkDgcW0KH51cdYD8y5oDn5OaBh2FzNei6lsY6ZOH92J0lFrY
-rHJvsrmsQy5Ywvufo1rP0KZEGNlP+qI1rGOaKIRsiEC2EElhGMbjYZYusd+1lp41
-mlp2bgV9tCQmTq/kitY2a1GGBmv2Zknlj4vpcqJU4lKYcSRAEfXtw0juHtvIAIsl
-YgqH4XSydX/RZpcKSnvXEQcYBJHKcgJ4STHafYSnt0VJ8S9lwHCqZLWo7izqPywf
-J4Crd0YXHo8jLVxAe7J0bp0B5xsBI50c2Iczam8BwptrnI+V/Vm+USr44RCurQSj
-kGVn0RFdnRIGx6ZcvNIKcfeL8V7RXg==
-=HcPI
+iQEzBAEBCAAdFiEETdUSO77k6gzTbgmzTCaO99ou320FAlyaGZMACgkQTCaO99ou
+321GnwgAk06+MTy5idXYGMEvSsrwX4TnG8QOlnGa+EeApZgFEKkKSPh8etdAHvRV
+U8y857DltWEu8z+BsNXi31+Tcguw9UuvWDEcZl2DcXRBm5gkr/k4X7+jQXo3pqm8
+68ir1YU8lTw8JtxF7MNNOpxz7YOQcYwtP9xMQLELsS3OUBAdQulsjBbPcleaaIxJ
+dGjiMx2RauQnBUBnFsDVxxUo5JJiJ6TjYu6Yz2zHipsYY2/A5yJYS9jbHQR36XxB
+3n6ycsdVZzBDIevZ2hlvRon5D7za9PzvrO212WObF6p/Jg/ko7ICwcw0ycJNr5Cx
+np0ED2QuvX2zdMpQwVujvUfqhy94Uw==
+=pSEP
 -----END PGP SIGNATURE-----

diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.12.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.12.1.ebuild
similarity index 100%
rename from dev-python/PyQtWebEngine/PyQtWebEngine-5.12.ebuild
rename to dev-python/PyQtWebEngine/PyQtWebEngine-5.12.1.ebuild

diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index fcb5258fb3c5a6772ac27812c70011ccd9b1a5ab..7e4fb2ef44cdfe4d4c6a6a79235996af4b31b7b4 100644 (file)
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,17 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST qutebrowser-1.6.0.tar.gz 3638739 BLAKE2B 8ca5995b9126fa7e017e3f2924c07c01b2d90540e0521d74cdba4ce8f2f83d1c7e8f0dc412ff41936c3a36c17d53060c331ed069d8088ac11b772979a48c7b0d SHA512 54b275f0d00ef48fa88a0bc83f31efd0d1fe708d7223adcf83c9d1a5db60de8e9c77033b8bf4b2b9a526d11ce39941d5d9da8afe9f49f3ed06e6f6f7ef124c20
+DIST qutebrowser-1.6.1.tar.gz 3657215 BLAKE2B da8f4e725a6547b45993bf59b1128aa475656afa4b543a0edc2233bbcb1067a3159f791fd90028008f68cbd7389ae33deeecc158408e27f57b2ae35ca334ea20 SHA512 ff8c50dd8524f6f8623f0d5ae205355a2b86f70eff1320c3b47dad9cb2a481c372d82f698497c0d2745291962999ff111fade14141a8390e337343fb01145998
 EBUILD qutebrowser-1.6.0.ebuild 2403 BLAKE2B 7efa9d2374048f37564329e2ca7294580af39f629ca7eec9c7faaba0fa41b4bab4be026e9b238e5bd1dab4092495ef2a62c3b9ebaf9a88419cd4ad27418b7f9c SHA512 669b18765d37f4cbb5672e36d59e48c39b4a1f4d6cf3b40547077d5044d194a609614887e7c68f240649f95cf6d70f3510750a3c6e9d835658532336a70b960c
+EBUILD qutebrowser-1.6.1.ebuild 2403 BLAKE2B 7efa9d2374048f37564329e2ca7294580af39f629ca7eec9c7faaba0fa41b4bab4be026e9b238e5bd1dab4092495ef2a62c3b9ebaf9a88419cd4ad27418b7f9c SHA512 669b18765d37f4cbb5672e36d59e48c39b4a1f4d6cf3b40547077d5044d194a609614887e7c68f240649f95cf6d70f3510750a3c6e9d835658532336a70b960c
 MISC metadata.xml 589 BLAKE2B 40485aca150508671b8b7fd65567c25abb73617b1f9d0d981c6ec9579b563904fefe5828e819276bb2c6e2c19883574334ffce0be7b047ad182bf3cdcadb70ea SHA512 e042cd2ad99080de919fce9f26a09cd6b1dd779cf2d2c8c26f8b214845635efc90e96e41acc025875ad7f8473ef750638ce4bf2f1ac3eeca6f7f762a44062ec0
------BEGIN PGP SIGNATURE-----
-
-iQEzBAEBCAAdFiEETdUSO77k6gzTbgmzTCaO99ou320FAlyPwy4ACgkQTCaO99ou
-321YHggAjjn8kgaz5MSqhF4R5W1ug+n4wrcknMD8V5Cb+HDbfEipHxWDtiaTk0HF
-thSTqj4VBB3lHGlleqdpa4uLbSi66CHLCHXej379naJ0kLXkc5QqP4Wrd/f7BvHS
-plhgnmidaVzbXL4bLBCdYrPN4i90eA2pQ14xyr+B1IEv55D5gLzfud8FTe3h6d3G
-WK62wj6vC2uWOs7BY5d2bUT6uKF2SoRWcBeNbMTLiMPP5biFzOeYr0AnckhQ6OwA
-hQFCqk2ZqoiqHiON/aW8l+tAAYOSxg4wVIzK7kNa5isZSVLT1+4McivrVjg1Kjmv
-kN1Y6jUCb+3EZILb5/yxFKn4v6Kozw==
-=2H6J
------END PGP SIGNATURE-----

diff --git a/www-client/qutebrowser/qutebrowser-1.6.1.ebuild b/www-client/qutebrowser/qutebrowser-1.6.1.ebuild
new file mode 100644 (file)
index 0000000..43774ed
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-1.6.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_5,3_6} )
+
+inherit distutils-r1 eutils gnome2-utils xdg-utils
+
+if [[ ${PV} == "9999" ]] ; then
+       EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+       inherit git-r3
+else
+       SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+       KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="scripts test"
+
+COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
+       app-text/asciidoc
+       test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="${COMMON_DEPEND}
+       dev-python/attrs[${PYTHON_USEDEP}]
+       >=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+       >=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
+       >=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
+       >=dev-python/PyQt5-5.12_pre[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+       >=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP},widgets]
+       >=dev-python/pyyaml-3.12[${PYTHON_USEDEP},libyaml]
+"
+
+# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
+# isn't complete and X11 is required in order to start up qutebrowser.
+RESTRICT="test"
+
+python_compile_all() {
+       if [[ ${PV} == "9999" ]]; then
+               "${PYTHON}" scripts/asciidoc2html.py || die "Failed generating docs"
+       fi
+
+       a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
+}
+
+python_test() {
+       py.test tests || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+       doman doc/${PN}.1
+       domenu misc/${PN}.desktop
+       doicon -s scalable icons/${PN}.svg
+
+       if use scripts; then
+               # Install only those userscripts that have an explicit license header
+               exeinto /usr/share/qutebrowser/userscripts/
+               doexe misc/userscripts/dmenu_qutebrowser
+               doexe misc/userscripts/openfeeds
+               doexe misc/userscripts/qute-keepass
+               doexe misc/userscripts/qute-pass
+               doexe misc/userscripts/rss
+               doexe misc/userscripts/tor_identity
+       fi
+
+       distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+       optfeature "PDF display support" www-plugins/pdfjs
+       xdg_desktop_database_update
+       xdg_mimeinfo_database_update
+       gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+       xdg_desktop_database_update
+       xdg_mimeinfo_database_update
+       gnome2_icon_cache_update
+}