gentoo auto-resync : 30:07:2022 - 21:10:59

25 files changed, 16 insertions, 430 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 0fe197d0772f..4d7572d112c1 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 17cf5459b564..56b6775e36cb 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -3,5 +3,5 @@ DIST black-22.3.0.tar.gz 1154456 BLAKE2B c89b43722839748dff0ce60debb684cd8eeae5e
 DIST black-22.6.0.gh.tar.gz 1165070 BLAKE2B ce2eef529e230954a13913063dbb9000fa13f4debb2e5ed33605e8efe5c6d62fc1b3c0b7847c26ad931b9becae43fa23b15701a1672c1e056f729810020cc282 SHA512 72e4b4dfc69436e4dbee5a75ea72a1be69a26dc37a5e4d7edfb84d62736f0e0aba8d14420f3069798b568bd8ba916e8850f0c958afc9b6134ee8832e54d3dc4c
 EBUILD black-22.1.0.ebuild 1397 BLAKE2B 89116657e56fb1f9a08ebdfe35de2d5d9761f43c5dff5a2ecfb0c8cf5d68581223dada3d0accb3261bbaabf4c26861dec3e35c482c7afdd8279ee8ab3422418d SHA512 0ec829dc329fab2b7c892405d195e34be8d8e1dd0850940c3727bdec6cd520b4a8d977f6b1a13e97b4622b2d853f9f372a515f457d2161e0412ed6be843f06a3
 EBUILD black-22.3.0.ebuild 1417 BLAKE2B ac11791cabf7d046f6a9a632174ff214c42983a5d152d9be29e8653b192bd8b72ea8f399d2a43bc64ec7c65590ba284082783db81685508e055a9d476f3abc80 SHA512 08f7e446dedbbf21a62b55e10828761c1e3962ce48c2009fe8a7846364386d8b206489eec09c91fb515c83fc54ee2efad5ae13d66427670659b6bad6a3911966
-EBUILD black-22.6.0.ebuild 1419 BLAKE2B 2028bea11b5d97026d7d0a521eb2cb3d529d0960665077e24147462d33c395c7c3a826fe6025a39996a546eaec16bf819a6adedafe28647e5241f00af44bb73b SHA512 f7d6709795261b578057c8a6457d07e7f57eb39a69ddae7dd696559520ccc30e4abdef4ceef2892d782cd7a8a6b8f0ec70f28bccf8f91a5bd7564bc3fd9b77d3
+EBUILD black-22.6.0.ebuild 1418 BLAKE2B 54fd1498fd0e3f558e6be4c3e96100ea5695f7f7ea43c38e5965d06f96b34159d6370e1a20382e8f5ecca3c5b62ec1c1e3167936aaf728098de0199f3206eb8f SHA512 c17b8d301f47a5dffae1460978d91bd127448f6903428c7b0c16e0bb6f13943c973f32c71349135cda43bd7cf26ae6151be3c185a2f5ac9fafe3a044e20f387b
 MISC metadata.xml 397 BLAKE2B 505ed4127741ef8d2fd77c36e6ad2d6168dca8ae5570cf7606a557fad29393c0dd78fe2eb1fe990d9d69abec19fb65d563481160b0bf0a914997b114e73f7c66 SHA512 357189214d3cc2a026b8c29ee5c695a62d73db229ca1f71372bfc5a1120317a4c4ffac942f5a196f20e84ae8988a4e707d4194ebde12ef7c96eb713b398f587c
diff --git a/dev-python/black/black-22.6.0.ebuild b/dev-python/black/black-22.6.0.ebuild
index 930e1aff074c..60252504da8e 100644
--- a/dev-python/black/black-22.6.0.ebuild
+++ b/dev-python/black/black-22.6.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 47e379c6107d..6b599e7c6485 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,14 +1,10 @@
 DIST boto3-1.24.26.gh.tar.gz 515531 BLAKE2B 34f99c4dd224731e07c2f0b175d6d172661ce454a7af16be6856053af1bfac69b7f56ada5b154fb625fe2ba1fb22fbe34b5150c550890e46a923b48f2466b06b SHA512 a3980ec79abd5e2656d7d02b36dff6b8c2acb67033eff134d96dccbb9d8bbc2d711698b87d08d537256fad7e3b3cd7af008018ef567b12d63ef0fc871a8f3b3e
 DIST boto3-1.24.31.gh.tar.gz 519387 BLAKE2B 8581d1018f0e1f0802779851edb52fdb6860c44bf46e6315eddd3b603cb65a0763707686286aa06447e90df6c8e6cae3de0e6bae8a9836ad90e5a3f4335797bf SHA512 370773f2365f4dcc7b73d0828bc84f0de5c15b189d23b799738c2358b1b0119e5e457f26529b7a6c90d637c2142121a2874d088671715c8deb4b793afbf7fd38
 DIST boto3-1.24.36.gh.tar.gz 522156 BLAKE2B b76cb50f01ff85c960a0984f950e72f02ac6e85131fd344142b886a3c745cb8b9073f865527911b88c462912413fce6df4066752ab5eec8ad1561d349ad22437 SHA512 fe00e78cc522248c449f83f869bb7d76793db9aa436259e74d0aa25984a02876191a7df41b1ad7658b06e418f248ad616743698c87a5c9696f77a196a53c561e
