gentoo auto-resync : 10:12:2022 - 15:20:44

author: V3n3RiX <venerix@koprulu.sector> 2022-12-10 15:20:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-12-10 15:20:44 +0000
commit: 177349fb1459039cc30cb8e3936af4117d038c16 (patch)
tree: 34c1bc161daefb8e152212dfba02b98da8a777a5 /dev-python
parent: c15acf374d4b25ba5afcb52435da6090f2d98a20 (diff)
196 files changed, 146 insertions, 3370 deletions
diff --git a/dev-python/Babel/Babel-2.10.3.ebuild b/dev-python/Babel/Babel-2.10.3.ebuild
deleted file mode 100644
index e2e44b4ca402..000000000000
--- a/dev-python/Babel/Babel-2.10.3.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.11.0.ebuild b/dev-python/Babel/Babel-2.11.0.ebuild
index 02e77dc3bc66..e2e44b4ca402 100644
--- a/dev-python/Babel/Babel-2.11.0.ebuild
+++ b/dev-python/Babel/Babel-2.11.0.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 67ed345649e3..645dd52cbc86 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,6 +1,4 @@
-DIST Babel-2.10.3.tar.gz 9344140 BLAKE2B c21d1e33160de2c98ac26b6ac83102a6249cbaf4b4860cd86e19b461ee66fd815a2972fc3652b411e2030b201bf32db77144fde91efc4e9e6ba51a580cad93b7 SHA512 72a5759d2cfa239df56f3d2809b23367b9691e21de92535b30f9b3455d253682f6c18ca919f3fb039deed2663db9276307f6343cbbab56fca96ff1ac9c214fa7
 DIST Babel-2.11.0.tar.gz 9346097 BLAKE2B 99ae97e4dc16e1757ae6f054f9f346c6728d087bbfba33786d59211ac4b6c12bf861c79ac7c12a3efd89539220126ea1ea9a3578a9008daaa464aed315102b60 SHA512 526368dc5e44f2d93c52f2fcb544130eea6c6b7c78325bd56c6d9a6706890a4cd9daa1498d639aab65059801d87977da626e64585083c58c4b328001991eea0b
 DIST cldr-common-41.0.zip 29364494 BLAKE2B 1960e860017c3e5f31d935d66a1ff551720975dca0af459adc72b8dc54100938fbd2d2ef00eb457f3fd04d4f1e90a4783229c350b125029dcda5c1e6903f9a54 SHA512 c64f3338e292962817b043dd11e9c47f533c9b70d432f83e80654e20f4937c72b37e66a60485df43f734b1ff94ebf0452547a063076917889303c9653b4d6ce5
-EBUILD Babel-2.10.3.ebuild 1364 BLAKE2B 49006e8f595e5c67bfacde4a471cae1aca5dcc8b8d13975c498f7601bbfb3b80d8bd79b22aca60f32bd43c2d16ab03449f30a0b3d489a572309df4c517fa38c3 SHA512 a44349e63e88fadd9fe1e7d6891925263a80d54ad633ff725fb8e66dafa9bcbd918a8804b643ea37c642addf58d93907568bb0c929d8c54374b535fb0fa9c238
-EBUILD Babel-2.11.0.ebuild 1372 BLAKE2B 38fafd6c6a00ab9f702b69c5c6f4db87e43bdaec25ccffe32e0464e2f8cf1719a01f3ec5cf061be8e54ce5f98f2ff746834fd5a605e0f17f54f37f6ece5dceea SHA512 3ee1db1f977a1466984106474140913481ad142bdce055759cdef7a31a8cb8c9ebd0c63e9aff206e9b10c0a24dfad50287a903af487e1c128a872479103b511c
+EBUILD Babel-2.11.0.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 8410e34f0703..44b9e3a5a661 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index 4ae2a7d9f09b..34b4853f2e9f 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,5 +1,5 @@
 DIST PyGithub-1.56.gh.tar.gz 3144624 BLAKE2B 04ee4784802f04b39da3fe28b67a884f14adc3d60f3085a5490d91e7b56fcadb735e70e8295ffddb63f21ca417932f1f8da0adf592e59034d3f7449d3c837aad SHA512 fe20d5eaa0f0267c49141fdd4d37bff81fe766a7db48662ceabc5a3f69ae7587bba6958d959a67dd224d4402f9b5785b67b461cac4c2f1bf5a15e8fcf8ae98ec
 DIST PyGithub-1.57.gh.tar.gz 3159952 BLAKE2B e753a72c0fe20f0697ff3246fd2c3445571079ae18bee50abf6543da51d9e889c67cafa0bf36a980223f3423cf880c36d24ce74a6bf245117a080186a209ddcb SHA512 6c8880d21c5134581be6bc5549184c3f13cef8f360a46a459234f22f3dd4fc5f8b573cc3a5d870bba6c6129ff7b670e739d87e42f2e34ddcdf357a3fe2b3cadc
 EBUILD PyGithub-1.56.ebuild 859 BLAKE2B ab33e774e0e5208ef32c7a1b99311e14c8cab3d50d8826832409ac4892843005126843ffe804fae1aa251d9414f6f2b6b0db4f4ef80b1c4479e53a20e1544c52 SHA512 fd113745c814993b75e14a45651508915512463eefcde88abfc51234e9d3de7c026158d3cb9d3cd07dd2154ef45279a6a16b57a9763470ac86447a46da435193
-EBUILD PyGithub-1.57.ebuild 863 BLAKE2B e1cc5aee283d6eb81193fb97a2997d6e84f301cafd576d39d1eafd3dcff05beba98160d079dc8c44a82e6f3cac0cc6251f0a5453f12acdaebc36b40bbc9b90cb SHA512 77f3b6166134022eec651087e31ec730969a117dddb208176b04e19bdbcba70f492772044be3e94897d9025f42997f83dca0b99d70948a0b1e54ddf9f45dab5d
+EBUILD PyGithub-1.57.ebuild 861 BLAKE2B c55d1c4061edea82c0c3963d8d07a42f79297258c3f15d757f2b497e2053cb18a3c467173740fad98cf4cde1c6562262c57fbd9022cfd40e26eea7995acf76e7 SHA512 2ebd9cdbcb030b4aca2a7bbc4bc3bb4983f7eab9d6fe7fff9f0a8bcc429b9f1fb623c4832d3fa3372b5a9fe72189846218b3b8b6681f23422846a588eabcb727
 MISC metadata.xml 501 BLAKE2B 1692287021b81416f18386da2b1dffd1c358d4dbfa3aacf7d5f773db0889ba966408c35fdbb7ea7f741923d542ea4e825039ab124a64168ad2d5264d1718dc5b SHA512 e1f2c16e725e96e8d576ff6b87a79d39f1b8169c6f419eadcd18a8a266fd188dc08fc9efa236f2c696449a083b000086b153da559cd819fcb73ddf2518500813
diff --git a/dev-python/PyGithub/PyGithub-1.57.ebuild b/dev-python/PyGithub/PyGithub-1.57.ebuild
index b1550f8817e5..b180417a832d 100644
--- a/dev-python/PyGithub/PyGithub-1.57.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.57.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/deprecated[${PYTHON_USEDEP}]
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index be34c94e3242..b17536b6b77e 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,5 +1,5 @@
 DIST PyQt5_sip-12.10.1.tar.gz 121271 BLAKE2B 5f1720a85b8522f552259be990d1d27c0f40d8c0c3ca0395679da02851e73b45210a6390b66d899fc00cabfeeda57f2bac4c8d108cd05ebc179302343fbe0457 SHA512 a6336195d8d5a1b216a85461c5f7acf3563c6db2255079734e955a9412522cfdb82663dbff5d60574acc7bb29dd5ef11f98f2c0c3c3d3fcbf290b039cda31638
 DIST PyQt5_sip-12.11.0.tar.gz 122792 BLAKE2B a2cde0a741fb5ef6d6805a382b66405dcebe09a18cbe1b7d88b277d96995b93b0a939900be9ed347ab46c8ed5d14b222c56f2e19e1506b72ebfda46aab8a22b1 SHA512 1542747ef1912c05b0054ffec16294046e20dd4eb757bb664fb92d7b6ed924521469e88d27e515146f725d153e3ebe3a3bf72805de6451fb52ff86ed5b9128d7
 EBUILD PyQt5-sip-12.10.1.ebuild 662 BLAKE2B 1f4a204aeeae3780fb4886edc1a5ba07503ccf9558417d843895726fcfd344598f298d54b62b94b18ca870e304ec33fe0ddb256b938310cd72da2924bc27233b SHA512 93b1fa1e3944433a92ba8d5ae1c602a503ba3b1c9f9319f2f45ecb5d1c32b94db77165e5e034822239980aca2946cc60d636f7beb42ed45d9bd47d1064dab39f
-EBUILD PyQt5-sip-12.11.0.ebuild 674 BLAKE2B 75be7532834b0bd1c7e1014bfc60d65a5fe3a76e1ffd3142611a618516fd07998b1155e4c095830f1508552826618d59149c2a1f74be722e1cca4c4213c101b7 SHA512 bdaddd85d45b4f2686083843129bb27e39799eafd2903690ef75c8bb8459d6bd6df7000d179b2c18e49fcdfa90ed362ceb88340353cbd8747fee49fefc2f9973
+EBUILD PyQt5-sip-12.11.0.ebuild 669 BLAKE2B 89e5bae943bb2890c03bb3f8ab058a08883b3ec3c29b69b599583d86fb53df2783ec09094bea7e63a9a5e0016a2dfc11ab6cd5c7196de2773eaec563dc9fcf5c SHA512 c5caf7d40e81576b216f06c9ab228f5ff1db3fd5ac293e8db2a82ed2d7c818d5485db3eccd122ecc97caf2767e2cce1a6b8853dddb2862f9e9da1bd2b3561db5
 MISC metadata.xml 649 BLAKE2B 0a6faee65b39f122f65965490284b17856ba6d86537f3f3780f8604366739c346b01e29e933a91c7edb5ff898e5d51a10e4bf288228d1943a1c9e9970eac4c86 SHA512 3af9be87db6da5cb071f4025cd6fc1964a4b0629ebe93239f6c5a3734d4ef8ef06e652abbac5c9bd86f882a6235bf3b1f0fec6f0035c77ea42571e47c6045e29
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-12.11.0.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-12.11.0.ebuild
index 376d7b7def1a..7a00219b1da6 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-12.11.0.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-12.11.0.ebuild
@@ -20,4 +20,4 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index 39d4d4bca0df..d7189a478fe8 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,8 +1,4 @@
 AUX aesara-2.6.5-compiledir-tid.patch 1707 BLAKE2B 77f8fa3618f930dddad8e864dee3e73fc0b965018d508be5877d5bcae4430024c4e4f90e905ac912da22a4d4934d6fc71acf4ebd49b7e8efb12c90dfaa072ed2 SHA512 9b6bbd8bc56f61c89dfd85cb18251ff8d73d717d91178efa9309e6b897dbda28937dea84f1d7d1a917c285219d51c0adcee1233112f2dcdb9f8c7b714a6c6c12
-DIST aesara-rel-2.8.7.gh.tar.gz 7944368 BLAKE2B 6772a8f88d9480044f0da275925577f85d86ef77a1f500f079478a5843ddd4afe2344e00664c5be06a8098587754d3fe7aeb71b8fbc4f12160263b5b98a56de4 SHA512 5f0646af9d9525ab81365fb1e8a6e3ff783bf8fe710ea6fafa91101903aef592d3db42cff47b0620132431198c5d7d16cad65d5668dccdd6b42a7ee62aa12ac6
-DIST aesara-rel-2.8.8.gh.tar.gz 4350570 BLAKE2B 27bcebacef4a4b7a9d38371f25ddd41c4183fea1ce1824a36298311e66d86dc11ef2e0af10e7e0b0cbb0f007aeb22d65b2f745d645c4e393deb44634c146a101 SHA512 42e0a2f9372b4a9df5351b1459930758589a30b7c59f46d5d97c567de353499d16c47f55713dd374d5ac258f56b3484c370fd4d1ad1437cb01ca2eff6f056e71
 DIST aesara-rel-2.8.9.gh.tar.gz 4351952 BLAKE2B ffdc3d33caba5cf5edd3dd15e62cd295dd23f944ac6d76461e9e43717a4126669391dadfee51c6117911dc4236e8787d3e9ab712a0fcbd1dcb137e64f9f994c4 SHA512 3fb4374899ab71366961a07c750f594505467cdab01b6851b36d1dd924b816117ebe488a6cae548650df393c8447de69e21ce2cf6eafe34e951b98f27c3a4f6c
-EBUILD aesara-2.8.7-r1.ebuild 2921 BLAKE2B d3e76a3c595760fc8dcea714ace28ea76495a96f6ea09081fa7cc81f13667ef2ac1bc66e61aa9fb7ea188ad0b2e347960780e17b23a33b9db46464e36e98fdb3 SHA512 0402a637a519d2da7d66292e582348651d1c20cd2e32e9fe9b2c1093600086897a5b4b3100c0ed9452b71c0128d973afdc058e477067d45d875fa8ed9be64dee
-EBUILD aesara-2.8.8.ebuild 2914 BLAKE2B ddf789d71bc4132a37976153096b8ebbb9cf8e5ee7fa0357a3d7b03cea24826d0cd112f4bf92341873ab95a80813086082b8583ce1e74d15a6fb196cb1261c6d SHA512 4ecbe1c2768affa5c9413eb86fee5e9f7e8ca71d21e3c832e08edc22fa58b10f0feca8888435b6ef4b08076118a4d7fca76fa0ad3d811c69e668aa69cee2a619
-EBUILD aesara-2.8.9.ebuild 2914 BLAKE2B ddf789d71bc4132a37976153096b8ebbb9cf8e5ee7fa0357a3d7b03cea24826d0cd112f4bf92341873ab95a80813086082b8583ce1e74d15a6fb196cb1261c6d SHA512 4ecbe1c2768affa5c9413eb86fee5e9f7e8ca71d21e3c832e08edc22fa58b10f0feca8888435b6ef4b08076118a4d7fca76fa0ad3d811c69e668aa69cee2a619
+EBUILD aesara-2.8.9.ebuild 2912 BLAKE2B 4341c48b6c1e23f0df379df0138d49d444bce6ab4a7bcb4b629b6920f770368e70a9b9257e50ea6edfed5f9971a89aa98aab60851a0b6b4def0ffb903ca8b1dc SHA512 9702835ce44682be7b9fb043218f0df3a1eb7a1b5c3d9bc61829c6aa00248fbba1ffad1da6f848b7b5ab4f532494c50ca0fb67d9e0aa56d3967bf2487b6a0dc4
 MISC metadata.xml 506 BLAKE2B be65b6be62282fa47152985d79892fd04105a47e00a427ee8341d27aeff21b144bee7e7d0f16b2f4b617c941bdf5ebd9de37a42c39d117cdfd579c3035d35a74 SHA512 a207ec3db85a8e6f03feabd14da588f0b9ca9a88ab2495ade0f40b516b3bbd20fe78b14698d28da7ceed238737a9f4d63f587156ef609e846b485132d598c6bb
diff --git a/dev-python/aesara/aesara-2.8.7-r1.ebuild b/dev-python/aesara/aesara-2.8.7-r1.ebuild
deleted file mode 100644
index 5edff639042b..000000000000
--- a/dev-python/aesara/aesara-2.8.7-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-MY_P=aesara-rel-${PV}
-DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
-HOMEPAGE="
-	https://github.com/aesara-devs/aesara/
-	https://pypi.org/project/aesara/
-"
-SRC_URI="
-	https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/cons[${PYTHON_USEDEP}]
-	dev-python/etuples[${PYTHON_USEDEP}]
-	dev-python/logical-unification[${PYTHON_USEDEP}]
-	dev-python/minikanren[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-48.0.0[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/aesara-2.6.5-compiledir-tid.patch
-)
-
-distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not claim "bin" package (sic!)
-	rm bin/__init__.py || die
-	sed -e 's/find:/find_namespace:/' \
-		-e '/exclude =/a\    doc*' \
-		-i setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# speed tests are unreliable
-		tests/scan/test_basic.py::test_speed
-		tests/scan/test_basic.py::test_speed_rnn
-		tests/scan/test_basic.py::test_speed_batchrnn
-		tests/link/test_vm.py::test_speed
-		tests/link/test_vm.py::test_speed_lazy
-		tests/tensor/test_gc.py::test_merge_opt_runtime
-
-		# rounding problem?
-		# https://github.com/aesara-devs/aesara/issues/477
-		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
-		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
-
-		# dunno
-		'tests/tensor/test_elemwise.py::TestDimShuffle::test_memory_leak[False]'
-
-		# TODO
-		tests/link/c/test_op.py::test_ExternalCOp_c_code_cache_version
-		tests/sparse/sandbox/test_sp.py::TestSP::test_multilayer_conv
-		tests/sparse/sandbox/test_sp.py::TestSP::test_maxpool
-	)
-	local EPYTEST_IGNORE=(
-		# we do not package jax or numba
-		tests/link/jax
-		tests/link/numba
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x AESARA_FLAGS="cxx=${CXX}"
-	AESARA_FLAGS+=",config.gcc__cxxflags=\"${CXXFLAGS}\""
-	AESARA_FLAGS+=',compiledir_format="compiledir_%(thread_id)s"'
-
-	epytest -p xdist.plugin -n "$(makeopts_jobs)"
-	# clean up the compiledir, as it can grow pretty large
-	rm -r "${HOME}"/.aesara || die
-}
-
-pkg_postinst() {
-	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
-	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
-}
diff --git a/dev-python/aesara/aesara-2.8.8.ebuild b/dev-python/aesara/aesara-2.8.8.ebuild
deleted file mode 100644
index 50d3e3cb6fd9..000000000000
--- a/dev-python/aesara/aesara-2.8.8.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-MY_P=aesara-rel-${PV}
-DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
-HOMEPAGE="
-	https://github.com/aesara-devs/aesara/
-	https://pypi.org/project/aesara/
-"
-SRC_URI="
-	https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/cons[${PYTHON_USEDEP}]
-	dev-python/etuples[${PYTHON_USEDEP}]
-	dev-python/logical-unification[${PYTHON_USEDEP}]
-	dev-python/minikanren[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-48.0.0[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/aesara-2.6.5-compiledir-tid.patch
-)
-
-distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not claim "bin" package (sic!)
-	rm bin/__init__.py || die
-	sed -e 's/find:/find_namespace:/' \
-		-e '/exclude =/a\    doc*' \
-		-i setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# speed tests are unreliable
-		tests/scan/test_basic.py::test_speed
-		tests/scan/test_basic.py::test_speed_rnn
-		tests/scan/test_basic.py::test_speed_batchrnn
-		tests/link/test_vm.py::test_speed
-		tests/link/test_vm.py::test_speed_lazy
-		tests/tensor/test_gc.py::test_merge_opt_runtime
-
-		# rounding problem?
-		# https://github.com/aesara-devs/aesara/issues/477
-		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
-		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
-
-		# dunno
-		tests/tensor/test_elemwise.py::TestDimShuffle::test_memory_leak
-
-		# TODO
-		tests/link/c/test_op.py::test_ExternalCOp_c_code_cache_version
-		tests/sparse/sandbox/test_sp.py::TestSP::test_multilayer_conv
-		tests/sparse/sandbox/test_sp.py::TestSP::test_maxpool
-	)
-	local EPYTEST_IGNORE=(
-		# we do not package jax or numba
-		tests/link/jax
-		tests/link/numba
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x AESARA_FLAGS="cxx=${CXX}"
-	AESARA_FLAGS+=",config.gcc__cxxflags=\"${CXXFLAGS}\""
-	AESARA_FLAGS+=',compiledir_format="compiledir_%(thread_id)s"'
-
-	epytest -p xdist.plugin -n "$(makeopts_jobs)"
-	# clean up the compiledir, as it can grow pretty large
-	rm -r "${HOME}"/.aesara || die
-}
-
-pkg_postinst() {
-	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
-	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
-}
diff --git a/dev-python/aesara/aesara-2.8.9.ebuild b/dev-python/aesara/aesara-2.8.9.ebuild
index 50d3e3cb6fd9..56da4486cc00 100644
--- a/dev-python/aesara/aesara-2.8.9.ebuild
+++ b/dev-python/aesara/aesara-2.8.9.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cons[${PYTHON_USEDEP}]
diff --git a/dev-python/aiosignal/Manifest b/dev-python/aiosignal/Manifest
index fe54e26863a3..ef0688937422 100644
--- a/dev-python/aiosignal/Manifest
+++ b/dev-python/aiosignal/Manifest
@@ -1,5 +1,3 @@
-DIST aiosignal-1.2.0.gh.tar.gz 26171 BLAKE2B 02657c11f5ee96173c94ab889993f835904a79e3fee58121fb332583f8d81cb680087e667dc0f8e89cd9704bc338362f2878bef7080907a5a3f86bef7a30cac1 SHA512 e75df2fcaeeea7ff7688c20838600f6315bec25b82c48ed7a23b7853edd3d53d72f76a686ad9b0d856f43b0d476398196a8ce4eb98c8859234710ff008f8ba42
 DIST aiosignal-1.3.1.gh.tar.gz 26119 BLAKE2B 16112f674f20b97406eff16a6a9baca1ef414132ec53a67789e08347f06a462ff653c7a00d6865855f5fe0fd70ba4a2bebe286020fdf1942da41d43f72e67837 SHA512 c03454d1b855bb3e84d3ce07fb32d08855b42d1ca7723fd67d3b2ef1bc66038a31974fabda7561c90e2beaf4cdd2c28cc0463e43eb5d5c127df0cd187ae3c2e2
-EBUILD aiosignal-1.2.0-r1.ebuild 745 BLAKE2B 534cff054719187cb2e97bd71ad1be3c6aad90397ab8c7e5fb9252bc3fa947e833e4a17497ce15fbf1f8539822a24bac190a4bc03702ea675f5e178fb6129408 SHA512 bde5dd6bc1c08e1c2847e8fb5093ea03d3546064c652ab8f71e4aee32aeae56e5b7ba89ead194574b10fcbaa936a442feaa5a57138175f7601d3f4da582291bc
-EBUILD aiosignal-1.3.1.ebuild 706 BLAKE2B feb2d8dc53a5f5300734cca21c376ec4f31384c6ecf97e224d554be7c6ff8c7e5efbcd97396419b700d8f7a90d2b438f43b4d188c0429b37fc7bab8414994e1b SHA512 ec539612fb7e1925312fe6b08a1ddf7c4cf88b6dbe866432c2a73252dce7867ae3da214a85894844b798e0ed3d79644aa505a002d01fd3b8d1070823c7c5a8ed
+EBUILD aiosignal-1.3.1.ebuild 698 BLAKE2B 272ffae8efd93bf6e3814d8cad41d4648f0d110b1eaef7e40e891db88d403fe4f5b0b532ea715db9cc9e4838f61d22339c371cb271296f486c194db31d7693b4 SHA512 27c930a9583e7dbd5ccfe0f4b49702688c4d282e25311c9cd9fa3c5b3fbb6db2034ef694780403319fd3e7fc114a2200e6c7e10f9ec358272d648b29b91244e6
 MISC metadata.xml 373 BLAKE2B b209b111344a544f995cee1af49f03f317e0747f11ba9cd3b34720b48f944efb52b622dfeea2abea1fa0d95207b711a16ddd19a16d86ae6935f2c3095ac94cb1 SHA512 74dee89fde8e295c370ca51ba1f8c041539da01ab54849adc8e90d5b67c238c9c54f19b5f0608dfa52271a5f1880995a2c61f1d649aa34fea650ef5e0c6927fb
diff --git a/dev-python/aiosignal/aiosignal-1.2.0-r1.ebuild b/dev-python/aiosignal/aiosignal-1.2.0-r1.ebuild
deleted file mode 100644
index 2961fee18787..000000000000
--- a/dev-python/aiosignal/aiosignal-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A list of registered asynchronous callbacks"
-HOMEPAGE="
-	https://pypi.org/project/aiosignal/
-	https://github.com/aio-libs/aiosignal/
-"
-SRC_URI="
-	https://github.com/aio-libs/aiosignal/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/frozenlist-1.1.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' pytest.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/aiosignal/aiosignal-1.3.1.ebuild b/dev-python/aiosignal/aiosignal-1.3.1.ebuild
index 9224c379b46f..77bffd8878a6 100644
--- a/dev-python/aiosignal/aiosignal-1.3.1.ebuild
+++ b/dev-python/aiosignal/aiosignal-1.3.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/frozenlist-1.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 4f1c7b9454c0..d5243d0e2a55 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -3,5 +3,5 @@ DIST aws-sam-translator-1.54.0.gh.tar.gz 1004760 BLAKE2B acb875f6f25c43d605dc1a2
 DIST aws-sam-translator-1.55.0.gh.tar.gz 1006734 BLAKE2B 5fbfd8719ad605e0df7acd8ecb25ca681f5863e67e97b57624c470fa6e77bb431d7ff19f5e00a181120ea809019d93bd75416e46ba1424e8839f80c10002b30f SHA512 4d2f1e3458cb9d2014f73575946e863e1d74e7432e2aaf17128638d69d9f092b4d531224e45c2110b50103a1e7c4343fc0282ad38fe959cf45af4a0a2b4663aa
 EBUILD aws-sam-translator-1.53.0.ebuild 2255 BLAKE2B 48a47eaf224f0cf84d7d2ee0aa3e3e7ec62844b593e6aa14f6b8b5dc1e46934294fc4454f1c2666dc5d4148a9403c499f3ae43a1d522f5e9a3df929b52613b3f SHA512 8454a7fc31df79581066a995cc7c323e52eb70b29e2c2f9766a4cccba444e910763a51eec5f3920601b7e3d8023807a7558e8e6e083435ff66a0dc3403df187c
 EBUILD aws-sam-translator-1.54.0.ebuild 2328 BLAKE2B d7bdc79b15e35bae70f07b178be76813a7fc9a96b2ed73b5fa0d138395a3a0d718785709dae915db2fa2d8ef18cd716261e56556e8d935a15006a125db96e7e8 SHA512 86c47ab5e015d2be0c5fe19d80aa2299a33521c6b9688df6065ed297a739a6e2e354e8a48f20f7e644e77ce7320b8c0f5b2bb62f05849a6af3da8a7f6ec0ab9e
-EBUILD aws-sam-translator-1.55.0.ebuild 2328 BLAKE2B d7bdc79b15e35bae70f07b178be76813a7fc9a96b2ed73b5fa0d138395a3a0d718785709dae915db2fa2d8ef18cd716261e56556e8d935a15006a125db96e7e8 SHA512 86c47ab5e015d2be0c5fe19d80aa2299a33521c6b9688df6065ed297a739a6e2e354e8a48f20f7e644e77ce7320b8c0f5b2bb62f05849a6af3da8a7f6ec0ab9e
+EBUILD aws-sam-translator-1.55.0.ebuild 2326 BLAKE2B f46ce1c2570bf4e190101068149659afe602bc18fbd398384d8870783e814a6a89acc72bd2dcd3b11b6e1dc3fd1384705fba2b57dde9758ece1b414f8bc0d676 SHA512 f26422aafe8c66243f541acbc81d675e97732e79402006e119b0240e722b59ec0cabc8cbdb171a0e18ae91309c769be35ff29c2ec88b54bb9d44b2a84375a602
 MISC metadata.xml 603 BLAKE2B 89556267393186cf69a585c58efeb6fa599bfb42ef221bea955ea807a28edee89036a2ee0d0ca81ae55d96702a01b171b837754dabf38047ecc2789157bb7116 SHA512 106b6d241eadf7807dadf03329073703f8b51e7443eddc4db8752878b6dd84cc4357689cd4b796b3a083192e9d98eacbe9e7b8af0273160c7b89846e78230a88
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.55.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.55.0.ebuild
index 307deef634c3..02bfd3290159 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.55.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.55.0.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/serverless-application-model-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/boto3-2[${PYTHON_USEDEP}]
diff --git a/dev-python/boto/Manifest b/dev-python/boto/Manifest
index 30f0c5ffb86d..461b8830d587 100644
--- a/dev-python/boto/Manifest
+++ b/dev-python/boto/Manifest
@@ -7,6 +7,5 @@ AUX boto-2.49.0-py38.patch 2061 BLAKE2B a17cc48925216f333a12631051f177c9d91199ed
 AUX boto-2.49.0-try-to-add-SNI-support-v3.patch 4727 BLAKE2B 197d4e6cc632e372faedac8812eb6dc250124555705d5b8d3b5ffe3718315043cf0bab5b9270d0dbd2ce333dbe074583cc7bd1f6057e324d13aea6f39e9b05e5 SHA512 0be17ce24149bfa02f6614fdc37b0e4c4018f78516348a6dc0f3d90f3e22405262a2ab61c36dd1fa6134d7cfdde422a5e06bbe855c6df5e5d7c77e0a9125f348
 AUX boto-2.49.0-unbundle-six.patch 1122 BLAKE2B bfaeaf7fea01e662d19caa6c040aaad9a2ce6544c105865a8b79255057d662c30478b6fb884b9a088f861c99a4d8399c0e503711e36e0581cbeeec3c5b2e1ba0 SHA512 7dd51b6a48f718475e18ac97584a508aee75b69dbfee9e91fa2955feec49cb1786662276a4519438cccc49b4d55a5d8536192bfe47a20a36a6a01f4bc3bfb9cc
 DIST boto-2.49.0.tar.gz 1478498 BLAKE2B 6a897ea162f5f4bd34a2d488a3e3897f7f2f5b8707dd0922c01b6a0b90ea577223bf3e588b6685bda1f2bc0e92af426711fcba67a70377183465a530065c6c84 SHA512 2175cf30cd25bbc05812e83e5ade7668c3e21b1bb09aa1b43f0f0ac7d6967a646394fb52c9be673ebb65618c5b33a52d6f31f6da702f5cd1d6c9a18169476dd4
-EBUILD boto-2.49.0-r4.ebuild 1606 BLAKE2B 5cddf12e53600517055b4499b39ee0df2e44d2091101f3fafd33c0a869a8563616961055fca1797303e46abf1f73a49af98bf9c5154fd63183c69c2e0541ca34 SHA512 16ba3efc211c825cf17649c950c23d3e70d78555ce74ef7b1d2e09622dcf179442b89d6f3e3136214ceabe8eecdc2078f29937f50559e76671a343a9c8bafb14
-EBUILD boto-2.49.0-r5.ebuild 1624 BLAKE2B c551526f0b455b9e09a75d778d2cd3507a94d0de57cbacb91a721b592829ece7604c7b223050a3d6efbe7119aa25763755b157445bba30b9415c891312a14b55 SHA512 1b94e4e0838631426181044a881c5da5b240da44fd70560591d632501a7bce90008112e1ef36e6e03ef2de1853d2361feaecf85bff4edef666fb69092d29e62d
+EBUILD boto-2.49.0-r5.ebuild 1618 BLAKE2B 764aa6d410991447781fe7cb702532c96a4b9fe61e96cc7dcb4397c20ddf25fc78989ca36018dcc46591a6d2bf77230537f3c636c98f4c3c1c7914845bbf3677 SHA512 dcd252df55b6607f76b0d5cd19da7b75eb2186e00247c42dd26774218bc1891423808feeeb99a3ec740a41b914577a482e4d005caed49c4166a1e8bf647c87d3
 MISC metadata.xml 445 BLAKE2B 69850f4bbb872a5770f7e79319e071cc78d5b4433c534595698696ea0a3db20500191c21fdb01fba7cbb212b46bdb658381914e9e08df677526a693ba57bae14 SHA512 aa512a8964ad197d0257187db54815478207b0829132e36895cd2e66f47338c8f9f2f1e614ded361170ce780775c085f493332f79889bd352d40952350e14c09
diff --git a/dev-python/boto/boto-2.49.0-r4.ebuild b/dev-python/boto/boto-2.49.0-r4.ebuild
deleted file mode 100644
index 5e32f2f4e2b1..000000000000
--- a/dev-python/boto/boto-2.49.0-r4.ebuild
+++ /dev/null
@@ -1,61 +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} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Amazon Web Services API"
-HOMEPAGE="https://github.com/boto/boto https://pypi.org/project/boto/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-PATCHES=(
-	# taken from https://bugs.debian.org/909545
-	"${FILESDIR}"/${P}-try-to-add-SNI-support-v3.patch
-	"${FILESDIR}"/${P}-py38.patch
-	"${FILESDIR}"/${P}-py3-socket-binary.patch
-	"${FILESDIR}"/${P}-py3-httplib-strict.patch
-	"${FILESDIR}"/${P}-py3-server-port.patch
-	"${FILESDIR}"/${P}-unbundle-six.patch
-	"${FILESDIR}"/${P}-py310.patch
-)
-
-RDEPEND=">=dev-python/six-1.12.0[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	test? (
-		dev-python/httpretty[${PYTHON_USEDEP}]
-		dev-python/keyring[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/paramiko[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	# remove bundled libs.
-	rm -f "${S}"/boto/vendored/six.py || die
-	# broken, not worth fixing
-	rm tests/unit/cloudfront/test_signed_urls.py || die
-	# fix tests
-	mkdir -p "${HOME}"/.ssh || die
-	: > "${HOME}"/.ssh/known_hosts || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	nosetests -v tests/unit ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/boto/boto-2.49.0-r5.ebuild b/dev-python/boto/boto-2.49.0-r5.ebuild
index 565ac4250172..4ae1ce8adac1 100644
--- a/dev-python/boto/boto-2.49.0-r5.ebuild
+++ b/dev-python/boto/boto-2.49.0-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 PATCHES=(
 	# taken from https://bugs.debian.org/909545
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 7c32d35788d3..83ac60c40f9e 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -11,7 +11,7 @@ DIST boto3-1.26.26.gh.tar.gz 576812 BLAKE2B f88759a49f15102e02a73fedd42cf6f8332d
 DIST boto3-1.26.27.gh.tar.gz 577292 BLAKE2B 31837d205570d0ee89b13bc68c6270f0e4cf932b51a6ca041c826bd0d9364be4542e6baff55dfb1ff6029fe7441c5e43820ac4946219a61bd4d5745bba3a0d64 SHA512 9ada5b840122e04d1bfa4bea20d223a84ffc6636643a0725b19dadc7136a25482863fb4d798132a1965fc553866898efd272416699d478170fd5f2f534ac1598
 DIST boto3-1.26.8.gh.tar.gz 557012 BLAKE2B 211bb7441acc8b1f901ebf5251288dc7c9073fa6e34f5a34426424ef064efb0fb3031deaf48ef336ec43bb015f95f618598da43d12ec83cbf814e1b4097b28a0 SHA512 738190cedfb0b85d3a1e9558b03e7f2fb14e43b152bc9627fd95c8ecc4a0ddc17f4c87ccb6129c1fbf5f47db9eea4dbc5c2cfbb69b903bc6f3ff417ef86b6f6b
 EBUILD boto3-1.26.11.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.26.16.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.26.16.ebuild 1582 BLAKE2B 9cbef4eb5cee630af30d909323e9d3b0bf94cfcf7ef373e0bb3f2c83b1fb690ce8c7a47bb6050d92af6db6223d9825f15a91038dde9787383de844129e23710f SHA512 cd0ae7e87a272c97c94f989d880b5427a062783cd97736a002210abaca5b707e18c89e17a4454740822b3bb64e1c79ae2ca08cef6068b1427b329c60c334705a
 EBUILD boto3-1.26.18.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.26.20.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.26.21.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
diff --git a/dev-python/boto3/boto3-1.26.16.ebuild b/dev-python/boto3/boto3-1.26.16.ebuild
index 6edcc751d54b..55cb98620aa8 100644
--- a/dev-python/boto3/boto3-1.26.16.ebuild
+++ b/dev-python/boto3/boto3-1.26.16.ebuild
@@ -25,7 +25,7 @@ else
 		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"
+	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-)"
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index dfb0a6750aec..10b684d01351 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -11,7 +11,7 @@ DIST botocore-1.29.26.gh.tar.gz 11015382 BLAKE2B b9777a7db931b15bfae0e62a5095b86
 DIST botocore-1.29.27.gh.tar.gz 11015321 BLAKE2B 81bd2269ca5dd5feedb7bd8a45a63e755575e9fb70b15d125beb57c1969259b16838e63660ff5a2f5ab24a52c1bdc21bca6a92e79f9023fa1c57f03250c096a5 SHA512 7fd577773f3fabbf38db8e5d353a27a73869d4249a55428a4d4e6056b9c459268887c264b1386f5170abe793709e4d9f2eb0e3e6daefea56f123fccea9d13cbf
 DIST botocore-1.29.8.gh.tar.gz 10636661 BLAKE2B 3ebd9e5cb6cc1a9d4ddb877e806e0a845e6a19a4604b4489dbdb9a0f35251201de5d7062f3b0193db3e28f5170d8c3315fdc0b2bec7668a61880ff3e9305d3bc SHA512 c4a1a3993576bd0340de4eeb25e10650219e9d74c21f7e51e5298120bc92a8359143c38d5a991b940316fc5eac483e4e838298881a5c068fa91dc3ebf92a7f5a
 EBUILD botocore-1.29.11.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa73a78b627988165703230bd47488a99b1b38bfbdf1dae735806a0de9ca9a17db8afb526121f8c5402e97ca659a6b9 SHA512 9aa2a546360c0bc286bfabb5adb2c95af40d4d405d89fc4186856814b9b88d158fa952d82fd42126876270615e88a24820ac61132e8fba8414db4ac01da2f72b
-EBUILD botocore-1.29.16.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa73a78b627988165703230bd47488a99b1b38bfbdf1dae735806a0de9ca9a17db8afb526121f8c5402e97ca659a6b9 SHA512 9aa2a546360c0bc286bfabb5adb2c95af40d4d405d89fc4186856814b9b88d158fa952d82fd42126876270615e88a24820ac61132e8fba8414db4ac01da2f72b
+EBUILD botocore-1.29.16.ebuild 1901 BLAKE2B 757e8e697905ea9d32f2eabc4e93c800e3a7065d41b4167671821a15b6c066382718e004c2cd836917a60afa5c9ffe698d8c6f2f870ea1c8d1972f776e6521e6 SHA512 e6dd33e18b10f63df5e7e76e8c4a7ff6eeb97cf04cda95f6e13762040981920e149248bd162a3127782f15f72d16ef6c5625fda215a18fa1be6adbcd4965888d
 EBUILD botocore-1.29.18.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa73a78b627988165703230bd47488a99b1b38bfbdf1dae735806a0de9ca9a17db8afb526121f8c5402e97ca659a6b9 SHA512 9aa2a546360c0bc286bfabb5adb2c95af40d4d405d89fc4186856814b9b88d158fa952d82fd42126876270615e88a24820ac61132e8fba8414db4ac01da2f72b
 EBUILD botocore-1.29.20.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa73a78b627988165703230bd47488a99b1b38bfbdf1dae735806a0de9ca9a17db8afb526121f8c5402e97ca659a6b9 SHA512 9aa2a546360c0bc286bfabb5adb2c95af40d4d405d89fc4186856814b9b88d158fa952d82fd42126876270615e88a24820ac61132e8fba8414db4ac01da2f72b
 EBUILD botocore-1.29.21.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa73a78b627988165703230bd47488a99b1b38bfbdf1dae735806a0de9ca9a17db8afb526121f8c5402e97ca659a6b9 SHA512 9aa2a546360c0bc286bfabb5adb2c95af40d4d405d89fc4186856814b9b88d158fa952d82fd42126876270615e88a24820ac61132e8fba8414db4ac01da2f72b
diff --git a/dev-python/botocore/botocore-1.29.16.ebuild b/dev-python/botocore/botocore-1.29.16.ebuild
index eed342eb3cfa..cbc7fe15ca12 100644
--- a/dev-python/botocore/botocore-1.29.16.ebuild
+++ b/dev-python/botocore/botocore-1.29.16.ebuild
@@ -24,7 +24,7 @@ else
 		https://github.com/boto/botocore/archive/${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/comm/Manifest b/dev-python/comm/Manifest
index fd7bb2c8e9e2..64ea49d88775 100644
--- a/dev-python/comm/Manifest
+++ b/dev-python/comm/Manifest
@@ -2,6 +2,6 @@ DIST comm-0.1.0.tar.gz 5364 BLAKE2B 25715bce2ca51ef81de742ab04dd17120cab1f2f6d56
 DIST comm-0.1.1.gh.tar.gz 5382 BLAKE2B 8749ae33ecead77c1e3e0130c7d68082ac465fb733ad0908cf42a91d5a1aeca90c987fc469bcf47b5a384e108bafadbe009368162507c8a751b9e16eb5bbc2b0 SHA512 31ce4a1f1f35a3e1790e5a9896fd3f453a952c5fb0de094286bb31b806138a6661b143c1beb076b6fb73328304768e52c0ae6015f040b0451540a2d850f9d448
 DIST comm-0.1.2.gh.tar.gz 5382 BLAKE2B 698cd4823c86d5e589c6bfa1e99d534fc05c34d9c12ea417c0702f6e5b1397db9e334a78fcc445e59b55e4693e5460cb980357c7e299f01db8df3d0bdb2b6ddc SHA512 9cec9909676edc0c8abf41e6d90f83a6ebfa88266023b3b5fd9c1ffe3fe16ba324b68ab92e788bfa01d5304d5de6e6dc96c7238973f3b39f8c77fa5165df8379
 EBUILD comm-0.1.0.ebuild 568 BLAKE2B ce67afca071ce2bdc0280c5c915b2a0344b5129b2570d37f2b1d405f9bd5b25bd2afea3b8fc0de604348b5f9b6083e507b8b96dfff3d2ad355f7ab7bd4dfeb2a SHA512 796b9dabac4f7fd608ac9f6f533f1824931f3661c2b642ebe2f521ff0e0744ce83aeb636192c4e36af65bfc364cd770f5ce575b90362d40a3956dab372e0fd4a
-EBUILD comm-0.1.1.ebuild 646 BLAKE2B c8ca201053de52a169e31667f3d1af29a2ff4ab1a14de7a2ecefa5de7ec9c1b521578d129ba0d3ff36f228d9a8cb3f13c3c7029113df079fb87173eb423ed529 SHA512 816c810ed9d01f3a59a048fcfd56a49d04868139d47e851f2b0b5c10c8eee5572197068260dfd5ec801f8893432b08328eadfbb017b7f0c05a0867f4318ecac6
+EBUILD comm-0.1.1.ebuild 642 BLAKE2B a8bd3f7e7c73417700cda023a3e6c4a9bd90b86ee0bf1b6f8ec14807a1f24898c8104fa862fdff4377f78561b4ac935774393bb558defebf541c489efe7da8bd SHA512 ddc21a57bd0027e831b542d50058e2215c368b07b859a2f13ae07ae8c07a4c1fac7b52c45b21e781de14e150cc33e231b9050d10955ba606310524a95f53af06
 EBUILD comm-0.1.2.ebuild 647 BLAKE2B b409598db81acf496084736660a220bca0178014a193f733e452087ebe78f1a01ab2ba88ea4c9e8c48355615e49e22bf05f7827303b35a3a746d83de72ce0751 SHA512 45647002ce79429fe2ef658b4c67cc749fe2c1b63c60748c196f379d2d4f433e4bd328df58503a3c743c629ddb8e7816d064c184c4dd58ece2ef5deddd670b81
 MISC metadata.xml 384 BLAKE2B c122aaf6c2b9e6776b19efa2549030f0267c1d553f92862c5ecf21926f30a9c3cd7564434a573cca6fdbb85485eb49213b4d95100e8de2a29ced9c9c1fa81153 SHA512 b06853ad3cb1775ad70e44c48bca74bcf85c11715291974e7e3ee496344256fc57b91920812f19809e7cf14f6a7f7938531934d6a12740baec0dd984d5d48632
diff --git a/dev-python/comm/comm-0.1.1.ebuild b/dev-python/comm/comm-0.1.1.ebuild
index 2f9815e10e8a..22aa3c9112b4 100644
--- a/dev-python/comm/comm-0.1.1.ebuild
+++ b/dev-python/comm/comm-0.1.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>dev-python/traitlets-5.3[${PYTHON_USEDEP}]
diff --git a/dev-python/crashtest/Manifest b/dev-python/crashtest/Manifest
index 585d5bd98c9b..6eb669010cc2 100644
--- a/dev-python/crashtest/Manifest
+++ b/dev-python/crashtest/Manifest
@@ -1,5 +1,5 @@
 DIST crashtest-0.4.0.gh.tar.gz 13564 BLAKE2B 9c29694f5c96a981e19cce16853460cfed7277a2a933c14be9bdefcac9f79e9d835454fd79b3da2fb5f62946f933452202eee05199dfa048b919a3fc3dd93f40 SHA512 98d9623eeef584baed7bd336a3846af9b4f3aa55662b643e915b17b0a7dce4968785052ce3d37f55fc0217dbb6662b6f5d34efeb4d45dbace876551871be4e4a
 DIST crashtest-0.4.1.gh.tar.gz 19114 BLAKE2B aa46efb2dbabfeaab54f9149da42cb033f5dca3ab1c75032ca2542018058cf16775f56450cadf3e1272e738d602f32f21b9a6668a99f2733cd53d23c1754a0bc SHA512 83faf66fb422c8fb13780ac5a8ddd4c47ebb77f248bea0eb94962caff24265b107fd8bbc0d577853969c4aecedd83977e9c74c81dc7e772b7684e09a832a0a2f
 EBUILD crashtest-0.4.0.ebuild 513 BLAKE2B 0586c53702fccb4543c527ad71787197f851520701ee975d3d20c791943bf35a7ad7ccaf487f5c044093a5067566ede9d3aabeffb928af8d63c6d98f2320826d SHA512 d72c6f5dc92274d7b57122cc8f3d2b8b87a9e62206b3ed895ffad0ebc5e47f7342182928e918b1b35564bbf6e7071bfc219c9c25275e0c71509024cff59c8305
-EBUILD crashtest-0.4.1.ebuild 556 BLAKE2B 0bff6ce64c5cc4a6a20501c9ed85ccc6bb7d66e8f2563c75ffdc4feccd6dce47c684918c4d0ca3d307215f061582f7e0ce33bcda0e8b2bfefe20dfb874cb3d33 SHA512 a59bdffe9a1c724b7980ef7e804d2b9bbd2951d0a1b47411b7cbe1d8f932e9352c6cef99c6bddf00b61179f1988a2ca63494a6d895d871c16ff787d0e27908e7
+EBUILD crashtest-0.4.1.ebuild 555 BLAKE2B 385447440503eb725def3965181e0151b745ff905ef07c097682455d9f7a55cbb56c034b9f54cb9e151e65550d11834d833466e8d24f803d87beade37cb35aa3 SHA512 14045daba3a4d90e3bfdec5eebbf698503ce227c7f824d8f4325cb57bdca01c6d5996f24f46e2fdd2cc2e0d2770ce556d6b1eac5bff7026074629a3a4652e800
 MISC metadata.xml 416 BLAKE2B f6b8728929c04221908904b4e43f0fa00c480b193537b519558a1f9e83bd99ab131c3b28d03a624690c4891feee71b6b90bbed6fdc0aa89a4f14dabe282c8343 SHA512 55c2a10cf5611aad9461b1aef9ec28f699a46237a7616e1a834769d20a00f9e4477e2910cc3117a71acd7512ee9812b7658010234387560445c484ce3feabe84
diff --git a/dev-python/crashtest/crashtest-0.4.1.ebuild b/dev-python/crashtest/crashtest-0.4.1.ebuild
index a51cf7380836..a30474f3336b 100644
--- a/dev-python/crashtest/crashtest-0.4.1.ebuild
+++ b/dev-python/crashtest/crashtest-0.4.1.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
index 68acbbc84437..d272da64ca5e 100644
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@@ -1,4 +1,3 @@
 DIST curtsies-0.4.1.tar.gz 53583 BLAKE2B 311c538dfc782566fefeac5bc085fda57200f1d42118393aee1de89486100d9777d6b5c9de8d7dda9a8d3e8564b56cfeb2cde8d1ed638d5f791e24f37eff7a02 SHA512 f49c5874b0e0e4cf92b05ca979bed8608e5e4e4bebfc78f8558e8b32b06876e680fe4d6bb8723bb2050ab3eed0b5379d065c69a3007e6c399b4f60bd410fc947
-EBUILD curtsies-0.4.1-r1.ebuild 671 BLAKE2B de119098aa305031aa1cc0acaa812d593fe9afe94ab7f7dc8e130d82a6244cb5b8ba0397964cb1b89975dee52e07cb21053fec185c61ffead2865384ebe58941 SHA512 b1b38fe46e7f85c91542702bc56ab94c3684e5c9f0f070c6de633954d03654716c3be4372056ea2aa3d82f13312a1bd0150a0dde30f57e412de152761ec7bfab
-EBUILD curtsies-0.4.1.ebuild 596 BLAKE2B deef0197b6cabe00c10416c445c6faded9e1395a8614f68571f2b00b7fcb0c121484b646491427523ba3253c5204d487197f020dc04e061c9a5c742ac4e467fd SHA512 f9d687d75cb582ed56536daf8ec61b8c3a112e827f3a51e583d3a0c7c7eb9e6e64c26482e3aae011c441930cda24b50905bb79d1a4a462bcdf0a6c4ba317f10b
+EBUILD curtsies-0.4.1-r1.ebuild 669 BLAKE2B cd2fe738884b2ee61f9a5cc6cd8691c4e40fd16c3a778c3b69688a723a9138f22c452d40bc2faed2dd310a3172fde8dceb56132a846597d856a890282351fbea SHA512 b9bc7ecdfa1fdb44d680cf4e2cd57e23dfa9f079266763e1e194a56febefeb074169c121e8c7b485d9050cff66310908d3b6f0a5015eef71ab0079410dfbed5b
 MISC metadata.xml 405 BLAKE2B 7c57f4c632fddcb41ee10c615862a68010cc66fce074a430f5cf2e0aa82e008d47b10da7fe6c30f39b86bae57019f2db6f7a65c3c1731643b465aad17047073e SHA512 32a4bcd62ffc656cacd01c3f86a06206f643a23e1d44bb760b1ac0b36e01363a491722084f1f7836f218b0637087d7067f33c86dd4cd636c8b258cb0e1731c38
diff --git a/dev-python/curtsies/curtsies-0.4.1-r1.ebuild b/dev-python/curtsies/curtsies-0.4.1-r1.ebuild
index feac078070d8..5cfb0d18c2b1 100644
--- a/dev-python/curtsies/curtsies-0.4.1-r1.ebuild
+++ b/dev-python/curtsies/curtsies-0.4.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/blessed-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/curtsies/curtsies-0.4.1.ebuild b/dev-python/curtsies/curtsies-0.4.1.ebuild
deleted file mode 100644
index 08c85466166b..000000000000
--- a/dev-python/curtsies/curtsies-0.4.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1
-
-DESCRIPTION="Curses-like terminal wrapper, with colored strings"
-HOMEPAGE="https://github.com/bpython/curtsies"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/blessed-1.5[${PYTHON_USEDEP}]
-	dev-python/cwcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pyte[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cx_Freeze/Manifest b/dev-python/cx_Freeze/Manifest
index db810371ceb8..1273be0fa0ad 100644
--- a/dev-python/cx_Freeze/Manifest
+++ b/dev-python/cx_Freeze/Manifest
@@ -2,5 +2,5 @@ AUX cx_Freeze-6.8.2-buildsystem.patch 534 BLAKE2B 2ac116374717090f7316b434fd36f7
 DIST cx_Freeze-6.12.0.gh.tar.gz 1483040 BLAKE2B 78faa77b7bd12344f601bcc5811dff43d6e9440f7cf96167b438557f93bc8d26c59c375930090389946005984245ff93232ddb6d7340ca28012ccb356d0ca630 SHA512 a3fdd94b33985b3bb0fbee2fc7438e20f3ddb31f0d71322eed1c06a15954be5845a0b1dfbc55537fe16022db95b446d3fa0b3e8418cd250e653f42a180b8c586
 DIST cx_Freeze-6.13.1.gh.tar.gz 1486207 BLAKE2B aa0151fed482714e41a859059f9672950249ad7fe50fa2accaa9d6af7ddc183a8f74d87337f274849a34a404dda0c732300343b58cd872f3bd03bf275c2f4d97 SHA512 48d569fdce5c6cb100232ce3577f0a55a40f3d1dcafa884a4d62af7f27200a21eb892504b47fb7cd106f410354b70d98a8e5245382431bc1f6d990510c77cb36
 EBUILD cx_Freeze-6.12.0.ebuild 1272 BLAKE2B f837dca159d50c53404170711a2eb072c400f44ef3b8c0cbe132e491c4d720d0f99d038d9fd0d32875df01bb06fb315e216c1b4e4a2d2214fcdbfa802d90a66e SHA512 4645c3ab5f3dd547c6d6f6e6ee4fc228c3645352458b4c37da8ca493ae049ac3991f4b38b1983c83ae349e9aa794873981c2f6c3751fb9cc2e372a4afe8a8b2b
-EBUILD cx_Freeze-6.13.1.ebuild 1274 BLAKE2B f89de13356f9b3bd6a48863b5a3927fb07f7e4cf1bdcae5d7a5b42d402b642f36cab779a42c1dcf16f8444a611278722ace3f596781bf95df3f5d0b1070d279b SHA512 6cc113a26520e6880898bd7b37cd9d59be14811cc62470e6f0c672b436b9253cac1669476bd7aeea3da94e8572c6326b899e1ec7ae78e7e9a54e20d52c1919fd
+EBUILD cx_Freeze-6.13.1.ebuild 1273 BLAKE2B 57171baad01762dc828aeb11dd999a550175d7684853d191bb0f40c23ad703972bd23b048a99fb6ea64154c21f8bca3585e3824eb2c8fd6fd74097dbf58ebd61 SHA512 161e7fc0aadcb4a5d73939673a6dae6295936c7754843a95fed0551ca98a17fb61e6a959cbf36ff5a495789541b94aa341fb5b4fb897a204d4ca4bab70d8fed6
 MISC metadata.xml 485 BLAKE2B 622c1dd3d46998fd3d1efa840e0f3b9af105d889b77d7ed779d5caacb384238a54e94c262ff15f4e09db710a44590cee03de6b2a749c24584060acad6925c445 SHA512 b5e45e9a331ffdfd888d5c5daed5658fb156f00a6974466c1b7a865ec7f0a8b839e1d7e4ffdc39903bea68eb9375a608c0094081f62097a7b3f92a7d2e8e370c
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.13.1.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.13.1.ebuild
index ee713d33b641..bb24d400330a 100644
--- a/dev-python/cx_Freeze/cx_Freeze-6.13.1.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-6.13.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="
 	dev-python/importlib_metadata[${PYTHON_USEDEP}]
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index c78f4b810fc9..697fb2871bd3 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -5,15 +5,12 @@ DIST Django-3.2.16.checksum.txt 2561 BLAKE2B c4fc829977881bbf758652b91c0b64c6432
 DIST Django-3.2.16.tar.gz 9847052 BLAKE2B d1b0aeedf2540a570859832b4b4c5c189cd57b05863aa14ac3e00d2e10c7a20f2acc639e29b56409c7be707b28d5f365ab1afa2b70916045fe66adb001b64ea7 SHA512 628263370b4d073d5e88db8607f5b082b03c4e6e6ed6aca059dce18f61725eb4ff69da77f5f98ff7b3e6d9046a701aca5a32687670bf7ea5fdcf92d6d13d7373
 DIST Django-4.0.8.checksum.txt 2552 BLAKE2B af7551bddb966e8e6d338b486c3d2aa5139b28571b77765fe3ca77c0a1a9c310c3286a98fea9d7748c00d1ed7f1afaaa98ef8d78f1a314fda4dd6d2f2b83882f SHA512 3838fc2369cd8010f06dcfed113106d6b32de3ab4da25580434efc7690c2f73323d60ad2da1b4992ffe6bab1ee8b334533ff7a5653f5a41430df858abe2e93a2
 DIST Django-4.0.8.tar.gz 10427857 BLAKE2B cbbba3b3044d60fcd6d240e1a181c00d65c1122dc464c86391e39a1eaa866703f41310401f3de291e427eb075dc141fbbc503f414e3627e16715e87f2c10e5c8 SHA512 6357cfc673eb0b993d88b6bed5e43bfea8e0c71d31b141033d06cfe45e91591739ac5c6c57a82cde0216104acb7b21c8c32c1c1bfacad3f62737c8ad10ee175a
-DIST Django-4.1.2.checksum.txt 2552 BLAKE2B 3786a5824ce981fa66e4173b4fe985ccca4084c3bf2a67cce05d527768c54afec69efb2cd79578fff3dfdcf6dcf26536208dc1ae203348e0648a1d2b27373469 SHA512 01bd342832d626efc03f0704b2e7a8287830cf8ccde53b0d8b9d20c10eb10b6d799611e143196f121b43967e72e08a2db032fec81638c3d58e541ccbd598bb1e
-DIST Django-4.1.2.tar.gz 10509111 BLAKE2B a6786e214967a3a789fd42218e3422f6985efa8e0f4be807d6afb1dd293ef37a201850af1728e72ae0bf429da3aac41dbfa95926f426e9bfe4b3f7f77a6e2934 SHA512 734d782777269b714f6648509d010649e7df2790e438ab2439ba1c4fc1cc9d37626b77ea9d60806c215ab666feb4555b1360ebcdc8cb16e85da8c950b262bbd7
 DIST Django-4.1.3.checksum.txt 2547 BLAKE2B d4a0c921360871495c16c9f44c0b7fef43729d30c2f4fbdb83c73bafd91532734ec597ff67190df4b4c6a66f2c61967a4fd4a8a51d24a3509550db46f1afec49 SHA512 3271a7cf74d457fb740c27f0c162789d40c9e443d92cf5a63d5fc2c1d2080221732aa74a1b896ac06106d5e625f1d2f0b764f72be05062977c9aeb8fa7932497
 DIST Django-4.1.3.tar.gz 10476258 BLAKE2B 9c4865ba86f846a017a7f382320c965fa67f56dbe660a1bf0e974d5cbde21f6c8a88f80675d884d03424e9cd4f1d89af0c9f76be135e875e003f45b1cff5b604 SHA512 3bc77444f22b9dc029d5f45b6481224b99afe41f43d6306db69d01ca5ba24ed05f6c3bd7b3f5320dd96e6d79a47ac1c8f45a86cd8d3822432be4e73b006026ca
 DIST Django-4.1.4.checksum.txt 2553 BLAKE2B 18a8a5de5148f1ade673fc158c756a5b9dc70a2164d7d094ce56dae67a89ea9e8ee808f8319508a7af9229642a80215bd25980257bc78ad982ccf91722379f97 SHA512 d39791499b59b9912eb589a7174a012a33a61d74f5bcbaedca6bdf78cf584296a52f221affc1ddae696a114695c8d533cbbc94d2d855abae40a2b811db40f036
 DIST Django-4.1.4.tar.gz 10517427 BLAKE2B aee4e92dc2e87dc4281025f68274380da46661c504e65db516f0565fc225388e1fb35d7a742a19b8768a31e416bcc82db9c38f4a397c9a88c50448a09a2370e3 SHA512 43649665ac6235b103a3d2c1271dfa0c6177dd2eeca24cefe210809bca85b29b7ecd10de1e7a88677c7ab26b0a1c1912af013bbcbcfadcbc1f85416c10ec7d5f
 EBUILD django-3.2.16.ebuild 3064 BLAKE2B 6f517e6b230b0a2c716f6995339a6da00e248718fd64cf4875b8e636f8979605d8192e0c4051e450b8013fad408083e37fea614c4e9dbd511d61c2ace4a12953 SHA512 6067e931920ba1bbd52da5bf569cc1c4ffc07b18672278987a696e80e1ca43f3743790b0fd10615fe11728bff85ea902a924acbc7ccbfed25561ca109ea9c55d
 EBUILD django-4.0.8.ebuild 3028 BLAKE2B dc67d9756d4c47bafc4a5e68a4047d58b865747211bcb8752a5cc5918d860370ffa16d457bbd521be2e2af57ab66ac063d4c2905418fe4501a16edf851e9ebbb SHA512 337304299836b8cc9aa16a19f164d536a0c80baa4caa193abc120ea39a183b64e0e71e7181a2301773955d6188b97ac4851a73ff9097b701101aa1fce4f727f7
-EBUILD django-4.1.2.ebuild 2874 BLAKE2B c61f2a896389eb8d3184d127ecbf3aa9d4aa4e67e006f7f697515ed46adfce56a9c645da74577ccaa78b327583aa9e0aeaed9c5738026648eb1e89cbb4d56532 SHA512 4ab4f6e95294c33f673eeeab0424d0a07eb24987236fcc448bda0125ba43362014df512861a0f7798a3ff037846029ff01138a37a273703b275d7c0adfdf12f2
-EBUILD django-4.1.3.ebuild 2885 BLAKE2B c93727b001ac923481ed0ea61d98cb97adc8f9e2909145ddd145262d45e3386bd037ff4724852b45e18e938bb50eacf8b852b0c3f2623d100076d28bb6b45050 SHA512 a649ee6678f346bfbb7b71b4442c044136920c3933830bd680de2b4926af9d7992ec8be702a4176d2d2691d48a9f0b7207cfef0dc97071dc334d90db09a97ed0
+EBUILD django-4.1.3.ebuild 2881 BLAKE2B 20fa648eb6219afd3a96631c7dec2ba5c14d79b5133a5929fb8d219722bdf83d08c49cf7a7c2a3fc86e44da866a8fd3fba56bcf1d165cf9074abe0740454d3ea SHA512 344dde2e564a5c76abe4d9a3471ac1c743492ac0f35db2cd755e8fe0bdbb0b90cb7f56680d392d939b9d7af1f7e9c89cbb8a3effb2896b34d19305b07d723e9b
 EBUILD django-4.1.4.ebuild 2885 BLAKE2B c93727b001ac923481ed0ea61d98cb97adc8f9e2909145ddd145262d45e3386bd037ff4724852b45e18e938bb50eacf8b852b0c3f2623d100076d28bb6b45050 SHA512 a649ee6678f346bfbb7b71b4442c044136920c3933830bd680de2b4926af9d7992ec8be702a4176d2d2691d48a9f0b7207cfef0dc97071dc334d90db09a97ed0
 MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7
diff --git a/dev-python/django/django-4.1.2.ebuild b/dev-python/django/django-4.1.2.ebuild
deleted file mode 100644
index 0401ab625bf4..000000000000
--- a/dev-python/django/django-4.1.2.ebuild
+++ /dev/null
@@ -1,103 +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} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 optfeature verify-sig
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="
-	https://www.djangoproject.com/
-	https://github.com/django/django/
-	https://pypi.org/project/Django/
-"
-SRC_URI="
-	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P^}.tar.gz
-	verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt )
-"
-S="${WORKDIR}/${P^}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/asgiref-4[${PYTHON_USEDEP}]
-	>=dev-python/asgiref-3.5.2[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-		sys-devel/gettext
-		!!<dev-python/ipython-7.21.0-r1
-		!!=dev-python/ipython-7.22.0-r0
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"${P^}.checksum.txt" sha256 "${P^}.tar.gz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature_header "Additional Backend support can be enabled via:"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature_header
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-4.1.3.ebuild b/dev-python/django/django-4.1.3.ebuild
index f1272173237b..7c425dbab004 100644
--- a/dev-python/django/django-4.1.3.ebuild
+++ b/dev-python/django/django-4.1.3.ebuild
@@ -27,7 +27,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/exceptiongroup/Manifest b/dev-python/exceptiongroup/Manifest
index 2649ce6f3d3a..1d0a5a6278bb 100644
--- a/dev-python/exceptiongroup/Manifest
+++ b/dev-python/exceptiongroup/Manifest
@@ -1,11 +1,3 @@
-DIST exceptiongroup-1.0.0.gh.tar.gz 19766 BLAKE2B 2c4aa2c7c096b91971872b2236fad211a1bd7cb8ae921f5a0255b5a534eefdb5033bbca4c562ff7045acf30e13371a38d52851749cd5bca4df6adfe359a43012 SHA512 e2e05066c0c7664bb36696737c0c33abd811637c5f0ae7e70a20525283d4db4667fa814b15cb6b21165416ae1a0c47f22250a2ed9be4be99b6237e0c1b45fdd4
-DIST exceptiongroup-1.0.1.gh.tar.gz 20267 BLAKE2B 1438e88a51034acd8b032339097640862da323dc46aaab4f64e53a3e8c3ce8a7bbda16cc72eff9c4f3ac44d8c239b9e51d3561781bbd0ed88fe9e1db78e95c2b SHA512 79a678b6d3d152334ff593d15047e4b4c8714d50bd667ff2c878617512fe78b0c1d9df113db221d9ac7ea1e4522427747d85e26ae2d46b16f15538e1a638cc38
-DIST exceptiongroup-1.0.2.gh.tar.gz 20586 BLAKE2B 09b1b7bee8f1e379c8ef48d9c8202efd7bc530029c5e2a7b91f0204e99429fade8cfa7427e2a88b52747b3308c0a03b193397b3c35c50ea7a9741c15d6f591f6 SHA512 c93a9b85649d662ae63d8396d262eaaff90b068e60f85e747d2538380a262afd54b16bfb0bae49c3909a39950574b9d777120c86e91344259700224480782759
-DIST exceptiongroup-1.0.3.gh.tar.gz 22285 BLAKE2B 4b4d0e46098daf3dd508996d6e566addae53f9ee5da4bccd92cb7c3eefc44c0d815ea94271be1dec8dbf8631b9264c36cd79d063cce3e5c6a326caca778cd53e SHA512 a47242afd9b92c37fd537e253dc0b3c9e6a04e255e9607ff49fc968da24776920dcc36fbda3d2074c44b5cbf7d310f3d7de3d74d396348fc25f22ed3342723c0
 DIST exceptiongroup-1.0.4.gh.tar.gz 22529 BLAKE2B bdf58d36ea59cc7bed17947e4671c92058e7036b20c91df434625d8627db41d646dd0b90ea397c25674753e3ba09654f5978c22220e13007d0af8b1fe659540d SHA512 18f207cb028f1b9ab1073c2859b4aeff357706c3d4c9f05fbe8739f3e19852dd91da5be9c9e18b14b16bd494fc8bf1bd26d058e925084da8c00eac5ad057e2be
-EBUILD exceptiongroup-1.0.0.ebuild 762 BLAKE2B d9157df63bd73187f1abe6b2b9bc81d1920177ddcc039d06cd8f42e5a3904b9fedb695f047aafe2468b0dce6448d6db3ffb1d7856bd149f1136782a3b0333c5f SHA512 fb93d9f4e6fdbc4f7363b53777d005378d5f9cf088acb72b7cd532aaf38420c1892d4a228c9a8575f1e389c52dabdef40a3d22a382bfd738ce9b0fbc6558b20f
-EBUILD exceptiongroup-1.0.1.ebuild 770 BLAKE2B b0bd0b8fb1edb61e570eac329219319ead6fb6273aaab2e828446f56d6534a8753fefdbd059ffab172a746d1f60ceaf7fbc281ea466af11d37f9bda8da38e598 SHA512 ddbf7e5089ad4d90183f949b1bf9122a4f86189dd98a3e53fc0d515bf1f261e7c64c71a6ef94b11a833ea63b228b3725e4f38050ce44be26f1363a0fd8023554
-EBUILD exceptiongroup-1.0.2.ebuild 770 BLAKE2B b0bd0b8fb1edb61e570eac329219319ead6fb6273aaab2e828446f56d6534a8753fefdbd059ffab172a746d1f60ceaf7fbc281ea466af11d37f9bda8da38e598 SHA512 ddbf7e5089ad4d90183f949b1bf9122a4f86189dd98a3e53fc0d515bf1f261e7c64c71a6ef94b11a833ea63b228b3725e4f38050ce44be26f1363a0fd8023554
-EBUILD exceptiongroup-1.0.3.ebuild 770 BLAKE2B b0bd0b8fb1edb61e570eac329219319ead6fb6273aaab2e828446f56d6534a8753fefdbd059ffab172a746d1f60ceaf7fbc281ea466af11d37f9bda8da38e598 SHA512 ddbf7e5089ad4d90183f949b1bf9122a4f86189dd98a3e53fc0d515bf1f261e7c64c71a6ef94b11a833ea63b228b3725e4f38050ce44be26f1363a0fd8023554
-EBUILD exceptiongroup-1.0.4.ebuild 777 BLAKE2B 5a5c936ea8fac970d139dad57389af04ce27b405a7544195cc4635d7402cecbe7e6c4ee02ef6a475a802e1d2030cd62ee9b74b6f0fc6e03427d79eed96093b87 SHA512 d2ac8edd4f40f6c1862c6bd978c0d39d8a1adc62f32fcef4c4ef68cc664b691dde94414fee9f3da08d66966cb0ca9b558223fbaea439fa72371fb5ad3268876f
+EBUILD exceptiongroup-1.0.4.ebuild 769 BLAKE2B f9202cbda4d4940df009c34d221356462a843549ca24dae49a29791d298f89236e432c9ebcb706e2266059865d90c04fac4088261f4e4cc5aaa702aa284771ff SHA512 5fc7874d4087bfb7714652a57658c5388ea9036b24b29db72fda0a3194ea2e9331793b2461d628b91207bfe30521aef477f9a82a8e923205614a1b4d31347921
 MISC metadata.xml 384 BLAKE2B 248abcb5fc08c91396cdbff52e5c3e4f6cce2aa273cfd52b48ee13de9ccdaecd09e9a436ed79f258d15d8d4583fe5995e054010c909a522f47e6866e55b3458f SHA512 c631c69438059cb2a6c80e595e45fac904d32dfb53f8be183142f1195d3a3b9bc14bc240f0808e14f47d31beb1887ad82ee79c5f1847c8e6b59dbfeea7913c8b
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.0.0.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.0.0.ebuild
deleted file mode 100644
index a02d461d86a0..000000000000
--- a/dev-python/exceptiongroup/exceptiongroup-1.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit_scm
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="Backport of PEP 654 (exception groups)"
-HOMEPAGE="
-	https://github.com/agronholm/exceptiongroup/
-	https://pypi.org/project/exceptiongroup/
-"
-SRC_URI="
-	https://github.com/agronholm/exceptiongroup/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT PSF-2.4"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV/_}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.0.1.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.0.1.ebuild
deleted file mode 100644
index b848cb3eea31..000000000000
--- a/dev-python/exceptiongroup/exceptiongroup-1.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit_scm
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="Backport of PEP 654 (exception groups)"
-HOMEPAGE="
-	https://github.com/agronholm/exceptiongroup/
-	https://pypi.org/project/exceptiongroup/
-"
-SRC_URI="
-	https://github.com/agronholm/exceptiongroup/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT PSF-2.4"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV/_}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.0.2.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.0.2.ebuild
deleted file mode 100644
index b848cb3eea31..000000000000
--- a/dev-python/exceptiongroup/exceptiongroup-1.0.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit_scm
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="Backport of PEP 654 (exception groups)"
-HOMEPAGE="
-	https://github.com/agronholm/exceptiongroup/
-	https://pypi.org/project/exceptiongroup/
-"
-SRC_URI="
-	https://github.com/agronholm/exceptiongroup/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT PSF-2.4"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV/_}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.0.3.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.0.3.ebuild
deleted file mode 100644
index b848cb3eea31..000000000000
--- a/dev-python/exceptiongroup/exceptiongroup-1.0.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit_scm
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="Backport of PEP 654 (exception groups)"
-HOMEPAGE="
-	https://github.com/agronholm/exceptiongroup/
-	https://pypi.org/project/exceptiongroup/
-"
-SRC_URI="
-	https://github.com/agronholm/exceptiongroup/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT PSF-2.4"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV/_}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.0.4.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.0.4.ebuild
index 999c9c16bc4c..fc7e44e4c9a5 100644
--- a/dev-python/exceptiongroup/exceptiongroup-1.0.4.ebuild
+++ b/dev-python/exceptiongroup/exceptiongroup-1.0.4.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT PSF-2.4"
 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/filetype/Manifest b/dev-python/filetype/Manifest
index 0004157f03bc..797fd3242382 100644
--- a/dev-python/filetype/Manifest
+++ b/dev-python/filetype/Manifest
@@ -1,5 +1,3 @@
-DIST filetype-1.0.10.tar.gz 804374 BLAKE2B 51735e8810be7f4fe9aaac1ec5305ea85146b5c540a1aaad795a287a4570abb22d131a5fd1444c83e3e747424938242dc8733d2076019a963f6947e4f5981db7 SHA512 a6455b8d11ec56dd3d041b95e1226a5d0ecdee21ef590997e93611d10184ed29137c9f3bd578313a25455010da8f21950420b29ecd9e6ddb5e363051a9fbacc6
 DIST filetype-1.2.0.tar.gz 998020 BLAKE2B 7fdd7e16a8a4d1cdffdd02c5d540d4290de7410a44185875a279c38a4d18c7f67a8bd8ce863efbae2c71c84e93dd1a5621f9fb9e6bde5ac0c611bd5bea939254 SHA512 09ed462d2a82437a58a28aa0315559afbf2e1b30176720254cc2a25fc67ff25e5e99988182e5e748e4e6ccb7ef3fde47cec96ebe20c937ab658bfcfe703ad20c
-EBUILD filetype-1.0.10.ebuild 519 BLAKE2B c87754c71d4d0597e1e4f85d16d833d5782167a1cab998e2430e1506cf27947f9242fe8bde986ee3ffa1bdd7bad2b87887ac580cef2da727062ab6f54a124019 SHA512 91209956eb9f16e2a2e47eeb3b4307ea15a17b77526967dc2866fcbfec2ff24f248aa517034c0aa83079f703fe820feb5f86f5c643dd29b744189264b70e73f7
-EBUILD filetype-1.2.0.ebuild 566 BLAKE2B 061a36df6cde5087b1266ecf77e8de8539eff9683a13246b09fca5227e3390334f303d4655673a273bd83bf7287d8f831e4f77d749a5b50ff52a7a98e13f352c SHA512 bc2d4dd2933d14e59a03f504c2f237725750c387ec2b637410634970a0b363e8a0cb55af4b35a4ee803cf4f3cbcc873b8f2c1369a0fe155f87fca615a8eb6508
+EBUILD filetype-1.2.0.ebuild 560 BLAKE2B 49519fad8c216144174fe109e825d70457f67601f4c1fe39e85f1ba28e485b8e642d2e3eba77e71c5c24ab9bf1cef6a221626e6feb81ae8e88f36f8bc08c91f3 SHA512 6bd8a6b4aa3ac5b3e3966972ae41edb1038801088aca451ca2f7ef6e65efe05d5fd174fb057b598a8329a219731329d96f0fc15862b4a3d39c9b04156fab68ea
 MISC metadata.xml 502 BLAKE2B bd79ec6c9e78732f89f64aed99872f5b31a7e75ba4dae7dc184be3e38937e90ea5366cedbd348cb878fd3e604a255559069d33f060ad788d9ba4e3b3c11c2eb7 SHA512 56fd6f66510f365f4111813f64abe9c9bb63f0354ad6e5919ed7c6597665ab9c1ef42f08d207144d16c3c68ad2ad59db06acdce7f3473f6818162efdb0291c67
diff --git a/dev-python/filetype/filetype-1.0.10.ebuild b/dev-python/filetype/filetype-1.0.10.ebuild
deleted file mode 100644
index d4094edb6538..000000000000
--- a/dev-python/filetype/filetype-1.0.10.ebuild
+++ /dev/null
@@ -1,18 +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="Small, dependency-free, fast Python package to infer binary file types checking"
-HOMEPAGE="https://github.com/h2non/filetype.py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/filetype/filetype-1.2.0.ebuild b/dev-python/filetype/filetype-1.2.0.ebuild
index deff2d2a388b..a0c6375ffd7a 100644
--- a/dev-python/filetype/filetype-1.2.0.ebuild
+++ b/dev-python/filetype/filetype-1.2.0.ebuild
@@ -17,6 +17,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/frozenlist/Manifest b/dev-python/frozenlist/Manifest
index 23834c7d9d55..c92ca5dc8739 100644
--- a/dev-python/frozenlist/Manifest
+++ b/dev-python/frozenlist/Manifest
@@ -1,5 +1,5 @@
 DIST frozenlist-1.3.1.gh.tar.gz 27705 BLAKE2B 7428d936926978acb90a857e0f76b303dddea684c3e815b3fd583e888102e114cc629fcd8e862a4e72775f8525193becfd4b9cd844a36f5b2c7964605008bb84 SHA512 4986f3635ebd2d3ca9623299a66375b03938a7be72f7a1d3437b1bf8c0739513942e6babf00476b61055c9ebee3638ec807dad521c52990104d4d57017efdfb2
 DIST frozenlist-1.3.3.gh.tar.gz 27742 BLAKE2B cf0dcd2ed0e22cb7fa3d57a73177e53cace8e6301c462ab56544678f1f78f113ac3ad9ffb68dafb3ae957a1e52e2069dcec76b5adc27284587d614bbb6a8c139 SHA512 8f416996c18d352912e88dad6b503cb1e5ce566d69e97aad8d7eedc6415316e8c9e63eb2c341c5d2409ebf90fd58153ce642d5d88f277435bc6e5a4f1ce8b949
 EBUILD frozenlist-1.3.1.ebuild 951 BLAKE2B 34f0f1ccfea43960817d487f3db1b0a8e898ab2540da1603e63d502dd08ad773a03164ad625264a4eb927f8d5102aee16861bdb62dfd207432025f1f3bb26967 SHA512 481e569cd7f6694cab015085efa0ae9f87daa608c6f9f6aeae6887ede168461fa31383c30d3690beb9b02bc074bad9334b9cb009c6c0d65eeef446177cadb988
-EBUILD frozenlist-1.3.3.ebuild 959 BLAKE2B a747d4160ba57a6412a86fbe8e00daec54ae331c306e541609eab5b5ad5bdb601b31741409340a0cab25cbf89ae9cf46073351c390dfd36e6dbb0644502b0fcc SHA512 8bf36bdb8951eebb9e69080c8bf443b8c71f19f8ca361163c426c60b5814a4fc2bd186779d5befb905243bb5312da8c451130666d89101519a850dd43ba9bfdf
+EBUILD frozenlist-1.3.3.ebuild 952 BLAKE2B 485c52f155c238790d9ee97db83c50b7763f79fda4390da779475ae069f4d14e8d0af4095598e7dae9765e1d680cbe1d6a9620a588d3f47c0a9e7ae0b69fad0a SHA512 7b68973170fdfa94cf2094c65c15690ccfd52fdff0efcf87b3e6faf157e51ebfa6341c5f84bbaca84c166cbf310590009c460be3b15473cb38f50c031dd64fd6
 MISC metadata.xml 351 BLAKE2B 354fa5d9789eb9f28cfe13a39e80f5ba41f4ef9f8daa3437cbab5f1fb61074baf9d1a196814cb459c0a1d3b3c1fbe806ee77580023d71b8b8c6314ad23405765 SHA512 a5b647914f9a7b2004bb3e1c02a6fe07dcaad58dda503cb6a41d6735dcfe80c4e60e4ca51ba83110557518e23f01a656f05266553a6b5acfe95a0560ecb2829e
diff --git a/dev-python/frozenlist/frozenlist-1.3.3.ebuild b/dev-python/frozenlist/frozenlist-1.3.3.ebuild
index f8146bda6935..9545740734f4 100644
--- a/dev-python/frozenlist/frozenlist-1.3.3.ebuild
+++ b/dev-python/frozenlist/frozenlist-1.3.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/funcparserlib/Manifest b/dev-python/funcparserlib/Manifest
index 6ef2a838a8c0..83575db41192 100644
--- a/dev-python/funcparserlib/Manifest
+++ b/dev-python/funcparserlib/Manifest
@@ -1,5 +1,3 @@
-DIST funcparserlib-1.0.0.gh.tar.gz 66709 BLAKE2B 76229795e88b5b880667e41b2cd3d534649893019824e7206f41d188f44e7a67bc1cdb97b0cbcf731eb840ed128f29434d0748d0923a16ea0a3130b3ee10d206 SHA512 431d6b639c46dc84a0a12c8de976cb2c1369f0172a18d1eadbffba31aff12e9cfeded5ebec3ec63065384547000144d65d60003c55e2b23a1a40818d910aaef3
 DIST funcparserlib-1.0.1.gh.tar.gz 66860 BLAKE2B eb6d70ff37f75bb1452be7b2103a1e756d79231b2d862964e383e4d4317e1ba7de6b744ee8d29f08d81b176d267bf93ceba21e6d47c04bc7f467866d0cd6c8c9 SHA512 d64fe07337822077a0aab6d5049cd81f2ac56ccd9d1db2522c245cadf8cc8421ff1c7931f6a075d821a8634ac8aea51c7ae30fe763e679b70b35955a3f6aa8c7
-EBUILD funcparserlib-1.0.0.ebuild 669 BLAKE2B aff216da08adbb2c1445ced33a3479a90c40d2274828576da8228839a361f7389674232a3e7ff3736e91acc8bbc3a75c2d7fb12e74e1a00efb21fb88a30688d3 SHA512 b07dd9975a716fafe570899f2f6e158c8f532776f87ae479ecabea16e5fc6df4ce2b113a08b0e21e809d89923c5006dd4cab80ae1b3527f6cd4fb0a81a316595
-EBUILD funcparserlib-1.0.1.ebuild 676 BLAKE2B c625b09da5282bee65646e8ef9f1bbdc12e917c439c3b254759967a76da45df254a4d2922ac9b23cc82938c5b6997487e7494417561b6de71b8943ae84fa4354 SHA512 b6d04efdcf2aa1ed205e7249b28f3a6c6c717fd03f9486ddaefafcee7b8be5fd2d0a95637afff5cc521c32a39c0aca17fd4bb2f339fdd2704bc4fccd856ad9f7
+EBUILD funcparserlib-1.0.1.ebuild 674 BLAKE2B 64f862f3039d77bcbde78ce00f00a0125e6e94e415c4a3ffcbe9bd0e72d0c7d58c8fa60c82fdf5a0729a3f5c796cdf21c8133d5f5ddaa8a600710208022e07f5 SHA512 3268ffc38068f7ef0bce5892e08bb000b750f319c9abe05f825b1702e729707bc9c6bd221da2bcb0cad40ea866d0511f96e79fda2768c429cc2aee709dae54dd
 MISC metadata.xml 406 BLAKE2B 0d7fe946eef963283c35b6cf68e714b4c0e09e0c6c132d568b71ed8f646357dc22af1de032258fef3a013f988a2876a392fbd080b271925de52aa7de0736ec40 SHA512 372cfba71b6342d5eab47086dead58bbe506a8da0d3f32b4538d7e5ad03a6c1916410c5f2f3296a9a07d1b5a7a87a1c93fc109a657a1e94b4a5dc2924fb744d3
diff --git a/dev-python/funcparserlib/funcparserlib-1.0.0.ebuild b/dev-python/funcparserlib/funcparserlib-1.0.0.ebuild
deleted file mode 100644
index 2648fecf740c..000000000000
--- a/dev-python/funcparserlib/funcparserlib-1.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Recursive descent parsing library based on functional combinators"
-HOMEPAGE="https://pypi.org/project/funcparserlib/
-	https://github.com/vlasovskikh/funcparserlib"
-SRC_URI="
-	https://github.com/vlasovskikh/funcparserlib/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/funcparserlib/funcparserlib-1.0.1.ebuild b/dev-python/funcparserlib/funcparserlib-1.0.1.ebuild
index 332f7b6a5ad9..9f32169c7b4e 100644
--- a/dev-python/funcparserlib/funcparserlib-1.0.1.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-1.0.1.ebuild
@@ -4,12 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
+
 inherit distutils-r1
 
 DESCRIPTION="Recursive descent parsing library based on functional combinators"
-HOMEPAGE="https://pypi.org/project/funcparserlib/
-	https://github.com/vlasovskikh/funcparserlib"
+HOMEPAGE="
+	https://github.com/vlasovskikh/funcparserlib/
+	https://pypi.org/project/funcparserlib/
+"
 SRC_URI="
 	https://github.com/vlasovskikh/funcparserlib/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz
@@ -17,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/gpep517/Manifest b/dev-python/gpep517/Manifest
index dc28a57de751..1729effdc574 100644
--- a/dev-python/gpep517/Manifest
+++ b/dev-python/gpep517/Manifest
@@ -1,5 +1,3 @@
 DIST gpep517-11.gh.tar.gz 15344 BLAKE2B 14f3f4b284eb4f7de8a78a9215cf2ec7fc84cb4028d83555b595a245d5ff2eb78be5049b30ccca944c35c40db0cc61e1afeaa68b25a0d6f3608363af75059762 SHA512 5ce840841d99c20d62b5b6c8dcb6ec353e40c75537aa99e44fa7dc13bff37444cd66d4cbc97eb1b107b6df85edfda853343d5e8ef1865d0d5ccd293c1496b5c0
-DIST gpep517-9.gh.tar.gz 15227 BLAKE2B b3c2b3e4452a7e27725eea0a6a0b1b362e1ea6bbdae44d99a2992c9edac80a4fdbf2ed75a231004534039c6d6f6db54d9fdbdc7c2c7044bb85cbc3f88484be41 SHA512 94cd1ddb1de7844504906b056ec5eb9d0e80da4f6bde6b561075c754a78a97e6db6025a793592c9498fad54ebab48c5497b29268c40d6992f5ef793a698b9da1
-EBUILD gpep517-11.ebuild 1057 BLAKE2B 22ce3d5726012ff9f928ef925f1134c97f9dbd8f15bf7c172e21bdd056934618f0fb4f44cc90940e8b4af60bc2022a03f2eaf99f1a2c74b07937cbf585480601 SHA512 1d46019f25e7de6dbbe0c3628a03b46a9a8ced619958dc1494cbb91d5cca7c609f9efbb2d8923b9d6250ff5d129825f604284fa95d24b6a1d026079ee0fa0bdb
-EBUILD gpep517-9.ebuild 1049 BLAKE2B cfe9acadcafdacc7967b2454c2548e074d056d4dda35939109b0fca25bf475746f2f3e1f3f70fac4c08533c8281808e2db743e5092dcabce813bfe56d1978be0 SHA512 d2a67868146a6b6f3324b058781dd29b641b0674f738b472ad6afcebf775dc1bccc5eac65b1fb0792885287baac9ba1fa13441a5dfcb3c95e904320d7697ea56
+EBUILD gpep517-11.ebuild 1049 BLAKE2B cfe9acadcafdacc7967b2454c2548e074d056d4dda35939109b0fca25bf475746f2f3e1f3f70fac4c08533c8281808e2db743e5092dcabce813bfe56d1978be0 SHA512 d2a67868146a6b6f3324b058781dd29b641b0674f738b472ad6afcebf775dc1bccc5eac65b1fb0792885287baac9ba1fa13441a5dfcb3c95e904320d7697ea56
 MISC metadata.xml 396 BLAKE2B b67a7e2109f002e48023fc60f19fe2aa7f224010795434815a4c7c0d075dba6cb27e9d443ff86b84ba582a12b30dec5dc8ce9c91419dc2d04c1c61f45e901192 SHA512 402dc1c9cad90e122443599282d03d317a29d31189aa1532041104ae4b6292340b5744488075c9f52877f450561072ef4d8750db65412bcb81b2af5648078b37
diff --git a/dev-python/gpep517/gpep517-11.ebuild b/dev-python/gpep517/gpep517-11.ebuild
index 5cd8e4b1d379..c92961cc5e62 100644
--- a/dev-python/gpep517/gpep517-11.ebuild
+++ b/dev-python/gpep517/gpep517-11.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 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-python/installer-0.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/gpep517/gpep517-9.ebuild b/dev-python/gpep517/gpep517-9.ebuild
deleted file mode 100644
index c92961cc5e62..000000000000
--- a/dev-python/gpep517/gpep517-9.ebuild
+++ /dev/null
@@ -1,41 +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=no
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A backend script to aid installing Python packages in Gentoo"
-HOMEPAGE="
-	https://pypi.org/project/gpep517/
-	https://github.com/projg2/gpep517/
-"
-SRC_URI="
-	https://github.com/projg2/gpep517/archive/v${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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-python/installer-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.2.3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_install() {
-	python_domodule gpep517
-	python_newscript - gpep517 <<-EOF
-		#!${EPREFIX}/usr/bin/python
-		import sys
-		from gpep517.__main__ import main
-		sys.exit(main())
-	EOF
-}
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index c362833cf2c9..3c8085e1ab8c 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1,5 +1,5 @@
 DIST guessit-3.4.3.tar.gz 166183 BLAKE2B 30b08719b12580ade5354a501217cf2b0547965d1ef8016ffce313d257a3ca80a0736e0c904b4e3f7f639d24919839afc3887d81e2912e6aafb37861f979766f SHA512 2719683487baa7bf0f212d4150486f3e673721683361004aa4397204fdc1a3414de86dd4b05b805dc91427d897cd391a7431e6c25e1576b0855f4cc3aabade7a
 DIST guessit-3.5.0.tar.gz 158094 BLAKE2B 2091fa8b0066dda70e1a504fd4aa8b7b4f2ba9b3a88f93b22aff0d084511d9a1c93e052558fe6791021e4c44a95e9adc5e7372c937e0e438b419417ff88d2fc0 SHA512 072b6874449679ed34eeb19fe70502abbec3a4284c2ba40e3e69861ce2b9e92f4ff8146840f7fc25079efed62f048c9e25ee3ddf5833b192480c512b9c93905a
 EBUILD guessit-3.4.3.ebuild 964 BLAKE2B b05f8d274bcb28c3e995f146375b2138a021ba8d2c0a55a77cf90874c82f26e54d545cd1ff352df6ec97a8ee25230a48c55c70adc29d4030fbc315e94505007c SHA512 7d8e2db95043c72e59993138fd900056a9a4c2af4ad0a0e7f94bb5fe38353fa81fd5a851fd3b4c94ef4219c487a0b4c62556924874e4ed280a9641f81c9d8b94
-EBUILD guessit-3.5.0.ebuild 966 BLAKE2B 3fc10b2f0954e91ed6dcb5807fe7d9cec495ffa8436aa4bb17fae86ef0ff84bfe9bc1f4b18751c5be9ecf65b85975b0913ba88ef49b9ba94d5d90081b051f208 SHA512 540e476eb97ca445f0814bd13b644f5f46cbbfb45c07c754534bf4f59835375fb93dd01453ceae262897aaa4ed94508b532a07a2674be363d913780f9c8cd20d
+EBUILD guessit-3.5.0.ebuild 964 BLAKE2B b05f8d274bcb28c3e995f146375b2138a021ba8d2c0a55a77cf90874c82f26e54d545cd1ff352df6ec97a8ee25230a48c55c70adc29d4030fbc315e94505007c SHA512 7d8e2db95043c72e59993138fd900056a9a4c2af4ad0a0e7f94bb5fe38353fa81fd5a851fd3b4c94ef4219c487a0b4c62556924874e4ed280a9641f81c9d8b94
 MISC metadata.xml 393 BLAKE2B 6aaa0bb7a7cac0915e2aa2d65bbc311144f5ac04ace0abbf5591f94d7e4b50c80754d9ac5d92039fb0494ebaf4051fcd9d0de60f208fcad3fb4fec521503a7d5 SHA512 02502c60dec90c160d8bdb29223cf27bf0ea6e23d01b3feb336f747e13c0c830f788e1b42fede862706d7b45927f08f3c8bc124dd8bac7c94264a0659a9df9c9
diff --git a/dev-python/guessit/guessit-3.5.0.ebuild b/dev-python/guessit/guessit-3.5.0.ebuild
index 7b4d9735d284..74897219672d 100644
--- a/dev-python/guessit/guessit-3.5.0.ebuild
+++ b/dev-python/guessit/guessit-3.5.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
diff --git a/dev-python/helpdev/Manifest b/dev-python/helpdev/Manifest
index 4ded7125e18c..3d2c640f8cce 100644
--- a/dev-python/helpdev/Manifest
+++ b/dev-python/helpdev/Manifest
@@ -1,4 +1,4 @@
 DIST helpdev-0.7.1.tar.gz 51575 BLAKE2B b780513c8b7af12296c003360c5805e8414e5c82fe459ab1e4ccaf68c9f029c817a6cb86535d26ad0143ea7dc60fb86126f6d87d4a84e85a9b29a9dbe651e2c8 SHA512 ba0af843617c7cc69aae2bfe88d437e90df14afa90dd0a76c0e7c1062f03963270514ff7653c859a70caec0cde3cc3f18ca87573fdb6a1d5e2fd5874cc24e59e
-EBUILD helpdev-0.7.1-r1.ebuild 715 BLAKE2B 59a9a327cfd1cdbb3bfea97ed8ab24922897d82b36353abec27532c8ff86de47a29b14c833b8a8a2c48fde6eefbbf9d02b8897d0ca8436607ba6d3cc3d2fe07d SHA512 17d4606952210943ef3959501487511fe21c145c901c93bc0f0598144c47c0a9f55ae40957eca75fdcc786b40e655f687393db28120751756ada4a9d4baf7400
+EBUILD helpdev-0.7.1-r1.ebuild 713 BLAKE2B 0f643e612033a782164cea324d1305f32b7e2679babb348f38c048be1745d9bb31d0c01d6be76b0d678a5164edf6a72524aedd04dc41983aa08acbd1c229b008 SHA512 7cf11e2be83cf2b6ab72bd8c65e6ca8a3e578535ce53e8a4bf7a8874d8ce106011f5a53b56c5f72f08d6961d0145443dd8dab057e515d7fc30ab1a3c30577b8a
 EBUILD helpdev-0.7.1.ebuild 680 BLAKE2B 71502b7950106d39dcb2f964aa848c0064abb611c11a1d8935e5dcb32b6c5152cee0715fe34077f5309de21987673e19394b9821756c798ff301c20047d83e2f SHA512 44fcd4452a79530f6242c00603f90314b14348b18ead41b9637f4aa06a57862e3eea23cfaa0f049ab340a434235983f592f95f3e6d8981626adf71d04fe5c3d9
 MISC metadata.xml 409 BLAKE2B 722b41aeba000d0f36882bf6ae5965342f2b292c0c42ca36f1fe38a681d5ca72f8bdd3c86d9b1f99dc4005e91b3cf4b1d047b211ced155918293358ccd75fdfb SHA512 84f64156602ee268040877e421a8fdb45e417ef218609b7134d32e3f74f210e06c7f84e0059b15d8f2c908140c8decf0d1a66ef4d2a6148077a42b4337de8f7e
diff --git a/dev-python/helpdev/helpdev-0.7.1-r1.ebuild b/dev-python/helpdev/helpdev-0.7.1-r1.ebuild
index 06bea21ab338..7b664765ac2f 100644
--- a/dev-python/helpdev/helpdev-0.7.1-r1.ebuild
+++ b/dev-python/helpdev/helpdev-0.7.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/html5-parser/Manifest b/dev-python/html5-parser/Manifest
index 971778df0da7..b9d10fd47d82 100644
--- a/dev-python/html5-parser/Manifest
+++ b/dev-python/html5-parser/Manifest
@@ -1,4 +1,4 @@
 DIST html5-parser-0.4.10.tar.gz 272814 BLAKE2B 5759c872e65080ea059b81e632ed70a94e6677ef01af1e50ab1822128cc75ccbd3361c9d4e5e94fc4cc78996b3dbde97ffe435f083c492df2815c67d929cabc7 SHA512 45accb891261e1b82185de1cb0e06915e0ff487fe2cfc81b79f5653c8e9d7b9848349ab94657f8fb5eb116311b1d2b0d19f504f841ee8af0cf4a23601a5000aa
-EBUILD html5-parser-0.4.10-r1.ebuild 851 BLAKE2B 37ecdda6a0eda2aba8cbc4d1e4c1c7a1981fb0d32285ed653f55667895c68dfa4de14aa2193397d606853abe12ead6157ba2369b7c3d3b440dcd7ee25c134fa7 SHA512 9a67a1aa6170c513c2d3cd2f413402f657f4e3e17d7edd8ec59981a65d776e87650728a8a1c01ab5a3f4db1b4d28bf02b1470bc8a518055722cbe808bf590f5c
+EBUILD html5-parser-0.4.10-r1.ebuild 849 BLAKE2B af5ce6ec19c346ea30f725904d65f85706ac6a97ec73f7f8e7c674cb7efd8c289f2d06a8ef2b075148b9889af19b174c8ff88ee389ec96df79ddadeb0dd19143 SHA512 bb6754ffd5572b806a3316aadad488537bf489f3663018b4ce6fc36a4a17a2bbaebdbdebebf47bb99c1f9b133320f48b180dd97dd0dd62053c11ea7599ac2f8b
 EBUILD html5-parser-0.4.10.ebuild 826 BLAKE2B ad7af266f23d032b3e6a3a54165dde7609e46297fd9d65998b13b4cb6f926f900e7021cd7f7f042d360e2f921de352ee74910cce59c1599af02f5f87e2ea52a0 SHA512 28f63774fb9812f2c0458c550a5bccf6bec22e60d581389b1eb392386f3c99f96ee9f5072cb9f50f953cbfa0ebf706e733e46c92f6e797bc28b1e2746ec7edde
 MISC metadata.xml 458 BLAKE2B 368218d3f5b16284b8d0bc3447efae89d833b7ac206f9b0719f88078f8e472a7b362a0843211189da3f273e0e689a40b5cda5d457ff4dedc51dc74b74960ec3e SHA512 40b3f0e265ac93e827eadc79a57f9b05a7b5adf9fb88d729613a7f2844fabc38e47d39843e039e27a412fd2d1aa1cc38345027a3c31c952873c5e38e899112b0
diff --git a/dev-python/html5-parser/html5-parser-0.4.10-r1.ebuild b/dev-python/html5-parser/html5-parser-0.4.10-r1.ebuild
index 211165d5baa8..658bd8d8a196 100644
--- a/dev-python/html5-parser/html5-parser-0.4.10-r1.ebuild
+++ b/dev-python/html5-parser/html5-parser-0.4.10-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 BDEPEND="
 	virtual/pkgconfig
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index b0ef0236e669..0c418f6b04e7 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -1,11 +1,3 @@
-DIST httpcore-0.15.0-h11-0.14.patch 7087 BLAKE2B 08a7b1a155392637cea9b6d59d01fc60b7a73416db9d87eb2477843cf6c46d1f4e342ce1b4b3ed362f0bf9d4dea7dca40dc7496c0b04a698c8924df7cbdb7f5f SHA512 9235d06a53b1839d7df945499f666477627dca5cbccde98b52d571d1d50380eb74b8d1b6538ea1cf5150062476780e5bf96290910c7c5513199d696f765a6868
-DIST httpcore-0.15.0.gh.tar.gz 76220 BLAKE2B e9a346d4f77cde82be5a3eb468123ae453753e57b54382f0b2c60b16afd3433cba173d9a796df20d76edbd8b5bcf2d61c32302bdd30c8d587036b3ac6f0425fd SHA512 3c25630d582448e3c7d46176c8862e4d92c6c4aac954bfe46b06e26297b32f996db2e002a87c7187accb5bf4ef86e82d7f9051404bee651ce5254119571d0c95
-DIST httpcore-0.16.0.gh.tar.gz 77020 BLAKE2B 0a6000c6e74204a8b90e32739344cca1e76dae73e53c6bee1d2bec16eb7aef11df761cf2cbee879f34a4995b5c8d0fc4a12bec23b07a58c1f06a06e2e1c4166d SHA512 28b6ba9f167f87ba8dadd3187248407c61c9770e27a1a281b6a0eb25e0a8966b3aa80587f00c8d92cdda44ffbe6f4af19adcecaa775ef59fa23492fa35be5323
-DIST httpcore-0.16.1.gh.tar.gz 78091 BLAKE2B 21e5ad922c7190299336a4b0a7efc3689027b9f7208f7276526080460aca3a52c32b2c0db80cbae8d9a40e90aca27c03eed6f5e67a8b9d3d28b97e8bb655d7ab SHA512 a160a02b6c33cdedc1cea6b72cca7e8742ac97333b6d1a3931711f10e397d5e0ba03b2c191e0a7700a1ecd667cbcac4246ef29450da8472ebcc7f19602d8b39d
 DIST httpcore-0.16.2.gh.tar.gz 78465 BLAKE2B f028bc524dcf865b5213d4ff21dcfff525ac34d4dfa1301ebc56392f3082b3b76b6ec1da5e50a01c416cd09d53ad5edd5f2a6d6d4f9dd78e8a579812c0cebc36 SHA512 d11fe4f6a59e2dc1bce6724941db5978f0863f73e39786121f775d9c1702a32741de2cb4a0588fc907294d1b244713222cc57ef19a0d66e4075075c621f17d9b
-EBUILD httpcore-0.15.0-r1.ebuild 1331 BLAKE2B 5cef5d5c3767dee8b2184ca8ffc85793a6a25e244c9a4a899c5ee8b32f3252577ff8ae7e7da3570c75af1a3af1296e8350bf4c2cc010495f0a2ccf3f36a17174 SHA512 466904d140fa94c3f6d790f98bc5206221270acbbfd575ef056be359dfc461c616c495c7658d86517515c653b3cd6a11677770d4492c2f7f8bf8bda5ebd80adb
-EBUILD httpcore-0.15.0.ebuild 1251 BLAKE2B c00e6bc3e7650f8c485de280b612590cc141e91f732229d9657560780340bede351a7efde15121f179c206ef560e24e76b706ef1406fc7b2236c42621c8c63d0 SHA512 a4a7468d09059fa610d1617c779defc01a70aaf37f81295917c68904763fb2ec0cfb13d3efcc2dcead3c3366b047b748ade6a167bb23bb98a5939415cbea08d8
-EBUILD httpcore-0.16.0.ebuild 1168 BLAKE2B eb4f2e8bcb1c33d13d6cf8439572ce05f4d8094e6cbfbfa86283ef57be277aab8ea56dd01c6c3d0bb42b0fd6eb7d66a15a96e00bc4653e1aa338435028e70c14 SHA512 c188361f71fe5549105bd8db20e36d349b46f771c82080ad65b467a1af0b33ab85a5aadc41810307ba785ad5a9d6f6894277c7747c6c3aa6f69d689a3df1a3c6
-EBUILD httpcore-0.16.1.ebuild 1168 BLAKE2B eb4f2e8bcb1c33d13d6cf8439572ce05f4d8094e6cbfbfa86283ef57be277aab8ea56dd01c6c3d0bb42b0fd6eb7d66a15a96e00bc4653e1aa338435028e70c14 SHA512 c188361f71fe5549105bd8db20e36d349b46f771c82080ad65b467a1af0b33ab85a5aadc41810307ba785ad5a9d6f6894277c7747c6c3aa6f69d689a3df1a3c6
-EBUILD httpcore-0.16.2.ebuild 1168 BLAKE2B eb4f2e8bcb1c33d13d6cf8439572ce05f4d8094e6cbfbfa86283ef57be277aab8ea56dd01c6c3d0bb42b0fd6eb7d66a15a96e00bc4653e1aa338435028e70c14 SHA512 c188361f71fe5549105bd8db20e36d349b46f771c82080ad65b467a1af0b33ab85a5aadc41810307ba785ad5a9d6f6894277c7747c6c3aa6f69d689a3df1a3c6
+EBUILD httpcore-0.16.2.ebuild 1160 BLAKE2B ec17bbe6948f02b6b3bebbc1675bf36b6d7a990a5e5f8c5ec8664f6818be3f4e94e15567b8eb17cedb2f7a2817cda38cb1eece5435b287706495f94b5bf9511c SHA512 a4b5d9e3b9a90c55b7e7fedbd9da2b52153e57a331bb5913ed72e51b50b2e52c4384b8bfda3464dc0ffd8395bcced35c92d0a4b81f94d1f81b3d4c9512eaf91d
 MISC metadata.xml 454 BLAKE2B f8a48d9ab81e5f74623dd0c8490e5de5cc711fda7f4614932e7ac6caa80bd23436037ddf9327d6bddc3d39c8b601b4ee74a85c0a10bacb20514cbf8278e34d1f SHA512 af962141bd55f51b27e0d4b61bcf7d5426e816df4f8c65be257d8fddd597664afe04e78ebe7e11caaebf06ae4fe17b88f568dc440403865ba6b8e3b47d796aa6
diff --git a/dev-python/httpcore/httpcore-0.15.0-r1.ebuild b/dev-python/httpcore/httpcore-0.15.0-r1.ebuild
deleted file mode 100644
index 35bc983a2b8e..000000000000
--- a/dev-python/httpcore/httpcore-0.15.0-r1.ebuild
+++ /dev/null
@@ -1,54 +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 optfeature
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="
-	https://www.encode.io/httpcore/
-	https://github.com/encode/httpcore/
-	https://pypi.org/project/httpcore/
-"
-SRC_URI="
-	https://github.com/encode/httpcore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	https://github.com/encode/httpcore/commit/4cf288e0007cb73561b9020af9228f076ba2a94e.patch
-		-> ${P}-h11-0.14.patch
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	=dev-python/anyio-3*[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	<dev-python/h11-0.15[${PYTHON_USEDEP}]
-	<dev-python/h2-5[${PYTHON_USEDEP}]
-	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/socksio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${DISTDIR}"/${P}-h11-0.14.patch
-)
-
-pkg_postinst() {
-	optfeature "SOCKS support" dev-python/socksio
-}
diff --git a/dev-python/httpcore/httpcore-0.15.0.ebuild b/dev-python/httpcore/httpcore-0.15.0.ebuild
deleted file mode 100644
index 59a6824e51c5..000000000000
--- a/dev-python/httpcore/httpcore-0.15.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=( pypy3 python3_{8..11} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="
-	https://www.encode.io/httpcore/
-	https://github.com/encode/httpcore/
-	https://pypi.org/project/httpcore/
-"
-SRC_URI="
-	https://github.com/encode/httpcore/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/anyio-3*[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	<dev-python/h11-0.14[${PYTHON_USEDEP}]
-	<dev-python/h2-5[${PYTHON_USEDEP}]
-	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/socksio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/h11/s:,<0.13::' setup.py || die
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	optfeature "SOCKS support" dev-python/socksio
-}
diff --git a/dev-python/httpcore/httpcore-0.16.0.ebuild b/dev-python/httpcore/httpcore-0.16.0.ebuild
deleted file mode 100644
index 621c94bfed43..000000000000
--- a/dev-python/httpcore/httpcore-0.16.0.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 optfeature
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="
-	https://www.encode.io/httpcore/
-	https://github.com/encode/httpcore/
-	https://pypi.org/project/httpcore/
-"
-SRC_URI="
-	https://github.com/encode/httpcore/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/anyio-5[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	<dev-python/h11-0.15[${PYTHON_USEDEP}]
-	<dev-python/h2-5[${PYTHON_USEDEP}]
-	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/socksio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "SOCKS support" dev-python/socksio
-}
diff --git a/dev-python/httpcore/httpcore-0.16.1.ebuild b/dev-python/httpcore/httpcore-0.16.1.ebuild
deleted file mode 100644
index 621c94bfed43..000000000000
--- a/dev-python/httpcore/httpcore-0.16.1.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 optfeature
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="
-	https://www.encode.io/httpcore/
-	https://github.com/encode/httpcore/
-	https://pypi.org/project/httpcore/
-"
-SRC_URI="
-	https://github.com/encode/httpcore/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/anyio-5[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	<dev-python/h11-0.15[${PYTHON_USEDEP}]
-	<dev-python/h2-5[${PYTHON_USEDEP}]
-	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/socksio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "SOCKS support" dev-python/socksio
-}
diff --git a/dev-python/httpcore/httpcore-0.16.2.ebuild b/dev-python/httpcore/httpcore-0.16.2.ebuild
index 621c94bfed43..328bfceed9c8 100644
--- a/dev-python/httpcore/httpcore-0.16.2.ebuild
+++ b/dev-python/httpcore/httpcore-0.16.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 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/anyio-5[${PYTHON_USEDEP}]
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index 29621bfc8948..8bfb638cb9d6 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,6 +1,3 @@
-AUX httpx-0.23.0-cgi.patch 2002 BLAKE2B 3f7c7e2a85d812d1a6cbd96a21b5d9716581b59528f651facd1c1b4f4b692aef24c1e8ef8d90315dd34dfbb84914c2cf23dce95499f401ad333632d15a6bfc0b SHA512 26c02d8c7bd6c50c72533e114377950d3f58a1ebe23193d8d6424c03c5f0efafb2f81dc155b5c16572dacd71bb2ad2aaea19816982a61ee19f2b531192796324
-DIST httpx-0.23.0.gh.tar.gz 2160686 BLAKE2B 036c66b2c3f743cd069716297f331f0d75043a98180b9db3e156c5692ae8bf9c68d1db87169953a7f44aaf7ee8554d0166f70b508f77b7ff4b0ebc0500bc02ad SHA512 3cfdf2b3b2f15967a1eec0be05ed947c5e18a46576b68a9cbfd5147dfd4736cb7c389f5431732b93f3a11f3ec6c6f25f7cbb3d96d845f00b58e2b8dae047c1d5
 DIST httpx-0.23.1.gh.tar.gz 2161798 BLAKE2B ee01771377bbfebbc4a9346280c8d59508c78295e61b6f9d60a07099e44dfb0fc208d37b68f511bbbacb48438cf6daa73ef82d7a7ae75470409c8346ddad0ad5 SHA512 3fe280b6d3cb1a12bdd502e7bd432588375f9cebfcd9e071acb6e851866a56d84a715428599a297f5df43d73997b2a0c02ba1a12b3e32d292b2051161a350751
-EBUILD httpx-0.23.0-r1.ebuild 2240 BLAKE2B 008a5e77c120facb896e0d0249d07cd98ece5e03b27df435d6f85f510e699d592d19386a6aaf848b5fb7f9b3108fd8a59dea4e8cb914ed9604f7d93254502f69 SHA512 2d7190ff15fb361f7200f09bcabe8fa223b0cd40bfb27a3b19ff43eee2c0fc22a2b7f9ed36819c0f404d5d10fb75c3ba534188ba4d721b0240d78665d1a66766
-EBUILD httpx-0.23.1-r1.ebuild 2178 BLAKE2B 08ffbb1627836d78872b5717c88f063a56ba2155c0107967a91bf145d27e25ed81e84c8b7cc379521e873ce82b1cc9b3ac5fddfbdce23c7a7cc4f27f1cb6a72e SHA512 8bd2e7dda0011ba5108c1b30bad511ba66d5784e062ccdae5d1e3841d83f7d5423b3a22522e062e90f8755a2e11917cc1b7494baa66fcaa4c65d6dd62e64f7eb
+EBUILD httpx-0.23.1-r1.ebuild 2170 BLAKE2B 351d8ae5566b7b7341540df0f28dbfb7689531343a0291eab21086cb2400380414f6c24dda191c0209a6d7d21fe8f6facea443a2d5c88e7791648073a7641752 SHA512 c228cd845319691d1c7c0678e18c5d6d81956b08e10e63bc27351938ca0fefda440f5446a7e60253429dc6999dbd95c86f1dcc334bd01c3b53d8f0edb748e133
 MISC metadata.xml 518 BLAKE2B 063b5b95529cd5a31aac83998c0acbdfef208c34e931c96ae8ee767a326301a597a8297514b5c97bef2b3b706b8938d38c0e5f5d752307a9dd06984792c799a2 SHA512 3a29dffa0f951255a67468b28917590d4108ca12e14af03bfddef80f6d48e266fcccdd991e778ab9e267c0bc76ff0017e07905c1f2f45dc440a9af89f6cae6aa
diff --git a/dev-python/httpx/files/httpx-0.23.0-cgi.patch b/dev-python/httpx/files/httpx-0.23.0-cgi.patch
deleted file mode 100644
index ba9a7aebda2d..000000000000
--- a/dev-python/httpx/files/httpx-0.23.0-cgi.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From f13ab4d288d0b790f6f1c515a6c0ea45e9615748 Mon Sep 17 00:00:00 2001
-From: Florimond Manca <florimond.manca@protonmail.com>
-Date: Thu, 25 Aug 2022 12:23:04 +0200
-Subject: [PATCH] Replace cgi which will be deprecated in Python 3.11 (#2309)
-
-* Replace cgi which will be deprecated in Python 3.11
-
-* Update httpx/_utils.py
----
- httpx/_models.py | 8 ++------
- httpx/_utils.py  | 9 +++++++++
- 2 files changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/httpx/_models.py b/httpx/_models.py
-index fd1d7fe9a..7a3b5885d 100644
---- a/httpx/_models.py
-+++ b/httpx/_models.py
-@@ -1,4 +1,3 @@
--import cgi
- import datetime
- import email.message
- import json as jsonlib
-@@ -47,6 +46,7 @@
-     normalize_header_key,
-     normalize_header_value,
-     obfuscate_sensitive_headers,
-+    parse_content_type_charset,
-     parse_header_links,
- )
- 
-@@ -608,11 +608,7 @@ def charset_encoding(self) -> typing.Optional[str]:
-         if content_type is None:
-             return None
- 
--        _, params = cgi.parse_header(content_type)
--        if "charset" not in params:
--            return None
--
--        return params["charset"].strip("'\"")
-+        return parse_content_type_charset(content_type)
- 
-     def _get_content_decoder(self) -> ContentDecoder:
-         """
-diff --git a/httpx/_utils.py b/httpx/_utils.py
-index e01c050df..ecce4f417 100644
---- a/httpx/_utils.py
-+++ b/httpx/_utils.py
-@@ -1,4 +1,5 @@
- import codecs
-+import email.message
- import logging
- import mimetypes
- import netrc
-@@ -209,6 +210,14 @@ def parse_header_links(value: str) -> typing.List[typing.Dict[str, str]]:
-     return links
- 
- 
-+def parse_content_type_charset(content_type: str) -> typing.Optional[str]:
-+    # We used to use `cgi.parse_header()` here, but `cgi` became a dead battery.
-+    # See: https://peps.python.org/pep-0594/#cgi
-+    msg = email.message.Message()
-+    msg["content-type"] = content_type
-+    return msg.get_content_charset(failobj=None)
-+
-+
- SENSITIVE_HEADERS = {"authorization", "proxy-authorization"}
- 
- 
diff --git a/dev-python/httpx/httpx-0.23.0-r1.ebuild b/dev-python/httpx/httpx-0.23.0-r1.ebuild
deleted file mode 100644
index 674754d2796c..000000000000
--- a/dev-python/httpx/httpx-0.23.0-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Docs builder mkdocs not keyworded on all these arches yet
-# DOCS_BUILDER="mkdocs"
-# DOCS_DEPEND="dev-python/mkdocs-material"
-# DOCS_AUTODOC=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1 optfeature # docs
-
-DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
-HOMEPAGE="
-	https://www.python-httpx.org/
-	https://github.com/encode/httpx/
-	https://pypi.org/project/httpx/
-"
-SRC_URI="
-	https://github.com/encode/httpx/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"
-IUSE="cli"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/sniffio[${PYTHON_USEDEP}]
-	=dev-python/httpcore-0.15*[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
-	cli? (
-		=dev-python/click-8*[${PYTHON_USEDEP}]
-		=dev-python/pygments-2*[${PYTHON_USEDEP}]
-		<dev-python/rich-13[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/brotlicffi[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/h2[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/socksio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		dev-python/uvicorn[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/${P}-cgi.patch
-	)
-
-	# unpin deps
-	sed -i -e 's:==[0-9.*]\+::' -e 's:,<[0-9.]\+::' setup.py || die
-	if ! use cli; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/client/test_proxies.py::test_async_proxy_close
-		tests/client/test_proxies.py::test_sync_proxy_close
-	)
-	local EPYTEST_IGNORE=()
-
-	use cli || EPYTEST_IGNORE+=(
-		tests/test_main.py
-	)
-
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "HTTP/2 support" dev-python/h2
-	optfeature "SOCKS proxy support" dev-python/socksio
-	optfeature "Decoding for brotli compressed responses" dev-python/brotlicffi
-}
diff --git a/dev-python/httpx/httpx-0.23.1-r1.ebuild b/dev-python/httpx/httpx-0.23.1-r1.ebuild
index 94aea019b8e3..b285ead69c05 100644
--- a/dev-python/httpx/httpx-0.23.1-r1.ebuild
+++ b/dev-python/httpx/httpx-0.23.1-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 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"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/ioflo/Manifest b/dev-python/ioflo/Manifest
index 2dde7a5673af..cd4ebca7a9d0 100644
--- a/dev-python/ioflo/Manifest
+++ b/dev-python/ioflo/Manifest
@@ -3,7 +3,5 @@ AUX ioflo-2.0.2-py310.patch 2520 BLAKE2B fbb1b8b5d1d2d135abb21f7f2ff094d4c85bf4d
 AUX ioflo-2.0.2-python39.patch 3813 BLAKE2B a21f5829b5a2fd4200350949d66d4fd77f5ba2b21d5fdb95c7754745fc2cf41f18640d4c79f5e1037fc0d4ca016c7dac062567aa8662b0e41e702e4dd0a94931 SHA512 b588703d653848401fb8e13be949f6de4ff41143eae669ccdcae8edaaac1883be0a684112dacfdf11fa3f2842dbde0dce2b47a7680cb87761d30ffa4018569e8
 AUX ioflo-2.0.2-tests.patch 1059 BLAKE2B a093cf0db0e00c4f06f0eeda76acee4515951e0dca1a77688e2cd4ccc33a3b10402228d76aa25f787cbfa8771d12f0613fe62e5fa38e09b6d8238870c2b25951 SHA512 5642963e6c29941c2803c6833d229b9fab62f60e7534fb6bfd7a101746eff1704dcfe3bdbbc72bfb466317562d995ede5a70a8ffc83ae9e76ab2d9c01bcab349
 DIST ioflo-2.0.2.gh.tar.gz 837382 BLAKE2B 1fe878c8a9a47a9be5083e392e15256f1a566433b4341e2ee234e84332bb72af0c426d04c77ccace33cfb05664745caaa63e910913c3d63bbb2e5d8360a1ec90 SHA512 7485924ce329889afb1c3e0555b54fdbfb11eafce48fb0ac15bacd229fea512c44fcc118bbc4368ebc7c770d62129ee6b895b982f73a269de7131ea37daac02b
-DIST ioflo-2.0.2.tar.gz 837382 BLAKE2B 1fe878c8a9a47a9be5083e392e15256f1a566433b4341e2ee234e84332bb72af0c426d04c77ccace33cfb05664745caaa63e910913c3d63bbb2e5d8360a1ec90 SHA512 7485924ce329889afb1c3e0555b54fdbfb11eafce48fb0ac15bacd229fea512c44fcc118bbc4368ebc7c770d62129ee6b895b982f73a269de7131ea37daac02b
-EBUILD ioflo-2.0.2-r2.ebuild 971 BLAKE2B 207fbdb926dc712dc361f96d44cd24da63375455203793e8011582ea6998c97b5bd6af7cf119a7128f83da4d27bbafb274026d0dfcd6fb7d005a5c4c5a94b4d6 SHA512 07bacfb51186f0f3f1410b97fc04c503f14b1197179690f076c15f4dc0ab5d9323e0bfea7ad5c806e742e5ae5949d3b0592ebec819acdb986fe4c7f1c21a6cc5
-EBUILD ioflo-2.0.2-r3.ebuild 1008 BLAKE2B b9d82e549c83d5b30f975fc9552578844c78118d94f99b1de489b0de3aa744f67dba971a088c1ff94ae7b65110544172cf33b28801f814b077ac55b9790edc5f SHA512 6f3c632e78fb1e58b895bc1d4e73723f93d9e21eadca918d0cd7f92510b7d7bae1c7610386bfeabc3adf1be20623a6177d0df07320600291dbdd9478033c7969
+EBUILD ioflo-2.0.2-r3.ebuild 1006 BLAKE2B 87d9a38a56ca853ef7a60085b3335e6b123039692b10bed724cae08aa23d62f1c1a522710def59a35624d77b749f7a65c483af46546f385f73cc4502f739b90c SHA512 4f4a28bf075bcc2c91c4ba977a070588d02a4b4082e44c27bdfef42a9ba89e703508f90ced2c572e9fa9b8c136134fb29fddb59a93eb16fb4c68c3fc73b81652
 MISC metadata.xml 494 BLAKE2B dc398c0ee508c0c1cf9ee17712efcbf7f994ed053416da6bdd236fe80402b80ce251272824bebbdcc7ea79cf98b6b5dd812de11fca55eb625bf19e5cf93228e3 SHA512 7364c6b7a37dd8ed762fc7d609e71ff93cd3321f6f94f88d795bd0a3082749571644cbdfd3c9d63a916249122fdfb47ff5377907159782ddf5744c5ea4a13f39
diff --git a/dev-python/ioflo/ioflo-2.0.2-r2.ebuild b/dev-python/ioflo/ioflo-2.0.2-r2.ebuild
deleted file mode 100644
index 8ccb0926edde..000000000000
--- a/dev-python/ioflo/ioflo-2.0.2-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework"
-HOMEPAGE="https://github.com/ioflo/ioflo/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-IUSE="test"
-
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-lang/python-3.7.4' python3_7)
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest-salt-factories[${PYTHON_USEDEP}]
-		app-admin/salt[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/ioflo-1.7.8-network-test.patch"
-	"${FILESDIR}/ioflo-2.0.2-python39.patch"
-	"${FILESDIR}/ioflo-2.0.2-tests.patch"
-	"${FILESDIR}/ioflo-2.0.2-py310.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e 's:"setuptools_git[^"]*",::' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/ioflo/ioflo-2.0.2-r3.ebuild b/dev-python/ioflo/ioflo-2.0.2-r3.ebuild
index 9a26bb1da6ea..37ce506f768e 100644
--- a/dev-python/ioflo/ioflo-2.0.2-r3.ebuild
+++ b/dev-python/ioflo/ioflo-2.0.2-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index fa57dc400aab..28552c40f79d 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -13,7 +13,7 @@ EBUILD ipykernel-6.17.1.ebuild 2107 BLAKE2B 7be212425f9b84d7b5f04f5314411e54f674
 EBUILD ipykernel-6.18.0.ebuild 2137 BLAKE2B 686df5f65d91a5b6faf0bbc5fb66233361df010242bbedeba00da2edc2a2814f6fe3832b46e66b23b1fde1d00c2bd36b2db905c2d7292f9e210c163c1a904b4f SHA512 ec3ab8d9aca1a75e7b578747db127272071d93dda8cb31c5f224c99cbcf157844f6fcec07c5c9ac47b439827f9eb527d3b4c313d4ef5f85b71ebf6ea3919417f
 EBUILD ipykernel-6.18.1.ebuild 2058 BLAKE2B 5cfd9b1c38959c002c48360afef9f9f69c4b606034b5c056df7d62c69b96cd35f4913bc92baee1da48952f274b6778dd6235dca4db1b6d2cfaf5fc860b572df4 SHA512 7935fa4383db9cb7e364850caf30ef90abf4787e771b64cb49e6391c7b63dee99f663b71a79651743518c93c616b70d7cc63b0156c572f23cb88e8ffd86aa9b0
 EBUILD ipykernel-6.18.2.ebuild 2058 BLAKE2B 5cfd9b1c38959c002c48360afef9f9f69c4b606034b5c056df7d62c69b96cd35f4913bc92baee1da48952f274b6778dd6235dca4db1b6d2cfaf5fc860b572df4 SHA512 7935fa4383db9cb7e364850caf30ef90abf4787e771b64cb49e6391c7b63dee99f663b71a79651743518c93c616b70d7cc63b0156c572f23cb88e8ffd86aa9b0
-EBUILD ipykernel-6.18.3.ebuild 2070 BLAKE2B 5f33f57cb024abc1f9b01c38b66824ffa26401b4d8ba8f6a0c658b642a4c0c30ca1c38990d7d480e0b35bece0b023ce2943eb9c3240b2a7040e611370187e8f9 SHA512 bed8adba15165806560d461ba75ded2210cae9e72c260309633a554b5fc05b18115f452ce04f3b6d723e1384f0a2b0d21cf14e1efe8bd8701ea870c33ed601e0
+EBUILD ipykernel-6.18.3.ebuild 2066 BLAKE2B 73571a43dc0b02914ede773a1dfcc3d646995f9fb59fbed0dd3fc0f3b6290092f3991027c8ffdfda8fab5c0ff83b707a1fa1896692d66ef49a26f448f6815919 SHA512 f0e4a4623401c31104ed69145942be60813dd8b10ae8894c45fa94ea9c0b98d628e4c552269fc8fee55e3a9954c843b80608a66e5d236d95f20b21be7af5a03d
 EBUILD ipykernel-6.19.1.ebuild 2078 BLAKE2B 2538c93fab041125eb9a3550c40769396f10214d3677fdeaee81501804d839ea337652eede98e96127196c27ecb43e10cb2bc46896420b3936c1f6a736ce1ae7 SHA512 e0ca85d89bf6c7e143b65900bab208278add9595c493132a5570940744a4dda03b4807685c18e831339d01cb1910bf6007e9d488dc41054ea40b4b72a9d30110
 EBUILD ipykernel-6.19.2.ebuild 2078 BLAKE2B 2538c93fab041125eb9a3550c40769396f10214d3677fdeaee81501804d839ea337652eede98e96127196c27ecb43e10cb2bc46896420b3936c1f6a736ce1ae7 SHA512 e0ca85d89bf6c7e143b65900bab208278add9595c493132a5570940744a4dda03b4807685c18e831339d01cb1910bf6007e9d488dc41054ea40b4b72a9d30110
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.18.3.ebuild b/dev-python/ipykernel/ipykernel-6.18.3.ebuild
index 99bf1e82e136..7faf15f7844e 100644
--- a/dev-python/ipykernel/ipykernel-6.18.3.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.18.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/comm[${PYTHON_USEDEP}]
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 08e3915523d7..500dbfc33dfe 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,8 +1,4 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
-DIST ipython-8.5.0.tar.gz 5319096 BLAKE2B 6ab330ffe99611478bdcf1211a500c08edd4aff802a1121156c302cb8a49b9c5f2fa98012dbaf80996574789bdb98d87924492181e45f00f46f600789c1ae6e4 SHA512 9339507fbe229d83f4c41b79257a7b40890d9d0601692521a61dc777c040a6d22d131014d660ffc9ba79f7128f579082473642f47b86e59a038f79c6553c8186
-DIST ipython-8.6.0.tar.gz 5329155 BLAKE2B 2c2ed361af7f4a3884fe3d20fa92fb65c9eb0f020ca935e6a7edec7d28891b74433db56b55070ae07369f93d69e0f46a23fc470ba1c0b7ebf8d3d0f620464ab5 SHA512 54c9e354754b1086e5b87d4d76fa4fe5aa261b095d18210f6660fa9e0a3177db4c9b66d26da5e5d6880a40534477d8c6ea59615c4069327939bca41d49addb47
 DIST ipython-8.7.0.tar.gz 5329857 BLAKE2B 876ed4e16377f2a4d1c0aa83a7e2e0dfda64100de97ff349911d10b07acf351329b0bff75bcf6085f9fadf773fa6762ed88586e1132cabf6479790a38a0bc4e6 SHA512 4652d06d1a0cf33a2b55f640d6bcc3fd9f1f644c848e869bc3807da8f4166060798ea5629fa80cc98a4a79b8ea1cde6013507eae859354a5db270b7fb3cca6bf
-EBUILD ipython-8.5.0.ebuild 4759 BLAKE2B 807eb538c0e1b40fb6fe7d0aaace2fb7868ed8155678a7abb52373a4997c0fc252ad37fd49fe91ea3cdb5f902e2e1bc702be8fd0bb750b87be1e7f2a39944670 SHA512 172d8d42bba81ee560f88ef210df857b92b50b15e56606763a7d5300cdf7d11ec00264df34dc65c698186e6896d5a9fe769386ee7895c0ed3ea587298e5e8f35
-EBUILD ipython-8.6.0.ebuild 4806 BLAKE2B 7cae2113a06c8815bd433894877f270fe5693178713f8b768a6ff8568635f6e0b25b8ea43d438a1afea11ac01f47937cf4f69f42f9166facb8732261af5dfd73 SHA512 06b728dbebc3b30841b3879ededf453da58d653cda152ec5f93db0918c4a7379c74d90ea04bbb1c5fdac758e0e752164306233a7196864dd3f73021897368df2
-EBUILD ipython-8.7.0.ebuild 4305 BLAKE2B f74cd50a9a2beb8f704236158958a55fee1785c2618a9092e2534c779b9ff171294fcee154dd9dfff3d9378d617831a443727246c704732390afe7716599ba1d SHA512 fa683ccb11e963dc67d26e1c0debffe20042aca2191725988d9e417e90364c3598faa6e7e51a6d4f2372dd0a57c9800fa297808cc27f89e195f3eea48bbfe177
+EBUILD ipython-8.7.0.ebuild 4297 BLAKE2B 85b13010388bc6f780796cd833ee37e64e0eb813c53aca1743ce550c8128075b167463e58a50daf4282aa65462b3dca4781908d718afeeb6f48818e9af4e5ce9 SHA512 1e935c307c7d84a0458a296973078c5dd1d0e10fdb71c2d9428daaeba6c66f370915c1c152a7db5f1edeaafc4d3bf1235a62d1ec5c2a09415e67218aadcac49c
 MISC metadata.xml 2886 BLAKE2B 88c80f5eef5c89c8939e60c1944be4c63a5a318e55a3490b38bf864e7919debf8e3c3a32f1fa0a43766ceec6462fb20fd4d943194fe2c08208f0839783c20916 SHA512 f4ed7c1898930ade11983fb0666dc25dce7907f017145e1ad903651dcd95ead2734893d55b4548c4ae23425388485a86bffc9d885eae17d12ae1ac2c0058aac2
diff --git a/dev-python/ipython/ipython-8.5.0.ebuild b/dev-python/ipython/ipython-8.5.0.ebuild
deleted file mode 100644
index 1e04201f335c..000000000000
--- a/dev-python/ipython/ipython-8.5.0.ebuild
+++ /dev/null
@@ -1,162 +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} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
-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"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/stack_data[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-RDEPEND+="
-	nbconvert? (
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-python_prepare_all() {
-	# Remove out of date insource files
-	#rm IPython/extensions/cythonmagic.py || die
-	#rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	# Rename the test directory to reduce sys.path pollution
-	# https://github.com/ipython/ipython/issues/12892
-	mv IPython/extensions/{,ipython_}tests || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
-	local EPYTEST_DESELECT=(
-		# Internet
-		IPython/core/display.py::IPython.core.display.Image.__init__
-		# TODO: looks to be a regression due to a newer dep
-		IPython/core/tests/test_oinspect.py::test_class_signature
-		IPython/core/tests/test_oinspect.py::test_render_signature_long
-		# TODO
-		IPython/extensions/ipython_tests/test_autoreload.py::TestAutoreload::test_smoketest_aimport
-		IPython/extensions/ipython_tests/test_autoreload.py::TestAutoreload::test_smoketest_autoreload
-	)
-	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
-		# TODO
-		IPython/core/tests/test_completer.py::TestCompleter::test_all_completions_dups
-		IPython/core/tests/test_completer.py::TestCompleter::test_deduplicate_completions
-	)
-	# nonfatal implied by virtx
-	nonfatal epytest || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "code formatting" dev-python/black
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-8.6.0.ebuild b/dev-python/ipython/ipython-8.6.0.ebuild
deleted file mode 100644
index 64ba61c55a1d..000000000000
--- a/dev-python/ipython/ipython-8.6.0.ebuild
+++ /dev/null
@@ -1,166 +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} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="
-	https://ipython.org/
-	https://github.com/ipython/ipython/
-	https://pypi.org/project/ipython/
-"
-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"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/stack_data[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-RDEPEND+="
-	nbconvert? (
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-python_prepare_all() {
-	# Remove out of date insource files
-	#rm IPython/extensions/cythonmagic.py || die
-	#rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	# Rename the test directory to reduce sys.path pollution
-	# https://github.com/ipython/ipython/issues/12892
-	mv IPython/extensions/{,ipython_}tests || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
-	local EPYTEST_DESELECT=(
-		# Internet
-		IPython/core/display.py::IPython.core.display.Image.__init__
-		# TODO: looks to be a regression due to a newer dep
-		IPython/core/tests/test_oinspect.py::test_class_signature
-		IPython/core/tests/test_oinspect.py::test_render_signature_long
-		# TODO
-		IPython/extensions/ipython_tests/test_autoreload.py::TestAutoreload::test_smoketest_aimport
-		IPython/extensions/ipython_tests/test_autoreload.py::TestAutoreload::test_smoketest_autoreload
-	)
-	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
-		# TODO
-		IPython/core/tests/test_completer.py::TestCompleter::test_all_completions_dups
-		IPython/core/tests/test_completer.py::TestCompleter::test_deduplicate_completions
-	)
-	# nonfatal implied by virtx
-	nonfatal epytest || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "code formatting" dev-python/black
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-8.7.0.ebuild b/dev-python/ipython/ipython-8.7.0.ebuild
index f17eb5232157..b6c3d942e325 100644
--- a/dev-python/ipython/ipython-8.7.0.ebuild
+++ b/dev-python/ipython/ipython-8.7.0.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 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index ed8bb6b563db..654ea68619b8 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,9 +1,3 @@
-DIST jsonschema-4.16.0.tar.gz 292399 BLAKE2B b1a78bc7dbc7cd10324638b57ebe4593afbdcbeb8d4b247aa127f41d5f6cce5e7970f5db1576e6a761357d8efe453ef514ae49f58b6624a05c4b7771daff3721 SHA512 c84abc992f410e9d558e2ce06c7172e9e2d298cff469baf8a23b1ea5b4777e6addfa757c5cc62b2e28e257721ee55e04bec0852e5f525adfa87392cbf712828f
-DIST jsonschema-4.17.0.tar.gz 293414 BLAKE2B 51910903a788c5fc0fea695f40ac26c886a88a6b97e653452d11ca9b4cbe18a24fe4c28a13705f77c16c1b2342f66ac86232f9ac7c578c94f23b725580e82b17 SHA512 a0160caea26527e5afbba48fea7f0700e8cd0bb5cbd9661501d34f5dd9857971ca3fd9982bc17f570d0b5a08eb5ecfd0e5182f78a0e0a6343621ed8360643166
-DIST jsonschema-4.17.1.tar.gz 296586 BLAKE2B 2d29abd1d27c216cb53363ea801f1a83aedfae66fc1cf90dd7b9cb4e9ce809e09819585a7e83c060dadc2a200c45036ec22cd35d4005757b4b8797f05daa207b SHA512 5d184ea60cf313c9fa6a3e1c2891432531aa7a25a5aced8e51aac46eb67fe7fd17bc9d141faa3e52a834f9067556225cfd3a592d80867b543f0dea42983e5d04
 DIST jsonschema-4.17.3.tar.gz 297785 BLAKE2B a0383bf5612ae50e94c95dbc1774d796b62c74a7aae3056a40edb7e042ad07fd7885e61d86220120a906a4017afe30d8ee8edbbf0cf01a6dec1f212984ff1c1e SHA512 626fc913c37d2e49e4b47c9e058aab4a96c1dc50c35d8def0b2ea0ca464dc25e3318d4fde4927c11ca38068743cd81779d5189464b821407ac1de1788bad30e2
-EBUILD jsonschema-4.16.0.ebuild 1640 BLAKE2B 9d05c031930382ed2d4783fc7caffb79a4a633241e614c042e0e57e536a4914a1374d6e17670361e2f46869cf46d53a60573fff34558fc7401112d83fde8c4b7 SHA512 7d708318a8924405db94ae833328b5b5119c2e2d6937ae6e81a0388de04e567c64a4e3e01c1e2099deccfb80b59aa8d17ffe198704403f7c4e90676ef34f5dc2
-EBUILD jsonschema-4.17.0.ebuild 1641 BLAKE2B e03c723527f0d97b8cdbe0432687325b67378a7ec9d6241327a21ddf079fcd7e94781e0d2ea3d325cc7a8a590bfcfee553aec61ddc428a5cf2eca3d635186fd7 SHA512 ab08d62e24fee05291ef45223f7aca89556733b99f9a64840499cdf61cb624eeeb3ff7fd749ad561fc2753c6aaef4a10a6981816d468058eb0394c7d133a997c
-EBUILD jsonschema-4.17.1.ebuild 1641 BLAKE2B e03c723527f0d97b8cdbe0432687325b67378a7ec9d6241327a21ddf079fcd7e94781e0d2ea3d325cc7a8a590bfcfee553aec61ddc428a5cf2eca3d635186fd7 SHA512 ab08d62e24fee05291ef45223f7aca89556733b99f9a64840499cdf61cb624eeeb3ff7fd749ad561fc2753c6aaef4a10a6981816d468058eb0394c7d133a997c
-EBUILD jsonschema-4.17.3.ebuild 1641 BLAKE2B e03c723527f0d97b8cdbe0432687325b67378a7ec9d6241327a21ddf079fcd7e94781e0d2ea3d325cc7a8a590bfcfee553aec61ddc428a5cf2eca3d635186fd7 SHA512 ab08d62e24fee05291ef45223f7aca89556733b99f9a64840499cdf61cb624eeeb3ff7fd749ad561fc2753c6aaef4a10a6981816d468058eb0394c7d133a997c
+EBUILD jsonschema-4.17.3.ebuild 1633 BLAKE2B ceeebeb04400ea4cde371c8c96216c331b7ea916b6e7b1f1ba8d1f689db893142adfa364992f21d3572f6aad008457402bc02162c9c84f31f683cad115adcfa4 SHA512 ebdc28de5dc8bb18d1bdfd1cbf636058edbd72c9b6bc8913f8669dab00cd67bad843187750714ba5c6ad9558d9ab9861472fd20d629b4491000a021dadc2a7f1
 MISC metadata.xml 705 BLAKE2B 731159cc340e6cbb15fe5a8d374188c8df685e8f8294d19af54ca3d209beb8c273b6e901b6b7fe75401324b8512ffb7f1870aefa8d4a139d1e3b84147d993af6 SHA512 1069fb33b2cf47d3dfd5e825b23ba1efa7d764d0d23aa009db522d04bc08362f5ca646411ec405cd33152a65ea8de2ea90d3dd6d4d4bf1a947ae7943e9d4c727
diff --git a/dev-python/jsonschema/jsonschema-4.16.0.ebuild b/dev-python/jsonschema/jsonschema-4.16.0.ebuild
deleted file mode 100644
index a450048b34a1..000000000000
--- a/dev-python/jsonschema/jsonschema-4.16.0.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=hatchling
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="
-	https://pypi.org/project/jsonschema/
-	https://github.com/python-jsonschema/jsonschema/
-"
-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"
-
-RDEPEND="
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-1.4.0[${PYTHON_USEDEP}]
-		dev-python/pkgutil_resolve_name[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-"
-
-# formatter deps
-RDEPEND+="
-	dev-python/fqdn[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/isoduration[${PYTHON_USEDEP}]
-	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri_template[${PYTHON_USEDEP}]
-	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires pip, does not make much sense for the users
-	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
-	# wtf?
-	jsonschema/tests/test_deprecations.py::TestDeprecations::test_version
-	jsonschema/tests/test_jsonschema_test_suite.py::test_suite_bug
-)
diff --git a/dev-python/jsonschema/jsonschema-4.17.0.ebuild b/dev-python/jsonschema/jsonschema-4.17.0.ebuild
deleted file mode 100644
index ac11d050d26a..000000000000
--- a/dev-python/jsonschema/jsonschema-4.17.0.ebuild
+++ /dev/null
@@ -1,57 +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=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="
-	https://pypi.org/project/jsonschema/
-	https://github.com/python-jsonschema/jsonschema/
-"
-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"
-
-RDEPEND="
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-1.4.0[${PYTHON_USEDEP}]
-		dev-python/pkgutil_resolve_name[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-"
-
-# formatter deps
-RDEPEND+="
-	dev-python/fqdn[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/isoduration[${PYTHON_USEDEP}]
-	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri_template[${PYTHON_USEDEP}]
-	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires pip, does not make much sense for the users
-	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
-	# fragile warning tests
-	jsonschema/tests/test_deprecations.py
-	# wtf?
-	jsonschema/tests/test_jsonschema_test_suite.py::test_suite_bug
-)
diff --git a/dev-python/jsonschema/jsonschema-4.17.1.ebuild b/dev-python/jsonschema/jsonschema-4.17.1.ebuild
deleted file mode 100644
index ac11d050d26a..000000000000
--- a/dev-python/jsonschema/jsonschema-4.17.1.ebuild
+++ /dev/null
@@ -1,57 +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=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="
-	https://pypi.org/project/jsonschema/
-	https://github.com/python-jsonschema/jsonschema/
-"
-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"
-
-RDEPEND="
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-1.4.0[${PYTHON_USEDEP}]
-		dev-python/pkgutil_resolve_name[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-"
-
-# formatter deps
-RDEPEND+="
-	dev-python/fqdn[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/isoduration[${PYTHON_USEDEP}]
-	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri_template[${PYTHON_USEDEP}]
-	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires pip, does not make much sense for the users
-	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
-	# fragile warning tests
-	jsonschema/tests/test_deprecations.py
-	# wtf?
-	jsonschema/tests/test_jsonschema_test_suite.py::test_suite_bug
-)
diff --git a/dev-python/jsonschema/jsonschema-4.17.3.ebuild b/dev-python/jsonschema/jsonschema-4.17.3.ebuild
index ac11d050d26a..9b7b382b9ffa 100644
--- a/dev-python/jsonschema/jsonschema-4.17.3.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.17.3.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 ~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"
 
 RDEPEND="
 	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 9d55e5c6d275..2356b0069ae7 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,7 +1,3 @@
-DIST keyring-23.10.0.gh.tar.gz 47127 BLAKE2B 1179cd0b835d2c394f9649782c692ff719d55ee15e975266951df356f97d946a0d7270e454bcaf4dca902ab511d90460c935369773ddf8f553835e0a83123479 SHA512 74d0049b300c2740b00d89de1a9688fc5901006d1d499af9a33f6f12d8634b749450d2527420404086ac7ec7606ca9fad4cb002fd217dfa82ccef173aa8e61e9
 DIST keyring-23.11.0.gh.tar.gz 47229 BLAKE2B cb5f4a771bc94db058d5783e6bcfc84a29359d8445f55a38b125fe5e751a7e13ce54533fcdf7ab47b50f5fb37a20858c4113ad7ec683b2123f136a7059763bff SHA512 8f200455229ef944729bab557845b2e4220fdd5146d3610105c907fe14ae4358ce85fab0c63c2a0598968871fc01e8b564c8e4d436930f3d39f11e93ae0b209c
-DIST keyring-23.9.3.gh.tar.gz 46913 BLAKE2B d55425c8e18f65362aab531b707e261b0990ab9c4f890286a63964fd2b29380ad9e2c19eae4c723848e3fcfff0eb6d3dcd4377e7151fa2dc5731987f2b468121 SHA512 8ee5da4f464fae90237f246037e2c675740dfda4945d6afcf2e5a4fdaf076766442590db92f9d32bda2dc820446a95a6e8ee3ccbccdb9c09e6c71bbd0e52f5b1
-EBUILD keyring-23.10.0.ebuild 1261 BLAKE2B 70abd801d8dc9ea52709ac35074da87e29248ffc11a020c89b71c63d90f5542c4708d8d3201ceca6b1e95a72679a2964ee381f465d4bdc9429af934593bf03aa SHA512 c75a0c8924d213728dd6e37d1d9ed6e3eeaed53d5bbc912ad2744679c382e8050be7fb1a9c64e4cb5c82ff15939564442893355905d8d37dda73cdc7831e88a6
-EBUILD keyring-23.11.0.ebuild 1261 BLAKE2B 70abd801d8dc9ea52709ac35074da87e29248ffc11a020c89b71c63d90f5542c4708d8d3201ceca6b1e95a72679a2964ee381f465d4bdc9429af934593bf03aa SHA512 c75a0c8924d213728dd6e37d1d9ed6e3eeaed53d5bbc912ad2744679c382e8050be7fb1a9c64e4cb5c82ff15939564442893355905d8d37dda73cdc7831e88a6
-EBUILD keyring-23.9.3-r1.ebuild 1241 BLAKE2B a0342e09a7a9aee90367b13c3dbe726b4e2536c5719bc49ca4bbb0f9530491ca06bce7d1c0b64fdf9680097ce948cec8da97e6e8dfaf966f447e65cc57e5ec9a SHA512 97f118060a04d03471c4d127784a815680d3a55ba27d4d15c80d1519d9afc190f12d8018e77c43add1f4ac6d593eadffebce5b39fd7ac731d81bc57abbc730f2
+EBUILD keyring-23.11.0.ebuild 1254 BLAKE2B 6375ef3949537a871d41c46cba32e066ed2c07d76428aaed6532e66a901404f7d6ed8af066ae51d785a419069d049e1d3e83d2968c980579fbeb8bb27a0ca8c8 SHA512 f37a641a4a20b182160b922a544cc896d82c87e3f7b14e586389f2d8a3044b8a010ce7a5a4a9c00ca2d59878a85fd4004532dc7cd7883a127a5c179d01cab21d
 MISC metadata.xml 611 BLAKE2B 7f938075d992467e01da200f0c859e9bc6a6128296151b3529b2168b68364605bd7dbadf69f7820d459d5db6950908e0b0acb09a636f1fc45862093df6d08334 SHA512 a0ad1729c53b18fedf227053648b04541f5adcf56bfaa73218e214f8c2409ebe2574a5917442c5218084b38da34691b6566f2c65390ef6487985a123f62f9efb
diff --git a/dev-python/keyring/keyring-23.10.0.ebuild b/dev-python/keyring/keyring-23.10.0.ebuild
deleted file mode 100644
index e3c99b84fc3b..000000000000
--- a/dev-python/keyring/keyring-23.10.0.ebuild
+++ /dev/null
@@ -1,52 +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="Provides access to the system keyring service"
-HOMEPAGE="
-	https://github.com/jaraco/keyring/
-	https://pypi.org/project/keyring/
-"
-SRC_URI="
-	https://github.com/jaraco/keyring/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	>=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.4[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10 3.11)
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-EPYTEST_DESELECT=(
-	# this test fails if importlib-metadata returns more than one
-	# entry, i.e. when keyring is installed already
-	tests/test_packaging.py::test_entry_point
-)
-
-EPYTEST_IGNORE=(
-	# apparently does not unlock the keyring properly
-	tests/backends/test_libsecret.py
-	# hangs
-	tests/backends/test_kwallet.py
-)
diff --git a/dev-python/keyring/keyring-23.11.0.ebuild b/dev-python/keyring/keyring-23.11.0.ebuild
index e3c99b84fc3b..d527c36723ca 100644
--- a/dev-python/keyring/keyring-23.11.0.ebuild
+++ b/dev-python/keyring/keyring-23.11.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/keyring/keyring-23.9.3-r1.ebuild b/dev-python/keyring/keyring-23.9.3-r1.ebuild
deleted file mode 100644
index a2b812627da3..000000000000
--- a/dev-python/keyring/keyring-23.9.3-r1.ebuild
+++ /dev/null
@@ -1,52 +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="Provides access to the system keyring service"
-HOMEPAGE="
-	https://github.com/jaraco/keyring/
-	https://pypi.org/project/keyring/
-"
-SRC_URI="
-	https://github.com/jaraco/keyring/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	>=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-EPYTEST_DESELECT=(
-	# this test fails if importlib-metadata returns more than one
-	# entry, i.e. when keyring is installed already
-	tests/test_packaging.py::test_entry_point
-)
-
-EPYTEST_IGNORE=(
-	# apparently does not unlock the keyring properly
-	tests/backends/test_libsecret.py
-	# hangs
-	tests/backends/test_kwallet.py
-)
diff --git a/dev-python/lark/Manifest b/dev-python/lark/Manifest
index 2f896cc2d6fe..0bbb2acf7ad5 100644
--- a/dev-python/lark/Manifest
+++ b/dev-python/lark/Manifest
@@ -2,6 +2,6 @@ DIST lark-1.1.3.tar.gz 245913 BLAKE2B 4c7b53d123aa7cdffcb16027921fced2f94dc0e5b9
 DIST lark-1.1.4.tar.gz 246520 BLAKE2B 08073f89a3403d5e722b3af4d9226ea4ca890a7ad9978fb69f023f1219bb2d148533a68810188d3af35770cc36d29629a1c57a3fbab4098e9ec3d4e73f68ffe8 SHA512 32498f8c387320dce89ebab66e9eed49dc83b855060a8fb9459e6323d0d783ff7184ac997ff095fead09766c00f28c12ccbcd614effb8344ba49df51f7b5a566
 DIST lark-1.1.5.tar.gz 246737 BLAKE2B 2111bb6c2f6eaa05b803daf11f0f55641c9b3943a97f943fd27b5dd33f8b511e3b0fc4fb335edbb3926ad19da6cb2696b7f87003b7def068cae1d805b3feb8d9 SHA512 8103e050745c83c99b077667aa8b1d4dfad28f5554d2381534b3518d8d3e8adb70f0304fdc7e1c762d3ea26089181d9632dea155b6cd97237078b89330a6711e
 EBUILD lark-1.1.3.ebuild 813 BLAKE2B 70ba209e88cf44119f499d8892507f11396f83797660bd5d8397e5bfd9ef69b461af3a743f9a57a265200823c3f103a3fb69b155743ec8d9d40b0c8f091bd633 SHA512 8bd4cdb8b3b2b5e48f1148f722d03e4b7891aac8e7f393b6d774e01d889788378cac0b63f0ace1d4ad21148ef646ebfdfe9c5e0299c104a0b758d5b52444a5e2
-EBUILD lark-1.1.4.ebuild 1005 BLAKE2B c4d432174b37224592542a9572fedef407b10f3ecda1fe23a50e5de62634e52cee2e966335a37799566f5b62a67b43902ae72777910ab015091fa1aff0828733 SHA512 29ae2054e1cb3434313b8a0730e5f147b7b2948ac24ec84b04b93dbd0730c6f3cf6a489cb893ee549b09c23492c9e49bf916608e46a3161d34e4b594a652fdb9
+EBUILD lark-1.1.4.ebuild 998 BLAKE2B 35e6fcb5bdecfa1dcebd2d0472b1529b861314afe571a419c89e2badf98464793839ffaa42ee380d510a2a7053af441afe9b71b9b45590a7b6910ee8ea02f9e1 SHA512 d9c4221791e70e7876102e6414f3254c42e90cf7d77c62ffdbdcf3c13b1b0184e1e7b57f83b82c3550514ad37e9ad887f6d806ece173e2f3f77dbdf5ebe2a852
 EBUILD lark-1.1.5.ebuild 1005 BLAKE2B c4d432174b37224592542a9572fedef407b10f3ecda1fe23a50e5de62634e52cee2e966335a37799566f5b62a67b43902ae72777910ab015091fa1aff0828733 SHA512 29ae2054e1cb3434313b8a0730e5f147b7b2948ac24ec84b04b93dbd0730c6f3cf6a489cb893ee549b09c23492c9e49bf916608e46a3161d34e4b594a652fdb9
 MISC metadata.xml 364 BLAKE2B 8a1409bfc4f242907355a931f5ca7308c96b424cc06cfbc82f281abbaea32a0aaa5257d04f4fbd6131e9056dc08ec2f5834d80608d68d5e9efd32314d0a5cd47 SHA512 ed2ecc7da195e14e5a8071f3c5d277ead1dbbb811c1b7b1163c53d0b5e01ab299a7547de82782c9211aeb8fb6d97d3cd6bc0c4f258c533e884c4e096e7ff20b1
diff --git a/dev-python/lark/lark-1.1.4.ebuild b/dev-python/lark/lark-1.1.4.ebuild
index 48eebe3a0446..9770091b61a2 100644
--- a/dev-python/lark/lark-1.1.4.ebuild
+++ b/dev-python/lark/lark-1.1.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/lark/${P}.tar.gz"
 
 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"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index 9cbf281eb28c..ab079e716849 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,5 +1,3 @@
-DIST mkdocs-1.4.1.gh.tar.gz 4018962 BLAKE2B 68484fa4866eed96ecf91d02e308f08480f3dd0ad261a4b94256585ec604126a59aef37b4d61962ed155ab4beb9be14d09574c9b403403fede14cc25579f9780 SHA512 880ec0e6fbb5cf48b998dd685eeebdb25ff0ed4fa9eef8869679550efad15597cb98d00964c3fe1a86c23c5afe2aeee91d704779b4efa42010ce1a582e02bd28
 DIST mkdocs-1.4.2.gh.tar.gz 4018656 BLAKE2B 325e940c72f6a8fe7f353a4ba2f65fc6b123c5be04173e5469d3165d25b3d6bb8983b5c541b0d1376770a8205b54860b756eca1719decdd77e7e4c57477998e4 SHA512 cabdb86a5934672645e29055c04f5c877dd5527df909a606d94f930211cec9f4f29f89137dd413238c07af4108d870dd3b880cba447c55690583cd1b13b179b7
-EBUILD mkdocs-1.4.1.ebuild 2409 BLAKE2B d96a7b83d4e23dca6388789f5726cbea001acee6d9fd36980c85bc2fde861625052348c988d31f48846d0f1d0b340ccbff5e7cdf5c513a86ad8c76257a62a7ff SHA512 69a64c122d37f4a4e14f699b2ec5447a1de881fab68ca65f1582debca7472df0c5becd75cfdb5fc2ed15f21e4d74d07841108796694c297b25b9468849761fe0
-EBUILD mkdocs-1.4.2.ebuild 2411 BLAKE2B 46b6453f03b57768646d33ffb7f31867011cc191608bf810702de1da1cfd577a5db9c78222f672bb43d3c6b9e002fb2eae2d065a9b01eb465fcf5d102837fe87 SHA512 df06d6aafc26d240f3174c73e67fb199f2f7eb5e7297c3584e7005d7d9e972a6511ca31b023f14dd982efefa536a5c33dd2f50fa49f82a4a02ee7451a5f7fdff
+EBUILD mkdocs-1.4.2.ebuild 2409 BLAKE2B d96a7b83d4e23dca6388789f5726cbea001acee6d9fd36980c85bc2fde861625052348c988d31f48846d0f1d0b340ccbff5e7cdf5c513a86ad8c76257a62a7ff SHA512 69a64c122d37f4a4e14f699b2ec5447a1de881fab68ca65f1582debca7472df0c5becd75cfdb5fc2ed15f21e4d74d07841108796694c297b25b9468849761fe0
 MISC metadata.xml 405 BLAKE2B de9dd789fea13afc3622c6961674d046806db1025e9d0475c0ff8bfe1c6d91a741b6112ccaafb46cb19b9dac971c50095ac89b13353c7c0e1571961a19a90387 SHA512 7a19785dbacb67aa5679d6e7c9617b52b25f724430fa3471b645e31df04157efc4060dbd4fccbfc37b5709138164d8ec89c2e94cddfd727b3ee4c705ddd38dcf
diff --git a/dev-python/mkdocs/mkdocs-1.4.1.ebuild b/dev-python/mkdocs/mkdocs-1.4.1.ebuild
deleted file mode 100644
index 112dd416b8a4..000000000000
--- a/dev-python/mkdocs/mkdocs-1.4.1.ebuild
+++ /dev/null
@@ -1,83 +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=hatchling
-inherit distutils-r1
-
-DESCRIPTION="Project documentation with Markdown"
-HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-# https://bugs.gentoo.org/873349
-# Building documentation requires packaging: callouts and mkdocs-autorefs
-#
-# IUSE="doc"
-#
-# BDEPEND="
-# 	doc? (
-# 		$(python_gen_any_dep '
-# 			dev-python/mdx_gh_links[${PYTHON_USEDEP}]
-# 			dev-python/mkdocs-redirects[${PYTHON_USEDEP}]
-# 		')
-# 	)
-# "
-RDEPEND="
-	>=dev-python/Babel-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.3.3[${PYTHON_USEDEP}]
-	<dev-python/markdown-3.4[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/watchdog-2.0[${PYTHON_USEDEP}]
-	>=dev-python/ghp-import-1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml_env_tag-0.1[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-4.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.5[${PYTHON_USEDEP}]
-	>=dev-python/mergedeep-1.3.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Tests fails if additional themes are installed
-	mkdocs/tests/utils/utils_tests.py::UtilsTests::test_get_themes
-	mkdocs/tests/utils/utils_tests.py::UtilsTests::test_get_themes_error
-	mkdocs/tests/utils/utils_tests.py::UtilsTests::test_get_themes_warning
-
-	# Does not work in emerge env
-	mkdocs/tests/config/config_options_tests.py::ListOfPathsTest::test_paths_localized_to_config
-)
-
-python_prepare_all() {
-	# livereload has been dropped in this release, this test is a remnant
-	rm mkdocs/tests/livereload_tests.py || die
-
-	# Does not work in emerge env
-	sed -i -e 's/test_paths_localized_to_config/_&/' \
-		mkdocs/tests/config/config_options_tests.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	default
-# 	if use doc; then
-# 		# cannot just do mkdocs build, because that fails if
-# 		# the package isn't already installed
-# 		python -m mkdocs build || die "Failed to make docs"
-# 		# Colliding files found by ecompress:
-# 		rm site/sitemap.xml.gz || die
-# 		HTML_DOCS=( "site/." )
-# 	fi
-}
-
-python_test() {
-	epytest mkdocs/tests/*
-}
diff --git a/dev-python/mkdocs/mkdocs-1.4.2.ebuild b/dev-python/mkdocs/mkdocs-1.4.2.ebuild
index 96747dfe0782..112dd416b8a4 100644
--- a/dev-python/mkdocs/mkdocs-1.4.2.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 # https://bugs.gentoo.org/873349
 # Building documentation requires packaging: callouts and mkdocs-autorefs
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index c032321e92da..b502e6ea060b 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -2,7 +2,7 @@ DIST moto-4.0.10.tar.gz 2501634 BLAKE2B 02fcd7e4f77589a8cae459d74832d72c8835e435
 DIST moto-4.0.11.tar.gz 2540794 BLAKE2B 3b68e3fc6ab75b7ada2548c0807936fc5ad0d296385357ffb8b8c490fd3611f1333a78e99a093d3cd3ee8e65a2115ae66a4d3338bdf23dfe3ce8a0ebde43bad1 SHA512 fa721bc8cf8256a120870256770adf165f9a3f5d75ea5c83d76303d32a6869d417bec73fca4b09c5d08794cf2e8e530fd73ac53939271785e31f024217c97fa1
 DIST moto-4.0.8.tar.gz 2488253 BLAKE2B ae707de8f0917b62904f38f977eded8f3e995271da8a7d6be47f05a24e3cb8bb8121e5e52625deb6c8f836e5f328352a7e6ea0855a4278c32dc9363da0faa8cc SHA512 9d3d3164bb6a77901bb55b8c536bfc8822e5b5292d79fedfe89a4a7fefaeab24b740d9a898e9487152a45c5a3bfd15d8aaca042a485bea389e1a82bb0a90bdd0
 DIST moto-4.0.9.tar.gz 2496530 BLAKE2B 596dc00ce0c931d4405d1ad6fdfcff4acc5c7421b1f1d67f442e090249d3df81f89c570368b5e981ec49f14a35aed32621ff3dbedc7003e3c870f891e4eda20a SHA512 fedf2c97779a93b1ab3492122be5425f3d91219eb207cc21bf2822ffa52c6efe2c3c8ca233acafd02c725c46e77e883f8f941c29638bb3e32ffa774ed8a5ff69
-EBUILD moto-4.0.10.ebuild 4131 BLAKE2B f02a5b9be9428526b3d98a1fd1d56d30a38f349d68f3a802b40fb99d49206393ca4e90d2c8b26e46ab848f888361d75e80fef457e94e74bdd971c3c757e57285 SHA512 ac877bbc209501ab4e32a98b79d9d03e1a64c7ee7485b700b0e3cbdb63b16cd95109eae930a5685d99c27c84af24479b15d882999a57a2bab34798142d786811
+EBUILD moto-4.0.10.ebuild 4130 BLAKE2B 3f83b8088b39f479e7227c0c6ea0dd172c936029c512907f815fbdd5b3822cd25e74547e0a3c3fa4bfb81a4ac2651b9095d15f40869e5df0205b184c80d29cb7 SHA512 9e9fcb719465fe8bbefd7e75e2db5f5315d892cea689c24dd41fff63273cb4cca46fd8bfd084bb763dca5f30e225047b8aaa550ea77562916c2cd4adc0e2e728
 EBUILD moto-4.0.11.ebuild 4131 BLAKE2B f02a5b9be9428526b3d98a1fd1d56d30a38f349d68f3a802b40fb99d49206393ca4e90d2c8b26e46ab848f888361d75e80fef457e94e74bdd971c3c757e57285 SHA512 ac877bbc209501ab4e32a98b79d9d03e1a64c7ee7485b700b0e3cbdb63b16cd95109eae930a5685d99c27c84af24479b15d882999a57a2bab34798142d786811
 EBUILD moto-4.0.8.ebuild 4168 BLAKE2B f7b93227ed08d35d0576af80b74ddce6287abde1a8a53188e6d78a0e39950f8ff43f1597f621da68046d93eae09b53a16511411aba98988ea9062f9cbfe29295 SHA512 954133862dd6ce7ae667104e0650ec2696104a494c0d07772a58456d4c61844d63d6215dd613aa49a74c3b3eaa270e1736b12880799a531ca0ac0f7d9bba4851
 EBUILD moto-4.0.9.ebuild 4170 BLAKE2B 40f9e16c72e4d0e9f85f77a638010028bf8037ac5b35d936860a02b12975088991bfbe46a5ced21416001765594669e688c8d43fe5a1c1c146d2b34b82b8e774 SHA512 0e4a3523bd9c58bf304b847a31b637f53de466850e921513ca70eb2772fa26abf1132db4ff5b88c7fc557c9947dda3e54cb2d5d58a9d96678ec5860809641bc8
diff --git a/dev-python/moto/moto-4.0.10.ebuild b/dev-python/moto/moto-4.0.10.ebuild
index 5968fb5171dc..ce4b3b58ee13 100644
--- a/dev-python/moto/moto-4.0.10.ebuild
+++ b/dev-python/moto/moto-4.0.10.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 0995297f875f..56db9289a104 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,5 +1,3 @@
-DIST networkx-2.8.7.tar.gz 1958634 BLAKE2B ca67cea6cd3c04868bf72a16efd211a3caec7819347a161f69433cea18aa987c0b8e15285a24e3aebdbbe7fb431b3a6748195a0049cb563a2ec6c5f2cdca5b15 SHA512 e525bf8a80ddb18607ac390475d9bf23dbcdaeda4bb277c428ce2aff8c0f62ea5adbf0c7746059b8145d6f38fcb32b581da48d9fa10536265ef3c78cf2751a59
 DIST networkx-2.8.8.tar.gz 1960828 BLAKE2B 074e902c2c31e0641fe651d2168c77e62af04b322485bf002f557a42c7a7c63d1391c32f9de95b9d5faf13f7eb9ece93171bb1fdba8548d59df5075ac72263e2 SHA512 c698ed2dcc4221662af585940cf5d6ce1ad97b6b8f6d84348ff1d6b233eb69a36f5fba362bc4bb3a08ec8716434690b52b1d66dc4122edb0f420eaa10023d9d4
-EBUILD networkx-2.8.7.ebuild 1929 BLAKE2B 2d1ea8a1591b62673f1357f6d3c2611e07fe041b9e30200600383c7e7413941e7876ab461299c175dc88cb02b6022e95bc9307c6a4a87cb850963e7670e05d7e SHA512 76ce67cae18a4d67e1ae45eb39e5d9ceedb66a8975eb6298b7b734f9ff0202f768cf1e1ec132712cb42dafec2ec027d208149c24f087dc368b4fe0361f8ebc6a
-EBUILD networkx-2.8.8.ebuild 1880 BLAKE2B 4df6d893e1bc886b8e6ab0178e4671e73c4c4c1e45e3117ecf2222e7a44a113673e85696f93875e514303bd028f52148b6108e8608511e674b147d8ab9e83476 SHA512 21716244f0064498f57649970a292b4d909c6f020656db3d1b0b999682b32f4ff6cf37c6d51b697ac62ae4b9c831e5d6aba4b5cdf44f60d580ab68fe48de901d
+EBUILD networkx-2.8.8.ebuild 1876 BLAKE2B 1db055549da1932f898956cb5808796bbbbc7ba4129bdc3d246c7cfd26713b078e9a2d25c36678612e8eaf00fa5adde88d40d9b6f4bfff448e2519e12b8877ad SHA512 14bb45898321cb2215a51deec3e0f7b6137afe8bd874821a7e5912ca6d6cfd959ddf518d5c97b970ac2b2c60a4c0ef980e7ad344013ae79d0f2c2bcb446b4969
 MISC metadata.xml 1090 BLAKE2B 9ef8ce06a4f462ac6a535217aa6bb55c9f1994ed3ab57b4cb656434a93a0c1fb401932307c43bd680576b82282b4055b1ee9ef1d49cfd5113927dc4919dc7616 SHA512 e9b291b754118d278b109f5704607f2d9b3807c9e6195b75b77388129952c79dba16e86f0a9c5f65479185c409c5191bb1f8863e282dde052b12d40bc9fb9901
diff --git a/dev-python/networkx/networkx-2.8.7.ebuild b/dev-python/networkx/networkx-2.8.7.ebuild
deleted file mode 100644
index 4cb8514883a7..000000000000
--- a/dev-python/networkx/networkx-2.8.7.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_FULLY_TESTED=( python3_{8..10} )
-# networkx skips tests w/ missing deps and the available ones all pass w/ py3.11
-PYTHON_COMPAT=( "${PYTHON_FULLY_TESTED[@]}" python3_11 )
-inherit distutils-r1 optfeature multiprocessing virtualx
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="
-	https://networkx.org/
-	https://github.com/networkx/networkx/
-	https://pypi.org/project/networkx/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-BDEPEND="
-	test? (
-		>=dev-python/lxml-4.5[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
-			>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
-		' "${PYTHON_FULLY_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	# virtx implies nonfatal
-	has_version "dev-python/scipy[${PYTHON_USEDEP}]" || local EPYTEST_DESELECT=(
-		networkx/drawing/tests/test_pylab.py::test_draw
-	)
-	nonfatal epytest -p no:django -n "$(makeopts_jobs)" || die
-}
-
-src_install() {
-	distutils-r1_src_install
-	# those examples use various assets and pre-compressed files
-	docompress -x /usr/share/doc/${PF}/examples
-}
-
-pkg_postinst() {
-	optfeature "recommended dependencies" "dev-python/matplotlib dev-python/numpy dev-python/pandas dev-python/scipy"
-	optfeature "graph drawing and graph layout algorithms" "dev-python/pygraphviz dev-python/pydot"
-	optfeature "YAML format reading and writing" "dev-python/pyyaml"
-	optfeature "shapefile format reading and writing" "dev-python/gdal"
-	optfeature "GraphML XML format" "dev-python/lxml"
-}
diff --git a/dev-python/networkx/networkx-2.8.8.ebuild b/dev-python/networkx/networkx-2.8.8.ebuild
index 39579b387fdf..3e0be0f13f95 100644
--- a/dev-python/networkx/networkx-2.8.8.ebuild
+++ b/dev-python/networkx/networkx-2.8.8.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 53f141d4f91a..bcc33231dd20 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,9 +1,5 @@
-AUX paramiko-2.11.0-invoke-tests.patch 1175 BLAKE2B 1ac310c2721b2366db7d5b2bdfa77058ebe820fba7f0c0faeb6a5ceb97621a1d2c1207109053f7b9d5a17b8b2084908afd9a3ab2ef0c6e76fd7bb94d5b439eed SHA512 bb3c7781aaa4b201d9c2f963f54aac0c76d7918c782f48981a108de7173d1db77dc42c24806bdde12b378186887922cad02504a7695b83f3cb25e9ff84ab9cd1
-AUX paramiko-2.11.0-pytest-relaxed.patch 3354 BLAKE2B 19326d3dbf4c3870dcdaeff0d9827a09894a44be2941a23f6ca7e3d8c05560b1ffa150d38e44301d9722948135a4b82a76cea16d5cfb8f8e3bcaa41bc842561c SHA512 98d508334f6d0ca3aae94a24bcc95bb9f3cfbf895b0f647896298f85ccb14e0868f948610d5e40a738d17d26fababe26a296d6acd3678c21e9351431ca3d6790
 AUX paramiko-2.12.0-pytest-relaxed.patch 3335 BLAKE2B 3bf61502c164d951e9db3f9cef0d4277a40be1b9ecd1201575c903795bb017b561934b4032312c2642986c892f2cf472565236c4a800f849955504e2d63a71e3 SHA512 a3e2cfdc314c85caef85c0d4877a21b7e7764e7671cd6b912064bd4c473d9d8fc54abb9e4cddc053f6281404c658cd6d2704f25678ffae8df28a569884b2a101
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
-DIST paramiko-2.11.0.tar.gz 350793 BLAKE2B 86358e08407f8a820a9b33a60e771ac3adb8f3e003ccbc4704ba69a52bd427f38a9c49a20e6a07220d07c25dbcc35a472b2091fa9f7bc1447bab0d7a1ce16b35 SHA512 59e439bd54d83938f91d6c9888f2278bafa4ca48582939580bdabc6207dbe6dc856f6006ad26b7ec91b9d39e92ca70dc6270c6b5d4f77a5e1fa0ec8bd084d4b5
 DIST paramiko-2.12.0.gh.tar.gz 351956 BLAKE2B d41668f32f28a5c2c3af1d2b5c85bb4c3d2f5af9028cd5ebcb2b8aa21bc25df2c1ead5ddfe61ff12cfacec4b92913833e267f8a3fef07fa9a794f4b064fdb472 SHA512 1bf325ffd393447cb90009d01dc1104d0d43a6acdd08cc6d28310063a649a333323748800dab119ab5e10833975e68f5f5702044fc247a2e8058122a5327f2c7
-EBUILD paramiko-2.11.0.ebuild 1342 BLAKE2B b5b669fcf6f89a3150844be18f16734abd1696bc3b378b4e783c14e4c2b7c07ff00b9cc4e97a5b4a15c554bb5794788e0c1cea91dd6d30afe985e0a2e7f11ccf SHA512 d78e4c7acba80430a0de9b0646fe40c0e26151c706ce647a96e49f619143f544ea2a3d9fb59f2a4c9ed29a1543c6708afb41932d62d31e34148bb9323831e4d2
-EBUILD paramiko-2.12.0.ebuild 1304 BLAKE2B 6a38feca6813295c977c44ba7238e5232d27f1c8bdb586524efa27b38d6bdb9f3f7fbeb133d4e69d53704c8dd9b97ea2e1f4d0dfd08a85d0d3443bb291e9d821 SHA512 ab6a3faa134f1e5179d6b8655e2e6d318b19e799c2a7a3c6432ce34ce4498af6a7f81144a5bd82682926d69600e363cd1f4eaf3b061ad0119429963359c7f869
+EBUILD paramiko-2.12.0.ebuild 1297 BLAKE2B 2fd178271b1cc865bc028000f98ecb7aef1d92dd98c5c68f725065ae2f1adb0bfda01048090515f12de94982f2ca2df1d2dc73df788cf79c41fb5310d2db4cb8 SHA512 a7d25030ce753be6ae90dd5813ae9b4b094d317bfda472a9c35c005660c4e4884b6a0bf7252a0440d21a7fb5e90ac3d80143c57a4e31d71639bc242d72c0f02e
 MISC metadata.xml 1222 BLAKE2B 46fb6385f6779cbc13fa54090dd5dfa0b5a7b5a753f728b133fa79a1e1c779a5652d6b38c5ea11cfcb505178b2ba70d9000dabba6228e38f30f426ecb1c49a3f SHA512 bf07a537ed375a3bf58d219c18ccfc29c810554041943e62819a46b63ce3fbcdd2197085dbeeb7ad36e0e601700edec6121ce5cc83dce1c7435d663473df2583
diff --git a/dev-python/paramiko/files/paramiko-2.11.0-invoke-tests.patch b/dev-python/paramiko/files/paramiko-2.11.0-invoke-tests.patch
deleted file mode 100644
index 80fe876ef8e3..000000000000
--- a/dev-python/paramiko/files/paramiko-2.11.0-invoke-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 529558cc20e448e45e24dc7b7609cd62300838b8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 16 Apr 2020 09:46:39 +0200
-Subject: [PATCH] Skip tests requiring invoke if it's not installed
-
-Since invoke is an optional dependency and only one group of tests
-require it, skip them gracefully rather than failing if it's not
-present.
----
- tests/test_config.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_config.py b/tests/test_config.py
-index 45fb262d..017d4bbf 100644
---- a/tests/test_config.py
-+++ b/tests/test_config.py
-@@ -6,7 +6,11 @@ from socket import gaierror
- 
- from paramiko.py3compat import string_types
- 
--from invoke import Result
-+try:
-+    from invoke import Result
-+except ImportError:
-+    Result = None
-+
- from mock import patch
- from pytest import raises, mark, fixture
- 
-@@ -742,6 +746,7 @@ def _expect(success_on):
-     return inner
- 
- 
-+@mark.skipif(Result is None, reason="requires invoke package")
- class TestMatchExec(object):
-     @patch("paramiko.config.invoke", new=None)
-     @patch("paramiko.config.invoke_import_error", new=ImportError("meh"))
--- 
-2.35.1
-
diff --git a/dev-python/paramiko/files/paramiko-2.11.0-pytest-relaxed.patch b/dev-python/paramiko/files/paramiko-2.11.0-pytest-relaxed.patch
deleted file mode 100644
index 6e746aff1863..000000000000
--- a/dev-python/paramiko/files/paramiko-2.11.0-pytest-relaxed.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 03741e48c83856e53fc3f1487d660165cb718c11 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 17 May 2022 07:26:36 +0200
-Subject: [PATCH] Replace pytest-relaxed with plain pytest.raises
-
-There is really no technical reason to bring pytest-relaxed to call
-@raises as a decorator while plain pytest works just fine.  Plus,
-pytest.raises() is used in test_sftp already.
-
-pytest-relaxed causes humongous breakage to other packages
-on the system.  It has been banned from Gentoo for this reason.
----
- dev-requirements.txt |  1 -
- pytest.ini           |  3 ---
- tests/test_client.py | 20 ++++++++++----------
- 3 files changed, 10 insertions(+), 14 deletions(-)
-
-diff --git a/dev-requirements.txt b/dev-requirements.txt
-index 3ed9eb40..e90f3373 100644
---- a/dev-requirements.txt
-+++ b/dev-requirements.txt
-@@ -2,7 +2,6 @@
- invoke==1.6.0
- invocations==2.6.0
- pytest==4.4.2
--pytest-relaxed==1.1.5
- # pytest-xdist for test dir watching and the inv guard task
- pytest-xdist==1.28.0
- mock==2.0.0
-diff --git a/pytest.ini b/pytest.ini
-index be207cd8..5a506bcd 100644
---- a/pytest.ini
-+++ b/pytest.ini
-@@ -1,7 +1,4 @@
- [pytest]
--# We use pytest-relaxed just for its utils at the moment, so disable it at the
--# plugin level until we adapt test organization to really use it.
--addopts = -p no:relaxed
- # Loop on failure
- looponfailroots = tests paramiko
- # Ignore some warnings we cannot easily handle.
-diff --git a/tests/test_client.py b/tests/test_client.py
-index fdf19c45..e4af71df 100644
---- a/tests/test_client.py
-+++ b/tests/test_client.py
-@@ -33,7 +33,7 @@ import warnings
- import weakref
- from tempfile import mkstemp
- 
--from pytest_relaxed import raises
-+import pytest
- from mock import patch, Mock
- 
- import paramiko
-@@ -733,11 +733,11 @@ class PasswordPassphraseTests(ClientTest):
- 
-     # TODO: more granular exception pending #387; should be signaling "no auth
-     # methods available" because no key and no password
--    @raises(SSHException)
-     @requires_sha1_signing
-     def test_passphrase_kwarg_not_used_for_password_auth(self):
--        # Using the "right" password in the "wrong" field shouldn't work.
--        self._test_connection(passphrase="pygmalion")
-+        with pytest.raises(SSHException):
-+            # Using the "right" password in the "wrong" field shouldn't work.
-+            self._test_connection(passphrase="pygmalion")
- 
-     @requires_sha1_signing
-     def test_passphrase_kwarg_used_for_key_passphrase(self):
-@@ -757,15 +757,15 @@ class PasswordPassphraseTests(ClientTest):
-             password="television",
-         )
- 
--    @raises(AuthenticationException)  # TODO: more granular
-     @requires_sha1_signing
-     def test_password_kwarg_not_used_for_passphrase_when_passphrase_kwarg_given(  # noqa
-         self
-     ):
-         # Sanity: if we're given both fields, the password field is NOT used as
-         # a passphrase.
--        self._test_connection(
--            key_filename=_support("test_rsa_password.key"),
--            password="television",
--            passphrase="wat? lol no",
--        )
-+        with pytest.raises(AuthenticationException):
-+            self._test_connection(
-+                key_filename=_support("test_rsa_password.key"),
-+                password="television",
-+                passphrase="wat? lol no",
-+            )
--- 
-2.35.1
-
diff --git a/dev-python/paramiko/paramiko-2.11.0.ebuild b/dev-python/paramiko/paramiko-2.11.0.ebuild
deleted file mode 100644
index 6576cc3aa7b1..000000000000
--- a/dev-python/paramiko/paramiko-2.11.0.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=( python3_{8..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="
-	https://www.paramiko.org/
-	https://github.com/paramiko/paramiko/
-	https://pypi.org/project/paramiko/
-"
-SRC_URI="
-	https://github.com/paramiko/paramiko/archive/${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="examples server"
-
-RDEPEND="
-	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
-	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-2.11.0-pytest-relaxed.patch"
-		"${FILESDIR}/${PN}-2.11.0-invoke-tests.patch"
-	)
-
-	if ! use server; then
-		PATCHES+=( "${FILESDIR}/${PN}-2.4.2-disable-server.patch" )
-	fi
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc -r demos/*
-	fi
-}
diff --git a/dev-python/paramiko/paramiko-2.12.0.ebuild b/dev-python/paramiko/paramiko-2.12.0.ebuild
index 856b3dd285da..b1f53f02f742 100644
--- a/dev-python/paramiko/paramiko-2.12.0.ebuild
+++ b/dev-python/paramiko/paramiko-2.12.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="examples server"
 
 RDEPEND="
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 327b61bd16a3..23ff17169cc1 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,9 +1,5 @@
-DIST python-phonenumbers-8.12.57.gh.tar.gz 4906700 BLAKE2B b755e6e27c3006ce2b72f8e8900937ac2b7d2bd464052cd9a788ba5cdbd08ead4628963ea794a5dee962531753f6674342a3eed092edfb421c1d8f203d90b2b3 SHA512 8da340dd88c4bd41fd18af264667211e7d9dea97dcb71306c901feb3f32ee7a7012dfa1a66b8ddac746ceaab972529c32d9fc19e331893296f9938c7249173ba
-DIST python-phonenumbers-8.13.0.gh.tar.gz 4907144 BLAKE2B 8441eb3bae743c92aacd581c0dfbea32d04353dbb6e45a3fd24ed4b9ef2e6a80ee70167b59ad288383cf409bdad73ed9bded6c991b7809d6ff2bbcc68519aab3 SHA512 1f8e78b3fa1418dec1cc89c02a7e8544847f343912be99d2b62aa49250aa0d89d67d27f0f9c40481ef6125872be7cc772de25bdd9ce26df512e7715f4f8281f2
 DIST python-phonenumbers-8.13.1.gh.tar.gz 4906086 BLAKE2B 3287df69f8246d241ee41b7fb71e1d49ed6393715a1bed31a60755e170c74f8a88c4b5a2dfe4dd87fa7e8049cefb930d33fe0821bff34745e18402bcc8a1e424 SHA512 2a3d7ac670db1f20a6409a705f654b7802266d9bc4f562b50beace67bc6af188b685159192c73078009fae787ad5de6bb191a8695d1c1626e2fd564f01c55592
 DIST python-phonenumbers-8.13.2.gh.tar.gz 4906335 BLAKE2B 720489d11d10a8277557688040f7b893ecdffba9269ea78d61f3612d0d3ad87cb1eeae04a113e16bc222c2eefc0f792357d06e83faec527ad990695aa25e3946 SHA512 30a668214e9b6f4fdc50fe604ebaa566a90a93c3bcbad0626c5f834dbc2127e3a38897ab60bf89090118bfadef92538508e7636c370b8069a4d46522df628fea
-EBUILD phonenumbers-8.12.57.ebuild 808 BLAKE2B ef45a7f57cab5aa38bb958cae5b0bb0bbca327073d8d4bc41aa56552037a2ae91e5e01b3e6af6e9d948ad4f7edd5ff7fd0808c2a7d742845040fbcd55a6b3b77 SHA512 2786479b7b053e0c900d5548a1339a0d81c0d4c44a25d0b33ce6058e06a872710d7c887d4ee20b7c705065e2a2e4eee6519bb76960902afc45f86c3806819108
-EBUILD phonenumbers-8.13.0.ebuild 810 BLAKE2B f6d524ccd4b5766f56f5b019096727e3b9bb091b7636e39369d2443511ac533c98a1d03c7b917c9572349e4601f556aed15661316a47f6f55da72199b105cad7 SHA512 beae3b028c737ebef7a3b45a8d8fe428b67dbbf9d0c6aacf14467f80b11ddc858e35e72fc1afb06e3d98cdcb47aa2c30f90956c5fe0e0ff43214e101c2a15188
-EBUILD phonenumbers-8.13.1.ebuild 810 BLAKE2B f6d524ccd4b5766f56f5b019096727e3b9bb091b7636e39369d2443511ac533c98a1d03c7b917c9572349e4601f556aed15661316a47f6f55da72199b105cad7 SHA512 beae3b028c737ebef7a3b45a8d8fe428b67dbbf9d0c6aacf14467f80b11ddc858e35e72fc1afb06e3d98cdcb47aa2c30f90956c5fe0e0ff43214e101c2a15188
+EBUILD phonenumbers-8.13.1.ebuild 808 BLAKE2B 87e011f42ff0b93b8e6998a1c1466fb7b85d409f3bbb0d41458438c6b55602242f3e782fd3261933624d7629a54b4d4d7689c3669b19767e182c9953fe5683c5 SHA512 479a6a9860991775a3284aad9f45a64d2070ea73e3c95604519fe0c461e8fe46e9eb5d93a7db1f01d5d4e04f05c472e4627b14206cce6c4e99c1352a08973f1a
 EBUILD phonenumbers-8.13.2.ebuild 810 BLAKE2B f6d524ccd4b5766f56f5b019096727e3b9bb091b7636e39369d2443511ac533c98a1d03c7b917c9572349e4601f556aed15661316a47f6f55da72199b105cad7 SHA512 beae3b028c737ebef7a3b45a8d8fe428b67dbbf9d0c6aacf14467f80b11ddc858e35e72fc1afb06e3d98cdcb47aa2c30f90956c5fe0e0ff43214e101c2a15188
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.57.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.57.ebuild
deleted file mode 100644
index fa0f470bb38b..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.57.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..10} )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="
-	https://github.com/daviddrysdale/python-phonenumbers/
-	https://pypi.org/project/phonenumbers/
-"
-SRC_URI="
-	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ../README.md )
-
-python_test() {
-	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.0.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.0.ebuild
deleted file mode 100644
index b1bff4a095e7..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.13.0.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} )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="
-	https://github.com/daviddrysdale/python-phonenumbers/
-	https://pypi.org/project/phonenumbers/
-"
-SRC_URI="
-	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ../README.md )
-
-python_test() {
-	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.1.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.1.ebuild
index b1bff4a095e7..31a41d5ae3a4 100644
--- a/dev-python/phonenumbers/phonenumbers-8.13.1.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.13.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}/python
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pivy/Manifest b/dev-python/pivy/Manifest
index b6c9097238a3..1bb69ba2f485 100644
--- a/dev-python/pivy/Manifest
+++ b/dev-python/pivy/Manifest
@@ -4,5 +4,5 @@ AUX pivy-0.6.7-find-qmake.patch 1009 BLAKE2B 18789a4592683bfffdd9094f5465d4e33ea
 DIST pivy-0.6.7.tar.gz 6618410 BLAKE2B 22ebe63a75fa624b772cb3d3ff6f03336258f6c8b638613413c19fcea072f83f73396bc91d35f0e06bc27ec57471ae67965ee492e62a7e73919f7827de645175 SHA512 606eac3527b5906ad6884c25775b5625bfd2a1b1c78f75017b05e662d622c75d30e70fd5785ec2145902f5a02d99098b52cc776aee12fab02f0319762ee104b0
 DIST pivy-0.6.8.tar.gz 6618458 BLAKE2B 08c57f0d7bff15a7f9d49b56b75b44c587416eb0feb2b237db48d7e2edd478f9212d7e898f4dd102b9d5dd10046dd652f37a9974861598c7ba91d7fdb1145c91 SHA512 723b09028f2e3075056b9588cebad0ddccbc98d0c15552b9565c177b0de764b9645f88ea2bc534ccf606f2e0b59f91e1d03551b55ece66c0654ce9cdf09a1a7c
 EBUILD pivy-0.6.7.ebuild 1355 BLAKE2B 7140623a4f62a47af8f66db3f8bfaadaf63b94c3adf2d50cd4a6d732ad98b8f5c08eaac0c1f63b8a9d8c2f3da2b620273cc80096445dc2793badd54e3fa21f75 SHA512 b5a2b69ef3d7563b17340267b7baa1858913f2599d94c2428dcab5d2e14caff31afcd974cdb38c80cc77efc37800c9faf34c4c94321dbd9a488dedd82e8da22d
-EBUILD pivy-0.6.8.ebuild 1364 BLAKE2B 5ea394df84522f43a9e32e18c48e4ad7eb15dbfa5d9a63591da9dc45e19c347341750ed03c1a3fb2840862cc092a113996357f7ffbc05f7e7f237c20efc7ac55 SHA512 f8738dfaafa3d278c26b7552add8c572d866d159416bcdb432085f5c2223a4072ecb2f8dca32e566488cc5393169596d44a09fb63b2cde583920e0fd1d594380
+EBUILD pivy-0.6.8.ebuild 1363 BLAKE2B ab6831a7ca52ccfe149a99654a146cc5ad4c252547b17fe571f0c26db62ce641aa7f63dac31cf4ab65c56332852bdccb50e35bd7260c33969ab0f78c35107aea SHA512 6b9a8b69655f95006ce1bf1c64c7e8793693223d5d43c4e8baea27e581736dca7d784cfb8c1533f4f027c0b95702f7edb78a82809cf9ccb5a306af95645dffd2
 MISC metadata.xml 619 BLAKE2B 56498bc9920e301de3dacb10db1c2bee59120b8cd3d15508c3549868700574641916e1d3d6f2a734f87eaa91290fd3b1b7ff1373297ca61cea11e33fbd0fed9f SHA512 fd7b9a70a84749a1eab30c3e4ea56bd15d43266e23298a5be1cf3bbee85c38e34bf062ea2555af724766daa7ed755cf586d8c66dfa2286dbcce9c23535661e66
diff --git a/dev-python/pivy/pivy-0.6.8.ebuild b/dev-python/pivy/pivy-0.6.8.ebuild
index e5e53f5f0640..932dcf7bd042 100644
--- a/dev-python/pivy/pivy-0.6.8.ebuild
+++ b/dev-python/pivy/pivy-0.6.8.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	PIVY_REPO_URI="https://github.com/coin3d/pivy.git"
 else
 	SRC_URI="https://github.com/coin3d/pivy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="ISC"
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index 3753b245778b..988d68ef95cc 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1,9 +1,5 @@
-DIST platformdirs-2.5.2.gh.tar.gz 20335 BLAKE2B 5d11e39d3e7482646e90d57642f0a956633408de5ec9f3cc1954e451ebb3bc3234a453c1e62997bcc74a32082f5d044a1e68ef6d7e75e27876495ad6ffb3c8f5 SHA512 7162050adff66124601359f0c1f73e671444d286e9f00c2694647df233c25e1eae673baf829e3e74e2a54d15a1633d0202dba986d4ed8a2864fc47859af0fd4e
-DIST platformdirs-2.5.3.gh.tar.gz 20644 BLAKE2B db8411c06ddf6cf5628aca2b828654293430cff0db36df5cfddebee2bd10122a50aa66f5c6f724f8f051f8745a0c85a00d59b12778f4478b6632d2d088d2c266 SHA512 9a44673a1f5ce7f3197843c35fb7972baeb7ad586bbf5751b7185aca2ae62fc0e467df13247d57884c68e90db4ef6e96b73744b1528d9c1b3f4c90874fc9c538
 DIST platformdirs-2.5.4.gh.tar.gz 20645 BLAKE2B c995b881bf25d215ffbcfa4d9fd6721d763d2c27e306961965cd16da00bffce5a1e8dc3ebb48f0f499dbc0f5a079fcffbe0755913f61bc3e8a7192e951e8f18b SHA512 35e2f4ff4d289d6d83172105c716b3a337dc55b52be6d4ac653460e6e5696cce2256a645b2e91a8bab4a17f8a6c6e49b4a005924ede8da7ef2d03ede35061703
 DIST platformdirs-2.6.0.gh.tar.gz 20779 BLAKE2B 5958cff9e3583091c365aea0b3380fc02b273d529868587cda80713db43794c5b69df729390152611d1611aa8a29a5aff84d26a4ccd8777bbd800b3c982bb0fe SHA512 727e057197b1f50cd6e9c0afcba042c9c0f85e061a8667f04548966e6d3d8eb80ce35d07d6578f98fc66273f31caf2a0dc7db9599f2f55fe2e89493803c4db57
-EBUILD platformdirs-2.5.2.ebuild 824 BLAKE2B 707f36f3b4f32713a600b55f760b8bc017285742749536e14029f79c7a6923a887ba453376b1bbd22d274c98e10d39070731803da36463a7849879a691aadfc6 SHA512 47f989d76004af0ad8f44844908b4fb56846cde0eb5bfd23e269f3034128af5e1ea9ade2a089f712c57272f345a3d0f50419fbffcdc07a038c694a4d1c57aa83
-EBUILD platformdirs-2.5.3.ebuild 832 BLAKE2B 9e2c472e6d643e1d037f016ce3c098009d1f3fcddef63bb733296b71f1b7bf2557936e47b31dcb7e2c02d92559c64900b96722ba22d0cb12cb7d6a301040c88c SHA512 fd49086d3e3966e633538504910d3b89fdacfc1e7ed3d53b5882dbddf22514452ba9ecf4f65b3c1d8a1307a3268891ba114a94c319b0c843c0112c391461c824
-EBUILD platformdirs-2.5.4.ebuild 832 BLAKE2B 9e2c472e6d643e1d037f016ce3c098009d1f3fcddef63bb733296b71f1b7bf2557936e47b31dcb7e2c02d92559c64900b96722ba22d0cb12cb7d6a301040c88c SHA512 fd49086d3e3966e633538504910d3b89fdacfc1e7ed3d53b5882dbddf22514452ba9ecf4f65b3c1d8a1307a3268891ba114a94c319b0c843c0112c391461c824
+EBUILD platformdirs-2.5.4.ebuild 824 BLAKE2B 707f36f3b4f32713a600b55f760b8bc017285742749536e14029f79c7a6923a887ba453376b1bbd22d274c98e10d39070731803da36463a7849879a691aadfc6 SHA512 47f989d76004af0ad8f44844908b4fb56846cde0eb5bfd23e269f3034128af5e1ea9ade2a089f712c57272f345a3d0f50419fbffcdc07a038c694a4d1c57aa83
 EBUILD platformdirs-2.6.0.ebuild 832 BLAKE2B 9e2c472e6d643e1d037f016ce3c098009d1f3fcddef63bb733296b71f1b7bf2557936e47b31dcb7e2c02d92559c64900b96722ba22d0cb12cb7d6a301040c88c SHA512 fd49086d3e3966e633538504910d3b89fdacfc1e7ed3d53b5882dbddf22514452ba9ecf4f65b3c1d8a1307a3268891ba114a94c319b0c843c0112c391461c824
 MISC metadata.xml 383 BLAKE2B b8c8c1593d154e7a38ca4bc450c14ca21f2411ea1d71f67e9631c1def0acace43ebb6e67adc0c4a1f5f14aadfbce44d0d815fc3696410bef66c826fd5fb00a45 SHA512 f4ba6722e1cf661b3febe10bb15755a9cbc30226a08bdcabfa3d80be87b42d662d6a1edb3412ad79e8f36836a6dd4fd91a83dae29725ec47041056dc1f1f9b75
diff --git a/dev-python/platformdirs/platformdirs-2.5.2.ebuild b/dev-python/platformdirs/platformdirs-2.5.2.ebuild
deleted file mode 100644
index 2361230d32d8..000000000000
--- a/dev-python/platformdirs/platformdirs-2.5.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021-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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/
-"
-SRC_URI="
-	https://github.com/platformdirs/platformdirs/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/platformdirs/platformdirs-2.5.3.ebuild b/dev-python/platformdirs/platformdirs-2.5.3.ebuild
deleted file mode 100644
index 8a195e51326b..000000000000
--- a/dev-python/platformdirs/platformdirs-2.5.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021-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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/
-"
-SRC_URI="
-	https://github.com/platformdirs/platformdirs/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/platformdirs/platformdirs-2.5.4.ebuild b/dev-python/platformdirs/platformdirs-2.5.4.ebuild
index 8a195e51326b..2361230d32d8 100644
--- a/dev-python/platformdirs/platformdirs-2.5.4.ebuild
+++ b/dev-python/platformdirs/platformdirs-2.5.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index c80b405f2789..2b78867388ad 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,9 +1,5 @@
-DIST prompt_toolkit-3.0.31.tar.gz 418926 BLAKE2B 881aabcdf2d944e5b198533b1ec597945ff90a9a83f13aeaac3cf8ba5632c38aff23405fd0b4e30426151824041c5e3dffd1f5331a4101a1054a6f2ebf7e4afd SHA512 dccb0df339a498befbc756b40d5140662f20bf594f7b6a9314a156a1d16704f329b43a329cf979f8317a800363875aebe95569be69727b598b6e3f2af86eb591
-DIST prompt_toolkit-3.0.32.tar.gz 419599 BLAKE2B ad0ae1708e66b278d47813dc7cf04f2f79cb244a8f4f90ff5f26a971be868e781c2152c60ca9fa63b278edf3b9be173cde5487ca75d6c5df8f991ceb667d3da4 SHA512 f219c3318616092b50a2d7cb18b2876fd6056bf22e2ab420e0f723a9d800bbbe301840839acc9139d7f13f6ef633a05fe598b52c2f5fbed3ed22e7cfb102eb5b
 DIST prompt_toolkit-3.0.33.tar.gz 420748 BLAKE2B 7df135b0b69f87b98f52c776316ed1f1a20d4c43fd12d1a8877b8d34d96918313b7fb337ba09258e817c41e1847da90a2b38038b998263ca98f24e52e01c968b SHA512 72531829389b5302617660a7b3a66b22b7e7af4d9f60710628a3bea45b8b58152c90b7fddea660cab61fdabdc4136441a3aa56846c2024eec0ed3f236028bc3c
 DIST prompt_toolkit-3.0.36.tar.gz 423863 BLAKE2B 1917ba618e4111f3d2d85f1063e3e34bc47cc1f60e1703be54cf92b98f72eb3cb3062381e16fd324953435ed67ce0711274f6d8faf735bf966283cc2201f1b65 SHA512 db77a3acb8a985b1df3d82eca7ac30fbd5e85bf3bc77f0f6da13af8064a7d4dc9d7fd57be3eabe5eecce610c8220ad493d296f2e425a8f69d62fddd1e419af1e
-EBUILD prompt_toolkit-3.0.31.ebuild 630 BLAKE2B a8139ccfa57df8ca76765c6eee2f8093886492f5af3f841c2bac4d1ddf6e13673b679998859cafd11a08be5b3e6038b13e3fffcbe092e8caea22462bfbe18eaf SHA512 9f7f2ac3970c34812959aa86f7eac752e22351142b10cc29a6a3f225bd62347fa38d8b65dcd6cb384c0be2655ff81dd9af1284b2007868ba9ec689a72f1d93d5
-EBUILD prompt_toolkit-3.0.32.ebuild 638 BLAKE2B cc734c5e775ea74626f44ef53b979a576942c2f05d74b733a167ba956f630c6742821176b29874ede930f37bb5a84911da49a4e0c43722c26be58dfa0d73cdab SHA512 1c49d3dd336d913a80e4e49d93acdd397c9a890729deffadf9367f7683b008b5724a8969e05e8574932062d92b807b5cedb151a7ad6a18dc0fddc4923e31863c
-EBUILD prompt_toolkit-3.0.33.ebuild 645 BLAKE2B 9376ca858d17f17b97f7b52d34c192317a2f722adf569a1c3a572e2fca9e2bac7f523fb86cb43de4b338d5a966f2648ffabc035ba5fa1d4ce69230a08be01314 SHA512 cbcccea1a9c0bc3d3b9ecf800382f4a950989b4ce581997d2e72fe1e9a73b789814404d89faaca7b164177b94a16f7a5ad40385a99c60e1d43496b982977fdbb
+EBUILD prompt_toolkit-3.0.33.ebuild 637 BLAKE2B 73861e38625e070580215f4de0f1badb62483f37b1d74ee0427559f0e237b87cdb8a97b31f0f630c415b308f77babcf4b1aefb0a6b0d18290e8065375c68ff78 SHA512 23794f272fcabae86669d4e6c625fa7a1bd3d117fd27aea8f69f327c75e131bee8ab29a1743654dd2a171f7feb9d6c1f132df7c2e3f2aa1bbd39a02f16bf9253
 EBUILD prompt_toolkit-3.0.36.ebuild 645 BLAKE2B 9376ca858d17f17b97f7b52d34c192317a2f722adf569a1c3a572e2fca9e2bac7f523fb86cb43de4b338d5a966f2648ffabc035ba5fa1d4ce69230a08be01314 SHA512 cbcccea1a9c0bc3d3b9ecf800382f4a950989b4ce581997d2e72fe1e9a73b789814404d89faaca7b164177b94a16f7a5ad40385a99c60e1d43496b982977fdbb
 MISC metadata.xml 431 BLAKE2B 534336484c65b57df5e672729ff722b67445948e0485c3a62c2f7081724cb951b5157c600dc6162a3bb857c2be0f378b18670786279ff8b5cff2858588f8ebc9 SHA512 a9bf68326839069c61e70d4ef3fe304706f2543b9b91eb291566dd66f36d1abec00382ae205549a35f10dfc730f4613c5cc5c0ee4d6858538d50c4145bd3b15e
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.31.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.31.ebuild
deleted file mode 100644
index 3d741b1e2cab..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.31.ebuild
+++ /dev/null
@@ -1,26 +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="Building powerful interactive command lines in Python"
-HOMEPAGE="
-	https://pypi.org/project/prompt-toolkit/
-	https://github.com/prompt-toolkit/python-prompt-toolkit
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.32.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.32.ebuild
deleted file mode 100644
index 3e2881b39eed..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.32.ebuild
+++ /dev/null
@@ -1,26 +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="Building powerful interactive command lines in Python"
-HOMEPAGE="
-	https://pypi.org/project/prompt-toolkit/
-	https://github.com/prompt-toolkit/python-prompt-toolkit
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.33.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.33.ebuild
index 6ed2313084da..05b4931f826a 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.33.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.33.ebuild
@@ -17,7 +17,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 2a3c2ab85a34..70953fbf08b9 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -2,5 +2,5 @@ DIST psutil-5.9.3-tests-r1.patch.xz 3648 BLAKE2B df56e3b11da307fdd4441284d1a7928
 DIST psutil-5.9.3.tar.gz 483579 BLAKE2B c1b5c77483a1e280cc68aa3ae5ca39fcc3992f3c07a591bbe92278050e9517a9e9c0e17338f2932f5ec680a19c4f6958e21e4b9b02158041e76dd877b5311c21 SHA512 d226364b416823783058f19c06dae4ac1ea03f061646f01ea6953ded8fbb89aed92aa743c9e55181e4d57101f7dbbb78336043e1fc7a3bd62ff82b19f0a4efae
 DIST psutil-5.9.4.tar.gz 485825 BLAKE2B ce5257e653876fc0c4bb005c964f677c0b4010f853cc7b8ff3451aa1efd7fde6b7e5d2150fb936cd38b667d5c167f180d5cae0792bdf50a8aa2e528795ed9897 SHA512 ff8d6213b153b5a3428e4f65ddbc41cb1f37caae4acab02760632107d95a50a74d3ee563f0cb2d623b37cdddd16425d2084e7f841e4a46af8988a7676f6975e6
 EBUILD psutil-5.9.3.ebuild 1247 BLAKE2B d3c1ae9f8b3f6090b988de49d915f4512af6dc9d78003e13d4247061de50d04c46648b68aa69e1fa720d76f633adab313dda40b21f93bb27d34180230a4966ae SHA512 244b7b8b14bb840dc48a415ec0b7c2266fcc285942854752560a24a5d0c55095908210b6b9ed2015ea1ebe56021510795298addc6db070d3f515929316135064
-EBUILD psutil-5.9.4.ebuild 1255 BLAKE2B f740459a556efa90ff8b4344ca879dd631087a032d0498aa580d0482f88cad33df5583c9ea79864b82ac57f94a1b618fbe2e317932dade7d528e40dd5ce22c66 SHA512 e71b2442d4f1c9af8436462f1bc84f3605c82ec2c29e63b35136f6efe338dc8677a0421e92721511357aeeb1cf593c706b8195cf245534119c28e12755f236d9
+EBUILD psutil-5.9.4.ebuild 1251 BLAKE2B 6db20a680e9e5cb5f1dbd4e5facee518b7d373ec0112eb378c4837001c0f57e53f418426eb6644737364519408424dd7353a5ca5b66c6c6f8d0a4a8bb2a04ce9 SHA512 ab4b490a1e6d1741dcafbf9771ff28136ed10a7f37a978f2fc02aadb6bbefcaf1bff77fa5bb291a9b1c5901efdd70cb844d291c33eb4f0699be140fdd50d61f6
 MISC metadata.xml 378 BLAKE2B 235c056a427ab18383c401143074ec62b91d471087c34e2bd48d5192c6221e089e32170d18cd0d69d51eb2bb02fb8a0efe59245af9224b284557812b32c341b5 SHA512 96492308dac753fb176e4810efa71757e66413d16589e52a942b02c91256b48f9873b53a698006923aef12aa7d1539d6fd7aa07632c073b6a92cc8920f6ce6c0
diff --git a/dev-python/psutil/psutil-5.9.4.ebuild b/dev-python/psutil/psutil-5.9.4.ebuild
index 609517d00b2f..5954214c025a 100644
--- a/dev-python/psutil/psutil-5.9.4.ebuild
+++ b/dev-python/psutil/psutil-5.9.4.ebuild
@@ -21,7 +21,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 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pychm/Manifest b/dev-python/pychm/Manifest
index 6a329b259bed..4bf18ca43cba 100644
--- a/dev-python/pychm/Manifest
+++ b/dev-python/pychm/Manifest
@@ -1,4 +1,4 @@
 DIST pychm-0.8.6.gh.tar.gz 23803 BLAKE2B fdf3c37eead60455fd5bde1638a010f2788074752f98c32cf4b3431b4a87b8893c23a9fa29995352b35b41f628b7026fdbfa6ff20b75e8a6efdf75fc2da3f67d SHA512 cc1b254b6c58aba038171ad9db1eea3212094d7fb9386b22ada67381d702b388e6a1dde0317b5724587ee135d2695c546a7c2d65af7091dafeb394647597b0ae
-EBUILD pychm-0.8.6-r1.ebuild 709 BLAKE2B 761a8fe248c17ad4d8b9ee2ee8defa26afddf4aede954e860115be35ec5f158cf61b6a0e293dee858633ec7e5d9d4df9ed9e074c9cd38e0620d83bc02e2da343 SHA512 e01981cf692065ca25565729d9d9f596c6211fa9a2e15f6f4cceb215beb770aff285224c8e7fa81935eb74313d569253dd3d1e2dbe8c3c798a02a55c0c8d1f6d
+EBUILD pychm-0.8.6-r1.ebuild 707 BLAKE2B dfdc956c986da4a787b4d71b095a74ecf530fd10a033af4cdb660834927e4cb766cd9be0e1cf0b37559b00e471e794fccfe11e8944096e581449a3432e64a8ed SHA512 b01c3f28adf44f07a2ff136b88f1da6182f295cc2759cb4a710301b4ecaeb66114179a73ad28ce98b9ba41ffdd0280395792aff41d0e983798d2c009593ccdc8
 EBUILD pychm-0.8.6.ebuild 676 BLAKE2B ca2ca75cc0e3a191967871b0ed9e72763ab15b3bf67e2afd07bcb524c7b1a9e3b52f98ec5705b01390f9182f3c6550d7a685c7c7bc70ae908851172262c75d79 SHA512 7ef6d0f97dd9e7d201e9a2bff4d2e0808f129defac4fce5c92644aa9a94039d25f3e5926bcce6f8b87f68a928faafee5f407a58891870cd22b08cd7b9aeb87ff
 MISC metadata.xml 1027 BLAKE2B 73a6036574ad781ec55e34ebbf6627e5f27e3156eb6bf4b016153c47621df4117338469895719fb94602d509dbdcc49f54436a8779db3249d9f4b25d17d52929 SHA512 836e64e5e3ab7786697e2afe9325a171a94aad3a81190008d7bfb6eefce5ca0a533554071ccc2c88eb05cef922e1054aa40df725877808c66c1783817f03c660
diff --git a/dev-python/pychm/pychm-0.8.6-r1.ebuild b/dev-python/pychm/pychm-0.8.6-r1.ebuild
index 2f078383366b..3c3cedbc7a27 100644
--- a/dev-python/pychm/pychm-0.8.6-r1.ebuild
+++ b/dev-python/pychm/pychm-0.8.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dottedmag/pychm/archive/v${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 
 RDEPEND="dev-libs/chmlib"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 2cb000d7410f..711b19ce98c8 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -3,5 +3,5 @@ DIST pygit2-1.11.0.gh.tar.gz 757139 BLAKE2B aef7dd1e9dfe8961be9e34c63ab07b13f9cd
 DIST pygit2-1.11.1.gh.tar.gz 757247 BLAKE2B 0cd5cf276e1bec375635905ca072b021e29821f9ebc878dc1ae92d0c0a0cbca00481ed3501550161827e4d6e9e018edf165a2e59eb0cbd0ec0004d6c1c10f7eb SHA512 c831afb30ec4c0c4972687f28196915ccb428bf2e242eed17ff50bf700f06db59dcec254e1104bea9a335bc7955f36143085395d8463a750f4492e8c701b2061
 EBUILD pygit2-1.10.1.ebuild 870 BLAKE2B a0d75bd20f9f9b304f54ac7756c55abfc89eac8ec3b231bd079e96dc6e4c99df6b77c659076f27f5a079fead2f72131c7e9b590660146ed3ca39971d7d1b5848 SHA512 55dded03a3e369cd57f058480498c46841a4d916f637109714ff3205a3e312855d4d9cc0221941209a32e301fb0686bd06bc7b8af246f5a45d3c4cbde87afbcf
 EBUILD pygit2-1.11.0.ebuild 872 BLAKE2B 4b5a4941a48b1679e7b3347383de167109d4ccc91723dd451b2faf12b1d80043dafd007d66dbb444737fb922f63cdb2dd003d334f1b1945501a60141c4f6f356 SHA512 154df8853386f65754aabb509956e7bd5fa045a182c73c852a04f31bc3bb916a1e49c9ad8adb1b02b42507e38e041e940091720f1b903ad19ed7fe36bf7232c5
-EBUILD pygit2-1.11.1.ebuild 872 BLAKE2B 4b5a4941a48b1679e7b3347383de167109d4ccc91723dd451b2faf12b1d80043dafd007d66dbb444737fb922f63cdb2dd003d334f1b1945501a60141c4f6f356 SHA512 154df8853386f65754aabb509956e7bd5fa045a182c73c852a04f31bc3bb916a1e49c9ad8adb1b02b42507e38e041e940091720f1b903ad19ed7fe36bf7232c5
+EBUILD pygit2-1.11.1.ebuild 870 BLAKE2B a0d75bd20f9f9b304f54ac7756c55abfc89eac8ec3b231bd079e96dc6e4c99df6b77c659076f27f5a079fead2f72131c7e9b590660146ed3ca39971d7d1b5848 SHA512 55dded03a3e369cd57f058480498c46841a4d916f637109714ff3205a3e312855d4d9cc0221941209a32e301fb0686bd06bc7b8af246f5a45d3c4cbde87afbcf
 MISC metadata.xml 490 BLAKE2B a53da88b5fe40a56d831bb5589d03d247ca1d1d843bde9a1fe6999563a42c076a9f6462b6947ae217086e5edde35a4788f4552636871891f9820534a6f0bade6 SHA512 57cb7356bbb0a22fce2d7ecd8ab346ef5c8155d0941d6a15bf2e98364e755d6e5e5d6aacf24017b4b827b983032e4d46f2363483ac66d6e3882c8be12e60fb39
diff --git a/dev-python/pygit2/pygit2-1.11.1.ebuild b/dev-python/pygit2/pygit2-1.11.1.ebuild
index 47951e5eef7a..83eb671e30fe 100644
--- a/dev-python/pygit2/pygit2-1.11.1.ebuild
+++ b/dev-python/pygit2/pygit2-1.11.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 DEPEND="
 	=dev-libs/libgit2-1.5*:=
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 565c9b1dd740..dc86cdf95e1c 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -2,6 +2,6 @@ DIST pyglet-1.5.27.gh.tar.gz 6532179 BLAKE2B f1dc668530a69e275860befe11f4c86003c
 DIST pyglet-2.0.0.gh.tar.gz 6201132 BLAKE2B e72436804688e9022f0efc7da7fac5eb31ed2d35632612149b52431167db98f1d2e8bc3824ef6bd69851a8bf609d5098ea5f5c77aa7bcf5a527457c62ed47586 SHA512 2dde724f0b5f284d0094109a7077464ac4ec76ea905c91ddc096032ac849ee9720ee36926e9f11969169906c7e45580789001dfc657edc2e737ad116c48c588a
 DIST pyglet-2.0.1.gh.tar.gz 6202313 BLAKE2B be77d8b1736a41ff97c91db2019716eb85be87c91847f1588ffa8c502224b127aa04b038a207890a7abd099f9a956cfa8836d25e50a913f3a8439edfc078942e SHA512 a8670a8845b1743347b1b8cac19ee62056b2ea819ba2e14e567bc2d42f4ff7d1dc2c10e782b1bd670aef69e78971dca8d740787065ef1c2923cb62a3570e7bec
 EBUILD pyglet-1.5.27.ebuild 1635 BLAKE2B b107e1081670aac52989972b8bcc617d29c2d1a4e31470a57c4041ff28c55cea616fed0b5ab834fbc37e38605dfcb2aadde623585e41889f96a1a11916a9202a SHA512 4123a85c09af260a37751085b67966c0316330509613e2a529ef13e522e3f91283a433f0da6bc68667e429791376b88144efcf14b6d322e58c429091655cbaff
-EBUILD pyglet-2.0.0.ebuild 1853 BLAKE2B c9c149fac929b6f5fbd429e2fdc9a7b6bdea0ec6fe27f236743a68306a6ec9bc5d302771c72ce57d9c841487a8b548db2abd33109b46ac6c8e2a53ff6483e33f SHA512 4de24b2a762f846fa201fcd57c41f2a82c1e740da096b2b93fb58b169d23f5f6e482a63663cbffce62c96d54f65d091851ac232efae1f359fa4f395da3b664af
+EBUILD pyglet-2.0.0.ebuild 1852 BLAKE2B fce01fd7bac04544ab21818248a505e3ace0e3b314c97cbe616892377f3e161e6b32bb8d17c190e5e8d62eb0a49f3b78cec0ab4c2983e92986b31207a326f278 SHA512 42ffd4f2ecc60aeda4c7f7ecf6bdb5cebc306676b6703d64202089e26187d71e0b7ce24332461c2031773b4d0f91ce608e24f925287caf9e138e3ca620443e5a
 EBUILD pyglet-2.0.1.ebuild 1853 BLAKE2B c9c149fac929b6f5fbd429e2fdc9a7b6bdea0ec6fe27f236743a68306a6ec9bc5d302771c72ce57d9c841487a8b548db2abd33109b46ac6c8e2a53ff6483e33f SHA512 4de24b2a762f846fa201fcd57c41f2a82c1e740da096b2b93fb58b169d23f5f6e482a63663cbffce62c96d54f65d091851ac232efae1f359fa4f395da3b664af
 MISC metadata.xml 1092 BLAKE2B 51abba6b5545fb47d277edaca91fda755e885f08a9407f5cd3d468c8b0b86991b57d8d151e27d59755ea884ae894ed0e5c32d357b0d81e66eb9054ca6fc92055 SHA512 7e47cc4c39ebf827bf46423251df994a65c2af8ada9420b36810e36f245bbd810796bc8b02cbce182ff071bbd9dae0c9e5d9f5cb201349cd49fa311b3891dc2f
diff --git a/dev-python/pyglet/pyglet-2.0.0.ebuild b/dev-python/pyglet/pyglet-2.0.0.ebuild
index 04ea35c2986c..401a499cc489 100644
--- a/dev-python/pyglet/pyglet-2.0.0.ebuild
+++ b/dev-python/pyglet/pyglet-2.0.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.gh.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples image +sound"
 
 BDEPEND="
diff --git a/dev-python/pykwalify/Manifest b/dev-python/pykwalify/Manifest
index 1939b993d490..e3f9ce01d485 100644
--- a/dev-python/pykwalify/Manifest
+++ b/dev-python/pykwalify/Manifest
@@ -1,5 +1,5 @@
 AUX pykwalify-1.4.0-S.patch 862 BLAKE2B d92c4e8d4d85d28f6df574bfe2f1ab0aa82c32ba8ce2b4a2d6ecdc21fe1db4056351b6aa6dde04d897525ce596ed492781bd7dcf0fba2ca5970a3af79a9abf3b SHA512 f7d9189993cd73a0412ef01fcb01a99fcbc61edc6863a1997333de085294b9c5772d026f7ab8f16703568404f2ff76bb1aeed760d7908c7865e0891ad5752dc9
 DIST pykwalify-1.8.0.tar.gz 62462 BLAKE2B 1593f5e3e15188929574ece60bf6818438258bf024d105ae26323a97a202ac69001a15ca6daaa430970af3659c49da745bcf1f77c23ac72bed2ddca14440d943 SHA512 c77d3072995bb3f61336e725227eeece1dafe2182513e5f67eedeeca3437825b53ac691a991055aad8298db252e2012bc9a61c23d766335fcfbb10a3b587b45d
 EBUILD pykwalify-1.8.0-r2.ebuild 797 BLAKE2B 2ebf9eb9f7427e1050c110e7bd3c7d9a91358b5cc13a01c36bdc7bf40064e5fbe911215892e4c82a5d8922a849fc8aa4d9ecc45978821066765dfb0161874a17 SHA512 51b38900d9848a01e8de7d67ba15a9656b30578e2089cd1d73dfa0ccd90c93cb885a5496649d1c125139005112177ced9ede305f1433b86f8167e4d2f9a8e3eb
-EBUILD pykwalify-1.8.0-r3.ebuild 799 BLAKE2B 5a506e7a27eae67ee48ced4e336992e6207bd6facab2f86c3430f39fe25e86907471a98c58abeb4a13165b678421b7ef0e7a69e99795c6e20b9bedf65d6a5fc2 SHA512 76b7dd09c7acb80e8a1add940d3805e10ca1a4c52e5d871a0a9ffb057dd791a13691227cf2f3277f35e5b8f88767e2ca01aab242abcea141c41cb7f1b7667fc0
+EBUILD pykwalify-1.8.0-r3.ebuild 797 BLAKE2B f36fb199b8c45e61ad775c97e0e280788e3c48f95a6f9a3cf01bfa4db6ec80700368011c77a0c329b1140b2bdfa15af6f50f384515c651daf67723ddfd503041 SHA512 655d26ef721f07d70532948b17ebb3eb82efc259c58ad1ccbc013f7d94e3bebbab755d9d20d852148e8241f9005f7cbd8deb4fd8ffbbbe104abe559f4f786fe5
 MISC metadata.xml 394 BLAKE2B e7262ef0692f68f8fd8c2d8b45cc7a18efc5c2759a7998d3c065f17450d2f4de09d4432961c7327f68fbd52cd61a9183122f19fc829a9c93a6a40b36ac3d9952 SHA512 0d96c9c00d4cd4a64afd790df32cc1536afaeb952d6172a7c3efd227c9686c7fe743e30f94c218e73ef5911c59b23aa40a9e5f19ded5474987d79e7337fcc6b1
diff --git a/dev-python/pykwalify/pykwalify-1.8.0-r3.ebuild b/dev-python/pykwalify/pykwalify-1.8.0-r3.ebuild
index 2a4148505387..3f78d9dfd56a 100644
--- a/dev-python/pykwalify/pykwalify-1.8.0-r3.ebuild
+++ b/dev-python/pykwalify/pykwalify-1.8.0-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/docopt-0.6.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pyls-spyder/Manifest b/dev-python/pyls-spyder/Manifest
index c9ed14baf817..f0d1249570de 100644
--- a/dev-python/pyls-spyder/Manifest
+++ b/dev-python/pyls-spyder/Manifest
@@ -1,5 +1,3 @@
-DIST pyls-spyder-0.4.0-gh.tar.gz 8854 BLAKE2B d14a78be98c1db0a37a2fffe2e6bd8955687a95af8524c852d434e57cdd157dda8f5ecceb19ad34527dedede4497c59fb7949a709d266803c2d8cd67c60380ce SHA512 5a9d6667cb85434ec41a176e097d20c78751d5f3879d4d361e097da214b54b37fbef97d95a763a58d7f5e3c148215672e769091814f06a34139c6625cdae3f9f
 DIST pyls-spyder-0.4.0.gh.tar.gz 8854 BLAKE2B d14a78be98c1db0a37a2fffe2e6bd8955687a95af8524c852d434e57cdd157dda8f5ecceb19ad34527dedede4497c59fb7949a709d266803c2d8cd67c60380ce SHA512 5a9d6667cb85434ec41a176e097d20c78751d5f3879d4d361e097da214b54b37fbef97d95a763a58d7f5e3c148215672e769091814f06a34139c6625cdae3f9f
-EBUILD pyls-spyder-0.4.0-r1.ebuild 611 BLAKE2B 7f459925a0e4ecda0b73c1dcbe99bd4e24e393c4e3eb75fd3c4ee6bc58a596c63f20cf1d2ff5d4c34f73cf52a0027cd3975095d3bc04957ad58307395f4bfd99 SHA512 bb2dff8f233a89e27e72bd56af5421495e5187b75b541c21e90a26b961bc5cd9a16a879996a652e4959680b837e2199b7b7a5e217c3d6ac70ba76bad6805459f
-EBUILD pyls-spyder-0.4.0-r2.ebuild 644 BLAKE2B 7f9ca703c679cb3f4172c69bddeea34f871cdf2d0e16706b9eaa55a4139de1e6a58623a11380a173b5ca8b2bd09e571540d6a2c2f813aeda0ba48cce8e6121ad SHA512 28d9c9fe9beb6e6f01522ee3a0bb91b0b7012a3af2797deaa2f98327ca8790c20af215d39766b3da52484d0a0e66065b0b44dd41ec0b19d507aa5fc13020db59
+EBUILD pyls-spyder-0.4.0-r2.ebuild 642 BLAKE2B 0793d4446acbe08e83a7c85c28fe3f3f66c7c7f5fa333790b2ac329efdcec752cf326dc053344b971add9c7f3b5f05650b77dc95644f2006323e950d25d4ee63 SHA512 d208b3f8b4ab14dbc6ee5be4d4b986119df64cbc3b43d0738c3cc3f85389baf6962e6b7f19c0dafc75d5e31f25ac00757db5c747b0b050345bcf0a234bcdaf86
 MISC metadata.xml 520 BLAKE2B ad207da8af7c89c4645f86aac823861720f57f7cb98be21f970506328dbe95cdba5eec58744135a5d5e0928217ad97a65dcef6d8e8d47538773c66ddb894b154 SHA512 ec3b1c30f3502d83f372f439e105eee62bba5627619395ab3ffc6e60c37312759e06a5e37287fd8a293438162c016cfd5c66765cc349636abd264be85983f44b
diff --git a/dev-python/pyls-spyder/pyls-spyder-0.4.0-r1.ebuild b/dev-python/pyls-spyder/pyls-spyder-0.4.0-r1.ebuild
deleted file mode 100644
index b846edc1c4d4..000000000000
--- a/dev-python/pyls-spyder/pyls-spyder-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Spyder extensions for the python language server"
-HOMEPAGE="https://github.com/spyder-ide/pyls-spyder
-	https://pypi.org/project/pyls-spyder/"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/python-lsp-server[all-plugins,${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyls-spyder/pyls-spyder-0.4.0-r2.ebuild b/dev-python/pyls-spyder/pyls-spyder-0.4.0-r2.ebuild
index 70fdf0b5e5cb..784484c1720f 100644
--- a/dev-python/pyls-spyder/pyls-spyder-0.4.0-r2.ebuild
+++ b/dev-python/pyls-spyder/pyls-spyder-0.4.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/python-lsp-server[all-plugins,${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 9edbaa87ecc4..8928b8446b20 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -3,5 +3,5 @@ DIST pymdown-extensions-9.8.gh.tar.gz 1012711 BLAKE2B 451dba60e42d8ad5e1368ac02c
 DIST pymdown-extensions-9.9.gh.tar.gz 1013192 BLAKE2B 51b9baf40f8a40f3553529f0670a895d141b3b92c2b5a66b215e8551246c20ba7b96891714b2012a005056b1534d72bb0cc644cc719b230ae1f3bb03e2258203 SHA512 000ca793d891abdbeac3c9902c25d842d5ed2c209a0e32deb5cdab41f2019dc85e0be41abdbecc369b4def1291d30e4bf9a71e86d522f45d629423b4d42c6d8b
 EBUILD pymdown-extensions-9.7.ebuild 1625 BLAKE2B 8be05c03d6225736fc63ad37197220a3c0f4a953895ce36c0064997d1deefe32dccb4e56ac6905367a86a019495afbd3a7de0a3c023e6bbb8401b7a04059797b SHA512 0114c035128fd883d42a0e2ba8403e86bbf56c42156063df59647f42d5b0a71b16d6621cc1e6172fff3894de80a222a9d0b19de84b5b973498e242da492cb7a9
 EBUILD pymdown-extensions-9.8.ebuild 1627 BLAKE2B 167a6c0187697bf5ea751fb3cf30d061c5d411ad7e922b35738e16a69459011610eec0ea193ce990ae745e8b967142d69b58eca5d3f043dcc4d2fd69c7f1b1f2 SHA512 2e2a85177a139eac580c6554d9fd2c560a8d18ea92612a7dd824e58692f9924b67f64018ca233401fa92df224dd73b1e19abd6cc03ac4311c8d22b01f52153d0
-EBUILD pymdown-extensions-9.9.ebuild 1317 BLAKE2B 9c6b453b7813142ed30e0aa78f28abf23e98b359a76fbf5528a3e5962e12abcb21215043ebcd17357a7f12d41fc5ff499618089f5f0d7845c8b16100d87b6e3f SHA512 12f01b2032e8982655a314dd7a4180c7a33907a8b594d111ca0f5ca07dcb2a36d584405a695c84afc2e692bf7196e015fd47d6a068e2e53496a688ae39fd4be3
+EBUILD pymdown-extensions-9.9.ebuild 1315 BLAKE2B 3aeb4ed1ebefcf7384386976aebb3e3e3ba55b81db13b52d2a132d7632af84276256f934cade1f9427a143ff999820cd55675eb951c733ba272f3a7062441c29 SHA512 791616b82ed9d540b582b51349b89e19e599e0f7e89d8bcdb570de0a1354a78000c2c333c0492cfaac629713179dfc0482d04573016e37c7399450f2aad4999b
 MISC metadata.xml 536 BLAKE2B f417ab2132b06eadbf1785654080084c4ef694f983e223ade83d5c77213e4443203a498a168efd68e4a3b1cccbe019c5b88716ac851719b9197deba9d2fd5411 SHA512 51304b48f9e296abea376be300053e041ea331f93e1ec7a2a3cdf10eea0ed6e9b8f04cdcbbed7920b46c60d5f6ce9337e3e25635516871d7b080eb54bfa16f57
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.9.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.9.ebuild
index 53b6a8621809..9e0ee759afd8 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.9.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-9.9.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index 79863cc37a22..01ef32e39735 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -3,5 +3,5 @@ DIST pyrsistent-0.19.1.tar.gz 102135 BLAKE2B 02756ae7c6172b2ee383508f896ae01ee4a
 DIST pyrsistent-0.19.2.tar.gz 102438 BLAKE2B aa231a7c300d2f1501abdf2fc74dfa9672ad8000d87e3fa9beaa51aff4816dad4f142e9a2e609dee402352cf5a0477b6d4dc31460a71e7d98a592604fcaa97d6 SHA512 fdaadb65e72db4f90ecb1526fd68eb2b60b278071978d4b5a1b1379be83c60d30fd653dd7e6527c217d4e50f05c7d641290172aa5d5e4741dfe5e08f0b0c282b
 EBUILD pyrsistent-0.18.1-r1.ebuild 653 BLAKE2B a0e141f6e4cc27b30ffa4d7fc77d91b2a62c0b21ed6d098b6aafb9243bda9ad0bfea46b3ad866dc4b369baad8d09552b7f2578b56bf4b4214de6eec4477f5da0 SHA512 38a60e54664c6865abcec9f02931cc92b4ed4427fcd6c278faa9b9d6acf39674a4487ba636e0587927ca39a353297bb86a686a1763183c941eb049411862c551
 EBUILD pyrsistent-0.19.1.ebuild 661 BLAKE2B 5ad77e6fd913eb877eefa8d08bc13b9fb449a1807d095097fa1bec0601749c9164d3ab2f51ec84b7e3ec6837aa461da68a6b4f2b00ea27454a386a8894007c09 SHA512 be6bed4b86d2ba4c2c276acde3bc4fe1ea1041b8a6b5c60c96b55620edb3c522d029503816040c79fec1a0d0169bd4e5714b6a0486b9df9f3cd83c39b12dc2c9
-EBUILD pyrsistent-0.19.2.ebuild 661 BLAKE2B 5ad77e6fd913eb877eefa8d08bc13b9fb449a1807d095097fa1bec0601749c9164d3ab2f51ec84b7e3ec6837aa461da68a6b4f2b00ea27454a386a8894007c09 SHA512 be6bed4b86d2ba4c2c276acde3bc4fe1ea1041b8a6b5c60c96b55620edb3c522d029503816040c79fec1a0d0169bd4e5714b6a0486b9df9f3cd83c39b12dc2c9
+EBUILD pyrsistent-0.19.2.ebuild 654 BLAKE2B a29defc3bd8d0c3d169a27ca7e513aa7f0e9fa83f45d3fda33796e849b164bf7bc5e2ec243b142ddbabb45aaef2988483398c2b8cbffa16f371211d90cf297a7 SHA512 5753409bdde1ee2dc4d594d0c2f1c90317a7435cbeb811df2db0fa993338a576eda529a0e5cee277bb042d38664be3df919185380ec4938b30a6e21f172e0eab
 MISC metadata.xml 522 BLAKE2B fbf571fd4d833fea0dc9942620655c45bb91b07ca02e2e0fccb23980de26303b9e9c3963453cae3775f7db33dfd485a4a55782a1b1b2b635af0d62e331596b99 SHA512 fe358befc92e29769bc2f84a516da1a26026e4ab84e812326da72ee02b18c79c3d6acdfb71cb6027d2d0f1e559cc00cf39406e335fb8f38d4479353a7dbb4ff2
diff --git a/dev-python/pyrsistent/pyrsistent-0.19.2.ebuild b/dev-python/pyrsistent/pyrsistent-0.19.2.ebuild
index 7a4e9ef1fc6d..6675dbe44a79 100644
--- a/dev-python/pyrsistent/pyrsistent-0.19.2.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.19.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P: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 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index 870997a02742..5715d8909370 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-httpx-0.21.1.gh.tar.gz 23997 BLAKE2B feba932cd8a4e7e36cbf98a5c07f8e3264c9f95568568dd4ec4b882a509a4feafd740d3c25a547b7ea28f7e5450083a5f5f7afde0b19bfe46f7999b01565fbe3 SHA512 22cd471996202c78c3d3b433f8ed525e0282df431f0923cfbce42fd543b56a2af20723062773a1a3e3f406a0ce6aa6eed27faaa76731472a903cdad6fb13f771
 DIST pytest-httpx-0.21.2.gh.tar.gz 24311 BLAKE2B ae1ce7ada3977c3bd68f31b5e20e93ac32f2459359bcff30d1ccf358b07ce269f38acb06b46211ddaed1085a9cf78fcefb921a978a5ca4f6c84fe25b602a3a25 SHA512 d8a9d1381a7c1bb1f907effce48bcd4cad29b2eb135e5d18e7ba3025ba2f18d97c7914f0cfb835416dfa608c59ed51db653b0366d407cfbb82fc520808f3792e
 EBUILD pytest-httpx-0.21.1.ebuild 769 BLAKE2B 97cd781f719ab8478c394d961ab45506ac8d30a374706bae1cb0fc4e0f2b8d2f62f78deb5b283da7e66db18c7aff58d6545aa8d366f752ad1e21f19cbca28643 SHA512 0c7647d481c7bb97e95eafce830c03cfb02b596c23548c33d0baf6d69413e4d1db8ad9d4610cc706f8c6fe58818b36b13f436f71d62b284df04e1b899b8df981
-EBUILD pytest-httpx-0.21.2.ebuild 771 BLAKE2B 2b4214c2c7375e215e9f070227840486b98a6a045af2dabd1cec997e70777e335efa00f9bd367b419da73cc0929e37aad5dcaac2db0e681ad732f4353176f748 SHA512 ea9698c8ad8743e1ebf41ea255e19ebab0dc3a828a8bced8885b7d695b2f6288e1fd0b004c15be26f3b0d8514799c5151f52642fd3e6d590ee884e7cb2d6d70a
+EBUILD pytest-httpx-0.21.2.ebuild 769 BLAKE2B 97cd781f719ab8478c394d961ab45506ac8d30a374706bae1cb0fc4e0f2b8d2f62f78deb5b283da7e66db18c7aff58d6545aa8d366f752ad1e21f19cbca28643 SHA512 0c7647d481c7bb97e95eafce830c03cfb02b596c23548c33d0baf6d69413e4d1db8ad9d4610cc706f8c6fe58818b36b13f436f71d62b284df04e1b899b8df981
 MISC metadata.xml 468 BLAKE2B e0f824f05936a831a958b027366ba18cad85307ac6c81b74b299f58270bcff53e06f32b2471d6433bd7014ffde83ddb24f787c07632453d14f4ee6e4679ffd10 SHA512 16bf024801db3c0d7b789cd1f16520a1ff2520e8b3e2abbeeff5b1192c19b8ac64f55fa678c922f8a817debcfe05242ce11e0164a00422445d7301858718b359
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.21.2.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.21.2.ebuild
index 779e7bf2b179..7d55391a5293 100644
--- a/dev-python/pytest-httpx/pytest-httpx-0.21.2.ebuild
+++ b/dev-python/pytest-httpx/pytest-httpx-0.21.2.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	=dev-python/httpx-0.23*[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-salt-factories/Manifest b/dev-python/pytest-salt-factories/Manifest
index 71bc15ce76df..6808b7591bc0 100644
--- a/dev-python/pytest-salt-factories/Manifest
+++ b/dev-python/pytest-salt-factories/Manifest
@@ -7,6 +7,6 @@ DIST pytest-salt-factories-1.0.0_rc20.gh.tar.gz 160140 BLAKE2B 7ecd9af695626c465
 DIST pytest-salt-factories-1.0.0_rc20.tar.gz 160140 BLAKE2B 7ecd9af695626c465e5776ed218bd92f30a556394cf4af0c2b6fb87c182f8aaf2d8f998358a7eef95fae53c85a6be2d4ed5a6ff191496fcac62a97e25cf19063 SHA512 5677c6638b5dc7f90c01f2c2204e1910c2bf6ea2c10b714173d3443d4c682b5f515ad7881e2ceee66f6eaf619e399d6fa10052604fdc9c5157c58348b63c8f2b
 EBUILD pytest-salt-factories-0.121.1-r1.ebuild 1724 BLAKE2B 83786447369717e7f414a154abf586dd1c87581f5809ba313ed954767f65ffb176b31c2e7d50523524619a703b601f8643c0134e0b564a2bbfa97d99a51ecc82 SHA512 889d5bfba0d62b48a9fef8327f11f31f7683d6d9107e9b9b537fa51eea66b7aa37f598da10f1836f68c95ad86eedda0ed5c0649aefde063cfa38b8402776fd23
 EBUILD pytest-salt-factories-1.0.0_rc13.ebuild 2004 BLAKE2B be652e742fdaa0885645a3f95f0c7789a5fbb7e5eec986fc26abecdcd191e9e0c7cef4e78a22c61d5e3703f3cb51153d1dfbebebacd9f8b1d76438a1766ddbb1 SHA512 354e0fb4e3a8aacd1ca2b4e3f13f7f24a882cb7b52e9fe4dde4a76172bb834db9232e17c296339cb67dafc7932fbd6ff04e66ebcaa5c468c5926c50f94e68a7e
-EBUILD pytest-salt-factories-1.0.0_rc20-r1.ebuild 2105 BLAKE2B fdec02476a729e12dd894274c38f99ebb196174986b4b33833269d698c29a50a7c02dc73a5cf89cf6c7f65397dbfb6827f6a874252a5a37cab1807c7c35aa1db SHA512 1966782b120f710e287e6107502349b115b9c13a61bdc1d6df9f9aafd2690e3e8f5947c2bea91af0acf8070e5612eec7e9ae99b556b4c73d487b7fbe70538762
+EBUILD pytest-salt-factories-1.0.0_rc20-r1.ebuild 2103 BLAKE2B 0cdd109d0a18db82278443d23260246926378e7181a7eebfe66615d1585ca79cba58a4ec75d0a8b508cc055bbd0d1b116421842d6fdf3b216ea816ead0297695 SHA512 9362b2317bdf43c2dc55440bb96d5afeb4d7ab02f0e7eeb11eb0b864733c2484ad3915b41fecc932f3e63eb6e30f421ba599fcd816e62f4c23ee4907d02117b6
 EBUILD pytest-salt-factories-1.0.0_rc20.ebuild 2012 BLAKE2B 77293f8c4e6a8839990b8510f0da1c2d60b4857c0ecf7ce24398519127c8ed4d8afa9193673d407f5876c42bcdf761ce83c1ddcfb539a6afb4620d813df87ea4 SHA512 52cf0336a5e83b27ddbcc2afab26735ce9643d38ccc21643e7e8aa7da6cf2735d88971d8e256ff4fbf5f2701e0dfd3b2b4ace959a7ad376583a308959589c29c
 MISC metadata.xml 358 BLAKE2B 0ca310e1a7269e532dfe3610bf5c9a1d93ff8dcc46ee3f26322cfb0ba1fb572b521359547f49b0deb3f463efd0321e3b3bee0403878df676e3c54dbcac14753a SHA512 8eaf37e98efe76ff401c536368d1537255d09db93b4f84254b7eb291b603f6ee83d80a65e9529c7bcea8324baaff708dc12f97662dd87c57fece36a1d5d8e1c9
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc20-r1.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc20-r1.ebuild
index fbe06ce4f14a..88d3fc6043e1 100644
--- a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc20-r1.ebuild
+++ b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc20-r1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${PN}-${PV//_/}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-system-statistics/Manifest b/dev-python/pytest-system-statistics/Manifest
index adb3e402a0c4..75f4bf6c606c 100644
--- a/dev-python/pytest-system-statistics/Manifest
+++ b/dev-python/pytest-system-statistics/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-system-statistics-1.0.2.gh.tar.gz 55147 BLAKE2B 9b1217102a23e723090e04652fdd727818e2404bf110e4f54289251eb92f4abb59861ba6c6fc611c843960cf0595fa5cbd636071033327d4e602606e8ab63abf SHA512 1fab5038dde504ab0d5d0f4da851c9a8260849adb38a1196c6399131d77cc24a1926e68310dd0701ed001a20a7fcfb57c5202c5ebfd6de4c85aac4be49fc7347
 DIST pytest-system-statistics-1.0.2.tar.gz 55147 BLAKE2B 9b1217102a23e723090e04652fdd727818e2404bf110e4f54289251eb92f4abb59861ba6c6fc611c843960cf0595fa5cbd636071033327d4e602606e8ab63abf SHA512 1fab5038dde504ab0d5d0f4da851c9a8260849adb38a1196c6399131d77cc24a1926e68310dd0701ed001a20a7fcfb57c5202c5ebfd6de4c85aac4be49fc7347
-EBUILD pytest-system-statistics-1.0.2-r1.ebuild 1292 BLAKE2B b61c167b3ff3b4227c03a2382db73d8fa177213ca371df3a6d9a8a5e572c69b25aaec1d28d39ff138996def7e77260fb0ee7fb703142ceb0ce1c1265b1ed0b14 SHA512 e9cce27bf919627881331f996aa17fed7593c9b313b6c2be16d348a77fa95026c8d126a7dd14d1a0e704089b402ba9e08f63c5d73bc2b1e5b38073cc3d061994
+EBUILD pytest-system-statistics-1.0.2-r1.ebuild 1290 BLAKE2B 1f174d7c693dbc16ed690117899d365765c8be84b4a1c8bd0c84805202f73260ecb3745230950ad5ca1ceb75f227f0a3695d17e4c75a70612185e068f7d54706 SHA512 c8b5202743136d938d36a24b1d6c3da189d5e8cc453823916dc2db1bf1d550b7868f1e40446f72d098aaec05e09a2fcd73cac083dc1d4b9cce25f3b9d210a91b
 EBUILD pytest-system-statistics-1.0.2.ebuild 1287 BLAKE2B e022b0b1c59f0ad4c66194941c095fa790bb273cca566ca2beb9ac44365d81d789aba7246ab8bb2552867cdf6cc5e0fe17a71b3fc02cdbc16a77bb769fa017c4 SHA512 4d5ee20cb93e02e772bf4dc2b41ae98de0794013850cf69a3c947a699c0017c44e805f9dc83c607c0f8e51c490cadcf5d241386fb9a980a7b1610d7dc8b2349b
 MISC metadata.xml 337 BLAKE2B 00bcf31ed6a7b0b94fe3bc0f3031d64bdd682be4797a4f2878ac0d66012d8c026a7295c923f9081f9e7b1b2dc1fd7c6dc7a4e33dfcd97f80785a737815979313 SHA512 a28c702734f0907afdb667a42e8d2672ab938bb4802f4e55e69de872694176b5424cd7073a9b2caee7dbe856fa511e41447ed30e49cc64d053a14b9ad830766a
diff --git a/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2-r1.ebuild b/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2-r1.ebuild
index 28c76f28eac4..f2faf80969b3 100644
--- a/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2-r1.ebuild
+++ b/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/saltstack/${PN}/archive/refs/tags/${PV}.tar.gz -> ${
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-tempdir/Manifest b/dev-python/pytest-tempdir/Manifest
index a9f981f1d5f7..01f2e5c85cc2 100644
--- a/dev-python/pytest-tempdir/Manifest
+++ b/dev-python/pytest-tempdir/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-tempdir-2019.10.12.gh.tar.gz 9859 BLAKE2B fe4d32d2de3d577952b90a811c38f1cfa0c16badf9115a1b70faf07f0123e29935c01bfc3c1b9c616a0eeb3e0da9f42a4415687a4862830e0edea505a99dfc04 SHA512 d6f8994423d9be90f4be20878f980ad4604475ccd4b65975cd3cad357c2d6a2a7bb8623e4ccd7441437ad72b7899d8b59ae19ca3a52c35a6c24456e44b7626de
 DIST pytest-tempdir-2019.10.12.tar.gz 9859 BLAKE2B fe4d32d2de3d577952b90a811c38f1cfa0c16badf9115a1b70faf07f0123e29935c01bfc3c1b9c616a0eeb3e0da9f42a4415687a4862830e0edea505a99dfc04 SHA512 d6f8994423d9be90f4be20878f980ad4604475ccd4b65975cd3cad357c2d6a2a7bb8623e4ccd7441437ad72b7899d8b59ae19ca3a52c35a6c24456e44b7626de
-EBUILD pytest-tempdir-2019.10.12-r1.ebuild 537 BLAKE2B 7990a1cf0e038757fe2c3ab64697a378d9464e3cf87bf9566984b4bd80323d9fe06b27d1d6647e2f54c6f1c3b7991e9d7b377693b9631f9bfd2db8b2bfd32496 SHA512 0dfff40e35c3318f8bbf8c20b32f45af0405ed321d1e1243e1f381bbba58d298221d79304dfc386cd2dc424ba14b49c41e5d6791791c6e6226ecb5929730e026
+EBUILD pytest-tempdir-2019.10.12-r1.ebuild 535 BLAKE2B 81ddfef9067d1b5fb54f061f31c99512e2cdea6738ed793954d33bcdf29ce97d7ff3ae80c246a429b27177fa447d45c75176c81e66095cf48511dc766fcb19e5 SHA512 08163e159e531f118d7081ce2fd0e89a10d5a121becf510ddb0514d9c6fd838ae47c94a93247204c8cabdbd240458f56648758f413085d35c5a94e0917d1abc3
 EBUILD pytest-tempdir-2019.10.12.ebuild 510 BLAKE2B f88d5c7052b9f24f80566433a9083e2cc6bf73d4f21cb8f993edb48601e1f53a76b032f14874bc3ce6e4bc6a99949cc53b275dde7c236f213ffabd7059dd07e9 SHA512 57a555d0b5f4cf035aaefa93e9959222616dac812ece07b5d68828ae775f4351a2c8a14ce5fe8adca23405706768618803f499bfbf5ac5ee1ffeafeb5d900f81
 MISC metadata.xml 327 BLAKE2B 0280ea518e1e366316adc1f2ee8f5ee2a787d190b409efccc1e7d001f95b39ce64f9ce4a2366172589e9128f541ad0312ee2d56d0f37f763def05ed8f0e12759 SHA512 7ba82ed730777df1be39f18030e1149819eb6a0e36dfea4dda4e2866920133ff584f6e4ec635a5fe05ea81739d02e3991c19e835ed769223d2d9a229ac48c570
diff --git a/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12-r1.ebuild b/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12-r1.ebuild
index d96260f5663f..05b6f9e4948c 100644
--- a/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12-r1.ebuild
+++ b/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12-r1.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://github.com/saltstack/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pytest-trio/Manifest b/dev-python/pytest-trio/Manifest
index dae4adf4c490..d845ef6e1230 100644
--- a/dev-python/pytest-trio/Manifest
+++ b/dev-python/pytest-trio/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-trio-0.7.0.tar.gz 47784 BLAKE2B 59b28df45e87804e0b6eb557a0cf259fdc3636cc7a03d78248fb814d55904ed01d00a530b194b2bfe93ccfb9de528d70a372faf1f6db24531c230319122db2e5 SHA512 547036c94f33cf8e755c88d608c5fddfa5c583fdaa7e604598d470e250a006c571702a81bac4f273b74450a8c10e4be404bad74d4104403fe1c9c70e872dff53
 DIST pytest-trio-0.8.0.tar.gz 46525 BLAKE2B 54660dc9b021af0ec18eace72f053223d16e89635c74d71329a005e5fee3bf6e2055cc29412d9de7443b2594ee53d68890d1e30ed7c94560c355d4342bb3d035 SHA512 79141021633b7b2d8a840d7eaf6a3447bccd59d1bd4909e7feba88a9ae8244376f281b64fde4333b5a575957e3f73028e389a9abf0d19a35417f15c47eeccd05
-EBUILD pytest-trio-0.7.0-r1.ebuild 1392 BLAKE2B 3ed1d0338eb55496fcb28e9b1bc8aa85cfa2d58b74b589c5eab707a6703c1ee2c9f7527bb01748537051b816b4d12f85cfd1761f50278ca19dd7c7e0b4f7e900 SHA512 b9343cb3c6f45acfd8486a89669e2a944fc5cd50ae18b36114da6cbd845fba0a77119b13ace30819e2a347f580206fde7918fbe9db3653a171f66624afae87ab
-EBUILD pytest-trio-0.8.0.ebuild 1357 BLAKE2B 90425cc7b57edf8fcbda1698fcdb7b55741353751f68e8bbb8362e999c9bfbb05468a74e79474bf26e4450453f5a9591b98ce110e96f6ae8c543643703d44756 SHA512 ea8f35b79976aca329fd7b8cca723377be46f801ea7e67f66816839cae42ba95e4fb4bcd8ec7b480b32307b3ff65ed0c6fe978ef36efe9f1a33cba813c83971b
+EBUILD pytest-trio-0.8.0.ebuild 1350 BLAKE2B 071fc4c2999162b01dba6028265d2e6d65cd04aa4e4e266d6658ec1231cac6107302364345520780a8724fbc383ccc28a05b2f94b49f27631fadf1339d9de83c SHA512 2154405356f2cdb21aaa412d26cfee45e05e44bd870500f329b26c4087576f06b854e93deca735a7a0b03ce1eaa1ce135c63aa02518981a0b77024ee2185da53
 MISC metadata.xml 420 BLAKE2B 42bae65fb9b23797c96bdc057faebc577f89f0c83f27031079176c2a122cb15e70eb5937a8cd52d09b3d7c5a7d16f62768452c87523fdb0fad876b63836c171d SHA512 5dd3d9e96df753347ccdf41428b5faa1df217985d7cfda1d7bd933fdf755f8f254fd9fa80e7cbeedff318327c4ff4257d8598a17def8ee6144d27aa89305cc3d
diff --git a/dev-python/pytest-trio/pytest-trio-0.7.0-r1.ebuild b/dev-python/pytest-trio/pytest-trio-0.7.0-r1.ebuild
deleted file mode 100644
index af426052c90a..000000000000
--- a/dev-python/pytest-trio/pytest-trio-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,52 +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="This is a pytest plugin to help you test projects that use Trio"
-HOMEPAGE="
-	https://github.com/python-trio/pytest-trio
-	https://pypi.org/project/pytest-trio/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
-	dev-python/outcome[${PYTHON_USEDEP}]
-	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/trio-0.15[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source \
-	dev-python/attrs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinxcontrib-trio
-
-python_prepare_all() {
-	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
-	mv pytest_trio/_tests/conftest.py conftest.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# disable autoloading pytest-asyncio in nested pytest calls
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# since we disabled autoloading, force loading pytest-trio
-	local -x PYTEST_PLUGINS=pytest_trio.plugin
-	epytest
-}
diff --git a/dev-python/pytest-trio/pytest-trio-0.8.0.ebuild b/dev-python/pytest-trio/pytest-trio-0.8.0.ebuild
index bcd93cd9dedf..2fa2ee710418 100644
--- a/dev-python/pytest-trio/pytest-trio-0.8.0.ebuild
+++ b/dev-python/pytest-trio/pytest-trio-0.8.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/outcome-1.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 912943a0ed77..4c44c779cf70 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1,5 +1,3 @@
-DIST pytz-2022.4.tar.gz 316055 BLAKE2B 795ac83f9d695f40d0675b8e53c8d573ba1799cb4037edd18974a1f5a5f5e1f73e871852ca4f4098facccf1589dfb22a4948375149a7ae790b98317d1442ec66 SHA512 4dc42def7743cacb13fc8c4b1f8f49b3a49c68c93e7444985eb7242c0d9fd0f95bb9d1be934c4ad5519c9fbdb2aea4d6b8b563d71153c86a40d2e1ee8abb6387
 DIST pytz-2022.6.tar.gz 313766 BLAKE2B db52c5dab06c90f6cacda590682a8011e59a2f1155edb1147a656561b29098bcaa34e2140f260b314b360efa879e822ca76e14e637f5cb5581b43d93c12958b3 SHA512 ea0343453d011e252fba64502984e2a43ea7c7437a211025ca68a4a45178c8aaef4c2b65261434289b21166a99a1941ec9e2d9d26bb3d22a76cbaa421250131d
-EBUILD pytz-2022.4.ebuild 797 BLAKE2B 4074092d41c3e2133a58d8a3ef75d3f0f349487b4f288c8c271c23acf0189dcc173dc925e36a6a426e6f551bc34c6497dd7cf41a5d56f04e51ae3a9e7d3a5edf SHA512 442747fd7f390b23b54257f90b87d9a374b28abff9cce1b2296bb5c2983c810317d89bd2071f791110ecb3d09a96109b755622583383fa01be1200cf5008a5e9
-EBUILD pytz-2022.6.ebuild 834 BLAKE2B 030a22826423e11d49b14fee15deaa439e4ab078799c46b14a96a0476a1e5430655750250bcfe0c64e2e76b023745db41979cef87ff426cc99b9c37d90fb0461 SHA512 f246763a75b2a9408eb375aa18b9d00f853079757c150c198c96e407426df2a272f83bb2fcdcdf47b4e970e76217569942466530803b7c7811cbad008ef03a0f
+EBUILD pytz-2022.6.ebuild 826 BLAKE2B 16846ba461e53e78f48a7c8d7c5ae682bcdb9ebd137dde3832d7c3ad70362518e5970d2507cb38d24e4e0e2a4b14e86b7eea8edad2def39d80bf617b9b25bd93 SHA512 c1a12f4eb876c0dd32e23fcc7c71e2dfe97e1f60dbc937581baffef7bd64aadcafae8c96e784fa3c258356aaf2e836296f0ad28ce318e3e0d6ac3807226a7494
 MISC metadata.xml 816 BLAKE2B fbebba08fc9a0eac3a94dff015dea77b57f01559bd703b906d7f922aa88b8aff3a43ca2391210533742d2ac6c16e6bf3e31b1a6bd5dd2ebf47ce7a29edf5040f SHA512 2614764bcffed71e746257b6cce2bb68de1205292001acbcff5bd69e3564ecabce55970967394ee3900e21dcf29d25150fa579bf39bffb189fd3b4e509d7b412
diff --git a/dev-python/pytz/pytz-2022.4.ebuild b/dev-python/pytz/pytz-2022.4.ebuild
deleted file mode 100644
index 5fb359de5776..000000000000
--- a/dev-python/pytz/pytz-2022.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="World timezone definitions for Python"
-HOMEPAGE="
-	https://pythonhosted.org/pytz/
-	https://pypi.org/project/pytz/
-"
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND="
-	|| (
-		>=sys-libs/timezone-data-2017a
-		sys-libs/glibc[vanilla]
-	)
-"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	"${EPYTHON}" pytz/tests/test_tzinfo.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytz/pytz-2022.6.ebuild b/dev-python/pytz/pytz-2022.6.ebuild
index 45af071f312d..54565df103f4 100644
--- a/dev-python/pytz/pytz-2022.6.ebuild
+++ b/dev-python/pytz/pytz-2022.6.ebuild
@@ -19,7 +19,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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 DEPEND="
 	|| (
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index 7e0430f254de..2e54928a1d1b 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,5 +1,3 @@
-DIST readme_renderer-37.2.tar.gz 29493 BLAKE2B c517a25b2f48646a38f12cba313fec8e9292c773704f4a7a4790e14d1d403c73ca64883894d1193de582ac80573f331df9f9779d329c67d8e675a777b38e5d46 SHA512 d8bc03ba77eec8ee493705ed9b19d4695630b2f07e342f0e27a3d23c1e9c74e1d33e8a091ef5a82f42de154e7c11da33850c2e158057000c9bc097299f8c4fab
 DIST readme_renderer-37.3.tar.gz 29718 BLAKE2B f0fdf0689f74b444ca1ae84c4e43f3bff5b5725052a3d83ad001d19b8a4180f6de95f41dc5cbaa6c7fd93bef6b593f1107674fce10f60148cdaa703cc480b789 SHA512 e4c060074cae3d23a10ef46f64d1426dab73e1618fe0920758d701d7ec4ced8120d4791ab29691306d0ab36f45447b4dc42be20d086b2f514111ef091204491c
-EBUILD readme_renderer-37.2.ebuild 766 BLAKE2B 612e6ccfa4f7f78db53879c0768dec93d89d03400d1aeb93d68b8de7d422926f87ad6c0c91659aec5485abc422d9f244add17a03fbdbe112f413efc06fc57d6e SHA512 26904fe2270ba5a4613fbeab79da6b8412b34b7cecb6d1454d88db3253f503b301ac89a35b2eb20850d8e9943c02e815b3645a1025d3aaf2b24acf8aa4f40f7f
-EBUILD readme_renderer-37.3.ebuild 843 BLAKE2B c8f798bcc256174b12d6f71806d8c561b3e71d8c72e0e8cd75e4e54ddfb3848dd451a76f85f1c978fcc005f8b368c705d0ca87ebce5ca402eaccaa26e0f5ebaf SHA512 7432a2b1f9a155f395529df9d83968e5a3101b777a259586712821f15caa364277bd49aa36ff529bc03a8153f46cdd5ec69e6f7149de7ab3f7cdc15dc1058afe
+EBUILD readme_renderer-37.3.ebuild 835 BLAKE2B 1bbc89e78a0068f6f328364b0ed1e40285552d6546645683fcb5d32b10cee2bf7033db0376b50b3bbfb647cf1421fcf6a2405ce25564fcae713b2c73fce13f25 SHA512 9d535ee05222adf0d12bc4ea5173d91f9005589b7c9f2fdfb9444cd75587d6cca4fe24799bba89197da952da648a3548ff97a1db0bf6b093b8469c4b6f14e24b
 MISC metadata.xml 416 BLAKE2B 1441314990a3eca464ea227d76e458a42b3c9bf44076f64a59d22cdddaace1fdbe219b3e6f8fb963cc40174aaf473852698facbc8816f55278821df0f452a1ed SHA512 50abec4287629f7982049959696e8f21e0a773618c40b42815d53e709d080ff6051235453a4659c50bd4cf856829d0489cdd0f4e1f56cc65f28d5de45d849b86
diff --git a/dev-python/readme_renderer/readme_renderer-37.2.ebuild b/dev-python/readme_renderer/readme_renderer-37.2.ebuild
deleted file mode 100644
index 3bc8fac4e0dd..000000000000
--- a/dev-python/readme_renderer/readme_renderer-37.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
-HOMEPAGE="
-	https://github.com/pypa/readme_renderer/
-	https://pypi.org/project/readme-renderer/
-"
-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 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.5.2[${PYTHON_USEDEP}]
-"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
diff --git a/dev-python/readme_renderer/readme_renderer-37.3.ebuild b/dev-python/readme_renderer/readme_renderer-37.3.ebuild
index 5c81623944c3..2a5bbeaaed0b 100644
--- a/dev-python/readme_renderer/readme_renderer-37.3.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-37.3.ebuild
@@ -17,7 +17,7 @@ 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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 986beb39c2f5..a0d64d7c6f62 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -2,6 +2,6 @@ AUX regex-2021.4.4-pypy3-fix-test_empty_array.patch 1103 BLAKE2B 2498de0ebaa68fc
 AUX regex-2021.4.4-pypy3-fix-test_issue_18468.patch 1078 BLAKE2B 3545ee5167790fbb1d068afdac3f6dbba28ea92d6c1d4ef31b60a8406061deb8609d7fd9a659b45715d4af0f2deb1da0ef9865aebe58919c2b392e2a1a833cae SHA512 182628709ef0f373037acf197c2ade3215684b2c805a96a600a3dfcb092e6fd134c261330ed76c7c248e72f439e464ccde432444bfe4a9610bd36c777bf45c9d
 DIST regex-2022.10.31.tar.gz 391554 BLAKE2B 060822767ab28e26d000faa198f4226ba1e4600141a7b3e0f656df8d004b5007a0a7934057e608d524f6a21421573fbeb8a1be208ce69ba2d912a55d19fb3f22 SHA512 d461cddea75f2a8ceb749d7e1a54f3543fe4cb3418976ded26101cb53c333f0e2eabaa824239c89c50c94c6736409566215cb7b6c6c3a0544678d10b6af76cc5
 DIST regex-2022.9.13.tar.gz 391531 BLAKE2B 83e8f1aabe15e65fb4f96072be3ccd5ddf1dcbffeeecb9d7a2889fb910d4095e902bfd45f43184b0df115b1116ddfc3e67d68a2fa903f19a8cbc6844ce023a3b SHA512 a991d6358001297db2b57855e76b8de680941ddefe9d18af1e9ee033da4e519df7b4553d138e7adf32b30593290284c91a954363bcc30b215409efe121e41e69
-EBUILD regex-2022.10.31.ebuild 897 BLAKE2B 409dbb1b548b25d5ac390fdd799e88f54255462fe43a054bb079396a58d2124f06b619c9f97bd95e09a84fec93ed76f0904ace13a81f40ba34ab54fedc885e30 SHA512 0c57dc92862339020b9caf9e727f75f577fbcc3710dfbc8657ba403d7791e2a7a42e0866d6fe82640b2d674167c60ac51e259dd03ed2acf8260435f0b352fbfd
+EBUILD regex-2022.10.31.ebuild 891 BLAKE2B 687c1e7b86d059451234fd4b33cc247608ba7badaf28846c1dcec990c4798f23d8388265a52d7da703b5c74b57d890b926fae2b619b7c125e0f5596435078953 SHA512 ec2415819d1c4a370bb1199a8aeaa33977af29a32d2fcd0d5ddbaa7824b89c337157f9d4c011081df719acd5aedc88fd040c09bc3486e1d05f450e4988ab04e8
 EBUILD regex-2022.9.13.ebuild 889 BLAKE2B 2f4739ef643cd8ce3dce81e94160c6943bfb5f5309f62306bad54dbdf0ff0035fdac591d776c5da341060b4da89d12396b54e2436855bb85e4e449c454e6552d SHA512 e95dc22617b73dcd0e01504dd8e974f09260c79f0935fe9cc9d6a2842640556ed1f34d619fdf31917ae2d466dda860ed02fb9539178c5700ed26ec1132c738b0
 MISC metadata.xml 385 BLAKE2B 90c9075dcf3be9bd447746b249c438f50bc84a7c6c63051e808c5feb19b2c6208f85a681e449a025fe43cd0d5b2ab541752966b04b787052d78b92d5230d8e62 SHA512 f554035e72bcfff83e693f3651198f09fd354babfbadd5fef26dca3015ef8cc00c47072648794123c69bbd12c637eeaf9e9471680bab847ec701da2146462817
diff --git a/dev-python/regex/regex-2022.10.31.ebuild b/dev-python/regex/regex-2022.10.31.ebuild
index d864a4bd8ea3..11f0d43d5077 100644
--- a/dev-python/regex/regex-2022.10.31.ebuild
+++ b/dev-python/regex/regex-2022.10.31.ebuild
@@ -17,7 +17,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index 0ebcbfea6077..3b78396080ae 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -1,3 +1,3 @@
 DIST python-rsa-version-4.9.gh.tar.gz 59238 BLAKE2B 077679131fcd29a0f396ad9db45db9a6891be45afe96a328f66191d747f10d36a3248b0929d5c8270ff32a39d08a9c15d80973ba3af83f7368e792cf003f186a SHA512 0b49c1e5ffb6235ccb9e34c81ad717276c04956e21dd54c08b5cae7dd28ecc115235b2793c8bfc2fbb46a260e574d35cab23729567efeee108b79544793e60ad
-EBUILD rsa-4.9.ebuild 767 BLAKE2B 5181c8381bfba94610bd72f4ddfebcbd593cafcc98f60f3d57f6efff757b7e51935e8501f41da60d6f2b4521a2cbbe60707e9f0fd6721ed22cb2eacce94890a3 SHA512 89fc7151041c3524914bc56b69cf18a5706c3d60f17326b3ca62d3eb4923cec942a236d64ade37a79a3395a7cc4c5fe6ed46c7a1d73fa7ab698d911ca8e7edf3
+EBUILD rsa-4.9.ebuild 766 BLAKE2B 0448ace41216276d018dca5eb0b53eea978347ecef6698289ef203abe30ff82577b09821576d86b6d88438e7376713bf27c3608603084f4b82b3b3d9385df89a SHA512 b2ae1637a0017c7f599f86069557ace6142c0ed561a2a055cfe9985000f886ca5f983e7dd31faedc432341a63d1151b1bd76a8a88953f901045b587176aea575
 MISC metadata.xml 463 BLAKE2B 79c674f37808820e4b946f0686545ebc2cdc2358934681a9f0d4cd300716a7bf0f0477c4c9af5ae4e054ef3f25cb4b115609f5f867cb8d4182120e8bd7cbee1a SHA512 07344efe5f1f670fa6e20ffa2308cd80376f9dc990d720f681d79a93c404490bbad319a0f9636bb0d7fea30167b9d139f2dd11b367c8a79b0a3d12ed8d1be8f7
diff --git a/dev-python/rsa/rsa-4.9.ebuild b/dev-python/rsa/rsa-4.9.ebuild
index fffb3c5c50ad..afcaf58db55c 100644
--- a/dev-python/rsa/rsa-4.9.ebuild
+++ b/dev-python/rsa/rsa-4.9.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
index 31050d952b27..6384819a1894 100644
--- a/dev-python/sphinx_rtd_theme/Manifest
+++ b/dev-python/sphinx_rtd_theme/Manifest
@@ -1,7 +1,3 @@
-DIST sphinx_rtd_theme-1.0.0.tar.gz 2780623 BLAKE2B 02e72ddade0632423d21e512ab86fbdcc9f18eddbef328ba766f1b06a49c838808af4ee000e57c8f0f40112569b35c1b62c9c0c8853c237fd2ddb6de76d48a21 SHA512 06025445e1358c994bf0c15a382ec8f8f3f2114dfac19f340585a3660d91a279100c2d16ef665d9eb8d38b0e4ed264e96d3ac6814dd01b9430d2f8a0d8275178
-DIST sphinx_rtd_theme-1.1.0.tar.gz 2782178 BLAKE2B d121a9eb2514c5f23260bdb97e360d7a611b895a35155592671fab557995904d6ba2db8fdc83cec390acbf800442289138995f680655cc7a1d9ff9edfcaf557c SHA512 49a87d97a0d4edd8e5e1244fb02dcf37d06e4d64a97b939678ba006b1159b06f173d18a7f5b5eaefade8818a5bee1bb9455131bfd0ec54d42063295595d45b14
 DIST sphinx_rtd_theme-1.1.1.tar.gz 2783043 BLAKE2B c132cc4bba5459ca29740222cc917aac0fa5afb26748b1bd3d457ed0a02e63cd973deecd9a3d509187f54ae85798cb63fdfaa293615eae278228753808fd8c50 SHA512 c3e6e3a9d25b9c48a9830e696ca5c8f0c185a0328c76032cbe6dcfb93cda7ad9a724ec4e0e2a99079db28f35aa61ef2f569b87ce98a01c47a9701a6070bc395e
-EBUILD sphinx_rtd_theme-1.0.0-r1.ebuild 974 BLAKE2B f2c4c183f0349a2fad3f84098ab4bfcb54fa093fbee2dd488002ff01605c64e3c8a05604dc83401fcc6612135f97d1250330e2a2ab11683c70169b42a878d60b SHA512 6a4052c1ecbd112175e23a395ca125605091bb75e08a123372d6c0380767b5b433904cff151ed05727a5effe3237add32ff9110766c62a139816ffb325f729fe
-EBUILD sphinx_rtd_theme-1.1.0.ebuild 983 BLAKE2B 999586ff23b7c3fdee96950cc2a540e31dcdccbfe3b54c88885a7171680ae25375daf4169d9495b59f1fad8243c7114aee287d8a9d56e98ab8f6e284e31076df SHA512 29088c80f9202f375d59879056a5fb66089b2aa4906635865d7bd6e032b73eec9ddcf20592beb5560512d232b10a9805a31bb9a2faefa919ef50345028c5955a
-EBUILD sphinx_rtd_theme-1.1.1.ebuild 983 BLAKE2B 999586ff23b7c3fdee96950cc2a540e31dcdccbfe3b54c88885a7171680ae25375daf4169d9495b59f1fad8243c7114aee287d8a9d56e98ab8f6e284e31076df SHA512 29088c80f9202f375d59879056a5fb66089b2aa4906635865d7bd6e032b73eec9ddcf20592beb5560512d232b10a9805a31bb9a2faefa919ef50345028c5955a
+EBUILD sphinx_rtd_theme-1.1.1.ebuild 975 BLAKE2B 6bf004c00a2d4cecfc7fe6d6419190ff019a4052c38380898f0db814def59f776a9d6cacbbb6710cedb66141b437d1f2567884126e633c90c9a0c52a38795dbf SHA512 73d3d6b2c02af3ac597f4d6ceee35b7e97147bbcb4be304a2359814481879a531948f8efa013154e87280c18f3c0f8571c9f1c8ecfda6571cff968aff121c75b
 MISC metadata.xml 412 BLAKE2B bed5105c13db0478a4b6129d634b8028b80cfb4e7969705ed0a693286d7f1645608ba6e6066cd3219c267c097bc1bd7d1ee13531d91d8cb4fdf6a5f107ef2252 SHA512 a0e7ce66d5f68145471452e49c173aaddcb502c9ba35af543240e5fbe9b24c0bd94ecf5782d5d81c23b3e63b80cf0cab4e39d279fb635f17275702e9a56bd5bc
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0-r1.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0-r1.ebuild
deleted file mode 100644
index e80638521850..000000000000
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0-r1.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
-
-DESCRIPTION="ReadTheDocs.org theme for Sphinx"
-HOMEPAGE="
-	https://github.com/readthedocs/sphinx_rtd_theme/
-	https://pypi.org/project/sphinx-rtd-theme/
-"
-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-macos"
-IUSE=""
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/readthedocs-sphinx-ext[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin docutils
-	sed -i -e '/docutils/s:<0.18::' setup.py || die
-	distutils-r1_src_prepare
-
-	# CI=1 disables rebuilding webpack that requires npm use
-	# yes, that surely makes sense
-	export CI=1
-}
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.1.0.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.1.0.ebuild
deleted file mode 100644
index 849354151794..000000000000
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.1.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ReadTheDocs.org theme for Sphinx"
-HOMEPAGE="
-	https://github.com/readthedocs/sphinx_rtd_theme/
-	https://pypi.org/project/sphinx-rtd-theme/
-"
-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-macos"
-IUSE=""
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/readthedocs-sphinx-ext[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin docutils
-	sed -i -e '/docutils/s:<0.18::' setup.cfg || die
-	distutils-r1_src_prepare
-
-	# CI=1 disables rebuilding webpack that requires npm use
-	# yes, that surely makes sense
-	export CI=1
-}
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.1.1.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.1.1.ebuild
index 849354151794..ec0c4dc002de 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.1.1.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.1.1.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 ~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"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index 271623df2dd3..344a3038e8e1 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -1,5 +1,5 @@
 DIST statsmodels-0.13.2.tar.gz 17874260 BLAKE2B 93f7a308217ba938b3cd2e11d75e8f5ad19e2d4e6ab2abbea702143129bb53e7b9be54864375dbfec805624538bc73850357eb944d6c9a4c1252cc8a7606b904 SHA512 79d8dd63f667d4019e462d93e007a5ef8e11972fe35fb4d657931d6d68f3e35d29978a865682133db12fd6742f3362c2d77dfb5735c82ae454570388dd84d59a
 DIST statsmodels-0.13.5.tar.gz 18364957 BLAKE2B 8357416b015b152612aca88a9ff42b81db4d97f61b1c255bc2baf8978440cd43fa1a5301d1c60e92b3a634008c5c001c00770685864d296587ff75e37d29ff4f SHA512 9aeeea80c69f52459140179523a0155429834b2951325c9781b28f8c4cbbd0593ff1867e2212078f2b898e4da953689c2fe78183d3c7959caa874e9d758b4ea4
 EBUILD statsmodels-0.13.2.ebuild 2152 BLAKE2B 563fb354b79bc0aa427e7c80c4fdf207e65a65d463685f2cf13293f2fb4a84923b70edaca90b3861bc7bb0f793fc8dc0b69e34118ff0b2af94ac4cfa8b7ac40f SHA512 b2cd81843b6f876bd59808a9f0f66dd4c506f613b4420eb4a45f37b35945670ccebe1bd4d1276dc55b7edb0b085669fa859a073e3da5a04acde50f9e93f3b97e
-EBUILD statsmodels-0.13.5.ebuild 2193 BLAKE2B 91aa90e93f387db23ba722e556a47d10a4e8a26ab87c5fe40ff7fc78f9ae9757ec67d6ac9ca99e322d460386c93cac7076b2342d260bfa51cd77de10328e6229 SHA512 63de6707b6b7012d365a1cb6f1f5fe3acfcc1c02c043e023636f0f1fceb3940b335b149e1a76c45f446e5dd28422b9d1ae75ec1f8948abd8a65de7c2a2f539d0
+EBUILD statsmodels-0.13.5.ebuild 2190 BLAKE2B 5d05d24d61fd6e2efe80d98268f3318b505e59a73fd29648af5eb8b060aca50b2628ab3b50506f2150797cb65ea4f2cde1d00a6cf50d5478f6a5b70ecdb5577f SHA512 33d60105099754cef5b3775ee88a53b212bfe7f2290f2fe00877e156dbd2f5d7de21135f4a35be2872c4a0a60d5cc2dbee4fa3924f961b69f55883129a58e668
 MISC metadata.xml 1356 BLAKE2B 0eca47b1f489954f26e6a726216f678ea5f9284ce52c00df51117d3414c549e9e43f5f307cff8fc17eb897f00abeb23cdeb4f70c2ec594860875464e0955f13a SHA512 a59057a6fad33b7dddbf7ad1b822934c9f12a45a829bea039f8773c5c778639aa3273d623ec78df653cfb2c4e88355f4a8cb809f4cb80b9dd3e7616cd06cc376
diff --git a/dev-python/statsmodels/statsmodels-0.13.5.ebuild b/dev-python/statsmodels/statsmodels-0.13.5.ebuild
index 22dbb4d2b0a2..2717477cfff3 100644
--- a/dev-python/statsmodels/statsmodels-0.13.5.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.13.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/subunit/Manifest b/dev-python/subunit/Manifest
index 1041359d71b8..e9534763c394 100644
--- a/dev-python/subunit/Manifest
+++ b/dev-python/subunit/Manifest
@@ -4,5 +4,5 @@ DIST subunit-1.4.1.gh.tar.gz 112188 BLAKE2B dd09882f13b52e8c1f34f91ee49726f75f47
 DIST subunit-1.4.2.gh.tar.gz 112283 BLAKE2B 195318de120f1fd7cff7173ba056bf5b37983db3527ca7d0f6be7ae9889b99e9c143c92a71d7bd1bada9458b7af402bfbee4153292e58a546e88ca2212ee547b SHA512 21413f0ed26f5f0572249ff4bcf948ea25d9185a1df73421836b9b21e11f323300f93a0275f0d64dc7c81a8e038fa0661a34f818bb038abf79c0637e051bc69e
 EBUILD subunit-1.4.0_p20210729.ebuild 2261 BLAKE2B cc3082e3d24817d6712840460d10d525ab998e43ffe62c726153e187c50602f54fccafa814f7f59e963a36fbe275637392ff86fb3f649168e8e4bb22b49ee015 SHA512 64edea1ae8fb8c95a7793954857f2d464a4591b971e03ee9e91fcbb17b73be1d3377792ad41a74423b1ce2af9831eee1635f26255df60db009ebe0644a0dac1b
 EBUILD subunit-1.4.1.ebuild 2048 BLAKE2B 8f47bd0d7c11626d1a546303c912a0a1597ce3d31e5a365a6e373a10c0083e4fd899750638dc5ae797062ce4de68e3cfe937b4e1a79ee6e13b05d831f560827e SHA512 d444d1c5ec7e46ea36704c7e5389bc77f7ff4125e08e1b112cf72d9a1d72de04945d754c77a5bb568f26a539262dbd4162187c97d35ce55f61c00711e0b27c81
-EBUILD subunit-1.4.2.ebuild 2048 BLAKE2B 8f47bd0d7c11626d1a546303c912a0a1597ce3d31e5a365a6e373a10c0083e4fd899750638dc5ae797062ce4de68e3cfe937b4e1a79ee6e13b05d831f560827e SHA512 d444d1c5ec7e46ea36704c7e5389bc77f7ff4125e08e1b112cf72d9a1d72de04945d754c77a5bb568f26a539262dbd4162187c97d35ce55f61c00711e0b27c81
+EBUILD subunit-1.4.2.ebuild 2042 BLAKE2B 9a703101a42d46fb91594f276e78e07293cbbbfc2cad35ec08bdcb369390d2c8dadd75aa3207414b63a81bd71fc83f99f1ce62a08e1796f3a53b8dbde4c89230 SHA512 2f87d962bf3242654d71f83484ae6ce9a219c6270844ae067c704c37be61d66042aaf82815acd018aa8a0c80fb0cda324764c286faa61434357a14a888e38444
 MISC metadata.xml 536 BLAKE2B a2d8868bf91b862ea393f908c5ae6924dc70fcfa5e2d58692d61c1a45ae33bb9301c82fc032c5951491857da923bdba56f2ed11c149df7b11a4fd9037d1e5a23 SHA512 15d6a7804d14048e959dcaee03bcb2069110ab930368b2b9c31c78b610fd35beb1f714e3d109de2903dba62600b0013d6ef7f5794e828dcc6b34755e35d1836f
diff --git a/dev-python/subunit/subunit-1.4.2.ebuild b/dev-python/subunit/subunit-1.4.2.ebuild
index 9f172a5eae8c..546dbd5e7490 100644
--- a/dev-python/subunit/subunit-1.4.2.ebuild
+++ b/dev-python/subunit/subunit-1.4.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 BSD"
 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="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/termcolor/Manifest b/dev-python/termcolor/Manifest
index bcc9d99d6152..76a5fedc81d5 100644
--- a/dev-python/termcolor/Manifest
+++ b/dev-python/termcolor/Manifest
@@ -1,7 +1,3 @@
-DIST python-termcolor-2.1.0.tar.gz 10665 BLAKE2B f3f08d3a490d8e20e5da0b7e639fa0ff780fcdf9c41bce2b962b157437b6880cccace05668e71808598d51eb00a043c9dad4800aaa1f734a931c0a01378ad8f7 SHA512 9dd1b8f1d137fc66d77f26913297a6c82eb25b3fd7ae1c5e639cd023eff02f155363ed5b731ff36bcb4281b7678d8e508fb8430ae0f89fa02b9c219e03f99e8f
 DIST python-termcolor-2.1.1.tar.gz 10831 BLAKE2B 0c5537f81234411ddb117266e45ac7ec8ea0af0f62e08883f4893aec21d83d03534200d1ad1633bed4c57cfd7a83305aaff5af7b0574d948854b7762c9e631f4 SHA512 f652d8ce07e192820c57d62fe76495e81e859a709e61b8a1418985da51a92ce8b71865b362d10331d40a914497fa2bf81e95c924c88ae281663a430ef065ca18
-DIST termcolor-2.0.1.tar.gz 9693 BLAKE2B 68592597da70957bd3f03a9a76e546ab17f7c437d00aca53325a617b02c5600679c9912c0ca8d9f7ade03a042cd657e86b1e12a588ec1eeafdfa57f3f5f16372 SHA512 e49f05e587fb420aa373d1644d66e4832a701385fc1da85470fa0d811770f73908ca139e1c1e9cb968cbc74285b038833f371854edc6e20bc22059b31ef1a1ed
-EBUILD termcolor-2.0.1.ebuild 643 BLAKE2B ea79175a88c94c4b9530e43b04b4e5da9ab22db6e00718163eed343d39a4f156736414f20fa6de77e957b96299dd2ac2d9cf923d1e75d41ae60e0fdb6ee9fff8 SHA512 bce8238eabe15a6ee0dcc328ccc45799e1a0ac510d0cd8c5c532d56302a95b045743698d2381f2aa7d6068641db3d3e030ca6e5d3a00010516b5155b5d28c667
-EBUILD termcolor-2.1.0.ebuild 730 BLAKE2B b549229497c872ceb8295b95ec1245806918e9dbea2b999922407584f574ab71203c90bf10ab4b082cdc0eef03452683cbb6ba10fbc89bcad5d609860d901847 SHA512 0d52e6f5a90cf759dbbc667dc6caceb3a518f53c21168b6a2819d9cb619482fbe3507247dfe8a26d2f226e58972f0ddd5c6d475b5203be4f1c40abaa63028797
-EBUILD termcolor-2.1.1.ebuild 730 BLAKE2B b549229497c872ceb8295b95ec1245806918e9dbea2b999922407584f574ab71203c90bf10ab4b082cdc0eef03452683cbb6ba10fbc89bcad5d609860d901847 SHA512 0d52e6f5a90cf759dbbc667dc6caceb3a518f53c21168b6a2819d9cb619482fbe3507247dfe8a26d2f226e58972f0ddd5c6d475b5203be4f1c40abaa63028797
+EBUILD termcolor-2.1.1.ebuild 722 BLAKE2B 48c211d3a182b59902b1f02e3dd3a1299575fa301d8f70f78965b0e71c13618c78f0fed529206d2eed29e9f9d3fffbf0cd1e1a949f80d3148d1331876ebd662a SHA512 e46aa7860aa4313dc4cd5d62806a16631e70af477fe89522ab7a8ff3a636744ef9a38d19ea0c271c8c919167fff4cd7e397a6dda06638f001c704bc23d3e7274
 MISC metadata.xml 530 BLAKE2B 6a8fc517eae6f2bbc099ba4e24cfdd48e6baf092baaef4921e9665521eec54c741a7cae9bb4d03cadedb845f5d5cd631c46544709c3efc4d4103408a57f35c26 SHA512 c2bf2f0aa44c39d4c9b2865c7f0a8abea0956bbcaed38485de60b7baedcda0df2f71d34e4a6bb5355eccbaa8dcc21e8c1b47d948d968668e3e55c3e8d7f3efa4
diff --git a/dev-python/termcolor/termcolor-2.0.1.ebuild b/dev-python/termcolor/termcolor-2.0.1.ebuild
deleted file mode 100644
index 83e871771d98..000000000000
--- a/dev-python/termcolor/termcolor-2.0.1.ebuild
+++ /dev/null
@@ -1,26 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ANSI Color formatting for output in terminal"
-HOMEPAGE="
-	https://github.com/termcolor/termcolor/
-	https://pypi.org/project/termcolor/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/termcolor/termcolor-2.1.0.ebuild b/dev-python/termcolor/termcolor-2.1.0.ebuild
deleted file mode 100644
index d29179a49c72..000000000000
--- a/dev-python/termcolor/termcolor-2.1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ANSI Color formatting for output in terminal"
-HOMEPAGE="
-	https://github.com/termcolor/termcolor/
-	https://pypi.org/project/termcolor/
-"
-# rename is for avoiding conflict with dev-cpp/termcolor
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> python-${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/termcolor/termcolor-2.1.1.ebuild b/dev-python/termcolor/termcolor-2.1.1.ebuild
index d29179a49c72..d99992bf3aad 100644
--- a/dev-python/termcolor/termcolor-2.1.1.ebuild
+++ b/dev-python/termcolor/termcolor-2.1.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> python-${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index a6be00512c03..ffe3604d3e2c 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,5 +1,3 @@
-DIST testfixtures-7.0.0.tar.gz 126163 BLAKE2B e9f31180878e7645a62b93242344c6cd8335067cf8158b03dbfb46b4ab79d57380809a20d6fdc6a6d4b0aca2d22f5d7c18636607a54c70de4bea39e79a9df6b1 SHA512 5fe56e0a654586c266aab5cebcdbf1e6b9988227605395c3198c759759be0fa98ff3c0a1885711ede5ef6d262a60cd19a29dc6e7a90a1f9f8b57df3cb2d9b97b
 DIST testfixtures-7.0.3.tar.gz 127280 BLAKE2B 14725f5a04a77453f1a6e1cb07b2ee8e907dcf49a845c9c75951d77160448c1037c7bfa0a759cf4061d92448203b8f4b14d611cdde32f46269b484985e654e67 SHA512 875aba5102bd43800b2f6464dc93185cd2bb5e117523cb4b3c458b2f8f8eb71f309c0a5266eeca70a7928f9992ccfe7807c67e42531c17fd82ca1c3b838d02a5
-EBUILD testfixtures-7.0.0.ebuild 1309 BLAKE2B e36f0bbe797a2bd27e3b4a8f192196bc2ddedd5b823eb488b951b296115bbc2cdd7d27e73902a70feebabbcdb1f429fc2193b85c26d09a28e7eb2577cc32a42d SHA512 b8d55688da3922d7bd3c03753a596b189f59981d3d86a31aa51a91796cccda3b7888166a4f47595eda1d4fbb77932b8ba14b79c9dea6cd9d01d1203210a41d6a
-EBUILD testfixtures-7.0.3.ebuild 1331 BLAKE2B 2b0d2fe30048503f0d4638a951dfa0b11c234e92b898bee5497289410dbd4e628ce77d1c83bccddcb8d72e49fe614d48ef6bed887e6d2b460fea7e5b1db630af SHA512 2c94440eb400cf6e954ba76c879d40d28952b85969245b55ab37285bbc12cc6cf24044f51fa19b6a3e9a09b4b050942fed163fd81fa90fd2a6ced1321ce7aabf
+EBUILD testfixtures-7.0.3.ebuild 1328 BLAKE2B aba2dc3165e242248bb3d81d7902df5563d99a9d708b10515e0dad53493d22a951f66095643eb5e8b017c7d50ec97b41bb0bda816c58929bd0dfa2ab4e1390d8 SHA512 b4b682c8dfa267e32a948342c9ccf9986dae524655324ac4928430604f0c98aa957a175ef5fbfff0cb82eb936485de2aaa2623783c9f128f27facf42ab01386b
 MISC metadata.xml 416 BLAKE2B 19f5d275458874364d2719ecf363f7a5627f9e612b7d3a3f2c075e306063ed899dec0b2e59ea5e5d7ba65209c9a6d91045d80b2fe50e74278e61247d0426b940 SHA512 8a5776feee4d6758da67dc0b413e2d0ddc0c843075ca96c9b44adace1f7669a6abf820c5b73b86652b27e9feed19a4a30e1004a021b24bda0829b5690a1687ec
diff --git a/dev-python/testfixtures/testfixtures-7.0.0.ebuild b/dev-python/testfixtures/testfixtures-7.0.0.ebuild
deleted file mode 100644
index 60bd7882d6a8..000000000000
--- a/dev-python/testfixtures/testfixtures-7.0.0.ebuild
+++ /dev/null
@@ -1,52 +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="A collection of helpers and mock objects for unit tests and doc tests"
-HOMEPAGE="https://pypi.org/project/testfixtures/
-	https://github.com/Simplistix/testfixtures"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/sybil[${PYTHON_USEDEP}]
-		>=dev-python/twisted-18[${PYTHON_USEDEP}]
-		dev-python/zope-component[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# kill weird way of declaring build deps
-	sed -e '/build=/d' -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTHONPATH="."
-	local -x DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings
-
-	local EPYTEST_DESELECT=(
-		# TODO
-		testfixtures/tests/test_shouldwarn.py::ShouldWarnTests::test_filter_missing
-		testfixtures/tests/test_shouldwarn.py::ShouldWarnTests::test_filter_present
-	)
-
-	epytest
-}
diff --git a/dev-python/testfixtures/testfixtures-7.0.3.ebuild b/dev-python/testfixtures/testfixtures-7.0.3.ebuild
index 2cfe8b90ee71..9e2e8ea38b8b 100644
--- a/dev-python/testfixtures/testfixtures-7.0.3.ebuild
+++ b/dev-python/testfixtures/testfixtures-7.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 52c08574b53a..7f5302809a4e 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,7 +1,5 @@
-DIST translate-3.7.3.gh.tar.gz 1153916 BLAKE2B 476b8ca3fd277f56cc73d8fc8f5adbf9ddb442b404c586627cc91af228ae08bbb87310219c910701de4938cb9977b386d0ed7b503901369a1ac5069664ebbd25 SHA512 ee339300e798fc043b1ac5455366e96bd5dab08306855a84cdcfd6d5176560366c3538810e94b7477704a5d1ed218e5c85f735979f48cd33242791ce1ad39c3b
 DIST translate-3.7.4.gh.tar.gz 1153973 BLAKE2B 55fd5d8f8d9c53d3aabaaece54272650fc412c778cbbc86d83b391946aebb627c7ad3dd8e10d5bc0bd6380f8396fd5c373a47d9323365886a50299f392238b4c SHA512 0eb93712de9fd7324e0e99cd31996694356452df51ac9f081f27f7bf15391e9630d4b042e2af4ca5b06d43d92f35cfd8806f18ad936c293bd08bdd465b09789e
 DIST translate-3.8.0.gh.tar.gz 1155430 BLAKE2B 53b9964373c49d2eaaa11f13c0a80aefef8572077561fbc2666b5c4f2f7b7731cda9ef665b0f077a84237bb7ccc6251b23308c18672d6397b08a6a64e91426bb SHA512 9ebacfa76e16e179cb000e9f60b1f91ddacf70644764d215df43c55876bc684c6e4c2c1d52e2c1aa00c6e757f87167f04ee7dac7ce996c5b9d3d39aff4bb7484
-EBUILD translate-toolkit-3.7.3.ebuild 2393 BLAKE2B 1232b4859241b692c082570966e4376d46964f9b1e48525a2c66501e7bf7b68b1603c84705ef134dafe046bf28cdb8310c837a7ce9836375a43bf32d19e70b50 SHA512 d59ec6510c48b9d957aeec1032ea43096b78c4f2c06a9349d2d0ce49baa826bcd0b6765acf7e878326fccdba104456930aedcfdf588fa463b732b0033b8fb1dc
-EBUILD translate-toolkit-3.7.4.ebuild 2439 BLAKE2B 347bcffc35645fcf5e107fb2cd827d1ff2d6d9333f90a98ec207b6a5b43b39f97c83394027dde024290fdbb5fb280738747a86957ff64bb8a3a34f2513a989be SHA512 7fb104828cc677aadf5531879f1df00e0277a178b4ee0cac016c8fb857b72bb35ad6f2834eb30a730aa5fd536b6082e06fc2acedc0d84faffd5a47a781c74f42
+EBUILD translate-toolkit-3.7.4.ebuild 2436 BLAKE2B 3d1ddcb4370a4128b2035a32dcfd0203f85d49de113cf08d13c89800f4ce379a74232bf61456a9d258e02c281c42127cdf4a0808cc9fb2f0c33cdfb620e3b31a SHA512 ae8843c46a32d7a7eceee1c697dc88d4cc57c66af29781d8437cf1267056c97a9466fa03a5f3c4ae59b095453f12113d645c533c4457128bb8b131edb9f61237
 EBUILD translate-toolkit-3.8.0.ebuild 2439 BLAKE2B 347bcffc35645fcf5e107fb2cd827d1ff2d6d9333f90a98ec207b6a5b43b39f97c83394027dde024290fdbb5fb280738747a86957ff64bb8a3a34f2513a989be SHA512 7fb104828cc677aadf5531879f1df00e0277a178b4ee0cac016c8fb857b72bb35ad6f2834eb30a730aa5fd536b6082e06fc2acedc0d84faffd5a47a781c74f42
 MISC metadata.xml 756 BLAKE2B 06f64f258d362954f99f7e9eee241eb3dddc6b00b9069df2ad977d28b5cf06f9c8ee2246ee5958600b5ac86297968d7aaced6b6420dca4ed507c441c58c61ca9 SHA512 80374c40513ca450f97e3930929c1450e7438ea15830e60937952a6fccfd999675f2ca2056c5aa4e287ba256c6ec08a09d8f7adb8b2c5af8ca0cd595f34acd85
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.7.3.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.7.3.ebuild
deleted file mode 100644
index c7db5dea2e22..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.7.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-MY_P=translate-${PV}
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="
-	https://github.com/translate/translate/
-	https://pypi.org/project/translate-toolkit/
-"
-SRC_URI="
-	https://github.com/translate/translate/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+html +ical +ini +subtitles +yaml"
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/Levenshtein-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? ( dev-python/phply[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-bootstrap-theme
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-	)
-	local EPYTEST_IGNORE=(
-		# unpackaged fluent.*
-		translate/storage/test_fluent.py
-	)
-
-	if ! use ini; then
-		EPYTEST_IGNORE+=(
-			translate/convert/test_ini2po.py
-			translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		EPYTEST_IGNORE+=(
-			translate/storage/test_subtitles.py
-		)
-	fi
-
-	# translate/storage/test_mo.py needs 'pocompile'
-	distutils_install_for_testing
-	epytest
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-
-	python_optimize
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.7.4.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.7.4.ebuild
index 51838ec8f6b4..ab3ee5931495 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.7.4.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.7.4.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 
 RDEPEND="
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 1534604039e9..3abb3e58d345 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -2,6 +2,6 @@ DIST trimesh-3.15.8.gh.tar.gz 11972365 BLAKE2B 2dd76c5f3c6949b79992dc23a4a80f3fc
 DIST trimesh-3.16.0.gh.tar.gz 11970053 BLAKE2B 3898dd2fd12fd070bc9a3a10e21bd255b75f7758deb38e0d36314524b4e24b7ada6514865c06677a1db39b1723b918e5ec6dcf491bf0c946c3e22495cf7dcd01 SHA512 7b56a5007614eae8a7cef1a69334ef3b21499572b5bfaa414bd29097a431266e1ec4d7dda540dbf502a57f5b0ce9d3fb3763675821714ac25d924e0d15e22c71
 DIST trimesh-3.17.1.gh.tar.gz 12653345 BLAKE2B df286132ca01e1a7e8c226b7c98ffa0682b9bf2e225c4114c88395611d1a65a02be4395940ad04b67ae3b6909664b46e18e9fd018d892c86f8f5a4fcfe532210 SHA512 8cbf0bedd21c0867c5aa307e9bb8b4e4caff2aabee89cfadfa11513293304caa4b6a5ecce21064b7fa157a2453b58d401eb6010d0ea32bbd5a99c3075f38b826
 EBUILD trimesh-3.15.8.ebuild 1863 BLAKE2B 7b8f0fc5c878d18b0ac6ff779474555e6ce2eef6f86fdf2da2e8e547351de67485d6d7c0092bc19e0e0be29ea9e0eb9c9180fb387c3075b8ee3f38869d4848d2 SHA512 f015e4269fa2282a8827c764d5d23c5fbbf5f1de5c509e651e29fb91983157114b13fb832c80a3600b6ae2ccf48a0e9b1ac15dd0880d56443c24632980e2b3e7
-EBUILD trimesh-3.16.0.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
+EBUILD trimesh-3.16.0.ebuild 1863 BLAKE2B 7b8f0fc5c878d18b0ac6ff779474555e6ce2eef6f86fdf2da2e8e547351de67485d6d7c0092bc19e0e0be29ea9e0eb9c9180fb387c3075b8ee3f38869d4848d2 SHA512 f015e4269fa2282a8827c764d5d23c5fbbf5f1de5c509e651e29fb91983157114b13fb832c80a3600b6ae2ccf48a0e9b1ac15dd0880d56443c24632980e2b3e7
 EBUILD trimesh-3.17.1.ebuild 2218 BLAKE2B 22a1b43f5e3e2164da691ff85ab46d48e40dd018cf20bac6fb125acb43cfcbd1a84fb9666d83cd7d2888f7c09c109953f18889a93f9a7bdba692af251d14fe5a SHA512 43394ec222da28ce755caaf42b692d030bddc7244f9c7e7a54b58bcc84ea19d1ccdb25c768aaa1e2d003a8db8ac82b7a31fd16849ebca82e9713241a5b163400
 MISC metadata.xml 495 BLAKE2B b8b403f7bfbac53ed234c2ba50324041502a28465d70e9406867f05741e0313845307491fcfd85f05e2993b21daf14117a4b6863b45422fd4c62c6e28902e3ff SHA512 3deec8ab4b513536a7fe182be8f1b96e06fd06b2480d3e516c2b3462cc26fcbdeb1d165b4d0297465e93c0cce584ab40a8f905b81a59dcb4040a39655028783d
diff --git a/dev-python/trimesh/trimesh-3.16.0.ebuild b/dev-python/trimesh/trimesh-3.16.0.ebuild
index 11e1a73dfac5..40922f106994 100644
--- a/dev-python/trimesh/trimesh-3.16.0.ebuild
+++ b/dev-python/trimesh/trimesh-3.16.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-python/u-msgpack-python/Manifest b/dev-python/u-msgpack-python/Manifest
index 78da4e818121..a4f8e3947641 100644
--- a/dev-python/u-msgpack-python/Manifest
+++ b/dev-python/u-msgpack-python/Manifest
@@ -1,5 +1,3 @@
-DIST u-msgpack-python-2.7.1.tar.gz 20631 BLAKE2B 10008f0653f969f1f5655c894be5b2497d692bf7ebf6d50de221695cab9c3a973c0870a8162efe6b61f2d9d4fb062c4130c07cddff8d64d6258d7d832efe4021 SHA512 0825b9edee28db2c954c9c0d64987a4640f11af52570c1ad834882a5fcd2e3a76eab3524cc3bb639cacfaf9eef27bf0a75656b4d02bca42b2d35b708348691d6
 DIST u-msgpack-python-2.7.2.tar.gz 20654 BLAKE2B 0365e4e778c9979d9154d8a267ba3bdaad9b2ef808723d2ae89e078fc0c8d76aebab234f1723985cf3b288274123e49571607599d6087ea234e3e8dc11e3a302 SHA512 e5d35bc03e5c23cfbaf9cc7f6459576e89b5dd19661ddff2a4ab5de2751e0b73c17e4685c6fead15ce2bf100b2250a3ba7cb10a7fa3f23debfa2141f4370b623
-EBUILD u-msgpack-python-2.7.1-r1.ebuild 617 BLAKE2B a1f2c314652b07fad55cc7351e29b50bb35bb8715aa3f74213cfa7e5bfc69923cdbaf05c824d60c9e2846125af69d5186e56e878e5a25e2c8e37451c0edaa3c4 SHA512 f8a9802f2bdc4c6f46265ce4439f2999b8de6141467fa4898f58b7c9e9add44dbf2fa4ca1084ae0dcfb790b555bf3738adc94c04f854f5457ef2eefd89768dcc
-EBUILD u-msgpack-python-2.7.2.ebuild 625 BLAKE2B 9f1ba57688d8538a1a001fbf113483c04935e574ed0ba242722b0b7fcfc13261b3966ac7604283fc5069de85a7fa080a586e1f4b992a04c6b6080e9c89f08fa9 SHA512 5572f6b22ac7e9e3ad1a70234f6e98fc3aeb4ffb3f2436ea2add4d85b045646a646b52fa53457ed0a330745eb9f5024c1264ca4641537d2f668fa8cf0fa01fb0
+EBUILD u-msgpack-python-2.7.2.ebuild 617 BLAKE2B a1f2c314652b07fad55cc7351e29b50bb35bb8715aa3f74213cfa7e5bfc69923cdbaf05c824d60c9e2846125af69d5186e56e878e5a25e2c8e37451c0edaa3c4 SHA512 f8a9802f2bdc4c6f46265ce4439f2999b8de6141467fa4898f58b7c9e9add44dbf2fa4ca1084ae0dcfb790b555bf3738adc94c04f854f5457ef2eefd89768dcc
 MISC metadata.xml 932 BLAKE2B 6c35c0276d1f132074198ec85c5b80967dda5eceef914b3e8c444c50926a83638a97754a483fbadd6246931af2eaf5de86c97d48ce6346da55dce1e577ea47eb SHA512 cdc35e790e2c454af8e82456fa438bfbe0c9e569001bd94d416b48d37f6ca8e78540fb76ad37c72c1cd632eff2f66d782e28265c5825f94f989786cebba59e67
diff --git a/dev-python/u-msgpack-python/u-msgpack-python-2.7.1-r1.ebuild b/dev-python/u-msgpack-python/u-msgpack-python-2.7.1-r1.ebuild
deleted file mode 100644
index a979a5962182..000000000000
--- a/dev-python/u-msgpack-python/u-msgpack-python-2.7.1-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A portable, lightweight MessagePack serializer and deserializer"
-HOMEPAGE="
-	https://github.com/vsergeev/u-msgpack-python/
-	https://pypi.org/project/u-msgpack-python/
-"
-SRC_URI="mirror://pypi/${P: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 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
diff --git a/dev-python/u-msgpack-python/u-msgpack-python-2.7.2.ebuild b/dev-python/u-msgpack-python/u-msgpack-python-2.7.2.ebuild
index 71f7b6947b7c..a979a5962182 100644
--- a/dev-python/u-msgpack-python/u-msgpack-python-2.7.2.ebuild
+++ b/dev-python/u-msgpack-python/u-msgpack-python-2.7.2.ebuild
@@ -17,6 +17,6 @@ SRC_URI="mirror://pypi/${P: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 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 769bcc9862ea..1fe737584a60 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,11 +1,5 @@
-DIST virtualenv-20.16.5.tar.gz 12223925 BLAKE2B 4f87f955d2d2c2b722d7a3699a74dc06aff7f2898203e87e607d1cabf182954fdf5eb2ba847d7b5641ded88e068d6e133441082703f8d874fbb92583f72eb6b1 SHA512 2d4f96057eb8fea5da07126bbc656306b8ebc2db1c82a84b784fcb82cd1959a571dc1f016dead9561e1d073a8b06e10f2e225d6484b363b960adaa64239826d3
-DIST virtualenv-20.16.6.tar.gz 12233333 BLAKE2B 3165de2c5350185f06ad2c1b105987b6bca421d5172a07dbef6486a285c2c5e7f8e095901241c894daec11f2e9bc565ddb2a7605eb5ff5ec9f84ea77296ab206 SHA512 24ca5038cc4e9cd72cf99a8bd4b96bda10cdc8deae2e6e7a0bef5000fd8fbeda87c4fda21aeb3b109a3763e47e0a7c7a5f383914a1bb1edcd8ed6791117d91cb
 DIST virtualenv-20.16.7.tar.gz 12268638 BLAKE2B 59403066eaa717532f672d5367916dda69c53e075c09eec62c2cdc1eaf3d642c206b4cf4959f498776b2c6022a88a42c21f2f8308a1efe9c2d03fb0f4ca634a2 SHA512 975298181696c4636a9567c29b4da5bad703d35fcf2a110cc24146e5bf7afe63b3fcb1f1601586b03bc0deef08c2278577bedf40cb21a7e07841986a9215dc69
-DIST virtualenv-20.17.0.tar.gz 12269523 BLAKE2B 0aca62cbe7467b8afa17c6189439cbc9141c8e3d471674a65d3624180bf7bef199a5860b56be1659c4c9b40c065bad9ff8b879b85d785aff97a6b63ff7b428a9 SHA512 28318a33b168c2226e703951b9205d48fd0349fa8407f265cdba97d9d12d7aec6bfe209f1de4f115eb860ced0a3c0323ab6bd5ac9b88f72342e95daeed839524
 DIST virtualenv-20.17.1.tar.gz 12269737 BLAKE2B 5caa223d549ecb69de3a17dec84a608f34f01c5abd39ab478c27438f71e36e6878a719f9002464dbf0f335bc90a2f4552e201d59e0e757fabef6f3caaaf857fb SHA512 6b32145f431f6b1f4c2a2ed888e8b9e5cb941e04ea1e68830053dceac80ee8bbf2286c1f353951d50d4b8417b8d81ee4b30dae597c94f2a3baf50f174f7ef4d4
-EBUILD virtualenv-20.16.5.ebuild 4831 BLAKE2B cba04409dcadfcf6c9b740b8b2fa86fc9df4556976a59ae709ec9a4ecf6313c82aa8dd33bc0c21fddf9b60c52315cb41df2d0beee85d2f0e22c7d766fb6fe882 SHA512 f18f48920f7115b97b7ce4bc2a1f179a47f5a52956b4ad0190c15e1181a987e0cf2a8de4347016d4e7ba593790ad6125d763f20250fc5fe0f6c46631b74163fe
-EBUILD virtualenv-20.16.6-r1.ebuild 4840 BLAKE2B dcf1709d0aa392cd15e1b35cc3de88e5a49c594fbf27959df5dbdd180e8f245bf38b74ef12e0af266739480af20d973ca8b11e672c41b45493dc606b9f1a5806 SHA512 3830186f2131601e35ddd102743af6913b99bc2d8029b1f91e00d36b5798dda0b281c0895717fae03905b30f07224514faf2d5aa211f2c918a5ccffd9fc5d07c
-EBUILD virtualenv-20.16.7.ebuild 4929 BLAKE2B 75271bcd9dbe3d470d907453290537ad694d89e3a208d22e02222c7aedfd0c40fa0a114a4e6c81d836ee70ee0d17e35d3bf68f7cf19866cff7b5324467e58815 SHA512 99a757a5bfc833a3396d0128fbc3ad698eefdc0bc0aafcf2e7ea00fc9c0cc4fd5e79c0937b7715bd1415309a4754f6478b6fb9cf64bdc836125a06d516675e01
-EBUILD virtualenv-20.17.0.ebuild 4929 BLAKE2B 75271bcd9dbe3d470d907453290537ad694d89e3a208d22e02222c7aedfd0c40fa0a114a4e6c81d836ee70ee0d17e35d3bf68f7cf19866cff7b5324467e58815 SHA512 99a757a5bfc833a3396d0128fbc3ad698eefdc0bc0aafcf2e7ea00fc9c0cc4fd5e79c0937b7715bd1415309a4754f6478b6fb9cf64bdc836125a06d516675e01
+EBUILD virtualenv-20.16.7.ebuild 4921 BLAKE2B 7241e5f8eac5c79e1c4b18715ecf9df68a6321abe9e33bd61d75d24e79fb80343d45a147e115476f00d44acc1e63caed8524eae65000b9f3fd62374b48950e39 SHA512 8e22c09518d8e67159dc27b0de06afc2d908b8c6632f55c11b50d071027674bdcfe7d8f8dd1889c6294bfa1aeb39d81b46d8f49f7840a2d12f7dff4d9ab88222
 EBUILD virtualenv-20.17.1.ebuild 4929 BLAKE2B 75271bcd9dbe3d470d907453290537ad694d89e3a208d22e02222c7aedfd0c40fa0a114a4e6c81d836ee70ee0d17e35d3bf68f7cf19866cff7b5324467e58815 SHA512 99a757a5bfc833a3396d0128fbc3ad698eefdc0bc0aafcf2e7ea00fc9c0cc4fd5e79c0937b7715bd1415309a4754f6478b6fb9cf64bdc836125a06d516675e01
 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/virtualenv-20.16.5.ebuild b/dev-python/virtualenv/virtualenv-20.16.5.ebuild
deleted file mode 100644
index f3f1dcc67007..000000000000
--- a/dev-python/virtualenv/virtualenv-20.16.5.ebuild
+++ /dev/null
@@ -1,106 +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="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/distlib-0.3.5[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.4.1[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.4[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-63.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-freezegun-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-2.1[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-# (unpackaged deps)
-#distutils_enable_sphinx docs \
-#	dev-python/sphinx-argparse \
-#	dev-python/sphinx_rtd_theme \
-#	dev-python/towncrier
-distutils_enable_tests pytest
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-		# tests failing without python2 installed
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# TODO
-		tests/unit/discovery/py_info/test_py_info.py::test_py_info_setuptools
-		tests/unit/discovery/py_info/test_py_info.py::test_custom_venv_install_scheme_is_prefered
-	)
-
-	epytest
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.16.6-r1.ebuild b/dev-python/virtualenv/virtualenv-20.16.6-r1.ebuild
deleted file mode 100644
index ee907432c6ab..000000000000
--- a/dev-python/virtualenv/virtualenv-20.16.6-r1.ebuild
+++ /dev/null
@@ -1,106 +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="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.4.1[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.4[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-63.2.0[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-freezegun-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-2.1[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-# (unpackaged deps)
-#distutils_enable_sphinx docs \
-#	dev-python/sphinx-argparse \
-#	dev-python/sphinx_rtd_theme \
-#	dev-python/towncrier
-distutils_enable_tests pytest
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-		# tests failing without python2 installed
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# TODO
-		tests/unit/discovery/py_info/test_py_info.py::test_py_info_setuptools
-		tests/unit/discovery/py_info/test_py_info.py::test_custom_venv_install_scheme_is_prefered
-	)
-
-	epytest
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.16.7.ebuild b/dev-python/virtualenv/virtualenv-20.16.7.ebuild
index e4891355eb78..1e9cc346bc08 100644
--- a/dev-python/virtualenv/virtualenv-20.16.7.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.16.7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-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"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/virtualenv/virtualenv-20.17.0.ebuild b/dev-python/virtualenv/virtualenv-20.17.0.ebuild
deleted file mode 100644
index e4891355eb78..000000000000
--- a/dev-python/virtualenv/virtualenv-20.17.0.ebuild
+++ /dev/null
@@ -1,107 +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="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.4.1[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.4[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-63.2.0[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-freezegun-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-2.1[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-# (unpackaged deps)
-#distutils_enable_sphinx docs \
-#	dev-python/sphinx-argparse \
-#	dev-python/sphinx_rtd_theme \
-#	dev-python/towncrier
-distutils_enable_tests pytest
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-		# tests failing without python2 installed
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# TODO
-		tests/unit/discovery/py_info/test_py_info.py::test_py_info_setuptools
-		tests/unit/discovery/py_info/test_py_info.py::test_custom_venv_install_scheme_is_prefered
-		tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-	)
-
-	epytest
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenvwrapper/Manifest b/dev-python/virtualenvwrapper/Manifest
index cfdbf857429e..76812f75d1fc 100644
--- a/dev-python/virtualenvwrapper/Manifest
+++ b/dev-python/virtualenvwrapper/Manifest
@@ -1,4 +1,4 @@
 DIST virtualenvwrapper-4.8.4.tar.gz 334920 BLAKE2B cd790b1e98cca7d09ea9c80df5d52380335d4a0ea4e6d95f7bd48d78583e0d842e1145ea08d8d8c73516adbe8d6c75bd53c17943723f859860a0cad105a2b058 SHA512 461938100061e11af0ee9b17405d991ae34e5ec9c79cc12614962d3178b588a2da710baa15ac626960b09177c1b5b10c7bc590cb4c126ebd2f719d0f1527c9c4
 EBUILD virtualenvwrapper-4.8.4-r1.ebuild 867 BLAKE2B b2d4d40092dca2ed4ee557dfd79b948a3626f94506f84b0967d0914ace961583c3999c45244859c052a380debc4791005feb48bd8c0425b7ca0e9c2e96a9998d SHA512 7c1d69963fc47584808e680cb8e26796dba01056e1b6c9a1dd03c82e5a3d5ffb64a0313574a39bbfb3011078f71eba4f21485a581b7abacda5c011436d7342ad
-EBUILD virtualenvwrapper-4.8.4-r2.ebuild 1168 BLAKE2B 00260dbbf9612c1999bef328b0d741a7be138e329d9082c3ba3c8b64d8b31bf678bbc221f29decff858ab4066bdb4b0ecac6a0e148905572f20b7608ee6c94b6 SHA512 95db39c2d0ad98643a8dbce6e3725b2a3591834f09bfcbce506b6fcafea6de742b22374b3e52f8126a9a7f8577327678ac8ecf20992cf10589cca60085c71963
+EBUILD virtualenvwrapper-4.8.4-r2.ebuild 1166 BLAKE2B d72698002ca44eae39605f18bc858b555aa6d21481a0446482169fae6c68cb29c15df789364c42d22466a3e0cc5b59e2bf3252438036d213fb1c15d665a875af SHA512 a980e44e9fe2e9340d29556dcb9240d6c1e1947da2cf670afe8a11861bf32964134abbd35d92954007ea00589c9ac982ef234a7f634f3d8d65b379406743463b
 MISC metadata.xml 391 BLAKE2B a8df48eb78d09f7926b81deb1b7670aa7f72ad7f94bee5e40a9308520c4320f6f0e152701da8cc329e7d01d056e217c2b59fad79154aa1db126ad736acb62d22 SHA512 1c82a0a04bb000fd1952c9ed86d07721618b95cc0d4accd95fa5c8a5c5fcbe4c3162c241a087d678289c4d0b12d48cde840262395edca874a0417e76deefaabb
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4-r2.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4-r2.ebuild
index 6a17821aa06a..e82ab2a5e842 100644
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4-r2.ebuild
+++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 # testsuite doesn't work out of the box.  Demand of a virtualenv outstrips setup by the eclass
 RESTRICT=test
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 8b0d51b1880c..e5df92bee11e 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -2,6 +2,6 @@ DIST xarray-2022.10.0.tar.gz 3035596 BLAKE2B f42df85bdfa66403826fc7d2fa811419898
 DIST xarray-2022.11.0.tar.gz 3053924 BLAKE2B 5e747aeda92ecb5a3ee2ce7a180cd8f3c2735b32d219f567fd254c733f98c62305829be166ddd76a3d2cd884f78aa3e6ceb2cf5aaac8539290c5863d5dea038d SHA512 6dc98746e3bea17a224926e7e1cf6a5f5ef01e8a848c63f5acd43f9da63b81093a7bdbebecb2afc06c9473d1b8fe735c67a847d05f25edd0a32bc0a5a2eda753
 DIST xarray-2022.12.0.tar.gz 3060755 BLAKE2B 449d21234436983b478a022cf5585236738014c6f783039442c3d51870b62a62c61eaada6eb9df5305ada3fd5cdc87bf0201ffae1c835ec7a731c06badb718a7 SHA512 9c5c692392b15711d57254006ebc92cdda08b92b663a577701f50c52253d736d78e2ad027777ad588ffa23d523394576f0cf226986b05b22816d3cec1ea8abb7
 EBUILD xarray-2022.10.0-r1.ebuild 1094 BLAKE2B f1c52df360e6f95cc8b0190292b4836b462da48da5a51ab9b5a3b1fc813d8f79401c3172d920d99e48044809857880e90a59292df23bbbd790319f110d69ac6a SHA512 73c9a2106d7242139945af820426360b7434f27f3d5c10c053980556263c44906feecc3703382bc1513309f7720b9c2f709ff836193ba681d6b1d7b8de75b379
-EBUILD xarray-2022.11.0.ebuild 1113 BLAKE2B 4b1f10ce0db71bd83353eead3982f9a149fe0e687ade38a8558a7d25d3d53608a746abee9fb29b2bba7591d4cef957b05775b5baa93a976ed3fd2cc91b04d696 SHA512 9eddbe9fd42c724f88fefeb3c41a996bfa530f4de55a5ef712d729c33b7da2d8104f6ebe4a5665f8fd6d5d76590948592b62caa021346f657f8276579e122055
+EBUILD xarray-2022.11.0.ebuild 1109 BLAKE2B 6604b73336cdfecdda50704d8a665cbb590eaf70afa1bba99aa934bd8f8268f88c1a76bf71f5bbbe66d378cd2f8e731ce3a134f0b9214e3f302abdb02be2a608 SHA512 20b761c1764dfd675e7797567de8f382a06924838b97a71fa51c9d8231bab671332bda61d14bdd20323c94354ac8cfacfc53f5057bdb38311c3dde7db3d578ea
 EBUILD xarray-2022.12.0.ebuild 1230 BLAKE2B 60355f658b6fb6effc409d8ce93758fd773776f13e9038df1c2cf9ba77b30f6407ca2faafdf5013565d5bf13553add23fe1418ebc1334f1ebb7940e62a611e71 SHA512 872e5852a9582a124a21766806c239f2da6d61ed9d3162595a2b97390c51541855238fc04788cf13193f4c85f0a4534f74c870bfc6d2a5d7ffadcc70441cca56
 MISC metadata.xml 509 BLAKE2B d470cc092eb055215a5868c22f9ec458057cfad600357fa1f658ed4537a6a6f68bda1422c4a665f1963ce0a6049e691befc3ca4baa60cc898364ad5f18164979 SHA512 602755896a3655295058afc8543a4bb64192d5c625f2edd86291c1f23d171f051a4238466163c2d469874aff3e68770fc76177e720870492266fb14e6faf6ce7
diff --git a/dev-python/xarray/xarray-2022.11.0.ebuild b/dev-python/xarray/xarray-2022.11.0.ebuild
index 9b7da4c9e1bd..aa4591ab7436 100644
--- a/dev-python/xarray/xarray-2022.11.0.ebuild
+++ b/dev-python/xarray/xarray-2022.11.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.22[${PYTHON_USEDEP}]
diff --git a/dev-python/zeep/Manifest b/dev-python/zeep/Manifest
index 2cc287202706..7fa126aabc72 100644
--- a/dev-python/zeep/Manifest
+++ b/dev-python/zeep/Manifest
@@ -4,5 +4,5 @@ DIST zeep-4.2.0.tar.gz 161102 BLAKE2B e6d25ec10c1e50d6d3e029d65e0ec28ca70524b82b
 DIST zeep-4.2.1.tar.gz 161072 BLAKE2B 01e3ec848bc4a98b301b7d091a0740f4a69057f3bb56e884a31b1d73ed51b0c62b4e0e148b2a59ebb6f01469aa949cb4079c0147dae7b3d8e7c8a2f66e5b31f8 SHA512 08de88c1e4cd1787137ea18f12bf343c5c9bb7b353ecd8781c58c7c1acf1b6ee8a0483b47d9a78eb24c79d8ecc347eb8595d460d9f75ca0428963f36a76dff5d
 EBUILD zeep-4.1.0-r2.ebuild 1586 BLAKE2B 3570b2b277148998c037be5f6628c5a290160debca06e5c720dce824f5ca66658e6a70a02898b98371d157487b18989d26ecc86e59bbfa98bada41beaf948862 SHA512 17e2705d7204aa5adfed81382c5412b59c4207d398b3f693a8a2e769e394d555870e34f8503f86743071780dbf23a4a1b0e108702e0d08b99600c2ae762ecac5
 EBUILD zeep-4.2.0.ebuild 1537 BLAKE2B b936cd796682f65e71aa2fbc4a493788c54795a254b6295073ec47c8d4a796006d8b058e9a9ab32cb5f17d36f9df8e5da6820511eec2e8c0ed5017f9fb4b1aa6 SHA512 1fdef4c45834cde4d5399f4329b4a5867609829f85e3c14ff0bddf87a32f70a952733076399718430e5ce7aa084e6e32f8220c8bc6f9b25c945066f852c62bfb
-EBUILD zeep-4.2.1.ebuild 1386 BLAKE2B 7345b368a70df087d92cb8c8350c5fa5d6747ee1561f6061028432cffa111fbfcca34a7c5ea7d400769266802cce9417e8cea56e2847952c4f55c7be6ff32da8 SHA512 9baadfa9fdc7d9d25c9898543e221c0615c03675dbea45dab2a37131139ae6f04c272cb35d43770d592c838aae89c8c33a79feb39d4780b48241f326a20a3d20
+EBUILD zeep-4.2.1.ebuild 1384 BLAKE2B b8acfc4028cb67df75a7054b87d167626e8500dc336ccba779710c819343bca6203df8fc9f3afcd8a0fbb4496130412e60a687311ffb8281c66182209a3b4900 SHA512 37216f5d37ed1ad10767ea43415145ec4f80168e062903396e283d93d00d334531adee02adf1edb30537e739d3ce587ac8eee96c49725b50f16ed76a044ecc4c
 MISC metadata.xml 485 BLAKE2B 7bf7fe5fa8c3803d58acb9b572a9b8cf5250f5bb95c95eb385748bd87da46fed52a6c13c48c5c623c61256289b598873c05c7bd24aeac331651708c365974557 SHA512 e4af11481fdcdc75c3e5f31d457707c7ea8baacee3c0e912a93b2d224e60685d821347f6cb7f6f12483e2051043ea25f5560446ef11f210cdd41b13e1e4e1fcc
diff --git a/dev-python/zeep/zeep-4.2.1.ebuild b/dev-python/zeep/zeep-4.2.1.ebuild
index ac22396b7e41..df41751090ac 100644
--- a/dev-python/zeep/zeep-4.2.1.ebuild
+++ b/dev-python/zeep/zeep-4.2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="async"
 
 RDEPEND="
diff --git a/dev-python/zope-hookable/Manifest b/dev-python/zope-hookable/Manifest
index 50f8845ccfd2..a19d0cdf28c8 100644
--- a/dev-python/zope-hookable/Manifest
+++ b/dev-python/zope-hookable/Manifest
@@ -1,7 +1,3 @@
-DIST zope-hookable-5.3.gh.tar.gz 25302 BLAKE2B 56ab933338a9a3fcc8c8a090111896d0b483909aba2235f9dbbadc4556cdac23f8d2a8d29b7081fe460e7afebb675032d05d2c7e5d00a9a97e2a1d6e20e186c7 SHA512 76ec43866c89a97efcccc4e312a6c3c4471c32ddd19ce4cae94ffd0a8f97f66871194ffbf45316965748d0e606a04af0ae8f2787a00c2e5d102c2df4dac9d6ae
 DIST zope-hookable-5.4.gh.tar.gz 25574 BLAKE2B 09d257e7884f9800088e2b2d9f66967244aced695899dc272dc76835b6a4df520e6486626acb91511d961f82c3df8c054d13f08ab92b0055fc73edb1b67913da SHA512 e109589dc67b155be99bceb5cb100ab1a728d3201126b2b17125054fc3b3f4f3424a11d28d222557ab74be3d67289e26dd6f3f161544970e09aad26e993e3103
-DIST zope.hookable-5.2.tar.gz 24004 BLAKE2B f1b64a906a849442437a3829d509210280066b41bc97fbedcd02b462fa9c7761910a7a71ed00430679f7c3ec9648c8a9ab5e88d4e8143018e44194d56611353a SHA512 b04107acedcc245fa99a59de71ffeaabe270ec15eaac32df1f5433ca16ea568d60c272349c8c8d7e512dfadef4fc8fcebf63a62ee9c8607fc02505a4457e1ed3
-EBUILD zope-hookable-5.2.ebuild 973 BLAKE2B d1325d1ae489dd9c7c9f757eab994cf01a2bfcde734b841b5cb771d7970eb5086fd3144786ecd8db19a667ce54700acbccd4859369bbd279b08d8287eda2ec1b SHA512 13b12baf36909a19225011ffbea033a4de5fa4176649c41dfcbb57acd9dc38dc7083538e40bbe11def7051c3bd3b983c3287834029d46aea5d7a72c8d60e28dd
-EBUILD zope-hookable-5.3.ebuild 980 BLAKE2B 84d9130fe0655fdfa9ae2ad419373cd6e8ed977fef0dceb1bc28702391c87121468e30c702a13253fbbd9d67c0db43afdd3432fa0f71f0d606a82dcc2e57d1bc SHA512 799b0ad1d83d3d02f3a52fcd9cb3ba064a33b7606352931319526277ed9073d9c16cb28019c4c754a35210098d4ec228f1db53a74e04d99c48556289a066373c
-EBUILD zope-hookable-5.4.ebuild 980 BLAKE2B 84d9130fe0655fdfa9ae2ad419373cd6e8ed977fef0dceb1bc28702391c87121468e30c702a13253fbbd9d67c0db43afdd3432fa0f71f0d606a82dcc2e57d1bc SHA512 799b0ad1d83d3d02f3a52fcd9cb3ba064a33b7606352931319526277ed9073d9c16cb28019c4c754a35210098d4ec228f1db53a74e04d99c48556289a066373c
+EBUILD zope-hookable-5.4.ebuild 978 BLAKE2B d875c1975ef029f5726d90f3b69728c48a3c19a3c716e4d26b2f1a446252ff90b6f04c3c95999a02b2b249194ac5c9b13a0482951eed3882e11f7987afb0d72c SHA512 1417f9a4104caabc9b94e4d236d0cfcb02a8551f49c1af03f57731ed503744befa73eebea5b39ce13a02d307ad2113c804c8ebea7e93435fc250da869fb0c7a5
 MISC metadata.xml 363 BLAKE2B 292afad5ddaa2ae9ea128a842934b751d16d84aebd617a9e5f6c2165245137f11089670fc78791ce46ccb260c5acbf0527030889d709725f6f89532f3972c0c2 SHA512 40afd7e868b05d352bc5f268d056f3550e924e22b07b1f0e41afd25429017cb28fd5b6caf565df04bfcecf5cc1c183d12a122a906affd813542ef32cbbc230a3
diff --git a/dev-python/zope-hookable/zope-hookable-5.2.ebuild b/dev-python/zope-hookable/zope-hookable-5.2.ebuild
deleted file mode 100644
index 6907af03c507..000000000000
--- a/dev-python/zope-hookable/zope-hookable-5.2.ebuild
+++ /dev/null
@@ -1,47 +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..11} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Efficient creation of 'hookable' objects"
-HOMEPAGE="
-	https://pypi.org/project/zope.hookable/
-	https://github.com/zopefoundation/zope.hookable/
-"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/zope-testing[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# strip rdep specific to namespaces
-	sed -i -e "/'setuptools'/d" setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	eunittest -s "${BUILD_DIR}/install$(python_get_sitedir)/zope/hookable/tests"
-}
diff --git a/dev-python/zope-hookable/zope-hookable-5.3.ebuild b/dev-python/zope-hookable/zope-hookable-5.3.ebuild
deleted file mode 100644
index e6323fc9044f..000000000000
--- a/dev-python/zope-hookable/zope-hookable-5.3.ebuild
+++ /dev/null
@@ -1,47 +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..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Efficient creation of 'hookable' objects"
-HOMEPAGE="
-	https://pypi.org/project/zope.hookable/
-	https://github.com/zopefoundation/zope.hookable/
-"
-SRC_URI="
-	https://github.com/zopefoundation/zope.hookable/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${P/-/.}
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/zope-testing[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# strip rdep specific to namespaces
-	sed -i -e "/'setuptools'/d" setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	eunittest -s "${BUILD_DIR}/install$(python_get_sitedir)/zope/hookable/tests"
-}
diff --git a/dev-python/zope-hookable/zope-hookable-5.4.ebuild b/dev-python/zope-hookable/zope-hookable-5.4.ebuild
index e6323fc9044f..d36b27a85498 100644
--- a/dev-python/zope-hookable/zope-hookable-5.4.ebuild
+++ b/dev-python/zope-hookable/zope-hookable-5.4.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${P/-/.}
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/zope-i18nmessageid/Manifest b/dev-python/zope-i18nmessageid/Manifest
index 56983ebd4293..9913d40acd37 100644
--- a/dev-python/zope-i18nmessageid/Manifest
+++ b/dev-python/zope-i18nmessageid/Manifest
@@ -3,5 +3,5 @@ DIST zope-i18nmessageid-5.1.1.gh.tar.gz 28570 BLAKE2B 3cddac039da8ce2920cc6b2246
 DIST zope.i18nmessageid-5.0.1.tar.gz 28217 BLAKE2B 67e31a18daa8c2d5ccc16b173d37188fc6154cc75b1fd7cd908d6ee3ebeca0092316546587103f01aa6b39d074aaa207bec86401c4d50f664efba179191c9719 SHA512 31af16581d59ce1b7d5d8fd86c715c56b84aee9a7a0756bb2b7ceac6db30903acc5fdff85d844c0250c0a112cb45ab03be2f56d3d4ca6165272ff76c09d40d8c
 EBUILD zope-i18nmessageid-5.0.1-r2.ebuild 1045 BLAKE2B 141a258330eb1a5e8d3df595149cce4d00284dd7bd13c4bdda0953e534c682854ea09d25add4dd931119f4e6cf39653e30479ae2abeb72264d3cf316a09aa9dd SHA512 f0bef6e95c94d453f9f2e27b59e2bd4e7e4bbebf844c6d1a4095381cb1486b15004942efa386a32c949df3eff27feabad5be6f45d479339d51ac154df831a630
 EBUILD zope-i18nmessageid-5.1.0.ebuild 1070 BLAKE2B fe77a055288568bc5bce46a1d2bd7bcf4749c2283bafbb6a7d34a7e132a32106e9ead577586c101a3110c57e45fb91df5cdbdf059caa4c59481d7ee8303dab55 SHA512 3c5c174124262b56e4ff15b1e4812a63ab33e5ad25d0887619bf3bdbd513344c72ff36531b710c2d4bf905d2bba92e59772440cd85329e0012d90e5eba5b8456
-EBUILD zope-i18nmessageid-5.1.1.ebuild 1070 BLAKE2B fe77a055288568bc5bce46a1d2bd7bcf4749c2283bafbb6a7d34a7e132a32106e9ead577586c101a3110c57e45fb91df5cdbdf059caa4c59481d7ee8303dab55 SHA512 3c5c174124262b56e4ff15b1e4812a63ab33e5ad25d0887619bf3bdbd513344c72ff36531b710c2d4bf905d2bba92e59772440cd85329e0012d90e5eba5b8456
+EBUILD zope-i18nmessageid-5.1.1.ebuild 1067 BLAKE2B a713153bde55f95813152595a90052901734a5b2630b4c4c1b4b7773c48a45980ba192536b27ad68509b38f18b6663c3c2e101739b595fae9b733419f5a086a1 SHA512 6b43d339ec98399be8d801141d13ee7ab0b6a7e1c3ef8e74d676fa6aadf674b9116b09ebd15841e8117c0ff295ac7103eca3b2e8bde52f257040ff9741481478
 MISC metadata.xml 488 BLAKE2B 2b413d726016bdcf199974f77972d7800a4d5f169463d9587f9d0563ee94f8f0cdafb9c384c387b7bf9c2f1814807a8ab32fae796275bc51d624133788df44c8 SHA512 3459883a636540739ecea197d7ebd1429dd6e8fb20d0df2337691e1742995edf50dd0fee6340695b6dc493d0d5fd7ea8d3f55277172cd7385df0b057f376fdbb
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.1.1.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.1.1.ebuild
index 9f8fe11f4a63..ea186d54f8a3 100644
--- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.1.1.ebuild
+++ b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.1.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index a3782f5fb1ba..51126b20cd8b 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -4,5 +4,5 @@ DIST zope.interface-5.5.1.tar.gz 300064 BLAKE2B a40de949efc269e3b942eaa6bd5006af
 DIST zope.interface-5.5.2.tar.gz 300533 BLAKE2B 04b348492d5af729eebc6b1abc6dc7bd4a28931c5d65d03261bc4a77a39e97c4cbcf319ea0b5a960ddab7bd1056481e741d2b69cf6c21bea4bf3885b757aa1bd SHA512 ecc20df9b84c91f7a03ce7be087abcd6288f77b2e04f6974ece5b86a222944baf0dc0a2aa49063c74dc7c4d47c474fd01f512c7686164806d48f360667581205
 EBUILD zope-interface-5.5.0.ebuild 1277 BLAKE2B ae61e5c4a46d5a9400d705601dc5547866b5958adf68c81875ce44391eed8bb3a69542b5e71020f8bf476e3988f17fb82a8184949a20831f6c8c0a0a073b8b34 SHA512 669f78e71312c2b5648d820a6d6025a64300866f114342b2ad5596d6d5edfc738fe4b58771c6dec0d05a3ff7a62fa3fd9c37a3db4cb6afef16050e82800344a5
 EBUILD zope-interface-5.5.1.ebuild 1285 BLAKE2B 494bd885a8482163486f792389daddf7399f33c341740346cc5a26c6ed641a3e115f709d2103ff1b2de65055cb73202230590f9392d4b3dc92642e0f0dfdd7b7 SHA512 d4c853a2fb8372720ab87925d35885b47112d687e65ca96ec0e10a229414260872f60747ea10aa66ad1684a587266ef6106a9637ca0c81867625bc9f805e2d81
-EBUILD zope-interface-5.5.2.ebuild 1285 BLAKE2B 494bd885a8482163486f792389daddf7399f33c341740346cc5a26c6ed641a3e115f709d2103ff1b2de65055cb73202230590f9392d4b3dc92642e0f0dfdd7b7 SHA512 d4c853a2fb8372720ab87925d35885b47112d687e65ca96ec0e10a229414260872f60747ea10aa66ad1684a587266ef6106a9637ca0c81867625bc9f805e2d81
+EBUILD zope-interface-5.5.2.ebuild 1279 BLAKE2B 949775ce4ac7e51bb9a34988518359a4b2b72c3800b2f987e06b5cbc36c0b5001abbf9f2c022c2c8892e4b4ab5c53c303c6dbb67bb4df33c1f16f95079daa312 SHA512 80aa465ba34bf68a5bd4a7030132409e8144fbc35e207562616678ec5eb57d0692f61aacd9a23ffa47ef41fa051f5fdee783011c42c25c4195b82bdc6011a4f1
 MISC metadata.xml 387 BLAKE2B 1d5e2a8f2fcd2c8fcb423f8a123d2d17a0456cd4003489358abd8baf74d3ea9ddfa04af94b9ef67b329520b5ee9bc3084343e824f3fbf7420f14372d43581dbc SHA512 258f0bd291cd42f6374bd331c3b906f149ff455dd264716eefc63487710d95f8b388ecb34be5733dbd7a0e185f449cc18fce04b46521a2d19fd9766e7dc0ed82
diff --git a/dev-python/zope-interface/zope-interface-5.5.2.ebuild b/dev-python/zope-interface/zope-interface-5.5.2.ebuild
index 6a87c71f939f..a279457df85f 100644
--- a/dev-python/zope-interface/zope-interface-5.5.2.ebuild
+++ b/dev-python/zope-interface/zope-interface-5.5.2.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	!dev-python/namespace-zope
author	V3n3RiX <venerix@koprulu.sector>	2022-12-10 15:20:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-12-10 15:20:44 +0000
commit	177349fb1459039cc30cb8e3936af4117d038c16 (patch)
tree	34c1bc161daefb8e152212dfba02b98da8a777a5 /dev-python
parent	c15acf374d4b25ba5afcb52435da6090f2d98a20 (diff)