gentoo auto-resync : 29:09:2024 - 01:25:46

4 files changed, 2 insertions, 112 deletions

diff --git a/dev-python/python-mimeparse/Manifest b/dev-python/python-mimeparse/Manifest
index af2ddbe2af3c..335499205b81 100644
--- a/dev-python/python-mimeparse/Manifest
+++ b/dev-python/python-mimeparse/Manifest
@@ -1,6 +1,3 @@
-AUX python-mimeparse-1.6.0-py3.13.patch 2328 BLAKE2B 9a6cf6844565eea60b71ab72472d3f607925f93c53ff1e3c38b08fd994455feafa4ff6b349905cc5216ce54a62e65258cc4d593139340acec9daae5033a087ef SHA512 dc44720a0711f2b3298ed727752e11eaf98648c505b07287cdebe312385a6804cead685e554e0375b1f02c8a66e9c54affe901150af431daa270d995a9dc3431
-DIST python-mimeparse-1.6.0.tar.gz 6541 BLAKE2B 15de86feddf892ee4599e0fe7c113a93f343d5b8afc09725263e2fcb3869f8f152612b9f30dbf68279aa95e2ce8f6ba9d4dc6e8e2b75366a972dcdb705220742 SHA512 cc2ec8059034fc224c59bffeb77e7fd0ba86b753373c8daf3a182fd56d647f0b96d7bacb6708be285dd7e246ebc19b813e2bfb8ac79a86f6d4e702c223f5187e
 DIST python_mimeparse-2.0.0.tar.gz 7162 BLAKE2B c87e391a87d06a0c967f51df4c9010c8f415a6a96d7b10f58ede9fb225ebabb9f85b42c22fef9ef583537e86341c9050527b1f8d38eec2c78cc1cf3f56f443ac SHA512 02fd28d6a5b1754ab9317571037b38dae94309694bc5d758c189acdda596a5e1e9c4cb2439abb9e932ddf1d6926930874f00d3c685a7edf568d339f9fe0c712a
-EBUILD python-mimeparse-1.6.0-r5.ebuild 688 BLAKE2B c92312985b37f7d1ddfe4df5751b5647331488f4536df3dd746218224010a11577420dc7fa8ebe2b6ee1392a97c4d966f85e3170d2a22feb9c7c38d36a9e79b3 SHA512 b3a3bbc2cd437d0f648189b960aebb019c6cc0751c64f7e5f5f2c6280219da4877dbe7cc3d4639e2da53f3cec3b10b5e67e6dbdeefb3e7c5cbbcb6505a966485
-EBUILD python-mimeparse-2.0.0.ebuild 630 BLAKE2B 59a05f94e22b16a7824a8e1cff03831a671776fbe5b5e9884f83501f9b95a3bded2ab56fff7d2edb145b6ffaf2656c6d7897637360a3921e83f9267ec6edb6d7 SHA512 d7180fb930da47fbcdbb0c2bc2cf70d6f169e4b211a2fa49af1662940409cfc8ff493de9b9d3d57ca59c586ecd4c3f1e3e66b1c0f5b3674e6d7b86c39e7ab831
+EBUILD python-mimeparse-2.0.0.ebuild 622 BLAKE2B 911ec05af93a1ed94fa509d9e513480570d8f3579ca8842c305281b6d085b60d6d0daa6a82c0065db3c6d5dc7ea50e9b0e73f1d29684eff5fc97f7c7cef6e87f SHA512 43d89e33ff1057ac7c79754fadc0fd7846d5743715ce78190bbdf5d4ac44134d43da9f9780a90133704f888f19ecd60db4626a1010ee7ee53626c41ee8d738c3
 MISC metadata.xml 422 BLAKE2B 83de811254521c0ba086160057d59ed1c49ae1258f78bd7c05acc8e2e0de86f3ce571f689df5a6c1247c6cbf99fde496eea2ac14d9133fd81493c6ac0c8bf28b SHA512 d14e037ea668ef4e6fadc15417ac5b74253b7b22385594965be785f5610e0071af0b74dfd80a5cf2386bfa01919955afff50dff1fd75853de7db7ed013b2e235
