gentoo auto-resync : 31:12:2022 - 14:19:51

author: V3n3RiX <venerix@koprulu.sector> 2022-12-31 14:19:51 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-12-31 14:19:51 +0000
commit: ea5bad4d0ba1eb937df22adb7f6cc57ea77f03d8 (patch)
tree: 444d798059985f0e993cb7582231243cd4c5d083 /dev-python
parent: 6989a301768c924a6014fdce19b28de541ad557a (diff)
130 files changed, 78 insertions, 2799 deletions
diff --git a/dev-python/GitPython/GitPython-3.1.27.ebuild b/dev-python/GitPython/GitPython-3.1.27.ebuild
deleted file mode 100644
index 091cf383e00d..000000000000
--- a/dev-python/GitPython/GitPython-3.1.27.ebuild
+++ /dev/null
@@ -1,79 +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
-
-TEST_P=GitPython-${PV}
-GITDB_P=gitdb-4.0.9
-SMMAP_P=smmap-5.0.0
-
-DESCRIPTION="Library used to interact with Git repositories"
-HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
-	test? (
-		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
-	)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-vcs/git
-	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# upstream reverted the changes needing py3.10's typing module
-	# but did not update the dep
-	sed -i -e '/typing-extensions/d' requirements.txt || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	git config --global user.email "travis@ci.com" || die
-	git config --global user.name "Travis Runner" || die
-
-	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
-	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb || die
-	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
-
-	cd "${T}"/test || die
-	git rev-parse HEAD > .git/refs/remotes/origin/master || die
-	TRAVIS=1 ./init-tests-after-clone.sh || die
-	cat test/fixtures/.gitconfig >> ~/.gitconfig || die
-	sed -i -e '/addopts/d' pyproject.toml || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# performance tests are unreliable by design
-		test/performance
-		# unimpoortant and problematic
-		test/test_installation.py
-		# Internet
-		test/test_repo.py::TestRepo::test_leaking_password_in_clone_logs
-		# TODO
-		test/test_submodule.py::TestSubmodule::test_base_rw
-		test/test_submodule.py::TestSubmodule::test_root_module
-	)
-
-	epytest
-}
diff --git a/dev-python/GitPython/GitPython-3.1.30.ebuild b/dev-python/GitPython/GitPython-3.1.30.ebuild
index 8c785a54a687..1da171d9ce51 100644
--- a/dev-python/GitPython/GitPython-3.1.30.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.30.ebuild
@@ -29,7 +29,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-vcs/git
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index 14fb1a59de76..380170c081ba 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -1,10 +1,6 @@
-DIST GitPython-3.1.27.gitbundle 9652508 BLAKE2B f81b6d94b302b1d4aec85096bb294df1a6a699eff4dd27a1d32083e73b031daf3ef58ec6aa6f98c7693ef187b21de9ea242fa37a88b1f51c0e17238dda978c5c SHA512 bf1011a765b51eb871f6b6a462c693e4e79bb0ba81103d4f268b780b86ab12112c44f74c1d68e93388d1f86c068f6c2336f33ea12dce2e0b2302c940ebb9c49f
-DIST GitPython-3.1.27.tar.gz 192188 BLAKE2B 3cab995a17d8eca8d4301367b1ee7a2c3c0a46a217f6e6d89e1bb4e62b733d21cd6d9210faac49c3c905343067e819f8c37ac9cc69d9fc33ce948b63fd53714e SHA512 6f855bcfc380c1a83a97807ca8ddcc4dfe8258f3aba0790142ef41f28befff44847aec925e523eaac47fd6c0078eb6296f52bb4b7d2be7d59ad95bbeb930fe28
 DIST GitPython-3.1.30.gitbundle 9945082 BLAKE2B ac3e530509d459303c0c465668c92073d0532bb75c0635c9e5521857132c2d3c18f0e30b85830cf101fc0c79cde33a5eaf459cddbd66abeb6185453d90e4077d SHA512 e43275e8ffc3fb02e360503de3cd9d0b2c817f870361fe6bcfcd9dec30da077c4c685f57bce408ec670f2fb49d265abca34bf14d806a3ea54fd25f9eaf5019b3
 DIST GitPython-3.1.30.tar.gz 195508 BLAKE2B ba3dcb7c7aba8ec42842e6240777b8823e641139e6704641a7236ea07b2a82966638fb074c8fe3ff47b66e23aa526cfc899d8c28359f260f62fd1962a6de66de SHA512 067e64c801ca3882d70aca7706b3a57a51597817f0a3f03290a17e3ebb0fa0fd04cd1d72a32eae3bb72b6c486ffd26d1ede9cee5b17d99ffceb0f8dcc83081b9
 DIST gitdb-4.0.10.gitbundle 1485461 BLAKE2B 5a217c609a402cd7888da1502b25d217812503cd703cda8bce3c7159732c59d7f4bcd52688a5da457f43fde1645a6db79588a6fc8cc8dff5c58e9dcbaef79b9a SHA512 98dba48f75e28eaded791f91c611e07bef73c28a7f8ac58889b05d04f4b3699a85a5be1c829ea3e2f380507a9009f35bc552bb4260564127e2863807f9b4712a
-DIST gitdb-4.0.9.gitbundle 1461448 BLAKE2B dad9efdc4e9711361c851f4745df2e3fa3b2360ab58cffea971a854429cf3e11862a267efb5afa3d9ff7668dc6d1bb7f11aa033172238bea61a6252d0488b746 SHA512 eb71e6dd380e67a96a9dcd50a3a3c82aab8c7f85b1ca4258a92202a5e4cb5a1535363599c94ab26884b4cd755ce30694c1b193a95e5cd5199b5d4e2cf8e72818
 DIST smmap-5.0.0.gitbundle 338621 BLAKE2B 58c151245a1353d482e06313beb1cfbe7aa23d30733b284b1745b562da1da4e6f9b8acd7d4b967987e8c29a0cfbe6d3b27790f4683f6cbd86fc22a1416bc1c24 SHA512 94b827cdcfaf31b726b48b7b0a9036e852683046b07430b79e59a1339079ca078129d5eb02d9009979ce86892748b700d6cd281e401ddf6b0048252e2181fe1f
-EBUILD GitPython-3.1.27.ebuild 2207 BLAKE2B 6592c43024b52a004909dc5d980e816a2be01d4dbfa4ecfba2365292781c84aa07b39e2f458413952fdb6adc5522417f737069552c166d9dfd45516618c8aa28 SHA512 c06de5bc0d32a7f3b50e4b4da04559903f8de4777bfbe5ddf7c451ed8224e924c9d57fafe9dcc05c0a8f995322550d16823a836d2ceca40b6323d46da3ed32d8
-EBUILD GitPython-3.1.30.ebuild 2277 BLAKE2B 4aeb45eb92b0c701ccd426b95318edc1d4a1b917775e06e2271da6418bfff64e7c8ae21d468996ae471799fe8a1e1f9dd9c4cf2f03b8578388f2f7d0ebc1342c SHA512 f0a177696446c0d36dbc5a8d36f7945bf41979b9284518fbcb632cf4e27193b75fdfbd7805debda7625bf6db87dd0b9c314b290406afd79a2662ae23e7c8e396
+EBUILD GitPython-3.1.30.ebuild 2269 BLAKE2B 8eaaaff0ccfd7e684a595e282d00514296029066e039fbcd5092dbef642ed89390152bb1ba518202675bad6ea010be0d42fd8b8d281192c4565e58d94c2854d2 SHA512 7d271a31a198f2632ccf5bc11e54b2a85e1918f6d237e2b8d09c4ca5886a0ddb6aa74c4ce83a5854fa4fc1d19c97ce9ff893a7841cff9580defa73f0af47563c
 MISC metadata.xml 407 BLAKE2B 49fd8d520d575be1489c299f22595120fad882f055b9cf2d02b87382c6d8f0ff38af694e5584b4da579aa84b82c2f1032e4afb64cafd9f4fe9212a6d67b4a752 SHA512 1bebe1e134eb86a4745cf7e297d45118a2bdd3d8a71d0034294b5c799a9cee763c63b61b34c6707c52f61058f727f4b827dd020d285fc297712b29eb7c1129ef
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index e27f283713a9..f1de32f3bdd3 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index 62405f8490e0..82f777fc9d2f 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -1,7 +1,3 @@
-DIST ansible-compat-2.2.5.tar.gz 39794 BLAKE2B 25a5c858eb3e120b7f51b8800b01eff2482a03d0e5f5c049d4ff2bc96ab2c01e856284f3328d5c9e3621b2d769df4450c9427997b48a7ddd337b01aa777e0c28 SHA512 8029d6dbd093414fb5eccba1789c881601a3a1f45bf7779f9e2af886d457e9c57a4e6432eed73a1d387b4d82617e1677a857cf0d2dfdcebcefa0dc790b2ec2d4
-DIST ansible-compat-2.2.6.tar.gz 38890 BLAKE2B 5022676dca1c2cb24e8f3e3387de8ef214979124b6d4a819f6328b2ffa0b19bddc5ef60131eb0133d809a214ecdf39fb5c01b197a44111e05a23740d4955c00c SHA512 b02faeb0202839c01a777277cd077264b44fbadbef679e93cb4ac0be3b81df921bc8f000e27372446326976acd1b42f1f1f42896ff0af9ba0677e7a93d06b195
 DIST ansible-compat-2.2.7.tar.gz 47378 BLAKE2B 58f3b19400fb7646d37c585df07435e65a60f3e57d445c98e8089c6a2ed853cb5dbab682d85cee1a604e1b4de6dd137faa12bf78fe7913752839f95bd651435f SHA512 9a3863be3d755eb5a1a61ba0c526786ea3df14bc6fcabd9196559eb625ab6dfc8de7a17fdb2cdd8ad71d7d61b5e2f0543b8b5908f39d5e7d9ea45e387aa625b1
-EBUILD ansible-compat-2.2.5.ebuild 1675 BLAKE2B df204a67712387cf02c8a23c2f0e2384d2f5d22eadbdcb4078657927a38ee10954e42f3ac5f75d2a9ae4d2106d0820762ab93f33a79677a1e5bf97b541c4ec11 SHA512 39d90bca553988b31038446b9c0e2e6a4374a2979bf2daecf9c022342054678befcb25c7fcfb7340630ecd120b7146d81e01e2b8558dbb1af551225ed9ef217e
-EBUILD ansible-compat-2.2.6.ebuild 1676 BLAKE2B 55686af94a4a36e0d402b9f06f3a59a0f5e56995fd366dc3d8d8bfa490560a96ff36458ac1a101c46ee1c559ba8260a44de4e724308a64fb9a6b3923b6bb928f SHA512 2af563dd6ec88b37d4d2e41a8ba9f2236b67b3e32b79cbb53d4048329c7f554d8be926a9a7fe5fb628618ea6cf53ce71c54ee6ec2285229316cd4defbb23fc81
-EBUILD ansible-compat-2.2.7.ebuild 1676 BLAKE2B 55686af94a4a36e0d402b9f06f3a59a0f5e56995fd366dc3d8d8bfa490560a96ff36458ac1a101c46ee1c559ba8260a44de4e724308a64fb9a6b3923b6bb928f SHA512 2af563dd6ec88b37d4d2e41a8ba9f2236b67b3e32b79cbb53d4048329c7f554d8be926a9a7fe5fb628618ea6cf53ce71c54ee6ec2285229316cd4defbb23fc81
+EBUILD ansible-compat-2.2.7.ebuild 1675 BLAKE2B df204a67712387cf02c8a23c2f0e2384d2f5d22eadbdcb4078657927a38ee10954e42f3ac5f75d2a9ae4d2106d0820762ab93f33a79677a1e5bf97b541c4ec11 SHA512 39d90bca553988b31038446b9c0e2e6a4374a2979bf2daecf9c022342054678befcb25c7fcfb7340630ecd120b7146d81e01e2b8558dbb1af551225ed9ef217e
 MISC metadata.xml 510 BLAKE2B 3f47270866cb9acc5944b71547640b69003891268ffc07b5cd10e6ba8842b6f644ab4dea3b3da2d20b17f34d90e565b6f03a4dbb8ea38fa282fed283ac22fac1 SHA512 65d8604e46581bf9ecb3d8e358f3a211b18c51beea22c92a1cd3668ba86140e3bd8d91a38c221e73fe13a3e0da1cbfc2030b3f7733ee55e045530b49cd77d46d
diff --git a/dev-python/ansible-compat/ansible-compat-2.2.5.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.5.ebuild
deleted file mode 100644
index bea25108e31f..000000000000
--- a/dev-python/ansible-compat/ansible-compat-2.2.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
-HOMEPAGE="
-	https://pypi.org/project/ansible-compat/
-	https://github.com/ansible/ansible-compat/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
-	>=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-7.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-plus[${PYTHON_USEDEP}]
-	)
-"
-
-# All these tests attempt to connect to galaxy.ansible.com
-EPYTEST_DESELECT=(
-	test/test_runtime.py::test_install_collection
-	test/test_runtime.py::test_install_collection_dest
-	test/test_runtime.py::test_prepare_environment_with_collections
-	test/test_runtime.py::test_prerun_reqs_v1
-	test/test_runtime.py::test_prerun_reqs_v2
-	test/test_runtime.py::test_require_collection_no_cache_dir
-	test/test_runtime.py::test_require_collection_wrong_version
-	test/test_runtime.py::test_require_collection
-	test/test_runtime.py::test_upgrade_collection
-	test/test_runtime_example.py::test_runtime
-)
-
-distutils_enable_sphinx docs \
-	dev-python/ansible-pygments \
-	dev-python/myst_parser \
-	dev-python/sphinx_ansible_theme
-distutils_enable_tests pytest
diff --git a/dev-python/ansible-compat/ansible-compat-2.2.6.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.6.ebuild
deleted file mode 100644
index ea13f54d55c0..000000000000
--- a/dev-python/ansible-compat/ansible-compat-2.2.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
-HOMEPAGE="
-	https://pypi.org/project/ansible-compat/
-	https://github.com/ansible/ansible-compat/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="
-	>=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-7.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-plus[${PYTHON_USEDEP}]
-	)
-"
-
-# All these tests attempt to connect to galaxy.ansible.com
-EPYTEST_DESELECT=(
-	test/test_runtime.py::test_install_collection
-	test/test_runtime.py::test_install_collection_dest
-	test/test_runtime.py::test_prepare_environment_with_collections
-	test/test_runtime.py::test_prerun_reqs_v1
-	test/test_runtime.py::test_prerun_reqs_v2
-	test/test_runtime.py::test_require_collection_no_cache_dir
-	test/test_runtime.py::test_require_collection_wrong_version
-	test/test_runtime.py::test_require_collection
-	test/test_runtime.py::test_upgrade_collection
-	test/test_runtime_example.py::test_runtime
-)
-
-distutils_enable_sphinx docs \
-	dev-python/ansible-pygments \
-	dev-python/myst_parser \
-	dev-python/sphinx_ansible_theme
-distutils_enable_tests pytest
diff --git a/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild
index ea13f54d55c0..bea25108e31f 100644
--- a/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild
+++ b/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="
 	>=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index d6401255ee21..0ff86e8f72a4 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,26 +1,8 @@
-DIST boto3-1.26.20.gh.tar.gz 572957 BLAKE2B 27286beaeabc0227376640fd3ee583656470ee324805ac716411a6c87fc2f301f6430c4f82e58c4a5371fe38a4cb3a6cebe32de39c0bae35f051fd340257c315 SHA512 4623e29b4396cd131e76ad44d24e32014e9f79642db471f64b5b06553ffbd0a0492883188e3658fe629e6af0a91b8274dbda3103a3ecf6d2dd6fe5b1a91b9503
-DIST boto3-1.26.29.gh.tar.gz 578484 BLAKE2B 5914f5f19072268f6b5f90571f0ec573632f8e0546010a754d3116b18bd0d4236af2aa4f94a15778134d2b90f3fa80feadf8355a3015932b33cfec64a8917471 SHA512 a30e783b627bdbe6b723eb635702f0fbbe38d48eaaba7e93c880dd9f462d6257ed5a7ee524a096c42978d43336bfc6327a999de794c39877214e1d71ce1ab363
-DIST boto3-1.26.31.gh.tar.gz 580080 BLAKE2B 30d44e3df131aef363ccc2afdde43ee4b0d11d232b7af532915f1c66090616a3154f85269481f41e00e0553d87a8ad178ab3b9c8296e58c6b68723674450e6e1 SHA512 021b9a5c2d1f1555a7632e2d688ae7cebc0b51e572ccec35b81c75354f68d7fdd4482fb7de6e617bd13334a15cba2db52a2502f6b421df130645ea7d037f810c
 DIST boto3-1.26.32.gh.tar.gz 581235 BLAKE2B f8decc1e924ff5f5f98566084a55c36ea10ca38596e0f8398a9d5865e6246290e9e09ff3e95622eacca9f32b6f8119156b2ba5a6ce0135e988fad0bcdb161030 SHA512 73c6f8f1e1d5f12887e880cc651399fbd147c65740090bd09303540dcc902efc6b04605551f055341e84cb8b72cdcb9d8d444263fc0131b8f5013197e67c1fb5
-DIST boto3-1.26.33.gh.tar.gz 581883 BLAKE2B a2ac93a516932b8cfcb039e215608ebdd3f5427c7abb016359ad2f1a9e5e4ed855a405bb0470b5ba4823ba59c21d21f2b3319dcc8ef0715a1293cb0219261ac1 SHA512 4bb267abfaa01643edd6670dc66c87225845dce31d1d4aa500f60a278326a8fe6f877d8af4bff460cea3b77ef316392a2acf10181d7ae2a7c59ca2f6ca5ec9aa
-DIST boto3-1.26.34.gh.tar.gz 582767 BLAKE2B 279138d5b6093a16d54bd14bab6e9e4c4901d03a38e968c693dff6c585c30098d6520b3d7f5d98c8db94948bf431ff93531c5f706b9e8bf25501255b46c40203 SHA512 b9cc60eda79e8addba92013e34893cb7c59557d350d065f7406c1fb2b0c4256612a09d049ebc62f2ee447922f9ae99557a84f60379267f576a6665dbdc193d1e
-DIST boto3-1.26.36.gh.tar.gz 584205 BLAKE2B d5aad2ab0b8ee3392c636309454859e30cbe937d0dc2efb4b5a817fc83c555e5592ec8a8ae94a273ab2ab55be5d627b44475d0b5ca77caebc246229e3f78b155 SHA512 818843d82b27ee2e376382f1a74a950cbacf04a588bdc012e8c88d569ad5571d231a2dd399a3e26efc3de96c89f722ceabc3e70eb3cdba930c08277fa6c2c189
 DIST boto3-1.26.37.gh.tar.gz 584822 BLAKE2B 08c08502f3defee6365aa19a55cb5bb6c006ce9685421119d1469f90f35e0aeb49fc11a6c5dd133cdfe1138248c0952338adb7b864010825f6f32f40398c2f4f SHA512 4c73b45cae0ed42f219b77d5b58f26560f3ac660d66eaea0c8452053ed38b4c8cc7ab168062483a52e091f7241623466a473368e0545a9fa07c0ac12d0185e31
-DIST boto3-1.26.38.gh.tar.gz 585100 BLAKE2B 22bbaad5e5ba59c29300ac1331e570b763d7544c9feddff307b2eba3e3da9076c6d64ed189d115ff63fd2deb156f6edd2a767121489c5d02e9ee0b897cb39712 SHA512 f97bd9cffd6d4c4d03841038940edb592962b72a3595e9255fc0af491aee1eb1742e819861c8f207383062f6ec284f8ecc37e9a30c59eb1e7702066b4a7c988f
-DIST boto3-1.26.39.gh.tar.gz 585471 BLAKE2B acf5631bccdc96f540bdd9396084f09d0b3d070f6b0d3a85267eeb54b1c1b1e5e38b662114dd8a52fb839f168f6d5694647a87559c389f4acbc23ee6bc0dd38d SHA512 d795dd9a553932d75317cf0f528757be201e6655e088499733318068fd8d15bb04dc67d370b1d5160b46eb3fc4ed489dc66181ac12e2d91c0b3a3c86043abdd0
-DIST boto3-1.26.40.gh.tar.gz 585787 BLAKE2B b738ffbae9d03b3f1d87dbdd0296007f69b7665e5aafa63c986205dc0bf77e1fab60e6079845a7a2419a81bfbc681c5a48d7557be348532df13b09284c417dba SHA512 b86f3109a55c244e231e00bc9d098da0a797f0d88cc9b033e39decc49c5288d437d26db7ee403cbbc48f3e66d3646117824167f5eed4629d315686da24b6511b
 DIST boto3-1.26.41.gh.tar.gz 586086 BLAKE2B 8f5fac4e26a8ff34e91ee99ab4f93b6c31174cea7fdb1a7e98c942601324fd4128b4609fb1b28d7daf4139dfc1e0fc75760d64693f33e225cc4180c83867aebb SHA512 d87db9db58315de796750d478d6488815cd37307693305d2c6fd0e5f1d04aef51190fa438d942412def7d0075ebb23d440508415459bd9dda83302d29e7cc646
