From 4be6deadf3e814bc37585cde9dc08faad2561453 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 18 Sep 2023 17:06:27 +0100 Subject: gentoo auto-resync : 18:09:2023 - 17:06:27 --- www-client/qutebrowser/Manifest | 3 - .../qutebrowser-2.5.4-tests-python-3.11.4.patch | 102 ------------- www-client/qutebrowser/qutebrowser-2.5.4-r1.ebuild | 162 --------------------- 3 files changed, 267 deletions(-) delete mode 100644 www-client/qutebrowser/files/qutebrowser-2.5.4-tests-python-3.11.4.patch delete mode 100644 www-client/qutebrowser/qutebrowser-2.5.4-r1.ebuild (limited to 'www-client/qutebrowser') diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest index bc70dd600410..63e8d4d405bf 100644 --- a/www-client/qutebrowser/Manifest +++ b/www-client/qutebrowser/Manifest @@ -1,9 +1,6 @@ -AUX qutebrowser-2.5.4-tests-python-3.11.4.patch 4324 BLAKE2B 0d55af4677d6822f03f23404a5f4df5c2189343e2765a5d08c08bdb75749f07594091d2c66ab5a646d0f0e1719cdc7b9aaa593076d2f263911f0881724fcb1b6 SHA512 9c0dc96b1d8e26fa22fdf07878e7fe60b7112e41b5b90955b96b0a95fe815334e2b8c4e48009e2e70ab5bd7e6bdb9f2097bf9333c38e003486a2be4bb4867b3b AUX qutebrowser-3.0.0-tests-qt653.patch 518 BLAKE2B 249ec80b108c14d4144e4199954cd9a161f430ec8e2f4503f8f512fda108043164c05099a24ebcd916375173a4a3b2a355f6a8360b83908a1e9685fe45d9ab0f SHA512 89e6608e5bd3c172fc63f53f8cf114698776decdcde1075133a23e2a844571cfd1b0d8bc021930ec6bde362802b6e7d61d9fad9256e1d3c281e9b1c12d38807d -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-3.0.0.ebuild 6764 BLAKE2B e8feebf6a1dd709a508ffd50c8315999a197d3329a71ec7432f3fd16cc13872ff235b91d1b267ac150375df3f558f94c36e2f63b5cb28ddcc88bb7d0b98563e8 SHA512 d9a2762e9408565bf7fa6ae757f12b1ea0e814f435cec28a04e1af6658d71c469e7e79b9ff03e00a47d15621d1facc4d1cb350acd5f3a4828d64dfad9a8f6f7d EBUILD qutebrowser-9999.ebuild 6714 BLAKE2B 21b3e8526f7074cbe32258faf42a68b9b9aef0751ac3c9a84e3602c8aae4dc9ae087c9363c8109aac6a742e1e73a6f06f5a0980a0ab3b3a2de89e6d9594e4f32 SHA512 ee88ec6379086c17dd1c01cc2fc8311e116a33ed880818c5f087eb360ff302194988ea24ada59bb876a47f264822b09d140782402555073627b3b35586c61f77 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 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? (