Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-03-15 18:25:52 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-03-15 18:25:52 +0000
commit: be58752269c92e59529b7ac1a99f2cadda464a69 (patch)
tree: 5d235c43d5d400d4846aa383a5220dd557666425 /dev-python
parent: 4b76e415164b427b26a29d99e46c771e919d5dce (diff)
download: baldeagleos-repo-be58752269c92e59529b7ac1a99f2cadda464a69.tar.gz
baldeagleos-repo-be58752269c92e59529b7ac1a99f2cadda464a69.tar.xz
baldeagleos-repo-be58752269c92e59529b7ac1a99f2cadda464a69.zip
191 files changed, 487 insertions, 3458 deletions
diff --git a/dev-python/argon2-cffi/argon2-cffi-21.3.0-r2.ebuild b/dev-python/argon2-cffi/argon2-cffi-21.3.0-r2.ebuild
index 5645ef4be1a4..80161a102550 100644
--- a/dev-python/argon2-cffi/argon2-cffi-21.3.0-r2.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-21.3.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND=">=dev-python/argon2-cffi-bindings-21.2.0[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/autobahn/autobahn-22.2.2.ebuild b/dev-python/autobahn/autobahn-22.2.2.ebuild
index da18cf40a36d..d3cf90e53cca 100644
--- a/dev-python/autobahn/autobahn-22.2.2.ebuild
+++ b/dev-python/autobahn/autobahn-22.2.2.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 IUSE="test xbr"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/black/black-22.1.0.ebuild b/dev-python/black/black-22.1.0.ebuild
index 75ae99eac9f5..feae0cf6c43d 100644
--- a/dev-python/black/black-22.1.0.ebuild
+++ b/dev-python/black/black-22.1.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/boolean-py/Manifest b/dev-python/boolean-py/Manifest
new file mode 100644
index 000000000000..097a45b1ef41
--- /dev/null
+++ b/dev-python/boolean-py/Manifest
@@ -0,0 +1 @@
+DIST boolean.py-3.8.gh.tar.gz 32063 BLAKE2B a0314852f9d914329476e80f7e11cbc7eb55412ef7c41dec620c2a21d522950fde7471f7e1d9042b2887b5a7462b226c2b6d08c9d3fd46192aa7d6d3426dae80 SHA512 d41ce9a05743342c116d68b88ea36be316ac9fc190a8451aca97b52fde60c58ec49d36d2dee071f83fb5f6ad49337da80bf9de1bf3d479b46386fd87e4cf2f14
diff --git a/dev-python/boolean-py/boolean-py-3.8.ebuild b/dev-python/boolean-py/boolean-py-3.8.ebuild
new file mode 100644
index 000000000000..515714a33562
--- /dev/null
+++ b/dev-python/boolean-py/boolean-py-3.8.ebuild
@@ -0,0 +1,26 @@
+# Copyright 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
+
+MY_P=${P/-/.}
+DESCRIPTION="Define boolean algebras, create and parse boolean expressions"
+HOMEPAGE="
+	https://pypi.org/project/boolean.py/
+	https://github.com/bastikr/boolean.py/
+"
+SRC_URI="
+	https://github.com/bastikr/boolean.py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/boolean-py/metadata.xml b/dev-python/boolean-py/metadata.xml
new file mode 100644
index 000000000000..e173c6c43d73
--- /dev/null
+++ b/dev-python/boolean-py/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">boolean.py</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2-r1.ebuild b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2-r1.ebuild
index 81c10fd4c620..496e30c953ed 100644
--- a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2-r1.ebuild
+++ b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2-r1.ebuild
@@ -18,6 +18,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/distlib/distlib-0.3.4.ebuild b/dev-python/distlib/distlib-0.3.4.ebuild
deleted file mode 100644
index 5daae379e25e..000000000000
--- a/dev-python/distlib/distlib-0.3.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2021-2022 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 vcs-snapshot
-
-DESCRIPTION="Low-level components of distutils2/packaging"
-HOMEPAGE="https://pypi.org/project/distlib/
-	https://bitbucket.org/pypa/distlib/"
-# pypi has zip only :-(
-SRC_URI="
-	https://bitbucket.org/pypa/distlib/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-# This package's tests are extremely fragile and tend to break or hang
-# when it doesn't like metadata of packages installed on the system.
-RESTRICT="test"
-
-# pypiserver is called as external executable
-# openpyxl installs invalid metadata that breaks distlib
-BDEPEND="
-	test? (
-		dev-python/pypiserver
-		!!<dev-python/openpyxl-3.0.3[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	# make sure they're not used
-	rm tests/pypi-server-standalone.py || die
-
-	# use system pypiserver instead of broken bundled one
-	eapply "${FILESDIR}"/distlib-0.3.2-system-pypiserver.py || die
-
-	# doesn't work with our patched pip
-	sed -e '/PIP_AVAIL/s:True:False:' \
-		-i tests/test_wheel.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x SKIP_ONLINE=1
-	local -x PYTHONHASHSEED=0
-	"${EPYTHON}" tests/test_all.py -v -x ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/django-cache-url/Manifest b/dev-python/django-cache-url/Manifest
index 1eb2051c11f0..06cc6ba9c646 100644
--- a/dev-python/django-cache-url/Manifest
+++ b/dev-python/django-cache-url/Manifest
@@ -1 +1,2 @@
 DIST django-cache-url-3.3.0.tar.gz 8319 BLAKE2B 28e627270baf5ea030bdcf098968644fd59551b1e974c7e08b396313c13bc48d4417c1e7b7c9942a1773b05d53c1b918177ef649ab088efcfa9ecf375b17ecac SHA512 fc01f3ef1e490146b911cff6f905c5257c8adbca57734a442d0d8e715c77d398fe07d3e47f043627eabc87f6f72153c2504873bf81d248c9da9183d6fe005069
+DIST django-cache-url-3.4.0.tar.gz 8455 BLAKE2B 91780a053a90decbffd3d9a6fc0b9043dee74b6b6b265b9ef4b035c5679a4955582b3a3b831ff9670fceb89d5729b9ac607b6f318543d437eb35e7d1a1c1c638 SHA512 17fb8aff3b65f4860b2d2c7c765341f17c13a0f78453f627f62f40894d3e83281ecbde1d1ddcbeff7de8fe55189ce9504d03281353d227f9e7b1678af4c423ec
diff --git a/dev-python/django-cache-url/django-cache-url-3.4.0.ebuild b/dev-python/django-cache-url/django-cache-url-3.4.0.ebuild
new file mode 100644
index 000000000000..001b815fbef8
--- /dev/null
+++ b/dev-python/django-cache-url/django-cache-url-3.4.0.ebuild
@@ -0,0 +1,33 @@
+# 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="Use Cache URLs in your Django application"
+HOMEPAGE="https://github.com/epicserve/django-cache-url"
+SRC_URI="
+	https://github.com/epicserve/django-cache-url/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/django[${PYTHON_USEDEP}]
+"
+
+DOCS=( AUTHORS.rst CHANGELOG.rst README.rst )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e '/--cov/d' -i setup.cfg || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/entrypoints/Manifest b/dev-python/entrypoints/Manifest
index 6b344114f99b..df221e2e1d75 100644
--- a/dev-python/entrypoints/Manifest
+++ b/dev-python/entrypoints/Manifest
@@ -1,2 +1 @@
-DIST entrypoints-0.3.tar.gz 12315 BLAKE2B f548d98eeb9dcf5760b26f66e5dec0849c9a9027cd68447c07a585e7b80f79a7c66712d0dd270b6960db167d26f9cf0c9c221edd21f2692c2221d36e952ede65 SHA512 aa1274362d3a4b00266103319ca51aa266605b4999c89a9d0673eb61bfae9e646cb0ec6b86c95544493f6fe048385a2c7641d64adca8f45815546fb1e663c858
 DIST entrypoints-0.4.tar.gz 13974 BLAKE2B 95bfe3deeee183f000722be63114e7eafe12ce9994e3ad02fccde7ee8dca3d10cc491e438bc9330fe9e16dbe1664d7a9fd9ef5712ebca989e3304e1dee7a55ce SHA512 874858c240199b9a209e00bde609b33335d199d21a959e51bb875240e2a35ada036380097218e9cd50d5d1dbf9de52638a069cb605ea8e8952db4a5afa3ffd42
diff --git a/dev-python/entrypoints/entrypoints-0.3-r2.ebuild b/dev-python/entrypoints/entrypoints-0.3-r2.ebuild
deleted file mode 100644
index 1ecc2b9b78bc..000000000000
--- a/dev-python/entrypoints/entrypoints-0.3-r2.ebuild
+++ /dev/null
@@ -1,29 +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="Discover and load entry points from installed packages"
-HOMEPAGE="https://github.com/takluyver/entrypoints"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-0.2.1-init.py.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}"/lib || die
-	cp -r "${S}"/tests "${TEST_DIR}"/lib/ || die
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/entrypoints/entrypoints-0.3-r3.ebuild b/dev-python/entrypoints/entrypoints-0.3-r3.ebuild
deleted file mode 100644
index 0bac717f5989..000000000000
--- a/dev-python/entrypoints/entrypoints-0.3-r3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Discover and load entry points from installed packages"
-HOMEPAGE="https://github.com/takluyver/entrypoints"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-distutils_enable_tests pytest
diff --git a/dev-python/entrypoints/files/entrypoints-0.2.1-init.py.patch b/dev-python/entrypoints/files/entrypoints-0.2.1-init.py.patch
deleted file mode 100644
index 40d5d82730d3..000000000000
--- a/dev-python/entrypoints/files/entrypoints-0.2.1-init.py.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-__init__.py for entrypoints by Marius Brehler <marbre@linux.sungazer.de>.
-
-Patch by Marius Brehler <marbrbre@linux.sungazer.de>.
---- /dev/null
-+++ b/entrypoints/__init__.py
-@@ -0,0 +1 @@
-+from .entrypoints import *
-\ No newline at end of file
diff --git a/dev-python/eradicate/eradicate-2.0.0.ebuild b/dev-python/eradicate/eradicate-2.0.0.ebuild
deleted file mode 100644
index ceacf360b516..000000000000
--- a/dev-python/eradicate/eradicate-2.0.0.ebuild
+++ /dev/null
@@ -1,21 +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=no
-
-inherit distutils-r1
-
-DESCRIPTION="Removes commented-out code from Python files"
-HOMEPAGE="https://github.com/myint/eradicate"
-# TODO: revert to PyPI tarball once it includes tests
-# https://github.com/myint/eradicate/pull/28
-SRC_URI="https://github.com/myint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/fastjsonschema/Manifest b/dev-python/fastjsonschema/Manifest
index d0d649f8e7a2..3de513fa8101 100644
--- a/dev-python/fastjsonschema/Manifest
+++ b/dev-python/fastjsonschema/Manifest
@@ -1,2 +1 @@
-DIST python-fastjsonschema-2.15.1.tar.gz 35384 BLAKE2B 89b9be7a9dcb8b22634dcfb54abec7b5709805b7087558af93b4cbca3c71a0b876956060aac0d0e7f4467db1bb38e6a587025c1c219613a661fb0d9e656b81e0 SHA512 7eb4d512eac03e258d670f6d448c5aeb74e20f892a08fa84a0412fd9c99cdc6412d4daa74bc09f9fe933a973a81227dae36125766e64f3c5b01106435ca5d70f
 DIST python-fastjsonschema-2.15.3.tar.gz 389350 BLAKE2B f9ab32666fce1ba44a11cb981f4f301d7d55260767ec71aefa54ad6bcdd5b8c3d246656908dcd50e909257b35bb9ee24eb34d5ce7fe0f91501127cad412a7e1d SHA512 59dfc513de46e9df790edaa1abc994decdf98d65bec8eb8a6ac7211d2277f4e15d521a308e45c6532a232321d8a4655f87b7a01f2d57b9de20246a4d6deeeb9b
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild
deleted file mode 100644
index 54147c039647..000000000000
--- a/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild
+++ /dev/null
@@ -1,26 +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
-
-MY_P=python-${P}
-DESCRIPTION="Fast JSON schema validator for Python"
-HOMEPAGE="https://github.com/horejsek/python-fastjsonschema/"
-SRC_URI="
-	https://github.com/horejsek/python-fastjsonschema/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	rm -r tests/benchmarks || die
-}
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.15.3.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.15.3.ebuild
deleted file mode 100644
index 81b7f1512110..000000000000
--- a/dev-python/fastjsonschema/fastjsonschema-2.15.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2020-2022 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
-
-MY_P=python-${P}
-DESCRIPTION="Fast JSON schema validator for Python"
-HOMEPAGE="https://github.com/horejsek/python-fastjsonschema/"
-SRC_URI="
-	https://github.com/horejsek/python-fastjsonschema/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	rm -r tests/benchmarks || die
-}
diff --git a/dev-python/filetype/Manifest b/dev-python/filetype/Manifest
index efc67bf0eaa7..156a60e16566 100644
--- a/dev-python/filetype/Manifest
+++ b/dev-python/filetype/Manifest
@@ -1,2 +1 @@
 DIST filetype-1.0.10.tar.gz 804374 BLAKE2B 51735e8810be7f4fe9aaac1ec5305ea85146b5c540a1aaad795a287a4570abb22d131a5fd1444c83e3e747424938242dc8733d2076019a963f6947e4f5981db7 SHA512 a6455b8d11ec56dd3d041b95e1226a5d0ecdee21ef590997e93611d10184ed29137c9f3bd578313a25455010da8f21950420b29ecd9e6ddb5e363051a9fbacc6
-DIST filetype-1.0.9.tar.gz 804325 BLAKE2B f17cfec5d4c971d96a36d9cf4718ebb74f9c128c0818fb271a506323b978a68235db7700001baa52eb47beb3ba93a452495b08fb0c1ddd23424b9a8cf42d3443 SHA512 4d59c32c83a448136ac0d5aef55a24d13cee1c234f3a6d713ad7c63696c9e5b6bd502b4f365244be84f8579705fa48a31dc231ae8e52b2656aa72255dc61cef8
diff --git a/dev-python/filetype/filetype-1.0.9.ebuild b/dev-python/filetype/filetype-1.0.9.ebuild
deleted file mode 100644
index dfc9a6b3532e..000000000000
--- a/dev-python/filetype/filetype-1.0.9.ebuild
+++ /dev/null
@@ -1,17 +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} )
-inherit distutils-r1
-
-DESCRIPTION="Small, dependency-free, fast Python package to infer binary file types checking"
-HOMEPAGE="https://github.com/h2non/filetype.py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/flexmock/Manifest b/dev-python/flexmock/Manifest
index e6eeceb3aa16..fff180c05d39 100644
--- a/dev-python/flexmock/Manifest
+++ b/dev-python/flexmock/Manifest
@@ -1,2 +1 @@
-DIST flexmock-0.11.2.tar.gz 51330 BLAKE2B 3ebeea60c19a9234a362117009610802f10c68c55885ae9dd72c16b19af19fdfbf18634bbc56a80efb0c985f0c339bab234304088dc482b0ccf937c1d7c2fd0f SHA512 208876131155dd0febc9e6aad7a6e98082fccf52573758ac9280f9f767d81ece7af425c901a4a094b3eb56bd711219a55dcfc0d7747f9060b3ad6630c37e6618
 DIST flexmock-0.11.3.tar.gz 52509 BLAKE2B 5246cedb3cae7aeb4ddee9158bc365be13bf81443711456a84abd3dfb30c8ea7cbca8fbce618efe26d33bc8185a9d7a52f1532934f7aad5fa11296ef21731963 SHA512 38387529d8b7e359cf6e578c9be8ae028cd28929567267bce1bb7f44032c00480520335315bb1c510229728e1101aa379b809fb89aeddafd19590e38e7ebdcf2
diff --git a/dev-python/flexmock/flexmock-0.11.2.ebuild b/dev-python/flexmock/flexmock-0.11.2.ebuild
deleted file mode 100644
index 8c9c9b78a37a..000000000000
--- a/dev-python/flexmock/flexmock-0.11.2.ebuild
+++ /dev/null
@@ -1,31 +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
-
-DESCRIPTION="Testing library to create mocks, stubs and fakes"
-HOMEPAGE="https://flexmock.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		tests/test_teamcity.py
-		tests/test_testtools.py
-		tests/test_unittest.py
-	)
-	epytest -p no:flaky
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc -r docs
-}
diff --git a/dev-python/fs/Manifest b/dev-python/fs/Manifest
index 38c0239dda81..a69d3926aeeb 100644
--- a/dev-python/fs/Manifest
+++ b/dev-python/fs/Manifest
@@ -1,2 +1 @@
-DIST pyfilesystem2-2.4.14.tar.gz 181196 BLAKE2B 23442e551684fab1493762182944769789ac45e363556705a911b2b3df456da7edfebb58a0d49317f9e9d46316494577be0ec449c86365a510d493d57e1636b0 SHA512 7bc69e23e6477a68fdf87d18403ba0bff2ff4eb2d0cf3cd9c7b0078885ed9d718e3f4f5f22bd77c6bcca6ebfa990045104a2d5abcf473a9d77a28aa94884650b
 DIST pyfilesystem2-2.4.15.tar.gz 181799 BLAKE2B 522d118dcee6aafe754d8eb571aa88f26cbbbafd7fedabbf7f4470e098dde01db42cb26b20ed28305daf8f32a22250da81c8a932d420ef4bdf825deb363a26a1 SHA512 7bb153dad5ea03eec7cb1af8d1b5a851845984e194f288687b0e737e1f32c74bf4c1a8d62a9105c8637cd5a29ab82810df9fc11055b894ab0df899cb20a4e1c1
diff --git a/dev-python/fs/fs-2.4.14.ebuild b/dev-python/fs/fs-2.4.14.ebuild
deleted file mode 100644
index 950e8172a837..000000000000
--- a/dev-python/fs/fs-2.4.14.ebuild
+++ /dev/null
@@ -1,59 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 optfeature
-
-MY_P=pyfilesystem2-${PV}
-DESCRIPTION="Filesystem abstraction layer"
-HOMEPAGE="
-	https://pypi.org/project/fs/
-	https://docs.pyfilesystem.org
-	https://www.willmcgugan.com/tag/fs/
-"
-# Tests from the PyPI tarball are broken
-# https://github.com/PyFilesystem/pyfilesystem2/issues/364
-SRC_URI="
-	https://github.com/PyFilesystem/pyfilesystem2/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-"
-# NB: we skip tests requiring pyftpdlib
-BDEPEND="
-	test? (
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# TODO: fails at teardown due to unfreed resources
-		tests/test_ftpfs.py
-	)
-
-	# pytest-xvfb causes test failures due to a zombie Xvfb process
-	epytest -p no:xvfb
-}
-
-pkg_postinst() {
-	optfeature "S3 support" dev-python/boto
-	optfeature "SFTP support" dev-python/paramiko
-	optfeature "Browser support" dev-python/wxpython
-}
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index 16e85d168212..9d3423354314 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,3 +1,4 @@
 DIST google-api-core-2.3.1.tar.gz 156495 BLAKE2B fdc7f7d8457b96947181eee9992c5e51bbd18f9740a0415a32d4d0f45ade9c0c784e01f0aa78fe0dbbf3717ee860e78d6b4d1c5f154361afbf919abe033e5380 SHA512 ab1c333727e666f920d81186e6213d440052021d952efcb47eac487d10ab33a2e1116278925e54bfb3468de70c18837a0e241ba3426af09728ea59a725789a29
 DIST google-api-core-2.5.0.tar.gz 160336 BLAKE2B 5a3050dcb2e58c068c67cd6263b297ea84e4a47784c750e7ed87077bf46314730698eda2eaa8305a99a55b539b8886dfbbeeb9dc9838748fa941db6785212f36 SHA512 92b570195db21dded50b220e350e518c13101ab3e247bcbb3d3f5701e722c6dc81312443889360fdef1485edf1d5ef486bfeecf56092844cea81b61c7c527728
 DIST google-api-core-2.7.0.tar.gz 163847 BLAKE2B ba9b787736744fcbe73fde030b8efc88c01f818d3b8b83886116202354a3626b8ea15cac46f23a12191364098f74e2b9128774afd659dd4c4ce55af1c7ad2319 SHA512 9c00791a7412dab25b68785b3265a5654671a7865381d6d2cc8cdcb7e509d71968a0a654ecaaa6bb830b38f0cc838707baeedb545fcf5eea362bfa4bd8a9c53b
