gentoo auto-resync : 25:07:2022 - 02:55:08

author: V3n3RiX <venerix@koprulu.sector> 2022-07-25 02:55:08 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-07-25 02:55:08 +0100
commit: aeb34c47a1042b074096bacb85205617c8a14d3a (patch)
tree: 905475b28fd25bd6ffbf92d7c1a0100c0474a780 /dev-python
parent: fc879856a16ea66528a11a00cf6ee19891f3d186 (diff)
173 files changed, 180 insertions, 3456 deletions
diff --git a/dev-python/Babel/Babel-2.10.1.ebuild b/dev-python/Babel/Babel-2.10.1.ebuild
deleted file mode 100644
index 5ba05540f593..000000000000
--- a/dev-python/Babel/Babel-2.10.1.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=( pypy3 python3_{8..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="
-	https://babel.pocoo.org/
-	https://pypi.org/project/Babel/
-	https://github.com/python-babel/babel/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/pytz[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_test() {
-	local -x TZ=UTC
-	epytest
-}
diff --git a/dev-python/Babel/Babel-2.10.2.ebuild b/dev-python/Babel/Babel-2.10.2.ebuild
deleted file mode 100644
index 02e77dc3bc66..000000000000
--- a/dev-python/Babel/Babel-2.10.2.ebuild
+++ /dev/null
@@ -1,62 +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=( pypy3 python3_{8..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-# see scripts/download_import_cldr.py
-CLDR_PV=41.0
-DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="
-	https://babel.pocoo.org/
-	https://pypi.org/project/Babel/
-	https://github.com/python-babel/babel/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://unicode.org/Public/cldr/${CLDR_PV%.*}/cldr-common-${CLDR_PV}.zip
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/pytz[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
-	' 3.8)
-"
-# RDEPEND in BDEPEND for import_cldr.py usage, bug #852158
-BDEPEND="
-	app-arch/unzip
-	${RDEPEND}
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm babel/locale-data/*.dat || die
-	rm babel/global.dat || die
-	distutils-r1_src_prepare
-}
-
-python_configure() {
-	if [[ ! -f babel/global.dat ]]; then
-		"${EPYTHON}" scripts/import_cldr.py "${WORKDIR}"/common || die
-	fi
-}
-
-python_test() {
-	local -x TZ=UTC
-	epytest
-}
diff --git a/dev-python/Babel/Babel-2.10.3.ebuild b/dev-python/Babel/Babel-2.10.3.ebuild
index 02e77dc3bc66..e2e44b4ca402 100644
--- a/dev-python/Babel/Babel-2.10.3.ebuild
+++ b/dev-python/Babel/Babel-2.10.3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index 25d9ef7324f5..693e7a780cf8 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,8 +1,4 @@
-DIST Babel-2.10.1.tar.gz 9342917 BLAKE2B fe9f4cff416a57b4964481afcf9cf154b3d9e2c0c88b2b97786cbede1cb068f9637a2168a819dd94770ce3a5836ee8096b2fe7131d2dff16eb0a31a924b9fae1 SHA512 d6f8876bc47d2ad88277f5a9512abb177518b79d4f477cdba11d1cd1af8fb92bfd033c2c05c7a6c32dbd087a28189288f8ac80f9b654027b3e026a06c4ade127
-DIST Babel-2.10.2.tar.gz 9346156 BLAKE2B f6d8c3ccc00c5384c52d98d9939e58a2ec6f16dafd89b5ae5b5a302db16ff1d773d5843d1aca6a4cede859aa7dfa33ebbe4c49bd06c2720e0aa916a097d26fdd SHA512 d292cd26e8eeeed699a8307540a10bb5521a118940928eecf56622d22c01fd566b1c22cd86b33d92c0c1fe3eaaf8c0d634636d288f74f18cb297137de6fdc842
 DIST Babel-2.10.3.tar.gz 9344140 BLAKE2B c21d1e33160de2c98ac26b6ac83102a6249cbaf4b4860cd86e19b461ee66fd815a2972fc3652b411e2030b201bf32db77144fde91efc4e9e6ba51a580cad93b7 SHA512 72a5759d2cfa239df56f3d2809b23367b9691e21de92535b30f9b3455d253682f6c18ca919f3fb039deed2663db9276307f6343cbbab56fca96ff1ac9c214fa7
 DIST cldr-common-41.0.zip 29364494 BLAKE2B 1960e860017c3e5f31d935d66a1ff551720975dca0af459adc72b8dc54100938fbd2d2ef00eb457f3fd04d4f1e90a4783229c350b125029dcda5c1e6903f9a54 SHA512 c64f3338e292962817b043dd11e9c47f533c9b70d432f83e80654e20f4937c72b37e66a60485df43f734b1ff94ebf0452547a063076917889303c9653b4d6ce5
-EBUILD Babel-2.10.1.ebuild 910 BLAKE2B 895df4bfb515d22b3cd49264846ad12a5a401faec5b036730abe4edba17c001ec2603db24cb7bee301466db9e7cdaea303bc2dd3b5cca42d46f4e3f68e8839cc SHA512 f596d31082076c89b37c7ce1388cc5d5abb544980147832c50c4cf53dd53f57379755535e6b9150e23bd9ae67dc14d771e38a4eec1627631548d418416a97ed5
-EBUILD Babel-2.10.2.ebuild 1372 BLAKE2B 38fafd6c6a00ab9f702b69c5c6f4db87e43bdaec25ccffe32e0464e2f8cf1719a01f3ec5cf061be8e54ce5f98f2ff746834fd5a605e0f17f54f37f6ece5dceea SHA512 3ee1db1f977a1466984106474140913481ad142bdce055759cdef7a31a8cb8c9ebd0c63e9aff206e9b10c0a24dfad50287a903af487e1c128a872479103b511c
-EBUILD Babel-2.10.3.ebuild 1372 BLAKE2B 38fafd6c6a00ab9f702b69c5c6f4db87e43bdaec25ccffe32e0464e2f8cf1719a01f3ec5cf061be8e54ce5f98f2ff746834fd5a605e0f17f54f37f6ece5dceea SHA512 3ee1db1f977a1466984106474140913481ad142bdce055759cdef7a31a8cb8c9ebd0c63e9aff206e9b10c0a24dfad50287a903af487e1c128a872479103b511c
+EBUILD Babel-2.10.3.ebuild 1364 BLAKE2B 49006e8f595e5c67bfacde4a471cae1aca5dcc8b8d13975c498f7601bbfb3b80d8bd79b22aca60f32bd43c2d16ab03449f30a0b3d489a572309df4c517fa38c3 SHA512 a44349e63e88fadd9fe1e7d6891925263a80d54ad633ff725fb8e66dafa9bcbd918a8804b643ea37c642addf58d93907568bb0c929d8c54374b535fb0fa9c238
 MISC metadata.xml 840 BLAKE2B b0f46186ca0a319d3e4e1a658007b2cc59fe3a3ea9ede567af5084593f907e88dbe714d2b70c6a882ec95a5f90d4c0e3620ea0a939ad6e52650e770de88a45ba SHA512 621b66293259fd20c94a62ecf64673f7afcd714c18f054c8c0afe2d14e6e98c8abbdf6b4c5cc0043b5d30e513acab292d85c5587a02a9ae99ca007a28720c921
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index efd097b12953..11f013eef5d5 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/alagitpull/Manifest b/dev-python/alagitpull/Manifest
index bfbf9d9dcca0..ac1f89b9be01 100644
--- a/dev-python/alagitpull/Manifest
+++ b/dev-python/alagitpull/Manifest
@@ -1,5 +1,3 @@
 DIST alagitpull-0.0.23.gh.tar.gz 6692 BLAKE2B 63af3da6e98521487fad233dd648d9217d8e89c0d17e49dd771e934c0808a52c0659661ca8104c53c2d0fddf458650458e676e14b2e9c3820f353ab42044a490 SHA512 1620c0e25299f694f29f6e54105a2f336dee90535370a691a6e23a879a68626ef4aa19ae40ecc835553fe3b0272d48e4f5213c1ada054ad20d47034fc20dea3c
-DIST alagitpull-0.0.23.tar.gz 6692 BLAKE2B 63af3da6e98521487fad233dd648d9217d8e89c0d17e49dd771e934c0808a52c0659661ca8104c53c2d0fddf458650458e676e14b2e9c3820f353ab42044a490 SHA512 1620c0e25299f694f29f6e54105a2f336dee90535370a691a6e23a879a68626ef4aa19ae40ecc835553fe3b0272d48e4f5213c1ada054ad20d47034fc20dea3c
-EBUILD alagitpull-0.0.23-r1.ebuild 552 BLAKE2B 7e19442f581ffbd6d11c5da8b0b7fc796b15400fecd77bcc2c57c0015132dadcd3d0a9ffdc8659d639dbfec3777441a6a68c78dbdf795c9d80f2e9937081f9c2 SHA512 e6836892d2f99b83d5d3588b87936dd23f2d62326184da2f89f4692dfff8892565afb2cfcaca90193d0648eb483e7233f27476057a2af7e84762905252b4d215
-EBUILD alagitpull-0.0.23-r2.ebuild 558 BLAKE2B 436c68e42a999604244cc8e1bc2ae9d4dac909491a7037263fa68ab45d4b0a8b7059d2ca847a2bf6c957de20a2504b8a74d4f79ff6d2dea88dac39bd0aa43ac6 SHA512 c8ac747c5dc0634707ac5a4911735b80839e6320f5ed53b5ad54a755d9168673c21c35baa36ec65a1d1b994c2b61b67fa904200480ff1d813915f3ca9ee19317
+EBUILD alagitpull-0.0.23-r2.ebuild 556 BLAKE2B c3308637418b864ef3e5ff2afb4e1739cc24ce5db005e3c9eb99ab9208ed1f258c37b4af7999d153e5237b374c7a28f068d50a062783a3c0889a390982192eee SHA512 d4bd73b6731d95fec0db893f7192a76189ea5aefd8ce496ad0e0dade57991cf84ef11215880e5602421ec0b7976b388e04ec03d8617aca6b64798ed9fd07b33e
 MISC metadata.xml 347 BLAKE2B 7f394b6b5262adc148a746a72308a74d8b7ae3d9c0896c775779415c3a4119026593957a58ea08bdf621309865759a4856a63221d3925258a34e026c1fd61044 SHA512 a5b91da9672da28f77f1ce059f00965de86de54b3f7b45a580b5d5509d42a38f256cf6525cc87a52cf0203713fd81f8cef06fd4dc8a1febf6c7690d6db57dcb8
diff --git a/dev-python/alagitpull/alagitpull-0.0.23-r1.ebuild b/dev-python/alagitpull/alagitpull-0.0.23-r1.ebuild
deleted file mode 100644
index 77abe36881f2..000000000000
--- a/dev-python/alagitpull/alagitpull-0.0.23-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="alabaster sub-theme used on git-pull docs"
-HOMEPAGE="https://github.com/git-pull/alagitpull"
-SRC_URI="https://github.com/git-pull/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-SLOT="0"
-
-RDEPEND="
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}"
-
-# no tests...
diff --git a/dev-python/alagitpull/alagitpull-0.0.23-r2.ebuild b/dev-python/alagitpull/alagitpull-0.0.23-r2.ebuild
index ce9528abbf6f..ae376488c171 100644
--- a/dev-python/alagitpull/alagitpull-0.0.23-r2.ebuild
+++ b/dev-python/alagitpull/alagitpull-0.0.23-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/git-pull/alagitpull"
 SRC_URI="https://github.com/git-pull/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/bashate/Manifest b/dev-python/bashate/Manifest
index 586268f821be..402947f09a3e 100644
--- a/dev-python/bashate/Manifest
+++ b/dev-python/bashate/Manifest
@@ -1,4 +1,3 @@
 DIST bashate-2.1.0.tar.gz 34717 BLAKE2B 6d25c9fe35f976f5ef24d580cb7ee5a30eb79f68f05de2b6784b79ec93ae090ecbc2a2a09b0cabd4a6a997adef6ccb73f8f258044b0443fa231a403115591202 SHA512 6ef17da86113195d8dae093fddb7c17a365b4cd7816ef0ebb98ac6cda61f52526092f7da6c39c11fba9d709a124970e18e93e267f7d0fb38190e313208f66e98
-EBUILD bashate-2.1.0-r1.ebuild 581 BLAKE2B 738fe250001241cc064556db88b882d285cc83f7a7de9516b036ae4f296be6801570644fd05ded18be6e768af99490f24120f98cad1a0c82208b3cb8795b431c SHA512 b2a23c548d8337142e4846c107f62b1082a175e84b0508ead5dfd45943bbbe4038ce2f1a72d6d1e762473c5b8bce4f3759c82dfb4169cd5994481fae3a1720ff
-EBUILD bashate-2.1.0.ebuild 547 BLAKE2B 80026742c91d0204411efda36034e9be6b767443b120cbb8d5c619f8575057da0009ea1b7e937459dab81b4de5a6a72a7bce401832e7ff34933c20fe7bafc3e1 SHA512 e8ff4de79e70c12d7de8797bf670746c886cd5be47784bc303b74996432196d1fefcb77d6aa87cefa1a3f01022eabc67a38e2bc9d0c8c1ee37b3ed24a9f84906
+EBUILD bashate-2.1.0-r1.ebuild 579 BLAKE2B 5fd9a07b53cd6940b8a1aa8516b37212d16ad60b6eb80af15ff06d459e93fa97a0d9fbad1224352a3a2bf20289ab10d4f61196cd5eab5343f3c05b03a566b6c1 SHA512 b9f9b3b03ecb06fb08c0b90684d2da1d80b9565cac5071699b2d4a715c0c0a997ec82b432afe9ed17df6355b5b4566e219b3be4e9d4e0cc4ca518e4d8c9049b0
 MISC metadata.xml 557 BLAKE2B fcbe8cb654adf3d748269b79f868dda3f6662fe0d2579ec2450e29e95d6a35ba2df0a470a387cc257c4df6af54420e7145562c739a0122fdf2f3963b300b1ed5 SHA512 204325d2ab7037d0425f2054b60f065fb998ca2757814966755ce106bd6e69f7e4844bd148ff619d6afb138359bb0567317c348debd391cf093bb52e29559a9c
diff --git a/dev-python/bashate/bashate-2.1.0-r1.ebuild b/dev-python/bashate/bashate-2.1.0-r1.ebuild
index cd0df55538ec..6684d7303e58 100644
--- a/dev-python/bashate/bashate-2.1.0-r1.ebuild
+++ b/dev-python/bashate/bashate-2.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/bashate/bashate-2.1.0.ebuild b/dev-python/bashate/bashate-2.1.0.ebuild
deleted file mode 100644
index d8e9502d73ba..000000000000
--- a/dev-python/bashate/bashate-2.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A pep8 equivalent for bash scripts"
-HOMEPAGE="https://pypi.org/project/bashate/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 157eee6fac3a..cc488849667d 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,14 +1,8 @@
-DIST boto3-1.24.22.gh.tar.gz 513301 BLAKE2B 1b71d128cc8f8224fd1ef521988e6b5e941562c256c2769941340f6a9e3342394f9e2cf20d658bc4b0e9f5ddaebc832ae8fdc96e35e348b73631ca01f0be33a6 SHA512 eb64a050c1b63da823fad2b10db828fefbf75a95ae1f222576eabb8efa80cbbb3e54862dfd40813a8d58f9c329f4d95595bbebc172bcf0141c241499af7d4726
 DIST boto3-1.24.26.gh.tar.gz 515531 BLAKE2B 34f99c4dd224731e07c2f0b175d6d172661ce454a7af16be6856053af1bfac69b7f56ada5b154fb625fe2ba1fb22fbe34b5150c550890e46a923b48f2466b06b SHA512 a3980ec79abd5e2656d7d02b36dff6b8c2acb67033eff134d96dccbb9d8bbc2d711698b87d08d537256fad7e3b3cd7af008018ef567b12d63ef0fc871a8f3b3e
 DIST boto3-1.24.31.gh.tar.gz 519387 BLAKE2B 8581d1018f0e1f0802779851edb52fdb6860c44bf46e6315eddd3b603cb65a0763707686286aa06447e90df6c8e6cae3de0e6bae8a9836ad90e5a3f4335797bf SHA512 370773f2365f4dcc7b73d0828bc84f0de5c15b189d23b799738c2358b1b0119e5e457f26529b7a6c90d637c2142121a2874d088671715c8deb4b793afbf7fd38
-DIST boto3-1.24.32.gh.tar.gz 519061 BLAKE2B f890c39f1cd3fd539e2e99ee3b5b9898da4197a2c00c6409366c70fb0ceb7e957879f2190321c06ac26638310992add19b8a54b2994d3c8d0749496cc0774c5d SHA512 0578112dbccfb76720565c2207c85a8f9e63c51a25ac367cda7ee4c8acce02cb5274d30e1051c049bf90e98f5898a91c71bcea7a187662be61c1ff16ac0c1805
-DIST boto3-1.24.33.gh.tar.gz 520287 BLAKE2B b9bbf7f265e1a3b4dfbda0cfe1d020d211239a7ac67f63a95f7740d4da447dd301ec770e08590365de08bb72cebf703a9c28debe90828206539d939448bbac36 SHA512 6e6a8f04ffd5aa4f87f5cbb884900a3eb6f0831b7bba76d1b8f9a865b3467e98afe9c50e1e2e8fe329a63942925990919d73f0e542edb7ba2b018bd97288ea82
 DIST boto3-1.24.36.gh.tar.gz 522156 BLAKE2B b76cb50f01ff85c960a0984f950e72f02ac6e85131fd344142b886a3c745cb8b9073f865527911b88c462912413fce6df4066752ab5eec8ad1561d349ad22437 SHA512 fe00e78cc522248c449f83f869bb7d76793db9aa436259e74d0aa25984a02876191a7df41b1ad7658b06e418f248ad616743698c87a5c9696f77a196a53c561e
-EBUILD boto3-1.24.22.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.26.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.31.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.24.32.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.24.33.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.36.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.24.22.ebuild b/dev-python/boto3/boto3-1.24.22.ebuild
deleted file mode 100644
index c93eb5e2d7c0..000000000000
--- a/dev-python/boto3/boto3-1.24.22.ebuild
+++ /dev/null
@@ -1,68 +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_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.24.32.ebuild b/dev-python/boto3/boto3-1.24.32.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.24.32.ebuild
+++ /dev/null
@@ -1,68 +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_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.24.33.ebuild b/dev-python/boto3/boto3-1.24.33.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.24.33.ebuild
+++ /dev/null
@@ -1,68 +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_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 60569a2a19f5..8e758d068839 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,14 +1,8 @@
-DIST botocore-1.27.22.tar.gz 9151155 BLAKE2B e3aa6e9814e07bca2bd67d16f6548303af71654021b28f13c43b4005ba24a32cfccffa9a145babb781a6cbff9df3eab7de4c18973c00b3861ba83264eb144537 SHA512 57e43577840c62556760ff40d820898b0ee1efeb5da39fbdfe8c7ef53e86c8184bdfed5a52eeb9d0652fa053900462bdad9820b4a34bd4b5231f361b89c710d6
 DIST botocore-1.27.26.tar.gz 9167551 BLAKE2B 9e95c1e6e5261b08247615446a589318d92cc86768c5e3999f99fb8e2a4a888309d72d4d3d66a1ebf9c1e2b6ccab6265a1d94ad9dcbf9da22aa1ae012aa2bfb3 SHA512 bbb563c2bc8eb3fe022f0b7be263ef16de93aadb02fb7a8e242f53a957a97e8f8b5d043ea8897a7b268d4d64b1e4972f2ccc91b8255f232c858f6a9ba1d93f34
 DIST botocore-1.27.31.tar.gz 9184651 BLAKE2B 01dcd9e94490923f7d0f463d3019007f58c5e441ae65ea2c365ed20417e8f7b532228a335c6f461ca97411269aaa78aa48fa33cccd8b2e45a6665c2410bb4352 SHA512 27f810e0519144fae71600ea7f6d9a15cca30386ee0f2b06beeeb64c06da8728b54709fb770673f708697dd930fe744703728ce00b6a1149361ab550fef9ccb4
-DIST botocore-1.27.32.tar.gz 9191251 BLAKE2B 757aa8e1efe16db3e9bedb545c32e9013eb80fc2b0b6fd61903c2c34d4c5140cce41f7c62822b277119079bdb921102d7d1c431edc5617131ab8cd8d6983054c SHA512 3ae2d0d092961bc061d744e74bbf3a387120a400173f54f4d62284535ee2e505a887f57be7c44f306560ce6d6f82c4ff435d0a9221e8e7f406eb13c7dd26ec11
-DIST botocore-1.27.33.tar.gz 9194408 BLAKE2B 1e942308a19a827b5b05187879860e7f3b78c8a184bf948c2ea6c424410f878bef01feb452b89d3cb60b241c17024a4974ad6997373e8e2423e1f725d137c4b3 SHA512 b3b36e75822188f9080808188de6b2f435fd9fb2f76efc41b1052e24008120a399c75a4f944976732257a936eea9290dbca995db03d377f96f8910f2307a8427
 DIST botocore-1.27.36.gh.tar.gz 9465835 BLAKE2B c22c341d6e762316f3d8719bd8c1fd52140642739361a7ade326d739005dbd141a6b4e1798287b40bf7ba40cd5e158d36f195893d529f5ba375b06087d2122b9 SHA512 09ef156b3c0457ceef341bf26e3f060d3e91808f1da66d1dbb06ba2826be3c61e047383dc9d8a719bb8e172e91f6475f4613c14d30c57c6a909b51c8ba7334cc
-EBUILD botocore-1.27.22.ebuild 1572 BLAKE2B d019098e9bd4f40cfe93307947813ffe3e880e9462b25ff6eaa16caf3ffad2ea5c6db9e482b7b3dc995ca174bde48e90ecd8861a86291c1d454dcf6212bbe7d8 SHA512 db12020b9130b5b940a44ae7fca5a6b0e4c3d84fa2efcff156099d355cab185ea52cb3c4740ebbea25d865d6af8d64ae58ea1e4c6129b1c1026fe8bce6f0580d
 EBUILD botocore-1.27.26.ebuild 1572 BLAKE2B d019098e9bd4f40cfe93307947813ffe3e880e9462b25ff6eaa16caf3ffad2ea5c6db9e482b7b3dc995ca174bde48e90ecd8861a86291c1d454dcf6212bbe7d8 SHA512 db12020b9130b5b940a44ae7fca5a6b0e4c3d84fa2efcff156099d355cab185ea52cb3c4740ebbea25d865d6af8d64ae58ea1e4c6129b1c1026fe8bce6f0580d
 EBUILD botocore-1.27.31.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
-EBUILD botocore-1.27.32.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
-EBUILD botocore-1.27.33.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
 EBUILD botocore-1.27.36.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-9999.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.27.22.ebuild b/dev-python/botocore/botocore-1.27.22.ebuild
deleted file mode 100644
index 7cd0e672f49a..000000000000
--- a/dev-python/botocore/botocore-1.27.22.ebuild
+++ /dev/null
@@ -1,66 +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_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.27.32.ebuild b/dev-python/botocore/botocore-1.27.32.ebuild
deleted file mode 100644
index 830c713f6036..000000000000
--- a/dev-python/botocore/botocore-1.27.32.ebuild
+++ /dev/null
@@ -1,66 +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_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.27.33.ebuild b/dev-python/botocore/botocore-1.27.33.ebuild
deleted file mode 100644
index 830c713f6036..000000000000
--- a/dev-python/botocore/botocore-1.27.33.ebuild
+++ /dev/null
@@ -1,66 +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_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index 65f734bd01ec..11a1289b71b2 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,5 +1,3 @@
-DIST breathe-4.33.1.tar.gz 206013 BLAKE2B c0239dcf79752d3aa0bf72b2867b9e3b2e7c321758dba7a556abaf2296b69c1ae0745ec217857216938199a03fee9d9fa0338034fbd9c01f84ebd07fc15b5f80 SHA512 770c0fd8eaca798c84cbbf138b0b4b1a348e2010cedf5efec085fff348e8b0e548ccbe160ecb112709929ee0cf8fd0d977c5032ae03f74cd39f4bb2ae1d5f14b
 DIST breathe-4.34.0.gh.tar.gz 206989 BLAKE2B 1c899165ae30de373f90c0fd0b3428d7f4d74e3f66720731c2d02bc2a8bd9c6e5bbd81909b8ab186304975f877d276ed0170c611105335032bee3b689cadef73 SHA512 7f3134575f1b8c4d7c96ebc735e33f656b5c6046de3fa2aee95d5e895fb33f0a83fb4b1c64dd69b9deca20b785868b42d6b1d5e39741500ff5f9d82bf3f130b4
-EBUILD breathe-4.33.1.ebuild 851 BLAKE2B fdf0708193c0e2369c35c92fd69892ebbb033e2b5265aa0c3534421feb2e615aaa514b9574a111b8360eea21a1d951d190d23ca5b2a3fe7dd28dd01ae548e7be SHA512 a5a2179340c688545c7e2d0784f4334a9e5f7e670e4b6753ec71cdd3f72393403d5291eb0eb4705e2a69bead65020d8a87a233b868f4a614d9e677b60eb8d125
-EBUILD breathe-4.34.0.ebuild 867 BLAKE2B eaf394858738456e9db5220865a4c6a2217fef5196df75877b19752c09a104911dbb251fd27c087db0e1eead2f19ee44c8abc1450358b0d72311d6dc3ee8d775 SHA512 3581c555bfca0246d5bc1036b284acff1ffd3306337c1c3de9aff3bd0382cb8bd2893c377df84b904f4bb9d38dd9ae6336f94b938e27f98a092d4b5a7a8dd66f
+EBUILD breathe-4.34.0.ebuild 860 BLAKE2B 8fc6ce8f3275cee09bc0fc3bef6bd3df006d3d3acbcbe92e2f9896cf150dfb7d0d276b59d1e11212f02ff1880aacb5c76c3dcf59f40d45164be5a75047b4b7d6 SHA512 4962c20b7d9df7f3ffd6b26d9a3036ac1aafb50925567c1e73669c1dd4ac92776857d989fbceed4befa3d4a271a74f2b11aa054265438f184d396636def55a3c
 MISC metadata.xml 822 BLAKE2B a09a68e18fbcceb11eacf09d338bae8d49dd266e09fc6b622e0ababc35f626276b1d9aa7ffcc2724d036617cd3d81b4f6d8dfc04412cd35959a8468a3aa5118f SHA512 29da310d740a06aece98f36892d6f97c10f3f13de5bf8e70c238663a1b85bde5199766169242a786331d9cbe09a6f0207f186e18d6d13aa6e0b1fd9af5eeaa8f
diff --git a/dev-python/breathe/breathe-4.33.1.ebuild b/dev-python/breathe/breathe-4.33.1.ebuild
deleted file mode 100644
index 1fa5a75ced22..000000000000
--- a/dev-python/breathe/breathe-4.33.1.ebuild
+++ /dev/null
@@ -1,32 +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_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx Doxygen renderer"
-HOMEPAGE="
-	https://breathe.readthedocs.io/en/latest/
-	https://github.com/michaeljones/breathe/"
-SRC_URI="https://github.com/michaeljones/breathe/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-doc/doxygen
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-3.0.0[${PYTHON_USEDEP}]
-	dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-fontsextra
-	dev-texlive/texlive-fontutils
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/breathe/breathe-4.34.0.ebuild b/dev-python/breathe/breathe-4.34.0.ebuild
index 7af035cfb322..653ebdf4f02d 100644
--- a/dev-python/breathe/breathe-4.34.0.ebuild
+++ b/dev-python/breathe/breathe-4.34.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 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"
 
 RDEPEND="
 	app-doc/doxygen
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index d317783867ad..5639ba855695 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1,5 +1,3 @@
-DIST charset_normalizer-2.0.12.gh.tar.gz 83293 BLAKE2B f1e993fff311cd3a1081a68d545703f545d68712c18f3821368c144b6166a8790482711171254f2741117ecbc9e18ad0bd5c19165d5fa6aed24ba021ce08535d SHA512 c42c64a9e15b322da0dfb6afa19947683a31106fdd620c15c0d948593e95e21d0d9c4a94ace32d67a9cc0cd95aea8f40b8fd09807b214f4ae2e79164627da05d
 DIST charset_normalizer-2.1.0.gh.tar.gz 85498 BLAKE2B f18c491b7d2b32cfc3cd92b1dc074b89f562c11a1bdebb9d4ff7c230ac7c2394c6f7cb30caa8cde9d8da26f1ed527a01c28236099b793808274c1146f258546d SHA512 a14e9e1d58eb23c9c568e7e74ab88361f522a76575b5ddc30df392f33584c821cf4943029395d2535c641d8fe441256803e6d2212e52c6f4b0544db64bd73b7c
-EBUILD charset_normalizer-2.0.12.ebuild 848 BLAKE2B cb70cc788c7d9ac7e2eb4a0e27ae1f1a446f3c88d90b909f21ea1a456c7fd1b4ad6b7fe6525cd6edd8cd07951bc2b9860ce1ee6cb49f753c614c52653779ff8b SHA512 4559737ca7997e111cdc0efd2073d32fd0c808045b845742af52d9ac2d8f52d87e4b7b7d1a2122ab315d99139342bfc87f615e0f7ba170a3694d3e8001e27912
-EBUILD charset_normalizer-2.1.0.ebuild 841 BLAKE2B aabd2720ae445ee1d8e9fcc4b59b953cef45efa104f8089002129624ecec92fccc741fd31ae0acc93d02a4ce98c9459913a9175cb1dba581374bfaab53fb0fdf SHA512 55c6e3ad6111173a419731077220df32b8b04de5000d4b78a7c6338187b3ba39f651f1a30a0b121767010049cd9c2526087184e11d52524619a14999da1e9bf8
+EBUILD charset_normalizer-2.1.0.ebuild 833 BLAKE2B b4eae98442517b4f1cfecfa10d79d4fbc17adf4d11e4c08bbb4b1671b67d4fcdfc7ad08c0921b01f80a549de20b3df7d6a8d6ffe8e7a6908caa7ddf2930704b2 SHA512 3163ac5e95a9c4c4b592f6b6ce68db87c1ddca51d7ebe7e06cd124c76cfdecb2876e62b564088bbf5d6e0bfa3f4fb173123080002e51ef74769e511ff3f66263
 MISC metadata.xml 389 BLAKE2B 3bbd21163c92f582c6f19a38c41a73b96adc3e3a3e84ecad87127fd4d77bc7b90f225f3fee8c0799b212881b5890717e65c23e1191cf1ce6a524887a747c4cec SHA512 51d4143d0e35df3d828b8d907cd5420518664c540d059e73c4f91692ca810bc36ee31083eb5d234318d2233348429422f31aa276b605eb74a9a1adcca7a72538
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.12.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.12.ebuild
deleted file mode 100644
index 7322fed2d3c1..000000000000
--- a/dev-python/charset_normalizer/charset_normalizer-2.0.12.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 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_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="The Real First Universal Charset Detector"
-HOMEPAGE="
-	https://pypi.org/project/charset-normalizer/
-	https://github.com/Ousret/charset_normalizer/
-"
-SRC_URI="
-	https://github.com/Ousret/charset_normalizer/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# pytest-httpx interferes with logging tests
-	epytest -p no:httpx
-}
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.1.0.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.1.0.ebuild
index 0ecf8bd8c9ef..07597e4710c7 100644
--- a/dev-python/charset_normalizer/charset_normalizer-2.1.0.ebuild
+++ b/dev-python/charset_normalizer/charset_normalizer-2.1.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/colorama/Manifest b/dev-python/colorama/Manifest
index a926a5a5c9c4..f0bb20f2a6d5 100644
--- a/dev-python/colorama/Manifest
+++ b/dev-python/colorama/Manifest
@@ -1,5 +1,3 @@
-DIST colorama-0.4.4.github.tar.gz 109439 BLAKE2B cbf08d4bd26924e269fd8b2ae6f9c7ecec905907acb296ded52b6b9c473c1a3b88945563cf00d4ddbf01c5bbfc4244997da20b47051594ca86a632a33c29fed2 SHA512 35501915b79bfc5fe46a36f83790ecd79c82150d6b73a57cd55fbe6431ea5ed7a86676504af90147eeb3a963ffd16890e0220099df579a66f2d8f1f7494f862e
 DIST colorama-0.4.5.gh.tar.gz 113373 BLAKE2B d7b071b1efa585c26c48f26af7a0df9bff25e3986f2615889fd25c34d785c256ac3c4655375f13e7d1bc6972f7fa64bd48a819d988160ceb75fda356d645876d SHA512 d4d3b2a4c6a0966b5c15a12cd789e4b68e5b632c4d745d93fcff5e250fe10e5d45dd2a8bd25f4399cca31a358aecf99f354aa3e1b74369ae382b51bd6c87644f
-EBUILD colorama-0.4.4-r1.ebuild 1232 BLAKE2B 51033f020974f97e46dfea112b5af38e34c2655cb245c091e717ae6a63b98e64fb165a0f9a02e68dc689ccf5db971ba264883f234995537e103b173649fd32f6 SHA512 66f10227db6dc88e2bda6c43b3077cdbc3effea45d672608d36dba919dfce8c244629d5ba54645203aa4fa0cdfc40556cd4f35b870f87715548890866d1b5589
-EBUILD colorama-0.4.5.ebuild 1158 BLAKE2B eec3ce96c4a4ab86c98dc8ea8c3e256009a9a7bddbfc4d5f290aed86f4964379cd97d9ee48cdd4d9aeb4f332006bc1e864f003c72afb583cfd30a17702312388 SHA512 aa86aeb94574d6be7e5a1d7827544fef12354f06e3ad758f024a92910190a4717e142b0e53d49bd7923d80f0c8dd4e374d33b68d09755430cceed5bebddda7a3
+EBUILD colorama-0.4.5.ebuild 1150 BLAKE2B 104fb49ae64ebb9224d0e66492c3351a08cbb5e5538defd75e0ae9afc998512a97f781c0e83b59f0c564d13b51f361c19d7cead18832b92251b643ca522b066f SHA512 749e7ddbaf1fc67c4b5c7cdccdc411789811afdc6d10c2b46806d0cccdb4d9ea018b3858bc354cd72d19db077cdc76174876dab68339d2feab1f21e772b9a512
 MISC metadata.xml 526 BLAKE2B f8f74b3797df9f8b0ab5ea81b6318d099a041cc3aac741084802272fdc7aaffdabc1269025f5e2b819cfe4608391a0857d208c487cc8f018578610faaad9f401 SHA512 dee4a202781edd36049ee9738dc9e90ffa63aa3874b389b5d0285147fbf86a577c15d55a868c0714ef982f78a2054636f464d6609af0693639d2449ae3d2ea53
diff --git a/dev-python/colorama/colorama-0.4.4-r1.ebuild b/dev-python/colorama/colorama-0.4.4-r1.ebuild
deleted file mode 100644
index 10a12d133728..000000000000
--- a/dev-python/colorama/colorama-0.4.4-r1.ebuild
+++ /dev/null
@@ -1,48 +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=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
-HOMEPAGE="
-	https://pypi.org/project/colorama/
-	https://github.com/tartley/colorama/
-"
-# https://github.com/tartley/colorama/pull/183
-SRC_URI="https://github.com/tartley/${PN}/archive/${PV}.tar.gz -> ${P}.github.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc -r demos/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# Some tests require stdout to be a TTY
-	# https://github.com/tartley/colorama/issues/169
-	script -eqc "${EPYTHON} -m pytest -vv -s" /dev/null \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/colorama/colorama-0.4.5.ebuild b/dev-python/colorama/colorama-0.4.5.ebuild
index 643b99ccd355..4a54beebbaec 100644
--- a/dev-python/colorama/colorama-0.4.5.ebuild
+++ b/dev-python/colorama/colorama-0.4.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 85a3b905d109..28a1a9c58511 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -55,5 +55,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 EBUILD cryptography-3.4.7-r3.ebuild 2165 BLAKE2B 62aded5c10bc74dd3b9b231cf8d704a361783c113136d117b65193f2d9433d9b6365f84ffd87956919f52000df2fbea7efc7045ef8a467c68b913220d85bf81e SHA512 37d56d46f97b6ff2dd4b30faef32fca1205851555fdee643f2367364591228a7c329aed4e9ac9d077be3b8de93a70651e5fc59a6f566dcadd4427535e9a183f1
 EBUILD cryptography-37.0.2-r1.ebuild 2944 BLAKE2B 9d1342b9bc50e963cfcbdc1d2212b80d7a778c408b0614e49cb417161ef3c5fb9c7e0fd452d47f4f1835ec4c6cd3759799992c812db90dc79021ca65c796c5f5 SHA512 8ab91ceff0dd803379be6f0623cb63dd33b7fe4c147b68c78f716ddacdfc58a4171d5351225dd2199915393ff336e4f2c8afa4779451ca668044ad54d68860b4
 EBUILD cryptography-37.0.3.ebuild 2957 BLAKE2B 8d4886736954913782e0f2e1bdf56cefd23ae1863c1413637f08d05fb5d4fad3c11fdcea4404a3b8c284428c1445382be8b6b34246a2761d2c644314e3d438bb SHA512 c0ac3a44867a489177704180ea53aa60b79083c0e9662388d668906785cc84235a6f2f7c4d61c1357314f77113b1875a23450a4fd8c0e80c850e6905020fab55
-EBUILD cryptography-37.0.4.ebuild 2957 BLAKE2B 8d4886736954913782e0f2e1bdf56cefd23ae1863c1413637f08d05fb5d4fad3c11fdcea4404a3b8c284428c1445382be8b6b34246a2761d2c644314e3d438bb SHA512 c0ac3a44867a489177704180ea53aa60b79083c0e9662388d668906785cc84235a6f2f7c4d61c1357314f77113b1875a23450a4fd8c0e80c850e6905020fab55
+EBUILD cryptography-37.0.4.ebuild 2956 BLAKE2B ba7c5d27f931902c35627a56574a2313746a3d58241485155e35acc99caea7ddeb528454f3ae6cc750417129eb726c98c8db54ef2c9d56cf9c539afe671429ba SHA512 db645547281f462e8f6212c408cda1db9a9f31336d70f0237fa8beee40cf76ac616f69e7922540d4daae4bc067e51f563edd3f79ba6935c13ba94253e013e9a5
 MISC metadata.xml 385 BLAKE2B 28c12f0c0303afca4d0fb015a1ed123efb559686e71477b3120291164a01f219c0dce373d7f4f7380ced372343945a8ee1ce875c27851d3864a468ba48eb2cc1 SHA512 f80a4794ae57fc9e434679ccdd0ff4cc5e2c4fb48274cca32316f827dd6d4cd3b903cb45f52abdd4893866987d4d1026f7ddb1efaa76cb99e0f55d01e8433b83
diff --git a/dev-python/cryptography/cryptography-37.0.4.ebuild b/dev-python/cryptography/cryptography-37.0.4.ebuild
index 0a6fca388dd7..4d080829640e 100644
--- a/dev-python/cryptography/cryptography-37.0.4.ebuild
+++ b/dev-python/cryptography/cryptography-37.0.4.ebuild
@@ -75,7 +75,7 @@ SRC_URI="
 # extra licenses come from Rust deps
 LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2o-r6:0=
diff --git a/dev-python/dominate/Manifest b/dev-python/dominate/Manifest
index 191528da9ccd..f13f8bdba9d8 100644
--- a/dev-python/dominate/Manifest
+++ b/dev-python/dominate/Manifest
@@ -1,4 +1,3 @@
 DIST dominate-2.6.0.tar.gz 35034 BLAKE2B f3a7aba630e925874da7387a1eed7ca15c353cb6464971d73e86eb259cbabad8b7736a0240d5c1578f84dc828f1ad6cd2e404c323dab9c0305031115e450944e SHA512 1bb690d05a290753cabac045160500717eda8c7610ce88d2b88a490abaa64b2cdb07067c433fa6a27110ec6cb67d884d335663217391e61215ac8eb30003d8e6
-EBUILD dominate-2.6.0-r1.ebuild 477 BLAKE2B 22fcba4261adb0e532ab6269403a0b2026ba0b0e26630527eb16901f4a656052c01a0896e8146d6e106af0fc3b4fb1c195a9cf226aa69ed008a5fee703baf342 SHA512 c8a62e7ae75e7a6aff57eb6fd89e187bcb008ed674614c6dbcc813f288dcbaa8fe69f6941593053b0a28edc934185da5cdf50dae9244f191289b234858e094d4
-EBUILD dominate-2.6.0.ebuild 443 BLAKE2B ff5566b324d7313a2f4dcde6801edd582b2ad07e159b3fff357d15ec5c7b9108925967d815e6f152bf23dbbfbcee3be2a9e3b2626e6f2846e7a2f8bea602748c SHA512 4fc24d1f96394890b040e3329727059fd90bae8564efd83eb1aa7f27fc44e95936b843c79531b31cc778608f84eaf503afa19b1a5a985d7185d49ba118d05c28
+EBUILD dominate-2.6.0-r1.ebuild 475 BLAKE2B 6aa96bc695fd8686c18a802d0f38d3203bb0a5ce8ca69081f01fc92372dc33fca12320843052f8aa510b66a75238a7d72f5c35413b8d7709d0245f7b184ce32b SHA512 0c17397614d59527065322d0b7a3624e859f0a31888eb46ddd428ff87fdcd1e264a4abc0a477274646ea9001342a7a9ffe2b4267f6e7a526b63e2973b46eb9a2
 MISC metadata.xml 796 BLAKE2B a6b8a73d12e14552aed0f4b4f2a4b5ff282829d44da6a3e283a04575bc31069d5e83a0f475d184896c586b416882507fa22ccfb346aec90692a47f28ea54646c SHA512 9a018dd4858f7a89ac7cfd8b1814df9bb24ebe9e811f0f98e2fe52f047b14bf742648de9c0e4ce55ff69434755d8b365297bd41a5909c63697eed925e1a30b03
diff --git a/dev-python/dominate/dominate-2.6.0-r1.ebuild b/dev-python/dominate/dominate-2.6.0-r1.ebuild
index a6f3d3645536..92a60838c140 100644
--- a/dev-python/dominate/dominate-2.6.0-r1.ebuild
+++ b/dev-python/dominate/dominate-2.6.0-r1.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/dominate/dominate-2.6.0.ebuild b/dev-python/dominate/dominate-2.6.0.ebuild
deleted file mode 100644
index 524adfd81d6e..000000000000
--- a/dev-python/dominate/dominate-2.6.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for creating and manipulating HTML documents using an elegant DOM API"
-HOMEPAGE="https://github.com/Knio/dominate"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index d10be1a0d988..a97d8e15005a 100644
--- a/dev-python/fido2/Manifest
+++ b/dev-python/fido2/Manifest
@@ -1,5 +1,5 @@
 DIST fido2-0.9.3.tar.gz 217894 BLAKE2B ccc3a9b59045216037664b5bf4b969a79b86b300f67fc4253b563acbbee98912ea076996772f17b88141d2a36a933b4926de96f05c53e204d0bb4eaaa2daad6b SHA512 f105c347784cdfab88ab08852227d24f4bca623145f7f76bd066dadab6ada1eae751934fd4dc7436a5c5fb3a0ed2fc4d5c59bb2a93888d470028f0713ca7e09e
 DIST fido2-1.0.0.tar.gz 245631 BLAKE2B e9ee319c19a9d4b687958ee2f9b2b809b8fa1d41bd278bbd7e26a5bbcab51791d6b8565dd6cdb6abf6804db4604f4b02e2d7e73cbbf2a237d72a0679c3ebcf49 SHA512 778128fb4fd459bd096eb440034a08c8883bfd29dbe834f3affb451032a5d5a22c79ca71be257b3c333a9d9890602558502848e83cd3efab4b6d6762e0622670
 EBUILD fido2-0.9.3.ebuild 1345 BLAKE2B 4c477249eede6dd1fd6cd1856af5766e95aac6d007e2de65c72688422ae1905e09afb5fb646a1ed78a5409990c127859f96aada6210212c53c723316f39ac133 SHA512 83975e9bb7f1d97b4142974fdb01e3d83fdd8fab874cf1b1a226e296f0976bcd35d7dc96bcf1c1d049e4ed478d037a3a4027f1c9ca0613b398e134ee94e83b82
-EBUILD fido2-1.0.0.ebuild 961 BLAKE2B 1d18b41fa0295b06a26e61e338b376c01f200299a0d212c58ce167fb00d157d750c822624603d3bde0579db20e9bf0d70e2abed029b764b21678fdf3b83c8c87 SHA512 9184ce099e83bced60aefb4c3bce99a9fe58143f759d96cd55e8caf20d402aab18a9947cda4ae52cc3f0d9f4d8583e5ba2cf302bf74629318bf9ed27897b7810
+EBUILD fido2-1.0.0.ebuild 959 BLAKE2B c9268a458e2557f020be5a03511d5d4e1c85a4fd970c6346e68fdf91130e3c62cec8a56d27944b8dff90d1eb658bd5da927c2b0c139de720d850a137e7f3137c SHA512 91dcde7f8e1f3e26594ba91aa14045da362c0aa9ceb8b3ad830319e99fe93d33b0c4e4cbdb048406d6b03fdc96f25d2c9324e040bfbf80e3bace2c45ca68cdc7
 MISC metadata.xml 820 BLAKE2B 092fc3aa0dc3e3a8998e7cef0a3229d5b8791983dc07df84c74ff6b7221afc879aa5a39a6ad58ff0bfe2836fa48b57d3445f20a0c78e2affc3bc47b73b81544b SHA512 f588e6637d75b668dabf80fc2c8e1133119a770d4f7fa5077025e0a478f8eb9c7f18eac1ce15395549485625bc4c82bdeebf07440087cd074e95d42a685eef53
diff --git a/dev-python/fido2/fido2-1.0.0.ebuild b/dev-python/fido2/fido2-1.0.0.ebuild
index a8edab7138a3..20e8481f1821 100644
--- a/dev-python/fido2/fido2-1.0.0.ebuild
+++ b/dev-python/fido2/fido2-1.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Yubico/python-fido2/releases/download/${PV}/${P}.tar
 
 LICENSE="Apache-2.0 BSD-2 MIT MPL-2.0"
 SLOT="0/1.0" # Bumped every time a backwards-incompatible version is released
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="examples"
 
 RDEPEND="<dev-python/cryptography-40[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-sphinx-themes/Manifest b/dev-python/flask-sphinx-themes/Manifest
index d175344cab2d..eab2a570a5ad 100644
--- a/dev-python/flask-sphinx-themes/Manifest
+++ b/dev-python/flask-sphinx-themes/Manifest
@@ -1,4 +1,3 @@
 DIST Flask-Sphinx-Themes-1.0.2.tar.gz 9066 BLAKE2B f4c67bf6c8e064a9d278779613182fa2139c83255b6e5c28adfd7d5e8df90c2203a6758dc22702b2d708d9876de029ff4e4d05daeb462dc8127bbb28a1392ac0 SHA512 55893b19f1c3da026e1e6d98143ccb4d2939da0d76e6530dd00f72ace6095d0fd038213a4ad02151a82670543634c6efe61a546df3ef90d71b1864914d36e2ac
-EBUILD flask-sphinx-themes-1.0.2-r1.ebuild 584 BLAKE2B 7aefe292e6cd5eca16f8c75c7f97accf8044406adcfa79202fe8620da21f8392b97a01367f6c3c741495aa9515d59586a8af69816f5df98c44cbcaeed1cc740c SHA512 861759b89aabe3edb45e29a297d477c02eca8ba0d223a24b74a3cde245b16d38d279dd3a9684a1c430294e5c418725eb3cdba21400952b8576a3483b74a0cc51
-EBUILD flask-sphinx-themes-1.0.2.ebuild 549 BLAKE2B 32b2f7220cb8e762bbbb49feca26e25c2ae6da1e7c7c848a5c352cccf968162fcba4fa2a6b510fde66904f37c40a408410fdde4da62263d19ec0a8c070b3316a SHA512 a813813c81077a15ce88ffa2ab1f7b522433093286545cb00400ffb6048b0a2b5175890867aac88eb0e51b29031d15685bbad86c69f3bd0e986b024a05b6ab4d
+EBUILD flask-sphinx-themes-1.0.2-r1.ebuild 581 BLAKE2B 0b07646155cd00a529c6ffe42eb18fbac85258a51b17fd36f744812d758d444501a3816d4f0e22b40fa58c4832323d78d96597374cf9d55f0c1c918ad8a66de2 SHA512 d807862b7629c55369385d105420480d78c0fe8b08d3a18ad233c5477758f12506697df0945b5ab00e613b059d45bb0ee651db44406e84d44e5212c7d55ce946
 MISC metadata.xml 504 BLAKE2B 4fe3d61ba640b18462737907d7048d3f81a4378b946f9552e5e145ea77f94618b5d4b6e2582f7b8933ff4bd2093f12137bcc8f37db284e93fe1a50db7f0c312c SHA512 576cbb6cef7b45e3dac5f23f0684ff2dccde20237cd8c2449fa9f67b7265561507a8c5067022eb93e16b222941d6af70593d01d337fcf1a3df2c8992b3a4dc66
diff --git a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2-r1.ebuild b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2-r1.ebuild
index 0bf6ea6f402c..9673f91c3285 100644
--- a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2-r1.ebuild
+++ b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2-r1.ebuild
@@ -17,4 +17,4 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
diff --git a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
deleted file mode 100644
index 2fcb2605b2ee..000000000000
--- a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.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
-
-MY_PN="Flask-Sphinx-Themes"
-MY_P="${MY_PN}-${PV}"
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx Themes for Flask related projects and Flask itself"
-HOMEPAGE="https://github.com/pallets/flask-sphinx-themes https://pypi.org/project/Flask-Sphinx-Themes/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index c36af1757d79..4c67d77bb2c3 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -3,5 +3,5 @@ DIST geventhttpclient-1.5.4.tar.gz 59551 BLAKE2B d1bda5315a92afeb408f33043c8ccf5
 DIST geventhttpclient-1.5.5.tar.gz 59566 BLAKE2B f43ffe9880eefe77f19adc00bcef612df057f96e256f50ca4081658d7e0d01deca2473da3d2055dbc1cb98fc4f7f0a7442809fdcab635c43042792e2601efdb9 SHA512 89efe008099935ac8715ddf09c13e70c1a3552da50c495522b2a62e1ff51a407808e6b797f8fd3b0863a3a59e5b03e604bda8b1027c0326da75cb1fddb5d0fa3
 EBUILD geventhttpclient-1.5.3.ebuild 1497 BLAKE2B 500fba9aefe32214d5896c9ad01f6dfa60b5c6b317764f64177cc590a5179dbe2e1f822571e2e1983f5b66b562ed7dc88ae37eab8243cd268a8d7419bf746fc6 SHA512 ccb07a069c62871956206cc0c98e0378d75edad600ec449a715b459968c225ed442ffd8189c2fa03359daff0de89c11fc2eec2cc027205ac768d45e47174b32d
 EBUILD geventhttpclient-1.5.4.ebuild 1538 BLAKE2B f52d86da5a52c30297c0e0b9c5cf94ed592c270b56e6b310bf94c824947810dfbae8a95445d369d7f28be68d80c817ff08300955d0d45070708116250864e236 SHA512 8dfabf1db715be2d32eddda352755da6bee4ee9d4d4d81e9c01ef86cbf573daefd0e2a52b9c927ffba7adbeecc3378caa8c96f0e38c68e37b0c1e17a51070a9f
-EBUILD geventhttpclient-1.5.5.ebuild 1538 BLAKE2B f52d86da5a52c30297c0e0b9c5cf94ed592c270b56e6b310bf94c824947810dfbae8a95445d369d7f28be68d80c817ff08300955d0d45070708116250864e236 SHA512 8dfabf1db715be2d32eddda352755da6bee4ee9d4d4d81e9c01ef86cbf573daefd0e2a52b9c927ffba7adbeecc3378caa8c96f0e38c68e37b0c1e17a51070a9f
+EBUILD geventhttpclient-1.5.5.ebuild 1537 BLAKE2B 95a38c76ce6f8e6ee2690c47a1e9603350589018ed27eaff31db654dc6492dc3d086616e39b77fe700c615cb3915e41c1236f0da35f8f07eb4c57050afdf1a05 SHA512 ad3946b8cf03fa57946c91ea79820a56082ef55f00b747971bca2bc6e5ed482f371adbdb91817b96b98b450b9c4411e22308422398226f8a8c888d131abd3f7c
 MISC metadata.xml 580 BLAKE2B 24b9860ee1f361f1ced81967a404c4cf773e415c053ac83ff0b2bb97bcbbaa5cbba4e7faddcb615379d3057d2c3c28d59f9c8a0a36135edf9165615610ecce45 SHA512 5c3a892358d1fc3594d08c3551b441eaa2e38c60cd06952a62631a4ac687ab730be559ecfb17f9ab7878d0052b4ff7e03d6d49fd1a277bff71c1ef4fc369daf8
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.5.5.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.5.5.ebuild
index d4807ee44f57..0cd9f0fef1dc 100644
--- a/dev-python/geventhttpclient/geventhttpclient-1.5.5.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-1.5.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-arch/brotli[python,${PYTHON_USEDEP}]
diff --git a/dev-python/git-review/Manifest b/dev-python/git-review/Manifest
index 839e69268fde..e9e0a35c80ec 100644
--- a/dev-python/git-review/Manifest
+++ b/dev-python/git-review/Manifest
@@ -1,6 +1,6 @@
 DIST git-review-2.3.0.tar.gz 66005 BLAKE2B b074811614093058525ec817770d9d1d0d0adc4f154ec7a8882406c1954672063e3cd58df28d0ce17735b5a135f0a6be97657207e16dbe8b7719e9b6f77aea28 SHA512 841ea039e73e2571ee01ba08781d82c5ee0c136be092d2f7ff44e59284f2e77d57537ef5aef3eaf24a0f93f63106fd2404e1ec89745a723386944b5e0b32faf0
 DIST git-review-2.3.1.tar.gz 66400 BLAKE2B 67b2bf60e91a127144995231b94a48eaa03cfe8cb8e27513183f21b4cae1fbe2eeaa00a23d21da2dd7258aa794ce4cb0ee06e91510d707116699da1702bbebac SHA512 b3fe0ab40c473c80da20c42b4104e82115c9ea02bda01580aedb69622e117d733160eb42027432eec12379250186ea7b6f9eb4cb86b128a591816243a0c0fadc
 EBUILD git-review-2.3.0.ebuild 782 BLAKE2B ff9255a07fcdcc81c3f17f4f9067ae19d7e717e1dd3fafb087e96066ca621350142027eda30cace90561a6d63dcdf9a09c4a5643cb71b30598f20c28675c72ab SHA512 d6314d81c5fe52d91684c2c313cf2969ad57001f6ad5f00d001d12fbbf70a8144bf9de9869579c150f558c1c359a4ee727a05c1628a9186374bb2d0445c29c7b
-EBUILD git-review-2.3.1.ebuild 784 BLAKE2B c2d971221d2bb7a6d07c4d961505d2cf7cc03785ee94eacb7496fad6fd999ee2fa21971e302a0a25de533a9153d36f92405bfe575dabead70afff8afa11e9ca4 SHA512 7267baf2963f6338b961241af52af728af0b8c2d8430c99e139f8f7e1f20800380781abb90cf9cb3fbe44f2e43955321953bdad5d14ec0cd28799e9b63eee875
+EBUILD git-review-2.3.1.ebuild 783 BLAKE2B f8af45d3eeb096f887d9803abf5e9bc0af3dcbc190303bdfa54c21926a61f3b3b12bd49241431e3e355f65e750192c6da48d52c3325053ec1ab6b98e1d68a8e8 SHA512 10b7b4c44a21e31ee64679f74624731f5195179ad7209934bcdc885d0cad37f6f8a4f6a0a836028fe3f8fd4fe38cdf9632d18a4d84e992a6b4740ce38f0b27f3
 EBUILD git-review-9999.ebuild 784 BLAKE2B c2d971221d2bb7a6d07c4d961505d2cf7cc03785ee94eacb7496fad6fd999ee2fa21971e302a0a25de533a9153d36f92405bfe575dabead70afff8afa11e9ca4 SHA512 7267baf2963f6338b961241af52af728af0b8c2d8430c99e139f8f7e1f20800380781abb90cf9cb3fbe44f2e43955321953bdad5d14ec0cd28799e9b63eee875
 MISC metadata.xml 338 BLAKE2B b891e2436716d179293d3a1844dc671cb2c4270887260921b04fa3674d999805d4845337b73d3e45a34b2105b900209c7630f85962ea59fa8b472946981b4b6d SHA512 b8e512c07502ddba83bd5012ca036fb364ecf433408e70f036290b4209f0f06bf085de7a7519f47f46f1e68df9e9c97349cc55454b48ccf9dbf57dddc1ec28fd
diff --git a/dev-python/git-review/git-review-2.3.1.ebuild b/dev-python/git-review/git-review-2.3.1.ebuild
index 16e5454edee8..13d202bab76e 100644
--- a/dev-python/git-review/git-review-2.3.1.ebuild
+++ b/dev-python/git-review/git-review-2.3.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://opendev.org/opendev/${PN}.git"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index 87589e0dce30..26d36d22add5 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,5 +1,3 @@
-DIST python-api-core-2.8.1.gh.tar.gz 164630 BLAKE2B 88db73f210ae5ee4aa2e7382ea34ef59fb51f88e196622556327c130057b74594884bbe21719bf12cc6ddc9975cf12ac71fa24ac4dfde4681b4742af57702b5d SHA512 f3bfa476562428246203592b53c22e8e52af167af10b1fa68afb51fe6e8ca8090e9231e4c297847d12c201ca791aa80153bee07f72939bc65920260ec50b3d38
 DIST python-api-core-2.8.2.gh.tar.gz 164586 BLAKE2B bd62b20d1be52f0a2227d1663ee37ce31d991e0773ed793a3999b70c74e03a28ac188cc331027def0055a5b80e93378d9ec5baa389c65e7d2f183b37233be5ac SHA512 5844339cee71103650c446f002dcb13a632086d96dec1ed04a0ad5e4d3a61cc2a8e048da3e6445a50a0c009b0d25729f02865d28484bfee2a3427c829537e350
-EBUILD google-api-core-2.8.1.ebuild 2116 BLAKE2B 2de96b01871de23ecede06ab214e606d22fae01fb2f4f57a1ac1568f2a6044e898022df1c0311dd3e5b7a23af6c8a917b713e45de399914c1bb1573b2a54c880 SHA512 e203f44aa72c910a49ab836c45aa2766f428f89563333401169e181d4f273853512608c8938f949855a0bbfebe576b3965af5cf985b43ab360202c3a1a6f7112
-EBUILD google-api-core-2.8.2.ebuild 2118 BLAKE2B 2b8508a51da3bed4950e4e3c9066acbb1a8e3404415beb4108ac0cf8f72eb43ab367340093fdc377b83236a306a339e4d4cef26286da2fae8a44f60446179073 SHA512 7aee5143b8943ee5895244e40b68ba4fa31401eaa1909aeb79887c1ea338f678d292400a516c8f6981404b041766580b01813b0a837bd47640c7b2d7c7663637
+EBUILD google-api-core-2.8.2.ebuild 2116 BLAKE2B 2de96b01871de23ecede06ab214e606d22fae01fb2f4f57a1ac1568f2a6044e898022df1c0311dd3e5b7a23af6c8a917b713e45de399914c1bb1573b2a54c880 SHA512 e203f44aa72c910a49ab836c45aa2766f428f89563333401169e181d4f273853512608c8938f949855a0bbfebe576b3965af5cf985b43ab360202c3a1a6f7112
 MISC metadata.xml 453 BLAKE2B b53e834b3c423d8bdceaa2568f38173fc203f92f2340edd42899e4d4a93602118dbdb2283d492e34189155c336ec659d96f907f257b34cbe5557be331169a4f5 SHA512 d26c893b82fa946cab27669148b3dc2dea8b985636209ae49294cb14a7055f6c4a3884b38bce6e4923a54e9872af7e540b33a992eb727caae96e071a8ffe3237
diff --git a/dev-python/google-api-core/google-api-core-2.8.1.ebuild b/dev-python/google-api-core/google-api-core-2.8.1.ebuild
deleted file mode 100644
index 668d75698795..000000000000
--- a/dev-python/google-api-core/google-api-core-2.8.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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_{8..10} )
-
-inherit distutils-r1
-
-MY_P=python-api-core-${PV}
-DESCRIPTION="Core Library for Google Client Libraries"
-HOMEPAGE="
-	https://github.com/googleapis/python-api-core/
-	https://pypi.org/project/google-api-core/
-	https://googleapis.dev/python/google-api-core/latest/index.html
-"
-SRC_URI="
-	https://github.com/googleapis/python-api-core/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/googleapis-common-protos-1.56.2[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.15.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-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_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
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-src_test() {
-	rm -r google || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	distutils_write_namespace google
-	epytest -p no:aiohttp -p no:trio tests
-}
diff --git a/dev-python/google-api-core/google-api-core-2.8.2.ebuild b/dev-python/google-api-core/google-api-core-2.8.2.ebuild
index 2ddf9d7fb8e4..668d75698795 100644
--- a/dev-python/google-api-core/google-api-core-2.8.2.ebuild
+++ b/dev-python/google-api-core/google-api-core-2.8.2.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/googleapis-common-protos-1.56.2[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index adb9456b17ef..4b9870b8d92a 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,11 +1,5 @@
-DIST google-api-python-client-2.50.0.gh.tar.gz 30751763 BLAKE2B 4fa967932d13fa03640970ba2b6b1756864d88e4953deb5c9cf89a4556bd2cb3f1083f2e141b89a08936a40ddea64e45d65b5d9afe4024edf94a56c5ccb32798 SHA512 8dcdb85f2f37d4c668924abba46f0012ad453dc0775b373dc9fc510020479b1dc8a22cd85980ab97bcd4e7bdff19c78d829b1d758e9105a71c3ac7aa0cb19946
-DIST google-api-python-client-2.51.0.gh.tar.gz 31181726 BLAKE2B 465cbc3beb870a543bb54b69342d1a4e75026fa3c83846a3641e048b922cfa14ccb56593a0e8feadf4bf30568425347b14f5f1dd081d5d74fa1112bb0d57caa3 SHA512 ea9e9424aa36e077f10922dba9d6bf43f376d5e059c5d0fc7a31ef919232eb7778a891104fe3a7328e841381d5cd2cd76cdfb1fb80458c979f83a935f8b1df5a
-DIST google-api-python-client-2.52.0.gh.tar.gz 31712232 BLAKE2B 573226a90617aaf2b0272393694759f2796cbaf26629f4d79ecb661424c6304689fafda7c2d60289840445f118dbae4cf0ffbd6444bc0c428ee4bb8879a57c92 SHA512 55fc06c50240b22ed51ecd84e797eebc4c57852da9c45ca8c0face7e961ab0debe06d6ac91fcc6ef81878fc4b851b8bec7a192a4e149f611fe9e4d8b15cccdc4
 DIST google-api-python-client-2.53.0.gh.tar.gz 32251370 BLAKE2B 880024a220bb793b53042c8b2192dee666b7f5ad6dd8b0b68d51ff7b18ebd2ba220974f86656ac13b4c421c191ec66b269007a3f68a1992b0672623db046ef6b SHA512 1cb251d8abbec0b33b62b661ea8235224e94f807571b47e8422b6908b6636f844c639328cf0c07b4820a083b265e71f54dc3f6c48447f0cfd20bca738d7ab86a
 DIST google-api-python-client-2.54.0.gh.tar.gz 32389268 BLAKE2B 568ff657ea5093ff927208cd38d0125bf4aea8b725c5ded0a232c4de77f59c97f639b7f2b0ab8cf0e121bafd4512c23f9ac4c3c6cce6b6ab407c6ad2bb5a4983 SHA512 f33525bee9b6cede8955af4e208b64d1c82185cff08173d9ae30a704c3239b9a2ee9972e083fd4a823091b76669a7df02bf60cd950a3e20ddf21c6fd2e5ee18b
-EBUILD google-api-python-client-2.50.0.ebuild 1442 BLAKE2B f386901776c1845ec0815ba4254b5e6cdbeec0c7dab8a3928bb60a6259ef1140bd4e3ece4287fc3ea0e1833a69cb8432fa973447f83846e60b6a6b2038bfbb20 SHA512 828e71b82de37f6d50f980e897c0cf5a46df036dcfa005906aed6772455c8f5059c1fa6bcf0b2340fb9307df08df2789e6421e26b5c0ff28774844c3a36c828c
-EBUILD google-api-python-client-2.51.0.ebuild 1444 BLAKE2B 4bd33fb2b9ec7d091d0b8e5aadbc24c5c786d4adf497087e749364f74f54536db99cd9efc6ade89b333e60ac09220badf45e721fca040227a53f151ee197b131 SHA512 4a3be7d069bf83dba8a7911ce9ed5761e1fe2c78dacb94a921aea897a0ba201b5c58983de5a487f841f498501b7e2ea7a5bdefad29a518fd75e546ff3c10925e
-EBUILD google-api-python-client-2.52.0.ebuild 1444 BLAKE2B 4bd33fb2b9ec7d091d0b8e5aadbc24c5c786d4adf497087e749364f74f54536db99cd9efc6ade89b333e60ac09220badf45e721fca040227a53f151ee197b131 SHA512 4a3be7d069bf83dba8a7911ce9ed5761e1fe2c78dacb94a921aea897a0ba201b5c58983de5a487f841f498501b7e2ea7a5bdefad29a518fd75e546ff3c10925e
-EBUILD google-api-python-client-2.53.0.ebuild 1444 BLAKE2B 4bd33fb2b9ec7d091d0b8e5aadbc24c5c786d4adf497087e749364f74f54536db99cd9efc6ade89b333e60ac09220badf45e721fca040227a53f151ee197b131 SHA512 4a3be7d069bf83dba8a7911ce9ed5761e1fe2c78dacb94a921aea897a0ba201b5c58983de5a487f841f498501b7e2ea7a5bdefad29a518fd75e546ff3c10925e
+EBUILD google-api-python-client-2.53.0.ebuild 1442 BLAKE2B f386901776c1845ec0815ba4254b5e6cdbeec0c7dab8a3928bb60a6259ef1140bd4e3ece4287fc3ea0e1833a69cb8432fa973447f83846e60b6a6b2038bfbb20 SHA512 828e71b82de37f6d50f980e897c0cf5a46df036dcfa005906aed6772455c8f5059c1fa6bcf0b2340fb9307df08df2789e6421e26b5c0ff28774844c3a36c828c
 EBUILD google-api-python-client-2.54.0.ebuild 1444 BLAKE2B 4bd33fb2b9ec7d091d0b8e5aadbc24c5c786d4adf497087e749364f74f54536db99cd9efc6ade89b333e60ac09220badf45e721fca040227a53f151ee197b131 SHA512 4a3be7d069bf83dba8a7911ce9ed5761e1fe2c78dacb94a921aea897a0ba201b5c58983de5a487f841f498501b7e2ea7a5bdefad29a518fd75e546ff3c10925e
 MISC metadata.xml 538 BLAKE2B bf0b8ab3a89ce9ab1d2159f4c0ebfe3f2646aced20bd2006485510c12d22e83cc130fac979f699ae6431a610c8d2acf86c04b39bc262abaf167c20571a860810 SHA512 30d004d944055660165954f8475e57ba45cef56423c80a324118836d78e5376261409955155a40c9bd988f230f3e2fc44c6aeb6fae3028c78c55a382ccd83bff
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.50.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.50.0.ebuild
deleted file mode 100644
index 1c528a1a0c2d..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.50.0.ebuild
+++ /dev/null
@@ -1,53 +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_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-SRC_URI="
-	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
-		-> ${P}.gh.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/google-api-python-client/google-api-python-client-2.51.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.51.0.ebuild
deleted file mode 100644
index 7e8aaa05d6d4..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.51.0.ebuild
+++ /dev/null
@@ -1,53 +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_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-SRC_URI="
-	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
-		-> ${P}.gh.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/google-api-python-client/google-api-python-client-2.52.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.52.0.ebuild
deleted file mode 100644
index 7e8aaa05d6d4..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.52.0.ebuild
+++ /dev/null
@@ -1,53 +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_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-SRC_URI="
-	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
-		-> ${P}.gh.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/google-api-python-client/google-api-python-client-2.53.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.53.0.ebuild
index 7e8aaa05d6d4..1c528a1a0c2d 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.53.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.53.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest
index 4e6c91c48238..1202a73a85ce 100644
--- a/dev-python/googleapis-common-protos/Manifest
+++ b/dev-python/googleapis-common-protos/Manifest
@@ -1,7 +1,3 @@
-DIST googleapis-common-protos-1.56.2.tar.gz 109718 BLAKE2B 6aeb43927f5c2b0332dbc478d47b06d49490b666158b35b5e58ccd3290939d903865f60ff11f396f9f329bb64382aa636d87ebd06cefcb66d465a0551843178f SHA512 814dddc95fa5bde437c124ff8b66c281f98cae6c0143d473b9194a1367ccaf7915c21450f79f372be5fdb3c4fb41c9d717e57244f2dbd1e819b927b8d86e8d2f
-DIST googleapis-common-protos-1.56.3.tar.gz 109601 BLAKE2B ac33ad2d9c737962bbc8c505ce03f57c9add2c9e9d7909371bac33651209bda8a6f85d00d9d93ca8f5bca5a88a3d148c6b0da210dd8330b2711cf3de027a307f SHA512 258f5408c3aae884ddcb13a606f369e80f56675296edb4fdfae1633bfdc707cae414920f87c21e210940667ede2989de7d80355a4b6551f5a9fc567a99fb64c6
 DIST googleapis-common-protos-1.56.4.tar.gz 109551 BLAKE2B 14886a639258c62442f1bd33959f303f280728584d1d2cb2c0f9666b1fd645b9166eea3c149d3081a36ca61b7c48ef0677760d0078f6c46f6c9ce3338d0664b6 SHA512 c4dc3d5390caf5b671b5cf091410d660a96e5e5df5b9584cc757cc5c6929dabd8456965a7721a7573fa28ba8143af8f4c30183193f2e735eb1e25b66b1e15d7c
-EBUILD googleapis-common-protos-1.56.2.ebuild 821 BLAKE2B 3692f07bb33fe1831f444290716690ce77bd7e9a0bacb745e5c2c9ed64c19bb190cce3e803d11d78e4b8959b1f6bc17eff83723c6ccae9af4b05dc1e2f07c7f8 SHA512 651a2b8fe712bcb4e48576dcabdfffde7343391f05cab80717f6b61c9b166aff107943cba085f7863c0ff5a249db676dfb230d8e857879c49e570dac444a1323
-EBUILD googleapis-common-protos-1.56.3.ebuild 823 BLAKE2B eb1a446f4779f4677c8b493b970ba178cb023d351013a8690c63a2e66eefe606146e8420616e4683ad3aacb4c788d7716288d90f0dede7909b8a516795d3aee6 SHA512 29aaf95b88310c3cad592abaf27473cec869ad7dc085264178cb6882c461346ea7b79599fd71860d1f4ea5ae85997c2ce440a379c89a23f678dc1680cd7fe0ad
-EBUILD googleapis-common-protos-1.56.4.ebuild 823 BLAKE2B eb1a446f4779f4677c8b493b970ba178cb023d351013a8690c63a2e66eefe606146e8420616e4683ad3aacb4c788d7716288d90f0dede7909b8a516795d3aee6 SHA512 29aaf95b88310c3cad592abaf27473cec869ad7dc085264178cb6882c461346ea7b79599fd71860d1f4ea5ae85997c2ce440a379c89a23f678dc1680cd7fe0ad
+EBUILD googleapis-common-protos-1.56.4.ebuild 821 BLAKE2B 3692f07bb33fe1831f444290716690ce77bd7e9a0bacb745e5c2c9ed64c19bb190cce3e803d11d78e4b8959b1f6bc17eff83723c6ccae9af4b05dc1e2f07c7f8 SHA512 651a2b8fe712bcb4e48576dcabdfffde7343391f05cab80717f6b61c9b166aff107943cba085f7863c0ff5a249db676dfb230d8e857879c49e570dac444a1323
 MISC metadata.xml 537 BLAKE2B 7b81f41f34a3c0fa53340ad298440f67727eb1830009899ffa10835485f66e727844735a88bed94b8a0bba14fa01a78d8a04f5ca3edf48a72781c7e1a797459e SHA512 6013da3540915e13a0cc60336bbefada12fbf71c04d4f40634f24015ada732d0d8b86600401bdadb2c7df2ea84f7097669f4efe6cf176ccca5efe46e9a3869d9
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.2.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.2.ebuild
deleted file mode 100644
index c2d6a64bc69a..000000000000
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python classes generated from the common protos in the googleapis repository"
-HOMEPAGE="
-	https://github.com/googleapis/python-api-common-protos/
-	https://pypi.org/project/googleapis-common-protos/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	<dev-python/protobuf-python-4[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.15.0[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-# no tests as this is all generated code
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.3.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.3.ebuild
deleted file mode 100644
index 00d26d4c7744..000000000000
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python classes generated from the common protos in the googleapis repository"
-HOMEPAGE="
-	https://github.com/googleapis/python-api-common-protos/
-	https://pypi.org/project/googleapis-common-protos/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	<dev-python/protobuf-python-4[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.15.0[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-# no tests as this is all generated code
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.4.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.4.ebuild
index 00d26d4c7744..c2d6a64bc69a 100644
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.4.ebuild
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	<dev-python/protobuf-python-4[${PYTHON_USEDEP}]
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 6cffe5a68449..f659961f69a5 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,11 +1,3 @@
-DIST humanize-4.1.0.tar.gz 73777 BLAKE2B fcbde90977ae9fcd706e423767b1d5617fd118ae8903283f4b307ee05a5adffb3bb68305e5d758b1860d37a37d22766127d84479d331a7ed05c83cd53e5b0829 SHA512 7e2d92ed44e773bd8a53d4b151e80949fda057d8f4a52003826efa9ec2a569360b76663d44c3d1239fd2ecdd5365357d3fac72a395d1c10d5207b4a27f248878
-DIST humanize-4.2.0.tar.gz 75169 BLAKE2B dc590d296362be20f607282686e18df73e1bb07aa37459431d7ec1f74ff6611497811da974b7eb62cd791536268018460d9171eb65ed958af6f12f668b3ae2a8 SHA512 ac0a067320d4dc236d97a69a3019cf01ce87efe2cb98e758f516f90986352fe87d03bfa497d66a2a75e61152a35fd8fac827bafd926d6bd84c8f0d2366e5beb7
-DIST humanize-4.2.1.tar.gz 75327 BLAKE2B 1c36002a2a5d103bc1dae444d9d8a70c3983c778674d5c6aa3a76aa82dc9bd3bf39faefd1c3dcf8d0726b151dfb4f8d8247bb88fdc9af765f703edfb08226b8a SHA512 c84f797b01bb8bcc2e036496f0b727f9c21fe88148a6d90f73ddacd25f73059a46bbc60ef8c3bb81554db0c75f1ab9aa1e551d8473aecb40761e51b59580092a
-DIST humanize-4.2.2.tar.gz 75336 BLAKE2B a95e9fe8536c9a2ecf5c4c40797810ac5825e99504386a8d55f8da0f7c16d4ac7f7aa36d8460e8357d05f34fd5fb6c30b15870b3ff792df7ba2d58080053ab3f SHA512 fa6606975629ef56a72528a543a3114acf17d65d684e868268fb9298f564aac8a1049b9318a4717c8b21f689570f1083fc32bc9eb17bc018c9c2e8e0ee06ec4f
 DIST humanize-4.2.3.tar.gz 75390 BLAKE2B b700c7f6da3ea94062ffb0b74fdd8940460c6017c30499b34678750d5f86b4669542c65291f7a8e1c57b446cfc43efa88324c680fc3f817b7bc5018c3e275e50 SHA512 008acdafd2b811da767fdff67c3b12f7ba333fc35b0d51c4b0edc0162659b8ac25dc54ba30f2a266f6a422990dc2522b6c9e017b9a73e8262ed414d63e0c4308
-EBUILD humanize-4.1.0.ebuild 586 BLAKE2B f89d881fd19e60a8eb9c2ffd5d53e8b0e6ac16672c16f441b2bf8e776b81b7a20218af77eb61fb4a1d9ae744906e361fd953da37b7e94542fd5e2e0c3bd329e7 SHA512 3f7f0f0239a899ab1445277b7944da5763d5585e287ccad072a0aa6b86d8bc2c5e0557c255f7d8e29d630ce681b2c95985dfdbbb72127a886df1a6cd79a85e1c
-EBUILD humanize-4.2.0.ebuild 588 BLAKE2B 7ccbcefd9b985a2eb85773993629bec0fdab43f09a9f092c67a520b123639a8272f01296153b0ef38a9ae498032807af089e4536b2482adbc033a5a4468f6a97 SHA512 53444dd98c6898caf5158cc5e5a55355ba7269cf7e1d130a5788ae246c7f0e1af06e53d2c99b094985583e2f472d28027d724a47bfb0c57f18ee1e2daa0fb5f7
-EBUILD humanize-4.2.1.ebuild 588 BLAKE2B 7ccbcefd9b985a2eb85773993629bec0fdab43f09a9f092c67a520b123639a8272f01296153b0ef38a9ae498032807af089e4536b2482adbc033a5a4468f6a97 SHA512 53444dd98c6898caf5158cc5e5a55355ba7269cf7e1d130a5788ae246c7f0e1af06e53d2c99b094985583e2f472d28027d724a47bfb0c57f18ee1e2daa0fb5f7
-EBUILD humanize-4.2.2.ebuild 588 BLAKE2B 7ccbcefd9b985a2eb85773993629bec0fdab43f09a9f092c67a520b123639a8272f01296153b0ef38a9ae498032807af089e4536b2482adbc033a5a4468f6a97 SHA512 53444dd98c6898caf5158cc5e5a55355ba7269cf7e1d130a5788ae246c7f0e1af06e53d2c99b094985583e2f472d28027d724a47bfb0c57f18ee1e2daa0fb5f7
-EBUILD humanize-4.2.3.ebuild 588 BLAKE2B 7ccbcefd9b985a2eb85773993629bec0fdab43f09a9f092c67a520b123639a8272f01296153b0ef38a9ae498032807af089e4536b2482adbc033a5a4468f6a97 SHA512 53444dd98c6898caf5158cc5e5a55355ba7269cf7e1d130a5788ae246c7f0e1af06e53d2c99b094985583e2f472d28027d724a47bfb0c57f18ee1e2daa0fb5f7
+EBUILD humanize-4.2.3.ebuild 586 BLAKE2B f89d881fd19e60a8eb9c2ffd5d53e8b0e6ac16672c16f441b2bf8e776b81b7a20218af77eb61fb4a1d9ae744906e361fd953da37b7e94542fd5e2e0c3bd329e7 SHA512 3f7f0f0239a899ab1445277b7944da5763d5585e287ccad072a0aa6b86d8bc2c5e0557c255f7d8e29d630ce681b2c95985dfdbbb72127a886df1a6cd79a85e1c
 MISC metadata.xml 506 BLAKE2B c00c304481f8bd5d2309a1fa72a19bd8405d2f8d55e68a9e688435dec5410db728537362d6fc090f448738fa462ad62d03cfdb82fda8702b91aced4ecd6c05d5 SHA512 71905cfb331f60723b2b3dc02b1a5cbc2712ea9a411692d8ce12e62ea90a4ebef41bb4806b90f9bc0706d8dfb6a3ebb69d23ef16f0177eaddcfbdf07612d8614
diff --git a/dev-python/humanize/humanize-4.1.0.ebuild b/dev-python/humanize/humanize-4.1.0.ebuild
deleted file mode 100644
index 5887ac380442..000000000000
--- a/dev-python/humanize/humanize-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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="
-	https://github.com/python-humanize/humanize/
-	https://pypi.org/project/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/humanize/humanize-4.2.0.ebuild b/dev-python/humanize/humanize-4.2.0.ebuild
deleted file mode 100644
index b471878fc311..000000000000
--- a/dev-python/humanize/humanize-4.2.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="
-	https://github.com/python-humanize/humanize/
-	https://pypi.org/project/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/humanize/humanize-4.2.1.ebuild b/dev-python/humanize/humanize-4.2.1.ebuild
deleted file mode 100644
index b471878fc311..000000000000
--- a/dev-python/humanize/humanize-4.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="
-	https://github.com/python-humanize/humanize/
-	https://pypi.org/project/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/humanize/humanize-4.2.2.ebuild b/dev-python/humanize/humanize-4.2.2.ebuild
deleted file mode 100644
index b471878fc311..000000000000
--- a/dev-python/humanize/humanize-4.2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="
-	https://github.com/python-humanize/humanize/
-	https://pypi.org/project/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/humanize/humanize-4.2.3.ebuild b/dev-python/humanize/humanize-4.2.3.ebuild
index b471878fc311..5887ac380442 100644
--- a/dev-python/humanize/humanize-4.2.3.ebuild
+++ b/dev-python/humanize/humanize-4.2.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/ifaddr/Manifest b/dev-python/ifaddr/Manifest
index f7f531a71f00..b689d4e2a292 100644
--- a/dev-python/ifaddr/Manifest
+++ b/dev-python/ifaddr/Manifest
@@ -1,5 +1,5 @@
 DIST ifaddr-0.1.7.tar.gz 9281 BLAKE2B 3f7d29b69462cbf592899f1b4035685d1e9bb4535b104e6e59b41fd51c4c2681d2502ad190dae633891aec90818bb330c1f8ea403be22d154d9e7de8a5a80dab SHA512 9a428dd6bb022c8f483b77df9e9301f96e9ba64207eda8b3956a7ca5993bfe97f222c451149851135d379db1a819c75d0834566f3b6501456b2f237b0645e300
 DIST ifaddr-0.2.0.tar.gz 10485 BLAKE2B d59f34e75c4d27c365f7b169bdf62d9ac3f413275b86ae52677b08909e2811349ab0a6d2c613fc303d74b71c787b5e97e0741174c5a11b88a8f8400e123d1fdc SHA512 02597c0fda81addebbc52893d2f1f5a5f1e99820360202652c433b4869f751901c0931a9fcf8cf0b1b4f1a95c438f238e5b1cfc84511785e7a2a42d5f81bb0d6
 EBUILD ifaddr-0.1.7.ebuild 450 BLAKE2B 5310efcbc89eb17e5b59c71deada0ebd38cf94f6790d08469c7edb6ef0c95d4915c81af82daa21f287bcf95f3797fe4cb974b3eed86722fc4e3dc44a87941028 SHA512 d8a641eda90453b2710e8c59435283091da7aea7590099d0170f1753f92648c084262685fd0bf43fe96ea58eafc2980676f61a6157569b730b021e8f5979482f
-EBUILD ifaddr-0.2.0.ebuild 522 BLAKE2B e7f606c7caeb8d99740bb45c9c42931999657071cb77b9cfb97cf2f14775aa49694497928f433e495cf43e0510b4e268484e96a3d16474c9354c100e690ea9fa SHA512 a90fd82110068d67d766c5f0d8e7aa0189660e682b4e24f0c5e394586c40dc2707f5de28537a19b254bb4d81c54c770b477da2bdb62b7653aef47b6cec719dc5
+EBUILD ifaddr-0.2.0.ebuild 521 BLAKE2B 18899527ccd2652ba0c87061d15d975358a64511cc392eae6eb5fa7fcb9ad45fa05f2a9c9e512128109284c4cd34505447f938d2d7554e3f919ed1ec711c16f7 SHA512 382931461cdd9eff2ab85046fd7d3f743ef9f55ea65062705b2ec64065ec30424e18f5db847318f372df624a877f957e4cf45416961c16deb031b094679a8a83
 MISC metadata.xml 452 BLAKE2B 25e4267ab823386fc377c24137e740035935b9eb3d31aa2d47361cc60476b9f9c6a3489d4c189042a52221bd91b2b7ab5da15f827c4d05bc25eeda57154a85a9 SHA512 0a5f347281f5f6dc1009ef84825e60eb3cb61192cb18a0f42c616e878c94bbbbef120d1d0342e110a6b478cb34b1b1182b1b2274ec892ce0f7b007e56e29305e
diff --git a/dev-python/ifaddr/ifaddr-0.2.0.ebuild b/dev-python/ifaddr/ifaddr-0.2.0.ebuild
index 05222a04124e..77dcab71d61d 100644
--- a/dev-python/ifaddr/ifaddr-0.2.0.ebuild
+++ b/dev-python/ifaddr/ifaddr-0.2.0.ebuild
@@ -17,6 +17,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/imapclient/Manifest b/dev-python/imapclient/Manifest
index b7c7983959ac..8d581c245e3b 100644
--- a/dev-python/imapclient/Manifest
+++ b/dev-python/imapclient/Manifest
@@ -1,8 +1,3 @@
-AUX imapclient-2.2.0-ssl-context.patch 456 BLAKE2B b8811608129f647cb53b298600f3b0055a9061706693d0180586248d187529010fe043aa4cd88800cddf03b4b7747e484ed624abaac15645c1d0b99a253082b7 SHA512 547ce1528a7d15f0e6fd829f847acfab87cfc7da9261864917ae69b1cdc3e091011d51b7e470c7098d8665703d25bf718b72b55992a49fafb044fd97773615b1
-DIST imapclient-2.2.0.gh.tar.gz 89505 BLAKE2B 448e8c736cd80f261c50dd7d6fe88498bf988e475f8135bf7079021d0154904741ab8af28c0ede817ec1bd8c7bd329b1c891c24e37c3466d68287afa02d636c7 SHA512 ace8f55e0f7f4dbb9127b2bbf26cce4c12dce40357cf8127aa6e377321d5156f91f913bd4d4ca57bd5b7f0c86ae5d0b7fdf352b74a6edb7d607f46aa45a144a2
-DIST imapclient-2.2.0.tar.gz 89505 BLAKE2B 448e8c736cd80f261c50dd7d6fe88498bf988e475f8135bf7079021d0154904741ab8af28c0ede817ec1bd8c7bd329b1c891c24e37c3466d68287afa02d636c7 SHA512 ace8f55e0f7f4dbb9127b2bbf26cce4c12dce40357cf8127aa6e377321d5156f91f913bd4d4ca57bd5b7f0c86ae5d0b7fdf352b74a6edb7d607f46aa45a144a2
 DIST imapclient-2.3.1.gh.tar.gz 91141 BLAKE2B c4efbdb4a513277039389e13d0f86498df3bb4c466026510fba55a8cf88316a3c5b02c15215e3e40e8e0b6206e8bd4659e75b1f83ba2a905a2aaec21f8af4b48 SHA512 06a9264e8cc001b8a4a6a855032bbb9b904c94999d090c3f1bedea1ae3a16524f668eb4dfa36e7a23a0622bd9d3e83191dcc1e5e30275cb6fcb7604142e5e2a6
-EBUILD imapclient-2.2.0-r1.ebuild 696 BLAKE2B eeee1d0c99ee35a92c59c3e1cce7a2f1b38a0159563cae949cb0d940d91d2911462c349a9d11176384561654a6b373239216c2f0bc1c18a91bcc900fa88fcd98 SHA512 6df5c064f9a08608e80bad92bf3539ba8336142b852cfac48e8d2e3b16cc890fb7b38273115c3e32e3e8cbb4d93212ca3d3c1776b77e8d9e6c67caa1385c80c1
-EBUILD imapclient-2.2.0.ebuild 633 BLAKE2B 11abf82ddda57c9225f79db80412513a0673fca5e7dbdc28e9406fad7f33ccb2abf971f614f1276bf17ae1e0c2c621737ed0c5ba7ce8c724eae3a459a3a666e5 SHA512 8b773a53b14573047aa84c7dbccc9fa0377dbc038ac436ee139ac6a64b2c2b3b3ac6613fd0a18cfbe6d9ed83b84f5ac065c0ca4ea207b2014d0b1075507ae9d2
 EBUILD imapclient-2.3.1.ebuild 668 BLAKE2B b9d011f4baa85f5debf71ddbafddcf1bcab6eadb4bab05f15b6dc7ba76e61d177639ee8643e43d4e13b7c332dfdc87ffd5bb3aaa36d8d65a095f78cd64f9feb4 SHA512 f61c714ee7e4b05696d3dece4ac9bec4195ba0691019fa2d0bcca371029583c5f846476926a805c76c29ed65762e720f841bb283ea6d68a404bac90910aa2d9f
 MISC metadata.xml 392 BLAKE2B 2a2a97b3882d544680b05e74e12067be2df1b910a37a08316540cdd7682beb16bbef184cac7c71ed51ce209187dba7803e34dd13756daf6ccafed343734d40f4 SHA512 b223e769302a2277d2638e58cb9c7ccfc741f582cf0465d1f9a44e6822539e1458d96e93d6b5a32482fdcc945b74e44b5bfc66caa53a85f224d4f380c19c1325
diff --git a/dev-python/imapclient/files/imapclient-2.2.0-ssl-context.patch b/dev-python/imapclient/files/imapclient-2.2.0-ssl-context.patch
deleted file mode 100644
index b3a12823f6a5..000000000000
--- a/dev-python/imapclient/files/imapclient-2.2.0-ssl-context.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/mjs/imapclient/issues/466
-https://bugs.gentoo.org/835498
---- a/imapclient/tls.py
-+++ b/imapclient/tls.py
-@@ -27,7 +27,7 @@ def wrap_socket(sock, ssl_context, host):
-         return ssl.wrap_socket(sock)
- 
-     if ssl_context is None:
--        ssl_context = ssl.create_default_context()
-+        ssl_context = ssl.create_default_context(purpose=ssl.Purpose.SERVER_AUTH)
- 
-     return ssl_context.wrap_socket(sock, server_hostname=host)
- 
diff --git a/dev-python/imapclient/imapclient-2.2.0-r1.ebuild b/dev-python/imapclient/imapclient-2.2.0-r1.ebuild
deleted file mode 100644
index 520ba497b462..000000000000
--- a/dev-python/imapclient/imapclient-2.2.0-r1.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_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="easy-to-use, pythonic, and complete IMAP client library"
-HOMEPAGE="https://github.com/mjs/imapclient"
-SRC_URI="https://github.com/mjs/imapclient/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.0-ssl-context.patch
-)
-
-distutils_enable_sphinx doc/src
-distutils_enable_tests unittest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/imapclient/imapclient-2.2.0.ebuild b/dev-python/imapclient/imapclient-2.2.0.ebuild
deleted file mode 100644
index 0c541676f444..000000000000
--- a/dev-python/imapclient/imapclient-2.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="easy-to-use, pythonic, and complete IMAP client library"
-HOMEPAGE="https://github.com/mjs/imapclient"
-SRC_URI="https://github.com/mjs/imapclient/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx doc/src
-distutils_enable_tests unittest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 273cab61fe38..55d9c11936af 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,7 +1,5 @@
-DIST importlib_resources-5.7.1.tar.gz 31272 BLAKE2B 3e30117ae4f18a9f2151b5435428f3853664ce291d2d4ce9490d1a3043ca5ce2e80cf04d7dcef71ebdaba8bbad17ee61bb47303637a8bee73a2263853b65293b SHA512 8fd89dfcea4112d26418bcfa522de36c2136a50d07470ac8de18f62bb7bb964a459534554802b1455996ae65796018bea806a592746c1d2717f1313608cf4918
 DIST importlib_resources-5.8.0.tar.gz 31461 BLAKE2B ce6668520297cd7e06b944146277065cd1a0f5ae3f9e3bce24005f0f4a1181a41fa7f91f6b9ee9c0ef4caf7ca65c8efff748957c5c1a45c56778b30568970b36 SHA512 5c20a46a1832c7aaddfaa561a3986ea02dae59b94c06861757b6e5912f36624d564c65e184612af6e5930927a3172dc132ceb9846b0585de851d019c68cc8955
 DIST importlib_resources-5.9.0.gh.tar.gz 32691 BLAKE2B bc922945d0577222e704ac3a5aa24cd6abb31c9b44f42c342e78f45fb035ee2b3843c437eba31bc8a73f609f6126390f4141c52b9eef15ff8bc7efc44233e81b SHA512 9054b633f3c9b3523ccfa2be93774d0aa4b0c2ab8bfb228f1e0bfbbc076362b416c9714409ff365aa5eae579554feedc8f2aeaa49c766db37ab669414eb22827
-EBUILD importlib_resources-5.7.1.ebuild 1192 BLAKE2B 416bfa64edc6b33cb3ba55247586e7009f73ebbe7d9b4a7ab9eb75d6d106d39d750951f4ef25d3ed24b92b0b7590bece96aea554a71e20009da18e42b5fa9aa8 SHA512 9e754a10fb2290f88be8b338caa7ce7935abb88b66c16955fc1057e7aca4a430ae00be0bc5ce269052d100e2f70a452e771f9ba26df9fd69526f989b58f43939
 EBUILD importlib_resources-5.8.0.ebuild 1244 BLAKE2B 2d7c354163f6846a3f54e605de3e4056cffd7ae11cf6bebb5a6bf93a762281b2ccf667f944101991969bba50844bf473e6be015221eecaa8826234c0a3136c75 SHA512 f0817a9356f4b0d727322796464fc03354080efb56452d840285fc6ef4fdafc9018f7ba4939ed9ae02200b1a0b8317808ceeb1d9ee494c7624a13b9d09a06f96
 EBUILD importlib_resources-5.9.0.ebuild 1301 BLAKE2B 6b22aff31454e6ddee4bb1ad24f2b09a0a01a3ad7b17e211abe3561ce671a07f900aec8ad8dc8f70cd1fd78926b5fe0c6eba4f33309eb07de95ff25d3306913a SHA512 9121bf2b4412c84a0a87ff116b4313a83a3bbd18932c576deb894cdb1e7c80276daeb6790214d99183e624e77869cd1b94a093725dd44da4a98b3e93a44f0253
 MISC metadata.xml 945 BLAKE2B 130dc56a13a8416168baf91e804e1fdef0d65978641c3fca5eb663b8accb5b1adc066bc4033751f03a9c729e27d0448925a7b623431922056fb7d282db052734 SHA512 ccb23df48a89f69133469722fb37acf516127b207b946cdea240cf82e2ba5422ee4e2166d1a9419031408a7624a52256e322fe7e478a9a7b8214ab4bc5c9b92b
diff --git a/dev-python/importlib_resources/importlib_resources-5.7.1.ebuild b/dev-python/importlib_resources/importlib_resources-5.7.1.ebuild
deleted file mode 100644
index 86b8123a2a88..000000000000
--- a/dev-python/importlib_resources/importlib_resources-5.7.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-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_PEP517=flit
-# This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( pypy3 python3_8 )
-
-inherit distutils-r1
-
-DESCRIPTION="Read resources from Python packages"
-HOMEPAGE="https://github.com/python/importlib_resources"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/zipp-3.7.0-r1[${PYTHON_USEDEP}]
-	' 3.8 3.9)"
-
-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_resources"
-		version = "${PV}"
-		description = "Read resources from Python packages"
-	EOF
-}
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index 8f601da64954..877f7fa78ded 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1,5 +1,5 @@
 DIST ipywidgets-7.7.0.tar.gz 4074763 BLAKE2B cff338dd635c57943161c78708e6a69abccaa46878e0bedb11ead76590b858ba57ce4dcfa8052533a4849da0dc9d5472987a7918fd2043462a21a908105d7910 SHA512 038da040912e6701762fb66fb3b6996ce0a59706afb05405b5932c02d34733842b227426f0b29eea115196bab384617425b0553c5db13a9dc832bddef63dfb92
 DIST ipywidgets-7.7.1.tar.gz 4075672 BLAKE2B 1e52d3b3b9380f42f67ad658f6e8579a61220e7160c10b1569437c1fd74ce962fbe746f3a6a3e302b5417812f69807deddc0ae3fe255b8e2f213d65103d55362 SHA512 ed6bf1a59a511714a3af96cc66e7665b9b264f56862ca4ea02d943137fcc6018da8fcb8dff4a8f9157bfb46cc19b7d58ceaff028e84f2f8d18ee16e57ce7fb96
 EBUILD ipywidgets-7.7.0.ebuild 990 BLAKE2B db29723bd37454ce6bb52d34ba08d00f1098970651fd53fc892532cecbce6591704130047860230e67e66f2c0dab785383f4b8de1387582f8065d2d71db7962e SHA512 23d1814f143bf6c54be421bb4a53fc38046dff9f0ea48332d4587d8942bc655b7d1fbf706ea51c115e0379c7a9802f42c6cbe6cb2a504ee301ed4539da3609f3
-EBUILD ipywidgets-7.7.1.ebuild 1040 BLAKE2B b6d51cb14e0ed73120ad2a327e19dfb41d9b45ab281cf69a1761379da9dd2073a144a8ac7842f6089808404967313313fda47f8f9cf33a0c8a2c87ac64f80083 SHA512 b35f317acc83fd88e62c6a00b21bbd254578b9b6da0a050869a17a9d2a8a00accec8cf001425eb6d70df3ee958e2b0c73c56596e516592e4e2fe06ec6e551494
+EBUILD ipywidgets-7.7.1.ebuild 1032 BLAKE2B 50e33134b2d32cc00e68985fae79c133f9c778771423698c675de85a1b0d7a2ee55b80b99c64885f01c0b142efc10feb296f2d2a5fa8335c6a4e938c10154203 SHA512 08e130f9e880a76350a5377f61b2bc2988b620cbf479767763abbc69fcad584e16bf49831d6a6ecfa3102c196f8049efc95aee88752bc251f5c2f51087d08715
 MISC metadata.xml 537 BLAKE2B 1f3b91be328b958870a72b5ce438c3e5bf67efd072b59dcb5ae77a9b89334e726af4fe8771221a7b728905cef4175cf7e0a49b11c651a7c0520b5cb032085985 SHA512 cb8092ea7a06e309a26abb78f5ddfd4a91f416e15374d2b59fb5086a64cc13f3dd408e18caa6719d12b1f18f762469a72a1027b2a047db626c51d22a5f304e54
diff --git a/dev-python/ipywidgets/ipywidgets-7.7.1.ebuild b/dev-python/ipywidgets/ipywidgets-7.7.1.ebuild
index 8f080eed2ecd..70a44baacad2 100644
--- a/dev-python/ipywidgets/ipywidgets-7.7.1.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-7.7.1.ebuild
@@ -19,7 +19,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 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jc/Manifest b/dev-python/jc/Manifest
index c0735007226d..1bf588bb11c4 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -1,5 +1,7 @@
 DIST jc-1.20.1.gh.tar.gz 10342360 BLAKE2B fe7eb94e53a78e6d2c1f13403ac529e4e0c0251a9e5f8270e88a94c7d086b7b1eca5cf8bd51ab6b514923ac2de95b7365b8ee29eeae5a1bb861e911f70be81d8 SHA512 d066b30089fce8bb7aff6db0b278f258a91bbef73bc49abb0b086b1cce5253a0ba07efa9e3680ee6ee333ea4a2b6afcfe4028eee58d0ec16411f7c257a54a9b5
 DIST jc-1.20.2.gh.tar.gz 10468681 BLAKE2B 185937c277989536bfed42ee27717a2dee1c4672565b7c2dbe6c3146ca6520e7952aef98d67b94c15b1cc3a2bac3eeafe7353644d8379cedc5c657c2ff9255d1 SHA512 80e851eaef0a3159d7ec8c295d8118692b45799359b131396319489ef9aa3d1567cfea4f1382ec857a82707857977b70d11166426cc1a92fb81186ee68bd017e
+DIST jc-1.20.4.gh.tar.gz 11842360 BLAKE2B 8c1358d4567510b705843efb7da9ccb02a55049c8a0dc1570661f3648a99405c692ea8493381f324c3517841757c9545527e151fbdf550e12a5fa13cf9c33bf8 SHA512 5f5bcf03c155a56132c66ada38bb6b570e6050d75e0bd90b966cfefb99351adf0249d968077a08714eb9ff8c7d7403d1888bc6687830e13fe05a68a63af661ad
 EBUILD jc-1.20.1.ebuild 674 BLAKE2B 4cb873aab7d621f36a62bb1d4a25be0d981dbc3c80cfddf795a47a0ddda6e962091f8aa46166cbf88b32d5372879cd9f8329036d27fa99bbbedceba47f4877de SHA512 6bf52b03223276c5b94ddfbc3a28822246bcfdaf9c75840570f36cb63b45a05b01995e09a4ff3cd22f9f5d10b8660b31e115e70e2826c5d7bf2614566d4aa7ba
 EBUILD jc-1.20.2.ebuild 674 BLAKE2B 4cb873aab7d621f36a62bb1d4a25be0d981dbc3c80cfddf795a47a0ddda6e962091f8aa46166cbf88b32d5372879cd9f8329036d27fa99bbbedceba47f4877de SHA512 6bf52b03223276c5b94ddfbc3a28822246bcfdaf9c75840570f36cb63b45a05b01995e09a4ff3cd22f9f5d10b8660b31e115e70e2826c5d7bf2614566d4aa7ba
+EBUILD jc-1.20.4.ebuild 674 BLAKE2B 4cb873aab7d621f36a62bb1d4a25be0d981dbc3c80cfddf795a47a0ddda6e962091f8aa46166cbf88b32d5372879cd9f8329036d27fa99bbbedceba47f4877de SHA512 6bf52b03223276c5b94ddfbc3a28822246bcfdaf9c75840570f36cb63b45a05b01995e09a4ff3cd22f9f5d10b8660b31e115e70e2826c5d7bf2614566d4aa7ba
 MISC metadata.xml 492 BLAKE2B 100e7421c33b90fb9180a3412206cdc2355b26dcacf988f1157a725ca8ee6eff44288ec12f8274360f086272ad3bd06e9df6a93288edeb9102551c65256a47f4 SHA512 cb0abbd0c1b02b1fd4c74034e1f41a53ed0b7f297dcfad4e9f6b2a4960e16790b5d879f407ab18f73c81684d3a0436327949bd628a1d1d146958f01e34206688
diff --git a/dev-python/jc/jc-1.20.4.ebuild b/dev-python/jc/jc-1.20.4.ebuild
new file mode 100644
index 000000000000..7b7bbfc30991
--- /dev/null
+++ b/dev-python/jc/jc-1.20.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
+HOMEPAGE="
+	https://github.com/kellyjonbrazil/jc/
+	https://pypi.org/project/jc/
+"
+SRC_URI="
+	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+RDEPEND="
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/jmespath/Manifest b/dev-python/jmespath/Manifest
index 0122d399daef..09e3c37fb07a 100644
--- a/dev-python/jmespath/Manifest
+++ b/dev-python/jmespath/Manifest
@@ -1,6 +1,3 @@
-AUX jmespath-1.0.0-py311.patch 857 BLAKE2B 8cd99015c73adad7855c6d7f6aa171dd2a0ad44300a37d7eb0710e5a696c31dc785632a69bc3a961d7d141058baca7325593d4cc4589c99735b0e050ca090e0b SHA512 f6c140589ff6a9049021437f846b1cdc8a6afcd0078679f04ba1e29e3d8cddc0c88e1b147c101d137f730c028f622c45054c8db7e30e5b898d3ff9940fa3a943
-DIST jmespath.py-1.0.0.gh.tar.gz 80829 BLAKE2B dcd5e61ef846c5bcd9ac59480f909b05310dbe785c21e97c81981db90d104d17a3319f766b8926e8c8e3ae8b0e2164051d5312c74fa9c16979d802aafd286654 SHA512 d55ea1c4041e1a5043b3e3b7efcd1e561b92a394e3facbe96b069ff6a9a11c20553e62cfbc5fea966670c71376f9f9ccc24d8905f253e0f1d96dd7a588cc3e44
 DIST jmespath.py-1.0.1.gh.tar.gz 80936 BLAKE2B 9dfcdf4a8359d0e7c5f333e349d12e5c438693cf81b64df1a8a3b7211304ee228e9579be528a9b35ee0e4289539a5b4e214fcb9cb42d2b3fdbdd2e1a83975bc2 SHA512 c1676a4b7565d25c2948569005c503a0ca33908de6ed16536767da2c00c634e4ee345bcaf88a01bf6cd2996aaf722faaedff80061ab65ee77e5bc0f494f86a70
-EBUILD jmespath-1.0.0.ebuild 842 BLAKE2B 875c2eac8288ceef5d863e764b27be3db5d2ddda2e7c40001feff2bf01f0788cf0baeb0880ebf6a524af1dac261c5cf33b658271fbc588ad1954d0f95ac165e9 SHA512 8feedd4bfd68a5938f4fe03d3bed8ee892ce23c33cc7de4028ba3526c35434182cd66d30b9fa847e1f61724eef9d43795b933aab9d97a4c16434cc0d4c1f8fcc
 EBUILD jmespath-1.0.1.ebuild 695 BLAKE2B c0e833f50407b759ad4bcca1b41c6e8f96a706d89f0404b289081f9ee7ea07953512e76dd0482bf6b5e92cf29629360b9de84b41d6ce60b83a31a1253a6b4069 SHA512 99006b7927874d5aa71839a822c90ddfd4f59ec0cf1fd0ae68e693c2f30ed8662514ed420bab285dd2f62f544b646e406d1bed4f09715e6776f9749225f9870f
 MISC metadata.xml 409 BLAKE2B 7adc2c326ae16f921adb5958e2f80b3309c4b4321c529e11225a7db22dbdb441335a1f35132147ad651c747075078263870ace4e1472398e833fbffd8e90ffd1 SHA512 a4009dc996e7c9df5b5bc31d7504af2d315ec57326edad640ce075f232c435d2dcfe400a7cb10cc33bafc142651a712df570efbfb2592361c078942c1e9a59bb
diff --git a/dev-python/jmespath/files/jmespath-1.0.0-py311.patch b/dev-python/jmespath/files/jmespath-1.0.0-py311.patch
deleted file mode 100644
index 90c7bef9beee..000000000000
--- a/dev-python/jmespath/files/jmespath-1.0.0-py311.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 325d8111a924a951d8778c9fc1dbce30be267435 Mon Sep 17 00:00:00 2001
-From: Karthikeyan Singaravelan <tir.karthi@gmail.com>
-Date: Wed, 10 Mar 2021 14:15:36 +0000
-Subject: [PATCH] Use list for random.sample since using a set has been
- deprecated since Python 3.9
-
----
- jmespath/parser.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/jmespath/parser.py b/jmespath/parser.py
-index eeac38f..4706688 100644
---- a/jmespath/parser.py
-+++ b/jmespath/parser.py
-@@ -489,7 +489,7 @@ class Parser(object):
-             lex_position, actual_value, actual_type, message)
- 
-     def _free_cache_entries(self):
--        for key in random.sample(self._CACHE.keys(), int(self._MAX_SIZE / 2)):
-+        for key in random.sample(list(self._CACHE.keys()), int(self._MAX_SIZE / 2)):
-             self._CACHE.pop(key, None)
- 
-     @classmethod
--- 
-2.35.1
-
diff --git a/dev-python/jmespath/jmespath-1.0.0.ebuild b/dev-python/jmespath/jmespath-1.0.0.ebuild
deleted file mode 100644
index 7d281153bda1..000000000000
--- a/dev-python/jmespath/jmespath-1.0.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=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=jmespath.py-${PV}
-DESCRIPTION="JSON Matching Expressions"
-HOMEPAGE="
-	https://github.com/jmespath/jmespath.py/
-	https://pypi.org/project/jmespath/
-"
-SRC_URI="
-	https://github.com/jmespath/jmespath.py/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/${P}-py311.patch"
-)
-
-src_prepare() {
-	# leftover import
-	sed -i -e '/nose/d' extra/test_hypothesis.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index 70b9430b9f82..5f2cc5cb0c81 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -1,5 +1,5 @@
 DIST jupyter_console-6.4.3.tar.gz 35432 BLAKE2B 57af0ccba4730e445972a937e9e103695dc33387c5aa15239416c280f79259963119a3485526d00beb92b7b11c579f68542dcbac39e0d625b3a592a82e8bdcbb SHA512 6b8f9be62efdac9d8a17367e169f8f73c3d7ee2783692ea380853a886d228957cad03095a2aa165a1ace3440c340e2939c1044c85fa3f5e1e2d1f48919e562da
 DIST jupyter_console-6.4.4.tar.gz 35145 BLAKE2B d37190c30eceba79c0d37ad60d88c9e691759aaccb29a64a9482b7c3cf3315efa3c902ac2244c2139ef2f94a77450115124227768f8291f73512796aaff1214a SHA512 1f06591ed2a0fcf56e783d4e9f2a7c3f58a4f566cfb63b3367edac23c7709aa1af7bf6639c7358227a987049804da90658144fa5ad38db120c0816e78ed465ef
 EBUILD jupyter_console-6.4.3.ebuild 875 BLAKE2B 5b35b10226583c3fcfa2cf2bc5a0d4d9877f0547d80b5a37bca351f5088e8f185f9cc398518cb695d744e853bcae72f525a9d506d8e443ebd4dff2d901461020 SHA512 2874b76aa8358f2bfa6918b28d0788862a4b6fea0a6d6657a36bcdd3c208cec6f654e432c456878ceb05fcf571a2c93a15affca63aa80eb46de88ddca291e256
-EBUILD jupyter_console-6.4.4.ebuild 880 BLAKE2B ea18dbd89cc95eb0016b19776f5501ba1b875857d8bb603d0cfe8ad997b89afedc83ae5e3692a15610075c268a6e14d73accae6c087f7840023ada9216e9e5e8 SHA512 0c480fa1f17049619a803cf1d9209ea2c2c8c298a25ea6e60c0d050fa1ffbf1c84c1850cead0d10cc15e0b75fb9756d876d2e3396af226487ef5fd3f156b41f7
+EBUILD jupyter_console-6.4.4.ebuild 878 BLAKE2B bcf8f16e15889bf17ec8556df318a605d9ccbbc126c323b6d6adc14e837166cd2809af338cb766c268091d5eb3534e2cf49fee20020cc4f19d1cf2b425be43fb SHA512 c4788a1accef6dcee9141c6557644782173b96fd8e147452d6c5b9f9ef7ea553b3cc9d1f259131096cc339dd53adc52e3038bfc49df5fec9d0016bdbff46b300
 MISC metadata.xml 702 BLAKE2B 38bb264e2ab7f1feca67ae6a35d2ee20c04b53188cc7d3a51bd2d1630ba6a9e89ac949013bbd9ac3443331bcf3f115f85537865787daee26949b9773aa9b9197 SHA512 c3f9fb275560a3aef2a5266d2070e3d013f53e2f3f7e1363626b15d290ccd619c65a19d6ee2b849a683a96159c8af29c55c81eff5a333759eae5cd6773736b24
diff --git a/dev-python/jupyter_console/jupyter_console-6.4.4.ebuild b/dev-python/jupyter_console/jupyter_console-6.4.4.ebuild
index 6f70ca03cce9..60189a0dbf09 100644
--- a/dev-python/jupyter_console/jupyter_console-6.4.4.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-6.4.4.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"
 
 RDEPEND="
 	dev-python/ipython[${PYTHON_USEDEP}]
diff --git a/dev-python/makefun/Manifest b/dev-python/makefun/Manifest
index ebd9cae2bd32..3a922ec53e97 100644
--- a/dev-python/makefun/Manifest
+++ b/dev-python/makefun/Manifest
@@ -1,6 +1,3 @@
-AUX makefun-1.13.1-no_pytest-runner.patch 184 BLAKE2B 663db5f0d235f5117a066fff19bbb940c3a2b7d7cfbe2c2b07430d85d33e0a62800aa89c38530526eeae76611a6619eee765f5fdd69d9ab38d39458d85cb104d SHA512 179e9db22717ec79d0c4ae9dc53ceee26d542eb4e3a957bb4ae4689ba808476894a8276e536214c9923140ee8307393d96b417ea8477d393e399ca4c953dfdd4
-DIST makefun-1.13.1.tar.gz 72170 BLAKE2B b1b5e76277e742ef51bcdf2bf6f1d1e761010d75bc3f20d7a8c079b368972b90775bd3bb23cf1787911a8d858549d72d4a2c9379675e59f359486bf1c49566e2 SHA512 ae103d3827673c4124d051e3c76d3d0d126c783ac7a1ea09de3801fd695439eaa549c297bd5c262184a3ee6fdf7b046065081fa3183642778148c2134d7bfc06
 DIST makefun-1.14.0.tar.gz 73792 BLAKE2B 8a3f947d53787efc1be6d76c4c817063a21d0e135815d196988aa2c6d1e0998344010dfd1e2f33f31c0d47fcad8b7e4c0c7c9e408bdd3ea60f668c3ec8ae09dd SHA512 49b239a559e0ec5e28c29c210161c3530e1d89b39a22f16382f0569a47a6d696917d86c9abefb7ac6dc59f904276f8a853a2dc09b1d9c2332e422757f6eb9a08
-EBUILD makefun-1.13.1.ebuild 623 BLAKE2B 07d6c59a1faea0879c792c37752a1e4edfad0f1f575199b4fb22794e5dad32cac11f846f21d722f81e6c5e23a9a24be424e65ce59a6626095a05cceec7403bf3 SHA512 d08ac35b8b5425d17dfb3c7f98716345ac26cf60003c33a694e962422d4964b1c4e6cce08ca7a5d68c44538b0db26cc9154cbc91abbb273e80617a32d52f7184
 EBUILD makefun-1.14.0.ebuild 659 BLAKE2B 0d2f2af0396619f039c9d817ace5710ab39a1a972236a939fba0209762a356a75870fc8aa946519268b13477e9e8573cacda88fedda3568ffc3dfe5715cb7535 SHA512 fcbb031a5b31d818f6a714637e3a1cb2015d9bde100495921a26f29f84d53d44172497ef5bd52d746628cb6ef059f2adb6a35f4acf1727e56d5e1b7b5c8e07f4
 MISC metadata.xml 401 BLAKE2B 0657deb821edfdf648e5bb0a95255b87df0c090c6e719a5ad94a6d3f6e2e64f36d4093a2bfddb5e8592d3d38741e8d0251c8331133113766ef2fc4caa48e88ad SHA512 cda21fbaa9b62896ba3389cf281ae35bd9a59fb0d0604e61fb3b046061de47a2535d7a98d335b66f44483ae43deadf05abde0a2285902c1c3fab2762b080dbad
diff --git a/dev-python/makefun/files/makefun-1.13.1-no_pytest-runner.patch b/dev-python/makefun/files/makefun-1.13.1-no_pytest-runner.patch
deleted file mode 100644
index 659717903361..000000000000
--- a/dev-python/makefun/files/makefun-1.13.1-no_pytest-runner.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -27,7 +27,6 @@
- [options]
- setup_requires = 
- 	setuptools_scm
--	pytest-runner
- install_requires = 
- 	funcsigs;python_version<'3.3'
- tests_require = 
diff --git a/dev-python/makefun/makefun-1.13.1.ebuild b/dev-python/makefun/makefun-1.13.1.ebuild
deleted file mode 100644
index c95083f79b0b..000000000000
--- a/dev-python/makefun/makefun-1.13.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Small library to dynamically create Python functions"
-HOMEPAGE="https://pypi.org/project/makefun/ https://github.com/smarie/python-makefun"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.13.1-no_pytest-runner.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/meson-python/Manifest b/dev-python/meson-python/Manifest
index 58a9a8fa0a49..db841a64abd2 100644
--- a/dev-python/meson-python/Manifest
+++ b/dev-python/meson-python/Manifest
@@ -1,4 +1,7 @@
 AUX meson-python-0.5.0-defaults.patch 819 BLAKE2B 1d6be7b3878b52aad4c0e0cf571a252727fff90e72f9c75eede3046e1736820498c67b0a50e36eba490d8ad0aba4aa645fbcd0ccf7dce5df35d0677016688a57 SHA512 37109dbbd40694070a075d92b26d90ebf42ea53004656da39a531433b31c3edf3c18fdbd5f29c02ba0f704690d6ff438a9de89cd821692fede6c9e6ebae29446
+AUX meson-python-0.7.0-defaults.patch 506 BLAKE2B 404c8d4803f4e6ca5244dc27c84f2c0440999e3fff87febeb12d1d304c7ed9f9358f6b958b5975d171995960bbf7681003180765d2bdb88e694e52c518a8381d SHA512 43b9825b9facdcf72f0b4b80a72aac8544ec1cedb14a79c53dbe37b190af170584acbb0d281d89ddeb199ea5ba720eb0de04c5294a3e7197019c58d7ee14d786
 DIST meson-python-0.6.0.gh.tar.gz 26783 BLAKE2B d5c5b95d5d609487a0efee1ce05b133794705cdb16f2d05d6e08b9201541e31f61a832c7770b4b5ad675f8dd91860c30c67769ce8fc0af2c48e65b0aad187ddb SHA512 25042ea030d2ad323c67daa0a520db936a4a4efa0de1c9f631c47fac22d797e01d1f1707ed407e2931164a35b3916e19a774ee16ab1d45fc91e41c75add57fa1
+DIST meson-python-0.7.0.gh.tar.gz 28959 BLAKE2B 6b60855d19c7dbbc4c8aca474ad55d4ce2a5db553ba86d2831adea7138d540433733d3b8e4077bf7314a6e6b68cd15b538b336afecaff3b262ae6d2157d8d5f0 SHA512 df529a3d31c67199cf72700734ea62b0de4f8eb03b437af9b53968e37c0350cbe60ba7385f8c3026d66fe2050df4c59912bf65e4a6e62ce19bace52fdcfef2e7
 EBUILD meson-python-0.6.0-r1.ebuild 1048 BLAKE2B 2c6fa715c72007b7ef19ecc532cc740387da9d05241fc7acd14b094b65086eb863b64470da496c938d945ebc6359f1123cc68ca52a064ca91c01e617ef3740aa SHA512 6c1d80399018626a7bc4b68f6a5dac46a8a5e8f8119603938da653d4793aa1856c62e3089d0960022b1784fd66079f680575486f5e6f8d4bfcfb180d66926764
+EBUILD meson-python-0.7.0.ebuild 930 BLAKE2B 3a8bb2c10bac4e8c27cf776e30efc8bde7ac52414d0bf79c97ee25cc9e311b5d1d46a98404a7c9621d897746936ac441e5b65380604468bbf493ed4bb4c9ec20 SHA512 e9a7a0501148d8529d9e28a286edab0663738be1fc43240c0230eaee868b209fbeccbb5098519aa0f9feb5a44fb34ded1e1d37b79948d586c6fd92a55e5ea152
 MISC metadata.xml 352 BLAKE2B 581fd656bf2da3af0cb7a9f50ef99effc9c2fc54c5012a363a3aaf4cb5cb1715c8626aed86ea176ebbbc22ece33e8b0f76d5c818b4533f99b3bac5b92f75fff1 SHA512 7e57debaea115565ade7e8ab87af065c4580506225df1a203c92fea877a9b918ebfce6fd172412bf318be07a8a4548be492318e5626b31688ed2714f00594d54
diff --git a/dev-python/meson-python/files/meson-python-0.7.0-defaults.patch b/dev-python/meson-python/files/meson-python-0.7.0-defaults.patch
new file mode 100644
index 000000000000..8a9b4fc21d5a
--- /dev/null
+++ b/dev-python/meson-python/files/meson-python-0.7.0-defaults.patch
@@ -0,0 +1,14 @@
+See https://github.com/FFY00/meson-python/blob/main/mesonpy/__init__.py#L452.
+
+(Also: https://github.com/FFY00/meson-python/issues/54)
+--- a/mesonpy/__init__.py
++++ b/mesonpy/__init__.py
+@@ -532,7 +532,7 @@ class Project():
+     @functools.lru_cache(maxsize=None)
+     def build(self) -> None:
+         """Trigger the Meson build."""
+-        self._meson('compile')
++        self._meson('compile', '--verbose')
+         self._meson('install', '--destdir', os.fspath(self._install_dir))
+ 
+     @classmethod
diff --git a/dev-python/meson-python/meson-python-0.7.0.ebuild b/dev-python/meson-python/meson-python-0.7.0.ebuild
new file mode 100644
index 000000000000..70f7d41728e8
--- /dev/null
+++ b/dev-python/meson-python/meson-python-0.7.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Meson PEP 517 Python build backend"
+HOMEPAGE="
+	https://pypi.org/project/meson-python/
+	https://github.com/FFY00/meson-python/
+"
+SRC_URI="
+	https://github.com/FFY00/meson-python/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pyproject-metadata-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
+	>=dev-util/meson-0.60.0[${PYTHON_USEDEP}]
+	dev-util/patchelf
+"
+BDEPEND="
+	test? (
+		dev-python/GitPython[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.0-defaults.patch
+)
+
+distutils_enable_sphinx docs \
+	dev-python/furo \
+	dev-python/sphinx-autodoc-typehints
+distutils_enable_tests pytest
diff --git a/dev-python/minimock/Manifest b/dev-python/minimock/Manifest
index 6cd356f0d1b0..0fa0659d11d7 100644
--- a/dev-python/minimock/Manifest
+++ b/dev-python/minimock/Manifest
@@ -1,5 +1,3 @@
 DIST minimock-1.3.0.gh.tar.gz 13828 BLAKE2B ed60d9725ada7173f88cdd64d76e3674fbeff352f4ead919f2a3a94ec871189051da29da5ee285b4d663eee143da847c95e35286cf33a587abb7fe95e02a4824 SHA512 de7feef7fee044ba45a52d7c83905d082ad2ed2c3d12b294a6995086b377a22317730326946d048b19063758f158a9bee7bbb6a79c9ae0b4ba7a93e4a21ea196
-DIST minimock-1.3.0.tar.gz 13828 BLAKE2B ed60d9725ada7173f88cdd64d76e3674fbeff352f4ead919f2a3a94ec871189051da29da5ee285b4d663eee143da847c95e35286cf33a587abb7fe95e02a4824 SHA512 de7feef7fee044ba45a52d7c83905d082ad2ed2c3d12b294a6995086b377a22317730326946d048b19063758f158a9bee7bbb6a79c9ae0b4ba7a93e4a21ea196
 EBUILD minimock-1.3.0-r1.ebuild 619 BLAKE2B 2ab6cf8e9f516e62ecfeaec4d91c651c96a1580d3aa72b74c73d8bf27824aa53b928c76b33e37e375fd5892409dc236a76094ca37dddfd786234130fe5035492 SHA512 0f6dd1d29096f75f59d0bee628d7413bbb5d4ff0d6d80f6c87a701ae1065020a3ba1cce39708ebbe8b7a0e9dfc9cffa61ef78810a8e2cb17b88e5ce382fa80c6
-EBUILD minimock-1.3.0.ebuild 558 BLAKE2B 7916e6d42927acd97a9bd488f22a5dd320651819638808b59acd7f19edecff6c80a7cf90edb78cc67bf850c4ba06ed281c234008d818a15f163dfd58a882e3ea SHA512 755ecccabea68142268eb5ad43ba1e42f29ee0ba92524e2be33f23ac63a15797b603354ddce7d12f1b581f5188f9b3b3fe94ef948599a75eb3bfdf76eb6b6e83
 MISC metadata.xml 390 BLAKE2B 9e75c471275dd555065f040f21dc122c7517752b5e8c1944b6c9b70959786f701f9a6e73cb38d2a6707307b5293ddd82da1f84a5407566f516a6a744fa9caf63 SHA512 3506164492e1dd9b17e387f3bc2e57d8663cc899b0dd40bca73e8b4bdd9c62d845465d7fe91ffb5d22711e08a66da984f97d7d56374ef39cdf3cc62354dd2ffe
diff --git a/dev-python/minimock/minimock-1.3.0.ebuild b/dev-python/minimock/minimock-1.3.0.ebuild
deleted file mode 100644
index dda36847f069..000000000000
--- a/dev-python/minimock/minimock-1.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P="MiniMock-${PV}"
-
-DESCRIPTION="The simplest possible mock library"
-HOMEPAGE="https://pypi.org/project/MiniMock/"
-SRC_URI="https://github.com/lowks/minimock/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc x86"
-
-DOCS=( CHANGELOG.txt README.rst )
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -i -e '/cov/d' setup.cfg || die
-	default
-}
diff --git a/dev-python/mygpoclient/Manifest b/dev-python/mygpoclient/Manifest
index 666e3ccd1914..d19d085727b7 100644
--- a/dev-python/mygpoclient/Manifest
+++ b/dev-python/mygpoclient/Manifest
@@ -1,7 +1,3 @@
-AUX mygpoclient-1.8-fix-literal.patch 1376 BLAKE2B e538cd673ae420e86cc68a8e8a93a20ab5714e2e44f864b62dfa2b2944fc5ba2c4df780079fac1db1ec531fc819b6c005bb727cd7ec95163f82d82ed6e6d256d SHA512 80409bb7419561e35f6200d0788e4e82c67b29114a5822c18f8559a280c5aab4bdfd3a263c1eeb3ab67ef17e95430e19723a8a8fc890644427811be6cc6ef9c2
-AUX mygpoclient-1.8-tests.patch 1635 BLAKE2B fb92cd995755013dbb2b35424de88d5c949485e818be45e00c89192bb60b9506690b971fd586c08d7be31e7680c54586a015cd8dee299320fbbccf87c9ea70ab SHA512 9036f3328ed4980858db07f57661300e429c15ca8159118067d1385f8cf0ed5fcbcb7ef498dd12336c9fe2b8e5d22c944b8cd1f4043d418c5ce2b706a47aa239
-DIST mygpoclient-1.8.tar.gz 43671 BLAKE2B 0a1c10c00a9ee034acc17bb5e28d1ebab50a14f3eea534f4a4277172251ce567a26e7ab66859a66d89d4adc06f44dfe5899edb0aeec45e90e461a4a8cb3ff337 SHA512 1edecd5ccb116c7f4017ebe6572439d87ff76501ed0628934e548dc0c9c041127a11ec9f4def4a54a6f7fabe46a461c863ec2ff2f8c14c3c67b5d1fd9285bb9f
 DIST mygpoclient-1.9.gh.tar.gz 44998 BLAKE2B 5feb17fbcdd02c632a11d9ae685b099addd2fed056e72d532e6391b707cfc46e694182ea4e5d7334be10796b5bb19b2d8cbceafe0b69798206f5ec41ca337913 SHA512 57502295725d3a1351e877998442141dd596927215d3746786c12db061ebe3bdf8282e8b2d554997515a558f608c0815e4caad311ad3f1ea9f5b62321e8d6635
-EBUILD mygpoclient-1.8.ebuild 836 BLAKE2B fda0a3569b1d605497bf10d6499806acdaf57bbbf70c783e2b35fcc1617535c6ec224ebb3c335d5e11a8b7f03f2bf26b86c3f3aef595ec601f25d8764c2d87d1 SHA512 d694c61cf3b353fc86b00367fd4a8d3d3e8b49b829d1447ffe7b571e567fa9996effa71dc46408d8a4e3e2731e13f99677f74f4972f7a5a553fb53ca020d3563
 EBUILD mygpoclient-1.9.ebuild 621 BLAKE2B 5c5bb166631ee5080fc2590fd17341a7b617b3cc74ca88b288b4fae13750c78631f590bf01b1a70005e7c1b16a98e7c0430b34d371a64e6eef95b099602e0620 SHA512 35f725551ab26d95780cee8417bbecd143a8e3b51abe8fbd2539d9308a42fd8354b83b514581e58e694570075584c13b529e10ec211558564f24f81fd76ad3cd
 MISC metadata.xml 512 BLAKE2B 2ff1435acc5efe1b4390e91957781baa2d555f127de82ceeefb7349f5c4b553a56924e0ecfe698e8a570da8a6d5ef462240a4c5b2f00c65918f2a175596fa9d5 SHA512 c89fef8499773f751d23d33d7c4407be85286ccf88f93f5fdc630a86602de024e2f3cb014837877f7b70012a3dac8625263fa8898aaf5c0675f0fa3afac31b20
diff --git a/dev-python/mygpoclient/files/mygpoclient-1.8-fix-literal.patch b/dev-python/mygpoclient/files/mygpoclient-1.8-fix-literal.patch
deleted file mode 100644
index 372d0bc2bc40..000000000000
--- a/dev-python/mygpoclient/files/mygpoclient-1.8-fix-literal.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From bdf8c8ce38cff8938bab3544c6dbb0d509ce7720 Mon Sep 17 00:00:00 2001
-From: Eric Le Lay <elelay@macports.org>
-Date: Sun, 22 Mar 2020 16:19:08 +0100
-Subject: [PATCH] use == for comparison with literal
-
-See https://bugs.python.org/issue34850
----
- mygpoclient/locator.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mygpoclient/locator.py b/mygpoclient/locator.py
-index c0dc9d7..810f973 100644
---- a/mygpoclient/locator.py
-+++ b/mygpoclient/locator.py
-@@ -317,17 +317,17 @@ def settings_uri(self, type, scope_param1, scope_param2):
- 
-         filename = self._username + '/%(type)s.json' % locals()
- 
--        if type is 'device':
-+        if type == 'device':
-             if scope_param1 is None:
-                 raise ValueError('Devicename not specified')
-             filename += '?device=%(scope_param1)s' % locals()
- 
--        if type is 'podcast':
-+        if type == 'podcast':
-             if scope_param1 is None:
-                 raise ValueError('Podcast URL not specified')
-             filename += '?podcast=%s' % quote(scope_param1)
- 
--        if type is 'episode':
-+        if type == 'episode':
-             if (scope_param1 is None) or (scope_param2 is None):
-                 raise ValueError('Podcast or Episode URL not specified')
-             filename += '?podcast=%s&episode=%s' % (quote(scope_param1), quote(scope_param2))
diff --git a/dev-python/mygpoclient/files/mygpoclient-1.8-tests.patch b/dev-python/mygpoclient/files/mygpoclient-1.8-tests.patch
deleted file mode 100644
index 94a37be8232f..000000000000
--- a/dev-python/mygpoclient/files/mygpoclient-1.8-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Naur a/mygpoclient/locator_test.py b/mygpoclient/locator_test.py
---- a/mygpoclient/locator_test.py	2018-03-27 02:18:57.711105496 -0300
-+++ b/mygpoclient/locator_test.py	2018-03-27 02:22:02.201109125 -0300
-@@ -16,7 +16,7 @@
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
- from mygpoclient import locator
--import unittest
-+import unittest, sys
- 
- class Test_Exceptions(unittest.TestCase):
-     def setUp(self):
-@@ -54,18 +54,21 @@
-                 podcast='http://example.org/episodes.rss',
-                 device_id='gpodder')
- 
-+    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy doesn't raise ValueError")
-     def test_device_settings_uri_exception(self):
-         """Test if using no parameter for a device Setting raises a ValueError"""
-         self.assertRaises(ValueError,
-                           self.locator.settings_uri, type='device',
-                           scope_param1=None, scope_param2=None)
- 
-+    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy doesn't raise ValueError")
-     def test_podcast_settings_uri_exception(self):
-         """Test if using no parameter for a podcast Setting raises a ValueError"""
-         self.assertRaises(ValueError,
-                           self.locator.settings_uri, type='podcast',
-                           scope_param1=None, scope_param2=None)
- 
-+    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy doesn't raise ValueError")
-     def test_episode_settings_uri_exception(self):
-         """Test if only using one parameter for a episode Setting raises a ValueError"""
-         self.assertRaises(ValueError,
diff --git a/dev-python/mygpoclient/mygpoclient-1.8.ebuild b/dev-python/mygpoclient/mygpoclient-1.8.ebuild
deleted file mode 100644
index 7992f3b024a2..000000000000
--- a/dev-python/mygpoclient/mygpoclient-1.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A gpodder.net client library"
-HOMEPAGE="https://github.com/gpodder/mygpoclient
-	https://mygpoclient.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/gpodder/mygpoclient/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="test? ( dev-python/minimock[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-literal.patch
-	"${FILESDIR}"/${PN}-1.8-tests.patch
-)
-
-distutils_enable_tests nose
-
-src_prepare() {
-	# Disable tests requring network connection.
-	rm mygpoclient/http_test.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	find "${D}" -name "*_test.py" -delete || die
-}
diff --git a/dev-python/nptyping/Manifest b/dev-python/nptyping/Manifest
index 7b153d574edb..6cca7bc5efa0 100644
--- a/dev-python/nptyping/Manifest
+++ b/dev-python/nptyping/Manifest
@@ -1,7 +1,3 @@
-DIST nptyping-2.1.2.gh.tar.gz 64535 BLAKE2B c050c7c49e4c4570b73496a3ac2aa24742844e7cbc1db353d1bf065eea4fdd892221139a085d217a9118dea5b19b0bcec512577c943cc841492f1cc0b14c3681 SHA512 f6d600f7595294829bae5b8cade8b66952df02f30b795af6b193401083d61e5dc8ac4ac474ddd5ef72c3fe3e7f11a4a895a5ff89ab7ddd2664382fbe4f8017c2
-DIST nptyping-2.1.3.gh.tar.gz 65157 BLAKE2B cae8b1a34ac42bdb805193437d2bc02d16c4c37b6cfd04e84e777ec11ce40b32a8422e89e7c63e876b99fa785bf2b15fcf0ea295313ae8a46e662ecb2e370d5e SHA512 7d0c47f5fc67af6ef3af4c757e75d2b415011c4bb7ef08100b4649dd17a8afe3b430ae1b621d36097e19ee635bdaa95ecda6e62c6fb01a58983c66386b51717c
 DIST nptyping-2.2.0.gh.tar.gz 65224 BLAKE2B 11b77690dc83492a13f5a58839655c210d3bd48368e14d0c97be4b5e51f4de54d4e4a238f5865826309b40dc7bb50376ca45827e9e74360dad215bd798610809 SHA512 3c29689994ca87418614e55811b66d03087d127b9e620c2dc3407e3e3ff984cdecd789b0dbd955db460f865a34941f061a7496362ef9944351f59a0e4c3ef483
-EBUILD nptyping-2.1.2.ebuild 1072 BLAKE2B 80d21dd92154b9c8042a86330130e972be101e92ee1c4bb35921182bbabc37162a784b0a51cc75863cc0f693075ff2acc04ed073627f453c36878efb2e6bca7b SHA512 6b6b53e3750bcf7d1046bbd362a48cad9a7ccca70a3da3fb159cc6335e010814cb3ab67f25dc72d3e32b205fb1a23046299403f8afe91f82165003d35b2f69d3
-EBUILD nptyping-2.1.3.ebuild 1128 BLAKE2B 7a302d6379614cec3f0681f5f1936dc38fbd3a4377c1eb1e99c74ca6c35041c1e4e47c6588eae4e9ca3fc72d2dd866740d5e8ddb8a25c3f62f1479636073243b SHA512 4b008f3dcece2747862f2bbd04cfba62a60eae719a878d27344e00cb4ed869ca99a6a573659b53a9027eb7cdc927b195b1bb450b4905c12dc73edaf75ead2df7
 EBUILD nptyping-2.2.0.ebuild 1121 BLAKE2B 31569278777591d4146bc8d202612a9687ccab3dda703249cf878e0b8ef707303d4abeb39392b26a4d707d19654ba1eebc892d7ebd4174162f122b7e61f73c49 SHA512 93ede7a07cec171509d377f4e8595a18e7ca403b1b654ac74dd1238125a597ee6a92b01b1f05401a68576f2a9055b719f5d8107e1c19a5e44c46c1f430a587c6
 MISC metadata.xml 427 BLAKE2B d314480c0cbd8bdf8be3bc5936d01cf73a3b27929b04a3d2147b43c5829a582d9ac3cbefd2c99e35c7dd83d5d4ebc39b0173d996483c349b392fbc27ada65a11 SHA512 1ee6a94fd1d8e2b61f97eec3144d5382e2ff7ebef369815551b033d218bd790ffd8eb21adbebe44f9935feecf62a842f9c6fa5989364f46f6facc606f94786e5
diff --git a/dev-python/nptyping/nptyping-2.1.2.ebuild b/dev-python/nptyping/nptyping-2.1.2.ebuild
deleted file mode 100644
index 1677c4c46bac..000000000000
--- a/dev-python/nptyping/nptyping-2.1.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Type hints for Numpy"
-HOMEPAGE="
-	https://pypi.org/project/nptyping/
-	https://github.com/ramonhagenaars/nptyping/
-"
-SRC_URI="
-	https://github.com/ramonhagenaars/nptyping/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		dev-python/mypy[${PYTHON_USEDEP}]
-		dev-python/typeguard[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# TODO: package beartype?
-	tests/test_beartype.py
-	# test for... whether the release is on pypi?
-	# requires Internet + feedparser, meaningless for users
-	tests/test_package_info.py
-	# relies on Internet access to fetch packages for pip
-	tests/test_wheel.py
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/nptyping/nptyping-2.1.3.ebuild b/dev-python/nptyping/nptyping-2.1.3.ebuild
deleted file mode 100644
index 3815be94d4dd..000000000000
--- a/dev-python/nptyping/nptyping-2.1.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Type hints for Numpy"
-HOMEPAGE="
-	https://pypi.org/project/nptyping/
-	https://github.com/ramonhagenaars/nptyping/
-"
-SRC_URI="
-	https://github.com/ramonhagenaars/nptyping/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		dev-python/mypy[${PYTHON_USEDEP}]
-		dev-python/typeguard[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# TODO: package beartype?
-	tests/test_beartype.py
-	# TODO: package pyright?
-	tests/test_pyright.py
-	# test for... whether the release is on pypi?
-	# requires Internet + feedparser, meaningless for users
-	tests/test_package_info.py
-	# relies on Internet access to fetch packages for pip
-	tests/test_wheel.py
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index c2c674451d0b..20bed5b3ac38 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,7 +1,3 @@
-DIST oslo.utils-4.13.0.tar.gz 101834 BLAKE2B 9d3457ee9ce1746869120bf66d83495b4e1f2b4ca005285fa121ff4c176e85148662cd1de52bdaf93dc18d85478f2cbfde9b310e748b895f01c77ef82019dc0e SHA512 1d97fdaab79cc6c4cc34efdafca7263a2679e60d446aadc46fe31d7fdda2051b37f9df79d149644d914c7274e7fa2d9ef6a1c1aeafad8a1333221dcbe65f4723
-DIST oslo.utils-5.0.0.tar.gz 101823 BLAKE2B be62ddc2fb9130e3f678366b6181f1f334f95846a09ede4a08917cd88427492978e53039a482a7158f234caf96c9e520026ab6009f1df5de588a9fe68aa0664f SHA512 8941caf086354c9066ef51e64dcab5854b8d99c2b51807cb2d8b75fac0983f5787e499b0727423b624791ead2b5c9b55b463d5ff47f7586f3e302dccec1f5408
 DIST oslo.utils-6.0.0.tar.gz 101261 BLAKE2B 8a659b4bedf49e40c85ee40fe026205964d2f4a919170e4700c85e754f4bbffdf5bb9305aea00f7b36233feec93e42bf5e0c72591eeedc02709a7fcdba64d9b6 SHA512 9f9dcd585419372711af69917daf717d7c694cc604aed4db242e508ca6bdea3db9a52a29c354dbb5c80473a819c80dec9eccad7e6f6ca297c3469bcd2db5c7d5
-EBUILD oslo-utils-4.13.0-r1.ebuild 1669 BLAKE2B 7bada81a49796f1b4cb9cc7ad4feb1e9832149624076dd26fe8c8e610c394127f031d367c14abe46c22212b9882f9c82ff896aab1f984a8f762f40f721d7659d SHA512 b86f2f59fcd2f18bde993c47862462ba1becc45c2b99f27db40c32caf6fcc6b0c2f5c1ffb82547500cd2372f5b381efcfcc5c935a230d3e98b703e8eb5162dff
-EBUILD oslo-utils-5.0.0.ebuild 1672 BLAKE2B 5c9840e3cda6c0548860f3896dd2915e6f816990ad0ccd9e7f90656d52e8b199aa8063db0fdb6b6c0a0e2e6e908ac25b212256699c2ec52a5eb5c51a2c2fa42b SHA512 4f6dec1e7153b2858c7594b528c9b6552a710296a4b79fe77866514813e0a1d8b6f96a30823defcc0b53de45f7153ffb70693738d72b2eb78a23eb249a6790b5
 EBUILD oslo-utils-6.0.0.ebuild 1669 BLAKE2B aecfa7811dad0fcb5c0180a8e86ecfc20b8e60e648721152ef120a026afcd4d31716741be279fe3223447af4f71493c5b850a626485636d0d5f04598238ec263 SHA512 0cca0fc1a84172a466c93337ebba68c78be54a85f2a71f2017c6cfd53e02621c34c2693bfa21770966079ca83d9593519e7a93ac740562120a26373f2c020026
 MISC metadata.xml 607 BLAKE2B 4bbcd1e819a4bd7ce0fd4f13d70dfa686c1731f4e7b73d49dbe9dad97d91d6d3bf8c323d0aa167a8ae94b037ef7ef70150debb5a45fc8ba0121e94b02bc688ca SHA512 2a1d9a822c4b6ee4a1cedd2e11970e04ac7ed0639fe6163196874784867a7b2796b840a46338ef53a748b9b6e2dbc6526798124f576a0017c0fe65ec5d46aca8
diff --git a/dev-python/oslo-utils/oslo-utils-4.13.0-r1.ebuild b/dev-python/oslo-utils/oslo-utils-4.13.0-r1.ebuild
deleted file mode 100644
index fbf7c0e01d64..000000000000
--- a/dev-python/oslo-utils/oslo-utils-4.13.0-r1.ebuild
+++ /dev/null
@@ -1,64 +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_{8..10} )
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-		' python3_{8..9})
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# spurious rdep
-	sed -i -e '/pbr/d' requirements.txt || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	if ! has "${EPYTHON}" python3.{8..9}; then
-		find "${BUILD_DIR}"/install -name '*eventletutils*.py' -delete || die
-	fi
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	eunittest
-}
diff --git a/dev-python/oslo-utils/oslo-utils-5.0.0.ebuild b/dev-python/oslo-utils/oslo-utils-5.0.0.ebuild
deleted file mode 100644
index a0bf0d0fa37e..000000000000
--- a/dev-python/oslo-utils/oslo-utils-5.0.0.ebuild
+++ /dev/null
@@ -1,64 +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_{8..10} )
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-		' python3_{8..9})
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# spurious rdep
-	sed -i -e '/pbr/d' requirements.txt || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	if ! has "${EPYTHON}" python3.{8..9}; then
-		find "${BUILD_DIR}"/install -name '*eventletutils*.py' -delete || die
-	fi
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	eunittest
-}
diff --git a/dev-python/outcome/Manifest b/dev-python/outcome/Manifest
index aba99905b003..71768a52139d 100644
--- a/dev-python/outcome/Manifest
+++ b/dev-python/outcome/Manifest
@@ -1,5 +1,3 @@
-DIST outcome-1.1.0.tar.gz 18675 BLAKE2B eef22274bb4d1ddd19fa223167b6c8ce96f015ac0b3b0609aed3717deb306087457ab068fd2466d492fcc5859d561e6d3172ad14611a937ec59a75b604565953 SHA512 65de1c0a38b8cbb041a9fc3a79518eeacea54ec87341846ae80a9a2075369f72a397f5aa747ae179eaac8f341a7e07cc1641555fbb809cc7924b2171f7f3d90e
 DIST outcome-1.2.0.gh.tar.gz 18147 BLAKE2B 19e99c8beb1c537a15040211e2fb2f30e425dbb6c81225f2b44720d52e26d8065f434949cd22f97d3a44b64d404077118842a7c85d38f1b7b01ec60d26ddaa39 SHA512 ac8f8738b000e50ace5fbf2c373c9d28f05e88fe40a11602dbb08c48d369f28651ca6c1269ce9ba4ebf1aa9701525e966c061f75313d8650e739934e3ad15003
-EBUILD outcome-1.1.0-r1.ebuild 842 BLAKE2B 72f21ae60bdf2feb37e01b26bc62456edfd7d921351b02020e2cafb54e413241b2c5eae011702af4ad4e95eaa1e1e4934ca4013f97ecd5502a47309d1e2cc424 SHA512 256f4eb85822405032b324d8f42d3a53ee2d458aae30320041b6a8d03904bc329010f6b5ccb5e2df831f61e1aa3563079342b2b97c24cd25b5b495c3aba592d6
 EBUILD outcome-1.2.0.ebuild 845 BLAKE2B 28d1327ff4cc7d61c03f3367f6497d4c423526636ab0d970841e0a43641e26b21fc5923f9f244dc3704d236f7dfaaef272c80ccebed1a543a15ad41770bcd9a7 SHA512 c7cfe8a2a55f0dc07862aa67d2210d43b38db4fedaa9964c4cbba9f631d0e53d8af4c08257d182f14c1aa484562653ea2f93584fc741e43eb5b01006bd03b47e
 MISC metadata.xml 413 BLAKE2B 375ed97b3bcb2ba5392f09962f6376e5ec8ecb842a70eb8c94647968f2f59e326ddacba74f0e65b7bb5733a05779d464b38d589f3a3dd364ba510bec2825eb5c SHA512 b9b9b94031580858aae25d0733688ce39f5026b4c1a59415370ed50dc27b63654927c36536d4c4cdf6389e68db0b397ddaa7e0aeb786713fdffca4bddaa217d2
diff --git a/dev-python/outcome/outcome-1.1.0-r1.ebuild b/dev-python/outcome/outcome-1.1.0-r1.ebuild
deleted file mode 100644
index caf7841c08f3..000000000000
--- a/dev-python/outcome/outcome-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,37 +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=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Capture the outcome of Python function calls"
-HOMEPAGE="
-	https://github.com/python-trio/outcome/
-	https://pypi.org/project/outcome/
-"
-SRC_URI="
-	https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/async_generator[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source dev-python/sphinxcontrib-trio
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index 58a65425c589..c30509c6fb49 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -1,5 +1,3 @@
-DIST Paste-3.5.0.tar.gz 638021 BLAKE2B 6c8d856733245a7eef5782f8d6c1fe35093f5247cc76e86ab308f2d98a99ebaaef5309a9c402f1334707e042b52e52d7801723e9404ad0ae454b756b9df31dfb SHA512 a9f596d6fcd95f915990c16830caeb9c9a03412447597258c67a003fd485e2efd27798f2eb2de9978ac529292af4b55136de554bfb501e90f6185f55a6b0531b
 DIST Paste-3.5.1.tar.gz 637755 BLAKE2B fc5f4afc064ced52322f7c2cb20c84d24538bdd3a5dadf7b47f62dd8b64ed62a2925102b785e366bc9b9257835529ae226a4d291bebd40d70bda16be781613c6 SHA512 7ae39691bb6067309a12bf76e2a110913c7be6ddcda6215eaf0228144ff26a1c7b50500729b65e27652dc7a7edf6fe26bd144d261e8754d7af8bac495d4613f9
-EBUILD paste-3.5.0-r2.ebuild 1129 BLAKE2B cc83c624249833832ec65e8eea0b41a1b8e5d9a95647fb55ee7608b4b008f2fe2044c9d8c5ac3bf537e6e6489987b3389f2c50da7aedc39b4c1c8074a9daa442 SHA512 715d5f4702ba53ef80606c8fd2ea4f5dae037b46da95903fcf3349a4615de4feb78ba69f156d65b54455e02d679f014e8907e36be4e073cf6cca1631f8aecd66
-EBUILD paste-3.5.1.ebuild 1137 BLAKE2B ae967d398946834c054145bb949c0716e09de1caa810ec66b58f18798988cdeca2da1841863ad58391e1d91b9c4e4a0af961d7ecf746259d60a76304e5b796d1 SHA512 d2511625b0f3278f964362ed87ee77cfeae7a7a2790e7fbed21dcb059804186b8af80e236e6be891a0494a7d02ec2d7d244961eb3f3eb0b6a9846435400310ec
+EBUILD paste-3.5.1.ebuild 1129 BLAKE2B cc83c624249833832ec65e8eea0b41a1b8e5d9a95647fb55ee7608b4b008f2fe2044c9d8c5ac3bf537e6e6489987b3389f2c50da7aedc39b4c1c8074a9daa442 SHA512 715d5f4702ba53ef80606c8fd2ea4f5dae037b46da95903fcf3349a4615de4feb78ba69f156d65b54455e02d679f014e8907e36be4e073cf6cca1631f8aecd66
 MISC metadata.xml 628 BLAKE2B 96690448ed95a0b6794142c3641a2e5baa5618926df08f8b25850f67cbd05fdf8ec165f7b7db421d2b96b156fb1f7ce123388d7d70769e777acde6d15c88b955 SHA512 a33c225ca164a23e44820e92bc94cff49383bf792c91e8d432f9bc0a0de537b0e4b01a1b99097df1d2e8984554b78be5101db556e1c37e00e9b5002d0729e6b9
diff --git a/dev-python/paste/paste-3.5.0-r2.ebuild b/dev-python/paste/paste-3.5.0-r2.ebuild
deleted file mode 100644
index a89c1a5d2dda..000000000000
--- a/dev-python/paste/paste-3.5.0-r2.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_{8..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P="Paste-${PV}"
-DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
-HOMEPAGE="
-	https://pythonpaste.readthedocs.io/en/latest/
-	https://github.com/cdent/paste/
-	https://pypi.org/project/Paste/
-"
-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 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
-
-RDEPEND="
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	!dev-python/namespace-paste
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/test_proxy.py
-	)
-
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# fails due to cgi deprecation warning
-		tests/test_cgiapp.py::test_form
-	)
-
-	epytest
-}
diff --git a/dev-python/paste/paste-3.5.1.ebuild b/dev-python/paste/paste-3.5.1.ebuild
index 7b27623d9a37..a89c1a5d2dda 100644
--- a/dev-python/paste/paste-3.5.1.ebuild
+++ b/dev-python/paste/paste-3.5.1.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
 
 RDEPEND="
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index 38c9ae471168..eca5d9b07aff 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -3,5 +3,5 @@ DIST peewee-3.15.0.gh.tar.gz 903961 BLAKE2B d3e01171fb281c1b371bc6518366fec69814
 DIST peewee-3.15.1.gh.tar.gz 903784 BLAKE2B 2570f12089728dd56bbcdf8715b7874fe11bed4790b80780b5850445188305a98695cbaac2e7a9b1cd53d9ae601a6a1be796219386dfa07da45610013151062d SHA512 eabfa7ae532fc6d392c7c89844ac28533787dd1a8e08ba797d6f0c5f70b9e60d74e3ca98e1a1e71e66744a7b48a3544c228289d7ac415619bfd81da15d6cf0fc
 EBUILD peewee-3.14.10-r1.ebuild 803 BLAKE2B a995c5f0079702eed30e2aa34c212a7f08cc62b5fa9e63ee92b943da586cdd31578719088689ee2a8fcb449a65933dedb479cfd4d6d2df423d41a0b5493306cf SHA512 6ac376ab1d7c7e81f3de257a723a0f057d30d48b2dfbf9261f2ef44c1c6fb56520a4542b9dae6a7e3c2308047b2041bb6f5e1b40fb1df5afebb590f815a098aa
 EBUILD peewee-3.15.0.ebuild 795 BLAKE2B de3dc99c82667838e28a99d3039a331f2061fe17c651f445ae91f5c8090cf085d0c8b84eb651299991d9d3d736a7f08d4219f9c28b49ae35198a597d6f88ca60 SHA512 1d66d6c42f9adc68b3fbc272cd4c0ac933994a863e0e01586f3c42a843d6c976a525a7f80cf6b0e0bde6a8291868d5b8228d3284b5ffa3b7d086dada07b3f4fc
-EBUILD peewee-3.15.1.ebuild 795 BLAKE2B 47791866b281534ea68bd6fb010e0b65710bf536d07150dfe35d0b6efe477e6b78aa3bd0b6e9788bfee318fcb251bf83d7ddfd37daa9ca5bfad41f7a3866a95f SHA512 c05561a8165b10933de8a922a0552f03418b0a8509fb5115bda18545652410e1c5802c0480030081dc108ee258b329b6b255ebc93d70f89704acf6effaec71dc
+EBUILD peewee-3.15.1.ebuild 794 BLAKE2B 1fb72c56a6b32e930e6696f06ee05e0c73a917ebe5735a13cd7e0052abd7d72bb763da2a896c5b3d9e7495ac34aa79751377103f4c6d8525f73a6524c5a7774e SHA512 b6b55b379a5c2c509f6357d33bc6317d475920f404d561adfba964a01083efb5d7359e939b0e7ee11da3f3c2fa1a6152c2306a47218e68f1e09dc5050632a510
 MISC metadata.xml 365 BLAKE2B 144b870f5470e3de971f47316313980f95a3453c684fb7c326da025bef8a4e29dc0731808eefdecbb059a49ad77dd4166b3595554ac42d0578bda75c17fc06bf SHA512 9445bc6cf059e5c95c1e9ce5eebad887a43133ea0fad3fb7b70f60395e79bf30a42d893aa65d4c328e7c304b24a86fbdf3939b9ecccad318db01e95c3b4521f3
diff --git a/dev-python/peewee/peewee-3.15.1.ebuild b/dev-python/peewee/peewee-3.15.1.ebuild
index 82b01219bc7a..fa5dcaf7f561 100644
--- a/dev-python/peewee/peewee-3.15.1.ebuild
+++ b/dev-python/peewee/peewee-3.15.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~riscv x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/proto-plus/Manifest b/dev-python/proto-plus/Manifest
index b9c9b7592f70..30a6b26ef387 100644
--- a/dev-python/proto-plus/Manifest
+++ b/dev-python/proto-plus/Manifest
@@ -1,5 +1,5 @@
 DIST proto-plus-1.20.5.gh.tar.gz 67573 BLAKE2B d764c8afb4608c38b050c256930a7ea37ee8d5393518e3146a66d11d4fee1cf3b35142426442d014483bd1ac5b815b6445b0f2c2c04f404136aeb6031a944e54 SHA512 bf612f23af3cf30cceaf8ee2027a721cc37dbe7e17d0ce643c31361397409171f92e92a6b53163e747931c3b0da66edca638ae4014c096bc0e3a8f1bc5dc8e80
 DIST proto-plus-1.20.6.gh.tar.gz 67697 BLAKE2B 88fbf1086bc9430360316c89baaf6216d3f395792fbc2bf1336c22aeb4f912dedd5a4af73c5a10cf6536cdc4cf285c89d1d0a86afd4ee21c7e40b26d34631240 SHA512 5da41a8ddabb34a4083b622d60e59532cd7cb97e4fd243b796aded06ee0f6d9ba5ac847434aa8141b90cb3481d45fbc703de2f905ff4f4676a5d86d77a01c44c
 EBUILD proto-plus-1.20.5.ebuild 917 BLAKE2B 0d6f5030b15ac4ed6a1bcf969bab8d0d700dbe274938b5c2f88b512b69ab493e4678a1bf2b74b1aef55727c13972d2c453b8c736a62c090d751b17d5cfeb2e84 SHA512 cdd555df32e78efeb385129ff7dfe301318c5b463d55266c9fb77c8c7b831c92ba6806f811c5b3c23f2ba0d6f954274458ea73c379d35f8fa6a6da5be8f5a347
-EBUILD proto-plus-1.20.6.ebuild 919 BLAKE2B 9d2e638037ab6e048257fb15d6e654d9c1dd4661e3875e1a2354582539311ad01baca958a454072a6c51e003a6bbf5a1bbf27e05b1cf2db78b7d3de9100aebfa SHA512 c306d37b44976b9fd4041c58458cf9cfb0d8c6af06ba456681221c291a4af6b80c9e47ff47203e9659638c7ee422299a82e353aac22d3c90c3e2128687d93ebe
+EBUILD proto-plus-1.20.6.ebuild 918 BLAKE2B 23773b2fbc1c450a47a5bf298c65d4bf14cc985aeb39a46a8c44fa8aa049274f19d23e2758737526336b7ce5008002ff5d8aba33ffc6fd339da198667c024a1f SHA512 7c76534eb990385358ebb3a571b1de78f69c96975f4c89337f45a67b7a47e48aa0115e8dc45dbbf14b0f405e883cff2ef704de7bc8b506ebf00a801bd740ef79
 MISC metadata.xml 447 BLAKE2B d440be836b8a2823ab3beb7f76cbe7ff3f027ec512dff3f7d920eefea3f18329e1aa910ca16e006b1424cbd780f3fad80b8ccdc632c08ade651afd815369e9d0 SHA512 d64b8d2eeac9916ec2faab3b038082155e46e8c379ce06d7f554de763318539fa9040d15f90a3a95f337937c90f4b4042f51b1ea1cd11727e5fd971a0af5280c
diff --git a/dev-python/proto-plus/proto-plus-1.20.6.ebuild b/dev-python/proto-plus/proto-plus-1.20.6.ebuild
index 6be65f5713cd..50684ebd4844 100644
--- a/dev-python/proto-plus/proto-plus-1.20.6.ebuild
+++ b/dev-python/proto-plus/proto-plus-1.20.6.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${PN}-python-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	<dev-python/protobuf-python-5[${PYTHON_USEDEP}]
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index b4447a09172a..49892f45164c 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -2,5 +2,5 @@ AUX pycryptodome-3.10.1-system-libtomcrypt.patch 1729 BLAKE2B 57a2022ef17e0b86e9
 DIST pycryptodome-3.14.1.tar.gz 15339859 BLAKE2B 72748a4eaf9f34be1ac3200a0ed0285a96111f52077b6d7cc5b4fa26599b6b8c6c17d79cdce4cabd7257cef840daf71440a78d00ded65deb52fa13e6b1b1efe6 SHA512 08e904aa2f3df19fcc75a8283fc867349617afe3919532912801d8abc9610f1cb64b878b56202cbdf0759cf5506ec5f793123093e21f18ba99acbf42fa4d9cf1
 DIST pycryptodome-3.15.0.gh.tar.gz 16547902 BLAKE2B ce1a6eaca4946d656c08f960f67537e61b9c82a69777fcb0b01b91a9a649c605dcc66a2a6d9fdc5533521a669544c7695e83db856dfcf8e4b2ba7301654b5555 SHA512 fc611174cfb4ca89fb457cc0d1220326ac813de5a83a959a95c1928a5220dc8c652655ac0a2b7d116b60cb4a8317959d8c2b2f3595e19b9b359a32beb042b58c
 EBUILD pycryptodome-3.14.1.ebuild 1161 BLAKE2B b0874894b4bd716bc3129a5b110f1b5697830b9554913afca5e98307be354dd963bbfec9ce9780bbb6af9d8da96304a7cd3807c57ec8db20931d5f3fb4b479c5 SHA512 e03092dd0f2a82057bc7b1a88c150590ac48f23d4487444c029a127ec1d18893caa2b29cada83b6a126a4651b40628ff088e322645d5da02a51a7a355cbaab32
-EBUILD pycryptodome-3.15.0.ebuild 1334 BLAKE2B 0a304f9fab2dce9030355fb0ca716471983424754e38b850363b86aa41499161e0568602c09a78a2bb5f187f5955f504b415fc85ca7802ab55033e4abfc0a99c SHA512 1c250f6bba72376d848984b2452cde8de241a62795c45c2ea14dbf96ff21bc6d4774e67305ecf40895a2ceb5896af2b1eed38fb35f9b5f6c28f7ca909a8dcc22
+EBUILD pycryptodome-3.15.0.ebuild 1333 BLAKE2B 15f030dfd1a107c2d0a9d5884689f33c8455a0ec2d244c5f39311cc6291cde0bc482d160d9b69463e38bfae6db4ca5b562d19f49ce7dd454c1ba6455f379f18d SHA512 0608b64a60faeb7b35ba29c5e27322b96e6fa2b400100295c00198172a13c520d25ae1ea4d615f95503932e80eb5b8f716113479e2955385541627a49dfe0415
 MISC metadata.xml 386 BLAKE2B 1ec04c0cb752414f063177e637f1fc3e3c401db0c1f245cb33a3690e25597098b25fb2cd5f3ab99838a8bf8339906e2b23e325af5c7248fd880563c872c6fb60 SHA512 f19e2537c5a985389182860eaa45ae68a37ef1167c4b76b452513987fae6fcfb3534d102a079a003770372bbdb4f1997460c982b355f76d09f2387996e18091b
diff --git a/dev-python/pycryptodome/pycryptodome-3.15.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.15.0.ebuild
index 9aa00023e3d2..585d2360c737 100644
--- a/dev-python/pycryptodome/pycryptodome-3.15.0.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.15.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	dev-libs/gmp:0=
diff --git a/dev-python/pyroute2/Manifest b/dev-python/pyroute2/Manifest
index 50c30604565d..8edc5a6b24a5 100644
--- a/dev-python/pyroute2/Manifest
+++ b/dev-python/pyroute2/Manifest
@@ -1,7 +1,4 @@
-AUX pyroute2-0.5.12-readme-filename.patch 332 BLAKE2B 37df4e22ef010582c9675a081d25493715b0a4cfd93c14320cfb58af576b189a282cf5ee774d821e24e9de1342e6af56c5508882b44fef1e63ac3111f70830de SHA512 9fe059bb14e7ecd98a9cfb749cc8dbaf68e52e3d1d0e66eb8a7a15a4b6f0161d4618a9b64fc20de4c15b4e5f750df82c648fd5169918c2f0dabfb9d3fac09a5d
 AUX pyroute2-0.5.19-exclude-tests.patch 323 BLAKE2B 21d429d3762fbd07566afaeefffa4682b35f5b0d5591d0525421973a225b10173a692c21bd46cf7d443d2ddda03289d9616ec0d299feb26aa712d57886daf678 SHA512 beaa77a3cc4e3987c50a797d6decdcf626a90dbbd34219738c3f6af8bd875282272f6fd6d6f59178e2a481e8e4274e3e5d6210a2b0b3c76a90cf94261a39f911
-DIST pyroute2-0.5.14.tar.gz 436853 BLAKE2B 9febcd6563d89b5ffd71342d8d83a3251494f978ad4449532b568cf0929c9f3d8d8d36e1a0b0f6733013e12f6322aea46d991a22f5c3fa93e47dfa08376ddd13 SHA512 9601cf8133b703c55770b6292cca1e907a029689aaeb350b6eee40406b56de5563ee0ba37b4814540c365a5974be78a024dcb27bc7ee00eac74676f4013cf277
 DIST pyroute2-0.5.19.gh.tar.gz 457432 BLAKE2B ffb2717c60badb1453eeb15f5b83f1494e851ee011fcdebd3a5d249ecc4bea7064069a1af2fe2d34aefe9812c8b6808b8a14cbe518383c165b0b008d10505c5c SHA512 19b0acbff17415acad20a214e0622ca9a3fc51b92e603ab15663ea7e8da290fc0b2033aeca1c20200307e34173802f89998151f77d5bcfc5f87eb8b42ba591ce
-EBUILD pyroute2-0.5.14.ebuild 848 BLAKE2B 1a575140957e1275b3590a1ca0c8799fd691edc5ab9d0e53298420011223c4929cb7f0687b12aa2a6b7059b2971a10977bb9ad03a6f13a5acda283f14702ca39 SHA512 f94cc4b0d7a50bb3fa045950cc8a1ef71a422c64d24af01fa750fb0905d1ebff3a56d0be822a2cb43899de38d5f52eda2dad59cb210d03f5da7da1a0d6bb37bc
-EBUILD pyroute2-0.5.19.ebuild 566 BLAKE2B 133f408834ca25c36ea849fdb311e4566ae1f1d21840287cbac5163ee5b3100bbae792e357fe5991f57d06e93c97e2c1fcfc1171dc95e4c49b2e342675ed78de SHA512 2345e5786347b186efc482656be3c4736e32db609686b58b981db4cd276dc52205a13dd075d3389978dfc79f568f564f94cd515353d8a037b3ed6a64ba3148d5
+EBUILD pyroute2-0.5.19.ebuild 564 BLAKE2B e2f573bfbb961f2d81f3b23745289137dd9ae65bcf009a619ce4ca86944ab14e7f23d6a491ac036fce95155da12e2ad1e4572f49ebf8da7523eb978992c81825 SHA512 a1d51d6d8e22226f775f52b96b0c34cb0b6da8329aed70b4040d3e38c8712b58430d8bc45df4ca8a132c4c61f810634b5d15770e6fd9cdf7c4207480d367b9f0
 MISC metadata.xml 547 BLAKE2B 1d256c8d9bb8cc039853ff12c15d7c2747822ff95e3ae7f3e7c1600498c7b886a341a03327992e3a7933592eba0094eec6fba519b0d9f2b2f0ece57eb515ea4a SHA512 e845b3e319e9d60b1dcbf9ab66681b886b0c517a5a72288aaf9ccb97d5018dc3b01b8d921b8a9fcd3538cec96e9a7e1c452a704c8c422ef6e6fa6069a7ae56ef
diff --git a/dev-python/pyroute2/files/pyroute2-0.5.12-readme-filename.patch b/dev-python/pyroute2/files/pyroute2-0.5.12-readme-filename.patch
deleted file mode 100644
index 9fa7379e565c..000000000000
--- a/dev-python/pyroute2/files/pyroute2-0.5.12-readme-filename.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 5c387f01..b0f1449e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -23,7 +23,7 @@ module = __import__(config.get('setup', 'setuplib'),
-                     ['setup'], 0)
- setup = getattr(module, 'setup')
- 
--readme = open("README.md", "r")
-+readme = open("README.rst", "r")
- 
- 
- setup(name='pyroute2',
diff --git a/dev-python/pyroute2/pyroute2-0.5.14.ebuild b/dev-python/pyroute2/pyroute2-0.5.14.ebuild
deleted file mode 100644
index aa6e0a92d04c..000000000000
--- a/dev-python/pyroute2/pyroute2-0.5.14.ebuild
+++ /dev/null
@@ -1,36 +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 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A pure Python netlink and Linux network configuration library"
-HOMEPAGE="https://github.com/svinota/pyroute2"
-SRC_URI="https://github.com/svinota/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-BDEPEND="test? ( dev-python/psutil[${PYTHON_USEDEP}] )"
-
-RESTRICT="!test? ( test )"
-
-# tests need root access
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}/pyroute2-0.5.12-readme-filename.patch"
-)
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	sed -i "s/^release.*/release := ${PV}/" Makefile || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyroute2/pyroute2-0.5.19.ebuild b/dev-python/pyroute2/pyroute2-0.5.19.ebuild
index 6a607f41ac0e..e19c69dedfef 100644
--- a/dev-python/pyroute2/pyroute2-0.5.19.ebuild
+++ b/dev-python/pyroute2/pyroute2-0.5.19.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 PATCHES=(
 	"${FILESDIR}/${P}-exclude-tests.patch"
diff --git a/dev-python/pytest-qt/Manifest b/dev-python/pytest-qt/Manifest
index cf1a7a4292df..f76b85617927 100644
--- a/dev-python/pytest-qt/Manifest
+++ b/dev-python/pytest-qt/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-qt-4.0.2.tar.gz 113466 BLAKE2B 73ba6571958f3f4cd76c3e891eaa014d464b94a7965afac6cee5b43bafdc63d4d640f84c7bfa1666146ab5139f79c760bd9f5a2a44f788b6384df200ac48ad0d SHA512 7f59c499e1395460c2ff20a969cec16ca104f742c648faa0d7eb1528c04d8ee52c04c52798478bc01c5467bee33d3389b141424491ba5442f9df4e82f0dff173
 DIST pytest-qt-4.1.0.tar.gz 119702 BLAKE2B 7c906c94761df6472ae65a6ebb38dff07de8156730e3e10615ea8e08f0bd9f9fee07127ee6e8616055117b1db1911bc9b4486345d84b249664d317561195ad77 SHA512 bfb56abbaac47bf9da26eb19d6913d59872f2a9923da339e9a30a2145d0a094ddec36bcfa21d39c4cf318f95a83c72c249fe70034294a6791f9d84345f77451d
-EBUILD pytest-qt-4.0.2-r1.ebuild 1578 BLAKE2B 36e13e3720c4e5739b2673992c2f888fc45400ac04a3a5d091d92bb32712ce39f7874c61e3c6e2f1511023b2ce5e8d2b06e75b0366e1d655be5e88e7c2a8f7b2 SHA512 68a89df20780c5d41865ed9b3d560667401712abbfce2e6dfe9071252ce95877b8c7854e0f7620d90543cd4f1381685d750f0fba4f6204a8b65e5252d886b04f
-EBUILD pytest-qt-4.1.0.ebuild 1695 BLAKE2B 11efdcf4e0ce3ef578e9a803476c0928f94ed3a8fe41caba28c6263c3d1996896370002347b8c9b7dc109faa26986971e0950e705394a02b222c7ce1306ccbd6 SHA512 238e661ac00081736d35fa3284f83f7e57d72e21c5ba34a91ccb171de511cee4c566dc197a397e8e44471fe1c4f9d34f53911754ecdf41c52ea591e18e4bda82
+EBUILD pytest-qt-4.1.0.ebuild 1693 BLAKE2B 33e32b2abcf8bc6cc3bf74dad84f5fef6644e66e8a8a7fe24a27b4c28c371aa35c410c2ac712dd0cc5722c504bdc323100c67b2e687f2726791712e23cdb7f53 SHA512 7003c9b7b2cdc7d0e91db559e55413361bae52046613c60004656860b229dbe18ce1118f9f305769444cb3609207da2f21c44088231cd9335559a0753c960a2d
 MISC metadata.xml 516 BLAKE2B be5241e39f672681b27a003d02eca0e047644cad7da57de6b3393f58760c094c1661b9d168e44bea4efd56b38225d49abd5be6e71031a0d854b878716286d3ed SHA512 77981d63d3214fd2c052f8a7eac1a439899318973807299237a9105730893ce01d4423b060f532bd4f4496418683fc5128508c7d8747ba6ee6ed0eae67e5569f
diff --git a/dev-python/pytest-qt/pytest-qt-4.0.2-r1.ebuild b/dev-python/pytest-qt/pytest-qt-4.0.2-r1.ebuild
deleted file mode 100644
index cddbe0810ddd..000000000000
--- a/dev-python/pytest-qt/pytest-qt-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,59 +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_{8..11} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Pytest plugin for PyQt5 and PySide2 applications"
-HOMEPAGE="
-	https://pypi.org/project/pytest-qt/
-	https://github.com/pytest-dev/pytest-qt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="dev-python/QtPy[gui,testlib,widgets(+),${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/PyQt5[gui,testlib,widgets,${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/pyside2[gui,testlib,widgets,${PYTHON_USEDEP}]
-		' python3_{8..10} )
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	# warnings from other plugins cause the test output matchers to fail
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytestqt.plugin
-
-	local EPYTEST_DESELECT=(
-		# requires the window to be activated; that doesn't seem
-		# to be possible inside Xvfb
-		"tests/test_basics.py::test_wait_window[waitActive-True]"
-
-		# we are forcing a specific module via envvar, effectively
-		# overriding the config
-		tests/test_basics.py::test_qt_api_ini_config
-		tests/test_basics.py::test_qt_api_ini_config_with_envvar
-	)
-
-	PYTEST_QT_API="pyqt5" epytest || die
-	# Pyside2 is not compatible with python3.11
-	if [[ "${EPYTHON}" != python3.11 ]]; then
-		PYTEST_QT_API="pyside2" epytest || die
-	fi
-}
diff --git a/dev-python/pytest-qt/pytest-qt-4.1.0.ebuild b/dev-python/pytest-qt/pytest-qt-4.1.0.ebuild
index 69dbc6a6d79f..721c620d61c8 100644
--- a/dev-python/pytest-qt/pytest-qt-4.1.0.ebuild
+++ b/dev-python/pytest-qt/pytest-qt-4.1.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/QtPy[gui,testlib,widgets(+),${PYTHON_USEDEP}]
diff --git a/dev-python/python-augeas/Manifest b/dev-python/python-augeas/Manifest
index ab060596a949..367e9334bdf7 100644
--- a/dev-python/python-augeas/Manifest
+++ b/dev-python/python-augeas/Manifest
@@ -1,5 +1,5 @@
 AUX remove-tests.patch 417 BLAKE2B e3a0e4b3fdb42b395fa336461f84feea4dac252399ff266231121a48e659fbfad671d318e9a3212f77939f7e609b3df71363abf8f9f2450e087479869731720a SHA512 3b399e3e85cf12bc5ee2db3d53594b2eee5ba8809bfaa950738730194c2dab16c8b776100b009bdbb520020b0ae276c8b13291139dcb1d48e0887bec72c80679
 DIST python-augeas-1.1.0.tar.gz 93657 BLAKE2B 21d2713d8e11552cc7f0191d2b8f7805b223f5dc9478b89b39dcbd325ab354cef0bfc0314852dc2b071b3b061319b4e27904c0514eb6d6ffd4e39cf7ca33d1f9 SHA512 34e4e98219b9146ef843d94c2e854e951a9b7e81409e603e77e7defdbb8765c013a2c869a4f5db2244352ca35656e18667a0210dd24099cb3e4552a04b23aef8
-EBUILD python-augeas-1.1.0-r1.ebuild 626 BLAKE2B 67f185c715cd68c2df3049c9760e8cf02e258093a55250c3753f9ae9c5fcc65637ed1adb5756ccfa1cafa943afcf7e9e1d0fdafafd6dcc5ec63d335994e0e1d1 SHA512 e691cb4247c4dc8050a6cbd653187ded7a329aa49410c6d71975a5e14cd9649abe6e22f3bd244285f22f87ac54cd1c0a47e4200c26f777479155797521253c19
+EBUILD python-augeas-1.1.0-r1.ebuild 625 BLAKE2B 4e94cc203252e5927868f276f59da8091ada26ebb3311e8002502e0acd27c2db50aad2507524b3fb74d915a8969d3d3aa44162fa5756dc39a9fadb1a58cfd2b5 SHA512 0f075444ab6cc181661ccf05c0dabf5b12b92a40fadae189aaa2b417cdda25742a5beec6b3b7a321b4082e8686b87e3780f61faa0087edab1675b7260172c1a8
 EBUILD python-augeas-1.1.0.ebuild 593 BLAKE2B a281c1c4a107ddacbd8d96f1d954a0979a3e5e27f6c358f978d6388fe5ad66787b56e304aea783458c8edbd2b6304190a466a0fea1155d779264bb56906cdf23 SHA512 2699f316a8cba901bc5acb03e3270602a8624c2339b0da81abbb0a9c1a2e8f54788d28775b2a1d9073d83a8c5810f76483a6cc9a077ed29a0b2ffb7699ca1d1c
 MISC metadata.xml 423 BLAKE2B 0caa39c52d7e83a0955531808d9bc2abb0ca3d5a1d81d0c1258d209debed472e55c96f93f6e6474beef75ce6b0691195c0b1092154eb463ffdb4190b4c59f0fc SHA512 53e90a9adbf82e9e3f7671b7de404fa4e32050aa9316b226efd782ad49628eeb3a407d6ad45a71bce698eafd60ac3bb46b6289df094fccfd2196d9d33ae290a2
diff --git a/dev-python/python-augeas/python-augeas-1.1.0-r1.ebuild b/dev-python/python-augeas/python-augeas-1.1.0-r1.ebuild
index 47cf09eb8435..54dc603d5249 100644
--- a/dev-python/python-augeas/python-augeas-1.1.0-r1.ebuild
+++ b/dev-python/python-augeas/python-augeas-1.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 
 RDEPEND="
 	app-admin/augeas
diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index 4fd7d1e93c59..cb4dc9be5e93 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,5 +1,3 @@
-DIST python-debian_0.1.43.tar.xz 175832 BLAKE2B 2b43da25392c844a3c8fa8e159695ef4c871c6620be88d286abde31b9285e3f005e3c20997617d24014fe94a1a3c446c8721f8d92c35018ac308da8703788bcd SHA512 510dd37ef65be2ee0f9c4c4c15010b94fc7c05c621de2cb25fee4f6e741f51dff2e4cdc333313bac8269bfa621533217b3f72ecbd8b0b6368aa52c54e5237bb6
 DIST python-debian_0.1.44.tar.xz 179372 BLAKE2B 39d19c46e956231cda7c1fdb3ca89f8ef579d61e6bff06b35114184b2596516b3a01f756ff8e34e9a0dab669658cce7b8fdbfa39ed770df376acf6c4c6fb1401 SHA512 34c627cf32647f196a4b41a8913fd9aaefcfd6c96d21cc8f9798723ac11dac371574f62af9e549437188f2f492cb80445e33f35c72b6fa8212223029371a7b33
-EBUILD python-debian-0.1.43.ebuild 910 BLAKE2B d9cfcaed8155908f5f5368ffa0b024672055467921c8244e81480da9708262e4379ae8cd6abc5b1e5013a114e0fc33b64897c81fec2672d0f45402941730b33a SHA512 5d9e19affafacb78b99ec9d1a4d2b1e575b649c8191d0afe1371758f0ab1e0ca1d58d2087c9bd513ac0becb58dbdac394315076706df9efb7ab70d25013bf808
-EBUILD python-debian-0.1.44.ebuild 966 BLAKE2B 603a89e178cdde7e72085b616803c263c7b4874fb6abbf71fb306d81feed10d6fa3010476e7fd177d69764bdf0a7332cf08ce8e45bac37820048bcc2fdfef654 SHA512 3550de40d71c5c7aef4db108121109cd3e79deb0b7e17c3ee446484ceac6256ed31271f58be72422022a7fe90d250151b9041d527b5ccfeb4a81e2695787f452
+EBUILD python-debian-0.1.44.ebuild 963 BLAKE2B 71e8142ac149f35932ed279d9710442fff2b8a142274ca2b7b223af745e091a3cb9bbac14ce90694990b4ab036ef8156b5a422d57bce5a0aa30914ae0ed24c8c SHA512 3d2a3f4c197a54f1bef45d9efc312dc8203d409707a275551f8b69a4d9af03f891c8f9b1f422df49e18bb29e6a9a149f9c9d2aeabce88b2665c265d4ab6cb31b
 MISC metadata.xml 448 BLAKE2B bccb39bdfb24e81bc05028fc92033468f5256be096cb409b4413f69444d59d3d9a3469047337a7fec79ac707ddf4d269b44b20c725f7fc4935bd10335e1f9374 SHA512 8e3fb6ca4bf305e23a51ff56cf84648aad1e96d36aa7a4fb138f7136ea77a6a76a8985557ecb1c9da962479c8c9e36c253655d6e6602c1833f2a2230b44540aa
diff --git a/dev-python/python-debian/python-debian-0.1.43.ebuild b/dev-python/python-debian/python-debian-0.1.43.ebuild
deleted file mode 100644
index b18cae919905..000000000000
--- a/dev-python/python-debian/python-debian-0.1.43.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2011-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python modules to work with Debian-related data formats"
-HOMEPAGE="https://salsa.debian.org/python-debian-team/python-debian"
-SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? ( app-arch/dpkg )
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# See debian/rules.
-	sed -e "s/__CHANGELOG_VERSION__/${PV}/" lib/debian/_version.py.in > lib/debian/_version.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# See debian/rules.
-	"${EPYTHON}" lib/debian/doc-debtags > README.debtags || die
-}
-
-python_test() {
-	eunittest lib
-}
diff --git a/dev-python/python-debian/python-debian-0.1.44.ebuild b/dev-python/python-debian/python-debian-0.1.44.ebuild
index 3c07375c1483..15b1e315ea43 100644
--- a/dev-python/python-debian/python-debian-0.1.44.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.44.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 9bbe5ffd2a49..b4475f0f4c8a 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,12 +1,4 @@
-AUX requests-2.27.1-unpin-charset-normalizer.patch 670 BLAKE2B 09d25ce8300c2dbbe57724bbb61362953602694d0c61b168e2304bf3c428264d40a5b306322f94119db0b27f0d25168bc401600ce0ed62cc0656f2c2126506eb SHA512 dd690477d181702d0a421794b98b8841573a6eb30402a8edc76e9f51b12365dbc2c3d72da1c261e370aa64eebab53b6aea99dfe5016aba0124fcd482c365c1ad
 AUX requests-2.28.0-drop-dependency-warnings.patch 759 BLAKE2B b2cc24d9d3137ad652ab9d8c14a08dd33af7d3f2968433a0f6cb09dda46ee5c98f428e495e5a565d32a142c22afb439e4604e09d2693b945bcceab0475381700 SHA512 2e486d399c311b81522d390ff9eb601fbc31f3ba64c7c3635aa0aa37e959acdba4f0cd4fd87d5ad51e1c50d83057c2f4ea02d9077702d51bda711730ea82e3ce
-AUX requests-2.28.0-unpin-chardet.patch 1569 BLAKE2B 8756805b4b8aea57bdc6e49d58195a7a4d98388cd54b919ec6135a23a3f0b5036cf419f7417699b83430cd2d24ad97d97b70fdd2e799bc6fc8edb1a37338fbd4 SHA512 e9be4ab64610dd3463709e293cba46987dc012d3b8643af57df16dc7add85b33da7bdcaf42e22dfaa9ae1f0c5bc7714aa10b016ce480d57531f7d7fbbaeadcfb
-AUX requests-2.28.0-unpin-charset-normalizer.patch 743 BLAKE2B ed605c62ac0d7b87f802c0cb80b64288d5a0de7f81e11c3a2e89513652f405b525bfcffaa603bd6b9eb4f394b7327fd78920c7c8525bc2968f33cd1ffea4531d SHA512 124e703a0d80d02bbc21c00fdbbdbd97d7e74469f6019cda338be6067994c9b15704e584649fcc91e88799801efd6cd41738115d61e099ef02869d006627087b
-DIST requests-2.27.1.tar.gz 106758 BLAKE2B a7fed53998fa61b3d03abd254a0cee76450c5b60d76f80aa6b91f32dca1dae5d2c51987b3d3f2138d72c50790e35c36cb03eb5974554ac4eb1a902eff79b5bdd SHA512 e51916abea8125254c5ee72c97e84a73e6981cab09961486873387522d2ce041ee3fe8fa2ff0b9bbe6707eefdc05145e9adcf127bcd999dea127acdfabd5312f
-DIST requests-2.28.0.tar.gz 109748 BLAKE2B 1df85b90ab1f6c551e46593dc8640aa0629505c9b395ca2100c6af04435e1360503b215d9796c34fb09122ffd616e1a01ca3574ac4543b4857c76a3dd86f13fe SHA512 111cfd2d0b0267111ccad0a97b33c5e9565812e6e6728b7d5bdbe06c32fae9e637b220bda605d799409e57dc6aaf3bcc66a4a4605cdbccb439367dc492fb836f
 DIST requests-2.28.1.tar.gz 109805 BLAKE2B 2106be5f9e1d9f1a22de5522b5d72084f91c2849e60e33b89b2411b76cae9b1f7faac34947f69c49480d001e9b77e4dce723ee939d51591882854d510db49b59 SHA512 c123ec07171c2c7c34e4173b97750adfa313b4312d91c0d58e4eb8750361604017e5b370c23ec886d2cbf704f9074ec5ad0fa9c2cd8e6f9521532adafff39d41
-EBUILD requests-2.27.1-r2.ebuild 1908 BLAKE2B a953b0fb34062bae636f2dce4f31f6a17d2cb7b0d1bb6d1cc9093d0d14e50d11e10288df067e660a5b8abffeda281e57b2b2fa0986c152cd12f7b757e18f746c SHA512 03741ec47b5468e168bb5173b8652d9c619ce10c10186adc45a9f0bff1838d7e06d2503b9f6d62d869b85bc2fbeb86f939bfaa96948a1ffd734cbf8cf828a36e
-EBUILD requests-2.28.0-r1.ebuild 1916 BLAKE2B 467e0a6ef9a367b47fa241435437028c4194c1c031ce2109a7f81072061eab0a597f5d97c3122c3bd21cdcf6265eb297120557d1d4513ecc610cbecb190ac6a4 SHA512 88deb82e4c2e046c68d0ee67e676dbe25462a51f597d128dcf4c049ad8e93bdd8a38374758c3d95bd7ee317cd8e52b8a247147314b214afab412583dcce106a2
-EBUILD requests-2.28.0-r2.ebuild 2023 BLAKE2B bb5d65af66c29fb3fc4adde5afdf6eb79e0de26990c8336eaa98ef2592e8124b7d60e00ff6cdc963984d1858ac9e72eb45c4e3e6d3599baea5b4db5dddaae103 SHA512 3a46c51ea3fd58bc98b301f75d2e9748199862f8b408ba2a103c70c54a31afab805d7770a365b4920381a317cc6ef70bfd8deb3ef829cdbb99738db4306d41be
-EBUILD requests-2.28.1.ebuild 1916 BLAKE2B fa2793b3b94490f6ff114142f2eabdd3be5ec2525690f82447ead28645519fad31779faaee52417cc722ad6e1d5b21de225e1b4ed6053e4fcb50ce22f3160e27 SHA512 c5042b940abd629b3caf500a0bfaebe05df7506efbbf1d285d09df383e1805fd426447f96d04cc4eeca33016b8f21bc7e4ce765e32ac3c7a6e8bb4cf77c78cd8
+EBUILD requests-2.28.1.ebuild 1908 BLAKE2B bffa4a5df7e0d8403c9d400b6c894fe65ec9390fbfd8e45537046455e12eec11e3a15478568760e11fc6b81f6f18909d09606c5fe302bc2e9baa6adc69acd07d SHA512 6660049b743847f75d2437abec159263f35e69b71be7267e55899ef20ced15f2976a489b7c197620ac553e464e82b07a43c215ff96d916cf642520483010bc35
 MISC metadata.xml 770 BLAKE2B a085a3bdbcc34c2297ad7d5a0e811c553aa77f12bba1ee8164cf63af2cd86adcef7b6080c984ea73a417ec690252540a0fc6072ee97b068b70f0f695696fc65c SHA512 de5c6a99ae18955f25895a93911570d41cb458eaaa9dc8b6edd09021c6dff3dda7bc2611d090b933837f83b8a7035769bb275bb844e1ac91b89a088dde3c7222
diff --git a/dev-python/requests/files/requests-2.27.1-unpin-charset-normalizer.patch b/dev-python/requests/files/requests-2.27.1-unpin-charset-normalizer.patch
deleted file mode 100644
index 418cb519ffb6..000000000000
--- a/dev-python/requests/files/requests-2.27.1-unpin-charset-normalizer.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/psf/requests/pull/6169
-https://bugs.gentoo.org/853247
-
---- a/requests.egg-info/requires.txt
-+++ b/requests.egg-info/requires.txt
-@@ -6,7 +6,7 @@ chardet<5,>=3.0.2
- idna<3,>=2.5
- 
- [:python_version >= "3"]
--charset_normalizer~=2.0.0
-+charset_normalizer~=2.0
- idna<4,>=2.5
- 
- [security]
---- a/setup.py
-+++ b/setup.py
-@@ -41,7 +41,7 @@ if sys.argv[-1] == 'publish':
- packages = ['requests']
- 
- requires = [
--    'charset_normalizer~=2.0.0; python_version >= "3"',
-+    'charset_normalizer~=2.0; python_version >= "3"',
-     'chardet>=3.0.2,<5; python_version < "3"',
-     'idna>=2.5,<3; python_version < "3"',
-     'idna>=2.5,<4; python_version >= "3"',
diff --git a/dev-python/requests/files/requests-2.28.0-unpin-chardet.patch b/dev-python/requests/files/requests-2.28.0-unpin-chardet.patch
deleted file mode 100644
index bd0451daaf13..000000000000
--- a/dev-python/requests/files/requests-2.28.0-unpin-chardet.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://github.com/psf/requests/pull/6179
-
-From 09483bae4f56e4f4c227e2d25ee920c538271feb Mon Sep 17 00:00:00 2001
-From: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
-Date: Sun, 26 Jun 2022 12:18:42 +0800
-Subject: [PATCH] Update Dependency with `chardet>=3.0.2,<6`
-
-https://github.com/chardet/chardet/releases/tag/5.0.0 was released on
-2022-06-25 with remove of Python 3.6 support, which also align with our
-Python > 3.6 requirement.
-
-Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
---- a/requests/__init__.py
-+++ b/requests/__init__.py
-@@ -75,8 +75,8 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver
-     if chardet_version:
-         major, minor, patch = chardet_version.split(".")[:3]
-         major, minor, patch = int(major), int(minor), int(patch)
--        # chardet_version >= 3.0.2, < 5.0.0
--        assert (3, 0, 2) <= (major, minor, patch) < (5, 0, 0)
-+        # chardet_version >= 3.0.2, < 6.0.0
-+        assert (3, 0, 2) <= (major, minor, patch) < (6, 0, 0)
-     elif charset_normalizer_version:
-         major, minor, patch = charset_normalizer_version.split(".")[:3]
-         major, minor, patch = int(major), int(minor), int(patch)
---- a/setup.py
-+++ b/setup.py
-@@ -123,7 +123,7 @@ def run_tests(self):
-     extras_require={
-         "security": [],
-         "socks": ["PySocks>=1.5.6, !=1.5.7"],
--        "use_chardet_on_py3": ["chardet>=3.0.2,<5"],
-+        "use_chardet_on_py3": ["chardet>=3.0.2,<6"],
-     },
-     project_urls={
-         "Documentation": "https://requests.readthedocs.io",
-
diff --git a/dev-python/requests/files/requests-2.28.0-unpin-charset-normalizer.patch b/dev-python/requests/files/requests-2.28.0-unpin-charset-normalizer.patch
deleted file mode 100644
index d4a4a1596296..000000000000
--- a/dev-python/requests/files/requests-2.28.0-unpin-charset-normalizer.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://github.com/psf/requests/pull/6169
-https://bugs.gentoo.org/853247
-
-From 9e9cd2a257392988e6fa417361c3085e5b85af85 Mon Sep 17 00:00:00 2001
-From: Lumir Balhar <lbalhar@redhat.com>
-Date: Mon, 20 Jun 2022 09:32:16 +0200
-Subject: [PATCH] Allow charset normalizer >=2 and <3
-
---- a/setup.py
-+++ b/setup.py
-@@ -59,7 +59,7 @@ def run_tests(self):
-     sys.exit()
- 
- requires = [
--    "charset_normalizer~=2.0.0",
-+    "charset_normalizer~=2.0",
-     "idna>=2.5,<4",
-     "urllib3>=1.21.1,<1.27",
-     "certifi>=2017.4.17",
-
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -5,7 +5,7 @@ provides-extra =
- 	use_chardet_on_py3
- requires-dist = 
- 	certifi>=2017.4.17
--	charset_normalizer~=2.0.0
-+	charset_normalizer~=2.0
- 	idna>=2.5,<4
- 	urllib3>=1.21.1,<1.27
- 
diff --git a/dev-python/requests/requests-2.27.1-r2.ebuild b/dev-python/requests/requests-2.27.1-r2.ebuild
deleted file mode 100644
index ecfd2cc3e0ee..000000000000
--- a/dev-python/requests/requests-2.27.1-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-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_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="
-	https://requests.readthedocs.io/
-	https://github.com/psf/requests/
-	https://pypi.org/project/requests/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="socks5"
-
-RDEPEND="
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	dev-python/charset_normalizer[${PYTHON_USEDEP}]
-	<dev-python/idna-4[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.27[${PYTHON_USEDEP}]
-	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
-"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-		!alpha? ( !hppa? ( !ia64? (
-			dev-python/trustme[${PYTHON_USEDEP}]
-		) ) )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.27.1-unpin-charset-normalizer.patch
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet (doctests)
-		requests/__init__.py::requests
-		requests/api.py::requests.api.request
-		requests/models.py::requests.models.PreparedRequest
-		requests/sessions.py::requests.sessions.Session
-		# require IPv4 interface in 10.* range
-		tests/test_requests.py::TestTimeout::test_connect_timeout
-		tests/test_requests.py::TestTimeout::test_total_timeout_connect
-		# TODO: openssl?
-		tests/test_requests.py::TestRequests::test_pyopenssl_redirect
-	)
-
-	if ! has_version "dev-python/trustme[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_requests.py::TestRequests::test_https_warnings
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/requests/requests-2.28.0-r1.ebuild b/dev-python/requests/requests-2.28.0-r1.ebuild
deleted file mode 100644
index b96762bee446..000000000000
--- a/dev-python/requests/requests-2.28.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-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_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="
-	https://requests.readthedocs.io/
-	https://github.com/psf/requests/
-	https://pypi.org/project/requests/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="socks5"
-
-RDEPEND="
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	dev-python/charset_normalizer[${PYTHON_USEDEP}]
-	<dev-python/idna-4[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.27[${PYTHON_USEDEP}]
-	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
-"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-		!alpha? ( !hppa? ( !ia64? (
-			dev-python/trustme[${PYTHON_USEDEP}]
-		) ) )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.28.0-unpin-charset-normalizer.patch
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet (doctests)
-		requests/__init__.py::requests
-		requests/api.py::requests.api.request
-		requests/models.py::requests.models.PreparedRequest
-		requests/sessions.py::requests.sessions.Session
-		# require IPv4 interface in 10.* range
-		tests/test_requests.py::TestTimeout::test_connect_timeout
-		tests/test_requests.py::TestTimeout::test_total_timeout_connect
-		# TODO: openssl?
-		tests/test_requests.py::TestRequests::test_pyopenssl_redirect
-	)
-
-	if ! has_version "dev-python/trustme[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_requests.py::TestRequests::test_https_warnings
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/requests/requests-2.28.0-r2.ebuild b/dev-python/requests/requests-2.28.0-r2.ebuild
deleted file mode 100644
index c3c23c38db26..000000000000
--- a/dev-python/requests/requests-2.28.0-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-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_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="
-	https://requests.readthedocs.io/
-	https://github.com/psf/requests/
-	https://pypi.org/project/requests/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="socks5"
-
-RDEPEND="
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	dev-python/charset_normalizer[${PYTHON_USEDEP}]
-	<dev-python/idna-4[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.27[${PYTHON_USEDEP}]
-	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
-"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-		!alpha? ( !hppa? ( !ia64? (
-			dev-python/trustme[${PYTHON_USEDEP}]
-		) ) )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.28.0-unpin-charset-normalizer.patch
-	"${FILESDIR}"/${PN}-2.28.0-unpin-chardet.patch
-	"${FILESDIR}"/${PN}-2.28.0-drop-dependency-warnings.patch
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet (doctests)
-		requests/__init__.py::requests
-		requests/api.py::requests.api.request
-		requests/models.py::requests.models.PreparedRequest
-		requests/sessions.py::requests.sessions.Session
-		# require IPv4 interface in 10.* range
-		tests/test_requests.py::TestTimeout::test_connect_timeout
-		tests/test_requests.py::TestTimeout::test_total_timeout_connect
-		# TODO: openssl?
-		tests/test_requests.py::TestRequests::test_pyopenssl_redirect
-	)
-
-	if ! has_version "dev-python/trustme[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_requests.py::TestRequests::test_https_warnings
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/requests/requests-2.28.1.ebuild b/dev-python/requests/requests-2.28.1.ebuild
index d144dda70c93..4bd04d958a8e 100644
--- a/dev-python/requests/requests-2.28.1.ebuild
+++ b/dev-python/requests/requests-2.28.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="socks5"
 
 RDEPEND="
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index f04595fc3530..3f3b7dbaf94e 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,9 +1,9 @@
 AUX scipy-1.9.9999-meson-options-lapack.patch 1013 BLAKE2B 04cb7b3bc281ef06fe4360f31ea6befe91134bc68ce2a981df704f52814487503d35100bf7fd429d854d0716eaac20f5d55aadad02a4d48eeed8ad55955232b6 SHA512 6d8f6e4c6399f5e8a641a87168b1e2abd31b69a23f90582cba5d8d22d46de0c89d7b0719a25f3cf4e6cd9f81c9ebe0c94d1ba8b6c6b0209020491603b1f548aa
 DIST scipy-1.8.1.tar.gz 38196215 BLAKE2B 180ae646adba2031a4bf99cd4feefe652b8e340110b3b2872e61aa1083054aadf369c7e3b3e3fd8fb71fcd831c95841d2dadd1c71e35e5f7d95800e5551173f0 SHA512 f6fc71c209991fe82baa4b10d8ade0deb1057f6f5942a91dfb7ae45f3eb78a4535efa2861badf5e2d37239fa99dbd99de760aa7e4854b95991ade0263004e7ea
