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

6 files changed, 2 insertions, 704 deletions

diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index c5c2551656e4..503da13e2bbc 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -4,16 +4,9 @@ AUX pip-24.1-test-offline.patch 2995 BLAKE2B bbaa9b6410b350cecfaf1422c252c166ac9
 AUX pip-24.1-unbundle.patch 8156 BLAKE2B 014d05bd6e5bb39a4b8a591948bba0760878b28fc757d3d091f226aca0bfc663de558d7b75651907d47951205d5804a7e3986c8631b805926a025658cd34895a SHA512 d78f521a27d1cb12012c622f1d13da7b19a2406204cba6a1ce149feb988a94421bc9883caaeda48e71bc26bb7c4845aef7c90aeb6f39bc474bf5f1ab1d694e43
 AUX pip-24.3.1-rich-13.8.patch 1774 BLAKE2B d0672abf384ed7e357f771109381996ae839c2bd054fbc45e86700fa3bda9f96db21775efbcdf2314e8aa92278550e1855e9d89ffa66b29e49680312bcd1f52d SHA512 82007682370c205c48751b978727983afbbe28175b6d3d9d86372c412a4fd363716a0317b9c55cd2c254e8116c5fb6f913f24f5d4822c86bcfd0d36a4f60dab8
 DIST pip-24.0.gh.tar.gz 9398156 BLAKE2B 17a7ed9e15e9b8efa0d3e3c5586dc446958b62cf9ba52155a0d1ad97a3e212ee7a08a0e88a592718fc3d542eb8f434155a75cb98d90c008904bd8f59bd2b40b6 SHA512 0c2ecb2ecde4f155c83468d35bc4f52f37efffc16821ae7c706d035e1e8cc3709b41cb10f8140ff09205e8bbdba2c76128ad76d1cbd18401328b619228e834df
-DIST pip-24.1.1.gh.tar.gz 9190972 BLAKE2B 1ce876d2767c1c36bac3237c17a3aced9dd5a335a7b522c70cee1e155bc0b47256db74c6835aab5f58133ebcde0daeb8e6eb217b06f76418c355034cbe736cf6 SHA512 523e7273134b68252693ba7a032e7992c72075aebd2bcd895fbd90ad28d76f98b13ea1a7df0b6da1802650782ae977868177f740dc6f0a2eaccb95915c27b318
-DIST pip-24.1.2.gh.tar.gz 9192691 BLAKE2B 9b5a07e9f10b5787d668766423d8b3a9dfcc62564673155b80c7bc95ffe79daafa8788d8141f67c76d4098c21922e62fcb2164f72bf580bbeec136786c48d512 SHA512 222a957030e9c51defa6f741f8e176f2a19bd54f0ef664d2e218d3d2c2b5a335c9b7ce4bd1c804133d6116b3fbf37648453cd85f7a2bcf86a5aeb43e22db4b0f
 DIST pip-24.1.gh.tar.gz 9188658 BLAKE2B 4a43ff0199d811dd30461e376f655a447f3f706a48dd97fe1d0ccf630f558e72209ccd06d98949a1541cd6b2942a816db23ce8aaa7fbbf9aef429502fb91ab92 SHA512 c60ab329fe91202ff64b5f0f90209085fbf8db0f0a05f0703f952ad69e39e2e3edb5dadc006a3f317cdd4ba4fb5abe56dfbd22792249a2d139702eec272186d1
-DIST pip-24.2.gh.tar.gz 9189637 BLAKE2B 6bc7bf69cd3e1edc1898a4476d36b749c037ac10a1614ef3a6bacc0c7debd38de94e0cf6d8a2931b1a7afb2f6f853922fcd62b65d17ac805f22741b7ff6423c6 SHA512 2c44881f62f7b89cedeb0b739409ad67c6144bfdffc347efeb7bcf85aed77bcd7ddd10868d24577fbba0ef84dd752473d6b6dff329b42841939fae2ff2f63d28
 DIST pip-24.3.1.gh.tar.gz 9198711 BLAKE2B c70524bfedf46776d5ab8da24754e8177caac6d87cc90aa86b144c0fe9718860fe3d08823f655495c059dbece6e0ecbb2ac8e655cff3124693f64a35deac512e SHA512 9cf5f18eefd559cf27bc026e5206b0028ea77fd904a61fea9a6682b519305c962dd19170b841581bd05ff72192a9c458ec0eba173fa66db0438b046111ff5856
 EBUILD pip-24.0.ebuild 4553 BLAKE2B ab9b123d226939f4046449042dc7d596416eb03ffb02cdd1e00470486c9028c94d1a3f5200ddac8ac50e15e0abf1a0b27ccd2d98c6f8053d1865ce79b77a2613 SHA512 d328643c7f913a5fb134b55b3757c911bbd669a644ec3d5ec4f0d2256ea7e8a9e4235278b8195ef7577daadc80317e23f1ceabe837481ff7fc8f55a32592cff1
