Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-03-16 13:40:37 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-03-16 13:40:37 +0000
commit: 056129369fe8d414a3c66fc9a52b4b6efc7e4f8c (patch)
tree: 289a1c6e2e5ac153f09dec4581f3808c3f5d8e13 /dev-python
parent: 1cd3065bf0a16f121fad816c79dbd3f96f23de94 (diff)
download: baldeagleos-repo-056129369fe8d414a3c66fc9a52b4b6efc7e4f8c.tar.gz
baldeagleos-repo-056129369fe8d414a3c66fc9a52b4b6efc7e4f8c.tar.xz
baldeagleos-repo-056129369fe8d414a3c66fc9a52b4b6efc7e4f8c.zip
115 files changed, 908 insertions, 2910 deletions
diff --git a/dev-python/PyPDF2/PyPDF2-1.26.0-r1.ebuild b/dev-python/PyPDF2/PyPDF2-1.26.0-r1.ebuild
deleted file mode 100644
index 17278760fee3..000000000000
--- a/dev-python/PyPDF2/PyPDF2-1.26.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="https://pypi.org/project/PyPDF2/ https://github.com/mstamy2/PyPDF2"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="examples"
-
-PATCHES=( "${FILESDIR}/${P}-py3-tests.patch" )
-
-python_test() {
-	"${EPYTHON}" -m unittest Tests.tests || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r Sample_Code/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r1.ebuild b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r1.ebuild
deleted file mode 100644
index 3b383f0e78d4..000000000000
--- a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="RSS feed generator written in Python"
-HOMEPAGE="http://www.dalkescientific.com/Python/PyRSS2Gen.html https://pypi.org/project/PyRSS2Gen/"
-SRC_URI="http://www.dalkescientific.com/Python/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
diff --git a/dev-python/anyio/anyio-3.5.0.ebuild b/dev-python/anyio/anyio-3.5.0.ebuild
index f5759842eff9..3d24b45cd56c 100644
--- a/dev-python/anyio/anyio-3.5.0.ebuild
+++ b/dev-python/anyio/anyio-3.5.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 96752f409337..f28570b58609 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,4 +2,5 @@ DIST boto3-1.21.15.tar.gz 476516 BLAKE2B 306c7ee69dec5ff1fbd76ed32aaebdf0f52cdc4
 DIST boto3-1.21.16.tar.gz 476669 BLAKE2B 5ff8130a168841cd885f1f3f4752a5362910f0fd3c0598bab9db6f36c91570b4ef2ef598c46ebc5af870d9a12f12343213d44786923b3e0388bcc929d51fbca9 SHA512 86abc6903761ef740e3144a70acc9c3ef6f06e980a81b5384f8ad382080e8a5865df4e84b04ad54d6160ac2e9b7e1ff088395508ceb80861177f55b3a4eeeaab
 DIST boto3-1.21.18.tar.gz 477263 BLAKE2B 3d27a261bca3b7dbbab2eadd5be686e5b87b297a7a243d27a5424195e027abfb8e378296e760104f5de48a2e1a860bde5b658f7ff4c64520eab3df9f85bf78ae SHA512 4750a5ad6858df03c5c5367035de02f5a0123f46397992a7573542f5348eb0d864e3bbd6e009d7a62ccedef0316d1a2443649a87e922aa9c6dbdc4e1c9238e59
 DIST boto3-1.21.19.tar.gz 477903 BLAKE2B e06fdbcaf94a2c30efec86883b281d83363eeb643b09c894c678ba506f9ab3c85e0d807db61a9f26cf08c4bc7ecc563b6ad4b841be04c3055ae681eb5a8733cb SHA512 fbc29d04da1962c2cff2e4be568bc0eb2199181731e5028b848152d224f2bd1dcc0c53c9098762fa69189df1fc4d5ed99ac45fb631c9b37b3c911184167b1c31
+DIST boto3-1.21.20.tar.gz 478803 BLAKE2B a10b40e73b40933de94b6b33dfb76588cc7f614041f0128add3b1c9d0e30da77338cadef25b8f952e6a0eff9ad8f8248b44d4e70070ea793e2f1d0b1d96d81ae SHA512 37d3269e05727a08d1e288f8eee8fd6824d869cefce67a58323b4ffa89cc458a6de94438db204d49e037215659d0b29da2f03b59d7159bbc6492328099a87147
 DIST boto3-1.21.8.tar.gz 473069 BLAKE2B f08f76fb9c4e56e6ba5624c885973599505769d7f9eea6e20a06e1a641768b1f7b108fc7293282a55bf4c7d2b62eb34853f46b8c3ada9afb8fc25624daa60c12 SHA512 23ed88dcaefe3224db05959251befaae4f03859bf00daf649db1e838e5fb92e01a6da4bee8083366d804404aac358df19d7e4552d6aaf39f9c4b371ccc7f9088
diff --git a/dev-python/boto3/boto3-1.21.20.ebuild b/dev-python/boto3/boto3-1.21.20.ebuild
new file mode 100644
index 000000000000..80278b309f54
--- /dev/null
+++ b/dev-python/boto3/boto3-1.21.20.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1 multiprocessing
+
+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 ~riscv ~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}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index eb894b6685a3..e2f833df5872 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,4 +2,5 @@ DIST botocore-1.24.15.tar.gz 8820413 BLAKE2B 1a842d811b0471ee6881fc6fbae97269126
 DIST botocore-1.24.16.tar.gz 8820938 BLAKE2B 53e88eac6f0a0eff43b7f934d978e06d86debb5a99f112c576281978499d29627a5f8f0ca988ff05c8f24d08336d7a1bc0206037c8f0a89b2485b66af2b81294 SHA512 fac23333998ff790bc06829d576593f7031964d3399bd0cd71ffe160574ed98b88e64dc0cc84ca3eb04f6da130a8906d02f092e57d4074150e13611fbcacce33
 DIST botocore-1.24.18.tar.gz 8823998 BLAKE2B 0b3e94ad6ee5257642cc24c1c0966b92b0e759cb3d7dc4560e3b5eee2511e53a8c5fdfca559e8f891e5869a0b9d619ea1a3d050cdfbe202d9e57a855be64112f SHA512 8e92bfd9ae6f2067139c9296cd07d5bbc6e53ae3d748318dd16c47bd292d53e18ffafcdb5b25d7e18966d09e46376c45de45fceadf3422f7215c6a1aeded982e
 DIST botocore-1.24.19.tar.gz 8826833 BLAKE2B 371aeb445c798b1d365397cd4e300cf86efa6c478d0e37ef768f14ead751f0e3f97d2d5190ee75681e11affb835517305fc4d8694e8c9aa9084048701b93d937 SHA512 a6020b9fcaf285859bd33239ac1f46ba7ddaab3c680a93ccb0562352bf8677b890da4ee6f6a0b6c33e3cce56931cedf29f3b373509815b5597be0578b392a74a
+DIST botocore-1.24.20.tar.gz 8826541 BLAKE2B 8661c7057d64905972062761a567e88507769108e8e97ebea7d71b89a46fe7e807bd270a23d811c182651d334e50cdbd10d25302e021e19aeb509fff449629f0 SHA512 60c9160fa2e01f3e17bb964bcbd8194e011a787ad610d24fc31c3791b2a4b7645f94a688b8766b839a140dfa76fb9f1ae470604a262aaaf2838d42c730481653
 DIST botocore-1.24.8.tar.gz 8798121 BLAKE2B 4ca37ed7be0af62901bf154f75739cc7e07505a809e551884c72d5b5eed334fff1111fc6db016df522564a1f3d9b6f258e8eca96161a734711340bf880b553b5 SHA512 6ac2139694ab199313a0fb9a2f783b12de7f3915d10cba739f4758356a3b84a917c3c394954b6d82d7a62de907c6fe57a3559e2b9a625bb0479e7bacd31d21cc