-DIST boto3-1.24.37.gh.tar.gz 522233 BLAKE2B ab361fd7443ff499c18a8e86c9a80da14e6a1d960fbac26d2e12d8806684daf169010225ce7a402626a814cb29fcc281ea61d293eb5eb197f48dccdb8a7a14ef SHA512 b75ea002f3a3e3b8c498797278adbf5f7d4b220baf7b8fa3be8c972bf2981933d962878b7d96a7c01c9a28be267effea34b48692716e7eabfa077ede380c816e
-DIST boto3-1.24.40.gh.tar.gz 524303 BLAKE2B 750d366914ebbfaab262a88d96afb1df6f16c108e1e07537e0ae2234df95500c7dabaeae27afc5c5cbb8b0370b3a088b97c16a8c48e3d2f5741744841f29fa1b SHA512 240b78619783a30919dc62c6240b07d51c8a4e4ee0fcb6c4daba19c6d5830d8623923de6cb984e7310bf5e745b0d20a2471578a2f8650089aca96e9575d3542a
 DIST boto3-1.24.41.gh.tar.gz 523844 BLAKE2B 0cff30d6aba5e8eddb8f545737e22a146ef9a3c33df2ad5b4f6d0ef8fd67cb46183eb7fa21e8a961d2597df8d965478bcb0038f5dda117611bcfe15f0de26eac SHA512 ad3a6035352c54f7ba0197357a5a4e001c8fe7548121a9a3931acb69f9c098feb8da1d1699ac98d3ff00626f39082753434f1c992351a82cf269ce2c6a4eab06
 EBUILD boto3-1.24.26.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.31.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.36.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.24.37.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.24.40.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.41.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.24.37.ebuild b/dev-python/boto3/boto3-1.24.37.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.24.37.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.24.40.ebuild b/dev-python/boto3/boto3-1.24.40.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.24.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_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index bb8305419bdc..5e441377f811 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,14 +1,10 @@
 DIST botocore-1.27.26.tar.gz 9167551 BLAKE2B 9e95c1e6e5261b08247615446a589318d92cc86768c5e3999f99fb8e2a4a888309d72d4d3d66a1ebf9c1e2b6ccab6265a1d94ad9dcbf9da22aa1ae012aa2bfb3 SHA512 bbb563c2bc8eb3fe022f0b7be263ef16de93aadb02fb7a8e242f53a957a97e8f8b5d043ea8897a7b268d4d64b1e4972f2ccc91b8255f232c858f6a9ba1d93f34
 DIST botocore-1.27.31.tar.gz 9184651 BLAKE2B 01dcd9e94490923f7d0f463d3019007f58c5e441ae65ea2c365ed20417e8f7b532228a335c6f461ca97411269aaa78aa48fa33cccd8b2e45a6665c2410bb4352 SHA512 27f810e0519144fae71600ea7f6d9a15cca30386ee0f2b06beeeb64c06da8728b54709fb770673f708697dd930fe744703728ce00b6a1149361ab550fef9ccb4
 DIST botocore-1.27.36.gh.tar.gz 9465835 BLAKE2B c22c341d6e762316f3d8719bd8c1fd52140642739361a7ade326d739005dbd141a6b4e1798287b40bf7ba40cd5e158d36f195893d529f5ba375b06087d2122b9 SHA512 09ef156b3c0457ceef341bf26e3f060d3e91808f1da66d1dbb06ba2826be3c61e047383dc9d8a719bb8e172e91f6475f4613c14d30c57c6a909b51c8ba7334cc
