Adding metadata

44 files changed, 241 insertions, 875 deletions

diff --git a/dev-python/Faker/Faker-8.14.0.ebuild b/dev-python/Faker/Faker-8.14.0.ebuild
new file mode 100644
index 000000000000..1f1f09ada79c
--- /dev/null
+++ b/dev-python/Faker/Faker-8.14.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 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="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 3af16bf3a842..f6cc2425c944 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,3 +1,4 @@
 DIST Faker-8.12.0.tar.gz 1151218 BLAKE2B b55d1b1bac6a580c51fdd3f87919cbcea107aff309bce4d2092ec77046dc40c67650f3c53d176147b6b433008e7487dae9e096eb9ba6c8722ec54ce5d6d39449 SHA512 5df90c0976cb8b5e96f4c6645a984e813130fd22f25b5fb99b7cd28b6e079eec54b19f8ca643b795be15f41b9f5b677e89db1379615479983f0b5519a6dd56b4
 DIST Faker-8.12.1.tar.gz 1151131 BLAKE2B fd59a337ed95429b34b2f9c1530a9db6ef4ec921d1c194e90e794ea6316fd8c79b8f2aa416ad8806cd2f4c31cca8d1d2cf60209a6bb4a75a708345a0bfb0a572 SHA512 e359b015d4908130b12ca6dd8c7e4801011de383eececb62f3ac76cb621cad1c9a873c5de989932405f7a30b33aef8969fb9788a331620db3d6c3ad1e5a657c4
 DIST Faker-8.13.2.tar.gz 1162423 BLAKE2B 595bac7a9a3031a46342ff19cfc1ef89bd7a5267dad3b1a18bda5cb3d96168eb0fda03adab940d35e499771ac1fc78e837631fe048fc374e0dcdcb62ac0a2002 SHA512 7da38c7bcf7b1b7364161092a38a2a9624ede6fed6e0bd9c8aec7acff83d4377bfef3e3ce2af48ea04d37eed0e880357bd40bca6eb81d19cdb876d66de249b04
+DIST Faker-8.14.0.tar.gz 1162580 BLAKE2B e0e5b7134d615b2cf64f9b995d28b931f56f421d6fe48117d78781f0fa03e3d32a9353cadfd27f216f116a30e3d3ef6b905ecdcd79d2630482b514b2841952f9 SHA512 4218a9e97bc3e72e59a2e5887fdeb8e38627cbb733ff270198acaf47fe993424e7819dcdd90856d0bf86f8dba77d7a73eed9bfe9c048f0962f671e2bd43a9c5d
diff --git a/dev-python/django-filter/Manifest b/dev-python/django-filter/Manifest
index d5150fd906a5..1a587dada8f2 100644
--- a/dev-python/django-filter/Manifest
+++ b/dev-python/django-filter/Manifest
@@ -1 +1,2 @@
 DIST django-filter-2.4.0.tar.gz 146904 BLAKE2B 994b07c0f5e511451964f4f1e007ff9906975600d0bc8a02dcbeb86f91bf906490ca394ca95c23c57c1fff25a447f50a40054c0abfe385300f9db87645753978 SHA512 0584222b46add89aa7dd1dfd334fdd19903e0119d455a2c46644c501a66df224f9f51c33394d130bcd1fc0f28c6ede6d6853b9790430040ec7228f9a1dc55264
+DIST django-filter-21.1.tar.gz 154188 BLAKE2B f0ae3119a1dfa466e6630f7da44db1531172991b137fe9420ed533a7b3d4177f689f07fed115566854bd40e5e23f4e9f2f73be32188af2c067a81a95fbccc5a3 SHA512 df2b02bfa93874d9684a26394778203b827c6459ab8cc8c581677e6ccfeedf1323085f53fb52cfc3e0e0a3d27f86de655366bcd4be361502ce86e65b4a4e84d0
diff --git a/dev-python/django-filter/django-filter-21.1.ebuild b/dev-python/django-filter/django-filter-21.1.ebuild
new file mode 100644
index 000000000000..d1b5db29725a
--- /dev/null
+++ b/dev-python/django-filter/django-filter-21.1.ebuild
@@ -0,0 +1,29 @@
+# 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="Django app allowing declarative dynamic QuerySet filtering from URL parameters"
+HOMEPAGE="https://github.com/carltongibson/django-filter"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]"
+BDEPEND="test? ( ${RDEPEND} )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test-skipIf.patch
+)
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=tests.settings
+	django-admin test -v 2 || die
+}
diff --git a/dev-python/django-filter/files/django-filter-21.1-test-skipIf.patch b/dev-python/django-filter/files/django-filter-21.1-test-skipIf.patch
new file mode 100644
index 000000000000..adaf8ba428d1
--- /dev/null
+++ b/dev-python/django-filter/files/django-filter-21.1-test-skipIf.patch
@@ -0,0 +1,27 @@
+From db97686a9950cc1a372d27dfbb90b19ceece3f65 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 24 Sep 2021 21:22:41 +0200
+Subject: [PATCH] Fix inverted skipIf for CrispyFormsCompatTests tests
+
+The test is being wrongly skipped when crispy_forms are installed
+rather than the other way around.
+---
+ tests/rest_framework/test_filterset.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/rest_framework/test_filterset.py b/tests/rest_framework/test_filterset.py
+index f8b5aae..b6a658d 100644
+--- a/tests/rest_framework/test_filterset.py
++++ b/tests/rest_framework/test_filterset.py
+@@ -38,7 +38,7 @@ class FilterSetFilterForFieldTests(TestCase):
+         self.assertEqual(result.extra['widget'], BooleanWidget)
+ 
+ 
+-@skipIf(is_crispy(), 'django_crispy_forms must be installed')
++@skipIf(not is_crispy(), 'django_crispy_forms must be installed')
+ @override_settings(INSTALLED_APPS=settings.INSTALLED_APPS + ('crispy_forms', ))
+ class CrispyFormsCompatTests(TestCase):
+ 
+-- 
+2.33.0
+
diff --git a/dev-python/django-filter/metadata.xml b/dev-python/django-filter/metadata.xml
index 92ab3dbecbd7..52c616dd35f3 100644
--- a/dev-python/django-filter/metadata.xml
+++ b/dev-python/django-filter/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
  <upstream>
   <remote-id type="pypi">django-filter</remote-id>
   <remote-id type="cpe">cpe:/a:django-filter_project:django-filter</remote-id>