-EBUILD pip-24.1-r1.ebuild 5839 BLAKE2B d70aa1453b8f7394294ca5fdbf3f97c53baf0aee7946f842b638416b0b6a6beb553dff60faf6ba3484684d04d82aca0b823ab6c5645e420b324aaefed13a2505 SHA512 faa9cfec1984eef2d942632b4fc643ff79c668610c5b31ad05f905ae520eaa3f5a4e77674a60b52dedfa88610b5b13113a0c3d4a202420fe1453059f0d9b52a9
-EBUILD pip-24.1.1.ebuild 5863 BLAKE2B 2e6311bfd2bd90c3bd3d0029bd675e606ca47701fe74303c4d9778f8ae63442d62f762df226714a581f85cd01687be9b82bcb1b4462b5267d222ff6e22faf9eb SHA512 69417fa13a807fb4f3d620e6cabb1c5d5839d40944d506bf33e01f5f375bb2624a17909d7a25433ba65551639e8aeca91e7546ae5f5613f54151bc289bca4288
-EBUILD pip-24.1.2.ebuild 5889 BLAKE2B d8ca5f8c339fe1a0593d553944bfcf6ecc04348ce22909ba351d8ce58d372aaf1aabbd4c9bea7604b702afb8c06dbac6e9cea0a4233c5260d800be87cfa0daef SHA512 8e73fa6573b42ceb6a372eed308cf6024b98d57847830920c694974a1257da2d20983100a66b8cd617f38894d5dc98d6401fd845f95edc2c91115c89fde53c64
 EBUILD pip-24.1.ebuild 4069 BLAKE2B 17b48996f8c982abdf73f523e35f7c4be1a1a1aa08fdea73e10054e93e5548ae48b2363110d85a0dced150435ea4ede0a7986d7114841bd73deafe4b672349d3 SHA512 e484be733a9b8caa3fc8e751f26fecd4b24571d40402d8b70ab8d4a294e249c0ccaa18c6a64ff977d64a7e7610d14be5d7666faf87447703013f0b003f0ded59
-EBUILD pip-24.2-r1.ebuild 5932 BLAKE2B 2ba8f1647723d1b943add6206379aa9a92ef654acc12e469f096bb73f30805951ae2b00f41fe756c7613a25c310346b1ce7b276043e3131c14bd7a7782f9e9a9 SHA512 78c27cdda6151f536b2c85daf01b8aaa9e926d58c6fb4276e4fac8d955c09249c76ab8dd12dbcb351b5164985e7a50a9971df498f4d3dec0c58e6643e25b0f8b
-EBUILD pip-24.3.1-r2.ebuild 5982 BLAKE2B 3400b6475a456b9f96ae6dc8ec13347ccc7cbf18c53321e6238dae89cf45d30469dbcd16f4662dc9996a0d3dac34d9ba9af52cc255abfd6d80ee8130b26ed898 SHA512 dd4afc6f788f74d62843e8005e3539e238e9c8e90cd504186b92591c76736d840ec526c077f13b1252a38b82d20a57b82110e4ffe8a721a95015335edb6dcf50
+EBUILD pip-24.3.1-r2.ebuild 5975 BLAKE2B 44791c81d4a4543c440e89f63a52284253a1883407c9572586f30441cb49a7b13a78b53451343479dfe553879480b801d97c5183bacec677bf2afbf68eec4bfc SHA512 14ffc143317f37509f24c15579ff2b252895655b2a194e97842137583a929ac291304064d4f4f8d2e850b7e679885010c6851fcd40fb752eb735caceb91d9c16
 MISC metadata.xml 392 BLAKE2B 94ea3de1220cb9ca64ae1186597789cc83a54adfe44695932c07dd5065df0e5f9ee5078a495e3a12563b36809d781d8ab86bb6c92c485c023199d92547b74f27 SHA512 603199f6547105f3bb64f4fcaf004e9ef62fa2e0f8ec6eab56078119684b0f5119161e0f164fe02b2cf6dd6b115588c9ef77d727eeb6d138e281f1cb0bcb5de9
