gentoo resync : 16.04.2022

3 files changed, 137 insertions, 3 deletions

diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index b0fc4a3777a2..297fef59d312 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -6,10 +6,12 @@ DIST setuptools-60.9.2.tar.gz 2425956 BLAKE2B 09baded7eef555ebd76db1672d69cd06cf
 DIST setuptools-61.3.0.gh.tar.gz 2643769 BLAKE2B 4ede87e7a597a6916dc089c311b0e4d098b08debbd1c4a9cb97078730e9cdc8dbcacd4236ca98a42e3cfafdf66d8f39bb64bc9135291335224b1c3b0bf79deff SHA512 35e2b848cf79e577b8c469562cb68a80b27d42d2d9c1c94f84fea9beb85e2db0796ed64d414add67a404d801c4f4e6cd489a72153de4dc8ed8b45fab24c28fd9
 DIST setuptools-61.3.1.tar.gz 2508220 BLAKE2B be59b7f666d8cc583b98b73d681eddf2d15e1437f05ddb534cb6e95bf458aed01a6e136ddc10bef2b2f66fe3f888187ece8262906079f1321f194e03a93fccca SHA512 463f2203416a298f65b66199fd62941ed32fc0914a4b6afff74b4abb8db37c063ab208a67383b5a7e6108a8c1ed0fda0fbb6b47d8fbc95c68b9e23e4ba152aec
 DIST setuptools-62.0.0.tar.gz 2512032 BLAKE2B 688afed5a19e70a0fd7ab91a8d137e6641597d9f9acf31826216cd59e4632872a9661fe9ca18e45aec5cd40e52956147aa8d40ac2c376380ffa0f01dc2997e63 SHA512 9017ab055c81063eaf741d45bd2479fcf85d15795bdcf0fa55522d194a69b5a912cbdba94e9eeaa6cf2a6cdaa5dda09604205d6e02d56e7c9fd3be4c1c79ba0a
+DIST setuptools-62.1.0.tar.gz 2512885 BLAKE2B a26a6bd5001922885b623bc7f1d42da90c59e6d9e195e9dd292ce2e73cd35a51f07fc714261c12db2fdf4510fa1137f57e7f3f649312f6a75035b9d927936a7c SHA512 41f39b5aa22e908c123e8e04c11e505e23cd3aaaae72793e106015dc14b1a44ff3b17aa15ca3da34f34a4becc887ceea7f41932650e38d409f95d7227707d2e1
 EBUILD setuptools-60.10.0.ebuild 4160 BLAKE2B 1b04acd31df87b7c8911c3f8b6e12920bb108583921245f0c733028476b7d521048c89cfa23c39b77fa1f508d2ba147b5809b4613a23bc220ca49f8214daf47a SHA512 7072f7b4825b9d972c55e0a5d6e117b99f81df7f8e942793bf0fe954ff44d7d2f90a26d22fdf1402d96f2626345f726a0d30b600e826a9c9c1b279b05c84c065
 EBUILD setuptools-60.5.0.ebuild 3392 BLAKE2B 93280ff6c52f3f0e6bfc94057bcf5e60db4d71d50f20d2aab7589996a625ab09c3645a5232711386d304517af149f2fc460c1e04d4f86658415b028de61a254a SHA512 6a55a979216217d7f6c39460e8058541423c33bb1474128dc6e2c5bdd69e13a10a4581057b37ccc2f5c600ed6f495e96f9aa8b0d4f9cb0a6e0fb2ec4b687d0c9
 EBUILD setuptools-60.9.2.ebuild 3958 BLAKE2B d9ab297e87453adc0395b0aabbaeea1b71f9ddf4137cc6276bb3ccda55e4b8138301c2008dc437a71919dc080cf3c171bc0b46ccef0bf9bc5ae948a335d684ac SHA512 af7c6a4b1c370e160fcebb0ab6502c770ec64064fb8fe803d9432c8f252ea132d2ae5cacec41ececcedf9888fab9910a11051215cd8a7c2f6c6c83efbf0a3256
 EBUILD setuptools-61.3.0.ebuild 4528 BLAKE2B 0bbfcbe4a56263e867aadb744bab3b28902fb8965f422654e72e9c0c5ff3b48328f2f3ccbe8eedf292c1d76f9e151aba6878b275203f83ff6aa7e0a42c6bafc0 SHA512 4b14c8bbfedf9398ebe393298cd3b70cfafff4510b43e44fe6badbd79b38c6ee14abae25c530913efa677dedc068d7045f8e2b0e2f44fa50e17d500c8cd387c9
 EBUILD setuptools-61.3.1-r1.ebuild 4687 BLAKE2B 5a5f6931fc312d20c04fc677885abae94cf466a127fa68b761fbe45803af0f1e2ca4ac83e089fdbacad32cf9f9c39fb3f84d19a7d0186fa7709a817f2da580c5 SHA512 71f8ab62ae73b2f293af7c12d7da08859a935c867cd8098aa4627a766c930644cc7e9195e5baec7cd54d926314afcfb1563eb2ac61e26ce827a5fb0ff51e131d