-DIST botocore-1.27.37.gh.tar.gz 9466348 BLAKE2B 56c670e22204dcd12164094d52b1ed4ec820241f1423738e008f24762a5702149f2eb57283ec194a77cc2d57bc1183d91a90ca55ae0cf977aa1abdacb922ed86 SHA512 adb18c54a757077f7cff4b9b6716d015998432faeb3eb7d0a631631e5b0cf7814b40843ba379841cef920d3eca1367623f52491f53fed9f318898b3a6197eac9
-DIST botocore-1.27.40.gh.tar.gz 9491717 BLAKE2B 4c4e96969432426b711642265573b1a3026ea60dbee2328ff34f0c64ad5c911bb773078e8f86882c94abc2b340567e65475ebed146651e92307ddf1629cbe2a0 SHA512 03d174f3c8490470a40ba54568b3ec1fed740acae143964db0618e7d57fd03fd6aae992d7e9dfe3882eae70a082a6974d3356cd7e2c49625eec8270fcb2ef784
 DIST botocore-1.27.41.gh.tar.gz 9493802 BLAKE2B dff510a658e77fe7185a8d118228cd80d06ea066328d39c56eaa8f01459dd11131ca73dcfe464a5e1403f8aceaa96065d5ea335bb268155c81c9b71299488d45 SHA512 29f419c4338e37bcc7fce38836b1f3b0ed1e552ea94cbe77ea09cd18c3c0b80d3405cd4a3468570c7eb6f1301bfed0d26dcc98feb7a1f62b9e8b1b11c61cdac5
 EBUILD botocore-1.27.26.ebuild 1572 BLAKE2B d019098e9bd4f40cfe93307947813ffe3e880e9462b25ff6eaa16caf3ffad2ea5c6db9e482b7b3dc995ca174bde48e90ecd8861a86291c1d454dcf6212bbe7d8 SHA512 db12020b9130b5b940a44ae7fca5a6b0e4c3d84fa2efcff156099d355cab185ea52cb3c4740ebbea25d865d6af8d64ae58ea1e4c6129b1c1026fe8bce6f0580d
 EBUILD botocore-1.27.31.ebuild 1572 BLAKE2B d019098e9bd4f40cfe93307947813ffe3e880e9462b25ff6eaa16caf3ffad2ea5c6db9e482b7b3dc995ca174bde48e90ecd8861a86291c1d454dcf6212bbe7d8 SHA512 db12020b9130b5b940a44ae7fca5a6b0e4c3d84fa2efcff156099d355cab185ea52cb3c4740ebbea25d865d6af8d64ae58ea1e4c6129b1c1026fe8bce6f0580d
 EBUILD botocore-1.27.36.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
-EBUILD botocore-1.27.37.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
-EBUILD botocore-1.27.40.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-1.27.41.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-9999.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.27.37.ebuild b/dev-python/botocore/botocore-1.27.37.ebuild
deleted file mode 100644
index 6558cbe56a50..000000000000
--- a/dev-python/botocore/botocore-1.27.37.ebuild
+++ /dev/null
@@ -1,69 +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
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.27.40.ebuild b/dev-python/botocore/botocore-1.27.40.ebuild
deleted file mode 100644
index 6558cbe56a50..000000000000
--- a/dev-python/botocore/botocore-1.27.40.ebuild
+++ /dev/null
@@ -1,69 +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
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 7b2135281b0a..522cd2e8cfc2 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -4,6 +4,6 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD clang-python-13.0.1.ebuild 925 BLAKE2B 1dab0cbb672643072e7d824a262c81505d19e555f24f97f82156473affc2f5ba6fc34ec493ffeedbc82feb1245fc6a39126e1b81fcdc8f8b4ddd0b7fe108e4bb SHA512 11eaf5c7a484d756f01986eacce19c912666518892f3213ff42367c126c2d8474abf6608cca24e6250c64e7423464e7cb3e58c2b069c7febf4893b249f2ee304
 EBUILD clang-python-14.0.4.ebuild 956 BLAKE2B 491c8335c64484034663fd84ca2397e13afdd8cab6d3b4adfcc9317379e7a3620372ffe5996d4a0029a7d412f11a0d598f741a6893803ebadba85d330e49682a SHA512 4ef0d1ab2cbc3d277d4cced33fa87de7c3d43295a60a3b418ad4a95399e8de8c2e1e5c594681bf7ce1bfc465732d34b2db3a9e8636c0ed124ddf79c8ed7a5750
