Adding metadata

31 files changed, 606 insertions, 403 deletions

diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 191b95df792e..67bfc1997a3e 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1 +1,2 @@
 DIST arrow-1.1.1.tar.gz 113054 BLAKE2B 7f9d205aaba1c8ea4ad433baad03cf2392e5dcb819a95ef8de612f7d6f8cbb8500d224648c61a0f48403878e9b02fa8e90e3e3fb6411fa23eaf1f333205f7c1e SHA512 eaa6cde1083a0ed1204260ae9b9c850ca2dfcc53858e2391def28b2aaefe78671166bfdefa1c725adceb26fa8425885d3a0c3914782203e1c3be593dd9a00349
+DIST arrow-1.2.0.tar.gz 115903 BLAKE2B d9f58ef6ffeb164a8ab1b210902b76f9efb0b08fc5e2a50611f81f903f9d8d5078b88929ef93146cf139ff1b32b993b69f96b56869680bb020264bf0056e514b SHA512 038bf7d7afbe2a3b419eec88c254d5233a5050eef97e00ca5e90e21cbfc8a157252bee269db45f25e3016cb50848c194ef456cd9eb04bb4f01d0c3614f4c49fa
diff --git a/dev-python/arrow/arrow-1.2.0.ebuild b/dev-python/arrow/arrow-1.2.0.ebuild
new file mode 100644
index 000000000000..a13e35cebce2
--- /dev/null
+++ b/dev-python/arrow/arrow-1.2.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Better dates and times for Python"
+HOMEPAGE="https://github.com/arrow-py/arrow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' pypy3)"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' tox.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/cssutils/cssutils-2.3.0.ebuild b/dev-python/cssutils/cssutils-2.3.0.ebuild
index cd040ab3c5c0..ff4de6b678db 100644
--- a/dev-python/cssutils/cssutils-2.3.0.ebuild
+++ b/dev-python/cssutils/cssutils-2.3.0.ebuild
@@ -21,6 +21,9 @@ BDEPEND="
 		dev-python/cssselect[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/importlib_resources[${PYTHON_USEDEP}]
+		' python3_8 pypy3)
 	)"
 
 PATCHES=(
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 4f34249beb05..29009d8b6165 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1 +1,2 @@
+DIST dask-2021.10.0.tar.gz 3963245 BLAKE2B cfccf683a6fc3b55f2be3e62b04e733586401ab642ed2ed0a6cc6956e4179d5692fb1aa94757fceacf1b40efd7ea46b6d5f7bb5df407d0f51d2f711c1672307e SHA512 801378c1e09eeb6825603d4de8efe711c04c1d83dbd37d44a66695c1629d74e6914670015fb231b270fa61a668120358aa5cd32d4ee99096616624e8fe0905fa
 DIST dask-2021.9.1.tar.gz 3794819 BLAKE2B c3ed5050581f41c4ea82ad9d1d233205f105434e5e6dcc654ba2e999b8cf105033d58ecf045d2063dabcb701cb2af6f092ecfd8435d24e5949ed2d39b54ae19e SHA512 20beca3f68c2e21d54c941049a1f352e19fcce7b5f7ecf84abf60cfb9979551a3e83938ca5439b662d35c0b64b26d726f6fea85641e737d0060c56a2e879755e
diff --git a/dev-python/dask/dask-2021.10.0.ebuild b/dev-python/dask/dask-2021.10.0.ebuild
new file mode 100644
index 000000000000..8750ad7688da
--- /dev/null
+++ b/dev-python/dask/dask-2021.10.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="https://dask.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/dask-2021.10.0-warning.patch
+)
+
+python_test() {
+	epytest -p no:flaky -m "not network"
+}
diff --git a/dev-python/dask/files/dask-2021.10.0-warning.patch b/dev-python/dask/files/dask-2021.10.0-warning.patch
new file mode 100644
index 000000000000..87c2ab318aee
--- /dev/null
+++ b/dev-python/dask/files/dask-2021.10.0-warning.patch
@@ -0,0 +1,38 @@
+From f59293c180f846a220762701006d25655095991f 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 09:09:29 +0200
+Subject: [PATCH] Fix test_describe_empty to work without global -Werror
+
+Fix test_describe_empty to work when the test suite is run without
+global -Werror.  This is e.g. desirable for packagers who don't want
+the test suite for a fixed version to suddenly start failing due to
+DeprecationWarnings in dependencies that otherwise don't break
+the package.
+
+Since the test expects either a ValueError or a RuntimeWarning, it seems
+that the easiest way to assert for that is to inject the "error" filter
+for the scope of the call.
+---
+ dask/dataframe/tests/test_dataframe.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/dask/dataframe/tests/test_dataframe.py b/dask/dataframe/tests/test_dataframe.py
+index 32edb488..e0d88ba8 100644
+--- a/dask/dataframe/tests/test_dataframe.py
++++ b/dask/dataframe/tests/test_dataframe.py
+@@ -570,7 +570,11 @@ def test_describe_empty():
+     )
+ 
+     with pytest.raises((ValueError, RuntimeWarning)):
+-        ddf_len0.describe(percentiles_method="dask").compute()
++        with warnings.catch_warnings():
++            # ensure that the warning is turned into an error since this is
++            # the easiest way to assert for exception-or-warning
++            warnings.simplefilter("error")
++            ddf_len0.describe(percentiles_method="dask").compute()
+ 
+     with pytest.raises(ValueError):
+         ddf_nocols.describe(percentiles_method="dask").compute()
+-- 
+2.33.1
+
diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
index 271f5f22ee7e..e5dc9714e80f 100644
--- a/dev-python/gitdb/Manifest
+++ b/dev-python/gitdb/Manifest
@@ -1 +1,2 @@
 DIST gitdb-4.0.7.tar.gz 394664 BLAKE2B 4a4586ac276c719110e7ad9ddccca8c0f45cca42f6740d990a974b043a749148088c495ad1939794382ff4094afa712cfa7f17619f371423f1b7a10e65ce72d2 SHA512 db63a613ee59249a3fccbd09fc0eca5747b166180bb5885737f849e339e81dfacd04f65e438fef241cf013cde33fe8c99a569c1599b2b5defd37b50e87dbdb0a