-DIST scipy-1.9.0rc2.tar.gz 41994528 BLAKE2B a1f72c54dda09a2086756e61cf35be30485e5f237b8a5c339002aa6532017fd215e029e9762b8b669d36975d0df751f7cbe1b0d1da60e12376f70e706af4bdf7 SHA512 dce69ee783d6a234c0a9300af055a59a4de23ba4fedfd2aa16e8dfd244eff72a217c242b332ab500389b236d3bac81ebb202a9f0ed8d1cffa82c36290fd49f77
+DIST scipy-1.9.0rc3.tar.gz 42021439 BLAKE2B 148c5a2517ef18015123503837d921a24258996047b4c5df22a279febc98d0633bb8b6bd9c7b886db9458583e8a5c15886b6349e2095a0ed7d60a7c976d24145 SHA512 1e4f0eb3fc5d8cdc24c2e4f7ea8400f5db039d4a2bb7a7d7c4869392fbdca6836d4dfb0a1ead2452b177fe49a60aa7ef86d7d6aee596e001e870df79a5cbce04
 DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d26b8e86c1558e427a715093f5a29ced3847ab6ecfe88ce1017664f36ac3e9fa9bbf72ede7e0fd3812b5f41fe933 SHA512 95153dc1f404aa64898a700c94c0deea3ca842c3152167d0987edabcf4a8eba16b6c8e6bc38a6775a849dc621e6a21434baf53d1669b1865fa5049cffa4387ac
 DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728
 EBUILD scipy-1.8.1.ebuild 5275 BLAKE2B 0b2f1bb8c37c253aae87941aa9cb15352d82ff5bc34089ae7cf93cad7d264b0ceaecd7f8f0ff02670d24282a61032eaa52bf16de03e1d25d8a18fbfe7d63c981 SHA512 d7ed5f3bc61e27f898937387f88cd934147149ba40ccc01b160571db97074ccba2eb68510899bb4ee70083e47cf3e2c5c6e53435f56933cc5652e9b21a231763