diff --git a/dev-python/botocore/botocore-1.24.20.ebuild b/dev-python/botocore/botocore-1.24.20.ebuild
new file mode 100644
index 000000000000..9601c42e9b23
--- /dev/null
+++ b/dev-python/botocore/botocore-1.24.20.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1 multiprocessing
+
+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 ~riscv ~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/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${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 pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/cython/cython-0.29.28.ebuild b/dev-python/cython/cython-0.29.28.ebuild
index a31f71c5421a..bb3e4d588651 100644
--- a/dev-python/cython/cython-0.29.28.ebuild
+++ b/dev-python/cython/cython-0.29.28.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index b3b6b83101b3..71a041cf46b4 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -4,3 +4,5 @@ DIST Django-3.2.12.checksum.txt 2556 BLAKE2B 7ae6e41305b5b07969ddad3474a0819359d
 DIST Django-3.2.12.tar.gz 9812448 BLAKE2B 39b6e7e8f50b79d7be62be171eb358ab815c9dd630b8b2ad2cf085c42c79a6a8c92914fae3c471f41578e65fa09f011f959dd0794c804e7b30cfbc9411cf4f4b SHA512 fc8ad3af019b268d514cc5240cac9c6b2fbf3a169c7933e8ab2da92e9cfed72df7a2784a8d92eaec8105bc9c245763acd307178bdf662e5d51407e72ae9d8683
 DIST Django-4.0.2.checksum.txt 2547 BLAKE2B 532139126846e1758bbe7b4dc4ad4aad6c6b3607e298f4373366239637ceca7d01a26472b2a87917e64db7140d28a76c1f5fbb396e7022b1a42b723551770d1f SHA512 eddd8ac31fc60f803f1e6f975c079e84e5ef997e8ac93b7dcf3573bd0c5d057adeb6f092acaecb200529044d81aa2db9849c1c13525678c8c2bd27bd14d6b280
 DIST Django-4.0.2.tar.gz 9996300 BLAKE2B 422b0bb000e7f62a854dc8fa686001acc3f629ded462d2520fad9486a9c8eb5d501d29c6a9f30f63ff8da128ded6f40281439371eb688fb9bc95f2377c5ca0f7 SHA512 c64b25aa69b826805cc7a3efcd63ae41bbc31a61e68cdbda90e6bcec6bd8e2c5fc47b82176d0c1708f55d2c7b082c71939b89cb0621fcf1929d1475e3d393a97
+DIST Django-4.0.3.checksum.txt 2550 BLAKE2B 19471819fb593611217ae13a7dcb6bc67a0323daa94f4a4aeee508305aa09edbbd88ea759968ac989a1971bd72df766c7651e969aa86d3cbddd65b2bb3bf7efa SHA512 573cd0b9291698bf3218d6a77c146b5cda814e99c01cc2c455bf1b5ab2c4cbf4f2f569ea14a108e658237e933a69ec1a5288c293174916f4393ecb119231b9dc
+DIST Django-4.0.3.tar.gz 10061007 BLAKE2B 1cab7d16608acc64b2bd80aeb7d25e740442411080811a2704bbb8ddbc91d86d2aeb761cbb0522a9f095d29468060959ba7f4efd902f6c3afe0f6eb06399dd11 SHA512 4de4445e8b095ad5b858a741adc21939654838ab88b368d532f87490c1c2b3b9c927410f4370e02d2883d51d6a9508f5db3be13c2358221ae687cefea034b294
diff --git a/dev-python/django/django-4.0.3.ebuild b/dev-python/django/django-4.0.3.ebuild
new file mode 100644
index 000000000000..4ec710a6c224
--- /dev/null
+++ b/dev-python/django/django-4.0.3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/asgiref-3.4.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+src_prepare() {
+	# TODO: this suddenly started failing
+	sed -i -e 's:test_custom_fields:_&:' tests/inspectdb/tests.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
index 5350bc4d66cb..dc09a8a88117 100644
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@@ -1,2 +1,3 @@
 DIST flask-security-3.4.5.gh.tar.gz 348928 BLAKE2B 9890227e9775c4a28fc364affb0bf767407463d514f6dc3cd359dd8a026e8325d943a547f294f6363a276f9e7d97336c526dd45f4549c7cfaff2d6ef9ef0316a SHA512 f9ac7f46b2e1ab7dbb44ba925b01e16304e8f8d6d5d56f4e558d07b80dfffa59f04c2597e17c00a7d7ae11be3a97c78ccf8d79993b7451be4a7f75f85bc89f6f
 DIST flask-security-4.1.2.gh.tar.gz 408120 BLAKE2B a4ec9b0a58368b9c84ee2d5b8b7404adf4a985067fca79e574726efc7cd78f9b713360c7d9d53a29ef6dd2ec7d23b64e50893fd75259a00c2b549a4b2a821936 SHA512 8fd3a0561ccc8dd815483fc8d2863a13fa83dea4cf308972778f99c29f0f7496f95cfac483f1a4cf2f77cd2a728eb09a5f8e8b4147d2749aa0b75f98b752ba36
+DIST flask-security-4.1.3.gh.tar.gz 408609 BLAKE2B ef4b270d62de75fdcf51d1247960df85deca1699fdbfb73592a5711f9bb56f71a2f2de12a8d8c0eccdaccfef11a578cf9bd9abbf52bdacfe4bfc10f9adda0acc SHA512 92a0e7fce95eb4eb04baa9a11ee88ab3b8e88952aa6300bf8245cecfcc90657c83bbe93e1c3b19d62642a346b30f5912dd424e59a81023637f3183a61e8cf91c
diff --git a/dev-python/flask-security/flask-security-4.1.3.ebuild b/dev-python/flask-security/flask-security-4.1.3.ebuild
new file mode 100644
index 000000000000..143b9b8a3927
--- /dev/null
+++ b/dev-python/flask-security/flask-security-4.1.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple security for Flask apps"
+HOMEPAGE="
+	https://github.com/Flask-Middleware/flask-security/
+	https://pypi.org/project/Flask-Security-Too/"
+SRC_URI="
+	https://github.com/Flask-Middleware/flask-security/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/bleach-3.3.1[${PYTHON_USEDEP}]
+	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
+	dev-python/cachetools[${PYTHON_USEDEP}]
+	>=dev-python/flask-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-wtf-0.14.3[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.7.2[${PYTHON_USEDEP}]
+	>=dev-python/python-email-validator-1.1.1[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/Babel[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/argon2-cffi-19.1.0[${PYTHON_USEDEP}]
+		>=dev-python/bcrypt-3.1.5[${PYTHON_USEDEP}]
+		dev-python/bleach[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/flask-sqlalchemy-2.3[${PYTHON_USEDEP}]
+		>=dev-python/mongomock-3.19.0[${PYTHON_USEDEP}]
+		>=dev-python/peewee-3.11.2[${PYTHON_USEDEP}]
+		>=dev-python/phonenumbers-8.11.1[${PYTHON_USEDEP}]
+		>=dev-python/psycopg-2.8.4:2[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.9.3[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.2[${PYTHON_USEDEP}]
+		>=dev-python/zxcvbn-4.4.28[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/pony-0.7.11[${PYTHON_USEDEP}]
+		' python3_8 python3_9)
+		amd64? ( >=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}] )
+		arm64? ( >=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}] )
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's@--cache-clear@-p no:httpbin@' pytest.ini || die
+	distutils-r1_src_prepare
+}
+
+python_configure_all() {
+	esetup.py compile_catalog
+}
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index d1bb467c90b9..ae411e30ad60 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,2 +1 @@
-DIST httpx-0.21.3.tar.gz 2157078 BLAKE2B 08a9328a7350534abe646f0bf60bd15600a1cb3eb8d06578c87ed9a7d4e55efdddd2be597650cddec9f6456e89a1b159f3e23aa657f379f78157c12670cdadb0 SHA512 0a551de52954db5ed2c33d1b5c172607516031a7c86c0f235bd04f12f4cf82f63980a9f53115dac801748b0c282890b3ed4a53b2c912adbd245c10ad61dbf67e
 DIST httpx-0.22.0.gh.tar.gz 2157682 BLAKE2B bb08a7c4b72478d24264c0dca5630205ff386af73294dca66dcd12b646de602ad64e308feedaabd58742cb7a9d799fa23cd2f922e685e74f8181e1b5e9f1c4ee SHA512 a7360f5355f75f07425b42d49697e480319f3fe606d4601bb6d64b870c8a8fce6fad8bd857ef422fc48e6141201307ee94876d5bc54a68557c7dc32ce8f1451b
diff --git a/dev-python/httpx/httpx-0.21.3.ebuild b/dev-python/httpx/httpx-0.21.3.ebuild
deleted file mode 100644
index 4f7b3647f010..000000000000
--- a/dev-python/httpx/httpx-0.21.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Docs builder mkdocs not keyworded on all these arches yet
-# DOCS_BUILDER="mkdocs"
-# DOCS_DEPEND="dev-python/mkdocs-material"
-# DOCS_AUTODOC=1
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 # docs
-
-DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
-HOMEPAGE="https://www.python-httpx.org/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-IUSE="cli"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/charset_normalizer[${PYTHON_USEDEP}]
-	dev-python/sniffio[${PYTHON_USEDEP}]
-	=dev-python/httpcore-0.14*[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
-	<dev-python/rfc3986-2[${PYTHON_USEDEP}]
-	cli? (
-		=dev-python/click-8*[${PYTHON_USEDEP}]
-		=dev-python/pygments-2*[${PYTHON_USEDEP}]
-		=dev-python/rich-10*[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/brotlicffi[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/h2[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		dev-python/uvicorn[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	if ! use cli; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/client/test_proxies.py::test_async_proxy_close
-		tests/client/test_proxies.py::test_sync_proxy_close
-
-		# Result change in charset-normalizer-2.0.7+
-		'tests/test_decoders.py::test_text_decoder[data3-iso-8859-1]'
-		'tests/models/test_responses.py::test_response_no_charset_with_iso_8859_1_content'
-	)
-	local EPYTEST_IGNORE=()
-
-	use cli || EPYTEST_IGNORE+=(
-		tests/test_main.py
-	)
-
-	epytest
-}
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index 21ad33d8658f..3cce861b413e 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1 +1,2 @@
 DIST ipywidgets-7.6.5.tar.gz 4072535 BLAKE2B bc2347863af42254e740454e1d91ca8b7fc03de9dc6a2fdddaf9dbb13da2fe7af0f429733166865ebcdda9840189fc65dc677b7181b34f1c0dc697905aa3af4f SHA512 4952f1cd293f1a4bf1721222579273c95f59adfa9385963617924f5f28232e1940ec045e18aeae83ad138176e4d887e952fe875b960279f3e0b7d982a790a4dc
+DIST ipywidgets-7.7.0.tar.gz 4074763 BLAKE2B cff338dd635c57943161c78708e6a69abccaa46878e0bedb11ead76590b858ba57ce4dcfa8052533a4849da0dc9d5472987a7918fd2043462a21a908105d7910 SHA512 038da040912e6701762fb66fb3b6996ce0a59706afb05405b5932c02d34733842b227426f0b29eea115196bab384617425b0553c5db13a9dc832bddef63dfb92
diff --git a/dev-python/ipywidgets/ipywidgets-7.7.0.ebuild b/dev-python/ipywidgets/ipywidgets-7.7.0.ebuild
new file mode 100644
index 000000000000..38b4b39d0a81
--- /dev/null
+++ b/dev-python/ipywidgets/ipywidgets-7.7.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="https://ipywidgets.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
+	>=dev-python/ipython_genutils-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/widgetsnbextension-3.6.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# upstream hack to autoconfigure ipywidgets in jupyter
+	# we don't have jupyterlab_widgets packaged
+	sed -i -e '/jupyterlab_widgets/d' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pgspecial/Manifest b/dev-python/pgspecial/Manifest
index f361a4ac9992..72487e3c92b0 100644
--- a/dev-python/pgspecial/Manifest
+++ b/dev-python/pgspecial/Manifest
@@ -1 +1,2 @@
 DIST pgspecial-1.13.0.tar.gz 49204 BLAKE2B 7269fc94fc0672db1880ba4b76c8926b6a3c995aac3fca77add7ae6756fcc3295d8d32fcede37cd3fa2d82c82aebfc26d91ed50b4294c5206f04d4c72742b45b SHA512 de2560106fbad14f2095ace468c8490cb325aedb772f649f20a0b5fe65f19afeed33f219d3a6eca683a63b418741a9906a01f7c4bdd8734868517faeba791026
+DIST pgspecial-1.13.1.tar.gz 50269 BLAKE2B 0566a7c2d8ee1ea350e27a4283f56c4cb1360f23ac9fe0147358ff68f527907c47650466dd41ae9c68e8a1f8ba658e452a88db360a7066f5562b7f0c578b8b62 SHA512 4b8f0495451db40087327640edc4bf8c29997b4f501dc5af6d093ad880fc337050d651676ae8ff434da3564e773f9e89e6e7d6bf0d6cfb7b70d8b4beea73a347
diff --git a/dev-python/pgspecial/pgspecial-1.13.1.ebuild b/dev-python/pgspecial/pgspecial-1.13.1.ebuild
new file mode 100644
index 000000000000..99f68dcb4a84
--- /dev/null
+++ b/dev-python/pgspecial/pgspecial-1.13.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of PostgreSQL meta commands"
+HOMEPAGE="https://github.com/dbcli/pgspecial"
+SRC_URI="https://github.com/dbcli/pgspecial/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/click-4.1[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.1.19[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( >=dev-db/postgresql-8.1[server] )
+"
+
+distutils_enable_tests pytest
+
+DOCS=( License.txt README.rst changelog.rst  )
+
+src_test() {
+	local db=${T}/pgsql
+
+	initdb --username=postgres -D "${db}" || die
+	# TODO: random port
+	pg_ctl -w -D "${db}" start \
+		-o "-h '127.0.0.1' -p 5432 -k '${T}'" || die
+	psql -h "${T}" -U postgres -d postgres \
+		-c "ALTER ROLE postgres WITH PASSWORD 'postgres';" || die
+	createdb -h "${T}" -U postgres _test_db || die
+
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${db}" stop || die
+}
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index a959ca4348e3..3a4f6666bd1e 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,6 +1,3 @@
-DIST pip-21.3.1.tar.gz 8961896 BLAKE2B f694956854cfd26f9b043fc28994448d2b2efff04080808f4e89ba15905887b432efb02d1c81370f75bd42e5c615a5a2360af63437967bc2fef63a85d59906a7 SHA512 2f50f95fe36cffc18821a70824f5b28d03598894f9ea5b02acc4921d16fc7739131814828a2159bcd577331cc780c7776a3669fa1ca2d4690c861add10a16f00
-DIST pip-22.0.1.tar.gz 9288984 BLAKE2B 11936d6baffb8ccf3715f1183ac007f93930c6188c9b8b7c063b1c42513658cf8de31ce98a73d7d94a0a5b28407c985fe419419a689fae2a43bfc5c2fcb0439e SHA512 64ee12c8bfa12e8df4d5160c24064f28805d14c215d9db2663ca069d49e1e3c7050084bd9059bfdb31f0901440b4c2711d4544440a937a94ca1b9fa7f213924d
-DIST pip-22.0.2.tar.gz 9289498 BLAKE2B 4e23c9cf5410cbed77b631fc153c1a9a992a11e5f06c9e317a4e3018da19382f25208557d327447ee778d2a9ca585f08ffa2a3fd8bcdfcda7fd2ec195e99c135 SHA512 5cc649b1b64c731d3b47c2296d37c93d276393224e8183e6f8966e320b876122c3e89c163d3da5cba064f4279a5e1f2a92b349edaf834c33b69b77d593b7195f
 DIST pip-22.0.3.tar.gz 9290286 BLAKE2B f81140fbff5d16e8a38d21047dd790be2287b664b130d43e71c7d4f23d6a7cd5c8b2e58f988cc18dc4d08b83b0fcb3eac6b6ec001421e83e35db74f15d6c557e SHA512 05f0807b298c2136842ad1cae3b003f81d85ca79103f12171e4c8d020d6add076848c1acfb6442c4ae2da6b834de0e87dffaec7bd24dfc403372cead94949326
 DIST pip-22.0.4.tar.gz 9325766 BLAKE2B 9ce5a25e6fb9aedc39e2cddab2a8af3b47dbaaaf8bd22c39f8301b784e6e9f5434f63d5ef467f4d819b15bcd5cf8d3da52db34b3514c7b4a15823f77cb47e1c1 SHA512 af6d1787b4fe97f2eec9c2e3e3f0f756efca8cb83f6ecdae797986fb6050ee60d872a8a8eb7502a32c4334fc0c7af8cf3c58ce980407d0e9f89eec28a4290093
 DIST setuptools-57.4.0-py3-none-any.whl 819017 BLAKE2B afba86cf9aeea58ee869fdc11bbb192abbf2f89710e468b90dc291fec228ca16202483e36195a5ad4e2b8d210326bc83e2be6ec696ab413d94ffaeb05bb9c030 SHA512 9bf230f4e0e72acab07ab372a6ca05adb3d175a8079d2f73d327c632f3d27b8ee10442d3e60f4c94a6e61d5ba2212fc78187ca6e1717e15bb570bdce4263fd0b
diff --git a/dev-python/pip/files/pip-21.3.1-cryptography-tests.patch b/dev-python/pip/files/pip-21.3.1-cryptography-tests.patch
deleted file mode 100644
index 1505d487ad40..000000000000
--- a/dev-python/pip/files/pip-21.3.1-cryptography-tests.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8fa5d719a3c902ca9b6c9198229b7a67fecf8b8e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 26 Nov 2021 16:12:16 +0100
-Subject: [PATCH] Move cryptography-based imports into the fixture
-
-Move the imports that require cryptography into the cert_factory
-fixture.  This makes it possible to deselect these tests on systems
-where cryptography cannot be installed.
----
- tests/conftest.py | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 076aeaf19..bab6ab3f5 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -27,7 +27,6 @@ from pip._internal.cli.main import main as pip_entry_point
- from pip._internal.locations import _USE_SYSCONFIG
- from pip._internal.utils.temp_dir import global_tempdir_manager
- from tests.lib import DATA_DIR, SRC_DIR, PipTestEnvironment, TestData
--from tests.lib.certs import make_tls_cert, serialize_cert, serialize_key
- from tests.lib.path import Path
- from tests.lib.server import MockServer as _MockServer
- from tests.lib.server import make_mock_server, server_running
-@@ -535,6 +534,11 @@ def deprecated_python() -> bool:
- 
- @pytest.fixture(scope="session")
- def cert_factory(tmpdir_factory: pytest.TempdirFactory) -> Callable[[], str]:
-+    # Delay the import requiring cryptography in order to make it possible
-+    # to deselect relevant tests on systems where cryptography cannot
-+    # be installed.
-+    from tests.lib.certs import make_tls_cert, serialize_cert, serialize_key
-+
-     def factory() -> str:
-         """Returns path to cert/key file."""
-         output_path = Path(str(tmpdir_factory.mktemp("certs"))) / "cert.pem"
--- 
-2.34.1
-
diff --git a/dev-python/pip/pip-21.3.1-r1.ebuild b/dev-python/pip/pip-21.3.1-r1.ebuild
deleted file mode 100644
index 45b75d32ffac..000000000000
--- a/dev-python/pip/pip-21.3.1-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-57.4.0-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-# upstream still requires virtualenv-16 for testing, we are now fetching
-# it directly to avoid blockers with virtualenv-20
-VENV_PV=16.7.11
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
-			-> virtualenv-${VENV_PV}.tar.gz
-	)
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
-SLOT="0"
-IUSE="test vanilla"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/scripttest[${PYTHON_USEDEP}]
-		dev-python/tomli-w[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		!alpha? ( !hppa? ( !ia64? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-		) ) )
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-21.3-no-coverage.patch"
-		"${FILESDIR}/${P}-cryptography-tests.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
-			tests/data/common_wheels/ || die
-	fi
-}
-
-python_test() {
-	if [[ ${EPYTHON} == pypy* ]]; then
-		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]'
-		tests/functional/test_install.py::test_install_pip_does_not_modify_pip_when_satisfied
-		# Internet
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-		tests/functional/test_install.py::test_editable_install__local_dir_no_setup_py_with_pyproject
-		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
-	)
-
-	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
-		tests/lib/test_lib.py::test_correct_pip_version
-		# uses vendored packaging that uses deprecated distutils
-		tests/functional/test_warning.py::test_pip_works_with_warnings_as_errors
-	)
-
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/functional/test_install.py::test_install_sends_client_cert
-			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		)
-	fi
-
-	distutils_install_for_testing
-	pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die
-	distutils_install_for_testing
-	popd >/dev/null || die
-	# prevent it from being installed
-	rm -r "${BUILD_DIR}"/lib/virtualenv* || die
-
-	local -x GENTOO_PIP_TESTING=1 \
-		PATH="${TEST_DIR}/scripts:${PATH}" \
-		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
-	epytest -m "not network"
-}
-
-python_install_all() {
-	# Prevent dbus auto-launch
-	# https://bugs.gentoo.org/692178
-	export DBUS_SESSION_BUS_ADDRESS="disabled:"
-
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
-
-	"${EPYTHON}" -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	"${EPYTHON}" -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/pip/pip-22.0.1.ebuild b/dev-python/pip/pip-22.0.1.ebuild
deleted file mode 100644
index 34273fc8b84c..000000000000
--- a/dev-python/pip/pip-22.0.1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-57.4.0-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-# upstream still requires virtualenv-16 for testing, we are now fetching
-# it directly to avoid blockers with virtualenv-20
-VENV_PV=16.7.11
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
-			-> virtualenv-${VENV_PV}.tar.gz
-	)
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-SLOT="0"
-IUSE="test vanilla"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/scripttest[${PYTHON_USEDEP}]
-		dev-python/tomli-w[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		!alpha? ( !hppa? ( !ia64? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-		) ) )
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-21.3-no-coverage.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
-			tests/data/common_wheels/ || die
-	fi
-}
-
-python_test() {
-	if [[ ${EPYTHON} == pypy* ]]; then
-		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]'
-		tests/functional/test_install.py::test_install_pip_does_not_modify_pip_when_satisfied
-		# Internet
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-		tests/functional/test_install.py::test_editable_install__local_dir_no_setup_py_with_pyproject
-		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
-	)
-
-	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
-		tests/lib/test_lib.py::test_correct_pip_version
-		# uses vendored packaging that uses deprecated distutils
-		tests/functional/test_warning.py::test_pip_works_with_warnings_as_errors
-	)
-
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/functional/test_install.py::test_install_sends_client_cert
-			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		)
-	fi
-
-	distutils_install_for_testing
-	pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die
-	distutils_install_for_testing
-	popd >/dev/null || die
-	# prevent it from being installed
-	rm -r "${BUILD_DIR}"/lib/virtualenv* || die
-
-	local -x GENTOO_PIP_TESTING=1 \
-		PATH="${TEST_DIR}/scripts:${PATH}" \
-		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
-	epytest -m "not network"
-}
-
-python_install_all() {
-	# Prevent dbus auto-launch
-	# https://bugs.gentoo.org/692178
-	export DBUS_SESSION_BUS_ADDRESS="disabled:"
-
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
-
-	"${EPYTHON}" -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	"${EPYTHON}" -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/pip/pip-22.0.2.ebuild b/dev-python/pip/pip-22.0.2.ebuild
deleted file mode 100644
index 34273fc8b84c..000000000000
--- a/dev-python/pip/pip-22.0.2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-57.4.0-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-# upstream still requires virtualenv-16 for testing, we are now fetching
-# it directly to avoid blockers with virtualenv-20
-VENV_PV=16.7.11
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
-			-> virtualenv-${VENV_PV}.tar.gz
-	)
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-SLOT="0"
-IUSE="test vanilla"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/scripttest[${PYTHON_USEDEP}]
-		dev-python/tomli-w[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		!alpha? ( !hppa? ( !ia64? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-		) ) )
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-21.3-no-coverage.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
-			tests/data/common_wheels/ || die
-	fi
-}
-
-python_test() {
-	if [[ ${EPYTHON} == pypy* ]]; then
-		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]'
-		tests/functional/test_install.py::test_install_pip_does_not_modify_pip_when_satisfied
-		# Internet
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-		tests/functional/test_install.py::test_editable_install__local_dir_no_setup_py_with_pyproject
-		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
-	)
-
-	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
-		tests/lib/test_lib.py::test_correct_pip_version
-		# uses vendored packaging that uses deprecated distutils
-		tests/functional/test_warning.py::test_pip_works_with_warnings_as_errors
-	)
-
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/functional/test_install.py::test_install_sends_client_cert
-			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		)
-	fi
-
-	distutils_install_for_testing
-	pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die
-	distutils_install_for_testing
-	popd >/dev/null || die
-	# prevent it from being installed
-	rm -r "${BUILD_DIR}"/lib/virtualenv* || die
-
-	local -x GENTOO_PIP_TESTING=1 \
-		PATH="${TEST_DIR}/scripts:${PATH}" \
-		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
-	epytest -m "not network"
-}
-
-python_install_all() {
-	# Prevent dbus auto-launch
-	# https://bugs.gentoo.org/692178
-	export DBUS_SESSION_BUS_ADDRESS="disabled:"
-
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
-
-	"${EPYTHON}" -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	"${EPYTHON}" -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/pyClamd/pyClamd-0.4.0-r2.ebuild b/dev-python/pyClamd/pyClamd-0.4.0-r2.ebuild
deleted file mode 100644
index 493ac813514d..000000000000
--- a/dev-python/pyClamd/pyClamd-0.4.0-r2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="python interface to Clamd (Clamav daemon)"
-HOMEPAGE="https://xael.org/pages/pyclamd-en.html"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -e 's:/etc/clamav/clamd.conf:/etc/clamd.conf:' \
-		-i pyclamd/pyclamd.py || die
-}
diff --git a/dev-python/pyaes/pyaes-1.6.1-r2.ebuild b/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
deleted file mode 100644
index d5beb42e59dc..000000000000
--- a/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python Implementation of the AES block-cipher and common modes of operation"
-HOMEPAGE="https://pypi.org/project/pyaes/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-python/pycryptodome[${PYTHON_USEDEP}] )"
-
-python_test() {
-	local t fail=
-	for t in tests/test-*.py; do
-		einfo "${t}"
-		"${EPYTHON}" "${t}" || fail=1
-	done
-	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pyaes/pyaes-1.6.1-r3.ebuild b/dev-python/pyaes/pyaes-1.6.1-r3.ebuild
index f55539034bef..c6a8291deee5 100644
--- a/dev-python/pyaes/pyaes-1.6.1-r3.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.1-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyelftools/Manifest b/dev-python/pyelftools/Manifest
index 3edd13886aa2..44ad39ed6598 100644
--- a/dev-python/pyelftools/Manifest
+++ b/dev-python/pyelftools/Manifest
@@ -1,2 +1 @@
-DIST pyelftools-0.27.tar.gz 3328795 BLAKE2B 74e6e17c68b197d0ecdddedba81a96601003c41a9c095bc72dff7630511705d36d1bc2732005a87ad1420c99497d729c5b771eca7bf5409c0da77d7b348d9c1b SHA512 bb0a00e5500016e3d4f64be0a728e190f84b11a805f78d668b5a74716a30400e6794946f198ef4a3f3b8f64a63deb1b5a96180b09e56b7357b988b28e25fad0a
 DIST pyelftools-0.28.gh.tar.gz 5086001 BLAKE2B 87dad42d87b9d3de2382e21d6f7115fb24e420e262735d4bd73c4e3a325d10b69c6eab5d73ff999811633d6a024c22c15ad65be637339f0c609378d54926f747 SHA512 005163a53fe12baad0998d60d531e3ce4201236b7b042e3c28d7e68f9c40586f94a2576be6918be991a3bf464f2ca55700c0475a6e8c7b05b4342a6f5bbf3354
diff --git a/dev-python/pyelftools/pyelftools-0.27.ebuild b/dev-python/pyelftools/pyelftools-0.27.ebuild
deleted file mode 100644
index 2d391cadcb7e..000000000000
--- a/dev-python/pyelftools/pyelftools-0.27.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information"
-HOMEPAGE="https://pypi.org/project/pyelftools/ https://github.com/eliben/pyelftools"
-# PyPI tarball lacks some test files
-SRC_URI="https://github.com/eliben/pyelftools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-python_test() {
-	# readelf_tests often fails due to host `readelf` changing output format
-	local t
-	for t in all_unittests examples_test ; do
-		"${PYTHON}" ./test/run_${t}.py || die "Tests fail with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index cddd4b2024ef..8f8830d3e880 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,3 +1 @@
-DIST pygit2-1.7.1.tar.gz 281791 BLAKE2B 51f7f23752acf0abf6000f2262019db7503506267f0f5306bd53e0e15378447d2da564818c1b6efccc4759587aba6b4d7b142c760e4e2796445cd6056e949825 SHA512 a6232039b6364c7a0905aba20f7e27b43892b7067fa95fdd464438869453360ecdb885f2012cdf0eb0734c91dc79b60db894d1d0fee81922b9fb3cf920950937
-DIST pygit2-1.8.0.tar.gz 290516 BLAKE2B 3ec0035c5d9b7d15b62fdd15303f126ce005f99b632c2fb2a4a0294dac38458893d3fde137905862ede0286b2fb28d507c21092fe1a1178c3369b6b2fb07ee08 SHA512 f027331e1c0eae477048ac80b077361473dbddf2f137b0c6ebc0062a4b026e7fffd1fd7f6850f049dbbadb175a146b60eec87baf96f634e580a2d2237e40844c
 DIST pygit2-1.9.0.gh.tar.gz 312349 BLAKE2B 067074d58887597cdce9b7bbebb96a8ec8629c4dc42c87c2a0a9a23849bc2e8e36763273c7d883ccfadbc9f71a3b4b5612a9a7b58e3cfb39475e568d85cbdc64 SHA512 8934f1099004a536b78973f74efc8854cbfb736369a0592c382fbc1325409105640235a2b3ce4602ad0dce863cb9ffd34b2359c9840d2abdadb55e2a43df18f9
diff --git a/dev-python/pygit2/pygit2-1.7.1.ebuild b/dev-python/pygit2/pygit2-1.7.1.ebuild
deleted file mode 100644
index 568ada6f7ebf..000000000000
--- a/dev-python/pygit2/pygit2-1.7.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	=dev-libs/libgit2-1.3*:=
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unconditionally prevent it from using network
-	sed -i -e '/has_network/s:True:False:' test/utils.py || die
-
-	# we need to move them away to prevent pytest from forcing '..'
-	# for imports
-	mkdir hack || die
-	mv test hack/ || die
-	ln -s hack/test test || die
-}
-
-python_test() {
-	epytest hack/test
-}
diff --git a/dev-python/pygit2/pygit2-1.8.0.ebuild b/dev-python/pygit2/pygit2-1.8.0.ebuild
deleted file mode 100644
index 50f417340876..000000000000
--- a/dev-python/pygit2/pygit2-1.8.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	=dev-libs/libgit2-1.3*:=
-"
-BDEPEND="
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-	${BDEPEND}
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unconditionally prevent it from using network
-	sed -i -e '/has_network/s:True:False:' test/utils.py || die
-}
-
-src_test() {
-	rm -r pygit2 || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 37f21a4ef355..b17e2b3ae48a 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,2 +1 @@
 DIST pyicu-v2.8.1.tar.bz2 242774 BLAKE2B eeb3c45124301b7072addcbfc3c97521d21fbdb5bdf2b0fe94f0181c225927a0b3bd6ab6271140fa9928d0220e5cb33c800b367cf4b0cf844ad64a2438aa016b SHA512 dc7fb292322c565da045db9d91e9b4cd58a559d6f78bf3f050bf25fbab942179b463b977340e08bbeb107e3a2be8a2eb0a0a91911e0c0b8b96327ba85fd13c46
-DIST pyicu-v2.8.tar.bz2 242791 BLAKE2B 0492b1fbbb97a92fb90620fb720cf82ddb2e404d4ce4d20d4204c271ae0c32c526e5832f5658205893381c074f6b1e2a3274f1935efac094241fe2afbc7b9c07 SHA512 c8ecc11322de79d42aa0f0336cdc47637af203bbf2782107132d3c194cef3725114ba6fc40bbd2bffc26ce168d6d4e39f069904aa268d0d095c506ddca292051
diff --git a/dev-python/pyicu/pyicu-2.8.ebuild b/dev-python/pyicu/pyicu-2.8.ebuild
deleted file mode 100644
index 2d5a81755e44..000000000000
--- a/dev-python/pyicu/pyicu-2.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-MY_P=${P/-/-v}
-DESCRIPTION="Python bindings for dev-libs/icu"
-HOMEPAGE="
-	https://gitlab.pyicu.org/main/pyicu/
-	https://pypi.org/project/PyICU/"
-SRC_URI="
-	https://gitlab.pyicu.org/main/pyicu/-/archive/v${PV}/${MY_P}.tar.bz2"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-libs/icu:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? ( dev-python/six[${PYTHON_USEDEP}] )"
-
-DOCS=( CHANGES CREDITS README.md )
-
-distutils_enable_tests pytest
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index 9490bb09a2d2..c299db153428 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,2 +1 @@
-DIST pylast-4.4.0.tar.gz 39793 BLAKE2B 13a2bd4652b0dee142442f8bc6bf922f544b093be207efe8661f5355e37ff59a5c0d9c844193d2d3e4f22ccafc10993b8cced6872d4f0fece42c37524bee8beb SHA512 341b3f8a6691699b9581769d1f06908df8ec694a22d8918e4ed37af1f47287577c5fc156f3807c744aa9774d69e23570036f06a8e9921f3c7c7d21b53b8eb041
 DIST pylast-4.5.0.tar.gz 40175 BLAKE2B 394a6329d0c7f03ae70cf7ee5e19e310d4fc4b70f86a6e8ed66ad93674465433ff7ab06cfbfa82fd33302a6d85b9fe582402c2166746e7853d1bada9de5f2449 SHA512 c885f0ea415c2a6b96454abdbcef0b61732a5253ddff45a03d85a2b7d733f6bff47d1806576e4acc6d07763e404985e5c35341e37b88d586d1cbec811d984551
diff --git a/dev-python/pylast/pylast-4.4.0.ebuild b/dev-python/pylast/pylast-4.4.0.ebuild
deleted file mode 100644
index 8171146a32fa..000000000000
--- a/dev-python/pylast/pylast-4.4.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Python interface to last.fm and other api-compatible websites"
-HOMEPAGE="https://github.com/pylast/pylast"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/flaky[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests --install pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index a33f8864e444..880fd0cc3b35 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,2 +1 @@
-DIST pymdown-extensions-9.1.tar.gz 1004051 BLAKE2B e6b1ebfbacce8c78c00cffc314244ed4a65a2e63d8270196e1acdd72adc75956e57b00b89ad0e4089cb186d23df390eb00a08b47a0418f4a41147803bed079ce SHA512 ab5b9703096dc95d33469d79eb042e845f1337ac65d951e65e44224190f7feb832049854163dfcb73ee238254e10b831640a1813cafd981368df96b96d3f6752
 DIST pymdown-extensions-9.2.tar.gz 1008401 BLAKE2B 017f8de124c8bfac8d53fe9ddb7aba5befa728f851cfc207b774d9da340fb8c5c067f3ffb399702c2d86ee17b740158c92a2dcce0d3470afca5b011499c86836 SHA512 2b33d63181d4e4e2e9a98c23ff48edc0425bd9a7419d339817210707b172538a5571a4d430276beb43ebab3f9e3941074a53116aaf4d1c4a90d1db2a76457f04
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.1.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.1.ebuild
deleted file mode 100644
index 55bc1473ca0b..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pymdown-lexers
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND=">=dev-python/markdown-3.2[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	test? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pymilter/pymilter-1.0.4-r1.ebuild b/dev-python/pymilter/pymilter-1.0.4-r1.ebuild
deleted file mode 100644
index 05176b21718c..000000000000
--- a/dev-python/pymilter/pymilter-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-DISTUTILS_USE_SETUPTOOLS="no"
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to sendmail milter API"
-HOMEPAGE="https://github.com/sdgathman/pymilter"
-SRC_URI="https://github.com/sdgathman/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )"
-
-DEPEND="${CDEPEND}
-	test? ( $(python_gen_impl_dep sqlite) )"
-
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${PN}-${P}"
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die
-}
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index 57adc2d896f2..f242f4cc2a25 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1 +1,2 @@
 DIST mongo-python-driver-4.0.1.tar.gz 1030722 BLAKE2B b820901a433ffa2e82db0ef3c014aaa1e7d53bbc3ab94a5432fcb713d9789cbbf411a4ad5085ef3896cbf2aeff6d0e79f3f7bd5936d3aa615080a0421d8818c2 SHA512 1aead66d21c032e6d42b3aa408b0193bcac6a5a293ecfc513fadb634c574dccdcd351c693352f23cfe577c73fec901cdc2aa635dfe9afe8d9108ed917f55b53b
+DIST mongo-python-driver-4.0.2.tar.gz 1027101 BLAKE2B d95eea08e09101f1db5df5dcbd5d843273ebd0c63b228420748a1663620ea18e05853372e876abc8b6480238de2b035c4e5a3c9f9b7c206228870a66e5d5f053 SHA512 eacb24d110de645a70b16b4d11f7a6b019f741fba2222f8ecee47d9f638fd71e579d3a46f5f539bc89d1ea53ddf0b72745b667a0f05479bb4b53ed72fb075b5b
diff --git a/dev-python/pymongo/pymongo-4.0.2.ebuild b/dev-python/pymongo/pymongo-4.0.2.ebuild
new file mode 100644
index 000000000000..565026d64ba7
--- /dev/null
+++ b/dev-python/pymongo/pymongo-4.0.2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit check-reqs distutils-r1
+
+MY_P=mongo-python-driver-${PV}
+DESCRIPTION="Python driver for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/"
+SRC_URI="
+	https://github.com/mongodb/mongo-python-driver/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86"
+IUSE="doc kerberos"
+
+RDEPEND="
+	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		>=dev-db/mongodb-2.6.0
+	)
+"
+
+distutils_enable_sphinx doc
+distutils_enable_tests unittest
+
+reqcheck() {
+	if use test; then
+		# During the tests, database size reaches 1.5G.
+		local CHECKREQS_DISK_BUILD=1536M
+
+		check-reqs_${1}
+	fi
+}
+
+pkg_pretend() {
+	reqcheck pkg_pretend
+}
+
+pkg_setup() {
+	reqcheck pkg_setup
+}
+
+src_prepare() {
+	# network-sandbox
+	rm test/test_srv_polling.py || die
+	sed -e 's:test_connection_timeout_ms_propagates_to_DNS_resolver:_&:' \
+		-e 's:test_service_name_from_kwargs:_&:' \
+		-e 's:test_srv_max_hosts_kwarg:_&:' \
+		-i test/test_client.py || die
+	sed -e '/SRV_SCHEME/s:_HAVE_DNSPYTHON:False:' \
+		-i test/test_uri_spec.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Yes, we need TCP/IP for that...
+	local DB_IP=127.0.0.1
+	local DB_PORT=27000
+
+	export DB_IP DB_PORT
+
+	local dbpath=${TMPDIR}/mongo.db
+	local logpath=${TMPDIR}/mongod.log
+
+	# Now, the hard part: we need to find a free port for mongod.
+	# We're just trying to run it random port numbers and check the log
+	# for bind errors. It shall be noted that 'mongod --fork' does not
+	# return failure when it fails to bind.
+
+	mkdir -p "${dbpath}" || die
+	while true; do
+		ebegin "Trying to start mongod on port ${DB_PORT}"
+
+		LC_ALL=C \
+		mongod --dbpath "${dbpath}" --nojournal \
+			--bind_ip ${DB_IP} --port ${DB_PORT} \
+			--unixSocketPrefix "${TMPDIR}" \
+			--logpath "${logpath}" --fork \
+		&& sleep 2
+
+		# Now we need to check if the server actually started...
+		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
+			# yay!
+			eend 0
+			break
+		elif grep -q 'Address already in use' "${logpath}"; then
+			# ay, someone took our port!
+			eend 1
+			: $(( DB_PORT += 1 ))
+			continue
+		else
+			eend 1
+			eerror "Unable to start mongod for tests. See the server log:"
+			eerror "	${logpath}"
+			die "Unable to start mongod for tests."
+		fi
+	done
+
+	local failed
+	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
+
+	mongod --dbpath "${dbpath}" --shutdown || die
+
+	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
+
+	rm -rf "${dbpath}" || die
+}
diff --git a/dev-python/pymountboot/pymountboot-0.2.3.ebuild b/dev-python/pymountboot/pymountboot-0.2.3.ebuild
deleted file mode 100644
index 192dadc68231..000000000000
--- a/dev-python/pymountboot/pymountboot-0.2.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python extension module to (re)mount /boot"
-HOMEPAGE="https://github.com/mgorny/pymountboot/"
-SRC_URI="
-	https://github.com/mgorny/pymountboot/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=sys-apps/util-linux-2.20"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
index b8e7cc7a640f..b622ff82abf1 100644
--- a/dev-python/pyqtgraph/Manifest
+++ b/dev-python/pyqtgraph/Manifest
@@ -1,2 +1,3 @@
 DIST pyqtgraph-0.12.3.tar.gz 1317230 BLAKE2B d9a7a86f976fd7d778b0f038b24e80d6cbbdb98f6cda7de0461d1e3bbac0a99745dc3cccc63f38c24128018a2f41f3a0da7437bf9ddbd3f4091fd826ae4ea915 SHA512 13f1ff4bcce7ab8c133ebb99101d300bb3abcd6ea8b7321f3aa646d6992b6988db17d478dcec52339dd380f7c6e487f47b95b9f9de616b7ff2dab35ca5f0cc30
