9 files changed, 33 insertions, 370 deletions
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 8d6622c64dc5..beff94d3969b 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,18 +1,8 @@
-AUX virtualenv-12.1.1-skip-broken-test.patch 542 BLAKE2B 8c924cafcc0ee78b3101d55a58db8f352f793fb873a2d82b00b13a41fea9b556d90613a8df1b4a86939b22573542d2187366a9e551ed3090c62d6bc4566779c7 SHA512 9517f2efccb3cd177370cf66ea12244a39e762aae64e9bd412fc05af087648066deaf62d381b52a0eee1487c82109df4bd463599eaa641890c32eec48b694f25
 AUX virtualenv-16.7.7-tests-internet.patch 2103 BLAKE2B 56ac246fb6675c273e288b230c2502691f36f49502427c234c8b2da1a2d187791aced234fd70f7be98b98ff158f570747e670cc0ededdab1d5ed499d7b8588be SHA512 17f2a38d32f17c7f8bfe138939b6953dcbf13404371b8377a47759118ad37aaf73f45f670d46d5956fd5948754fb9c60248d9222920c6fd7e7c2e7c7661c9a18
 AUX virtualenv-16.7.7-tests.patch 2092 BLAKE2B fe9eef6372958265ff4b0b919c424a16313934973f29f15f726541cf3a32a9e49d163a40ff0b2d08d17f6521cc7d651fa092d66eb196261706d8d11a9e590e31 SHA512 f4c8a46d5d064672bd154beb0c1fd4a368e9879046931a67fc053e314b5f8510e825cbb3ad3d7e149a19745149a47d4e694b0f6b9f771dcf55e35bcc0871eb59
 AUX virtualenv-16.7.8-tests-pypy.patch 3133 BLAKE2B 37d544c96a1546aa0df4e820014ee6091d4b4ca5155da86280aaebfb1a8d26ce9c6a055e47b11129509d7d00abcee0e3a915bd6ff4665b289cfce399f2dfd3b6 SHA512 f99cd435fe9fa98465addc6b22310e5d708c87edef224cdf540556a2ab1a70bebf06e828c02148bb597d163c31b2816845c0c8126727d1d25b38ffcb91c2251e
-AUX virtualenv-20.0.21-py39.patch 1161 BLAKE2B a8f8f9f45add1e48b0904b5de85479b44cf5bae9153d8362bdd47892ec5ef57a85e55d6d7e797b5d7a79efcb2bf579f39b6c5fe4fc31dff4f9e6fa8bd442aea6 SHA512 17886796c0dbc388c4d115f81f7b129ff18a649a68e474142ebf06d708864a7ca19a32e19c7b3b9d7d526b52be38dc76c8b26f761088b60ec8c9d3252ac6b0c2
-DIST virtualenv-16.0.0.tar.gz 1968312 BLAKE2B efc25f7c12335bb8619c3de125af3693d73afc5e7ff4edf1afa95227360ab4d0eb2ffb574b9bb36de26a2bda65b1f06009308fef48b12a81050bbc1f4ab852e9 SHA512 aed6eff9b85107072c321b37c1725987d474caf615734ab40d8d1fa60f2635be1a1919a47fbd211127e38cf1c4002548c778df29fc56d45a4570b31906c0ee54
 DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