+DIST google-api-core-2.7.1.tar.gz 163942 BLAKE2B 0b28e8dd8607ed6a64a3715c14e321f74d18abc09bc2eee5c6d080936160ea9d6839f1acf9589667c86a688e4e02038cc204f25d0b7cab3e3ed3af2463f31abb SHA512 2264eec00309f272ecca278e8f310bca4be64cfcec94c05fa96a7a8ae350fce0ae9931fbb27aae71e89393289cdbef782631a6766e85d5aee449e903e70f0817
diff --git a/dev-python/google-api-core/google-api-core-2.7.1.ebuild b/dev-python/google-api-core/google-api-core-2.7.1.ebuild
new file mode 100644
index 000000000000..6d31f1725649
--- /dev/null
+++ b/dev-python/google-api-core/google-api-core-2.7.1.ebuild
@@ -0,0 +1,65 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core Library for Google Client Libraries"
+HOMEPAGE="https://github.com/googleapis/python-api-core/
+	https://googleapis.dev/python/google-api-core/latest/index.html"
+SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P//google/python}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+"
+# grpcio support is broken if grpcio-status is not installed,
+# and we do not package the latter
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/proto-plus[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# failing due to missing grpcio-status
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_unary_errors
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_raised
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_read
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_aiter
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_write
+	tests/unit/test_grpc_helpers.py::test_wrap_unary_errors
+	tests/unit/test_grpc_helpers.py::Test_StreamingResponseIterator::test___next___w_rpc_error
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_invocation
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_iterator_initialization
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_during_iteration
+	# TODO
+	tests/unit/test_operation.py::test_exception_with_error_code
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	epytest -p no:aiohttp -p no:trio
+}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 9bd163cb7605..7dcec388acd0 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,2 +1,3 @@
 DIST google-api-python-client-2.37.0.tar.gz 28868090 BLAKE2B 971fa3a873c902a34c100066a026ab6698d142a4875282d8be890b403a2edf1f00ea5a3dc4bcf90a30ad9dfb8aa5e1d5eb1b60e64a6718a6e054d49b7ff94afc SHA512 72543f78779403a5d16cfae8f84718d7a6dc08e9fcaa4e97d7a1f6e5ba6594b3a87762e229b94ccfc3a3ca196bbe0cd17c5fde949d101d5975b61cdc57a32622
 DIST google-api-python-client-2.38.0.tar.gz 29194978 BLAKE2B 741cf925256f0bd648e68c339233cfc13a9eaa12e123e202eab64b8389bc493755838c3da8ca4e7f4ffeecacec783c41f37df1847edf0fb54387d58163c112fc SHA512 b93f1f946ebab226b9fdd9012c3ae70563197a895d9069f09c7eb8926cd8fe5567535d3677a6824f66720b9ed1f0a732f02be9440dc800a13cb7e335728a3ce8
+DIST google-api-python-client-2.40.0.tar.gz 29463380 BLAKE2B f70067d3afe614e34cf84480d7a653620b516689560033cf3ad72a963e53c76632d1254ed1ac5f492e9e4639a6d717889f0f84c283363892efa99ce1007bbb82 SHA512 ae345d46bcb13509dd631039079c3ef96899899c206bc19b47a873d8ebc9372e70f55bcada1c8ba9775d826dbe8b1fde96a8f496f5574bb15b3c73c7d848f189
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.40.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.40.0.ebuild
new file mode 100644
index 000000000000..a609ec488769
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.40.0.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="Google API Client for Python"
+HOMEPAGE="https://github.com/googleapis/google-api-python-client"
+SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	epytest tests
+}
diff --git a/dev-python/h2/h2-4.1.0.ebuild b/dev-python/h2/h2-4.1.0.ebuild
deleted file mode 100644
index e0c92c7f72ab..000000000000
--- a/dev-python/h2/h2-4.1.0.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
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
-HOMEPAGE="https://python-hyper.org/h2/en/stable/ https://pypi.org/project/h2/"
-SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/hyperframe-6.0[${PYTHON_USEDEP}]
-	<dev-python/hyperframe-7[${PYTHON_USEDEP}]
-	>=dev-python/hpack-4.0[${PYTHON_USEDEP}]
-	<dev-python/hpack-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/hpack/hpack-4.0.0.ebuild b/dev-python/hpack/hpack-4.0.0.ebuild
deleted file mode 100644
index c6c137e8c14b..000000000000
--- a/dev-python/hpack/hpack-4.0.0.ebuild
+++ /dev/null
@@ -1,27 +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="Pure-Python HPACK header compression"
-HOMEPAGE="
-	https://python-hyper.org/hpack/en/latest/
-	https://pypi.org/project/hpack/"
-SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# dev-python/pytest-relaxed causes tests to fail
-BDEPEND="
-	test? (
-		>=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}]
-		!!dev-python/pytest-relaxed[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index e00e914ecd83..f8ca93a5252a 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -1,2 +1 @@
-DIST httplib2-0.20.2.gh.tar.gz 407815 BLAKE2B ebb3a35b5842eff570c4d804e5dcffa5afde32841eaf1797afd47a58ff7e4d6f945b20c82ad10afe0abff1dd8c5fb405594dca0c6641f8a7a201a71258478c52 SHA512 cb1e0e365ec7872d20c1a8e3ddb150433dd01f4ec816ae2044be6aad6c21afd00ce00dfc57f1348dcc857a63e02e8ffbd39c78f35bb4bba2e283a48f07102159
 DIST httplib2-0.20.4.gh.tar.gz 371778 BLAKE2B 85e2dd0b6213cc5015d4f2f7f923209a61649f948f003eaf3c95c956cb08e6f5bf9dc4e40109c0ddea6a18ab47870a21c7d367ea1eeec2644507568f4e271005 SHA512 46396a9bb439e61939e481a2502567a6dc40686471267ea4c357f141ac138193107f90ac465db683e4ab71e5d92249b810657bff0cb74af7a37a9a23c8320741
diff --git a/dev-python/httplib2/httplib2-0.20.2.ebuild b/dev-python/httplib2/httplib2-0.20.2.ebuild
deleted file mode 100644
index 9bf826a7c55b..000000000000
--- a/dev-python/httplib2/httplib2-0.20.2.ebuild
+++ /dev/null
@@ -1,71 +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="A comprehensive HTTP client library"
-HOMEPAGE="https://pypi.org/project/httplib2/"
-SRC_URI="
-	https://github.com/httplib2/httplib2/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	app-misc/ca-certificates
-	dev-python/pyparsing[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-libs/openssl
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}"/${PN}-0.12.1-use-system-cacerts.patch )
-
-src_prepare() {
-	sed -i -e '/--cov/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	# the bundled certificates use weak MDs
-	pushd tests/tls >/dev/null || die
-	../../script/generate-tls || die
-	popd >/dev/null || die
-
-	# recerting increases serial numbers
-	sed -e 's:E2AA6A96D1BF1AEC:E2AA6A96D1BF1AEF:' \
-		-e 's:E2AA6A96D1BF1AED:E2AA6A96D1BF1AF0:' \
-		-i tests/test_https.py || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken by using system certificates
-		tests/test_cacerts_from_env.py::test_certs_file_from_builtin
-		tests/test_cacerts_from_env.py::test_certs_file_from_environment
-		tests/test_cacerts_from_env.py::test_with_certifi_removed_from_modules
-
-		# broken by new PySocks, probably
-		tests/test_proxy.py::test_server_not_found_error_is_raised_for_invalid_hostname
-		tests/test_proxy.py::test_socks5_auth
-
-		# broken by recerting (TODO)
-		tests/test_https.py::test_min_tls_version
-		tests/test_https.py::test_max_tls_version
-	)
-
-	# tests in python* are replaced by tests/
-	# upstream fails at cleaning up stuff
-	epytest tests
-}
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 2ec8b83da42e..e38b5777c261 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,3 +1 @@
-DIST humanize-3.13.1.tar.gz 72109 BLAKE2B a17033c704fb1a12a82008bf07ed1f672c6d9b8a2a1ee16e34a49b2e9ce697099951f8bad638692b183d424a20836dff42f7fb8fffd1112a8ba9c4f42365db23 SHA512 f2d510347f05f953bb6f67811a7fd062f721c76892388d43ea0f19f826e75853c6f7b6cddcd986c06414dc8a3c8b3c88bee16a61fa23baa24d951ba275114de2
-DIST humanize-3.14.0.tar.gz 72030 BLAKE2B a1ba7a664c33551d9d776904b0646aad9077a53fd5a546060a9deb23e9817f1306acaddb6b133be71fdbe2a20dd3c25cef2f41448c0bc0137c657da61aad4b93 SHA512 6c3d4fba1af287023d86cc2b9bcc4b7a2fc1855271fa772b316bfab3bec2f8e0b7a91d8672e156986ccf9044dc937c3fa2e73e4537ebe919eb0869ce59c3ce73
 DIST humanize-4.0.0.tar.gz 71028 BLAKE2B ef11ae45950a4dc7f55bbd380351aa6f6aaccb7410336f3c9187755d619131741cb2932917e9316c86e33f47e0640311cce278ce23046160aa0ffb4c1bdad1bc SHA512 71c528101b62c883de6474d3c31e97f7f54099c3389f7a88a328ef24b40f7a5667db879badd6154d76ce9bb1390a45404e177c50c7c26064c63b654936ba0514
diff --git a/dev-python/humanize/humanize-3.13.1.ebuild b/dev-python/humanize/humanize-3.13.1.ebuild
deleted file mode 100644
index 401b4442efc6..000000000000
--- a/dev-python/humanize/humanize-3.13.1.ebuild
+++ /dev/null
@@ -1,22 +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="Common humanization utilities"
-HOMEPAGE="https://github.com/jmoiron/humanize/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/humanize/humanize-3.14.0.ebuild b/dev-python/humanize/humanize-3.14.0.ebuild
deleted file mode 100644
index 8662e5169a1b..000000000000
--- a/dev-python/humanize/humanize-3.14.0.ebuild
+++ /dev/null
@@ -1,24 +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="Common humanization utilities"
-HOMEPAGE="https://github.com/jmoiron/humanize/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/hyperframe/hyperframe-6.0.1.ebuild b/dev-python/hyperframe/hyperframe-6.0.1.ebuild
deleted file mode 100644
index a35fa4c440a2..000000000000
--- a/dev-python/hyperframe/hyperframe-6.0.1.ebuild
+++ /dev/null
@@ -1,19 +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="HTTP/2 framing layer for Python"
-HOMEPAGE="https://python-hyper.org/en/latest/
-	https://pypi.org/project/hyperframe/
-	https://github.com/python-hyper/hyperframe"
-SRC_URI="mirror://pypi/${P: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"
-
-distutils_enable_tests pytest
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 249c396da713..d5e60010136a 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,8 +1,2 @@
-DIST hypothesis-python-6.35.1.tar.gz 9179056 BLAKE2B 3667ed7fe2a5402a3055941c44afe8e3e909381a0cbc1bec61cdcec18cb102796d283c737d5642ff6242fee4f0a2dc88774befe880a58f64bb4e183789b21e09 SHA512 839c9b2cf607f44fccf20c814a774889484f61a40a93e976f7bcb457dceac272bf6b775231fb36009e115181cf2089907bcad898f795e266d98ca218c5c4af28
-DIST hypothesis-python-6.36.1.tar.gz 9179567 BLAKE2B 67c5e33667287107b80684011076448d3761f09759592eeb42c4763080a23c9bdcffd21d0566282b856f55cc3b527e365f5b91f12abf0de77aee842ef2da719d SHA512 53a2054cfad778e59d56b483075a2de0cb3b15c80be3d2101607c593eb4e997516c350a44e542ec4ecf6b265058733d0362d557b908d58a934e57369b08334be
-DIST hypothesis-python-6.36.2.tar.gz 9179500 BLAKE2B e627ddfbef2e0955df0f4d8a388157352779aa73ca422f6372ba966b4b815bef26822f664983de089c9036eef05ae810deefd76615b37dffe5561fef9862495f SHA512 e2dd6ca73a72c30c0f0a6b3bdce44ef070f0497400f1de6758ab2daf948185afd607d34ffb604c8f55746beec60dca1289f9c4d71fc666b7904f7dcbe0d66cd7
-DIST hypothesis-python-6.37.0.tar.gz 9179770 BLAKE2B 914968515c65b52cfa7fd4908c7132c36e2b3639a48a5f9131fdf0dc9f0230f3b3e9cc47e5f45896fd37faaa6b9822f8232df6bbb4b12b1d62e8498c35ba777e SHA512 44b200cb583c006c44a551b7f0e859d193bb4ae68233ca8903bc89259b7a7b57e751458034d3c46223481e5862fb046d546c0331501fe926d645ccb0fcd2a455
-DIST hypothesis-python-6.37.1.tar.gz 9179835 BLAKE2B 316b4bd4143d8bd403bac2fcc713c49c0a1f5f713d78335845f77c7ac9dac852cce367ac618999265ab4c68e848037920b2be6e18f68bd1f3d6982b1e7f5e297 SHA512 7b5e961339672cf853d181f4a3963ab753fe0bd7af599247996629de2b8e62159b3cfe6ce8663b2499e2e4e2dbdcc99fc99c5a582a73102c5637e82ce4624c64
-DIST hypothesis-python-6.37.2.tar.gz 9179951 BLAKE2B 0178beee31353d94454ce289d9214153b394612f28cec52e906456cda6419b7b427213ac46ff423c1f6d853e82d737b2f9f57ae89c20481cabde2bc523a87c18 SHA512 659ddce542e26047b0dceb764588c0ffa20a096f44b742514105d4f6f933042ee29fb84897863112fabf19b83de9d357714f252f5adeb8d0557788c62b71c6e2
 DIST hypothesis-python-6.38.0.tar.gz 9180960 BLAKE2B a62cb0cb31cfe4ece8ee829207befb729aebf2be802c57b398547c87ecbd4769955c5c2919a0eb653d41cc3f4998c5326fdb184b6409d5fcb632c037df6a542f SHA512 2d57b783a71a905470ca088ebd91c0ea96be1bd76648d30d52b0b43914844712bbf3eaad54d66607b149a1238bb9a0258f920a6e262e54bed5cef36e3ca227e1
 DIST hypothesis-python-6.39.3.tar.gz 9182758 BLAKE2B 3641e5a9fd7e3e3e9f6432fa5bd5b8f6e4508fd840c781a65f11e8e99cee40dbd343bb17c37c60a4aabff00d5faca98a3a49b756eb754763ffc26a63a8450b38 SHA512 6dcbecdbd564aced4b0e14608a226d71adccaccfd54a3b9029f85a3e616372b7422f97029b5254bf1b08e44f74c714d65c1cb5fc21b6a0e0bdcedff2cc539ed2
diff --git a/dev-python/hypothesis/hypothesis-6.35.1.ebuild b/dev-python/hypothesis/hypothesis-6.35.1.ebuild
deleted file mode 100644
index e0faf6724a6e..000000000000
--- a/dev-python/hypothesis/hypothesis-6.35.1.ebuild
+++ /dev/null
@@ -1,65 +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 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{8..9})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{8..9}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
-
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.36.1.ebuild b/dev-python/hypothesis/hypothesis-6.36.1.ebuild
deleted file mode 100644
index 5eb94ce96458..000000000000
--- a/dev-python/hypothesis/hypothesis-6.36.1.ebuild
+++ /dev/null
@@ -1,65 +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 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
-
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.36.2.ebuild b/dev-python/hypothesis/hypothesis-6.36.2.ebuild
deleted file mode 100644
index 5eb94ce96458..000000000000
--- a/dev-python/hypothesis/hypothesis-6.36.2.ebuild
+++ /dev/null
@@ -1,65 +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 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
-
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.37.0.ebuild b/dev-python/hypothesis/hypothesis-6.37.0.ebuild
deleted file mode 100644
index 5eb94ce96458..000000000000
--- a/dev-python/hypothesis/hypothesis-6.37.0.ebuild
+++ /dev/null
@@ -1,65 +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 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
-
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.37.1.ebuild b/dev-python/hypothesis/hypothesis-6.37.1.ebuild
deleted file mode 100644
index 5eb94ce96458..000000000000
--- a/dev-python/hypothesis/hypothesis-6.37.1.ebuild
+++ /dev/null
@@ -1,65 +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 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
-
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.37.2.ebuild b/dev-python/hypothesis/hypothesis-6.37.2.ebuild
deleted file mode 100644
index 5eb94ce96458..000000000000
--- a/dev-python/hypothesis/hypothesis-6.37.2.ebuild
+++ /dev/null
@@ -1,65 +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 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
-
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 9984d5e3ebef..86f9c2d7a6c6 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,5 +1,2 @@
-DIST importlib_metadata-4.10.1.tar.gz 42013 BLAKE2B 056a8e16cacc961bef5168c903f5143a764eeee028f576da964fa4b1462ecb98b5baa1b59653cf15a49b0f8d8c31cc9993c16c89d04d188cb1a99d3943ac4ec4 SHA512 96ceb9286145e2933ca3a1724fde4519819c27a1dc0947ef8e0c399a4cc2026875e673ab352f08bb4dd6aa10d78d8c9773a6fb0138e3065961df7e850ff37757
-DIST importlib_metadata-4.11.0.tar.gz 42170 BLAKE2B b1f0a887c3b62981b3312a06b0ebb0bc8e03313f6b1cfb58f59ef934f15aeb5247cf58befba7551f3485bd7162ed8a3c90633a88445a03257aeb9c15a101c08a SHA512 d959fdbf947c034fcac921677041a9f765a09b9b63566f83680f4fe68260d09278f5a3fe443ce0c63a8e561f9cc6e0b48721e75c065af3c89a91cdffe6d2d451
-DIST importlib_metadata-4.11.1.tar.gz 42224 BLAKE2B 7d376d0bfaf3304ea8412559bcbafd2a92ee88a045432a1245b5127ac1766c2842374f4e05e140e95f0e7e73072cdfe6fba6b140c656470f1c24aae8500b662f SHA512 1f7a5469b378b9f3080ae893637eb5aa778267250c50c8a56786d912ef8cd2f737cc580686f7ce37351505728493ac5feb243823ec37b7afc978746e7dc70cef
 DIST importlib_metadata-4.11.2.tar.gz 43293 BLAKE2B ea515da66eed404d7d6bdf09fc3ade31c34a48656a6e37219c2d86eed3004ef2c82dc80f916de54b45e4b462a3b142d40b8e2ee959614e9be011844ba12eb3fc SHA512 114a8078b15905a898d63934f208d6409ec043cd5ac35f9455f532956fb7e5262df26aadcd8618ca8b2baf69333147a15d456fdb0d8e50163aecedfccb6003d9
 DIST importlib_metadata-4.11.3.tar.gz 43607 BLAKE2B 661f8ce68869540995dbee39c6be07d7b88e8339267d4d49744691f2347ab2bcc9ac33c4cafd6caed5fa9ce3d4a3640a816e4659eee9a59b5ccc1df2edd2f6aa SHA512 d33efa2abba5f6f770615f133c940a61948ce5091d59526ee2c7e3866aebd74d79ac464f72602404c2b56fe284a93a9cd1b0cac251ceea53666019485bdddf23
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.10.1-r1.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.10.1-r1.ebuild
deleted file mode 100644
index 08be08f09658..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-4.10.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-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"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' pypy3 python3_8)
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "importlib_metadata"
-		version = "${PV}"
-		description = "Read metadata from Python packages"
-	EOF
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.10.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.10.1.ebuild
deleted file mode 100644
index 746fdead658f..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-4.10.1.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
-
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' pypy3 python3_8)
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.11.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.11.0.ebuild
deleted file mode 100644
index b17d4dd46f2c..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-4.11.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-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"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' 3.8)
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "importlib_metadata"
-		version = "${PV}"
-		description = "Read metadata from Python packages"
-	EOF
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.11.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.11.1.ebuild
deleted file mode 100644
index b17d4dd46f2c..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-4.11.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-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"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' 3.8)
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "importlib_metadata"
-		version = "${PV}"
-		description = "Read metadata from Python packages"
-	EOF
-}
diff --git a/dev-python/incremental/incremental-21.3.0.ebuild b/dev-python/incremental/incremental-21.3.0.ebuild
deleted file mode 100644
index 81301ea75fa3..000000000000
--- a/dev-python/incremental/incremental-21.3.0.ebuild
+++ /dev/null
@@ -1,31 +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 )
-# TODO: revert to rdepend once this has been merged:
-# https://github.com/twisted/incremental/pull/59
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Incremental is a small library that versions your Python projects"
-HOMEPAGE="https://github.com/twisted/incremental https://pypi.org/project/incremental/"
-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 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/twisted[${PYTHON_USEDEP}] )"
-
-python_test() {
-	distutils_install_for_testing
-	trial incremental || die "Tests failed on ${EPYTHON}"
-}
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 243ca8b3461a..0a4f54d3c142 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,2 +1 @@
-DIST inflect-5.3.0.tar.gz 74127 BLAKE2B 20c591012a5a6692c3da3a39f4aeaaae290da5ba723af5c9ac90f7d28112a1894acf082633f8f673f6d903f756b9bb70c6c3366762e872cf7ca6c6d5edf1c99c SHA512 f5baf65fb7a6ba59c91a36a17acb0abda3efc74fef56b3a3d99c100b2c6e94c5aafb08ab37310ce410631ac928e9c24a4a4c5e6b5c7d8f907c3d999f4a70cce4
 DIST inflect-5.4.0.tar.gz 68594 BLAKE2B 60898e019c04b9d86a1591c341f48e7e3093eaa4f93bb4f902f4d405f1151d705f902b792028ca97a85ed47ffe509bab758b3ec74878ec82f5dac3c953197ca0 SHA512 48b7d38faf41b3f682226b66ea5493b7d4ff58a8db52c9b90092fc329aee761b090791deeda24234b9f9fa47d8db9b499e1f4304367ef3637c441959e8b8d005
