gentoo resync : 25.10.2021

9 files changed, 139 insertions, 315 deletions

diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index cac6da5f72be..2db658afbd58 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,15 +1,10 @@
+AUX virtualenv-20.8.1-pypy38.patch 4808 BLAKE2B e1d2ef42f0cf4098ba6e9fa20367defb0eda41952beddcd7c321863f72e19a553faeb4e543a60455141ca4b13690a69906bafc158e1d502f21cbd5bfb2a84a51 SHA512 7683d1a59d357fef28d31cfff26a11d08c5759aba482b04f01559afd1c36f81d349f8ecc2361ff1e0055d08108bdbf742006208ce0859e8f5da1a3f6f51610c0
 DIST virtualenv-20.4.7.tar.gz 10625204 BLAKE2B 1233ea45f771fb425b99c966904e2c5444e5fcb617b1d7cd34cdac097ee15566b7f4c841d444393723ed369193f33bef90ea7caa5b3c20aaf65fbde2f865abf7 SHA512 a554fb32cc46cb1cef2a2655bdae598efb52a4e71223eb10d9a36b124390546250aa11cf7da991a41ef4697523ec4562a31e35b5ab7ee8aba748ea4ff28e088b
-DIST virtualenv-20.6.0.tar.gz 8700762 BLAKE2B 718bbfda175ab4ef0820ba66b480060c0371c54a3e6c622c816d8c30141951c85b4f461fa03f71912a767b8d6a40733ab253062466e38a4a2e18b3169812e6a1 SHA512 7eff570f407a4986336d5a34bdcab1621d953aa6900d41962a85a5a44d7b68d378cda4a1bc1ddbfbc468580e051a98c37be17b0a52babbb00166718a987a591c
-DIST virtualenv-20.7.0.tar.gz 8714219 BLAKE2B 81b5ee144614a7c854e03599270d03454f991520e8381b98ef01b64e91bb7520a3949e5af9710ceb6292be6b7b7e3738ed7a08324b5ada37f8f4941b408fb425 SHA512 af0f993045013814d9397419fc9d789a1ad64dc53818cbeceb5146e418a8535f76b74ed36b4b164d6974660be77de91cda244eb70b810c8c9fb522ba1088813a
-DIST virtualenv-20.7.1.tar.gz 8714303 BLAKE2B 9ba0714fa842a4d4dc07f8a47536ad95f049c7d4149be7d859af55e6f26aef5d61c80399a8e03de183b7e170ac47eab6bee263c5d3df79eac6a00c63cb368873 SHA512 4d0127ef38655c6370c874a99dc3a92f2d1e50428496878e64aaf52a944f54fb6fc8397c1b4943c40c7cd5c19ee93cccfab735f38d3dcc202372e1081f0ea23f
 DIST virtualenv-20.7.2.tar.gz 8715517 BLAKE2B 306de1bb6e4aa1c888c28161abb33f7016da47a82bba7181687b99127998e82a67e24961610bcbea8a3cad8e7f218e7c76d62de26a74e2bbdf163ab76021bc41 SHA512 6ae91a0cd5cd4da000d0175762515b1b9af80e273d56293d9d57b3faf63ff72001c8d1b3326c1f9dfcea8a4a157c1f62332a2a02b84e25ac4bd3850b0d39aebc
-DIST virtualenv-20.8.0.tar.gz 8706991 BLAKE2B fe605a57ccded505a4f89a0b8410cd492fe165dca5b73a818422b14fadd3c3951b753e59a33a1f94dc4ed5c584ef32eae352cc92a0b71570dbdc2388ff792d62 SHA512 7666d3298d732017631fe6199256910becc91fdbfd259dfc32ca74471ed65055fa9e36e8451bd624af287b5a4611659d84e607b3669fd6183ca599929db88666
 DIST virtualenv-20.8.1.tar.gz 8708080 BLAKE2B 703e3e8e07105e4a7154d0e91a13ec2c6b7e37be92e73733a6850c7c1a96711c19b4974bc4f6d3816ea78095b2af807183f53cbc579acad9a7ec6815ea547294 SHA512 db373bdb68efce0ce26cefe508e452b62d4336ccf74f08a51aa61272127c8cd43639443342f42cacb62d7bfd1381bc1204211218c486dfcdb165d8486a2e728b