-EBUILD scipy-1.9.0_rc2.ebuild 1826 BLAKE2B 4a37e01a87ed6bc546614bab9509e5a59093c2c54b7cefdff3914c35cadf72caa20259347631b2f6ba3e9effb58ce00e7fef5df291abffbd74297461d1c40393 SHA512 9d23d1da0223a07e4fa51ebd3990ca2b782b3bfebe92e0a54d897cac2847648b5135e2b6f5a4b17dcc065388156d872d231e47694fa25c009fa223e629be740b
+EBUILD scipy-1.9.0_rc3.ebuild 1851 BLAKE2B ed4481800fed54aa595fa9b57991ae4d333dca1a58b4a7637b27a8e8a3531fa837afefced6e05ad51b8a98f26f3a423e7248e5123323fd53a1336d1912d956aa SHA512 0836886a7db479338ce97d85a1ec343336076370b080b9c2a138e6a15724e10a9c0db4d2c69b5ed433bb2f8c75c8e8f0922759b5b7474e5986352e58dfee59b3
 EBUILD scipy-1.9.9999.ebuild 1826 BLAKE2B 4a37e01a87ed6bc546614bab9509e5a59093c2c54b7cefdff3914c35cadf72caa20259347631b2f6ba3e9effb58ce00e7fef5df291abffbd74297461d1c40393 SHA512 9d23d1da0223a07e4fa51ebd3990ca2b782b3bfebe92e0a54d897cac2847648b5135e2b6f5a4b17dcc065388156d872d231e47694fa25c009fa223e629be740b
 MISC metadata.xml 1127 BLAKE2B 6019c7fe056a0198db927c1b149d5a60bd583a523d749e57c86ad899a880fd83e688e040cb693ec3f34be63cae1e5b785d5f6f7a378b98e992d6cb9368ea1b2c SHA512 f7c45d801c3344b3d8de3fabad26a95814cfdf92b604e8215bfac2cfd1cfb181cc8a9a9fa46c0b95c7fb55a34e44bab51c2d1cd7a5adcf421cd965a755722e73
