gentoo resync : 02.02.2022

2 files changed, 13 insertions, 15 deletions

diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index d9067b0868d7..5f14617d0f55 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,4 +1,4 @@
 DIST qutebrowser-2.4.0.tar.gz 6074001 BLAKE2B 9eda4a72b9050d6992681803b69778d954654fffd78aa524dfba9bddcbb8e54bd84e6725c30d826dddeb45b6b76e06d7401c7ad22d15a153b4cc1104e791cc84 SHA512 e4341a57a259a31e1c665eec34329594bb3d8390e3c612a15c1857ff12cb9e1f5b30954dd0cd91bee0a40ec0d97c59349ab7cd699626434a89c7d40e5dd961f7
 EBUILD qutebrowser-2.4.0.ebuild 4370 BLAKE2B 9554c0148141525d54f4a2ca3a262f93a53fe6162174903b07f03d29e1e91788eddfe8c638f97c9855a0719291267b4fae9c3531f67873329e83907f8f1f0e68 SHA512 9bd7e90cd9869a3385e47d0b0bc594578300f9bffc7683bba318a07382dacf0103420aee5bcc72d504b3bfa3cb7c16f65ecc43901b4efe5dafaada153071e2d0
-EBUILD qutebrowser-9999.ebuild 4371 BLAKE2B b4176f1da5b6a7f83a58fd8acb46804c46057d87673473b25a55c74c32d61ec132d78bea4ccea9fa365205f2c09c251983dc2e7c6f79440d1071cfcfe24b9d2c SHA512 364b114d8b648f721ad33a34105d0d4d63782d347bfe4aaa5d0af4deb87e5441b05a0d074a94feba44b41194e48e5dae92b67ad0caaf8dd19ed2000f9723544e
+EBUILD qutebrowser-9999.ebuild 4292 BLAKE2B 09180bced9a89d811b35965996167a9ec1ca6df0b72d4c3bd16eac06d669efda7ea6570b5ba85a6eb7ffe6c8b5b82932f3fd417ced58be70d0f26293733a312d SHA512 3bc9e3e877285d80c870e88632a47202ea909aaae525d693c2ce40c82b57c1e83ad2447620e71ebd97d4fb49bd6ed0f23200dc11e2965738084336039ef63ac4
 MISC metadata.xml 945 BLAKE2B e796d777d56a5452b6652d77e011dfb160684f6e7498d0c4fad583bb828ecd111c25be5d80ed906b9b579e6ccd33315fc20a727342df0fb1b66b1a71effcea25 SHA512 80a65a391a84208042d9e7a6e0b5e8644ed07d5e389cd6a7b314b961dca5cff6406c5556693b34dcd275acfb27d05d9e40f77e9d503f9e3e8054ab6b6763932d
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index f3fcf16be9a4..6e52913c8194 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1 optfeature xdg
 
@@ -27,20 +28,17 @@ RDEPEND="
 	dev-qt/qtgui:5[png]
 	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
 	$(python_gen_cond_dep '
-		>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
 		>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
 		>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
 		dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
 		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
-		>=dev-python/typing-extensions-3.10.0.2[${PYTHON_USEDEP}]
-		>=dev-python/zipp-3.6.0[${PYTHON_USEDEP}]
-		adblock? ( >=dev-python/adblock-0.5.0[${PYTHON_USEDEP}] )
-	')
+		dev-python/pyyaml[${PYTHON_USEDEP},libyaml(+)]
+		dev-python/zipp[${PYTHON_USEDEP}]
+		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )')
 	widevine? ( www-plugins/chrome-binary-plugins )"
 BDEPEND="
-	app-text/asciidoc
 	$(python_gen_cond_dep '
 		test? (
 			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
@@ -53,8 +51,8 @@ BDEPEND="
 			dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
 			dev-python/pytest-xvfb[${PYTHON_USEDEP}]
 			dev-python/tldextract[${PYTHON_USEDEP}]
-		)
-	')"
+		)')"
+[[ ${PV} != 9999 ]] || BDEPEND+=" app-text/asciidoc"
 
 distutils_enable_tests pytest
 
@@ -62,10 +60,12 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 
 	if use widevine; then
-		sed "/yield from _qtwebengine_settings_args/a\    yield '--widevine-path=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so'" \
+		local widevine=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
+		sed "/yield from _qtwebengine_settings_args/a\    yield '--widevine-path=${widevine}'" \
 			-i ${PN}/config/qtargs.py || die
 	fi
 
+	# let eclass handle python
 	sed -i '/setup.py/d' misc/Makefile || die
 
 	[[ ${PV} != 9999 ]] || ${EPYTHON} scripts/asciidoc2html.py || die
@@ -88,8 +88,6 @@ python_test() {
 		# tests that don't know about our newer qtwebengine
 		tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
 		tests/unit/utils/test_version.py::TestChromiumVersion
-		# needs qtwebkit and isn't skipped by default
-		tests/unit/config/test_websettings.py::test_config_init
 		# may misbehave depending on installed old python versions
 		tests/unit/misc/test_checkpyver.py::test_old_python
 		# bug 819393
@@ -102,7 +100,7 @@ python_test() {
 }
 
 python_install_all() {
-	emake -f misc/Makefile DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	emake -f misc/Makefile DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
 
 	rm "${ED}"/usr/share/${PN}/scripts/{mkvenv,utils}.py || die
 	fperms -x /usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}