-EBUILD boto3-1.26.20.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
-EBUILD boto3-1.26.29.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.26.31.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.26.32.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.26.33.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.26.34.ebuild 1587 BLAKE2B 2fff9e50b68aab4197c1dda600ba71e8ee090ea02195375d9a54afe0eaaccec42d917a8057878e5a0bb1a19adc79ff40ec8f3074888145409bd240cd5a28ee48 SHA512 819fea2080e15d23d5bc642aa56cabcf38852c77f06a495e08dea653deafa588284d5569070acdc2a5c534f9e217e8ea4d045cf39ab735437d81589fd97d639b
-EBUILD boto3-1.26.36.ebuild 1587 BLAKE2B 2fff9e50b68aab4197c1dda600ba71e8ee090ea02195375d9a54afe0eaaccec42d917a8057878e5a0bb1a19adc79ff40ec8f3074888145409bd240cd5a28ee48 SHA512 819fea2080e15d23d5bc642aa56cabcf38852c77f06a495e08dea653deafa588284d5569070acdc2a5c534f9e217e8ea4d045cf39ab735437d81589fd97d639b
+EBUILD boto3-1.26.32.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.26.37.ebuild 1587 BLAKE2B 2fff9e50b68aab4197c1dda600ba71e8ee090ea02195375d9a54afe0eaaccec42d917a8057878e5a0bb1a19adc79ff40ec8f3074888145409bd240cd5a28ee48 SHA512 819fea2080e15d23d5bc642aa56cabcf38852c77f06a495e08dea653deafa588284d5569070acdc2a5c534f9e217e8ea4d045cf39ab735437d81589fd97d639b
-EBUILD boto3-1.26.38.ebuild 1587 BLAKE2B 2fff9e50b68aab4197c1dda600ba71e8ee090ea02195375d9a54afe0eaaccec42d917a8057878e5a0bb1a19adc79ff40ec8f3074888145409bd240cd5a28ee48 SHA512 819fea2080e15d23d5bc642aa56cabcf38852c77f06a495e08dea653deafa588284d5569070acdc2a5c534f9e217e8ea4d045cf39ab735437d81589fd97d639b
-EBUILD boto3-1.26.39.ebuild 1587 BLAKE2B 2fff9e50b68aab4197c1dda600ba71e8ee090ea02195375d9a54afe0eaaccec42d917a8057878e5a0bb1a19adc79ff40ec8f3074888145409bd240cd5a28ee48 SHA512 819fea2080e15d23d5bc642aa56cabcf38852c77f06a495e08dea653deafa588284d5569070acdc2a5c534f9e217e8ea4d045cf39ab735437d81589fd97d639b
-EBUILD boto3-1.26.40.ebuild 1587 BLAKE2B 2fff9e50b68aab4197c1dda600ba71e8ee090ea02195375d9a54afe0eaaccec42d917a8057878e5a0bb1a19adc79ff40ec8f3074888145409bd240cd5a28ee48 SHA512 819fea2080e15d23d5bc642aa56cabcf38852c77f06a495e08dea653deafa588284d5569070acdc2a5c534f9e217e8ea4d045cf39ab735437d81589fd97d639b
 EBUILD boto3-1.26.41.ebuild 1587 BLAKE2B 2fff9e50b68aab4197c1dda600ba71e8ee090ea02195375d9a54afe0eaaccec42d917a8057878e5a0bb1a19adc79ff40ec8f3074888145409bd240cd5a28ee48 SHA512 819fea2080e15d23d5bc642aa56cabcf38852c77f06a495e08dea653deafa588284d5569070acdc2a5c534f9e217e8ea4d045cf39ab735437d81589fd97d639b
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.20.ebuild b/dev-python/boto3/boto3-1.26.20.ebuild
deleted file mode 100644
index c93eb5e2d7c0..000000000000
--- a/dev-python/boto3/boto3-1.26.20.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.29.ebuild b/dev-python/boto3/boto3-1.26.29.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.26.29.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.31.ebuild b/dev-python/boto3/boto3-1.26.31.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.26.31.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.32.ebuild b/dev-python/boto3/boto3-1.26.32.ebuild
index 6edcc751d54b..c93eb5e2d7c0 100644
--- a/dev-python/boto3/boto3-1.26.32.ebuild
+++ b/dev-python/boto3/boto3-1.26.32.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/boto3/boto3-1.26.33.ebuild b/dev-python/boto3/boto3-1.26.33.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.26.33.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.34.ebuild b/dev-python/boto3/boto3-1.26.34.ebuild
deleted file mode 100644
index aa8071e64d5e..000000000000
--- a/dev-python/boto3/boto3-1.26.34.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.36.ebuild b/dev-python/boto3/boto3-1.26.36.ebuild
deleted file mode 100644
index aa8071e64d5e..000000000000
--- a/dev-python/boto3/boto3-1.26.36.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.38.ebuild b/dev-python/boto3/boto3-1.26.38.ebuild
deleted file mode 100644
index aa8071e64d5e..000000000000
--- a/dev-python/boto3/boto3-1.26.38.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.39.ebuild b/dev-python/boto3/boto3-1.26.39.ebuild
deleted file mode 100644
index aa8071e64d5e..000000000000
--- a/dev-python/boto3/boto3-1.26.39.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.40.ebuild b/dev-python/boto3/boto3-1.26.40.ebuild
deleted file mode 100644
index aa8071e64d5e..000000000000
--- a/dev-python/boto3/boto3-1.26.40.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 4cdf647997f7..338232388637 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,26 +1,8 @@
-DIST botocore-1.29.20.gh.tar.gz 10956292 BLAKE2B 3453a1051056f8f6bc870c66b66d81b4f68dca97068ebb0beed286f3534798483254a0a3390e9b2ce07d25a01b35e81ceccc9c5f8cfd5bf18147931a9048e242 SHA512 c99e1cb4f0f55715d88ec8fe6602fef60254cacd9e2c1b309bfa1b8dfdc5c979c60f558b08f953afcc0985859091f4fad5c21e1906c177eaa8bc2dcd8216a3aa
-DIST botocore-1.29.29.gh.tar.gz 11020243 BLAKE2B f576fb0ba73b4a9c8a65eedf387a432b30b18db3f657e25ada7c5f3ad647b00ab1f0a855f19bd3ebd897d8e267a14a6d467c29bacb30809b61e7e92ef464ac1e SHA512 fa6457d811137906b0e46302ccabe9623d60ed5cbb588004bbddd0d28ebdaa3aabad3491641b4b69798ed371ddda3e23ea41b930db4f5856e2fa8242dc170571
-DIST botocore-1.29.31.gh.tar.gz 11047541 BLAKE2B 7ac038bf914307277db982fa854a6a5832144c1f21b1dc375beb93f3a1c0d765f254066b8741bb5bd98748970611e967882306d11d3f8c9c5f65be318a0dc890 SHA512 cfa49bd47f24cc031d98ce1180fc55f991015b08872ee38024cb70069245f7323d4ac1f9189b0b4dd70516d0bcbe7e5895df221b4eefbfbd83e474d7aee1cd89
 DIST botocore-1.29.32.gh.tar.gz 11048130 BLAKE2B 42c1fd07f0501c5815c05ff8ad2d63d1e90e22835e1df274a7a7dbd77d0edd111c6bd596e2c4489a54982629ad5c525cc558db71f5f06d07cc6a80084f3cb274 SHA512 4ae8f60ee36999848944ebb122fbc3bfde0730d5e2450fa25d7f608e277534bce49fef93e2e21db315edfbda795a130b7ce63644f5a3627cbed4b7905bbb1f99
-DIST botocore-1.29.33.gh.tar.gz 11053602 BLAKE2B 746a59340b7a01c46b15d36d735c67db107ccc99ffa20983a15196561f48a3974d5f9d7b82a2eba07ca04b0a9d068bc742fcafe19259b3e76643cd0ca0bb1baf SHA512 efbeeca34ecd759735f91b6dae5bd4f2b32831cdbdc1eb621242b158bc1a707c50de68ab07e894cb207b65601a5b96f592350bd2f2b395a959344d06699ab7e0
-DIST botocore-1.29.34.gh.tar.gz 11061036 BLAKE2B 03b4b48d1308113be6711e27d15dfca4e361ba6c1464c009cdbb0524ddf2075a749e8433d52fe760a4a3871ce3f646c08db125f81828c1b29d8ee3d2a2176331 SHA512 683a0f0d62559db351036426bf59e3179c259cddb4010e6064cac2f23d43e07d98b6aed8a1cf5b3a8089ae24a95f1b3f2543bbd23bc0a21d7aad90114041619b
-DIST botocore-1.29.36.gh.tar.gz 11075582 BLAKE2B 4db73c753acc1eba93bc5fc3a2486b3ded6ee41e35220f56cefc71e808128cb88582474782b1e77b992186b8bcab3ec34ec5566517b1464ee226480f615ef1f0 SHA512 dfaf655fabe85c54cc58a4266fa11b78c7b0dab771a639d9bf8d2583db1b245ae8d5344b7fc6aff759fce80a3ab7ba7f61a7d912adc1dab3c147077cd4fd79c9
 DIST botocore-1.29.37.gh.tar.gz 11077206 BLAKE2B 59c877edba074d4d5858dbf0a4026c0884cc4fce5bc2c9a7d933cfbff8317825663955205ebc754f8a4713b817b7d775fe208d6946f788a1943989949da58a04 SHA512 e79447fe66a506326c5f6396a32b5f4f6560038c57ab03457c36c838f52c1e48a94cba7624350a738eb937d0f3954984b77fd97ffb4becfa72cc4c61005efd40
-DIST botocore-1.29.38.gh.tar.gz 11079677 BLAKE2B 3edca40f575278b24c4b65ccaba3432715f8d7908f6e561cc475963f0865ef777a53845a1e8579f023a4943d69f33c8e1071afa6dd214d480dd48bacc8c132e1 SHA512 814863a6653f36f58bb20d4c7e154ba6d731f4046f3183ce696f515b1baa5ce342620bdfdd09eeea3847c6494add5611651487ad4d8f9c773823cf20393cb940
-DIST botocore-1.29.39.gh.tar.gz 11079996 BLAKE2B 5354766665b3402861cd497ee2831cb82c7d6db977c6573cb43cd70ec06291a4eba6c39a601c798414c2fb47c92f14df6e302623c1d5a5523edfdd9c977bf579 SHA512 bf7c30313737792eea1506855aa166cac63fcba48b764ec5e5b2313c9c66fe48970cfeef1f7405f329db715ee0b9d49ff4550d6d69ccd4c7db09923e77bcbe8d
-DIST botocore-1.29.40.gh.tar.gz 11081508 BLAKE2B f303b055083d41646367ed8d1c72cbb51cd229d5a2e5268265e90ed9ddb1fe99bc314b1ca5ed44e537b4056e7f2cf14acf610e2d2b448419b7b735e26c57f81d SHA512 ad8c90fd4a6de0ef28bd48a870a5918ad12cc842b7c5abbc1fdd77a1a0dc9231f40ef76eab5f367009bb590437e2c109d40883cec2af961f379345d5da89b761
 DIST botocore-1.29.41.gh.tar.gz 11082628 BLAKE2B a42a66299715159e82bb7bd9ceb5d1d60e88bfe2f59f66231605c909b03110ec18e6f946690c5b33e662fc92719e45fa4cf64ac31176d809908f3574fece5d49 SHA512 b3a5409f3d868c93fd038687d8c864be3c9cacbf4740ba0dd745358cadcce9aa8d76616d7f93316ac14f5f94f18ed42505ec108e2557b234b26c01ca0f3fc22c
-EBUILD botocore-1.29.20.ebuild 1898 BLAKE2B 96ba15f9361114f85df2e6d1d2d17a1e1e1e88f9ede3d0dbb528ac195589670eddb17a452353eb3c91014fee6e5737a7e581e0aebd62bc25ff752ffbb22b0572 SHA512 a44a1049cfc316267502dd278d62eb7850a63b94191ac8ea017af4d0836fb6007a41082d14182fd0c679fdc4b5431e0bb2588084b95453fd587de2fffe801882
-EBUILD botocore-1.29.29.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa73a78b627988165703230bd47488a99b1b38bfbdf1dae735806a0de9ca9a17db8afb526121f8c5402e97ca659a6b9 SHA512 9aa2a546360c0bc286bfabb5adb2c95af40d4d405d89fc4186856814b9b88d158fa952d82fd42126876270615e88a24820ac61132e8fba8414db4ac01da2f72b
-EBUILD botocore-1.29.31.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa73a78b627988165703230bd47488a99b1b38bfbdf1dae735806a0de9ca9a17db8afb526121f8c5402e97ca659a6b9 SHA512 9aa2a546360c0bc286bfabb5adb2c95af40d4d405d89fc4186856814b9b88d158fa952d82fd42126876270615e88a24820ac61132e8fba8414db4ac01da2f72b
-EBUILD botocore-1.29.32.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa73a78b627988165703230bd47488a99b1b38bfbdf1dae735806a0de9ca9a17db8afb526121f8c5402e97ca659a6b9 SHA512 9aa2a546360c0bc286bfabb5adb2c95af40d4d405d89fc4186856814b9b88d158fa952d82fd42126876270615e88a24820ac61132e8fba8414db4ac01da2f72b
-EBUILD botocore-1.29.33.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa73a78b627988165703230bd47488a99b1b38bfbdf1dae735806a0de9ca9a17db8afb526121f8c5402e97ca659a6b9 SHA512 9aa2a546360c0bc286bfabb5adb2c95af40d4d405d89fc4186856814b9b88d158fa952d82fd42126876270615e88a24820ac61132e8fba8414db4ac01da2f72b
-EBUILD botocore-1.29.34.ebuild 1906 BLAKE2B 6bb6097b84adeb172e43d2cccb963d8912fa0b3f6d9a59a0a41ef645ceb5cb22e35aaf763a39e0e6905721e68f129f0bd14f01edf8d3706f5b666f3075023fa9 SHA512 1cc91fc5b2e9478efe06571396a67a94c582d2032f7d2c973ec4748a8ce490d2d0218fd8fbf49a94f74617f472040bf58c957f44a69498a0c2d3c47647ca99f6
-EBUILD botocore-1.29.36.ebuild 1906 BLAKE2B 6bb6097b84adeb172e43d2cccb963d8912fa0b3f6d9a59a0a41ef645ceb5cb22e35aaf763a39e0e6905721e68f129f0bd14f01edf8d3706f5b666f3075023fa9 SHA512 1cc91fc5b2e9478efe06571396a67a94c582d2032f7d2c973ec4748a8ce490d2d0218fd8fbf49a94f74617f472040bf58c957f44a69498a0c2d3c47647ca99f6
+EBUILD botocore-1.29.32.ebuild 1898 BLAKE2B 96ba15f9361114f85df2e6d1d2d17a1e1e1e88f9ede3d0dbb528ac195589670eddb17a452353eb3c91014fee6e5737a7e581e0aebd62bc25ff752ffbb22b0572 SHA512 a44a1049cfc316267502dd278d62eb7850a63b94191ac8ea017af4d0836fb6007a41082d14182fd0c679fdc4b5431e0bb2588084b95453fd587de2fffe801882
 EBUILD botocore-1.29.37.ebuild 1906 BLAKE2B 6bb6097b84adeb172e43d2cccb963d8912fa0b3f6d9a59a0a41ef645ceb5cb22e35aaf763a39e0e6905721e68f129f0bd14f01edf8d3706f5b666f3075023fa9 SHA512 1cc91fc5b2e9478efe06571396a67a94c582d2032f7d2c973ec4748a8ce490d2d0218fd8fbf49a94f74617f472040bf58c957f44a69498a0c2d3c47647ca99f6
-EBUILD botocore-1.29.38.ebuild 1906 BLAKE2B 6bb6097b84adeb172e43d2cccb963d8912fa0b3f6d9a59a0a41ef645ceb5cb22e35aaf763a39e0e6905721e68f129f0bd14f01edf8d3706f5b666f3075023fa9 SHA512 1cc91fc5b2e9478efe06571396a67a94c582d2032f7d2c973ec4748a8ce490d2d0218fd8fbf49a94f74617f472040bf58c957f44a69498a0c2d3c47647ca99f6
-EBUILD botocore-1.29.39.ebuild 1906 BLAKE2B 6bb6097b84adeb172e43d2cccb963d8912fa0b3f6d9a59a0a41ef645ceb5cb22e35aaf763a39e0e6905721e68f129f0bd14f01edf8d3706f5b666f3075023fa9 SHA512 1cc91fc5b2e9478efe06571396a67a94c582d2032f7d2c973ec4748a8ce490d2d0218fd8fbf49a94f74617f472040bf58c957f44a69498a0c2d3c47647ca99f6
-EBUILD botocore-1.29.40.ebuild 1906 BLAKE2B 6bb6097b84adeb172e43d2cccb963d8912fa0b3f6d9a59a0a41ef645ceb5cb22e35aaf763a39e0e6905721e68f129f0bd14f01edf8d3706f5b666f3075023fa9 SHA512 1cc91fc5b2e9478efe06571396a67a94c582d2032f7d2c973ec4748a8ce490d2d0218fd8fbf49a94f74617f472040bf58c957f44a69498a0c2d3c47647ca99f6
 EBUILD botocore-1.29.41.ebuild 1906 BLAKE2B 6bb6097b84adeb172e43d2cccb963d8912fa0b3f6d9a59a0a41ef645ceb5cb22e35aaf763a39e0e6905721e68f129f0bd14f01edf8d3706f5b666f3075023fa9 SHA512 1cc91fc5b2e9478efe06571396a67a94c582d2032f7d2c973ec4748a8ce490d2d0218fd8fbf49a94f74617f472040bf58c957f44a69498a0c2d3c47647ca99f6
 EBUILD botocore-9999.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.20.ebuild b/dev-python/botocore/botocore-1.29.20.ebuild
deleted file mode 100644
index dc69b4e53a4f..000000000000
--- a/dev-python/botocore/botocore-1.29.20.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		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"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.29.ebuild b/dev-python/botocore/botocore-1.29.29.ebuild
deleted file mode 100644
index eed342eb3cfa..000000000000
--- a/dev-python/botocore/botocore-1.29.29.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		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"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.31.ebuild b/dev-python/botocore/botocore-1.29.31.ebuild
deleted file mode 100644
index eed342eb3cfa..000000000000
--- a/dev-python/botocore/botocore-1.29.31.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		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"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.32.ebuild b/dev-python/botocore/botocore-1.29.32.ebuild
index eed342eb3cfa..dc69b4e53a4f 100644
--- a/dev-python/botocore/botocore-1.29.32.ebuild
+++ b/dev-python/botocore/botocore-1.29.32.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/botocore/botocore-1.29.33.ebuild b/dev-python/botocore/botocore-1.29.33.ebuild
deleted file mode 100644
index eed342eb3cfa..000000000000
--- a/dev-python/botocore/botocore-1.29.33.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		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"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.34.ebuild b/dev-python/botocore/botocore-1.29.34.ebuild
deleted file mode 100644
index 36f6e1eb862b..000000000000
--- a/dev-python/botocore/botocore-1.29.34.ebuild
+++ /dev/null
@@ -1,74 +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_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		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"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.36.ebuild b/dev-python/botocore/botocore-1.29.36.ebuild
deleted file mode 100644
index 36f6e1eb862b..000000000000
--- a/dev-python/botocore/botocore-1.29.36.ebuild
+++ /dev/null
@@ -1,74 +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_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		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"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.38.ebuild b/dev-python/botocore/botocore-1.29.38.ebuild
deleted file mode 100644
index 36f6e1eb862b..000000000000
--- a/dev-python/botocore/botocore-1.29.38.ebuild
+++ /dev/null
@@ -1,74 +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_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		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"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.39.ebuild b/dev-python/botocore/botocore-1.29.39.ebuild
deleted file mode 100644
index 36f6e1eb862b..000000000000
--- a/dev-python/botocore/botocore-1.29.39.ebuild
+++ /dev/null
@@ -1,74 +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_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		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"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.40.ebuild b/dev-python/botocore/botocore-1.29.40.ebuild
deleted file mode 100644
index 36f6e1eb862b..000000000000
--- a/dev-python/botocore/botocore-1.29.40.ebuild
+++ /dev/null
@@ -1,74 +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_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		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"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index 0b0393cc5987..9f6a1a4243c6 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1,9 +1,3 @@
-DIST cbor2-5.4.3.tar.gz 86499 BLAKE2B 0303ed49a1c468a3aa13e12a4bebef17479f106bc3f0a92e35c6029ff1bd86aea6a77f557ac0c8acb5e055ec0b56c82e5c95e9417d00715a1fb244bd94d0f60d SHA512 9527bec5a36464bb7dc9a8c0ece3ad72f1c6182272a7edf0526668b264c957b72bc031d2398dc6af38af09bb298219c316da194084fab410bae5f9100b22328b
-DIST cbor2-5.4.4.tar.gz 86755 BLAKE2B 616a5e3d10f979f7f5923b0226d6ca52392e79bf1c4dcdef6d44143af75b02a91846e1a8f0c571f096f2168908137a5f31995199c13383b4d81cb1f17062b1fd SHA512 f8754423490b8a9643ca3309c99254f6be5e9eeab2163b57631fd2e6fd3f5f5dbd8495e24bbfcf96720f07467797eb3f4e3603822a7d6999f1ee4fa66651f2d7
-DIST cbor2-5.4.5.tar.gz 86800 BLAKE2B 2911cf15d31ec77aab79129719f9fc869392da8383b8a1afbff7e7d9c0d90ad341f66b5b76ae5142eae7036b7446dd54d545a48695de43aaf54e0824e9d8052c SHA512 ee360318c24ab6cdd93162ef78b0ab099990630ebd14c581012b0d86b1a30c9aa1e4b45d285d33da5684f5385db976189e89d32589d68272f79fcd8f7130bf7b
 DIST cbor2-5.4.6.tar.gz 86909 BLAKE2B df24c786f32819f9a93a2db28536b78349db6185108188d0a20e7298ff8c083d1feb59110865b4e21190e0363b113201ccddaa0d36b49bd7bbacf9d5ee7695f4 SHA512 44fb3e2e2249c79b1454487670d53eb672ffae4c22374d2a2bb9e314ac15470e4e7913e4eb1981a8bd4d722e6827328dde7e57c5f0556843e951c4723ae5bd8e
-EBUILD cbor2-5.4.3.ebuild 742 BLAKE2B 66cef322f8f7232e5d3f8998a0dd3745b33312a7f49a0f6a84b32464a490f6a55b19af6bbbd1f2cc973dea98e525216adbcec3865d44b65ec8d9138dbb50b509 SHA512 381d9264ad334246a5d6705f0f3bee5b191fb569f570238c7b49ed206094bbacb04c70a0b1d1248e82f2ef1d1744022399b000bf6444fc503440a08b81bb00d6
-EBUILD cbor2-5.4.4.ebuild 746 BLAKE2B 10d554b4065f80e47c00fd64aceb8e3d97631cf67bd141db2bf5af77a3cd21ce4432ff428f9b7a675b29e5fce49950531ab0b5a7cfd46a0e771c4d781d861da7 SHA512 4e0406482dc1e895dee85b129bbba3ca1ea9fba672c5afa97832ca1ea31bee990c7d2386157536be279f4110fca16bc3ba218530631bd0d8e6def7dd8492a67e
-EBUILD cbor2-5.4.5.ebuild 746 BLAKE2B 10d554b4065f80e47c00fd64aceb8e3d97631cf67bd141db2bf5af77a3cd21ce4432ff428f9b7a675b29e5fce49950531ab0b5a7cfd46a0e771c4d781d861da7 SHA512 4e0406482dc1e895dee85b129bbba3ca1ea9fba672c5afa97832ca1ea31bee990c7d2386157536be279f4110fca16bc3ba218530631bd0d8e6def7dd8492a67e
-EBUILD cbor2-5.4.6.ebuild 746 BLAKE2B 10d554b4065f80e47c00fd64aceb8e3d97631cf67bd141db2bf5af77a3cd21ce4432ff428f9b7a675b29e5fce49950531ab0b5a7cfd46a0e771c4d781d861da7 SHA512 4e0406482dc1e895dee85b129bbba3ca1ea9fba672c5afa97832ca1ea31bee990c7d2386157536be279f4110fca16bc3ba218530631bd0d8e6def7dd8492a67e
+EBUILD cbor2-5.4.6.ebuild 742 BLAKE2B 66cef322f8f7232e5d3f8998a0dd3745b33312a7f49a0f6a84b32464a490f6a55b19af6bbbd1f2cc973dea98e525216adbcec3865d44b65ec8d9138dbb50b509 SHA512 381d9264ad334246a5d6705f0f3bee5b191fb569f570238c7b49ed206094bbacb04c70a0b1d1248e82f2ef1d1744022399b000bf6444fc503440a08b81bb00d6
 MISC metadata.xml 995 BLAKE2B 8b9c668c2628dc12eab5bc42ca90a5c7e1ed64405b3de54ccca8dca90a974e9e2274b8815bc800d5427c6128c2f369eb5fc1fe17b5f6dbcee242239966dcdb98 SHA512 12f4909783b90ac9eef2ef4141f6f0041c2faed7ccb3d08f64fc8cd4e36e5ad8a3a5068267f6dc02c8d2fca5213d26f28ce468ce4487a0b2d44cdb558d4882c8