-EBUILD clang-python-14.0.6.ebuild 957 BLAKE2B 90122ccf0d2e1c5b28b2c5e9d2a375a83b9d90667ae126162e82961a6a9ff6d52558e2e13557345a99284fb983f43165a879b235a95f5b58fcf4ad630cef66d0 SHA512 e44eb8e67898caa098cac43038a4fc12b395f4a995ab3621ad82aaba3239a135c4d495149ca2766f84bd981ce8e0149d7bcd1650c8c24629803de531d3c41d76
+EBUILD clang-python-14.0.6.ebuild 956 BLAKE2B 491c8335c64484034663fd84ca2397e13afdd8cab6d3b4adfcc9317379e7a3620372ffe5996d4a0029a7d412f11a0d598f741a6893803ebadba85d330e49682a SHA512 4ef0d1ab2cbc3d277d4cced33fa87de7c3d43295a60a3b418ad4a95399e8de8c2e1e5c594681bf7ce1bfc465732d34b2db3a9e8636c0ed124ddf79c8ed7a5750
 EBUILD clang-python-15.0.0.9999.ebuild 935 BLAKE2B 259d469221df0c360735c5c033f89523161f2bf19db811f390973b52229a50b82cb06f96c05230a9862986a77d42466d1b3bc95b5bd30578c96715b28831212a SHA512 a26fbbadeff6657cca7ef915d263bc9a1a4543116bb1f14282b889c5463a662d280ce8d7e7f674753c43b186fb0531062ea86462221adfb4a8b76a50c214aa1d
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-python/clang-python/clang-python-14.0.6.ebuild b/dev-python/clang-python/clang-python-14.0.6.ebuild
index 682b499bdda8..414fb007ea1d 100644
--- a/dev-python/clang-python/clang-python-14.0.6.ebuild
+++ b/dev-python/clang-python/clang-python-14.0.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/configupdater/Manifest b/dev-python/configupdater/Manifest
index 7860ac2f2e9f..cb02327bbdaa 100644
--- a/dev-python/configupdater/Manifest
+++ b/dev-python/configupdater/Manifest
@@ -1,5 +1,5 @@
 DIST configupdater-3.1.1.gh.tar.gz 138777 BLAKE2B 9fef5815bc41903a65c2c53c6b9ff3d00d1f4efe65008c725afda8d12694be4d18810cbfc03b291246789d736f1a2933061f2683bfc62e9e1d72e2e4f159d772 SHA512 1e499f87d0ac3d75f32aafe532d7c83b4b86fbaa204fcdbaf7a3dcb5262d936fe027ee0b21d169ef69a0590edbe965a872390b14be274fbb1c893f2d4695b92c
 DIST configupdater-3.1.gh.tar.gz 138671 BLAKE2B 48e349780e11ca26b4b15b44aa298058840cfcea47fc7b2e555f3ca743de1956a15255bfea2c5f96624e02e399bed99ae45f3422ab1660b8ae83087ddf6117e1 SHA512 89685a93f3bec907184d818b5adea4f87967df313fe4e4216aeef2c227fdf0b0f98757ec27da7f43adff6e2ee37020dd57b98569d5811c9dc7c3201852b27432
-EBUILD configupdater-3.1.1.ebuild 743 BLAKE2B 7c4be0e42e01ef9371b51c921e25853a80f416b29ed75faed5e43068cfee78fec437972c0e6d889c32440e70d5efcff4c936085abbd5e5866d40a81c0915a5ea SHA512 ec0bf3b62bb2d45c7a42665aa2abf4ca9f145b9ed6c1373adf5823d4c7823ebc87fc3c3e85a1e8f8f51b767ae120a781a801938cb8ed053a84780bd9fac6f502
+EBUILD configupdater-3.1.1.ebuild 748 BLAKE2B af730ac122f3e19ff7f9178306df5a65d6e4310ac422bebc7eaaa5a4a7ab5e72afcd05e8ed861ea703ef3cacdcc56eeaa606e95d7ea77c3519c02f2a4afb3aeb SHA512 69614d86045197e61bc124014675f3d33e73cbd7877a5a1914e6a9470b85c5efce05d6c7a43d053be78d343a82ea5d2e374a3fe7877d1b450f1582fe33f764f7
 EBUILD configupdater-3.1.ebuild 693 BLAKE2B fd1c8b10619c7b2ff849c59a467687e53b653188b2395aadf47e4731eedb967fa93d203cecb8d1bbd00b309f977ad242a21658cdd371affbafe79b44e03d5cf9 SHA512 23745443f9fa98695eac44e41559300c0948ebfe099aa7ae41450239040685acaa10c97c600c48fefc046ec2fd3cb934c400c45819ddb191fc636c0206132b71
 MISC metadata.xml 359 BLAKE2B 59eca20050b8eb4620813ab2bc61abec0d905dba4c38d35806f135cc3f165634cf6f1df124d77e294dbcb3d196b521bbfaa005979e0c63164004d4942afe4717 SHA512 8ce147cc56b7c207125e40d9ce54f692f62f2ecff1944e74d661b2656e5d479e8072e41fbec7451e58976d3453c5dd0e4eff0726ff9f2b502b505926fd2d851f
