7 files changed, 2 insertions, 514 deletions
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index bc3703b9f67b..1a087ab9c216 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,16 +1,8 @@
 AUX pip-20.0.2-disable-system-install.patch 1298 BLAKE2B a384ee2114e59b8bc719fc14270cf6efbe8914854c404395beb1126db3278683b940e8fcfee83423d78e2aed6521e0bc57566ab0f5618f473262bbd9b7b0bffa SHA512 d2772105d4f4f880606e1e8ab3381af6768a96604a5fdcaa155dd42f8eea731c3a1b733b027d3e591d81f962ba14758b19da4a2c6c12946cd9a9d77c51ca4e78
-AUX pip-21.3-no-coverage.patch 1820 BLAKE2B f515e324f043fa8548f9add2fecf1f4d09c2487d695c429f870a6cd1ee9a228717c4fb152faa99a74d75d3b1998a5e7e93f710e2acd096f107f23091875f1f11 SHA512 b386e8116009f43013fe600d1f3928931a6595105bdd782266eeab85ba0f5a0743c7ccfbf2cab018d2ee0646b832573c56aad009e4b074dd805011d0a810348d
-AUX pip-22.2-no-coverage.patch 1833 BLAKE2B 8111b66a8e97b0415b1fe9314f8c1fcf49c1fffaf94b966bd484b1cb27b400c4eadd99fb3df1e67eb9a41983932e08a9bbebb135c9323255654fec121f802c6a SHA512 0f530065040f052a6806ce5220fc5447f92ac230e3047cd2d56674857a22bbfd489fff4b72d2f095a0c42f74a10b35444471f0cb5cf31e72d2eb7f71f355c9a9
 AUX pip-22.2.1-no-coverage.patch 1805 BLAKE2B 790a6736194d3ad7cadbb7965978f19c251a65b98b67c64726072f2baa24831f3e3788fdba560c247cde948183c6589b6edf18d5861468801e5729ba53c42995 SHA512 5fd775c0a1cb0f88c6c632a90294f11788916371b7d4bb8b378ed1530b461a9788f289a06d6619e66fcb45dd08a7063a749a608c5f12a778db84dfcbb5e79cba
-DIST pip-22.1.2.gh.tar.gz 9346675 BLAKE2B f709f8977d467d5a3170884bb75cd2f74a2f40801ae02a3725d442e18e4073f9c4a39cd1c9d2ce3949eb888be69d151f67d0cf2d0cbad7e2ec1ec6e78150b5c7 SHA512 7dd13150023f1cca8f5e01da7688ae418b5d0b36364efcfc15374a5147c7cabd46ff1d34e6499bc8e182dc0d34a366f5fe21d8ab4de4d112d269a97200401305
-DIST pip-22.2.1.gh.tar.gz 9279141 BLAKE2B 61906027e36c8b3b82f3d17a59cbc995864622184c7f4099e9dfbb5082d1953dff72551558b8fe0d463d7defcd8b9403a978e4a8c7d79af5cd6b9dbbbcc9c7b5 SHA512 77996ce7e1aa4b5aab0c55dfee5e9bfe9f5f09f33cb796ce78bba7365f37ce9f1cce4eeaf5fdbeddde0819ecc6a30ffdafa6b7e25f93c672fcc8646303a7946e
 DIST pip-22.2.2.gh.tar.gz 9279218 BLAKE2B 2179b0d3f5f05bbd678f1785b4dbc0613078c09c83b45faa62d766182dfeb564095abda809ed99f45644abcb06c125efc528aeaed3ad40ab1c9e8972e33ccbb2 SHA512 bd59e28b55475b77a8f11ea771cbad3b2602ff974e219f9a55288963a9522c9279a5b00fde40fb65cfebefae0e905d3da3c06fe50b402aa5326b25f70a98a015
