gentoo auto-resync : 29:11:2023 - 16:55:57

4 files changed, 2 insertions, 116 deletions

diff --git a/dev-python/mechanize/Manifest b/dev-python/mechanize/Manifest
index 8f1cd57cddf6..87f6789e3a74 100644
--- a/dev-python/mechanize/Manifest
+++ b/dev-python/mechanize/Manifest
@@ -1,6 +1,3 @@
-AUX mechanize-0.4.8-python3.11-test-order.patch 3062 BLAKE2B 7aa0734e93931eafe7527c722d5850df39f99225c4d7b173f48799b81f212c730e9ed6e42da3feaa080e0d5ed0f732b2f0d1bebe9dd01b01c5915e295d536495 SHA512 5e4947badd6b25e0788c67d751a71e8a8d46a16ff758a902a5874dd4cd818b9d21f36b5d3363a411b8f5c3a9398227957a35f25f5b92e29fc8127df3b96828e2
-DIST mechanize-0.4.8.tar.gz 218055 BLAKE2B bd91738092ac473ee6e65ee5f175479515f735a0433b112241f17061adf7e60ef6fa410fa549f088390b6ef6c8b2ff95e00335a626322ad170c88923c96e8e44 SHA512 71087481d27359b3ce795eae440ebb3a146f8dd5a6d5ac5dc91ae3c63f2c487beb472aa06b2925d6121faa038a0a8be50f6cecc54ee7209eb2b61e16242ffaa3
 DIST mechanize-0.4.9.tar.gz 218286 BLAKE2B 42ea97f843ec61b5ae05913e564f0cdb473976ea4e08a886c3bed15b27cea64def7fe5c73c1b809e48688d5ae41c269e85b633a24731c83409bf9855fc72b85f SHA512 a0c5d6e01ddabd35dded9908e4f7e24cb0a8c20a674af603cd2f5f146c75d38dc96c36af0898646691206ce41745dff9a736ce53efd03ff48e55e763814b893c
-EBUILD mechanize-0.4.8.ebuild 710 BLAKE2B b7edc6294b5b6f9745f1f861e362b4af06aed5dfa9e7217f7e9aafbaa1e93a87fbf165d1ed84c66e6519430c995b3f0b2ca115676d7f3ad1b639e14bc167b9a4 SHA512 4175c20daa4a8df8732c5ad37dfa845a92b31cf29cd5dea2d3ce4694ab13f60a51d14e32fb3bf44b1c84e1148c25a96410b40b817a3693c1dd0f8ba44d552c1c
-EBUILD mechanize-0.4.9.ebuild 690 BLAKE2B a098c4741a866dcf486bb0623bb0aa5c9b294808ceb744606ea3b57893944f007c0cd91ab7bddd1bffeee689d38d2193a1e51d9324a5881aad49c62824e47bf3 SHA512 85543360138f8206713f8156c6491cd8d746d5356fe05fa301fe809e6398e2b1e610ec6370d97ab9bf160932a1feab3db95430d578f5e271d742d0531affae0e
+EBUILD mechanize-0.4.9.ebuild 687 BLAKE2B 54434723531b70f865846f30f66b850eb377e6281cbbc7b41680b4275cf51f2402bb64453c592b58ef99589625f5a257b24a3c011e8ffd7cf6748dc3d23a6c2c SHA512 871849b08db99ca1265feb8c22e96a211dc0e6f1b6161119c63f68111316c2b4e0f083efb824419ff840e7397b83419ea1a40fb6734033ed529192c733aa7fe5
 MISC metadata.xml 1069 BLAKE2B 71445830ac06448e12152b3418f1e4c68ece2d3deb2b3da1d4e82c89fc5faeef02b9669d19576dd47076e3f69097b535fc8f27bb117f8d6d74819676d59bc208 SHA512 6b31da39515a39c6c2fff17dbe6ebed752b14730ac2253fedc649a3ef9cdcb21095cc4ab45bff80a7d38e30467317b25bdf605020fff4ec47473cf666c0f5436