diff --git a/dev-python/scipy/scipy-1.9.0_rc2.ebuild b/dev-python/scipy/scipy-1.9.0_rc3.ebuild
index 19c83a0756f4..66e0ae62dac4 100644
--- a/dev-python/scipy/scipy-1.9.0_rc2.ebuild
+++ b/dev-python/scipy/scipy-1.9.0_rc3.ebuild
@@ -60,6 +60,7 @@ BDEPEND="
 	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
 	dev-python/pybind11[${PYTHON_USEDEP}]
 	dev-python/pythran[${PYTHON_USEDEP}]
+	>=dev-util/meson-0.62.2
 	dev-util/patchelf
 	virtual/pkgconfig
 	doc? ( app-arch/unzip )
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 0e90554c26ef..335d2812116f 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,13 +1,7 @@
-DIST sentry-sdk-1.5.12.tar.gz 247388 BLAKE2B 72dc4a5df97656074243045f20cfdbcb15b3d40bb58be06f458a31b52f0168be6f543f83d4641528cb7310f3f5ac1459218397e0e7c0a5131c9bf462e8cfcfb1 SHA512 4d39ba8fd2f490b4e8e5584207c17ace9055668d34a1c43e74a5f05c740b0f38d0794a90cd27edf221d35f5ad76aa6551e117f48167186ce630f7f64200cdad4
 DIST sentry-sdk-1.6.0.gh.tar.gz 249637 BLAKE2B c4d6788c80184ce9127ed85dfb5305363fd27bcbebd74763e4c14c4fed35dd05069ad4a244fa2d8a59f8cb618df22d4d864bf72510fe42600d23fcc6bf8228cf SHA512 d2999831af595ed7f1861ec78887e46887eea8c4c931f22bd4003aede508511287f67eb6100232362a110d16b7bdec892572225440be52a9bd37952c30478f15