diff --git a/dev-python/inflect/inflect-5.3.0.ebuild b/dev-python/inflect/inflect-5.3.0.ebuild
deleted file mode 100644
index 19c6c929325a..000000000000
--- a/dev-python/inflect/inflect-5.3.0.ebuild
+++ /dev/null
@@ -1,24 +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="Correctly inflect words and numbers"
-HOMEPAGE="https://github.com/jaraco/inflect"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-8.2' \
-	'>=dev-python/rst-linker-1.9' dev-python/alabaster
-distutils_enable_tests pytest
diff --git a/dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild b/dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild
deleted file mode 100644
index ec3cce54bcb4..000000000000
--- a/dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,25 +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="Python IP address manipulation library"
-HOMEPAGE="https://github.com/google/ipaddr-py https://pypi.org/project/ipaddr/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86"
-
-python_prepare() {
-	2to3 -n -w --no-diffs *.py || die
-}
-
-python_test() {
-	distutils_install_for_testing
-	"${EPYTHON}" ipaddr_test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/ipy/ipy-1.01.ebuild b/dev-python/ipy/ipy-1.01.ebuild
deleted file mode 100644
index 53e016824f39..000000000000
--- a/dev-python/ipy/ipy-1.01.ebuild
+++ /dev/null
@@ -1,41 +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
-
-MY_PN="IPy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Class and tools for handling of IPv4 and IPv6 addresses and networks"
-HOMEPAGE="https://github.com/autocracy/python-ipy/wiki https://pypi.org/project/IPy/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="examples"
-
-python_test() {
-	# 1 test fail under pypy, persistent from 0.82a, not a regression.
-	cp -r test_doc.py README.rst test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" > /dev/null || die
-	"${PYTHON}" test/test_IPy.py || die "Tests fail with ${EPYTHON}"
-	"${PYTHON}" test_doc.py || die "Doctests fail with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild b/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild
deleted file mode 100644
index 4408406734ea..000000000000
--- a/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild
+++ /dev/null
@@ -1,22 +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="Vestigial utilities from IPython"
-HOMEPAGE="https://github.com/ipython/ipython_genutils"
-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"
-
-# Needed because package provides decorators which use nose
-RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
-
-distutils_enable_tests nose
diff --git a/dev-python/isort/isort-5.10.1.ebuild b/dev-python/isort/isort-5.10.1.ebuild
deleted file mode 100644
index f8d6cbe4fe82..000000000000
--- a/dev-python/isort/isort-5.10.1.ebuild
+++ /dev/null
@@ -1,61 +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} )
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="https://pypi.org/project/isort/"
-SRC_URI="
-	https://github.com/PyCQA/isort/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"
-
-RDEPEND="
-	dev-python/toml[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/black[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/natsort[${PYTHON_USEDEP}]
-		dev-python/pylama[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unbundle toml
-	sed -i -e 's:from ._vendored ::' isort/settings.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Some tests run the "isort" command
-	distutils_install_for_testing
-	# Install necessary plugins
-	local p
-	for p in example*/; do
-		pushd "${p}" >/dev/null || die
-		distutils_install_for_testing
-		popd >/dev/null || die
-	done
-	# remove examples leaked into BUILD_DIR
-	rm "${BUILD_DIR}"/lib/example* || die
-
-	local EPYTEST_IGNORE=(
-		# Excluded from upstream's test script
-		tests/unit/test_deprecated_finders.py
-	)
-	epytest tests/unit
-}
diff --git a/dev-python/jaraco-itertools/Manifest b/dev-python/jaraco-itertools/Manifest
index 0c878f175910..7b0b77ea1a5a 100644
--- a/dev-python/jaraco-itertools/Manifest
+++ b/dev-python/jaraco-itertools/Manifest
@@ -1,2 +1 @@
-DIST jaraco.itertools-6.0.3.tar.gz 16383 BLAKE2B aaa70b40baae4fdba617ecded0376c557a7f227cb52d79e982c06ec125c70056a6773b0c974eca16f12eb1d358bbc190d4f43819374e353836ea2a0dac373367 SHA512 5ceb11c6a5f1c88fa6191f1153b5450614d9fc87ae08acbe4a417d8bf6089f5dae747b1cee95a29763ffc595c291ab02198cf94b48eca34ce766735c6dc44e30
 DIST jaraco.itertools-6.2.1.tar.gz 16813 BLAKE2B 7bf4b3818bcf66ad49643aaa1c606953d8d920c970fa4a4159796c042a1d5b77e53240e8a260b24b337cd65398758d2392fe2a5f73cf784aeeac9b4d0a128181 SHA512 7b4c27143848d899472a9ce207819062719adbef2cf038754c9236fee7da39f62238b85f8d83bdc41bf5a37e8d102e79dd4afbc6efa46c2d7c7ca04c032c67d3
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-6.0.3-r1.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-6.0.3-r1.ebuild
deleted file mode 100644
index fc7b0442d79c..000000000000
--- a/dev-python/jaraco-itertools/jaraco-itertools-6.0.3-r1.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} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Tools for working with iterables. Complements itertools and more_itertools"
-HOMEPAGE="https://github.com/jaraco/jaraco.itertools"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/inflect[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
-	'>=dev-python/rst-linker-1.9'
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	# create a pkgutil-style __init__.py in order to fix pytest's
-	# determination of package paths
-	cat > jaraco/__init__.py <<-EOF || die
-		__path__ = __import__('pkgutil').extend_path(__path__, __name__)
-	EOF
-	epytest --doctest-modules
-}
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-6.0.3.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-6.0.3.ebuild
deleted file mode 100644
index 428bda0b109b..000000000000
--- a/dev-python/jaraco-itertools/jaraco-itertools-6.0.3.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
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Tools for working with iterables. Complements itertools and more_itertools"
-HOMEPAGE="https://github.com/jaraco/jaraco.itertools"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/inflect[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
-	'>=dev-python/rst-linker-1.9'
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	# create a pkgutil-style __init__.py in order to fix pytest's
-	# determination of package paths
-	cat > jaraco/__init__.py <<-EOF || die
-		__path__ = __import__('pkgutil').extend_path(__path__, __name__)
-	EOF
-	epytest --doctest-modules
-	rm jaraco/__init__.py || die
-}
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index 3cf5fe4c1228..bbad7ff03381 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -1,2 +1 @@
-DIST jaraco.packaging-8.2.1.tar.gz 15393 BLAKE2B 8e30dcbb6c5dacf55fc62041e14c18ec852e39761ff5e00202bde89f6224eda8fbc090272d9470129be6014d8777b134908280dde10a0fce712b29167b122bb5 SHA512 3235756833bb4b0aff8dc832adb6e269bda622c5458493a302c6d487547ce224865aa367773f42bd456553c69cf451944d9b50d148761a40a775f59a398ec02c
 DIST jaraco.packaging-9.0.0.tar.gz 7917 BLAKE2B a975f1a4a024df8ec2ed56cd10cd574fa9bf1fd121b1d05fb71a72a944a07883539bb75d82894329cf2e845e996cf930a9010ca26952adff131bc9b3f51cfe60 SHA512 5968418251eeb7fa0f5657e8b8b4ead40f7f2b28fbaa8dc331a3bb0518d32b45646b85521e941e7c483ef8861d9a9cd47c45126cfdf2da708bd8f3b3514b47da
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-8.2.1-r1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-8.2.1-r1.ebuild
deleted file mode 100644
index b7358b954ec1..000000000000
--- a/dev-python/jaraco-packaging/jaraco-packaging-8.2.1-r1.ebuild
+++ /dev/null
@@ -1,39 +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
-
-MY_P=${P/-/.}
-DESCRIPTION="Tools to supplement packaging Python releases"
-HOMEPAGE="https://github.com/jaraco/jaraco.packaging"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs '>=dev-python/rst-linker-1.9'
-distutils_enable_tests pytest
-
-src_test() {
-	# create a pkgutil-style __init__.py in order to fix pytest's
-	# determination of package paths
-	# https://bugs.gentoo.org/832713
-	cat > jaraco/__init__.py <<-EOF || die
-		__path__ = __import__('pkgutil').extend_path(__path__, __name__)
-	EOF
-	distutils-r1_src_test
-}
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-8.2.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-8.2.1.ebuild
deleted file mode 100644
index 7afc54dd75a5..000000000000
--- a/dev-python/jaraco-packaging/jaraco-packaging-8.2.1.ebuild
+++ /dev/null
@@ -1,37 +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 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Tools to supplement packaging Python releases"
-HOMEPAGE="https://github.com/jaraco/jaraco.packaging"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs '>=dev-python/rst-linker-1.9'
-distutils_enable_tests pytest
-
-src_test() {
-	# create a pkgutil-style __init__.py in order to fix pytest's
-	# determination of package paths
-	# https://bugs.gentoo.org/832713
-	cat > jaraco/__init__.py <<-EOF || die
-		__path__ = __import__('pkgutil').extend_path(__path__, __name__)
-	EOF
-	distutils-r1_src_test
-	rm jaraco/__init__.py || die
-}
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index 3f6b633029d9..132762d5f718 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -1,3 +1,2 @@
 DIST jeepney-0.6.0.tar.gz 49513 BLAKE2B e5f9b5104cf07dbcd2d40c2d22b690dfd56c456ab56daf44f4abee83f0bfe7e1dfbad797348044d51e3dc20fbc6ce68bf8df54f9c1e46d7a86ceb22d3ab30f8d SHA512 140be9dd28ed853d2d41b6a8bbeb2f22c0270ce7bf33b943ec2ac010db17d4f06e253fa8637fbbb3044fe9ffdbfa1e15f0c663eb44bdd538f8c47c2e7dab3ca5
-DIST jeepney-0.7.0.tar.gz 61236 BLAKE2B ec477ed0d96d7d82a256c7f62900eff0282ebec4545e30807fd62cffb419ed763fd8042bdd4d72c6cf43ac09d24af9cd86797b1baec61ad5965e51b3d669175d SHA512 b1fac480da0d8798b28eae30cb22ee97d4f73a11922f7b1bce86eebf938c2980414c2d026ef5a1cdcd95813724873700d348b04ba337aaac0706b2c8b38ea6c2
 DIST jeepney-0.7.1.tar.gz 61833 BLAKE2B 626d4c921d0548ea898197ac5459f20b4c73fd52d3579c5b74f257158c82803011655c1d418d7d10afe8ba803100530bc08dbcce41e12727888de5be5995adb3 SHA512 f0af5a18a669f1a6322925201cad83ee01bc5a1b91577565042fd8a18b506a3650ff67b0ba333c8fb3b179f43ef243d16b07a9a1f7a7e5baec825dda0e6b0571
diff --git a/dev-python/jeepney/jeepney-0.7.0.ebuild b/dev-python/jeepney/jeepney-0.7.0.ebuild
deleted file mode 100644
index 2216f1f49a17..000000000000
--- a/dev-python/jeepney/jeepney-0.7.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 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="Low-level, pure Python DBus protocol wrapper"
-HOMEPAGE="https://gitlab.com/takluyver/jeepney"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-		sys-apps/dbus
-		$(python_gen_cond_dep '
-			dev-python/pytest-trio[${PYTHON_USEDEP}]
-			dev-python/trio[${PYTHON_USEDEP}]
-		' python3_{8..9})
-	)
-"
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-
-python_test() {
-	local ignore=()
-	# keep in sync with python_gen_cond_dep!
-	if ! has "${EPYTHON}" python3.{8..9}; then
-		ignore+=( jeepney/io/tests/test_trio.py )
-	fi
-
-	dbus-run-session pytest -vv -ra -l ${ignore[@]/#/--ignore } ||
-		die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jeepney/jeepney-0.7.1.ebuild b/dev-python/jeepney/jeepney-0.7.1.ebuild
deleted file mode 100644
index 100be07796aa..000000000000
--- a/dev-python/jeepney/jeepney-0.7.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 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="Low-level, pure Python DBus protocol wrapper"
-HOMEPAGE="https://gitlab.com/takluyver/jeepney"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="examples"
-
-BDEPEND="
-	test? (
-		dev-python/async_timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-		sys-apps/dbus
-		$(python_gen_cond_dep '
-			dev-python/pytest-trio[${PYTHON_USEDEP}]
-			dev-python/trio[${PYTHON_USEDEP}]
-		' python3_{8..9})
-	)
-"
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-
-python_test() {
-	local ignore=()
-	# keep in sync with python_gen_cond_dep!
-	if ! has "${EPYTHON}" python3.{8..9}; then
-		ignore+=( jeepney/io/tests/test_trio.py )
-	fi
-
-	dbus-run-session pytest -vv -ra -l ${ignore[@]/#/--ignore } ||
-		die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jsondiff/Manifest b/dev-python/jsondiff/Manifest
index 6b8c544f7e1f..2a8adda09ae7 100644
--- a/dev-python/jsondiff/Manifest
+++ b/dev-python/jsondiff/Manifest
@@ -1,2 +1 @@
-DIST jsondiff-1.3.0.tar.gz 15283 BLAKE2B 408070816a4b21a3f11f5b039464ba276fb253f712f29930454167d3aff22f78b4d828aba5e28cf05587c8a296b908fd1945a65958244a1093279bff5e3a555c SHA512 512e34d1a0673ed785f066c284c09412a3590ad916913ae1885ac567795cc73e2adf30596b60b64b6b379954e6cb82d5174e80dd9cf40ed53f6968bec8a3d8f2
 DIST jsondiff-1.3.1.gh.tar.gz 15457 BLAKE2B f3896c85b601ac32859e59f2a5a29b51f124a1dd27fa2b0da40e44c4b776bbba933043fb7334e5ec20833eea25143d40cc7988a8308f56eff20510db982688b0 SHA512 cbbed17bf00f1757d81477e02435c3f5a9a3246774f3fd9a433be31de1617525acfe33d6790be33dcf9b5da5ef3d6910d13958fb7b8ea4fbd802c74485a9dc6f
diff --git a/dev-python/jsondiff/jsondiff-1.3.0.ebuild b/dev-python/jsondiff/jsondiff-1.3.0.ebuild
deleted file mode 100644
index f09af19f239b..000000000000
--- a/dev-python/jsondiff/jsondiff-1.3.0.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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Diff JSON and JSON-like structures in Python"
-HOMEPAGE="
-	https://github.com/xlwings/jsondiff/
-	https://pypi.org/project/jsondiff/"
-SRC_URI="
-	https://github.com/xlwings/${PN}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		dev-python/nose-random[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# Avoid file collision with jsonpatch's jsondiff cli.
-	sed -e "/'jsondiff=jsondiff.cli/ d" -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index a1400e3612e5..24fd7c25cf73 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,2 +1 @@
-DIST jsonpickle-2.0.0.tar.gz 110336 BLAKE2B 574dab58418c5225a9364836d04eaabf3384e9dab404d191846a4bb41e9c8bbb51243a6a231ec8baf05ff9be337e12b5c96c46b74a327e9f05653ca81bf6ccf2 SHA512 acba11e5dfce116b27edfe0fdccdd74755e299aa43f873dd1ce547d947b58f14c1059c21d04007b5be0857f7ce69fe5355fb2edc47a99cc2217fe00297ca78d3
 DIST jsonpickle-2.1.0.tar.gz 186799 BLAKE2B a9e82a046fc77e1a4d5e7b1f13fc34f07e0e42e34922258bb0bd5aa4557bfec2b5fc06e450a0391522ae27380306111001204eb4f5429c2ad1f908fc4dec40a0 SHA512 46e8bcc2e24616da43b87bf8371ec9b39de1e8e33380684c05b7d7c6695f17bcc21150848c3306d235f89c5d74c69b6fda79e93fc823665d72cc88d9d89d8484
diff --git a/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild b/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild
deleted file mode 100644
index da826e0b9b30..000000000000
--- a/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild
+++ /dev/null
@@ -1,61 +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} )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
-HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/ujson[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/feedparser[${PYTHON_USEDEP}]
-		' python3_{8,9})
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/jaraco-packaging \
-	dev-python/rst-linker
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e 's:--flake8 --black --cov::' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# unpackaged bson dependency
-		tests/bson_test.py
-		# broken when gmpy is installed
-		# https://github.com/jsonpickle/jsonpickle/issues/328
-		# https://github.com/jsonpickle/jsonpickle/issues/316
-		tests/ecdsa_test.py
-	)
-	# There is a problem with packaging feedparser with python 3.10, so skip
-	[[ ${EPYTHON} == python3_10 ]] && EPYTEST_IGNORE+=(
-		tests/feedparser_test.py
-	)
-	epytest
-}
-
-pkg_postinst() {
-	# Unpackaged optional backends: yajl, demjson
-	optfeature "encoding numpy-based data" dev-python/numpy
-	optfeature "encoding pandas objects" dev-python/pandas
-	optfeature "fast JSON backend" dev-python/simplejson
-}
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index 958a4e4a34d8..d717816c7219 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1 +1,2 @@
+DIST kiwi-1.4.0.tar.gz 92361 BLAKE2B 773da71557d4c9fcd7778fa1771a1c52d0ca6aa4d698a33467a5a3fac8fd4bd3135aec9e836c96c4c18b2873e17743ce5cbc79c5dd1ea189f28adadcf2030e51 SHA512 6f69e232d5620be5f316d273066a1f8a78ebbef2dd8ee1ba56a2a57581fcc0c985fb0a51e6cca8436bcfeb51c4a95a865cde408c497bdec9c7e025f030744f54
 DIST kiwisolver-1.3.2.tar.gz 89075 BLAKE2B 729880e3b18ac8c6c3e48d2fb32f00b4232118eb753f60837c7736c75a0f22e7a259aec46b76bc91286541847929eb4a92fcf9991650dea16d263f4d16beffc1 SHA512 e9ef20756df587b49f7b8e52ff388db6e2e551548ae7d60b6916586fb35249b10bda895a7be7635b300e6100ec1c7daf7d641de6d26d9b2c36055ac6c176302b
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.0.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.0.ebuild
new file mode 100644
index 000000000000..c5e9bb1bd33f
--- /dev/null
+++ b/dev-python/kiwisolver/kiwisolver-1.4.0.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} )
+
+inherit distutils-r1
+
+MY_P=kiwi-${PV}
+DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
+HOMEPAGE="https://github.com/nucleic/kiwi/"
+SRC_URI="
+	https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${MY_P}.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Clear-BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-3.4.3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/libcloud/Manifest b/dev-python/libcloud/Manifest
index 5b490a88d3fa..5efb0c8bd662 100644
--- a/dev-python/libcloud/Manifest
+++ b/dev-python/libcloud/Manifest
@@ -1,2 +1 @@
-DIST apache-libcloud-3.3.0.tar.bz2 1811722 BLAKE2B bfdacdda6bb39b3782915d71db6d736caa8a1d57c5120dac9020a1c4923ab08bf8983916fcac15723139b073858efdf178aa797dd592d7534a0b6ff35f8fc5ae SHA512 286ddd79b14633ceb59e1a4b015760a1e525b0282f3039f16c2fa4de940005da5fbde1b8262027103ca91c9653baed22d61dd136ddcc2b6886687ad8b27f3ea8
 DIST apache-libcloud-3.4.1.tar.bz2 1851322 BLAKE2B f141b85423babc41c4dc61f4ef27228da10f2d6d7c9a0dfff0a292cc226a36a7626f8398a8e04202417955720ea5eb0b48736b704cc1379ab05a2bc4e3e0c86e SHA512 72a745a689229901277b347a45e86c6b66836b490d177bfa078062f54d28a149da158b8224b7c8ad6c278de18ed87b2d22bcc119f2577159ef5ecc3fa1ec621f
diff --git a/dev-python/libcloud/libcloud-3.3.0.ebuild b/dev-python/libcloud/libcloud-3.3.0.ebuild
deleted file mode 100644
index ed1162726538..000000000000
--- a/dev-python/libcloud/libcloud-3.3.0.ebuild
+++ /dev/null
@@ -1,55 +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="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Unified Interface to the Cloud - python support libs"
-HOMEPAGE="https://libcloud.apache.org/"
-SRC_URI="mirror://apache/${PN}/apache-${P}.tar.bz2"
-S="${WORKDIR}/apache-${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/cryptography-2.6.1[${PYTHON_USEDEP}]
-		dev-python/lockfile[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	if use examples; then
-		mkdir examples || die
-		mv example_*.py examples || die
-	fi
-
-	# needed for tests
-	cp libcloud/test/secrets.py-dist libcloud/test/secrets.py || die
-
-	# Needs network access
-	sed -i -e "s/test_list_nodes_invalid_region(self):/_&/" \
-		libcloud/test/compute/test_ovh.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libcloud/libcloud-3.4.1.ebuild b/dev-python/libcloud/libcloud-3.4.1.ebuild
index af27690888e3..d7f772f4c49d 100644
--- a/dev-python/libcloud/libcloud-3.4.1.ebuild
+++ b/dev-python/libcloud/libcloud-3.4.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/apache-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index 00fb9a4144dc..df8f1c83392c 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -1,4 +1,3 @@
-DIST libtmux-v0.10.1.tar.gz 220592 BLAKE2B 56028bca4e6a8df788d9fc9a112731fbf17f3617410d0632ac9d3f000ca130d2f4b21c377611e1ef95bcf493fa14f885cbcd7aa986d9c1b89d2b972fb4173f78 SHA512 67ed162546a3dc5aa51e91ac03f015532d67847b0400766b442691a39a1a751c59a6b37811f6422ed713fca6a071767a8e13694b2722489d2e56cda711010228
 DIST libtmux-v0.10.3.tar.gz 225258 BLAKE2B 40d591ee1f8a6068947b61416d6247b2475cc99031a67c167dc527631e50075f18c46fe6fc16193867d83a1a735b0a23fbfbc77f4539f788f05375f1f68b77d2 SHA512 2c8f28ce8c313404caffa42e5fd4a1dfa5d48bdc48203f8db595cb97b44886d63608771f23d62d76a56513b7e4578e48a31cacd224eca92425f110efd0a5db69
 DIST libtmux-v0.8.5.tar.gz 222445 BLAKE2B 5af148555eb89c66bdc66f3f214967f7e901d9b86ea85e02a9fba64f2eb3559828519ba8120eaee5eb86ec75bee2e599a08384dd096de8dc0969129c58172c1e SHA512 d456725c3ca41a672ee5239bfb5f42a262674638d308fa141627995be8b8fe348bb8713b735eb05c5a3cc73f35fe3f6fac12024f6254c950a3048b2e07606363
 DIST libtmux-v0.9.0.tar.gz 215649 BLAKE2B fdf6f424ce8eead5f0f19cb53bfd438e9cd7b5326e57e676281f74cedac6e1bcd7cded27e4ef226d2fc3bc09bbb57ff0e63aaa7d901ab910b6a890275c7fe63d SHA512 d47078300614b2a286eab6063c9492baa115787b917d2fb2e4188032ce580f495f0e7f4a14383407c61063a77d640092d117ba43974524f18da024dfc687c8a5
diff --git a/dev-python/libtmux/libtmux-0.10.1.ebuild b/dev-python/libtmux/libtmux-0.10.1.ebuild
deleted file mode 100644
index 0ee9b96a28a0..000000000000
--- a/dev-python/libtmux/libtmux-0.10.1.ebuild
+++ /dev/null
@@ -1,38 +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="python api for tmux"
-HOMEPAGE="https://libtmux.git-pull.com/"
-SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND=">=app-misc/tmux-3.0a"
-BDEPEND="
-	test? (
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/twine[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/libtmux-0.10.0-more-specific-ids.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local issues="https://github.com/tmux-python/libtmux/issues/"
-	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
-	rm requirements/doc.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/license-expression/Manifest b/dev-python/license-expression/Manifest
new file mode 100644
index 000000000000..24ba1af8ede5
--- /dev/null
+++ b/dev-python/license-expression/Manifest
@@ -0,0 +1 @@
+DIST license-expression-21.6.14.gh.tar.gz 107788 BLAKE2B 18e123be256df2de289b00f292782fd5010333f692ba56caea448bf9a5102d2a11868a3c85787b5cd8129a9d3f9728e0776fa7658d00efe79c124a40f2263683 SHA512 12c4333a53f30c73f123434c9e50ee50163a3bad5831e756cc1350c14daa062b939e8382f4bcf2fef11020f8bec5185f71302f3c68ae88cd59b8da9a5f2964f4
diff --git a/dev-python/license-expression/license-expression-21.6.14.ebuild b/dev-python/license-expression/license-expression-21.6.14.ebuild
new file mode 100644
index 000000000000..4cf111a20b7c
--- /dev/null
+++ b/dev-python/license-expression/license-expression-21.6.14.ebuild
@@ -0,0 +1,33 @@
+# Copyright 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="Parse, compare, simplify and normalize license expressions"
+HOMEPAGE="
+	https://pypi.org/project/license-expression/
+	https://github.com/nexB/license-expression/
+"
+SRC_URI="
+	https://github.com/nexB/license-expression/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	<dev-python/boolean-py-4.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/license-expression/metadata.xml b/dev-python/license-expression/metadata.xml
new file mode 100644
index 000000000000..c0b25ca4463f
--- /dev/null
+++ b/dev-python/license-expression/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">license-expression</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/logutils/logutils-0.3.5.ebuild b/dev-python/logutils/logutils-0.3.5.ebuild
deleted file mode 100644
index e5c12742aadf..000000000000
--- a/dev-python/logutils/logutils-0.3.5.ebuild
+++ /dev/null
@@ -1,19 +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="The logutils package provides a set of handlers for the Python standard"
-HOMEPAGE="https://bitbucket.org/vinay.sajip/logutils"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index 19363a6d6532..e1f51ad90193 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1 +1,2 @@
 DIST Mako-1.1.6.tar.gz 495132 BLAKE2B bbdf0db9303f5d369b5c6c6644ee44d767630f51305ae259c44c65a3fba959a07d9833fdc69fc8168f7424cc0c3a05e991daae239bef8392c01396c1295967c7 SHA512 e87d883d7a549a902bb2e16d20306ccd3dd7b3bf855dfdaff20477dd182a782a5cecbdc447e4b1607f190a7b0febcca001333137f7cac6ffa674824c2a2fd1bb
+DIST Mako-1.2.0.tar.gz 488603 BLAKE2B 30ef597e2dd500d52d02118e0ec8a40cfeeff00604eb9fec887df4aff794aed7d6a1d78b2defb6f985947f9429d912a083b9941ee30b1e53ef32890d19e94158 SHA512 ad608016d7785a735a28ea18f697be4882da747e3da32e4a7c7be4bf846d37e4d3374d78e62ef85607ae9f3f73ee35dc78b473347e4110c059a504be2c497c6e
diff --git a/dev-python/mako/mako-1.2.0.ebuild b/dev-python/mako/mako-1.2.0.ebuild
new file mode 100644
index 000000000000..6cac5693efba
--- /dev/null
+++ b/dev-python/mako/mako-1.2.0.ebuild
@@ -0,0 +1,46 @@
+# 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
+
+MY_P=${P^}
+DESCRIPTION="A Python templating language"
+HOMEPAGE="https://www.makotemplates.org/ https://pypi.org/project/Mako/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/test_exceptions.py::ExceptionsTest::test_alternating_file_names
+	)
+	local EPYTEST_IGNORE=(
+		# lingua is not packaged in Gentoo and the skip is currently broken
+		# https://github.com/sqlalchemy/mako/pull/357
+		test/ext/test_linguaplugin.py
+	)
+	epytest
+}
+
+python_install_all() {
+	rm -r doc/build || die
+
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/markupsafe/Manifest b/dev-python/markupsafe/Manifest
index 098a56ecfabc..db4aa1bba9a4 100644
--- a/dev-python/markupsafe/Manifest
+++ b/dev-python/markupsafe/Manifest
@@ -1,3 +1,4 @@
 DIST MarkupSafe-1.1.1.tar.gz 19151 BLAKE2B 184ab0bc42f8d254ef4239f700f019c0a380bdf2117dfe1abe2eb4dfa0f037158d181a120d8654a6971e9c8badb078f997e3a8bf231898e0f4bb3e8496d9abd3 SHA512 f3014e6131a3ab866914c5635b5397ef71906bffb1b6f8c5f2ed2acf167429ff7914236d38943e872683a57a9be9669f4c5aace6274f3307ab21ef25373db0b6
 DIST MarkupSafe-2.0.1.tar.gz 18596 BLAKE2B 3f6d576733a0033ca46df5e92892c1f052c1b0c03a92f27926383279f81531981139e5a659a7d21d436643795706480dd9e6aa979f70a81a2b95f2b9d0ac9f8c SHA512 77249bda784111ece15d59eb3de1cbb37a58fb9f22902fe6b73fea9eb0f23857ccbe53dc55463278e3b91f78dc35e2b027fd823ca50d88d8985d5a98ce2327f1
 DIST MarkupSafe-2.1.0.tar.gz 18546 BLAKE2B b6279b4ff3ad4c2ee33ee303c8d8c5213488b87297314e99547ebccfcac5897a3893814fb8cff46a5ae098552f9510351b4076497e3b299c1bba686cee32dcf4 SHA512 2a340f4f4cc7de0638cc32bf04f0daa8a0db579ebe7b514b296498c5c05ea0e36e164bfcce929a92bea9051e8211b6683602431dac1aaf490bc0e279dee520a6
+DIST MarkupSafe-2.1.1.tar.gz 18668 BLAKE2B c15bddc89bec9a6558b797b825314d9db3ac03978c44aed42d98ab534613e5bffa2eb0ffe500ff675e78491e3f6039981c468711bdf398ff56277b2bd93932c4 SHA512 1d9bf55614b4e0aeca726ebda7bab2829452212f03f2295efdd0340f3dd05eefc9733d6dd0e37f0d06a432ce00ed7d06b28c9e817fc25212675006577f468b3e
diff --git a/dev-python/markupsafe/markupsafe-2.1.1.ebuild b/dev-python/markupsafe/markupsafe-2.1.1.ebuild
new file mode 100644
index 000000000000..4b24269ea6e5
--- /dev/null
+++ b/dev-python/markupsafe/markupsafe-2.1.1.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} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="MarkupSafe"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
+HOMEPAGE="https://pypi.org/project/MarkupSafe/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+
+distutils_enable_tests pytest
diff --git a/dev-python/minidb/Manifest b/dev-python/minidb/Manifest
index ec0240127fc0..6dd535753525 100644
--- a/dev-python/minidb/Manifest
+++ b/dev-python/minidb/Manifest
@@ -1,2 +1 @@
-DIST minidb-2.0.5.tar.gz 11957 BLAKE2B 31b500e420f256988ddaff7271b143f628aea5ebf0abe77125d9ce5143dca3d3d3fb1061c39d325d5df564514b786d751dec90d82fc3310c0f76daf1b4683d02 SHA512 889e678a99c7a5dff5ae7ae2c3540e978f09616384450934f2f16797a3a06c9d863b57eced4b2cde0a4bdfa4923b754e473bde0905c86d948d3bdb81a8e6dbad
 DIST minidb-2.0.6.tar.gz 12019 BLAKE2B 00e070d1cbe1966d44228f6ad13b9280ee8d79b1b37a72d685dc53b05d329e6ee02f77a7cac729e6c4e651d66d88d1fcd7be7f704e91b3ef2dddd8c928bfed50 SHA512 17c845d5bd45a99020a96a1e1aeaf2d7663f41dc23828b4ec00e49bebb066e021d751b9a1e1ee846973306198224f91543d20219beaa40b4d245cccc4f746b93
diff --git a/dev-python/minidb/minidb-2.0.5-r1.ebuild b/dev-python/minidb/minidb-2.0.5-r1.ebuild
deleted file mode 100644
index d481aca871b7..000000000000
--- a/dev-python/minidb/minidb-2.0.5-r1.ebuild
+++ /dev/null
@@ -1,20 +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="Simple SQLite-based object store"
-HOMEPAGE="https://thp.io/2010/minidb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/minidb/minidb-2.0.5.ebuild b/dev-python/minidb/minidb-2.0.5.ebuild
deleted file mode 100644
index 4b08772024a3..000000000000
--- a/dev-python/minidb/minidb-2.0.5.ebuild
+++ /dev/null
@@ -1,20 +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="sqlite"
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Simple SQLite-based object store"
-HOMEPAGE="https://thp.io/2010/minidb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 08870f0d3b15..6b5cb3ecac8e 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,5 +1,3 @@
-DIST mkdocs-material-8.1.8.gh.tar.gz 7942776 BLAKE2B 368f922f4b8b4723db36354697131a7055fcad4af0db015ef7e9c43b37431a8e7e64635241232b845bf73ab5a45a738f7741dc6d5e47d364c54be61df6a0a314 SHA512 9e3bc19d9c23b484c4c9dcd7f357efd151d351e1ab15be70a44607b4a6b59e367e93d3ccf4c31e5975cb41cb63939614cf26ca9ba6788abf000ad94b3a920b7b
-DIST mkdocs-material-8.1.9.gh.tar.gz 7969721 BLAKE2B 91c72e67baac0889077ed7b93afb697042f7b09a144e3cdb343cad88a7d7f55dafa01aa96d7fdc10b09b60213e849027bcb158dd4cb41d5f5443e43f43258628 SHA512 6a1e4284364215cb9f53a67c493b4e01e6449fa0970e8c93ca84a2bd585c631255599254bb215a281a1462dc9e6ea1db478a90647b32702e175c63a59f2b0d21
 DIST mkdocs-material-8.2.1.gh.tar.gz 8102602 BLAKE2B 04e8e3230d44376ace16a34d78a19c290a3c87013a2193983a60d8b8fa8bf456d407e11be250750135ad7cfe8633152e7c031c4b4e9a99093ac98885caacacca SHA512 2a79504d882360152bc130f5ee2903ed360685294e4f57ab5cb6fef6095fa6ca68da2c5d580837a30cc50e3c6f89d3b7a2ff1c62e768faa080e65d8220e43db7
 DIST mkdocs-material-8.2.2.gh.tar.gz 8217637 BLAKE2B 2186f8e5a57cd4331e916cad922c6f0f859674d3775ff80cbc4e455b23d2ad154e3b1a7044d8d8ee20148e236c8224a831d6cd58db7b005cbafa62f42ff15b48 SHA512 fe5aef449793ed0137a122f7b00e9700ff4e142fe24d23600ec113eff1c2e939da9548d5098187839ff2d56e562c641b2bf24d41ec9accb984c85ced36c21782
 DIST mkdocs-material-8.2.5.gh.tar.gz 8229554 BLAKE2B 7c41595b8fde073bcced12a0087b3b5303c141a27762d9c7c2698bd52ca31862c629a0562c1eab4f4dfabdc6730ce84557361c6f499c736e4ffbbe7e32a28d0a SHA512 1b648c1318071cd72d7f9721fa93d7546f0fadd515c2f0aa61673abb516c5efb3b694df33f2048af00a7ed9399c72bdbacd1966681d34ecf201494807a5a58b7
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.1.8.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.1.8.ebuild
deleted file mode 100644
index ad673167c1ba..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-8.1.8.ebuild
+++ /dev/null
@@ -1,35 +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} )
-DISTUTILS_USE_PEP517=setuptools
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material
-	https://pypi.org/project/mkdocs-material
-"
-SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.10[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-9.0[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.1.9.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.1.9.ebuild
deleted file mode 100644
index ce3f7b193b99..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-8.1.9.ebuild
+++ /dev/null
@@ -1,38 +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} )
-DISTUTILS_USE_PEP517=setuptools
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material
-	https://pypi.org/project/mkdocs-material
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.10[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-9.0[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.2.1.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.2.1.ebuild
index 23ac9d216aac..8024ce7531d4 100644
--- a/dev-python/mkdocs-material/mkdocs-material-8.2.1.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-8.2.1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
diff --git a/dev-python/mongomock/Manifest b/dev-python/mongomock/Manifest
index 7bd93c46a015..f997a7765a3e 100644
--- a/dev-python/mongomock/Manifest
+++ b/dev-python/mongomock/Manifest
@@ -1,2 +1 @@
-DIST mongomock-3.23.0.tar.gz 123705 BLAKE2B d58f867628c8c80e1289c1a86fa910585431b5eca41818201dccd54d5adccb55c35aea41566ab2d483c7040cfcaa4c2afdbaad39fdd901497a0e1db4effd1c11 SHA512 35442f29907bb58693059a33f5941ca557965fe2b0b9b68ab3e4b31f5e2326bb41db8716a089dd18a1a1fdd5523a729b48a85e0caa0daca1bad2790c2ac017a9
 DIST mongomock-4.0.0.tar.gz 145478 BLAKE2B fad07cd15f250f81dd483814d6a3c15e69a86f4ee9a27308a3a08961f11a38c1abfc3bfa0a36dd81e14c902946c9aefd6ac29a9dde95dbf3e5b0781e7f9c8aca SHA512 e489dd9f312762f0322dfcc34b85912b5e47fa838bd48561aab9c195f19002c8e5f3617a1cc45929e9476aede7733286b5f6246f54be7396c422da5920bd89d5
diff --git a/dev-python/mongomock/mongomock-3.23.0.ebuild b/dev-python/mongomock/mongomock-3.23.0.ebuild
deleted file mode 100644
index 7fae9452c6b5..000000000000
--- a/dev-python/mongomock/mongomock-3.23.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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to help testing Python code that interacts with MongoDB via Pymongo"
-HOMEPAGE="https://github.com/mongomock/mongomock https://pypi.org/project/mongomock/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND=">=dev-python/pbr-5.1.1[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	>=dev-python/pymongo-3.10.1[${PYTHON_USEDEP}]
-	>=dev-python/sentinels-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]"
-
-src_test() {
-	# Use NO_LOCAL_MONGO to disable tests that need a MongoDB instance.
-	# TZ=UTC needed for date/time tests to pass
-	TZ=UTC NO_LOCAL_MONGO=1 distutils-r1_src_test
-}
-
-distutils_enable_tests pytest
diff --git a/dev-python/mongomock/mongomock-4.0.0.ebuild b/dev-python/mongomock/mongomock-4.0.0.ebuild
index 3f491b07f351..63211a2786a9 100644
--- a/dev-python/mongomock/mongomock-4.0.0.ebuild
+++ b/dev-python/mongomock/mongomock-4.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND=">=dev-python/pbr-5.1.1[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index 643131f681e1..76642bd0fcf3 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,2 +1 @@
-DIST natsort-8.0.2.tar.gz 144912 BLAKE2B 0e5d83e6991ef1208b84cbf17e287f487a2a059d68274876977ae6f18f89492284bc166499a9518bfc2df19999e5593f386ce88beca94c23d8a050697c0b2a36 SHA512 fad31e1af1e1d4a33061b8b3e31d022f353f662d306136d05e0121a0531f33cf388467a40f91f51036f283ab8fbdefc1193d09f440052960ffdf733186b5fb27
 DIST natsort-8.1.0.tar.gz 145241 BLAKE2B dcf9ffdb58cfe4d0f7ca0ed74701c8137a87716831dc747c5fb68d187a93c1b7414fa3625c0ed385e727e97c36feb99e9ecc6a41dd3d9da342d357646b5aaf32 SHA512 a065899b124e6a6ee8560ce1882650e35f0c36ddfd3c56462820886b076cd8cdb0121825e30e298af576e07915cc5bc1e90fe3f0b1f7bfb89f816c00665baa22
diff --git a/dev-python/natsort/natsort-8.0.2.ebuild b/dev-python/natsort/natsort-8.0.2.ebuild
deleted file mode 100644
index 741d2664a7a6..000000000000
--- a/dev-python/natsort/natsort-8.0.2.ebuild
+++ /dev/null
@@ -1,27 +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} )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Natural sorting for Python"
-HOMEPAGE="https://pypi.org/project/natsort/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "sorting results that match most file browsers" "dev-python/pyicu"
-}
diff --git a/dev-python/natsort/natsort-8.1.0.ebuild b/dev-python/natsort/natsort-8.1.0.ebuild
index b4c9941d5110..673a03701edb 100644
--- a/dev-python/natsort/natsort-8.1.0.ebuild
+++ b/dev-python/natsort/natsort-8.1.0.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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/nltk/Manifest b/dev-python/nltk/Manifest
index 9c3afac3c2e8..ef1d47b1d343 100644
--- a/dev-python/nltk/Manifest
+++ b/dev-python/nltk/Manifest
@@ -1,2 +1 @@
-DIST nltk-3.6.7.tar.gz 2848416 BLAKE2B 8bc6672c17741c93da15b3c4ec9af484915ffd9fc857dbbfa94d949063c8e44c5f672e076b69213a033b7bec8e14baa099c69748eef4688fa09635de662f5037 SHA512 07f117835e1bf99d73a03f1279da0104a955e36f41c9648be19652481c58758900d5d2ff4633203254cee1e27c6cc129fe5d6e388de0711f2052e3e76a746edf
 DIST nltk-3.7.tar.gz 2851947 BLAKE2B 4cd4fed9f26de7996bcabbd71d500c072489e79ae0edb29f09577e465227c948efa7130af6975b029e77fb79db015437a9e3311eb28048d02dcc2356441d0908 SHA512 66d79afa59f18f2bf7d086dcb22813c7b92239c05669daa62866dbda06c0ca22367317749cf19db3e41a7bdb405d4f87f72b695aa58fd0669bf36de64f1f9888