-DIST virtualenv-16.7.9.tar.gz 5116740 BLAKE2B 10b77c4d74d3b1be60d567caf60b48274893777313d7151350df1d8a7d86d7cbd299c6c04734cbad134512e2ea05f5bc694648b6e9307019ffd9b91f7d0cdaf5 SHA512 d7379941e299c44beba30eaab68d5f1a6650f767b24f95d5e8abd05c1529dca4c1423113a41ff42690bb2b2bd4fe05c3e47a8fed4f9df0972188f6c77034436b
-DIST virtualenv-20.0.18.tar.gz 7982748 BLAKE2B f759ff1c42aaf9229e3f8dedd7b50df12e3a7616f979e18a5a91d58afd190beea86c67e0f7c530ba327427f3a4967ab27d7b922723c9ce92cba844946f8eb8ff SHA512 9295acb4d21da13c93fcf2a73244137a6fd8384313cf2685b67295f3be8cf33aaf6d22fc9ba4fa93dbfd81429eeaf4eb46d752fb717f0f74c172a754b92d41e6
-DIST virtualenv-20.0.21.tar.gz 8036935 BLAKE2B 63519368c951989a4112abd77bc8dbdb3548872ccd2da8c8fb8ed0d8dd2b99271df4b666dc5618eb4ccb650ecefff07d57e47ba6ce56c770de432e79f5eb1931 SHA512 168bd977bfecf98b76a20c6059fa372a3a9681e778539d962c7062a19ffdf3387c89eca50e03a4fe83ff2ae8affaf8ec3f87141d0c94240ea205df329a113651
-DIST virtualenv-20.0.23.tar.gz 8038565 BLAKE2B e11a7e36c33848fc9c8ad12fed369e6804c11a89e11cb66ff105b4e4e5758dcab15809932f88d9ddbc229d1bb862d29dead9ff2e4da655603e627887a1a2cd1d SHA512 01a56564ac09abca25cd163e7b425d8dbf1f57d6771b57e1f5fe4182f86197009e7ebdcb6f4a8640c8b8f0cdfcfdcd843f7be33848c66b0b5877cc7a8fe6ee0e
-EBUILD virtualenv-16.0.0.ebuild 1229 BLAKE2B 1471e961cb3e6eac155ad7c7aa761ee6fc3cc067f043c05f0dabcad30cee98c9689bae08e4f37a05a4a47c0627bd8d124be23f0804952b564309cd05a6e5491f SHA512 0204f47949d89816bba0295b24c076ec375f31e19071ffcccb3f0b70068c88a12fff97e292ed636ac9b0edda5bc5ba4f912d6486d30c3f3956f7456771eb4120
-EBUILD virtualenv-16.7.10.ebuild 1762 BLAKE2B f00d03022a30babf6278c6735ca5b9a860ea8481410539e1538ea870ff1b34f4841376bb229daaa0258b2fbe5059e976e3193b98419a604749dd7bc81fd0188b SHA512 932f0bb7e39b68a4f82485f578f63c3c2f9dd8d9ea48cf628d536b761261ea540e845221e62474aa5a428634fdd08c5adb9cef14f224a273e7dceb2b2265ba3d
-EBUILD virtualenv-16.7.9-r1.ebuild 1828 BLAKE2B a6092602da117163b2b6b7882a7e2fff1acd9334c5150b8d9f7ea37b5855dda60924d374e3b3ecc4f2426f3a0d426ec7dbb17a9c577f4285f499123ccfd39b62 SHA512 0c714cb640d21eabb8eafd0c641989b9d896748889f987b381ec137d15da79dc1caa757ef94ef1ecbdef790d9018fc8197b4337223b85eca4821770eaaf2b35f
-EBUILD virtualenv-20.0.18.ebuild 2272 BLAKE2B 0ae1219c1cb9d17e39912cd4963a3c2ee8898e71a61e894ab453e85c50926a2721be52a26652028a30decace9d4ad0eb0f30ba3d569e19d132e0472728f16cae SHA512 989f04d992e7699038ded65a15f5904fd077b6037b49711f0df91fb8b760207b2abb967fda53d2aa684371bb9dd38f30f2189be2d4d8e7de78c7098dfdde9768
-EBUILD virtualenv-20.0.21.ebuild 2597 BLAKE2B 0f6868368b0babd66fdcc7411f50bb9b3899bb75babca111e7f61610d3af7f1b84975a98f8b99ab36c1c42713931384dc3de0a7fa1b8218f91b3b201dcf12028 SHA512 b31cab9e92aa539977242293fa58392c5ef7826b85371f0357264b6e5601b8afbc9152ba365a99aee05de0728e4bdd1057d88191f06eb174b4e94394095d78d3
-EBUILD virtualenv-20.0.23.ebuild 2582 BLAKE2B 5c6421e1682a7878d89e40754b1a9445de3f5da7503ddbaa2b728499c0c1bbead6e3f6c1239950778a4c0c181326193e7d7dfc79aef5f0142ce24a7e4bf4828e SHA512 52bcf6f1ed5bc14634d31c250948efa486bfa9c25bf69f958fe3286ed43ad1f9e5ace94288907465e2b4d8d9da8f82669cdec7f2ef57056a3997f7bcb41c389d
+DIST virtualenv-20.0.31.tar.gz 8300305 BLAKE2B 1574b553b2bc8e05bf00584379f80c1e5c0ee9798595255830059eedea62f02f02d216c421aa2cb312bc9e60694f6a409d0c2495858a89fc1ad7aaddea7965ff SHA512 46220bda37b3b860e44c4d0775a89c22a7ba775287f05438d1d3698201cc213a05b2718ef40be302627005ae349dc59a3141c7a30cc1dab6dc81f7692c7f16a5
+EBUILD virtualenv-16.7.10.ebuild 1901 BLAKE2B e9464ea36c8772c6cbc19df04458ebc53bceafa9cf39a8e13ec2805d9a8c3a38a2e7b1bbae6a589dc5d912256c770e55f54a84b476b81d2c41c2907e495dfbe6 SHA512 586cc1b761b9a46e03a45835a010877aa9e7e29b00e35d722f5bc244a051aa3aad2458ac2f36311749291bf9a3e81671fd77d14fbcd9fe5aace0652d843d0686
+EBUILD virtualenv-20.0.31.ebuild 2612 BLAKE2B 1d09906f4570e8dd0bfd8e02569bb58ecbe7790f0afa506bc533b6fdf6f12005ba02b67589bc68fded0b0ef07c2ef063c093507adbef90692b57f7858fb70fc3 SHA512 bb1ee0a4b9a3f68c6e6fc2eae5250e4de465a1a575c4f517e7c52e59007058a939a29203a8480d9c593b0a5fd7a465c0a0e8a6d24b10958960996a21b5b3fdb3
 MISC metadata.xml 380 BLAKE2B 9a15805179f82d4e5c60aeb56191e690f9fe9260e34d9b4e0b893a51522fdc61246f02b20c1b55084709e06d6ce53b2e6436947aa178e2d413a923102d7ee125 SHA512 b6385fef70c6988548a00e6987bf5004979d139ad6c501d3f7b739bacef06eafa39a40bee8cc2d1164e01bb425f131aeea13f4b58ed6e75d66773a4f1c1df824