diff --git a/dev-python/pip/pip-24.1-r1.ebuild b/dev-python/pip/pip-24.1-r1.ebuild
deleted file mode 100644
index 439924ebd199..000000000000
--- a/dev-python/pip/pip-24.1-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# please bump dev-python/ensurepip-pip along with this package!
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{10..13} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="The PyPA recommended tool for installing Python packages"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/
-"
-SRC_URI="
-	https://github.com/pypa/pip/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-# bundled deps
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc"
-IUSE="test-rust"
-
-# see src/pip/_vendor/vendor.txt
-RDEPEND="
-	>=dev-python/cachecontrol-0.14.0[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.8[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-1.0.8[${PYTHON_USEDEP}]
-	>=dev-python/packaging-24.1[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-hooks-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.32.0[${PYTHON_USEDEP}]
-	>=dev-python/rich-13.7.1[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-69.5.1[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-8.2.3[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/truststore-0.9.1[${PYTHON_USEDEP}]
-
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/ensurepip-setuptools
-			dev-python/ensurepip-wheel
-			dev-python/freezegun[${PYTHON_USEDEP}]
-			dev-python/pretend[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/scripttest[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			test-rust? (
-				dev-python/cryptography[${PYTHON_USEDEP}]
-			)
-			dev-vcs/git
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/pip-23.1-no-coverage.patch"
-		# https://github.com/pypa/pip/issues/12786 (and more)
-		"${FILESDIR}/pip-24.1-test-offline.patch"
-		# prepare to unbundle dependencies
-		"${FILESDIR}/pip-24.1-unbundle.patch"
-	)
-
-	distutils-r1_python_prepare_all
-
-	# unbundle dependencies
-	rm -r src/pip/_vendor || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from pip\._vendor import:import:g' \
-		-e 's:from pip\._vendor\.:from :g' \
-		{} + || die
-
-	if use test; then
-		local wheels=(
-			"${BROOT}"/usr/lib/python/ensurepip/{setuptools,wheel}-*.whl
-		)
-		mkdir tests/data/common_wheels/ || die
-		cp "${wheels[@]}" tests/data/common_wheels/ || die
-	fi
-}
-
-python_compile_all() {
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
-	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
-	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_inspect.py::test_inspect_basic
-		# Internet
-		tests/functional/test_config_settings.py::test_backend_sees_config_via_sdist
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		# broken by system site-packages use
-		tests/functional/test_check.py::test_basic_check_clean
-		tests/functional/test_check.py::test_check_skip_work_dir_pkg
-		tests/functional/test_check.py::test_check_complicated_name_clean
-		tests/functional/test_check.py::test_check_development_versions_are_also_considered
-		tests/functional/test_freeze.py::test_freeze_with_setuptools
-		tests/functional/test_pip_runner_script.py::test_runner_work_in_environments_with_no_pip
-		tests/functional/test_uninstall.py::test_basic_uninstall_distutils
-		tests/unit/test_base_command.py::test_base_command_global_tempdir_cleanup
-		tests/unit/test_base_command.py::test_base_command_local_tempdir_cleanup
-		tests/unit/test_base_command.py::test_base_command_provides_tempdir_helpers
-		# broken by unbundling
-		"tests/functional/test_debug.py::test_debug[vendored library versions:]"
-		tests/functional/test_debug.py::test_debug__library_versions
-		tests/functional/test_python_option.py::test_python_interpreter
-		tests/functional/test_uninstall.py::test_uninstall_non_local_distutils
-	)
-	local EPYTEST_IGNORE=(
-		# requires proxy.py
-		tests/functional/test_proxy.py
-	)
-
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/functional/test_install.py::test_install_sends_client_cert
-			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		)
-	fi
-
-	case ${EPYTHON} in
-		python3.10)
-			EPYTEST_DESELECT+=(
-				# no clue why they fail
-			)
-			;;
-	esac
-
-	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local EPYTEST_XDIST=1
-	epytest -m "not network" -o tmp_path_retention_policy=all
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	newbashcomp completion.bash pip
-
-	insinto /usr/share/zsh/site-functions
-	newins completion.zsh _pip
-}
diff --git a/dev-python/pip/pip-24.1.1.ebuild b/dev-python/pip/pip-24.1.1.ebuild
deleted file mode 100644
index d7613702ae5f..000000000000
--- a/dev-python/pip/pip-24.1.1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# please bump dev-python/ensurepip-pip along with this package!
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{10..13} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="The PyPA recommended tool for installing Python packages"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/
-"
-SRC_URI="
-	https://github.com/pypa/pip/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-# bundled deps
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc64 ~riscv ~sparc ~x86"
-IUSE="test-rust"
-
-# see src/pip/_vendor/vendor.txt
-RDEPEND="
-	>=dev-python/cachecontrol-0.14.0[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.8[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-1.0.8[${PYTHON_USEDEP}]
-	>=dev-python/packaging-24.1[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-hooks-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.32.0[${PYTHON_USEDEP}]
-	>=dev-python/rich-13.7.1[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-69.5.1[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-8.2.3[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/truststore-0.9.1[${PYTHON_USEDEP}]
-
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/ensurepip-setuptools
-			dev-python/ensurepip-wheel
-			dev-python/freezegun[${PYTHON_USEDEP}]
-			dev-python/pretend[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/scripttest[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			test-rust? (
-				dev-python/cryptography[${PYTHON_USEDEP}]
-			)
-			dev-vcs/git
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/pip-23.1-no-coverage.patch"
-		# https://github.com/pypa/pip/issues/12786 (and more)
-		"${FILESDIR}/pip-24.1-test-offline.patch"
-		# prepare to unbundle dependencies
-		"${FILESDIR}/pip-24.1-unbundle.patch"
-	)
-
-	distutils-r1_python_prepare_all
-
-	# unbundle dependencies
-	rm -r src/pip/_vendor || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from pip\._vendor import:import:g' \
-		-e 's:from pip\._vendor\.:from :g' \
-		{} + || die
-
-	if use test; then
-		local wheels=(
-			"${BROOT}"/usr/lib/python/ensurepip/{setuptools,wheel}-*.whl
-		)
-		mkdir tests/data/common_wheels/ || die
-		cp "${wheels[@]}" tests/data/common_wheels/ || die
-	fi
-}
-
-python_compile_all() {
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
-	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
-	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_inspect.py::test_inspect_basic
-		# Internet
-		tests/functional/test_config_settings.py::test_backend_sees_config_via_sdist
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		# broken by system site-packages use
-		tests/functional/test_check.py::test_basic_check_clean
-		tests/functional/test_check.py::test_check_skip_work_dir_pkg
-		tests/functional/test_check.py::test_check_complicated_name_clean
-		tests/functional/test_check.py::test_check_development_versions_are_also_considered
-		tests/functional/test_freeze.py::test_freeze_with_setuptools
-		tests/functional/test_pip_runner_script.py::test_runner_work_in_environments_with_no_pip
-		tests/functional/test_uninstall.py::test_basic_uninstall_distutils
-		tests/unit/test_base_command.py::test_base_command_global_tempdir_cleanup
-		tests/unit/test_base_command.py::test_base_command_local_tempdir_cleanup
-		tests/unit/test_base_command.py::test_base_command_provides_tempdir_helpers
-		# broken by unbundling
-		"tests/functional/test_debug.py::test_debug[vendored library versions:]"
-		tests/functional/test_debug.py::test_debug__library_versions
-		tests/functional/test_python_option.py::test_python_interpreter
-		tests/functional/test_uninstall.py::test_uninstall_non_local_distutils
-	)
-	local EPYTEST_IGNORE=(
-		# requires proxy.py
-		tests/functional/test_proxy.py
-	)
-
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/functional/test_install.py::test_install_sends_client_cert
-			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		)
-	fi
-
-	case ${EPYTHON} in
-		python3.10)
-			EPYTEST_DESELECT+=(
-				# no clue why they fail
-			)
-			;;
-	esac
-
-	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local EPYTEST_XDIST=1
-	epytest -m "not network" -o tmp_path_retention_policy=all
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	newbashcomp completion.bash pip
-
-	insinto /usr/share/zsh/site-functions
-	newins completion.zsh _pip
-}
diff --git a/dev-python/pip/pip-24.1.2.ebuild b/dev-python/pip/pip-24.1.2.ebuild
deleted file mode 100644
index 8b00ccade752..000000000000
--- a/dev-python/pip/pip-24.1.2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# please bump dev-python/ensurepip-pip along with this package!
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{10..13} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="The PyPA recommended tool for installing Python packages"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/
-"
-SRC_URI="
-	https://github.com/pypa/pip/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-# bundled deps
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ppc ppc64 ~riscv ~sparc x86"
-IUSE="test-rust"
-
-# see src/pip/_vendor/vendor.txt
-RDEPEND="
-	>=dev-python/cachecontrol-0.14.0[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.8[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-1.0.8[${PYTHON_USEDEP}]
-	>=dev-python/packaging-24.1[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-hooks-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.32.0[${PYTHON_USEDEP}]
-	>=dev-python/rich-13.7.1[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-69.5.1[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-8.2.3[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/truststore-0.9.1[${PYTHON_USEDEP}]
-
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/ensurepip-setuptools
-			dev-python/ensurepip-wheel
-			dev-python/freezegun[${PYTHON_USEDEP}]
-			dev-python/pretend[${PYTHON_USEDEP}]
-			dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/scripttest[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			test-rust? (
-				dev-python/cryptography[${PYTHON_USEDEP}]
-			)
-			dev-vcs/git
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/pip-23.1-no-coverage.patch"
-		# prepare to unbundle dependencies
-		"${FILESDIR}/pip-24.1-unbundle.patch"
-	)
-
-	distutils-r1_python_prepare_all
-
-	# unbundle dependencies
-	rm -r src/pip/_vendor || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from pip\._vendor import:import:g' \
-		-e 's:from pip\._vendor\.:from :g' \
-		{} + || die
-
-	if use test; then
-		local wheels=(
-			"${BROOT}"/usr/lib/python/ensurepip/{setuptools,wheel}-*.whl
-		)
-		mkdir tests/data/common_wheels/ || die
-		cp "${wheels[@]}" tests/data/common_wheels/ || die
-	fi
-}
-
-python_compile_all() {
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
-	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
-	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_inspect.py::test_inspect_basic
-		# Internet
-		tests/functional/test_config_settings.py::test_backend_sees_config_via_sdist
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_install.py::test_install_sdist_links
-		tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		# broken by system site-packages use
-		tests/functional/test_check.py::test_basic_check_clean
-		tests/functional/test_check.py::test_check_skip_work_dir_pkg
-		tests/functional/test_check.py::test_check_complicated_name_clean
-		tests/functional/test_check.py::test_check_development_versions_are_also_considered
-		tests/functional/test_freeze.py::test_freeze_with_setuptools
-		tests/functional/test_pip_runner_script.py::test_runner_work_in_environments_with_no_pip
-		tests/functional/test_uninstall.py::test_basic_uninstall_distutils
-		tests/unit/test_base_command.py::test_base_command_global_tempdir_cleanup
-		tests/unit/test_base_command.py::test_base_command_local_tempdir_cleanup
-		tests/unit/test_base_command.py::test_base_command_provides_tempdir_helpers
-		# broken by unbundling
-		"tests/functional/test_debug.py::test_debug[vendored library versions:]"
-		tests/functional/test_debug.py::test_debug__library_versions
-		tests/functional/test_python_option.py::test_python_interpreter
-		tests/functional/test_uninstall.py::test_uninstall_non_local_distutils
-	)
-	local EPYTEST_IGNORE=(
-		# requires proxy.py
-		tests/functional/test_proxy.py
-	)
-
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/functional/test_install.py::test_install_sends_client_cert
-			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		)
-	fi
-
-	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local EPYTEST_XDIST=1
-	# rerunfailures because test suite breaks if packages are installed
-	# in parallel
-	epytest -m "not network" -o tmp_path_retention_policy=all \
-		-p rerunfailures --reruns=5
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	newbashcomp completion.bash pip
-
-	insinto /usr/share/zsh/site-functions
-	newins completion.zsh _pip
-}
diff --git a/dev-python/pip/pip-24.2-r1.ebuild b/dev-python/pip/pip-24.2-r1.ebuild
deleted file mode 100644
index e4a0442a57f3..000000000000
--- a/dev-python/pip/pip-24.2-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# please bump dev-python/ensurepip-pip along with this package!
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{10..13} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="The PyPA recommended tool for installing Python packages"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/
-"
-SRC_URI="
-	https://github.com/pypa/pip/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-# bundled deps
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="test-rust"
-
-# see src/pip/_vendor/vendor.txt
-RDEPEND="
-	>=dev-python/cachecontrol-0.14.0[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.8[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-1.0.8[${PYTHON_USEDEP}]
-	>=dev-python/packaging-24.1[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-hooks-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.32.0[${PYTHON_USEDEP}]
-	>=dev-python/rich-13.7.1[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-69.5.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-	>=dev-python/truststore-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.12.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/ensurepip-setuptools
-			dev-python/ensurepip-wheel
-			dev-python/freezegun[${PYTHON_USEDEP}]
-			dev-python/pretend[${PYTHON_USEDEP}]
-			dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			<dev-python/rich-13.8[${PYTHON_USEDEP}]
-			dev-python/scripttest[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			test-rust? (
-				dev-python/cryptography[${PYTHON_USEDEP}]
-			)
-			dev-vcs/git
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/pip-23.1-no-coverage.patch"
-		# prepare to unbundle dependencies
-		"${FILESDIR}/pip-24.1-unbundle.patch"
-	)
-
-	distutils-r1_python_prepare_all
-
-	# unbundle dependencies
-	rm -r src/pip/_vendor || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from pip\._vendor import:import:g' \
-		-e 's:from pip\._vendor\.:from :g' \
-		{} + || die
-
-	if use test; then
-		local wheels=(
-			"${BROOT}"/usr/lib/python/ensurepip/{setuptools,wheel}-*.whl
-		)
-		mkdir tests/data/common_wheels/ || die
-		cp "${wheels[@]}" tests/data/common_wheels/ || die
-	fi
-}
-
-python_compile_all() {
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
-	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
-	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_inspect.py::test_inspect_basic
-		# Internet
-		tests/functional/test_config_settings.py::test_backend_sees_config_via_sdist
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_install.py::test_install_sdist_links
-		tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		# broken by system site-packages use
-		tests/functional/test_check.py::test_basic_check_clean
-		tests/functional/test_check.py::test_check_skip_work_dir_pkg
-		tests/functional/test_check.py::test_check_complicated_name_clean
-		tests/functional/test_check.py::test_check_development_versions_are_also_considered
-		tests/functional/test_freeze.py::test_freeze_with_setuptools
-		tests/functional/test_pip_runner_script.py::test_runner_work_in_environments_with_no_pip
-		tests/functional/test_uninstall.py::test_basic_uninstall_distutils
-		tests/unit/test_base_command.py::test_base_command_global_tempdir_cleanup
-		tests/unit/test_base_command.py::test_base_command_local_tempdir_cleanup
-		tests/unit/test_base_command.py::test_base_command_provides_tempdir_helpers
-		# broken by unbundling
-		"tests/functional/test_debug.py::test_debug[vendored library versions:]"
-		tests/functional/test_debug.py::test_debug__library_versions
-		tests/functional/test_python_option.py::test_python_interpreter
-		tests/functional/test_uninstall.py::test_uninstall_non_local_distutils
-	)
-	local EPYTEST_IGNORE=(
-		# requires proxy.py
-		tests/functional/test_proxy.py
-	)
-
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/functional/test_install.py::test_install_sends_client_cert
-			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		)
-	fi
-
-	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local EPYTEST_XDIST=1
-	# rerunfailures because test suite breaks if packages are installed
-	# in parallel
-	epytest -m "not network" -o tmp_path_retention_policy=all \
-		-p rerunfailures --reruns=5
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	newbashcomp completion.bash pip
-
-	insinto /usr/share/zsh/site-functions
-	newins completion.zsh _pip
-}
diff --git a/dev-python/pip/pip-24.3.1-r2.ebuild b/dev-python/pip/pip-24.3.1-r2.ebuild
index aee9a90317e0..dc26ec994c2a 100644
--- a/dev-python/pip/pip-24.3.1-r2.ebuild
+++ b/dev-python/pip/pip-24.3.1-r2.ebuild
@@ -26,7 +26,7 @@ LICENSE="MIT"
 # bundled deps
 LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test-rust"
 
 # see src/pip/_vendor/vendor.txt