gentoo auto-resync : 18:08:2023 - 21:36:58

4 files changed, 243 insertions, 15 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 8d11c49f2394..bab3911ee29a 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 3dc4f16968a0..e46cb80699fe 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,5 +1,8 @@
 AUX qutebrowser-2.5.4-tests-python-3.11.4.patch 4324 BLAKE2B 0d55af4677d6822f03f23404a5f4df5c2189343e2765a5d08c08bdb75749f07594091d2c66ab5a646d0f0e1719cdc7b9aaa593076d2f263911f0881724fcb1b6 SHA512 9c0dc96b1d8e26fa22fdf07878e7fe60b7112e41b5b90955b96b0a95fe815334e2b8c4e48009e2e70ab5bd7e6bdb9f2097bf9333c38e003486a2be4bb4867b3b
 DIST qutebrowser-2.5.4.tar.gz 6117674 BLAKE2B d8dedf57ac064ce1a3d2e4e854a0064dfe567260cadfcdf129c2a2bcdbd26aaa21a569e3f69300c75e5dfb363b62173ac6e5f11e4bcd4a5c8dd72697b4caa5c3 SHA512 1c500cda921a273dee14b1e0808786bbfd2ce53ea9b4d5114be9abdacbefa5d3c7580d2995ad0100f597b9bf54addf4c98dbd4b924d9e8d3d08fe30309e44c3e
+DIST qutebrowser-3.0.0.tar.gz 6030459 BLAKE2B 05e1f3c87fe572ec66d199b9c255178c7e7358321c44255b9191624fa4fede0525b16ff0740df5051390f4e3b2a2c3ee99d53fcf6c44279689f9ea0427df13ca SHA512 2aa361b418adad1e2c2dd068148215f3eaea29c70e00634fd1a2370d584ffa2a66b0a0e22623656fc5f634d35ba99a178c269a3accd25edf778b7e3077ceb373
+DIST qutebrowser-3.0.0.tar.gz.asc 659 BLAKE2B 19d736ede7cfb2ac4d3ebaea7f4f8a6da722e3eac0c1693d487ed16f2bc5a5cce13bbc69604cd7c34e266c345f3149f2f2250aba71555f3290cd63216adc0b98 SHA512 25c9cd3fa44f712b98ef3f8d1821f61d5f2b96d8bf108ff2277dc6609343237876124f7587cf906127b8d6161923bda0946c6ef75f3cbf6c401cf5d72b7a6ffd
 EBUILD qutebrowser-2.5.4-r1.ebuild 5229 BLAKE2B 02b2d82dc544051e1afbb0c22362745c39d4befd9443b1a873cb5979de492987cac707b2dedae594924f9402b3c362be5951e637df0f7471335c9b02d22c8fb9 SHA512 5a264abffe9861d288dd2a35765bf8f956e1af970880922cc7c1cf83e7a92f8b8f9e0afe190d196b78d777707aee57cc06eb538b5042aa7342fbe98fefc89731