+DIST gitdb-4.0.8.tar.gz 394637 BLAKE2B 8eb3b04664df0fb40b93ee814d94a2526d62127c3dd7d0908f8c3ab9c3fc4d7ad368ad6a4288e509ce2f6e43348cb4f3761aaf404040bad1c59bc920517888af SHA512 fa883bf135080a9defa039bf1f13aebdb91c7e8d397c870e24d7c13acc1b30fc32c6299b43c117657382c1908ace748b0967bc53e02c2d73633cc8603fcb8003
diff --git a/dev-python/gitdb/gitdb-4.0.8.ebuild b/dev-python/gitdb/gitdb-4.0.8.ebuild
new file mode 100644
index 000000000000..b782b40fda2c
--- /dev/null
+++ b/dev-python/gitdb/gitdb-4.0.8.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="GitDB is a pure-Python git object database"
+HOMEPAGE="
+	https://github.com/gitpython-developers/gitdb
+	https://pypi.org/project/gitdb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-vcs/git
+	)"
+
+distutils_enable_tests nose
+
+src_test() {
+	local i
+
+	mkdir "${T}"/repo || die
+	cd "${T}"/repo || die
+
+	for (( i = 0; i < 2500; ++i )); do
+		echo "${i}" > file"${i}" || die
+	done
+
+	git init || die
+	git config user.email "you@example.com" || die
+	git config user.name "Your Name" || die
+	git add -A || die
+	git commit -q -m ".." || die
+	git clone --bare "${T}"/repo "${T}"/repo.git || die
+	cd "${S}" || die
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	#TRAVIS=1 disables performance tests which rely on the gitdb repo
+	local -x TRAVIS=1
+	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index 99a2e45943cd..5099a7ac61c4 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,3 +1,4 @@
 DIST identify-2.2.14.tar.gz 101144 BLAKE2B 9a23595173ab2ebfcbbcfc503e9750ef1e9c0c068e9d1a1b2f47dd2e08787f734541a79ae65b4a72a7de076b8f7ab4f877f3bb049560f33b38698729b9d5f3ab SHA512 9dc27e745f30fc1e6ee5135cdb82de004a5c60f17c47ab3e1deffe1c3c04adc47211bde161216be202db2171711a7dfea5f0ba60a56fea0cbc75ec6d55c6203f
 DIST identify-2.2.15.tar.gz 101146 BLAKE2B 1855598314c191a9e4d2f73c2c7a424957a76177df1daf32b4c7de6ddbda4439fac0860ed105e4a2ca4aef0555843157499e9840cbbccf42cf728aef93b13607 SHA512 5b85c07603381174fb4265ad8fc411645dc0cecb68b3fc9b2afa7111f18eae7cf39d5cf1000eda8ded256f441a4bf05d9ded11f31c9aa80f55efaf2dc6745697
 DIST identify-2.3.0.tar.gz 101179 BLAKE2B d51911a69a9845d136c0b5ce50a3ed94c50d80d6d8c89a2c823f1a85cafef373dab68716c5b38907bc920ca5f4d67ef969d598539e59e32bc2c36a0427d37765 SHA512 356e3c983273a771c06863a63fb53bdca9e3df3a50382f47da0d5ef7cee1b83d9279eb0d1e6c28409b2550f6e16eb793901147983582d792cdd39bb4d4c6e9f1
+DIST identify-2.3.1.tar.gz 101199 BLAKE2B e2d37c10e0190b2f876011aec57ce2aa7b4e227e138e1ff78666694516f8f9c2b0d104200daaf4e634f9774bceff2c97d72a77b7918b5e4a943ad5f4d6a1da3f SHA512 6102418672ec2f038b884ed55956fdccd1ff3a2f4da0da0d8b65f93237456314de984be32d2f20fe6754a7dea9f1887628c93a58f42378466bb914a9dde4c0db
diff --git a/dev-python/identify/identify-2.3.1.ebuild b/dev-python/identify/identify-2.3.1.ebuild
new file mode 100644
index 000000000000..bae7649cf429
--- /dev/null
+++ b/dev-python/identify/identify-2.3.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="File identification library for Python"
+HOMEPAGE="https://github.com/pre-commit/identify"
+SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 70c1ac6a904d..e64327676d1f 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,4 +1,5 @@
 DIST pip-21.2.4.tar.gz 8786693 BLAKE2B 02d4cdd3d9feda2d4daaf7552bf86e068d2f040ef9836a128c8dfc36697594d6a7d830cc58dc4f2d42c22fec0230f3055ab8b5b204bfd1fb0b9429e2dd44f537 SHA512 3c018601bca60d865032962deaf0ba4943fc6c3f3d8d69dab65f987737daf7fa91492c8250ab36988d1fa5f22b20608ada88ac1ffde914a7d72485bf5164b45f
+DIST pip-21.3.1.tar.gz 8961896 BLAKE2B f694956854cfd26f9b043fc28994448d2b2efff04080808f4e89ba15905887b432efb02d1c81370f75bd42e5c615a5a2360af63437967bc2fef63a85d59906a7 SHA512 2f50f95fe36cffc18821a70824f5b28d03598894f9ea5b02acc4921d16fc7739131814828a2159bcd577331cc780c7776a3669fa1ca2d4690c861add10a16f00
 DIST setuptools-57.4.0-py3-none-any.whl 819017 BLAKE2B afba86cf9aeea58ee869fdc11bbb192abbf2f89710e468b90dc291fec228ca16202483e36195a5ad4e2b8d210326bc83e2be6ec696ab413d94ffaeb05bb9c030 SHA512 9bf230f4e0e72acab07ab372a6ca05adb3d175a8079d2f73d327c632f3d27b8ee10442d3e60f4c94a6e61d5ba2212fc78187ca6e1717e15bb570bdce4263fd0b
 DIST virtualenv-16.7.11.tar.gz 8134533 BLAKE2B ea81e11c210d911bf9576edf7b1754721b270adcc5d9633415d33b8f659149d64932fe2d366200121ec00c266c25dae380e248add438fc357477114eba4dfb4e SHA512 82d0d2a964508511e8e1686703581ff543f65791dc2449d9741d46ea57c4c89673947d2477ba374176f05fcea2a5ca572aa650c61c4f3271c4d73d1ff9d9ff42
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
diff --git a/dev-python/pip/files/pip-21.3-no-coverage.patch b/dev-python/pip/files/pip-21.3-no-coverage.patch
new file mode 100644
index 000000000000..8292f97f9488
--- /dev/null
+++ b/dev-python/pip/files/pip-21.3-no-coverage.patch
@@ -0,0 +1,52 @@
+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/pip-21.3.1.ebuild b/dev-python/pip/pip-21.3.1.ebuild
new file mode 100644
index 000000000000..77af9679cc4b
--- /dev/null
+++ b/dev-python/pip/pip-21.3.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit bash-completion-r1 distutils-r1
+
+# setuptools & wheel .whl files are required for testing,
+# the exact version is not very important.
+SETUPTOOLS_WHL="setuptools-57.4.0-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.11
+
+DESCRIPTION="Installs python packages -- replacement for easy_install"
+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}.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}.tar.gz
+	)
+"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+SLOT="0"
+IUSE="test vanilla"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/scripttest[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-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_test() {
+	if [[ ${EPYTHON} == pypy* ]]; then
+		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
+		return 0
+	fi
+
+	local deselect=(
+		tests/functional/test_install.py::test_double_install_fail
+		tests/functional/test_list.py::test_multiple_exclude_and_normalization
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]'
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]'
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]'
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]'
+		tests/functional/test_install.py::test_install_pip_does_not_modify_pip_when_satisfied
+		# 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
+	)
+
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		tests/lib/test_lib.py::test_correct_pip_version
+		# uses vendored packaging that uses deprecated distutils
+		tests/functional/test_warning.py::test_pip_works_with_warnings_as_errors
+	)
+
+	distutils_install_for_testing
+	pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die
+	distutils_install_for_testing
+	popd >/dev/null || die
+
+	local -x GENTOO_PIP_TESTING=1 \
+		PATH="${TEST_DIR}/scripts:${PATH}" \
+		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
+	epytest ${deselect[@]/#/--deselect } -m "not network"
+}
+
+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"; from pip._internal.cli.main import main; sys.exit(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/pyrqlite/pyrqlite-2.1.ebuild b/dev-python/pyrqlite/pyrqlite-2.1.ebuild
index 88f0b6bf7bbe..c7a4215a3d31 100644
--- a/dev-python/pyrqlite/pyrqlite-2.1.ebuild
+++ b/dev-python/pyrqlite/pyrqlite-2.1.ebuild
@@ -15,7 +15,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-BDEPEND="test? ( dev-db/rqlite )"
+# Pin test rqlite version due to https://github.com/rqlite/pyrqlite/issues/37.
+BDEPEND="test? ( <dev-db/rqlite-6.2 )"
 
 PATCHES=("${DISTDIR}/${P}-python3.10-test_support.patch")
 
