gentoo auto-resync : 01:12:2024 - 02:06:42

6 files changed, 50 insertions, 194 deletions

diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 60ba09a2a8f3..22fc9e399f7a 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,10 +1,8 @@
-AUX 0001-Allow-knowledgeable-users-to-disable-validating-trov.patch 2790 BLAKE2B 9f795eb84b903ae97fbdd7580c8912a411dae6eae2eddf5d707e12d1c00868b1b7ea55188e7b1be997aa2d102f85f20a1f36c12370ca5d036f2872d9ec3f6713 SHA512 3197ce1935c406283cd102c87389b64c66fd7179e02ffb5551ca5c33e18c2a480f39b88eef6f686e0d3d27deea7ee2ab167c6cad5b183d54b7086edfe01581a5
 AUX setuptools-62.4.0-py-compile.patch 3704 BLAKE2B 9a5e70d2556b059be0ef060abd1db71298cd0e9aa1e2795d92cea5cdbaf0c82f4433e1a0c3095f4bc41bc72a457b63142253fe46c712afa1d7855a5d43607bca SHA512 48d7c065e2d8c29ce6e498effe6d79f9caa0f37d7cf6cadd0ed02c48d196a4d8a10a73cfa26744d6f74b48c63cd28a4074b161a6aae18c6169f6d8fffb044b1e
-DIST setuptools-74.1.3.tar.gz 1356471 BLAKE2B c59476710f10aae77f8b466ce2b072966a889b13c3e2e2a9524497ce43893bcd296412f8e0be8a3ccaa9be46b429680c11fe291095a65a185243701fa667be6c SHA512 7892d1ff0a1cd90f6cd367536392bf2933d354eb61d5177a01218b253bc254b51e74c040601adf35aff1652f1e1c6dbffca3cdce3f4fc32b8bd23c36cd885ddc
+AUX setuptools-75.6.0-disable-trove-classifiers.patch 1383 BLAKE2B fa3bc1822badca21e102ea4f360ba4975906aced16a274622f69cfbb3a720d67cbbdb8f4d7a15e4545f3b96528f2e284e85116139ba0788c80ab6eb5cd4d3414 SHA512 9011ef7551479d9512f880a91c27ee1327fca2d19eb5e97bcbadbdf243f8de2cffd6351d4a03f5ee5a6b2442953b544d70e1c30106618582758290568d3af6e7
 DIST setuptools-75.5.0.tar.gz 1336032 BLAKE2B 3e06713c45212ef64b0f041089aa0621f3c12b850c9716e21181e91192378bb0596f81cfd6c484c3ec2d6f7e29ea7967fb17a7e5bbc2de996968be4fc47c2c32 SHA512 353ad99bb946d5ed07139f3a6d5f0efc9a4ca9721b060fce9095ee6fc74ac0e832fd0ebf7b2d1d68c71021db30561c5fea6abdde42174981f26002390a1e0e67
 DIST setuptools-75.6.0.tar.gz 1337429 BLAKE2B 65ba2e3de8dd0c86ab0ad59a5dc99a860ef5b59f357272eb2568347a496d853ef8e12a2d456dee3effe6f100bfb8d29e2f9f60123b58d791003ce3cddac23e8a SHA512 bdc12309165912f8de84e6f4ceaaf8f6b05dc1506a9205201784eb740346d773a7701af9b570cb13c272d81dcc0b4928e53ea1c4bb7c179debf479701c35bb6e