-EBUILD qutebrowser-9999.ebuild 6883 BLAKE2B d2455eeff05b339247cd7c6330745e915dff325e5add9547f72ebf61b92ab0aa225ba893abf684533cab06dd158d5ce1b35cad6e87235be2840ca0a96d778713 SHA512 159d7321c52ec74a98af4dd8893f835b6d4a204e5e4ab46d3680bf0ad6af5e89cecf99d25317f843dc645a2bcdcba6d4b6fcdeb94563edd7ba19831394d68718
+EBUILD qutebrowser-3.0.0.ebuild 7276 BLAKE2B e0c43f7a52525c74d4e4a4e7f3badd1487530c8f82ae35e8b8d06fb81652aed590cae642c66903cdd9534952e327f7d58bcca7b14b6d15db7d18b196a3178010 SHA512 28ef8ed4d05ab325008ac5116e8faf2094282a58142e9b694bd7b1de645a587f2542b35d4730120a79e31f056089e98ae5ecf59b15f8f2491bf9e87aaa4486f9
+EBUILD qutebrowser-9999.ebuild 7276 BLAKE2B e0c43f7a52525c74d4e4a4e7f3badd1487530c8f82ae35e8b8d06fb81652aed590cae642c66903cdd9534952e327f7d58bcca7b14b6d15db7d18b196a3178010 SHA512 28ef8ed4d05ab325008ac5116e8faf2094282a58142e9b694bd7b1de645a587f2542b35d4730120a79e31f056089e98ae5ecf59b15f8f2491bf9e87aaa4486f9
 MISC metadata.xml 1018 BLAKE2B 9d0c406995b2036671113b6513c3ed2fdb5021eae9d1dde5c186efeccdde6dae127857e3e5898f7809edcc27eca4b47f37965155ac0ff21bedb78e242421fd54 SHA512 2af79f18d31f9efe8df852f4bca132caf1d79fc06f6388959deb367470d4975af541a75c70831b549d944112bcd0bc7e11510a81bce4ef1391fbf1354425b769
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
new file mode 100644
index 000000000000..98701890400a
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+# py3.12 should work (no tests regressions), but waiting on the last dep
+# (pytest-qt) to properly have py3.12 which gets more complicated with
+# QtPy + pyside* that we don't actually use here
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1 xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git"
+else
+	inherit verify-sig
+	SRC_URI="
+		https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz
+		verify-sig? ( https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc )
+	"
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/qutebrowser.gpg"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
+HOMEPAGE="https://qutebrowser.org/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+adblock pdf +qt6 widevine"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/zipp[${PYTHON_USEDEP}]
+		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
+		qt6? (
+			dev-qt/qtbase:6[icu,sqlite]
+			dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
+			dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]
+			pdf? ( www-plugins/pdfjs )
+		)
+		!qt6? (
+			dev-qt/qtcore:5[icu]
+			dev-qt/qtgui:5[png]
+			dev-qt/qtsql:5[sqlite]
+			dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets]
+			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+			pdf? ( <www-plugins/pdfjs-3 )
+		)
+		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}]
+			qt6? ( dev-python/PyQt6[testlib] )
+			!qt6? ( dev-python/PyQt5[testlib] )
+		)
+	')
+"
+
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+=" app-text/asciidoc"
+else
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-qutebrowser )"
+fi
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	if use pdf; then
+		# does not hurt to enable by default if it was explicitly requested
+		sed -e '/^content.pdfjs:/,+1s/false/true/' \
+			-i ${PN}/config/configdata.yml || die
+	fi
+
+	if use widevine && use prefix; then
+		# hack: QtWebEngine knows Gentoo's widevine, but not with ${EPREFIX}
+		local widevine=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
+		sed -e "/yield from _qtwebengine_settings_args/a\    yield '--widevine-path=${widevine}'" \
+			-i ${PN}/config/qtargs.py || die
+	fi
+
+	# ensure the requested backend is used in case multiple are available
+	sed -e "/^_WRAPPER_OVERRIDE =/s/None/\"PyQt$(usex qt6 6 5)\"/" \
+		-i qutebrowser/qt/machinery.py || die
+
+	# let eclass handle python
+	sed -i '/setup.py/d' misc/Makefile || die
+
+	if [[ ${PV} == 9999 ]]; then
+		# call asciidoc(1) rather than the single target python module
+		sed -e '/cmdline = /s/= .*/= ["asciidoc"]/' \
+			-i scripts/asciidoc2html.py || die
+
+		"${EPYTHON}" scripts/asciidoc2html.py || die
+	fi
+
+	if use test; then
+		# unnecessary here, and would require extra deps
+		sed -e '/pytest-benchmark/d' -e 's/--benchmark[^ ]*//' \
+			-e '/pytest-instafail/d' -e 's/--instafail//' \
+			-i pytest.ini || die
+
+		if [[ ${PV} == 9999 ]]; then
+			# likewise, needs vulture
+			rm tests/unit/scripts/test_run_vulture.py || die
+		else
+			# https://github.com/qutebrowser/qutebrowser/issues/7620
+			rm tests/unit/scripts/test_problemmatchers.py || die
+		fi
+	fi
+}
+
+python_test() {
+	local -x PYTEST_QT_API=pyqt$(usex qt6 6 5)
+
+	local EPYTEST_DESELECT=(
+		# end2end/IPC tests are broken with "Name error" if socket path is over
+		# ~108 characters (>124 in /var/tmp/portage) due to Linux limitations,
+		# skip rather than bother using /tmp+cleanup over ${T} (end2end tests
+		# are important, but the other tests should be enough for downstream)
+		tests/end2end
+		tests/unit/misc/test_ipc.py
+		# python eclasses provide a fake "failing" python2 and trips this test
+		tests/unit/misc/test_checkpyver.py::test_old_python
+		# not worth running dbus over
+		tests/unit/browser/test_notification.py::TestDBus
+		# fails in ebuild, seems due to saving fake downloads in the wrong location
+		tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
+		# may fail if environment is very large (bug #819393)
+		tests/unit/commands/test_userscripts.py::test_custom_env\[_POSIXUserscriptRunner\]
+		# needs _WRAPPER_OVERRIDE = None, but we have changed it
+		tests/unit/test_qt_machinery.py::TestSelectWrapper::test_autoselect_by_default
+		tests/unit/test_qt_machinery.py::TestInit::test_none_available_{implicit,explicit}
+	)
+
+	# we mangle qtargs with widevine+prefix leading to unexpected results
+	use widevine && use prefix &&
+		EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
+
+	# tests known failing with Qt5 which is considered a 2nd class citizen
+	# and, unless completely broken, new tests issues may not be pursued
+	use qt6 || EPYTEST_DESELECT+=(
+		tests/unit/mainwindow/test_tabwidget.py::TestTabWidget::test_tab_text_not_edlided_for_wide_tabs
+	)
+
+	# skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
+	epytest -p xvfb -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_preinst() {
+	xdg_pkg_preinst
+
+	has_version "${CATEGORY}/${PN}[qt6]" && QUTEBROWSER_HAD_QT6=
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	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
+
+	if [[ ! -v QUTEBROWSER_HAD_QT6 && ${REPLACING_VERSIONS} ]] && use qt6; then
+		ewarn
+		ewarn "Be warned that starting the Qt6 version of ${PN} performs a one-way"
+		ewarn "conversion of ~/.local/share/${PN}/webengine to Qt6. There will also"
+		ewarn "be a warning on startup, and may optionally want to backup first."
+	fi
+
+	# only show Qt6 warning on arches where USE=qt6 is unmasked
+	if use amd64 && use !qt6; then
+		ewarn
+		ewarn "USE=qt6 is disabled, be warned that Qt5's WebEngine uses an older"
+		ewarn "chromium version. While it is relatively maintained for security, it will"
+		ewarn "cause issues for sites/features designed with a newer version in mind."
+	fi
+}
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 8319d7eaab10..98701890400a 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -15,12 +15,17 @@ 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"
+	inherit verify-sig
+	SRC_URI="
+		https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz
+		verify-sig? ( https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc )
+	"
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/qutebrowser.gpg"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
-HOMEPAGE="https://www.qutebrowser.org/"
+HOMEPAGE="https://qutebrowser.org/"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -70,7 +75,12 @@ BDEPEND="
 		)
 	')
 "
