Adding metadata

48 files changed, 255 insertions, 968 deletions

diff --git a/dev-python/MechanicalSoup/MechanicalSoup-1.0.0.ebuild b/dev-python/MechanicalSoup/MechanicalSoup-1.0.0.ebuild
index 2c3f818dcb00..6e84143e9c08 100644
--- a/dev-python/MechanicalSoup/MechanicalSoup-1.0.0.ebuild
+++ b/dev-python/MechanicalSoup/MechanicalSoup-1.0.0.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
 RDEPEND="
-	>=dev-python/beautifulsoup-4.0[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup4-4.0[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/dev-python/MechanicalSoup/MechanicalSoup-1.1.0.ebuild b/dev-python/MechanicalSoup/MechanicalSoup-1.1.0.ebuild
index 88355d239d9f..9963325423aa 100644
--- a/dev-python/MechanicalSoup/MechanicalSoup-1.1.0.ebuild
+++ b/dev-python/MechanicalSoup/MechanicalSoup-1.1.0.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
 RDEPEND="
-	>=dev-python/beautifulsoup-4.7[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup4-4.7[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/bandit/bandit-1.6.2-r1.ebuild b/dev-python/bandit/bandit-1.6.2-r1.ebuild
index fe369bac223f..93b4b4ebb60d 100644
--- a/dev-python/bandit/bandit-1.6.2-r1.ebuild
+++ b/dev-python/bandit/bandit-1.6.2-r1.ebuild
@@ -32,7 +32,7 @@ DEPEND="
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup4-4.6.0[${PYTHON_USEDEP}]
 		>=dev-python/pylint-1.4.5[${PYTHON_USEDEP}]
 	)"
 RDEPEND="
diff --git a/dev-python/bandit/bandit-1.7.0.ebuild b/dev-python/bandit/bandit-1.7.0.ebuild
index cd950d9be3af..0d98ebebec4c 100644
--- a/dev-python/bandit/bandit-1.7.0.ebuild
+++ b/dev-python/bandit/bandit-1.7.0.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 		>=dev-python/stestr-2.5.0
 		>=dev-python/testscenarios-0.5.0[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/beautifulsoup-4.8.0[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup4-4.8.0[${PYTHON_USEDEP}]
 		>=dev-python/pylint-1.9.4[${PYTHON_USEDEP}]
 	)"
 RDEPEND="
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
deleted file mode 100644
index f253159b19c1..000000000000
--- a/dev-python/beautifulsoup/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST beautifulsoup4-4.9.3.tar.gz 376031 BLAKE2B fbe2139f288eee978c3f665c7640f66c6c51b857a186f6a8ace02b36effa1552f1cbea9e3744e0a46a65a06e6cdbd9203832e0ecd86b61406b933f9bd83d37b8 SHA512 e3cb6258bd7c51f12128fa8ee5948fb3566163ae233fac2dda21bab7772ab8dbb384d920b0ea138ef9921307b48f89cee3a9bf6111dfc8903d917ee7af365f34
diff --git a/dev-python/beautifulsoup4/Manifest b/dev-python/beautifulsoup4/Manifest
new file mode 100644
index 000000000000..4dede2d8d2dd
--- /dev/null
+++ b/dev-python/beautifulsoup4/Manifest
@@ -0,0 +1,2 @@
+DIST beautifulsoup4-4.10.0.tar.gz 399890 BLAKE2B 61f044064a81e94b64a72fd49cca164faa05442bc76f897c8a7fa4481acca039bcb9e4f7a1853a7155504fa25e56c518806d8af016369bc37316ecb95b59d7d3 SHA512 92be99ed0fd479b86519395143516e28f7b80f54a8251223d6e7b88dc98f8dfca9585079f5f1d89bfe68f577de3dff433711642486303203f46bc76754959a18
+DIST beautifulsoup4-4.9.3.tar.gz 376031 BLAKE2B fbe2139f288eee978c3f665c7640f66c6c51b857a186f6a8ace02b36effa1552f1cbea9e3744e0a46a65a06e6cdbd9203832e0ecd86b61406b933f9bd83d37b8 SHA512 e3cb6258bd7c51f12128fa8ee5948fb3566163ae233fac2dda21bab7772ab8dbb384d920b0ea138ef9921307b48f89cee3a9bf6111dfc8903d917ee7af365f34
diff --git a/dev-python/beautifulsoup4/beautifulsoup4-4.10.0.ebuild b/dev-python/beautifulsoup4/beautifulsoup4-4.10.0.ebuild
new file mode 100644
index 000000000000..6c9601d72f4b
--- /dev/null
+++ b/dev-python/beautifulsoup4/beautifulsoup4-4.10.0.ebuild
@@ -0,0 +1,24 @@
+# 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="Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
+HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/bs4/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/soupsieve[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx doc/source
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.9.3.ebuild b/dev-python/beautifulsoup4/beautifulsoup4-4.9.3.ebuild
index d4bd9226d53c..ed7076fe4fde 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.9.3.ebuild
+++ b/dev-python/beautifulsoup4/beautifulsoup4-4.9.3.ebuild
@@ -7,16 +7,12 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 
 inherit distutils-r1
 
-MY_PN="${PN}4"
-MY_P="${MY_PN}-${PV}"
-
 DESCRIPTION="Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
 HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/bs4/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="4"
+SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
@@ -24,6 +20,9 @@ RDEPEND="
 	dev-python/html5lib[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 "
+BDEPEND="
+	<dev-python/setuptools-58[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests nose
 distutils_enable_sphinx doc/source
diff --git a/dev-python/beautifulsoup/metadata.xml b/dev-python/beautifulsoup4/metadata.xml
index c15e905d30dc..c15e905d30dc 100644
--- a/dev-python/beautifulsoup/metadata.xml
+++ b/dev-python/beautifulsoup4/metadata.xml
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index f834554035fe..ac420e272a3e 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,4 +3,5 @@ DIST boto3-1.18.21.tar.gz 402611 BLAKE2B 39974c66ed5ad0697be6df04dbb141ce28e9a09
 DIST boto3-1.18.28.tar.gz 406268 BLAKE2B 1379f65f46f287a541b098b3ae183bc7d0a6c40a58f6241d97ce39ffdde4f0655e755fe56890fda767b57c6cf7bd565d95745dbbeb80f42f729f561f6e8d9a82 SHA512 98c0d94dd4971f833677947dbfbdcd495a26fda60592130842cf2f22b8929c6f72f971294d9ddc4923372706bf7f37d3d4cb0ede32afc6955d8253c19ddab63f
 DIST boto3-1.18.35.tar.gz 410165 BLAKE2B 1d32525175ee490b1b4029fc9c682afd789f850cff2fae4f3a46789b45c0cb3aa696e3b8f1c218e4efa1215c2945e21b9b00ea4cb0414addbecc593a858ada2d SHA512 d2ee1fa7465833696bb528119cce1629aba891e9cf85afd5a4757d2b900b8ed90d8fbc4fdb6aa69ee4d62cef8e7f13c2a078ad4135a5835739d455fef8ffcac0
 DIST boto3-1.18.36.tar.gz 410432 BLAKE2B 08d73bb8d8f16040f62fa5fb5e40855e201cd3bc24e0ffd0fdebbbf69a4ec05a0a93a6e1f08a61cebb1661542eda9783c36c098e07fd9b2f0d3c6ecc0ece1aea SHA512 16cc41de99ee216991dcb42d4ad92b08a834efdeaeba1fb18edd68dc3c0d1d04bb25b858f15f68286308a9dba0b800fc9c392b6b807c562660431425351e89e5
+DIST boto3-1.18.37.tar.gz 411095 BLAKE2B fafa31a06c52b1f35290ab4e6af7eb6e0bf16704da57b959b61edb8e5621bc036b1723ab084653e1177cbef008f3b4728546b7dfe78d572f600eda681e8e3feb SHA512 8536652e95ba7affdf701f76ab4674f6fddcc1b123e3476dc272f582cde236dfd920459c6cd644465e638ea0d6abf982e2ef77320cf1e7a4f5f6ef8b01e36227
 DIST boto3-1.18.7.tar.gz 395640 BLAKE2B 6a9fa1dd55644806fe93271805f35fbe0c4cb65d1de08dded2d2f57fcefa96e32c4ebe7b60743c52c0898222bc06d33dbd03d304bbef327b88022450a7943e2c SHA512 20e7fedab7d061ab02f391e9baf36cb554e7f194f38d24d5a75f76715b2acf1b51b6adce5d8cf5a2a0d29df73566db00b8813a219d45a194d9a8eb93d0dab570
diff --git a/dev-python/boto3/boto3-1.18.37.ebuild b/dev-python/boto3/boto3-1.18.37.ebuild
new file mode 100644
index 000000000000..bee358e1c595
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.37.ebuild
@@ -0,0 +1,57 @@
+# 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="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 1ba24c661b22..15bf9eef0939 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,4 +3,5 @@ DIST botocore-1.21.21.tar.gz 8042971 BLAKE2B 888abb929e1d66c293bff9d3d25682590e0
 DIST botocore-1.21.28.tar.gz 8079306 BLAKE2B 26dce445746a9da1b0cf62b622597396f9b4e735701f9260fd9863410b28b884e70e41b446b8349df39c81696b64632450f4ebb3e3f7865175e538f1b465898c SHA512 29534e51465bc7ac7b6f2e2c48472768c26caa5089f4c7f4a23cc2411fd55fde473388ad181a0b5a36650a6c1252ecb3e2b65e30510adc40f6edd6ce0c89f484
 DIST botocore-1.21.35.tar.gz 8122175 BLAKE2B 976ceaeb93a838337403b334e4ff4747e725cb473859031b86bcd6f87313a2c8e799a11f65f7e5efe5f4c063010fd55f4c012866be92db6e974c2293bf499a64 SHA512 7d94e35b027c01329eaf1b7d0f14f860359fdcebca0d0b842b87aeb5af61ee1fa5438f6d316b5d5b9a3f262fe8d24da5d0c6546679f3789ce09da17205aae162
 DIST botocore-1.21.36.tar.gz 8120799 BLAKE2B 3150e1efeca3173001f22e5e577ec4d9872af93608b3854f184455d11c1132bede7626b4f2a1ee79a70c1029578cac908914ef17e9d8675af1556454c270cb34 SHA512 1e69693580ebb311bc6be76ce92a11e3ecd33872dcd72c7add6dae696b231a39a3db6a6290930585445f442b7a5ba09445f0f176cd1d1ff21dde3efd054c0f0b
+DIST botocore-1.21.37.tar.gz 8123057 BLAKE2B 0e7c50bd5263db120f051e3d14c1a2f71db679c69cf22ca22f31a4e971d0aafe583b62e3d04083b5646663a87055bef73369d34b9ae825da25fe2bf4a76e58de SHA512 a81604b173216bce93b81a874b5f4defc84c9d1766f90c0fcd8b2ce9fa03867f11a08a6405f5e70006f10645a3729c2843c3f9c59bf37f901a5c07e73865f05c
 DIST botocore-1.21.7.tar.gz 7977343 BLAKE2B 19c5bf5de40ab131585e30bb85486fcffc3428808811b312b33578174ce31a691f4f4d955462120f05d2aad2cd5e5772789704eee641760fb67099aa3cddc9b5 SHA512 db1bb36faa6857a1cc717e5d591954415bb948178ee2be90ab9c32c11b1fb45c5b5aff87dfacd907c2f11bc7cdd2cd4de2ee9c847fa8cda4e5f0814a828b1019
diff --git a/dev-python/botocore/botocore-1.21.37.ebuild b/dev-python/botocore/botocore-1.21.37.ebuild
new file mode 100644
index 000000000000..5684261bd4b3
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.37.ebuild
@@ -0,0 +1,59 @@
+# 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="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.7.0.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.7.0.ebuild
index 26f64cf5dfe8..52e6c5891186 100644
--- a/dev-python/dns-lexicon/dns-lexicon-3.7.0.ebuild
+++ b/dev-python/dns-lexicon/dns-lexicon-3.7.0.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/tldextract[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/lxml/lxml-4.6.3-r1.ebuild b/dev-python/lxml/lxml-4.6.3-r1.ebuild
index 05144621e284..af0bf51dcaab 100644
--- a/dev-python/lxml/lxml-4.6.3-r1.ebuild
+++ b/dev-python/lxml/lxml-4.6.3-r1.ebuild
@@ -95,6 +95,6 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup
+	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4
 	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
 }
diff --git a/dev-python/lxml/lxml-4.6.3.ebuild b/dev-python/lxml/lxml-4.6.3.ebuild
index 01ae69c35719..c694f55598c3 100644
--- a/dev-python/lxml/lxml-4.6.3.ebuild
+++ b/dev-python/lxml/lxml-4.6.3.ebuild
@@ -95,6 +95,6 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup
+	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4
 	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
 }
diff --git a/dev-python/micawber/micawber-0.5.4.ebuild b/dev-python/micawber/micawber-0.5.4.ebuild
index 90f4befd88b8..17f6938ac7f1 100644
--- a/dev-python/micawber/micawber-0.5.4.ebuild
+++ b/dev-python/micawber/micawber-0.5.4.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 BDEPEND="
 	test? (
 		$(python_gen_impl_dep sqlite)
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/django[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild
index e9c565f7b899..fe2da2928d5e 100644
--- a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild
+++ b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild
@@ -25,7 +25,7 @@ PDEPEND=">=dev-python/mkdocs-material-5.0.0[${PYTHON_USEDEP}]"
 # by first emerging with FEATURES="-test"
 BDEPEND="
 	test? ( ${PDEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/mysql-connector-python/Manifest b/dev-python/mysql-connector-python/Manifest
index 145ae5916c4c..4f171f1d7da1 100644
--- a/dev-python/mysql-connector-python/Manifest
+++ b/dev-python/mysql-connector-python/Manifest
@@ -1,4 +1 @@
-DIST mysql-connector-python-8.0.22.tar.gz 12081967 BLAKE2B fc6b724ec2eb47a92294f7316093d4a4d2f4925981adeb07b305e946a047dbdaedd96c6ff9a07426fd56185f467cf6473bc84e0896d2e8fde70a188af16e9df2 SHA512 07f380922c18f9ade38f95d8e107fe8f90b8a7901fb9a36bbdfdb2b29f9cb79b0b6387a608e89bf90e9344c635d47184c750a206beacb2c9cc7615d6a7df2c29
-DIST mysql-connector-python-8.0.23.tar.gz 12095843 BLAKE2B e4cc24f045d0e988ad97a9427fa3f6e20eb9d993d97f51033140e12722bc04fc3a2b252b811402daea2fea8f987948ebd8c68623f2af3e0e7e35d2b0d6fa7eda SHA512 66ca61c15573555a3f42ad8a9e9b3a4bc612c4d2b4e54928af87adcf609e131e9afd53b76c3a8da30f181e4f2111245cda5995063109526ff72f4f2062c2e528
-DIST mysql-connector-python-8.0.25.tar.gz 14600643 BLAKE2B e3452aa82dc047cfdec8e64975ceb4f1ba7804aae770956fa52293e185408a4a31b2f563a21dcc6f0c5be0f4a5858d6b58f0d33ab5cf5071543e2c68b2b52b52 SHA512 2a76b879b369e69e0ed6a67d1eab4787c0f9a29c505ad785b03b6b25d7c92b85547082adeae572c75e61b613f39ee01d291fdf54927bdaf25dfcfc85cb8ced7c
 DIST mysql-connector-python-8.0.26.tar.gz 15180658 BLAKE2B e964728d5f39b9ca5abc72ab84780b463708d1a1cf90507330e73be4837cd30befe245ddd70783490660c70da1b7c162803eee743a0e668cfa6b82773bea4fef SHA512 204021e08b21c5efe87c0f59a6ff3b949cc1d01005121dfe5dde7fea12852a3e28c35b68e06e04f2c0ac4f911bfc14893e6509c99d0c5bf2c30fa32d4131c630
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-8.0.22.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-8.0.22.ebuild
deleted file mode 100644
index 6c7dfb5f6ae9..000000000000
--- a/dev-python/mysql-connector-python/mysql-connector-python-8.0.22.ebuild
+++ /dev/null
@@ -1,53 +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} )
-inherit distutils-r1
-
-DESCRIPTION="Python client library for MariaDB/MySQL"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/python/"
-SRC_URI="https://dev.mysql.com/get/Downloads/Connector-Python/${P}.tar.gz"
-
-KEYWORDS="amd64 arm x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples test"
-
-BDEPEND=">=dev-libs/protobuf-3.6.1"
-
-RDEPEND="
-	>=dev-db/mysql-connector-c-8.0
-	>=dev-python/protobuf-python-3.6.1[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]
-"
-# tests/mysqld.py does not like MariaDB version strings.
-# See the regex MySQLServerBase._get_version.
-DEPEND="${RDEPEND} test? ( dev-db/mysql[server(+)] )"
-
-# Tests currently fail.
-# mysql.connector.errors.DatabaseError: 1300 (HY000): Invalid utf8 character string: ''
-RESTRICT="test"
-
-DOCS=( README.txt CHANGES.txt README.rst )
-
-python_test() {
-	"${EPYTHON}" unittests.py --with-mysql="${EPREFIX}/usr" --unix-socket="${T}" --mysql-topdir="${T}"
-}
-
-# Yeah, this is really broken, but the extension will only build this way during "install"
-python_install() {
-	distutils-r1_python_install \
-		--with-mysql-capi="${EPREFIX}/usr" \
-		--with-protobuf-include-dir="${EPREFIX}/usr/include/google/protobuf/" \
-		--with-protobuf-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-protoc="${EPREFIX}/usr/bin/protoc"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples ; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-8.0.23.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-8.0.23.ebuild
deleted file mode 100644
index 546f15ceb2cf..000000000000
--- a/dev-python/mysql-connector-python/mysql-connector-python-8.0.23.ebuild
+++ /dev/null
@@ -1,53 +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} )
-inherit distutils-r1
-
-DESCRIPTION="Python client library for MariaDB/MySQL"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/python/"
-SRC_URI="https://dev.mysql.com/get/Downloads/Connector-Python/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples test"
-
-BDEPEND=">=dev-libs/protobuf-3.6.1"
-
-RDEPEND="
-	>=dev-db/mysql-connector-c-8.0
-	>=dev-python/protobuf-python-3.6.1[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]
-"
-# tests/mysqld.py does not like MariaDB version strings.
-# See the regex MySQLServerBase._get_version.
-DEPEND="${RDEPEND} test? ( dev-db/mysql[server(+)] )"
-
-# Tests currently fail.
-# mysql.connector.errors.DatabaseError: 1300 (HY000): Invalid utf8 character string: ''
-RESTRICT="test"
-
-DOCS=( README.txt CHANGES.txt README.rst )
-
-python_test() {
-	"${EPYTHON}" unittests.py --with-mysql="${EPREFIX}/usr" --unix-socket="${T}" --mysql-topdir="${T}"
-}
-
-# Yeah, this is really broken, but the extension will only build this way during "install"
-python_install() {
-	distutils-r1_python_install \
-		--with-mysql-capi="${EPREFIX}/usr" \
-		--with-protobuf-include-dir="${EPREFIX}/usr/include/google/protobuf/" \
-		--with-protobuf-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-protoc="${EPREFIX}/usr/bin/protoc"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples ; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-8.0.25.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-8.0.25.ebuild
deleted file mode 100644
index 3f872fc2b7eb..000000000000
--- a/dev-python/mysql-connector-python/mysql-connector-python-8.0.25.ebuild
+++ /dev/null
@@ -1,53 +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} )
-inherit distutils-r1
-
-DESCRIPTION="Python client library for MariaDB/MySQL"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/python/"
-SRC_URI="https://github.com/mysql/mysql-connector-python/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="amd64 arm x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples test"
-
-BDEPEND=">=dev-libs/protobuf-3.6.1"
-
-RDEPEND="
-	>=dev-db/mysql-connector-c-8.0
-	>=dev-python/protobuf-python-3.6.1[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]
-"
-# tests/mysqld.py does not like MariaDB version strings.
-# See the regex MySQLServerBase._get_version.
-DEPEND="${RDEPEND} test? ( dev-db/mysql[server(+)] )"
-
-# Tests currently fail.
-# mysql.connector.errors.DatabaseError: 1300 (HY000): Invalid utf8 character string: ''
-RESTRICT="test"
-
-DOCS=( README.txt CHANGES.txt README.rst )
-
-python_test() {
-	"${EPYTHON}" unittests.py --with-mysql="${EPREFIX}/usr" --unix-socket="${T}" --mysql-topdir="${T}"
-}
-
-# Yeah, this is really broken, but the extension will only build this way during "install"
-python_install() {
-	distutils-r1_python_install \
-		--with-mysql-capi="${EPREFIX}/usr" \
-		--with-protobuf-include-dir="${EPREFIX}/usr/include/google/protobuf/" \
-		--with-protobuf-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-protoc="${EPREFIX}/usr/bin/protoc"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples ; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 0c0ed7445218..fbe956811828 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,20 +1,8 @@
-DIST numpy-1.20.2.zip 7756879 BLAKE2B 8b76942e04701e164029b145fed1747de72142ea4f5a8aa7472a01caeeed5e0b5b6d9e543106f9786e231df5a8afe3b7ad9256e69873e4f8876c659114bc494e SHA512 337a66d68c965da06f757a89b58d30b83ec0b2f3c7a3bb39496e5031e50fee6c4f2ec090202c3da9a20613864ea46d032ae75af1de5c33eebe515133ef37d40c
-DIST numpy-1.20.3.zip 7761912 BLAKE2B a4da49f7c1aadca299acb1b6d92deb4f50b1881c4b131cd389524a88ffc70179b2acdc88235dccd1ffd09879893db45b16bf2f54ced9b9639b806e85f7346285 SHA512 897be1cd6f3880711149dcedd838357e2d937a3c5f36b2a0db6ceed341654acf96b8b775610e1b43bdb6eacb987bbc51aaa8906244ca02cc8c2eae359ccef405
-DIST numpy-1.21.0.zip 10252686 BLAKE2B 98f69855fae35f53a3bd467ca9bc0c06438519e6dc84808de829a4b1e41402b764c35ac4f94edba72496693241f85f488d6f91c81e7e5c3e33fdac264ce9ba56 SHA512 b4653ed78030d3c411fcafc08c6656072480704379810b7e3a4d907b55c255c27dcef6d519cdc0bb2dc79324c475baf0263248fb456be18a9ce80e3a2c5c7120
 DIST numpy-1.21.1.zip 10259878 BLAKE2B ba5d8eb2d294e199c86d8e96026d148098f5716398e730e0fdfee3b710fd01cb6e877973471d7751a2e558c2eaeb626fe9ce5ea4b03a7e4f8e5dc42b852d5b7c SHA512 694100915f4e2917d70a83e7fcdad30c85ffad8f5ad8d164c89287846c1b746c2b577233bacf53e8d8ca5147391f46065a2cabf100957bb8841dee4a042bc1f5
 DIST numpy-1.21.2.zip 10264801 BLAKE2B 2d88506faa5bc767a16c000f201559917d800fd205c75f30c1e61d4b34e214b376da9876e96186914f9fe23bf033a305bf9212f593841407e3bf4e516b5982a6 SHA512 ad08110d9a73a73ef1a546de5fcd6dfe600c17b396f629c3a19ade7b3f226688cf7524fed78c035fd4ddda135e2bcf9facb5e061fb59640b424da2ed070c4184
-DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5 SHA512 c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
-DIST numpy-html-1.20.3.zip 22936526 BLAKE2B 9c0bf4edea0c34640a2f2d84f117aa383f8690f5c99eb9c504aa27c07195c1e5a4219efc798398d8de709803b67d4a41a2739b1319b6dd7aeba3e70e817c2488 SHA512 181ff49fcde40f2d260e480d4a90bd8b439aecafef4ea581749b5a432c7e8c163b1714a97fd447c512b550d5bf3d9b104c575b4939eb5c8b7b70bbce1153982a
-DIST numpy-html-1.21.0.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.21.1.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.21.2.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
-DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
-DIST numpy-ref-1.20.3.pdf 7362241 BLAKE2B bf17564d7aea0db25ca9ef6b24dbbd25093c09e2a93bb60b69220d4e666024c50f3373fdb65aac510c06420dc415102d552fb0435e1986330ffdc41e9e356098 SHA512 316e645402125ca41d1e8b4da33374703f4379c31cf572c8ad429e0e89b6968776f480f9159bce53b9fdec918f03b82e5bb6446f127f43f138d6c0990191af5a
-DIST numpy-ref-1.21.0.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-ref-1.21.1.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-ref-1.21.2.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
-DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
-DIST numpy-user-1.20.3.pdf 4977046 BLAKE2B 3548463cc878645bb169255d3332681685d0f05e02abf4cfcdd03773826d34f5a25c020240652839867a76258b25ca601ed292462f80bdf18b92ecfb46710487 SHA512 f6c37152228eac1fb69ddfc3a37454066ed678d57f12a587e0edcfe0adb390cc0b470384c2751033f7407bac44df9f69b0da4f3da1c300e6fc02231035ff634c
-DIST numpy-user-1.21.0.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 DIST numpy-user-1.21.1.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 DIST numpy-user-1.21.2.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
diff --git a/dev-python/numpy/files/numpy-1.20.1-no-hardcode-blasv2.patch b/dev-python/numpy/files/numpy-1.20.1-no-hardcode-blasv2.patch
deleted file mode 100644
index e24e0edb926d..000000000000
--- a/dev-python/numpy/files/numpy-1.20.1-no-hardcode-blasv2.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
-index 13f9da0..b696ef5 100644
---- a/numpy/distutils/system_info.py
-+++ b/numpy/distutils/system_info.py
-@@ -505,32 +505,7 @@ def get_info(name, notfound_action=0):
-       1 - display warning message
-       2 - raise error
-     """
--    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
--          'atlas_threads': atlas_threads_info,                # ditto
--          'atlas_blas': atlas_blas_info,
--          'atlas_blas_threads': atlas_blas_threads_info,
--          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
--          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
--          'atlas_3_10': atlas_3_10_info,  # use lapack_opt or blas_opt instead
--          'atlas_3_10_threads': atlas_3_10_threads_info,                # ditto
--          'atlas_3_10_blas': atlas_3_10_blas_info,
--          'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
--          'lapack_atlas_3_10': lapack_atlas_3_10_info,  # use lapack_opt instead
--          'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info,  # ditto
--          'flame': flame_info,          # use lapack_opt instead
--          'mkl': mkl_info,
--          # openblas which may or may not have embedded lapack
--          'openblas': openblas_info,          # use blas_opt instead
--          # openblas with embedded lapack
--          'openblas_lapack': openblas_lapack_info, # use blas_opt instead
--          'openblas_clapack': openblas_clapack_info, # use blas_opt instead
--          'blis': blis_info,                  # use blas_opt instead
--          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
--          'blas_mkl': blas_mkl_info,          # use blas_opt instead
--          'openblas64_': openblas64__info,
--          'openblas64__lapack': openblas64__lapack_info,
--          'openblas_ilp64': openblas_ilp64_info,
--          'openblas_ilp64_lapack': openblas_ilp64_lapack_info,
-+    cl = {'flame': flame_info,          # use lapack_opt instead
-           'x11': x11_info,
-           'fft_opt': fft_opt_info,
-           'fftw': fftw_info,
-@@ -950,10 +925,7 @@ class system_info:
-         return [b for b in [a.strip() for a in libs.split(',')] if b]
- 
-     def get_libraries(self, key='libraries'):
--        if hasattr(self, '_lib_names'):
--            return self.get_libs(key, default=self._lib_names)
--        else:
--            return self.get_libs(key, '')
-+        return self.get_libs(key, '')
- 
-     def library_extensions(self):
-         c = customized_ccompiler()
diff --git a/dev-python/numpy/files/numpy-1.20.2-fix-ccompiler-tests.patch b/dev-python/numpy/files/numpy-1.20.2-fix-ccompiler-tests.patch
deleted file mode 100644
index 2312dd89a9b2..000000000000
--- a/dev-python/numpy/files/numpy-1.20.2-fix-ccompiler-tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 6f2f26e08c6e0d476593c82ad31d13847f30cbf4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 28 Mar 2021 10:00:14 +0200
-Subject: [PATCH] BUG: Fix test_ccompiler_opt when path contains dots
-
-Fix test_ccompiler_opt not to be confused by dots occurring on the path
-to the temporary directory, by using only the source file's basename
-when grabbing options.  Otherwise, the test can fail with mismatches
-such as:
-
-    E           AssertionError: 'sources_status' returns different targets than the compiled targets
-    E           ['AVX512F', 'AVX2'] != ['(20 2/TEMP/TMPB0YHSCAI/TEST_TARGETS AVX512F)', '(20 2/TEMP/TMPB0YHSCAI/TEST_TARGETS AVX2)']
-
-This is because our TMPDIR value includes numpy version, i.e. 1.20.2.
-The splitting happens on the first dot that is part of the directory
-path rather than test filename.
----
- numpy/distutils/tests/test_ccompiler_opt.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/numpy/distutils/tests/test_ccompiler_opt.py b/numpy/distutils/tests/test_ccompiler_opt.py
-index 287a683c8..d2b0a4c58 100644
---- a/numpy/distutils/tests/test_ccompiler_opt.py
-+++ b/numpy/distutils/tests/test_ccompiler_opt.py
-@@ -112,7 +112,7 @@ class _Test_CCompilerOpt(object):
-             gflags = {}
-             fake_objects = opt.try_dispatch([file])
-             for source, flags in fake_objects:
--                gtar = source.split('.')[1:-1]
-+                gtar = path.basename(source).split('.')[1:-1]
-                 glen = len(gtar)
-                 if glen == 0:
-                     gtar = "baseline"
--- 
-2.31.1
-
diff --git a/dev-python/numpy/files/numpy-1.20.2-fix-popcnt-detection.patch b/dev-python/numpy/files/numpy-1.20.2-fix-popcnt-detection.patch
deleted file mode 100644
index 85f4bb11b768..000000000000
--- a/dev-python/numpy/files/numpy-1.20.2-fix-popcnt-detection.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-https://github.com/numpy/numpy/pull/19074
-https://bugs.gentoo.org/788184
-
-From 8dc768964b5578a8aa9db1ef2c55134a00731e10 Mon Sep 17 00:00:00 2001
-From: Carl Michal <michal@physics.ubc.ca>
-Date: Sat, 22 May 2021 20:43:10 -0700
-Subject: [PATCH 1/2] Fix compile-time test of POPCNT
-
-The compile-time test of POPCNT, cpu_popcnt.c produced code that would
-execute without error even if the machine didn't support the popcnt
-instruction. This patch attempts to use popcnt on random numbers so the
-compiler can't substitute the answer at compile time.
----
- numpy/distutils/checks/cpu_popcnt.c | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/numpy/distutils/checks/cpu_popcnt.c b/numpy/distutils/checks/cpu_popcnt.c
-index e6a80fb40be4..f6c785dd2a97 100644
---- a/numpy/distutils/checks/cpu_popcnt.c
-+++ b/numpy/distutils/checks/cpu_popcnt.c
-@@ -4,20 +4,26 @@
-     #include <popcntintrin.h>
- #endif
- 
-+#include <stdlib.h>
-+
- int main(void)
- {
-     long long a = 0;
-     int b;
-+    
-+    a = random();
-+    b = random();
-+      
- #ifdef _MSC_VER
-     #ifdef _M_X64
--    a = _mm_popcnt_u64(1);
-+    a = _mm_popcnt_u64(a);
-     #endif
--    b = _mm_popcnt_u32(1);
-+    b = _mm_popcnt_u32(b);
- #else
-     #ifdef __x86_64__
--    a = __builtin_popcountll(1);
-+    a = __builtin_popcountll(a);
-     #endif
--    b = __builtin_popcount(1);
-+    b = __builtin_popcount(b);
- #endif
-     return (int)a + b;
- }
-
-From 52d5fe1ede45083d0783c3e2bbaee5c44df9d553 Mon Sep 17 00:00:00 2001
-From: Carl Michal <michal@physics.ubc.ca>
-Date: Sun, 23 May 2021 08:24:52 -0700
-Subject: [PATCH 2/2] Change fix of cpu_popcnt.c to use
- _mm_popcnt_u64/_mm_popcnt_u32 on GCC
-
-_builtin_popcount is always available, so the compile-time check always
-succeeds.
----
- numpy/distutils/checks/cpu_popcnt.c | 26 ++++++++------------------
- 1 file changed, 8 insertions(+), 18 deletions(-)
-
-diff --git a/numpy/distutils/checks/cpu_popcnt.c b/numpy/distutils/checks/cpu_popcnt.c
-index f6c785dd2a97..540c98dab05d 100644
---- a/numpy/distutils/checks/cpu_popcnt.c
-+++ b/numpy/distutils/checks/cpu_popcnt.c
-@@ -4,26 +4,16 @@
-     #include <popcntintrin.h>
- #endif
- 
--#include <stdlib.h>
--
--int main(void)
-+int main(int argc, char **argv)
- {
--    long long a = 0;
--    int b;
--    
--    a = random();
--    b = random();
--      
--#ifdef _MSC_VER
--    #ifdef _M_X64
-+    // To make sure popcnt instructions are generated
-+    // and been tested against the assembler
-+    unsigned long long a = *((unsigned long long*)argv[argc-1]);
-+    unsigned int b = *((unsigned int*)argv[argc-2]);
-+
-+#if defined(_M_X64) || defined(__x86_64__)    
-     a = _mm_popcnt_u64(a);
--    #endif
--    b = _mm_popcnt_u32(b);
--#else
--    #ifdef __x86_64__
--    a = __builtin_popcountll(a);
--    #endif
--    b = __builtin_popcount(b);
- #endif
-+    b = _mm_popcnt_u32(b);
-     return (int)a + b;
- }
diff --git a/dev-python/numpy/files/numpy-1.20.3-float-hashing-py310.patch b/dev-python/numpy/files/numpy-1.20.3-float-hashing-py310.patch
deleted file mode 100644
index f3b2ea3ef0ca..000000000000
--- a/dev-python/numpy/files/numpy-1.20.3-float-hashing-py310.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From ad2a73c18dcff95d844c382c94ab7f73b5571cf3 Mon Sep 17 00:00:00 2001
-From: Sebastian Berg <sebastian@sipsolutions.net>
-Date: Tue, 4 May 2021 17:43:26 -0500
-Subject: [PATCH] MAINT: Adjust NumPy float hashing to Python's slightly
- changed hash
-
-This is necessary, since we use the Python double hash and the
-semi-private function to calculate it in Python has a new signature
-to return the identity-hash when the value is NaN.
-
-closes gh-18833, gh-18907
----
- numpy/core/src/common/npy_pycompat.h        | 16 ++++++++++
- numpy/core/src/multiarray/scalartypes.c.src | 13 ++++----
- numpy/core/tests/test_scalarmath.py         | 34 +++++++++++++++++++++
- 3 files changed, 57 insertions(+), 6 deletions(-)
-
-diff --git a/numpy/core/src/common/npy_pycompat.h b/numpy/core/src/common/npy_pycompat.h
-index aa0b5c1224d..9e94a971090 100644
---- a/numpy/core/src/common/npy_pycompat.h
-+++ b/numpy/core/src/common/npy_pycompat.h
-@@ -3,4 +3,20 @@
- 
- #include "numpy/npy_3kcompat.h"
- 
-+
-+/*
-+ * In Python 3.10a7 (or b1), python started using the identity for the hash
-+ * when a value is NaN.  See https://bugs.python.org/issue43475
-+ */
-+#if PY_VERSION_HEX > 0x030a00a6
-+#define Npy_HashDouble _Py_HashDouble
-+#else
-+static NPY_INLINE Py_hash_t
-+Npy_HashDouble(PyObject *NPY_UNUSED(identity), double val)
-+{
-+    return _Py_HashDouble(val);
-+}
-+#endif
-+
-+
- #endif /* _NPY_COMPAT_H_ */
-diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src
-index a001500b0a9..9930f7791d6 100644
---- a/numpy/core/src/multiarray/scalartypes.c.src
-+++ b/numpy/core/src/multiarray/scalartypes.c.src
-@@ -3172,7 +3172,7 @@ static npy_hash_t
- static npy_hash_t
- @lname@_arrtype_hash(PyObject *obj)
- {
--    return _Py_HashDouble((double) PyArrayScalar_VAL(obj, @name@));
-+    return Npy_HashDouble(obj, (double)PyArrayScalar_VAL(obj, @name@));
- }
- 
- /* borrowed from complex_hash */
-@@ -3180,14 +3180,14 @@ static npy_hash_t
- c@lname@_arrtype_hash(PyObject *obj)
- {
-     npy_hash_t hashreal, hashimag, combined;
--    hashreal = _Py_HashDouble((double)
--            PyArrayScalar_VAL(obj, C@name@).real);
-+    hashreal = Npy_HashDouble(
-+            obj, (double)PyArrayScalar_VAL(obj, C@name@).real);
- 
-     if (hashreal == -1) {
-         return -1;
-     }
--    hashimag = _Py_HashDouble((double)
--            PyArrayScalar_VAL(obj, C@name@).imag);
-+    hashimag = Npy_HashDouble(
-+            obj, (double)PyArrayScalar_VAL(obj, C@name@).imag);
-     if (hashimag == -1) {
-         return -1;
-     }
-@@ -3202,7 +3202,8 @@ c@lname@_arrtype_hash(PyObject *obj)
- static npy_hash_t
- half_arrtype_hash(PyObject *obj)
- {
--    return _Py_HashDouble(npy_half_to_double(PyArrayScalar_VAL(obj, Half)));
-+    return Npy_HashDouble(
-+            obj, npy_half_to_double(PyArrayScalar_VAL(obj, Half)));
- }
- 
- static npy_hash_t
-diff --git a/numpy/core/tests/test_scalarmath.py b/numpy/core/tests/test_scalarmath.py
-index d91b4a39146..09a734284a7 100644
---- a/numpy/core/tests/test_scalarmath.py
-+++ b/numpy/core/tests/test_scalarmath.py
-@@ -712,6 +712,40 @@ def test_shift_all_bits(self, type_code, op):
-                 assert_equal(res_arr, res_scl)
- 
- 
-+class TestHash:
-+    @pytest.mark.parametrize("type_code", np.typecodes['AllInteger'])
-+    def test_integer_hashes(self, type_code):
-+        scalar = np.dtype(type_code).type
-+        for i in range(128):
-+            assert hash(i) == hash(scalar(i))
-+
-+    @pytest.mark.parametrize("type_code", np.typecodes['AllFloat'])
-+    def test_float_and_complex_hashes(self, type_code):
-+        scalar = np.dtype(type_code).type
-+        for val in [np.pi, np.inf, 3, 6.]:
-+            numpy_val = scalar(val)
-+            # Cast back to Python, in case the NumPy scalar has less precision
-+            if numpy_val.dtype.kind == 'c':
-+                val = complex(numpy_val)
-+            else:
-+                val = float(numpy_val)
-+            assert val == numpy_val
-+            print(repr(numpy_val), repr(val))
-+            assert hash(val) == hash(numpy_val)
-+
-+        if hash(float(np.nan)) != hash(float(np.nan)):
-+            # If Python distinguises different NaNs we do so too (gh-18833)
-+            assert hash(scalar(np.nan)) != hash(scalar(np.nan))
-+
-+    @pytest.mark.parametrize("type_code", np.typecodes['Complex'])
-+    def test_complex_hashes(self, type_code):
-+        # Test some complex valued hashes specifically:
-+        scalar = np.dtype(type_code).type
-+        for val in [np.pi+1j, np.inf-3j, 3j, 6.+1j]:
-+            numpy_val = scalar(val)
-+            assert hash(complex(numpy_val)) == hash(numpy_val)
-+
-+
- @contextlib.contextmanager
- def recursionlimit(n):
-     o = sys.getrecursionlimit()
diff --git a/dev-python/numpy/numpy-1.20.2-r1.ebuild b/dev-python/numpy/numpy-1.20.2-r1.ebuild
deleted file mode 100644
index e8b0aa662bda..000000000000
--- a/dev-python/numpy/numpy-1.20.2-r1.ebuild
+++ /dev/null
@@ -1,144 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
-
-DOC_PV="1.16.4"
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://numpy.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
-	doc? (
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
-	)"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
-	lapack? ( virtual/pkgconfig )
-	test? (
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/numpy-1.20.1-no-hardcode-blasv2.patch
-	"${FILESDIR}"/numpy-1.20.2-fix-ccompiler-tests.patch
-	"${FILESDIR}"/numpy-1.20.2-fix-popcnt-detection.patch
-)
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-python_prepare_all() {
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	# disable fuzzed tests
-	find numpy/*/tests -name '*.py' -exec sed -i \
-		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
-	# very memory- and disk-hungry
-	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TEST_DIR}/lib" || die
-	epytest \
-		--deselect 'numpy/typing/tests/test_typing.py::test_fail[array_constructors.py]'
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.20.3-r1.ebuild b/dev-python/numpy/numpy-1.20.3-r1.ebuild
deleted file mode 100644
index a3f37dd8ae66..000000000000
--- a/dev-python/numpy/numpy-1.20.3-r1.ebuild
+++ /dev/null
@@ -1,142 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
-
-DOC_PV=${PV}
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://numpy.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
-	doc? (
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
-	)"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
-	lapack? ( virtual/pkgconfig )
-	test? (
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/numpy-1.20.1-no-hardcode-blasv2.patch
-	"${FILESDIR}"/numpy-1.20.2-fix-ccompiler-tests.patch
-	"${FILESDIR}"/numpy-1.20.2-fix-popcnt-detection.patch
-	"${FILESDIR}"/numpy-1.20.3-float-hashing-py310.patch
-)
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-python_prepare_all() {
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	# disable fuzzed tests
-	find numpy/*/tests -name '*.py' -exec sed -i \
-		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
-	# very memory- and disk-hungry
-	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TEST_DIR}/lib" || die
-	epytest
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.21.0.ebuild b/dev-python/numpy/numpy-1.21.0.ebuild
deleted file mode 100644
index 852fed7fbdb4..000000000000
--- a/dev-python/numpy/numpy-1.21.0.ebuild
+++ /dev/null
@@ -1,139 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
-
-DOC_PV=${PV}
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://numpy.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
-	doc? (
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
-	)"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
-	lapack? ( virtual/pkgconfig )
-	test? (
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/numpy-1.21.0-no-hardcode-blasv2.patch
-)
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-python_prepare_all() {
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	# disable fuzzed tests
-	find numpy/*/tests -name '*.py' -exec sed -i \
-		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
-	# very memory- and disk-hungry
-	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TEST_DIR}/lib" || die
-	epytest
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.21.2.ebuild b/dev-python/numpy/numpy-1.21.2.ebuild
index a522f986467d..7e6d544d571b 100644
--- a/dev-python/numpy/numpy-1.21.2.ebuild
+++ b/dev-python/numpy/numpy-1.21.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads(+)"
 
 FORTRAN_NEEDED=lapack
 
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
+inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs
 
 DOC_PV=${PV}
 DESCRIPTION="Fast array and numerical python library"
diff --git a/dev-python/pandas/pandas-1.2.3-r1.ebuild b/dev-python/pandas/pandas-1.2.3-r1.ebuild
index 01c55b256c23..7e29589c0aa3 100644
--- a/dev-python/pandas/pandas-1.2.3-r1.ebuild
+++ b/dev-python/pandas/pandas-1.2.3-r1.ebuild
@@ -28,7 +28,7 @@ RECOMMENDED_DEPEND="
 
 # TODO: add pandas-gbq to the tree
 OPTIONAL_DEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/blosc[${PYTHON_USEDEP}]
 	|| (
 		dev-python/html5lib[${PYTHON_USEDEP}]
@@ -67,7 +67,7 @@ DEPEND="${COMMON_DEPEND}
 	doc? (
 		${VIRTUALX_DEPEND}
 		app-text/pandoc
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
@@ -88,7 +88,7 @@ DEPEND="${COMMON_DEPEND}
 		${VIRTUALX_DEPEND}
 		${RECOMMENDED_DEPEND}
 		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/openpyxl[${PYTHON_USEDEP}]
@@ -176,7 +176,7 @@ python_install_all() {
 pkg_postinst() {
 	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
 	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
 	optfeature "for msgpack compression using blosc" dev-python/blosc
 	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
 	optfeature "Plotting support" dev-python/matplotlib
diff --git a/dev-python/pandas/pandas-1.2.4.ebuild b/dev-python/pandas/pandas-1.2.4.ebuild
index 4ca2f3297f41..b6d848f86177 100644
--- a/dev-python/pandas/pandas-1.2.4.ebuild
+++ b/dev-python/pandas/pandas-1.2.4.ebuild
@@ -28,7 +28,7 @@ RECOMMENDED_DEPEND="
 
 # TODO: add pandas-gbq to the tree
 OPTIONAL_DEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/blosc[${PYTHON_USEDEP}]
 	|| (
 		dev-python/html5lib[${PYTHON_USEDEP}]
@@ -65,7 +65,7 @@ DEPEND="${COMMON_DEPEND}
 	doc? (
 		${VIRTUALX_DEPEND}
 		app-text/pandoc
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
@@ -86,7 +86,7 @@ DEPEND="${COMMON_DEPEND}
 		${VIRTUALX_DEPEND}
 		${RECOMMENDED_DEPEND}
 		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/openpyxl[${PYTHON_USEDEP}]
@@ -174,7 +174,7 @@ python_install_all() {
 pkg_postinst() {
 	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
 	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
 	optfeature "for msgpack compression using blosc" dev-python/blosc
 	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
 	optfeature "Plotting support" dev-python/matplotlib
diff --git a/dev-python/pandas/pandas-1.2.5.ebuild b/dev-python/pandas/pandas-1.2.5.ebuild
index c1a6e0cd7f8a..71cc589ae791 100644
--- a/dev-python/pandas/pandas-1.2.5.ebuild
+++ b/dev-python/pandas/pandas-1.2.5.ebuild
@@ -28,7 +28,7 @@ RECOMMENDED_DEPEND="
 
 # TODO: add pandas-gbq to the tree
 OPTIONAL_DEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/blosc[${PYTHON_USEDEP}]
 	|| (
 		dev-python/html5lib[${PYTHON_USEDEP}]
@@ -65,7 +65,7 @@ DEPEND="${COMMON_DEPEND}
 	doc? (
 		${VIRTUALX_DEPEND}
 		app-text/pandoc
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
@@ -86,7 +86,7 @@ DEPEND="${COMMON_DEPEND}
 		${VIRTUALX_DEPEND}
 		${RECOMMENDED_DEPEND}
 		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/openpyxl[${PYTHON_USEDEP}]
@@ -172,7 +172,7 @@ python_install_all() {
 pkg_postinst() {
 	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
 	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
 	optfeature "for msgpack compression using blosc" dev-python/blosc
 	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
 	optfeature "Plotting support" dev-python/matplotlib
diff --git a/dev-python/pandas/pandas-1.3.0.ebuild b/dev-python/pandas/pandas-1.3.0.ebuild
index 331647d8403b..5af1ff9f396e 100644
--- a/dev-python/pandas/pandas-1.3.0.ebuild
+++ b/dev-python/pandas/pandas-1.3.0.ebuild
@@ -29,7 +29,7 @@ RECOMMENDED_DEPEND="
 
 # TODO: add pandas-gbq to the tree
 OPTIONAL_DEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/blosc[${PYTHON_USEDEP}]
 	|| (
 		dev-python/html5lib[${PYTHON_USEDEP}]
@@ -66,7 +66,7 @@ DEPEND="${COMMON_DEPEND}
 	doc? (
 		${VIRTUALX_DEPEND}
 		app-text/pandoc
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
@@ -87,7 +87,7 @@ DEPEND="${COMMON_DEPEND}
 		${VIRTUALX_DEPEND}
 		${RECOMMENDED_DEPEND}
 		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/openpyxl[${PYTHON_USEDEP}]
 		dev-python/pymysql[${PYTHON_USEDEP}]
@@ -178,7 +178,7 @@ python_install_all() {
 pkg_postinst() {
 	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
 	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
 	optfeature "for msgpack compression using blosc" dev-python/blosc
 	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
 	optfeature "Plotting support" dev-python/matplotlib
diff --git a/dev-python/pandas/pandas-1.3.1.ebuild b/dev-python/pandas/pandas-1.3.1.ebuild
index ddf38f82b00f..832b1bfc94f8 100644
--- a/dev-python/pandas/pandas-1.3.1.ebuild
+++ b/dev-python/pandas/pandas-1.3.1.ebuild
@@ -29,7 +29,7 @@ RECOMMENDED_DEPEND="
 
 # TODO: add pandas-gbq to the tree
 OPTIONAL_DEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/blosc[${PYTHON_USEDEP}]
 	|| (
 		dev-python/html5lib[${PYTHON_USEDEP}]
@@ -66,7 +66,7 @@ DEPEND="${COMMON_DEPEND}
 	doc? (
 		${VIRTUALX_DEPEND}
 		app-text/pandoc
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
@@ -87,7 +87,7 @@ DEPEND="${COMMON_DEPEND}
 		${VIRTUALX_DEPEND}
 		${RECOMMENDED_DEPEND}
 		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/openpyxl[${PYTHON_USEDEP}]
 		dev-python/pymysql[${PYTHON_USEDEP}]
@@ -178,7 +178,7 @@ python_install_all() {
 pkg_postinst() {
 	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
 	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
 	optfeature "for msgpack compression using blosc" dev-python/blosc
 	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
 	optfeature "Plotting support" dev-python/matplotlib
diff --git a/dev-python/pandas/pandas-1.3.2.ebuild b/dev-python/pandas/pandas-1.3.2.ebuild
index 975555bf2ce6..344b6d6be86b 100644
--- a/dev-python/pandas/pandas-1.3.2.ebuild
+++ b/dev-python/pandas/pandas-1.3.2.ebuild
@@ -29,7 +29,7 @@ RECOMMENDED_DEPEND="
 
 # TODO: add pandas-gbq to the tree
 OPTIONAL_DEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/blosc[${PYTHON_USEDEP}]
 	|| (
 		dev-python/html5lib[${PYTHON_USEDEP}]
@@ -66,7 +66,7 @@ DEPEND="${COMMON_DEPEND}
 	doc? (
 		${VIRTUALX_DEPEND}
 		app-text/pandoc
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
@@ -87,7 +87,7 @@ DEPEND="${COMMON_DEPEND}
 		${VIRTUALX_DEPEND}
 		${RECOMMENDED_DEPEND}
 		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/openpyxl[${PYTHON_USEDEP}]
 		dev-python/pymysql[${PYTHON_USEDEP}]
@@ -178,7 +178,7 @@ python_install_all() {
 pkg_postinst() {
 	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
 	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
 	optfeature "for msgpack compression using blosc" dev-python/blosc
 	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
 	optfeature "Plotting support" dev-python/matplotlib
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.6.3.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.6.3.ebuild
index b85a377cc8b4..5801b19cbaaf 100644
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.6.3.ebuild
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.6.3.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/pytest-regressions[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 7aa180271602..dff99805927d 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,2 +1,3 @@
 DIST pyglet-1.5.18.tar.gz 6440818 BLAKE2B cb7832000e0df96cd794f8eff9ba41aac8571542fbc45d1607df3935a7ed53ba8fd46b6bba40f6d5d53adfb2024aad1930cba1889b5d40d342457f7dc06db5d1 SHA512 d6ceddecccb36a90bef38c4a1608e866bb90ebb72eaaff693a2eb34678c7a50c99213a69042c569c22d54cc04a4b11d37ea8da47425958505261ebcf99bd28ce
 DIST pyglet-1.5.19.tar.gz 6446786 BLAKE2B fef21122cf31718e0a796b3be4edf386bf477dc4fa6480970159b9d361e489417c9cad1df1060290bc1678408eed36e287c15da442275beaa8d354c268568411 SHA512 7ef85d91cdcafef8cf097e96bd34e800002824696ffbc1132c2dd776fe9d3c7be0b5633fff1cb10344fcc1aafa3c0c9a75547ad374be091f35aa99527869ab4b
+DIST pyglet-1.5.20.tar.gz 6517626 BLAKE2B 41b63bc650823fc3065f71215822d39a1e3f40b02f75401ab8fab6be7d3d8848813c721f400ec923fa29f5d5b0a66f7d7af905caae10f1ea5ab5241cbead1c87 SHA512 da1519a2c196348d8af90f280ffc90b0f46d2d325403a5ca53fa663aab161d13802e22259124c3af77fbf5814c06d8920c0147b30c22db74fff885091e9a9ad0
diff --git a/dev-python/pyglet/pyglet-1.5.20.ebuild b/dev-python/pyglet/pyglet-1.5.20.ebuild
new file mode 100644
index 000000000000..5513865e435b
--- /dev/null
+++ b/dev-python/pyglet/pyglet-1.5.20.ebuild
@@ -0,0 +1,61 @@
+# 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 virtualx xdg-utils
+
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="http://pyglet.org/"
+SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples image +sound"
+
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/gst-python[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	image? ( || (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		x11-libs/gtk+:2
+	) )
+	sound? ( || (
+		media-libs/openal
+		media-sound/pulseaudio
+	) )
+"
+#	ffmpeg? ( media-libs/avbin-bin )
+
+DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	xdg_environment_reset
+
+	# Specify path to avoid running interactive tests
+	# We could add in integration tests, but they're slow
+	epytest tests/unit
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyquery/pyquery-1.4.3.ebuild b/dev-python/pyquery/pyquery-1.4.3.ebuild
index 04f6198e70dd..d1ad918d47db 100644
--- a/dev-python/pyquery/pyquery-1.4.3.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.3.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]"
 DEPEND="
 	test? (
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/webtest[${PYTHON_USEDEP}]
 	)"
@@ -39,5 +39,5 @@ python_test() {
 }
 
 pkg_postinst() {
-	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
+	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup4
 }
diff --git a/dev-python/pyspelling/pyspelling-2.7.2.ebuild b/dev-python/pyspelling/pyspelling-2.7.2.ebuild
index 9c1c8ade658c..c0f171f5b821 100644
--- a/dev-python/pyspelling/pyspelling-2.7.2.ebuild
+++ b/dev-python/pyspelling/pyspelling-2.7.2.ebuild
@@ -27,7 +27,7 @@ KEYWORDS="amd64 x86"
 RDEPEND="
 	|| ( app-text/aspell app-text/hunspell )
 
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/html5lib[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/markdown[${PYTHON_USEDEP}]
diff --git a/dev-python/pyspelling/pyspelling-2.7.3.ebuild b/dev-python/pyspelling/pyspelling-2.7.3.ebuild
index 62c341d6c8f1..0dd3b91a5410 100644
--- a/dev-python/pyspelling/pyspelling-2.7.3.ebuild
+++ b/dev-python/pyspelling/pyspelling-2.7.3.ebuild
@@ -25,7 +25,7 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	|| ( app-text/aspell app-text/hunspell )
 
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/html5lib[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/markdown[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools_rust/setuptools_rust-0.12.1.ebuild b/dev-python/setuptools_rust/setuptools_rust-0.12.1.ebuild
index 0c24f1e8d77c..25ca730e5b53 100644
--- a/dev-python/setuptools_rust/setuptools_rust-0.12.1.ebuild
+++ b/dev-python/setuptools_rust/setuptools_rust-0.12.1.ebuild
@@ -115,7 +115,7 @@ BDEPEND="
 	test? (
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/soupsieve/soupsieve-2.2.1.ebuild b/dev-python/soupsieve/soupsieve-2.2.1.ebuild
index 4b111bc722a3..30e9b7e58d0e 100644
--- a/dev-python/soupsieve/soupsieve-2.2.1.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.2.1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x
 
 BDEPEND="
 	test? (
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		<dev-python/lxml-4.6.3-r1[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.1.0.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.1.0.ebuild
index bba91ac90a32..d6e13ff9ccdb 100644
--- a/dev-python/sphinx-tabs/sphinx-tabs-3.1.0.ebuild
+++ b/dev-python/sphinx-tabs/sphinx-tabs-3.1.0.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 
 BDEPEND="
 	test? (
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/pytest-regressions[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
 		dev-python/sphinx-testing[${PYTHON_USEDEP}]
diff --git a/dev-python/webtest/webtest-2.0.35.ebuild b/dev-python/webtest/webtest-2.0.35.ebuild
index ac96829a3279..d431eb14be11 100644
--- a/dev-python/webtest/webtest-2.0.35.ebuild
+++ b/dev-python/webtest/webtest-2.0.35.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.2[${PYTHON_USEDEP}]
 	>=dev-python/waitress-0.8.5[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]"
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]"
 BDEPEND="
 	app-arch/unzip
 	test? (
diff --git a/dev-python/webtest/webtest-3.0.0.ebuild b/dev-python/webtest/webtest-3.0.0.ebuild
index 136c86e35c93..287766a2d5cc 100644
--- a/dev-python/webtest/webtest-3.0.0.ebuild
+++ b/dev-python/webtest/webtest-3.0.0.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/pastedeploy[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.2[${PYTHON_USEDEP}]
 	>=dev-python/waitress-0.8.5[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]"
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]"
 BDEPEND="
 	app-arch/unzip
 	test? (