gentoo resync : 08.10.2021

4 files changed, 2 insertions, 68 deletions

diff --git a/dev-python/mechanize/Manifest b/dev-python/mechanize/Manifest
index dbe28fad83f2..0ba4b48bdddb 100644
--- a/dev-python/mechanize/Manifest
+++ b/dev-python/mechanize/Manifest
@@ -1,8 +1,5 @@
-AUX mechanize-0.4.5-py310.patch 900 BLAKE2B 48fcf7baed04e4a2aa32bef01cfab4f8246abace61364fd26d4c90231f6e2ab5924d89b377e6c3a0f5086bcd916e9789a61a5b2aa585665711b97726ecd4b5fa SHA512 1e4262f24ba5ae7238bcf261dfce7cbb851b72fd5daacc37cee570d2172d57d9700802a8c6b8186d7dcdc0cfba583cc136b81fe759513436f393f27159e266c0
-DIST mechanize-0.4.5.tar.gz 216908 BLAKE2B 67951ad8295a32799768b3719525d45d502bc773c6f2a5e762e3dae97f309c8c265a2cb3efde95c9e8cb65e89dee6ad6ad8585685baa4e9ff1acfd146f115f6f SHA512 51706d5c073501d02fb7395eda30625ed9191324f948073c7d1589df0e507d8b7641ca514ceff55e7d82e899ba6e10c55507c79668976c7654ff0004671d09d2
 DIST mechanize-0.4.6.tar.gz 217254 BLAKE2B 0adc7e0bcbef93051412d0d22e9f426984e197791b43b007087d70d3b15d4fce2f4868e8ad520e8621d35890d6454bd9bfc0910dc5af3d640e2620de4f536e16 SHA512 c28ba59529d2a1d4454467c1e034fc583952fd152c8f889bf9b4c496ad4567e9ca5f8b133eb6eb081bc1e811f54c508e47f8a2c5ccdd8f04c709dafeedf05820
 DIST mechanize-0.4.7.tar.gz 217289 BLAKE2B 9254cc88141b08bd9f97b63ac1dcb6b417e042cbefcf710ea9e1c340e8f6331ef9301a47bc6dd989970810ef36b97b867b81b3a44c9a4cdf283a77b04f25decd SHA512 f2796f322b1000818bcd4bcedf1d88538ba3a43151b74c950594a60dd7b5cf96ea4fcb605e30c93a5df095da35418401487928b9adfcca932e95dbf964d74c53
-EBUILD mechanize-0.4.5-r1.ebuild 897 BLAKE2B 7465d7954ee7ae92eaa44a556197c73fee14a437c0afe25b8a75e699ebb32562a790469abe5557f3c7ae45cc270bba601d8a00e69bbdad9ad588217410090a61 SHA512 7681220882b31d7ff082b1c87ffd620e27f75add1facc4576232ae2fc1ea94b21050cbe75cb2ae4815524acd4ad38f1c0fe5e431deec5a09614d284af3c639ed
-EBUILD mechanize-0.4.6.ebuild 659 BLAKE2B cfb0509985470050037963c450def21be228e137ed4b09789321be7880be20b2d4178e1aa1a54715e341a36d9c0352de85340d3de629d322a18255e8379b2b0e SHA512 489c62c7ce671c06fed7b007b2f76982e33856e7edb60367219cd1af978c434932ac711f4eb468bdd5861240aacd746969ad714cd54bbd13a48592bcb532e725
+EBUILD mechanize-0.4.6.ebuild 657 BLAKE2B 0771db52d3446f853c5400bc1394708e6c336b021960314ea6cbff890219420f4dd03002eecbf56e1c20d8d9ec136059ed1a608abcf9a03f0a5e364997469a3f SHA512 32cac3c2b5c3ca08206ecebf4249cdb6b6117f6f1a7b2a76e31cbae6e9f0ada5db06520f456428fba84eaadc21bcf73bd72f1b96ba15a84e792c9fa53b96856a
 EBUILD mechanize-0.4.7.ebuild 659 BLAKE2B cfb0509985470050037963c450def21be228e137ed4b09789321be7880be20b2d4178e1aa1a54715e341a36d9c0352de85340d3de629d322a18255e8379b2b0e SHA512 489c62c7ce671c06fed7b007b2f76982e33856e7edb60367219cd1af978c434932ac711f4eb468bdd5861240aacd746969ad714cd54bbd13a48592bcb532e725
 MISC metadata.xml 979 BLAKE2B fc6a5b62fc6fad0dda94209699a03801aee4f759085a8c0f66766f80ef2b3c0036b0694934e9f7d55fa7ffe8d2cfffc8660a2f4df047b2bd37f10c9381a9d423 SHA512 76190d47696d3c999bf6a3788985b42a0ed99ef737a42c495a85e6de209a96eaa61ad8ba641a34f21dec49c8d55a8f0ba46fa325bf1001e1d43ce8bac1189979
diff --git a/dev-python/mechanize/files/mechanize-0.4.5-py310.patch b/dev-python/mechanize/files/mechanize-0.4.5-py310.patch
deleted file mode 100644
index 98656b65425f..000000000000
--- a/dev-python/mechanize/files/mechanize-0.4.5-py310.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/mechanize/_clientcookie.py b/mechanize/_clientcookie.py
-index ebd2773..6c89cbf 100644
---- a/mechanize/_clientcookie.py
-+++ b/mechanize/_clientcookie.py
-@@ -188,13 +188,22 @@ class CookieJar(CJ):
-         raise IndexError()
- 
- 
-+try:
-+    from http.cookiejar import NETSCAPE_MAGIC_RGX, NETSCAPE_HEADER_TEXT
-+except ImportError:  # python < 3.10
-+    NETSCAPE_MAGIC_RGX = MCJ.magic_re
-+    NETSCAPE_HEADER_TEXT = MCJ.header
-+else:
-+    MCJ.header = NETSCAPE_HEADER_TEXT  # needed for tests
-+
-+
- class MozillaCookieJar(MCJ):
- 
-     def _really_load(self, f, filename, ignore_discard, ignore_expires):
-         now = time.time()
- 
-         magic = f.readline()
--        if not re.search(self.magic_re, magic):
-+        if not re.search(NETSCAPE_MAGIC_RGX, magic):
-             f.close()
-             raise LoadError(
-                 "%r does not look like a Netscape format cookies file" %
diff --git a/dev-python/mechanize/mechanize-0.4.5-r1.ebuild b/dev-python/mechanize/mechanize-0.4.5-r1.ebuild
deleted file mode 100644
index 50942d696a0a..000000000000
--- a/dev-python/mechanize/mechanize-0.4.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Stateful programmatic web browsing in Python"
-HOMEPAGE="https://github.com/python-mechanize/mechanize"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-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=(
-	# https://github.com/python-mechanize/mechanize/commit/2a563ec4fbc394ec5976dda0f528db43d28a2706
-	# https://github.com/python-mechanize/mechanize/commit/bc6a2ca7b17e11f2533ada67f0bf92124d4a3cac
-	"${FILESDIR}/${P}-py310.patch"
-)
-
-python_test() {
-	"${EPYTHON}" run_tests.py || die
-}
diff --git a/dev-python/mechanize/mechanize-0.4.6.ebuild b/dev-python/mechanize/mechanize-0.4.6.ebuild
index 02ef35521fce..0dbed48e2d13 100644
--- a/dev-python/mechanize/mechanize-0.4.6.ebuild
+++ b/dev-python/mechanize/mechanize-0.4.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 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 )"