diff --git a/dev-python/python-mimeparse/files/python-mimeparse-1.6.0-py3.13.patch b/dev-python/python-mimeparse/files/python-mimeparse-1.6.0-py3.13.patch
deleted file mode 100644
index 90b4c4fc7d8a..000000000000
--- a/dev-python/python-mimeparse/files/python-mimeparse-1.6.0-py3.13.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 5427072b12119fe28fd66f19f74beb7da0c1de8b Mon Sep 17 00:00:00 2001
-From: Stanis Trendelenburg <stanis.trendelenburg@gmail.com>
-Date: Mon, 1 Jan 2024 12:48:19 +0100
-Subject: [PATCH] chore(cgi): include `parse_header()` from the deprecated cgi
- module (#46)
-
-* Include functions from the deprecated cgi module
-
-* Document source of vendored functions from cgi.py
-
-* Fix linter error
----
-
-Upstream-PR: https://github.com/falconry/python-mimeparse/pull/46
-
-diff --git a/mimeparse.py b/mimeparse.py
-index 0de6d57..506e138 100644
---- a/mimeparse.py
-+++ b/mimeparse.py
-@@ -1,5 +1,3 @@
--import cgi
--
- __version__ = '1.6.0'
- __author__ = 'Joe Gregorio'
- __email__ = 'joe@bitworking.org'
-@@ -11,6 +9,44 @@ class MimeTypeParseException(ValueError):
-     pass
- 
- 
-+# Vendored version of cgi._parseparam from Python 3.11 (deprecated and slated
-+# for removal in 3.13)
-+def _parseparam(s):
-+    while s[:1] == ';':
-+        s = s[1:]
-+        end = s.find(';')
-+        while end > 0 and (s.count('"', 0, end) - s.count('\\"', 0, end)) % 2:
-+            end = s.find(';', end + 1)
-+        if end < 0:
-+            end = len(s)
-+        f = s[:end]
-+        yield f.strip()
-+        s = s[end:]
-+
-+
-+# Vendored version of cgi.parse_header from Python 3.11 (deprecated and slated
-+# for removal in 3.13)
-+def _parse_header(line):
-+    """Parse a Content-type like header.
-+
-+    Return the main content-type and a dictionary of options.
-+
-+    """
-+    parts = _parseparam(';' + line)
-+    key = parts.__next__()
-+    pdict = {}
-+    for p in parts:
-+        i = p.find('=')
-+        if i >= 0:
-+            name = p[:i].strip().lower()
-+            value = p[i + 1:].strip()
-+            if len(value) >= 2 and value[0] == value[-1] == '"':
-+                value = value[1:-1]
-+                value = value.replace('\\\\', '\\').replace('\\"', '"')
-+            pdict[name] = value
-+    return key, pdict
-+
-+
- def parse_mime_type(mime_type):
-     """Parses a mime-type into its component parts.
- 
-@@ -23,7 +59,7 @@ def parse_mime_type(mime_type):
- 
-     :rtype: (str,str,dict)
-     """
--    full_type, params = cgi.parse_header(mime_type)
-+    full_type, params = _parse_header(mime_type)
-     # Java URLConnection class sends an Accept header that includes a
-     # single '*'. Turn it into a legal wildcard.
-     if full_type == '*':
diff --git a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r5.ebuild b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r5.ebuild
deleted file mode 100644
index 1ec1be302fc3..000000000000
--- a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Basic functions for handling mime-types in python"
-HOMEPAGE="
-	https://github.com/falconry/python-mimeparse/
-	https://pypi.org/project/python-mimeparse/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-PATCHES=(
-	"${FILESDIR}/${P}-py3.13.patch"
-)
-
-python_test() {
-	"${EPYTHON}" mimeparse_test.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/python-mimeparse/python-mimeparse-2.0.0.ebuild b/dev-python/python-mimeparse/python-mimeparse-2.0.0.ebuild
index 8c5829d82fc8..37d1e422249b 100644
--- a/dev-python/python-mimeparse/python-mimeparse-2.0.0.ebuild
+++ b/dev-python/python-mimeparse/python-mimeparse-2.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 python_test() {
 	"${EPYTHON}" mimeparse_test.py -v || die "Tests fail with ${EPYTHON}"