diff --git a/dev-python/python-debian/python-debian-0.1.42.ebuild b/dev-python/python-debian/python-debian-0.1.42.ebuild
index 0064ad2018ff..c02a27cb091f 100644
--- a/dev-python/python-debian/python-debian-0.1.42.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.42.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Python modules to work with Debian-related data formats"
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 56e6df96b26c..49941036d5e6 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,3 +1,4 @@
+DIST regex-2021.10.23.tar.gz 703746 BLAKE2B e26ec50994375f8b128206743209dff1ceb760b67967ff66d2553c1da27840e0df1611bf1a2746fd26246d3ac8b4a3974c98c8b4d4ede4e6d7954875c17b2405 SHA512 6bc67a066a7f33f6567a672132b1b65d89b21152d5ec3546262e542413ce40999ad57fb55eec92b9f4010489968b6eed1dab27efa63e14b771d883a890ddf9ab
 DIST regex-2021.10.8.tar.gz 703541 BLAKE2B da2a35c0f95c208fe2a9951d4c8cf756cd9eecb3ff27c5d729e9b5702256cc12bdde896019abf2aa12d206cbaace0fa693be332ff8d8baa5e6e628866eb64dea SHA512 395fbef61d54fad539bbd1e51c9100cba02bcd3a147e95a32ff8c32cb7fca66df98bade638e24f9a5c6e5d6c7becca033f925c4fa675b4e6689cba8316a8b46d
 DIST regex-2021.8.28.tar.gz 694689 BLAKE2B 1aeceeb77df3c67e3ac14811000dc0f0cccf2a4994fd349f01f3a4e793f265dc9a73ea685202c6a7af8f507f0db94d6b74b1ae448ce58dd985ca4122c3454cba SHA512 da95f8ce03200f45b6be8730b65d01170847d074202e9b5f311688e22e3d59c32a8ff93768e2ac0105bac02936cbcde49eb114b762e89e6ebf895d8b799b4bf9
 DIST regex-2021.9.30.tar.gz 703504 BLAKE2B d958fa97aabb4c25c424591cfc9b6006c72e72d33029902a00e705c0db6786dcca92b006c4d77f98b0dd183405f63e282f33af75361d20d2b61f65d70da40da6 SHA512 3ce87e01a6e90a2519046595548f9ce38fb177db0d5c2359c57df857a2a9f14be1c6d228b7bd724d5bd66f723e33fd6056180fb45c50931bb0ec5e723df2f16a