diff --git a/dev-python/filetype/Manifest b/dev-python/filetype/Manifest
index 31824e49eaa6..846d3fd29df9 100644
--- a/dev-python/filetype/Manifest
+++ b/dev-python/filetype/Manifest
@@ -1 +1,2 @@
 DIST filetype-1.0.7.tar.gz 666636 BLAKE2B 3abc1cc3a94b3ca8c91b9b43909522efa18736c826f8f45990b3d7dab18047476f05b259108290bf7383e4df82a63def4249c0d52ae313b0dc23d377bb5369d8 SHA512 8d81261082a5765c2f96b587cc8372ec2e7347536f3e76c1f4c17f10011fd1808309ceaf55923f0e063f379cdd253020ce651a263b9535a9d16375f07dc8ec92
+DIST filetype-1.0.8.tar.gz 804082 BLAKE2B f636e9fdddd93dc8972c434666b82d97fd9572ce94f0c3b617add2ecaec2e1bfeaa267bb5ceaa07a6ed76d0b0ef0736451f9e4395353ce795e1a61e7cce5d543 SHA512 5ab87ec277781d27bdd7a4245f406d230724b0f0a7ab26e879cb78893262fbdff7088bb306203fb1fce38723b5d1c2a998fb8ae113509502755e995a1f81993b
diff --git a/dev-python/filetype/filetype-1.0.8.ebuild b/dev-python/filetype/filetype-1.0.8.ebuild
new file mode 100644
index 000000000000..2d40c8d04985
--- /dev/null
+++ b/dev-python/filetype/filetype-1.0.8.ebuild
@@ -0,0 +1,17 @@
+# 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="Small, dependency-free, fast Python package to infer binary file types checking"
+HOMEPAGE="https://github.com/h2non/filetype.py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/flit_core/flit_core-3.3.0.ebuild b/dev-python/flit_core/flit_core-3.3.0.ebuild
index cf6116470234..1affe9d33f34 100644
--- a/dev-python/flit_core/flit_core-3.3.0.ebuild
+++ b/dev-python/flit_core/flit_core-3.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/intreehooks[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index f2273ef30e2a..626fb383543b 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,13 +1,5 @@
 DIST hypothesis-python-6.14.5.tar.gz 9135819 BLAKE2B 2e42949f81024038b901231a8446203388c8052ebaacf4a87d21356265fd1c09c9aa8b191dcd65780d45cc52ed9d48bb16440fc553addb4671e0ad901213ef64 SHA512 d047eea19129d5855bee5f012f5c91fe1f0de40228600fadad9c76709f951c003450f613f59848064b58f9d0e559b54b44744ae0aae689687488b6506cc8fe1a
 DIST hypothesis-python-6.14.9.tar.gz 9138640 BLAKE2B 3cda0edace7b3a1c373bdd61267013874fe78ae18aa7fda02759ac451f7e576614a61c3ce1d588e24afe4333f61680d89eb30f6f055e41fee91312c791b1af5d SHA512 a32d4f09ae6a44354d136164a517ea53c653fccb3e21a39ac63df78ebdf695c887f13749d2f310ac67863b6645a85dca73ef0bfab077aefe0486e445f6a85dce
 DIST hypothesis-python-6.17.4.tar.gz 9144209 BLAKE2B b110e355b34f386c51e9edeb2589bf11e5d0b574ee7e97437f9eba9ec7d8e823e68ad1e4f5911a1e78f3d5a316f59056301b0238c4b6a8cdcb21e46ea434686c SHA512 95eeadc1655d249008897035660af54f66e8ea78fea78d1069dbddb979505e003d1bdb971371769e90af4a7bc5f96ee0c42a6c14bc42e56677d4f89f39985d41
-DIST hypothesis-python-6.18.0.tar.gz 9145660 BLAKE2B 6fb47aeb134363e50944d08f0658245d9cc5190260e56cc16c394499df0bcf3739fd69c22bcfce6f3b290a1ecd9bdc8ac6bfd7c5f2efd4b00694b81d7dba062d SHA512 069deaa91b7dc7244c8fccb046e384c60009365418dfb7f76ed75428446a731ec860613201d0657c2c8b3b29e4fce3c403a93aa082f48b072471f919b7a1af5a
-DIST hypothesis-python-6.19.0.tar.gz 9146087 BLAKE2B 11cf1e76735f2d57ee793c131a055c0e349bf7a39b072ac33914bcc371d44a607866ec617d2f955779fe99922f968b8da571fea87c45db72583e3ea2026000a5 SHA512 b641938c6f9b5603bb7b72ba1106da16bdcd0528de34317afdc4099bbfa1bfec90e76fbf14dc7cfc773fb02c3fa3b4bcfeea7f3788884cbefb51751f02879f9c
-DIST hypothesis-python-6.20.0.tar.gz 9146238 BLAKE2B 88009c7369209f8781644a975587d757ecf83e9e84e650fd2f8e88b5e4e1d078dd0639e49a9055c4390c0aba96a661561ff5858bf628036d097c614b7d9fc45a SHA512 6c139c78b75c5b8408345d654e6d638f4f2b0f1567bcb05c430e396d3dbf40fde7e3f6a6af4eea75b2387d395e8ee2a5eb11eabd3183c4eff0a35979aed1bcba
-DIST hypothesis-python-6.20.1.tar.gz 9146416 BLAKE2B ae3e10ffe2853009b8d698e0eae391e05632ba1a3d889dbfb498b8f46c18ec16477daefa9052dc6711f3239f9e83ffc7d52c6ad0c554492a00a55417b583afe7 SHA512 8d23bd0311cd8e81d7fd3851f4a72cc92bea4a07943475d8be9bac9dc9d5096f0d7d5e8ed8b14e64dbdb3c49b7d2c7ecc8d85dfe30d5e6f9f0ed96570ce4ddb0
-DIST hypothesis-python-6.21.0.tar.gz 9162663 BLAKE2B a5a2fbb7b377e6cf769c3454ca89615551164e1b0dae24abee15191fcdff2eb1f01b9462c7aff68a7ea801477105bdfe5f6a33f098eb506325031d3511914ae5 SHA512 7d91d83580403da3afac0f4e0a72935c63d7da2ff28429423a3001b0a19a1b6216fe36eb526e91fe9e7f0cae481aa3f446695f7407ec2201c5f8abc6e3ea19a8
-DIST hypothesis-python-6.21.1.tar.gz 9162836 BLAKE2B af52db17d51801d03496036f14b9b1e79667de64b4d5df925bffe00f67e11fb652f0e027bf250d3f4286e113052b3413b75fcd6c8922702924ca0eb9c46849dd SHA512 4e9d994e1323ee90cd4555ae3f310bcf4661079b287e000a65fbda7771e02c265c387df3bbbd0425d54b342de4fb20632b6a35842bc7a66affbdda159048359b
-DIST hypothesis-python-6.21.3.tar.gz 9165503 BLAKE2B ee57b10021d5a8fd4731563e41e2583c879efd602779f5dfaa21a549b34bece29ebdd8386bcb637039b1c679a634f61ff68128c7d1e427ef4ca5ff571197b401 SHA512 0446df21f467cbabc6918a68b8a678db458ac798adaaf57090a756ff3a9b749dee550e77e1f78292d4bfe6f24caac175b104b4f4f1607521776c497649ac9c66
-DIST hypothesis-python-6.21.4.tar.gz 9165577 BLAKE2B f2bf805d1ff1d469b2f62aa7095183a6eef2fa6f0e1cbd611a7e62dd978456ae199f64479ac43a7d34ffa7f3ae6b35c4aa1691dc863e6cc509914a23aa767f89 SHA512 7fd8a4c6a35417ac14999cfa668b9976314e022bc432a20387ef82b97021b626fe8a25e43ae92e5ecfdba8ab9cee0f182621132287c82511d64231272365fd06
-DIST hypothesis-python-6.21.5.tar.gz 9166120 BLAKE2B 6f51bd99c3c2f38e540f7e9720aa49ec62c0b8308ba5424f50ea72ea97172481dc28fd086d09c34449bde2601a68984158392fe19ad724a3048cba549c88a9fb SHA512 5cfa5196feffd5652e3c771fa8e99b8ebe563539d9a9ee0e87c5d9c08d363af19a207f76dd88fee0ff501f4d748d9cd1af87d01ef7d178d295f886123c11cd1a
 DIST hypothesis-python-6.21.6.tar.gz 9166313 BLAKE2B 19ac66c1674be30e14d54faa61244ac6da5b67678da4c5dbc728fefcac2e5f0a99c31f7cbe6fc4bc8738e1b072b4accba6f97863e6d601303d4fd69d4ccbd96a SHA512 454434f37dfc3f171d1865ac72d58821173654fabdd880c1b699ea0ff281405644bb1b370129843d35368cd9b6eb06fa00458e0aa41b2b7dc0b7e05e7f659a5d
+DIST hypothesis-python-6.22.0.tar.gz 9166539 BLAKE2B 386c7fd4f9ff0d4d199f686f25743793de4de9f2676cf7c36c16519f5fef007f6b677bd5ef84fa975389c5fea9989dffffc8a18923699c05fecc23ef2e4dc5e6 SHA512 92352a7ba13d8a06532c6fcdb965f156c43369f18ba7c46808d9b6dde1ccdd5b4f938c1ce575d5651835bfe981d22e7a68189c93a368420c915f5d1ce9b8a205
diff --git a/dev-python/hypothesis/hypothesis-6.19.0.ebuild b/dev-python/hypothesis/hypothesis-6.19.0.ebuild
deleted file mode 100644
index 8b48444a4699..000000000000
--- a/dev-python/hypothesis/hypothesis-6.19.0.ebuild
+++ /dev/null
@@ -1,62 +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 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{7..9})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest tests/cover tests/pytest tests/quality \
-		-p no:pytest-describe \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.20.0.ebuild b/dev-python/hypothesis/hypothesis-6.20.0.ebuild
deleted file mode 100644
index 8b48444a4699..000000000000
--- a/dev-python/hypothesis/hypothesis-6.20.0.ebuild
+++ /dev/null
@@ -1,62 +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 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{7..9})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest tests/cover tests/pytest tests/quality \
-		-p no:pytest-describe \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.20.1.ebuild b/dev-python/hypothesis/hypothesis-6.20.1.ebuild
deleted file mode 100644
index 8b48444a4699..000000000000
--- a/dev-python/hypothesis/hypothesis-6.20.1.ebuild
+++ /dev/null
@@ -1,62 +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 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{7..9})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest tests/cover tests/pytest tests/quality \
-		-p no:pytest-describe \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.21.0.ebuild b/dev-python/hypothesis/hypothesis-6.21.0.ebuild
deleted file mode 100644
index 8b48444a4699..000000000000
--- a/dev-python/hypothesis/hypothesis-6.21.0.ebuild
+++ /dev/null
@@ -1,62 +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 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{7..9})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest tests/cover tests/pytest tests/quality \
-		-p no:pytest-describe \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.21.1.ebuild b/dev-python/hypothesis/hypothesis-6.21.1.ebuild
deleted file mode 100644
index 8b48444a4699..000000000000
--- a/dev-python/hypothesis/hypothesis-6.21.1.ebuild
+++ /dev/null
@@ -1,62 +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 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{7..9})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest tests/cover tests/pytest tests/quality \
-		-p no:pytest-describe \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.21.3.ebuild b/dev-python/hypothesis/hypothesis-6.21.3.ebuild
deleted file mode 100644
index 8b48444a4699..000000000000
--- a/dev-python/hypothesis/hypothesis-6.21.3.ebuild
+++ /dev/null
@@ -1,62 +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 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{7..9})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest tests/cover tests/pytest tests/quality \
-		-p no:pytest-describe \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.21.4.ebuild b/dev-python/hypothesis/hypothesis-6.21.4.ebuild
deleted file mode 100644
index 8b48444a4699..000000000000
--- a/dev-python/hypothesis/hypothesis-6.21.4.ebuild
+++ /dev/null
@@ -1,62 +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 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{7..9})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest tests/cover tests/pytest tests/quality \
-		-p no:pytest-describe \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.21.5.ebuild b/dev-python/hypothesis/hypothesis-6.21.5.ebuild
deleted file mode 100644
index 8b48444a4699..000000000000
--- a/dev-python/hypothesis/hypothesis-6.21.5.ebuild
+++ /dev/null
@@ -1,62 +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 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{7..9})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest tests/cover tests/pytest tests/quality \
-		-p no:pytest-describe \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.18.0.ebuild b/dev-python/hypothesis/hypothesis-6.22.0.ebuild
index 8b48444a4699..8b48444a4699 100644
--- a/dev-python/hypothesis/hypothesis-6.18.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.22.0.ebuild
diff --git a/dev-python/intreehooks/intreehooks-1.0.ebuild b/dev-python/intreehooks/intreehooks-1.0.ebuild
index cc0e6c9bd9a2..0af51cc6001b 100644
--- a/dev-python/intreehooks/intreehooks-1.0.ebuild
+++ b/dev-python/intreehooks/intreehooks-1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/line_profiler/Manifest b/dev-python/line_profiler/Manifest
index b00ea8ac97d7..f18e60ea4a85 100644
--- a/dev-python/line_profiler/Manifest
+++ b/dev-python/line_profiler/Manifest
@@ -1,5 +1,2 @@
-DIST line_profiler-3.0.2.tar.gz 45185 BLAKE2B 04e617cc7b6c9686192281ab1cdfdef2cfc6ce3c7aa6b9962ed2369620618af8835b93bafe89f8d1288b45d4120d71f728ec577d5c5d035699c2d7a49d6be7c1 SHA512 9a5d1821c02fc063081854ba98a17eca21af65d5aecf4ce32c67806d31bf0c936291a30409845ce6f94211cdaaaf0859ab5e2b437e1a086fd4f60fc2a0fd2742
-DIST line_profiler-3.2.1.gh.tar.gz 54639 BLAKE2B 8840ac41397aa5d5c0cb94dec5f673a021a9bad18a7d67d73a2d90bf59745c5e35f205d67d28edd3ceade075320c6fe00426d5cf536b9b2953fbbf90539a5e9a SHA512 6e4e0fcb44df6a4eeafa66e8254e511ef0a0c616e9c2bb4bac6bc29df5efa1849f9e75e998770ec6fbe62916a22b17465cdc6eeee6c61ffa52658a9bdb773490
-DIST line_profiler-3.2.2.gh.tar.gz 50780 BLAKE2B 79c5f7f73adaf940e34f96ef799faf08e7a6218cd9346dc3aa86211d04f0cdfe309de23d11f43292aaca121e78df27d0d07ec3efd129e1cc6778b6f8ae83cbbf SHA512 a7279db406adfdae08d375fa18869fdc2276fe360ffb791aa65b13a028470504cd45acfbaa7ccb1c44fb1a5622d9400c5a889f13230514b9d392f09b439af0fd
-DIST line_profiler-3.2.5.gh.tar.gz 50934 BLAKE2B 2124fcb5cba9b0eebe81da6f966eb12e17f1a44db8beddab6903dc7ec79441cfe1d207786083f96100e2394cc2f0274460353d7aa6ce75a6f301500332acbb47 SHA512 ee72df835b55a26c0cd150356da19f8051013e5ffc1a18a31899c9da06f40e97175368204dc23ed21722a237612c1089cb18628715151ab07ba5827e460befeb
 DIST line_profiler-3.3.0.gh.tar.gz 52791 BLAKE2B e3499f5274045d158620fa890df6e725a99c3df019bb4515434213d2c60d52d400d7a7dfce64b153422722ea388f73318818485c9747e6eace2d81c457f93a7f SHA512 37680c55a551c73aed7a3ee2333c523f0617e01cda6db98060f15fe36990c8c8bc08bd5848e569f269bf11590776290ee0980046cce745df8e54268d7991559b