-DIST pip-22.2.gh.tar.gz 9278410 BLAKE2B e32fe63e81593a0ec9c0110af0f07f1a47ddd3d6c660c11e9eb9142c251b7f45e3a1cc343193b123364a6a3a69490add7d4ebb368aac027c448f00f7cd163d7c SHA512 2ff3f9c2dc84c65c14c978e8c58cd3cee6cfff9753655c726763d6d7780d147479f32c47873d402ad9e0821fef940b971a7df93fabd6b998f07dea5af1251c9b
 DIST setuptools-62.3.2-py3-none-any.whl 1225929 BLAKE2B 608952e201f749ebf557e3962ba9856d5bdcbc534f3a25598cab0d6c53282cfb3b9f007ba135497a8addf49db4c02bc4387c486d95a4529d01ce4114154ec28a SHA512 366d69dc44e326dd7549cdacd8dec481a14dce4feef4338adc38b9de5c4c338f04d61696e13ce8603be1315f2e8734100f92d3fe4b4b11843e19f550c9631978
 DIST virtualenv-16.7.12.gh.tar.gz 8906590 BLAKE2B a1f206769e4e5797562906162e492e44c4a72720e4f88a0362dc802ce2df20c65aaab6a72dce2238445601a10fae59bd90cd362217994d30911f105afd71c5fa SHA512 0278b33fb19f6553e70ad3dcffa6ea1a455ff435b216ac9b4fadff216b2932714faa2bb6027af3058010111d8511a5c2fcd424f31c9645be361603971f111c8e
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
-EBUILD pip-22.1.2-r1.ebuild 4244 BLAKE2B eb572300446fe1697e4201024ba005d25edfcfec50c4102c2053b8b586af60ea261db2898e48b7e8b4f07d9deb289f5f6719918f66132ad078ba7a35756be7e2 SHA512 737f505103c8e2401cae1ba09f25407c598379bf085d28d9761abf93d4451d67c5aa08a8f446b5a03da2bf3ac68afb2f1bb6e57e0c8fec3b8fef4cd63a0b5b1d
-EBUILD pip-22.2-r1.ebuild 4440 BLAKE2B 28cf5c72f782107f7d322d418b503067a21217d8552580051641438883ecb18235b761bdc1e9574817e77bc5523104197dd0fe3472ed676d65619593b5726932 SHA512 c37dd2ce831728511b4cbc08b87076f1112cf23815eea1cc0cf959721d7d697ebe65bf458c27ed777475d54d58ee0d00fa9190c6829e06ae666e775e6fe03c03
-EBUILD pip-22.2.1-r1.ebuild 4510 BLAKE2B 60e0a608797cac42cc03cba07ef99733e5e9631e8044876a7e929394fde697edb89a95291ddd0d5db4ae7456458ec3ec15dcdf6fe2c1ab976488365d1e22daf3 SHA512 79bd859969f22b8cc20d38b3a152d93249848b3110c714bb95e4e14fa347fe77d3ee92422a46fca0a1008fb23f0959fd8985b9aa0c67fae473be8a05eb5a9b31
-EBUILD pip-22.2.2.ebuild 4510 BLAKE2B 60e0a608797cac42cc03cba07ef99733e5e9631e8044876a7e929394fde697edb89a95291ddd0d5db4ae7456458ec3ec15dcdf6fe2c1ab976488365d1e22daf3 SHA512 79bd859969f22b8cc20d38b3a152d93249848b3110c714bb95e4e14fa347fe77d3ee92422a46fca0a1008fb23f0959fd8985b9aa0c67fae473be8a05eb5a9b31
+EBUILD pip-22.2.2.ebuild 4502 BLAKE2B c30eb4f85a0f4744716d44354b665ff26283721e673f2c82778a3e40212ab9725d981ea393db90af03fec30ae9fe19b83d4d9f45ce5bb46ce612d903b35f5d6b SHA512 fd9b89048d1fcfdae23be6edd635bb462924ee64891e459b1747125641eb90a64d9aa0fb60bf6ce284a74767befea02c704432fdbd9d002586847337497152cc
 MISC metadata.xml 392 BLAKE2B 94ea3de1220cb9ca64ae1186597789cc83a54adfe44695932c07dd5065df0e5f9ee5078a495e3a12563b36809d781d8ab86bb6c92c485c023199d92547b74f27 SHA512 603199f6547105f3bb64f4fcaf004e9ef62fa2e0f8ec6eab56078119684b0f5119161e0f164fe02b2cf6dd6b115588c9ef77d727eeb6d138e281f1cb0bcb5de9