diff --git a/dev-python/configupdater/configupdater-3.1.1.ebuild b/dev-python/configupdater/configupdater-3.1.1.ebuild
index 4f22878363fa..fc26cc3facb9 100644
--- a/dev-python/configupdater/configupdater-3.1.1.ebuild
+++ b/dev-python/configupdater/configupdater-3.1.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT PSF-2 PYTHON"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/ini2toml/Manifest b/dev-python/ini2toml/Manifest
index e8e1a81474b4..d95baa39c507 100644
--- a/dev-python/ini2toml/Manifest
+++ b/dev-python/ini2toml/Manifest
@@ -1,4 +1,4 @@
 DIST ini2toml-0.11.gh.tar.gz 93696 BLAKE2B 0fb52b346065421049fd377a62de4189a6d261ad12c00679c97568a0e7b7f8fc7bf1aae2196b8fc70489d547c0ce9be1347336d25769c7fb383f9fec4d4aa205 SHA512 7329fd3ba31567638fffce22f2370c2055503bd4abc3d7dab30b1828eb54204d31036753efddfab52e79703ce7583f6070e1207c95345096c0751c2d429fd6ea
-EBUILD ini2toml-0.11-r1.ebuild 1182 BLAKE2B 27c7a6da18517f83420827a10be7aa53f7202b7e8b1ab22d91269973b2140f773da4420085a2313ee1175964bfa7de123f00dbaa3c0296c375e0e47758609476 SHA512 9cf37c417b63d1e006de423a9154d505d4c007ddb19d10dddfccb0cb32159acf078f2f718a518b9b3bbda347d186142d8472579f892356495ddd0ff6221dc7ab
+EBUILD ini2toml-0.11-r1.ebuild 1187 BLAKE2B 8bdc3358f1fa70fdea2668ebb217c4adee7d4dc48c5c4a295e7d5e7cec9eb1f4f4ba77b0e5a31562c0b1c3d2a8afcd9d4acde62a6ce9eccac2968f61f669a4a4 SHA512 30286466a2dfd1c54a5387c5fc8b2e966bcd26345620762f26ce31f48852b3ef2f204ec3f91d7c16aecb23dabc5177e8ea3195631dc462d16f18e688f0224b09
 EBUILD ini2toml-0.11.ebuild 1711 BLAKE2B 1837c2f2e3af0b878a7e3c0a58aec8139ad2582048ffa89d5b80720c700bf53f8180db7221678209bb3aa1de89f938416df22822a4a37316281ad549bdc8525b SHA512 2bb9474cbdbe15c9d2c9ec4f59fb2661171b54d27a40722996f22b5c5a2886c0676b2ae4a8a1ffb65cc8e7c56236a9d2a8c8cbb3fb0714ec5c9a0e47b6572127
 MISC metadata.xml 374 BLAKE2B d1d096c2db4d1975e07553486be8e1ef66a63338b6a6617f71131565b80f612b9d50ca7c039d0b37b02eec56421231f52833390eb8536de44d4edd7c90d307f2 SHA512 21a272e9c3a7eb3e0950358f8ffb90b961ff0e39073519ed0b36660dfae91b24f8e09e3b89a20dbeadba45d995eea4bb89d484acc04a7251dfb9f33603bef998
diff --git a/dev-python/ini2toml/ini2toml-0.11-r1.ebuild b/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
index 64386dec26ae..aebbfa75fec3 100644
--- a/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
+++ b/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 15e691bdfa0f..7147528e9b72 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -4,6 +4,6 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD lit-13.0.1.ebuild 907 BLAKE2B 786bc45254014c19e47997b263eba9245fc44459a6f12d46e69803fdf57c1b8f3d07d7e0354ea23ab17471771f57af8e792ca942b9f195462a26629d8d6bfb8b SHA512 ca254f8d0d3af0e01b24e73de8e15b77d687fd0f23a4848dd4e85522426e7dbdcd8ae77e25d8f88e637e390131fe78362ae7ba4ecd192a4c970cc3311b371dfa
 EBUILD lit-14.0.4.ebuild 915 BLAKE2B 1b5f3a2c173e1321cb172352f090e013d90535b1a97af0d37e5db9d7c4699638d627942f8ca0c90e56840039f6fa7b8d1360b069f89c4b0298a541015c4036aa SHA512 f40f818848819f460efdba91dd05215ab878f38cb0900ece6ed9e59bfa3c8b25ab025ea698bc377f92d535c6b6c189fc9b219d6832ad365f6c1bd01c70397b44
