12 files changed, 187 insertions, 395 deletions
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 9a593abc8290..7656342b5861 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,22 +1,13 @@
 AUX pip-19.3-disable-version-check.patch 872 BLAKE2B b0398674f56b78a066c4308f0a8ee0272c5c4c3cb569e6c300ac62fc9fbe8ec2a1bfe257047c15ddcf9cc44c47b7f8b9ab99e17b722bd6ae4cf9dc2a168e01d6 SHA512 1ece773f66556e4380eabf76490430e8fbec23f7cfad27dac02c7e49f7136b632515ef04843e89dfae42c095dbf5280d64e61da1544801c998f802aa59be8e22
-AUX pip-19.3.1-network-tests.patch 2436 BLAKE2B bb4397074428c2fa0729380ee30e3e67be09871d592df1012937db495a79ffcbd92b534d48c8b459cd6f3ddd30e363f14961511fc8574d438cb5a8acc7b64f20 SHA512 ec3ca2a8381cdca5d8952803389837070b235b08c9df7985e4ffc4f78e83defb9284480fdee439fd42b86d0de5574c707c1de72b230742fee39ce7b8a57a066b
-AUX pip-19.3.1-r2-disable-system-install.patch 835 BLAKE2B 11a8b86f57619b87d090e6f02c0e623f33e2bbae6b5b16acebc34c9205c53d8221ec98e99167e26eb789d3fbf075406bbdba6dc74c120288fea2d0bcd98beeec SHA512 eb2fb10828aca4a1179f8763c63d861f547e2d92da32c7fd697863e26583eba4f1b0d76a820a82afe3803a6ea22c61b01d3fd98291ec5cff4700855294b19286
-AUX pip-20.0.2-disable-system-install.patch 1260 BLAKE2B eb2f86c6792b52f446e2c5dbe14eb015032879137a058b291d90da6b5da2c4a563959c34f25cbb551e1218306be136abec692950bace60fa46b439918a16f81b SHA512 0ca24355f54b45d74eba5eaecaac9d6c017a2e7b5743eef533c5ad4f7f28f1f707945a9407716e1a3f88121c6d4179bb6c991696b7f24bf6c77eebcff8d73104
+AUX pip-20.0.2-disable-system-install.patch 1298 BLAKE2B a384ee2114e59b8bc719fc14270cf6efbe8914854c404395beb1126db3278683b940e8fcfee83423d78e2aed6521e0bc57566ab0f5618f473262bbd9b7b0bffa SHA512 d2772105d4f4f880606e1e8ab3381af6768a96604a5fdcaa155dd42f8eea731c3a1b733b027d3e591d81f962ba14758b19da4a2c6c12946cd9a9d77c51ca4e78
 AUX pip-20.1.1-test-endian.patch 2779 BLAKE2B 63fd87aed4edb8c9cf5c64b3055c345234602a9dafd0b58b501bd30f5026ebd683720a9ad2931bbb9db2c35841fe6cac19a88a5181b195c9f0a4e4e590b18094 SHA512 21f52dc64746e5d8e5c0d92c3f9b6a75da0316eeafad49fccdbd92c8b560e083d4ffedf148590c6f4265cc367a67b8e70890c14d0f718934f4ca4ddea82bdf50