-DIST sentry-sdk-1.7.0.gh.tar.gz 251695 BLAKE2B b31a11ee6dcd55960b2d267c26cabdb35a463ab8c081889dceca55ae9ad87c90827875fb75f0912e98457391f24263816d5e61c59551121fe8dede8bb4921a8b SHA512 5595266185618630493eb9bf84c8570f419339b37e8f4afcd4feee80d62d9f678da68d58df081a5361380fe166df589029606ba1d7b70c1844fe174e3292f54c
-DIST sentry-sdk-1.7.1.gh.tar.gz 251834 BLAKE2B e12c16780c3748754b9b104fbb38c7f7aba5fba3186c0ea00f40e742095828bedc926d6c8ed3cae05cc324fde8dac14053035ea4f75fa8f7669dc953e844ea0c SHA512 92d6e04cc6efb3d3272e3afdeb302115d8dfed9907db914bdf387bb257a8175f3d0713041e8c86c64a8d027fbcd3d6d03b4cccba55e6c76e52412ae404de7dc5
 DIST sentry-sdk-1.7.2.gh.tar.gz 254370 BLAKE2B e65b2236bfec9279a4aa05b77c9492547f657e461a7c96c4158acb6bc0887571186bfa71893dce34251ef8d783fb5d583b25aa12539c5db7993cec65fdf05229 SHA512 9fe2c283a326b78c8be95500e4916bb633dc7369960a4e0ef69c0f29de74c38db81f43b3931c47d50431ee7f1a66a2b18e8c4fc02ce71c404a5e9700644cb76c
 DIST sentry-sdk-1.8.0.gh.tar.gz 286488 BLAKE2B d47f33a1c83cfffa6e4a801a6fdfde132d4cfe1b734e464c4db60e97abf53ebe503c53c3edd89d1a84e655a348a4463a75c3475d4824d03cd9b95733b13b5532 SHA512 aa3be96dbc55265f17371d8f20f8b3116b4310cbc1d078b62beeb1fd90bdbb840db85c25309e16f793a188d373c6dbcfd11a104db21b60221a5fb06d8deacc2d
