gentoo resync : 15.12.2019

5 files changed, 30 insertions, 120 deletions

diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index a864a7baa07d..7a1d34a01391 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,6 +1,4 @@
-DIST qutebrowser-1.6.3.tar.gz 3582973 BLAKE2B 950f77612b5476a2026669890fe6568f2fc2e808cd2439aae47e3836b66424136269b639eef98599064c57f506b927ecb2391d8a8f48391f9a67c8e460cc9019 SHA512 6bb0a5d3d39b7ea0fdbf48fae6b70d4b2be7b7f065a9933b9933f11bcf6373798ea31c100808cd445b12fc163ad6c578b0eef723418c1d6e0c251c24f9cd089e
-DIST qutebrowser-1.7.0.tar.gz 3595849 BLAKE2B 5ace5f756550fe10a3bd09819a3d5562927ec55624dcdc05e8963abc0550d9eaadcc10436e9e36725e44b0eb16bc733ab00ed3ff78acb00ab52aeeec1068d79c SHA512 4f437a38748f6143a4c2f5d8f00588b33aebbf3c68129151dd00270cf3ff5da5e3ccda5022b1328d75c072b29c0fc0ce53ca7f7d414708c33e129f45abf35e28
-EBUILD qutebrowser-1.6.3.ebuild 2522 BLAKE2B 0eef6585e93cccfb2c7afdc4528ece62578d12fd2eb731d8794b3f582592dee71242da36beeab4d62b89d4ee58807f05f3fcd0e7955aea8ca58d994b4c8801d0 SHA512 2755a791ed5633894ed76bd337dde0712cd7f24c9b7f53bf7935e9959c972f5340c56339149c90f71b1b07578fb25a5c3fe60308f208608600c1bf98c8debfa4
-EBUILD qutebrowser-1.7.0.ebuild 2532 BLAKE2B cb3f420100e7071c43f859c210883f566aec699ce34d5e1183c958d50d1eb35ad9ab0e48431f73ec94ce0cc285d856bbb83f8022f5900e416f47d6301522e97b SHA512 0f4b818ca22ce1c01509469dbddb86c2d4bae94cb2d0fd82c5a470ba7eb28306f71604e2502057192e7c7d5146b3422819a2b0132d8f10c1dee9ffccf1fefba4
-EBUILD qutebrowser-9999.ebuild 2532 BLAKE2B cb3f420100e7071c43f859c210883f566aec699ce34d5e1183c958d50d1eb35ad9ab0e48431f73ec94ce0cc285d856bbb83f8022f5900e416f47d6301522e97b SHA512 0f4b818ca22ce1c01509469dbddb86c2d4bae94cb2d0fd82c5a470ba7eb28306f71604e2502057192e7c7d5146b3422819a2b0132d8f10c1dee9ffccf1fefba4
-MISC metadata.xml 399 BLAKE2B 34bd345642f71d8456cd74c56e86c9dfef7f97af62ceb3b4045af0965136229bcc8dc782b748ea5bc2774ba41fc74bd2f2e1ab661e1cf9c3bbaf302761a120a7 SHA512 d1af93f580469a5720adf99ae3fd01afcdc7bc33fb05390c8eea60b5723f115a4f4e1044a49bacff8decdb92cba21563f93cd609bfb180117eeabcf02710d8bf
+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
+MISC metadata.xml 604 BLAKE2B c597b4466b3954d0c328b376636a8dca286c212c3e857692ee5f039d94cb89c42cbb10e764c5323948cdb7a3d1fd11648bb057f65b7ee7b2e899529d294f7972 SHA512 92eeea88dbe246d8211a84d616772600aaeee95d9e135eb9b5ea38e488f844440ba97373fa302ee52f8486d7d1dae4c5008ce3e1ceaf3062e9d406b1ff0cb565
diff --git a/www-client/qutebrowser/metadata.xml b/www-client/qutebrowser/metadata.xml
index c72c5366e939..c859c4f503cd 100644
--- a/www-client/qutebrowser/metadata.xml
+++ b/www-client/qutebrowser/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>guillaumeseren@gmail.com</email>
+		<name>Guillaume Seren</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">qutebrowser/qutebrowser</remote-id>
 	</upstream>
diff --git a/www-client/qutebrowser/qutebrowser-1.6.3.ebuild b/www-client/qutebrowser/qutebrowser-1.6.3.ebuild
deleted file mode 100644
index 6cc99d532db9..000000000000
--- a/www-client/qutebrowser/qutebrowser-1.6.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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[${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-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
-}
diff --git a/www-client/qutebrowser/qutebrowser-1.7.0.ebuild b/www-client/qutebrowser/qutebrowser-1.8.1.ebuild
index 9808d790b8a3..74f6b986b0ff 100644
--- a/www-client/qutebrowser/qutebrowser-1.7.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.8.1.ebuild
@@ -1,31 +1,26 @@
 # 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} )
+EAPI=7
 
-inherit distutils-r1 eutils gnome2-utils xdg-utils
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 
-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
+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"
 
-COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
 	app-text/asciidoc
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
@@ -43,10 +38,6 @@ RDEPEND="${COMMON_DEPEND}
 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"
 }
 
@@ -76,12 +67,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
 }
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 9808d790b8a3..4786a63c56fb 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -1,10 +1,11 @@
 # 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} )
+EAPI=7
 
-inherit distutils-r1 eutils gnome2-utils xdg-utils
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+
+inherit distutils-r1 eutils xdg-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
@@ -21,11 +22,11 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE="scripts test"
 
-COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
 	app-text/asciidoc
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
@@ -44,7 +45,7 @@ RESTRICT="test"
 
 python_compile_all() {
 	if [[ ${PV} == "9999" ]]; then
-		"${PYTHON}" scripts/asciidoc2html.py || die "Failed generating docs"
+		"${EPYTHON}" scripts/asciidoc2html.py || die "Failed generating docs"
 	fi
 
 	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"