[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/, www-client/qutebrowser/files/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     8ab0af2d2de53e11130eb6eeb8f2ad7c27e8c47f
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 18 11:51:52 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Sep 18 11:51:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ab0af2d

www-client/qutebrowser: drop 2.5.4-r1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 www-client/qutebrowser/Manifest                    |   1 -
 .../qutebrowser-2.5.4-tests-python-3.11.4.patch    | 102 -------------
 www-client/qutebrowser/qutebrowser-2.5.4-r1.ebuild | 162 ---------------------
 3 files changed, 265 deletions(-)

diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 92c58976db37..f985470fac4a 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,3 +1,2 @@
-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

diff --git a/www-client/qutebrowser/files/qutebrowser-2.5.4-tests-python-3.11.4.patch b/www-client/qutebrowser/files/qutebrowser-2.5.4-tests-python-3.11.4.patch
deleted file mode 100644
index 909bd3acfab7..000000000000
--- a/www-client/qutebrowser/files/qutebrowser-2.5.4-tests-python-3.11.4.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-Backports for tests broken by python-3.11.4.
-https://bugs.gentoo.org/910742
-
-IPv6 tests are notably related to https://bugs.gentoo.org/909747
-
-https://github.com/qutebrowser/qutebrowser/commit/e1d0b3c543fc470a0459a18be3dee5a151ed79ed
-https://github.com/qutebrowser/qutebrowser/commit/5d890f14d093689e53fcbdec3d739daf04a8aae4
-...was for 3.12 but change was backported to 3.11.4 which led to:
-https://github.com/qutebrowser/qutebrowser/commit/8b058389b7db591fb52b99fe9f7afbacfeabd901
---- a/tests/unit/config/test_configfiles.py
-+++ b/tests/unit/config/test_configfiles.py
-@@ -1102,7 +1102,14 @@
-         error = excinfo.value.errors[0]
--        assert isinstance(error.exception, ValueError)
--        assert error.text == "Error while compiling"
-+
-+        if sys.version_info >= (3, 11, 4):
-+            assert isinstance(error.exception, SyntaxError)
-+            assert error.text == "Unhandled exception"
-+            assert error.traceback is not None  # tested in more detail by test below
-+        else:
-+            assert isinstance(error.exception, ValueError)
-+            assert error.text == "Error while compiling"
-+            assert error.traceback is None
-+
-         exception_text = 'source code string cannot contain null bytes'
-         assert str(error.exception) == exception_text
--        assert error.traceback is None
- 
---- a/tests/unit/utils/test_urlmatch.py
-+++ b/tests/unit/utils/test_urlmatch.py
-@@ -42,2 +42,8 @@
- 
-+_INVALID_IP_MESSAGE = (
-+    r'Invalid IPv6 address; source was ".*"; host = ""|'
-+    r"'.*' does not appear to be an IPv4 or IPv6 address"  # Python 3.11.4+
-+)
-+
-+
- @pytest.mark.parametrize('pattern, error', [
-@@ -62,3 +68,7 @@
-     ## TEST(ExtensionURLPatternTest, IPv6Patterns)
--    pytest.param("http://[]:8888/*", "Pattern without host", id='host-ipv6'),
-+    pytest.param(
-+        "http://[]:8888/*",
-+        "Pattern without host|'' does not appear to be an IPv4 or IPv6 address",
-+        id='host-ipv6',
-+    ),
- 
-@@ -89,3 +99,6 @@
-         "http://[[2607:f8b0:4005:805::200e]/*",
--        r"""Expected '\]' to match '\[' in hostname; source was "\[2607:f8b0:4005:805::200e"; host = """"",
-+        (
-+            r'''Expected '\]' to match '\[' in hostname; source was "\[2607:f8b0:4005:805::200e"; host = ""|'''
-+            r"'\[2607:f8b0:4005:805::200e' does not appear to be an IPv4 or IPv6 address"
-+        ),
-         id='host-ipv6-two-open',
-@@ -95,3 +108,3 @@
-         "http://[2607:f8b0:4005:805:200e]/*",
--        'Invalid IPv6 address; source was "2607:f8b0:4005:805:200e"; host = ""',
-+        _INVALID_IP_MESSAGE,
-         id='host-ipv6-colons',
-@@ -101,3 +114,3 @@
-         "http://[2607:f8b0:4005:805:200e:12:bogus]/*",
--        'Invalid IPv6 address; source was "2607:f8b0:4005:805:200e:12:bogus"; host = ""',
-+        _INVALID_IP_MESSAGE,
-         id='host-ipv6-non-hex',
-@@ -155,3 +168,3 @@
-         "http://[fc2e::bb88::edac]",
--        'Invalid IPv6 address; source was "fc2e::bb88::edac"; host = ""',
-+        _INVALID_IP_MESSAGE,
-         id='ipv6-double-double',
-@@ -160,3 +173,3 @@
-         "http://[fc2e:0e35:bb88::edac:fc2e:0e35:bb88:edac]",
--        'Invalid IPv6 address; source was "fc2e:0e35:bb88::edac:fc2e:0e35:bb88:edac"; host = ""',
-+        _INVALID_IP_MESSAGE,
-         id='ipv6-long-double',
-@@ -165,3 +178,3 @@
-         "http://[fc2e:0e35:bb88:af:edac:fc2e:0e35:bb88:edac]",
--        'Invalid IPv6 address; source was "fc2e:0e35:bb88:af:edac:fc2e:0e35:bb88:edac"; host = ""',
-+        _INVALID_IP_MESSAGE,
-         id='ipv6-long',
-@@ -170,3 +183,3 @@
-         "http://[127.0.0.1:fc2e::bb88:edac]",
--        r'Invalid IPv6 address; source was "127\.0\.0\.1:fc2e::bb88:edac',
-+        _INVALID_IP_MESSAGE,
-         id='ipv6-ipv4',
-@@ -176,3 +189,3 @@
-         "http://[fc2e:bb88:edac]",
--        'Invalid IPv6 address; source was "fc2e:bb88:edac"; host = ""',
-+        _INVALID_IP_MESSAGE,
-         id='ipv6-short',
-@@ -181,3 +194,3 @@
-         "http://[fc2e:bb88:edac::z]",
--        'Invalid IPv6 address; source was "fc2e:bb88:edac::z"; host = ""',
-+        _INVALID_IP_MESSAGE,
-         id='ipv6-z',
-@@ -192,3 +205,3 @@
- def test_invalid_patterns(pattern, error):
--    with pytest.raises(urlmatch.ParseError, match=error):
-+    with pytest.raises(urlmatch.ParseError, match=f"^{error}$"):
-         urlmatch.UrlPattern(pattern)

diff --git a/www-client/qutebrowser/qutebrowser-2.5.4-r1.ebuild b/www-client/qutebrowser/qutebrowser-2.5.4-r1.ebuild
deleted file mode 100644
index eaf8bf596f66..000000000000
--- a/www-client/qutebrowser/qutebrowser-2.5.4-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# 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
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1 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 Python and Qt"
-HOMEPAGE="https://www.qutebrowser.org/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+adblock pdf widevine"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets]
-		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
-		>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/zipp[${PYTHON_USEDEP}]
-		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
-	')
-	dev-qt/qtcore:5[icu]
-	dev-qt/qtgui:5[png]
-	dev-qt/qtsql:5[sqlite]
-	pdf? ( <www-plugins/pdfjs-3 )
-	widevine? ( www-plugins/chrome-binary-plugins )"
-BDEPEND="
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/PyQt5[testlib]
-			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
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tests-python-3.11.4.patch
-)
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	if use pdf; then
-		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
-
-	# 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
-
-	# disable unnecessary tests/plugins that 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
-	fi
-}
-
-python_test() {
-	local -x PYTEST_QT_API=pyqt5
-
-	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
-		# calls eclass' python2 "failure" wrapper
-		tests/unit/misc/test_checkpyver.py::test_old_python
-		# not worth running dbus over
-		tests/unit/browser/test_notification.py::TestDBus
-		# bug 819393
-		tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner]
-		# tests that don't know about our newer qtwebengine:5
-		tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
-	)
-	# qtargs are mangled with widevine+prefix
-	use widevine && use prefix && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
-
-	# 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 ]]; then
-		ewarn "This is a downgrade from Qt6-based ${PN} to Qt5-based, and this"
-		ewarn "older version of ${PN} will /not/ warn on startup that this is"
-		ewarn "going to destroy some browsing data (e.g. cookies) when older chromium"
-		ewarn "version tries to use the newer ~/.local/share/${PN}/webengine."
-		ewarn
-		ewarn "It is recommended to backup in case or go back to Qt6."
-	fi
-}