diff --git a/dev-python/nltk/nltk-3.6.7.ebuild b/dev-python/nltk/nltk-3.6.7.ebuild
deleted file mode 100644
index be8cec7d56a9..000000000000
--- a/dev-python/nltk/nltk-3.6.7.ebuild
+++ /dev/null
@@ -1,61 +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} )
-PYTHON_REQ_USE="sqlite,tk?,xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Natural Language Toolkit"
-HOMEPAGE="https://www.nltk.org/ https://github.com/nltk/nltk/"
-SRC_URI="https://github.com/nltk/nltk/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="tk"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/joblib[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/joblib[${PYTHON_USEDEP}]
-		>=dev-python/nltk-data-20211221
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pyparsing[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/twython[${PYTHON_USEDEP}]
-		sci-libs/scikit-learn[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-	)"
-PDEPEND="dev-python/nltk-data"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Internet
-	unit/test_downloader.py::test_downloader_using_existing_parent_download_dir
-	unit/test_downloader.py::test_downloader_using_non_existing_parent_download_dir
-)
-
-src_prepare() {
-	# requires unpackaged pycrfsuite
-	sed -i -e '/>>>/s@$@ # doctest: +SKIP@' nltk/tag/crf.py || die
-	# replace fetching from network with duplicate file URL
-	sed -e 's@https://raw.githubusercontent.com/nltk/nltk/develop/nltk/test/toy.cfg@nltk:grammars/sample_grammars/toy.cfg@' \
-		-i nltk/test/data.doctest || die
-
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	cd nltk/test || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/nltk/nltk-3.7.ebuild b/dev-python/nltk/nltk-3.7.ebuild
index 5257e5bed0db..a9f4c384501f 100644
--- a/dev-python/nltk/nltk-3.7.ebuild
+++ b/dev-python/nltk/nltk-3.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/nltk/nltk/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="tk"
 
 RDEPEND="
diff --git a/dev-python/notify2/notify2-0.3.1-r2.ebuild b/dev-python/notify2/notify2-0.3.1-r2.ebuild
deleted file mode 100644
index 69ac9bbb6ec8..000000000000
--- a/dev-python/notify2/notify2-0.3.1-r2.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
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python interface to DBus notifications"
-HOMEPAGE="https://bitbucket.org/takluyver/pynotify2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="examples"
-
-RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
-BDEPEND="test? (
-	dev-python/pygobject[${PYTHON_USEDEP}]
-	sys-apps/dbus[X]
-	x11-libs/gdk-pixbuf[introspection]
-	virtual/notification-daemon
-)"
-
-distutils_enable_tests unittest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_install_all() {
-	if use examples; then
-		rm examples/notify2.py || die
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/notify2/notify2-0.3.1-r3.ebuild b/dev-python/notify2/notify2-0.3.1-r3.ebuild
index c949274bfb0e..e53031097c75 100644
--- a/dev-python/notify2/notify2-0.3.1-r3.ebuild
+++ b/dev-python/notify2/notify2-0.3.1-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="examples"
 
 RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
diff --git a/dev-python/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index ad77cba92360..c382e1540d3d 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -1,2 +1 @@
-DIST numpydoc-1.1.0.tar.gz 609482 BLAKE2B 475be835a760dd148b7132a3149a1b79193425b70bbaa51b29a3909c73ed11a933181c917a0f0d0b56d8d30baced2142897e0a931b5eeb6449092d0a2a81632b SHA512 10dfc5e40ca851401be7d7cca3cbf24bf8ded8573c01344976321cd65fe351d985ee0bf48a92a485a43f8fb191c246e4822545a1583c87c1214d819a5fdfc106
 DIST numpydoc-1.2.tar.gz 69659 BLAKE2B e5483ad3d6d82e9ff51d2d7cdc36c75407361059a696047f1d0fb7d3307c36ee056e8c0b9eb45fc11e4d341350c1b1dd021d60252055154c6907942e549b9555 SHA512 b8ea82a947c7fca9d02c2083f6040f2a1a115400e43257fd6ce7ac9b1b174d22ed7723053b87893d6bff8f47a625932297c884e853be4e00d3ae2262ad0161cf
diff --git a/dev-python/numpydoc/numpydoc-1.1.0.ebuild b/dev-python/numpydoc/numpydoc-1.1.0.ebuild
deleted file mode 100644
index 1f7aba91b774..000000000000
--- a/dev-python/numpydoc/numpydoc-1.1.0.ebuild
+++ /dev/null
@@ -1,43 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
-HOMEPAGE="https://pypi.org/project/numpydoc/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/matplotlib-3.2.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov-report= --cov=numpydoc::' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# these require Internet (intersphinx)
-		numpydoc/tests/test_full.py::test_MyClass
-		numpydoc/tests/test_full.py::test_my_function
-	)
-	epytest --pyargs numpydoc
-}
diff --git a/dev-python/numpydoc/numpydoc-1.2.ebuild b/dev-python/numpydoc/numpydoc-1.2.ebuild
index e161f9bb7a4d..80ae040b983e 100644
--- a/dev-python/numpydoc/numpydoc-1.2.ebuild
+++ b/dev-python/numpydoc/numpydoc-1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
diff --git a/dev-python/oauthlib/Manifest b/dev-python/oauthlib/Manifest
index c0ff31e615a7..2c92c9dd8b19 100644
--- a/dev-python/oauthlib/Manifest
+++ b/dev-python/oauthlib/Manifest
@@ -1,2 +1 @@
-DIST oauthlib-3.1.1.tar.gz 161395 BLAKE2B bc127841a16429364191a69777741135594366a5c99b32f063ce9bec4b6a3e9b7eb67515aee4da37f26cc2e8b2a2450fc708a21da7e4944861b9adbd9e112018 SHA512 1c18f265a6017a6f2bf77507f5de095b439be36f309316993b547ded0f306461b058dcb85dc245bf26f65a9c77be44ca38f9053f3300a9b5cb92332b61a7f307
 DIST oauthlib-3.2.0.tar.gz 163829 BLAKE2B cf14aeea253bc25f696bb638f364ff74d1a695a0f72dc8a77e2a5433e20672a5cf4a7b25f222940a08a5a26b503e671258ef26ee96e121fa016fbec3d6c5c874 SHA512 abb052cbaccb00a61e9a6c0028102927310d2d864d853cd0826c9a8eae8a9e921da33b79be554a3c6f6067cbcf43b25140f5224c8ab1e7f0a4eb6ab227d418a3
