Adding metadata

20 files changed, 174 insertions, 237 deletions

diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.25.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.25.ebuild
index c74e72808ee3..c52296ab3766 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.25.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.25.ebuild
@@ -20,7 +20,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/asttokens/asttokens-2.0.5.ebuild b/dev-python/asttokens/asttokens-2.0.5.ebuild
index a5499f0f5710..aee997f974d1 100644
--- a/dev-python/asttokens/asttokens-2.0.5.ebuild
+++ b/dev-python/asttokens/asttokens-2.0.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/cppy/metadata.xml b/dev-python/cppy/metadata.xml
index f5603f1328f4..b196a848027a 100644
--- a/dev-python/cppy/metadata.xml
+++ b/dev-python/cppy/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>vpayno+gentoo@gmail.com</email>
-  <name>Victor Payno</name>
- </maintainer>
- <maintainer type="person">
-  <email>gyakovlev@gentoo.org</email>
-  <name>Georgy Yakovlev</name>
- </maintainer>
  <maintainer type="project">
   <email>python@gentoo.org</email>
   <name>Python</name>
diff --git a/dev-python/executing/executing-0.6.0.ebuild b/dev-python/executing/executing-0.6.0.ebuild
index 38663d9677f7..ad915bacfc31 100644
--- a/dev-python/executing/executing-0.6.0.ebuild
+++ b/dev-python/executing/executing-0.6.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 # asttokens is optional runtime dep
 BDEPEND="
diff --git a/dev-python/flask-wtf/Manifest b/dev-python/flask-wtf/Manifest
index 6c1bdfa924da..286419f386a0 100644
--- a/dev-python/flask-wtf/Manifest
+++ b/dev-python/flask-wtf/Manifest
@@ -1,2 +1,2 @@
 DIST Flask-WTF-0.14.3.tar.gz 44507 BLAKE2B d160e10b1434c0578708c265468b77624953eb2d4ddde9a6ed2ff5b4f4651e0d5d2483020f51c9e512e3cb04895ecaa8fd1d0bf9380211d0a916acd8428f353a SHA512 58bdb87e442dd49dcbc9090e6466ecbd0b5c6bd2f097a26e071a5c73e09256ac46cc2f794f138f0e0b45e4f65ce70c231c275dc69aa44df408d7d79b15198832
-DIST Flask-WTF-0.15.0.tar.gz 45382 BLAKE2B ff019200c48d69d223b71a7f666e413badddb70ed602bd428bcfe70522a66d4c39588e352969c883b017374bee83477765de1b347943923919ab1afd45c8a92f SHA512 51fa22f0397478a98bb0fceec78814740aa25e8ba19e8c5aae0a81056f65da55c7a412ae79548b907798e3561ad0ce64a826ad38b532cc912e9765a6474558b7
+DIST Flask-WTF-0.15.1.tar.gz 45540 BLAKE2B 95ed9efaa89b487f406811926a8b206d15ad9c065f99595a35ea2ca4f98ede671673204c4085de91afe1e1b91b611ceb0f43b9c68b46fdd0e38d9025ac666f70 SHA512 9741e2c2285a500866b160e8c906c38ca579fdae2235bcba2336c7125ba614a9f75167c82bfcb96a45e553170c5925cb1a530d0164ecc57dc76cf1b560c40855
diff --git a/dev-python/flask-wtf/flask-wtf-0.15.0.ebuild b/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild
index 4d14de36f3e1..4d14de36f3e1 100644
--- a/dev-python/flask-wtf/flask-wtf-0.15.0.ebuild
+++ b/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild
diff --git a/dev-python/kiwisolver/metadata.xml b/dev-python/kiwisolver/metadata.xml
index dd57f21d66c4..c7b915fa45ff 100644
--- a/dev-python/kiwisolver/metadata.xml
+++ b/dev-python/kiwisolver/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>vpayno+gentoo@gmail.com</email>
-  <name>Victor Payno</name>
- </maintainer>
- <maintainer type="person">
-  <email>gyakovlev@gentoo.org</email>
-  <name>Georgy Yakovlev</name>
- </maintainer>
  <maintainer type="project">
   <email>python@gentoo.org</email>
   <name>Python</name>