-EBUILD setuptools-74.1.3-r2.ebuild 4242 BLAKE2B ccd99b9f11355f29b46e851c1e0d7f183fd74844e5dfd96426b3cf3050b42d6ff71a34ae4c050750ca4c87f9ea25ad353665e54a66cd9519eb939b3d777c6445 SHA512 d42249f91700f63abe10ab1bae4a644d141a3a66208c0e23ff7cd593ccb5ec302121d41fd630afa45b7a871c1baab6ca14d27a61b73aed3a048fe62be3448796
-EBUILD setuptools-75.5.0-r1.ebuild 4355 BLAKE2B 1a9c982dcc8843261e43dd0a2f569b2ab196a769591f0c5d990d4dacf89ca478fce7a86a73c12bb850f067db89f004d970fd951d237b65b26e6489e0d1b35c5e SHA512 7100ee4ca15e251250f42a0c517b049f97f9cc48076503e813b74300966bc4af35c283c7ccc1513170d96f981843f4f870c5a1c1ddbe58812772668700ac3f30
-EBUILD setuptools-75.6.0-r2.ebuild 4355 BLAKE2B 1a9c982dcc8843261e43dd0a2f569b2ab196a769591f0c5d990d4dacf89ca478fce7a86a73c12bb850f067db89f004d970fd951d237b65b26e6489e0d1b35c5e SHA512 7100ee4ca15e251250f42a0c517b049f97f9cc48076503e813b74300966bc4af35c283c7ccc1513170d96f981843f4f870c5a1c1ddbe58812772668700ac3f30
+EBUILD setuptools-75.5.0.ebuild 4575 BLAKE2B 618ea3c8b1b8b14937d093a5c509b779464aa39aef04f5f7979afbb51664ae0d4fd0f4b407deb4807ba23f41e953423d867b4fdf71c3c0d85078066bedb1ebb1 SHA512 054f982ab492f8d49ddf5bcfa2eb0a97f9ed4f255590b20bb843b56e2705c271bf2568a6dec6b04bd8df09726cd092138060f00b2dd4b7950ff77e219624581e
+EBUILD setuptools-75.6.0-r1.ebuild 4712 BLAKE2B 164d92873857ef4886604fabcc95e972ea7c5dfc21aaa7ef239ae179bfebce1c87ad50f697a5434f5a222c259be3ee14146826a72ea7dbb302d6b556920f35da SHA512 a9e3c4b063685d0b2f1293d8a67dd2de9ae21b42e41eb4d25e6bad89011b1322859a124e69441b50f00cd83254ced33fb1d69c0afb5cdcaad181cab8c4430034
 EBUILD setuptools-75.6.0.ebuild 4583 BLAKE2B 44454c89580bd4b79a2edb138a787145b783d005f00b581a0e0ce406b92d4f8f5336f830f3c14119a81b818bf240278f9f940a0199c8162ccb86a481dec44f66 SHA512 9513f25796d2135df67d93097edf7a203c91526aa5b508f4cd5deac590d4600f2dbd23fed7d9b1c50a2e5f912e3e1d355458979b5fe9fc2027a9cf969a070db9
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/files/0001-Allow-knowledgeable-users-to-disable-validating-trov.patch b/dev-python/setuptools/files/0001-Allow-knowledgeable-users-to-disable-validating-trov.patch
deleted file mode 100644
index 4ab6bbae7af4..000000000000
--- a/dev-python/setuptools/files/0001-Allow-knowledgeable-users-to-disable-validating-trov.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From f694e474ab3c45af6241a3f2bf575f8188e9cbea Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@gentoo.org>
-Date: Mon, 11 Nov 2024 19:51:54 -0500
-Subject: [PATCH] Allow knowledgeable users to disable validating
- trove-classifiers
-
-Classifiers are based on a "blessed list" of search terms that are
-allowed on https://pypi.org and need to be regularly kept up to date in
-order to validate them.
-
-Many people don't care about this. Arguably, *no one* cares about this,
-since wheels that have search terms that PyPI doesn't consider popular
-enough will simply fail uploading to PyPI. But also, not everyone wants
-to download new lists of "allowed words" from the internet every time
-they check to see if e.g. pyproject.toml contains a valid format that
-won't traceback when someone tries to read the "name" field and gets an
-integer instead of a string. Or their entrypoints are malformed because
-they aren't a valid python object reference.
-
-This is also an issue because one might have an old version of the
-classifiers cached, and then a new classifier is added to
-https://pypi.org and you want to use it immediately, and the local
-validator in the form of validate_pyproject fails but actually uploading
-a wheel to https://pypi.org would work fine.
-
-Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
-Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
----
- .../config/_validate_pyproject/formats.py      | 18 +++++++++++-------
- 1 file changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/setuptools/config/_validate_pyproject/formats.py b/setuptools/config/_validate_pyproject/formats.py
-index 153b1f0b2..50b8520e9 100644
---- a/setuptools/config/_validate_pyproject/formats.py
-+++ b/setuptools/config/_validate_pyproject/formats.py
-@@ -205,15 +205,19 @@ class _TroveClassifier:
-         return value in self.downloaded or value.lower().startswith("private ::")
- 
- 
--try:
--    from trove_classifiers import classifiers as _trove_classifiers
--
-+if os.getenv("GENTOO_VALIDATE_PYPROJECT_NO_TROVE_CLASSIFIERS"):
-     def trove_classifier(value: str) -> bool:
--        """See https://pypi.org/classifiers/"""
--        return value in _trove_classifiers or value.lower().startswith("private ::")
-+        return True
-+else:
-+    try:
-+        from trove_classifiers import classifiers as _trove_classifiers
- 
--except ImportError:  # pragma: no cover
--    trove_classifier = _TroveClassifier()
-+        def trove_classifier(value: str) -> bool:
-+            """See https://pypi.org/classifiers/"""
-+            return value in _trove_classifiers or value.lower().startswith("private ::")
-+
-+    except ImportError:  # pragma: no cover
-+        trove_classifier = _TroveClassifier()
- 
- 
- # -------------------------------------------------------------------------------------
--- 
-2.45.2
-
diff --git a/dev-python/setuptools/files/setuptools-75.6.0-disable-trove-classifiers.patch b/dev-python/setuptools/files/setuptools-75.6.0-disable-trove-classifiers.patch
new file mode 100644
index 000000000000..c5111e985f61
--- /dev/null
+++ b/dev-python/setuptools/files/setuptools-75.6.0-disable-trove-classifiers.patch
@@ -0,0 +1,32 @@
+From 0d9e8bc7d6df86381ac56770dc95fc75276f49ef Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 21 Nov 2024 20:40:14 +0100
+Subject: [PATCH] Add an option to disable using trove-classifiers package
+
+As requested in https://github.com/pypa/setuptools/issues/4459, add
+a VALIDATE_PYPROJECT_NO_TROVE_CLASSIFIERS environment variable that can
+be used to disable using trove_classifiers package even if it is
+available.  This can be used when the system features an outdated
+trove_classifiers, and therefore incorrectly triggers validation error.
+The change is designed to be absolutely minimal and non-intrusive.
+---
+ setuptools/config/_validate_pyproject/formats.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/setuptools/config/_validate_pyproject/formats.py b/setuptools/config/_validate_pyproject/formats.py
+index aacf4092b..0b05ab17b 100644
+--- a/setuptools/config/_validate_pyproject/formats.py
++++ b/setuptools/config/_validate_pyproject/formats.py
+@@ -210,6 +210,9 @@ try:
+         """See https://pypi.org/classifiers/"""
+         return value in _trove_classifiers or value.lower().startswith("private ::")
+ 
++    if os.getenv("VALIDATE_PYPROJECT_NO_TROVE_CLASSIFIERS"):  # pragma: no cover
++        raise ImportError()
++
+ except ImportError:  # pragma: no cover
+     trove_classifier = _TroveClassifier()
+ 
+-- 
+2.47.0
+
diff --git a/dev-python/setuptools/setuptools-74.1.3-r2.ebuild b/dev-python/setuptools/setuptools-74.1.3-r2.ebuild
deleted file mode 100644
index 62bcc9708b4a..000000000000
--- a/dev-python/setuptools/setuptools-74.1.3-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{10..13} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_13t )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!<dev-python/setuptools-rust-1.8.0
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-24[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.44.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-	!<=dev-libs/gobject-introspection-1.76.1-r0
-	!=dev-libs/gobject-introspection-1.78.1-r0
-	!=dev-libs/gobject-introspection-1.80.1-r1
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/build-1.0.3[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.14[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/jaraco-test[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pyproject-hooks[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			>=dev-python/pytest-home-0.5[${PYTHON_USEDEP}]
-			dev-python/pytest-subprocess[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-# setuptools-scm is here because installing plugins apparently breaks stuff at
-# runtime, so let's pull it early. See bug #663324.
-PDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
-		"${FILESDIR}"/0001-Allow-knowledgeable-users-to-disable-validating-trov.patch
-	)
-
-	distutils-r1_src_prepare
-
-	# breaks tests
-	sed -i -e '/--import-mode/d' pytest.ini || die
-
-	# remove bundled dependencies
-	rm -r */_vendor || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		# TODO, probably some random package
-		setuptools/tests/config/test_setupcfg.py::TestOptions::test_cmdclass
-		# broken by unbundling
-		setuptools/tests/test_setuptools.py::test_wheel_includes_vendored_metadata
-		# fails on normalized metadata, perhaps different dep version?
-		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_with_pyproject_config
-		# TODO
-		setuptools/tests/test_sdist.py::test_sanity_check_setuptools_own_sdist
-	)
-
-	local EPYTEST_XDIST=1
-	local -x PRE_BUILT_SETUPTOOLS_WHEEL=${DISTUTILS_WHEEL_PATH}
-	epytest -o tmp_path_retention_policy=all \
-		-m "not uses_network" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-75.6.0-r2.ebuild b/dev-python/setuptools/setuptools-75.5.0.ebuild
index 9e5a6fe7eb3f..1eb6021ff9a4 100644
--- a/dev-python/setuptools/setuptools-75.6.0-r2.ebuild
+++ b/dev-python/setuptools/setuptools-75.5.0.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -66,15 +66,20 @@ BDEPEND="
 "
 # setuptools-scm is here because installing plugins apparently breaks stuff at
 # runtime, so let's pull it early. See bug #663324.
+#
+# trove-classifiers are optionally used in validation, if they are
+# installed.  Since we really oughtn't block them, let's always enforce
+# the newest version for the time being to avoid errors.
+# https://github.com/pypa/setuptools/issues/4459
 PDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	>=dev-python/trove-classifiers-2024.10.16[${PYTHON_USEDEP}]
 "
 
 src_prepare() {
 	local PATCHES=(
 		# TODO: remove this when we're 100% PEP517 mode
 		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
-		"${FILESDIR}"/0001-Allow-knowledgeable-users-to-disable-validating-trov.patch
 	)
 
 	distutils-r1_src_prepare
diff --git a/dev-python/setuptools/setuptools-75.5.0-r1.ebuild b/dev-python/setuptools/setuptools-75.6.0-r1.ebuild
index 9e5a6fe7eb3f..a9961b9303cc 100644
--- a/dev-python/setuptools/setuptools-75.5.0-r1.ebuild
+++ b/dev-python/setuptools/setuptools-75.6.0-r1.ebuild
@@ -66,15 +66,22 @@ BDEPEND="
 "
 # setuptools-scm is here because installing plugins apparently breaks stuff at
 # runtime, so let's pull it early. See bug #663324.
+#
+# trove-classifiers are optionally used in validation, if they are
+# installed.  Since we really oughtn't block them, let's always enforce
+# the newest version for the time being to avoid errors.
+# https://github.com/pypa/setuptools/issues/4459
 PDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	>=dev-python/trove-classifiers-2024.10.16[${PYTHON_USEDEP}]
 "
 
 src_prepare() {
 	local PATCHES=(
 		# TODO: remove this when we're 100% PEP517 mode
 		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
-		"${FILESDIR}"/0001-Allow-knowledgeable-users-to-disable-validating-trov.patch
+		# https://github.com/abravalheri/validate-pyproject/pull/221
+		"${FILESDIR}/setuptools-75.6.0-disable-trove-classifiers.patch"
 	)
 
 	distutils-r1_src_prepare