gentoo resync : 15.01.2020

4 files changed, 91 insertions, 9 deletions

diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 7a1d34a01391..f300b165e1a0 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,4 +1,6 @@
 DIST qutebrowser-1.8.1.tar.gz 3605606 BLAKE2B 5f60de24738aa9cab88149193c6ce884c663edaed6e018ce56d582eac5489af2f889d8a8074949165e4302847dda61695039d95df4dc992516d3b4e42b2abe8e SHA512 5fff6a8590bb4fd26815984310e5ce57201eed9a4a1fb788594d70e64e00a666563851b376bbac78cb175d64ffbe34a032521db31ae389958fab796ee9c26c78
-EBUILD qutebrowser-1.8.1.ebuild 2269 BLAKE2B a39ad6b84f5c9a45d5b8655859c561e30d5d841b82744e27d076fed1de6ef841cdd5f6db8b42c0522cf4ae1cc9f23af86f7aeaf9843ef8014a175825e9ca4b3a SHA512 df16bb5b6a1b35349d3b19b82218d615e64fb820f74c29e36b4b21bdbfa1db7257c1726b9cdb3c4bde6bb62488e998d6ecf49c4f37db6e0c26e7ae482a804915
-EBUILD qutebrowser-9999.ebuild 2487 BLAKE2B b45ee9c6dec8ad309741353a3ffe706749f8f9d2f6ac1d597f434229598611135c587b017139697521c80b664b42135e63d4be446483ad8dd75ba52e3a71dc8a SHA512 22ae667d6711aabe2e843e3112b5c7832af570fe26ff350245707860d94c930f03c4ad37ed8d0d5d7d902c6e933bfb0949448b419f3f7d0d335890287691b7f0
+DIST qutebrowser-1.8.3.tar.gz 3634523 BLAKE2B c36abcbd99767e3dbc7113d6432c5b7b2e4062e8b2892dbc15c4ffcde1d7b8f2d918674e3f5f0acf6b5e45eef794019f0cda1d9462da614ece8d1582952a0a95 SHA512 9a3dc3040d1236c81933263e031db4d44c86be206c54f0787a73b2dd7d32d6e742f9ac80626163515e917fbc9fa1588f76afcb21f4b3d31f47ba386d06c3c6e7
+EBUILD qutebrowser-1.8.1.ebuild 2265 BLAKE2B 9bc4f138c5d1fecf676e3bf3ae19dc99b423738079c89f78e7bb4464b06bb417dbe82affb64f02bf895eec661dd9d832b8793243bc56204364eddff6ff818b56 SHA512 9150a63f0f6a3f4e897854d935cc2181b742162313ab8c1ad121f62540fe4b4c82e473bc84d6c46d5798b91c5737ad78f20504728bf488d163f2496f1bdd4fe2
+EBUILD qutebrowser-1.8.3.ebuild 2372 BLAKE2B 7cd8628d876603b1aacb06860c12b7d255f99fff475425e3b91a09342bd035d1e6552aee7d9dd30a2e2d3d74d10621d7357d0f8ae10ffa1db6e22d581d277fe7 SHA512 3ca7eef0914170d8a5d96c4261dac01b292b318551c1d4aa586adb63f1a791c15111fa3c173826c396c0939e34bd9be51a98cffcb9d4d2d470d0e2426c923c15
+EBUILD qutebrowser-9999.ebuild 2485 BLAKE2B 958189a09e6c02089a6f8a4508286956238397bd1ea01b771dac5de6ec8b4385b66c15c2268e9771f175bcec98ac7bfc3e3c762ae6b3eb4f05c3edab2a8ff52e SHA512 911d8bbd39822d8ded419678d7c9706caa96346bae2cb75a7ad4cc1ef9b7e8deabda00ea0c1591c476fc5de72e95e2f8c691d84d4a0ef8f791351eb0a85a91bd
 MISC metadata.xml 604 BLAKE2B c597b4466b3954d0c328b376636a8dca286c212c3e857692ee5f039d94cb89c42cbb10e764c5323948cdb7a3d1fd11648bb057f65b7ee7b2e899529d294f7972 SHA512 92eeea88dbe246d8211a84d616772600aaeee95d9e135eb9b5ea38e488f844440ba97373fa302ee52f8486d7d1dae4c5008ce3e1ceaf3062e9d406b1ff0cb565
diff --git a/www-client/qutebrowser/qutebrowser-1.8.1.ebuild b/www-client/qutebrowser/qutebrowser-1.8.1.ebuild
index 74f6b986b0ff..74d2ceada806 100644
--- a/www-client/qutebrowser/qutebrowser-1.8.1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit desktop distutils-r1 eutils xdg-utils
 
diff --git a/www-client/qutebrowser/qutebrowser-1.8.3.ebuild b/www-client/qutebrowser/qutebrowser-1.8.3.ebuild
new file mode 100644
index 000000000000..b824ba54fcd9
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-1.8.3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit desktop distutils-r1 eutils xdg-utils
+
+DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="scripts test"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
+	app-text/asciidoc
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="
+	>=dev-python/attrs-19.1.0[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/cssutils-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
+	|| (  (
+			>=dev-python/PyQt5-5.12[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+			dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
+		<dev-python/PyQt5-5.12[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,webengine,widgets]
+	)
+	>=dev-python/pyyaml-5.1.2[${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() {
+	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/org.${PN}.${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_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 4786a63c56fb..d50e01d3cf03 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
-inherit distutils-r1 eutils xdg-utils
+inherit desktop distutils-r1 eutils xdg-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
@@ -77,12 +77,12 @@ python_install_all() {
 pkg_postinst() {
 	optfeature "PDF display support" www-plugins/pdfjs
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
 }