diff --git a/dev-python/mkdocs/mkdocs-1.1.2-r2.ebuild b/dev-python/mkdocs/mkdocs-1.1.2-r2.ebuild
new file mode 100644
index 000000000000..ba7c3c764e5a
--- /dev/null
+++ b/dev-python/mkdocs/mkdocs-1.1.2-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Project documentation with Markdown"
+HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc"
+
+BDEPEND="
+	doc? (
+		dev-python/mdx_gh_links
+	)
+"
+
+RDEPEND="
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.3[${PYTHON_USEDEP}]
+	>=dev-python/livereload-2.6.1[${PYTHON_USEDEP}]
+	dev-python/lunr[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.2[${PYTHON_USEDEP}]
+	>=www-servers/tornado-5.1.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests --install nose
+
+python_prepare_all() {
+	# Tests fails if additional themes are installed
+	sed -i -e 's:test_get_themes:_&:' \
+		mkdocs/tests/utils/utils_tests.py || die
+
+	# Upstream pins this to workaround with a bug
+	# in lunr, from 0.5.9 onwards lunr (mistakenly?)
+	# depends on nltk<3.5 if [languages], which does not
+	# work with mkdocs. We remove the [languages] part, and
+	# allow the use of 0.5.9 instead of 0.5.8.
+	# Tests pass.
+	sed -i -e 's/lunr\[languages\]==0.5.8/lunr/g' \
+		setup.py || die
+
+	# Skip this network test, "does not appear to be an IPv4 or IPv6 address"
+	sed -i -e 's/test_IP_normalization/_&/' \
+		mkdocs/tests/config/config_options_tests.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	default
+	if use doc; then
+		# cannot just do mkdocs build, because that fails if
+		# the package isn't already installed
+		python -m mkdocs build || die "Failed to make docs"
+		# Colliding files found by ecompress:
+		rm site/sitemap.xml.gz || die
+		HTML_DOCS=( "site/." )
+	fi
+}
diff --git a/dev-python/mongomock/metadata.xml b/dev-python/mongomock/metadata.xml
index 9f795dd8b82b..8f5984f36c4e 100644
--- a/dev-python/mongomock/metadata.xml
+++ b/dev-python/mongomock/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>vpayno+gentoo@gmail.com</email>
-  <name>Victor Payno</name>
- </maintainer>
- <maintainer type="person">
-  <email>gyakovlev@gentoo.org</email>
-  <name>Georgy Yakovlev</name>
- </maintainer>
  <maintainer type="project">
   <email>python@gentoo.org</email>
   <name>Python</name>
diff --git a/dev-python/pyflakes/files/pyflakes-2.3.1-fix-py3.10-tests.patch b/dev-python/pyflakes/files/pyflakes-2.3.1-fix-py3.10-tests.patch
new file mode 100644
index 000000000000..c96585d20c73
--- /dev/null
+++ b/dev-python/pyflakes/files/pyflakes-2.3.1-fix-py3.10-tests.patch
@@ -0,0 +1,91 @@
+From f3b1b44bf3d2d5927004fa1c2fcf1ab2def816b9 Mon Sep 17 00:00:00 2001
+From: Anthony Sottile <asottile@umich.edu>
+Date: Thu, 20 May 2021 07:23:19 -0700
+Subject: [PATCH] fix syntax error offsets for python 3.10 (#635)
+
+---
+ .github/workflows/test.yml |  2 +-
+ pyflakes/test/test_api.py  | 43 +++++++++++++++++++++++++-------------
+ tox.ini                    |  2 +-
+ 3 files changed, 30 insertions(+), 17 deletions(-)
+
+diff --git a/pyflakes/test/test_api.py b/pyflakes/test/test_api.py
+index d379b3b7..2c1cf19d 100644
+--- a/pyflakes/test/test_api.py
++++ b/pyflakes/test/test_api.py
+@@ -441,7 +441,7 @@ def evaluate(source):
+             evaluate(source)
+         except SyntaxError:
+             e = sys.exc_info()[1]
+-            if not PYPY:
++            if not PYPY and sys.version_info < (3, 10):
+                 self.assertTrue(e.text.count('\n') > 1)
+         else:
+             self.fail()
+@@ -449,10 +449,17 @@ def evaluate(source):
+         with self.makeTempFile(source) as sourcePath:
+             if PYPY:
+                 message = 'end of file (EOF) while scanning triple-quoted string literal'
++            elif sys.version_info >= (3, 10):
++                message = 'unterminated triple-quoted string literal (detected at line 8)'  # noqa: E501
+             else:
+                 message = 'invalid syntax'
+ 
+-            column = 8 if sys.version_info >= (3, 8) else 11
++            if sys.version_info >= (3, 10):
++                column = 12
++            elif sys.version_info >= (3, 8):
++                column = 8
++            else:
++                column = 11
+             self.assertHasErrors(
+                 sourcePath,
+                 ["""\
+@@ -468,21 +475,25 @@ def test_eofSyntaxError(self):
+         """
+         with self.makeTempFile("def foo(") as sourcePath:
+             if PYPY:
+-                result = """\
+-%s:1:7: parenthesis is never closed
+-def foo(
+-      ^
+-""" % (sourcePath,)
++                msg = 'parenthesis is never closed'
++            elif sys.version_info >= (3, 10):
++                msg = "'(' was never closed"
+             else:
+-                result = """\
+-%s:1:9: unexpected EOF while parsing
+-def foo(
+-        ^
+-""" % (sourcePath,)
++                msg = 'unexpected EOF while parsing'
+ 
+-            self.assertHasErrors(
+-                sourcePath,
+-                [result])
++            if PYPY:
++                column = 7
++            elif sys.version_info >= (3, 10):
++                column = 8
++            else:
++                column = 9
++
++            spaces = ' ' * (column - 1)
++            expected = '{}:1:{}: {}\ndef foo(\n{}^\n'.format(
++                sourcePath, column, msg, spaces
++            )
++
++            self.assertHasErrors(sourcePath, [expected])
+ 
+     def test_eofSyntaxErrorWithTab(self):
+         """
+@@ -515,6 +526,8 @@ def foo(bar=baz, bax):
+             if ERROR_HAS_LAST_LINE:
+                 if PYPY:
+                     column = 7
++                elif sys.version_info >= (3, 10):
++                    column = 18
+                 elif sys.version_info >= (3, 9):
+                     column = 21
+                 elif sys.version_info >= (3, 8):
diff --git a/dev-python/pyflakes/pyflakes-2.3.1.ebuild b/dev-python/pyflakes/pyflakes-2.3.1.ebuild
index 36fc625c3f19..8abbc38a0ed9 100644
--- a/dev-python/pyflakes/pyflakes-2.3.1.ebuild
+++ b/dev-python/pyflakes/pyflakes-2.3.1.ebuild
@@ -17,4 +17,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10-tests.patch"
+)
+
 distutils_enable_tests unittest
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index ebb42e37bec1..0f6ca7db8ea4 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,2 +1,2 @@
 DIST pyopencl-2021.1.3.tar.gz 447070 BLAKE2B fcd8c5d06de9c14a7bcf3c3d37f89cb208adf0225cc88a081aefc86aac82a99026183f2c9975f34cd8247f784335e4ba6c0a09164ce01e527123b5c1dd952a76 SHA512 8799e73b3b1596387f619fd997f643228679fb1d9ab5ce6704da9df51922f96229efc98ab6b7a7361234848078b15bc67946a4188f4d17cb8760040b48b346e8
-DIST pyopencl-2021.1.6.tar.gz 448568 BLAKE2B aea3f6f28d3377b0b8aa7b6c726252299039663e9684316f48c5e875be9d25600582a4af931cacda3fa39834c000a00e2d29720ed6a3cca8e46141ee189107a0 SHA512 320b521e9ed05e0c183d0535b81f27355bdb21577a8a8ba254599a9e853cbe6e0ef44ee6e5be742b44fa1e1e5005732643217f327e4b347845ee6c706db5da87
+DIST pyopencl-2021.2.2.tar.gz 450053 BLAKE2B 577e328aa5999b499aaec759256b60c1ef5e41ad8d9e19ffafa9b1e7562e5f74f15f2c8ee344f4f2bd80c27375d6a303a813f80241932d22988f6afefa61d6c0 SHA512 ec148d5b05f8df62d35ddf85d156e75ef2effab6dfab12a998e8a79cb559313c5a7fc1b680790eeec12f4f31fb5af80e46c6a18e8b641b6485659a5c89758735
diff --git a/dev-python/pyopencl/pyopencl-2021.1.6.ebuild b/dev-python/pyopencl/pyopencl-2021.2.2.ebuild
index 0e8ea0cd925a..0e8ea0cd925a 100644
--- a/dev-python/pyopencl/pyopencl-2021.1.6.ebuild
+++ b/dev-python/pyopencl/pyopencl-2021.2.2.ebuild
diff --git a/dev-python/python-evdev/python-evdev-1.4.0.ebuild b/dev-python/python-evdev/python-evdev-1.4.0.ebuild
index 9f8e2180206a..50ae309a9a56 100644
--- a/dev-python/python-evdev/python-evdev-1.4.0.ebuild
+++ b/dev-python/python-evdev/python-evdev-1.4.0.ebuild
@@ -20,7 +20,7 @@ distutils_enable_tests pytest
 python_compile() {
 	distutils-r1_python_compile build_ecodes \
 		--evdev-headers \
-		"${SYSROOT}"/usr/include/linux/input.h:"${SYSROOT}"/usr/include/linux/input-event-codes.h
+		"${SYSROOT}/usr/include/linux/input.h:${SYSROOT}/usr/include/linux/input-event-codes.h"
 }
 
 python_test() {
diff --git a/dev-python/sentinels/metadata.xml b/dev-python/sentinels/metadata.xml
index 91ca55bfa695..100d5f98ca3f 100644
--- a/dev-python/sentinels/metadata.xml
+++ b/dev-python/sentinels/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>vpayno+gentoo@gmail.com</email>
-  <name>Victor Payno</name>
- </maintainer>
- <maintainer type="person">
-  <email>gyakovlev@gentoo.org</email>
-  <name>Georgy Yakovlev</name>
- </maintainer>
  <maintainer type="project">
   <email>python@gentoo.org</email>
   <name>Python</name>
diff --git a/dev-python/sip/sip-4.19.25.ebuild b/dev-python/sip/sip-4.19.25.ebuild
index 8182952e35b4..b46556332314 100644
--- a/dev-python/sip/sip-4.19.25.ebuild
+++ b/dev-python/sip/sip-4.19.25.ebuild
@@ -20,7 +20,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 0465a4c25907..33a5d2a2571b 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,5 +1,3 @@
 DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
-DIST virtualenv-20.4.3.tar.gz 10579193 BLAKE2B 02102579eb72b7e4ea8fa182b3c7ef5d8b9d95992b5f73b0f24737522dfae988a91953c49df5aa17541f3f0b1c54557ece7feba173a9cce3bb65964bddbd6edb SHA512 d79479d73fc87f34462e775629306bd20ff5d25eb1829c6719f08c800df6a5db03254b04773766a703d903d577cf74b8409a026196ba98d0f5f94f70604ed576
 DIST virtualenv-20.4.4.tar.gz 10579531 BLAKE2B 9e10c07bd191d745d6904f304787a3913c0c574bb4453549796052f27329cbc2e3700fbc6f40ff02f4e94b8f1c21458c8fbd706b05ae458c033722d3eaf04f2e SHA512 acc528cccfc80aeed2fcd7209cab7ff0f1a7d1dc01a59fdb6a07703c7905904ab68d3f4ff312e108c687d03495e82ed8d26ecc15c2b17b9e771605a46164b4bd
-DIST virtualenv-20.4.6.tar.gz 10588254 BLAKE2B 90537a694940063d74513ac74eb5e771c97cb7413b98ef9628ad71eecfd7bf1f604d920b94fc31b87ec2884aa1988aae8917085c4561cd9902eec83994197073 SHA512 4ed0b1e333215f2a9cc91082b4bbbe9ba6c1da928e5c19a2245966041213d771e02f84538c2a2a34c7aab539419ff14013150fc4b70884941fe48aa4786e90c0
 DIST virtualenv-20.4.7.tar.gz 10625204 BLAKE2B 1233ea45f771fb425b99c966904e2c5444e5fcb617b1d7cd34cdac097ee15566b7f4c841d444393723ed369193f33bef90ea7caa5b3c20aaf65fbde2f865abf7 SHA512 a554fb32cc46cb1cef2a2655bdae598efb52a4e71223eb10d9a36b124390546250aa11cf7da991a41ef4697523ec4562a31e35b5ab7ee8aba748ea4ff28e088b
diff --git a/dev-python/virtualenv/virtualenv-20.4.3.ebuild b/dev-python/virtualenv/virtualenv-20.4.3.ebuild
deleted file mode 100644
index 9bcd13b14ff0..000000000000
--- a/dev-python/virtualenv/virtualenv-20.4.3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~x64-macos"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.3[${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}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
-	' python3_{6,7} pypy3)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
-	' python3_6 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*')
-	)"
-
-distutils_enable_sphinx docs \
-	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.4.4.ebuild b/dev-python/virtualenv/virtualenv-20.4.4.ebuild
index ee2a5ae36ba5..9bcd13b14ff0 100644
--- a/dev-python/virtualenv/virtualenv-20.4.4.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.4.4.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="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/virtualenv/virtualenv-20.4.6.ebuild b/dev-python/virtualenv/virtualenv-20.4.6.ebuild
deleted file mode 100644
index 445a853b3170..000000000000
--- a/dev-python/virtualenv/virtualenv-20.4.6.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~x64-macos"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.3[${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}]
-	$(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*')
-	)"
-
-distutils_enable_sphinx docs \
-	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 ..."
-}