From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B8926158089 for ; Mon, 18 Sep 2023 11:57:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02D6C2BC023; Mon, 18 Sep 2023 11:57:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D7EEC2BC023 for ; Mon, 18 Sep 2023 11:57:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8727C335C94 for ; Mon, 18 Sep 2023 11:57:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CFD43AD2 for ; Mon, 18 Sep 2023 11:57:55 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1695037914.8ab0af2d2de53e11130eb6eeb8f2ad7c27e8c47f.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/, www-client/qutebrowser/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/qutebrowser/Manifest www-client/qutebrowser/files/qutebrowser-2.5.4-tests-python-3.11.4.patch www-client/qutebrowser/qutebrowser-2.5.4-r1.ebuild X-VCS-Directories: www-client/qutebrowser/ www-client/qutebrowser/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 8ab0af2d2de53e11130eb6eeb8f2ad7c27e8c47f X-VCS-Branch: master Date: Mon, 18 Sep 2023 11:57:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bb5132f5-ace3-4b5b-bb5f-b7a4cfdc6086 X-Archives-Hash: 56ef1f2147da87f23d7c52f4783dc359 commit: 8ab0af2d2de53e11130eb6eeb8f2ad7c27e8c47f Author: Ionen Wolkens gentoo org> AuthorDate: Mon Sep 18 11:51:52 2023 +0000 Commit: Ionen Wolkens gentoo 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 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? (