-EBUILD sentry-sdk-1.5.12.ebuild 2867 BLAKE2B 713c54d0b7774765790baa3db1631023e16291796d33a1481adef9db6daaa5548a899393d28a68ff3dd1df2df86f6c935c53f410dd9a91d5d7837a0ed11ad0e2 SHA512 1a259533119f6d72f04229d48ad8ae33379c345d08f5ea2c51f75bdf44534de69da266a60db06dcdb6c3fcac21a592a518d0bdffbda8e53b664328919adceadb
-EBUILD sentry-sdk-1.6.0.ebuild 2874 BLAKE2B 499f352134ac1748e95c5b690a7b3848a4cfca4d532388ab4c056d8b59e37885faeed409c50d2764907280dfc83f2a015a72420f5620724026d7f418d1884040 SHA512 4ffa0cd99c29794138a199ab295e32817ea7fe8c7383a6f68598cd77c992a5ad7782bae3db5e52bf074351e061a2ebd3ab49f9123858e438a813627a82511cdb
-EBUILD sentry-sdk-1.7.0.ebuild 2874 BLAKE2B 499f352134ac1748e95c5b690a7b3848a4cfca4d532388ab4c056d8b59e37885faeed409c50d2764907280dfc83f2a015a72420f5620724026d7f418d1884040 SHA512 4ffa0cd99c29794138a199ab295e32817ea7fe8c7383a6f68598cd77c992a5ad7782bae3db5e52bf074351e061a2ebd3ab49f9123858e438a813627a82511cdb
-EBUILD sentry-sdk-1.7.1.ebuild 2874 BLAKE2B 499f352134ac1748e95c5b690a7b3848a4cfca4d532388ab4c056d8b59e37885faeed409c50d2764907280dfc83f2a015a72420f5620724026d7f418d1884040 SHA512 4ffa0cd99c29794138a199ab295e32817ea7fe8c7383a6f68598cd77c992a5ad7782bae3db5e52bf074351e061a2ebd3ab49f9123858e438a813627a82511cdb
+EBUILD sentry-sdk-1.6.0.ebuild 2870 BLAKE2B 1bf7978f3df6c64385e0010c8a65d7c3422ac8f7180b2507afa688b739bd14df2cd53ae698e8f5f0b25f5203ec4e1fd6eeae33cb4b75358be2490ddedda13fe9 SHA512 2b4657cd4b1076cfba36034608506e6bfe7d930e5e7db4641ff2f56602741f88be40226581371ca1b18ed35d612341038b9f9ebd16cec427baca18816d34caa6
 EBUILD sentry-sdk-1.7.2.ebuild 2874 BLAKE2B 499f352134ac1748e95c5b690a7b3848a4cfca4d532388ab4c056d8b59e37885faeed409c50d2764907280dfc83f2a015a72420f5620724026d7f418d1884040 SHA512 4ffa0cd99c29794138a199ab295e32817ea7fe8c7383a6f68598cd77c992a5ad7782bae3db5e52bf074351e061a2ebd3ab49f9123858e438a813627a82511cdb
 EBUILD sentry-sdk-1.8.0.ebuild 3125 BLAKE2B dc87ed38983d2d0affd1cf18b3acdc0c2ae6f4b0105cb24d72afa4d19b20df8da823264821974b7b5ac21a8559bbf617f118b4045a09cba8fc923d6c0cd0086a SHA512 d15338c869daa70b9d834305246fd9add6988909c4192b6137fcc38a950e75c9280e2d5190c14ffdfaeb6256117d34189f31ce1d8fe305fb905cb3e3d10be8ac
 MISC metadata.xml 510 BLAKE2B e00011699ac2cc83f1923e1f6fa813ede7eab8c57f9ce9d9fca04e721b089db1c5f2bdffaa7b9856f56b433abd9189125e07ffd3f329e4fa8d098e28a4f2d7bd SHA512 bafb77a102d94fe050cb526b298fb8cfd56775cb4d07eda280f6356fbec6fbe5df5c9ebd459d9d4457cd027c2e0d7c349e053fa6070b52f0d2989f6ec600b87d
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.5.12.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.5.12.ebuild
deleted file mode 100644
index 8f71f6b3bddb..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.5.12.ebuild
+++ /dev/null
@@ -1,91 +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_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~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
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	tests/integrations/flask/test_flask.py
-	tests/integrations/django/test_basic.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
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-	# TODO
-	tests/integrations/bottle
-)
-
-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_auto_session_tracking_with_aggregates
-	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
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.6.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.6.0.ebuild
index 45d775960169..ac1650bb3f7f 100644
--- a/dev-python/sentry-sdk/sentry-sdk-1.6.0.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-1.6.0.ebuild
@@ -22,7 +22,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/sentry-sdk/sentry-sdk-1.7.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.7.0.ebuild
deleted file mode 100644
index 45d775960169..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.7.0.ebuild
+++ /dev/null
@@ -1,91 +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_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	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 ~riscv ~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
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	tests/integrations/flask/test_flask.py
-	tests/integrations/django/test_basic.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
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-	# TODO
-	tests/integrations/bottle
-)
-
-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_auto_session_tracking_with_aggregates
-	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
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.7.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.7.1.ebuild
deleted file mode 100644
index 45d775960169..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.7.1.ebuild
+++ /dev/null
@@ -1,91 +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_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	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 ~riscv ~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
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	tests/integrations/flask/test_flask.py
-	tests/integrations/django/test_basic.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
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-	# TODO
-	tests/integrations/bottle
-)
-
-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_auto_session_tracking_with_aggregates
-	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
-)
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 30b38d0f36ce..ce6d1e9526b6 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,13 +1,3 @@
-DIST setuptools_scm-6.4.2.tar.gz 61305 BLAKE2B e1b5191425cf5db8334761a6857b0bc39c547c167901cbdf8401af441c5941cd75744162417ff42dbac792ae867d71c7576c5e9e533fe8039a75954f4c2ba439 SHA512 224dfe543e8658e7d8b7272d18eb657fac1774a206d079d65bb6e22bfa68b35e618a31b3671418d095f8b7b492339ea18491a1711be3a87eeecf50c6703a4096
-DIST setuptools_scm-7.0.1.tar.gz 67921 BLAKE2B 15a4a8953bb9cf8754fe465b53e11483ade33b09c5b407f096ecbdaed80081fa554e0c6da1accdbc629163019bf91968f4edae40166dc4598b25e0a51c5881d1 SHA512 49d296ca4af3175c47a385d9d935fe32371d39c31ff4e6d704ea6fc8dd512e7ed6b0136677e7768836c0ec2ae558c47f156adc5975ace30a396fa81644e61acb
-DIST setuptools_scm-7.0.2.tar.gz 68142 BLAKE2B 11bc3db134c3ee90b9262cf663036a6119a559e134b479a42e10c4b54005029c0e192d92e32d14f8d2dee2d09258b9cbebe9b45f07b553507b80ac7f2ecee110 SHA512 c9782a1b5bbfaaab2bbfc223477e92e8ee2fb0b2a393ff912f0c54fb99494d1c014a4e6c103a3f852d335733b02bcaa3b15eed8ec3a5c1ef54c4691fba7cb0de
-DIST setuptools_scm-7.0.3.tar.gz 70341 BLAKE2B dea8fcdb3cafb040dd2bcdc5efeb8bcba1906d35fee83b17646e1df10a4fee642a01df7d115d66e93c1c177c2ddfa0f4260fb9fe9bf54d24955c3c7014611d35 SHA512 511cff1d00601e535ef4abb14189b7a965003b77b630578c6306758946d45e9140f9a0cdf9a02b915d829f92fcc3460a49091ad2971dec783016f952cff1d326
-DIST setuptools_scm-7.0.4.tar.gz 70512 BLAKE2B 07acfccdbeb0c7f6a6773ff93fa10c35aa8cc2451ede42cce269e2278606fed4acd17e8fda8294ac84b596e776a5ba02ae5ef1203dff42738291798e624cd991 SHA512 cdd1f36fab5b0fa9c1f3dc42c57ee732fbc7b39e761b2db3047c9e953ddc28dd6bbc29b44451e77f602c4ea39469af86a7b08d2d6ab1513b938193e000c3c04e
 DIST setuptools_scm-7.0.5.tar.gz 70716 BLAKE2B 242809a32cd23d9d98e3326714d1435220907eacdb3127558987d0d8be95775b7f8ed284707421a9c52e401c1738c11a01782fee2c0635924122307d3308cc0c SHA512 5b3420f0aaa0dd1655afb0fdcedc3738b75dbb9d8205e0ad67555c251d330a0d3620a7297cfdcfabbc7386a8acf43fe73fa7f3b17e2d156495fd8b2ab7d1c985