+DIST line_profiler-3.3.1.gh.tar.gz 56700 BLAKE2B 030c0fc742a6773ebb55a54a3c21d3d5e5d6d5d258a2c3cd2071ff93917411b65e100bfc6549d9c60d9a7c361c53b291d8b81538acaf5b83665c04129d25bc02 SHA512 8a3704a6df2abe71283cb2da23b738932c6f4b42aedcdefda0d318fd4b894d56831a855c4be4430657308530a04d1e96b0e15a60edca06621bdd5370c0bf9911
diff --git a/dev-python/line_profiler/files/line_profiler-3.0.2-python3_9.patch b/dev-python/line_profiler/files/line_profiler-3.0.2-python3_9.patch
deleted file mode 100644
index 74b0677bc70a..000000000000
--- a/dev-python/line_profiler/files/line_profiler-3.0.2-python3_9.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f40a6e102d3c4808155af601ddba7733e597e604 Mon Sep 17 00:00:00 2001
-From: Stefano Rivera <stefano@rivera.za.net>
-Date: Thu, 15 Oct 2020 22:44:50 -0700
-Subject: [PATCH] Python 3.9 dropped gettimeofday configure checks
-
-Upstream status: Accepted [https://github.com/pyutils/line_profiler/pull/31}
-Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
-
-diff --git a/line_profiler/timers.c b/line_profiler/timers.c
-index ae01060..e8ee6c6 100644
---- a/line_profiler/timers.c
-+++ b/line_profiler/timers.c
-@@ -32,10 +32,6 @@ hpTimerUnit(void)
- 
- #else  /* !MS_WINDOWS */
- 
--#ifndef HAVE_GETTIMEOFDAY
--#error "This module requires gettimeofday() on non-Windows platforms!"
--#endif
--
- #if (defined(PYOS_OS2) && defined(PYCC_GCC))
- #include <sys/time.h>
- #else
-@@ -48,11 +44,7 @@ hpTimer(void)
- {
-         struct timeval tv;
-         PY_LONG_LONG ret;
--#ifdef GETTIMEOFDAY_NO_TZ
--        gettimeofday(&tv);
--#else
-         gettimeofday(&tv, (struct timezone *)NULL);
--#endif
-         ret = tv.tv_sec;
-         ret = ret * 1000000 + tv.tv_usec;
-         return ret;
diff --git a/dev-python/line_profiler/line_profiler-3.0.2.ebuild b/dev-python/line_profiler/line_profiler-3.0.2.ebuild
deleted file mode 100644
index e83367a56178..000000000000
--- a/dev-python/line_profiler/line_profiler-3.0.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 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="Line-by-line profiler"
-HOMEPAGE="https://github.com/pyutils/line_profiler"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/scikit-build[${PYTHON_USEDEP}]"
-
-RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-DEPEND="test? (
-	dev-python/coverage[${PYTHON_USEDEP}]
-	dev-python/ubelt[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-python3_9.patch
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	# tests fail if not already installed
-	# to fix this, source files should be in PYTHONPATH
-	# also, tests call kernprof, so we have to move that
-	# back to the source files and make it executable
-	cp "${BUILD_DIR}/lib/kernprof.py" "${WORKDIR}/${P}/kernprof" || die
-	chmod +x "${WORKDIR}/${P}/kernprof" || die
-	cp "${BUILD_DIR}/lib/${PN}" -r "${WORKDIR}/${P}" || die
-	PYTHONPATH="${WORKDIR}/${P}"
-	PATH="${PATH}:${WORKDIR}/${P}"
-
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/line_profiler/line_profiler-3.2.1.ebuild b/dev-python/line_profiler/line_profiler-3.2.1.ebuild
deleted file mode 100644
index a59ea7704afe..000000000000
--- a/dev-python/line_profiler/line_profiler-3.2.1.ebuild
+++ /dev/null
@@ -1,50 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-# force it to match scikit-build
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit cmake distutils-r1
-
-DESCRIPTION="Line-by-line profiler"
-HOMEPAGE="https://github.com/pyutils/line_profiler/"
-SRC_URI="
-	https://github.com/pyutils/line_profiler/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-# technically, the package claims to support non-scikit-build build
-# but it's clearly unmaintained and broken at the moment
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/scikit-build[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/ubelt[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-src_prepare() {
-	cmake_src_prepare
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd tests || die
-	epytest
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
diff --git a/dev-python/line_profiler/line_profiler-3.2.5.ebuild b/dev-python/line_profiler/line_profiler-3.2.5.ebuild
deleted file mode 100644
index 13ad3420fe64..000000000000
--- a/dev-python/line_profiler/line_profiler-3.2.5.ebuild
+++ /dev/null
@@ -1,49 +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} )
-# force it to match scikit-build
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit cmake distutils-r1
-
-DESCRIPTION="Line-by-line profiler"
-HOMEPAGE="https://github.com/pyutils/line_profiler/"
-SRC_URI="
-	https://github.com/pyutils/line_profiler/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-# technically, the package claims to support non-scikit-build build
-# but it's clearly unmaintained and broken at the moment
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/scikit-build[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/ubelt[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-src_prepare() {
-	cmake_src_prepare
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd tests || die
-	epytest
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
diff --git a/dev-python/line_profiler/line_profiler-3.2.2.ebuild b/dev-python/line_profiler/line_profiler-3.3.1.ebuild
index 13ad3420fe64..7265d63ece55 100644
--- a/dev-python/line_profiler/line_profiler-3.2.2.ebuild
+++ b/dev-python/line_profiler/line_profiler-3.3.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 # force it to match scikit-build
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index aec2779b15f2..b19ffa2041a3 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,2 +1,3 @@
 DIST phonenumbers-8.12.29.tar.gz 2258737 BLAKE2B 6a885e4ba28d7093746cd754a5fb60cb62b002a42d4331bb1cdfc2291b39b6da6d3c6673364e4715c09186bebf05b11988cf3beb8ed1690826ef800d07b17e7c SHA512 23e88f9a8bb801bb7a95cd5ef74527572d315e69b2db1c9c38c84d83293d99a015492f010321c9dc0596a5f40dc63453a42e2fd5a7d9dabae7ac0b78967876d7
 DIST phonenumbers-8.12.31.tar.gz 2258495 BLAKE2B 7b08961cf50382857b5bdbeef640091967e3c14f3949c8975028fef4192c7776a2f7619c6fbe177f4b46de44de9103cc62ddd949f5e1c882f742ab2a80619cb9 SHA512 28b608a81a452638e25eaa1311e42384725c55cb8f438e9ab54006b8b8cebd0ae848449f1ab6758884113b3cecae21729c3b4d8e1bbab1120df0d82c9ebe7f04
+DIST phonenumbers-8.12.33.tar.gz 2268271 BLAKE2B bbf84efe22806357f03f647952a66d58538975a932b290ca8d3f83996868a2320aa0d18b0094167f6e38514cde800163eb2240c89e7a244c3b1596743b20b39f SHA512 d156a501c1950ecd98eaa0515dfa8c8d38ad470344461ea3dd1f579091a60472b5998e98b3d7ba5b02db45bee94b1ee8db7543464677f5d79b36469717997f6e
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.33.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.33.ebuild
new file mode 100644
index 000000000000..717843f08927
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.33.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="Python port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=(README.md)
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pillow/pillow-8.3.2.ebuild b/dev-python/pillow/pillow-8.3.2.ebuild
index e08970128b21..bc7a489cd94b 100644
--- a/dev-python/pillow/pillow-8.3.2.ebuild
+++ b/dev-python/pillow/pillow-8.3.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pip/pip-21.2.4.ebuild b/dev-python/pip/pip-21.2.4.ebuild
index de14f16baee4..be0a11496e11 100644
--- a/dev-python/pip/pip-21.2.4.ebuild
+++ b/dev-python/pip/pip-21.2.4.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 SLOT="0"
 IUSE="test vanilla"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pytest-check/pytest-check-1.0.4.ebuild b/dev-python/pytest-check/pytest-check-1.0.4.ebuild
index fdb3f097a5f3..5380cedcddba 100644
--- a/dev-python/pytest-check/pytest-check-1.0.4.ebuild
+++ b/dev-python/pytest-check/pytest-check-1.0.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 
 RDEPEND=">=dev-python/pytest-6[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/flit_core[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
index ae476b3a4084..819502076cb3 100644
--- a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
+++ b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/freezegun[${PYTHON_USEDEP}]
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 35df8b202fa2..0fc9352eaecc 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,8 +1,2 @@
 DIST rich-10.10.0.tar.gz 16264680 BLAKE2B 5f57b7ea7a091b3478ddc17dfe29309f558f36e8795a66ea918141f42f2a9e5a655667a1db8420193f3f44ba070413ebb512601751a6a5663a87db775576ce65 SHA512 8b9f1348b0f55db90c17042a83e8317d4f00b5446a77334a12379676ef1fe526f40dc92425e4bafce22ee5f65bcb2fae2422b903c6f958feb5734c254813826e
-DIST rich-10.3.0.tar.gz 16237609 BLAKE2B ddac8f2ed7b3b39e647179cd03cf59994729d7d82bdfad6670284a692871b79f2f6ceb86fae0d47d76401f756c122ebcb5978d241d4a95b4f3d6c54de67132a1 SHA512 91886b19c91052a7fe24fb9ae8c98a59f882e6c387036420f17a4867f581e71839b990541fcedf7831d361a9cb535f05c13e45bf5505a4d1fcdc0d0f8e8b39c8
-DIST rich-10.4.0.tar.gz 16240850 BLAKE2B 76874e3efd9a8d696ba96579e1c658b1c76e71d353574cf3f9fb5d8a15810879f649d0ebfcbd1d72d9d496ce438cc08099b5d0416b932875704be2d0b4b28d0a SHA512 ecf6234ac862c1e04ab71c39763857d770c20200f5e1903a7d8e90fc1a67b5702a9eb0c67454ca48fb786a7631f60401f0a3299e82d864eca8c7afefedf21e26
-DIST rich-10.5.0.tar.gz 16242786 BLAKE2B d4d612555f9dca24b5150f5502d95bede784d7e6481e15948614de15a914d0cb3c83b64148a02db4ce8693feb1604c3729006fc0ca347eb10313aedcb795feca SHA512 c0471c0f35d3d9e5b5baf5798911073de02820a5bb5dcf42324bef2153a49a3019db44bc96b95247defe3be65f18097fc266a30bdeab153d9dda0ae38d34a79b
-DIST rich-10.6.0.tar.gz 16244447 BLAKE2B 79012a211e8f5510fd4cf0f2580971c51fee17a1e38905abc8227ba07eed1f2d25b7c356ecc907043a9e1898245cb6927cf226218c0ba20344865c1cd0a4a160 SHA512 59b777ef0fe3efe67138a7dbfc0c4e813b0a8c3d46adc6526b07241483919e0f71b478c0a66f3e0c207fcebdc0d639b7acf989ebf914c0e0fb6953029f0c9a16
-DIST rich-10.7.0.tar.gz 16261862 BLAKE2B 41f49bcda95f64b6deb30b32c7b8809ec1fa008d08de08dbb2ed8e718f04de1f446291468d714030db951877eb8a5e95360504c6a396758cb1e8d37fff4fe6be SHA512 23607389370cc2b8203f4505cee1536a57e7c3379d97ebbe3a751e11d578e1f652c0522d151048bc7ee018800d44ac762b7272cd3084f4ee94263e019bc42964
-DIST rich-10.8.0.tar.gz 16263649 BLAKE2B f73ee1996d16ba06dc0dc1909056deb731819395fea6c36d6953045bcc20ea95ab7b7d6a2025ed7b7f7991b75eb909a8cdbf80c561d1e60ad095ea24d005638f SHA512 89173ddffb421b09025ccfc479194d751bf96e114f06728e789f0b5fd903de22423c268c7ecf78ee8c6791ba6230abc7a5f2fbfd17d3445a205b84f326083447
-DIST rich-10.9.0.tar.gz 16264350 BLAKE2B dd8f27bb48baf6abe190ee5bc73d2a3dddac19cc3f52665655fbd6ed62654c1547fa33bc767d18b972e4d92d924db9eaf199e39affc34779c82fd4d45978f65a SHA512 8154994c1f21c7cbcd9ec03da4b0f22bf84c1ff380bddcf8c7f00d07fcfc8794da4160d2d68064d0664309bd1075ca593ebbf9e5c5f4fe6ad26a10460736fb02
+DIST rich-10.11.0.tar.gz 16266050 BLAKE2B 34081a127eacbc875fb5af1b00a195df4718eacb4e0371ac1367950fc8e102bc2a611d970364a1b02cb400137cb838aa30d9bcd757a4d4644ed976c49c9603c8 SHA512 34cdcad401dbda0763dfaa6f46e19e498b2da96ed9423a00a957d55f9e2833fabc6b2e6d65e411dcb5814c869a8670b5242e1a891835d6b6675d4da86b28f33d
diff --git a/dev-python/rich/rich-10.7.0.ebuild b/dev-python/rich/rich-10.11.0.ebuild
index 901679288d88..3958bf9474a3 100644
--- a/dev-python/rich/rich-10.7.0.ebuild
+++ b/dev-python/rich/rich-10.11.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/rich/rich-10.3.0.ebuild b/dev-python/rich/rich-10.3.0.ebuild
deleted file mode 100644
index 67307cc76d41..000000000000
--- a/dev-python/rich/rich-10.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 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=pyproject.toml
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
-HOMEPAGE="https://github.com/willmcgugan/rich"
-SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7)"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-10.4.0.ebuild b/dev-python/rich/rich-10.4.0.ebuild
deleted file mode 100644
index 67307cc76d41..000000000000
--- a/dev-python/rich/rich-10.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 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=pyproject.toml
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
-HOMEPAGE="https://github.com/willmcgugan/rich"
-SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7)"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-10.5.0.ebuild b/dev-python/rich/rich-10.5.0.ebuild
deleted file mode 100644
index d15cd9f18c9a..000000000000
--- a/dev-python/rich/rich-10.5.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 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=pyproject.toml
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
-HOMEPAGE="https://github.com/willmcgugan/rich"
-SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-10.6.0.ebuild b/dev-python/rich/rich-10.6.0.ebuild
deleted file mode 100644
index d15cd9f18c9a..000000000000
--- a/dev-python/rich/rich-10.6.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 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=pyproject.toml
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
-HOMEPAGE="https://github.com/willmcgugan/rich"
-SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-10.8.0.ebuild b/dev-python/rich/rich-10.8.0.ebuild
deleted file mode 100644
index 901679288d88..000000000000
--- a/dev-python/rich/rich-10.8.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
-HOMEPAGE="https://github.com/willmcgugan/rich"
-SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-10.9.0.ebuild b/dev-python/rich/rich-10.9.0.ebuild
deleted file mode 100644
index 901679288d88..000000000000
--- a/dev-python/rich/rich-10.9.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
-HOMEPAGE="https://github.com/willmcgugan/rich"
-SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/scripttest/scripttest-1.3.0-r1.ebuild b/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
index 9f9971c50d93..642ebdede41a 100644
--- a/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
+++ b/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
@@ -14,6 +14,6 @@ SRC_URI="https://github.com/pypa/scripttest/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
diff --git a/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild b/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild
index 827393c4397e..25dc68b4b1b0 100644
--- a/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild
+++ b/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 SLOT="0"
 
 RDEPEND="
@@ -43,6 +43,7 @@ distutils_enable_sphinx doc/source \
 python_prepare_all() {
 	# --strict option is deprecated in pytest>6
 	sed -i -e '/addopts/d' tox.ini || die
+	sed -e '/CLI_TEST_TIMEOUT/s/2/20/' -i tests/test_cli.py || die
 
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index e4abcc5f19f8..23750b052b71 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -4,3 +4,4 @@ DIST virtualenv-20.7.0.tar.gz 8714219 BLAKE2B 81b5ee144614a7c854e03599270d03454f
 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/virtualenv-20.8.1.ebuild b/dev-python/virtualenv/virtualenv-20.8.1.ebuild
new file mode 100644
index 000000000000..c7692b2effe0
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.8.1.ebuild
@@ -0,0 +1,97 @@
+# 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 ~m68k ~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 ..."
+}