-EBUILD lit-14.0.6.ebuild 918 BLAKE2B 78f412ace759f145c4cd44962afd359b9e9f093acc749518a93f78b0eb13b6232832ef88cc5034bb08ca384f3aa4e37cbd4b257b3d7354fedce92a8122d3286d SHA512 d13c6559d04cd40ae972b328d9cee7bd75fbcb9aee5f2a39c393a92fe550c0e1b242b4b8d1ea1bbf02744c88bae8dbf96c2310a5c0789bc3d069210d9ac81c7b
+EBUILD lit-14.0.6.ebuild 916 BLAKE2B 5a9743061c016646ffc06f88479fce370bfb9a58444f6aa9b5b294315215ceed6c5ac25870d276bb9b63b26e7dbafc53925a64c7f00280e8ddd2c4474049daea SHA512 f01cff904b9aa29295ec19f01aada151a5527986fcf915b7f37b62cd1b4036a1b5b17803d94c318ab976bc523c4fd80f81c31383ac134b39b79ac9acab993d70
 EBUILD lit-15.0.0.9999.ebuild 871 BLAKE2B 7637fa92b7d8e5b7c87bd1cc7e8941357b48064795ca297050fcbd83f0e2a9a2a36bc1916d2cff19e95fff353250c5cfc82d2eb052c36b8bb9cb9398df19e3c0 SHA512 d049fceece84c0a07332d664a7f9b98b3c5ef81e69f24394f3e81e733977b64a523eb9b15a149e82bacd54c9a262f988ea777ee7af7c3ad48007be62f529c103
 MISC metadata.xml 340 BLAKE2B c9ca851e49b4ab48c015686e983ec988f60c34ed0af77abd7bc03d046002f79f74b9b463ecb97db89f2230c1593af7acdaf6651fc51fed4aa92a459d07aabf18 SHA512 3fe8262ce6b971364162fbdbac3b02bf02f0a64896c8a2564e2a2998bd6e6bc74463bf9104e3f4ffaa9f5c1a16c877fc864b8a4f056ca0022f741799bc00f217
diff --git a/dev-python/lit/lit-14.0.6.ebuild b/dev-python/lit/lit-14.0.6.ebuild
index b4c9afbc220b..a0766f6b5855 100644
--- a/dev-python/lit/lit-14.0.6.ebuild
+++ b/dev-python/lit/lit-14.0.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyproject-fmt/Manifest b/dev-python/pyproject-fmt/Manifest
index d7f78609c197..b668e942b777 100644
--- a/dev-python/pyproject-fmt/Manifest
+++ b/dev-python/pyproject-fmt/Manifest
@@ -1,5 +1,5 @@
 DIST pyproject-fmt-0.3.3.gh.tar.gz 14399 BLAKE2B 82af6d6c4424f83ed9a5539d64bfd517cf08df4bb14b7f1321a379a4d87d140f1518444b503731344e5fdbb4b94d92ce23605fe2a1cc978d26901eae98a31b8c SHA512 49c4648e140b34a6d2f27cc01be7253693e79687f2ff8dbcae5ca3cc64c14f5945f942ffb42d1d286ff221e5aaed22dc1f9953216f49232ce311c4c18130754e
 DIST pyproject-fmt-0.3.4.gh.tar.gz 14400 BLAKE2B 3ab116fe4d4f683eb3700ca2cb855744111b806514ef18f56cbe6628bfdb6935b813e852ff6ff64716959f1580e8817f485ddcdec6c463ecf5c8935912316528 SHA512 0e3adddfbe8afe3b9da85033ceea7c4e37f59bf48722a5897f6e7f2963cd95ba9eef7309c095f4b3fbd927a6486a058289cc3fa5f90c0108a75686b1b81d13e2
 EBUILD pyproject-fmt-0.3.3.ebuild 776 BLAKE2B 6cacc964e5da9df0ed7b6a89e6cc4b2a1177ee2fca7dfd97b4e1564f0c9e13644ac2897f9bc8193cd7defaec18820a5f5d0b70740d5a82dc5b734ee2f480383e SHA512 7521d1c96aff9a1b3ea7d84311e410c5730b7a3cf83c12543e49b62c523b688ef009493fdc05de3a8debe29276a884fb5be3e9d01bbca505f0125e0da1ed3fff