diff --git a/dev-python/mechanize/files/mechanize-0.4.8-python3.11-test-order.patch b/dev-python/mechanize/files/mechanize-0.4.8-python3.11-test-order.patch
deleted file mode 100644
index 0808460dcc67..000000000000
--- a/dev-python/mechanize/files/mechanize-0.4.8-python3.11-test-order.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-https://github.com/python-mechanize/mechanize/commit/529d2c4cb8f31284f8026642968ba3adb9de1171
-https://github.com/python-mechanize/mechanize/commit/7ba3d586368c03577c061c35bc27664a907f5435
-https://github.com/python-mechanize/mechanize/commit/560839d51e54943890c2d37c0d0854792479cb80
-
-From: Kovid Goyal <kovid@kovidgoyal.net>
-Date: Tue, 24 May 2022 11:13:16 +0530
-Subject: [PATCH] Use asserts for failing test so we get better feedback on the
- failure
-
---- a/test/test_cookies.py
-+++ b/test/test_cookies.py
-@@ -1028,10 +1028,10 @@ def test_Cookie_iterator(self):  # noqa
-             i = 0
-             for c in cs:
-                 # assert isinstance(c, Cookie)
--                assert c.version == versions[i]
--                assert c.name == names[i]
--                assert c.domain == domains[i]
--                assert c.path == paths[i]
-+                self.assertEqual(c.version, versions[i])
-+                self.assertEqual(c.name, names[i])
-+                self.assertEqual(c.domain, domains[i])
-+                self.assertEqual(c.path, paths[i])
-                 i = i + 1
- 
-         self.assertRaises(IndexError, lambda cs=cs: cs[5])
-
-From: Kovid Goyal <kovid@kovidgoyal.net>
-Date: Tue, 24 May 2022 17:54:50 +0530
-Subject: [PATCH] DRYer
-
---- a/test/test_cookies.py
-+++ b/test/test_cookies.py
-@@ -1025,14 +1025,9 @@ def test_Cookie_iterator(self):  # noqa
- 
-         # sequential iteration
-         for i in range(4):
--            i = 0
--            for c in cs:
-+            for c, expected in zip(cs, zip(versions, names, domains, paths)):
-                 # assert isinstance(c, Cookie)
--                self.assertEqual(c.version, versions[i])
--                self.assertEqual(c.name, names[i])
--                self.assertEqual(c.domain, domains[i])
--                self.assertEqual(c.path, paths[i])
--                i = i + 1
-+                self.assertEqual((c.version, c.name, c.domain, c.path), expected)
- 
-         self.assertRaises(IndexError, lambda cs=cs: cs[5])
- 
-Date: Tue, 24 May 2022 18:09:16 +0530
-Subject: [PATCH] Change test to not rely on order of cookie iteration
-
-python 3.11 iterates in add order, earlier pythons iterate in domain
-sorted order
-
-Fix #74
---- a/test/test_cookies.py
-+++ b/test/test_cookies.py
-@@ -1022,13 +1022,12 @@ def test_Cookie_iterator(self):  # noqa
-             "www.acme.com"
-         ]
-         paths = ["/", "/", "/", "/blah", "/blah/"]
--
-+        expected = set(zip(versions, names, domains, paths))
-         # sequential iteration
--        for i in range(4):
--            for c, expected in zip(cs, zip(versions, names, domains, paths)):
--                # assert isinstance(c, Cookie)
--                self.assertEqual((c.version, c.name, c.domain, c.path), expected)
--
-+        # python 3.11 iterates in add order, earlier pythons iterate in domain
-+        # sorted order
-+        actual = {(c.version, c.name, c.domain, c.path) for c in cs}
-+        self.assertEqual(expected, actual)
-         self.assertRaises(IndexError, lambda cs=cs: cs[5])
- 
-     def test_parse_ns_headers(self):
-
diff --git a/dev-python/mechanize/mechanize-0.4.8.ebuild b/dev-python/mechanize/mechanize-0.4.8.ebuild
deleted file mode 100644
index 06b1f532059f..000000000000
--- a/dev-python/mechanize/mechanize-0.4.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="Stateful programmatic web browsing in Python"
-HOMEPAGE="https://github.com/python-mechanize/mechanize"
-
-LICENSE="|| ( BSD ZPL )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.8-python3.11-test-order.patch
-)
-
-python_test() {
-	"${EPYTHON}" run_tests.py || die
-}
diff --git a/dev-python/mechanize/mechanize-0.4.9.ebuild b/dev-python/mechanize/mechanize-0.4.9.ebuild
index c715455a4fc0..9f450d7fd6b3 100644
--- a/dev-python/mechanize/mechanize-0.4.9.ebuild
+++ b/dev-python/mechanize/mechanize-0.4.9.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="|| ( BSD ZPL )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"