-EBUILD setuptools-62.0.0.ebuild 4684 BLAKE2B b2d7a04877db9472f4794af65bce35132f4e5fb8d661b2b93ae6a55ee51d1ba944d20ac140f9e970ae2bd763807c168b18f2503c9967e9215ba32eacb0028708 SHA512 e28ba4a94596a3164f8e876cb3578234836ef0e5c5047c9c51cc19d0753fbf90e4d2885a6d7f2e83aa398ad20ee62783cbc8cca3672f208e019b54fab6344fea
+EBUILD setuptools-62.0.0.ebuild 4726 BLAKE2B 441b8eb88aadb86da1a37abba16baf0801fa897f780053e64084e62a511a6fa6053334af03fba73036945df8a81599864807e4d2d12430c6eef785025820f8a9 SHA512 b404010aaf5ef0d054da8fbf083d9ec893d2d2ea09ad44b025d1d1bf1ab30640f3f2e8b1e927629b8ca8b8f4a071853b1f407536e54aedf521bb927a96d1bd2c
+EBUILD setuptools-62.1.0.ebuild 4726 BLAKE2B 441b8eb88aadb86da1a37abba16baf0801fa897f780053e64084e62a511a6fa6053334af03fba73036945df8a81599864807e4d2d12430c6eef785025820f8a9 SHA512 b404010aaf5ef0d054da8fbf083d9ec893d2d2ea09ad44b025d1d1bf1ab30640f3f2e8b1e927629b8ca8b8f4a071853b1f407536e54aedf521bb927a96d1bd2c
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-62.0.0.ebuild b/dev-python/setuptools/setuptools-62.0.0.ebuild
index 0e8e6c351cfc..0bcb480a73c4 100644
--- a/dev-python/setuptools/setuptools-62.0.0.ebuild
+++ b/dev-python/setuptools/setuptools-62.0.0.ebuild
@@ -18,12 +18,12 @@ HOMEPAGE="
 "
 SRC_URI="
 	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${CPY_PATCHSET}.tar.xz
 "
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~m68k ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~m68k ~s390 ~x86 ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setuptools/setuptools-62.1.0.ebuild b/dev-python/setuptools/setuptools-62.1.0.ebuild
new file mode 100644
index 000000000000..0bcb480a73c4
--- /dev/null
+++ b/dev-python/setuptools/setuptools-62.1.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+CPY_PATCHSET="python-gentoo-patches-3.10.4"
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+	https://github.com/pypa/setuptools/
+	https://pypi.org/project/setuptools/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/python/${CPY_PATCHSET}.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~m68k ~s390 ~x86 ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	dev-python/nspektr[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.10.1-r1[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.9[${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/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/pip-run[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-python/tomli[${PYTHON_USEDEP}]
+			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' python3_{8..10} pypy3)
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	# remove bundled dependencies, setuptools will switch to system deps
+	# automatically
+	rm -r */_vendor || die
+
+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
+		-i {} + || die
+
+	# apply distutils patches to the bundled distutils
+	pushd setuptools/_distutils >/dev/null || die
+	# TODO: distutils C++ patch?
+	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
+	popd >/dev/null || die
+
+	distutils-r1_src_prepare
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# keep in sync with python_gen_cond_dep above!
+	has "${EPYTHON}" python3.{8..10} pypy3 || continue
+
+	local EPYTEST_DESELECT=(
+		# network
+		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_virtualenv.py::test_clean_env_install
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+		# unhappy with pytest-xdist?
+		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		setuptools/tests/test_test.py::test_tests_are_run_once
+		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/test_editable_install.py::test_editable_with_pyproject
+		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
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" epytest \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
+}