-EBUILD pyproject-fmt-0.3.4.ebuild 826 BLAKE2B 995ec17a27c44fd85b3fe27e2f5035f352c99bce2212f7cee4a259129d433ffcd4fea81af70a7870f989ea609e0fab6bc6e21d3735d678fd54e83b15441e4ac9 SHA512 39b16c3040a6a8bb1ee696b586feddda6800f05d65f256fb4fc02a80ee70719e82575057d3ce1edf2c13be63b45eec91f5799032895bd64991432d16c7357839
+EBUILD pyproject-fmt-0.3.4.ebuild 831 BLAKE2B a4027da557ba35bfa4cb93dcc03cc372660e08800e76b45c3f822c5c2d4acbd48dfbf5edf6b8753192f49a222c2445cc1cbde2f804b97813f06542283b24dc91 SHA512 897c0e8ceaf4cd1a4aedec3a37364de1b68922b1b0a1a2712c37cb38e89a5033d09435dedbffc041ad4102998eef326db9f905e3ccf7a8f996a553b46d3782ad
 MISC metadata.xml 356 BLAKE2B 9d15eb809d02ee235382282c3eaaea6ae0f3c0192045829495fae1244f88907673f5e5ec26ee5234f25267add21b34fe416d1d48e54f3a899773160bad1cbc8d SHA512 77a3e6273b92141d5a337ab28b162ee27f3f1970316fe42becf2efbd4cdbc5ed6cb26f1f24201d0605c26dfaac75db467f42b00cc47df0093336bd0629f0a1cd
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.3.4.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.3.4.ebuild
index cd6179fd4d81..e4f5cb82f1dd 100644
--- a/dev-python/pyproject-fmt/pyproject-fmt-0.3.4.ebuild
+++ b/dev-python/pyproject-fmt/pyproject-fmt-0.3.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 2113d7f94bb4..96742000f2b9 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,5 +1,3 @@
-DIST SQLAlchemy-1.4.37.tar.gz 8155965 BLAKE2B cf21c2ab73a5ba2576a857a12f30ea516265af946e25c1b137e57019d862bf04f4757b4755cee28e6f53642d1f1b58f43c99cd1c69f87640e47ac8a1d1ff8d28 SHA512 3f8a814f9bb6fa273f7b210c4567bf7411d0cf2e5caf010a5387fb946063704c342072145a858fb906545dfb1b959155d041e6073273674e51715356fc1f39e6
 DIST SQLAlchemy-1.4.39.tar.gz 8212369 BLAKE2B d65993c4342c2cb5bc76ea4ecc986d0ec521a6eb785604ceeca0c9c22187e4af29fc8bd940a130162ca9dd5c30d58b5d0999472285382c6f6bed3863ff9f20cd SHA512 a7c6b73250044289add492b2d7df9010f3b9a3a5126c8b3448d7339cf743c4be3f1c08d238107bb12c579b2bbd7d20e216e331d3ee10dcf79c0f23ca44d496af
-EBUILD sqlalchemy-1.4.37.ebuild 2839 BLAKE2B b19eea5aad1cb6309d4b8b93777a0dbc9bafce964aea03a3cda6a80acc603fc1ff18cfcf324b6a9a65faf00354f49c778203e02277b8c277dcd484cc381654b5 SHA512 881a5a1b470dcb2c15ce0dead3ea454ec11a130202bb243e14c0622a0d7ab424747b42ac349eb3d7b4f68c27495e273f23d5d1d4c0f8d5fa4cd1efedec785e6a
-EBUILD sqlalchemy-1.4.39.ebuild 2618 BLAKE2B b39513f3fbbe974c80b77ee47efdc7101217d815b2bf501db5800f2661dea9816258da1bdb26deb95c0e577b6c3814b675d496d49c7725e13e073c927091a092 SHA512 3646243bc3cee65f586e1a1ca221761f051161146fb2da54cc396437a58a1cffe3055806bfb336f546731a9cf7987190d911c6b02abbcec4ca78b66c085e4d37
+EBUILD sqlalchemy-1.4.39.ebuild 2617 BLAKE2B 8463ac4ba31b500c01b444cd7b305f2c4dfcc9e39752e68fa0d82b6e7a45a34c55fb72fc87e36035139c714dd5c74fdce6a9f7c9f5c39aa1e4b52b1c0695333b SHA512 53105444a9d92f70b4823ba420d533358c609f6e567911fbe1231eb791d552f6d2a34540718c2ed224b1fdb54d09df7faa04eb9f0684322cb11853b28eadd4f7
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.37.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.37.ebuild
deleted file mode 100644
index 7c460a84d5da..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.37.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 optfeature
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# hardcode call counts specific to Python versions
-	test/aaa_profiling
-)
-
-src_prepare() {
-	sed -i -e '/greenlet/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# warning tests are unreliable
-		test/base/test_warnings.py
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# https://github.com/sqlalchemy/sqlalchemy/issues/8019
-		test/engine/test_logging.py::TransactionContextLoggingTest::test_log_messages_have_correct_metadata_echo
-	)
-	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-_exclusions0]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
-		)
-	fi
-
-	# upstream's test suite is horribly hacky; it relies on disabling
-	# the warnings plugin and turning warnings into errors;  this also
-	# means that any DeprecationWarnings from third-party plugins cause
-	# everything to explode
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=
-	# upstream automagically depends on xdist when it is importable
-	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
-		PYTEST_PLUGINS+=xdist.plugin
-	fi
-	epytest
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "asyncio support" dev-python/greenlet
-	optfeature "MySQL support" \
-		dev-python/mysqlclient \
-		dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild
index 3d537b3f5d7f..e4039b787fa5 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 BDEPEND="
diff --git a/dev-python/stack_data/Manifest b/dev-python/stack_data/Manifest
index d0622ddf8a2b..67031e175ce9 100644
--- a/dev-python/stack_data/Manifest
+++ b/dev-python/stack_data/Manifest
@@ -1,5 +1,3 @@
-DIST stack_data-0.2.0.tar.gz 36618 BLAKE2B af79e5c46d03967a8ea6a992a0672a5bd3676a8b088be412782b8c6be6f58a14de1c6e6ff0cd4ae764a65c539a83aa4d7491bb7fe81761452d430d30f70d20fb SHA512 7d6a1a0ffdc667b3ac428b378f1c4f14c5ded99ec244e3cb558bb39ba0c319e9e1657188cb686c8eb788e1af2be6c0b51beae825b73f2685d7b0bc1341ebe5d9
 DIST stack_data-0.3.0.tar.gz 41061 BLAKE2B 9202ddb2e6e8c8c9e050e085cfe6e1bdbf26124eb85c19516558336d46876aba5ede1b6a87cf17e09c2b44629063a8f5e1f558fdaf64db2db029978a5860cd99 SHA512 648b6fd0dbf43ee974c15de85aa530034c6c67a3a7c297c1ea3f1ddd59bf13d331f8db9f8ddf54f69e59385ed2c0c2a24b48c5a93330df62082c333610d8a6bb