-EBUILD setuptools_scm-6.4.2.ebuild 1186 BLAKE2B d99353bf7e44158acccf0f8fc1a33a72211c1f8fd735de1cb59cb6eb1927e510b6fd196e11f1a8a122f2529bd6399739fc8ccfb456b2d3868d0dcb1ff93d948b SHA512 903990604ea97b4fd412d041fdf9764dfafdde3c66ce1756d8c9efdc351811bd7bc2062acc65399db6ba3eea5cee7d8bd2e1ac3128bdaa0cc67002f7307dc498
-EBUILD setuptools_scm-7.0.1-r1.ebuild 1322 BLAKE2B 7f8e059beda99fd1f0c030a56f325cefbe2c1399ec0ea6d0a065e848c51aad7f19674f1e5b6ca742f05775d55aa6e20083550407088fe7dda1013fccdb7e1b5d SHA512 966bb2d39c8feafd545d62931e162c5e1f9d74c89fd56d3644d32d64e5104405cac2450ddaed6f686aa7ab7568a60e0abdfd4a177f4bb6ae73cc6e5bb5473623
-EBUILD setuptools_scm-7.0.2.ebuild 1310 BLAKE2B f405a051faaeb080d2f1a30b51da40517100e28e5b96932a6eeeb293cd32e457b73f0c91347a6f57018e283c2ae62764c1dc13a61a04336cba9e9ddb5447c54f SHA512 d38568331d425cd71c2f03377567fd4c0ad6795f03fbcb3c1df370c439a037a00e36ae9a2346f89c9bd126af009b3bae21f0d2444641ee70ee1dc0cbd239532e
-EBUILD setuptools_scm-7.0.3.ebuild 1274 BLAKE2B 68274360555caf901b5712d42bc36ea0a6ccf113e0a9429b6be03c5ac5d06df0307baa56f4e473c5d1d9f7da8b14ecd928fb95ccc0fd2284459cb11f53974fde SHA512 8f5a500a3710a48014f26d1f4db19498fe60558565cc8c348407c634e99b4e3389ee1759c39d90853aca7e9ca1db101aacdef1146ff889626defc3f548d58bad
-EBUILD setuptools_scm-7.0.4.ebuild 1274 BLAKE2B 68274360555caf901b5712d42bc36ea0a6ccf113e0a9429b6be03c5ac5d06df0307baa56f4e473c5d1d9f7da8b14ecd928fb95ccc0fd2284459cb11f53974fde SHA512 8f5a500a3710a48014f26d1f4db19498fe60558565cc8c348407c634e99b4e3389ee1759c39d90853aca7e9ca1db101aacdef1146ff889626defc3f548d58bad
-EBUILD setuptools_scm-7.0.5.ebuild 1358 BLAKE2B 11a2e1cd09de8c48799e8412f7263cd54f6970364dd44ab4a6be0ad9adcd8818d4619b23f6a3c199bd836e7e5685beb0dab21ea2ceb8aa53565a630b3cfebdd2 SHA512 1e5e10b35f77ffe1b24e0478a9502fcfd4a40e894a1820cbd4a175b72fa2a0d33c46f4af52a38d4e177440974f96178e5eed6146815265d0a981ddc746e19b4b
+EBUILD setuptools_scm-7.0.5.ebuild 1350 BLAKE2B a0943cb19e5f753cf0fba35cb2faa2da20c019654a2d2050f7c152196a7105a9527e296fe17e96200b26d32e3f0703ad16139233f122761b8fc83653ff9274ae SHA512 9bc4ef7a60b24fcd6198be353441b78c6a44dff7725a27bec3d25103ad5ed0225406232f5dbb83fc4fcb3d86d700b965d22f23e9de3b59254fcda2981dd8bcea
 MISC metadata.xml 401 BLAKE2B 288e77f725debab548d96fa06738fb8262a93deb6df1ecc6c0a77e4a30cd65c4e76e38e86f8101112db95dd67a11ada6c0659e1ac13cf3c0e65dcce44e19bf8a SHA512 61b009eacedf191242659d6be6f62d17f9335674c651cfbdcc88abd074e320ddd79e1610de44e7c8105503f6d8d058ed5910f63b2e740492a982a69c52b30730
diff --git a/dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild b/dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild
deleted file mode 100644
index c5176551b20b..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-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_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage versions by scm tags via setuptools"
-HOMEPAGE="
-	https://github.com/pypa/setuptools_scm/
-	https://pypi.org/project/setuptools-scm/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-vcs/git
-		!sparc? (
-			dev-vcs/mercurial
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# fetching from the Internet
-	testing/test_regressions.py::test_pip_download
-	testing/test_setuptools_support.py
-
-	# broken by setuptools pyproject.toml validation
-	testing/test_integration.py::test_pyproject_support
-)
diff --git a/dev-python/setuptools_scm/setuptools_scm-7.0.1-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-7.0.1-r1.ebuild
deleted file mode 100644
index 91c722d47031..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-7.0.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
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage versions by scm tags via setuptools"
-HOMEPAGE="
-	https://github.com/pypa/setuptools_scm/
-	https://pypi.org/project/setuptools-scm/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-vcs/git
-		!sparc? (
-			dev-vcs/mercurial
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# fetching from the Internet
-	testing/test_regressions.py::test_pip_download
-	testing/test_setuptools_support.py
-
-	# the usual nondescript gpg-agent failure
-	testing/test_git.py::test_git_getdate_signed_commit
-
-	# broken by... pbr?
-	testing/test_integration.py::test_pyproject_support
-)
diff --git a/dev-python/setuptools_scm/setuptools_scm-7.0.2.ebuild b/dev-python/setuptools_scm/setuptools_scm-7.0.2.ebuild
deleted file mode 100644
index a7e35478d252..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-7.0.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-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_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage versions by scm tags via setuptools"
-HOMEPAGE="
-	https://github.com/pypa/setuptools_scm/
-	https://pypi.org/project/setuptools-scm/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-vcs/git
-		!sparc? (
-			dev-vcs/mercurial
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# fetching from the Internet
-	testing/test_regressions.py::test_pip_download
-	testing/test_setuptools_support.py
-
-	# the usual nondescript gpg-agent failure
-	testing/test_git.py::test_git_getdate_signed_commit
-
-	# broken by... pbr?
-	testing/test_integration.py::test_pyproject_support
-)
diff --git a/dev-python/setuptools_scm/setuptools_scm-7.0.3.ebuild b/dev-python/setuptools_scm/setuptools_scm-7.0.3.ebuild
deleted file mode 100644
index ce8eeed82aca..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-7.0.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-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_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage versions by scm tags via setuptools"
-HOMEPAGE="
-	https://github.com/pypa/setuptools_scm/
-	https://pypi.org/project/setuptools-scm/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-vcs/git
-		!sparc? (
-			dev-vcs/mercurial
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# fetching from the Internet
-	testing/test_regressions.py::test_pip_download
-
-	# the usual nondescript gpg-agent failure
-	testing/test_git.py::test_git_getdate_signed_commit
-
-	# broken by... pbr?
-	testing/test_integration.py::test_pyproject_support
-)
diff --git a/dev-python/setuptools_scm/setuptools_scm-7.0.4.ebuild b/dev-python/setuptools_scm/setuptools_scm-7.0.4.ebuild
deleted file mode 100644
index ce8eeed82aca..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-7.0.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-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_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage versions by scm tags via setuptools"
-HOMEPAGE="
-	https://github.com/pypa/setuptools_scm/
-	https://pypi.org/project/setuptools-scm/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-vcs/git
-		!sparc? (
-			dev-vcs/mercurial
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# fetching from the Internet
-	testing/test_regressions.py::test_pip_download
-
-	# the usual nondescript gpg-agent failure
-	testing/test_git.py::test_git_getdate_signed_commit
-
-	# broken by... pbr?
-	testing/test_integration.py::test_pyproject_support
-)
diff --git a/dev-python/setuptools_scm/setuptools_scm-7.0.5.ebuild b/dev-python/setuptools_scm/setuptools_scm-7.0.5.ebuild
index 1088c09905a4..28dd95ccdd0b 100644
--- a/dev-python/setuptools_scm/setuptools_scm-7.0.5.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-7.0.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools_scm_git_archive/Manifest b/dev-python/setuptools_scm_git_archive/Manifest
index d59e294b62b5..2b49e60f96c4 100644
--- a/dev-python/setuptools_scm_git_archive/Manifest
+++ b/dev-python/setuptools_scm_git_archive/Manifest
@@ -1,9 +1,3 @@
-DIST setuptools_scm_git_archive-1.1.tar.gz 2584 BLAKE2B 7c7569a92300be966b5447b1ab6c30a982c837efdb7a125173f6014420d78cf28e0d8cb0f04c4349ce364219e1567bcbc2e13bd85cb7627d3bdbae9c7974385b SHA512 73783d60d33782fb18012e64685db6333a2dda1be41ce75e0cd74a81585d8ebb7c85f23371056a42974c93b2d4a0633338945cf2a2219b0ee2a21f063dad8809
-DIST setuptools_scm_git_archive-1.2.gh.tar.gz 2648 BLAKE2B d2a6629fa1eb8c413def6c7cb192afb47299cd1ffce3692951fb6f90e9b6b4d0f4f2286486a5ae7e550c4659ed3ef7289746ec48be2bfe43c6c3d80143cc4e46 SHA512 980a7463dd7a53f71c8f9f1fde0f14927a6063bfae386b85d42a2909e05de42339a3770d5cf0c22981f17bbdec52febf7041fb54628f2d8321e46401ef0beccb
-DIST setuptools_scm_git_archive-1.3.gh.tar.gz 2556 BLAKE2B 338c02b9b377a165b4bcd29790e04b9e3215f2f892a681888760e5bdd2bc2a5c4970646fff42d652a6dde8557602af4dbde0decf5ac0f0605cbb55fc1f3ec085 SHA512 28146bef914f310590d29a1c3c2a97f1fe33d19d28eb7477983b6164d99d2e40e02afe541e5ef3ca8b7ff3297cc002d35da1f971d5d2183f2c5634c10b098476
 DIST setuptools_scm_git_archive-1.4.gh.tar.gz 2616 BLAKE2B ce76067231fbb73f22c129e592a6b29bce8ef28383f47c1774162e3a57842d60b04bdaeafb6ff8342e77d2e3f413bcd2704d7dcddfd500db2902a33cf97c890a SHA512 dd279f293334439abacf40f4423b5dc9def7bd0a0f23b39d30695ba9e86dcf48205d6e8120930148f876bb20181016cc6d279d225669c067f4d02e780f33e271
-EBUILD setuptools_scm_git_archive-1.1-r5.ebuild 806 BLAKE2B e040d7f8afc473ef5f5620962631b9bf03708acfae082bda46ab7182f9ad1b809ce3ed46fa4665587802e875b19c07efac1d81a52084e91649672d7c6992228e SHA512 427a2f6b275f42ba4fb59e93eaeffe9a8e644884fb363f3ef29b44c21b700cb76e246f2ecfc91dad567a35e756d08dba5494c265931a1697f605f64af21e2751
-EBUILD setuptools_scm_git_archive-1.2.ebuild 817 BLAKE2B cb7167f6de149edad817d92db25fa68727d3e673cb2095e4ad6e98488735d9b7d1fb42041727c32b94eda2b534f95981433532dd1acfdb0ba857848bc1e666d7 SHA512 0bd41bcde5e4704f58d9ca77a29d4d3f34d42bacde120bb82e1778cc44bd9826e2709ef0af0e4707f942a3a750f38b2b253b75c0a0c4c03773671fa977218dd6
-EBUILD setuptools_scm_git_archive-1.3.ebuild 817 BLAKE2B cb7167f6de149edad817d92db25fa68727d3e673cb2095e4ad6e98488735d9b7d1fb42041727c32b94eda2b534f95981433532dd1acfdb0ba857848bc1e666d7 SHA512 0bd41bcde5e4704f58d9ca77a29d4d3f34d42bacde120bb82e1778cc44bd9826e2709ef0af0e4707f942a3a750f38b2b253b75c0a0c4c03773671fa977218dd6
-EBUILD setuptools_scm_git_archive-1.4.ebuild 817 BLAKE2B cb7167f6de149edad817d92db25fa68727d3e673cb2095e4ad6e98488735d9b7d1fb42041727c32b94eda2b534f95981433532dd1acfdb0ba857848bc1e666d7 SHA512 0bd41bcde5e4704f58d9ca77a29d4d3f34d42bacde120bb82e1778cc44bd9826e2709ef0af0e4707f942a3a750f38b2b253b75c0a0c4c03773671fa977218dd6
+EBUILD setuptools_scm_git_archive-1.4.ebuild 809 BLAKE2B e3ad2def2a59f5c8fafb5f4194a5a5db27be1ebf847b831ab3521d1010ab57a1e5e4c4daf142b14457a4f1e7d13daf8e17c680c757d19860d2a91e8d4d4f0be7 SHA512 372cbbd5253999762627a7ee16e64582b09d077d09d351205f43b19518188803c684eca461aaef3b20c9b8701c3b94c355975e7ef5d76494ea7fd7912e754953
 MISC metadata.xml 357 BLAKE2B 3cdd316f50c6f2cab1dc88b7f1d00081c2021a12a4076efaf5c1188dbc650a594bf714d6653f62a1f58e7f816b4defd7774abe0cf6d3c4dbf77f7f90a064eae0 SHA512 475bdaf52720f484b4614d313ae74e6cffc68779460463d9409e683c997f12f9ef416dea6050e3adcc0c137f0ceb7f889ce440f808c697d34a8fd7776fd6cb60
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r5.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r5.ebuild
deleted file mode 100644
index 4324185e7ee2..000000000000
--- a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r5.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_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A setuptools_scm plugin for git archives"
-HOMEPAGE="
-	https://github.com/Changaco/setuptools_scm_git_archive/
-	https://pypi.org/project/setuptools-scm-git-archive/
-"
-SRC_URI="
-	https://github.com/Changaco/setuptools_scm_git_archive/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"
-IUSE=""
-
-RDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
-
-python_test() {
-	epytest tests.py
-}
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.2.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.2.ebuild
deleted file mode 100644
index 394a9500b20f..000000000000
--- a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.2.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_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A setuptools_scm plugin for git archives"
-HOMEPAGE="
-	https://github.com/Changaco/setuptools_scm_git_archive/
-	https://pypi.org/project/setuptools-scm-git-archive/
-"
-SRC_URI="
-	https://github.com/Changaco/setuptools_scm_git_archive/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
-
-python_test() {
-	epytest tests.py
-}
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.3.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.3.ebuild
deleted file mode 100644
index 394a9500b20f..000000000000
--- a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.3.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_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A setuptools_scm plugin for git archives"
-HOMEPAGE="
-	https://github.com/Changaco/setuptools_scm_git_archive/
-	https://pypi.org/project/setuptools-scm-git-archive/
-"
-SRC_URI="
-	https://github.com/Changaco/setuptools_scm_git_archive/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
-
-python_test() {
-	epytest tests.py
-}
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.4.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.4.ebuild
index 394a9500b20f..cb155636233b 100644
--- a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.4.ebuild
+++ b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.4.ebuild
@@ -20,7 +20,7 @@ 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"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index ed4ca924c0f3..27f6fd2beedd 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1,7 +1,3 @@
-DIST sphinxcontrib-spelling-7.5.0.tar.gz 54978 BLAKE2B ed56e27434a43d688a63ff6ca8aa7889a80a0a750abdebc5e9307c68fae8a14ae7ba065b127c583fff11499e75750aee6f017b4d442204b1a2308a5c8692e73c SHA512 d306d19664990cfb6ceff947f3a34243a8ead95b0e6076f9da924cd0ef43e2621178bd374400f805970592f803d6a129c74a32a6c6837d41e4f72118da667138
-DIST sphinxcontrib-spelling-7.5.1.tar.gz 55547 BLAKE2B 61415fb62b0d47672901048276897d7578f891732278d9ea0b4fe0ca5f42654114f76d600ffcf0f602afe1c0d46f4bf466c326337accf910090f768c1cee1c69 SHA512 d38114421e519ed127eae712637677a8ae75cc640087d2e7740d8c106a0d7058e633f65fb1ac9ee2fa75d295b218aa98d3a3279b077f2a89ea947a3b4c0fd05a
 DIST sphinxcontrib-spelling-7.6.0.tar.gz 56329 BLAKE2B e26a3fcb39edf622b20bce0d79d1ce2d2a13e4dd8bdef0bb5cc31108a8ee42afd728975fd65e840c91bc6c6510a57904ebc478b458a52a96031bf44f1cbfa8b6 SHA512 102202eb73767ffface2aa5555c8ee2658bcd3c1eb7f3a925e8713e2f233d1bcf0eb307fed6c264c4e4e6503c30d83a3025b0c39ef608451d2fe86664aeb48c5
-EBUILD sphinxcontrib-spelling-7.5.0.ebuild 1026 BLAKE2B 63fb36f0d5e11274574acfad2a86be588f95ee6d270fb761390ac6d676688ab9f4b6c93bfc0239d47c0e9ac14f559ad4f403907d62af71daa92927f902a4db24 SHA512 34903f8138bcd4cf5c85de0a112d4210e3a4c2cfd3bfd61a91571ced19d43997f5c17750656d6b775f6f6356e36765a09b21ad5e97b642ab1142939ea4f9e8cf
-EBUILD sphinxcontrib-spelling-7.5.1.ebuild 1033 BLAKE2B cb0f2310e25fe207a31b8889d842341efd0683a699f0a959f9f1a5962a52a6d658ffd56936951c1e540a8f0eccd6a7c3cb0e42c916303365fa26c9b32d152ec2 SHA512 140bbb72d466bd6766fd004bd537bdb18981f145e310c05b0ec318d735a4f557bf5061fab31d3ffb49031e7027f6bb4e5610a7f1bfdb6203ea9e619c15fe013d
-EBUILD sphinxcontrib-spelling-7.6.0.ebuild 1033 BLAKE2B cb0f2310e25fe207a31b8889d842341efd0683a699f0a959f9f1a5962a52a6d658ffd56936951c1e540a8f0eccd6a7c3cb0e42c916303365fa26c9b32d152ec2 SHA512 140bbb72d466bd6766fd004bd537bdb18981f145e310c05b0ec318d735a4f557bf5061fab31d3ffb49031e7027f6bb4e5610a7f1bfdb6203ea9e619c15fe013d
+EBUILD sphinxcontrib-spelling-7.6.0.ebuild 1026 BLAKE2B 63fb36f0d5e11274574acfad2a86be588f95ee6d270fb761390ac6d676688ab9f4b6c93bfc0239d47c0e9ac14f559ad4f403907d62af71daa92927f902a4db24 SHA512 34903f8138bcd4cf5c85de0a112d4210e3a4c2cfd3bfd61a91571ced19d43997f5c17750656d6b775f6f6356e36765a09b21ad5e97b642ab1142939ea4f9e8cf
 MISC metadata.xml 451 BLAKE2B fa659ac4949e98ca8c5a11a9b72ecba8a69ca94d95f8ab5f07c0d43d9684cd1cd21dbd63f42928a9920001904a6f75aa5663a3d924b02910c78b7894f6011722 SHA512 fead100dcd4c1d85e29260a60178e1b866ceb1f944c73fffcc051e2cfb1e96cc2e61bcf94379c0dcf84bed1349abaceb86ca9a89f2b1a8ddd384c14997d1a159
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.5.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.5.0.ebuild
deleted file mode 100644
index 2384e4dd356d..000000000000
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.5.0.ebuild
+++ /dev/null
@@ -1,49 +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_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx spelling extension"
-HOMEPAGE="
-	https://github.com/sphinx-contrib/spelling/
-	https://pypi.org/project/sphinxcontrib-spelling/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		app-dicts/myspell-en
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires the git repo
-	tests/test_filter.py::test_contributors
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	rm -rf sphinxcontrib || die
-	epytest tests
-}
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.5.1.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.5.1.ebuild
deleted file mode 100644
index 834977197c58..000000000000
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.5.1.ebuild
+++ /dev/null
@@ -1,49 +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_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx spelling extension"
-HOMEPAGE="
-	https://github.com/sphinx-contrib/spelling/
-	https://pypi.org/project/sphinxcontrib-spelling/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		app-dicts/myspell-en
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires the git repo
-	tests/test_filter.py::test_contributors
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	rm -rf sphinxcontrib || die
-	epytest tests
-}
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.6.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.6.0.ebuild
index 834977197c58..2384e4dd356d 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.6.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.6.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 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"
 
 RDEPEND="
 	dev-python/pyenchant[${PYTHON_USEDEP}]
diff --git a/dev-python/stack_data/Manifest b/dev-python/stack_data/Manifest
index 7862c46ec886..e5d19ec1399c 100644
--- a/dev-python/stack_data/Manifest
+++ b/dev-python/stack_data/Manifest
@@ -1,5 +1,5 @@
 DIST stack_data-0.2.0.tar.gz 36618 BLAKE2B af79e5c46d03967a8ea6a992a0672a5bd3676a8b088be412782b8c6be6f58a14de1c6e6ff0cd4ae764a65c539a83aa4d7491bb7fe81761452d430d30f70d20fb SHA512 7d6a1a0ffdc667b3ac428b378f1c4f14c5ded99ec244e3cb558bb39ba0c319e9e1657188cb686c8eb788e1af2be6c0b51beae825b73f2685d7b0bc1341ebe5d9
 DIST stack_data-0.3.0.tar.gz 41061 BLAKE2B 9202ddb2e6e8c8c9e050e085cfe6e1bdbf26124eb85c19516558336d46876aba5ede1b6a87cf17e09c2b44629063a8f5e1f558fdaf64db2db029978a5860cd99 SHA512 648b6fd0dbf43ee974c15de85aa530034c6c67a3a7c297c1ea3f1ddd59bf13d331f8db9f8ddf54f69e59385ed2c0c2a24b48c5a93330df62082c333610d8a6bb
 EBUILD stack_data-0.2.0.ebuild 824 BLAKE2B 14592d59e199555514f8057c5d04a7ce663d05d25c763233ca680becad59f602a2e66831980270d79827bd86047810319a5d8b4cb29e1891053446556709fdf9 SHA512 2ec55cfcf15b6e26a3b7c7d002b14ce5b19c7945eb3b9e909afa1638b74c9b6a0c509ecc73aed22b3b7cd1eefd55a522c807fb92789d6bf6b417158044da1971
-EBUILD stack_data-0.3.0.ebuild 833 BLAKE2B eed18bbd3e49a5073e55b067a6da1501ac772d1926138e6d23f811ca4e6a432da534caca90e2a9214ad55abc7f210b3d8b385e39a27458ed9e1efdf7aae27911 SHA512 0a5c559e764428f8e4f85e31b15ed725c96d77df9de632e069e51e076f0d9063262522b67a86a0614f5609c863a8141a356c284445f6f03028ac025a6d1dadac
+EBUILD stack_data-0.3.0.ebuild 832 BLAKE2B 74533f001d6d46a10da481898dc07ab425ac22d8da2221296854502b74e6eb598285e5d3aa806f114484ebef4285a7e0bf8a3b1d12fcf154215616dcc6b2b566 SHA512 3397d866d1aab3174ebf9bb53219f428d7dbbb0ca4fd01817e1f831978f05a22543c5c74604c79965f9cd16420c5622c6543d28a6e0046a83d42b58b0fdc40ab
 MISC metadata.xml 375 BLAKE2B af41ba2f7058da9de0e1f8be741c3de7581d895246c1c941f0dc27ed2e708ac2cb64b5a6fcaea82ff79e7a8bd4e0b424500a373957019d9e62f53babeadc166b SHA512 be539ff023fbcdf96761cf06429efc4cc2d0d2ee38b3bdaadbd73665798c123591b9543ab4fd3ccca9c80820c71b010f8fd34646d2001a940df0a61fc4e0639b
diff --git a/dev-python/stack_data/stack_data-0.3.0.ebuild b/dev-python/stack_data/stack_data-0.3.0.ebuild
index 354f429fa75b..64e69a43141d 100644
--- a/dev-python/stack_data/stack_data-0.3.0.ebuild
+++ b/dev-python/stack_data/stack_data-0.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/asttokens[${PYTHON_USEDEP}]
diff --git a/dev-python/tabulate/Manifest b/dev-python/tabulate/Manifest
index bd03041d48f4..45a7f4bd5ce9 100644
--- a/dev-python/tabulate/Manifest
+++ b/dev-python/tabulate/Manifest
@@ -1,5 +1,3 @@
 DIST python-tabulate-0.8.10.gh.tar.gz 49453 BLAKE2B 9bf5c9e937f8ef051792fc57dcd56f1150636bf29493fabe56d4b706df04add41fdffbe1108cb93aa561edc96245ba85e621d4a8b402ace513b55710e6e5498c SHA512 d216076112c0d0f0879c1eeecf2d2c0c30edc84d7289396f1a8d24bca862ef90fcf221a09812b409547696c3b7d4472d431043e359c3a7f67bb8392ce1e95ddc