-EBUILD virtualenv-20.4.7.ebuild 4256 BLAKE2B 8fbe67f90a9b7079b5eb6b6e9c6c28fcc887fdcfa1bf31ba9fa02c62166ee8f7e42d1a98336110d452907133a0d75892b7d28c202a8075f88b32ac354dd57ca3 SHA512 db31bfb20d836ad986acff3b6ff5d16ef00a78379b02cf7d6be853aaaa08cbcbfcd7de106d47d398e9b8125644fc9daa164bfa6cb09a302e1f3135b709f38bb3
-EBUILD virtualenv-20.6.0.ebuild 4276 BLAKE2B 6533c59050af3916bdf02e38671cb6fa6558bacb9ca47af9a9282594fb5d97d3c8eb405db4c6f41a180203ba54dd77066f7bab75deebc8a101d078b22e8dd5c2 SHA512 f49d6360516804b898fa90bfd4a0592c58ed224e1abea528730f041e7f3cc15d68bf2628323feb5c05f724fdb1c085dd940ffdaedceae7010551f6ebc00d08d0
-EBUILD virtualenv-20.7.0.ebuild 4254 BLAKE2B 001e09ffdad208c5386993419b56dd0f0c35504d6591896a306b39e70f01ecbc0f47ef800f8b50bb502ee10eeb03d952d7c65cd6ec94823450c7b8d83c2b4fca SHA512 501bb46fb0e7ee7fabba977a25a4ab8b4168e18e5655226900320543e15dd95f84d0932bafd6a5230f3e7424e66c560ba853cc515cb2995dea7dea020595abad
-EBUILD virtualenv-20.7.1.ebuild 4254 BLAKE2B 001e09ffdad208c5386993419b56dd0f0c35504d6591896a306b39e70f01ecbc0f47ef800f8b50bb502ee10eeb03d952d7c65cd6ec94823450c7b8d83c2b4fca SHA512 501bb46fb0e7ee7fabba977a25a4ab8b4168e18e5655226900320543e15dd95f84d0932bafd6a5230f3e7424e66c560ba853cc515cb2995dea7dea020595abad
-EBUILD virtualenv-20.7.2.ebuild 4259 BLAKE2B 8a0c40d38de0bcc19a1112fee3352c738516c9586947f8dcab84595467dbb8c39119b93f66fd5ccf3a7bc3b6da1c86647c5d2133a6baf924bf16d559b5fbdff0 SHA512 089298f444f4f667dd5995f3dce29bd25848f55ee560238744d3f2118564e0b3a780c275cffff48f5a8ef16a796f8156040d86a26e4f1c8498cdba235c66136e
-EBUILD virtualenv-20.8.0.ebuild 4266 BLAKE2B 5268eb5253bd16aae9908c79309be6c9e41af015f8adfdfb133670e154aec7181826d3a45b65eb361ac9477fcbfec5be8bdd31371801d41aef489ee4ca9d0932 SHA512 3a25a1fecf2924d9470a9a260662bf882aea6612b97c3af43a37822f5523f0b4b9797913e809accb035904a727dcac22f10fc2fcbf43391baf9f9f0719d75e2d
-EBUILD virtualenv-20.8.1.ebuild 4272 BLAKE2B 1f51d9d30e8b52f106a1b5246ceb14f724961e62759f6136a647c818e761e2de471ff2e788dd1a6d832442c639789889b6d751c4c7b2c4189a830139e15dca6c SHA512 65918cd565777c6eea4716d721afe6e047f8111f8a3735dc20b32812d45f5b11d6c3888d49c535e14460b4626588ae65b44577257d49f3cbd044c93387d18460
+DIST virtualenv-20.9.0.tar.gz 9005930 BLAKE2B fb3875c34d282f030d06ad3e6f57d4d8ba9be9f9f40602b0129c5ae68e869a4b64cb5fb7935242518e09fd47294a8d87d6eec6db8f8e78947126564428aff07a SHA512 bfcf60946e2fcc0c4ac2dc9ad48187097961280dbd2353a23cb0aaab97aa63a247637d8f41ed6e6de9d30262978495ebb9519f932ebbb636cf81bb699beeab4d
+EBUILD virtualenv-20.4.7.ebuild 4177 BLAKE2B bf376450c121d476752301a909152a465de7646a712509dc11709baf7a997440aa7b9e09d0823e8bb08255f913aad7133765d524c7e99615eedaad2dfecd63e5 SHA512 e252764fe0c907dd8e6d1ba8c5fba977f48700a829373bae6cae34be2142fa40b1563f1d797c9ca63947897a786b1983ae6b3590ecc3ce58d98c2e4d73457bbe
+EBUILD virtualenv-20.7.2-r1.ebuild 4645 BLAKE2B ff89f8dbb08ad75a3129ba0113271f30342fa18a406c3595d8ab1b4482e3be9b62e8a73554d31f53d72b7bf5afc76975d8d580e1b4afd5657c3b496d26c91e93 SHA512 b43da9f650fd92469a0d539fb076c892aa6f1856977970e0f8234684ebdf18559b03ad860b69c398aa47d9ad0ffc6268a1d8ef231647ba2d35d1329d4c6caf66
+EBUILD virtualenv-20.8.1-r1.ebuild 4642 BLAKE2B 8aad6e2230e52a8a41c0f7ff368841879c28f5edb1b77c88285b438052e4000ec3e59748d70d3321e350051cc2a752d39c3164b894a62e064103e6f7d65efc3e SHA512 e3878cb1243af633de2f1ac029b481891cc0643b9eabee3f887acdd0dad4eaa7a33f323976c638b99c46a6440241117339bc1ddcfb6a888cc3d7e1e9b0eff1ca
+EBUILD virtualenv-20.9.0.ebuild 4599 BLAKE2B 825112b6e94eaaacab405607faa6bbdbda3f729b3316826f376da5409dc59482e8ce8d78f81c135f983d3703829ba6650cb354efec36c3e7707a145ea477d390 SHA512 4fff29e9288cfaa94c3bb69b1420914110d4b515316608f4ee0fc4e9d131fdb932d89911a20bfd920ff27d577a773d12256169eceb899d976f3b208d08096f4e
 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/files/virtualenv-20.8.1-pypy38.patch b/dev-python/virtualenv/files/virtualenv-20.8.1-pypy38.patch