diff --git a/dev-python/pip/files/pip-21.3-no-coverage.patch b/dev-python/pip/files/pip-21.3-no-coverage.patch
deleted file mode 100644
index 8292f97f9488..000000000000
--- a/dev-python/pip/files/pip-21.3-no-coverage.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 8473691148031ed4db5bd8870fbeef9484b9c831 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 23 Oct 2021 08:11:11 +0200
-Subject: [PATCH] Disable coverage testing support inside test venvs
-
----
- tests/conftest.py | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 076aeaf19..77c41dc15 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -340,13 +340,6 @@ def wheel_install(tmpdir_factory: pytest.TempdirFactory, common_wheels: Path) ->
-     return _common_wheel_editable_install(tmpdir_factory, common_wheels, "wheel")
- 
- 
--@pytest.fixture(scope="session")
--def coverage_install(
--    tmpdir_factory: pytest.TempdirFactory, common_wheels: Path
--) -> Path:
--    return _common_wheel_editable_install(tmpdir_factory, common_wheels, "coverage")
--
--
- def install_egg_link(
-     venv: VirtualEnvironment, project_name: str, egg_info_dir: Path
- ) -> None:
-@@ -362,7 +355,6 @@ def virtualenv_template(
-     tmpdir_factory: pytest.TempdirFactory,
-     pip_src: Path,
-     setuptools_install: Path,
--    coverage_install: Path,
- ) -> Iterator[VirtualEnvironment]:
- 
-     venv_type: VirtualEnvironmentType
-@@ -389,13 +381,6 @@ def virtualenv_template(
-         [venv.bin / "python", "setup.py", "-q", "develop"], cwd=pip_editable
-     )
- 
--    # Install coverage and pth file for executing it in any spawned processes
--    # in this virtual environment.
--    install_egg_link(venv, "coverage", coverage_install)
--    # zz prefix ensures the file is after easy-install.pth.
--    with open(venv.site / "zz-coverage-helper.pth", "a") as f:
--        f.write("import coverage; coverage.process_startup()")
--
-     # Drop (non-relocatable) launchers.
-     for exe in os.listdir(venv.bin):
-         if not (
--- 
-2.33.1
-
diff --git a/dev-python/pip/files/pip-22.2-no-coverage.patch b/dev-python/pip/files/pip-22.2-no-coverage.patch
deleted file mode 100644
index 20a5fa4beabf..000000000000
--- a/dev-python/pip/files/pip-22.2-no-coverage.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 75292c12ee2062f7d035b326b652ba6cffb8480d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 23 Oct 2021 08:11:11 +0200
-Subject: [PATCH] Disable coverage testing support inside test venvs
-
----
- tests/conftest.py | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 210ff0f4e..e5c0d2ef0 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -382,13 +382,6 @@ def wheel_install(tmpdir_factory: pytest.TempPathFactory, common_wheels: Path) -
-     return _common_wheel_editable_install(tmpdir_factory, common_wheels, "wheel")
- 
- 
--@pytest.fixture(scope="session")
--def coverage_install(
--    tmpdir_factory: pytest.TempPathFactory, common_wheels: Path
--) -> Path:
--    return _common_wheel_editable_install(tmpdir_factory, common_wheels, "coverage")
--
--
- def install_egg_link(
-     venv: VirtualEnvironment, project_name: str, egg_info_dir: Path
- ) -> None:
-@@ -404,7 +397,6 @@ def virtualenv_template(
-     tmpdir_factory: pytest.TempPathFactory,
-     pip_src: Path,
-     setuptools_install: Path,
--    coverage_install: Path,
- ) -> Iterator[VirtualEnvironment]:
- 
-     venv_type: VirtualEnvironmentType
-@@ -431,13 +423,6 @@ def virtualenv_template(
-         [os.fspath(venv.bin / "python"), "setup.py", "-q", "develop"], cwd=pip_editable
-     )
- 
--    # Install coverage and pth file for executing it in any spawned processes
--    # in this virtual environment.
--    install_egg_link(venv, "coverage", coverage_install)
--    # zz prefix ensures the file is after easy-install.pth.
--    with open(venv.site / "zz-coverage-helper.pth", "a") as f:
--        f.write("import coverage; coverage.process_startup()")
--
-     # Drop (non-relocatable) launchers.
-     for exe in os.listdir(venv.bin):
-         if not (
--- 
-2.35.1
-
diff --git a/dev-python/pip/pip-22.1.2-r1.ebuild b/dev-python/pip/pip-22.1.2-r1.ebuild
deleted file mode 100644
index 92328155e736..000000000000
--- a/dev-python/pip/pip-22.1.2-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{8..10} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_11 pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-62.3.2-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-# upstream still requires virtualenv-16 for testing, we are now fetching
-# it directly to avoid blockers with virtualenv-20
-VENV_PV=16.7.12
-
-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/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
-			-> virtualenv-${VENV_PV}.gh.tar.gz
-	)
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-IUSE="vanilla"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			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/werkzeug[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			!alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? (
-				dev-python/cryptography[${PYTHON_USEDEP}]
-			) ) ) ) ) )
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/pip-21.3-no-coverage.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
-			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} since virtualenv-16 is broken"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		# Internet
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-		tests/functional/test_install.py::test_editable_install__local_dir_no_setup_py_with_pyproject
-		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
-	)
-
-	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 GENTOO_PIP_TESTING=1
-	local -x PYTHONPATH="${WORKDIR}/virtualenv-${VENV_PV}"
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
-	epytest -m "not network" -n "$(makeopts_jobs)"
-}
-
-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-22.2-r1.ebuild b/dev-python/pip/pip-22.2-r1.ebuild
deleted file mode 100644
index 67d8b8ae610c..000000000000
--- a/dev-python/pip/pip-22.2-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{8..10} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_11 pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-62.3.2-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-# upstream still requires virtualenv-16 for testing, we are now fetching
-# it directly to avoid blockers with virtualenv-20
-VENV_PV=16.7.12
-
-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/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
-			-> virtualenv-${VENV_PV}.gh.tar.gz
-	)
-"
-
-LICENSE="MIT"
-# bundled deps
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE="vanilla"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			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/werkzeug[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			!alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? (
-				dev-python/cryptography[${PYTHON_USEDEP}]
-			) ) ) ) ) )
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/pip-22.2-no-coverage.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
-			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} since virtualenv-16 is broken"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_inspect.py::test_inspect_basic
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		# Internet
-		tests/functional/test_install.py::test_install_dry_run
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-		tests/functional/test_install.py::test_editable_install__local_dir_no_setup_py_with_pyproject
-		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
-	)
-
-	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 GENTOO_PIP_TESTING=1
-	local -x PYTHONPATH="${WORKDIR}/virtualenv-${VENV_PV}"
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
-	epytest -m "not network" -n "$(makeopts_jobs)"
-}
-
-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-22.2.1-r1.ebuild b/dev-python/pip/pip-22.2.1-r1.ebuild
deleted file mode 100644
index 8d3b6ef3e28e..000000000000
--- a/dev-python/pip/pip-22.2.1-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# please bump dev-python/ensurepip-wheels along with this package!
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{8..10} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_11 pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-62.3.2-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-# upstream still requires virtualenv-16 for testing, we are now fetching
-# it directly to avoid blockers with virtualenv-20
-VENV_PV=16.7.12
-
-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/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
-			-> virtualenv-${VENV_PV}.gh.tar.gz
-	)
-"
-
-LICENSE="MIT"
-# bundled deps
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE="vanilla"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			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/werkzeug[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			!alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? (
-				dev-python/cryptography[${PYTHON_USEDEP}]
-			) ) ) ) ) )
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/pip-22.2.1-no-coverage.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
-			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} since virtualenv-16 is broken"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_inspect.py::test_inspect_basic
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		# Internet
-		tests/functional/test_install.py::test_install_dry_run
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-		tests/functional/test_install.py::test_editable_install__local_dir_no_setup_py_with_pyproject
-		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
-	)
-
-	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 GENTOO_PIP_TESTING=1
-	local -x PYTHONPATH="${WORKDIR}/virtualenv-${VENV_PV}"
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
-	epytest -m "not network" -n "$(makeopts_jobs)"
-}
-
-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-22.2.2.ebuild b/dev-python/pip/pip-22.2.2.ebuild
index 8d3b6ef3e28e..1cfe45d40d06 100644
--- a/dev-python/pip/pip-22.2.2.ebuild
+++ b/dev-python/pip/pip-22.2.2.ebuild
@@ -39,7 +39,7 @@ SRC_URI="
 LICENSE="MIT"
 # bundled deps
 LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 IUSE="vanilla"