-[[ ${PV} == 9999 ]] && BDEPEND+=" app-text/asciidoc"
+
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+=" app-text/asciidoc"
+else
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-qutebrowser )"
+fi
 
 distutils_enable_tests pytest
 
@@ -105,14 +115,19 @@ src_prepare() {
 		"${EPYTHON}" scripts/asciidoc2html.py || die
 	fi
 
-	# disable tests/plugins that are unncessary for us and need extras
-	sed -e '/pytest-benchmark/d' -e 's/--benchmark[^ ]*//' \
-		-e '/pytest-instafail/d' -e 's/--instafail//' \
-		-i pytest.ini || die
-	if [[ ${PV} == 9999 ]]; then
-		rm tests/unit/scripts/test_run_vulture.py || die
-	else
-		rm tests/unit/scripts/test_problemmatchers.py || die
+	if use test; then
+		# unnecessary here, and would require extra deps
+		sed -e '/pytest-benchmark/d' -e 's/--benchmark[^ ]*//' \
+			-e '/pytest-instafail/d' -e 's/--instafail//' \
+			-i pytest.ini || die
+
+		if [[ ${PV} == 9999 ]]; then
+			# likewise, needs vulture
+			rm tests/unit/scripts/test_run_vulture.py || die
+		else
+			# https://github.com/qutebrowser/qutebrowser/issues/7620
+			rm tests/unit/scripts/test_problemmatchers.py || die
+		fi
 	fi
 }
 
@@ -122,14 +137,15 @@ python_test() {
 	local EPYTEST_DESELECT=(
 		# end2end/IPC tests are broken with "Name error" if socket path is over
 		# ~108 characters (>124 in /var/tmp/portage) due to Linux limitations,
-		# skip rather than bother using /tmp+cleanup over ${T}
+		# skip rather than bother using /tmp+cleanup over ${T} (end2end tests
+		# are important, but the other tests should be enough for downstream)
 		tests/end2end
 		tests/unit/misc/test_ipc.py
 		# python eclasses provide a fake "failing" python2 and trips this test
 		tests/unit/misc/test_checkpyver.py::test_old_python
 		# not worth running dbus over
 		tests/unit/browser/test_notification.py::TestDBus
-		# fails in ebuild, seems due to saving fake downloads in wrong location
+		# fails in ebuild, seems due to saving fake downloads in the wrong location
 		tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
 		# may fail if environment is very large (bug #819393)
 		tests/unit/commands/test_userscripts.py::test_custom_env\[_POSIXUserscriptRunner\]
@@ -190,6 +206,5 @@ pkg_postinst() {
 		ewarn "USE=qt6 is disabled, be warned that Qt5's WebEngine uses an older"
 		ewarn "chromium version. While it is relatively maintained for security, it will"
 		ewarn "cause issues for sites/features designed with a newer version in mind."
-		ewarn "When Qt6 support is stable enough, ebuild's Qt5 support may get removed."
 	fi
 }