-EBUILD stack_data-0.2.0.ebuild 824 BLAKE2B 14592d59e199555514f8057c5d04a7ce663d05d25c763233ca680becad59f602a2e66831980270d79827bd86047810319a5d8b4cb29e1891053446556709fdf9 SHA512 2ec55cfcf15b6e26a3b7c7d002b14ce5b19c7945eb3b9e909afa1638b74c9b6a0c509ecc73aed22b3b7cd1eefd55a522c807fb92789d6bf6b417158044da1971
-EBUILD stack_data-0.3.0.ebuild 826 BLAKE2B 5da6cfc5ae729d604c85fb3cb09127b0cf85a99f7b31a1aad1d57bef242f9ef23b9406b60fd511c2ec615647ff9008077c36215a575ac7c0e2cbeaa316d1981d SHA512 143e2e5ff461052db0166e667d9e5dabe45339f4f12c5f732c450861869b50bf8d5ee669be04cc07745e334c9bbab9d27c1596c69c860c242ec0984b2f72f3f9
+EBUILD stack_data-0.3.0.ebuild 825 BLAKE2B 575800f98c667835be726a01e4d2d0bdf0e7d6f26e4554bf33670fc7c6732fc147174ad15441bb6e3951a474478ad1b90aea7ba2184e02d9d5b53a58ded08a26 SHA512 b639c0422e76e42d661575378191eeba250e7f35ca96b5ae8c2b8ddecc0cfa530140c2336654e3d04344b45ebbb6875b9673733266df54e43ecd25149163d8a6
 MISC metadata.xml 375 BLAKE2B af41ba2f7058da9de0e1f8be741c3de7581d895246c1c941f0dc27ed2e708ac2cb64b5a6fcaea82ff79e7a8bd4e0b424500a373957019d9e62f53babeadc166b SHA512 be539ff023fbcdf96761cf06429efc4cc2d0d2ee38b3bdaadbd73665798c123591b9543ab4fd3ccca9c80820c71b010f8fd34646d2001a940df0a61fc4e0639b
diff --git a/dev-python/stack_data/stack_data-0.2.0.ebuild b/dev-python/stack_data/stack_data-0.2.0.ebuild
deleted file mode 100644
index 4a42abf43fa1..000000000000
--- a/dev-python/stack_data/stack_data-0.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extract data from Python tracebacks for informative displays"
-HOMEPAGE="https://github.com/alexmojaki/stack_data"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/asttokens[${PYTHON_USEDEP}]
-	dev-python/executing[${PYTHON_USEDEP}]
-	dev-python/pure_eval[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/typeguard[${PYTHON_USEDEP}]
-		dev-python/littleutils[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/stack_data/stack_data-0.3.0.ebuild b/dev-python/stack_data/stack_data-0.3.0.ebuild
index d7f8f151612e..833bda6e4c4b 100644
--- a/dev-python/stack_data/stack_data-0.3.0.ebuild
+++ b/dev-python/stack_data/stack_data-0.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/asttokens[${PYTHON_USEDEP}]