-AUX pip-9.0.1-disable-version-check.patch 1031 BLAKE2B 148e528aab19de021f193ac56d758c803e0875b618ee32e948eb103eb6b05eb56e2ecf5ed4dbe39893f5c44ddee17122fdd686f433f5ce89044b2c02291e0ba1 SHA512 8b5764d3ecdbfc871bdf051b41d9610d5028bc3b95a4bf990db46325d10e5d559449ec97ab052686148d6ab6abfa630fb38101c726b6648d19fa94ac593b0a28
-AUX pip-disable-system-install.patch 1070 BLAKE2B 85bfd82888a169cf771467f4f811b9859fddc1cfd134ac21be42b9fd93d84118354fa23a2f4b0ec9c67024f571ba7035665302671420221b52f3fc89f24b1af3 SHA512 bb0a9a32b2eac0a12276c3f0527534226c03868300f54945d20eec16902ad51cbfdace9d79b0caa304bc641323194031a5ca9e5e784366a44527441bd0f3c231
-DIST pip-19.3.1.tar.gz 6409819 BLAKE2B b3aacd0bee60400a1f30b4be57871002072e5cc7a86e76cca1848e977ebdc85b6e282fc521c19bf7a518d1aef3280133fcd65a431cb2a16e202dd7721c5b97ad SHA512 39446c0ab6e4495d98f22923a2a76901b024d9047b60d92580b21d447a718e5285cfd66f8ad0c20befcfe1abc7f06be29b6a5644d1b30265d3b67399fe76e033
+AUX pip-20.2-no-coverage.patch 6154 BLAKE2B 743dcacd3107d9c6447197dd01bc85b1b16db5b1da3bf5f84e73801e645848a98854f350d958056eb17aa6b87f8bb2557a27e3bd78582958c3b37cb6ce61d7ce SHA512 67ea11c56b6a7b02faae28c9d941015ca2ba9c125dfcaf01eeaba7717cfb22f23fb84c28f993202f7b648ee64741baaf7545e9951be840d378e39d3af0a60fd0
 DIST pip-20.0.2.tar.gz 6445047 BLAKE2B 8f6e0a8908cf594c8d51818942b0839f59a495697a95dcc0347235e90cbe6d7f035f155761e7da9cfca1ba08b2c5a2c5def52c60c381f5428ef48efd1b6b5131 SHA512 f9965944ca0f319d01db1638ce97cf64772afff1778b3b1271155de73208cfcb3954d89a469c1143c0bf3288a53d4446165a49df994374b16ac6f7ffdae85857
 DIST pip-20.1.1.tar.gz 6503229 BLAKE2B 5b0409042c970ec47fa6f947b21a53aca43563a6bb442fd5f91788fa97caf7167a84b4f581de87453eb0e55657d2ccd11dca2d1815c3bfe9ef5923994306a6db SHA512 ee7b0345c08fbe0215811d07b4c57c1ceece826871842f6d1c174d82e8eee0ad810aa5413d6763ecd5a513e151792a53c36623ab99d2049555ef2542d32d1658
-DIST pip-20.1.tar.gz 6500955 BLAKE2B 81ab806fce4ae3d9aeab34fe8781c13507252ef0325abb35dd739f3eaf0e648866b052d2adb8b187974ae784f493dbb83f684c464da8f9079f66fe8c4fa2d61d SHA512 19cc1172540bec4b0c6facf55fa9c463bf8f4391dd1a643ac208c8e0b787950b2d72a6ec8f0772c7e6582c6b6a4a103f31ad58ffa2119fb574c174e5ec77b0c1
-DIST pip-9.0.1.tar.gz 1197370 BLAKE2B 3618161690d5e0a38d141f9b51baea4aaa3fdc225664ef180bbeecf6e2df95e9ea4f97c63fe3a68f84f4fb5ebcc74e316827253c7e07b03565e58113bbaa918a SHA512 ee59efb4b009ff6543b7afdea99b9cbbee1981ecc03af586acda76674024d3b66dab23049e68f3da9448734984619fc1eaba6e965c9dd3d731973376c8a42e25
-DIST setuptools-41.4.0-py2.py3-none-any.whl 580302 BLAKE2B 58dc2d48445406f7467bfb0934dc507e8a569e4759bfcc95287cfb21b5b1a7bcab061656a29a8b4976ee3ae12a3adca570035ae4a6d9df09ae7a799857775d36 SHA512 a27b38d596931dfef81d705d05689b7748ce0e02d21af4a37204fc74b0913fa7241b8135535eb7749f09af361cad90c475af98493fef11c4ad974780ee01243d
+DIST pip-20.2.2.tar.gz 8719081 BLAKE2B 642a8e9b2f7c3dc08b7e8f7874b7d1d988622f50b9430939060c3b9c086ae7bdaf4a58e9709376e0d36411fb2b492d4e44ddb6282f1fe12d7c8b9ecfdb1c0482 SHA512 0b000977f169900eebd4afeabfc7bd59b104246bbb048ce5b4db7f701e20ef1caef22c7ca2311843eafc4a37abbb81a74beddddf655eeaf2e33e3949d5a811e6
 DIST setuptools-44.0.0-py2.py3-none-any.whl 583230 BLAKE2B 823e6792471660f247e30a938aa869d345a63db7294e5f9b4bd88f15a7694779011d29740fe317149620985f705fc6e18cbb07a18e5680cc11d7c229ffbc74f6 SHA512 7006fd303181afbeeec0e30cafb9fd1e4d3c6f55cfdd6343fedbc32b17dbb96b3d96ae37f4db27bfb168738727474cf425904ec280ff1d2b789fc48077a8fa84
