gentoo resync : 29.12.2022

4 files changed, 140 insertions, 9 deletions

diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 979e4c86c4ef..566ca61e6f14 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,4 +1,6 @@
-DIST qutebrowser-2.5.0.tar.gz 6086105 BLAKE2B c95afbbdfeebe4352e461cef78d499e9efa9de2e4acc2cedf350904bd617a4f238c34042369655030e53433f941288ff676f8ffd873683939ddd38ff01604aa1 SHA512 41ab6f6d2b72c94e0f66ba0a80999d820748d0f86dbec92583a2be88725f1ebd7517dd75edbaa0ce60bc029ed4dc0dd3e30a1cb25ab4ef940b968c87b4df2472
-EBUILD qutebrowser-2.5.0.ebuild 4291 BLAKE2B 77eb11d168f99a99d2de509f49a16580bfa4a85f48ccb98818dccda17a599357aec68f084da14104442971f18dbcb248dd6401e2c0f9c3ceb8a8bfb0e090cc90 SHA512 becebc7833fdf20439ad705bb9ec528021f6a93e3a51133a0e243148174ef921e8ae30934b5e5e9a907b5dea616e79741e2ee6306e3d780b8321ef0127bde074
-EBUILD qutebrowser-9999.ebuild 4292 BLAKE2B 09180bced9a89d811b35965996167a9ec1ca6df0b72d4c3bd16eac06d669efda7ea6570b5ba85a6eb7ffe6c8b5b82932f3fd417ced58be70d0f26293733a312d SHA512 3bc9e3e877285d80c870e88632a47202ea909aaae525d693c2ce40c82b57c1e83ad2447620e71ebd97d4fb49bd6ed0f23200dc11e2965738084336039ef63ac4
+DIST qutebrowser-2.5.1.tar.gz 6089389 BLAKE2B e26be42742795b22c34d131a5c9046e0223cef2fd461d8aa3c656a8182bf0127e17e55a7e0a79e1ade76c883094d841a822864e995365b0217ef1b422272e6e0 SHA512 27eca3e987e4c2a662fc863840d3ea697da65f55c7b9180e892466aeb5a2753f1eca424bbf8705670fe8cd9363e3297e03f9f9cc0d4f85f0198a4e3312d32f3c
+DIST qutebrowser-2.5.2.tar.gz 6114611 BLAKE2B 5f56e1e2c390bb2f36c95e25a2dae9e5203020ff6b2cf1e13092cf493efa950b24b8ff8f23af6eed93ca8b316e30f86715ecd2f2eb28c341210de0b25c9f67ad SHA512 4751ea1a5b1776f085fcd1f9ab5ff805155fca34d0272ba8eb6574f9074257929c3fb5b50c9053a522bfb346aee1a2551b58cf933c6ff7c5c84fd10559ec36fc
+EBUILD qutebrowser-2.5.1.ebuild 4337 BLAKE2B 556ef9db9fe8f4345c21ab5ad8a3e140a07ffd1285171c79896bf20e375b2f3cac60ef917094881b06efa75b88d2da7fce4944b2744c9f2200561831d916f636 SHA512 96bc71761297c407eab8c1376be115ad71032285f7ea46a6265cf737db12043c6d0279ce20946cadbde06c9f5bca5c96d94b5d6dc02e431263a6641c6495df8b
+EBUILD qutebrowser-2.5.2.ebuild 4422 BLAKE2B da0c2957c44b58cd7163fd60bbbc7be4d21f1f91d87bbc7acef2a103b7b163f8bc7e23ab87936530efa0db8bff08030148a56a7e64230719ba69b28ef6beeda8 SHA512 96d5c30924dccfc5373508242cc77bc582a04062e09842db3ee23d03651b45015c77e970210773f2ec95c538d8adf0d08e9d12e4ea8ecda2d9716034c1613394
+EBUILD qutebrowser-9999.ebuild 4422 BLAKE2B da0c2957c44b58cd7163fd60bbbc7be4d21f1f91d87bbc7acef2a103b7b163f8bc7e23ab87936530efa0db8bff08030148a56a7e64230719ba69b28ef6beeda8 SHA512 96d5c30924dccfc5373508242cc77bc582a04062e09842db3ee23d03651b45015c77e970210773f2ec95c538d8adf0d08e9d12e4ea8ecda2d9716034c1613394
 MISC metadata.xml 945 BLAKE2B e796d777d56a5452b6652d77e011dfb160684f6e7498d0c4fad583bb828ecd111c25be5d80ed906b9b579e6ccd33315fc20a727342df0fb1b66b1a71effcea25 SHA512 80a65a391a84208042d9e7a6e0b5e8644ed07d5e389cd6a7b314b961dca5cff6406c5556693b34dcd275acfb27d05d9e40f77e9d503f9e3e8054ab6b6763932d
