gentoo auto-resync : 24:07:2023 - 08:55:05

3 files changed, 108 insertions, 1 deletions

diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 3062219c3b03..3378e6531303 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,4 +1,5 @@
+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
-EBUILD qutebrowser-2.5.4-r1.ebuild 5170 BLAKE2B 1af9713cdac477076dc5e9f38c48b4c36c0b1e7a4b2f9d862cf1fe4df93323a287e29dbe1bf14cb9d08a6a36faa0fcd18adb400a9588e3d4ea8dd0498f5767b6 SHA512 1d850e6569cc9d6636cf09a82c59885cd7709150f81482a42279bd9e9a04c96fdfa0f7dc8296214bcee285e491b09f7593f2f5c24e8245e4b1e1349e699b8adf
+EBUILD qutebrowser-2.5.4-r1.ebuild 5229 BLAKE2B 02b2d82dc544051e1afbb0c22362745c39d4befd9443b1a873cb5979de492987cac707b2dedae594924f9402b3c362be5951e637df0f7471335c9b02d22c8fb9 SHA512 5a264abffe9861d288dd2a35765bf8f956e1af970880922cc7c1cf83e7a92f8b8f9e0afe190d196b78d777707aee57cc06eb538b5042aa7342fbe98fefc89731
 EBUILD qutebrowser-9999.ebuild 6500 BLAKE2B 6491fe16c4bbdea8b6e1bc82a9602fdfcdbb16acacd02d1b21a42adccaef6137e39f44986124cf28d283023782a481a414739c3cca955b64ee418b0d804cbc43 SHA512 244f5749a8763a88dad983ff615104468bf29459cb49c6febf26bbeb1628b171816ea630dc32a3a7aafee92cf57002130e6b430d11f1034edf7d9b74cc6f8d30
 MISC metadata.xml 1018 BLAKE2B 9d0c406995b2036671113b6513c3ed2fdb5021eae9d1dde5c186efeccdde6dae127857e3e5898f7809edcc27eca4b47f37965155ac0ff21bedb78e242421fd54 SHA512 2af79f18d31f9efe8df852f4bca132caf1d79fc06f6388959deb367470d4975af541a75c70831b549d944112bcd0bc7e11510a81bce4ef1391fbf1354425b769
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
new file mode 100644
index 000000000000..909bd3acfab7
--- /dev/null
+++ b/www-client/qutebrowser/files/qutebrowser-2.5.4-tests-python-3.11.4.patch
@@ -0,0 +1,102 @@
+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
index cf04e29c3d8d..eaf8bf596f66 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.4-r1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.4-r1.ebuild
@@ -60,6 +60,10 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${P}-tests-python-3.11.4.patch
+)
+
 src_prepare() {
 	distutils-r1_src_prepare