diff --git a/dev-python/oauthlib/oauthlib-3.1.1.ebuild b/dev-python/oauthlib/oauthlib-3.1.1.ebuild
deleted file mode 100644
index bc32ec52522b..000000000000
--- a/dev-python/oauthlib/oauthlib-3.1.1.ebuild
+++ /dev/null
@@ -1,29 +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="Spec-compliant and thorough implementation of the OAuth request-signing logic"
-HOMEPAGE="https://github.com/oauthlib/oauthlib https://pypi.org/project/oauthlib/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-# optional extras hard set as RDEPs. See setup.py
-RDEPEND="
-	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
diff --git a/dev-python/oauthlib/oauthlib-3.2.0.ebuild b/dev-python/oauthlib/oauthlib-3.2.0.ebuild
index 75a64f2fdb3a..c37fca87ef8e 100644
--- a/dev-python/oauthlib/oauthlib-3.2.0.ebuild
+++ b/dev-python/oauthlib/oauthlib-3.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 # optional extras hard set as RDEPs. See setup.py
 RDEPEND="
diff --git a/dev-python/oslo-context/Manifest b/dev-python/oslo-context/Manifest
index 03801bf0fb44..b5d6441c6de2 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1,3 +1 @@
-DIST oslo.context-3.4.0.tar.gz 32954 BLAKE2B 9f22ce6af5efcfec8ab92bdb6c806e420b09037bce08b68fd43684fd459cb12b8196a1e6ee48dcb41ae7aa5d4679851fbed2058709d17e5bb7efc85c9b6d04ea SHA512 bf31c01237352a296e46fdb533ea921dce24cd3c3a918e39f7ff17305104d8f033527738fe562dfe61c8700dbce96e26433068503ca8c5cf9dffb0780e42ec53
-DIST oslo.context-4.0.0.tar.gz 33057 BLAKE2B 180df04bd331489f2f175f8ab6f23750f0ab5f2c805ecd3a4ece4ad3e04a165ab08244cbb70bedfaeb2b38912ba45f4773671408eb1b5e8ee379809362e6016f SHA512 6a79d4c9568ad021365531e58679297700207472667a84153f016edd9044550d7c8ab868940772a45e9359ebf660a15a6f6d21f8f653fb8f297219bee1122d2f
 DIST oslo.context-4.1.0.tar.gz 33573 BLAKE2B 8fa4f94f5cb5c82d95e55bbc553f97088ae8907b38ebc95b81674709c6fb4eeffab4f83f042c2069a9bcddfa827ca0c5c9e31ec12f21ad1c82dc111ea7d1732e SHA512 83ef0aafc94460bc16ac84841ffa78bad2594d7b81578552579251b2548779296552f86204788fe3acd1a393e7ca54d479475e8c062649d0fd2f4989c3cbebe9
diff --git a/dev-python/oslo-context/oslo-context-3.4.0.ebuild b/dev-python/oslo-context/oslo-context-3.4.0.ebuild
deleted file mode 100644
index ebd355ff56ae..000000000000
--- a/dev-python/oslo-context/oslo-context-3.4.0.ebuild
+++ /dev/null
@@ -1,30 +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="Helpers to maintain useful information about a request context"
-HOMEPAGE="https://pypi.org/project/oslo.context/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
-S="${WORKDIR}/oslo.context-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source \
-	dev-python/openstackdocstheme
diff --git a/dev-python/oslo-context/oslo-context-4.0.0.ebuild b/dev-python/oslo-context/oslo-context-4.0.0.ebuild
deleted file mode 100644
index bff78942636b..000000000000
--- a/dev-python/oslo-context/oslo-context-4.0.0.ebuild
+++ /dev/null
@@ -1,31 +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="Helpers to maintain useful information about a request context"
-HOMEPAGE="https://pypi.org/project/oslo.context/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
-S="${WORKDIR}/oslo.context-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source \
-	dev-python/openstackdocstheme
diff --git a/dev-python/oslo-context/oslo-context-4.1.0.ebuild b/dev-python/oslo-context/oslo-context-4.1.0.ebuild
index a5efb7a2ad0c..9a18bf02b482 100644
--- a/dev-python/oslo-context/oslo-context-4.1.0.ebuild
+++ b/dev-python/oslo-context/oslo-context-4.1.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/oslo.context-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index c97f18d876a9..14f5e9fe8ab4 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,2 +1,3 @@
 DIST paramiko-2.10.1.tar.gz 347426 BLAKE2B 5c277afb2c8483a522756d017092174d5fc88e534a0069362be26b81896e5c2e280aa06db4d7b945d46f7c3563693f25409d0a51ba184e43d982b5276a76c5fe SHA512 1d97f32c0c14229cf51c2762fe2552ca3ac9bfd945965702cecbcf1ff62f1e740f7fb048d74127230ae23bd4b6ada8509da67e1c1da6a38d65254e674f054f6c
+DIST paramiko-2.10.2.tar.gz 347527 BLAKE2B 0c9ad4a696020eaef3402e1243f3f8ebfbe0cdd8c363d0ec04170678906ed67fe3d233d2feba6be4c48e98ee68589d8cebcf56bc0d818af8d827461634ef03fa SHA512 213fb65ac23133d82edf39c07b85a1e3785c25b4e44a31525595e389da4dda83ddf6fd01e637f66a0524b7f5b95e41615b6e0f578e4709c63a7a25ffd1509288
 DIST paramiko-2.9.2.tar.gz 345088 BLAKE2B b3b95ec222ac5386fba311c2f0878a44a92bfd0d6edd45c928e2c681fccaf66f2bcfb185cf3eafd37361dc119127623d2c690a981e9f30bfe280eb4c1a0f66e6 SHA512 5b0810358376e4a42ba38ffa4a713f104b122fd77d463a80937dd6dc529da70825d6741fec16f93071aefe4bbfa6f0dbdb2eabd125663c19ba4d35ac06ecfa90