diff --git a/dev-python/virtualenv/files/virtualenv-12.1.1-skip-broken-test.patch b/dev-python/virtualenv/files/virtualenv-12.1.1-skip-broken-test.patch
deleted file mode 100644
index 5c14c3e22850..000000000000
--- a/dev-python/virtualenv/files/virtualenv-12.1.1-skip-broken-test.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- virtualenv-12.1.1/tests/test_virtualenv.py
-+++ virtualenv-12.1.1/tests/test_virtualenv.py
-@@ -6,6 +6,7 @@
- import tempfile
- import pytest
- import platform  # noqa
-+import unittest
- 
- from mock import patch, Mock
- 
-@@ -126,7 +127,7 @@
-         shutil.rmtree(tmp_virtualenv)
- 
- 
--@pytest.mark.skipif("platform.python_implementation() == 'PyPy'")
-+@unittest.skip("Running create environment while testing is broken")
- def test_always_copy_option():
-     """Should be no symlinks in directory tree"""
-     tmp_virtualenv = tempfile.mkdtemp()
diff --git a/dev-python/virtualenv/files/virtualenv-20.0.21-py39.patch b/dev-python/virtualenv/files/virtualenv-20.0.21-py39.patch
deleted file mode 100644
index 221cc734d268..000000000000
--- a/dev-python/virtualenv/files/virtualenv-20.0.21-py39.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a8717bf6ac3375d7f26738189c32e3bae04d280a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bern=C3=A1t=20G=C3=A1bor?= <bgabor8@bloomberg.net>
-Date: Fri, 22 May 2020 12:41:32 +0100
-Subject: [PATCH] Add 3.9 on Linux to the test suite (#1839)
-
----
- azure-pipelines.yml                  | 10 ++++++----
- setup.cfg                            |  3 ++-
- tests/integration/test_zipapp.py     |  2 ++
- tests/unit/activation/test_xonsh.py  |  3 +++
- tests/unit/discovery/test_py_spec.py |  2 ++
- tox.ini                              |  2 +-
- 6 files changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/tests/unit/discovery/test_py_spec.py b/tests/unit/discovery/test_py_spec.py
-index 445412773..52154f14c 100644
---- a/tests/unit/discovery/test_py_spec.py
-+++ b/tests/unit/discovery/test_py_spec.py
-@@ -95,6 +95,8 @@ def _version_not_satisfies_pairs():
-                 for o in [1, -1]:
-                     temp = copy(sat_ver)
-                     temp[patch] += o
-+                    if temp[patch] < 0:
-+                        continue
-                     sat = ".".join(str(i) for i in temp)
-                     target.add((req, sat))
-     return sorted(target)
diff --git a/dev-python/virtualenv/virtualenv-16.0.0.ebuild b/dev-python/virtualenv/virtualenv-16.0.0.ebuild
deleted file mode 100644
index 87a7b5e5be62..000000000000
--- a/dev-python/virtualenv/virtualenv-16.0.0.ebuild
+++ /dev/null
@@ -1,50 +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,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( docs/index.rst docs/changes.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-12.1.1-skip-broken-test.patch
-)
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test -v -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/virtualenv/virtualenv-16.7.10.ebuild b/dev-python/virtualenv/virtualenv-16.7.10.ebuild
index a50edc6e731b..b8f4327d4e7d 100644
--- a/dev-python/virtualenv/virtualenv-16.7.10.ebuild
+++ b/dev-python/virtualenv/virtualenv-16.7.10.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
@@ -26,14 +26,16 @@ RESTRICT="!test? ( test )"
 RDEPEND=">=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
 	test? (
-		>=dev-python/pip-19.3.1-r1[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pypiserver[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/pip-19.3.1-r1[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pypiserver[${PYTHON_USEDEP}]
+			dev-python/pytest-localserver[${PYTHON_USEDEP}]
+			dev-python/pytest-timeout[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' -3)
 	)"
 
 DOCS=( docs/index.rst docs/changes.rst )
@@ -53,6 +55,11 @@ distutils_enable_sphinx docs \
 	dev-python/towncrier
 
 python_test() {
+	if ! python_is_python3; then
+		ewarn "Tests are skipped on py2, please test externally"
+		return
+	fi
+
 	cp "${S}"/LICENSE.txt "${BUILD_DIR}"/lib || \
 		die "Could not copy LICENSE.txt with ${EPYTHON}"
 
diff --git a/dev-python/virtualenv/virtualenv-16.7.9-r1.ebuild b/dev-python/virtualenv/virtualenv-16.7.9-r1.ebuild
deleted file mode 100644
index d6c847fb9ef5..000000000000
--- a/dev-python/virtualenv/virtualenv-16.7.9-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pypy{,3} dropped until test deps are tested/updated
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~alpha amd64 ~hppa ~sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pip-19.3.1-r1[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pypiserver[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( docs/index.rst docs/changes.rst )
-
-PATCHES=(
-	"${FILESDIR}/virtualenv-16.7.7-tests.patch"
-
-	# disable tests that need internet access
-	"${FILESDIR}/virtualenv-16.7.7-tests-internet.patch"
-
-	# test fixes for pypy
-	"${FILESDIR}/virtualenv-16.7.8-tests-pypy.patch"
-)
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/towncrier
-
-python_test() {
-	cp "${S}"/LICENSE.txt "${BUILD_DIR}"/lib || \
-		die "Could not copy LICENSE.txt with ${EPYTHON}"
-
-	pytest -vv tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/virtualenv/virtualenv-20.0.18.ebuild b/dev-python/virtualenv/virtualenv-20.0.18.ebuild
deleted file mode 100644
index 85130547d143..000000000000
--- a/dev-python/virtualenv/virtualenv-20.0.18.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/contextlib2-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/pathlib2-2.3.3[${PYTHON_USEDEP}]
-	' -2)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
-	' -2 python3_{6,7} pypy3)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
-	' -2 python3_6 pypy3)"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-		' -3)
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/towncrier
-distutils_enable_tests pytest
-
-src_prepare() {
-	# we don't have xonsh
-	rm tests/unit/activation/test_xonsh.py || die
-	# TODO: investigate
-	sed -e 's:test_cross_major:_&:' \
-		-i tests/unit/create/test_creator.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	# TODO: fix/skip with more granularity tests on pypy3
-	if has "${EPYTHON}" pypy3 python2.7; then
-		einfo "Skipping broken tests on pypy3"
-		continue
-	fi
-
-	distutils_install_for_testing
-
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/virtualenv/virtualenv-20.0.21.ebuild b/dev-python/virtualenv/virtualenv-20.0.21.ebuild
deleted file mode 100644
index 2f37b45989c3..000000000000
--- a/dev-python/virtualenv/virtualenv-20.0.21.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/contextlib2-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/pathlib2-2.3.3[${PYTHON_USEDEP}]
-	' -2)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
-	' -2 python3_{6,7} pypy3)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
-	' -2 python3_6 pypy3)"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-		' -3)
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/towncrier
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py39.patch
-)
-
-src_prepare() {
-	# we don't have xonsh
-	rm tests/unit/activation/test_xonsh.py || die
-	# require internet
-	sed -e 's:test_seed_link_via_app_data:_&:' \
-		-i tests/unit/seed/test_boostrap_link_via_app_data.py || die
-	# TODO: investigate
-	sed -e 's:test_cross_major:_&:' \
-		-i tests/unit/create/test_creator.py || die
-	sed -e 's:test_py_info_to_system_raises:_&:' \
-		-i tests/unit/discovery/py_info/test_py_info.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	# TODO: fix/skip with more granularity tests on pypy3
-	if has "${EPYTHON}" pypy3 python2.7; then
-		einfo "Skipping broken tests on pypy3"
-		continue
-	fi
-
-	distutils_install_for_testing
-
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/virtualenv/virtualenv-20.0.23.ebuild b/dev-python/virtualenv/virtualenv-20.0.31.ebuild
index 6c1825d6e7d5..651770201985 100644
--- a/dev-python/virtualenv/virtualenv-20.0.23.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.0.31.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=manual
 
 inherit distutils-r1
@@ -14,17 +14,17 @@ HOMEPAGE="
 	https://pypi.org/project/virtualenv/
 	https://github.com/pypa/virtualenv/
 "
-SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
 	>=dev-python/filelock-3[${PYTHON_USEDEP}]
 	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
@@ -46,8 +46,10 @@ BDEPEND="
 		${RDEPEND}
 		$(python_gen_cond_dep '
 			dev-python/coverage[${PYTHON_USEDEP}]
+			dev-python/flaky[${PYTHON_USEDEP}]
 			>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
 			>=dev-python/pytest-5[${PYTHON_USEDEP}]
+			>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
 			>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
 			>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
 			dev-python/wheel[${PYTHON_USEDEP}]
@@ -64,12 +66,10 @@ src_prepare() {
 	rm tests/unit/activation/test_xonsh.py || die
 	# require internet
 	sed -e 's:test_seed_link_via_app_data:_&:' \
-		-i tests/unit/seed/test_boostrap_link_via_app_data.py || die
+		-i tests/unit/seed/embed/test_boostrap_link_via_app_data.py || die
 	# TODO: investigate
 	sed -e 's:test_cross_major:_&:' \
 		-i tests/unit/create/test_creator.py || die
-	sed -e 's:test_py_info_to_system_raises:_&:' \
-		-i tests/unit/discovery/py_info/test_py_info.py || die
 
 	distutils-r1_src_prepare
 }
@@ -79,10 +79,13 @@ src_configure() {
 }
 
 python_test() {
-	# TODO: fix/skip with more granularity tests on pypy3
-	if has "${EPYTHON}" pypy3 python2.7; then
-		einfo "Skipping broken tests on pypy3"
-		continue
+	if ! python_is_python3; then
+		ewarn "Tests are skipped on py2, please test externally"
+		return
+	elif [[ ${EPYTHON} == pypy3 ]]; then
+		# TODO: skip with better granularity
+		ewarn "Skipping broken tests on pypy3"
+		return
 	fi
 
 	distutils_install_for_testing