new file mode 100644
index 000000000000..4cff243bcf2c
--- /dev/null
+++ b/dev-python/virtualenv/files/virtualenv-20.8.1-pypy38.patch
@@ -0,0 +1,102 @@
+From 8e3e6cceaefaf63acdf1762baac38c88af9fd15b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 2 Oct 2021 15:42:17 +0200
+Subject: [PATCH 1/7] Skip directories when symlinking libraries for PyPy3
+
+The PyPy3 logic creates symlinks for all files from the library
+directory existing alongside the PyPy executable.  This is meant
+to ensure that the bundled libraries to which PyPy is linked can also
+be found from inside the virtualenv.  However, this logic also symlinks
+all directories which is unnecessary and causes library directory
+collisions with the new install layout.  Change to logic to symlink
+non-directories only.
+
+A similar fix has been applied to the internal venv module in PyPy3.8:
+https://foss.heptapod.net/pypy/pypy/-/commit/713b2af9abd2b9453e12c60143e17431a1aefb33
+
+Fixes #2182
+---
+ docs/changelog/2182.bugfix.txt                             | 2 ++
+ src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py | 2 ++
+ 2 files changed, 4 insertions(+)
+ create mode 100644 docs/changelog/2182.bugfix.txt
+
+diff --git a/docs/changelog/2182.bugfix.txt b/docs/changelog/2182.bugfix.txt
+new file mode 100644
+index 000000000..0f26a202b
+--- /dev/null
++++ b/docs/changelog/2182.bugfix.txt
+@@ -0,0 +1,2 @@
++Fixed path collision that could lead to a PermissionError or writing to system
++directories when using PyPy3.8 - by :user:`mgorny`.
+diff --git a/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py b/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
+index be5319a2b..f740de963 100644
+--- a/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
++++ b/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
+@@ -44,6 +44,8 @@ def sources(cls, interpreter):
+         host_lib = Path(interpreter.system_prefix) / "lib"
+         if host_lib.exists() and host_lib.is_dir():
+             for path in host_lib.iterdir():
++                if path.is_dir():
++                    continue
+                 yield PathRefToDest(path, dest=cls.to_lib)
+ 
+ 
+
+From d7ec9269f38dee462c8b3012128aacbbe18894f5 Mon Sep 17 00:00:00 2001
+From: mattip <matti.picus@gmail.com>
+Date: Mon, 4 Oct 2021 12:01:41 +0300
+Subject: [PATCH 2/7] fix stdlib path
+
+---
+ src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py b/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
+index f740de963..0cb83ed9d 100644
+--- a/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
++++ b/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
+@@ -28,7 +28,7 @@ class PyPy3Posix(PyPy3, PosixSupports):
+     @property
+     def stdlib(self):
+         """PyPy3 respects sysconfig only for the host python, virtual envs is instead lib/pythonx.y/site-packages"""
+-        return self.dest / "lib" / "python{}".format(self.interpreter.version_release_str) / "site-packages"
++        return self.dest / "lib" / "pypy{}".format(self.interpreter.version_release_str) / "site-packages"
+ 
+     @classmethod
+     def _shared_libs(cls):
+
+From e1f065f703fe4b506cbc575a5a7c9d5fb6079095 Mon Sep 17 00:00:00 2001
+From: mattip <matti.picus@gmail.com>
+Date: Mon, 4 Oct 2021 16:06:04 +0300
+Subject: [PATCH 3/7] skip linking/copying the stdlib specifically, extensively
+ comment
+
+---
+ .../create/via_global_ref/builtin/pypy/pypy3.py        | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py b/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
+index 0cb83ed9d..0c26b79f0 100644
+--- a/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
++++ b/src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
+@@ -41,10 +41,18 @@ def to_lib(self, src):
+     def sources(cls, interpreter):
+         for src in super(PyPy3Posix, cls).sources(interpreter):
+             yield src
++        # Also copy/symlink anything under prefix/lib, which, for "portable"
++        # PyPy builds, includes the tk,tcl runtime and a number of shared
++        # objects. In distro-specific builds or on conda this should be empty
++        # (on PyPy3.8+ it will, like on CPython, hold the stdlib).
+         host_lib = Path(interpreter.system_prefix) / "lib"
++        stdlib = Path(interpreter.system_stdlib)
+         if host_lib.exists() and host_lib.is_dir():
+             for path in host_lib.iterdir():
+-                if path.is_dir():
++                if stdlib == path:
++                    # For PyPy3.8+ the stdlib lives in lib/pypy3.8
++                    # We need to avoid creating a symlink to it since that
++                    # will defeat the purpose of a virtualenv
+                     continue
+                 yield PathRefToDest(path, dest=cls.to_lib)
+ 
diff --git a/dev-python/virtualenv/virtualenv-20.4.7.ebuild b/dev-python/virtualenv/virtualenv-20.4.7.ebuild
index 04a7f9cfccd5..c9f386f60928 100644
--- a/dev-python/virtualenv/virtualenv-20.4.7.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.4.7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="hppa"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/virtualenv/virtualenv-20.6.0.ebuild b/dev-python/virtualenv/virtualenv-20.6.0.ebuild
deleted file mode 100644
index 3d63a4a907b5..000000000000
--- a/dev-python/virtualenv/virtualenv-20.6.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} 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="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~hppa ~mips ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/backports-entry_points_selectable-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
-	' python3_7 pypy3)"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		$(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-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}]
-			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-		' 'python3*')
-	)"
-
-# (unpackaged deps)
-#distutils_enable_sphinx docs \
-#	dev-python/sphinx-argparse \
-#	dev-python/sphinx_rtd_theme \
-#	dev-python/towncrier
-distutils_enable_tests pytest
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local deselect=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-	)
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-
-	distutils_install_for_testing
-	epytest ${deselect[@]/#/--deselect }
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.7.0.ebuild b/dev-python/virtualenv/virtualenv-20.7.0.ebuild
deleted file mode 100644
index 1c6b72d16019..000000000000
--- a/dev-python/virtualenv/virtualenv-20.7.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} 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="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/backports-entry_points_selectable-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
-	' pypy3)"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-20.0.2[${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}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)"
-
-# (unpackaged deps)
-#distutils_enable_sphinx docs \
-#	dev-python/sphinx-argparse \
-#	dev-python/sphinx_rtd_theme \
-#	dev-python/towncrier
-distutils_enable_tests pytest
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local deselect=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-	)
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-
-	distutils_install_for_testing
-	epytest ${deselect[@]/#/--deselect }
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.7.1.ebuild b/dev-python/virtualenv/virtualenv-20.7.1.ebuild
deleted file mode 100644
index 1c6b72d16019..000000000000
--- a/dev-python/virtualenv/virtualenv-20.7.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} 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="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/backports-entry_points_selectable-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
-	' pypy3)"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-20.0.2[${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}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)"
-
-# (unpackaged deps)
-#distutils_enable_sphinx docs \
-#	dev-python/sphinx-argparse \
-#	dev-python/sphinx_rtd_theme \
-#	dev-python/towncrier
-distutils_enable_tests pytest
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local deselect=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-	)
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-
-	distutils_install_for_testing
-	epytest ${deselect[@]/#/--deselect }
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.7.2.ebuild b/dev-python/virtualenv/virtualenv-20.7.2-r1.ebuild
index ab65ca42a212..dc4bf33b4314 100644
--- a/dev-python/virtualenv/virtualenv-20.7.2.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.7.2-r1.ebuild
@@ -52,21 +52,29 @@ BDEPEND="
 #	dev-python/towncrier
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/virtualenv-20.8.1-pypy38.patch
+)
+
 src_configure() {
 	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 }
 
 python_test() {
-	local deselect=(
+	local EPYTEST_DESELECT=(
 		tests/unit/activation/test_xonsh.py
 		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
 		tests/unit/create/test_creator.py::test_cross_major
 	)
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
 		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
 		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
 		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
 		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
 		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
 		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
 		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
@@ -87,7 +95,7 @@ python_test() {
 	)
 
 	distutils_install_for_testing
-	epytest ${deselect[@]/#/--deselect }
+	epytest
 }
 
 pkg_postinst() {
diff --git a/dev-python/virtualenv/virtualenv-20.8.0.ebuild b/dev-python/virtualenv/virtualenv-20.8.1-r1.ebuild
index 7e18c125fdac..960f69332eb2 100644
--- a/dev-python/virtualenv/virtualenv-20.8.0.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.8.1-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 RDEPEND="
@@ -52,21 +52,29 @@ BDEPEND="
 #	dev-python/towncrier
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${P}-pypy38.patch
+)
+
 src_configure() {
 	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 }
 
 python_test() {
-	local deselect=(
+	local EPYTEST_DESELECT=(
 		tests/unit/activation/test_xonsh.py
 		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
 		tests/unit/create/test_creator.py::test_cross_major
 	)
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
 		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
 		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
 		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
 		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
 		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
 		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
 		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
@@ -87,7 +95,7 @@ python_test() {
 	)
 
 	distutils_install_for_testing
-	epytest ${deselect[@]/#/--deselect }
+	epytest
 }
 
 pkg_postinst() {
diff --git a/dev-python/virtualenv/virtualenv-20.8.1.ebuild b/dev-python/virtualenv/virtualenv-20.9.0.ebuild
index 2bfbb6c72e50..49b7be5d7c71 100644
--- a/dev-python/virtualenv/virtualenv-20.8.1.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.9.0.ebuild
@@ -57,16 +57,20 @@ src_configure() {
 }
 
 python_test() {
-	local deselect=(
+	local EPYTEST_DESELECT=(
 		tests/unit/activation/test_xonsh.py
 		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
 		tests/unit/create/test_creator.py::test_cross_major
 	)
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
 		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
 		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
 		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
 		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
 		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
 		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
 		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
@@ -87,7 +91,7 @@ python_test() {
 	)
 
 	distutils_install_for_testing
-	epytest ${deselect[@]/#/--deselect }
+	epytest
 }
 
 pkg_postinst() {