diff --git a/dev-python/regex/regex-2021.10.23.ebuild b/dev-python/regex/regex-2021.10.23.ebuild
new file mode 100644
index 000000000000..92ae2cbca7dc
--- /dev/null
+++ b/dev-python/regex/regex-2021.10.23.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="doc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
+)
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest -s "${BUILD_DIR}"/lib
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/Features.html )
+	local DOCS=( README.rst docs/*.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/simpleeval/Manifest b/dev-python/simpleeval/Manifest
index c18ce144babe..0cad65eb0d1d 100644
--- a/dev-python/simpleeval/Manifest
+++ b/dev-python/simpleeval/Manifest
@@ -1 +1,2 @@
 DIST simpleeval-0.9.10.tar.gz 26687 BLAKE2B eccde3c580f65bc22e88711cdfae4b1d6509515d674d62bab501d1cdc5dc1e91f76d391441e012f7fa51221e2c807b831dda05e7b620303d0845b5032b1a45be SHA512 50710221b49ff618218375d6d9b4eb9ee12b875ce0cdaaa63e2dfcaa112918f5bfdf8f02bbc3b5be98c7abc312f99563d910985bc5ad86eb846df935fc072eab
+DIST simpleeval-0.9.11.tar.gz 21996 BLAKE2B f7721b06da05bd7e16f81366df5ce73d343f199a917a4741c3444e9c6f5623d584fdf5ebd1afbaddd4f33d200dbdf3e266d66661c53cb36b0f23280326b046d9 SHA512 cfa3f965eb3749a8bdfae93760bdeebcf3b7621ed1aa64b5f267cd8405dbfcd00a1613b6018e49bcf274d18914cec27ecc029f779035b1e8030d0e502f225307
diff --git a/dev-python/simpleeval/metadata.xml b/dev-python/simpleeval/metadata.xml
index c06ddf2abc58..db240ca9a6e8 100644
--- a/dev-python/simpleeval/metadata.xml
+++ b/dev-python/simpleeval/metadata.xml
@@ -5,6 +5,10 @@
   <email>cedk@gentoo.org</email>
   <name>Cédric Krier</name>
  </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
  <upstream>
   <remote-id type="pypi">simpleeval</remote-id>
  </upstream>
diff --git a/dev-python/simpleeval/simpleeval-0.9.11.ebuild b/dev-python/simpleeval/simpleeval-0.9.11.ebuild
new file mode 100644
index 000000000000..ff77de1c70ba
--- /dev/null
+++ b/dev-python/simpleeval/simpleeval-0.9.11.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple, safe single expression evaluator library"
+HOMEPAGE="https://github.com/danthedeckie/simpleeval"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 23750b052b71..6eefc699f0a2 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,7 +1,3 @@
 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
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 d28d1002421f..c2d7fca2391b 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 12926e72c12e..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_{6,7,8,9,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 648aaafbea48..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_{6,7,8,9,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 648aaafbea48..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_{6,7,8,9,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 f23ee0480dd7..49bb3dbacf90 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.0.ebuild
deleted file mode 100644
index df60e51f9165..000000000000
--- a/dev-python/virtualenv/virtualenv-20.8.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_{6,7,8,9,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 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~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.8.1.ebuild b/dev-python/virtualenv/virtualenv-20.8.1-r1.ebuild
index c7692b2effe0..d7206ef24b98 100644
--- a/dev-python/virtualenv/virtualenv-20.8.1.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.8.1-r1.ebuild
@@ -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/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index f71fae7243b0..f6266e8fcb63 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -4,3 +4,4 @@ DIST python-zeroconf-0.36.5.gh.tar.gz 129395 BLAKE2B 3e62da5f38bd0648ed300c2ecea
 DIST python-zeroconf-0.36.6.gh.tar.gz 129469 BLAKE2B f52348d8fb5a2ed865bc946ad52ea0df474fd59ca5735411381366f08b2a5e1b673916256871128cc9f3a7fef1e72e2ea35fc113e5e41fe63f67659b3cc8f0ba SHA512 fe8d9026e9a19d267c7e734df51253bf69d5ca38b79b00b752886d59288073e8a4b9de40bbd2324064a574f40bec147c8b44d4f3395e480794600c440f2d7c9c
 DIST python-zeroconf-0.36.7.gh.tar.gz 129775 BLAKE2B 9b8ea59e2e62de4476c6b014b925b000b3c47cd9f965a23dd1c6a15b3a4f1ac7a4473eb6b9953d8893a445ffefcd1167c1e32b87b210ed3777fb046b3bd584f4 SHA512 c589c58c92d649c42f9a752d080c2b36a1fcc0c892ab6868cc79a3727087dd95f3e7b779ffd8b040d649453b8c70de4214d76d0f6c16c46a67628545c2472a54
 DIST python-zeroconf-0.36.8.gh.tar.gz 129890 BLAKE2B dafd1a660e611afcac0367b6f4618dd488161d30337fa1d8bd7f43af06446785e86125ae50781b341549fb9b1c70070e6b86ba271a98e5544f5d0e3287640e00 SHA512 928a78a59a5e23182c5f0af8cc8bda477b8225ffaf50e25bdd746ce7b40f7e215e5f23d7a4a282f802c9a4b7b53cbc60c38f547f382b8eff5eb14d1a21f108c1
+DIST python-zeroconf-0.36.9.gh.tar.gz 130154 BLAKE2B d9a96a853a12d3f9f0e4fd9f80bb7114ce25b2fed730ed79baa4ac07a6108a6f5cfc56232ba77f829a947e2961a91c3e1eed224fadf95b2e433ebe0c7b9374ee SHA512 27558fdb9dd8539fffdc5756d180dce921bed010fb7eb2e11254e162792ba663fcaa74afbfcebfb86b5c6aa9187d00a302f6a402cf40986f0bc9e3bed1dd0e19
diff --git a/dev-python/zeroconf/zeroconf-0.36.9.ebuild b/dev-python/zeroconf/zeroconf-0.36.9.ebuild
new file mode 100644
index 000000000000..727d5570c1fd
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.36.9.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+MY_P=python-zeroconf-${PV}
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/jstasiak/python-zeroconf/
+	https://pypi.org/project/zeroconf/"
+SRC_URI="
+	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# network
+	tests/test_core.py::Framework::test_close_multiple_times
+	tests/test_core.py::Framework::test_launch_and_close
+	tests/test_core.py::Framework::test_launch_and_close_context_manager
+	tests/test_core.py::Framework::test_launch_and_close_v4_v6
+	tests/test_core.py::Framework::test_launch_and_close_v6_only
+	tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
+)