-DIST python-tabulate-0.8.9.gh.tar.gz 42562 BLAKE2B 6e6e1017379d07d5ede0cdfb6a8e3142f60656fd5d5b409c1259239e62637824c3bab0bb0f6b03f8733a24e9e3ac074a80a56d44939a8c6eeab8e9a830ae8277 SHA512 68a4d194068f692b57b2cca0fa42a58ba571b46adaef7f8b1a8cea7e34c78ea0a1c523286c3f1df631897cc60ad39ef6b11bfee61d46c04e2de1fb9ec0b497dd
-EBUILD tabulate-0.8.10.ebuild 1289 BLAKE2B 3f663b2d1094d20ca3b634cfe4439c8c2cfc4b9f5cb274b276f49210df63f01f5bd158397cfcdc1e10d0d89a7f1c8092eb70b6a762b02ab82e732bbe0fcb3638 SHA512 2ad30f43fc0e29c40093da2626b1adefe59c188a93db6e5c5253c29206f7a4c04bab07975693adff661b4c4d879368c5819df9d5fa3ef53d96a9dd9c6672f91f
-EBUILD tabulate-0.8.9-r1.ebuild 1287 BLAKE2B f05fe2089ed8092f04ca65d90e1e1fdbbb0870bed8cc56948f16e30a5200ccec8a6379734c68c07b9989a55185d1fad682cb7f17096948ad39abdc613697cc72 SHA512 00b891e8cb2a64e594555a94dfdddc604ba18c587f680664762d9279004d1f38d75525421e080d27e32de702b11265d7fea374c34ac15a1d6cac38a3c930b220
+EBUILD tabulate-0.8.10.ebuild 1287 BLAKE2B f05fe2089ed8092f04ca65d90e1e1fdbbb0870bed8cc56948f16e30a5200ccec8a6379734c68c07b9989a55185d1fad682cb7f17096948ad39abdc613697cc72 SHA512 00b891e8cb2a64e594555a94dfdddc604ba18c587f680664762d9279004d1f38d75525421e080d27e32de702b11265d7fea374c34ac15a1d6cac38a3c930b220
 MISC metadata.xml 399 BLAKE2B b92bc308afead78cb604ddc6bc288fb28ed5a2a523c890270ee87eb5bfee21133748c5861829bafcc8a7b3401b430dff84dd99264ebf3e7ea74342f99ee8cfc5 SHA512 2d8c4dca9558e5a5d6413a6bd5e2cd6e15d1d0d447e6c692af84c8575be899f3d78246782e6c908a626326662aaffde56b2c3f96f4e9cfa0473c976109e3dcac
diff --git a/dev-python/tabulate/tabulate-0.8.10.ebuild b/dev-python/tabulate/tabulate-0.8.10.ebuild
index 699b1e2f6b7c..8c3e9b4a5657 100644
--- a/dev-python/tabulate/tabulate-0.8.10.ebuild
+++ b/dev-python/tabulate/tabulate-0.8.10.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/tabulate/tabulate-0.8.9-r1.ebuild b/dev-python/tabulate/tabulate-0.8.9-r1.ebuild
deleted file mode 100644
index 8c3e9b4a5657..000000000000
--- a/dev-python/tabulate/tabulate-0.8.9-r1.ebuild
+++ /dev/null
@@ -1,56 +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_{8..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Pretty-print tabular data"
-HOMEPAGE="
-	https://github.com/astanin/python-tabulate/
-	https://pypi.org/project/tabulate/
-"
-SRC_URI="
-	https://github.com/astanin/python-${PN}/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep 'sqlite')
-		dev-python/colorclass[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_USEDEP}]
-		' 'python3*')
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/test_input.py::test_pandas
-			test/test_input.py::test_pandas_firstrow
-			test/test_input.py::test_pandas_keys
-			test/test_output.py::test_pandas_with_index
-			test/test_output.py::test_pandas_without_index
-			test/test_output.py::test_pandas_rst_with_index
-			test/test_output.py::test_pandas_rst_with_named_index
-		)
-	fi
-	epytest
-}
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index 7e72c4709f79..c6f9870d7114 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1,5 +1,3 @@
-DIST traitlets-5.2.2.post1.tar.gz 136827 BLAKE2B 8e85704bcb704ea6e3bb270abc62ba6739c1f9c4d3dccf182c129d7f28ad3f71882be26504762a57ace19ac58885b88f86ed1dedf9c4e34a080f57431b7d0cd9 SHA512 3651a383c8f761bc5ddf3c3aeee2848265c7c891c7af30111e12968069381e2d571ab57091b8c9c4e0deb7faa06a6338697d65054931fc6f512531f103cae99e
 DIST traitlets-5.3.0.tar.gz 136916 BLAKE2B 72f1a8ec9524a2a77046e592206ca0fd5c788daf67c673b8335f840272ce49b6b82735b272d29e1a507096dc2c65b82350b1ccbf925864a643918ff813e8a888 SHA512 1c6c74b18b1a4d37fb61f466b9018b5612a8cf8b7a52c58bf0d3f576d0a94487f73c9d1005458d2b56ac9e86083bb5f1ef67e107ceced1009fda442f1fc9aa44
-EBUILD traitlets-5.2.2_p1.ebuild 710 BLAKE2B d420b7d8b56dfd26d40317a2dfe62b10ec3eda865fa14fda5149b9802f0f3acba438a99cbb4f11132b5f088c576b16e9c3d0ee0af616dc04adaec4b1e8ad6261 SHA512 143e2722f6edbe7f62f32a4097927eb004d14e61cd9bcb1b70c426d2032aff6ea9c98b4d2441884706e0e882fe90cee47f62a6097547401a5855a5d6a7a7ceaa
-EBUILD traitlets-5.3.0.ebuild 674 BLAKE2B e9e0521629151df6b172090de835d5c4abe06aba01c73f6d30cc3cac3d3c6556b972682ed28c1ed317f200a169527bef4e2ea0c6a64f59d341822d1760b0137f SHA512 b83f7b65b9d7d3c1952fa8407416f96d2b837d8592ce4678433b7507570ab95a63ccc444d20ccb1f36d59e4a85a8888276546f0c01039df9f9098c606963ddff
+EBUILD traitlets-5.3.0.ebuild 666 BLAKE2B 7016b267fa5c37cbc29600412cbdc0c7dd0647e49734f314052cb752f4068f5e816f9467ee1e4eadd5b2d5e2dbb0b662604c4e3cb0a4df3f62dc555872328b02 SHA512 cff3a710365c525cee44b1528c403e71cc03568146cce79b0e10a5def69d55a12f73f0b615cfb5eba8782741977bbbecb15ff3e06f959e63fd358f7a87fd8bb2
 MISC metadata.xml 737 BLAKE2B dadf9c19ed06cc70940023c180cb2256534ccba2881b4a0b5d7673ae9959838c129f82b1a5d2b9c13e408442ef2f9ec906484b01baa4408417143a712f4bfa56 SHA512 3a9e54cabaac875c27747642794f54b90216ee103e5de336d6e4e76d3a08c045ec08eabebe59c47b6fab2dabdeb43f16a8579a9448cbc19ab169ceb08740508d
diff --git a/dev-python/traitlets/traitlets-5.2.2_p1.ebuild b/dev-python/traitlets/traitlets-5.2.2_p1.ebuild
deleted file mode 100644
index 4a34e0afe386..000000000000
--- a/dev-python/traitlets/traitlets-5.2.2_p1.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=hatchling
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="A configuration system for Python applications"
-HOMEPAGE="
-	https://github.com/ipython/traitlets/
-	https://pypi.org/project/traitlets/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${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_sphinx docs/source \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/traitlets/traitlets-5.3.0.ebuild b/dev-python/traitlets/traitlets-5.3.0.ebuild
index 08fe26572c56..0edc0e6b5b02 100644
--- a/dev-python/traitlets/traitlets-5.3.0.ebuild
+++ b/dev-python/traitlets/traitlets-5.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::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/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index 49707d1e7fc2..e31be7943c71 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,7 +1,5 @@
 DIST uvicorn-0.17.6.tar.gz 708048 BLAKE2B 83b06907c8109b38e13930d8b73584682fa4e34fe7e51fe14b6ca1ddc7ef8122d950a09e31cb364a02f5f12eead5d0522b41cbf428509c6900604d4e2776dfb2 SHA512 d5c5223759d59648f279e22f7e6af728fe8117ed75488d125c1db3e5e9d385a50d574cff72ac46db4eb0a78d0e4f690096cfe78c774674dfba61860e55b7494e
-DIST uvicorn-0.18.1.gh.tar.gz 712588 BLAKE2B f99c173015d3efdd6f7d6257384045542cbf95ab65fdd84f47ee5df4677865d0b4d6de5f23db0bc2713cb286242a029b056c4076268b14d238a3e9f57c02fc42 SHA512 d8650ace78d19c44d03de8413bf06b2dd3208c7e47c4d9e17ecbed99eef938ec08eb249b204713139b985ae4b117c7da64836c25bf8d20610363bedcf1ebf990
 DIST uvicorn-0.18.2.gh.tar.gz 712706 BLAKE2B d8d300579d945a5c2f51b7746b93cd64710c103cd0b7694ce858ec0f4e9dc09f89e9663529dd84c13c9f6334d0f4543cc9442e94aedf8dbddd72a6a0394ba370 SHA512 d2e05198cd833efbe7dddffc30f9a52be3168192269cd493816df8a7d4053e312f534988ee09c5270d63f52dfa48d0b105862c9e05acad41ebf3a40e5fa1aa76
 EBUILD uvicorn-0.17.6.ebuild 1394 BLAKE2B 1f9eb4a37f3476787f643dd1b06c846ee2d4f0aa08aedfb74589097e9163b24a4b5642bf8fdb672bbb61537a15bdbee3ecd69962bd5edb42f969b94202307320 SHA512 7e478a4e05e4ae6b097eb018ec4bc105812a368389e0b663100f1ae0abad5c11a9ceb8555119d01c1d5397bc56df9af801129ed83e246a69538aa262fa39157f
-EBUILD uvicorn-0.18.1.ebuild 1681 BLAKE2B 3197c880ed7f44d0610a270db52c07957bd377388abac1a19991a324782523c7c26669575fc6195ee403ecfc12cad7b85001e4920f6de5dbc237c03dfe42570d SHA512 2c32dcbe9e0eaa273f7908a6208751438951959756ebae3924c21039a30b0815e5cf0131bb9c1631b869cec033c1a32740d2a9b68fc1571c2145fe30c6425e1e
-EBUILD uvicorn-0.18.2.ebuild 1681 BLAKE2B 3197c880ed7f44d0610a270db52c07957bd377388abac1a19991a324782523c7c26669575fc6195ee403ecfc12cad7b85001e4920f6de5dbc237c03dfe42570d SHA512 2c32dcbe9e0eaa273f7908a6208751438951959756ebae3924c21039a30b0815e5cf0131bb9c1631b869cec033c1a32740d2a9b68fc1571c2145fe30c6425e1e
+EBUILD uvicorn-0.18.2.ebuild 1673 BLAKE2B 22a286fd646394076e5c3ec3958709559bca6349e80009ee64dc75e941a1625d21594989d8b2ec97720697619a0be0efab45ff1950cb0649504d1e4f125f37ae SHA512 913f3e72abcc10ada0629218f41bb98f85afdf6ea4b4cf42df90b8dca3be7f864ff242a61b7a7f6fd95c31c84f2c512b19a4a31fb7c8a170a6a3f289a6822ace
 MISC metadata.xml 451 BLAKE2B af9be617c95128297e3455b503e198e13c373244094f6aa9c80837945c3f9f023f1874efa28d4ffa8b241feb9a4e8c7f3d3534e96966733bd5593bffb90904a5 SHA512 4d76bab5c20f7cad81fa56a28c9be07bf2c2ebc412fc647f073215d437a2550eca247b8419df71d04200d0fdf545520684db0b6f4953e73848f69a4f4ad6931e
diff --git a/dev-python/uvicorn/uvicorn-0.18.1.ebuild b/dev-python/uvicorn/uvicorn-0.18.1.ebuild
deleted file mode 100644
index de246a78f9d4..000000000000
--- a/dev-python/uvicorn/uvicorn-0.18.1.ebuild
+++ /dev/null
@@ -1,62 +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=( pypy3 python3_{8..11} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Lightning-fast ASGI server implementation"
-HOMEPAGE="https://www.uvicorn.org/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		>=dev-python/websockets-10.0[${PYTHON_USEDEP}]
-		dev-python/wsproto[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# too long path for unix socket
-		tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
-		# need unpackaged httptools
-		"tests/middleware/test_logging.py::test_trace_logging_on_http_protocol[httptools]"
-		tests/protocols/test_http.py::test_fragmentation
-	)
-
-	local EPYTEST_IGNORE=()
-	# love from Rust world
-	if ! has_version "dev-python/watchfiles[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/supervisors/test_reload.py
-		)
-	fi
-
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "auto reload on file changes" dev-python/watchfiles
-}
diff --git a/dev-python/uvicorn/uvicorn-0.18.2.ebuild b/dev-python/uvicorn/uvicorn-0.18.2.ebuild
index de246a78f9d4..8176b7865f0f 100644
--- a/dev-python/uvicorn/uvicorn-0.18.2.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.18.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/warlock/Manifest b/dev-python/warlock/Manifest
index 2f5058548e92..1856fd18972a 100644
--- a/dev-python/warlock/Manifest
+++ b/dev-python/warlock/Manifest
@@ -3,5 +3,5 @@ DIST warlock-2.0.0.gh.tar.gz 19823 BLAKE2B 538f0b8797277ab067c22a5c43a0fc236fe9a
 DIST warlock-2.0.1.gh.tar.gz 19850 BLAKE2B 3ac4f92a68b4e1142a2baf0a0b5670c8b6ee89f22b0b48c061dc5bad8ccbb818ee8a4d7d27f2300562c6e3369662a1d1c8f12135eac1046b87187d1aed42cc54 SHA512 f354f0dd2af524a9e09ed03b072e1f68859fc70bf5ec083f8853fde2f1cec3172bef42318df176a3cf5fa48d93f030010db81d710961f2b05a092a4ee25041c1
 EBUILD warlock-1.3.3-r3.ebuild 1085 BLAKE2B ae84d28e0f3a4334bde91a9e31ef85ec10da2c7d99ffdc5d4a4fc007096bc79e90840af0718c0fc834b7ded2e59b2d55d767fa3ce1df88142267aabc2e734e1a SHA512 fed7734ca9fd360c511b926889e15f84b2e16255b46026ea1b6253d538718e154a2b0f0f897371cbfa15150c5aa6800119e7b9bcfe59a6f6e1304a895fd5d809
 EBUILD warlock-2.0.0.ebuild 848 BLAKE2B 9f3876d87499c8ce31ec220ec66c7f71220ddaa3d8b2c6310d3547dfd74de1e4a4607ee9105c999264a2ef2bc833bf54de0857fdcc73a7669026561c4524ec87 SHA512 9884047cd29091755882f10e7cfe6b7ee87906251c56dc326b6df061a1f310862b01b56804bb3823fbfe5b998681d77e7e96fef59f636d54dde425eb016f3f89
-EBUILD warlock-2.0.1.ebuild 848 BLAKE2B 9f3876d87499c8ce31ec220ec66c7f71220ddaa3d8b2c6310d3547dfd74de1e4a4607ee9105c999264a2ef2bc833bf54de0857fdcc73a7669026561c4524ec87 SHA512 9884047cd29091755882f10e7cfe6b7ee87906251c56dc326b6df061a1f310862b01b56804bb3823fbfe5b998681d77e7e96fef59f636d54dde425eb016f3f89
+EBUILD warlock-2.0.1.ebuild 847 BLAKE2B 1cc30cf08f589329385c4e0f38f08e97dd498159c61bbdd03d710902507024539e4c76037e9141bff53ad5d354e100219c3d63191de3d8234161feb23bb218d7 SHA512 ea349ebfcf980bcf2cfe790e6a292e80784a006cac03c54a6074a4b79ef7c0a602b505ffc852bdb48e1c32abe65b6569ef429af6ae1da1528dea901240c7fb82
 MISC metadata.xml 482 BLAKE2B 28941971c8e9ae4f5d1685ac1b9e53497235a62180a4c18093b54c576211b39f3048433d317ffb587a1335042b3894b8bee32cd903a97eee249c4864cfdec357 SHA512 99840c6ff45fdd5a4cb6a06a9322cfcd167b89a540d092fd75851ceb5a03ebce26c7c4adf702b41cc209eb1efd924aab50809c2840799fbb711578185cfbd61b
diff --git a/dev-python/warlock/warlock-2.0.1.ebuild b/dev-python/warlock/warlock-2.0.1.ebuild
index 90b6658386cb..a389f87e0b04 100644
--- a/dev-python/warlock/warlock-2.0.1.ebuild
+++ b/dev-python/warlock/warlock-2.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/jsonpatch-1[${PYTHON_USEDEP}]
diff --git a/dev-python/whatever/Manifest b/dev-python/whatever/Manifest
index 2476cc1281aa..54b2b401510e 100644
--- a/dev-python/whatever/Manifest
+++ b/dev-python/whatever/Manifest
@@ -1,4 +1,4 @@
 DIST whatever-0.6.gh.tar.gz 6003 BLAKE2B 410093960b8e17b1e0a7f91d7692bfd9e3f88a73cffb17a9a1763d42674cb1ec75da2b0a6575279c93451f24504086bdb89487bcc44bb116cbb2af89b9a7521b SHA512 f982100f0d6a8bf4c30e452a083c75f4cb2bca07e57e40ba4fd66baca752f039aea9519ffb97b3d43708df0ff5e981d0c4d03773f225106aa2f43e7770ee1975
-EBUILD whatever-0.6-r1.ebuild 485 BLAKE2B 0372669b2862429d5a346f05d4b4f36b0bc5b2dc2e245dce7fea9a2cd0cfd6a67d823dae86c98a82005bc96f85626c6cf8750bdb4d551d1cd68d5c4e17d6edf6 SHA512 ce358baa5ecc2243854ba760dfd81b6ed39fbbafdc119d234f2578404e893185eed82ffd04295c1f3b871de1f9dd430cbace368109fc5f591f7b796bd341f0a5
+EBUILD whatever-0.6-r1.ebuild 484 BLAKE2B d31d2046367e02df6d175777aef87f69c88f028ce07028cbc1d268ab98dd877a00435fbe083f5f27f8000740978dd600af71d56aaa6ed7d3f0e4a6ec6f10ce8d SHA512 322296167472551f33021a95fde55e38f7ddf6d8d2a9d962ebdbb46355b6b8f6f8ed7dd6b3fa526a9d46993f27fd793525d378a6314c0696e0f8cc3b557cb9ac
 EBUILD whatever-0.6.ebuild 448 BLAKE2B 9cf9890a0b1cbdeeabb9971ebc7e1371c12586bd49a675b59cf508be3b29a1b7b490f1201e217cc7c547ce9308007196b3925dc77d3ced752f7e9b5c6fc6c543 SHA512 1e1ecda69708cccb04076d8171db7cc6c9d03bf62db89e7591b8ea017e1a34c09603e6eca0c73b7beb9b05dc9f4f39b7fb3c35b8561074dfec101adaef16572a
 MISC metadata.xml 420 BLAKE2B 41c4f20317bb859b027aa397e6aa9d370ee72453dbb52f6d91b6b1214ea7716144cb43c8d63f204899302f50205d2253464f356f8849328588c11a1e2d245f39 SHA512 db6115bbed26216bdd3dd32e6f5b38573bce984f314a8076e80de1da3824cf203fe2fa8f81bf54c6c339db26e8ef37ccd6cf9963b7a33725181509a789570a98
diff --git a/dev-python/whatever/whatever-0.6-r1.ebuild b/dev-python/whatever/whatever-0.6-r1.ebuild
index 269e63debc39..1cadda669b26 100644
--- a/dev-python/whatever/whatever-0.6-r1.ebuild
+++ b/dev-python/whatever/whatever-0.6-r1.ebuild
@@ -16,6 +16,6 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 16c75e123140..90a9dac80b16 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,11 +1,5 @@
-DIST xmlschema-1.11.1.tar.gz 454932 BLAKE2B b80885b7bde87115caece3cdcd036c5ef7cc225acb01ca610c97b2759142a6deb1c29e9fbaf08f60ef4ec80ac4d7dd4b382dd5cd0b74f0f766101664a3cb7fca SHA512 58800377e4bdec70608286057093827fd72bce82117424753a37632c2dbccf2b4e354bfa6e62c3dec06ec98ff262eff258e18c0c6e6af2b5fd520ad11118531c
-DIST xmlschema-1.11.2.tar.gz 476302 BLAKE2B 61d194ae9d269c2bb8231b8ce9068cf0fb0019022abdb24748c4df8ede8821e1c197ea040e07bd267c060944ea1dcd4ada300995287f47e617daf2f923c54abc SHA512 777743e1a0711ceb3aa752b33d65b79e56252284cb911c504751152a86281fba9a39e96271fd8058093c65d69badecdd8e30d836578c9138ff988843fbe9b90c
 DIST xmlschema-1.11.3.tar.gz 477008 BLAKE2B 30e0802e271bf82a1baa8f38317048f4ccda994e2dd04c2fdbf70e4240c2227e821bd416326347d0817b27635dde2c67f446adde2cdf443301046f15ac84175c SHA512 5920573900f0cfc159e3239883aaada18502ac0d33dc7a9aaaf4ab63b41f6d37ba68989aa931e0e2e3e546d335788cb55b1d350d5856d06f12904549cf3cb723
-DIST xmlschema-2.0.0.tar.gz 474917 BLAKE2B 4249b3b12651c9afee528016679f35cedfc9bb25e097cc056a28e246a976446b0cbf82aa042dbf2c56f9917c40cb9e747afeb141c2cbabbc8fffd6db85f7b532 SHA512 5c37e65cb471dca6048602a8383414069d53d4adb17d39046db8bb396510df0a14513fcc463e9a9921d3530240d841757286d97bd811f05e2bf58f8e01aa0e27
 DIST xmlschema-2.0.1.tar.gz 475999 BLAKE2B 646f839ec8c1e3e7a18250e5e98a2d2503974b331a296c428eeceb5400af792c432851bf4cc7b8a15bfa815a9316f3a243535412344fd968ede7fbbee352bce5 SHA512 2087c3a4dc8517b3a05e852f213c611c6040c9bf41a392b26467a9d4a27140a2ce577a13cb1d0f4074f1d3d8bc33d6e115386cb1d675a6b6ee5ee29c01b20173
-EBUILD xmlschema-1.11.1.ebuild 832 BLAKE2B 17e3942b555bc419a77695077c676163ecb80be93436724601c3d414d7c530a87e4845384108a6f99a5c8ce8895416aa5173f88979f4bfb771c357c1f2051ab4 SHA512 1b232654938e4bdbc443f080f7cd80793a52ac483ecbdf5540debb15cc16657fedda7845f7d89d0f2ef4a944c4cca9ca8e454710ad4c744f7cab2318e960a46c
-EBUILD xmlschema-1.11.2.ebuild 840 BLAKE2B e9d3ec065b1e72a9ad47329591f125f4ed683105f98cee1590d21309a357eb56794c8d9a3efb01af87819beef145aa3cc652d19e14d638bbfaf497a7860149a1 SHA512 d3c02d15745686e2aa0690a530a31eb57e83a3487fd09450fc7ed8cbaa089114bba443077fc3195e5ecc7b3eb7041a8b05b998c39337af71b937e34197cad4d9
-EBUILD xmlschema-1.11.3.ebuild 840 BLAKE2B e9d3ec065b1e72a9ad47329591f125f4ed683105f98cee1590d21309a357eb56794c8d9a3efb01af87819beef145aa3cc652d19e14d638bbfaf497a7860149a1 SHA512 d3c02d15745686e2aa0690a530a31eb57e83a3487fd09450fc7ed8cbaa089114bba443077fc3195e5ecc7b3eb7041a8b05b998c39337af71b937e34197cad4d9
-EBUILD xmlschema-2.0.0.ebuild 885 BLAKE2B 18245bee72521a6fb759cee3181ddf6f93633a8c790efffe6f733f709f67df1a386231a46093a91624588570db1d5ea7955dd252eb31f0358015c8dfdf973ea7 SHA512 6cc9df953df065937c9714859b63567240a6a68bd1569ec551a3b5ebc04afaa610591283f233abe3de124bd42de7ae87b3361254ba92216a0c22b2e344d0196b
+EBUILD xmlschema-1.11.3.ebuild 832 BLAKE2B 17e3942b555bc419a77695077c676163ecb80be93436724601c3d414d7c530a87e4845384108a6f99a5c8ce8895416aa5173f88979f4bfb771c357c1f2051ab4 SHA512 1b232654938e4bdbc443f080f7cd80793a52ac483ecbdf5540debb15cc16657fedda7845f7d89d0f2ef4a944c4cca9ca8e454710ad4c744f7cab2318e960a46c
 EBUILD xmlschema-2.0.1.ebuild 885 BLAKE2B 18245bee72521a6fb759cee3181ddf6f93633a8c790efffe6f733f709f67df1a386231a46093a91624588570db1d5ea7955dd252eb31f0358015c8dfdf973ea7 SHA512 6cc9df953df065937c9714859b63567240a6a68bd1569ec551a3b5ebc04afaa610591283f233abe3de124bd42de7ae87b3361254ba92216a0c22b2e344d0196b
 MISC metadata.xml 376 BLAKE2B 6aa6c0ef38b17f49452a3db71c7f449dfda8951e2196b904235592921620b6a2064021aae7a1a30639e637c3b9bdb46bcaebec1903a081a41832bd0c5199dde9 SHA512 b814209cd4b87ad5cb8bc447f1d485043d8386339607f39575faf2d26c19b69befa9fd7b7eb2d3fca4b5e60499091a59c1466cfc2f0d9651430949893e2edaeb
diff --git a/dev-python/xmlschema/xmlschema-1.11.1.ebuild b/dev-python/xmlschema/xmlschema-1.11.1.ebuild
deleted file mode 100644
index f3be2f731360..000000000000
--- a/dev-python/xmlschema/xmlschema-1.11.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="
-	https://github.com/sissaschool/xmlschema/
-	https://pypi.org/project/xmlschema/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.11.2.ebuild b/dev-python/xmlschema/xmlschema-1.11.2.ebuild
deleted file mode 100644
index 02ebb8c6be86..000000000000
--- a/dev-python/xmlschema/xmlschema-1.11.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="
-	https://github.com/sissaschool/xmlschema/
-	https://pypi.org/project/xmlschema/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.11.3.ebuild b/dev-python/xmlschema/xmlschema-1.11.3.ebuild
index 02ebb8c6be86..f3be2f731360 100644
--- a/dev-python/xmlschema/xmlschema-1.11.3.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.11.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xmlschema/xmlschema-2.0.0.ebuild b/dev-python/xmlschema/xmlschema-2.0.0.ebuild
deleted file mode 100644
index da14b0a0f004..000000000000
--- a/dev-python/xmlschema/xmlschema-2.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="
-	https://github.com/sissaschool/xmlschema/
-	https://pypi.org/project/xmlschema/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/elementpath-4[${PYTHON_USEDEP}]
-	>=dev-python/elementpath-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 22ad29943997..592e3187cbc1 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,5 +1,5 @@
 DIST python-zeroconf-0.38.6.gh.tar.gz 134795 BLAKE2B 839d59d7c46d9ab16145e37bb58acc7a71072b00507ee0ae8325fea9a3ebc0e567f9e257937675f8eaf44095c7449f96e6bc42b82d34f75a39cc87fd29be2766 SHA512 274db525751191b0188a4f00505c795420f975de3f714f84f2207271ff484bb5de1c881c0ed00b1ad3a6265d5d461519cf46041ab907026d9e6937844bbab6af
 DIST python-zeroconf-0.38.7.gh.tar.gz 134866 BLAKE2B 060ffdc45d4ec8092cd278b99a74561fd1ea06aba3cdecadbd35c1c5e3f608befe3ced18009d8d64c5b37388ee57900b4b00a44c90d87923f259e798da5bb962 SHA512 a0ab90f30b843bc889daf95eab6d806a5e3fb4ffe5e3857c435f14a85de7b659b8386159f6428f05a34f2e3010f4582f7d3a55bbd6e6ede0008247821f666707
 EBUILD zeroconf-0.38.6.ebuild 1365 BLAKE2B 0d2b743e81200bb4a3a2cf7053fd572ac6cfa1cdd8a32cca98ed0d2338a264a2d02782c8352746e5041aba9d518755e018277eabc3e33bf9302f826f03acc3ff SHA512 d8f8fdb6f2bca9dea6b2a1901e9cc84575222b1585e8c0eb1339cd413cf303e95487592582fb8a27cc982a015ef40e8886a02d6120c1c828a042081d828be7bc
-EBUILD zeroconf-0.38.7.ebuild 1367 BLAKE2B f9a582d3632ec0ed395de8c7413b3df552f770489683fbccba02a97d33ee1432e90a15baaf85c98b0321cbdfbc20a636c8525a7aa59feb08e57359b72b77b34a SHA512 642de855934c35c1a60d430679b2293cb7652cbcd2267c2f682bdc66ed595a9e1bef30f68e5ce07808afa59d3ea3d960cb1d4a9206df49a2b86bad0c7df7e729
+EBUILD zeroconf-0.38.7.ebuild 1365 BLAKE2B 0d2b743e81200bb4a3a2cf7053fd572ac6cfa1cdd8a32cca98ed0d2338a264a2d02782c8352746e5041aba9d518755e018277eabc3e33bf9302f826f03acc3ff SHA512 d8f8fdb6f2bca9dea6b2a1901e9cc84575222b1585e8c0eb1339cd413cf303e95487592582fb8a27cc982a015ef40e8886a02d6120c1c828a042081d828be7bc
 MISC metadata.xml 413 BLAKE2B f93eceda07029400d2fd7ab38f234e5a1747e3d86f228adc973bbd6cdc71456778a7d926457f976cb2c6f55678b2c671d2415e5c7a480306582f1e70f6f733dc SHA512 d228e198b2f495dd02cd3d9d948aae123461c70c8e0185a47b133000f0316a84ff33d9b6f4cc0196bca5cf638e53ae58a3cd746338c33729d957a1170a5f08dd
diff --git a/dev-python/zeroconf/zeroconf-0.38.7.ebuild b/dev-python/zeroconf/zeroconf-0.38.7.ebuild
index 5fbfc422a51f..51704d814c2d 100644
--- a/dev-python/zeroconf/zeroconf-0.38.7.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.38.7.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index dce816b1dea7..5ebe3073ee9a 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,5 +1,5 @@
 DIST python-zstandard-0.18.0.gh.tar.gz 678765 BLAKE2B 7a297e76d65c6f5adbb87cc615f474d58c66bc9ee4050eb10277b596f7efda9109de815188b6efe55beb7aa637ec4779359a573c87094661ae28a080c9619576 SHA512 d573da893e3a372143271c7d9dec15cd4e9dd7355d2069e283df8b3feadbf999dddcc0aa37a2831a370526b2b045497f46326dcf13d3680dd8ee624bca1e7666
 DIST zstandard-0.17.0.tar.gz 629456 BLAKE2B 2b19c017b6255eaa22037e633f1f1dea1322c21dda3f1129e9593c5782b6cf3dbba12003711f6192bfa474a918cbf1eae2b5dd21fbf78731b8dfc62e69a27048 SHA512 312aa02c7309fac64cf70ca901942118d4b3f12f27d20cc18dcaba5ce155ad81ea8d7657501a33a5fb6cdc8bcca11f91141ea9d6c3fc09c28a84d698b9050391
 EBUILD zstandard-0.17.0-r1.ebuild 1289 BLAKE2B 87e499d2f68d68d1a849fc68141b7d668e06fede1e08274fece25fde25cf5d432080e5fab45b8691e6757aad5107aa0bbc351673f74b59b0a7e3859610027c95 SHA512 71bfd3942fc904e2818b8614588cf891f4735cec1942a239d2ca64be48a42263eee8b06cf80a8cebd0a766495f266701b8aaf1ffb08da685e5ef453fccff0c80
-EBUILD zstandard-0.18.0.ebuild 1616 BLAKE2B 6d1f0fb63b3aa7a66feacd5f53a9935f6c6af57e1b1179aa222a9cc990081cb53d3f74b0e35ab9553100af423f438ba675f42b2fabab6c1a4f03d41d4f57d2ee SHA512 84c3c467577767193da1fd6f952a9b58f4fc713e8976ad2814be0abbd9e66fa2d0f1f488500c79da0e2f964e858cf723d78a125267776af029f545dd7e98221e
+EBUILD zstandard-0.18.0.ebuild 1615 BLAKE2B 2a12953ccf399013791dfa35dae6221093ef185982b5488a98d6e33085813b1ad1136c865a9deafb8945fe6d0aceade37d25c6ae0bc6c7d8fa8842b99da12e12 SHA512 64fa03259651f1538361d1e08b383731f5c2eec07fc8f98a28e03e1231d26790606aca8a6f85770ad2ff3f9f4abea06c56c8544654f1fd410f8ca42e199d51cd
 MISC metadata.xml 378 BLAKE2B dd5834c84bb375812b3a3cfcc00d29aa43ac8954b044e188e8f38bdca93fdf1ce98fe78b78dbeccd935c83ca10f3ce18f893e5720dd8991118b6c69149a4ac61 SHA512 06554d973b525d53c680c3e43041f33125dad222339e645294fbc22670a7eadb0e9bf8a3b0771d2b2fb8f136d958eadb32c295179d1547c50ae26754360609f3
diff --git a/dev-python/zstandard/zstandard-0.18.0.ebuild b/dev-python/zstandard/zstandard-0.18.0.ebuild
index 24b3d7e8d9f0..f18dd40388b1 100644
--- a/dev-python/zstandard/zstandard-0.18.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.18.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	app-arch/zstd:=
author	V3n3RiX <venerix@koprulu.sector>	2022-07-25 02:55:08 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-07-25 02:55:08 +0100
commit	aeb34c47a1042b074096bacb85205617c8a14d3a (patch)
tree	905475b28fd25bd6ffbf92d7c1a0100c0474a780 /dev-python
parent	fc879856a16ea66528a11a00cf6ee19891f3d186 (diff)