-DIST wheel-0.33.6-py2.py3-none-any.whl 21556 BLAKE2B 6b6124c1e8e70592399a90c88b2a70efc5885bad81d2ff07a2e243eee008ba5cb0c927454036915a61e97489e29fe1abc4ba2e63d7eadf1a8985c8a8b7cdf4c4 SHA512 4663cd55ee9d3de138216bb06870606b546b19cb6a733f1beab211c0ba72e63d849c422d320ddc8aa8275ad04a30119a84c1351e589150cd18c2a34f9fdb224a
 DIST wheel-0.34.2-py2.py3-none-any.whl 26502 BLAKE2B 3a1bd4571c582245b60ff33c9bf74ff8a2ebafb26e56fc7b9bd215058d059b6bd13bbe21ce46002af257813a54126f27e19253f211e21c4548c7cf84cd15caf7 SHA512 4f1a44f4691ed8baad777d7874f7f4da96a5019eb485fd3a9eed9259aa2a9d5acccc6dc63a72128664347c64ee039a6076c6ca9c3b75a1f94457967864e522ed
-EBUILD pip-19.3.1-r2.ebuild 3968 BLAKE2B 6c0e2c5daeee3afa0c575e0f3a54600bd16f5bef748800a17fa05f444818e3fdb28a9825f1c89d0052a01555ebc623fb8c1f16f74cfef5fed1085ea3bd1dedb1 SHA512 8202150be54533c2420909fc339c2c53b8ddd93733cbfd9b9070034bbef2ea02335ca519f15d39a1e6e77de39a17833fde7c92b765edffde270eff56bd3d16a1
-EBUILD pip-20.0.2.ebuild 4028 BLAKE2B 3a3ff94b364fcffe375f1844ecb0229a6680187397947b7bb523b97342287b81c4ac7b5f38cc142e4f1312f560c9446187a2228946f69310f939e4f544b8c64a SHA512 b534a5277ff82e3ce2c62b5a7c0c07591879a4786e025583a292d57d9a8e90f91f7f230fef05221f8f097ffcef4afcf72c298ad6c3848ace4ba930af1b216d5f
-EBUILD pip-20.1.1.ebuild 4159 BLAKE2B 35aa594ade5d4af7c460bd1f6ef358ff580ed9dcd89624573e2d81487b9c4da4e16024774a6efd74f1a463b0685532a764bff599802ec92add8ee2388695b01e SHA512 1de3aa6d9a5136297b7564c3d9ac0c88692ddd9f67f540b4022ecb53069b6b668449bd55cd64db257572d8e1c2221f52a8f4eb422fc7074924ebfb13d4578c79
-EBUILD pip-20.1.ebuild 4111 BLAKE2B a5f9d7975ab43e27a5a8a4c1359702809137989c57f9f7ac318323d01f6b8c47af58bd8eb3437a0be9b60b0c028917216196fbfb9ef8b68239a3425bf0a2d61f SHA512 938e39e722e149e12d853da0e023219caca3d2c936555e92a34645e3d378a37af6546f553c0fe6b2653e5ee3990ae5ca7fc3008c3de6e67877e53f800ee536f4
-EBUILD pip-9.0.1-r2.ebuild 2454 BLAKE2B 7d6eba7ecf7279234a820a90edf51e2c2aceecd06ae212e1fda4912fa8a265c8217c27c90bb0f6e112fd53f766dc4e926371f11408d20f41004a60e24ee83a46 SHA512 5fd2425d32692d483814dd03f80ba634f2612e3e5fe1ffe8d043d717064483eaf01b76b053e383dd34bcf1bd2792346d0ed1648461f9414093dd082c13b61d88
+EBUILD pip-20.0.2.ebuild 4027 BLAKE2B 2694a675757d8f34c8d0188021c6fe16e9f5574954fd17665158ea53f0f7ebd03cbbaf5d9773d31433b06e2cb9dd8e0549b4e4bd1f120f36c6eaa6e16d2991d7 SHA512 b83221a980e5ba8b7451dd00bc610827b4541dd0549096d5c70adb5cebe1aadab77b362583e62cbe427a174e67819c88762d3a3467e198f3b500649c0824fdb5
+EBUILD pip-20.1.1.ebuild 4154 BLAKE2B d3779d260da376b29f09d37150ed34a50e771332ed7044255f918713d203c4ff9c6ffcde71051e9f8c87f2a75111e5700ef09070abbfe10b6d98a1ded0118abb SHA512 8bf788208e7bfd044c4b362ed29b65da300b9996694e33dd9bb6146fc686b5de3a1df14abfdffc70dbe36f8c60e74de1f4d58f6be9245446f08a7ef09ab86dce
+EBUILD pip-20.2.2.ebuild 4229 BLAKE2B c5b6a4071e909aa5eed3316624bf8d3f0cd41d57aaa622228ddcc0fa06ff781a8f0aec860e995e2bca855d0072c000114794d00fcbcdb4a79ed11af7198d9005 SHA512 81337ccec86e9ca492e77e2676d03ad3e8d2325b6a30ff49d24ed52ad2c9c88b96b12f740bbd6b531681361518e257ed4bfd487703cd46269ea93a9151422712
 MISC metadata.xml 391 BLAKE2B d8537d1b2f8886d7c30dad3975568e0198a04f16a7ced44f3682f1b865e25f0b7552a640955dd915b2f059eec78eb3f920a0bea0f5f1503f366731a5d20a96c2 SHA512 27ee4b430cd0175c9eecc279765fd617ce5ab55d36932879a0710c2eb66ac2de449de303b1b70fc0ce925666c87008814d64e62d904fc3b9f800380c53478e69