diff --git a/dev-python/cbor2/cbor2-5.4.3.ebuild b/dev-python/cbor2/cbor2-5.4.3.ebuild
deleted file mode 100644
index 08c1044fdbc9..000000000000
--- a/dev-python/cbor2/cbor2-5.4.3.ebuild
+++ /dev/null
@@ -1,33 +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="Pure Python CBOR (de)serializer with extensive tag support"
-HOMEPAGE="
-	https://github.com/agronholm/cbor2/
-	https://pypi.org/project/cbor2/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
-
-BDEPEND="
-	>=dev-python/setuptools-61[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e "s/--cov//" pyproject.toml || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cbor2/cbor2-5.4.4.ebuild b/dev-python/cbor2/cbor2-5.4.4.ebuild
deleted file mode 100644
index e59e7bdb4064..000000000000
--- a/dev-python/cbor2/cbor2-5.4.4.ebuild
+++ /dev/null
@@ -1,33 +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="Pure Python CBOR (de)serializer with extensive tag support"
-HOMEPAGE="
-	https://github.com/agronholm/cbor2/
-	https://pypi.org/project/cbor2/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-BDEPEND="
-	>=dev-python/setuptools-61[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e "s/--cov//" pyproject.toml || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cbor2/cbor2-5.4.5.ebuild b/dev-python/cbor2/cbor2-5.4.5.ebuild
deleted file mode 100644
index e59e7bdb4064..000000000000
--- a/dev-python/cbor2/cbor2-5.4.5.ebuild
+++ /dev/null
@@ -1,33 +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="Pure Python CBOR (de)serializer with extensive tag support"
-HOMEPAGE="
-	https://github.com/agronholm/cbor2/
-	https://pypi.org/project/cbor2/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-BDEPEND="
-	>=dev-python/setuptools-61[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e "s/--cov//" pyproject.toml || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cbor2/cbor2-5.4.6.ebuild b/dev-python/cbor2/cbor2-5.4.6.ebuild
index e59e7bdb4064..08c1044fdbc9 100644
--- a/dev-python/cbor2/cbor2-5.4.6.ebuild
+++ b/dev-python/cbor2/cbor2-5.4.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 
 BDEPEND="
 	>=dev-python/setuptools-61[${PYTHON_USEDEP}]
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 50a8c026c853..3afab456094f 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -57,5 +57,5 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD cryptography-38.0.3.ebuild 3193 BLAKE2B f42a5dd98deb51f1fd1bebcd1c7b9b0248f6d93e549db9318cfbb9017dfeed728c1073f3addf465abd2125dd1f10f6ad2eb3057fd8439c0ff5a8de11f7975887 SHA512 392fefefa77b56103b843239b959478909e92cb9f667c8b6f9e175a3375d917d5ef4c77134c585046f7847d6758cd07e7c1ea9bc1563d5130d92e5d84261b761
-EBUILD cryptography-38.0.4.ebuild 3224 BLAKE2B 30461a84549bcf9e8bf11c8bb9ecd1e56b71378e7e8c1349006c074f9f64d15e7ba023e752f4828770751301514237163402a50719ea1d9af0f36999fb5c9c58 SHA512 6c733e97133ef996c94e66764d74011a3d47917ddc3fce89432883ab1a9b8fb118c7bf4c3548aee67e84f1ed8e530bb97c7fb140aa843b08d461daa089773629
+EBUILD cryptography-38.0.4.ebuild 3218 BLAKE2B ee77f8865077c4563ddc3b596f42c6a57dad0e8eda103245a77284b0de5a06cc21221f4c4d82c0e3c3b9d94463d05a38cb3540c726461acf1e2417112621614c SHA512 979be1a05075f576ac90943aaae4af481ec53a2132ddd6886acaba33a9aef7cb0c6e1fc08e20eb48f59b0869a7b4ea57a6b1c97ad7f51eab1a2f78c5b5185e0f
 MISC metadata.xml 464 BLAKE2B 96c0bd97b83c9718910d129260402fdc37e88a96ac6002c8f6dd19fb21d6daf31211b83ff7423036811e27954811ebdc810c8328f18c620682bd9428f42ba1f9 SHA512 2f36a186bb195a8cbafe1d8dd6630fadf0ea56b22906ebaf3c90954adb8b66e1017f599169e2b1ca386e1113c1a6b834fff90f2bec527bed53f62985120732d6
diff --git a/dev-python/cryptography/cryptography-38.0.4.ebuild b/dev-python/cryptography/cryptography-38.0.4.ebuild
index 3f47e9fd6976..52cf51f71ad2 100644
--- a/dev-python/cryptography/cryptography-38.0.4.ebuild
+++ b/dev-python/cryptography/cryptography-38.0.4.ebuild
@@ -85,7 +85,7 @@ LICENSE="|| ( Apache-2.0 BSD )"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0 BSD-2 BSD MIT Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2o-r6:0=
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index e5b856c1fad4..ec50a5b89b2b 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,8 +1,3 @@
-AUX flake8-4.0.1-upgrade-mccabe.patch 321 BLAKE2B 6febcff41b8064731f3a91bd9785516ce9534c5e6687404262df4eb984011dafe17ce8164a886d11ed0e4b795c475bdcc52e38db0b9e95ba3b36cecd4a0f452a SHA512 621771fd1976172caf2a6f1942821097ac50617c07cfa9a20f4d4b4ea24b8bcec0a41d81b6e49fce2405a6cca8b15dd513d6bbf41e186175b1aa21e30076b123
-DIST flake8-4.0.1.tar.gz 154905 BLAKE2B b93fea36236881da595ae924b056686e0cd35d2466c1858e3ee83262922df8bc38cf5cd40a910980d287d048572dc94eb8d7c8ee4b11ebd1b4a474dfca02490c SHA512 0bdbf0218ce893df1c3e61f51cd3f371a5c72bb49ef78fec39548b1684e49b024e91cf4e3dcea60ba1efc08727985ef485814c372461e062ff4f810da99a1796
-DIST flake8-5.0.4.gh.tar.gz 146207 BLAKE2B c99ec0977948e98ca62106737509f7901b15871894f08c1dc82a4dfdf7567bc85eaca5918600fc42d0c82de612644df1b587e8a7c84fbe040d1402c3513e1855 SHA512 2e9f8bf2bbca1ab0b7cb0bc6aee53f7e12288194a80a8be915478061fd76adb8d270ee50383b45beb9d4dd1ee806f104e7bbf29f69b23a7cd88ee0902ff3e965
 DIST flake8-6.0.0.gh.tar.gz 139138 BLAKE2B 87590594a95f48a9e532ca545d4ae17a098cba81a7708066d63180b27e1cd0e0b648a2362d16b3818ef1b91cbe9ecf51810d45136fb42f188fc09083e9b31921 SHA512 27de4632332ee72bb5deedfcb7ea59e31a3e7fbfd6c165adf019b06cccaba51b776f4310219d8b27cf4894ed2597330fe9c0e381187353d4dc239f102eedd26a
-EBUILD flake8-4.0.1-r2.ebuild 1233 BLAKE2B 8b22865d9d36db9a860b4132b71dcc9ce9a4de8d00312538fe7f5880d70763a4300151379222d10bfffcbcae965533581096fd47b0bcb0a2d89337cabc44c8dc SHA512 d99542c787c24d2ea3473b3acaa24f0debf53a9b038d5f14374932efc1f760c68f1aa066729b4f60c0a55e75e7b0f2d260ab4867f85652065d294d0399b8e340
-EBUILD flake8-5.0.4.ebuild 1237 BLAKE2B b3ae08e137e3422fe48218984fc12cacbaa20aa6bd868a7c7af87b8c648c6ec519658b869929ee4a8fce77e2d86ff64fc877832a8ffbea819912ebbca796b2d2 SHA512 63252af97cb9dbad49b7191ec9de23578a0e56d0643cc67db6f15eea8524085fd32128c13cdfae37736057e18d96e1d9106bbbd8cc056a6849588469a0a36cc9
-EBUILD flake8-6.0.0.ebuild 1190 BLAKE2B d4da720ef13bf473ef37be431e5476db4a3cdace71fd4d6671bf478b644f14647d565e095d131d4a1b67e5f811cc4b12dc20f0f3da66d8b7789b474ec5ec9c18 SHA512 49113ba52ac155c242bd269548ef596b97a2e53eade9030bc72e7675249ac2bef5b676f128f7de8f8d80795b4d3607a2bfbe274cca27bd29cde1a13282b3504c
+EBUILD flake8-6.0.0.ebuild 1182 BLAKE2B 34e678092c454d81e9e30dd7eae5d60c3f128f5cb7e25706f46af1271d788d4ee19790803359b0382297e72e432e08441ce9a5d0ecca8f19243b82f0bcc3626e SHA512 2e4bfe8aaf90c92a766aada4c2324a358f396203d8376562f3f706148596264854c0333645218cfca918a3cf76e0a356c23dee066cac6b756f37bd3de760f5b1
 MISC metadata.xml 399 BLAKE2B 01ae165c898af67195582e1aaf867b9f9fc937e56b87f09a812d21c9d1175131c25561524ba76857c1630a117a21bc43eeef907c2a34ab9e9b38866dc2f9430e SHA512 8f149a017f4fef8f8fe0fef037e589694e0c3b3689990f97f38ed23fb9b5c5170985fc1fd7814ef70b8200db66cb9367dcfc9bf6453f8742092335a1c3c8fae6
diff --git a/dev-python/flake8/files/flake8-4.0.1-upgrade-mccabe.patch b/dev-python/flake8/files/flake8-4.0.1-upgrade-mccabe.patch
deleted file mode 100644
index 5dab4af913fe..000000000000
--- a/dev-python/flake8/files/flake8-4.0.1-upgrade-mccabe.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.cfg b/setup.cfg
-index 9cbc9b3..732d6a2 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -35,7 +35,7 @@ packages = find:
- package_dir = 
- 	=src
- install_requires = 
--	mccabe>=0.6.0,<0.7.0
-+	mccabe>=0.7.0,<0.8.0
- 	pycodestyle>=2.8.0,<2.9.0
- 	pyflakes>=2.4.0,<2.5.0
- 	importlib-metadata<4.3;python_version<"3.8"
diff --git a/dev-python/flake8/flake8-4.0.1-r2.ebuild b/dev-python/flake8/flake8-4.0.1-r2.ebuild
deleted file mode 100644
index 330b48a50e31..000000000000
--- a/dev-python/flake8/flake8-4.0.1-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
-"
-PDEPEND="
-	>=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8.0[${PYTHON_USEDEP}]
-
-"
-BDEPEND="${RDEPEND}
-	test? (
-		${PDEPEND}
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-upgrade-mccabe.patch"
-)
-
-distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove version-limited dep
-	sed -i -e '/importlib-metadata/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/flake8/flake8-5.0.4.ebuild b/dev-python/flake8/flake8-5.0.4.ebuild
deleted file mode 100644
index fb872f3ac938..000000000000
--- a/dev-python/flake8/flake8-5.0.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="
-	https://github.com/pycqa/flake8/
-	https://pypi.org/project/flake8/
-"
-SRC_URI="
-	https://github.com/PyCQA/flake8/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.10.0[${PYTHON_USEDEP}]
-"
-PDEPEND="
-	>=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		${PDEPEND}
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# fails if additional flake8 plugins are installed
-	tests/integration/test_plugins.py::test_local_plugin_can_add_option
-)
diff --git a/dev-python/flake8/flake8-6.0.0.ebuild b/dev-python/flake8/flake8-6.0.0.ebuild
index 7223706d7eb8..af77f380c879 100644
--- a/dev-python/flake8/flake8-6.0.0.ebuild
+++ b/dev-python/flake8/flake8-6.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 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"
 
 RDEPEND="
 	<dev-python/pyflakes-3.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
index 733d5a61e4e1..b836f28e704b 100644
--- a/dev-python/gitdb/Manifest
+++ b/dev-python/gitdb/Manifest
@@ -1,6 +1,3 @@
-AUX gitdb-4.0.9-nose-to-pytest.patch 2453 BLAKE2B 6c827808467f874d500bd6b15cefae6292d01ad9f104e8085e5038c92970a329847654c097b6be8e3a2edeb42ff0c2ebc708de9601f74cb90a4bbfdba31e1cf6 SHA512 d5878b74919cec9481b6f0012e35bb01e4fbfc42d053900f1ef1af3f1f4ebcc01c3a0a14a4e60519d24cafd5c51fb43174c58ac00f5bc7eceea10a8ec1f2f3bc
 DIST gitdb-4.0.10.tar.gz 394284 BLAKE2B f5a00dd3a27a17781df4c53c268c92101838ce53efcb3796a72a79f8109540912f86d746cad169ef34af2575cfb242e90cb450b658699512d37956f6902e14ed SHA512 6cfb58db322f1b18fd25d0c6537e5b24b2eb2f7a7222c1511cdee8dff39fb1249bf12691b9cb1a5d653131b8c3c57c1de2bb42139a2c8da6014332b4f1c6c03b
-DIST gitdb-4.0.9.tar.gz 394670 BLAKE2B 7882c2757f7c6ff9fa6518504b46ff987fa69f38ba28713a6d140614944e2ccb1c371321402faae835455659a8b33c12523cb781e9c62c79132a724c7ad4d86d SHA512 174b90e09b65ba38d3404fd79a8963987ab49a5e2b96ce82057b519861e8312342c425ff10849c865f66e6e88c27d651d8902a6f8abea88f9f33161f44974109
-EBUILD gitdb-4.0.10.ebuild 1194 BLAKE2B 948ea4e89ee655509bc837e3001452c67f72a1093237d3c7259ade2074bec40727e30e294a27bcd1f5c123f6d34a43f4843b6c7ba78c09be10cc08685c19cef6 SHA512 ebd8ef0848e4bc4d8bac7aaaaf3122658d8705ab37d70f209ff2910452c84f95cced7c8914a11efd96f49fbc7749b26a9e377ef5683f0eb5c7514211f56bf039
-EBUILD gitdb-4.0.9-r1.ebuild 1267 BLAKE2B 22afdea4f7c6cce18b10019f72d2ef391236411d749078446b70231409bb1882140a2b00534d55649ca8521658204c147ec64b976b150f5555aed162b8f46cea SHA512 8a253957a94a0f4f58558dfa5e5804cede22f470a0a0596ed921e62ac962a0ea9aaaaa811a1e71fc76ec7ef5b09abc9459f97a475dfd74216666d5bc59b31c68
+EBUILD gitdb-4.0.10.ebuild 1186 BLAKE2B 5af8f028ecb71299522b7a3884d647f567ae2e9378124d5eb404c3ed77bacd31220eb809cdefea45bc5817263e92fc9186c275bf89fb3fad63084e410599a685 SHA512 d1a4a59661cc0f0835eba068ad359b9b1269d7df3bc68dfb976c576e0a86664b09402af2c21099ae6eebdeb885fde5a45ba8958c857bec4698fccd4d54cb6ded
 MISC metadata.xml 412 BLAKE2B 102f815a0eee2ea04a3c77b8b26f08760bbd64ee1f0b6b2523164f3b3fb576003865198574529332c2da8f6548f232b4cbc1bbc2e93fd7a437fe77dbde934ca7 SHA512 1f94c86c4366e0be10f89e3dbf935025bbf51d547b0ba65d99d2e97da0590de0d05fbe05e0277b0177fb1b2a9cea55cf824d332a224336d71cd49b0257fc31da
diff --git a/dev-python/gitdb/files/gitdb-4.0.9-nose-to-pytest.patch b/dev-python/gitdb/files/gitdb-4.0.9-nose-to-pytest.patch
deleted file mode 100644
index fe38e8c613ee..000000000000
--- a/dev-python/gitdb/files/gitdb-4.0.9-nose-to-pytest.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From a61910fde100fa1112ec57dd3e456719724997ef Mon Sep 17 00:00:00 2001
-From: Carl George <carl@george.computer>
-Date: Wed, 9 Feb 2022 17:15:39 -0600
-Subject: [PATCH] Switch from nose to pytest
-
-This is not a full rewrite to pytest style tests, it just changes the
-minimum to allow pytest to run the existing tests.
-
-Resolves #72
----
- .github/workflows/pythonpackage.yml | 6 +++---
- Makefile                            | 3 +--
- README.rst                          | 4 ++--
- gitdb.pro.user                      | 3 +--
- gitdb/test/db/test_pack.py          | 4 ++--
- gitdb/test/lib.py                   | 4 ++--
- gitdb/test/test_pack.py             | 4 ++--
- 7 files changed, 13 insertions(+), 15 deletions(-)
-
-diff --git a/gitdb/test/db/test_pack.py b/gitdb/test/db/test_pack.py
-index ff96a58..4539f42 100644
---- a/gitdb/test/db/test_pack.py
-+++ b/gitdb/test/db/test_pack.py
-@@ -16,7 +16,7 @@
- import random
- import sys
- 
--from nose.plugins.skip import SkipTest
-+import pytest
- 
- class TestPackDB(TestDBBase):
- 
-@@ -24,7 +24,7 @@ class TestPackDB(TestDBBase):
-     @with_packs_rw
-     def test_writing(self, path):
-         if sys.platform == "win32":
--            raise SkipTest("FIXME: Currently fail on windows")
-+            pytest.skip("FIXME: Currently fail on windows")
- 
-         pdb = PackedDB(path)
- 
-diff --git a/gitdb/test/lib.py b/gitdb/test/lib.py
-index a04084f..abd4ad5 100644
---- a/gitdb/test/lib.py
-+++ b/gitdb/test/lib.py
-@@ -65,8 +65,8 @@ def skip_on_travis_ci(func):
-     @wraps(func)
-     def wrapper(self, *args, **kwargs):
-         if 'TRAVIS' in os.environ:
--            import nose
--            raise nose.SkipTest("Cannot run on travis-ci")
-+            import pytest
-+            pytest.skip("Cannot run on travis-ci")
-         # end check for travis ci
-         return func(self, *args, **kwargs)
-     # end wrapper
-diff --git a/gitdb/test/test_pack.py b/gitdb/test/test_pack.py
-index 4b01741..f946197 100644
---- a/gitdb/test/test_pack.py
-+++ b/gitdb/test/test_pack.py
-@@ -26,7 +26,7 @@
- from gitdb.exc import UnsupportedOperation
- from gitdb.util import to_bin_sha
- 
--from nose import SkipTest
-+import pytest
- 
- import os
- import tempfile
-@@ -246,4 +246,4 @@ def rewind_streams():
-     def test_pack_64(self):
-         # TODO: hex-edit a pack helping us to verify that we can handle 64 byte offsets
-         # of course without really needing such a huge pack
--        raise SkipTest()
-+        pytest.skip('not implemented')
diff --git a/dev-python/gitdb/gitdb-4.0.10.ebuild b/dev-python/gitdb/gitdb-4.0.10.ebuild
index a647deebb1cb..e07ae8b3b614 100644
--- a/dev-python/gitdb/gitdb-4.0.10.ebuild
+++ b/dev-python/gitdb/gitdb-4.0.10.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/smmap-3.0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/gitdb/gitdb-4.0.9-r1.ebuild b/dev-python/gitdb/gitdb-4.0.9-r1.ebuild
deleted file mode 100644
index 5eb050582e8b..000000000000
--- a/dev-python/gitdb/gitdb-4.0.9-r1.ebuild
+++ /dev/null
@@ -1,63 +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="GitDB is a pure-Python git object database"
-HOMEPAGE="
-	https://github.com/gitpython-developers/gitdb/
-	https://pypi.org/project/gitdb/
-"
-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/smmap-3.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-vcs/git
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-nose-to-pytest.patch"
-)
-
-distutils_enable_tests pytest
-
-src_test() {
-	local i
-
-	mkdir "${T}"/repo || die
-	cd "${T}"/repo || die
-
-	for (( i = 0; i < 2500; ++i )); do
-		echo "${i}" > file"${i}" || die
-	done
-
-	git init || die
-	git config user.email "you@example.com" || die
-	git config user.name "Your Name" || die
-	git add -A || die
-	git commit -q -m ".." || die
-	git clone --bare "${T}"/repo "${T}"/repo.git || die
-	cd "${S}" || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	#TRAVIS=1 disables performance tests which rely on the gitdb repo
-	local -x TRAVIS=1
-	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
-	epytest
-}
diff --git a/dev-python/jaraco-test/Manifest b/dev-python/jaraco-test/Manifest
index 9e5943d5140d..77ed02cc9638 100644
--- a/dev-python/jaraco-test/Manifest
+++ b/dev-python/jaraco-test/Manifest
@@ -1,5 +1,5 @@
 DIST jaraco.test-5.1.0.tar.gz 6700 BLAKE2B 69ac08ab7e1c8aeff45d25483f2bb2648ad57a5977dbff8aab844f114a15f054b782ad5b424d9baa805ab80fc7483362dc97320965ef0abe86573b1e7f40b97b SHA512 d1d93eab85068fcba94530df50da9221b7f574e58b2c4ed519c8c4dec7231aa982d588e29137418226f23e0f94bd98f47c0859cf14d7a58c1683ac8ccc24d900
 DIST jaraco.test-5.2.0.tar.gz 8000 BLAKE2B 21e0714537a9966cc285eb1458f313c354226903ee3da816d7a6620676716cf9c220f82963c8b8ea7ac7a1d641f174d5c72dcca43c68c62e4f929c411aa00d62 SHA512 25cd7d5defda6941569958ce61cf41b54555d54c7dc1e115de409d6da352f8e8c09b8671adbdfdc00cf6f1c60a0d43201680c40dbeda44bdcf11a0e64cb23751
 EBUILD jaraco-test-5.1.0-r1.ebuild 814 BLAKE2B 485fa57bf60eaf93425b47fb479e2ec2a9c9408b57c8652f6a4e0fae706744a80270a7b366a640e6a0e2ea2dc391d0e5b48d2414a7ecea148d26f1570c17595d SHA512 125dd57f0fffaa8db952118c44b868f4db16d64cb93bcdc52e7356c3e96d5b15d2165adc69c22625aee32898fee93f5660618d5041239c93287771ba517bb5f3
-EBUILD jaraco-test-5.2.0.ebuild 629 BLAKE2B b7569aad037c8b84caa4f3898f8f31b1346b194e8810f87258801247b820abd11d4fe54b82bdcde6f1d3f9e4852e2a2b1113695cfe953aff93d499007c72583a SHA512 6e8cb2e1a5a757b24ac79ab815ef0d0a2b61606944554607b0c1dce1410d425e2a1280472f46c4e71c26fc0f37f59333d849055be60d8a3530c965b4b026494c
+EBUILD jaraco-test-5.2.0.ebuild 654 BLAKE2B f3c866cee8a17aa5304c6b2df1316adc54976dc69162365b41738cfe917e5cd2840d499279d46d982dd08f3e6707984a6fd944e0c387710ae27b563ea5850239 SHA512 2b3d93762d22e386db80313da7fcd5fc35262814ce9ff61b2c21cf50afefd3332daf1e756d702ef9451e3e54537362e6007526f3848c685228c318a822966370
 MISC metadata.xml 397 BLAKE2B 24c07f0efc966e9d4445968ba639a5476a24a0885051e4eab17075ea9b7b6369fe9ed919ccdc0b51a1e667c8d327428caac2196c2a3e087d8b36176e7b4b2c81 SHA512 4fce74bc524dc018611c219b86b87b7643fe5d133309a00dd5ade217895165f85cfbe26b686c79fc4dd8b1e016b07c83c25afa1c015fc240ffa0ac75e4c17159
diff --git a/dev-python/jaraco-test/jaraco-test-5.2.0.ebuild b/dev-python/jaraco-test/jaraco-test-5.2.0.ebuild
index 8b5ed987f9b2..20f1619cdd8d 100644
--- a/dev-python/jaraco-test/jaraco-test-5.2.0.ebuild
+++ b/dev-python/jaraco-test/jaraco-test-5.2.0.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86"
 
 RDEPEND="
 	dev-python/jaraco-context[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_events/Manifest b/dev-python/jupyter_events/Manifest
index 770183bdac7e..e18e37ea92fb 100644
--- a/dev-python/jupyter_events/Manifest
+++ b/dev-python/jupyter_events/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_events-0.5.0.tar.gz 55838 BLAKE2B a3ac815a28d2592a10394569726b76de75cb3baab0bab4c1f276da33375ba93d6bfed71fbfaca404a238b7af58ebd7e75dd7fdf6c8717141517c2f790eeb9514 SHA512 49c21f0d5dce18b137f73911b0272919a56c972561deceb228558ea369f2091ce219ac335eec002b22ca1465b2622330fb3d8973d142df4b76e350345cb6249a
-EBUILD jupyter_events-0.5.0.ebuild 870 BLAKE2B 6a2c41a50ff54eac67e48e5c9f3030ec7b254383c369fd74922e44a16ad8105e0de328495b156fe94544e2aae70375014ba951b011c4fb94ec3f38873e85e061 SHA512 610717fd31db4955e2ac5c0573b5c16b70180bdb7581b181353ca291a08022916bee3106746eefec856298f2afcdf162baf0d4ff57aed98828686c0616e7c4d1
+EBUILD jupyter_events-0.5.0.ebuild 876 BLAKE2B cd45e2a6e017ca131529c7feb009042a679f20dac042f06b133e2264ba90e46faabef5a3c6dad8c626556ee5f6f61b07ed8c10a17534fd28c2eed405ac1b9402 SHA512 9c16ec5b353e2b79fb3bdac5a08d48496214373ead492534307c43a8c647d9d0946ed278d323f80387bbe4974f531016fdc0ac5fe540cfeaa37e8141bb0a80de
 MISC metadata.xml 537 BLAKE2B dfe33b67ac51a46c9ad33d4b0e02ff39d5aa1780d70f92f12b7ee8ac336c43caa79201bebd42c461373bfdc7608580487ec000613cf92765fec352b70a8aec13 SHA512 689e8a1125b4da96db6d6c4495933ee29d24666ad9e7e3af891170f8da512ac388c005836402c74418476cb9838f278c19f5267840533cef0e02091d47fa43ea
diff --git a/dev-python/jupyter_events/jupyter_events-0.5.0.ebuild b/dev-python/jupyter_events/jupyter_events-0.5.0.ebuild
index 1f45b86cfb9e..dcd0f793bc20 100644
--- a/dev-python/jupyter_events/jupyter_events-0.5.0.ebuild
+++ b/dev-python/jupyter_events/jupyter_events-0.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64"
 
 RDEPEND="
 	>=dev-python/jsonschema-4.3.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_server/Manifest b/dev-python/jupyter_server/Manifest
index c21a32565d54..f4d4db8fb53b 100644
--- a/dev-python/jupyter_server/Manifest
+++ b/dev-python/jupyter_server/Manifest
@@ -2,5 +2,5 @@ AUX jupyter_server-2.0.1-skip-npm.patch 698 BLAKE2B f037094e4ba041f112e6b2b08693
 DIST jupyter_server-1.19.1.tar.gz 453411 BLAKE2B 800231e7e7ddfcf2a2c2f2725971983d754c76940623ce000e6b86ad503bc6ca68a27e55ca3766193e58184a7148471464dfa9c27076e53ac84b176b8ff65897 SHA512 f4228c73950e49fe26add11c61f3de425b963726908a2df7dae21bb38b986c2ebb6abfc3319ef9e3acbc2fef9579a1a70ac594920985977adf580a082d272368
 DIST jupyter_server-2.0.6.tar.gz 686312 BLAKE2B dfa309146e74c646ab28f31a4a7293d2b658771077240179aebd13176151c982035649acf3b78c86ddb06e914e3342e5894fb55f8b8711cb493a6a7c4b259cfa SHA512 186b41b13cc727d0674a49abcb9b3a9aa5b898f0e9e42124e46e862ec62528b4127b159a30352f33e6b91321f1dd3f086f82dca72d5616755bcf3220d154faa6
 EBUILD jupyter_server-1.19.1.ebuild 2282 BLAKE2B 2c9c0450fa3f77034ce1e072425a235d61b6219d5adc624ab591514d4f4faced43d5e8f302aceafe3a4ddb0fcca1b12281351f1075376f127e75e7dc627ecb5b SHA512 2754a4a18aea4ad2529d03ceaf64c81b04ee15a7f6c7d1742b26c187d344be6f52d288957945ebc729d76c6c909a34688e8a434aa4aa3afadce0ae487c7915fd
-EBUILD jupyter_server-2.0.6-r1.ebuild 2067 BLAKE2B f33098515fb0ac2e54c1a2c6ce8c71e8cef5cddd03503cb0ccc347732a78406c83400046bcd1ed88e6c7a3eea60433e7ea9e845652f4459df67e5601be90a38d SHA512 9ce5ddaa4c1ff0f09a4018ccfabab58c4fcc8ae10a5f2b264dd6b7db63921bbdcb060b0c5ca2b804efb79a047dc6d258c99de8b2293c18aec000a4d4fb6ebb09
+EBUILD jupyter_server-2.0.6-r1.ebuild 2073 BLAKE2B ade398703404daa5cb0ef44afc5dd7cf0530ec1123523b6b7972ea3eb6a3cfe61ca58aa2e9a3498484c6c78a3eaa753041ecfca8d6c9380b2fc16e6d4be6f063 SHA512 50b62ecee52304dd88f5a7d221464e9c1228f840bf8823440b59e1629ccb9af33ac947234c16b558ef409a8896f3ef617fe1433e400b2d15d126346f50409d2a
 MISC metadata.xml 544 BLAKE2B ec5a0aea1d2ad6ce0e59972d2ef4ce62c03877d464dfdc34bcb94a7d01304c63761c6bc30ed973bba1f4100e25f70541bed4eea858deb44f359d0e373ae1ade0 SHA512 ffe7deb7349ce99890b902a225b73913185bfa860237dea8c1a508a6a5e84bbb74ca7a5c43253c9986f97fb3fd1e9f2bb63ca60f73953fcc851359df8adb5fbd
diff --git a/dev-python/jupyter_server/jupyter_server-2.0.6-r1.ebuild b/dev-python/jupyter_server/jupyter_server-2.0.6-r1.ebuild
index aa50855947aa..c3497d516f2f 100644
--- a/dev-python/jupyter_server/jupyter_server-2.0.6-r1.ebuild
+++ b/dev-python/jupyter_server/jupyter_server-2.0.6-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64"
 
 RDEPEND="
 	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index 1d90b7562661..aca186a60448 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1,3 +1,3 @@
 DIST libarchive-c-4.0.gh.tar.gz 47743 BLAKE2B c6246b35a9a389c6cd999b32412436f8134737a4cba1c0bf8a905e3ba6e1653c515956f43a580901dd4278cbc00b783ecfa7a4306f0fc7ca2d2666b3af500cb8 SHA512 787b049a5f06d7370369a6bb2d9ebab6e4e5eda0a4f839906e205a7e19a00f9f7e350d4c42e3434e345063dd0ea44e5b0b4c0524033b05a6d8f15758757c5c36
-EBUILD libarchive-c-4.0.ebuild 638 BLAKE2B e3358172192cefe3b80817d1803d4d4c11663af5d99a7d54c0984226157ab309c18bd96e3a00afeff1707ccc18028010aea169df7697b24677b91ffb256056d9 SHA512 3cab85464bdcbb6bfbb2eacd372d09b93b0368ede8f44cd9dee3dd8eab6ce2eaca709f60aea11f099ced25d58af05a0dd467902ea23b7794164e9455ce294ae2
+EBUILD libarchive-c-4.0.ebuild 644 BLAKE2B 0a0c56301e6f0aa901a67175a84b88c5e65047173cecbb0b2ff1f7591f8588989dbb1f3eee05ec84a6e5f9e3382359a17a940b136084ca2d2bc1a52b5cb64c8e SHA512 ee1a30375e07852e792e2aef106450f16422a25955a3974240f040b4be2361c32b7e7f9f2257cf6634b6349bf8711d407a639fdd906846f3e8b20526b66f0e83
 MISC metadata.xml 562 BLAKE2B 5b9cebc30209b517fc5ed60eea8e340dd36b16fb1c593bb857a05bc6a8cba3b6ac45a54891c72429a775b15afcd7f56b453ae628aa61d029db1df633e764518b SHA512 200c3fd7789d21103719ba2693f8298a8be1842535ff086ad487a66e9d4ae39f6dd1b2435d60fc0443add133923cf047f37c2de17f581fd66f786f935e203c43
diff --git a/dev-python/libarchive-c/libarchive-c-4.0.ebuild b/dev-python/libarchive-c/libarchive-c-4.0.ebuild
index 60ae1296caf4..174a19df207a 100644
--- a/dev-python/libarchive-c/libarchive-c-4.0.ebuild
+++ b/dev-python/libarchive-c/libarchive-c-4.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/python-${P}
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
 
 RDEPEND="app-arch/libarchive"
 BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
diff --git a/dev-python/mccabe/Manifest b/dev-python/mccabe/Manifest
index 75f117495c3a..87df6efbad91 100644
--- a/dev-python/mccabe/Manifest
+++ b/dev-python/mccabe/Manifest
@@ -1,6 +1,4 @@
 AUX mccabe-0.7.0-fix-tests-without-hypothesmith.patch 3585 BLAKE2B 928877eb6422450e410ff7a6721fc7dd0282c9d8ae4ba2be3542bf0b4c6e398f63b238fdacec979d55c86d440c463ddafcc757465dfe632ba2ce975b076ffa76 SHA512 590e7918f758873d6f14345345a5c4d3c31d098edd08252ac281bdf1ec547925620095f94a5937983136d040b4e6965207b05bd6ce7a069e6c67ace1f07493ef
-DIST mccabe-0.6.1.tar.gz 8612 BLAKE2B 6828dfd852cf9b47de10bd889dd4c32dc1ee95910fbd27e0921cd7d9975a0831b1c2763eda5b2d77d7e4b44b5a9d0e89f0818cab71de655954cc87cacfe8d382 SHA512 d8fc251a29790887c14c5932c5172b4cd578cd37ccf14cb96e80f0b97f27023427ea032d14e1e2a99d72627b055eb285f60db69e679ecd79d90a34b0255703d8
 DIST mccabe-0.7.0.tar.gz 9658 BLAKE2B b4664a00d4760e2f662681875b548b67ad76d6b8a0ee46bf160e3232ad75172512ad7b4a99759dc13607cf06f3c772210b76a7051582d0bbd221091772543c07 SHA512 3e4141033c63434fad183f62dece872554302aeee8cb789586ac7d6d748d198799e2797df1d58458f4d431734f8899f11022d76666c848d43e6271304776346d
-EBUILD mccabe-0.6.1-r2.ebuild 716 BLAKE2B 4884582ba4b135fbdb844b1d581c258044e78aaa4563bd9097ae78c5ef361882983ebc5e482ddb2a2f1573ece982215c734c060207af1077c918c424d5be2b17 SHA512 2bbb177f9c1865902fac9154d5525280e8eaedfdc8929df5a68d67eeb7b0cd47a7d1a23a8d7419f312e01d5df2da01031f36f9fd8991b0309c41a90ef2de8e61
 EBUILD mccabe-0.7.0.ebuild 886 BLAKE2B a47146568688fb3e9a441cf3845e8bb4d78bed55b8984e61ac3f11bcecf865d91aeae3946d2ff874bca970186d142aee3d829b6639cb9b5efb50a4e5db1b9822 SHA512 b4faa749919be2677a18e058dbc065cc32a2c702e178a920f462d6da56dced303c4b708920d2092015e3ef70c9a234acf9b7f4e4f2d75e451e3be39b43918337
 MISC metadata.xml 399 BLAKE2B 4abb33f734bea7c7f0e42b4840bf818ee190d83c264a623e4a3f45eb1578e4f49384976efd205234821d60d0982f5ab4abfa6885e958bc75bedc064a16d14f75 SHA512 52255fe16006844729a51af6ebd3501e1365cca9470e6cfa029c74ebd86252c4dcbf3f250876fdd0ea7b6380a51ec975370db464dfb42fbef8d4880cf5336322
diff --git a/dev-python/mccabe/mccabe-0.6.1-r2.ebuild b/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
deleted file mode 100644
index 4a2bda6049ea..000000000000
--- a/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="flake8 plugin: McCabe complexity checker"
-HOMEPAGE="https://github.com/PyCQA/mccabe"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e '/pytest-runner/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index fb6cbbf37efc..afb05e26c4ac 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,6 +1,4 @@
 AUX mkdocs-material-8.5.7-simplify-build.patch 529 BLAKE2B 60a246940983ca713b370b454fff74a36dedf1aec175e72455255b35164f75f7eb79144cff67df4b1ec143a4e19b043042c9bce562456133c917c27018c4862a SHA512 51b18f3faa4a3adfc9cf8ad1fa5fd63f787a3b2b9c9769b5889a2abab621ff6e14e034487f5573418405b26bc11155e44f7c6d50acea8baf9f45164fb3ec7984
-DIST mkdocs-material-8.5.10.gh.tar.gz 10384269 BLAKE2B 3f7837b17724e93fa28a906811a8695aacba9c479a13d4568775945aee3943b9f58e017ab71fb81da8c72073a471b736ca75bf721a786309fe822f5898e4d3aa SHA512 ed186b206ffe0b17c96a33270d83ffc3c98262eb608d6889101b6949057e7059642eb83b584f4a309afff64a359ee79625c5a95be62fc37ece069e2404faa0bd
 DIST mkdocs-material-8.5.11.gh.tar.gz 10423819 BLAKE2B 8af9b10fde57a6543d86dc8d6004cb100359e274072486094e7db4f8eeb7d44d83505d00b3f202f02e695a613ae8e2fdf08ac1b39584e7d9aeae430bb560d60a SHA512 7fdc06cf7f64a2831fe2acb05a735bc9519fdf109fbccd5ee1667d07175916fffb295ccfa88a4352a7a0688f0eaf535c26ab49463f672d964d4a87ad8de6ddf1
-EBUILD mkdocs-material-8.5.10.ebuild 1260 BLAKE2B e451af5367cd95af15ca911f87ad47eb1d1148e4f639547cc6e636dbe66e9eca1363348c0cb2a62cecf6b9899b78f98d148060072dae7ccf57ca72fae21563e7 SHA512 b18aa8d0e9cb04b1797ce89dc304409df88e1277ac3bd7e490daf87758cd41ba43c3cfbebfeeb68f0dcaec16858c0849d119188248d56e83204c84590deb7fd7
-EBUILD mkdocs-material-8.5.11.ebuild 1265 BLAKE2B 940d12dec3038abf4d4b58743f2870992a44495d72adde8b1339dbbc2acd85bbd3babf925a3e605ab61b776b7606e5a4d8911b4898db72418f5bf45ccd44eb5b SHA512 f0dc2a6f45e15be072f77842a6bee8f0f0f6c65fa062979a2a486b3f8ded5174b0aa94cdbc395bf75b012c0a56ace6c67ae89133afc39cf5cdbcb67b685b7ca5
+EBUILD mkdocs-material-8.5.11.ebuild 1263 BLAKE2B ade580f1921daa471e69a1711c5ba95adf8dd83eb385852c47ba0f1e66dff80609ba0cf0b81bed2a8afbf7949ab4af5bb753930a6a14681d8666e3bb26748d50 SHA512 e519986187741ad49b74001d89f84f8dc70c168f5c0887f95837c328e7d8b4804bcf6f51abd2ae55e3fbef73ac04ddedfdadca0c3a460b7bb1cf7ffb1463ae7f
 MISC metadata.xml 1037 BLAKE2B 6997d0f85e31152c58092081b697d8934c54f933e188082eb55e5e9f252f57274f673e1d8e5b657907da2d1658f969cd67bdb32bdc05324746f211b718f3a4b2 SHA512 ccd4f4aa6e6e780d0aff5894b260eedb602d29cc25427c202561525d27de4a31d1e13f59267d8d732d0e12f3ca0485996bca6ef2a114e96b030259899e8ad47c
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.5.10.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.5.10.ebuild
deleted file mode 100644
index ac3f606a406e..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-8.5.10.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..11} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material/
-	https://pypi.org/project/mkdocs-material/
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-9.4[${PYTHON_USEDEP}]
-"
-
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	# simplify pyproject to remove extra deps for metadata
-	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
-)
-
-src_prepare() {
-	echo "__version__ = '${PV}'"> gentoo_version.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.5.11.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.5.11.ebuild
index 33fbca42ea2f..7f37e98ce5d9 100644
--- a/dev-python/mkdocs-material/mkdocs-material-8.5.11.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-8.5.11.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-minify-plugin/Manifest b/dev-python/mkdocs-minify-plugin/Manifest
index adbb3b8d4bcf..3b8e0505ccf7 100644
--- a/dev-python/mkdocs-minify-plugin/Manifest
+++ b/dev-python/mkdocs-minify-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST mkdocs-minify-plugin-0.6.1.gh.tar.gz 8346 BLAKE2B 130495cc2dcc2b71c6dd715c1ed277df0d8fac5aef8fc49094bf05b324d692e41e3db85175df5455eed21f2cf413d57225a1baafe14770a77ffd3c2bb77ff3d8 SHA512 f1611b1a8f946e27450c9825f65e77e798200b22d08b5957417ae060cc2d6cb40c6edd2a6ace08eff2b32b59c9aca3020e26da35917aaddae293047d9cc8f86b
 DIST mkdocs-minify-plugin-0.6.2.gh.tar.gz 8480 BLAKE2B 91091702c0f5953b8cef4e081004cf44abbc2a7b21a0ea1996a337c96764a636fa79054c5d05ffc2814acb4b7fda0e833e61b02c6b97466586875e9da21c937b SHA512 563e150eb380aab105b18492eb0f725ec96fe12768c666b093e40d375e66cccf42f859aeb4d2788ae8c7a5b01e6e103c9f9aa1153802ad104955a98d90036144
-EBUILD mkdocs-minify-plugin-0.6.1.ebuild 877 BLAKE2B d4f4d45c486552439497294d9756d8f0a5c08dd14374ac5033c37d4a3b07d333decc192501bf758ee64c08b8af10546b0e0a9d8ecb54734b19c967e803c8934f SHA512 c35bfb3b875104a7f8531406251662068f53c0256ff5845af4de9428e5e6be5c0d249de8871606f05c75e423f577fd403244a73ce7232717e59f27e75cd50ba9
-EBUILD mkdocs-minify-plugin-0.6.2.ebuild 973 BLAKE2B f7ba6c50a52bb22f412484c9ca0795c48cd188410270e121067dc282245c2ca1c2ff235a01c852ef3f9446f8cc29f6e7aa84458a55a548f19964ef118b5ba3bf SHA512 83ad9df506d6decdacc157019c9ea36e477a5b763ce07f68c960af8e9b6f3420a9494d18a1401875c4b944bc1a750a59a393b7d900c710cc21d8a720ceb3c091
+EBUILD mkdocs-minify-plugin-0.6.2.ebuild 971 BLAKE2B c8df4776cad6350ad0a25cad0435b5763d53d6211ac2edf6524622593ba8490db52f8aef50ef1f382ea2a3eb8ad490720f845e70fee229fc639dbf7a20947afa SHA512 6d708c93ca10330a66f208fb2952e8111e2cf8ac5bb4072316dcdfa0521c42e4e1f5456e19eac5382a32829148973225a43b103efed9a33711dd039a16abeced
 MISC metadata.xml 437 BLAKE2B 0b089b896a3b9458b03573a6f2870ee98c194a76969cb730508582aaae75cd5ae3fc46739ba12850a2388cf588aa68c6a45e31a59a8f1894e7eb02fe78d74992 SHA512 f238ac7d118776d582d880a4355d0786dc5d9b3f82e9139d5668fa9be009eeb7228a0bc0b2d5254e76b167ec30457241b808917a910b8d2037c781e46a871946
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.1.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.1.ebuild
deleted file mode 100644
index de88cde21894..000000000000
--- a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="An MkDocs plugin to minify HTML and/or JS files prior to being written to disk"
-HOMEPAGE="
-	https://github.com/byrnereese/mkdocs-minify-plugin
-	https://pypi.org/project/mkdocs-minify-plugin/
-"
-SRC_URI="
-	https://github.com/byrnereese/mkdocs-minify-plugin/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/csscompressor-0.9.5[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.4.1[${PYTHON_USEDEP}]
-	>=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
-	>=dev-python/jsmin-3.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		~dev-python/mkdocs-minify-plugin-${PV}[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.2.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.2.ebuild
index 0a7f0c30648f..f669e45b2ede 100644
--- a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.2.ebuild
+++ b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/csscompressor-0.9.5[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 5b5317f93943..4899b590b5ae 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -6,7 +6,7 @@ DIST moto-4.0.9.tar.gz 2496530 BLAKE2B 596dc00ce0c931d4405d1ad6fdfcff4acc5c7421b
 EBUILD moto-4.0.10.ebuild 4129 BLAKE2B 5835bbdaff08816eafec87a9a9de840ef6d9b9e4cc8c295a34a1116156be932dd70bd89f1d3ebf34051ac223a88aaca8cf18c957c36ec774c8d1538e71af1b7d SHA512 e5e5c86c34384342934029b91fa682fc4cd56fbb521cb1f4fc5508188a2f574ce2f0e93a0b5abf72ce864bc1decd896e474d69b7882612a9ef0c37fa4537992a
 EBUILD moto-4.0.11.ebuild 4131 BLAKE2B f02a5b9be9428526b3d98a1fd1d56d30a38f349d68f3a802b40fb99d49206393ca4e90d2c8b26e46ab848f888361d75e80fef457e94e74bdd971c3c757e57285 SHA512 ac877bbc209501ab4e32a98b79d9d03e1a64c7ee7485b700b0e3cbdb63b16cd95109eae930a5685d99c27c84af24479b15d882999a57a2bab34798142d786811
 EBUILD moto-4.0.12-r1.ebuild 4097 BLAKE2B 6653cce5ff5baab77c2b547112f1ff94b61650b1c903b923b38ae13020c4804e4685741a9c300871c6628d3e214dca071f17cbb8948834c46c5f2cb06c279b52 SHA512 ef580ef5348017916e843043c6faf39b8214215ae7ce03b3b442f02fc53c9df4b17fc0f2201e6961fd865ddea9faa25dafb2500d07dfb5c1ec657d1da45a256c
-EBUILD moto-4.0.12.ebuild 4096 BLAKE2B 718b2628412e536bfb477e24f4fcae145c55897b42cc9be3ade397913f53ae637efd2649d11248dc65ed8e3186864d0cbfe98ad444e7feafa59b160c70ff4d26 SHA512 325f444ae9be5ca37186898719e1ef3cef1d0641710c736cc6133d7864fa6984f792747f7e39e9b892b82448f7e5278c3be29b411a2c1a5525ae434b16e866eb
+EBUILD moto-4.0.12.ebuild 4095 BLAKE2B d0009e9018b20c438903d64e6b77204368cb909c3ad0549ce1ebdc41c5f136a13bc9410c81b9f993cb723da04267624d4045bafd1973c7d6c56ab1005935408a SHA512 3b4719677e4186fdd2f1e8ddacce0627ed2a3e90120b156349577644ce2c9f6b93266f0cde82270f50ba4adc19742f387274bebbfc72cea6733fe6732a5761cc
 EBUILD moto-4.0.8.ebuild 4168 BLAKE2B f7b93227ed08d35d0576af80b74ddce6287abde1a8a53188e6d78a0e39950f8ff43f1597f621da68046d93eae09b53a16511411aba98988ea9062f9cbfe29295 SHA512 954133862dd6ce7ae667104e0650ec2696104a494c0d07772a58456d4c61844d63d6215dd613aa49a74c3b3eaa270e1736b12880799a531ca0ac0f7d9bba4851
 EBUILD moto-4.0.9.ebuild 4170 BLAKE2B 40f9e16c72e4d0e9f85f77a638010028bf8037ac5b35d936860a02b12975088991bfbe46a5ced21416001765594669e688c8d43fe5a1c1c146d2b34b82b8e774 SHA512 0e4a3523bd9c58bf304b847a31b637f53de466850e921513ca70eb2772fa26abf1132db4ff5b88c7fc557c9947dda3e54cb2d5d58a9d96678ec5860809641bc8
 MISC metadata.xml 552 BLAKE2B c0162cc80007c1fda211c105b3e7391e3596ef11deb9257bab489f4b112f79ed115ca3f250bdf1b87aee0af258aa59056c8d062acebca7dec631acf3ec9eb2bb SHA512 3f7b3c5709bca51588e58f9eeb9bb363e2657a7e6483519ec7782eb047a5311d434e2459ccd3b495340f85f72a92da2f7cc6eb3de617e979bade7b8fc7b3c01d
diff --git a/dev-python/moto/moto-4.0.12.ebuild b/dev-python/moto/moto-4.0.12.ebuild
index bc027ddddc9a..81c401ab0fb2 100644
--- a/dev-python/moto/moto-4.0.12.ebuild
+++ b/dev-python/moto/moto-4.0.12.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/path/Manifest b/dev-python/path/Manifest
index 6cd7f4d99917..1eb42a81b47e 100644
--- a/dev-python/path/Manifest
+++ b/dev-python/path/Manifest
@@ -1,5 +1,3 @@
-DIST path-16.5.0.gh.tar.gz 44286 BLAKE2B 1d96b0003c562044c1c2ba5eba7a525d5503bd9a58ec1f9611d74e9d52581f646447d3d754809b49b4418c18de9fbfd5de34077fe9edb1c4b3d3fd49f9c2af19 SHA512 0b9b306b2b5cce1e51d65a7555e54770e19a3d4796dbaf2d617bbe8282c771e3d7975112e443462e9b43bafc533d6dc61bedb8608b0d93cc0d1febec995d1780
 DIST path-16.6.0.gh.tar.gz 45238 BLAKE2B f1fa3a23ba19f623ca276496c1fa7351ea02858710f2dddbf5f4d96cf2c9f8fc3325c74a56f1b4dec809e28e927f2c8adab913eed9d8893016e0fd3d0b3a662d SHA512 4d7772b7eb7017bee78f95f30f6286b14750d6d8edbf5f58617ede12bd664f1b893921b89bb64f797e1d2eb7e67e361d8f1e01618fee26d64a5b879a3854aead
-EBUILD path-16.5.0.ebuild 912 BLAKE2B e5f67f0ab168f5ed17d15e6a072e47fc922dabef4c9b834e9b32d3bc29da62066c4e7341f5e96732b458636144eae0b6e4c5c3a93a503496257ff0b7d7fd4ffe SHA512 d7db2839493d6a642d8242fe5a8a69d22031b192b05896deef3abef68d91118e48b023ff277ced94149e10237c9fd18588631f8c4a68222c570192161d45fc60
-EBUILD path-16.6.0.ebuild 920 BLAKE2B bbfc51ae3e83c511322a9123e2ab974970c697d259c1c05f3a8393548b367dfc78fbd43f63edda4942d62e6ce07d315281f353676e796cdf1c1e5f7c61a85593 SHA512 fcdc1d9f63008a8437d2b6977f426a082cd242918faf471897979f006586f65dd4bbd4741c46db74bef980cbcbd8780a27282850148d522ee18facbcb6c17289
+EBUILD path-16.6.0.ebuild 912 BLAKE2B e5f67f0ab168f5ed17d15e6a072e47fc922dabef4c9b834e9b32d3bc29da62066c4e7341f5e96732b458636144eae0b6e4c5c3a93a503496257ff0b7d7fd4ffe SHA512 d7db2839493d6a642d8242fe5a8a69d22031b192b05896deef3abef68d91118e48b023ff277ced94149e10237c9fd18588631f8c4a68222c570192161d45fc60
 MISC metadata.xml 383 BLAKE2B 30f12776bf4f9c1995774d7dc68cd8d9a85b74d514e8239ba76af336e6b08979e496ddaffce999bf0a3557f88ced148335024628b61f765b5bd08bf90b453c5a SHA512 aaceff1caa2714c0b8b3f7373c8721358e63833cfac824e3feda8a34fd1d6a961a27805c012a1125cad1f76d8bf7b1a92d7719480d90b344e5b4d0260ccf0547
diff --git a/dev-python/path/path-16.5.0.ebuild b/dev-python/path/path-16.5.0.ebuild
deleted file mode 100644
index ff84d0db32cd..000000000000
--- a/dev-python/path/path-16.5.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A module wrapper for os.path"
-HOMEPAGE="
-	https://github.com/jaraco/path/
-	https://pypi.org/project/path/
-"
-SRC_URI="
-	https://github.com/jaraco/path/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# unreliable, not really meaningful for end users
-	test_path.py::TestPerformance
-)
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/path/path-16.6.0.ebuild b/dev-python/path/path-16.6.0.ebuild
index ecd7e2ae4fa3..ff84d0db32cd 100644
--- a/dev-python/path/path-16.6.0.ebuild
+++ b/dev-python/path/path-16.6.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/piexif/Manifest b/dev-python/piexif/Manifest
index f76362722190..8869174cefe8 100644
--- a/dev-python/piexif/Manifest
+++ b/dev-python/piexif/Manifest
@@ -1,5 +1,4 @@
 AUX piexif-1.1.3-tests-pillow-7.2.0.patch 1382 BLAKE2B c7ea03ffe0708b975d64602910bf9c228f0093d9cb717a1b1b9f3e7b6358b94f3bcbd6da8f9bac12fe2ee0745d17defccd196bdd8ec018fea50b7d131e148616 SHA512 be1ee541e3bb6c219d6fd9ab68e9143c2131f695a2001d36a0d63b0566d71a542a09d58dc0bcbdb8c1353297156ea7853d483b9a44407cb31c30acc4252310bf
 DIST piexif-1.1.3.zip 1011134 BLAKE2B b27d4419cf545f6205b13c5646dff9fc7b1ce6e5de538f6a7189e6cadb54d301e11cbf0feaed8b073cbf16de95d67c621b68657b35fc0ba2025281ee64be4e51 SHA512 df5f7793c39911af58bbae76cf998e2a7bc820b84dcf9808ee8f6a38f766f824fef28392ef88387e18b10c270c4b27881be310f0368076b6fb65379a11a93270
-EBUILD piexif-1.1.3-r1.ebuild 827 BLAKE2B cae7df00b4c42c480ceaa0b6cfae4e39d42ab44c1779b88d4ca19241ac0ccee8846a614c8ee1bb705e35e60a4a9482b587453f7b58709579031d76775ce99dbf SHA512 f34dde462ce0954cdafd78ca71a87e64451a8af44e3a74cab1fe578385e9c81b03beb4446db4e63d0d8d2e8a20104bc30b18aba8574c3824044b08b3a2d95152
-EBUILD piexif-1.1.3-r2.ebuild 860 BLAKE2B ff796d57fb9a1fa4e4d015446f98ec78b70b98bffc324a023db63738cbb4809c1bd647dcb7e5428250d9791dd2a414ba05d2674820726b72576ce4e6cf24af09 SHA512 170b66ec51721262d1ffcb05d6c4715a98d67eb2fc444930f793589aab25c940e035f0ffbac9f914d26082e8e8b2e1c1a7f96994bb7bb404ce0f76c80193b5d6
+EBUILD piexif-1.1.3-r2.ebuild 859 BLAKE2B 931c296d174689b45f7b074efbed7ad0dd4e200f7b55f0b71f732d456f09f7158bfff3aaea0fff0ebaa62f78cd7684431c2a80b3e0a8535b8963007254a7a1f8 SHA512 e85ac474cad258c50cb511af432a2a4d467e4d0c550d996d0251b7030ff15ac916556d0f0e76d5c5653764208b517a5648e53fd1337a74519bc7de93cbe25b44
 MISC metadata.xml 364 BLAKE2B 2ef968ac973776979f74c1ff510b657d691d7cfd1b963b04faed752e4dedfea8f325357b95ea9abede883a8ead27016bd2b657be119902fa21f9bef6ea2ebb0c SHA512 c62c0ee0303599f10b04701183db691da926fb3176f5ad5efcf58782c50280e03dcf5772ab1d033d3dc96730a2ad87c19ce9749a9c0ce2dd3dfdde76d2466eb7
diff --git a/dev-python/piexif/piexif-1.1.3-r1.ebuild b/dev-python/piexif/piexif-1.1.3-r1.ebuild
deleted file mode 100644
index 3927fcd5f2b1..000000000000
--- a/dev-python/piexif/piexif-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit edos2unix distutils-r1
-
-DESCRIPTION="Exif manipulation with pure Python"
-HOMEPAGE="https://github.com/hMatoba/Piexif
-	https://pypi.org/project/piexif/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	app-arch/unzip
-	test? ( dev-python/pillow[jpeg,${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-PATCHES=(
-	# From https://github.com/hMatoba/Piexif/pull/109
-	"${FILESDIR}"/${P}-tests-pillow-7.2.0.patch
-)
-
-src_prepare() {
-	edos2unix tests/s_test.py  # to be able to patch it
-	default
-}
-
-python_test() {
-	"${PYTHON}" setup.py test || die
-}
diff --git a/dev-python/piexif/piexif-1.1.3-r2.ebuild b/dev-python/piexif/piexif-1.1.3-r2.ebuild
index 44ecb4c39ee1..d4f17a451c15 100644
--- a/dev-python/piexif/piexif-1.1.3-r2.ebuild
+++ b/dev-python/piexif/piexif-1.1.3-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pip-run/Manifest b/dev-python/pip-run/Manifest
index 0527252412d7..e680ec50691c 100644
--- a/dev-python/pip-run/Manifest
+++ b/dev-python/pip-run/Manifest
@@ -3,7 +3,7 @@ DIST pip-run-9.0.0.gh.tar.gz 23171 BLAKE2B ca1bee27f4d1826029aa2520dbad9807d22ce
 DIST pip-run-9.2.1.gh.tar.gz 24104 BLAKE2B ebb26cd5356a5919d74c6601b36deed0046c0d67d7533f5817b62b7b7ba74240ef44dd2425be7143f8432d3f8a3f611a051f099b6059e64479eadd77e8f39b45 SHA512 f320da7641817df5c9418094fb49792e3368907ddac551ef22d97ab45b5183cb84f40338da106d5a47d238ca68ca376cbfc6d6c3528b9fca1db02bf910bd3d28
 DIST pip-run-9.4.0.gh.tar.gz 25821 BLAKE2B 8d4d9712f0563d3edf8d963e14221fde89cffc14c3fb26afc2b18bdeca9917cacb27c88a815d398d2b67f10112e888c9f60b497c3c1bf59d0105a4c972aef15d SHA512 c266e6eb30f21ddfd89cc25dee5c56542b3734497d59315751c190e7bd985c6746b95802255ec05da19d5cec8822f4fa169eba4218989013e36a2c118d560f4d
 DIST pip-run-9.5.0.gh.tar.gz 25620 BLAKE2B 156b33f6978ae7c26e4f73be931f887b0a6d793414dee5b69290b88eb849b487d366ce722d6cc6eb58a10074c779cf7dd4bbbdf192bb57494757a6f9c11adbee SHA512 5f1a59e60203dc5e5fd818687112f23ef93117af315161a4ce31e2de183e097aa205af12bd81f45aac91ab2b6a18fbd6a0275b9ad3ce3a7942140b345f49a7a9
-EBUILD pip-run-10.0.1.ebuild 1302 BLAKE2B f976ddcb2331aa70ac14537fcada5012cfaae7cf6b0d69896256b80e3f558e3bd69354f4dbf9faed4695e74cef570c68a3bb8fb2620ba8eb1903fffcee2a1695 SHA512 e39b8375e9ea952adfc39b395c74667873b211d8d3ddf529acb3db96ec9553dbd99dec0ea04df8435842fe4d32d8dc34cca44e831f0d4f564f20bbd9fe22dd2a
+EBUILD pip-run-10.0.1.ebuild 1327 BLAKE2B 86c7f320e402af6d5b8ecff2ed425387d7959f719c1f148bec14315c28dcc5f496ab2f5135930cf7edd6605a2ac6df2a9f59d158aaabb6d04979eae9801f621f SHA512 05309b61df1ee65e52afd29f9bf6af8c25524459d00ea5d922315a19539c81f67677d7244f5af14248829865592e8383a0a726dde400ebb8b43584e63ed1d37c
 EBUILD pip-run-9.0.0.ebuild 963 BLAKE2B e176a68ad10beab276e7150bd917d9d3dd5507e8000932e6afae6bc662838af36d5f377b9515208b12e4464eb5fbc2c137c1f1531e3891eb616d7f96c4b9c56a SHA512 7f72c4b7def3b9b29fa49dffe2accb678a696f9742846e2a812908f1bba2039867a003f45f005d2f61a1c7604c1f100ff447601a05e5718b8651454737f87191
 EBUILD pip-run-9.2.1.ebuild 1144 BLAKE2B f521960057405acc8f2ed3e52b051e90da48a3655d344776956602ef749543289eb30879acf63fdfd8065cc1edd6ff00ff908bfc3731ff7733f47d7e9dcf11fd SHA512 5822639fa79991d6a9b09ab296e94dbbb5d1f31f75ee3c4de74a141603ee9ff542f5ad9229b71fc9711abb088ac5b982987d3a62fe0178bb5bd4242cb8dce8a7
 EBUILD pip-run-9.4.0.ebuild 1187 BLAKE2B 327330f7d8a2dff27d8cc73f04c7a11c3ac78819abdd343bd5cb6634bd59f79e17849c0dacbb2dfddbc2c8aee9d68e68bf2e36886f07ade3065f2c991bfff7af SHA512 ca895f4f7849d554d280ab6b87fd64506bba42a76d0695af9501d1a9e223e9f45e6a510eabc5ca3bd88e88ea76754521245dde55cba18d123e6f5bebd5811693
diff --git a/dev-python/pip-run/pip-run-10.0.1.ebuild b/dev-python/pip-run/pip-run-10.0.1.ebuild
index 98266e7e28e5..427639ad6456 100644
--- a/dev-python/pip-run/pip-run-10.0.1.ebuild
+++ b/dev-python/pip-run/pip-run-10.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86"
 
 RDEPEND="
 	dev-python/autocommand[${PYTHON_USEDEP}]
diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest
index dd36f1e646af..cb9a3ab825a3 100644
--- a/dev-python/pkginfo/Manifest
+++ b/dev-python/pkginfo/Manifest
@@ -1,7 +1,3 @@
-DIST pkginfo-1.8.3.tar.gz 375734 BLAKE2B a3e9779bcb7cd326d8bd8137fa388055032fd4ee7732d47a341807201a97f1d44652d8e46adefd301cf7cd3c1d041e49a6ed2b8752e12347a8a2a2349cf397bd SHA512 54a67bdf078b38600651cb94afa62e9d86fce512022b1e79eb4565289ae3fad2325647654704488968e18cd85cbba4bd0ce28392fd09ae9638ee449e802273eb
-DIST pkginfo-1.9.0.tar.gz 376601 BLAKE2B 1823140bcd109cf2549f0c7f8db4315880a86030a8400838755664794a7cac94998a6a20832db6b29d5f8623fc16d0bed477eb48750184ba04b6440063d6bf02 SHA512 5189929a80aedbeb65ad3b243d6f916854887e34d3489eab71a6ca69ab82d0fb2cc62ec7a49999890eb323be981d35505a6f47d2debc83cfa1cc8bb04523dcb0
 DIST pkginfo-1.9.2.tar.gz 377091 BLAKE2B e217e3d58fbc7a4efe7321d1eb4f6c95ea75cfcdcbdd06c0f8b728eb1ec18c5800a7ed6f6338996c60f5f251f36d40b40c20d0b1700956dd8a23a6e40594a356 SHA512 16eb4708040811a21184e5fff1bbbde775360718fa67df97f56c646381f6f1e58967920753437e5759e4d88c31a4f10c1e4d8be2380981939e51e4ee140dbeda
-EBUILD pkginfo-1.8.3.ebuild 675 BLAKE2B 0bc2a787bc673fc106f50b484bb9987b99cefd880e13b3dd1b9b91da211b496152b8de428ffee896ef00683c8db9c9ef4d25dded995a19a95d186484f1b2fa65 SHA512 4c33fa944601b4b831efcdd606dd36b9417b11a49d612421b2e8fa6146d3980fb0a4d5d0fccce36c1816b8ca335c29b8a4c7e5511ce83f1241b6da2af69131da
-EBUILD pkginfo-1.9.0.ebuild 926 BLAKE2B fb892aa3d81b82da2a8990c05b32cf7638a626dfadb5e7af5e18dc878a739c23b023985df52235865dde6d21756eeedb25138228cc89c1c5ea7e1b38b5ddd7d7 SHA512 fc71e7a1083f4580cae525997b0dd709370cf7b8e319a350afe2370791e256f5c8a88c7220533e3eaff1f58ea8a0c46c67d94ca7cf19a2909c7cf82cb58a7782
-EBUILD pkginfo-1.9.2.ebuild 683 BLAKE2B f7a68d9bab4f7da9e753b621ab7840a9d2335efb759de45cd2b608681273f27ef17e7b9c934cff9a336595cdbd22d08fd5d0cb5ac73997e74c24b8ab7c557d0f SHA512 a8de06b90bc6a9c43d502e82886c74889f22e93ec41094259aabf63f818a5c65277241d95cee7a5291a3ef09ce35e2c2085192a958cd33df51ed04cc04e9e035
+EBUILD pkginfo-1.9.2.ebuild 675 BLAKE2B 0bc2a787bc673fc106f50b484bb9987b99cefd880e13b3dd1b9b91da211b496152b8de428ffee896ef00683c8db9c9ef4d25dded995a19a95d186484f1b2fa65 SHA512 4c33fa944601b4b831efcdd606dd36b9417b11a49d612421b2e8fa6146d3980fb0a4d5d0fccce36c1816b8ca335c29b8a4c7e5511ce83f1241b6da2af69131da
 MISC metadata.xml 385 BLAKE2B da3779a71a7d23a535599d8854c970725b3e6c121642cfabbabccc0e97cc1dab0cf77452da565c9efbd8044cb02cb2fbe00687a0b312948298902e4eb1f4e498 SHA512 fcd65e87146d573c1bc33dc560ed419ae5d4e46e6ba423da1a6dd46ce96683d3ffeef75b640ee671f16865e34293695b48a5fef89ee754a8b6bb797a03c13b08
diff --git a/dev-python/pkginfo/pkginfo-1.8.3.ebuild b/dev-python/pkginfo/pkginfo-1.8.3.ebuild
deleted file mode 100644
index 6c2807d22d3f..000000000000
--- a/dev-python/pkginfo/pkginfo-1.8.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file"
-HOMEPAGE="
-	https://launchpad.net/pkginfo/
-	https://pypi.org/project/pkginfo/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
diff --git a/dev-python/pkginfo/pkginfo-1.9.0.ebuild b/dev-python/pkginfo/pkginfo-1.9.0.ebuild
deleted file mode 100644
index 263179ac56d4..000000000000
--- a/dev-python/pkginfo/pkginfo-1.9.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file"
-HOMEPAGE="
-	https://launchpad.net/pkginfo/
-	https://pypi.org/project/pkginfo/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-EPYTEST_DESELECT=(
-	# fail because of extra python 2.7 classifier
-	pkginfo/tests/test_utils.py::Test_get_metadata::test_w_module_and_metadata_version
-	pkginfo/tests/test_utils.py::Test_get_metadata::test_w_package_name_and_metadata_version
-)
diff --git a/dev-python/pkginfo/pkginfo-1.9.2.ebuild b/dev-python/pkginfo/pkginfo-1.9.2.ebuild
index 0d4b0b97213c..6c2807d22d3f 100644
--- a/dev-python/pkginfo/pkginfo-1.9.2.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.9.2.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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index e0d2db5361e4..0265b8473634 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -1,9 +1,3 @@
 DIST pycodestyle-2.10.0.tar.gz 101916 BLAKE2B 1dbf4c2ea9b1c606740fe1e9804b29100056bad25935182b43dd07d694bf3d321d63b17d2e308dc1ffaca1f4e3e46a4e8df3998424adc4e4a1a33862e608e153 SHA512 b0c3ee7ac56942db1e8cb5f3a59c2bd2a44b7467e73b46ab7b6f932603beefbbd29f2760ee49907447af1a5987dc1961f00788b01456bdd0aed7690e2d54446b
-DIST pycodestyle-2.8.0.tar.gz 102299 BLAKE2B ac4708a513582bb0f27f1abfcc983319e6c7b853c53971d5f026f297f897b25a6c8a651a4d2441b19ab37e6df6f7a38a472aad0757fec59e0438263d76ccfdb2 SHA512 0098be44451bc173507e2b396aaf342ccf7f25a6a1f5d5c1f802079a76a66e6bedf9f358b5e07b27bee66e3b279c72a6b72f63e5984f58ae83b7fc5806880fc1
-DIST pycodestyle-2.9.0.tar.gz 102014 BLAKE2B ee2c2cad332e7442f9e557f388c3de09ea0ea65b0678c65d64d6293de18aa884a39a6a65ce47a99ac04b98da4e4bad14d2ccd228b22bdbd7361a3a0ca2c27afb SHA512 82926bf1c5b72decc0679d4fcec705d707b91b347ea0eec52b1f05301b96e55fc75afdb367ecdec674976fe1f2f7b475498a8e9a2ba19e3dfd483584a9ef841e
-DIST pycodestyle-2.9.1.tar.gz 102127 BLAKE2B 701e6325a73173b8ab8540f03f794066f05ffe7f29cfac49f065ec6f8cc6a50b1334372b8fd7619a368a54605dde0214da9e9b3b59326c58803bf7f49d6981ea SHA512 da1c67815b50d13c8eb70cebcc12c761a6407518a4ed4a8780ee7064089c9e89a5c3246d05f19916c0ec293fc1a372d3b2adb72e11f775b1cfbd1fbbe07a1a83
-EBUILD pycodestyle-2.10.0.ebuild 1074 BLAKE2B a8666a9baa4f88dfa887bdcb766462ed72c1779b95ff5afce9e169ed27092f3e8740180f00440742b1cfe44289b6ae90d1d6f9585397ecd60fcf1006abeaf878 SHA512 35c06832c536da24b0b6f2875be4904eb753ed6ef99d92c771b7799045d69a6e327c9c67d71357b827b45c8275a45f919ce85701b95e70908eec0eed8cc6a741
-EBUILD pycodestyle-2.8.0-r1.ebuild 988 BLAKE2B 1a03070b2034e0980a1bcbccea10fb802cf8d29103ade396ad4834cbbe1b7f63c11e771467cdd53c188a0ee7025e5c0c5e7d7cc06d179d2d40c2e30194bdde99 SHA512 7ae95a135f574daea73067a52cd143bf502f54706264c7736673ed552cb7cd1bc33f2017f3fb8726d1605d86acfa294a469b9ed7e9fe69ac13ff61b55b1acc29
-EBUILD pycodestyle-2.9.0.ebuild 1067 BLAKE2B 440eb3e87210bbc3b2b013daec2ab9eb89c5d759d9a0d9553d1d817fe09a722281a7e478fcc34276ebcb38be84471bcf74263dc4d86ec1e7ef540fbcde348f0f SHA512 d3d9712990c3204b4d790f3ada1d438ab2618b6a34da97a647b2af73ab423845fd30181c3c6687fafbbe73c8ba8627cebe402080e050270bffbf766e2d514a7d
-EBUILD pycodestyle-2.9.1.ebuild 1059 BLAKE2B 55c3b8d2ad52d4555dff20cc0c84101041edfd4105e6d6f7daa35a7740574b4bbb9b5539e595aa4b7435a3c96072756172e6af236ab9fd814e638278146efe93 SHA512 7b079a4d4dd0e860235c377d4e3fc208a030b644740b5c3b0fc7fa89a7cd2cdca2891716767b059892e3b3d8d16922836d3e315b4c0bee03c3042b9448ac2c4e
-MISC metadata.xml 350 BLAKE2B 6ca2711d99bb29041b5cc2a65218ace68f8d4f2d1d2d0a19f62d17f2340cc44faa7488d4eb29b72e86a0b2f003ea6a2df5f5d4e7d95894ff9c8c229bb6441156 SHA512 db79cd77edb6be824903614c78a39f427af51e940c0b08e1512c264b634ef3474fdba21a1a8b6c9458c2687f871d9374ea5f9b5080da4f6e652dd919e89d990c
+EBUILD pycodestyle-2.10.0.ebuild 1066 BLAKE2B 1ef1877f21cdee29fde629a99b9e8213e2862d899e55f86472ea685ff3eeee59c0e608dfcb909b49d1758df39459764aa582f250fa1788971ba184f92647bad6 SHA512 a5636eb60b094d128142c6b84d211acc7b283bbe7111fc208e24e9393965b0ca64ced0b8a3c28beb7fed887c2526b487aaad3a7cfbed9091761c2214719fb001
+MISC metadata.xml 409 BLAKE2B 86d114cb53a68c8c24caebef1287bce1ae99cd652bca1fe2f19cce870c66490521329133a1fea47c79bd8c64d2bcd945022e31ac7db7885e9a4dea4d50f19a04 SHA512 e1de2014c44c8fdaf71ac26af406d27ab76cfd377dc20bb36e36bfbeab79f8e8981e8834e04b8e0bddd92d231b275e56e91d87570fee5ad426418a4abd00d4be
diff --git a/dev-python/pycodestyle/metadata.xml b/dev-python/pycodestyle/metadata.xml
index 27d16c029300..0e8cfdd5e1fd 100644
--- a/dev-python/pycodestyle/metadata.xml
+++ b/dev-python/pycodestyle/metadata.xml
@@ -7,6 +7,7 @@
   </maintainer>
   <stabilize-allarches/>
   <upstream>
+    <remote-id type="github">PyCQA/pycodestyle</remote-id>
     <remote-id type="pypi">pycodestyle</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pycodestyle/pycodestyle-2.10.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.10.0.ebuild
index c79a68b37117..f9ed68271452 100644
--- a/dev-python/pycodestyle/pycodestyle-2.10.0.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.10.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
diff --git a/dev-python/pycodestyle/pycodestyle-2.8.0-r1.ebuild b/dev-python/pycodestyle/pycodestyle-2.8.0-r1.ebuild
deleted file mode 100644
index 8caa67171937..000000000000
--- a/dev-python/pycodestyle/pycodestyle-2.8.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python style guide checker (fka pep8)"
-HOMEPAGE="
-	https://pycodestyle.pycqa.org/en/latest/
-	https://github.com/PyCQA/pycodestyle/
-	https://pypi.org/project/pycodestyle/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-
-python_test() {
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --max-doc-length=72 --testsuite=testsuite || die
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py --doctest -v || die
-}
diff --git a/dev-python/pycodestyle/pycodestyle-2.9.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.9.0.ebuild
deleted file mode 100644
index 509d1524f65a..000000000000
--- a/dev-python/pycodestyle/pycodestyle-2.9.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python style guide checker (fka pep8)"
-HOMEPAGE="
-	https://pycodestyle.pycqa.org/en/latest/
-	https://github.com/PyCQA/pycodestyle/
-	https://pypi.org/project/pycodestyle/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-
-python_test() {
-	local -x PYTHONPATH=${S}
-	"${EPYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die "Tests failed with ${EPYTHON}"
-	"${EPYTHON}" pycodestyle.py -v --max-doc-length=72 --testsuite=testsuite || die "Tests failed with ${EPYTHON}"
-	"${EPYTHON}" pycodestyle.py --doctest -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pycodestyle/pycodestyle-2.9.1.ebuild b/dev-python/pycodestyle/pycodestyle-2.9.1.ebuild
deleted file mode 100644
index 2726262d4f39..000000000000
--- a/dev-python/pycodestyle/pycodestyle-2.9.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python style guide checker (fka pep8)"
-HOMEPAGE="
-	https://pycodestyle.pycqa.org/en/latest/
-	https://github.com/PyCQA/pycodestyle/
-	https://pypi.org/project/pycodestyle/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-
-python_test() {
-	local -x PYTHONPATH=${S}
-	"${EPYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die "Tests failed with ${EPYTHON}"
-	"${EPYTHON}" pycodestyle.py -v --max-doc-length=72 --testsuite=testsuite || die "Tests failed with ${EPYTHON}"
-	"${EPYTHON}" pycodestyle.py --doctest -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 20d61b914180..1cc849c77de0 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -2,5 +2,5 @@ AUX pycryptodome-3.10.1-system-libtomcrypt.patch 1729 BLAKE2B 57a2022ef17e0b86e9
 DIST pycryptodome-3.15.0.gh.tar.gz 16547902 BLAKE2B ce1a6eaca4946d656c08f960f67537e61b9c82a69777fcb0b01b91a9a649c605dcc66a2a6d9fdc5533521a669544c7695e83db856dfcf8e4b2ba7301654b5555 SHA512 fc611174cfb4ca89fb457cc0d1220326ac813de5a83a959a95c1928a5220dc8c652655ac0a2b7d116b60cb4a8317959d8c2b2f3595e19b9b359a32beb042b58c
 DIST pycryptodome-3.16.0.gh.tar.gz 16548063 BLAKE2B 4adf1c3027fe593e9a01eb0ea3da1f81ddcedd731a284a3f98dd02f07ba9eaa80e906bbcea1432fe64f08f0857033cfdbe43acd415fb3081718a301fbbb5ca16 SHA512 945c5bda213a08ba12a0ace8e4bf76730461f8dfce94fa426a97dfab846234ea06e121b176ae823d0f7da9316de50aafde6507a2f17efec4d4a0629d4d68d870
 EBUILD pycryptodome-3.15.0.ebuild 1327 BLAKE2B 84e59b3e658660997df56c5c96b413c3117db314064e6ee499ac92efdd3d15d6c727db499c48839ed1eeb9a38cb64ab13332f4d167bb9ec6e33f41fc07adbdd3 SHA512 072ccdc50221e90ab88e69b035353d2b32b0bd7b52a5f367598aa15b506dfa76ddabeed9fbc6918d83cbd2a47e38aa25367dba51607587b5d520bba0c49e1ee9
-EBUILD pycryptodome-3.16.0.ebuild 1334 BLAKE2B 0a304f9fab2dce9030355fb0ca716471983424754e38b850363b86aa41499161e0568602c09a78a2bb5f187f5955f504b415fc85ca7802ab55033e4abfc0a99c SHA512 1c250f6bba72376d848984b2452cde8de241a62795c45c2ea14dbf96ff21bc6d4774e67305ecf40895a2ceb5896af2b1eed38fb35f9b5f6c28f7ca909a8dcc22
+EBUILD pycryptodome-3.16.0.ebuild 1328 BLAKE2B b444056dd0c51708d96f3417bf6aeb910d0f6047938790306edc34805fbee52b3f96b988901741631ba1f2fdd78fb4a02f42f258e4971305d93ec4c31052ea4a SHA512 4c6683472d8b722bfed6fa364c37f652618b213994ab685e58555e5df62ca19371ddee7fade442ff1602b9e5b90978b3f49daab1561821346973c8fd8090dc9a
 MISC metadata.xml 386 BLAKE2B 1ec04c0cb752414f063177e637f1fc3e3c401db0c1f245cb33a3690e25597098b25fb2cd5f3ab99838a8bf8339906e2b23e325af5c7248fd880563c872c6fb60 SHA512 f19e2537c5a985389182860eaa45ae68a37ef1167c4b76b452513987fae6fcfb3534d102a079a003770372bbdb4f1997460c982b355f76d09f2387996e18091b
diff --git a/dev-python/pycryptodome/pycryptodome-3.16.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.16.0.ebuild
index 9aa00023e3d2..cbdb4d25957d 100644
--- a/dev-python/pycryptodome/pycryptodome-3.16.0.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.16.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	dev-libs/gmp:0=
diff --git a/dev-python/pycxx/Manifest b/dev-python/pycxx/Manifest
index df62e4e49fd3..18128c7db228 100644
--- a/dev-python/pycxx/Manifest
+++ b/dev-python/pycxx/Manifest
@@ -1,5 +1,3 @@
-DIST pycxx-7.1.5.tar.gz 156343 BLAKE2B 099de7f88c19ec86aea67b503e6fbdc0df66bbdd3bdc0ff7f8ce77425be9486e6abebed8548f9ac764688a85e62cda77d3832f460e5678b4c07b1c6d2123b257 SHA512 0f980298739886d0c05ddd5ee23ebb234014b8276d811e62dc5b0a738666c6a011ad3f4aeeb7b1b404d8bff87dddfc30f68eec9c6bd13d5f262a2f7c53e273be
 DIST pycxx-7.1.7.tar.gz 156383 BLAKE2B 69a454615c9a7cdc57f4c357b9e3805821711bc48efb82e684da6066069ff0ee6af3b76911a705adb6f984969659441d331a8470061b514180ddf53f6494a33d SHA512 5439b2f72a7f04a628e7e93d093566654f3b4eafe78a7834005f86fb08e614f22f4d1fffb8d626e46cd56880ff7792e494ee3282b313ce668a7497d2bc1fbea9
-EBUILD pycxx-7.1.5-r1.ebuild 916 BLAKE2B d81ef87e677e63cf27b7771240091a743e48384ac4339e16aa7a76af938f21ada1cccd3b5ab3d20ef144dcd524acf1167f138809dd4340f34dcfe1f8f851bbc4 SHA512 7ca22d46fd8646df4dc7e52836abe53d45561d2b5125d09e5ccf88b7b7f1c2e1a2a9205d656ee214ab096f8ddeb67454c17153c41f19403d0330ba2d8278ec29
-EBUILD pycxx-7.1.7.ebuild 990 BLAKE2B 8166b78459474a99d04e1c85243dd251de2ec5d513e56aec7e644153761d44825881d2984900d350892a2d973c36b4522a65b458b69182d0827de3a70745e4ff SHA512 9f805c8445f68f6ab106f3a6ce4f1888a63fa344b28d46ca2f2d6f61440ea48700628bc0890a5adab346aefb2b1ae4faba5da3a2ba085f0aa387b4673d3da601
+EBUILD pycxx-7.1.7.ebuild 986 BLAKE2B b2a26acb9d2c142d49f89151f6563e99c37072fec7c1200c5bd595b11a3f24256c49dc311da2d1d9307bad824142936c88445fd52dea4ce46cc475063608a1da SHA512 767a70d83ec9af4a322eea05db7c1cde788ab839f1c9ea4805175bacecfb369f34e599a72aeb28b456955941703880e6872a2426795c352b0c17b562c046a30c
 MISC metadata.xml 741 BLAKE2B 0704aeaef1fff687aa8374876e9d275a135d4ead7fabc938d8b3dc60954717fcf01bb79e8e9a72483184b13441d65294f41f7b5b0b19bebbf42c0934993723f4 SHA512 0b4f912fa2e38882bcaecede459f34270dd222a94bf70fa019e8de1eb1097c9c9016405b9b8a7933fd7839f11404a18c5e2ce7d4b4336a7121e86605903a8901
diff --git a/dev-python/pycxx/pycxx-7.1.5-r1.ebuild b/dev-python/pycxx/pycxx-7.1.5-r1.ebuild
deleted file mode 100644
index 42470d114ccf..000000000000
--- a/dev-python/pycxx/pycxx-7.1.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-DESCRIPTION="Set of facilities to extend Python with C++"
-HOMEPAGE="http://cxx.sourceforge.net"
-SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="doc examples"
-
-python_prepare_all() {
-	# Without this, pysvn fails.
-	# Src/Python3/cxxextensions.c: No such file or directory
-	sed -e "/^#include/s:Src/::" -i Src/*.{c,cxx} || die "sed failed"
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( Doc/. )
-	if use examples ; then
-		docinto examples
-		dodoc -r Demo/Python{2,3}/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycxx/pycxx-7.1.7.ebuild b/dev-python/pycxx/pycxx-7.1.7.ebuild
index 49ffda406c9a..0ed99e5bbd12 100644
--- a/dev-python/pycxx/pycxx-7.1.7.ebuild
+++ b/dev-python/pycxx/pycxx-7.1.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="doc examples"
 
 python_prepare_all() {
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index 2cf918a31810..a4924e6fc647 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -1,7 +1,3 @@
-DIST pyflakes-2.4.0.tar.gz 69101 BLAKE2B 852e50f3545138947761f9a8413fd6463bb9a28977c008feb1c3a81afb3854501b8fd3c05840d9d75bc6ebf505b545e62c047b87780b0bc764fd4225ea6a1e21 SHA512 f4c6512eb811511c897623f52c4f88e50275a3292582d7dd34462e90e39fecce939818cb92e750eebdd66eab25b91c23540104fc4530c42621d7cfeb1d33c577
-DIST pyflakes-2.5.0.tar.gz 66388 BLAKE2B 2511700c208a2eabe8f71597b2fa0bd69b6a1fb9fc1428fbb21ab7fad801bb3ad38f72f9a0c98f654828cc2f183a75c1c208e554c876bf77fe91c9c88b93e25e SHA512 e47303c4b445e0c010dfc96244b6fa991bd1870072c61cc7acd309947af3d81581276b012b56b7db0d8df3f91a4216a5ec502720c149f5707d5d1d28654aeeb4
 DIST pyflakes-3.0.1.tar.gz 63554 BLAKE2B 992dc4c81204c9ae2fd44744452e76a11209552edaef930edb14b7ba4763720cd1c0c0cd148fa7edd474b33aa529d8ec28f7f35a2b02b707d58cf70243fc13a9 SHA512 10ffe2b92f3885d40578452423a93609f8546b2392997bdbc3f64ca0094516ce6b8449e5d3675bda5fdbc16190c89be23609559fc4cd4f1c97e6af032226d7b7
-EBUILD pyflakes-2.4.0-r1.ebuild 646 BLAKE2B 2e0ee3052b051da22d04063d5e4dc1d447c3b7aaf216e621a92f2ebb299921140bdc0fc4340c9239a704d92b283aa4a4cc6a6c9e83864c3d10635685471fb739 SHA512 7b6ff841ee877cc5c294e8aec54fff885ebec6253ee479b998057b13a678063fa09125a2e1f84a141df0f8d09ed2cfabe44ef770ad2fd035a4104cac6681901f
-EBUILD pyflakes-2.5.0.ebuild 646 BLAKE2B bf195d66989eeaa10865c6874ec80a409e819f34506b623c13ee9a96e366589fa19854c27b22b147f787302aa4cbd47128eab319dbc505fb15e38d29067ff41b SHA512 afc8d7df411d73469e9731c13320d45740849a66dff787f3e2ffb4047c3e704e5645ef86c82d4d9c5c77808610701f5e53b1348fc378d4dd923fd9c4f8256394
-EBUILD pyflakes-3.0.1.ebuild 661 BLAKE2B c43a0c808a21d4f4293c83151c071ab1069313f8114de352d51f8a0708127972dcf5758b48e6dd50a33a2ec0ff51f747d97d358716b944c50cf46ccbd7220d87 SHA512 b91f868820659230ce994b12bc6997b050bd188bf6f3765c43202d3459d4d3158b147b4ce3a3e8dcb613abc7d9bf6a47809ac2c91b58f79a54b78cdecc5ab76b
+EBUILD pyflakes-3.0.1.ebuild 653 BLAKE2B 5ac797870698a3ff4fc9827b27ec0337e98359a963e7b00703f6c82f65288b5e51d3090007fb510576b71e22c9ebc3cd4034cd2da11d3b028046616e3df73a62 SHA512 d2c84a2b0ac15ed316f70129cc6c49dc72defb2ab9ce9a89c3a4509d790d77a734373185f14af5a9ae245b1960121c6c18aef297c782bb0310085e4408b7fcb3
 MISC metadata.xml 763 BLAKE2B e15bc4240e0cc54bd0d7ecca523bcc43c5ae6ebd4f195815f7b2c3494e0366f1cc6feadbc63fce82390ed414e8f52a7bdf15f5c56909ab39879814ff1b178558 SHA512 bb8e0b6f746c99e5185a8bca736f0af36068ae0de45d1bde9663f0e732770366ac20f2116ddd9d7a85239146cf5d7b8fbbfc5c225d7bca4650001f86468a0142
diff --git a/dev-python/pyflakes/pyflakes-2.4.0-r1.ebuild b/dev-python/pyflakes/pyflakes-2.4.0-r1.ebuild
deleted file mode 100644
index 9e1e1477eb75..000000000000
--- a/dev-python/pyflakes/pyflakes-2.4.0-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=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="
-	https://github.com/PyCQA/pyflakes/
-	https://pypi.org/project/pyflakes/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyflakes/pyflakes-2.5.0.ebuild b/dev-python/pyflakes/pyflakes-2.5.0.ebuild
deleted file mode 100644
index a2b67fbebe46..000000000000
--- a/dev-python/pyflakes/pyflakes-2.5.0.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="Passive checker for Python programs"
-HOMEPAGE="
-	https://github.com/PyCQA/pyflakes/
-	https://pypi.org/project/pyflakes/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyflakes/pyflakes-3.0.1.ebuild b/dev-python/pyflakes/pyflakes-3.0.1.ebuild
index 05fb5693492e..e12a2456cd26 100644
--- a/dev-python/pyflakes/pyflakes-3.0.1.ebuild
+++ b/dev-python/pyflakes/pyflakes-3.0.1.ebuild
@@ -17,6 +17,6 @@ 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 ~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"
 
 distutils_enable_tests unittest
diff --git a/dev-python/pymediainfo/Manifest b/dev-python/pymediainfo/Manifest
index 93416df1d2cd..7633415e68cb 100644
--- a/dev-python/pymediainfo/Manifest
+++ b/dev-python/pymediainfo/Manifest
@@ -1,5 +1,3 @@
-DIST pymediainfo-5.1.0.tar.gz 445630 BLAKE2B debef8de004232c4e39bd17018c447474a4f71bc386b01710bea8084febb5353cb70512ee77c33ea8b3e6c7b67baded99aecb77b60c52da58be35ef91919f34a SHA512 d3c48e37f6d59b0f5bc1d66d4fad9fea26724863dc2ae75a30c80d972f68f3be650298d25105d330c20b83083f94d2ff5e2690c29573897e09afa44931f3228e
 DIST pymediainfo-6.0.1.tar.gz 446487 BLAKE2B 402c71157e43fd03efe37934932c61e1e22d469c13f5b5e85d7e0f1d52d6e54289860777c1677efeb4710a5c55086a1c7db03da8ad2f88f49d144bd5484f8638 SHA512 7b373b133911eb320248f72627f6aeb6fa04705b55500639d18094ed8227296fd744c2c4b76d765e8b2d98d78f443114e9ca7ef8e2e0eb498d48d2b46956f952
-EBUILD pymediainfo-5.1.0-r1.ebuild 767 BLAKE2B ce22c3f166a25f6da758fb654eb8a47975fd93cd46f80b6216dcc24cad13f261ab13f016942b8ac20517e090821f11bd68da3483840debbf686ee0fa1d6df92f SHA512 89d9036bde9af6f1e89931048a8c1ee365004a0c823eaee58a9543e48c75e67664a3ad6f9c18ec4cc8a322e355a95246605494adad70737bc96430962eaaa6b3
-EBUILD pymediainfo-6.0.1.ebuild 754 BLAKE2B 6ba5693d61bada79bd1faab173b6ea80f5ea7a45a4569fdac30ffa015f5af0711be71b5e5a7c3ad6d698bb1937ee97326317eb270da349f6a7ec28497a78e933 SHA512 a7f026872431bcf4fbbdea6de3095038b302a5ef763eccfc1fdda75f9ba5ac27f7efd456a0aa470d9b6210dc96db2ee5d63792d220443d00095275dad31c8b2f
+EBUILD pymediainfo-6.0.1.ebuild 752 BLAKE2B b96e95921fc32a9e153e085bd90ab487f96eda7a5587c41edfb0d157b6f104b16be74f1f7af438ee9b14d0a8abf3512b3c890288c45ae7eb65b798aa5fc28f52 SHA512 d8ffee2224f33d5af431af8ebe8d14ba1f709bd7947fd86c87de4e0a7fbb3b58608b8a011ec823925907882d645405a6c6cb1be62f02faa67e546c9d994e3ff0
 MISC metadata.xml 491 BLAKE2B c204e000d175f22b70686247e5db4b7cf791489785aaa72099676a554791c555ad3c60892229b12c35b84d1a382b9adfa54eef6cc20bd5cc63ea536c05995032 SHA512 507cc75dc66e7d23846f0a295ac0a21110f9164fb0a5b70f3f7a71420796fd1f35ffb587a84952634e1cef6df322db4abf0eba50976033fd0159d92f54e10357
diff --git a/dev-python/pymediainfo/pymediainfo-5.1.0-r1.ebuild b/dev-python/pymediainfo/pymediainfo-5.1.0-r1.ebuild
deleted file mode 100644
index be2e13207f93..000000000000
--- a/dev-python/pymediainfo/pymediainfo-5.1.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around the mediainfo library"
-HOMEPAGE="https://github.com/sbraz/pymediainfo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	media-libs/libmediainfo
-"
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs dev-python/alabaster
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Disable tests which requires network access
-	sed -i 's/@pytest.mark.internet/@pytest.mark.skip/' \
-		tests/test_pymediainfo.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild b/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild
index ea0f2602e92f..1df296187ae4 100644
--- a/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild
+++ b/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	media-libs/libmediainfo
diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest
index 1bda24b8b050..a6573a275ed4 100644
--- a/dev-python/pysvn/Manifest
+++ b/dev-python/pysvn/Manifest
@@ -2,5 +2,5 @@ AUX pysvn-1.9.18-tests-3.11.patch 1031 BLAKE2B 3886df331cbacedb7046b78a914b29cd6
 DIST pysvn-1.9.15.tar.gz 667161 BLAKE2B 35e9e0967d5c0b4cebf546e40df17b66c66406d0f8100c32e6e840220f60b0083c0ed3f3af5f54e2264d06905ea90970d6b7cbfad2bab872a14d5d4aea5900df SHA512 0809507134fd31f6bcc90217e7840eb166e2eb2ed56316010a549dd70f6f855599f596942574343cdefd5997947b12c847df2cd145669f50aa93f603e46a5ee0
 DIST pysvn-1.9.18.tar.gz 667827 BLAKE2B cd32b4ec55118becd496a9aab6f4dd2b9d57c82e12d5a08b18d36d0caffbafe7066ff45c9493a36499979e759d38dd6b15a68e7bb5819464362c2691e7599160 SHA512 0ca2924223cdc5f29e961e879db6b0f88e82b5c4c40df50169468dd5a72cbccddea9f0d1680ef4a54d45e89b4b2b2c3c22f5e76c66196783a89cac8b583b6623
 EBUILD pysvn-1.9.15-r1.ebuild 1272 BLAKE2B d2ba9aca8484b8006bd6a1c2fd76995123b0e99070817585ba6013261924091c9ec0bbc2932a69e8aa88647a4b885e2444e7b40983e03d497096b709cd98b767 SHA512 1890856b74902478cd993e40034998f4a9e61528f420ee88877a0210474f6f77119189348764dfa4c13a19f9f4510dd4c2737587fb0a78059c9cb9b119d8e9af
-EBUILD pysvn-1.9.18.ebuild 1286 BLAKE2B 44702fb081011d73eb345d1c0fe651848070119f6a093a6b4561342bdcdf8e5643f8b32590a4cc126c625540858da8cf2b07c8fcea97a9ee9f3b7350e8b95354 SHA512 f736fc2540d63169831cc67c5de8ea97be4a62e0674ebb52e5962045f734f7c8400d7290a32cafa5376acd31be43fbb7be2d15dd088f236a60b80b28874f3338
+EBUILD pysvn-1.9.18.ebuild 1283 BLAKE2B a113f06f65605a10f21b6eca09bd0af89b80d11e38bce5bb590ded64fe8a068e09b3f7a556011bc326d6a5c1a9865caed6abb78a53f7a385d75b6b63dc297196 SHA512 3d04fb07d6398a9b02315b9e8bafd8cd95d0777be07ffec1e6b5466932db352d40b9db7fc43f2ec7985ca67f877dfb0e7d5284c1e703d497e28248642d963698
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-python/pysvn/pysvn-1.9.18.ebuild b/dev-python/pysvn/pysvn-1.9.18.ebuild
index ebc6f2e8f2cf..f488e1fd5174 100644
--- a/dev-python/pysvn/pysvn-1.9.18.ebuild
+++ b/dev-python/pysvn/pysvn-1.9.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/pysvn/pysvn/V${PV}/${P}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc examples"
 
 DEPEND="
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index 742d38c31d9b..bce77610ae36 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-xprocess-0.20.0.tar.gz 30342 BLAKE2B 8e66ad321224cb8e702721b0936c56b65be5aee9330a233c710519303679f2d1eea03825fe4326ffd2811f6fe4c37db217a2c0c34561742bd2c849ddcae7284e SHA512 bce022c924db94f53549c1df5547a8df7390806bb99d817f152f1e5fb946fef60f2447a31dc519577c1b54d6a7adeb7d7d996a28e7784918622db5ccfd0b035b
 DIST pytest-xprocess-0.21.0.tar.gz 30601 BLAKE2B c487b6223306c8a96ea2c4f99763ab8e59ea1db908b2ed93280fa3e2805794798b4555c3d07c730f911702712371bb390780709caa9eb6663451367f58b9781c SHA512 72f8db45a11cffb65302379c1690ef5ad9d71a1aa40b7fd03e1231f7ad0c0413638f7d2155f5b366d2d623399512759d8ffdac8591eb24b77562f9b1f584ed74
-EBUILD pytest-xprocess-0.20.0.ebuild 684 BLAKE2B 7cab7b699749b1bc2d35f015852cc31304374a497c7d861bff383ea46111467c4613b3810d1f48081a85ab647218c77d568bd30b15712c9920a59682898c6637 SHA512 aa84967b3bed18718f978f8e090d9ca92ba47416197d241ccd4e9f5610a0cc1c3cb9a2fcdde47c43a4ca4fc5681d4508def33769b9ab46e9770190f677b88a6d
-EBUILD pytest-xprocess-0.21.0.ebuild 725 BLAKE2B 6497a0985b87d867292ec7cb0b9eea38868907f9b0759d92f3035d871c4e2d3caf311a63b46e611fd33d31261746ad6119c0093605959cec897f45bab7971ae5 SHA512 4a31b0f3ca67705332e168e886e5bcc537b60e6bec40122c7d2b57c8adbf9c8c9d1fd4e5aa93ea09cf20faddf6416f80b4bad8c50c3a9f20ad55b0d72656ba32
+EBUILD pytest-xprocess-0.21.0.ebuild 717 BLAKE2B c6a4e981ec827de573fd0396d57ffde4aab011815b0522692dacce1d9f8e7e01e87967cdbdbf023e2700061db593817e8b4b8ce29a6736863332c3f3ac6d3e1f SHA512 8788aa7661ab715c4a927e9355a4a75617e4bfde2cddaa79500bf69238c0c6720aec65bf5d9900a3194d26cb1b9ea947604e3a54acca975371a0cd2bce4a6d27
 MISC metadata.xml 422 BLAKE2B fb18d498d2325613b4ddb9262d90108aca85cc28c4dc298359adc0cb589565df894b5c48bfdc7a7f83cf30421f324fa1af93333ae20fc793910993e0a93db90b SHA512 19e96fb0695284d9adfd71eccee8f3ab0661d5e0231f3f55db0456a3dfe797fb683985cb776e45a183a710462e990f539f75a764dca68d0c2e631abf68d8344e
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.20.0.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.20.0.ebuild
deleted file mode 100644
index cd0427f806de..000000000000
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.20.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=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage external processes across test runs"
-HOMEPAGE="
-	https://pypi.org/project/pytest-xprocess/
-	https://github.com/pytest-dev/pytest-xprocess/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.21.0.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.21.0.ebuild
index 07a1ee622918..6d6f7d481f4c 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.21.0.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.21.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-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"
 
 RDEPEND="
 	dev-python/py[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest_jupyter/Manifest b/dev-python/pytest_jupyter/Manifest
index c3d16da78559..680609c27689 100644
--- a/dev-python/pytest_jupyter/Manifest
+++ b/dev-python/pytest_jupyter/Manifest
@@ -1,3 +1,3 @@
 DIST pytest_jupyter-0.6.2.tar.gz 15174 BLAKE2B b6c536383ab1b8e375e4250b4922ac6372f850ee4993643122896092109d3f711f91ccc7b159b7330de18f7876df818dc01d31c05e3c18d97488255e063db4d4 SHA512 396f7a7c978097e6dee37ead92bb3c8cef2a8100a7cc85b0b1eab19e20bdaed3332391c17568a6a279ab6ddeea1fbb2fa8dafe24ba4500982ba52cfcda2b1052
-EBUILD pytest_jupyter-0.6.2.ebuild 729 BLAKE2B 69c27ae1fc34108a0a36310d703ecfdb472b0b17b395d6d5264ecdc0aa021bc9f5ef4ff6725a45b53f19f8ffee5a7ea65284f7b815d227b9183cd45df34197ea SHA512 add7f9be5035d57e78f2a063863893436fe5d3cecc532ec985d15551cdabd2b33db66a409a324ad7eb97016ef1d8f295d28484009f63296eb3a5b9a859a29e0e
+EBUILD pytest_jupyter-0.6.2.ebuild 735 BLAKE2B 38eb38100f283a31fcc8336e2f16352e10057190e10796aeb7ae366fe5ee59bccacb5c29a604b231600eb3ccc34cf3477eabb351d2dccd60b176f76bf19e2773 SHA512 3f2681c945773be709d7d4a06513e7e798c4fdcb9d362527ee9cd79476b95147b468b53a29450a2525e42b77261ff818c23ce6297e824cbd49a1a1781cf697ab
 MISC metadata.xml 544 BLAKE2B 2774989bbb5ea75c4254ec2c9f3daf04a48bdec28698d62afd2471abb4031273bea581c09151efa643fc691a3fda2e1a4211dca66882fe2c5a24d7a6bef7c1a1 SHA512 e3751515a8baf2b422cb680870adbe9393d37ecf2e8b01212bcfa7d0b62ca368c34a9140945e1af4d7c7f0c5443b996ac7cbd4394833aa13b4e937b05bfe0e6b
diff --git a/dev-python/pytest_jupyter/pytest_jupyter-0.6.2.ebuild b/dev-python/pytest_jupyter/pytest_jupyter-0.6.2.ebuild
index 78d14293f4a7..e3707a3e5860 100644
--- a/dev-python/pytest_jupyter/pytest_jupyter-0.6.2.ebuild
+++ b/dev-python/pytest_jupyter/pytest_jupyter-0.6.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64"
 
 RDEPEND="
 	>=dev-python/jupyter_client-7.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index b72cd7297cb7..f94246dbcc21 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,5 +1,3 @@
-DIST python-debian_0.1.48.tar.xz 189096 BLAKE2B 3b273f1e90069e00a93aeb9c2333d20d479b057613c93325344f42a73230bd569160a487a25d1c7f90f7f00f42feeab55c9850cf44121e1ca423cd1f40a991a4 SHA512 85bd12ce8ade9b43d502bd60ac1ac826d9a81b5bf32262ff9377b4ba5a1c95306683098d10a64fd6a1331ed7eb44a7fb09ad90f0ee6c885d69ea16f85c4eda59
 DIST python-debian_0.1.49.tar.xz 191388 BLAKE2B 590e6f7877684caaa5a74f06d335bcf7808960968209cf18bb2cec7e81f33a3b0ff458bbe30264ae5fc015de9357dddb1522b5fd93bf33d0a7fabef1b7dd98f9 SHA512 201ceecdd8c1d3dc0cca0f661407bcfb825a1cba07c528858cc1123ab16afe0df50e338c8cd82ea24230812a9cc136220bd4f0dccbac19ad53efe48eaa25cf6f
-EBUILD python-debian-0.1.48.ebuild 963 BLAKE2B 71e8142ac149f35932ed279d9710442fff2b8a142274ca2b7b223af745e091a3cb9bbac14ce90694990b4ab036ef8156b5a422d57bce5a0aa30914ae0ed24c8c SHA512 3d2a3f4c197a54f1bef45d9efc312dc8203d409707a275551f8b69a4d9af03f891c8f9b1f422df49e18bb29e6a9a149f9c9d2aeabce88b2665c265d4ab6cb31b
-EBUILD python-debian-0.1.49.ebuild 987 BLAKE2B 1d42fa051896336a1e010b363341313ff50107e6dbe3fb189b4886f8d3732184d0f8d29ce205ade6749c17fa362ba62bb1dd4871544af12d9d5e280e99397862 SHA512 10dd269bac1fb27b03cf9b7a8f98ca4037713b53973cf9725193bf00903ab67af24fac59c87024daf68991bc537f939657d25acfe212aa24beda6671b5b88710
+EBUILD python-debian-0.1.49.ebuild 984 BLAKE2B c1d47c1b32a3444ba625f016fbb0bae81860d57da0084c8a1468c3e6583fd1179b52a8c8463f46218ab45d558bb829296a6ee805ba1e87ebdf808763d2184bf8 SHA512 410d7c97e36c2161e0c3bbc016069f163c7375fc45026f80a1c66c43bebaac985204cf6849a702433ebbee61fbc2ae631ed065ef80031b0ae07bd7298a4e30ec
 MISC metadata.xml 448 BLAKE2B bccb39bdfb24e81bc05028fc92033468f5256be096cb409b4413f69444d59d3d9a3469047337a7fec79ac707ddf4d269b44b20c725f7fc4935bd10335e1f9374 SHA512 8e3fb6ca4bf305e23a51ff56cf84648aad1e96d36aa7a4fb138f7136ea77a6a76a8985557ecb1c9da962479c8c9e36c253655d6e6602c1833f2a2230b44540aa
diff --git a/dev-python/python-debian/python-debian-0.1.48.ebuild b/dev-python/python-debian/python-debian-0.1.48.ebuild
deleted file mode 100644
index 15b1e315ea43..000000000000
--- a/dev-python/python-debian/python-debian-0.1.48.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2011-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python modules to work with Debian-related data formats"
-HOMEPAGE="
-	https://salsa.debian.org/python-debian-team/python-debian/
-	https://pypi.org/project/python-debian/
-"
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		app-arch/dpkg
-	)
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# See debian/rules.
-	sed -e "s/__CHANGELOG_VERSION__/${PV}/" lib/debian/_version.py.in \
-		> lib/debian/_version.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# See debian/rules.
-	"${EPYTHON}" lib/debian/doc-debtags > README.debtags || die
-}
-
-python_test() {
-	eunittest lib
-}
diff --git a/dev-python/python-debian/python-debian-0.1.49.ebuild b/dev-python/python-debian/python-debian-0.1.49.ebuild
index 5daf3ded63cd..fd88bfd9199c 100644
--- a/dev-python/python-debian/python-debian-0.1.49.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.49.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-python/python-json-logger/Manifest b/dev-python/python-json-logger/Manifest
index aa8a000d9797..6d669834e8c7 100644
--- a/dev-python/python-json-logger/Manifest
+++ b/dev-python/python-json-logger/Manifest
@@ -1,3 +1,3 @@
 DIST python-json-logger-2.0.4.tar.gz 9856 BLAKE2B 013dadb37044eb89976ab98309bbafaa348c0bfd82a75f7645d580212fb85ee2cb2bc70d455aec9da3424e89d5905d8e80a77d8c08d46443a8ee5ee9bebc3cdf SHA512 5849e3780f9a4cb59baff2c73d872ca11c916af14337bada2de3620d5a5e9b138b7bd76a1a25001c4733c0074469bb579808a57d50f964f0fe0e4bf3a4bb1216
-EBUILD python-json-logger-2.0.4.ebuild 532 BLAKE2B bc6bbf6dfb1afd30ef9400abd942e3a511ab3f0db347bfb5c08d3700b4c11af201eabba4c64105d523a49d13e2404ee23cb2b1c3df01e4f6cf1a0a70fc9154bd SHA512 35a86f60bf8643f0862c5b2a349c0919761f7aa275e060b8d84bfab511773eea4f38001df76aab00eb34abefc77b583d3381202ac75025f039c14e157c3335ee
+EBUILD python-json-logger-2.0.4.ebuild 538 BLAKE2B 3f7766116accf907a72a9b224168127638a7776d866b286efcdfe7ba28672be77e80e8e1bfdb59df91a685ddb43f32d08e5fde20be1846326da428c6402bae2e SHA512 5e4ba2fa5c0105a32317eae7db82ebc0df550199d74fa12761fedf61946933c36f6d6667f0db58bce52bcb5bc705a6b65b16d9efa303866e5493c1ab790e2cc0
 MISC metadata.xml 648 BLAKE2B d2c5fc2fbe82dbc6391eb8c5dd9513f5dc455abc8f8426f44eb338f0369621496d87f921b039c0e75f1684533e33058f005e41b55e4868ade9db30ed747ceb04 SHA512 a9a6d220281bf92eaee7da04710313daabda41feb00562c5ae6a016106b981c9fa6d1ba1294bd75e37a029799c235caeef91c48b404bca883a41b6988d549e64
diff --git a/dev-python/python-json-logger/python-json-logger-2.0.4.ebuild b/dev-python/python-json-logger/python-json-logger-2.0.4.ebuild
index 71db1dcbe48e..240f63e2da79 100644
--- a/dev-python/python-json-logger/python-json-logger-2.0.4.ebuild
+++ b/dev-python/python-json-logger/python-json-logger-2.0.4.ebuild
@@ -17,6 +17,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64"
 
 distutils_enable_tests unittest
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index 64a3b1e8f79a..1f0fa9395582 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,8 +1,6 @@
 AUX python-xlib-0.32-drop-unused-tkinter-import.patch 251 BLAKE2B b5f8e9bf719b85d84463b2018bb92a1bc2de4a698998b8c76a1597f19e7da52d207eff2a97f71c916303b6ef2e37eb80cd55ab77723d7aecbb3ca3c8211220f3 SHA512 792ab97007bca4c9ed9e1d0d866926c4bd25edc238ae03e17c6489949dc1336b3374a6edeaaaaa23da17495bcbabe08e3da3d78063996a8866528c07e866f835
-DIST python-xlib-0.31.tar.bz2 211425 BLAKE2B c0a15b11c264942479c86088d8d5bdc0c759ae71df8939feee200ff58ec30d3b2c0a99a119cc56e5c32279b26517e7925cf9124a367dc7d32fcaf0be4f7cd41e SHA512 f98978cd0058ae18f08f9da71b4ff31cd7811040ec1eb03ce065c187f312259d674dd76aad447752c8f508e585838948c90182eef5d5240e6c06b0a5dd1fbd33
 DIST python-xlib-0.32.tar.bz2 213554 BLAKE2B cf24645529c6ca67a4825419837f312fa4ae0902bd2fb8f2eade7cc1645a3f79201b43c7ddca0cdcf8b21f623583acee1252cbe83d3700ab08979b8f0723b0a4 SHA512 9fecb77fa5d7ffba4c8031c0738147b7581dee9aed1a812254d22d78b6021cfc08743edb76829a3e5ba31f9a42648ea501b50ddcf5652ec3114a367c5e83d465
 DIST python-xlib-0.33.tar.bz2 213763 BLAKE2B 53486ec938bc00306658f3151556f1353fe5881ab942d06493f6f78d33b4cff8aab6e6aa5ad7e9124824d61549545719375c84f7b9376518e2328fa2e65df553 SHA512 3b7b4fea5cd69544d2227806853bdfdd04447089e182ca0f199e18e8bd43375d9bf03c819fd6a055ad4ad274594651e05db82585ab40d0fcf225ce36b553c991
-EBUILD python-xlib-0.31-r1.ebuild 923 BLAKE2B 2ae27f4e486622488190da030e3f9df00d693e1ee26e29c70f1008f8db425cc6fc520059fc716deff6664ce787d51c268951c2c8511fbcaecff7c86ce2b96eb8 SHA512 c1ce2f17ff40bc0b09395666a391b59a4f9ef58433d3aa8cd5fb08a65712ca106d7f2a49ddc55031a27e4034a650e4a0ffad3e9dedc0c4cade2bda442f680e3b
-EBUILD python-xlib-0.32-r1.ebuild 1056 BLAKE2B efae8a4f98f05158ec33024673de8ce90ece9b8303209811c0a745d7657eaf4afb45cd761c22fa36d9307a56ee546ea10791ddd08896489f1780712515b9ecc0 SHA512 f810adcdd44a0a29d91f33307994781b19961c05b3fe38542df0428c38d5f202467b4ef635c9f842a315eb0180b3b1e5ca2e4b6bda7c5c64b0d2cdf55f6f6577
+EBUILD python-xlib-0.32-r1.ebuild 1053 BLAKE2B b78f351ff390221411103cc6f4efed2f3d30f93997bd7fc39f9c045adb61bdba69ac2d73e34674cdb817b0fb9c85a83cf09ae8181d4ee1e34fc5294a90b634d3 SHA512 8b29c72cd7f3dd4a93850c9876b89556c14a5a191ef95655780275e7d171a5b0c221e92b87d64d99ed4d943d9985c6cbd51e081bd3592c657fef620136c20813
 EBUILD python-xlib-0.33.ebuild 990 BLAKE2B e14479b44a04bbf49fa82d4c2856b9d8ae13384b782427224a02ab4e1a8bb303f947a74a0520605e28a939c00c918f7db99cb6e516f681151e61b54022760bc4 SHA512 b00d3f2383f2b2500fe9e92b002e96e48715c6738c8b35fb7bdc09447a8b4c16cbce6094a755eaa97bb5f91c3165df3fbadf210174614f1c5da59c650bf42365
 MISC metadata.xml 434 BLAKE2B 3fa5d4e6b3b0347d1872805cf074795e486fe64a6b5b3edf326e9a8f81c1f5b86472ec6d906e85ef11493e9aeff9ef8ecfbece69103df037c8237fee3bbbaac9 SHA512 38738c99171d5351a797b12384a0f29b38250bb62cb17ff6250e3215a580500eec3210e22ee9605356c71477b8574b9fde34c5dee944b8437b901adc9b417218
diff --git a/dev-python/python-xlib/python-xlib-0.31-r1.ebuild b/dev-python/python-xlib/python-xlib-0.31-r1.ebuild
deleted file mode 100644
index 6b3f020591e1..000000000000
--- a/dev-python/python-xlib/python-xlib-0.31-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 virtualx
-
-DESCRIPTION="A fully functional X client library for Python, written in Python"
-HOMEPAGE="https://github.com/python-xlib/python-xlib"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
-IUSE="doc"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? ( sys-apps/texinfo )
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests unittest
-
-python_compile_all() {
-	use doc && emake -C doc/info
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_install_all() {
-	use doc && doinfo doc/info/*.info
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-xlib/python-xlib-0.32-r1.ebuild b/dev-python/python-xlib/python-xlib-0.32-r1.ebuild
index ca3e97705196..677c93b372c3 100644
--- a/dev-python/python-xlib/python-xlib-0.32-r1.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.32-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/retrying/Manifest b/dev-python/retrying/Manifest
index f1bbf5fb022e..59f0a6056ff7 100644
--- a/dev-python/retrying/Manifest
+++ b/dev-python/retrying/Manifest
@@ -1,5 +1,3 @@
-DIST retrying-1.3.3.tar.gz 11648 BLAKE2B 2c518ca887dddc35bad421ad75c76cb88f08a0965272816af8667b1b151eca2dda1b0b198607f26dcda2df547ba2cb317ac927ebfc5891cd8c6203ded619f1e1 SHA512 e053e62cb71b31573b89b8fffa706c3410794b5cced829582c373a09af78158f7a16948e6ce52078589cf7d8f5bba726c889180588a2628be343f242bc40c035
 DIST retrying-1.3.4.gh.tar.gz 11789 BLAKE2B 8a75a007bfc8333592aa1aed5b7090a44264a3ad46b71d8a494a0033ce94059751e8276c383c7567da8487230ab2877368bed4b15dca6c45cff2d709eebfd6b4 SHA512 80bd19eefdbd8277ec0ba656d1b1d3589b2e3492cbb902c963376b3df475abbe4725c9902426a1784e4dddbd57ea8bc51ea5925a0a72a6f5c11333893314f2c5
-EBUILD retrying-1.3.3-r1.ebuild 586 BLAKE2B b2a66c632d2b915f8c9dbd7e3baf9d551272cd0d15421ab0fdb8697e550325dd4f6e6cdc7bb3748e8cf6b2f6eee46301ea83e14d408a71c23a39252f29723d22 SHA512 a086ddd4dc8fcc2bd0bf5bae4c23fa89d9de9e5cbc3f7cec6e4804062d8e1144f0d86f81f1d844cbc79fade2dd11c0e87d25d0025f2eb03ccde5edb4c711d60d
-EBUILD retrying-1.3.4.ebuild 639 BLAKE2B 31e6997f1fffb3175e275f6103f7883dc55eb9a2c10be2ef80185b845a13d03fcb4d32b5bdd77873f4ad7b74556357dab1b3b5c537f85a4bbc8c2597b34398ed SHA512 b3dc2b62222c23cf954ae2f90ed29ef1dc6e8b7e9e8c4eef10edf4fad2a6a39d1267cbc8d1b9d39f5613783d30e7668744f7c77cd13c06adc791e0cc37dbdbaa
+EBUILD retrying-1.3.4.ebuild 633 BLAKE2B f73a5a795ea30232ef121e78d1fa69e2d0d42159aa1b948b307ef9a6457bd83f577293d8c9cd28f449e75c03305032bca352670c5f05460b4210ad5197ee0c08 SHA512 03277afbc87e534954068fc02b55e7cc9b1554e65759bdac7b453c2688393d4fcee94ec0422f63c292ade7b4b4e8241e6f86c506a9ee78135e31958adf2b35a7
 MISC metadata.xml 613 BLAKE2B 7bf7b29f121f15b0acbdbb555329603bef39a85fb0af12c61127f788c3550c6336c8330f0ee81d2e4ce455c23df2d7d3eb6f575cf55ab354f6c5418aa0af039d SHA512 0ed4c7f5e8d3dbcdbd5d4c52672a8447358cd2bfe89b3aed07b8c4f114d500d9cf3cd16c5f6a7aaaed86e09f8b6e3f26712a2d5f9198ecf16d80a46e64ca074b
diff --git a/dev-python/retrying/retrying-1.3.3-r1.ebuild b/dev-python/retrying/retrying-1.3.3-r1.ebuild
deleted file mode 100644
index 8d90953b7dca..000000000000
--- a/dev-python/retrying/retrying-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="General-purpose retrying library"
-HOMEPAGE="https://github.com/rholder/retrying"
-SRC_URI="https://github.com/rholder/retrying/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-RDEPEND=">=dev-python/six-1.7.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/retrying/retrying-1.3.4.ebuild b/dev-python/retrying/retrying-1.3.4.ebuild
index 59071b9b1a11..0ba3f7f41df7 100644
--- a/dev-python/retrying/retrying-1.3.4.ebuild
+++ b/dev-python/retrying/retrying-1.3.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index d11ab602d950..ef63709be24e 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,7 +1,3 @@
-DIST rope-1.4.0.tar.gz 287417 BLAKE2B d161e571649be2df7e6012336e7bded844f98f67764740814bfccebc926ff4c5f734cdf26701c9b7cec35bf3178be1f1ebe0d86f3b60259a161d3e87125fc7d5 SHA512 586f6f22fdf4743f71bf7f7505ec49aaced28aff48b5eae4f731eb690edec1ff8c736e3f9f21d7732bf5ea60ced5253e8f0d224a51a6a9bfdf7dd50ab56733ea
-DIST rope-1.5.1.tar.gz 288965 BLAKE2B bc912932dec03317a3ea24d2e15f751037d308d58a941305b6155e2f85d2ee81fc82f9d4183a1a416ebda6e791ab8c5408835e7eb36a7fb5a8b71116d5edb24c SHA512 5b7c76f0bfd481978d0e6c23d37f17f9db49fe6affc0f670868deed9a23a95c53f31a578bc7b8cd1c59318b38789a6e264f8fa9d3c7e13e5ce3db80dbadf177f
 DIST rope-1.6.0.tar.gz 289325 BLAKE2B fc7fc37a93f6d011f7e5eab5d2a28e3eab1767839cba4bce2b665c7972d6485eb3693e5977abfd36025415bc898fb4985affb7ac757c8457840a5de3946df77d SHA512 f610eb71c20533907aeea86c3ec5101401cf8136aba4221b2d64db3b0db16d4d7d1ec081c6d4929d6534ed51d4c01761af8d2ffddb6b69b4a9cc4921d240d745
-EBUILD rope-1.4.0.ebuild 934 BLAKE2B ee6f2211ec8c4b4110e69dec2d177e773a3d5ee22603e6d2c4951a0c6f41d5a3d0bb8430f1073c27b89434bc5328dbfc9f8dc6c8b627c0f8178c0e12583657f0 SHA512 41fe33213e1532fbfa1a53e25f6cb66f924c28cdca9d79f211d37313d1ac23edb7f824738d10a4e0f065d8b3a8c4341ccfb6c2778ab395cded138bcef57000b4
-EBUILD rope-1.5.1.ebuild 936 BLAKE2B 5177f20b6d19135672b1d3572635ec8e28df81cf245434c359b281ef14e69999ae5ff3dcaf344c5a62bd10670cc5116ba14df92d683cfdcbd88b87dcbdaebe45 SHA512 a168bbae17201eebea10e05c1f997e7457033c83d8bb9d35889da62c00813ba9c5f39e71106b02276a5b074b53b9591e62da635bbb9739609fd564caa32122cf
-EBUILD rope-1.6.0.ebuild 936 BLAKE2B 5177f20b6d19135672b1d3572635ec8e28df81cf245434c359b281ef14e69999ae5ff3dcaf344c5a62bd10670cc5116ba14df92d683cfdcbd88b87dcbdaebe45 SHA512 a168bbae17201eebea10e05c1f997e7457033c83d8bb9d35889da62c00813ba9c5f39e71106b02276a5b074b53b9591e62da635bbb9739609fd564caa32122cf
+EBUILD rope-1.6.0.ebuild 934 BLAKE2B ee6f2211ec8c4b4110e69dec2d177e773a3d5ee22603e6d2c4951a0c6f41d5a3d0bb8430f1073c27b89434bc5328dbfc9f8dc6c8b627c0f8178c0e12583657f0 SHA512 41fe33213e1532fbfa1a53e25f6cb66f924c28cdca9d79f211d37313d1ac23edb7f824738d10a4e0f065d8b3a8c4341ccfb6c2778ab395cded138bcef57000b4
 MISC metadata.xml 452 BLAKE2B 6bee424d801bad8728f10ec3a1618e3a48776a7b0af2a04efafd07e6ae5ac8e0b88253ebc35e457c791e820f8c3b1dabde73aabbfd3636cac5e169e8aca75aa7 SHA512 4f88e1157e4838f321b6f208ba6b89fbf2b7a72ea6e038cdd6cf3e9e211c2788dda137e3adf76072c1d52026c554750193d9938054670dd995a91db24ea8da76
diff --git a/dev-python/rope/rope-1.4.0.ebuild b/dev-python/rope/rope-1.4.0.ebuild
deleted file mode 100644
index 93e895ce28f6..000000000000
--- a/dev-python/rope/rope-1.4.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python refactoring library"
-HOMEPAGE="
-	https://pypi.org/project/rope/
-	https://github.com/python-rope/rope/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/pytoolconfig-1.2.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# our venv style confuses this comparison
-	ropetest/contrib/autoimport/utilstest.py::test_get_package_source_typing
-	ropetest/contrib/autoimport/utilstest.py::test_get_package_tuple_typing
-	ropetest/contrib/autoimport/utilstest.py::test_get_package_tuple_compiled
-)
diff --git a/dev-python/rope/rope-1.5.1.ebuild b/dev-python/rope/rope-1.5.1.ebuild
deleted file mode 100644
index be67d9231d44..000000000000
--- a/dev-python/rope/rope-1.5.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python refactoring library"
-HOMEPAGE="
-	https://pypi.org/project/rope/
-	https://github.com/python-rope/rope/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/pytoolconfig-1.2.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# our venv style confuses this comparison
-	ropetest/contrib/autoimport/utilstest.py::test_get_package_source_typing
-	ropetest/contrib/autoimport/utilstest.py::test_get_package_tuple_typing
-	ropetest/contrib/autoimport/utilstest.py::test_get_package_tuple_compiled
-)
diff --git a/dev-python/rope/rope-1.6.0.ebuild b/dev-python/rope/rope-1.6.0.ebuild
index be67d9231d44..93e895ce28f6 100644
--- a/dev-python/rope/rope-1.6.0.ebuild
+++ b/dev-python/rope/rope-1.6.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index d547d3221aaa..aa56541c9445 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -3,5 +3,5 @@ DIST scikit-build-0.16.3.tar.gz 270429 BLAKE2B 32930041e64750dc4ee7d496bf6541bcc
 DIST scikit-build-0.16.4.tar.gz 271037 BLAKE2B 6cca8a3c4f4b37228b77ac098650a5eca4ad0f525ca7dcba178f4cffabb7e60e9a7bbba244e64c1a598ab5916f2f47788198eb2a19803d8d0cf7b9792f4e06e2 SHA512 90315ceac4c372e4d7248b4b56b6092362c2c43fbdc180d1a234e057209c508a05d2c6e0a3d0c2587c3adb8957e4c66d5c171a2a2bc3dbf9874a0de58d97d976
 EBUILD scikit-build-0.16.2.ebuild 2115 BLAKE2B d44568826ab5172a18f6f5eb288e85d2e3ebbfc5310d5d111b05557e4dd4e9d263e30535c81b0181358cefe8cae819f469391c8ac09f1bc19f78f60968801eb7 SHA512 1e0cb85334f27f27e089598d8435c8001339472d57ffb9ec897e9e196608ee58062f94b7dcd806b4ebd98bd68760d73bd821bf5d1e78b86cf4df107a6bcf325d
 EBUILD scikit-build-0.16.3.ebuild 2086 BLAKE2B 8234c15bd6dc53874e5a047385c8d6855bf0b8d2d26de4daf64e7dd34b855e3a125dd10e186aaef40053ab6fb8dca8159a71bf40c4f581997eb95d4ba12a5d73 SHA512 782f5b2476ce979b4936e1ec6a820d292f874c84a6a8c1f4870a0805cc49604a3fd65a8efa74b41db590ee915295e63bc3f264ed8ad80edb866a6aa2cd41aff4
-EBUILD scikit-build-0.16.4.ebuild 2026 BLAKE2B 8a3490ba7be7b821c31ea2c506cb368ce342ce93d623216e172a90ff66e30183661b68ec79423d31d820bf7b69d9a06a5b6ee9b72af781348937190e585a1f78 SHA512 70030e48019bb553dc25af2ef16ae0dc5338b65d4786a9feeb4ab80995fd4868464fde09d4e02a43ec69697a83df0b51cc9032e1a605d5392150406d457f4c3e
+EBUILD scikit-build-0.16.4.ebuild 2020 BLAKE2B d39078d1e002029e4b5d2785b977a611896f5bd2bd570f93521432a1be3dd2c6a8d643554d02bfd015ebb00b395d1a1f65d45f4a7d4dbeadcb2a56ae1110d470 SHA512 4a4adf8c12451842e042ed845c800a2c5eaf3b7393daf0959a3f9f793035eda0c9aeb869a0baae60766bda5350a050ae7cbe9f59a8a3b0fbceba6cd2425f3815
 MISC metadata.xml 473 BLAKE2B 9d02a79439618fa413f74e4a617b8af042879be7a44c8f1c33e254e985d4f24057321fb2ec0b73074be1f6b67af3984190e48669e19985d6297411c0c5b61a79 SHA512 afc398c6287ce67eb85402832684fd006385e70d28a738ca8c5f1e2d008526621121cd9107a7fbc217a1a5857b54fa1dce3de69c47db58fc76990764b814a36d
diff --git a/dev-python/scikit-build/scikit-build-0.16.4.ebuild b/dev-python/scikit-build/scikit-build-0.16.4.ebuild
index 385d50bf5126..65821fd0de3c 100644
--- a/dev-python/scikit-build/scikit-build-0.16.4.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.16.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-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"
 
 RDEPEND="
 	dev-python/distro[${PYTHON_USEDEP}]
diff --git a/dev-python/seedir/Manifest b/dev-python/seedir/Manifest
index 7931b277b9a9..cfd1b2590037 100644
--- a/dev-python/seedir/Manifest
+++ b/dev-python/seedir/Manifest
@@ -1,3 +1,3 @@
 DIST seedir-0.4.2.gh.tar.gz 3096194 BLAKE2B daabdf1f5bb202ab454bea376c6e14dab2eb9c964a3bf87349c3ac6075bb8ed201b66082518aff01cb4515e89026a02c662da5e9a5f43c5d0ea21556cda07e90 SHA512 8d16ae1ba020268f9587742cacbc55ecc1d218f36955c625f64829940396c908d0498ee6bf50d560f87b10488dc6daa5698681e10e1699d20d958b3cd58f14c4
-EBUILD seedir-0.4.2.ebuild 589 BLAKE2B f181c9b75ba2d8d30be0033f37ea0717292f26d9e4017785da9c398a4fb2aec60f9535df7b5eaf82b79e5eac66345529393954321e2be96a52dfc133fe86381a SHA512 35f982869c2936994b501d9c80a1a982a1d2933ae4469040fc4289b0d7034da11da9f69cd3bb8cd21babf468736068dd994e5513ae95ee084a72110e6878af58
+EBUILD seedir-0.4.2.ebuild 594 BLAKE2B 327f265c4f0aedb55b0b823a6411d332d2700e8244f0063038c27a58ba086f7b314ee55598863dd66de84ea587d9617dd9a35e95ece4498184e4c5678ff4b932 SHA512 c425504956787b46f4e831f6d959e4081c889c2d5fe23cec9c7992dab4ea868d9a80a9f332c75a34086ad7f07b268e62fef895c6c7345016062c45520da380dc
 MISC metadata.xml 393 BLAKE2B fa479c17b0ecb4807f85e82e871d8f3690c7b0aab9a6c53b3609c84771d3d5a0e8b0769ec35ee51d533764440bffaaa679fda6401a95813ab7c76f81d6f84897 SHA512 913ba255b6ae25b437d99ced1bd8aef70f8dcc17b947be4d1ce10738a88c6ab35cce66dfdc2193d73881011f1e5e976e7b43c1faaedf312a429401e02f0dd9f7
diff --git a/dev-python/seedir/seedir-0.4.2.ebuild b/dev-python/seedir/seedir-0.4.2.ebuild
index b71456c65538..f9b3e9223140 100644
--- a/dev-python/seedir/seedir-0.4.2.ebuild
+++ b/dev-python/seedir/seedir-0.4.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/natsort[${PYTHON_USEDEP}]
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index b1b2a3f2cfbd..8a8cd7b72391 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,5 +1,5 @@
 DIST sybil-3.0.1.tar.gz 38265 BLAKE2B 3a9dd8d85a5a6228944f104d255826b4dfee80f5a349da3a0fa69edcfa0953145378f002c1bf834e21c0d382fc96a993b927bdc92bb3e9a84d34998ad6ade62f SHA512 312c57f0de646b1e7a3b992806362c1020b2d567c805d248e94ab22a336a8fc77704234e123e1ec74987bfea620b2f8c4d3714d32aee03587c615d3d90fe5558
 DIST sybil-4.0.0.gh.tar.gz 50845 BLAKE2B 5c7144ad1dd131f98c48f18cf6770782529a3c86a3f976461f032c9024ef93dc2de3c8bc327421a55a3f505982608e15cdcfe022f964c4fd871bd9de61205d68 SHA512 6cf0422ba856a85ba5dd105481cb2d06eb2ff196aee263a36e7ab44c7d45185df022bd859afc92b3b42dc418142e441f377adda82c0b5b0d1410697b563db994
 EBUILD sybil-3.0.1.ebuild 466 BLAKE2B e7f8d067705ef95e0c0de18dd57bdfe732db6641fdd598f75c94bbfd1db07b4a3f1a6f48dceca424605f00b4191097a6195fe72d98176639a738536fa9fea31e SHA512 eb28765e157618a19e335787ec52116da493bc0a5e64328f49dfa28dabd525f508e430eba7ea1dc798a9269249cfad16611b9a05a3d55f2ffc1745a90e8f4a23
-EBUILD sybil-4.0.0.ebuild 670 BLAKE2B b8b98592b5dcdd276a84d48c195d359314c7be24c15e3ba38ae8659b2a0470865f37a536a50750ef7242801f18ddd0159ab08c16557cfebecd082b9befa8fafd SHA512 137ac0799f7e6f056c31ed9315e222e8678b6b25e3d941b139aff789493237ff9707846d3cd7037ab3322a2d57f03a65e1e6eb4cb089c63568f5db339fa8c2d6
+EBUILD sybil-4.0.0.ebuild 675 BLAKE2B 5df0e2e919bc3f39402d4ed51b5c2a531538c1f6e85c31d684373fb2b1232a428f287d0d4384a1ac3c45761e0a93e161d1050c660311af0454699ee24be06d70 SHA512 fb52654177c65a625e45ecd71509593c83afc5a72b7d07faf9551031ab73f9e9195c76c1653f9949316f43c6bfe13391a2044b35a1116748de4bda3a3ed417c1
 MISC metadata.xml 402 BLAKE2B 3fcce3ac9ff731e24a3f6e761da2d840b3a7c9107b3d9a46afe00fed61b475d1400580b4ccf49dd71f6a1ab8098dc2aaf895e529a723cd96301d1400ee211edf SHA512 138106c714dc33871ccf535cc47d669580b665c842adfea5442a03067fe507236d8fde4158f006e1188003abe53c9c25db98632dadd1cfa0e41efd1755c2c75c
diff --git a/dev-python/sybil/sybil-4.0.0.ebuild b/dev-python/sybil/sybil-4.0.0.ebuild
index a54934b5878a..cbe87def85d2 100644
--- a/dev-python/sybil/sybil-4.0.0.ebuild
+++ b/dev-python/sybil/sybil-4.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/tlsh/Manifest b/dev-python/tlsh/Manifest
index 566ae536a962..2668e1c8b641 100644
--- a/dev-python/tlsh/Manifest
+++ b/dev-python/tlsh/Manifest
@@ -1,4 +1,4 @@
 AUX tlsh-4.8.2-setup-sources.patch 1029 BLAKE2B 6b1a252693940df0856361aa38553a6a684566c4ab80ac4e01b7151a611b5d27bd9065c5560e958931108399b9b860405ab4119615f8f6ab6f8d05e8ce2f4c89 SHA512 04fce865f3a7e73a9a6814596255f86eb1d24086372479ed993b7faa362973808d2d45f4d81506c1bf87bfc534caa410a0c8758250ccb3fa4337c0952610be5e
 DIST tlsh-4.8.2.tar.gz 3345458 BLAKE2B 27d5eece16bb36225b9ae8b3d3a9d055a0f214fffae08a58c39211c3d918dd842497315a62237b291ee1055dfadad78826bbd24f7b9d88f510e9a31f74654039 SHA512 5355c7734f5356a3a7a31ccc078254835871fc0369f1889a34131a0f810735201c68f674eb18e975b6a03a32e5c284899ca9ffdc1f583e42192188c172d2aad0
-EBUILD tlsh-4.8.2.ebuild 796 BLAKE2B 21d34d99e476fcd896a3063ca86d200008c0ed14b484933c47160892969ba9ef11ed0dd7c812b3e6c49dd5bb039cd7eca7cb0fa3dd0c1ae2bec4fa2aba229b16 SHA512 094533b78aef4dae022b5789ca953abad11f541a198a81630d32c68b41132e56d2237ae19ecf9271d8e4f53b16dbccbf868b2dc07c2487857cc5da205e5931f4
+EBUILD tlsh-4.8.2.ebuild 802 BLAKE2B 2526d3a593d162d853cf06f4c775be6ceefda164821463f0d0eac1bd05b3aa4522e41bb6bfdf37ded171d1b20242efcff80d6c141d86edc0ba4d69e3d39709c9 SHA512 1dcde5e6d1ae3ce5babeb8d301aa9262f94f9b46c2c9477b0e503cb49625dbb14f452d2a9610a1bfa996baad7984a48d1033eaa2b993f2b2476a4e5efef9a16c
 MISC metadata.xml 520 BLAKE2B 97d64e94859345f4537e1a95dac94190cf54cf608cc851a8cdf24f5f4b71c0821c778d24f99fb076ed08247a085270d4c36aaa66583916c0a420733b7b8543be SHA512 95dc94ca2c08d71246453ccee139901e675ec84b2c4af224b90057270f4bf5494ffb761e2d3b4dff25cfcac47185d4f7d2f4b3080182f8c9526b746e99519211
diff --git a/dev-python/tlsh/tlsh-4.8.2.ebuild b/dev-python/tlsh/tlsh-4.8.2.ebuild
index ff90343fe42c..fb6ce513dd32 100644
--- a/dev-python/tlsh/tlsh-4.8.2.ebuild
+++ b/dev-python/tlsh/tlsh-4.8.2.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P}/py_ext
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
 
 DEPEND="dev-libs/tlsh"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 8dafe542aa77..69729e620d90 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,5 +1,3 @@
-DIST twine-4.0.1.gh.tar.gz 214569 BLAKE2B 82c1793718cfd7d81d9745d16dfe21f59fdfd8b157840ff29629f8b7b86c1e36281f1ed9ba613ec0048c8eef8a2c80d2b9b160893ed953b06c9bfb027f5299e0 SHA512 0b5d24c56731239400b6713e0e52d1cfdb399a84e886b02ea4b59e7af69cc1578e03bf442cca4b2ea5f400995955d27c8d9d3cc17a6ea59013bdaaf6ac63a567
 DIST twine-4.0.2.gh.tar.gz 214528 BLAKE2B c088329a86139eb01d325ec623504c0dfee1231ca8bbbf9ed73d46d4ed9dd79aaac6aaad225cacd64942eb7a3ead19bcb5e224ad9735d9760bd8c9c8e5e69043 SHA512 94dec0b08ea8f4cc5900d743b750f02a668c738d402632a80faef24220f87b4b14824966d6d902e9ddaab741e4091d6a370a7660d02ca27fd6fd0d251a473ab5
-EBUILD twine-4.0.1.ebuild 2081 BLAKE2B 1a87117b40ea78b1fb70c7e651ba8e1e0a94e6b90c07a50db0e7dd917121678da85a88399a6bf154b125d0178ae131e6c8f99838d34b9ef46f3b8b2a41032754 SHA512 5a5b7997840ebdaae513be8f8d46755c1ae1e4b67eccef6a591ea6aa19771ab2f68232237a62bc820ffd27c0b5da18527108e14efc2b528bdc3a4d48deb78815
-EBUILD twine-4.0.2.ebuild 2088 BLAKE2B ae61807508f60f6901abc7035ecf4ec8e948a3b3fbb45e6fd97e1cde477b01f5c6104e73b69d603b417967af4090b4630d7026249cc97918887b1ad5d3a960cd SHA512 3d5b75903d94a330246c1d5e387ace5bac97491baeeb74a4f33640d6b427312b43f2009ee7e5c3dd541a4c502a305237551421f9dcb6cbdac22b0cef3b39a252
+EBUILD twine-4.0.2.ebuild 2081 BLAKE2B 1a87117b40ea78b1fb70c7e651ba8e1e0a94e6b90c07a50db0e7dd917121678da85a88399a6bf154b125d0178ae131e6c8f99838d34b9ef46f3b8b2a41032754 SHA512 5a5b7997840ebdaae513be8f8d46755c1ae1e4b67eccef6a591ea6aa19771ab2f68232237a62bc820ffd27c0b5da18527108e14efc2b528bdc3a4d48deb78815
 MISC metadata.xml 383 BLAKE2B e2a596604a2f3e40ddd0196ea79105e318f8a04d9e5a2c7e458d403d215af1371f2a526fa7d8cbc430f20747f7b65ed6c8546263fb8a54ddd8a6db487c358634 SHA512 cd5c1f1ed89dc5c314975fc5b503108d6828db37826ebba98d6edd580b72cd41867e19e65a9a022f8c07babadecd810f21febeb8a015c51eecec412b9df4f0d5
diff --git a/dev-python/twine/twine-4.0.1.ebuild b/dev-python/twine/twine-4.0.1.ebuild
deleted file mode 100644
index b56ab48ee848..000000000000
--- a/dev-python/twine/twine-4.0.1.ebuild
+++ /dev/null
@@ -1,78 +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="Collection of utilities for publishing packages on PyPI"
-HOMEPAGE="
-	https://twine.readthedocs.io/
-	https://github.com/pypa/twine/
-	https://pypi.org/project/twine/
-"
-SRC_URI="
-	https://github.com/pypa/twine/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
-	>=dev-python/keyring-15.1[${PYTHON_USEDEP}]
-	>=dev-python/pkginfo-1.8.1[${PYTHON_USEDEP}]
-	>=dev-python/readme_renderer-35.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/rich-12.0.0[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/jaraco-envs[${PYTHON_USEDEP}]
-		dev-python/jaraco-functools[${PYTHON_USEDEP}]
-		dev-python/munch[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pypiserver[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# pytest-socket dep relevant only to test_integration, and upstream
-	# disables it anyway
-	sed -i -e '/--disable-socket/d' pytest.ini || die
-	sed -i -e '/--cov/d' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Internet
-		tests/test_integration.py
-	)
-	local EPYTEST_DESELECT=(
-		# Regression due to deps?
-		tests/test_check.py::test_fails_rst_no_content
-		# Avoid needing heavy virtualx
-		tests/test_auth.py::test_warns_for_empty_password
-	)
-
-	local -x COLUMNS=80
-	epytest
-}
diff --git a/dev-python/twine/twine-4.0.2.ebuild b/dev-python/twine/twine-4.0.2.ebuild
index 37584b486999..b56ab48ee848 100644
--- a/dev-python/twine/twine-4.0.2.ebuild
+++ b/dev-python/twine/twine-4.0.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index 2b71e4dd3b1f..c1c599ad2ac2 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,5 +1,3 @@
-DIST zipp-3.10.0.tar.gz 15564 BLAKE2B 145374d6e2e251f588e198a0fd400542b34ff26de4e1240dd30710dc33e884ccde91ca1cc168d5f421aa4e04341c76cfb10fbf176c830ade237be39a886267ab SHA512 2e64b05eb0123eb3c3c87fbfe2da26721eb9e24142a43e794d04e5f86ab5fe4cf3e0e3e3497bfc9631ab61dd64226829772493f26e091a66148ddbdc5dfd8e51
 DIST zipp-3.11.0.tar.gz 16799 BLAKE2B 96cbb86e4c112a2cc0bbd8cf8f7a6d0e7b5a5b4af0857bfea87583341e7d08c9f0879f8455131f81e21ffb75bb362fb312c5575a8ccb2e2996313fe3f95ffe36 SHA512 10e1eca131063d9e34db18320152ea5e2445585802e7814fcb0a0aeddd8eb5481c60c2eaca1f7f2729826aafd4004fc4a0b8ee26896c833f789752a501f77e86
-EBUILD zipp-3.10.0.ebuild 1544 BLAKE2B c0c07b4972de564f9556ab16b5597b6cb531cf950631ba8c65c91a44ff7adbf7121d3f82db20cb3858961755b0c824252f13b7241bb4b36f0e624cd6521b9bad SHA512 d54bf69f4432945b3b0781b8d3dbc7ea01a9f4d152cb8afcbd30c7e7b595af809fa7cb6295a23347a87b470def8e238153c9e414a483a6726f68abab7c37ce58
-EBUILD zipp-3.11.0.ebuild 1587 BLAKE2B 61547469335d6bbb2452255c9feb8226c80e6cdcf6551e11ca282b9dd1ad12bf51debdd16398d2ffd228bad0132b2c6ca2a7fddf169d9ed1210c223acd6ea8ee SHA512 a1c4f9e3a71d5b377344d7014b34404c2058bcd41fbdfda72f8a84ac475bfd211c2bcef9b72bf1655462060e0da01469e3e4a28e8e7e4d7a365621abb71d28a0
+EBUILD zipp-3.11.0.ebuild 1579 BLAKE2B 28f24cce1eb66f212cb7a04c066632f1219c22160f1948ef85f6673a5b786e6bf8f6c5e18242834fb3c63b6d8429987f03b0329751c2430a81904f832b064b1f SHA512 5bf7f8dfb95d1e89bff84c209ddb93e61b57099cac7a0ae94c7e96f0cb8fd294d92551e9ae73355e7ea53dae0140e34230b542946d8a1347c33737b427dc088a
 MISC metadata.xml 548 BLAKE2B 0bcd7b95c50e9e14ada6f3f02145bec64ee365beacf3447659276c1a5454355714f83fd2dc81a035a56d11ba1eb989f32bc0209a540b28fb72c3126d4d45a5fa SHA512 f214f6711b3197a44ec5c03b418aab3c9b907e0b3a297cb1c4e2ac3a499acefeb4de411443495db9678cbfd75460f89c9c40a57fc1bc404acbab844223a129d2
diff --git a/dev-python/zipp/zipp-3.10.0.ebuild b/dev-python/zipp/zipp-3.10.0.ebuild
deleted file mode 100644
index c75defb1e1b8..000000000000
--- a/dev-python/zipp/zipp-3.10.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE="https://github.com/jaraco/zipp/"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	test? (
-		dev-python/jaraco-functools[${PYTHON_USEDEP}]
-		dev-python/jaraco-itertools[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# speed tests are flaky by design
-	tests/test_zipp.py::TestPath::test_implied_dirs_performance
-)
-
-src_prepare() {
-	# dep of disabled test
-	sed -i -e '/func_timeout/d' tests/test_zipp.py || die
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "zipp"
-		version = "${PV}"
-		description = "Backport of pathlib-compatible object wrapper for zip files"
-	EOF
-}
diff --git a/dev-python/zipp/zipp-3.11.0.ebuild b/dev-python/zipp/zipp-3.11.0.ebuild
index 0604a8099e8a..cb1708d805b6 100644
--- a/dev-python/zipp/zipp-3.11.0.ebuild
+++ b/dev-python/zipp/zipp-3.11.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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"
 
 BDEPEND="
 	test? (
author	V3n3RiX <venerix@koprulu.sector>	2022-12-31 14:19:51 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-12-31 14:19:51 +0000
commit	ea5bad4d0ba1eb937df22adb7f6cc57ea77f03d8 (patch)
tree	444d798059985f0e993cb7582231243cd4c5d083 /dev-python
parent	6989a301768c924a6014fdce19b28de541ad557a (diff)