diff --git a/dev-python/paramiko/paramiko-2.10.2.ebuild b/dev-python/paramiko/paramiko-2.10.2.ebuild
new file mode 100644
index 000000000000..fde6af462a11
--- /dev/null
+++ b/dev-python/paramiko/paramiko-2.10.2.ebuild
@@ -0,0 +1,55 @@
+# 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="SSH2 protocol library"
+HOMEPAGE="https://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+IUSE="examples server"
+
+RDEPEND="
+	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
+	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx sites/docs
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-2.7.1-tests.patch"
+	)
+
+	if ! use server; then
+		PATCHES+=( "${FILESDIR}/${PN}-2.4.2-disable-server.patch" )
+	fi
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r demos/*
+	fi
+}
diff --git a/dev-python/pdm-pep517/Manifest b/dev-python/pdm-pep517/Manifest
index 7737873b0235..9340bb3efc45 100644
--- a/dev-python/pdm-pep517/Manifest
+++ b/dev-python/pdm-pep517/Manifest
@@ -3,3 +3,4 @@ DIST pdm-pep517-0.10.1.gh.tar.gz 189525 BLAKE2B 10d80fee2ac45fd68c61baf9a8ee7365
 DIST pdm-pep517-0.10.2.gh.tar.gz 189817 BLAKE2B 47e773ac38197d898c50821d272c155d6749952bcce1492416291c02fa370965ca438e68268a56b8366b18f8a786883c9101e4dc325c9d4741f6cc509862d823 SHA512 6cdbd2cd96a784317356f4c5c52697279b720de03e7059c287872725baa10333b2f352e9a1c5ace727907bd6179cd879fcb4f6770eae1dd23294bf1b60cc233b
 DIST pdm-pep517-0.11.0.gh.tar.gz 211783 BLAKE2B 10a112a29ce8cef047d5dea79169fbc590a953e201da5fb3cde631dfc0b0a4ebdbe6e82e28971773db4b913d6b6ab468eb611564f59137beb3df4bd961decbc1 SHA512 71a12512660f85af2a50133f67cb0dc15a2d848d6500fe7dbc9e63ea0e7b916cb00a6c392abc8eb7383db81b1f46b53779a0befbeee4d6831d2586d65be1676c
 DIST pdm-pep517-0.11.2.gh.tar.gz 211796 BLAKE2B d1f6ea59a4a8d1188bc19c857d3fd9cb93bbb27e905bce5eb40454a1062c2086233a282119e4b8eee4264a885f58317ce7e1e9c78d588f9612240e220bc4fc07 SHA512 36b75526da84541a21672755ecb9b6ddede46d062e4db60b9b89acaa4febb59c4b0378f402095b678c9f902acce39e4649bbf2539ff6a8f9b3a33e284f84fb16
+DIST pdm-pep517-0.12.1.gh.tar.gz 303954 BLAKE2B 65344c2571264b9fadcffcf5ae05f42246912dce3e7029a1ea5e91df72f1c9425d603024099146cb7d9ed95d8e3ab0fcf5058ab35346893e28d3595d430548f6 SHA512 a7c27c685eec274798b5d9fa7fd3d7ec7ca77d204110c7c9962a53b1522c4c6dbc56d7413ce5ff6fe8e8f091b0d4e4914b9e3296dc226bcae9f5fbc2cb28444e
diff --git a/dev-python/pdm-pep517/pdm-pep517-0.12.1.ebuild b/dev-python/pdm-pep517/pdm-pep517-0.12.1.ebuild
new file mode 100644
index 000000000000..845cc21c1891
--- /dev/null
+++ b/dev-python/pdm-pep517/pdm-pep517-0.12.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
+HOMEPAGE="
+	https://pypi.org/project/pdm-pep517/
+	https://github.com/pdm-project/pdm-pep517/
+"
+SRC_URI="
+	https://github.com/pdm-project/pdm-pep517/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
+	dev-python/license-expression[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2[${PYTHON_USEDEP}]
+	dev-python/tomli-w[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-vcs/git
+	)
+"
+# setuptools are used to build C extensions
+RDEPEND+="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	rm -r pdm/pep517/_vendor || die
+	find -name '*.py' -exec sed \
+		-e 's:from pdm\.pep517\._vendor\.:from :' \
+		-e 's:from pdm\.pep517\._vendor ::' \
+		-i {} + || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	git config --global user.email "test@example.com" || die
+	git config --global user.name "Test User" || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index bcd71171a6fd..94fc54d292c4 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1,3 +1 @@
-DIST platformdirs-2.4.1.gh.tar.gz 20051 BLAKE2B 18fd11f7cae7c81c3615c89468d1deb3ceef3337b4a87a806b245b7bb5a4c14c0eb64fc7cfa06adc2da6150969da3a626da16c1f309f3011a9d4c5d1e4ca1d83 SHA512 d410056207506395c922ecc36c481bcc21f8dd97c69f33dc13580c74d0ea3d1aaa97284b79eed47b723f18c663038874edc5b9c4f4def06d92f1e25f7a8d76b4
-DIST platformdirs-2.5.0.gh.tar.gz 20101 BLAKE2B 420e70bfef15d17f69927809580440a4a9df618be7a93299a963bef236c5f966d0abe88f7bd9bf292109e5ddeb9b87b5615171ea1c70db9c7b2934d8b11fde5d SHA512 a50acf15bc776fdb43f6875055991aa85d5ebe7a931e27c9eada42500305cc1c7892e32687f2f882e850a97748e23dc6f2777f7f54558a32d6a413e35569f6f5
 DIST platformdirs-2.5.1.gh.tar.gz 20103 BLAKE2B 78df153feabd397e6ab0d3c5edfe899f2e2685e7b287bd17c36346bc109d90ba783b5164605bda448322811312299ce65d49b85537ebd1629448c1d82f4718e5 SHA512 c0f3e79fbb41cda1f543fcb6d3a4ea0c96872d195197aa720864c1ed0efa095e633202878da9b19abfb2aded08f5c736f431b1c615ee0f21cbf1775e87b12356
diff --git a/dev-python/platformdirs/platformdirs-2.4.1.ebuild b/dev-python/platformdirs/platformdirs-2.4.1.ebuild
deleted file mode 100644
index 27127ab71512..000000000000
--- a/dev-python/platformdirs/platformdirs-2.4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2021-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
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/"
-SRC_URI="
-	https://github.com/platformdirs/platformdirs/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="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/platformdirs/platformdirs-2.5.0.ebuild b/dev-python/platformdirs/platformdirs-2.5.0.ebuild
deleted file mode 100644
index 329f88ca52f6..000000000000
--- a/dev-python/platformdirs/platformdirs-2.5.0.ebuild
+++ /dev/null
@@ -1,32 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/"
-SRC_URI="
-	https://github.com/platformdirs/platformdirs/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="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/platformdirs/platformdirs-2.5.1.ebuild b/dev-python/platformdirs/platformdirs-2.5.1.ebuild
index 329f88ca52f6..3144ca41fb43 100644
--- a/dev-python/platformdirs/platformdirs-2.5.1.ebuild
+++ b/dev-python/platformdirs/platformdirs-2.5.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/plyr/plyr-1.0.6-r1.ebuild b/dev-python/plyr/plyr-1.0.6-r1.ebuild
index 495ebd2b3b44..32eec9e776a9 100644
--- a/dev-python/plyr/plyr-1.0.6-r1.ebuild
+++ b/dev-python/plyr/plyr-1.0.6-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/sahib/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.g
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 
 RDEPEND="media-libs/glyr:="
diff --git a/dev-python/plyr/plyr-1.0.6.ebuild b/dev-python/plyr/plyr-1.0.6.ebuild
deleted file mode 100644
index 5aac164272db..000000000000
--- a/dev-python/plyr/plyr-1.0.6.ebuild
+++ /dev/null
@@ -1,39 +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 flag-o-matic
-
-MY_PN="python-glyr"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A python wrapper for Glyr"
-HOMEPAGE="https://sahib.github.io/python-glyr/intro.html
-	https://github.com/sahib/python-glyr"
-SRC_URI="https://github.com/sahib/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-KEYWORDS="amd64 x86"
-SLOT="0"
-
-RDEPEND="media-libs/glyr:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs
-
-python_prepare_all() {
-	# Disable test requiring internet connection
-	sed -e 's:test_download:_&:' -i tests/test_misc.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" -m unittest discover tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/polygon/polygon-3.0.9.ebuild b/dev-python/polygon/polygon-3.0.9.ebuild
index 46437037af05..37aca6c12c15 100644
--- a/dev-python/polygon/polygon-3.0.9.ebuild
+++ b/dev-python/polygon/polygon-3.0.9.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/Polygon3-${COMMIT}"
 
 LICENSE="LGPL-2"
 SLOT="3"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="examples"
 
 DOCS=( doc/{Polygon.txt,Polygon.pdf} )
diff --git a/dev-python/priority/priority-2.0.0-r1.ebuild b/dev-python/priority/priority-2.0.0-r1.ebuild
index f8f9fa561161..0fc3a12a926c 100644
--- a/dev-python/priority/priority-2.0.0-r1.ebuild
+++ b/dev-python/priority/priority-2.0.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P: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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	test? ( >=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}] )
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index 25bf7d997195..ba097762af85 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,4 +1 @@
-DIST prompt_toolkit-3.0.24.tar.gz 3042044 BLAKE2B e9b4186a38756cf6c0d92575e42dfe4507e63f721038374252e7a7d5af76f7df04dc01251079d99a74167aef7e394b50c43b5190df8b9cd68cf74eae31dfbe51 SHA512 e423735441407ffe51d46225efa4b747899d47fa5d5a2163e5c0c906d2f1937e80a67bcd06ff6aa97d8a336e507fd0322957e79b9382d1a678994060fcccfb84
-DIST prompt_toolkit-3.0.26.tar.gz 402667 BLAKE2B 60160c3e0059b570321d182699b2e6cc10e7d771e9c328314e5561329aec5ddb4951d5cd50d49414314d50a9542e223b44e9c589d272ccf32bfb4f54ed1a9980 SHA512 7151d6678409bf3b04bee76cbcf4e0ffb5ca1963c359d30c8edf9e81bde424ea69b7009cd44e6d72088936290e2fd9dd8cac59efc8b5e59bfb87dacf53967b05
-DIST prompt_toolkit-3.0.27.tar.gz 3056711 BLAKE2B 920c9d56f634644dde4b25c95e794b3652e4fb4afb652982ff767f798812e63b48138f0f2fd82e081e8c47fe27c69c525622b7caf56ca95565d11955e72abc5a SHA512 5249c245e183101d92d7a26030cb69b425d6aa719dd4d134cc2e7102f7c4e593c3d18c753108bfa855ca72cbe1c68ade28f65b1029dae55db5168296c6dfd5b2
 DIST prompt_toolkit-3.0.28.tar.gz 3057388 BLAKE2B 87e5723f0c28a60e0241d051746c3e1124cb0e95bfcfead5da3594b89da3e190a139c0fda2597b3c435e3c3cae9bde8e75c16745faaad624d7c10c698eeb2c95 SHA512 143771bbb96ca761ba1e47dbe22b532081f39a6769935d90e320217f8566b15be5407aba5e7ff48d9e3e71782c9c9604536b0284c6e322179101adecbedd5ee5
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.24.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.24.ebuild
deleted file mode 100644
index 024b9a698df8..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.24.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} )
-inherit distutils-r1
-
-DESCRIPTION="Building powerful interactive command lines in Python"
-HOMEPAGE="
-	https://pypi.org/project/prompt-toolkit/
-	https://github.com/prompt-toolkit/python-prompt-toolkit"
-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"
-
-RDEPEND="
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.26.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.26.ebuild
deleted file mode 100644
index db3826b5ee33..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.26.ebuild
+++ /dev/null
@@ -1,22 +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="Building powerful interactive command lines in Python"
-HOMEPAGE="
-	https://pypi.org/project/prompt-toolkit/
-	https://github.com/prompt-toolkit/python-prompt-toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.27.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.27.ebuild
deleted file mode 100644
index 38878bddb6bf..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.27.ebuild
+++ /dev/null
@@ -1,23 +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="Building powerful interactive command lines in Python"
-HOMEPAGE="
-	https://pypi.org/project/prompt-toolkit/
-	https://github.com/prompt-toolkit/python-prompt-toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.28.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.28.ebuild
index 295d24cb4bf7..a60e5361d56d 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.28.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.28.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pslab-python/Manifest b/dev-python/pslab-python/Manifest
index 4e36b7586ba2..f33e127e0135 100644
--- a/dev-python/pslab-python/Manifest
+++ b/dev-python/pslab-python/Manifest
@@ -1,2 +1 @@
-DIST pslab-python-1.0.1.tar.gz 15460183 BLAKE2B 6837c40352eecdf563fa700617ee1712997fc0532483357d889d0fb03645732e0febf5ac83cdc8c766b7ec6d9ac9a436a313d0f44221c2ea69044be6f4c11fa6 SHA512 939f3649a0060a59a39ee97b57134075f8602b966fb3d14250c8ae96c340a4ab33e9fa8d7c5d8cf09ae9297b762c203e4a256bc29b9ff6006ce6ff254c468ad2
 DIST pslab-python-2.5.0.tar.gz 353493 BLAKE2B 4eae07fec800dc357041578a75e48812848588e49e14b75425ee4b24c62b1116d0493055564188e33e4d934f4d572708c811ec9bb7fbf5d437befedfcad5da1a SHA512 e8e4f53dc8c1d6aa4385cdbdc8a82bac21d9de15643980fed42a2b16c10ff56e0836371368840c9207d6bd6f8d73900a344507b8bce8b197f0580373137c0f1f
diff --git a/dev-python/pslab-python/files/pslab-python-1.0.1-no_install_udev_rules.patch b/dev-python/pslab-python/files/pslab-python-1.0.1-no_install_udev_rules.patch
deleted file mode 100644
index b721e8a8ab03..000000000000
--- a/dev-python/pslab-python/files/pslab-python-1.0.1-no_install_udev_rules.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -50,6 +50,5 @@
-     packages=find_packages(),
-     #scripts=["PSL/bin/"+a for a in os.listdir("PSL/bin/")],
-     package_data={'': ['*.css','*.png','*.gif','*.html','*.css','*.js','*.png','*.jpg','*.jpeg','*.htm','99-pslab.rules']},
--    cmdclass={'install': CustomInstall},
- )
- 
diff --git a/dev-python/pslab-python/files/pslab-python-1.0.1-sys_version.patch b/dev-python/pslab-python/files/pslab-python-1.0.1-sys_version.patch
deleted file mode 100644
index 474850a34b08..000000000000
--- a/dev-python/pslab-python/files/pslab-python-1.0.1-sys_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/PSL/SENSORS/AD9833.py
-+++ b/PSL/SENSORS/AD9833.py
-@@ -3,7 +3,7 @@
- 
- 
- class AD9833:
--    if sys.version.major == 3:
-+    if sys.version_info.major == 3:
-         DDS_MAX_FREQ = 0xFFFFFFF - 1  # 24 bit resolution
-     else:
-         DDS_MAX_FREQ = eval("0xFFFFFFFL-1")  # 24 bit resolution
diff --git a/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild b/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
deleted file mode 100644
index 678609a568b5..000000000000
--- a/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,28 +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 library for communicating with Pocket Science Lab"
-HOMEPAGE="https://pslab.io"
-SRC_URI="https://github.com/fossasia/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pyqtgraph[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.1-sys_version.patch
-	"${FILESDIR}"/${PN}-1.0.1-no_install_udev_rules.patch
-)
-
-distutils_enable_sphinx docs
diff --git a/dev-python/pslab-python/pslab-python-2.5.0.ebuild b/dev-python/pslab-python/pslab-python-2.5.0.ebuild
index 6c294e515d26..bdbd34bcf655 100644
--- a/dev-python/pslab-python/pslab-python-2.5.0.ebuild
+++ b/dev-python/pslab-python/pslab-python-2.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fossasia/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND=">=dev-python/numpy-1.16.3[${PYTHON_USEDEP}]
 	>=dev-python/pyserial-3.4[${PYTHON_USEDEP}]
diff --git a/dev-python/ptyprocess/ptyprocess-0.7.0.ebuild b/dev-python/ptyprocess/ptyprocess-0.7.0.ebuild
deleted file mode 100644
index 6371cb6f1901..000000000000
--- a/dev-python/ptyprocess/ptyprocess-0.7.0.ebuild
+++ /dev/null
@@ -1,19 +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="Run a subprocess in a pseudo terminal"
-HOMEPAGE="https://github.com/pexpect/ptyprocess"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pydecomp/pydecomp-0.3-r2.ebuild b/dev-python/pydecomp/pydecomp-0.3-r2.ebuild
deleted file mode 100644
index 6d5486d4dcfc..000000000000
--- a/dev-python/pydecomp/pydecomp-0.3-r2.ebuild
+++ /dev/null
@@ -1,27 +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} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_BRANCH="master"
-	EGIT_REPO_URI="https://github.com/dol-sen/pyDeComp.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-	S="${WORKDIR}/pyDeComp-${PV}"
-fi
-
-DESCRIPTION="A python library of common (de)compression and contents handling"
-HOMEPAGE="https://github.com/dol-sen/pyDeComp"
-
-LICENSE="BSD"
-SLOT="0"
-
-PATCHES=( "${FILESDIR}/${PV}-no-pixz-index.patch" )
diff --git a/dev-python/semantic_version/Manifest b/dev-python/semantic_version/Manifest
index 9a016c5f5ab9..e9b6e3e3b8bb 100644
--- a/dev-python/semantic_version/Manifest
+++ b/dev-python/semantic_version/Manifest
@@ -1,3 +1 @@
-DIST python-semanticversion-81a4730778fba6b5c76242d3c8da6dace7e2ec0a.tar.gz 40289 BLAKE2B 3e41362b5905b69873b13aef3a5146f61991b9e7438c30351b45da420fe9acb41b03664c6c0981ae2e3e22b9f50c061da74742d999c1c5f87dbb2a365249f827 SHA512 db5bc2f40483f06ccebebbbfa14009a68e6d89ab7480d51a3cd26b10fbc9ab1b43def2ea402ceac9db16720d6226be91b04ecf34441b1d535819471007a02df6
-DIST semantic_version-2.8.5.tar.gz 50009 BLAKE2B 5f966ca68358d4963b3a41574c100a8f78275445285aebbfa47d1febb0b7a2eb3a638254d4d1bd8e093acbef47a101ef0a0d7a86475313aefa211d2a0a3cfc19 SHA512 2ab59024c148239d78de062ff3a357f81a33fd066b6be8b6f9ef0753841a4945829b1c11899cfbda6c3ff09e00aa3b689e1fb6f8b9a92bbb3c2a62dd713b6049
 DIST semantic_version-2.9.0.tar.gz 51123 BLAKE2B c487c49ad17e7ca224ca4b6602abb42d1406dad8d70a3f5d0c536160e5b2d706ff0e1497961e3b9e0391c6d773ab7d0e9699f171f5781cec1d36025450cb7019 SHA512 e08f8e83ad20e94ecd6393d88836e13703fec3c2f89dc7e44fae42d8a929b2460524053fd7440865fa136d22312501a1368b5c3e923997b02383c8227972aa74
diff --git a/dev-python/semantic_version/semantic_version-2.8.5.ebuild b/dev-python/semantic_version/semantic_version-2.8.5.ebuild
deleted file mode 100644
index 862274e117f0..000000000000
--- a/dev-python/semantic_version/semantic_version-2.8.5.ebuild
+++ /dev/null
@@ -1,24 +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 library providing a few tools handling SemVer in Python"
-HOMEPAGE="https://pypi.org/project/semantic-version/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-#SRC_URI="https://github.com/rbarrois/python-semanticversion/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p no:django
-}
diff --git a/dev-python/semantic_version/semantic_version-2.8.6_pre20211108.ebuild b/dev-python/semantic_version/semantic_version-2.8.6_pre20211108.ebuild
deleted file mode 100644
index 100c4118383e..000000000000
--- a/dev-python/semantic_version/semantic_version-2.8.6_pre20211108.ebuild
+++ /dev/null
@@ -1,30 +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
-
-EGIT_COMMIT="81a4730778fba6b5c76242d3c8da6dace7e2ec0a"
-MY_P=python-semanticversion-${EGIT_COMMIT}
-DESCRIPTION="Python library providing a few tools handling SemVer in Python"
-HOMEPAGE="https://pypi.org/project/semantic-version/"
-SRC_URI="
-	https://github.com/rbarrois/python-semanticversion/archive/${EGIT_COMMIT}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p no:django
-}
diff --git a/dev-python/semantic_version/semantic_version-2.9.0.ebuild b/dev-python/semantic_version/semantic_version-2.9.0.ebuild
index d37f65ed2c93..8d3987cac033 100644
--- a/dev-python/semantic_version/semantic_version-2.9.0.ebuild
+++ b/dev-python/semantic_version/semantic_version-2.9.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 05a11695dd70..28f117ca7567 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,4 +1,2 @@
-DIST sentry-sdk-1.5.4.gh.tar.gz 239778 BLAKE2B 383dbc122439a16692fba5ff3a530817b7dc16a4fb6aef1f0353a09e95fadbe2e31015642ef7c5224ea12855a9b0b170d0a64c9dc5471ad978372fe0742d6552 SHA512 2ac725ca91a948f2e6770c2429e444fa97988c8db145728dd202ca86827d9bb101e96a3d8d0d6e4e6a0678b749da1782c068954a1669e019a125e298adfe8d5e
-DIST sentry-sdk-1.5.5.gh.tar.gz 242280 BLAKE2B 8c3bfeb50d19ee23aa430d77ffa10ea77ab579565b6ef85bacae6d0d8952478587c71d62c74e04e6708ed451b70b8903ffa9bdb10fde5e590586a928118d3942 SHA512 ad31754294e7cc1acd9c5b5f6ae454908e3579298494cef7dbcbc01e0b1a2d2036152ffafe50fc4e859a39e56afc2c8167a242de66b44c9416ebb70a4f032e86
 DIST sentry-sdk-1.5.6.gh.tar.gz 244568 BLAKE2B 5b9270787abaeadf2b5a15686aa07f60766cbe56c8c657801a88d6074ecab83fd38c3e0d1f0586cd8c8d5e36c5ffc97eec47998bf27bd9461ace9b8a83a2201d SHA512 628b8281e5c267a988730c0ddcb9348a43ce2cffe9b664619e6b5bc6ec4c0034898082b0b57bc2a8ea3100042a1bfb570ce4dd36a23ba412661ee902dfa41492
 DIST sentry-sdk-1.5.7.gh.tar.gz 244753 BLAKE2B 343c9439525f7609eb3c3962213c8c4b5493d2ace8143d3bb36cd4b13463f4548597f80ac49288d925e0f03a9675b1ed24744eb4cfa3dbe2700a19f2e03585d3 SHA512 8d5e41967387463ed50b4cd582ac0492905bb9cd8740054690f176b8ba07a095836141f4f23791a83909bdb18d4b006aeb0ff963c1663f97305bbdd819a2889a
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.5.4.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.5.4.ebuild
deleted file mode 100644
index eaae20896902..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.5.4.ebuild
+++ /dev/null
@@ -1,81 +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 client for Sentry"
-HOMEPAGE="https://sentry.io/ https://pypi.org/project/sentry-sdk/"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/gevent[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/eventlet[${PYTHON_USEDEP}]
-		' python3_{8..9})
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# tests require Internet access
-		tests/integrations/httpx/test_httpx.py
-		tests/integrations/requests/test_requests.py
-		tests/integrations/stdlib/test_httplib.py
-		# wtf is it supposed to do?!
-		tests/integrations/gcp/test_gcp.py
-		# broken by rq-1.10.1 (optional dep)
-		tests/integrations/rq/test_rq.py
-	)
-
-	local EPYTEST_DESELECT=(
-		# hangs
-		'tests/test_transport.py::test_transport_works'
-		# TODO
-		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-		tests/test_client.py::test_databag_depth_stripping
-		tests/test_client.py::test_databag_string_stripping
-		tests/test_client.py::test_databag_breadth_stripping
-		tests/integrations/asgi/test_asgi.py::test_websocket
-		# incompatible version?
-		tests/integrations/falcon/test_falcon.py
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
-		# test_circular_references: apparently fragile
-		'tests/integrations/threading/test_threading.py::test_circular_references'
-		# test for new feature, fails with IndexError
-		tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	)
-
-	epytest
-}
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.5.5.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.5.5.ebuild
deleted file mode 100644
index b612c8f3feb1..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.5.5.ebuild
+++ /dev/null
@@ -1,84 +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 client for Sentry"
-HOMEPAGE="https://sentry.io/ https://pypi.org/project/sentry-sdk/"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/gevent[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/eventlet[${PYTHON_USEDEP}]
-		' python3_{8..9})
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# tests require Internet access
-		tests/integrations/httpx/test_httpx.py
-		tests/integrations/requests/test_requests.py
-		tests/integrations/stdlib/test_httplib.py
-		# wtf is it supposed to do?!
-		tests/integrations/gcp/test_gcp.py
-		# broken by rq-1.10.1 (optional dep)
-		tests/integrations/rq/test_rq.py
-	)
-
-	local EPYTEST_DESELECT=(
-		# hangs
-		'tests/test_transport.py::test_transport_works'
-		# TODO
-		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-		tests/test_client.py::test_databag_depth_stripping
-		tests/test_client.py::test_databag_string_stripping
-		tests/test_client.py::test_databag_breadth_stripping
-		tests/integrations/asgi/test_asgi.py::test_websocket
-		# incompatible version?
-		tests/integrations/falcon/test_falcon.py
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
-		# test_circular_references: apparently fragile
-		'tests/integrations/threading/test_threading.py::test_circular_references'
-		# test for new feature, fails with IndexError
-		tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-		# TODO
-		tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-	)
-
-	epytest
-}
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.5.6.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.5.6.ebuild
index ddaca8514239..a3b98b30d446 100644
--- a/dev-python/sentry-sdk/sentry-sdk-1.5.6.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-1.5.6.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/sentry-python-${PV}"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index 9e59d0d41bb0..968d9023abd6 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -1,5 +1 @@
-DIST sphinx-autodoc-typehints-1.13.1.gh.tar.gz 19923 BLAKE2B d0f72b814c83dd8987b80bdbaffbab5c3a7c671d9e56e9bb62d3cf44dec1df7b5fb9c591928b89680427069ce8d5953f4dea52de9eb4a4add07a332be96c730a SHA512 50e2958aafaa661cb209da04bb456dadddc4782dd2168c3f6524fba26d906479c66e5b22b3f49fff0c4022acb4b5b99ff73b250cb3e4d5dd9f083c4a5ab12531
-DIST sphinx-autodoc-typehints-1.14.1.gh.tar.gz 22095 BLAKE2B 43fff7ad0ce83d4a7b50da7b3d0f9936754cb1897defe5d91bfef44dfae4df7bb6a0472fe5012bd2526a642149710e96b407fee3096dfb1474187273133079be SHA512 a720195d8792f3b6f5b8b5ce84b709872e7034c38640c15ab83b1676b5f0c26c650b0e74c34dbf9652e32f8b7f66edb94dcf4447ff2e0a1b196b721583294f49
-DIST sphinx-autodoc-typehints-1.15.3.gh.tar.gz 23660 BLAKE2B 4e05987b56f54e9a4eff62f4bc48ec271b33ac496fd755f8fd72a7d2342a0971c81cf3780d93c9f87e96bc388f6120cb4d8dce98cb5ac0d33dc9892e6bd08899 SHA512 d121cfe75f5b8dc0cb87e3fca5a0e5a1c88fc57bfbaf2183abbe8b7e1a680465d40e43eb836145aad3adf179e7a66800375267f5e0430ef28f79053a9a1f2649
-DIST sphinx-autodoc-typehints-1.16.0.gh.tar.gz 25357 BLAKE2B 60c9b34802237ce822b9ebb2685a59800140a6cdb1a95bb16cf696a360e15290a4cccaa15a622786029a06eb0cc7c26f67d78f59120e2421b63c8b5dd282661c SHA512 1984a0ee60c6f9501e2065e4d026cf2cd1dd86aea3ae73f9a4598114b79dd49e3b9e71f34e267d3471500a8c6c7cbec1298e5a36b5456c2068b68fdb6aa360f9
 DIST sphinx-autodoc-typehints-1.17.0.gh.tar.gz 26087 BLAKE2B d2193378160404dd18ee066dd09c299f69d92b3b747edcd88910a8eb29a707b0ad3f7c95e56a0137c19010d37bddd3d72c5d378dcf72376ea36d69ab2eba52d4 SHA512 0b35cbc3a26cd084c7c741df1ad0a0887eca9943adc16980f7dbc3304c00854bb2861b1314c126e59b2d59cdbff22f5f466cc433e485ec05e40ed93e36ee9650
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.13.1.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.13.1.ebuild
deleted file mode 100644
index 70f82a1c7271..000000000000
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.13.1.ebuild
+++ /dev/null
@@ -1,39 +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} )
-inherit distutils-r1
-
-DESCRIPTION="Type hints support for the Sphinx autodoc extension "
-HOMEPAGE="
-	https://github.com/tox-dev/sphinx-autodoc-typehints/
-	https://pypi.org/project/sphinx-autodoc-typehints/
-"
-SRC_URI="
-	https://github.com/tox-dev/sphinx-autodoc-typehints/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
-SLOT="0"
-
-RDEPEND=">=dev-python/sphinx-4[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphobjinv[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# this package is addicted to Internet
-	tests/test_sphinx_autodoc_typehints.py::test_format_annotation
-)
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.14.1.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.14.1.ebuild
deleted file mode 100644
index fe0633944b72..000000000000
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.14.1.ebuild
+++ /dev/null
@@ -1,39 +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} )
-inherit distutils-r1
-
-DESCRIPTION="Type hints support for the Sphinx autodoc extension "
-HOMEPAGE="
-	https://github.com/tox-dev/sphinx-autodoc-typehints/
-	https://pypi.org/project/sphinx-autodoc-typehints/
-"
-SRC_URI="
-	https://github.com/tox-dev/sphinx-autodoc-typehints/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-SLOT="0"
-
-RDEPEND=">=dev-python/sphinx-4[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphobjinv[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# this package is addicted to Internet
-	tests/test_sphinx_autodoc_typehints.py::test_format_annotation
-)
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.15.3.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.15.3.ebuild
deleted file mode 100644
index 2a012f001198..000000000000
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.15.3.ebuild
+++ /dev/null
@@ -1,40 +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="Type hints support for the Sphinx autodoc extension "
-HOMEPAGE="
-	https://github.com/tox-dev/sphinx-autodoc-typehints/
-	https://pypi.org/project/sphinx-autodoc-typehints/
-"
-SRC_URI="
-	https://github.com/tox-dev/sphinx-autodoc-typehints/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-SLOT="0"
-
-RDEPEND=">=dev-python/sphinx-4[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphobjinv[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# this package is addicted to Internet
-	tests/test_sphinx_autodoc_typehints.py::test_format_annotation
-)
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.16.0.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.16.0.ebuild
deleted file mode 100644
index 8bdb352cae1e..000000000000
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.16.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="Type hints support for the Sphinx autodoc extension "
-HOMEPAGE="
-	https://github.com/tox-dev/sphinx-autodoc-typehints/
-	https://pypi.org/project/sphinx-autodoc-typehints/
-"
-SRC_URI="
-	https://github.com/tox-dev/sphinx-autodoc-typehints/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-RDEPEND=">=dev-python/sphinx-4[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nptyping[${PYTHON_USEDEP}]
-		dev-python/sphobjinv[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# this package is addicted to Internet
-	tests/test_sphinx_autodoc_typehints.py::test_format_annotation
-)
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.17.0.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.17.0.ebuild
index dee8a7d32de7..e1b14e59cfdb 100644
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.17.0.ebuild
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.17.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 RDEPEND=">=dev-python/sphinx-4[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-bootstrap-theme/Manifest b/dev-python/sphinx-bootstrap-theme/Manifest
index 4ccc8c8b9bca..f7e79f174b57 100644
--- a/dev-python/sphinx-bootstrap-theme/Manifest
+++ b/dev-python/sphinx-bootstrap-theme/Manifest
@@ -1,2 +1 @@
-DIST sphinx-bootstrap-theme-0.8.0.gh.tar.gz 1229005 BLAKE2B c3d7c000007d1f8328c972f0aa4417d54b7c3ee239a094432770d09d955c97d5c9e001748a07b9f88525b97481218a1e6df24d16aa1c1045feb7c0fcb1496cd2 SHA512 471519ecf46c359a9c036b1ba15245b4a5d499263560dde7a7217a1a17a62e8f559359fd66de9c1f35c150314a68d62e3b9bcff8ff018bff909ece9284bb948f
 DIST sphinx-bootstrap-theme-0.8.1.gh.tar.gz 1228936 BLAKE2B 1f7d83052cd8f7b5cc8ec89279e591eab46ea3db11562dac8d92f9050b47fe5ab28939a17e4e48178096cd161275af7fb3047c91a4a5c405b9a8f848625893dc SHA512 de56b56bbb729c9d4f98697a1d312555ddb22c05588fb00e0417075f8b500a6cb09c8918276f4a59900ceec1374f1355cd4919b012505a37481de970f0172399
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0-r1.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0-r1.ebuild
deleted file mode 100644
index e1a805ef5bbf..000000000000
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,20 +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="Sphinx theme integrates the Bootstrap CSS / JavaScript framework"
-HOMEPAGE="https://ryan-roemer.github.io/sphinx-bootstrap-theme/README.html"
-# Latest version isn't on PyPI
-# https://github.com/ryan-roemer/sphinx-bootstrap-theme/issues/210
-SRC_URI="
-	https://github.com/ryan-roemer/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.1.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.1.ebuild
index 6538d580d9dd..f334ff00155f 100644
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.1.ebuild
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.1.ebuild
@@ -17,4 +17,4 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-python/sphobjinv/Manifest b/dev-python/sphobjinv/Manifest
index 87dca51a85a8..54ef0e3bc0c5 100644
--- a/dev-python/sphobjinv/Manifest
+++ b/dev-python/sphobjinv/Manifest
@@ -1,3 +1 @@
-DIST sphobjinv-2.1.tar.gz 1144017 BLAKE2B 71878e1bac5202ab74298b56cd6172236ea524050323e0d6b8bbc0c89f1937d75f10d40b4071cfbe8c9031641e9a0ecb283da908c40840a61c12a7c892438241 SHA512 cde77d73b09b72358b0ac5b0d8f1a748e78dce6664d1b849ba68f5ff70dc43cbcff4581374d0151be29c4d97efe2920c5c00ff68918371243be158031e9554fa
 DIST sphobjinv-2.2.1.tar.gz 1150428 BLAKE2B 13bec53b00d14466aad652fb822ba32156d4ee3141f2df5bf55eaf77d03627c98c48dd142757ac43fe7dbf00716a85ee4c03060dfcf89e1d9aca4cd2589df5b0 SHA512 9247fc38e5d49adab0921f31e4ad1a8b2ca260c7a921b5fb9db7f800ee484335449031b0f51f81149ff71edba6cc93ab14a683ff6cdce2494322d05474e9a2c7
-DIST sphobjinv-2.2.tar.gz 1150648 BLAKE2B db29624c9e7c5ec014793bb76693dfbe87d8742a688b91c196bec12ac03852ae7999717588e075f58f5d2c3109b10d532bd117d482b540d30af27760869a5904 SHA512 257327ad168d5804639d3a064db683e0b9eb4f1dcb864a12a8ba440f3fde31c832bd72298f6381d2590bfac85ffe811563b8de124a135de2b6c1511217925103
diff --git a/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild b/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild
deleted file mode 100644
index a3afd0bd6d97..000000000000
--- a/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx objects.inv Inspection/Manipulation Tool"
-HOMEPAGE="
-	https://github.com/bskinn/sphobjinv/
-	https://pypi.org/project/sphobjinv/
-"
-SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/attrs-19.2[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/fuzzywuzzy-0.8[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/dictdiffer[${PYTHON_USEDEP}]
-		dev-python/pytest-check[${PYTHON_USEDEP}]
-		dev-python/pytest-ordering[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		>=dev-python/stdio-mgr-1.0.1[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-distutils_enable_sphinx doc/source \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinx-issues \
-	dev-python/sphinxcontrib-programoutput
-
-python_prepare_all() {
-	# --strict option is deprecated in pytest>6
-	sed -i -e '/addopts/d' tox.ini || die
-	sed -e '/CLI_TEST_TIMEOUT/s/2/20/' -i tests/test_cli.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/sphobjinv/sphobjinv-2.2.1.ebuild b/dev-python/sphobjinv/sphobjinv-2.2.1.ebuild
index 530163881dae..fe4377f5a884 100644
--- a/dev-python/sphobjinv/sphobjinv-2.2.1.ebuild
+++ b/dev-python/sphobjinv/sphobjinv-2.2.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/sphobjinv/sphobjinv-2.2.ebuild b/dev-python/sphobjinv/sphobjinv-2.2.ebuild
deleted file mode 100644
index a1f198611130..000000000000
--- a/dev-python/sphobjinv/sphobjinv-2.2.ebuild
+++ /dev/null
@@ -1,50 +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="Sphinx objects.inv Inspection/Manipulation Tool"
-HOMEPAGE="
-	https://github.com/bskinn/sphobjinv/
-	https://pypi.org/project/sphobjinv/
-"
-SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/attrs-19.2[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/dictdiffer[${PYTHON_USEDEP}]
-		dev-python/pytest-check[${PYTHON_USEDEP}]
-		dev-python/pytest-ordering[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		>=dev-python/stdio-mgr-1.0.1[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc/source \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinx-issues \
-	dev-python/sphinxcontrib-programoutput
-
-src_prepare() {
-	# --strict option is deprecated in pytest>6
-	sed -i -e '/addopts/d' tox.ini || die
-	sed -e '/CLI_TEST_TIMEOUT/s/2/20/' -i tests/test_cli.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.4-r1.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.4-r1.ebuild
index 325d3bc1ec5c..afec42747f2c 100644
--- a/dev-python/ssl-fetch/ssl-fetch-0.4-r1.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-0.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~dolsen/releases/ssl-fetch/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND=">=dev-python/requests-1.2.1[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
deleted file mode 100644
index 700a75488f53..000000000000
--- a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
+++ /dev/null
@@ -1,28 +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 )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-DESCRIPTION="Small convenience library for fetching files securely"
-HOMEPAGE="https://github.com/dol-sen/ssl-fetch"
-SRC_URI="https://dev.gentoo.org/~dolsen/releases/ssl-fetch/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND=">=dev-python/requests-1.2.1[${PYTHON_USEDEP}]"
-
-pkg_postinst() {
-	elog "This is beta software."
-	elog "The APIs it installs should be considered unstable"
-	elog "and are subject to change in these early versions."
-	elog
-	elog "Please file any enhancement requests, or bugs"
-	elog "at https://github.com/dol-sen/ssl-fetch/issues"
-	einfo "I am also on IRC @ #gentoo-ci of the Libera.Chat network"
-}
diff --git a/dev-python/statsmodels/statsmodels-0.13.2.ebuild b/dev-python/statsmodels/statsmodels-0.13.2.ebuild
index 06ada2453bc2..37e37b3604ff 100644
--- a/dev-python/statsmodels/statsmodels-0.13.2.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.13.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/stomp-py/Manifest b/dev-python/stomp-py/Manifest
index bd43186b3713..612c26af9fc0 100644
--- a/dev-python/stomp-py/Manifest
+++ b/dev-python/stomp-py/Manifest
@@ -1,2 +1 @@
-DIST stomp.py-7.0.0.tar.gz 34772 BLAKE2B 838ee5ebf520bcf0c65d89b00e94c8cadb77204a4d387fa0261b8b8046d123d436fe587481c9a3db9d515b11fcdf246993c955834ff18b9161ff3355341caa3a SHA512 2cce1803125bb60c98ebf7c58c27130a13a2c42c0135e590752fae7a13a82edf3337c85f6ec2fb050e9ece0d3dc604a526610445a1a410fbe440ac8596608f34
 DIST stomp.py-8.0.0.tar.gz 35146 BLAKE2B 65f15e0145e1fc48d4f9ccf37ce81f1f7464e9179d63d6f22e96dd99ce35692dbcb6056730c35255428b0ccf0d744debc39e2c12e6e2b6675ac20c7ec0ff3efd SHA512 068694e9bc42e45dd769275296a1ea817153cb0318b08377be5e0b9563989a83bff35c4bc424e00939b7521938aa34f485401f07a8a51c3d9a90eea3f00c1ea1
diff --git a/dev-python/stomp-py/stomp-py-7.0.0.ebuild b/dev-python/stomp-py/stomp-py-7.0.0.ebuild
deleted file mode 100644
index 3bf8906992f5..000000000000
--- a/dev-python/stomp-py/stomp-py-7.0.0.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="pyproject.toml"
-
-inherit distutils-r1
-
-MY_PN="${PN//-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python client library for the STOMP messaging protocol"
-HOMEPAGE="https://pypi.org/project/stomp.py/ https://github.com/jasonrbriggs/stomp.py/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="<dev-python/docopt-0.7.0[${PYTHON_USEDEP}]"
-
-# stomp.py test suite requires quite a few appropriately configured
-# messaging servers (as of 7.0.0: RabbitMQ, ActiveMQ, ActiveMQ Artemis,
-# stompserver). Upstream relies on Docker to provide those servers, however
-# doing the same in src_test would require both granting the portage user
-# extra permissions and packaging the base image (trying to download it
-# on the fly would violate the network sandbox).
-# Side note: PyPI tarballs do not include tests.
-RESTRICT="test"
-
-S="${WORKDIR}"/${MY_P}
diff --git a/dev-python/stomp-py/stomp-py-8.0.0.ebuild b/dev-python/stomp-py/stomp-py-8.0.0.ebuild
index e133231dedf2..d1b41dbf53d0 100644
--- a/dev-python/stomp-py/stomp-py-8.0.0.ebuild
+++ b/dev-python/stomp-py/stomp-py-8.0.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="<dev-python/docopt-0.7.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
deleted file mode 100644
index 6543116df096..000000000000
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
+++ /dev/null
@@ -1,22 +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
-
-MY_PN="${PN}-version"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Strict, simple, lightweight RFC3339 functions"
-HOMEPAGE="https://pypi.org/project/strict-rfc3339/ https://github.com/danielrichman/strict-rfc3339"
-SRC_URI="https://github.com/danielrichman/${PN}/archive/version-${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests unittest
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r2.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r2.ebuild
index 51924cbc7a5b..da020a261f29 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r2.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r2.ebuild
@@ -16,6 +16,6 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests unittest
diff --git a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
deleted file mode 100644
index aa825b1c89f2..000000000000
--- a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 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="ANSII Color formatting for output in terminal"
-HOMEPAGE="https://pypi.org/project/termcolor/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-# no tests...
-RESTRICT="test"
diff --git a/dev-python/termcolor/termcolor-1.1.0-r3.ebuild b/dev-python/termcolor/termcolor-1.1.0-r3.ebuild
index 39876b001758..a6812f1a2c7a 100644
--- a/dev-python/termcolor/termcolor-1.1.0-r3.ebuild
+++ b/dev-python/termcolor/termcolor-1.1.0-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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 # no tests...
 RESTRICT="test"
diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
index 01a1957d369f..271f8acba8f6 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -1,2 +1 @@
-DIST testpath-0.5.0.tar.gz 93168 BLAKE2B 864ac80e027192fb1a83f1a15db55fe72729154c7236f2054abfe161be36741614732efbea2a6b4eeb1fb59befa36002d767b4113fab98202ff22330ad15e21d SHA512 d960da04b490b355c5ca9d8e348d81a0d528f13dc7a2b5d6d3c09327a603c1582bce76f7de6d1666b490112306a10d6a19c7979c1119fb726c08c712a08bbcb0
 DIST testpath-0.6.0.tar.gz 92307 BLAKE2B 320695b4224803214759a74e64e969a244814f4767eb6092b758ba9fcbfadce81afa3fa5eee65b8c8fe9c54e486d9abf75a18b867883740052c58d1eb2671e23 SHA512 fe13523138c1e67f33a3aa707e81b8cc8b5a720ab231ea2c2407da003178d779a649f664213822022e26325fed4ddf468cf727737b94eb2ebf7315aacbce6857
diff --git a/dev-python/testpath/testpath-0.5.0-r1.ebuild b/dev-python/testpath/testpath-0.5.0-r1.ebuild
deleted file mode 100644
index 77b5193bd4bf..000000000000
--- a/dev-python/testpath/testpath-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Test utilities for code working with files and commands"
-HOMEPAGE="https://github.com/jupyter/testpath https://testpath.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
diff --git a/dev-python/testpath/testpath-0.5.0.ebuild b/dev-python/testpath/testpath-0.5.0.ebuild
deleted file mode 100644
index 3349bc7edc44..000000000000
--- a/dev-python/testpath/testpath-0.5.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Test utilities for code working with files and commands"
-HOMEPAGE="https://github.com/jupyter/testpath https://testpath.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND=">=dev-python/pyproject2setuppy-15"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
diff --git a/dev-python/testpath/testpath-0.6.0.ebuild b/dev-python/testpath/testpath-0.6.0.ebuild
index 77b5193bd4bf..d87d19fc33a1 100644
--- a/dev-python/testpath/testpath-0.6.0.ebuild
+++ b/dev-python/testpath/testpath-0.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx doc
diff --git a/dev-python/threadpoolctl/Manifest b/dev-python/threadpoolctl/Manifest
index e7396707fda4..04471494d275 100644
--- a/dev-python/threadpoolctl/Manifest
+++ b/dev-python/threadpoolctl/Manifest
@@ -1,2 +1 @@
-DIST threadpoolctl-3.0.0.tar.gz 28486 BLAKE2B e49bf43ea272e353e1a5f864cd7f38978793489b2dba60a1c075a61f6dbfe0a75a456e1143c0f33d3222ff2e27c1ce6025579b00e3feb2d789c7be068f6e07ad SHA512 df0829d5bed15d5cbcd502810aff91c9dd0d4dafc11173aa762426e96a7ed5acb0fd3132161e5b2d234136156f2a599c3592fc0a8e20828db83882b840a939cc
 DIST threadpoolctl-3.1.0.tar.gz 29899 BLAKE2B 41bddace1231107a108fd57e281541a4e9f04c9bee957d16cfbff49361f9dcb0b879bf376617480b1ca2929c09d07fd1f8f704afa4ad85e34e38c4a82fb48a3c SHA512 551dad4c93a62382583a96187f795aaeb6954700647c984ad618d3d1bede50d6859e75f676c557fa875db37c798c0347131f6b136148f71b8208783c7f8f717e
diff --git a/dev-python/threadpoolctl/threadpoolctl-3.0.0-r1.ebuild b/dev-python/threadpoolctl/threadpoolctl-3.0.0-r1.ebuild
deleted file mode 100644
index a9429882d182..000000000000
--- a/dev-python/threadpoolctl/threadpoolctl-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Limit the number of threads used in native libs that have their own threadpool"
-HOMEPAGE="https://github.com/joblib/threadpoolctl"
-SRC_URI="https://github.com/joblib/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '2,3s:flit:&_core:' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/threadpoolctl/threadpoolctl-3.0.0.ebuild b/dev-python/threadpoolctl/threadpoolctl-3.0.0.ebuild
deleted file mode 100644
index 7e2fc7f26ff6..000000000000
--- a/dev-python/threadpoolctl/threadpoolctl-3.0.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2020-2021 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
-
-DESCRIPTION="Limit the number of threads used in native libs that have their own threadpool"
-HOMEPAGE="https://github.com/joblib/threadpoolctl"
-SRC_URI="https://github.com/joblib/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
-
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/threadpoolctl/threadpoolctl-3.1.0.ebuild b/dev-python/threadpoolctl/threadpoolctl-3.1.0.ebuild
index b6144e34448f..234b864eab7d 100644
--- a/dev-python/threadpoolctl/threadpoolctl-3.1.0.ebuild
+++ b/dev-python/threadpoolctl/threadpoolctl-3.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/joblib/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/tomli/Manifest b/dev-python/tomli/Manifest
index 59d4cf87d470..99d952ed5734 100644
--- a/dev-python/tomli/Manifest
+++ b/dev-python/tomli/Manifest
@@ -1,6 +1,4 @@
 DIST tomli-1.2.3-py3-none-any.whl.zip 12122 BLAKE2B ad0037b3761a13043bffb5875a25c7e18b71ac8cdb4491ca9c7cc60f593acd588ac38d7d9f7c48da217adfcfe5100bed3af215da2bffc06064d4817bf9923ec3 SHA512 7dd3ca4851728ef78cb288f51a446ddf25be5a6454a8dbfb4987f7078fe744ac76021ed7046bdbb630b4989479bc932ce649c5e3af33f43724f9714fb755209f
 DIST tomli-1.2.3.gh.tar.gz 123142 BLAKE2B e8af1618aa962d7ff56d319c3a789c7655d9cb95e79f27b90cd9f9c7e978d2e29a49abef3884c4f53788305e54f8e919992d65fcec12679a9346690d86b7dd6a SHA512 270dbfe1df2e7f2692c35be5cc45e0b78e9e045e150fe959f4d6db8e3022126e7c17338636e57ba553fd928cbfd227938cfcd13128e1f05ee8cff29327594c61
-DIST tomli-2.0.0-py3-none-any.whl.zip 12127 BLAKE2B 1a680c2baa158db3892fc616e4fa74aa197862dcdb792db51e16e00fd949c6e7554235ac083ea1524d5ae952c911899c512f37d1500786dae401df4086c5ca15 SHA512 6191981e9771dedc5dc225734295774c75a272d03edfbea7415d2b4c09531d5022dba53affc47baf817ff9cc5945d8d62ea3eb67bd69e146a07eaa35dec5acc0
-DIST tomli-2.0.0.gh.tar.gz 123262 BLAKE2B cddd21e3297ee71608f2f3e08023ec8d86f8295133ee78a16bf3c4dca080d94ade1f7d8c43d262d5a5f0287ea743068f57d47336d5d9ec684cdfaf485194a2e6 SHA512 dc7cdfadaca74f39dd6cb00686ec2e5b47b8ee3dbec9bd0a289a6ff78619cfdbf125adb6253d838f197722f4389690872a3ca870664b7785c19f3c2bb1a18231
 DIST tomli-2.0.1-py3-none-any.whl.zip 12757 BLAKE2B 0a33773bc0409831aec6ee803ef0ef9d6b6b441213d549184068e218b73d6178d617bc2b58d11db98f0e6284baaf81663723fbc6eb89f7466608f0d89aeb1982 SHA512 b6164b03d3db360093f92e644e87a37a0ce20d63d7e9e271fcafd727f4fdb73ad6b301aaf32b3d2839f6eedbc8ea499dafba7335b8fdfc4667e30ed50c9805b4
 DIST tomli-2.0.1.gh.tar.gz 133685 BLAKE2B 0d3a1f4ee4e74eeab6a7e7c3d5e866ce1baf9017136cdc8ce1f6275f8d6d151239e5a00b97b6409872fac0e8558a49120adf16f0ae21f9d92ae630dfd39cd6ff SHA512 a467f8d48cdbd7213bd9b6f85fd48ba142ab7c9656c40bb30785e1c4b37a9e29eaed420f183458ad20112baee8413ebbec87755332795c8f02235d1018c3aa5c
diff --git a/dev-python/tomli/tomli-2.0.0.ebuild b/dev-python/tomli/tomli-2.0.0.ebuild
deleted file mode 100644
index 659d57e39e40..000000000000
--- a/dev-python/tomli/tomli-2.0.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A lil' TOML parser"
-HOMEPAGE="
-	https://pypi.org/project/tomli/
-	https://github.com/hukkin/tomli/"
-SRC_URI="
-	https://github.com/hukkin/tomli/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	https://files.pythonhosted.org/packages/py3/${PN::1}/${PN}/${P}-py3-none-any.whl
-		-> ${P}-py3-none-any.whl.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
-
-BDEPEND="
-	app-arch/unzip
-	test? ( dev-python/python-dateutil[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-# do not use any build system to avoid circular deps
-python_compile() { :; }
-
-python_install() {
-	python_domodule tomli "${WORKDIR}"/*.dist-info
-}
diff --git a/dev-python/tomli/tomli-2.0.1.ebuild b/dev-python/tomli/tomli-2.0.1.ebuild
index 6659644747a0..e28ec416a3f4 100644
--- a/dev-python/tomli/tomli-2.0.1.ebuild
+++ b/dev-python/tomli/tomli-2.0.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
 
 BDEPEND="
 	app-arch/unzip"
diff --git a/dev-python/tomlkit/Manifest b/dev-python/tomlkit/Manifest
index 69913d5edd7c..49ac9d899435 100644
--- a/dev-python/tomlkit/Manifest
+++ b/dev-python/tomlkit/Manifest
@@ -1,3 +1 @@
 DIST tomlkit-0.10.0.tar.gz 183499 BLAKE2B b9906dea2dd8867dca0208f3ce86b3d587f8504addfe25cf29f9164f50dc12d244010df53791ed01e0e7dd16e71ad77ce22c9ea7a37a6216880059c058f112e8 SHA512 05d03ae71a1d72ca0e03276f2b2530ca9fab7d6f366166a79839c66eaa00b55abb5f70a669ecb4d762dbbd655f10e4c4a373a7683cd781ae034d0910a0c3eccf
-DIST tomlkit-0.8.0.tar.gz 179067 BLAKE2B 871eb8371d94c76552d78a56adfbde5ebb9da4b93aa29229ae9aa279ae35fac488a1b4986169b818d2e5366883b8f246b44dc9075d0d9785b2d7d6f97e222ec1 SHA512 77b267201021e740d8134d0d5edfbef2cf077adac0b320d80887fdedda3f63f74df1957e8230976f16c80fcc58fd4cfabb195cccf0eda7d6cd29f5f65d362147
-DIST tomlkit-0.9.2.tar.gz 176380 BLAKE2B 3af0a397382c9c7dd948d32c3d359d8409b8c4a1beb93cb528632909ab834fb86298da1dd1791e474dd83395cf462e6ce6842c32ea3011ade744b495cf1fd40a SHA512 9a5a422ad7f2602d164b486dea816f878791393675a17ae30d10f12b6eed0ca73cbfaac7c359f1a57aea4f734b5ba31ee3bbbb95c521e41ce608eae972c2059b
diff --git a/dev-python/tomlkit/tomlkit-0.10.0.ebuild b/dev-python/tomlkit/tomlkit-0.10.0.ebuild
index 6724baa84084..f14c5b3ec673 100644
--- a/dev-python/tomlkit/tomlkit-0.10.0.ebuild
+++ b/dev-python/tomlkit/tomlkit-0.10.0.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 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/tomlkit/tomlkit-0.8.0.ebuild b/dev-python/tomlkit/tomlkit-0.8.0.ebuild
deleted file mode 100644
index ea5b169b8753..000000000000
--- a/dev-python/tomlkit/tomlkit-0.8.0.ebuild
+++ /dev/null
@@ -1,19 +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
-
-DESCRIPTION="Style preserving TOML library"
-HOMEPAGE="https://github.com/sdispater/tomlkit"
-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"
-
-BDEPEND="test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tomlkit/tomlkit-0.9.2.ebuild b/dev-python/tomlkit/tomlkit-0.9.2.ebuild
deleted file mode 100644
index 6724baa84084..000000000000
--- a/dev-python/tomlkit/tomlkit-0.9.2.ebuild
+++ /dev/null
@@ -1,30 +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="Style preserving TOML library"
-HOMEPAGE="https://github.com/sdispater/tomlkit"
-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"
-
-BDEPEND="test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	# use setup.py to avoid circular dep with poetry-core
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["setuptools", "wheel"]
-		build-backend = "setuptools.build_meta"
-	EOF
-}
diff --git a/dev-python/towncrier/Manifest b/dev-python/towncrier/Manifest
index 8acda6f39058..57628a4901fd 100644
--- a/dev-python/towncrier/Manifest
+++ b/dev-python/towncrier/Manifest
@@ -1,2 +1 @@
-DIST towncrier-21.3.0.tar.gz 31787 BLAKE2B 1ad54cb2eb28d25131be13a7fce5aeec3df07fe198f3200202d612b2b49cbef76d422025e143b19db498af224ba522f3a67b66fc10ec2cfb0ab81a52aeb7263e SHA512 b6093864d590849e29311fd1a085cc40997f88ada38e92bf159d72fd809691e014f67ac87844886cfdb27be0f9abc8fbf79d5d7e800688eac34e9edec6d6a2f6
 DIST towncrier-21.9.0.gh.tar.gz 32161 BLAKE2B 9160feb1d7fa8b70350a266b91f0ebca81287ac2c25d1a586cc4db6dc64d55534e39a75aba3407fdccff83fca336cb559d21604299ecb2c01aa168e8fa75fcb2 SHA512 d58e5c9f916144085bf24fd2062bee24a1a577e283350f81bdfcd42b797fcefeece6988659b75ddc8b0701ff40a070628a548f0d4fbfb9d7c5a8c8f9cfdd29a3
diff --git a/dev-python/towncrier/towncrier-21.3.0.ebuild b/dev-python/towncrier/towncrier-21.3.0.ebuild
deleted file mode 100644
index c631c28bc2e6..000000000000
--- a/dev-python/towncrier/towncrier-21.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=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Building newsfiles for your project"
-HOMEPAGE="https://github.com/twisted/towncrier"
-SRC_URI="https://github.com/twisted/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/click-default-group[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/incremental[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-vcs/git
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	distutils_install_for_testing
-	trial towncrier || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/towncrier/towncrier-21.9.0.ebuild b/dev-python/towncrier/towncrier-21.9.0.ebuild
index b4a255c15c3b..c140f6e5c0a2 100644
--- a/dev-python/towncrier/towncrier-21.9.0.ebuild
+++ b/dev-python/towncrier/towncrier-21.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index 420446389b8b..389c79691be6 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1,3 +1 @@
-DIST traitlets-5.0.5.tar.gz 128856 BLAKE2B ad3e5d6dbdf3f118a86be0106e0243146ff833c40300c5fd4c5704db323fcfa4b30d87a88e66608e3a54672c9a7cd6ce07bd9596827fa7ce08625626c9610f7e SHA512 ec5901bab493949f656269a6f7a9211f919a29510d22a6ed440f1e3577dfcb73a6aeca8a0e7d2a6e23192b9ab4844beef1012a847ef08180e64cfb1e2cd40bfa
-DIST traitlets-5.1.0.tar.gz 135161 BLAKE2B adb948cd07a961196c3b02cd28c7dac274ba9152ddae0fab1d706d78643ff1f60e4478731d960e583eb6ad5088b2730efa31c6b3a806497ac5c8aa7b05e51502 SHA512 2b7aa7db355ddb5fa5dcdc091324b933cf7f8b189c033d43408af1bcda40cb242cd787f82098e042f1c65f07bf94b89d7d9f10019374388c47390565e7e3a467
 DIST traitlets-5.1.1.tar.gz 130629 BLAKE2B 75a6f11d95e3989b9faffd576a1c9c45aa413b0b8c6ac853368902a60aad735ffd9699e721878af4e449d07ca6c2b0fae584fa2ae17707408ea9ca7591d38f75 SHA512 6ef5fcde81e1403b4b28c80e636c75f49819e319863dfa654aa5bbb96d18cca82ef8e7878cc8cccdb988d75201c3912fc49c31b673d7182a1f7d3cc78c115112
diff --git a/dev-python/traitlets/files/traitlets-5.0.5-python3_10.patch b/dev-python/traitlets/files/traitlets-5.0.5-python3_10.patch
deleted file mode 100644
index 53ade693a3ad..000000000000
--- a/dev-python/traitlets/files/traitlets-5.0.5-python3_10.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From dbb604946745ed90c6e9f6ed17f2bde253042d52 Mon Sep 17 00:00:00 2001
-From: Olga <olgamatoula@gmail.com>
-Date: Fri, 7 May 2021 17:27:09 +0100
-Subject: [PATCH] Fix string assertion for python3.10
-
----
- traitlets/tests/test_traitlets_enum.py | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/traitlets/tests/test_traitlets_enum.py b/traitlets/tests/test_traitlets_enum.py
-index 769e830b..a87dd705 100644
---- a/traitlets/tests/test_traitlets_enum.py
-+++ b/traitlets/tests/test_traitlets_enum.py
-@@ -5,6 +5,7 @@
- 
- import unittest
- import enum
-+import sys
- from traitlets import HasTraits, TraitError, Enum, UseEnum, CaselessStrEnum, FuzzyEnum
- 
- 
-@@ -87,7 +88,10 @@ def test_assign_scoped_enum_value_name(self):
-             example = self.Example()
-             example.color = value
-             self.assertIsInstance(example.color, Color)
--            self.assertEqual(str(example.color), value)
-+            if sys.version_info < (3, 10):
-+                self.assertEqual(str(example.color), value)
-+            else:
-+                self.assertEqual(repr(example.color), value)
- 
-     def test_assign_bad_enum_value_name__raises_error(self):
-         # -- CONVERT: string => Enum value (item)
diff --git a/dev-python/traitlets/files/traitlets-5.1.0-py310.patch b/dev-python/traitlets/files/traitlets-5.1.0-py310.patch
deleted file mode 100644
index eed1b8e0985c..000000000000
--- a/dev-python/traitlets/files/traitlets-5.1.0-py310.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 9ee33f09bdae6bea94641ce39e24dc180df5517a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 30 Aug 2021 23:07:38 +0200
-Subject: [PATCH] Revert "Fix string assertion for python3.10"
-
-This reverts commit dbb604946745ed90c6e9f6ed17f2bde253042d52.
-The relevant change has been reverted in Python 3.10.0rc1, breaking
-the test again.
----
- traitlets/tests/test_traitlets_enum.py | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/traitlets/tests/test_traitlets_enum.py b/traitlets/tests/test_traitlets_enum.py
-index a87dd70..769e830 100644
---- a/traitlets/tests/test_traitlets_enum.py
-+++ b/traitlets/tests/test_traitlets_enum.py
-@@ -5,7 +5,6 @@ Test the trait-type ``UseEnum``.
- 
- import unittest
- import enum
--import sys
- from traitlets import HasTraits, TraitError, Enum, UseEnum, CaselessStrEnum, FuzzyEnum
- 
- 
-@@ -88,10 +87,7 @@ class TestUseEnum(unittest.TestCase):
-             example = self.Example()
-             example.color = value
-             self.assertIsInstance(example.color, Color)
--            if sys.version_info < (3, 10):
--                self.assertEqual(str(example.color), value)
--            else:
--                self.assertEqual(repr(example.color), value)
-+            self.assertEqual(str(example.color), value)
- 
-     def test_assign_bad_enum_value_name__raises_error(self):
-         # -- CONVERT: string => Enum value (item)
--- 
-2.33.0
-
diff --git a/dev-python/traitlets/traitlets-5.0.5.ebuild b/dev-python/traitlets/traitlets-5.0.5.ebuild
deleted file mode 100644
index 107bdc7c23ea..000000000000
--- a/dev-python/traitlets/traitlets-5.0.5.ebuild
+++ /dev/null
@@ -1,30 +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} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="A configuration system for Python applications"
-HOMEPAGE="https://github.com/ipython/traitlets"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-python3_10.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	dev-python/ipython_genutils \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
diff --git a/dev-python/traitlets/traitlets-5.1.0.ebuild b/dev-python/traitlets/traitlets-5.1.0.ebuild
deleted file mode 100644
index 446bf3dde63c..000000000000
--- a/dev-python/traitlets/traitlets-5.1.0.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
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="A configuration system for Python applications"
-HOMEPAGE="https://github.com/ipython/traitlets"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 hppa ppc ~ppc64 ~riscv ~s390 sparc ~x86"
-
-PATCHES=(
-	"${FILESDIR}/${P}-py310.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
diff --git a/dev-python/traitlets/traitlets-5.1.1-r1.ebuild b/dev-python/traitlets/traitlets-5.1.1-r1.ebuild
index 94fbfadcd1e2..bda2ac957905 100644
--- a/dev-python/traitlets/traitlets-5.1.1-r1.ebuild
+++ b/dev-python/traitlets/traitlets-5.1.1-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_sphinx docs/source \
 	dev-python/sphinx_rtd_theme
diff --git a/dev-python/traitlets/traitlets-5.1.1.ebuild b/dev-python/traitlets/traitlets-5.1.1.ebuild
deleted file mode 100644
index 2645480c7cfb..000000000000
--- a/dev-python/traitlets/traitlets-5.1.1.ebuild
+++ /dev/null
@@ -1,21 +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} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="A configuration system for Python applications"
-HOMEPAGE="https://github.com/ipython/traitlets"
-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"
-
-distutils_enable_sphinx docs/source \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-03-15 18:25:52 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-03-15 18:25:52 +0000
commit	be58752269c92e59529b7ac1a99f2cadda464a69 (patch)
tree	5d235c43d5d400d4846aa383a5220dd557666425 /dev-python
parent	4b76e415164b427b26a29d99e46c771e919d5dce (diff)
download	baldeagleos-repo-be58752269c92e59529b7ac1a99f2cadda464a69.tar.gz baldeagleos-repo-be58752269c92e59529b7ac1a99f2cadda464a69.tar.xz baldeagleos-repo-be58752269c92e59529b7ac1a99f2cadda464a69.zip