+DIST pyqtgraph-0.12.4.tar.gz 1333052 BLAKE2B 4208787d1d203904d841493e10b2f1d23357b60475c9e1cfff733fe772973d4dd619ca84941049bd60299912f3077fb18c27a90fa3c0c0e712a3715b5be1d071 SHA512 8402b38fe1abaaf55d6dbc26775093993b9f642d7a9da59d2780ed38562c8653ab872c588d2e66373434491b8f397533cb3c222382065c812a28cf6b9ce34960
 DIST pyqtgraph-test-data-8.tar.gz 306068 BLAKE2B f3aa418dfaf2e74950fa880da4b6dfb4ef5dbd46346b78065d885c1f9fc06fc3de86756af17e27035d4cd47d98cc7ce58c036b493837b568086a4ebceb230c78 SHA512 07ef414f2b57e00589f8c18459e88ab16001c7cc3766164cdfcd69faa26cbc90ed64611fd0c5e3b401dc6a3f1a6e9e4ce6a7d9fa96ebcc4360e03fa9fbb856d2
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.12.4.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.12.4.ebuild
new file mode 100644
index 000000000000..2fddd62f0518
--- /dev/null
+++ b/dev-python/pyqtgraph/pyqtgraph-0.12.4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1 multiprocessing
+
+TEST_DATA_TAG=test-data-8
+DESCRIPTION="A pure-python graphics and GUI library built on PyQt and numpy"
+HOMEPAGE="https://www.pyqtgraph.org/ https://pypi.org/project/pyqtgraph/"
+SRC_URI="
+	https://github.com/pyqtgraph/pyqtgraph/archive/${P}.tar.gz
+	test? (
+		https://github.com/pyqtgraph/test-data/archive/${TEST_DATA_TAG}.tar.gz
+			-> ${PN}-${TEST_DATA_TAG}.tar.gz
+	)"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples opengl svg"
+REQUIRED_USE="test? ( opengl svg )"
+
+RDEPEND="
+	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,widgets,opengl=,svg=,${PYTHON_USEDEP}]
+	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		dev-python/h5py[${PYTHON_USEDEP}]
+		dev-python/PyQt5[testlib,${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_sphinx doc/source
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if ! use opengl; then
+		rm -r pyqtgraph/opengl || die
+	fi
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# apparently fragile
+		tests/test_reload.py::test_reload
+
+		# TODO
+		tests/graphicsItems/test_ROI.py::test_PolyLineROI
+
+		# pyside2 is normally skipped if not installed but these two
+		# fail if it is installed
+		# TODO: this could be due to USE flags, revisit when pyside2
+		# gains py3.9
+		'pyqtgraph/examples/test_examples.py::testExamples[ DateAxisItem_QtDesigner.py - PySide2 ]'
+		'pyqtgraph/examples/test_examples.py::testExamples[ designerExample.py - PySide2 ]'
+	)
+
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+src_test() {
+	mkdir "${HOME}"/.pyqtgraph || die
+	mv "${WORKDIR}/test-data-${TEST_DATA_TAG}" \
+		"${HOME}"/.pyqtgraph/test-data || die
+	cd "${HOME}"/.pyqtgraph/test-data || die
+	# we need to fake a git repo
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+	git init -q || die
+	git commit -q --allow-empty -m "dummy commit" || die
+	git tag "${TEST_DATA_TAG}" || die
+	cd - >/dev/null || die
+
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	use examples && DOCS+=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyserial/pyserial-3.5.ebuild b/dev-python/pyserial/pyserial-3.5.ebuild
deleted file mode 100644
index 77fcbd8b0b5f..000000000000
--- a/dev-python/pyserial/pyserial-3.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Python Serial Port extension"
-HOMEPAGE="https://github.com/pyserial/pyserial https://pypi.org/project/pyserial/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="examples"
-
-DOCS=( CHANGES.rst README.rst )
-
-distutils_enable_sphinx documentation --no-autodoc
-
-python_test() {
-	"${EPYTHON}" test/run_all_tests.py loop:// -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/pyspf/pyspf-2.0.14-r2.ebuild b/dev-python/pyspf/pyspf-2.0.14-r2.ebuild
deleted file mode 100644
index b617ee2affe8..000000000000
--- a/dev-python/pyspf/pyspf-2.0.14-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="ipv6(+)"
-
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the Sender Policy Framework (SPF)"
-HOMEPAGE="https://pypi.org/project/pyspf/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/authres[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" testspf.py || die "Test fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index ca407a500dc0..c1a39aec7112 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,2 +1 @@
-DIST pytest-mock-3.6.1.tar.gz 29933 BLAKE2B 6c22d23f3a8e9b5ef26f990325f5a2c2897b60f61f84472716a1f984e72a8c38f6992e439ef581d7772e25a5fe9e76d190697d9c7bc8b5dcbf6375bead4b3dc3 SHA512 50a8ffbac1b20b1962558789b24d50c1e7d8d2e2706ee15a576eb5fd1b40d4523482dce7a1078d532b686ff8d38b6d769d356b04241528a0196e14acae0b6199
 DIST pytest-mock-3.7.0.tar.gz 29311 BLAKE2B 27227b66008c70c4016c8e15d0021a67e84730a8b49c5664dc4f29e16d5f163df293269ab332707e44b7a0b182e15e20ab0ebaf4b9d923eb911083377972dad1 SHA512 6ba69e86bac8a430a9f1f1c615ad21f505b87848ac50fc551bc02f81306bf8769fd015615d96085d87d4c695c24b0686a95116721358687b48b64de5d0ae6901
diff --git a/dev-python/pytest-mock/pytest-mock-3.6.1.ebuild b/dev-python/pytest-mock/pytest-mock-3.6.1.ebuild
deleted file mode 100644
index 694bf838bb17..000000000000
--- a/dev-python/pytest-mock/pytest-mock-3.6.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e 's/runpytest_subprocess(/&"-p","no:xprocess",/' -i tests/test_pytest_mock.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	if has_version dev-python/mock; then
-		local EPYTEST_DESELECT=(
-			tests/test_pytest_mock.py::test_standalone_mock
-		)
-	fi
-
-	distutils_install_for_testing
-	epytest --assert=plain
-}
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 764480a08baa..a8123617ad28 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,3 +1 @@
-DIST pytest-6.2.5.tar.gz 1118720 BLAKE2B 9dfc87279617be58353566009325f929e6fa53d54fd4c665a75f3b359ab5415972d745a680eb85ab21ca9eaec84450bc1decd50566b0ccdf90d7551f3d03ee70 SHA512 7624563a9d967da4cbf82cfff90bae8c0cca07b32e291dc7c5efa787725ed1a255edd066bf0d5fbd89b8cbed8cf5b619fe7c7017f44a7f8a014e3310c06bdbf9
-DIST pytest-7.0.0.tar.gz 1247853 BLAKE2B 3af132da903252323086b21eb052d35973f1e81189972d7f1880a22c5dd8a2b779bf2450f394ef9b1e156b780bcf6f677a0b043db204bcb6038a9a85c7f393e6 SHA512 9e876575d89ee60eccc873b2551464cc8eb7f9abfc6d73b33913efef79906830bdbe08b182ae436f981950cc6384f494935aa6ecb0d63b82e3c9ded77f9655b9
 DIST pytest-7.0.1.tar.gz 1249154 BLAKE2B fcaef6afc6e98f6716a80f6451671b2abbf9ad676330a6e66e917a73e018eef966de8e7ef7ab48a1213167476eef1eb37cc5e84ec2bd9e5eab4ec6f1a8071c87 SHA512 21493717159a64fe6467bd096b578b127d81438d04f5b03ba2f4047237054f865a1f50a4e291b9d95b1a144f59bc7a8b3a00008493f4fb4f14bff7fb65c5edc2
diff --git a/dev-python/pytest/files/pytest-6.2.5-py310.patch b/dev-python/pytest/files/pytest-6.2.5-py310.patch
deleted file mode 100644
index 89ca41954273..000000000000
--- a/dev-python/pytest/files/pytest-6.2.5-py310.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 5082686349185ef35f64d1a998a3062ee5a48771 Mon Sep 17 00:00:00 2001
-From: Ran Benita <ran@unusedvar.com>
-Date: Thu, 13 May 2021 17:27:43 +0300
-Subject: [PATCH 1/2] Merge pull request #8664 from
- hroncok/test_unittest-ignore_DeprecationWarning-from-twisted
-
-Ignore DeprecationWarnings in test_trial_error
-
-(cherry picked from commit 850a8447792f89c7d38c72b2f542536655ab0354)
----
- testing/test_unittest.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/testing/test_unittest.py b/testing/test_unittest.py
-index 8b00cb826..de8fc5c55 100644
---- a/testing/test_unittest.py
-+++ b/testing/test_unittest.py
-@@ -533,7 +533,9 @@ class TestTrialUnittest:
-                 # will crash both at test time and at teardown
-         """
-         )
--        result = testdir.runpytest("-vv", "-oconsole_output_style=classic")
-+        result = testdir.runpytest(
-+            "-vv", "-oconsole_output_style=classic", "-W", "ignore::DeprecationWarning"
-+        )
-         result.stdout.fnmatch_lines(
-             [
-                 "test_trial_error.py::TC::test_four FAILED",
--- 
-2.35.0
-
-From 932792c22a300fc7794f966851df2b996f4a79bc Mon Sep 17 00:00:00 2001
-From: Bruno Oliveira <nicoddemus@gmail.com>
-Date: Thu, 16 Dec 2021 10:37:52 -0300
-Subject: [PATCH 2/2] Merge pull request #9417 from
- nicoddemus/fix-py3.10.1-9413
-
-(cherry picked from commit 47df71d23ff13bd083b21ffcf839bd11169b42fc)
----
- .github/workflows/main.yml | 4 ++--
- testing/test_skipping.py   | 2 --
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
-index 5a9435357..a8a6406c6 100644
---- a/.github/workflows/main.yml
-+++ b/.github/workflows/main.yml
-@@ -75,7 +75,7 @@ jobs:
-             os: windows-latest
-             tox_env: "py39-xdist"
-           - name: "windows-py310"
--            python: "3.10-dev"
-+            python: "3.10.1"
-             os: windows-latest
-             tox_env: "py310-xdist"
- 
-@@ -105,7 +105,7 @@ jobs:
-             os: ubuntu-latest
-             tox_env: "py39-xdist"
-           - name: "ubuntu-py310"
--            python: "3.10-dev"
-+            python: "3.10.1"
-             os: ubuntu-latest
-             tox_env: "py310-xdist"
-           - name: "ubuntu-pypy3"
-diff --git a/testing/test_skipping.py b/testing/test_skipping.py
-index 3cb8bdff2..487793645 100644
---- a/testing/test_skipping.py
-+++ b/testing/test_skipping.py
-@@ -1126,8 +1126,6 @@ def test_errors_in_xfail_skip_expressions(pytester: Pytester) -> None:
-     pypy_version_info = getattr(sys, "pypy_version_info", None)
-     if pypy_version_info is not None and pypy_version_info < (6,):
-         markline = markline[5:]
--    elif sys.version_info[:2] >= (3, 10):
--        markline = markline[11:]
-     elif sys.version_info >= (3, 8) or hasattr(sys, "pypy_version_info"):
-         markline = markline[4:]
- 
--- 
-2.35.0
-
diff --git a/dev-python/pytest/pytest-6.2.5-r2.ebuild b/dev-python/pytest/pytest-6.2.5-r2.ebuild
deleted file mode 100644
index 60790d2b07c6..000000000000
--- a/dev-python/pytest/pytest-6.2.5-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="https://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/iniconfig[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	>=dev-python/py-1.8.2[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-3.4[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	# backport fixes for py3.10 test regressions
-	"${FILESDIR}"/${P}-py310.patch
-)
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
-
-python_test() {
-	distutils_install_for_testing --via-root
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-
-	local EPYTEST_DESELECT=(
-		# broken by epytest args
-		testing/test_warnings.py::test_works_with_filterwarnings
-
-		# tend to be broken by random pytest plugins
-		# (these tests patch PYTEST_DISABLE_PLUGIN_AUTOLOAD out)
-		testing/test_helpconfig.py::test_version_less_verbose
-		testing/test_helpconfig.py::test_version_verbose
-		testing/test_junitxml.py::test_random_report_log_xdist
-		testing/test_junitxml.py::test_runs_twice_xdist
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal_count
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_verbose
-		testing/test_terminal.py::TestProgressWithTeardown::test_xdist_normal
-		testing/test_terminal.py::TestTerminalFunctional::test_header_trailer_info
-		testing/test_terminal.py::TestTerminalFunctional::test_no_header_trailer_info
-	)
-
-	epytest -p xdist -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/pytest/pytest-6.2.5-r3.ebuild b/dev-python/pytest/pytest-6.2.5-r3.ebuild
deleted file mode 100644
index 26e1496c8870..000000000000
--- a/dev-python/pytest/pytest-6.2.5-r3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="https://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/iniconfig[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	>=dev-python/py-1.8.2[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-3.4[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	# backport fixes for py3.10 test regressions
-	"${FILESDIR}"/${P}-py310.patch
-)
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-
-	local EPYTEST_DESELECT=(
-		# broken by epytest args
-		testing/test_warnings.py::test_works_with_filterwarnings
-
-		# tend to be broken by random pytest plugins
-		# (these tests patch PYTEST_DISABLE_PLUGIN_AUTOLOAD out)
-		testing/test_helpconfig.py::test_version_less_verbose
-		testing/test_helpconfig.py::test_version_verbose
-		testing/test_junitxml.py::test_random_report_log_xdist
-		testing/test_junitxml.py::test_runs_twice_xdist
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal_count
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_verbose
-		testing/test_terminal.py::TestProgressWithTeardown::test_xdist_normal
-		testing/test_terminal.py::TestTerminalFunctional::test_header_trailer_info
-		testing/test_terminal.py::TestTerminalFunctional::test_no_header_trailer_info
-
-		# unstable with xdist
-		testing/test_terminal.py::TestTerminalFunctional::test_verbose_reporting_xdist
-	)
-
-	epytest -p xdist -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/pytest/pytest-7.0.0.ebuild b/dev-python/pytest/pytest-7.0.0.ebuild
deleted file mode 100644
index 36af88ae4816..000000000000
--- a/dev-python/pytest/pytest-7.0.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="https://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/iniconfig[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	>=dev-python/py-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-6.2.3[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-	)"
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x COLUMNS=80
-
-	local EPYTEST_DESELECT=(
-		# broken by epytest args
-		testing/test_warnings.py::test_works_with_filterwarnings
-
-		# tend to be broken by random pytest plugins
-		# (these tests patch PYTEST_DISABLE_PLUGIN_AUTOLOAD out)
-		testing/test_helpconfig.py::test_version_less_verbose
-		testing/test_helpconfig.py::test_version_verbose
-		testing/test_junitxml.py::test_random_report_log_xdist
-		testing/test_junitxml.py::test_runs_twice_xdist
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal_count
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_verbose
-		testing/test_terminal.py::TestProgressWithTeardown::test_xdist_normal
-		testing/test_terminal.py::TestTerminalFunctional::test_header_trailer_info
-		testing/test_terminal.py::TestTerminalFunctional::test_no_header_trailer_info
-
-		# unstable with xdist
-		testing/test_terminal.py::TestTerminalFunctional::test_verbose_reporting_xdist
-	)
-
-	epytest -p xdist -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/python-discid/python-discid-1.2.0.ebuild b/dev-python/python-discid/python-discid-1.2.0.ebuild
deleted file mode 100644
index fef8afc94f87..000000000000
--- a/dev-python/python-discid/python-discid-1.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for libdiscid"
-HOMEPAGE="https://github.com/JonnyJD/python-discid"
-SRC_URI="https://github.com/JonnyJD/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND=">=media-libs/libdiscid-0.2.2"
-DEPEND="${RDEPEND}"
-
-distutils_enable_sphinx doc
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild b/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
deleted file mode 100644
index f135e405c138..000000000000
--- a/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Google's Python argument parsing library"
-HOMEPAGE="https://github.com/google/python-gflags"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.1.1-script-install.patch )
-
-python_test() {
-	# note: each test needs to be run separately, otherwise they fail
-	"${EPYTHON}" -m gflags._helpers_test -v || die
-	"${EPYTHON}" -m gflags.flags_formatting_test -v || die
-	"${EPYTHON}" -m gflags.flags_unicode_literals_test -v || die
-}
diff --git a/dev-python/python-libevdev/Manifest b/dev-python/python-libevdev/Manifest
index 784dbab9bc0d..be2d5db9038a 100644
--- a/dev-python/python-libevdev/Manifest
+++ b/dev-python/python-libevdev/Manifest
@@ -1,2 +1 @@
 DIST python-libevdev-0.10.tar.bz2 32385 BLAKE2B ae962d714168a3c035220dc9343ae5907e5de5a645b9d5857cfd884a847fb5b2b13cbdcc6204a66940ad406e92a3add332755c3adb5a10b7cc6a5ae62468c1ff SHA512 1ea54c5e335d348182fad71151ab37103a8c295c8efb73a60f40b41e399cc5fc48525006b15337e591147fc5385e8e56a12dcbcec2dd2e07652a7b60f85eaf1c
-DIST python-libevdev-0.9.tar.bz2 31496 BLAKE2B 4802f1528c104b0717f3f3a450e6e704232d5045ac285b96eb3eb690f120969ea0f23eae1da6013b260627f18b3e58e55a5017401928149e9cc581d9a84fad70 SHA512 77dcb18c393fd7962887d477292ec359c65404ae126624dc5ab201528e53b9fab565d5c6acfe2908f4a03a29e09fad862220246b91a92cc5f69768a31d1ca808
diff --git a/dev-python/python-libevdev/python-libevdev-0.9.ebuild b/dev-python/python-libevdev/python-libevdev-0.9.ebuild
deleted file mode 100644
index e43f757eb601..000000000000
--- a/dev-python/python-libevdev/python-libevdev-0.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python wrappers for the libevdev library"
-HOMEPAGE="https://gitlab.freedesktop.org/libevdev/python-libevdev"
-SRC_URI="https://gitlab.freedesktop.org/libevdev/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="test? ( dev-libs/libevdev )"
-PDEPEND="dev-libs/libevdev"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source \
-	dev-python/sphinx_rtd_theme
diff --git a/dev-python/python-lzo/python-lzo-1.14.ebuild b/dev-python/python-lzo/python-lzo-1.14.ebuild
deleted file mode 100644
index eb9bc6323d68..000000000000
--- a/dev-python/python-lzo/python-lzo-1.14.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 prefix
-
-DESCRIPTION="Python interface to lzo"
-HOMEPAGE="https://github.com/jd-boyd/python-lzo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-libs/lzo:2"
-DEPEND="${RDEPEND}"
-
-# We can't use pytest at the moment because the package uses "yield tests"
-# https://docs.pytest.org/en/6.2.x/deprecations.html#yield-tests
-distutils_enable_tests --install nose
-
-python_prepare_all() {
-	hprefixify setup.py
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
index f4426284c62a..6b7a177b6c3d 100644
--- a/dev-python/python-magic/Manifest
+++ b/dev-python/python-magic/Manifest
@@ -1,2 +1 @@
-DIST python-magic-0.4.24.gh.tar.gz 863700 BLAKE2B 09ecc8bea1696343ec2462e6989da8059c40f88e401390c8c491e531540ef0b38e5a8eac1fb8a3356203e25cf2e5caa6dad0c13d24eb34a7a299b5a071ae29b3 SHA512 b3ec148da398293465299938fabf691b56c4b3876f6abbb7a734a9c0a5180cc758a15f7085bbf1bf40ec6031697ec84d98c161db1fd04301133af09928c611fc
 DIST python-magic-0.4.25.gh.tar.gz 864121 BLAKE2B ec79112aba9f79a6dd6a3840a1286432806c0cd035d301668fd8177ce36b270ddf1c928f70d51cfacb88cca4d5fb31706cff946b16ed230e8850bca9ebda8c0b SHA512 eb138f7f2d1320f831516fdf21bf7dd404acf070be6093b7ed8697325f60998d886405c5ff348c7e4ad69ecd2ee0ab899afe455db90eda502acdf8b86337f79c
diff --git a/dev-python/python-magic/python-magic-0.4.24.ebuild b/dev-python/python-magic/python-magic-0.4.24.ebuild
deleted file mode 100644
index 27ea2a10e2fe..000000000000
--- a/dev-python/python-magic/python-magic-0.4.24.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Access the libmagic file type identification library"
-HOMEPAGE="https://github.com/ahupp/python-magic"
-SRC_URI="
-	https://github.com/ahupp/python-magic/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-apps/file[-python]"
-BDEPEND="
-	test? ( sys-apps/file )
-"
-
-python_test() {
-	local -x LC_ALL=en_US.UTF-8
-	"${EPYTHON}" test/test.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index c5ed25a76ae9..1beeec2952e0 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,3 +1 @@
-DIST pytools-2021.2.9.tar.gz 66254 BLAKE2B 576e10a1ab823827d030466a2f39ec5510c02a856288d840904a5d3b612191d2a108393fc9a73072b8757e7729b4ead84829805e8913e4c54949465594ac8842 SHA512 1afe6feb6e5094171aba9a2749418a5e677cb70286be1ac9b65d1470835e1ae68f72f7c4221149358ab1595cab438688882b51682c5865955edf89ae32ca6d6d
 DIST pytools-2022.1.1.tar.gz 67883 BLAKE2B 915d0a40de77589b3ec7d463f44b677cf47663458895b3f0aed0667eaaae6e6e34a44896f98b5e07016022f48074780c7d24082df616178308b34507713dab8d SHA512 6d69e84124b0894250e82fb9d0f23776b0fee90fa0d7176d83669d3538eeb5e8a3ff706aba88f61442b9889b524cedcbcae635cf6886145deab310319dc2268f
-DIST pytools-2022.1.tar.gz 67423 BLAKE2B d560792c66840d16e6ee75033fa01333fd4f390970ed0d1b88d0b242f735066f7c008827af503fc0915838f005e7916c31deb1a96deda2e5fdcadd46445d91f0 SHA512 91ebd602f5b7c26b31b16fcf22ba40544a691908a13e6b635a27ff2094ae386e49d1f6c1f03c5bfd7fbeb6e5f238b642ce9faf26afad094ba9b826d14a5f39be
diff --git a/dev-python/pytools/pytools-2021.2.9.ebuild b/dev-python/pytools/pytools-2021.2.9.ebuild
deleted file mode 100644
index af66c7b0dbf2..000000000000
--- a/dev-python/pytools/pytools-2021.2.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools missing from the Python standard library"
-HOMEPAGE="https://mathema.tician.de/software/pytools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2022.1.ebuild b/dev-python/pytools/pytools-2022.1.ebuild
deleted file mode 100644
index e1d6c2aece59..000000000000
--- a/dev-python/pytools/pytools-2022.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools missing from the Python standard library"
-HOMEPAGE="https://mathema.tician.de/software/pytools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1.ebuild b/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1.ebuild
deleted file mode 100644
index a777cc23d092..000000000000
--- a/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="A custom YAML tag for referencing environment variables in YAML files"
-HOMEPAGE="https://github.com/waylan/pyyaml-env-tag"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/quantities/quantities-0.13.0.ebuild b/dev-python/quantities/quantities-0.13.0.ebuild
deleted file mode 100644
index a9c2cb6a24a0..000000000000
--- a/dev-python/quantities/quantities-0.13.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-MY_P="python-quantities-${PV}"
-DESCRIPTION="Support for physical quantities with units, based on numpy"
-HOMEPAGE="https://github.com/python-quantities/python-quantities"
-SRC_URI="
-	https://github.com/python-quantities/python-quantities/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/numpy-1.16[$PYTHON_USEDEP]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/readthedocs-sphinx-ext/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest
index 4886e21bbaeb..e7d8b5761f72 100644
--- a/dev-python/readthedocs-sphinx-ext/Manifest
+++ b/dev-python/readthedocs-sphinx-ext/Manifest
@@ -1 +1,2 @@
 DIST readthedocs-sphinx-ext-2.1.4.tar.gz 11218 BLAKE2B 9851da181b9d181715436dfb350bcaa2f8f6c5dbf56941d2f26457976cd5f5f1e32752b0fa39c65a7ca4f4f304e0e83bb9cd34dcc25a039e6f970d7ca6410a38 SHA512 dc3e70f55634e6769a0cd8778644389838884da7f175464e56c7766a1cef257bf6d4bd317a4dd4442fb46fc21714f5697991d1b2a764e40857eefae340b15278
+DIST readthedocs-sphinx-ext-2.1.5.tar.gz 12351 BLAKE2B 5cb3e821b04dabb492cac194ec3be4cdf5874811d8e57556c653611d4a1e2d57a38c00492662d1530f25f15a011834a7966af4c58b9f8f8fe71559753cf3d79d SHA512 0d2960ca55bf9be4faad0a8aa9cdcde74aaa69529b98be6059377ae037ce447d5919617fd8d4afb85ece6dc7f2693426e1a5574049025859e300211f7a5802fb
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.5.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.5.ebuild
new file mode 100644
index 000000000000..b5f7fa5f3009
--- /dev/null
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Code specific for Read the Docs and Sphinx"
+HOMEPAGE="https://github.com/readthedocs/readthedocs-sphinx-ext"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+PDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( ${PDEPEND} )
+"
+
+# unittest should be sufficient but tests are very verbose, so pytest's
+# output capture is most welcome
+distutils_enable_tests pytest
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 6bd51193e205..2f7b917b2954 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,2 +1,3 @@
 DIST regex-2022.1.18.tar.gz 382589 BLAKE2B aa11459d2a2a7d6032c7f7ff0dc6eadaa6bf091637dee7ea8c8e6508a37dbf34b22923346b047b1d37d988981de5572d4dce903855e82b47a09f101200b5b146 SHA512 23f782c98c4dc98e51296626b3c6466058771d11a398a92f1ebdd69795dbe318aeeb3f1a551c817b8f06df1c1373af5a93a1590d15168569419fa439b3163edd
+DIST regex-2022.3.15.tar.gz 383001 BLAKE2B 459fed91a8996d6191ccd220869cf0c0e793f774552702c9aaec00882f71adae1e7378233811f6885d95b10db963d098a1d4c45aa0887c26d304df85fa9fb124 SHA512 99ef24b28dc5b1ec6a5d670698a98025aff14d082f6c24a3122157d28879f71c3ced2f5d2a3c8c6091609d93b7a500b2882b92b29a8fe1527532dd9f280cd51b
 DIST regex-2022.3.2.tar.gz 383148 BLAKE2B 6f908207f759b1eadec44cca89c2eeffc42d798bd8a33ae3bf1ab1bbf0486040bb18a270836ebe2c7ae0518f01dd0e9467fe3a213284d433ceff0b51cf4bbe31 SHA512 176f675cb7698a28472128e2676ac735c37194c40151ea8aa32c6959dc42b9f54a6d7762a4628e50cfa21ffbe1db1a6c6a771e95c00882d975d5361cf67871ef
diff --git a/dev-python/regex/regex-2022.3.15.ebuild b/dev-python/regex/regex-2022.3.15.ebuild
new file mode 100644
index 000000000000..3feb42793209
--- /dev/null
+++ b/dev-python/regex/regex-2022.3.15.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="doc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
+)
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/Features.html )
+	local DOCS=( README.rst docs/*.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index f0df1962a663..c90d8a6eede6 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,3 +1,4 @@
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.6.6.tar.gz 4509457 BLAKE2B d2cb5c764aa86000dd97798b5aea25fdc07e4230015dda6c11099e379884ca74532327dfe723069d5e56569dd7e120d94918f64a5f705bfef212b484f812aa7b SHA512 6f05e5f7c6b6c0b6f8d65fe11e2900ecd427f6c293672b12a4cc094476da1cdebc0df59198660614251d388241d7c886c345f958d337d351ea048b3b25a71ba5
 DIST reportlab-3.6.7.tar.gz 4504447 BLAKE2B 3e691294d20f94850840ddc70565d2235bdcb37d47b5e869e34e5fea93dc9ba017d09f088e18b6479266354076b89461849dd1eb7d1d4e8b12a9c4a95706bf66 SHA512 51f98900ccf7ef34fefc237bf1c787931a525cd82284685bda26f411760b97d1b85fce5bffa59b133705f6c1769a8d3616ef85ea368ed59dfc72f24d5faf6e88
+DIST reportlab-3.6.8.tar.gz 4503191 BLAKE2B 3d61ac2554309a8dfff2107ba6157152b558355fc6ebd7d2337b0f3152ceb9644ae2dc20b6e0f2ed312a579fc5f172e05eeda69e3b6acbbf921b62f27ce50f77 SHA512 7eb2381a8020f751f03008bb8dc1eb07f954a97c0c3d38646602a22ed7f69dd73e11bbd1251a471da141c98492be7f3867cf120e489c58911ae6e9f29c926507
diff --git a/dev-python/reportlab/reportlab-3.6.8.ebuild b/dev-python/reportlab/reportlab-3.6.8.ebuild
new file mode 100644
index 000000000000..70ed96798ff2
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.6.8.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="
+	https://www.reportlab.com/
+	https://pypi.org/project/reportlab/"
+SRC_URI="
+	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/libart_lgpl
+	sys-libs/zlib:=
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
+"
+BDEPEND="
+	app-arch/unzip
+"
+
+distutils_enable_sphinx docs/source
+
+PATCHES=(
+	# bug 738312, remove -L/usr/lib from link line
+	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+src_configure() {
+	cat > local-setup.cfg <<-EOF || die
+		[OPTIONS]
+		no-download-t1-files = 1
+		use-system-libart = 1
+	EOF
+}
+
+python_test() {
+	pushd tests >/dev/null || die
+	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index 0998e9ab636f..04f1c4757361 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -1,3 +1 @@
-DIST requests-cache-0.9.1.gh.tar.gz 1539483 BLAKE2B 9adb6710cda7fb6ae9dba9b6ce57351b9817419f7108da328f4ac206534c6c5453d79592ecbe1108d3d5d78862ed109630fdce518025a42b1db101c906253d16 SHA512 829488f68f10be8f84203d488d5dab68c477d02bc4419b49b38851693f2bd1d0ec0b86bc5d953b951b9c7d4372b2bc179f096014f69eb6356f87a2b1d025d3a0
-DIST requests-cache-0.9.2.gh.tar.gz 1539753 BLAKE2B a49932b961486e5af1681d0094c599e12c12dc340b1631b9e0a8ab19268f04005ba56f6bb2c8759268e8cea866e94a1b3f59e1e7d9229aa257f3bb2daab8a187 SHA512 449dcd5924388cd8a02114e2588dfe50f0289be07ec3eaa06388298c959e69e891e51793a18ba2766d7a0ff866355e3d4950ebcd04b2349a146d342e11eb41bd
 DIST requests-cache-0.9.3.gh.tar.gz 1541517 BLAKE2B a6096e8db01ccc7e6afa94ca35460ad79bbc503fe32fb272c3b43bb3344cb4a4e3c6f9240dc8d26a49b2ae4b564de72be22553b40847480487c150b192aa9490 SHA512 d413fbed156bd3fca48db8b153b01a883ee72d62f6e8982d490a5378dc188c19d0b3af5e37e6f47d19ed0ba11b3c0e01489720d56df12afcf1b47088e1541221
diff --git a/dev-python/requests-cache/requests-cache-0.9.1-r1.ebuild b/dev-python/requests-cache/requests-cache-0.9.1-r1.ebuild
deleted file mode 100644
index e405779cd344..000000000000
--- a/dev-python/requests-cache/requests-cache-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 optfeature
-
-HOMEPAGE="
-	https://pypi.org/project/requests-cache/
-	https://github.com/reclosedev/requests-cache/"
-DESCRIPTION="Persistent cache for requests library"
-SRC_URI="
-	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/cattrs[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/itsdangerous[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-		dev-python/ujson[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# These require extra servers running
-		tests/integration/test_dynamodb.py
-		tests/integration/test_gridfs.py
-		tests/integration/test_mongodb.py
-		tests/integration/test_redis.py
-	)
-	local EPYTEST_DESELECT=(
-		# Requires Internet access
-		tests/integration/test_compat.py::test_version_upgrade
-	)
-
-	local -x USE_PYTEST_HTTPBIN=true
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "redis backend" "dev-python/redis-py"
-	optfeature "MongoDB backend" "dev-python/pymongo"
-
-	optfeature "JSON serialization" "dev-python/ujson"
-	optfeature "YAML serialization" "dev-python/pyyaml"
-	optfeature "signing serialized data" "dev-python/itsdangerous"
-}
diff --git a/dev-python/requests-cache/requests-cache-0.9.1.ebuild b/dev-python/requests-cache/requests-cache-0.9.1.ebuild
deleted file mode 100644
index 3e738c2f6f1f..000000000000
--- a/dev-python/requests-cache/requests-cache-0.9.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 optfeature
-
-HOMEPAGE="
-	https://pypi.org/project/requests-cache/
-	https://github.com/reclosedev/requests-cache/"
-DESCRIPTION="Persistent cache for requests library"
-SRC_URI="
-	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/cattrs[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/itsdangerous[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-		dev-python/ujson[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# These require extra servers running
-		tests/integration/test_dynamodb.py
-		tests/integration/test_gridfs.py
-		tests/integration/test_mongodb.py
-		tests/integration/test_redis.py
-	)
-	local EPYTEST_DESELECT=(
-		# Requires Internet access
-		tests/integration/test_compat.py::test_version_upgrade
-	)
-
-	local -x USE_PYTEST_HTTPBIN=true
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "redis backend" "dev-python/redis-py"
-	optfeature "MongoDB backend" "dev-python/pymongo"
-
-	optfeature "JSON serialization" "dev-python/ujson"
-	optfeature "YAML serialization" "dev-python/pyyaml"
-	optfeature "signing serialized data" "dev-python/itsdangerous"
-}
diff --git a/dev-python/requests-cache/requests-cache-0.9.2.ebuild b/dev-python/requests-cache/requests-cache-0.9.2.ebuild
deleted file mode 100644
index e405779cd344..000000000000
--- a/dev-python/requests-cache/requests-cache-0.9.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 optfeature
-
-HOMEPAGE="
-	https://pypi.org/project/requests-cache/
-	https://github.com/reclosedev/requests-cache/"
-DESCRIPTION="Persistent cache for requests library"
-SRC_URI="
-	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/cattrs[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/itsdangerous[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-		dev-python/ujson[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# These require extra servers running
-		tests/integration/test_dynamodb.py
-		tests/integration/test_gridfs.py
-		tests/integration/test_mongodb.py
-		tests/integration/test_redis.py
-	)
-	local EPYTEST_DESELECT=(
-		# Requires Internet access
-		tests/integration/test_compat.py::test_version_upgrade
-	)
-
-	local -x USE_PYTEST_HTTPBIN=true
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "redis backend" "dev-python/redis-py"
-	optfeature "MongoDB backend" "dev-python/pymongo"
-
-	optfeature "JSON serialization" "dev-python/ujson"
-	optfeature "YAML serialization" "dev-python/pyyaml"
-	optfeature "signing serialized data" "dev-python/itsdangerous"
-}
diff --git a/dev-python/requests-oauthlib/Manifest b/dev-python/requests-oauthlib/Manifest
index 5ed8dbedfbb9..c6de87b7f1d6 100644
--- a/dev-python/requests-oauthlib/Manifest
+++ b/dev-python/requests-oauthlib/Manifest
@@ -1,2 +1 @@
-DIST requests-oauthlib-1.3.0.tar.gz 45449 BLAKE2B b7d0df59eefe801e09329bde8604d09fe0f45eac146172c5ae5f1a77df59229a89c70d78a97fca0f7b546a015e66d6d9dd4ac3efdd4de0100f77f2427106e197 SHA512 0eebd209dad892567de7d37f1482b5c7523eced3a73a68054674b29447d090c885b2388fd6f2db26436f14098833051c8888ace8b137889a4012e010efb0e86b
 DIST requests-oauthlib-1.3.1.tar.gz 48367 BLAKE2B 0cc538fe7ed1ef12740b60bb8b3e32d84f0d45b6c231c70b8bbfe9db9c8775acc51f50e78589e43eb0644c82e919a5a124941986023de4432e0631ebf0764869 SHA512 86fe34d39ad7224fd44a1b0c4fbf3784032239b894ae73ba65043941cde9675c2f8abedf44ccc00b5fb1648b8e261de258464b311f3ace6392ab6202fb50aa08
diff --git a/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild b/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
deleted file mode 100644
index 1e581ba98131..000000000000
--- a/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="This project provides first-class OAuth library support for Requests"
-HOMEPAGE="https://github.com/requests/requests-oauthlib"
-SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="ISC"
-KEYWORDS="amd64 ~arm x86"
-
-RDEPEND="
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oauthlib-3.0.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# Internet access
-		tests/test_core.py::OAuth1Test::testCanPostBinaryData
-		tests/test_core.py::OAuth1Test::test_content_type_override
-		tests/test_core.py::OAuth1Test::test_url_is_native_str
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 2851c3184cf2..242056873273 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,4 +1,2 @@
-DIST rich-10.16.2.tar.gz 16282443 BLAKE2B ccc7292e265770880539d6a1a6b2e819b45e2e3d4d152f1a16c56f2da74c9a472ae49ea0a4a677ad71c4dd087fade2c415484073b4b2cd86869ad7c43c32b162 SHA512 9cb8b0c8105589db22d7efdc47cbfa20531cd184f07855db4bfafb667299c7d3e520b19e3b33e7818affb7a5674805849ee9f2e770927e285ccd7f4f838982c3
-DIST rich-11.1.0.gh.tar.gz 16295117 BLAKE2B 1d326edea18b1eaad633665c2e50aa789f9eba19ee9b4cb50b94a160a69d12604fdf87d57ffbc903835b6e1e745fe17e0c521801b515ae73c8a44bf9ef17b6c2 SHA512 9da2015a66e0924bdd04deebd8fe8e963151d0a912f78320f8de8e61d656a693595c4feb0ce2436610602308d690ed96c8d10b5c81a9fc12a350b2e40907dbcb
 DIST rich-11.2.0.gh.tar.gz 16300346 BLAKE2B 520f512a7e26613a4cc881834f8c150963b84a6dc3a43029dde6d64d1e405d82422b9c6f0098293b6f9bdb55749c7929426dad14840c9a287889c1a6a70f6bf2 SHA512 ec1178a6a320a48f589ead5163e974725f79ae63ddf9a2deb66400e43619ade8d366dbef6b524e66e603647a957b8e26266845a0bcb85912fd9ad2a81dd92f5e
 DIST rich-12.0.0.gh.tar.gz 14727980 BLAKE2B b9f7761ab1084765f804fd22f9fb18e659f91b917bb452217752683f6d61320d2703eee28de3be3bd70009fc06d04165528393c4c0ec32a49b1dc7e94989a224 SHA512 4e47e48709180ef844bcf1cd516b22de8a4f22c5121ca0582a2cff7297d97afe63232926d518cd2bf4d6d1a7cea362ab12e71eedacce6b6d378ef1a1528d9e4c
diff --git a/dev-python/rich/rich-10.16.2-r1.ebuild b/dev-python/rich/rich-10.16.2-r1.ebuild
deleted file mode 100644
index 4a408d2d90d0..000000000000
--- a/dev-python/rich/rich-10.16.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-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 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# check for exact color render string, which changes across pygments bumps
-		tests/test_syntax.py::test_python_render
-		tests/test_syntax.py::test_python_render_simple
-		tests/test_syntax.py::test_python_render_indent_guides
-	)
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-10.16.2.ebuild b/dev-python/rich/rich-10.16.2.ebuild
deleted file mode 100644
index ea3472f2b806..000000000000
--- a/dev-python/rich/rich-10.16.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{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 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# check for exact color render string, which changes across pygments bumps
-		tests/test_syntax.py::test_python_render
-		tests/test_syntax.py::test_python_render_simple
-		tests/test_syntax.py::test_python_render_indent_guides
-	)
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-11.1.0.ebuild b/dev-python/rich/rich-11.1.0.ebuild
deleted file mode 100644
index 16f23047cac5..000000000000
--- a/dev-python/rich/rich-11.1.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
-HOMEPAGE="https://github.com/Textualize/rich"
-SRC_URI="
-	https://github.com/Textualize/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pypy3.patch
-)
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# check for exact color render string, which changes across pygments bumps
-		tests/test_syntax.py::test_python_render
-		tests/test_syntax.py::test_python_render_simple
-		tests/test_syntax.py::test_python_render_indent_guides
-	)
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/ruamel-std-pathlib/Manifest b/dev-python/ruamel-std-pathlib/Manifest
index 173ee6ad4237..8c5ac304da07 100644
--- a/dev-python/ruamel-std-pathlib/Manifest
+++ b/dev-python/ruamel-std-pathlib/Manifest
@@ -1,4 +1 @@
-DIST ruamel-std-pathlib-0.8.0.tar.xz 19068 BLAKE2B e1709bf5af17a843a7f5aec8009c4ec337cd1a4a526315e8834924909613eb5cc50c2ae1a1acc74c97a876fa347767dce627f2dba1fb874032f0989f7ee6599e SHA512 eecbb43e3867d8ccb166a0d528b3d7cfc04ed6f2df5e2048ccec4d7fd36117ac4a3984d4143025f6b7fd51867de879fe02e5dcbc4b275fd40cab1609bcf69536
-DIST ruamel-std-pathlib-0.9.0.tar.xz 19340 BLAKE2B 1ab661f3dc4cb75eed20426256f5c14fd9c3b44894c343dd55bd53dbb811eb90ea90ff8c1056b0eb4a5d186521786e22e42f8db48d8dde42885c72f34f8e3782 SHA512 ba551b3b07db87e46e059ddf17b0768283e8da49c7ea5bb252fba6ca611bb69d160fd6a3d3557eac0606b8aece5ee21aced2889609d95cfeb6f59473d72a261e
-DIST ruamel-std-pathlib-0.9.1.tar.xz 19408 BLAKE2B 26c5dbddec337fb5fac6992206d49ecaabf743f2b6d9836c524626b77ca772e8e97e660f8bb22fd4d6e572705ef7d5cf6a012cede315a1662d8786be4ad8eca8 SHA512 d577731c504719b650a718c98979d28442f48ca1526b653f8faeadc4720f5cff09f0554fe5b8eb1cd65c7d3106f0b9e0a4d11f1f416458df187c51f707d137b6
 DIST ruamel-std-pathlib-0.9.2.tar.xz 19948 BLAKE2B 1d8d6b4a6703c22a578320d47258bca487376945fc5442716686b05aed78ab64b32022da7fe63f454396235c5782135d173892ab99fdcb857d42369732e26f80 SHA512 71077d2c979bdd5f9d4a2467f6d4a7c0aeabb3dab3f0657411b562ada955c859da619db1e8431d8065d7610b376a961244920359471a9c1358315c02a6b621e4
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.8.0.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.8.0.ebuild
deleted file mode 100644
index 56a014b0519b..000000000000
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.8.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="${PN//-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Ruamel enhancements to pathlib and pathlib2"
-HOMEPAGE="https://pypi.org/project/ruamel.std.pathlib/ https://sourceforge.net/p/ruamel-std-pathlib/"
-# PyPI tarballs do not include tests
-SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="dev-python/namespace-ruamel[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}"/${MY_P}
-
-distutils_enable_tests pytest
-
-python_install() {
-	distutils-r1_python_install --single-version-externally-managed
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.9.0.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.9.0.ebuild
deleted file mode 100644
index ff91599e57ea..000000000000
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.9.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-MY_PN="${PN//-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Ruamel enhancements to pathlib and pathlib2"
-HOMEPAGE="https://pypi.org/project/ruamel.std.pathlib/ https://sourceforge.net/p/ruamel-std-pathlib/"
-# PyPI tarballs do not include tests
-SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="dev-python/namespace-ruamel[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_install() {
-	distutils-r1_python_install --single-version-externally-managed
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.9.1.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.9.1.ebuild
deleted file mode 100644
index 977618d7aaa4..000000000000
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.9.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-MY_P="${PN//-/.}-${PV}"
-
-DESCRIPTION="Ruamel enhancements to pathlib and pathlib2"
-HOMEPAGE="https://pypi.org/project/ruamel.std.pathlib/ https://sourceforge.net/p/ruamel-std-pathlib/"
-# PyPI tarballs do not include tests
-SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="dev-python/namespace-ruamel[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_install() {
-	distutils-r1_python_install --single-version-externally-managed
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.9.2.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.9.2.ebuild
index 8aadb53feabc..87fc3702b577 100644
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.9.2.ebuild
+++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.9.2.ebuild
@@ -10,16 +10,21 @@ inherit distutils-r1
 
 MY_P="${PN//-/.}-${PV}"
 DESCRIPTION="Ruamel enhancements to pathlib and pathlib2"
-HOMEPAGE="https://pypi.org/project/ruamel.std.pathlib/ https://sourceforge.net/p/ruamel-std-pathlib/"
+HOMEPAGE="
+	https://pypi.org/project/ruamel.std.pathlib/
+	https://sourceforge.net/projects/ruamel-std-pathlib/
+"
 # PyPI tarballs do not include tests
 SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
-RDEPEND="dev-python/namespace-ruamel[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index d3546736a7f0..3bdca8dc3af7 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,2 +1 @@
-DIST ruamel.yaml-0.17.20.tar.xz 184628 BLAKE2B 0b50240717c10d6dd5aefed9e092fddf503f079066ed49d1f614928046544a67b9168c76a58ee5fbe782fe6e1296a6282416fa8567783f4543ef9c8c0ad340ca SHA512 8c2614ffecba1560e829cfc27f9b4effec589f9eba90792c470ba8f531fecd06ae6f12036ee5463f89021360fb4f35e9b78a16fc778507e88c5c6a8f6e293876
 DIST ruamel.yaml-0.17.21.tar.xz 184612 BLAKE2B cc7e2a336d3c77a9f2d7e5d7233ceb4d15fddca3a97ec0e54427469fd24c7c63fc70b258adbad92a816d99a1f9839d41eccb9f3224e7a23884914755fa424bc9 SHA512 87f4723bfc76b1b21168852aabe4b49921f175294ac05b4e3f292f2bcf23fe6595df3e066843d193f881b274be2a7b358bd04625afef913bb0e5811efe98b761
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.20.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.20.ebuild
deleted file mode 100644
index 075db7383c5f..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.20.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-MY_P="${P/-/.}"
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="
-	https://pypi.org/project/ruamel.yaml/
-	https://sourceforge.net/p/ruamel-yaml/"
-# PyPI tarballs do not include tests
-SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
-# via test_z_olddata, tell pytest itself to leave the subdir alone.
-python_test() {
-	[[ ${EPYTHON} == pypy3 ]] && local EPYTEST_DESELECT=(
-		_test/test_deprecation.py::test_collections_deprecation
-	)
-	local EPYTEST_IGNORE=(
-		_test/lib/
-	)
-	epytest
-}
-
-python_install() {
-	distutils-r1_python_install --single-version-externally-managed
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.21.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.21.ebuild
index 075db7383c5f..16bd36dfdbda 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.21.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.17.21.ebuild
@@ -10,7 +10,8 @@ MY_P="${P/-/.}"
 DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
 HOMEPAGE="
 	https://pypi.org/project/ruamel.yaml/
-	https://sourceforge.net/p/ruamel-yaml/"
+	https://sourceforge.net/projects/ruamel-yaml/
+"
 # PyPI tarballs do not include tests
 SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
 S="${WORKDIR}"/${MY_P}
@@ -21,11 +22,13 @@ KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
+	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	test? (
 		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index e6e3167e8a66..fd9b9479bcc5 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,3 +1 @@
-DIST s3transfer-0.5.0.tar.gz 133535 BLAKE2B 2ce9235fbffc4c42682345873becac6f0d574ac44de523e10178bf7d115b261acbd1753b1a41ca301b72fa96a6a93314572fe12ea4d286a325a0a36e3cf56b36 SHA512 e34d115d149f8f9715fa0147521eec63a5fd672ee513d690248fbca73003cf4c9e43775bd5b3616f7ad3a6734993a1c8b2ba789394d338a8ac4c841a0e51999c
-DIST s3transfer-0.5.1.tar.gz 134278 BLAKE2B e67a726743af4f75e3e22519addeaa4437020ec26e0deec67d003d96307865cb624d7da272618114b168c32f26f595a27ed823b2905f47b1c2e5e187a68457cb SHA512 1bdcb9adfa795b524e36369e9128b1bd39d0b14f51862aba779a1eebe0569283da58138da52e031073d8c1199441083771c7f6e0657e0e1da9cd0d767450d52f
 DIST s3transfer-0.5.2.tar.gz 134873 BLAKE2B 55adab89ca04a9ed1f0195237cab55f97769a8f865e645437df6d95effcf1a27a734f1577daa981261123b681044b540ebbb876e1a8a3b4cf1cf4e5018f2c213 SHA512 6b035ff5b33ba5c048f6921f72684802a9b12516c70c75bd153e481e62a768015f45f569aa88071f887839fd2e004b5f9202813926ca33d58c30793218d14083
diff --git a/dev-python/s3transfer/s3transfer-0.5.0-r2.ebuild b/dev-python/s3transfer/s3transfer-0.5.0-r2.ebuild
deleted file mode 100644
index 35a19f6cd82e..000000000000
--- a/dev-python/s3transfer/s3transfer-0.5.0-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="An Amazon S3 Transfer Manager"
-HOMEPAGE="https://github.com/boto/s3transfer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/botocore[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest tests/{unit,functional}
-}
diff --git a/dev-python/s3transfer/s3transfer-0.5.1.ebuild b/dev-python/s3transfer/s3transfer-0.5.1.ebuild
deleted file mode 100644
index 349f2f9346e5..000000000000
--- a/dev-python/s3transfer/s3transfer-0.5.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="An Amazon S3 Transfer Manager"
-HOMEPAGE="https://github.com/boto/s3transfer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/botocore[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest tests/{unit,functional}
-}
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index a9f0f2b0e50e..9509b61905aa 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1 +1,2 @@
 DIST stripe-2.66.0.tar.gz 234929 BLAKE2B 289c3464c3aa9ef5ebeccaffde383271ca23e704303d5b5499d1f5f1f197483088781d16878749bca03c8ea56209a22173c376ef00510f53d81c733f0a626af8 SHA512 d716e82580757ec0b187a74de1f8ef7bbe2f32468f13c551886bcbadf631eef001df9f4d249f091856b009545ca8b6d60f16c07e79345fee33651e7d27fb31c0
+DIST stripe-2.67.0.tar.gz 235426 BLAKE2B ee396b0b7d3991afdd81e6b051fad0168a7b3dcfaddccc7700292878fc437788dcc40480fea2131dd52e3b787dc6e7b420d6023079f55d9365f76076cc51070d SHA512 099208259c6ca8d69fd6f39f72b9f12f41eace2f0a2a08b017f6141ad06882df742749941326fb8d9898db7c59e32ed74a464ad372d6f7f0a929c9ae4e4d2475
diff --git a/dev-python/stripe/stripe-2.67.0.ebuild b/dev-python/stripe/stripe-2.67.0.ebuild
new file mode 100644
index 000000000000..b93665ed3c64
--- /dev/null
+++ b/dev-python/stripe/stripe-2.67.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Stripe python bindings"
+HOMEPAGE="https://github.com/stripe/stripe-python"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/requests-2.20[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-util/stripe-mock-0.119.0
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		net-misc/curl
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
+
+src_test() {
+	local stripe_mock_port=12111
+	local stripe_mock_max_port=12121
+	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
+	# Try to start stripe-mock until we find a free port
+	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
+		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
+		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
+		local stripe_mock_pid=$!
+		sleep 2
+		# Did stripe-mock start?
+		curl --fail -u "sk_test_123:" \
+			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
+		eend $? "Port ${stripe_mock_port} unavailable"
+		if [[ $? -eq 0 ]]; then
+			einfo "stripe-mock running on port ${stripe_mock_port}"
+			break
+		fi
+		(( stripe_mock_port++ ))
+	done
+	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
+		eerror "Unable to start stripe-mock for tests"
+		die "Please see the logfile located at: ${stripe_mock_logfile}"
+	fi
+
+	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
+	distutils-r1_src_test
+
+	# Tear down stripe-mock
+	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
+}
diff --git a/dev-python/suds/Manifest b/dev-python/suds/Manifest
index 71c755efb2eb..312a5f79e570 100644
--- a/dev-python/suds/Manifest
+++ b/dev-python/suds/Manifest
@@ -1 +1,2 @@
 DIST suds-community-1.0.0.tar.gz 282894 BLAKE2B 06b1d96c13b0e7f3259b550718d653979e4d7cf5d094c881fb2a4c56f6fd47aa0d204c960d1ec617d3d85fe18b1a86f468e9bbeab6695cde73330e2e97462103 SHA512 77f26df229a93ac0efbc4245180f4eb630bd565624cd5e3e92e82af3545c7ce63802eacfe616cc138e8dfcceb8d9007a88c911c654ca7ba77c82d6e9bcf75d77
+DIST suds-community-1.1.0.tar.gz 284545 BLAKE2B b5f6f6f46a35df3263664c9893745a2e723f3eef543cb1a9e9fd061956b0c00c219e818228de9bf11b2730ad0a8fed90ad731199ffc7ca9fba9f22c5c0c8dd41 SHA512 2c8902e16c3513c99ce6d8bdf58ef4f5c4d704f1bf2480ea2b23ec2adbd9e8919928bfd5e3fd6859028b7fbc3788d067b9b71bad2a20c2f4907e6e56f3f15350
diff --git a/dev-python/suds/suds-1.1.0.ebuild b/dev-python/suds/suds-1.1.0.ebuild
new file mode 100644
index 000000000000..8b3eadf04ac1
--- /dev/null
+++ b/dev-python/suds/suds-1.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+MY_PN="${PN}-community"
+DESCRIPTION="Lightweight SOAP client"
+HOMEPAGE="https://github.com/suds-community/suds"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+DOCS=( README.md notes/. )
+
+distutils_enable_tests pytest
diff --git a/dev-python/tekore/Manifest b/dev-python/tekore/Manifest
index c208925991f1..6df3da4564e6 100644
--- a/dev-python/tekore/Manifest
+++ b/dev-python/tekore/Manifest
@@ -1,2 +1 @@
-DIST tekore-4.2.0.tar.gz 261053 BLAKE2B 16e76c7e4ff147140bb5a698381249d135e45cb9bcba23ac14c811bfe220c08e8da003ded44526f5d8f46fc9e439d750c3b21560b38b382751a5d0ee834b72eb SHA512 e22232eb7d4ce453e8338b07caad56b04ec35bf7b4ef2207dae450404e62afaca32b29a74155c99918bea75b0cfb80cc847242ff2ec4762abb8a45c1eb6d6d60
 DIST tekore-4.3.0.tar.gz 261287 BLAKE2B 1ac6f828e20d2aa4e591a7b53f6178d1c9f8b760d2daa1f7705d7a45bef5a4973b65fffc1f7571b1bce270efc9c4e8c6d9dd258173cdda94b06e92a4c14352a2 SHA512 bb0aafdda47d5ac4baefc3c057b8ae91d3a243d913f332f69d7dc00f716e6403daaf8d8382e9b25d2810fd65e139f6d427b9749746c8ac61d67b02dc24620969
diff --git a/dev-python/tekore/tekore-4.2.0.ebuild b/dev-python/tekore/tekore-4.2.0.ebuild
deleted file mode 100644
index 233d3c31f945..000000000000
--- a/dev-python/tekore/tekore-4.2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Spotify Web API client"
-HOMEPAGE="
-	https://tekore.readthedocs.io
-	https://github.com/felix-hilden/tekore
-"
-SRC_URI="https://github.com/felix-hilden/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	<dev-python/httpx-0.22[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pytest-asyncio-0.17[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( readme.rst )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/src \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinx-autodoc-typehints
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/auth/expiring.py::TestCredentialsOnline::test_bad_arguments_raises_error
-)
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 70b7d517e2bb..c36c4a617da4 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,2 +1 @@
-DIST tempora-4.1.2.tar.gz 19243 BLAKE2B 4014fce1abf24231c79bfa80db7ecf80303bca43902aa68a880c3e0a29cb9d6f7bd1d9e02c4f93d43db2a7810f0fd7a26de31383057dcf63b5b8a42fe8e6810e SHA512 dc03db61af973645f8f89c13eb1a0b696275a7a2768f82cd61d1602891d4bb0d4b45725404f39da242362346eb0dc6c38892a117f150f32517a2ac8d3436f5db
 DIST tempora-5.0.0.tar.gz 18532 BLAKE2B f3d59b7d7d2974564b0c7cf25d5bf8716610aa09dd134e37289648e71c4dd6989bfecfafd258da01875de0560cef31fcb8ee0ec85e16d642ff56d10915da6132 SHA512 e95fff8c460329c8369f8f819a95341ec4e1641d2ecc88251c9681ac5e9678eded0f320aa1bff98a980fc552cb214ea3f40c249ea25b54d8fbe34849fffff7b6
diff --git a/dev-python/tempora/tempora-4.1.2.ebuild b/dev-python/tempora/tempora-4.1.2.ebuild
deleted file mode 100644
index 6a629f992825..000000000000
--- a/dev-python/tempora/tempora-4.1.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="https://github.com/jaraco/tempora"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pytest-freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
diff --git a/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild b/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
deleted file mode 100644
index e639f574da69..000000000000
--- a/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Run unittests or fail if no tests were found"
-HOMEPAGE="https://github.com/mgorny/unittest-or-fail/"
-SRC_URI="
-	https://github.com/mgorny/unittest-or-fail/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Warning: do not use distutils_enable_tests to avoid a circular
-# dependency on itself!
-python_test() {
-	"${EPYTHON}" -m unittest -v test/test_unittest_or_fail.py ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index 80193973cf5c..00527862f3cf 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,4 +1,2 @@
-DIST uvicorn-0.17.3.tar.gz 706936 BLAKE2B f96f1707fc966f2972392a413517ba4f3f65097c83134bd648a759ef65496ffa166507d64a2c51d5c301adab4203e0766ab2b359d1182dceeb31dd70e6bbf8e3 SHA512 d2a35a69420b2715c2688be341860958b8697c1565d5b2665d4b9c6fa7bf72060e61f72bfd99fb7c346df48f4a962e3c7a7118dd1d0782bc35ac0fcc57cb4e1d
-DIST uvicorn-0.17.4.tar.gz 706950 BLAKE2B 51d30a97f70984929bc4d4eb3934a16514307ff3e504f86813d0b5ea81467cc5fcc06da6aaa298f0319b2ccddf88b02ee4006ba9f1d573da50365cc4455f5da3 SHA512 4e61d712551ee6e6471f88f511e31b5543ef16d8ebe960447f5de6d02753bdbc38fd5fbae0d736b54b01a61d8519ef3891db2bbc1c7440806650b92a765d1d23
 DIST uvicorn-0.17.5.tar.gz 707840 BLAKE2B 70a5aa4c084f63231b2c4f11c9a4add6a84362789243fe59b4c954665b67f859dcd92076454cac7b960d30c878bccb52e6da5232e052d70ca0a71f4035804b96 SHA512 b73c99d03957bf5f37957386da77cad68e0c9603fb0bfe48ab81f1066953ca01bc75b2eb458a20a587df4f2e1f591fe1c56f26d8df84070c833ccbb912d55ca2
 DIST uvicorn-0.17.6.tar.gz 708048 BLAKE2B 83b06907c8109b38e13930d8b73584682fa4e34fe7e51fe14b6ca1ddc7ef8122d950a09e31cb364a02f5f12eead5d0522b41cbf428509c6900604d4e2776dfb2 SHA512 d5c5223759d59648f279e22f7e6af728fe8117ed75488d125c1db3e5e9d385a50d574cff72ac46db4eb0a78d0e4f690096cfe78c774674dfba61860e55b7494e
diff --git a/dev-python/uvicorn/uvicorn-0.17.3.ebuild b/dev-python/uvicorn/uvicorn-0.17.3.ebuild
deleted file mode 100644
index 22ccdc2f2d54..000000000000
--- a/dev-python/uvicorn/uvicorn-0.17.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Lightning-fast ASGI server implementation"
-HOMEPAGE="https://www.uvicorn.org/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		>=dev-python/websockets-10.0[${PYTHON_USEDEP}]
-		dev-python/watchgod[${PYTHON_USEDEP}]
-		dev-python/wsproto[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# too long path for unix socket
-	tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
-	# need unpackaged httptools
-	"tests/middleware/test_logging.py::test_trace_logging_on_http_protocol[httptools]"
-)
diff --git a/dev-python/uvicorn/uvicorn-0.17.4.ebuild b/dev-python/uvicorn/uvicorn-0.17.4.ebuild
deleted file mode 100644
index bb81866d3012..000000000000
--- a/dev-python/uvicorn/uvicorn-0.17.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Lightning-fast ASGI server implementation"
-HOMEPAGE="https://www.uvicorn.org/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		>=dev-python/websockets-10.0[${PYTHON_USEDEP}]
-		dev-python/watchgod[${PYTHON_USEDEP}]
-		dev-python/wsproto[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# too long path for unix socket
-	tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
-	# need unpackaged httptools
-	"tests/middleware/test_logging.py::test_trace_logging_on_http_protocol[httptools]"
-)
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index cd7f2e9ce987..fd1082b2f868 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,6 +1 @@
-DIST virtualenv-20.11.2.tar.gz 9953645 BLAKE2B 8bd0e5bee4fad2cdb13b1ce3e018191ef69993c9d1c66332c74908483802b2d1aff1ea1ef9acd4d94b17cacc9ae4c4014ded6ac0e7df4ea807d050d1243d5464 SHA512 18f9c6e50aa6d7b7060163b23332d7e9140199e525f7fb4efe99e84dfb298413889f4516b6e942d3e05a667774093ed521cc757a67a1698138cb793b9798a46f
-DIST virtualenv-20.12.1.tar.gz 9956052 BLAKE2B 1507e45de7d1383062b18a2796baf91befec576200560e3a07a5b78e563d6c93cd8f1b3aea327d2edf4d9e582a9a4a9c62f03e9f8cf023318ea4a6cd1fdc6c79 SHA512 1f1a721f1b03cab72330827bca68741cc7f3d4c713a44eb50028ce7b72101cf7530f12cb1fbbff1c94ce9ce621601484845069f34d0c36250f80d8186b2501f9
-DIST virtualenv-20.13.0.tar.gz 9957090 BLAKE2B 7ff73c458b319c2a4545e6ad468cfdf3b4d48eec02f2d82843fd5276a0f97b72a953079849295ab2467fc78d6fb304774cac800b8744cbf7a295cc3fc4dbb433 SHA512 72aa8cffe92551479ad4ec93395597cd9f77ddaf2063e36d5836277199a96ab2d57236d94b99b7038a60ada103a2d8a37ae4b13ffaaa6ed8e786245d9fbbf6d6
-DIST virtualenv-20.13.1.tar.gz 11990886 BLAKE2B 9db9504576406f7992f5ad132241e91042e57fc9b37b0a539c11a79499e1b6da9eea997fa9bbba85ba1e3e388b3dc9245bf02f4ee87408547590b9a34ff6f389 SHA512 97204361a308cced55b07b868b2039662b7c9d82cf4ecf64df18ff9723312e73bc9eb2a88937fb6b5f19c2bae3289784cf28bca46f138603fd55d8a76c6e2897
-DIST virtualenv-20.13.2.tar.gz 12111439 BLAKE2B 956c5c7f1215bfb46279b29634ab0cab523bb44578077837bab47634495462ccc0f8010a438d3eeebfe6afec0900cfa14dd015dabbc31a8e56c9f34312f2f260 SHA512 7e5ef7927637ab1d029c8831889846acb13948c8cfafc17d56ca815f23f682207da0f3b3291936585a9b059c10ec35813fb53511f19462f867edaf5f197c0135
 DIST virtualenv-20.13.3.tar.gz 12152717 BLAKE2B 791eff66e02d0e7b563d68136cf9652ca0e7422cde94ddf558053778e7677937f7f3ddd9e2d6d0a5fd56c79d9061474685b39aa8519471cea230f4dc5ea71c83 SHA512 e9e05e6e6aba10bb6c0813484f508aede9fe2a78401272bb12ea68b80e8f4059f4292de51e37c2487efb92d27f6eeda6e108dd12f45623984966d8fe821352c0
diff --git a/dev-python/virtualenv/virtualenv-20.11.2.ebuild b/dev-python/virtualenv/virtualenv-20.11.2.ebuild
deleted file mode 100644
index ffa612330400..000000000000
--- a/dev-python/virtualenv/virtualenv-20.11.2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{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}]"
-# 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 EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'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
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.12.1.ebuild b/dev-python/virtualenv/virtualenv-20.12.1.ebuild
deleted file mode 100644
index c61d5fbc077c..000000000000
--- a/dev-python/virtualenv/virtualenv-20.12.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{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}]"
-# 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 EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'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
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.13.0.ebuild b/dev-python/virtualenv/virtualenv-20.13.0.ebuild
deleted file mode 100644
index ffa612330400..000000000000
--- a/dev-python/virtualenv/virtualenv-20.13.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{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}]"
-# 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 EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'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
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.13.1.ebuild b/dev-python/virtualenv/virtualenv-20.13.1.ebuild
deleted file mode 100644
index 8b0e61e36817..000000000000
--- a/dev-python/virtualenv/virtualenv-20.13.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-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}]"
-# 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 EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'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-]'
-	)
-
-	epytest
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.13.2.ebuild b/dev-python/virtualenv/virtualenv-20.13.2.ebuild
deleted file mode 100644
index 8b0e61e36817..000000000000
--- a/dev-python/virtualenv/virtualenv-20.13.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-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}]"
-# 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 EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'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-]'
-	)
-
-	epytest
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/wcag-contrast-ratio/wcag-contrast-ratio-0.9.ebuild b/dev-python/wcag-contrast-ratio/wcag-contrast-ratio-0.9.ebuild
deleted file mode 100644
index 28b0481a89f5..000000000000
--- a/dev-python/wcag-contrast-ratio/wcag-contrast-ratio-0.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A library for computing contrast ratios, as required by WCAG 2.0"
-HOMEPAGE="
-	https://github.com/gsnedders/wcag-contrast-ratio/
-	https://pypi.org/project/wcag-contrast-ratio/"
-SRC_URI="
-	https://github.com/gsnedders/wcag-contrast-ratio/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest test.py
-}
diff --git a/dev-python/werkzeug/werkzeug-2.0.3.ebuild b/dev-python/werkzeug/werkzeug-2.0.3.ebuild
index 948f6d3bb04d..ec51a2a788cf 100644
--- a/dev-python/werkzeug/werkzeug-2.0.3.ebuild
+++ b/dev-python/werkzeug/werkzeug-2.0.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest
index 9c0753abea9e..d579ea2c3d79 100644
--- a/dev-python/widgetsnbextension/Manifest
+++ b/dev-python/widgetsnbextension/Manifest
@@ -1 +1,2 @@
 DIST widgetsnbextension-3.5.1.tar.gz 1112877 BLAKE2B 9608a4bb385e697685383e52ee3a17127b87dded4e8edd22233ed03ec837818798a8c08709a83ef7c13995797ebc1b43961e2bc8592e542c5b4fe7c2f5f08f7b SHA512 484f6d91e36ab734c02675973e9007b1f379f1a1cb762c863ad0d80c8c6eb8c9c49a138b3280894ed17ed86775f517a13790cb4537e1cf8bcbdc57e72d13cc2b
+DIST widgetsnbextension-3.6.0.tar.gz 802154 BLAKE2B ef6b56c9ba2e40dde4a6ca40687488fd823886ab5eae474558b994f8a4206c4665e3ed4d953deb93a6261d3f55f3b514ec44eae3aa10bf699e8d2378f1669631 SHA512 d00b0e8d5edfc85ea1a9ac036dbdbe0b0ac6cb0eb694fc999f81e8f615e2a637890a2d5383c0f0ea041d886dbddf2e7036f8163fae0b8c3b5aa315a072b3ff7a
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-3.6.0.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-3.6.0.ebuild
new file mode 100644
index 000000000000..989b4d976cfa
--- /dev/null
+++ b/dev-python/widgetsnbextension/widgetsnbextension-3.6.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="https://ipython.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/notebook[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index db23a40b8926..8c9ff6d15b8e 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,3 +1,4 @@
 DIST xarray-0.20.2.tar.gz 2906021 BLAKE2B 08ed46a27ce66ec1677e63000d74ecc4a01defa81b8ae1ec24595ff330713bf3e5585adce541e5e6769a74d64a4f5eb9d9aad27450e8088973681d0d60d00f83 SHA512 cd292af68ffd8016e01021e30a2ea83dd36e2f79bd9c3d8e7d83adc5a98a95615091d0102a19a0e3337ae334a701f575a142f476d1465804c8d5fe259ca35f1a
 DIST xarray-0.21.0.tar.gz 2937088 BLAKE2B b40d57cbb018e563b92afef1e5208bb597bf8ae892b154f49e90079977c05ab955ba07f136fcf3f456efa8deb70ffd2590dd2d2429b6114a418882b8d96b535f SHA512 85461b86ced78ad5cfd1ace122f1ab89f779a8c0c7e8d0f06233b4654c5f6bcb081eeddc91e5df1c8c40c344d2477f2f18799858e23294c0929e8e59445508b0
 DIST xarray-0.21.1.tar.gz 2936861 BLAKE2B 4d419185a6c49f8054f43748fd7a0ba9694aa9e7377e371705dd6eceea84f5d611d445a7548a79133f8db4c65729c9b5f694ab586d5e2f55640a6369483e3df4 SHA512 be5d925971557f492c8ca7e90eb678a0f98cf0a670eaa8a8564bd160a02fcd8a22362a8691c5447a9baaa67b464257f2ab6954747296839b304f3e25cf13487a
+DIST xarray-2022.3.0.tar.gz 2943007 BLAKE2B 4c323573835c00275b9c293157c78e42d14f2736c07dc06c61643052992b9c75d624cdf9a93487094fbffd9577662388807b661d388032add3b2e2ca3a63b812 SHA512 c088b985a852c57dcef14d8a5107987c0c33f17bde1d9d639d30ac826d906639ce0ee4fe8345c65a5479b944057af045fe50c2d2ea932356aceb0718f55cd24a
diff --git a/dev-python/xarray/xarray-2022.3.0.ebuild b/dev-python/xarray/xarray-2022.3.0.ebuild
new file mode 100644
index 000000000000..7b7688b7a690
--- /dev/null
+++ b/dev-python/xarray/xarray-2022.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="N-D labeled arrays and datasets in Python"
+HOMEPAGE="https://xarray.pydata.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/numpy-1.18[${PYTHON_USEDEP}]
+	>=dev-python/pandas-1.1[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]"
+# note: most of test dependencies are optional
+BDEPEND="
+	test? (
+		dev-python/bottleneck[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/toolz[${PYTHON_USEDEP}]
+		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.19.0-riscv_tests_datetime.patch
+)
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# warning-targeted tests are fragile and not important to end users
+	xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get
+)
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-03-16 13:40:37 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-03-16 13:40:37 +0000
commit	056129369fe8d414a3c66fc9a52b4b6efc7e4f8c (patch)
tree	289a1c6e2e5ac153f09dec4581f3808c3f5d8e13 /dev-python
parent	1cd3065bf0a16f121fad816c79dbd3f96f23de94 (diff)
download	baldeagleos-repo-056129369fe8d414a3c66fc9a52b4b6efc7e4f8c.tar.gz baldeagleos-repo-056129369fe8d414a3c66fc9a52b4b6efc7e4f8c.tar.xz baldeagleos-repo-056129369fe8d414a3c66fc9a52b4b6efc7e4f8c.zip