diff --git a/dev-python/pip/files/pip-19.3.1-network-tests.patch b/dev-python/pip/files/pip-19.3.1-network-tests.patch
deleted file mode 100644
index f194a7b34a90..000000000000
--- a/dev-python/pip/files/pip-19.3.1-network-tests.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --git a/news/7359.trivial b/news/7359.trivial
-new file mode 100644
-index 000000000..e69de29bb
-diff --git a/tests/functional/test_freeze.py b/tests/functional/test_freeze.py
-index d13c931d0..2e35de3e6 100644
---- a/tests/functional/test_freeze.py
-+++ b/tests/functional/test_freeze.py
-@@ -721,6 +721,7 @@ def test_freeze_user(script, virtualenv, data):
-     assert 'simple2' not in result.stdout
-
-
-+@pytest.mark.network
- def test_freeze_path(tmpdir, script, data):
-     """
-     Test freeze with --path.
-@@ -734,5 +735,6 @@ def test_freeze_path(tmpdir, script, data):
-     _check_output(result.stdout, expected)
-
-
-+@pytest.mark.network
- def test_freeze_path_exclude_user(tmpdir, script, data):
-     """
-@@ -756,6 +758,7 @@ def test_freeze_path_exclude_user(tmpdir, script, data):
-     _check_output(result.stdout, expected)
-
-
-+@pytest.mark.network
- def test_freeze_path_multiple(tmpdir, script, data):
-     """
-     Test freeze with multiple --path arguments.
-diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
-index a9eff081d..ba7a0a55c 100644
---- a/tests/functional/test_install.py
-+++ b/tests/functional/test_install.py
-@@ -1325,6 +1325,7 @@ def test_install_no_binary_disables_building_wheels(script, data, with_wheel):
-     assert "Running setup.py install for upper" in str(res), str(res)
-
-
-+@pytest.mark.network
- def test_install_no_binary_builds_pep_517_wheel(script, data, with_wheel):
-     to_install = data.packages.joinpath('pep517_setup_and_pyproject')
-     res = script.pip(
-diff --git a/tests/functional/test_install_config.py b/tests/functional/test_install_config.py
-index 176976c4e..308263928 100644
---- a/tests/functional/test_install_config.py
-+++ b/tests/functional/test_install_config.py
-@@ -133,6 +133,7 @@ def test_command_line_appends_correctly(script, data):
-     ), 'stdout: {}'.format(result.stdout)
-
-
-+@pytest.mark.network
- def test_config_file_override_stack(script, virtualenv):
-     """
-     Test config files (global, overriding a global config with a
-diff --git a/tests/functional/test_install_upgrade.py b/tests/functional/test_install_upgrade.py
-index 6d2eeb5dc..0024de4d4 100644
---- a/tests/functional/test_install_upgrade.py
-+++ b/tests/functional/test_install_upgrade.py
-@@ -8,6 +8,7 @@
- from tests.lib.local_repos import local_checkout
-
-
-+@pytest.mark.network
- def test_no_upgrade_unless_requested(script):
-     """
-     No upgrade if not specifically requested.
diff --git a/dev-python/pip/files/pip-19.3.1-r2-disable-system-install.patch b/dev-python/pip/files/pip-19.3.1-r2-disable-system-install.patch
deleted file mode 100644
index 8486c37f0c73..000000000000
--- a/dev-python/pip/files/pip-19.3.1-r2-disable-system-install.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-install: Raise an error to avoid breaking python-exec
-
-Running pip without --target, --root, or --user will result in packages
-being installed systemwide. This has a tendency to break python-exec if
-setuptools gets installed or upgraded.
-
---- pip-19.1/src/pip/_internal/commands/install.py
-+++ pip-19.1/src/pip/_internal/commands/install.py
-@@ -246,6 +246,9 @@ class InstallCommand(RequirementCommand):
-         if options.upgrade:
-             upgrade_strategy = options.upgrade_strategy
-
-+        if not options.use_user_site and not options.target_dir and not options.root_path and not os.getenv('GENTOO_PIP_TESTING'):
-+            raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec")
-+
-         if options.build_dir:
-             options.build_dir = os.path.abspath(options.build_dir)
diff --git a/dev-python/pip/files/pip-20.0.2-disable-system-install.patch b/dev-python/pip/files/pip-20.0.2-disable-system-install.patch
index c6b5354bc68f..e0b0034e407a 100644
--- a/dev-python/pip/files/pip-20.0.2-disable-system-install.patch
+++ b/dev-python/pip/files/pip-20.0.2-disable-system-install.patch
@@ -1,29 +1,29 @@
-From 57d610bbcc721c2e58fd2e9f3197bb3e3acbd935 Mon Sep 17 00:00:00 2001
+From 3aee04cbb93c0e479b040e682b2aef676629c9a2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
 Date: Sat, 1 Feb 2020 09:14:46 +0100
 Subject: [PATCH] install: Raise an error to avoid breaking python-exec
 
-Running pip without --target, --root, or --user will result in packages
-being installed systemwide. This has a tendency to break python-exec if
-setuptools gets installed or upgraded.
+Running pip without --target, --prefix, --root, or --user will result
+in packages being installed systemwide. This has a tendency to break
+python-exec if setuptools gets installed or upgraded.
 ---
  src/pip/_internal/commands/install.py | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
-index 02a187c8..025b824b 100644
+index 8c2c32fd..41bac878 100644
 --- a/src/pip/_internal/commands/install.py
 +++ b/src/pip/_internal/commands/install.py
-@@ -246,6 +246,9 @@ class InstallCommand(RequirementCommand):
+@@ -238,6 +238,9 @@ class InstallCommand(RequirementCommand):
          if options.upgrade:
              upgrade_strategy = options.upgrade_strategy
  
-+        if not options.use_user_site and not options.target_dir and not options.root_path and not os.getenv('GENTOO_PIP_TESTING'):
++        if not options.use_user_site and not options.target_dir and not options.root_path and not options.prefix_path and not os.getenv('GENTOO_PIP_TESTING'):
 +            raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec")
 +
          cmdoptions.check_dist_restriction(options, check_target=True)
  
          install_options = options.install_options or []
 -- 
-2.25.0
+2.28.0
 
diff --git a/dev-python/pip/files/pip-20.2-no-coverage.patch b/dev-python/pip/files/pip-20.2-no-coverage.patch
new file mode 100644
index 000000000000..55be5b8c9712
--- /dev/null
+++ b/dev-python/pip/files/pip-20.2-no-coverage.patch
@@ -0,0 +1,163 @@
+From 43389903a55a5432ca8556f42fb2252c91c7ca45 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 29 Jul 2020 07:42:25 +0200
+Subject: [PATCH] Revert "Add basic test coverage configuration"
+
+This is just PITA since coverage uses native C extensions.
+---
+ .coveragerc                                |  4 +++
+ setup.cfg                                  | 38 ----------------------
+ tests/conftest.py                          | 16 +--------
+ tools/requirements/tests-common_wheels.txt |  2 --
+ tox.ini                                    | 16 ++-------
+ 5 files changed, 7 insertions(+), 69 deletions(-)
+ create mode 100644 .coveragerc
+
+diff --git a/.coveragerc b/.coveragerc
+new file mode 100644
+index 00000000..5f833c94
+--- /dev/null
++++ b/.coveragerc
+@@ -0,0 +1,4 @@
++[run]
++branch = True
++omit =
++  src/pip/_vendor/*
+diff --git a/setup.cfg b/setup.cfg
+index 45fd58a3..e40596e9 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -67,44 +67,6 @@ markers =
+     yaml: yaml based tests
+     fails_on_new_resolver: Does not yet work on the new resolver
+ 
+-[coverage:run]
+-branch = True
+-# Do not gather coverage for vendored libraries.
+-omit = */_vendor/*
+-# Centralized absolute file prefix for coverage files.
+-data_file = ${COVERAGE_OUTPUT_DIR}/.coverage
+-# By default, each covered process will try to truncate and then write to
+-# `data_file`, but with `parallel`, they will write to separate files suffixed
+-# with hostname, pid, and a timestamp.
+-parallel = True
+-# If not set, then at the termination of each worker (when using pytest-xdist),
+-# the following is traced: "Coverage.py warning: Module pip was previously
+-# imported, but not measured (module-not-measured)"
+-disable_warnings = module-not-measured
+-
+-[coverage:paths]
+-# We intentionally use "source0" here because pytest-cov unconditionally sets
+-# "source" after loading the config.
+-source0 =
+-    # The primary source code path which other paths will be combined into.
+-    src/pip/
+-    # Unit test source directory e.g.
+-    # `.tox/coverage-py3/lib/pythonX.Y/site-packages/pip/...`
+-    */site-packages/pip/
+-    # Functional test virtual environment directories, which look like
+-    # `tmpdir/pip0/pip/src/pip/...`
+-    */pip/src/pip/
+-
+-[coverage:report]
+-exclude_lines =
+-    # We must re-state the default because the `exclude_lines` option overrides
+-    # it.
+-    pragma: no cover
+-    # This excludes typing-specific code, which will be validated by mypy anyway.
+-    if MYPY_CHECK_RUNNING
+-    # Can be set to exclude e.g. `if PY2:` on Python 3
+-    ${PIP_CI_COVERAGE_EXCLUDES}
+-
+ [bdist_wheel]
+ universal = 1
+ 
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 2aab5020..0db6d967 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -294,13 +294,6 @@ def wheel_install(tmpdir_factory, common_wheels):
+                                           'wheel')
+ 
+ 
+-@pytest.fixture(scope='session')
+-def coverage_install(tmpdir_factory, common_wheels):
+-    return _common_wheel_editable_install(tmpdir_factory,
+-                                          common_wheels,
+-                                          'coverage')
+-
+-
+ def install_egg_link(venv, project_name, egg_info_dir):
+     with open(venv.site / 'easy-install.pth', 'a') as fp:
+         fp.write(str(egg_info_dir.resolve()) + '\n')
+@@ -310,7 +303,7 @@ def install_egg_link(venv, project_name, egg_info_dir):
+ 
+ @pytest.fixture(scope='session')
+ def virtualenv_template(request, tmpdir_factory, pip_src,
+-                        setuptools_install, coverage_install):
++                        setuptools_install, common_wheels):
+ 
+     if six.PY3 and request.config.getoption('--use-venv'):
+         venv_type = 'venv'
+@@ -334,13 +327,6 @@ def virtualenv_template(request, tmpdir_factory, pip_src,
+     subprocess.check_call([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 (
+diff --git a/tools/requirements/tests-common_wheels.txt b/tools/requirements/tests-common_wheels.txt
+index f0edf0b0..6703d606 100644
+--- a/tools/requirements/tests-common_wheels.txt
++++ b/tools/requirements/tests-common_wheels.txt
+@@ -7,5 +7,3 @@
+ 
+ setuptools >= 40.8.0
+ wheel
+-# As required by pytest-cov.
+-coverage >= 4.4
+diff --git a/tox.ini b/tox.ini
+index 82e9abc6..7a19ca61 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -8,7 +8,6 @@ envlist =
+ # Wrapper for calls to pip that make sure the version being used is the
+ # original virtualenv (stable) version, and not the code being tested.
+ pip = python {toxinidir}/tools/tox_pip.py
+-mkdirp = python -c 'import os, sys; os.path.exists(sys.argv[1]) or os.mkdir(sys.argv[1])'
+ 
+ [testenv]
+ # Remove USERNAME once we drop PY2.
+@@ -31,20 +30,9 @@ commands = pytest --timeout 300 []
+ install_command = {[helpers]pip} install {opts} {packages}
+ list_dependencies_command = {[helpers]pip} freeze --all
+ 
+-[testenv:coverage]
++[testenv:coverage-py3]
+ basepython = python3
+-commands =
+-    {[helpers]mkdirp} {toxinidir}/.coverage-output
+-    pytest --timeout 300 --cov=pip --cov-config={toxinidir}/setup.cfg []
+-
+-setenv =
+-    # Used in coverage configuration in setup.cfg.
+-    COVERAGE_OUTPUT_DIR = {toxinidir}/.coverage-output
+-    # Ensure coverage is enabled in child processes in virtual environments
+-    # since they won't already have been enabled by pytest-cov.
+-    COVERAGE_PROCESS_START = {toxinidir}/setup.cfg
+-    # Used in coverage configuration in setup.cfg.
+-    PIP_CI_COVERAGE_EXCLUDES = if PY2
++commands = pytest --timeout 300 --cov=pip --cov-report=term-missing --cov-report=xml --cov-report=html tests/unit {posargs}
+ 
+ [testenv:docs]
+ # Don't skip install here since pip_sphinxext uses pip's internals.
+-- 
+2.28.0
+
diff --git a/dev-python/pip/files/pip-9.0.1-disable-version-check.patch b/dev-python/pip/files/pip-9.0.1-disable-version-check.patch
deleted file mode 100644
index 7334380c1e1d..000000000000
--- a/dev-python/pip/files/pip-9.0.1-disable-version-check.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 890a1c26018752f2c57c7800968e4b8d1e0987f9 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 20 Nov 2016 19:52:40 +0100
-Subject: [PATCH] Stop checking for new versions
-
----
- pip/basecommand.py | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/pip/basecommand.py b/pip/basecommand.py
-index 54c6706..3cffe86 100644
---- a/pip/basecommand.py
-+++ b/pip/basecommand.py
-@@ -241,15 +241,6 @@ class Command(object):
-             logger.critical('Exception:', exc_info=True)
- 
-             return UNKNOWN_ERROR
--        finally:
--            # Check if we're using the latest version of pip available
--            if (not options.disable_pip_version_check and not
--                    getattr(options, "no_index", False)):
--                with self._build_session(
--                        options,
--                        retries=0,
--                        timeout=min(5, options.timeout)) as session:
--                    pip_version_check(session)
- 
-         return SUCCESS
- 
--- 
-2.10.2
-
diff --git a/dev-python/pip/files/pip-disable-system-install.patch b/dev-python/pip/files/pip-disable-system-install.patch
deleted file mode 100644
index 9e572454315e..000000000000
--- a/dev-python/pip/files/pip-disable-system-install.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 847553da616edabede18c69ba640a32b719b45a8 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Tue, 27 Oct 2015 12:20:44 -0400
-Subject: [PATCH] install: Raise an error to avoid breaking python-exec
-
-Running pip without --target, --root, or --user will result in packages
-being installed systemwide. This has a tendency to break python-exec if
-setuptools gets installed or upgraded.
----
- pip/commands/install.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/pip/commands/install.py b/pip/commands/install.py
-index 46cd9f2..36b72f2 100644
---- a/pip/commands/install.py
-+++ b/pip/commands/install.py
-@@ -204,6 +204,9 @@ class InstallCommand(RequirementCommand):
-             )
-             options.ignore_installed = True
- 
-+        if not options.use_user_site and not options.target_dir and not options.root_path:
-+            raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec")
-+
-         if options.build_dir:
-             options.build_dir = os.path.abspath(options.build_dir)
- 
--- 
-2.6.2
-
diff --git a/dev-python/pip/pip-19.3.1-r2.ebuild b/dev-python/pip/pip-19.3.1-r2.ebuild
deleted file mode 100644
index 17ca2852b9eb..000000000000
--- a/dev-python/pip/pip-19.3.1-r2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-SETUPTOOLS_PV="41.4.0"
-WHEEL_PV="0.33.6"
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-${WHEEL_PV}-py2.py3-none-any.whl
-	)
-"
-# PyPI archive does not have tests, so we need to download from GitHub.
-# setuptools & wheel .whl files are required for testing, exact version is not very important.
-
-LICENSE="MIT"
-KEYWORDS="amd64 arm64 ~hppa ~sparc x86"
-SLOT="0"
-IUSE="test -vanilla"
-
-# disable-system-install patch breaks tests
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/scripttest[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-19.3-disable-version-check.patch"
-
-		# these are from upstream git
-		"${FILESDIR}/pip-19.3.1-network-tests.patch"
-		"${FILESDIR}/${PN}-20.1.1-test-endian.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-19.3.1-r2-disable-system-install.patch" )
-	fi
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl \
-			tests/data/common_wheels/ || die
-
-		cp "${DISTDIR}"/wheel-${WHEEL_PV}-py2.py3-none-any.whl \
-			tests/data/common_wheels/ || die
-	fi
-}
-
-python_test() {
-	if [[ ${EPYTHON} == pypy* ]]; then
-		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
-		return 0
-	fi
-
-	local -a exclude_tests
-
-	# these will be built in to an expression passed to pytest to exclude
-	exclude_tests=(
-		git
-		svn
-		bazaar
-		mercurial
-		version_check
-		uninstall_non_local_distutils
-		pep518_uses_build_env
-		install_package_with_root
-		install_editable_with_prefix
-		install_user_wheel
-		install_from_current_directory_into_usersite
-		uninstall_editable_from_usersite
-		uninstall_from_usersite_with_dist_in_global_site
-		build_env_isolation
-	)
-
-	distutils_install_for_testing
-
-	# generate the expression to exclude failing tests
-	local exclude_expr
-	printf -v exclude_expr "or %s " "${exclude_tests[@]}" || die
-	exclude_expr="not (${exclude_expr#or })" || die
-
-	local -x GENTOO_PIP_TESTING=1 \
-		PATH="${TEST_DIR}/scripts:${PATH}" \
-		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
-
-	pytest -vv \
-		-k "${exclude_expr}" \
-		-m "not network" \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	# Prevent dbus auto-launch
-	# https://bugs.gentoo.org/692178
-	export DBUS_SESSION_BUS_ADDRESS="disabled:"
-
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	# '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"; import pip.__main__; sys.exit(pip.__main__._main())'
-
-	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/pip/pip-20.0.2.ebuild b/dev-python/pip/pip-20.0.2.ebuild
index fcb8d78d31a7..90db22a8b7b5 100644
--- a/dev-python/pip/pip-20.0.2.ebuild
+++ b/dev-python/pip/pip-20.0.2.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 # setuptools & wheel .whl files are required for testing, exact version is not very important.
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="test -vanilla"
 
diff --git a/dev-python/pip/pip-20.1.1.ebuild b/dev-python/pip/pip-20.1.1.ebuild
index c6e2c880ab95..4366b9350805 100644
--- a/dev-python/pip/pip-20.1.1.ebuild
+++ b/dev-python/pip/pip-20.1.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 # setuptools & wheel .whl files are required for testing, exact version is not very important.
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 SLOT="0"
 IUSE="test -vanilla"
 
diff --git a/dev-python/pip/pip-20.1.ebuild b/dev-python/pip/pip-20.2.2.ebuild
index 9da532f79f0e..8da2d952643e 100644
--- a/dev-python/pip/pip-20.1.ebuild
+++ b/dev-python/pip/pip-20.2.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="ssl(+),threads(+)"
 
 inherit bash-completion-r1 distutils-r1 multiprocessing
@@ -25,7 +25,7 @@ SRC_URI="
 # setuptools & wheel .whl files are required for testing, exact version is not very important.
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="test -vanilla"
 
@@ -46,7 +46,7 @@ DEPEND="
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/scripttest[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
+		<dev-python/virtualenv-20[${PYTHON_USEDEP}]
 		dev-python/werkzeug[${PYTHON_USEDEP}]
 		dev-python/wheel[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' -2)
@@ -56,11 +56,15 @@ DEPEND="
 python_prepare_all() {
 	local PATCHES=(
 		"${FILESDIR}/${PN}-19.3-disable-version-check.patch"
-		"${FILESDIR}/${PN}-20.1.1-test-endian.patch"
+		"${FILESDIR}/${PN}-20.2-no-coverage.patch"
 	)
 	if ! use vanilla; then
 		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
 	fi
+
+	# TODO
+	rm tests/functional/test_new_resolver_user.py || die
+
 	distutils-r1_python_prepare_all
 
 	if use test; then
diff --git a/dev-python/pip/pip-9.0.1-r2.ebuild b/dev-python/pip/pip-9.0.1-r2.ebuild
deleted file mode 100644
index 792b91c4cefa..000000000000
--- a/dev-python/pip/pip-9.0.1-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit eutils bash-completion-r1 distutils-r1
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-IUSE="-vanilla"
-
-# Check pip/_vendor/vendor.txt for this
-#VENDOR_DEPEND="
-#	>=dev-python/distlib-0.2.2[${PYTHON_USEDEP}]
-#	>=dev-python/html5lib-1.0b8[${PYTHON_USEDEP}]
-#	>=dev-python/six-1.10.0${PYTHON_USEDEP}]
-#	>=dev-python/colorama-0.3.6[${PYTHON_USEDEP}]
-#	>=dev-python/requests-2.9.1-r2[${PYTHON_USEDEP}]
-#	>=dev-python/CacheControl-0.11.6[${PYTHON_USEDEP}]
-#	>=dev-python/lockfile-0.12.2[${PYTHON_USEDEP}]
-#	>=dev-python/progress-1.2[${PYTHON_USEDEP}]
-#	>=dev-python/packaging-16.5[${PYTHON_USEDEP}]
-#	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
-#	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-#	virtual/python-ipaddress[${PYTHON_USEDEP}]
-#"
-# https://github.com/pypa/pip/issues/3057
-#RDEPEND="${VENDOR_DEPEND}
-#	>=dev-python/setuptools-19.2[${PYTHON_USEDEP}]
-#	<dev-python/setuptools-19.4[${PYTHON_USEDEP}]
-#"
-#DEPEND="${RDEPEND}"
-
-# required test data isn't bundled with the tarball
-RESTRICT="test"
-
-#PATCHES=(
-#	"${FILESDIR}"/${PN}-6.0.2-disable-version-check.patch
-#	"${FILESDIR}"/${PN}-8.0.0-unbundle.patch
-#	)
-
-#python_prepare_all() {
-#	mv pip/_vendor/__init__.py "${T}" || die
-#	rm -r pip/_vendor/* || die
-#	mv "${T}"/__init__.py pip/_vendor/__init__.py || die
-#
-#	distutils-r1_python_prepare_all
-#}
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-9.0.1-disable-version-check.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-disable-system-install.patch" )
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	"${PYTHON}" -m pip completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	"${PYTHON}" -m pip completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}