diff --git a/www-client/qutebrowser/qutebrowser-2.5.0.ebuild b/www-client/qutebrowser/qutebrowser-2.5.1.ebuild
index 7d651f4ce4d0..9287f76d1bec 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.1.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
+# py3.11: wait for https://github.com/python/cpython/issues/93252
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1 optfeature xdg
 
@@ -26,7 +27,7 @@ IUSE="+adblock widevine"
 RDEPEND="
 	dev-qt/qtcore:5[icu]
 	dev-qt/qtgui:5[png]
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' 3.8)
 	$(python_gen_cond_dep '
 		dev-python/colorama[${PYTHON_USEDEP}]
 		>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
@@ -56,8 +57,8 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-python_prepare_all() {
-	distutils-r1_python_prepare_all
+src_prepare() {
+	distutils-r1_src_prepare
 
 	if use widevine; then
 		local widevine=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
diff --git a/www-client/qutebrowser/qutebrowser-2.5.2.ebuild b/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
new file mode 100644
index 000000000000..8e1dcf48ee29
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
@@ -0,0 +1,125 @@
+# 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
+# py3.11: wait for https://github.com/python/cpython/issues/93252
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git"
+else
+	SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+adblock widevine"
+
+RDEPEND="
+	dev-qt/qtcore:5[icu]
+	dev-qt/qtgui:5[png]
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' 3.8)
+	$(python_gen_cond_dep '
+		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[${PYTHON_USEDEP},libyaml(+)]
+		dev-python/zipp[${PYTHON_USEDEP}]
+		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )')
+	widevine? ( www-plugins/chrome-binary-plugins )"
+BDEPEND="
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+			dev-python/cheroot[${PYTHON_USEDEP}]
+			dev-python/flask[${PYTHON_USEDEP}]
+			dev-python/hypothesis[${PYTHON_USEDEP}]
+			dev-python/pytest-bdd[${PYTHON_USEDEP}]
+			dev-python/pytest-mock[${PYTHON_USEDEP}]
+			dev-python/pytest-qt[${PYTHON_USEDEP}]
+			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
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	if use widevine; then
+		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
+
+	# these plugins/tests are unnecessary here and have extra dependencies
+	sed -e '/pytest-benchmark/d;s/--benchmark[^ ]*//' \
+		-e '/pytest-instafail/d;s/--instafail//' \
+		-i pytest.ini || die
+	[[ ${PV} == 9999 ]] || rm tests/unit/scripts/test_problemmatchers.py || die
+	[[ ${PV} != 9999 ]] || rm tests/unit/scripts/test_run_vulture.py || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# end2end and other IPC tests are broken with "Name error" if
+		# socket path is over 104 characters (=124 in /var/tmp/portage)
+		# https://github.com/qutebrowser/qutebrowser/issues/888 (not just OSX)
+		tests/end2end
+		tests/unit/misc/test_ipc.py
+		# tests that don't know about our newer qtwebengine
+		tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
+		tests/unit/utils/test_version.py::TestChromiumVersion
+		# may misbehave depending on installed old python versions
+		tests/unit/misc/test_checkpyver.py::test_old_python
+		# bug 819393
+		tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner]
+		# not worth running dbus over
+		tests/unit/browser/test_notification.py::TestDBus
+	)
+	use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
+
+	# skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
+	epytest -k 'not _bench and not _matches_tree and not _warning'
+}
+
+python_install_all() {
+	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}
+	python_fix_shebang "${ED}"/usr/share/${PN}
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "PDF display support" www-plugins/pdfjs
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Note that optional scripts in ${EROOT}/usr/share/${PN}/{user,}scripts"
+		elog "have additional dependencies not covered by this ebuild, for example"
+		elog "view_in_mpv needs media-video/mpv[lua] and net-misc/yt-dlp."
+	fi
+}
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 6e52913c8194..8e1dcf48ee29 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
+# py3.11: wait for https://github.com/python/cpython/issues/93252
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1 optfeature xdg
 
@@ -26,7 +27,7 @@ IUSE="+adblock widevine"
 RDEPEND="
 	dev-qt/qtcore:5[icu]
 	dev-qt/qtgui:5[png]
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' 3.8)
 	$(python_gen_cond_dep '
 		dev-python/colorama[${PYTHON_USEDEP}]
 		>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
@@ -56,8 +57,8 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-python_prepare_all() {
-	distutils-r1_python_prepare_all
+src_prepare() {
+	distutils-r1_src_prepare
 
 	if use widevine; then
 		local widevine=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
@@ -92,6 +93,8 @@ python_test() {
 		tests/unit/misc/test_checkpyver.py::test_old_python
 		# bug 819393
 		tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner]
+		# not worth running dbus over
+		tests/unit/browser/test_notification.py::TestDBus
 	)
 	use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )