gentoo auto-resync : 25:10:2022 - 15:53:58

author: V3n3RiX <venerix@koprulu.sector> 2022-10-25 15:53:58 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-10-25 15:53:58 +0100
commit: b8c48743664466ac0f638f0949fd78bfb9f5eae6 (patch)
tree: dd60615a286df950811f8267c0631e1fd97eac58 /dev-python
parent: cf9065b9fe1f8c33a6e488fce1ee75d893cd351f (diff)
154 files changed, 452 insertions, 3547 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index bb48e30bbcb4..a4e52db88b7c 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 414f80714b36..95a26e3e6682 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,5 +1,5 @@
 DIST aiohttp-3.8.1.tar.gz 7324180 BLAKE2B 99f85b8510782a31de2d2f6c8efa65ef5c5cde600a5c5f49d6362d5833a0443b9adcaed9beb27c5d8502aca37af154b06017f48836b73d4c61d78204b62b7f05 SHA512 3611549393e50c8d30426aee9ddd23794a71ddefe4384eb549049b93e452fafb38de7ad900737213b61fbe717bd85035a780c1622593eae250328f17d484a0a7
 DIST aiohttp-3.8.3.tar.gz 7337480 BLAKE2B 28d2b5bf6dd6f19506127747511e006c22fcb59959ab090bdc53ca5ee0f7f186aedb0c8b4103c2ea52399dc998fa2e6d3f872239223cf72629a1168e3950f1f8 SHA512 248c232604c91442b2fc9fa55fbf7df8e3af56dcf4cd9c516414a3a738c5c60a8a06395cd9c6e2c8ea9884728aea757423735c7b9be889e6f17e3ee6395a2f64
 EBUILD aiohttp-3.8.1-r1.ebuild 3657 BLAKE2B 2da81b97e0b3f1d167557b6d675acd9a857e45b45166e924493900eaf395e77cee71d45b2f0c7e428ce7a0f22bd47cbfabc49fbb9e462216029a271a57dc5f7c SHA512 d9b644e44be853ab68704d175ac8a99bb292fd09fc8097c356ee0f8b06335420c3cec66bee3d20a554c0413d278e35c25cda08251fc5e00fcca20f2f68cb0e69
-EBUILD aiohttp-3.8.3.ebuild 2924 BLAKE2B 34540155f07da927653d82daa23124374ef67c64fa6c9fb416b548db1ed0d8d567e65e36d2255157e997b2a1d7fd40d08bea4b7bb992024cef573e89fa604626 SHA512 05011da423a5587fa9b402605260a30683b589210d2f6a3e57ae478c27767d76bb570670f4abebde7e7e246f340ba94d4d4801d5014d348f5c8acbf6dffc32a1
+EBUILD aiohttp-3.8.3.ebuild 2923 BLAKE2B 216eb0c9e1f095b71c942193d191aebd087fb87c4ac1b8d03886af1faf07a3cb552227bd1652a47287fc26974cc32719a5893496f00a43a06beac380102d7ec9 SHA512 59bbaf9271ca864c76fe116d2a7f61d6c74bcf10fe9b2a2d8b68e5cd5976a93595cb93d58841ed358de68d8c31926ce0b7711ce4e3f3f1da13e9d67d7a37224e
 MISC metadata.xml 490 BLAKE2B 5233af0b5e2668b1eb62278b05b62f24f1ab90f6d05b20dd9f1c5b54b846919c3fa28b843df28f5bfa320996d46de0e74c7a28bd0bef02aaaca14b1cec52baba SHA512 9b701c5c5a22b6aa94977a67bc40f3dc9df8337556952658a2a17ecaaa471cd7f7b5b8bf3a0088208087677555f0cbb8760c091b03b96ee70affe3e2b84cf6d5
diff --git a/dev-python/aiohttp/aiohttp-3.8.3.ebuild b/dev-python/aiohttp/aiohttp-3.8.3.ebuild
index 2b4af1cf66e3..8cf3486e7213 100644
--- a/dev-python/aiohttp/aiohttp-3.8.3.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.8.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 647ec95ad709..cbb3b970ce81 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,9 +1,3 @@
-DIST aws-sam-translator-1.50.0.gh.tar.gz 1103467 BLAKE2B 8d9408b7e92a5c515da47075a0722c937223e73dfa99d92d6daf91997a2edf4e1854afb88f7020fdab3457453d1c54ea77cf7e3466ec71ede36bfb3fc9c469fa SHA512 2f8f494218a1ac018893de59e7bede88b73ce446b29cc818d9309275851b080608656f69c422a9b49c885a6e6cbe7f34826f31cf4da9f2ee0667a1663dbee32a
-DIST aws-sam-translator-1.51.0.gh.tar.gz 1107033 BLAKE2B be5d46fa4caa7619c0b959eeec65d0902fdb197369c84c930618398a9b4110c2b1e281c80e63c659be266bb6b2f191495c40578fde73ab31c93bd05906bd55e3 SHA512 d21f3d0b3d4947ad25811f0274e5807089a8d1e2aab76310a80a92f48cfe9ac683bcecea3c833692948f94934be5662cf7585aab0a4a949fcf368901d2e1b9a8
-DIST aws-sam-translator-1.52.0.gh.tar.gz 1155351 BLAKE2B 523b7b8b31ee001da05b43a1a9ca17da30d3a4a63ebfefdd7dcb9e4a67088f8b6d51da3eefa241e4330bf901a7cd3544094d58b1b512fb8d967198a7d7b92ab0 SHA512 d6108086143d76bce810ec0276763dac944381ad22bb89f8ed5ed5197168bf9139808c5177655c6d59b57017b398cb8220acfb69d14d25883753e3b695b456f4
 DIST aws-sam-translator-1.53.0.gh.tar.gz 1158682 BLAKE2B 4bc8430936a1b180dc04637e540ecad7eb82cd7a5da5254f2b823075878a03ad3e63422c183b365b0dad927bcdf063b8ab40984ab23abe1d91d8bc3c411aa2f1 SHA512 292259bf8d4002b72be51db0358673eee61fe368be5db15e7faff195baae8fa194bef882fd0f5a9b5c46379fe5f9593d101a212121da8d0636aca709dd087f05
-EBUILD aws-sam-translator-1.50.0.ebuild 2255 BLAKE2B 48a47eaf224f0cf84d7d2ee0aa3e3e7ec62844b593e6aa14f6b8b5dc1e46934294fc4454f1c2666dc5d4148a9403c499f3ae43a1d522f5e9a3df929b52613b3f SHA512 8454a7fc31df79581066a995cc7c323e52eb70b29e2c2f9766a4cccba444e910763a51eec5f3920601b7e3d8023807a7558e8e6e083435ff66a0dc3403df187c
-EBUILD aws-sam-translator-1.51.0.ebuild 2257 BLAKE2B fd134b743ab8affdd452652ccabccb31122939c458dcd52f2019a0290c4a2725ac5a0b10fd102e71929f41d17037a2b7f10c3ef2019a022b94d5a80b79e691fc SHA512 756fb5f4baa0b7647d7af262ff895fcc5605cfe8fca0d8089f90d62e5ff846b60d0432a8df5e4a47487b289f10b20b3b4e7f9ec8a1927cc6b17cdbb245cec13b
-EBUILD aws-sam-translator-1.52.0.ebuild 2257 BLAKE2B fd134b743ab8affdd452652ccabccb31122939c458dcd52f2019a0290c4a2725ac5a0b10fd102e71929f41d17037a2b7f10c3ef2019a022b94d5a80b79e691fc SHA512 756fb5f4baa0b7647d7af262ff895fcc5605cfe8fca0d8089f90d62e5ff846b60d0432a8df5e4a47487b289f10b20b3b4e7f9ec8a1927cc6b17cdbb245cec13b
-EBUILD aws-sam-translator-1.53.0.ebuild 2257 BLAKE2B fd134b743ab8affdd452652ccabccb31122939c458dcd52f2019a0290c4a2725ac5a0b10fd102e71929f41d17037a2b7f10c3ef2019a022b94d5a80b79e691fc SHA512 756fb5f4baa0b7647d7af262ff895fcc5605cfe8fca0d8089f90d62e5ff846b60d0432a8df5e4a47487b289f10b20b3b4e7f9ec8a1927cc6b17cdbb245cec13b
+EBUILD aws-sam-translator-1.53.0.ebuild 2255 BLAKE2B 48a47eaf224f0cf84d7d2ee0aa3e3e7ec62844b593e6aa14f6b8b5dc1e46934294fc4454f1c2666dc5d4148a9403c499f3ae43a1d522f5e9a3df929b52613b3f SHA512 8454a7fc31df79581066a995cc7c323e52eb70b29e2c2f9766a4cccba444e910763a51eec5f3920601b7e3d8023807a7558e8e6e083435ff66a0dc3403df187c
 MISC metadata.xml 603 BLAKE2B 89556267393186cf69a585c58efeb6fa599bfb42ef221bea955ea807a28edee89036a2ee0d0ca81ae55d96702a01b171b837754dabf38047ecc2789157bb7116 SHA512 106b6d241eadf7807dadf03329073703f8b51e7443eddc4db8752878b6dd84cc4357689cd4b796b3a083192e9d98eacbe9e7b8af0273160c7b89846e78230a88
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.50.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.50.0.ebuild
deleted file mode 100644
index 0a009ad6cfeb..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.50.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="
-	https://github.com/aws/serverless-application-model/
-	https://pypi.org/project/aws-sam-translator/
-"
-SRC_URI="
-	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/serverless-application-model-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/boto3-2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	tests/validator/test_validator_api.py::TestValidatorApi::test_errors_13_error_definitionuri
-	tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_success_one_app
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_throttling_doesnt_stop_processing
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sleep_between_sar_checks
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_unexpected_sar_error_stops_processing
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_and_on_after_transform_template::test_time_limit_exceeds_between_combined_sar_calls
-)
-
-python_prepare_all() {
-	# remove pytest-cov dependency
-	sed -i -e '/addopts/d' pytest.ini || die
-
-	# deps are installed by ebuild, don't try to reinstall them via pip
-	truncate --size=0 requirements/*.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.51.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.51.0.ebuild
deleted file mode 100644
index 4194237c6fc3..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.51.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="
-	https://github.com/aws/serverless-application-model/
-	https://pypi.org/project/aws-sam-translator/
-"
-SRC_URI="
-	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/serverless-application-model-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/boto3-2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	tests/validator/test_validator_api.py::TestValidatorApi::test_errors_13_error_definitionuri
-	tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_success_one_app
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_throttling_doesnt_stop_processing
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sleep_between_sar_checks
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_unexpected_sar_error_stops_processing
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_and_on_after_transform_template::test_time_limit_exceeds_between_combined_sar_calls
-)
-
-python_prepare_all() {
-	# remove pytest-cov dependency
-	sed -i -e '/addopts/d' pytest.ini || die
-
-	# deps are installed by ebuild, don't try to reinstall them via pip
-	truncate --size=0 requirements/*.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.52.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.52.0.ebuild
deleted file mode 100644
index 4194237c6fc3..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.52.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="
-	https://github.com/aws/serverless-application-model/
-	https://pypi.org/project/aws-sam-translator/
-"
-SRC_URI="
-	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/serverless-application-model-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/boto3-2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	tests/validator/test_validator_api.py::TestValidatorApi::test_errors_13_error_definitionuri
-	tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_success_one_app
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_throttling_doesnt_stop_processing
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sleep_between_sar_checks
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_unexpected_sar_error_stops_processing
-	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_and_on_after_transform_template::test_time_limit_exceeds_between_combined_sar_calls
-)
-
-python_prepare_all() {
-	# remove pytest-cov dependency
-	sed -i -e '/addopts/d' pytest.ini || die
-
-	# deps are installed by ebuild, don't try to reinstall them via pip
-	truncate --size=0 requirements/*.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.53.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.53.0.ebuild
index 4194237c6fc3..0a009ad6cfeb 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.53.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.53.0.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/serverless-application-model-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/boto3-2[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index d6968e57d6b5..f1ee9402b9b5 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,20 +1,8 @@
-DIST boto3-1.24.80.gh.tar.gz 539716 BLAKE2B ccbbfa84e4e2274eb0275b9b2dcc0a4a78b139007829c4e3f880909f71e404be22c4461b687596bf12675c1212c6cf5b59c4383a042f60cb7919a10581fdc612 SHA512 aa3340e4bb9ae80f02fc70cf2be49d245e3dcc941b0b682c2827c1b8bb51d02e72ab7bf561e7d39397af8ca7ead7e115766fd4fd2eca18db2c551f55afb3e3b6
 DIST boto3-1.24.88.gh.tar.gz 543896 BLAKE2B 9dd2a18e3fb8d0a9f3a3a1fd7d0cceb491765690f99c7bd4200f37c66cbdb1e86dcdcdd09669d3175b97e762e6faabac3a2e5cba49136f42cba459e45f3ab67f SHA512 676528ca180c23834d1666b69292754e551a339914362da2708ff3f937c2eb04fe3b3dd1d4c6960eb8f5f7f58b1e0bcf13b1f52cc16a7c8d3bd025e9ea4ee109
-DIST boto3-1.24.89.gh.tar.gz 544293 BLAKE2B 53854b91c1c4c677eee743776a67e552bd2e11947839c442d81c1983930d6ff16d6bc5483c29b9a14b99a7cef09f3b9cd74cea9edb1cb76ff5458be3c9743164 SHA512 ef3b503b1313b8b7d84f5e4afdbe4e3d9e95ce3fbba81d400191295c71d4237e764f87ab6ebf2b29536248a520ab1273bee43bedd746596224f7400ce04c2c02
-DIST boto3-1.24.90.gh.tar.gz 545802 BLAKE2B 04148b878266a9d541a6fe8a4b4e8088fa2af11fd88b0fd9bac064bf493a9e787958d61c721254c1cf72edea72d761cd3583370f587c925f70c099027e94f72c SHA512 92c9da4559fdef7a7ee68eda9f1e9f70d652ec383471b9d1fafcf260b1456e84b7cc86347c3a0c44990f38aa87632885b1df65aafdae3c7f5948c0223ffe6981
-DIST boto3-1.24.91.gh.tar.gz 545914 BLAKE2B 763b39653d7de6ce27bb2a429ae0856a077f490e2c61b648ad89bde3c79731578272ffb558479517fd8a5235c41280413812b91f22604e6671cc1c941459fc90 SHA512 5b86a1518e8e6a9972d62dbcd8cd2f784d03e9e9fe7dc76ae4fc28b7c5151b277774bf01fce0473a3ff88af736132c389df5f7ae33c54f895b4c447e8cc19135
-DIST boto3-1.24.92.gh.tar.gz 546140 BLAKE2B 308f170f83a8cdc66c0423721e3fc9a2a58fe11f3b5bc7290e85aa637714ce10bd728ae69ff9e09a6e62bcf76a178e1f118e78e85c0c845d925be1937402ca87 SHA512 a8968f780a6b2929368f8696c83e501d42f17219e5015f668734e3a66146ca3e4cb539a2cd47525ba5a8376ee4cd4b180b9a362fd221f8fe75b78bfa17b92894
-DIST boto3-1.24.93.gh.tar.gz 546679 BLAKE2B edb3324c20fae7a0f7811d56c865c161dbd8f329a2bf2411641255439f6b046a773d414e884e1ec22cad7169e8b02f4644b7a39c4062fb9c845f2a42710263e2 SHA512 bd02644d14a3eb2b39b38269e503f3e7ef58a39ac69445306f23e7ddc56103c1cb7f5a2b7383ffa6eb65a5fb658bf67780ff2062840f018384df80d950ac4b46
-DIST boto3-1.24.95.gh.tar.gz 547598 BLAKE2B 0f648681e3b434a866763a72b936a3e43f83ff85d18c9e89646874cde81773cd8dad730f252f887c641a6bbb394fce743a2607d1a153a84319d3970875e6e5d6 SHA512 ab196e9a4d1be4cfa9b42d3172236d86e768bc2ac1ccbe4099b2c609cf6c20542b1c6dfb463d2984c8c87608892e5e347bd18d20989f947e32bd09973e769fc2
 DIST boto3-1.24.96.gh.tar.gz 547933 BLAKE2B 63c347b3abb383f36e4109b2695014dda6b4dd159b8f0e878ea17bcd24c9605dcf403a120b15f63e9a335065a1e3254813998a435d5eb1663f0066f2e7797be6 SHA512 9c3ac6dba99904a54e4b06b02531c2388d235b1926cb5bd7b767c679632b613db4a0d453030295e5f4101efdb7a3df8aca08e3c2e92a6725dc3df733cef37d72
-EBUILD boto3-1.24.80.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
+DIST boto3-1.25.0.gh.tar.gz 548321 BLAKE2B 46371869420a12b067594efbaa0d0f6b8003e813c5c85511fdead9841489bd333fe1207cc5310fd663628560a3c570ce495f0234ecc72eb93dfa20b79532390f SHA512 7cd6443fdb67a7e2df440c9b1ec84f7d37040549ddcdfaf5ca41fbee3d47e99d995f0be8690f22c25422391734d664746d00c88bd59aa269285f8c0e038836f9
 EBUILD boto3-1.24.88.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
-EBUILD boto3-1.24.89.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.24.90.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.24.91.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.24.92.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.24.93.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.24.95.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.96.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.25.0.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.80.ebuild b/dev-python/boto3/boto3-1.24.80.ebuild
deleted file mode 100644
index c93eb5e2d7c0..000000000000
--- a/dev-python/boto3/boto3-1.24.80.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.90.ebuild b/dev-python/boto3/boto3-1.24.90.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.24.90.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.91.ebuild b/dev-python/boto3/boto3-1.24.91.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.24.91.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.92.ebuild b/dev-python/boto3/boto3-1.24.92.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.24.92.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.93.ebuild b/dev-python/boto3/boto3-1.24.93.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.24.93.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.95.ebuild b/dev-python/boto3/boto3-1.24.95.ebuild
deleted file mode 100644
index 6edcc751d54b..000000000000
--- a/dev-python/boto3/boto3-1.24.95.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.89.ebuild b/dev-python/boto3/boto3-1.25.0.ebuild
index 6edcc751d54b..6edcc751d54b 100644
--- a/dev-python/boto3/boto3-1.24.89.ebuild
+++ b/dev-python/boto3/boto3-1.25.0.ebuild
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 580a5d33f891..8405b2463081 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,20 +1,8 @@
-DIST botocore-1.27.80.gh.tar.gz 9643079 BLAKE2B feec0b34c39b358eaff7f947fe83fc6dcd9926771b465c092e8071c334382d07d51a88fda775fc9fadae2544ac2f3e37c814bc9b8729730955b95d3efdf16b7b SHA512 f38ee5b252051a8208964387ff1550489c5900605d2aa5c69dc2d1229411015af1edaa51e9df4d56895c3fd2b4a56cca5179c1fd5aecbf5032ab80ce4c8f8b8e
 DIST botocore-1.27.88.gh.tar.gz 9703393 BLAKE2B b7152546ffd44fccc3607ce4fb0df586e192a68431d68f40063d6397d6005507118c49197e3bb0215ccc4ce6b075a2e95919dc0b2352da3562ba8b5675274ca4 SHA512 0cca62a8e357c8c345afa2ebfa8fa931aa75e323b93ecd63857db05fac7fcd83118012ee7f93921a31895721189995af3179f6ae62ee61cef68eda84edc88132
-DIST botocore-1.27.89.gh.tar.gz 9704257 BLAKE2B f7c0f34d93940aea72337c1cfb229ba79b06c15c99c7c1b719fcad9c2131cc98e084a14f8988e77e0627fac994bd4bfe539bcbcedd318b9bc861311772a5e99b SHA512 ddebfa73a4fee423ee7ead3e7d28ff9e8160f8459ea7cc341b1194759894aee24b07cec25030dedc4570416146d96159f532b7ec2e22d5279e4390bef3330a13
-DIST botocore-1.27.90.gh.tar.gz 9712235 BLAKE2B 3140dd97ed33b368bf605ff77e15ada2b0ace21d8816f7ea0b614f822a4f6ab1fe7640c52c08087cc3d12a8a6a2e15cde0895eb65d643441398b743800ed8296 SHA512 4ba1d0cc82ee0f0d77da2613b8dae20aeeb49d0ce6c87c074800e4887fa341948292a4fb9eec605c5a3f9ed9ff7773e4c8b46ff286d8b2d9588b125f5d3fcac9
-DIST botocore-1.27.91.gh.tar.gz 9712617 BLAKE2B 3317a45a297e1903d43d608760fb9e12c68d132f979bf4c76d73592aaa42a5f2d29a8c20bfa1f868365e962573bfa16986858dca2078b1fa797c58e71ab9a642 SHA512 0e2895cded36c3a9583c38ad018683556e26faa066d930c37a754798c31f0b510a86362357c66d13fbc141d04c30ae4f3d518ec46c95a1e37ed0e9912ab96a1e
-DIST botocore-1.27.92.gh.tar.gz 9758222 BLAKE2B 4f3c04b9822dfb84eacf758c6768e3e278cd53148041982ca89f7bba451cb287b23e0f13198543766caa9719e5010b0e5ee0cf1b072caf6c49602d07dac6c1ca SHA512 107f36ef2bfb2fb98f2b8b5db04d3f5c345b1a4e7c03f2e949da5b4eb3694bfdf8d711c6a154df4bd248ef98be3868d69ba5a429037e3be61db4d3a4aa7df9e0
-DIST botocore-1.27.93.gh.tar.gz 9759939 BLAKE2B 4d0afb73e8d0cd7bf14191ae104c28d5d0999db3542bf9ba7be1612ea616aeb446d13b13a91ecc0698471fad49b3623708d5d716229ad0f95fd17ff12809b466 SHA512 31fb75ccccc83a8235fdda36b09e2348f9698eb8999363ce8cba085ff91ff1ae505c20206c6c553a3fbad5a802b6888e02390203926b145909c86a92bc1c1180
-DIST botocore-1.27.95.gh.tar.gz 9790732 BLAKE2B 79d41a99a27b0dd01f9de1c722aba6a0826a2be7ef4f4114d9d20525b8110bed663a7c2a0613eb02c48b9b90ed3ee19e33015d63400b7b149e3ce76888632b82 SHA512 3831c3f389776c6beb18b0cf19e92af74974e54c4526224ab23904f43bef7f1a197fef8a8ee0e304bd3f114b9206daf0d720720b98b461cdee62aa0992ff654f
 DIST botocore-1.27.96.gh.tar.gz 9792299 BLAKE2B 7d4b388e0dd45a41c794ad8527287fb326c5e828c15998393936b817333055dfbc59f85365f074f6b3017715341d30fed4ea0de8e1ee24ee08d13eff36b369bf SHA512 1050c23a207d089af16e86404db0367936d186c23b8e1fcfa8ebb07737ad411c2771344d535edd5dde43f8473e45ad85c8e5c39f2ddb03449ead3c9daa746a22
-EBUILD botocore-1.27.80.ebuild 1801 BLAKE2B 224b9b1ebd6786f36115c25699b06ef4ace30f13c8c97fbac20f37ec3dec7219e89fae3fdc70ef2b808342e7dab564755b758952cd565f06ef68b1e387c1ee7e SHA512 f26fd77fbbc424dc20e7844807bb7650e73e989e15fa5c20c9733e3bc322f4a2fffda47fcd29f82490be7262648582b162f86b4951c8d338d9ebbb1312df8294
+DIST botocore-1.28.0.gh.tar.gz 9815905 BLAKE2B 40c7a5eb9aaa851b682c85d4045f4e3fbdbf34f2933e5a97cd84109e71d6b442c1075122b83870da20cba79a84dfeb213e1df62bf761efbc60d729d672e9224f SHA512 a9700867564d07024527a27c13a9a1fc5a014865afe9fa2f39401abbefeb16fae753fbaf97e81536de946fbb515724d6bdde864868077fd40b4fdfa2b7a35b9c
 EBUILD botocore-1.27.88.ebuild 1801 BLAKE2B 224b9b1ebd6786f36115c25699b06ef4ace30f13c8c97fbac20f37ec3dec7219e89fae3fdc70ef2b808342e7dab564755b758952cd565f06ef68b1e387c1ee7e SHA512 f26fd77fbbc424dc20e7844807bb7650e73e989e15fa5c20c9733e3bc322f4a2fffda47fcd29f82490be7262648582b162f86b4951c8d338d9ebbb1312df8294
-EBUILD botocore-1.27.89.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.27.90.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.27.91.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.27.92.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.27.93.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.27.95.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.27.96.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
+EBUILD botocore-1.28.0.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 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.27.80.ebuild b/dev-python/botocore/botocore-1.27.80.ebuild
deleted file mode 100644
index fb557be6c315..000000000000
--- a/dev-python/botocore/botocore-1.27.80.ebuild
+++ /dev/null
@@ -1,72 +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
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.27.90.ebuild b/dev-python/botocore/botocore-1.27.90.ebuild
deleted file mode 100644
index d1a6948e70e5..000000000000
--- a/dev-python/botocore/botocore-1.27.90.ebuild
+++ /dev/null
@@ -1,72 +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
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.27.91.ebuild b/dev-python/botocore/botocore-1.27.91.ebuild
deleted file mode 100644
index d1a6948e70e5..000000000000
--- a/dev-python/botocore/botocore-1.27.91.ebuild
+++ /dev/null
@@ -1,72 +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
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.27.92.ebuild b/dev-python/botocore/botocore-1.27.92.ebuild
deleted file mode 100644
index d1a6948e70e5..000000000000
--- a/dev-python/botocore/botocore-1.27.92.ebuild
+++ /dev/null
@@ -1,72 +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
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.27.93.ebuild b/dev-python/botocore/botocore-1.27.93.ebuild
deleted file mode 100644
index d1a6948e70e5..000000000000
--- a/dev-python/botocore/botocore-1.27.93.ebuild
+++ /dev/null
@@ -1,72 +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
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.27.95.ebuild b/dev-python/botocore/botocore-1.27.95.ebuild
deleted file mode 100644
index d1a6948e70e5..000000000000
--- a/dev-python/botocore/botocore-1.27.95.ebuild
+++ /dev/null
@@ -1,72 +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
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.27.89.ebuild b/dev-python/botocore/botocore-1.28.0.ebuild
index d1a6948e70e5..d1a6948e70e5 100644
--- a/dev-python/botocore/botocore-1.27.89.ebuild
+++ b/dev-python/botocore/botocore-1.28.0.ebuild
diff --git a/dev-python/brotlicffi/Manifest b/dev-python/brotlicffi/Manifest
index a537d5b5ea92..f16d0ab1e20c 100644
--- a/dev-python/brotlicffi/Manifest
+++ b/dev-python/brotlicffi/Manifest
@@ -1,4 +1,4 @@
 DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a1c3c2e5b62bd63b392debe54bd1732ac1cb31f88500f0142108b453649d96901d9a03b6db98642cb9abaf9188c06d440f2b8bd3cf57fbbb52196a931f5079 SHA512 dc573c90491032a205f32f0ce9c93e95b06c70a3107caa9501e038a212226c37117d63709a29843367344bf7d18cf32d0c0578b11166387198e12b38b1522406
 DIST brotlicffi-1.0.9.2.gh.tar.gz 22714 BLAKE2B 463cff7aed04718d1c77e6b3477dbbdb40cf61f0e045a7759bf1e8656e3b07e7b9f3ff5c5356069e752d750774a6ab203588a4094d27ad7ab9ae80f091c6ea3a SHA512 3d200f606c9851f0049835b53dd1f117727786505b5887e246934f41a978d375e1fa5a078e0811f130c009931e41c51575bd9d55b602ee7b6daebe9759ed15d5
-EBUILD brotlicffi-1.0.9.2-r1.ebuild 1472 BLAKE2B fad5c16ddbff176fc54d6fa14168ed546cac15dc64e2fc072cfb902f928ad30bf02801df13085daaf38eae4bf2d1f190c8c8e54ec4793f707e332d27551a926a SHA512 312ed9581a6bbda38c5a7f55b02f078b09e4146462d729edb0719b68e2770429a0c902b80d9803eb6fbd977836cf8236c8492217e1c4afb7134f360884b9c2b5
+EBUILD brotlicffi-1.0.9.2-r2.ebuild 1484 BLAKE2B 47168536662ab5c345bc38f01a819983325a54f198909aee6d5a8c217398f32e80995a43c311d29f4eb77134e0e2cbae370fff30a4ddd530554bc8e571bc60ec SHA512 cf0b50d8dd8e1313be31e91d1148e49969a19f00621319bbcc11b550ec9999e0afc40c10755b8f879c584a62f6e4fefc35216c1ca3abef027cbf6ef5406c7b6a
 MISC metadata.xml 377 BLAKE2B 13782cfbd514306140bb23753666679d94d15f89f0c2c84c13972151bd17d5c4ccd88930d60d732632f5e9a263d864b7aa5dcd741aae60508240e0f6d6f29230 SHA512 e440ae16d42ea9ab96317d26d88bf2955e0d8d5b4a6c41aca96a46c4f1e1c149d710d4cf52a569d6eb6d34ead71007fc2b2a7f67ff3c241e83d9573fe4d41e38
diff --git a/dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild b/dev-python/brotlicffi/brotlicffi-1.0.9.2-r2.ebuild
index 4ea6fd766724..480f252b6009 100644
--- a/dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild
+++ b/dev-python/brotlicffi/brotlicffi-1.0.9.2-r2.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
 	' 'python*')
 "
 DEPEND="
+	${RDEPEND}
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/canonicaljson/Manifest b/dev-python/canonicaljson/Manifest
index ff612070e8de..9c17844b4471 100644
--- a/dev-python/canonicaljson/Manifest
+++ b/dev-python/canonicaljson/Manifest
@@ -1,5 +1,3 @@
-DIST canonicaljson-1.6.2.gh.tar.gz 10311 BLAKE2B 7460b99d8e95b223e4d092ee4158c13b5b101d7001fe111fed021c15128d040ef657ee03dbfba14d2e3df0a61f82a072e171a87312f47f524baad1603c6e47bb SHA512 5dfcf76e80814e65b897e216e18cbe69b3f44e7676fe433cefdcfa15dc18a004dc7586c16bf95b7457cb8e9268dedf2e7b1b92247b7c65afef30888b1c89bde5
 DIST canonicaljson-1.6.3.gh.tar.gz 10400 BLAKE2B 9d97ad9f8c0803fdfd1f4d2f85291fb175d19be23fb9c3bdf717030b9dae30f810329118c484cdf9dab5d77f01ea41b08653559fa188c90305126bdf3f4e5f9d SHA512 4b2cb7524425b8a4dde2359273f60110ca01081d31b0add158f106ff1f8874366978d6a15baed53a948503d4013b87a0b75ad7f6e8ea6ce42f3f9fc95672280f
-EBUILD canonicaljson-1.6.2.ebuild 601 BLAKE2B 3ff985939a122c56320f52a6f81ea7a44ad3747d0efd1fc46193392ae3cef408c60d562b3872267bad953dad519bc56dab14eec4754e70e7b7930ad10e5dbc1d SHA512 e21272bb03e037c723a0e476f51f9cb6da4862d37aaf6f655489411a5c3d247da13886ce63f11dbfe734e91ce5465351ca7a5283b1c7727090ecdfb221efb11c
-EBUILD canonicaljson-1.6.3.ebuild 607 BLAKE2B db66951148e1ab3836dbf6fb63db093177d5e723262d2f49b61aff7bf6aa5428d9dc2444036cdcef0c47d5a4f5bb95d258d47d6d67729c6dadb4e66d27a7f9ed SHA512 44fb4ce00a39788c204d68ebc4b3bef9eb8b8fd0504bd62af69a339692df16a6e670c7d1f565afb679d5c6b0a037bc7831c15e887e6d5fceca0253bfea2a279d
+EBUILD canonicaljson-1.6.3.ebuild 606 BLAKE2B 03a03d128b260bb43c081a6e70fc771d6478b2880d37832bc81fd52cc0e0b9a343273963c9d62634e2e81ec54b16a29f3dadcdaa6c636efb6457386c4ce05d2b SHA512 af5c6138a30308a8693104fcef490bf2732f60f7d97d753f3775ec15fc2ce2bc128e136bbcb57b72de6662688c0bd0a9185719c8df84b5b08cc7d14d7e9689e1
 MISC metadata.xml 562 BLAKE2B 09eeef3180d91d94572ed2095300f0a9638110d9fe6e2ebd9ab1bac29a10062dd630088ccc5774d49ecb1a83ee3f76f711b7c7166cd56497586fda6261114f8b SHA512 e459cb2290e3d64f41ebaf72ee51ab70c6a1638860a8be30e77451cbda03cbfa50a77088d2369d1fdf1c4984c8c04ac35c5e4005af3f429c1d2697beca6ef0b7
diff --git a/dev-python/canonicaljson/canonicaljson-1.6.2.ebuild b/dev-python/canonicaljson/canonicaljson-1.6.2.ebuild
deleted file mode 100644
index 8c050cdb8e11..000000000000
--- a/dev-python/canonicaljson/canonicaljson-1.6.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Canonical JSON"
-HOMEPAGE="
-	https://github.com/matrix-org/python-canonicaljson/
-	https://pypi.org/project/canonicaljson/
-"
-SRC_URI="https://github.com/matrix-org/python-canonicaljson/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-S="${WORKDIR}/python-${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/canonicaljson/canonicaljson-1.6.3.ebuild b/dev-python/canonicaljson/canonicaljson-1.6.3.ebuild
index 6862f00c53be..ef2341b08bb7 100644
--- a/dev-python/canonicaljson/canonicaljson-1.6.3.ebuild
+++ b/dev-python/canonicaljson/canonicaljson-1.6.3.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/python-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 
 RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 26a964ccb9ea..6bd4ec448a3e 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -9,7 +9,7 @@ EBUILD cfn-lint-0.64.1.ebuild 1638 BLAKE2B aac7fa1a1a77be545e0198503a3557beff145
 EBUILD cfn-lint-0.65.1.ebuild 1640 BLAKE2B 02c81bbb43b8d2d2f9c56982e3b8ca13f7eb0c7e94eb7565a93c78df387ab1d2a9980f52d8a2f8f843fc816dbdf92f855eed49ec7b82620f6f1f1f722f015032 SHA512 e0a42d3d67973996bda7a3f283c93479be102a8c05097a4cb03d3b91ccb9fb9f446dcc4e1fca7752ad9f3b63f546f871f1f6d99d903ee186faf97fbcfa5dbe77
 EBUILD cfn-lint-0.66.0.ebuild 1640 BLAKE2B 02c81bbb43b8d2d2f9c56982e3b8ca13f7eb0c7e94eb7565a93c78df387ab1d2a9980f52d8a2f8f843fc816dbdf92f855eed49ec7b82620f6f1f1f722f015032 SHA512 e0a42d3d67973996bda7a3f283c93479be102a8c05097a4cb03d3b91ccb9fb9f446dcc4e1fca7752ad9f3b63f546f871f1f6d99d903ee186faf97fbcfa5dbe77
 EBUILD cfn-lint-0.66.1.ebuild 1640 BLAKE2B 02c81bbb43b8d2d2f9c56982e3b8ca13f7eb0c7e94eb7565a93c78df387ab1d2a9980f52d8a2f8f843fc816dbdf92f855eed49ec7b82620f6f1f1f722f015032 SHA512 e0a42d3d67973996bda7a3f283c93479be102a8c05097a4cb03d3b91ccb9fb9f446dcc4e1fca7752ad9f3b63f546f871f1f6d99d903ee186faf97fbcfa5dbe77
-EBUILD cfn-lint-0.67.0.ebuild 1640 BLAKE2B 63dd864e85c9b5285085148ae9333b7f37fbfd315781d2c29c76fc44c31d8224bcf28d82f5ade7624d03edadbd98a10bbdfe9712b0893535e21f64258a5488c7 SHA512 0e7c486093354f630615e4cba7d3248f68f67c296ad24e87b607450cfb8b2467748a707fef6c1d8938b53daa95f196efc92f59561ff4c8526b9a3378aaf9bd6e
+EBUILD cfn-lint-0.67.0.ebuild 1638 BLAKE2B a439d73d2d83ca8489c2bcbf2c1034f650ad4216d6600e2163c60976ef0133fba36316e9cb263dbb7c3d12d756d8cad188c762732952d0392371a8e74bb58743 SHA512 1426c30e2dc1d63b765a109ee707fa8d466046789694cc1d3afa111c3263b3da11560c72ec6fdd180f213bd5619d9bc5f9b23bd0e9d230eef66d24b647fd2acf
 EBUILD cfn-lint-0.68.0.ebuild 1640 BLAKE2B ec6a9bdbdbb86461f0f2acb66fd1734ea65367182fef0d7b0baf080350972f8c701fa18d7b52bc4b243f5565c5b1ef0f98232bc8e9fcab71d19ffef9d413f016 SHA512 2bf2da99cc45b67e70c61127f855007d89bf82af5e39af3d48099da70794b83e1b2e959c1d89cf832fef080beee3d80a8f758cdb0a2b30a8f41c55d323cd97b7
 EBUILD cfn-lint-0.68.1.ebuild 1640 BLAKE2B ec6a9bdbdbb86461f0f2acb66fd1734ea65367182fef0d7b0baf080350972f8c701fa18d7b52bc4b243f5565c5b1ef0f98232bc8e9fcab71d19ffef9d413f016 SHA512 2bf2da99cc45b67e70c61127f855007d89bf82af5e39af3d48099da70794b83e1b2e959c1d89cf832fef080beee3d80a8f758cdb0a2b30a8f41c55d323cd97b7
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.67.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.67.0.ebuild
index 86e3c9ea0c3d..06aae2e797f0 100644
--- a/dev-python/cfn-lint/cfn-lint-0.67.0.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.67.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.52.0[${PYTHON_USEDEP}]
diff --git a/dev-python/colorama/Manifest b/dev-python/colorama/Manifest
index f0bb20f2a6d5..14bed51e2a5c 100644
--- a/dev-python/colorama/Manifest
+++ b/dev-python/colorama/Manifest
@@ -1,3 +1,5 @@
 DIST colorama-0.4.5.gh.tar.gz 113373 BLAKE2B d7b071b1efa585c26c48f26af7a0df9bff25e3986f2615889fd25c34d785c256ac3c4655375f13e7d1bc6972f7fa64bd48a819d988160ceb75fda356d645876d SHA512 d4d3b2a4c6a0966b5c15a12cd789e4b68e5b632c4d745d93fcff5e250fe10e5d45dd2a8bd25f4399cca31a358aecf99f354aa3e1b74369ae382b51bd6c87644f
+DIST colorama-0.4.6.gh.tar.gz 116300 BLAKE2B 5b8f013a0cfa227dc750456d28af83dd6322000a3982e680d0cf051f6ae964b630f2889a0f1b78fe1cab465b25a52db07516cee9cbd99575dae38a86c5b69bd0 SHA512 2b269b190041398a1808b0b5147e47422b4451a1bc91841d0957572214ba8addd731c8932afdc60bfbba9833a0fe6c9c5c2ecb150613f13498f661799d625e4f
 EBUILD colorama-0.4.5.ebuild 1150 BLAKE2B 104fb49ae64ebb9224d0e66492c3351a08cbb5e5538defd75e0ae9afc998512a97f781c0e83b59f0c564d13b51f361c19d7cead18832b92251b643ca522b066f SHA512 749e7ddbaf1fc67c4b5c7cdccdc411789811afdc6d10c2b46806d0cccdb4d9ea018b3858bc354cd72d19db077cdc76174876dab68339d2feab1f21e772b9a512
+EBUILD colorama-0.4.6.ebuild 1157 BLAKE2B d0938b8e91910b78d5b9446833f0367b0c7d05c5427e01f75ac2e2302f0e7aa9552199b67b2c540f5e96e5f6470e9d7c5eeeff02b31369554d692ace7b9bc1f2 SHA512 4c66adab78df857a3b23bfac44d169dd1e97a5f37fa08cc4a602aefe924247257538d894b0f071210078adae532ef9b0d51aba4a06fa3a09ba6e217afa9960b1
 MISC metadata.xml 526 BLAKE2B f8f74b3797df9f8b0ab5ea81b6318d099a041cc3aac741084802272fdc7aaffdabc1269025f5e2b819cfe4608391a0857d208c487cc8f018578610faaad9f401 SHA512 dee4a202781edd36049ee9738dc9e90ffa63aa3874b389b5d0285147fbf86a577c15d55a868c0714ef982f78a2054636f464d6609af0693639d2449ae3d2ea53
diff --git a/dev-python/colorama/colorama-0.4.6.ebuild b/dev-python/colorama/colorama-0.4.6.ebuild
new file mode 100644
index 000000000000..08425bfd8fbf
--- /dev/null
+++ b/dev-python/colorama/colorama-0.4.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
+HOMEPAGE="
+	https://pypi.org/project/colorama/
+	https://github.com/tartley/colorama/
+"
+SRC_URI="
+	https://github.com/tartley/colorama/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r demos/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# Some tests require stdout to be a TTY
+	# https://github.com/tartley/colorama/issues/169
+	script -eqc "${EPYTHON} -m pytest -vv -s" /dev/null \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/cssselect2/Manifest b/dev-python/cssselect2/Manifest
index f271b41e0388..062a96deaa98 100644
--- a/dev-python/cssselect2/Manifest
+++ b/dev-python/cssselect2/Manifest
@@ -1,5 +1,3 @@
-DIST cssselect2-0.6.0.tar.gz 35442 BLAKE2B eb42c6abed531d9ece07ae5aa442be0c0ca926f982987ede1c5ba3e391950fcf88b1c322da5933842993ad5d98488e2a29aa714d1ca65b672cecbe425bac9bd7 SHA512 10cb55ebaaa16b755d85f1e511ae0281fb017d6937750392ae1da7f32d51ff944fb14c6d1c9ea5f42734450b719157ded116dc14ef471a9a20fcc43fb6682308
 DIST cssselect2-0.7.0.tar.gz 35888 BLAKE2B 14ad79878b7dbd9ce56fa9597a0678b3dc774fc81f599cd8eb28d67af5eb07914ff6f72dd6210d1e34787c78f85ebb22c8096c3a642f1c0092384e4f22a9e59c SHA512 e3c975fe159d3bec53002bda31c72d9cb346f40529272d8d5bef6aa13142ce60f1e8aa20b039d93ff5ff3d2cd34119b8b2d406f889964eded69e770e4f04e949
-EBUILD cssselect2-0.6.0.ebuild 737 BLAKE2B 31878e5b4c0ea50f469d162656a3a4b5734eb06678d37e71a249a283121137e217daac1d7de63448cd2daf9cc2c3e948427375d1b7fcde3776f064b6758aee81 SHA512 76d21bb2e1cc1f700ba58f0905667e3fc5a780794a2f824725d9cee360305d0dc7685825e86552db6d8cbdda034a51d45cab5e22c449d64cfe496cd9235118a4
-EBUILD cssselect2-0.7.0.ebuild 739 BLAKE2B 730dbe5fea17fd73f0e3ae02af17cbb1b9ce1628b3d641e31d64eca9b979407f124b729a0f2c6d13cd0f7b9a6a70b50b75a6e75e6a6bf43ee1b0d4cd78b4d973 SHA512 900266f5810bc161547d9cf39a6cc21a471e105c3c4dcf18e01b06543a112f2930fa5ae21c7d501128e4ba6b2999dbdf4a67c8e67feae0cd36eab0ab7d6d63ee
+EBUILD cssselect2-0.7.0.ebuild 737 BLAKE2B 31878e5b4c0ea50f469d162656a3a4b5734eb06678d37e71a249a283121137e217daac1d7de63448cd2daf9cc2c3e948427375d1b7fcde3776f064b6758aee81 SHA512 76d21bb2e1cc1f700ba58f0905667e3fc5a780794a2f824725d9cee360305d0dc7685825e86552db6d8cbdda034a51d45cab5e22c449d64cfe496cd9235118a4
 MISC metadata.xml 394 BLAKE2B 23a6ce3791a44c2a50b0a1853f1860ec76c15ca2a437e8406ef8459941921f8f92905933b59841ab9e3ef429a40435e2e480de38311f9bb078af747105d6eb41 SHA512 1c7692aebe1ec93fddf5e536af98a4be44c6610f8bfaff1f58ace0562916c24c5bc67db8455c1cc75eba3296b34a4fce3e72dd770abe4f51c1e83798ee9887eb
diff --git a/dev-python/cssselect2/cssselect2-0.6.0.ebuild b/dev-python/cssselect2/cssselect2-0.6.0.ebuild
deleted file mode 100644
index f5154b04c974..000000000000
--- a/dev-python/cssselect2/cssselect2-0.6.0.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=flit
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Parses CSS3 Selectors and translates them to XPath 1.0"
-HOMEPAGE="
-	https://doc.courtbouillon.org/cssselect2/stable/
-	https://pypi.org/project/cssselect2/
-	https://github.com/Kozea/cssselect2/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/tinycss2[${PYTHON_USEDEP}]
-	dev-python/webencodings[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cssselect2/cssselect2-0.7.0.ebuild b/dev-python/cssselect2/cssselect2-0.7.0.ebuild
index fccb1c1149ae..f5154b04c974 100644
--- a/dev-python/cssselect2/cssselect2-0.7.0.ebuild
+++ b/dev-python/cssselect2/cssselect2-0.7.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/tinycss2[${PYTHON_USEDEP}]
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 6d2199365649..bccecff7f33c 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -5,5 +5,5 @@ DIST dask-2022.9.2.gh.tar.gz 8767605 BLAKE2B ad0d9b7f849f984316768f1d1983e13177c
 EBUILD dask-2022.10.0.ebuild 1780 BLAKE2B 24148b6128c95f1b700b3a5f1d53cf1e05147bc234a7092d8d64991c99af531e18664e413d4c35124f6062a25f32da5112846297650c54d719f48a5aa7cd3761 SHA512 559f6e575414a68c1e2db39a355120abd40d60d17ac9bda60919d508e0414776c5a0abeea2e70adf6f19a6039edf101dd20cbccd9079b18cc2b7dcef9f6ad767
 EBUILD dask-2022.9.0.ebuild 1779 BLAKE2B 4dea87e8411ff0ecb0aa0f647a0ca84f6b95f3289be3e9cf232bb66108bc1ecfbda8327960712df44cbdf1dcc6713c1a11cc3294ac6d8df7a700de5c058d9fd7 SHA512 4de6ded112a26208ef4c4ac039a2aa55464a47431d48b040c198e0e3fba3dc167af2a8786220cc8b1744ee2ffcaa0869eba90c187f1c481aa89e2fc5604f2f84
 EBUILD dask-2022.9.1.ebuild 1780 BLAKE2B 0af473bd7b44c26022591b631cae4f656a861b33cd415b78336658692d589712373058e7e82bf288959df7819ade2b941af7c84bdea97bf40ba20489e4fd78f6 SHA512 de374eabcd08502dde1c0a39819e21cac7903756bfcaff74d83cc75be2341c2e67359f25ad2d255978a3dc71e8fcc519a762c519c6051d6a942343abd7505aab
-EBUILD dask-2022.9.2.ebuild 1780 BLAKE2B 0af473bd7b44c26022591b631cae4f656a861b33cd415b78336658692d589712373058e7e82bf288959df7819ade2b941af7c84bdea97bf40ba20489e4fd78f6 SHA512 de374eabcd08502dde1c0a39819e21cac7903756bfcaff74d83cc75be2341c2e67359f25ad2d255978a3dc71e8fcc519a762c519c6051d6a942343abd7505aab
+EBUILD dask-2022.9.2.ebuild 1779 BLAKE2B 4dea87e8411ff0ecb0aa0f647a0ca84f6b95f3289be3e9cf232bb66108bc1ecfbda8327960712df44cbdf1dcc6713c1a11cc3294ac6d8df7a700de5c058d9fd7 SHA512 4de6ded112a26208ef4c4ac039a2aa55464a47431d48b040c198e0e3fba3dc167af2a8786220cc8b1744ee2ffcaa0869eba90c187f1c481aa89e2fc5604f2f84
 MISC metadata.xml 724 BLAKE2B 9af7553cec2b66228a21f146372d86b8d620048d68f94c1fd09006c8ee7ddaa4e212c2a359b937a5ee37ac23df01e10af0796e8b4cf952237cb4c73a2dff7ca0 SHA512 89b83402c13b06f7adf10cd1cc08b96b90dbc2ca3b5c0c6c422b6e2394e03fd51346306479557c11fcfdbd4a81a574890f2367228ea38531b5f05c02a30b8dcb
diff --git a/dev-python/dask/dask-2022.9.2.ebuild b/dev-python/dask/dask-2022.9.2.ebuild
index 6ad6f0bd45e1..a25e140d6003 100644
--- a/dev-python/dask/dask-2022.9.2.ebuild
+++ b/dev-python/dask/dask-2022.9.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-compress/Manifest b/dev-python/flask-compress/Manifest
index 0420c719ef1e..beaa718dcc32 100644
--- a/dev-python/flask-compress/Manifest
+++ b/dev-python/flask-compress/Manifest
@@ -1,5 +1,3 @@
-DIST Flask-Compress-1.12.tar.gz 12581 BLAKE2B 5c925c19756730beaf5ac24b492e8bffcf7dd7c80df3c8440a8dfeca67e9756c50839246081b01b2da8c4b05839ee35b21b30f8e007734bbfcc1f056770ef3de SHA512 5712aff44aaaa379656e03f7b63fdef727721245cb9329e698a2e25aefca21a77202f5eb0c5f5828395647c694a5b417778a7b5db9eb592753a979d3994603a5
 DIST Flask-Compress-1.13.tar.gz 12675 BLAKE2B 252c63500e5ba2adbe857a52fcffe2dc8280198c79210d64ae8439c8e0daaeaa4e295002a5fdacb6724971018f7e3322c00bab85bfd0ad2291f53103f01f3ee1 SHA512 e910971f94966f14d4657f7fa1c92a4e73ca7afd08959ed5d5694228851f06e614873f3202d19c6a06be2c277136f097d88eb578773dd7b5e9130456c9828ed0
-EBUILD flask-compress-1.12.ebuild 666 BLAKE2B 01d83678fcceed6cff6e41aa64952430231e114c7b8351947136e53f269cef4b2cf84c3b45b5bb09a12444dd4a953a200d746f387576b24c5407d5396451ff78 SHA512 241580442e571b962a4eeb0c04683ff23298bd5501adcb43a3c92e3ac5d74754daca47934c12d3ddb37dae15b8e842995e0c862625a216d23f1b9217346be108
-EBUILD flask-compress-1.13.ebuild 668 BLAKE2B 5cf4f6b394bfd109cada5698ab7b95ef3841b35e657c929900e837d0c87ebb9749309e07219f38707608367b7b8065f711b48a37a526c09c1a96dec816f45594 SHA512 78f7ad6e575a000d259be04d4c30164d16520f60cfab4f45baf9174a9ff1f358fb82cbacdfbdcb557da78e9c8251fd4a8189c1a5bbe26f498c809a1eb06f3eb2
+EBUILD flask-compress-1.13.ebuild 666 BLAKE2B 01d83678fcceed6cff6e41aa64952430231e114c7b8351947136e53f269cef4b2cf84c3b45b5bb09a12444dd4a953a200d746f387576b24c5407d5396451ff78 SHA512 241580442e571b962a4eeb0c04683ff23298bd5501adcb43a3c92e3ac5d74754daca47934c12d3ddb37dae15b8e842995e0c862625a216d23f1b9217346be108
 MISC metadata.xml 525 BLAKE2B 3d7d87c0c376b9fef9f88f976b29adb728c0c6dd8102e413de5f7c9d0116bc040b7dce813c945b9b25d62dee5054425b34264b432725201a828858f63d62eafb SHA512 39d1a786add6c53c2a86cbe41bfcc41490e22a094d0f5741368249f08618725efad2cd7edaa172bd0ee7648d9b320c453180ec77d3e9b88ea8573aea3d982cd5
diff --git a/dev-python/flask-compress/flask-compress-1.12.ebuild b/dev-python/flask-compress/flask-compress-1.12.ebuild
deleted file mode 100644
index 9d5901c77d5c..000000000000
--- a/dev-python/flask-compress/flask-compress-1.12.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..11} )
-
-inherit distutils-r1
-
-MY_PN="Flask-Compress"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Compress responses in your Flask app with gzip"
-HOMEPAGE="
-	https://github.com/colour-science/flask-compress/
-	https://pypi.org/project/Flask-Compress/
-"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	app-arch/brotli[python,${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/flask-compress/flask-compress-1.13.ebuild b/dev-python/flask-compress/flask-compress-1.13.ebuild
index 4464bc0c4ec8..9d5901c77d5c 100644
--- a/dev-python/flask-compress/flask-compress-1.13.ebuild
+++ b/dev-python/flask-compress/flask-compress-1.13.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	app-arch/brotli[python,${PYTHON_USEDEP}]
diff --git a/dev-python/flask-htmlmin/Manifest b/dev-python/flask-htmlmin/Manifest
index 07941be381aa..a444aca44992 100644
--- a/dev-python/flask-htmlmin/Manifest
+++ b/dev-python/flask-htmlmin/Manifest
@@ -1,3 +1,5 @@
 DIST Flask-HTMLmin-2.2.0.gh.tar.gz 17637 BLAKE2B 541ae212ba5bfd5e5881adb108d62c994248a7f851512d0fddedb001737620433cb46e267cdd66de73a353c6b357802eb89ea33c771153bc0acf3937c06f83c3 SHA512 24287ef93e99a16e7dde35ba6b7b8fefa06f11ce30fb47969313c3e0e1135ac8a2685aac06bc430d3253162f4f2bc7e8eed90ddda2092bbad092d4e0d09cb4fc
+DIST Flask-HTMLmin-2.2.1.gh.tar.gz 17550 BLAKE2B 30393f6739ba8bdcfc17586e0955dff4341707b3c5bc27e30e9f9ddd5d4ff5b5b1b71b512b034b3b09cab3bfbcfb47c1651bc8cedba597de8aca5f2c7cfc0907 SHA512 34d5c9e2393901b32ab43c4333d87d75b489a410af2fdb019c180d0cb7bac01074616125486b49ef577782311a394bde6444ce311d5ab4f2ae2852a3ea92f4cd
 EBUILD flask-htmlmin-2.2.0.ebuild 707 BLAKE2B 6478442db22f1b259efe2db803693c4d56947ca89f2549e5f544d8330be00074c0b9c42dd24d48c408db7d9d4a13db73dbb82b59f0475fe0a7fbe85a971f3491 SHA512 edd35e44fe95acc70d3010dca3d8bf63852892cb74d9bc364519fc8e9fd7a757e825ccaca64a9feb926849416f1da8e3e0d3e745e97b637918c3af15ebf2586a
+EBUILD flask-htmlmin-2.2.1.ebuild 694 BLAKE2B 65ade5fb5b44bba6e56bfc6a8c00689b4c9a16ca8b83a4caed837c2d6f5781862fe7680b0a9e0660f7e77ef5e40d52996eb030e91cd7e6fa00c07bbda03c49d3 SHA512 fee76464c5f37f6b895aeee13e7c37496da5c7c26f6a5f0f961630e4a8c99f413c84f3233bde636f7ab26e74b6d2315276bc9eb26a1e44fe25d2f504ef75963d
 MISC metadata.xml 517 BLAKE2B e22522b2f2578e000de4127d3c6cd5d6f08b3974aef72644e51ae39e074eed3d42cba247b2dff4090e930cd9ecb5354f7094a763c116989d425672d109fdd408 SHA512 6393c0fb4084501989d12c24f7e56269780423d675761e48da3ed159db639df3639e5a68cfcfaa8a53d1e111474d05656f227137af2ee7950f4ec88f1393216c
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-2.2.1.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-2.2.1.ebuild
new file mode 100644
index 000000000000..a19920f25153
--- /dev/null
+++ b/dev-python/flask-htmlmin/flask-htmlmin-2.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P="Flask-HTMLmin-${PV}"
+DESCRIPTION="Minimize your flask rendered html"
+HOMEPAGE="
+	https://github.com/hamidfzm/Flask-HTMLmin/
+	https://pypi.org/project/Flask-HTMLmin/
+"
+SRC_URI="
+	https://github.com/hamidfzm/Flask-HTMLmin/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-text/cssmin[${PYTHON_USEDEP}]
+	app-text/htmlmin[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 3f11ef5f98a1..d41c5bc27129 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -6,6 +6,6 @@ DIST fonttools-4.38.0.gh.tar.gz 3603281 BLAKE2B 8ec558c35cc10b32760eb199dce7c409
 EBUILD fonttools-4.36.0.ebuild 1516 BLAKE2B 7b9540de8ab5c231b1cd133b014e9e0d0a265ea2452ffa5326dc84902708319bbbb02a001216cc0c1f8e1d84cfebcdf1d08ee2710741fdc816d3aca033e7ebca SHA512 2d6f905463b5049d4b95fb0e317c263a2dc8b098c432f2169230070a018eeb4bbd2308a99ba5ee4645e67f6b945fd3ee3b95fb1c47e59a001355f48d8996fae0
 EBUILD fonttools-4.37.2.ebuild 1524 BLAKE2B 006a2e378c259889001bb01a0ef51350d34fbc3c59d9445d3669317e66916f6d546ca7be3dfffab3b56505bad8bf9a738f6e093829eedbedde2162e5cfda798b SHA512 30d8c62dc7dc26a9218f1cf7e0a4c9553299b4268bdc6a68556d565598ceda574ba194a090390e46a88606ade224c96ba5f49d4143f6ac79074fdfcb1bba97d0
 EBUILD fonttools-4.37.3.ebuild 1562 BLAKE2B 2bb7e510ffad7508d3eab0d98b08a740c60c9d981bcd1934d6b4069604628e481c43f39dd1837b39f32637402fb1148b86018afa8983f40a2454be746d8a67d3 SHA512 11833f0747c5676be2823f60cc28dba9f054f37fa1afeba2c958fdcf3a3d7e5644a09be0470bc6ce8c28b28f743f3271f5e24f6592f7f81ff5b037b3112f6e2f
-EBUILD fonttools-4.37.4.ebuild 1556 BLAKE2B fb40586d0e2c622847e9e08823fe38d4d48b350ac5e799f05ee993018ff1f8c904c589a9f78bb45d7b98c82caf299133e58b0b9c0bd5088b5d7543e522a30e70 SHA512 4b4d948ab28deef8645889c662cc133a81c313c84f941fb160e6f90cc32f44f6f041eeab3d2018075fda387b44fae5f4b16acb15fc0bfc8ff7c4af5fd50531c3
+EBUILD fonttools-4.37.4.ebuild 1554 BLAKE2B 44f95549cba24882b10fa630004815545734caff372c187b63fc57170f9a4f5c4220b50af937b052aa1575d2bf0778cd24405bba11c67f7feb13b760687461dc SHA512 65783ae6ccbb1d98ee53826d316a8fcde2d373a4259ed1d370b3e54e88027311d4594f5ccb193a93e4a4b90d49cbcbed8b34909a2a35898378e97afcdf15dda5
 EBUILD fonttools-4.38.0.ebuild 1562 BLAKE2B 2bb7e510ffad7508d3eab0d98b08a740c60c9d981bcd1934d6b4069604628e481c43f39dd1837b39f32637402fb1148b86018afa8983f40a2454be746d8a67d3 SHA512 11833f0747c5676be2823f60cc28dba9f054f37fa1afeba2c958fdcf3a3d7e5644a09be0470bc6ce8c28b28f743f3271f5e24f6592f7f81ff5b037b3112f6e2f
 MISC metadata.xml 372 BLAKE2B 950ec78bf127250847c6513c22a5108b251afdb000d361068edf9d00d64a5baf6925ba4058bb889724febb28d92abc044c29af5936a48d8e8951b12314b64357 SHA512 03e76e28959bab83fe41c3ee4b55692ced9b1360e73e38a6e8f6e5c06fd1185dcbe0214aea2edff18d248abf252c1877d0d2c2b78b8e088e606c09c34e93e7ac
diff --git a/dev-python/fonttools/fonttools-4.37.4.ebuild b/dev-python/fonttools/fonttools-4.37.4.ebuild
index d52e9285c19f..2dafd3b2f154 100644
--- a/dev-python/fonttools/fonttools-4.37.4.ebuild
+++ b/dev-python/fonttools/fonttools-4.37.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest
index 8d8bf1e8cdf6..f7926ade1cce 100644
--- a/dev-python/google-auth-oauthlib/Manifest
+++ b/dev-python/google-auth-oauthlib/Manifest
@@ -1,5 +1,7 @@
 DIST google-auth-library-python-oauthlib-0.5.2.gh.tar.gz 53842 BLAKE2B 7adcd9f339ec9a5528308fcc0fee1cbbe96440e1bfe5c7cc9c94808668e22801b612d291a2419333888194c3224838ac40f9d0656381825bd660067470f58910 SHA512 eaf296a0e0504e8249637a8db7531c10b120f28abeeab3e1fe8f366b4279c396509188e83f8a0ec56be85063430ceb691d6d926cee33d4f166bbcc4425e538db
 DIST google-auth-library-python-oauthlib-0.5.3.gh.tar.gz 69613 BLAKE2B 74338894f35fd1cd8802ea56952561ce0e801fecb2f994b71caf3c6b62a22e8b85f8a5b40f5571b05225a565b373865377d321625aeea2dafcc0cafb89da1492 SHA512 76c855e9becd57d3cb3bb0b203ad77ef17dc04e8be8b96d17a9c1f29474a8b180edb725e835d0552c5eddbb387cc463e88b076dd6d11635e6d45798224f09188
+DIST google-auth-library-python-oauthlib-0.6.0.gh.tar.gz 70025 BLAKE2B 2d87390a629d967b0f2aef5f56712d3defc2b460a67f2bf633bb628875161f9ddbb4f229426ce2b42dcf805feefe8101ed3bacd72ced630c0be4fe40bd926c7e SHA512 1aa42498a5875812db922b30eb20cdf124935f95f5cabd224acfb82c9ed61714cfc3c6af2168e75cf11aaa8550e41c48f30fc1d467d1b7be511bf5cb522104e8
 EBUILD google-auth-oauthlib-0.5.2.ebuild 876 BLAKE2B 97153977e671f5a8e24315290ce154c41bf478add7b9103141df177381631adfb7a4e7001888a8362ee09f11213c1d461b480436d649d59f9f089ff95c1a25db SHA512 eb04ca36f3939bf0f76b0118ba8c629e39b9bec056c5afd322a2d73b3d655d9af6c2786db17b16f0f7010e0e9f150c14f11cc56671b43e3f876e4477f8ed48b9
 EBUILD google-auth-oauthlib-0.5.3.ebuild 876 BLAKE2B 97153977e671f5a8e24315290ce154c41bf478add7b9103141df177381631adfb7a4e7001888a8362ee09f11213c1d461b480436d649d59f9f089ff95c1a25db SHA512 eb04ca36f3939bf0f76b0118ba8c629e39b9bec056c5afd322a2d73b3d655d9af6c2786db17b16f0f7010e0e9f150c14f11cc56671b43e3f876e4477f8ed48b9
+EBUILD google-auth-oauthlib-0.6.0.ebuild 876 BLAKE2B 97153977e671f5a8e24315290ce154c41bf478add7b9103141df177381631adfb7a4e7001888a8362ee09f11213c1d461b480436d649d59f9f089ff95c1a25db SHA512 eb04ca36f3939bf0f76b0118ba8c629e39b9bec056c5afd322a2d73b3d655d9af6c2786db17b16f0f7010e0e9f150c14f11cc56671b43e3f876e4477f8ed48b9
 MISC metadata.xml 410 BLAKE2B 23af42a2aa614f119e10cf5d57c3c37abb69ad8d9b1e16445fb92c9f00bdd78f6b1a6a51dff4ebb98bbb03e0002e73eb68cffcf857372dd94848187637c60219 SHA512 c19dd3af098644d5068ec677be51615885bb1267ba9bfb867609725e2a824a74934e2fe25909ea7406c91ca405d44e4c7191a14d3d1bc7b3a60c29445456d3d1
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.6.0.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.6.0.ebuild
new file mode 100644
index 000000000000..9aa755ca297b
--- /dev/null
+++ b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.6.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=google-auth-library-python-oauthlib-${PV}
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python-oauthlib/
+	https://pypi.org/project/google-auth-oauthlib/
+"
+SRC_URI="
+	https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/click-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index a95a3e9bfc86..3fccae68e3fb 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,9 +1,5 @@
-DIST google-auth-2.11.0.tar.gz 205568 BLAKE2B 76f43804c117006141e46291eaa35b49e73f4eec81307b7c3c6fdf82faf1a1f3101ef1a652c5dff05ca6686ded0859c6a3bee8d38cd584fd5cacef9598aae9b1 SHA512 0b2c8653184d95b1f0981326721a8604bee6737e2e4fb68c12d695c74e03406e6d189b00740c34ee74d6ae4032581bd099018f8eaf1d65759e4c5fa4127305cf
-DIST google-auth-2.11.1.tar.gz 205716 BLAKE2B 06cf90b915c82bb53795427fc971c6a979baa34d3e32d43db20c0df86df9ef39d0ee80c4026dd502ff1d5233f1d80b0a4fa9750aafe9f0d427013a2d8ad34054 SHA512 f89fc2ec2d130156132f7e7290f4237ee9adf832f6b1914a39ea7d56943bb26fa02e940e826eb9c4e5351aa91ebf03cc5969c25e5020a89a09ea8f92535a0c07
 DIST google-auth-2.12.0.tar.gz 209325 BLAKE2B a6f754262dd7b75796dd63f4b7a2161ba959a3103c51cacb3d5f4ba3d17efdd36e1836ce360fa108b5dbce710743bfacf3b8b054de0e235590ba15eae8f3cdf3 SHA512 59209299631b7ea7d11e6787c33a304bbed5bca2173148d8c69595fc573f8915f6e3b601ed96686568f517cbbea71e18be228874334733629fbdd030976821cb
 DIST google-auth-2.13.0.tar.gz 216209 BLAKE2B 4e88062d89ca9976e0d87a93012c8ca318f9068452fde365970aab1d6ab4985aad378a038e36e0a82aca4665a196c412287a84b58c831edc9483d02fa4ed2489 SHA512 253dd17466850b20212c8cbbeb29c35dbffb2f3205867c7fdf74e400e4f2f9bf3c9ca6ffc814e5c3e9c7cc918a6cc60e696bc98c5d969761101dee4109b7018e
-EBUILD google-auth-2.11.0.ebuild 1525 BLAKE2B 0559fae14e6b27d48b0a8cf5babe40d71283d26581e6bc1c2efb0e9c20b7757ba820fbed34dd73b32198cbde9f2b3a620b9d27156ef9847a875908ce663a3e63 SHA512 e9ade71009eea68d39214942b376aff7aa4c1660e29cc2bbc535f7e0f40fdbe0ec30140dd4a21dd503531577ee6c183ec78fcf433f4898f819c620be02dceda1
-EBUILD google-auth-2.11.1.ebuild 1527 BLAKE2B 6a9c5ae6fe4de702e737e491d692c91e0b44ba3961a2f965489614220fd641cf0416ced1ee0bfd910730268c14406d27e12a224499004a9d2a41f258726c33b7 SHA512 e64349d2b54a4be4fc33d37faec791ac61459ae7cc4143758bc47b3d593f8c440ea4114dea463318f2706d1c597c6c248a81117908ab5b6f5304e0ea63ae521d
-EBUILD google-auth-2.12.0.ebuild 1527 BLAKE2B 6a9c5ae6fe4de702e737e491d692c91e0b44ba3961a2f965489614220fd641cf0416ced1ee0bfd910730268c14406d27e12a224499004a9d2a41f258726c33b7 SHA512 e64349d2b54a4be4fc33d37faec791ac61459ae7cc4143758bc47b3d593f8c440ea4114dea463318f2706d1c597c6c248a81117908ab5b6f5304e0ea63ae521d
+EBUILD google-auth-2.12.0.ebuild 1525 BLAKE2B 0559fae14e6b27d48b0a8cf5babe40d71283d26581e6bc1c2efb0e9c20b7757ba820fbed34dd73b32198cbde9f2b3a620b9d27156ef9847a875908ce663a3e63 SHA512 e9ade71009eea68d39214942b376aff7aa4c1660e29cc2bbc535f7e0f40fdbe0ec30140dd4a21dd503531577ee6c183ec78fcf433f4898f819c620be02dceda1
 EBUILD google-auth-2.13.0.ebuild 1527 BLAKE2B 6a9c5ae6fe4de702e737e491d692c91e0b44ba3961a2f965489614220fd641cf0416ced1ee0bfd910730268c14406d27e12a224499004a9d2a41f258726c33b7 SHA512 e64349d2b54a4be4fc33d37faec791ac61459ae7cc4143758bc47b3d593f8c440ea4114dea463318f2706d1c597c6c248a81117908ab5b6f5304e0ea63ae521d
 MISC metadata.xml 521 BLAKE2B 784282f6a173e7746a408556d77e1277f65a41eae545b6b26054c1e506642e683c1c7d91798f3b7b690bc4f9d2f642a51c1395593177eebf1770d2a0c0ba589e SHA512 c2624ebca3dc42961e61531db4724b2b354a722f71cd7f2c194680fee50125d2251f4b94cc7e31b008a2792e74b0f55f407a1230d3f59572df9cf32ee49d2fb7
diff --git a/dev-python/google-auth/google-auth-2.11.0.ebuild b/dev-python/google-auth/google-auth-2.11.0.ebuild
deleted file mode 100644
index 37c2ffef06a9..000000000000
--- a/dev-python/google-auth/google-auth-2.11.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# these are compatibility tests with oauth2client
-	# disable them to unblock removal of that package
-	tests/test__oauth2client.py
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-2.11.1.ebuild b/dev-python/google-auth/google-auth-2.11.1.ebuild
deleted file mode 100644
index de5188c8fdb8..000000000000
--- a/dev-python/google-auth/google-auth-2.11.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# these are compatibility tests with oauth2client
-	# disable them to unblock removal of that package
-	tests/test__oauth2client.py
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-2.12.0.ebuild b/dev-python/google-auth/google-auth-2.12.0.ebuild
index de5188c8fdb8..37c2ffef06a9 100644
--- a/dev-python/google-auth/google-auth-2.12.0.ebuild
+++ b/dev-python/google-auth/google-auth-2.12.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index c7d1fe424415..4e9a8e697b62 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,5 +1,3 @@
-DIST humanize-4.3.0.tar.gz 78035 BLAKE2B 03cea639879165453becc41f62e7b6e34a62ac3a74c37141e0c3f7e9d855b2727710ab5ac231a3829d03c413b297449dccbfc8b804b3f5ddcd402dd813adbf57 SHA512 b8713fa9ec2c2210f93e06436a5bef390937b85ccd0bc95520e53d5c0f49354b94a7957ef50dd9e391d8377d1faf43003c47028b19cef42885fd083cbda1ac46
 DIST humanize-4.4.0.tar.gz 78519 BLAKE2B f61b654e201995479ace22b5aac106b08304ed9212cf5c6c7f87731d861c42c5e0243f7bb0b7f2c29b870421fa81fba0c36e4ead90ff90f207bc984286ac119a SHA512 bbbd386d9af82d9db0f2edc4653928654203c4239419232abfc15c51ccd865b355366549c46651e1291d4222ca8b2a297ffc0fce3cc32be4ae2f904ae308a8e4
-EBUILD humanize-4.3.0.ebuild 586 BLAKE2B f89d881fd19e60a8eb9c2ffd5d53e8b0e6ac16672c16f441b2bf8e776b81b7a20218af77eb61fb4a1d9ae744906e361fd953da37b7e94542fd5e2e0c3bd329e7 SHA512 3f7f0f0239a899ab1445277b7944da5763d5585e287ccad072a0aa6b86d8bc2c5e0557c255f7d8e29d630ce681b2c95985dfdbbb72127a886df1a6cd79a85e1c
-EBUILD humanize-4.4.0.ebuild 588 BLAKE2B 7ccbcefd9b985a2eb85773993629bec0fdab43f09a9f092c67a520b123639a8272f01296153b0ef38a9ae498032807af089e4536b2482adbc033a5a4468f6a97 SHA512 53444dd98c6898caf5158cc5e5a55355ba7269cf7e1d130a5788ae246c7f0e1af06e53d2c99b094985583e2f472d28027d724a47bfb0c57f18ee1e2daa0fb5f7
+EBUILD humanize-4.4.0.ebuild 586 BLAKE2B f89d881fd19e60a8eb9c2ffd5d53e8b0e6ac16672c16f441b2bf8e776b81b7a20218af77eb61fb4a1d9ae744906e361fd953da37b7e94542fd5e2e0c3bd329e7 SHA512 3f7f0f0239a899ab1445277b7944da5763d5585e287ccad072a0aa6b86d8bc2c5e0557c255f7d8e29d630ce681b2c95985dfdbbb72127a886df1a6cd79a85e1c
 MISC metadata.xml 506 BLAKE2B c00c304481f8bd5d2309a1fa72a19bd8405d2f8d55e68a9e688435dec5410db728537362d6fc090f448738fa462ad62d03cfdb82fda8702b91aced4ecd6c05d5 SHA512 71905cfb331f60723b2b3dc02b1a5cbc2712ea9a411692d8ce12e62ea90a4ebef41bb4806b90f9bc0706d8dfb6a3ebb69d23ef16f0177eaddcfbdf07612d8614
diff --git a/dev-python/humanize/humanize-4.3.0.ebuild b/dev-python/humanize/humanize-4.3.0.ebuild
deleted file mode 100644
index 5887ac380442..000000000000
--- a/dev-python/humanize/humanize-4.3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="
-	https://github.com/python-humanize/humanize/
-	https://pypi.org/project/humanize/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/humanize/humanize-4.4.0.ebuild b/dev-python/humanize/humanize-4.4.0.ebuild
index b471878fc311..5887ac380442 100644
--- a/dev-python/humanize/humanize-4.4.0.ebuild
+++ b/dev-python/humanize/humanize-4.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 02f7f3b0c5ab..678a77bb50dd 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,5 +1,5 @@
 DIST hypothesis-6.56.2.gh.tar.gz 9333277 BLAKE2B 6c75b48cd6e7300c05bd020003340aa8c868ba2d25402c7599b0e4e6f8774df38e3b3c3a4b589cf08f44fb43b04cfdbc2a3e69f894c3ccaffef705896c6c0a98 SHA512 10d4cdd343b63bc17b3e813309911fa70dfee24fac5d355e6ed907740103177da9be461d4d25e27d5190867664c64f28a7827d6ffd15fa4519ea38fbcdf629e8
 DIST hypothesis-6.56.3.gh.tar.gz 9333288 BLAKE2B 9608542d8dbe97fec147eae1f9b2f06af2b08e3cc0807fefcfa97b0a8c1aa30a15df9f1114a13f5c719701a4d13ab09a808d0d09e271d9e0d69168ebc4183af4 SHA512 f410455e77c6e9dc3b9003ef3d4c21bd204d85bc567dfd0d420986dc255d8c1ff9f41d809d837286f02064f546a08eff0f89389906ab7023581cc1f5a5d18947
-EBUILD hypothesis-6.56.2.ebuild 2091 BLAKE2B 1c091c6e695dddd96a8ce37a2291c4678350aa99903719f46d0be402308c1d1fedf3957864a3d1dffe008b9fd310f94ee5f39ef9b5fc9c62edd35081943229e2 SHA512 9d05e96fdc44aa5175e4b974a0f81170d73300896f19c13ec1e6801642d325543311df89e490d4b7a80c2c5109701e23bdbe856a06349254c02a3a4f4c0fcc21
-EBUILD hypothesis-6.56.3.ebuild 2132 BLAKE2B 949f41664cd920791b94bf39a053e3ef8d443231d34619f9f7873929d6829d261c9fe99000e274dce706f71ca5eea93fdfb62325a6ad881cfa0941420548ef5f SHA512 a04252a6ec505ddd8acb26d47d30180ce656ea8f79b06e6ab5d465092898a53ca1a83ed4f97e4d9dece274e4a40678938dde4308243acc8221927cabd2f3c9bc
+EBUILD hypothesis-6.56.2.ebuild 2132 BLAKE2B 46f1d1c0f69606e55673a002c305f72655f44ac456ea0e8cde03e7cfd12a074d915f00b29280637b150a4faa596dcd28e2527fc6762aa53893f245530c5a7eef SHA512 bb0602862ac4175e49605bb095ca8d9a027a964cda6e0cc51f03910f5186436646e25f25621cbfec777dbbf0e5fbb4f7a5a01ef646fc20bb84f75980daddf1b8
+EBUILD hypothesis-6.56.3.ebuild 2140 BLAKE2B b805e367bbbe90dc2037a89f3488677ea9eed9052283c25a2562d3a5af85b73d2e11a2019cf64a4a8c8d7dd180f8636f03519b0681afb61a38a6057bc707d097 SHA512 dfeb6198d076546f2654edc67fd6f0fcfaf1cdc65385ad90e01901c54e06f565a48d23af2ca48d1acfcd91cfbdc2b5072fb211f2fe02237b2bb6935a0682d07c
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.56.2.ebuild b/dev-python/hypothesis/hypothesis-6.56.2.ebuild
index 6d6bc2aac3e0..8b831543982e 100644
--- a/dev-python/hypothesis/hypothesis-6.56.2.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.56.2.ebuild
@@ -46,6 +46,7 @@ BDEPEND="
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pexpect[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
 	)
 "
 
diff --git a/dev-python/hypothesis/hypothesis-6.56.3.ebuild b/dev-python/hypothesis/hypothesis-6.56.3.ebuild
index e1015cf08f6e..bbb3ede19663 100644
--- a/dev-python/hypothesis/hypothesis-6.56.3.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.56.3.ebuild
@@ -46,7 +46,7 @@ BDEPEND="
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pexpect[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!dev-python/requests-toolbelt
+		!!<dev-python/requests-toolbelt-0.10.1
 	)
 "
 
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index 7bf1fe1c45a2..79ada94174dc 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,5 +1,7 @@
 DIST identify-2.5.5.gh.tar.gz 101461 BLAKE2B b3a4dc2273435cf9244af64b08b9a9a922025f7d32f479fb2641fcdd9f8a05d2778db126104b1e3b765b82af7ecc1660163de1f71098900296135cd1ccd129c5 SHA512 e02688805310a4f92d0435af562383a10297afa7fc468e44f73be40118c73e2ceac1b4ba7525c375fd0b671ea2700ba66307115c78558a370c525de8cba33c83
 DIST identify-2.5.6.gh.tar.gz 101460 BLAKE2B c540934d4a482521758a64a1eb5e84b346eef0e0cccecbb9ad06e53e4b6872acb9c6fc94fccab9b75a7cf5658af78ad319d808a17f7ec44dfd08ae9c9a3b9f58 SHA512 9a35eb42767b0d2365b8da7c5aa5d7644272de5b65a505c5876cce0781222d8e52937b5c2d5594e560c5ab2fbbf4329555df15443b8f6110ac48880691af9089
+DIST identify-2.5.7.gh.tar.gz 101472 BLAKE2B 519f35e08258dac5ff4b897f4ee55cf432641e57c55ff1d05d3fdf564aa7eed441ba839f222b430eae96f55a8e6a5d14a9c25fc78b3536dad59c3604a3bff7c2 SHA512 186a0c36e3abadd4b2db1439daa837fed55db706c4eb1821d9ecf1288cd667706b708e1251f84d67a480cdd28e6a57960443b707c327e19a9342f5e2afdb1a7c
 EBUILD identify-2.5.5.ebuild 588 BLAKE2B eff914d7f68c76704a11dcdbfef21c51f52f0abcb6d29f669ba173106369d2eaedc818e9d89ed2d35e765184b07fe471c3d9c86db84f0093ebe87e46bf951152 SHA512 2ff5036390cf415ad56c87cc4bc7e1c2fbf0992ebf92ef3cbdf44ed40832a0326bb5f946e4fa432d4e429f8b224c7e6b37fb3ebac56d2388201df754205bd42e
 EBUILD identify-2.5.6.ebuild 590 BLAKE2B 9903b2478df4f9ce56ff68e2877d9b8e5d86a814e3c021b0533f3db6a1aabc5709c5cda6a719e47126c1ffac7ef34bfac74531395e035055a856a9427b9ca179 SHA512 b9c852d73351dc0386609a4db9072467a47fcf768205fbcfdc7798d0acac40de383315a734547acf4b3fc46cc1c21c66fabc0d97583c2fa0ad946ad89551be03
+EBUILD identify-2.5.7.ebuild 590 BLAKE2B 9903b2478df4f9ce56ff68e2877d9b8e5d86a814e3c021b0533f3db6a1aabc5709c5cda6a719e47126c1ffac7ef34bfac74531395e035055a856a9427b9ca179 SHA512 b9c852d73351dc0386609a4db9072467a47fcf768205fbcfdc7798d0acac40de383315a734547acf4b3fc46cc1c21c66fabc0d97583c2fa0ad946ad89551be03
 MISC metadata.xml 501 BLAKE2B da95534590927f7290f78f47e30484e3349c9058048c15522e7346a74d9a2c96141a18897b10b230adf966d3c237217ef1d2dcfe59814ccfffd58ab4c38c1ebf SHA512 8d78245bbd2e14016eb70f1d8f8d6129e6b265084f7da95bd915f01ce5af94f86bd69c33c1514195de70d0f834332d9ca968a18afb59a7016c8cb58681d04d24
diff --git a/dev-python/identify/identify-2.5.7.ebuild b/dev-python/identify/identify-2.5.7.ebuild
new file mode 100644
index 000000000000..8ce2bd5b0e7d
--- /dev/null
+++ b/dev-python/identify/identify-2.5.7.ebuild
@@ -0,0 +1,29 @@
+# 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="File identification library for Python"
+HOMEPAGE="
+	https://github.com/pre-commit/identify/
+	https://pypi.org/project/identify/
+"
+SRC_URI="
+	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/ukkonen[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/immutables/Manifest b/dev-python/immutables/Manifest
index b3f395591834..6da0115d4e2d 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -1,5 +1,3 @@
-DIST immutables-0.18.gh.tar.gz 84891 BLAKE2B 2e800e1b7b354781ef221315b80877e57ef446753c4a42e411196379e2bc921f71918c5ecd5cc693ca54cb7c401bef31161e9d249407b705626fe95d0e4e9fcc SHA512 1477ff6d9a6c02c3619b209352096abefb913cf53d392748e0940160067ecdcf2b89ad9ce807161ededaa5062105a2e5c5a3303bd02752a5f07b5f68f1c1044c
 DIST immutables-0.19.gh.tar.gz 85695 BLAKE2B b6457bd4e61c79ffc4ae83c1be3845ea1914ef6604ee8b0886c1ab24dba96e226444af5adc1032dc36e6f3058acac8a8f0289ce97f97874b02aae85eb3bc2ee1 SHA512 b1027e9ab4a304dcb953037a1ea4af082d0524255bcf3f3f368deda85b9a9e5b1c556638aab7a10cbf200fc14b85c8b739f212035f8ead1dff941b8f6da09668
-EBUILD immutables-0.18.ebuild 811 BLAKE2B 4fa65ad7440492d0113f3801a968af96840cfba36f24f45780c1ac3265184c82b0c3de2948b63886cdb9f63fe87ce18109bdd2eb6011c49a25984334393980af SHA512 d4156d40e6b4fa634d16781aad141b18bb3de8cc85bfcee0537369c76086024dc51dc6004f6dda9b6af0f8ec069c1db17784ff892eba87b997e78dd61787703b
-EBUILD immutables-0.19.ebuild 813 BLAKE2B e69af3ac8e980c23ae3b81e182c1ac46ac3a064d8fd8bbe497a1e8142c3e466fea5892adccbcaccd46b2bc7c57aaa6faae58dd9c47c655371eaf63c7e21562ad SHA512 1ce3807ad0bd1ce6c9af2098dd699686707ae487e03a50538e509e672673199c8cf092852915ad7db1c2a0c50ca6de7533efcdd89b7f8b5b97e6af43c048eb93
+EBUILD immutables-0.19.ebuild 811 BLAKE2B 4fa65ad7440492d0113f3801a968af96840cfba36f24f45780c1ac3265184c82b0c3de2948b63886cdb9f63fe87ce18109bdd2eb6011c49a25984334393980af SHA512 d4156d40e6b4fa634d16781aad141b18bb3de8cc85bfcee0537369c76086024dc51dc6004f6dda9b6af0f8ec069c1db17784ff892eba87b997e78dd61787703b
 MISC metadata.xml 353 BLAKE2B 5ba3a63b6d65aa989535ec78a5e097fb15e6bcb392e846471fb01efd4a4b546a3ba861cc3829d13e71f1f5c31b582a99e1f5e4adf6b60c2b6fb17bdfb9265c99 SHA512 ede81f3aec8f6ee374c8d39d60f4193cfb701f2561858f2ddfadbe68d531849cec13fb8c13cc671e14d8ab1f18b08759d030c562cc496f959517c6ce67ac9781
diff --git a/dev-python/immutables/immutables-0.18.ebuild b/dev-python/immutables/immutables-0.18.ebuild
deleted file mode 100644
index e34f68e5dd8a..000000000000
--- a/dev-python/immutables/immutables-0.18.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A high-performance immutable mapping type for Python"
-HOMEPAGE="
-	https://github.com/MagicStack/immutables/
-	https://pypi.org/project/immutables/
-"
-SRC_URI="
-	https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/mypy/d' tests/conftest.py || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	local EPYTEST_IGNORE=(
-		tests/test_mypy.py
-	)
-
-	rm -r immutables || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/immutables/immutables-0.19.ebuild b/dev-python/immutables/immutables-0.19.ebuild
index c45d9591f332..e34f68e5dd8a 100644
--- a/dev-python/immutables/immutables-0.19.ebuild
+++ b/dev-python/immutables/immutables-0.19.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/jc/Manifest b/dev-python/jc/Manifest
index f4091572b6d9..88f2de68a909 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -1,9 +1,3 @@
-DIST jc-1.21.0.gh.tar.gz 11910267 BLAKE2B 7d02f6b574dc2171daca9682ef5cfe2ccdba6230320fc331c086c47b147e49efbd11fcb7b7f26bf4d448d4462f051b5b6892eff16e853cdb6cc4927f5cffddba SHA512 5382aba5c6ea0409fae31097516912d07133d2c14eb529e9df742f2efe4682c7e36e934786c9b12454d23e4c3acd5bdce3e97f410303b761f695db787058b034
-DIST jc-1.21.2.gh.tar.gz 11910311 BLAKE2B ece8651c55f62821e30574cc208f3e1a569a2408ae1c637329556d49aae894afd7a57cdb7c70a0fdd16136fddd7329a1cefab493848376f22d5fae553c0231eb SHA512 3860e429a11131b888fa0689dd627016d3e9c052908979c22eca604281f13ba3df7164cdfa04ff6e4e08146b42d7bd76888efdcce65a549d5c904ecd207209f0
-DIST jc-1.22.0.gh.tar.gz 12062944 BLAKE2B 8a4f301c563cabb5ee780280d3aa3caa64a8cbab7972c67854e0c7fb53ba86c6cae12682f6bc8559d51ef692e0352378c01a223848249c0f8f3b664bad63e7ce SHA512 832ef3d209bbf6e3d3a4b7b038e80fc0dcb99d4ba38732ad393fdbe59be4f5d86428cfbbdb81f48d5902b31bdea635996a99aeada19361d74c991e711560767e
 DIST jc-1.22.1.gh.tar.gz 12676358 BLAKE2B dbea5d19f28abf7773787275b8e5c64b8ceee07e56474336b37e35d76bf3cb3b6bbbad0d4e129fd118dc2eba03dca7f12d07c41f469f6d0e81fad1e4acb8af88 SHA512 67fba63921b9c8bc6b47a6d8405a693ce68c7338ad0d05565a0a4b4f7872ff83d27a97241daa8bd5eeb27299e630154b7a9d923bcd00fb121c25ac61f70d3faa
-EBUILD jc-1.21.0.ebuild 674 BLAKE2B 4cb873aab7d621f36a62bb1d4a25be0d981dbc3c80cfddf795a47a0ddda6e962091f8aa46166cbf88b32d5372879cd9f8329036d27fa99bbbedceba47f4877de SHA512 6bf52b03223276c5b94ddfbc3a28822246bcfdaf9c75840570f36cb63b45a05b01995e09a4ff3cd22f9f5d10b8660b31e115e70e2826c5d7bf2614566d4aa7ba
-EBUILD jc-1.21.2.ebuild 674 BLAKE2B 4cb873aab7d621f36a62bb1d4a25be0d981dbc3c80cfddf795a47a0ddda6e962091f8aa46166cbf88b32d5372879cd9f8329036d27fa99bbbedceba47f4877de SHA512 6bf52b03223276c5b94ddfbc3a28822246bcfdaf9c75840570f36cb63b45a05b01995e09a4ff3cd22f9f5d10b8660b31e115e70e2826c5d7bf2614566d4aa7ba
-EBUILD jc-1.22.0.ebuild 674 BLAKE2B 4cb873aab7d621f36a62bb1d4a25be0d981dbc3c80cfddf795a47a0ddda6e962091f8aa46166cbf88b32d5372879cd9f8329036d27fa99bbbedceba47f4877de SHA512 6bf52b03223276c5b94ddfbc3a28822246bcfdaf9c75840570f36cb63b45a05b01995e09a4ff3cd22f9f5d10b8660b31e115e70e2826c5d7bf2614566d4aa7ba
 EBUILD jc-1.22.1.ebuild 674 BLAKE2B 4cb873aab7d621f36a62bb1d4a25be0d981dbc3c80cfddf795a47a0ddda6e962091f8aa46166cbf88b32d5372879cd9f8329036d27fa99bbbedceba47f4877de SHA512 6bf52b03223276c5b94ddfbc3a28822246bcfdaf9c75840570f36cb63b45a05b01995e09a4ff3cd22f9f5d10b8660b31e115e70e2826c5d7bf2614566d4aa7ba
 MISC metadata.xml 492 BLAKE2B 100e7421c33b90fb9180a3412206cdc2355b26dcacf988f1157a725ca8ee6eff44288ec12f8274360f086272ad3bd06e9df6a93288edeb9102551c65256a47f4 SHA512 cb0abbd0c1b02b1fd4c74034e1f41a53ed0b7f297dcfad4e9f6b2a4960e16790b5d879f407ab18f73c81684d3a0436327949bd628a1d1d146958f01e34206688
diff --git a/dev-python/jc/jc-1.21.0.ebuild b/dev-python/jc/jc-1.21.0.ebuild
deleted file mode 100644
index 7b7bbfc30991..000000000000
--- a/dev-python/jc/jc-1.21.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
-HOMEPAGE="
-	https://github.com/kellyjonbrazil/jc/
-	https://pypi.org/project/jc/
-"
-SRC_URI="
-	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-
-RDEPEND="
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jc/jc-1.21.2.ebuild b/dev-python/jc/jc-1.21.2.ebuild
deleted file mode 100644
index 7b7bbfc30991..000000000000
--- a/dev-python/jc/jc-1.21.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
-HOMEPAGE="
-	https://github.com/kellyjonbrazil/jc/
-	https://pypi.org/project/jc/
-"
-SRC_URI="
-	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-
-RDEPEND="
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jc/jc-1.22.0.ebuild b/dev-python/jc/jc-1.22.0.ebuild
deleted file mode 100644
index 7b7bbfc30991..000000000000
--- a/dev-python/jc/jc-1.22.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
-HOMEPAGE="
-	https://github.com/kellyjonbrazil/jc/
-	https://pypi.org/project/jc/
-"
-SRC_URI="
-	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-
-RDEPEND="
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jwcrypto/Manifest b/dev-python/jwcrypto/Manifest
index 3d555c6f20f5..461fe927a9f8 100644
--- a/dev-python/jwcrypto/Manifest
+++ b/dev-python/jwcrypto/Manifest
@@ -1,5 +1,3 @@
-DIST jwcrypto-1.3.1.gh.tar.gz 91903 BLAKE2B 49fb3cb9548c85d406d47074a410f6bc89cbc32f16a0244b4ac5e3fa219bc66fc1e4ed32056f5c9885608b5225c2ed3423555813938465924e60dabb8f39749b SHA512 bc43a1acdb12a4e25251a3c5f9c85286c5a4234bd098efe69b7e3bd3da9ec72e80d7239cc20b1f971e17218cce9a7febe6a92efca33da2f2e1479fe64150bb71
 DIST jwcrypto-1.4.2.gh.tar.gz 94465 BLAKE2B 23b3a18694793cdbdd1875bd9b107ecab8248ac2c6cbf1bf142144633f7dc6efea91b693b808a4a6153b78c1117dbb2fe1f831f7f2558d2476e146961a501c17 SHA512 9967e626bc4a13a12ef09bbf3dada589c2c5374f4addff743c3ca9762c66659f59ca2e0f495cda6bc5821b6ed62aae95d478bf14de0acd6b2696bf0e1a9e7a49
-EBUILD jwcrypto-1.3.1.ebuild 842 BLAKE2B d81c732703a83443f1bab3668256170a4c3a44691c891d6dcf06c68c1fa7283268bba5a5005fca7db7ca9af3785bc5ad056282fed4c3e6fd23a135b3f3a8d126 SHA512 9f8f2f49bbb7704f477a4a7eb9bed40e63261348c0d972e91d7b991ed5da168955c10787ea85865032bb033f81d983046fc15da8060dde557dab52b8a201b42e
-EBUILD jwcrypto-1.4.2.ebuild 847 BLAKE2B a1aa7608405aa4fbcf1763ebfb46c9f904431dda31978a6ae474919012b94f6a0fab40dd5d5642c4bded38d4b075b31c4090d6803abf3fed447f83dade868925 SHA512 55947c42faea78a660ff9fb17a8f900a169a2a1884cd7feaf4f0da44bc1d8fa096293e7d5c7f366913f093b2e755b29e35c313023456599a179504d6262aff9d
+EBUILD jwcrypto-1.4.2.ebuild 845 BLAKE2B 7349ff5efb3058c96522a4a03336fac07dd02169b1da080b7f53ce591fb2b341954690899a92ad90b58062bdab937c2590a3cff5aeb502e3a5201d9762bdc507 SHA512 1ae9253827bb6def1997efcb4fbc11274d8298873345b0bad1fa99fd540d73f12d4b13a5c347d3ef8532b0dbf9e3ae3922542dbfe66ded42b027ea7c40cd8401
 MISC metadata.xml 369 BLAKE2B c7868e0b20a2875964290642cddb457b71628e361f0e032875ac45f4405abeb76c8c53bcfe623c9a2e49ea6e184505503b4e43f34c456528ff3250aea5110b10 SHA512 a1fec6ac31bbb096e508b0ebd644aa8a96418e6972d852512d4b7702b67f241f858610235dbd68430c588d8b837c7a0866f333c8aab182e7cd01e10325031d34
diff --git a/dev-python/jwcrypto/jwcrypto-1.3.1.ebuild b/dev-python/jwcrypto/jwcrypto-1.3.1.ebuild
deleted file mode 100644
index 6517479a9113..000000000000
--- a/dev-python/jwcrypto/jwcrypto-1.3.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
-HOMEPAGE="
-	https://github.com/latchset/jwcrypto/
-	https://pypi.org/project/jwcrypto/
-"
-SRC_URI="
-	https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-	dev-python/deprecated[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Do not install doc in non-standard paths
-	sed -i "/data_files/d" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jwcrypto/jwcrypto-1.4.2.ebuild b/dev-python/jwcrypto/jwcrypto-1.4.2.ebuild
index e6056edc5f0d..ac6f46ca1bdc 100644
--- a/dev-python/jwcrypto/jwcrypto-1.4.2.ebuild
+++ b/dev-python/jwcrypto/jwcrypto-1.4.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
diff --git a/dev-python/kgb/Manifest b/dev-python/kgb/Manifest
index 3f6078f54e7e..58eda617934b 100644
--- a/dev-python/kgb/Manifest
+++ b/dev-python/kgb/Manifest
@@ -1,3 +1,3 @@
 DIST kgb-7.1.1.tar.gz 61504 BLAKE2B 37aa4c78e0e74c2ad10db047453229d903c72dc9f359ce916f66b24ddc390e89126869e8e52942854911952e995b45f9a304e48574c7c79319f388d0f70d148f SHA512 29e5d78270f55b82b917a1e448307397f813502cc3a262fd6af082417f3875c88732b3f7c11c6001120bb0cba4079c2c6351b2b24287b1f5a3b3c891cf3f8d55
-EBUILD kgb-7.1.1.ebuild 622 BLAKE2B 92b469a51da23a3327bcca2ccf8ee32572443f7ad5303c569fd7d088cf558744c00b10b565f1ce9aa4943f2c2665689bf5e78893aa5b03684a6b99d1bef11d3f SHA512 cbcf89bc8b5ca4fa5c97baefdc978ab5ad3812524de30fcc9c2ddac0450dc1b405e90a4fdd622171a244106c370d68535c93ff352c03d1e30a3e7f5e519fcd8a
+EBUILD kgb-7.1.1.ebuild 620 BLAKE2B 9309fe04445f3452b8812f9e52c143f7aa0bd1d8713e1e1a16ef3d1eb40b9d386f75f86b04e74fcc55ddde0292996685d1f664499614a35bd6db5867059b20b3 SHA512 a99be8986e26f73cddfa89a30ee0affb7a7d232d26aa0ee6ba6d7c61af882fee8c7c05b5cd11b175d355ff1d2a8c1601bbc2183e94f64a70e167628bb3f31c66
 MISC metadata.xml 385 BLAKE2B a36cb8262ed3d2fd3114e8c84bdd732dbbb661b8fea7a9705ff329f56659c020e5b9e00756a9e9dbbf073b894ddf5f811367b8c4d9b11dddd7c866588987e96e SHA512 5ee33147dec8e3fee8dc4856ca8a363674cd1854f36e9a01559751ec6799d8f8c995c8d0f82dcf794161b1f91acec387d7a18d7cdee2638fddbc177f0a069c81
diff --git a/dev-python/kgb/kgb-7.1.1.ebuild b/dev-python/kgb/kgb-7.1.1.ebuild
index c7f92d10cca2..72b37f451fd4 100644
--- a/dev-python/kgb/kgb-7.1.1.ebuild
+++ b/dev-python/kgb/kgb-7.1.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/linkify-it-py/Manifest b/dev-python/linkify-it-py/Manifest
index 9c3d79e402cb..e91249d19195 100644
--- a/dev-python/linkify-it-py/Manifest
+++ b/dev-python/linkify-it-py/Manifest
@@ -1,3 +1,3 @@
 DIST linkify-it-py-2.0.0.gh.tar.gz 76363 BLAKE2B dc04c1445b86998bd59d452cb86afdfa91d1165cbfe4148b5f9f0234b2f9f9e71fa3c41c36749e96f1269eda20fb81ed55fb63b18947e5c38bb233cdff06f9ca SHA512 7d2a66d5f0e33aece5b8d2737f20bd83f6cb2b7958b681c293f5996263f65f525862ce0cb0f7be9df1597844e58ed804b5b604c257e4d84cbf05677fd2733dda
-EBUILD linkify-it-py-2.0.0.ebuild 658 BLAKE2B 5d8cfb80ad2d55c39c457d17e42e9db209c800e7bcaee1a543c7ad4152a3fcc17a452fd39b3881a493bf52de95af14329e96a5fd177485551c16b159e6043d7f SHA512 7cedb120e6375a538c5d32502c1db7742144433f21f552dcbf23b3d4ac954efdb22708b5211a7678ddcd0107fde52e83dced6049d0e421fcd3d53528bb636fef
+EBUILD linkify-it-py-2.0.0.ebuild 656 BLAKE2B 1421c65a95f8dc5c3ad8c20c42b0328ca47cb6a5f21b53877849f49643f6f38b5447c7b2f25e2a44ceda40ce5e7280dd8c71c677c81b0bb2b5a8c33832cae2c8 SHA512 897ef88de41e4618086db3e59d71a38101ff27cccd6caf2dd69bcfe3d5103df088800ea876e6e341c085817454fa2a78071ad1341e6871b05c8fb8130cf6aa7d
 MISC metadata.xml 402 BLAKE2B f743f7ee6ccc16f6ae09861fa1712b456d7d7796afea37616781f3c40c33633a4571c78cfe41a9fb9b7e6370b8d2c03197e57ada0a0c5a2f80c1a21bbcab52cf SHA512 783959f08e822d432f30348ff5a7f4fc0713d0d273286cb840c43165141b12d28d812dce0958105561bb2a9d02e0034199d1405b4b83579de2283e133a03eef1
diff --git a/dev-python/linkify-it-py/linkify-it-py-2.0.0.ebuild b/dev-python/linkify-it-py/linkify-it-py-2.0.0.ebuild
index afb562424721..2f1758698e37 100644
--- a/dev-python/linkify-it-py/linkify-it-py-2.0.0.ebuild
+++ b/dev-python/linkify-it-py/linkify-it-py-2.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/uc-micro-py[${PYTHON_USEDEP}]
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 7303ceb32849..00aaa33c5b1d 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -7,7 +7,7 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD lit-13.0.1.ebuild 907 BLAKE2B 786bc45254014c19e47997b263eba9245fc44459a6f12d46e69803fdf57c1b8f3d07d7e0354ea23ab17471771f57af8e792ca942b9f195462a26629d8d6bfb8b SHA512 ca254f8d0d3af0e01b24e73de8e15b77d687fd0f23a4848dd4e85522426e7dbdcd8ae77e25d8f88e637e390131fe78362ae7ba4ecd192a4c970cc3311b371dfa
 EBUILD lit-14.0.6.ebuild 914 BLAKE2B 80f1bb1010f71ff835aef8e87cc0bca5de0dd97e74debaee4e26d698e530468b755bc632884c11616a0ae082befa75a7b6c11043c70c3bb5679b0dae1c985d0a SHA512 77eafef2378be28fdcaa87f07fec8b1907f8c491b4a600b47d9f5970148f6684e6b4733ad6dafb753aa7a56ed1834b10ff30afc5995812c895749ea0c7294e47
-EBUILD lit-15.0.3.ebuild 920 BLAKE2B 44ddfc3adf60ca1c1a328ecda0d28b7fcbc416a0d472cdf31f978fa25beebec533686b71292a7b36be1654633026e029f04e2b496c06845e088bd9b416b1b6c0 SHA512 d4a2442ead255c0664f4a4946034632658d39dd36ccf3d88b5aaad7f7ebe25b0969dbfb368ad6a487c277f845c47a54f8f548df79db2da84bf3714883ec0fbea
+EBUILD lit-15.0.3.ebuild 919 BLAKE2B adf8eb983f08a1ba6b3ec432c8ce75579649562d7786c6614f07919c5742274e4fe028eae5faea0d9b3b83e9ab3d0b2f9c8cc8c0b1c811dcedf3d9fecdec1223 SHA512 4f34c0519214f9d4e69e9a034b17d24562f66fe7138b3c7628eaf15652f2b56c5bfcabe9fb2d37fc204b28790f2629283a733a9ce2bf413f154c6e7a2afa733d
 EBUILD lit-15.0.4.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 EBUILD lit-16.0.0.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 EBUILD lit-16.0.0_pre20221016.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
diff --git a/dev-python/lit/lit-15.0.3.ebuild b/dev-python/lit/lit-15.0.3.ebuild
index a79ebb91d54a..1573302cb8be 100644
--- a/dev-python/lit/lit-15.0.3.ebuild
+++ b/dev-python/lit/lit-15.0.3.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/markdown-it-py/Manifest b/dev-python/markdown-it-py/Manifest
index 955374ef2eeb..ef5de90e6ef7 100644
--- a/dev-python/markdown-it-py/Manifest
+++ b/dev-python/markdown-it-py/Manifest
@@ -1,4 +1,4 @@
 DIST markdown-it-py-2.1.0.gh.tar.gz 265858 BLAKE2B 0d1bb789ed9a8d08b16c753f7ecc7cc6a6b1fd59fc39d303a0de15276a0a0f93dc8c8bc952de60450741f26770dd3955ae0e6aaa358bacf1003e5eb9124d3a54 SHA512 04e90538c8693f795aed2ed0a5bef4eaf0c12fac32cc0c2049c563e974b229940b9ceaea849ce86fa9804ccdd7be93145f3b6fc8d0774e96fafa0484368d0a88
 EBUILD markdown-it-py-2.1.0-r1.ebuild 940 BLAKE2B b0cedc3fad75106c214baa72beb5f1fb515740616385833aa2252e13406acaf2f8ae7601d8eaa94449608775afedd69ef062caff88826e4a3c7c72e74b2ddf73 SHA512 f5c21e569860963c03b36f4189dbc8c0081c1b6664c49349b6a48e4a4115f83b2ea7642c5b5a9bee7e494f79d6b7f4df19cd85d4050d0ffcdbe9f0509fe070f8
-EBUILD markdown-it-py-2.1.0-r2.ebuild 834 BLAKE2B c0eae681f964d47dd105f6108abcedfc39f00c30620d984a890fe0850f3cad8cc9e54ce653b3e9f84198270f77005e505691379e6fe60b55d62dc44c579e9384 SHA512 22f468c0c2689cf807379cbb0febe3316af50cbe19a3bb106f1df867603236cad4dd34c864607af1feea85e733a7f22e0354bd76ffef10ca147f5b706c975d7e
+EBUILD markdown-it-py-2.1.0-r2.ebuild 832 BLAKE2B d6242e6372983e90640b0648cefcfae79e8dbb497b69b5e8390b544a32b6182436adf3f5a369da928b3f68747e6ea5a4c2a9ffa605830d15f397ff1f8bed182b SHA512 b188f06b1adaea1fe7582d15a604d53a4c74d8a2f3f648ccb05f69851d5c1494a8b7c19cbb226d364afba98d0e71eed2f1d89c9246640c7d190ea744520867c3
 MISC metadata.xml 412 BLAKE2B bffaf51dbd0a94b09d07650e49e9bee76015ab4358c36db207713d82387a1d729e7f6576d824b02ccfd786353762e623e3dd657fb3d7c42f8467c8165da61ed3 SHA512 88b86fad883100895db6feee193102cc93ead665e1283d02f9f57a4bb228acfc738cef11af2ba02cab9b02fdfe8ba35861347a19e5b0de22f546e8e0a297e173
diff --git a/dev-python/markdown-it-py/markdown-it-py-2.1.0-r2.ebuild b/dev-python/markdown-it-py/markdown-it-py-2.1.0-r2.ebuild
index dbe1f15c8c05..d50832e41c7c 100644
--- a/dev-python/markdown-it-py/markdown-it-py-2.1.0-r2.ebuild
+++ b/dev-python/markdown-it-py/markdown-it-py-2.1.0-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/linkify-it-py[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index be889fb34074..e196d2d95c1d 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,14 +1,9 @@
 AUX matplotlib-3.3.3-disable-lto.patch 828 BLAKE2B 2044ef633091f27080d20e3e1b2c74605e13e99c9d044e97accde3b0a7946ef656f10c9bf5c036745f8ec85380e48cfd5e3d6fe8a023fa60e408d270f45a1da5 SHA512 81562749756b0415c6ce333d3cbbc197306dc9c2c425ec761767271c974badd13fe9a497c74231cd1bf9347f03ef0593bceff9b597289a8328e7c0211c7047ed
-AUX matplotlib-3.5.0-test.patch 10430 BLAKE2B 26f07224ad540c6fdaeec05d901ddb70c55bc3c8ba21e71fe2739e109cfad513f5a4231e99dcf65a00bbbe626b8966b46be1f4a53f80e03a7fd1ca8d3ed87b0a SHA512 560653a1a2ab311e3041e872cb9d1e82125fe4b98208160ddedfd3f6f26a9488714039736ebbf256d190307354a7a513609ea5e9b8876d8c6afef8bde034d3f9
 AUX matplotlib-3.5.2-test.patch 10981 BLAKE2B cd7406a1452b22d5782ef293b10e1fbed819c0fd832a7e4d5104020250f207bb87186a95815e2357379b2dc3bc87ae2f37387c7c423bdf41122ec330712ad53f SHA512 551d3ec3fb2bb14ccecee8056d78511e9b739af8b00f41d60be9a840b661725ff2eb4b22d72d8a9ccafa22e61c99db8dff216d7fb8ce537446a95056abea4d93
 AUX matplotlib-3.6.0-test.patch 10781 BLAKE2B 797fe4c86d94ecbfa5b7699c63f68e663ab842cb0a5bdedb059103bd62bc91e73bf135d3fca49ba93bf246e0fc68012b8ee85a20c83582823cf210d238ec8d0c SHA512 195fdf5f6af23ba5eb72fbd65ded1066c7e400af73e5c64fe989a231c6a3a32f0eb8a2196b48a7ba39079e3815d4a6c346dcc41175b80a673c7beefaa85bbb53
 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
-DIST matplotlib-3.5.1.tar.gz 35320470 BLAKE2B ebf69b62ac587c61ecf8442abaab302019f63a3c9d8db6f7f7fb32f4d14da554fd8305ea6dfed2ff86a5af4e7e4d2b81f14802692fe50c986f7da8545bd26c00 SHA512 a317dbd748e5fc1fafcf80020cb6d38a8888431487beded97acd59d759e67e54f59506b642e4a03d4351c1ac050d15e3f2e2b5443433debc78ddad52881c8d82
-DIST matplotlib-3.5.2.tar.gz 35210006 BLAKE2B e3f90a0cf1d28f041a8cdd6920a8a4efe16169bb4acf85f7b2562196db306eeb692218728ea33c7b62214e7894e83a104954cbef38c45ccbb4f630bd35c0c36b SHA512 32844dfa85dbc43360c1773d748a58d2ab089111c51c825da62956c778a0eeaf10ca33a5c6c094295388a80d5873a2e1b17484e02b653e9e8e5ba98659329974
 DIST matplotlib-3.5.3.tar.gz 35236343 BLAKE2B 0d3f4e15295afe2c737e441325206e77c520a514bc87ab1eebef624f89896a2cf609e8d57b8fa8ef28ecf8c836e20cb296adaa95f81dbfcf3f2a45631e3dd02c SHA512 f431d3046e9c5fbe5d44a16a762e9a178ba34380974964660eaf3681671178866a63b3bad9aad8d3ad423926f7db2965d514e9b1489e3a824a4532a01f0e0670
 DIST matplotlib-3.6.1.tar.gz 35826557 BLAKE2B b30710436a773298dcdf233e592656d9815f55f0daab0cc28811b9adbfd3b2ede08f4c13e0dfa43c5fb283bc1ba96ea793084f3d65ba13b9697d14ffa406a273 SHA512 40b148fe4574eea88e7e74c2844a4811c71651602bd7e0a863482571bfa216c01d4f5fcd36add14af82c5cacdb6ae9d441ed251ee5239d06bcc8d40c9ee8841b
-EBUILD matplotlib-3.5.1-r2.ebuild 7230 BLAKE2B 003f7562ce03d398eecf1bc7cb9485b9109e6ab88a8277dcc26e34ecaee2e452f4af6ab34ff5c8de06c3c1548032cda3ecda9bf8bae635cceb4b4d2d8039b1a7 SHA512 7a325460d335521a132eb30594ea36a910c153f19ecac66303402e2821d0ab130f1fa91a69ae90a6a1746378876234f54d8c05c0695c09a827453c83e7d0b345
-EBUILD matplotlib-3.5.2-r3.ebuild 7389 BLAKE2B 0d41fcdbb4de4fe4ff68bbe7e77b931cce804cb2ba2ae62c3f7a597db6055b8a3d4e9bb49a084a30688f775a382a46ebb7fd8c1ce1cc914ee0ca2ab6a519b23c SHA512 0812494f86e37a65c4e800f9732437089d556fd866fad6084ad2bc1dd997ae53b5e9b7f431f5be73e8d24efc6afab770c211b8922c6450f4b1cd08ae55eff8c1
 EBUILD matplotlib-3.5.3.ebuild 7442 BLAKE2B d836df9fd184d6f55100527f9ff037e8707e2dd23c76b69beeafcff68c78d1bbbfc3de803b1a7ccdb6e4231d56fd97366495f162f2f9d1142979febf282f4eb3 SHA512 524ced6de727064ed0d2171dc410af864621842d189436941d90761abd3e7318d1704c7f8801ced1049235ab61c0548107805d3d6342f0dd3d085fe4fe657ced
 EBUILD matplotlib-3.6.1.ebuild 7493 BLAKE2B 12e64e26d7f46136281a97b780e8c11e2c611d2e242977dafde4e1f0e4fba09cc336e8b399efdf4353715f395b82ae8af0ea9262380ed4cd66fd5e306ca0b2d7 SHA512 7abb86a401f296ed6a9fd1ff526fa86ae3fcbd4f55c55facaba8e395d1cf19efe14e786e3eb181b272285b1227da7c94f63973c5c543dd5d99fb3b6ce66cc663
 MISC metadata.xml 1074 BLAKE2B 1d7dce116e09939378872c2eaf5153948b7e934626110eb4899d0dfc2781429522328f1c4efd2c40f829da64e19bed8f9fbd1b8907a6e74a5fd54587c1d29e5b SHA512 e344bfc813e09c24a8edfa9c062eb2a6c44535559370f508a27a2de20c6ab92aeb48bc8daf9c357178e513eb2474a33782e4098c0f3bcbb84b11f7388ef1a704
diff --git a/dev-python/matplotlib/files/matplotlib-3.5.0-test.patch b/dev-python/matplotlib/files/matplotlib-3.5.0-test.patch
deleted file mode 100644
index 214117d772ca..000000000000
--- a/dev-python/matplotlib/files/matplotlib-3.5.0-test.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-From 5487db555adb0385892216e7819a1bf6cea41116 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 26 Mar 2021 13:42:49 +0100
-Subject: [PATCH] Increase image comparison limits
-
-Most of the tests require exact match which apparently doesn't always
-happen in non-pristine environments.  Some of them have very big
-differences due to texlive font rendering changes.
----
- lib/matplotlib/tests/test_arrow_patches.py | 6 +++---
- lib/matplotlib/tests/test_axes.py          | 4 ++--
- lib/matplotlib/tests/test_backend_pgf.py   | 2 +-
- lib/matplotlib/tests/test_contour.py       | 2 +-
- lib/matplotlib/tests/test_figure.py        | 5 +++--
- lib/matplotlib/tests/test_image.py         | 2 +-
- lib/matplotlib/tests/test_legend.py        | 6 +++---
- lib/matplotlib/tests/test_lines.py         | 3 ++-
- lib/matplotlib/tests/test_streamplot.py    | 3 ++-
- lib/matplotlib/tests/test_units.py         | 4 ++--
- lib/mpl_toolkits/tests/test_axes_grid1.py  | 2 +-
- lib/mpl_toolkits/tests/test_mplot3d.py     | 2 +-
- 12 files changed, 22 insertions(+), 19 deletions(-)
-
-diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
-index 8d573b4adb..dfc42efcb9 100644
---- a/lib/matplotlib/tests/test_arrow_patches.py
-+++ b/lib/matplotlib/tests/test_arrow_patches.py
-@@ -67,7 +67,7 @@ def __prepare_fancyarrow_dpi_cor_test():
- 
- 
- @image_comparison(['fancyarrow_dpi_cor_100dpi.png'], remove_text=True,
--                  tol=0 if platform.machine() == 'x86_64' else 0.02,
-+                  tol=0.015 if platform.machine() == 'x86_64' else 0.02,
-                   savefig_kwarg=dict(dpi=100))
- def test_fancyarrow_dpi_cor_100dpi():
-     """
-@@ -82,7 +82,7 @@ def test_fancyarrow_dpi_cor_100dpi():
- 
- 
- @image_comparison(['fancyarrow_dpi_cor_200dpi.png'], remove_text=True,
--                  tol=0 if platform.machine() == 'x86_64' else 0.02,
-+                  tol=0.018 if platform.machine() == 'x86_64' else 0.02,
-                   savefig_kwarg=dict(dpi=200))
- def test_fancyarrow_dpi_cor_200dpi():
-     """
-@@ -115,7 +115,7 @@ def test_fancyarrow_dash():
- 
- 
- @image_comparison(['arrow_styles.png'], style='mpl20', remove_text=True,
--                  tol=0 if platform.machine() == 'x86_64' else 0.005)
-+                  tol=0.005)
- def test_arrow_styles():
-     styles = mpatches.ArrowStyle.get_styles()
- 
-diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
-index 17f8e5c631..b44cd454ef 100644
---- a/lib/matplotlib/tests/test_axes.py
-+++ b/lib/matplotlib/tests/test_axes.py
-@@ -868,7 +868,7 @@ def test_imshow():
-     ax.imshow("r", data=data)
- 
- 
--@image_comparison(['imshow_clip'], style='mpl20')
-+@image_comparison(['imshow_clip'], style='mpl20', tol=1.24)
- def test_imshow_clip():
-     # As originally reported by Gellule Xg <gellule.xg@free.fr>
-     # use former defaults to match existing baseline image
-@@ -4163,7 +4163,7 @@ def test_vertex_markers():
- 
- 
- @image_comparison(['vline_hline_zorder', 'errorbar_zorder'],
--                  tol=0 if platform.machine() == 'x86_64' else 0.02)
-+                  tol=0.015 if platform.machine() == 'x86_64' else 0.02)
- def test_eb_line_zorder():
-     x = list(range(10))
- 
-diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
-index 9b5b0b28ee..a374be0333 100644
---- a/lib/matplotlib/tests/test_backend_pgf.py
-+++ b/lib/matplotlib/tests/test_backend_pgf.py
-@@ -80,7 +80,7 @@ def test_common_texification(plain_text, escaped_text):
- # test compiling a figure to pdf with xelatex
- @needs_xelatex
- @pytest.mark.backend('pgf')
--@image_comparison(['pgf_xelatex.pdf'], style='default')
-+@image_comparison(['pgf_xelatex.pdf'], style='default', tol=0.8)
- def test_xelatex():
-     rc_xelatex = {'font.family': 'serif',
-                   'pgf.rcfonts': False}
-diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
-index 6396105f12..45b7022d03 100644
---- a/lib/matplotlib/tests/test_contour.py
-+++ b/lib/matplotlib/tests/test_contour.py
-@@ -341,7 +341,7 @@ def test_contourf_log_extension():
- 
- 
- @image_comparison(['contour_addlines.png'],
--                  remove_text=True, style='mpl20', tol=0.03)
-+                  remove_text=True, style='mpl20', tol=0.1)
- # tolerance is because image changed minutely when tick finding on
- # colorbars was cleaned up...
- def test_contour_addlines():
-diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
-index cb8f63893a..ef56c50d25 100644
---- a/lib/matplotlib/tests/test_figure.py
-+++ b/lib/matplotlib/tests/test_figure.py
-@@ -23,7 +23,7 @@ import matplotlib.gridspec as gridspec
- 
- 
- @image_comparison(['figure_align_labels'], extensions=['png', 'svg'],
--                  tol=0 if platform.machine() == 'x86_64' else 0.01)
-+                  tol=0.02)
- def test_align_labels():
-     fig = plt.figure(tight_layout=True)
-     gs = gridspec.GridSpec(3, 3)
-@@ -1000,7 +1000,8 @@ def test_subfigure_tightbbox():
- 
- @image_comparison(['test_subfigure_ss.png'], style='mpl20',
-                   savefig_kwarg={'facecolor': 'teal'},
--                  remove_text=False)
-+                  remove_text=False,
-+                  tol=0.013)
- def test_subfigure_ss():
-     # test assigning the subfigure via subplotspec
-     np.random.seed(19680801)
-diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
-index 719b190578..ee2263a88e 100644
---- a/lib/matplotlib/tests/test_image.py
-+++ b/lib/matplotlib/tests/test_image.py
-@@ -1324,7 +1324,7 @@ def test_nonuniform_and_pcolor():
- 
- 
- @image_comparison(["rgba_antialias.png"], style="mpl20",
--                  remove_text=True)
-+                  remove_text=True, tol=0.005)
- def test_rgba_antialias():
-     fig, axs = plt.subplots(2, 2, figsize=(3.5, 3.5), sharex=False,
-                             sharey=False, constrained_layout=True)
-diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
-index 21c8ab748d..a05cb4c571 100644
---- a/lib/matplotlib/tests/test_legend.py
-+++ b/lib/matplotlib/tests/test_legend.py
-@@ -102,7 +102,7 @@ def test_multiple_keys():
- 
- 
- @image_comparison(['rgba_alpha.png'], remove_text=True,
--                  tol=0 if platform.machine() == 'x86_64' else 0.01)
-+                  tol=0.02)
- def test_alpha_rgba():
-     fig, ax = plt.subplots()
-     ax.plot(range(10), lw=5)
-@@ -111,7 +111,7 @@ def test_alpha_rgba():
- 
- 
- @image_comparison(['rcparam_alpha.png'], remove_text=True,
--                  tol=0 if platform.machine() == 'x86_64' else 0.01)
-+                  tol=0.02)
- def test_alpha_rcparam():
-     fig, ax = plt.subplots()
-     ax.plot(range(10), lw=5)
-@@ -137,7 +137,7 @@ def test_fancy():
- 
- 
- @image_comparison(['framealpha'], remove_text=True,
--                  tol=0 if platform.machine() == 'x86_64' else 0.02)
-+                  tol=0.02)
- def test_framealpha():
-     x = np.linspace(1, 100, 100)
-     y = x
-diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py
-index f6917a134b..4a14abb74d 100644
---- a/lib/matplotlib/tests/test_lines.py
-+++ b/lib/matplotlib/tests/test_lines.py
-@@ -162,7 +162,8 @@ def test_set_drawstyle():
-     assert len(line.get_path().vertices) == len(x)
- 
- 
--@image_comparison(['line_collection_dashes'], remove_text=True, style='mpl20')
-+@image_comparison(['line_collection_dashes'], remove_text=True, style='mpl20',
-+                  tol=0.58)
- def test_set_line_coll_dash_image():
-     fig, ax = plt.subplots()
-     np.random.seed(0)
-diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
-index 88c3ec2768..b536ba3ff0 100644
---- a/lib/matplotlib/tests/test_streamplot.py
-+++ b/lib/matplotlib/tests/test_streamplot.py
-@@ -34,7 +34,8 @@ def test_startpoints():
-     plt.plot(start_x, start_y, 'ok')
- 
- 
--@image_comparison(['streamplot_colormap'], remove_text=True, style='mpl20')
-+@image_comparison(['streamplot_colormap'], remove_text=True, style='mpl20',
-+                  tol=0.002)
- def test_colormap():
-     X, Y, U, V = velocity_field()
-     plt.streamplot(X, Y, U, V, color=U, density=0.6, linewidth=2,
-diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
-index a6f6b44c97..ab5ad8b5cf 100644
---- a/lib/matplotlib/tests/test_units.py
-+++ b/lib/matplotlib/tests/test_units.py
-@@ -76,7 +76,7 @@ def quantity_converter():
- # Tests that the conversion machinery works properly for classes that
- # work as a facade over numpy arrays (like pint)
- @image_comparison(['plot_pint.png'], remove_text=False, style='mpl20',
--                  tol=0 if platform.machine() == 'x86_64' else 0.01)
-+                  tol=0.002 if platform.machine() == 'x86_64' else 0.01)
- def test_numpy_facade(quantity_converter):
-     # use former defaults to match existing baseline image
-     plt.rcParams['axes.formatter.limits'] = -7, 7
-@@ -103,7 +103,7 @@ def test_numpy_facade(quantity_converter):
- 
- # Tests gh-8908
- @image_comparison(['plot_masked_units.png'], remove_text=True, style='mpl20',
--                  tol=0 if platform.machine() == 'x86_64' else 0.01)
-+                  tol=0.02)
- def test_plot_masked_units():
-     data = np.linspace(-5, 5)
-     data_masked = np.ma.array(data, mask=(data > -2) & (data < 2))
-diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py
-index 3c4aa9a9eb..94ad419ceb 100644
---- a/lib/mpl_toolkits/tests/test_axes_grid1.py
-+++ b/lib/mpl_toolkits/tests/test_axes_grid1.py
-@@ -324,7 +324,7 @@ def test_zooming_with_inverted_axes():
- 
- 
- @image_comparison(['anchored_direction_arrows.png'],
--                  tol=0 if platform.machine() == 'x86_64' else 0.01)
-+                  tol=0.02)
- def test_anchored_direction_arrows():
-     fig, ax = plt.subplots()
-     ax.imshow(np.zeros((10, 10)), interpolation='nearest')
-diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
-index 5fee82f519..ed55a7bf68 100644
---- a/lib/mpl_toolkits/tests/test_mplot3d.py
-+++ b/lib/mpl_toolkits/tests/test_mplot3d.py
-@@ -1357,7 +1357,7 @@ def test_errorbar3d():
- 
- 
- @image_comparison(['stem3d.png'], style='mpl20',
--                  tol=0.0 if platform.machine() == 'x86_64' else 0.003)
-+                  tol=0.003)
- def test_stem3d():
-     fig, axs = plt.subplots(2, 3, figsize=(8, 6),
-                             constrained_layout=True,
--- 
-2.34.0
-
diff --git a/dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild b/dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild
deleted file mode 100644
index af0fa9dd9ef1..000000000000
--- a/dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
-
-FT_PV=2.6.1
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="https://matplotlib.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	test? (
-		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
-	)"
-
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
-
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.22.0[${PYTHON_USEDEP}]
-	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=media-libs/qhull-2013:=
-	virtual/imagemagick-tools[jpeg,tiff]
-	cairo? (
-		dev-python/cairocffi[${PYTHON_USEDEP}]
-	)
-	excel? (
-		dev-python/xlwt[${PYTHON_USEDEP}]
-	)
-	gtk3? (
-		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-	latex? (
-		virtual/latex-base
-		app-text/dvipng
-		app-text/ghostscript-gpl
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		dev-texlive/texlive-xetex
-	)
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	webagg? (
-		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
-	)
-	wxwidgets? (
-		dev-python/wxpython:*[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="
-	${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		>=app-text/dvipng-1.15-r1
-		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
-		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
-		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
-		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-luatex
-		dev-texlive/texlive-xetex
-		>=media-gfx/graphviz-2.42.3[cairo]
-	)
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-"
-
-# A few C++ source files are written to srcdir.
-# Other than that, the ebuild shall be fit for out-of-source build.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-distutils_enable_tests pytest
-
-pkg_setup() {
-	unset DISPLAY # bug #278524
-}
-
-use_supported() {
-	case ${1} in
-		wxwidgets)
-			[[ ${EPYTHON} == python3.[678] ]]
-			;;
-	esac
-
-	return 0
-}
-
-use_setup() {
-	local uword="${2:-${1}}"
-	if use_supported "${1}" && use "${1}"; then
-		echo "${uword} = True"
-		echo "${uword}agg = True"
-	else
-		echo "${uword} = False"
-		echo "${uword}agg = False"
-	fi
-}
-
-python_prepare_all() {
-# Generates test failures, but fedora does it
-#	local PATCHES=(
-#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
-#		"${FILESDIR}"/${P}-unbundle-agg.patch
-#	)
-#	rm -r agg24 CXX || die
-#	rm -r agg24 || die
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	# Affects installed _version.py, bug #854600
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-	local PATCHES=(
-		"${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
-		"${FILESDIR}"/matplotlib-3.5.0-test.patch
-	)
-
-	# requires jupyter-nbconvert
-	rm lib/matplotlib/tests/test_backend_nbagg.py || die
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	sed -e 's:\(@pytest.mark.flaky\)(reruns=3):\1:' \
-		-i lib/matplotlib/tests/test_*.py || die
-
-	hprefixify setupext.py
-
-	rm -rf libqhull || die
-
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -DNDEBUG  # or get old trying to do triangulation
-	tc-export PKG_CONFIG
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-
-	# create setup.cfg (see setup.cfg.template for any changes).
-
-	# common switches.
-	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
-		[directories]
-		basedirlist = ${EPREFIX}/usr
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[libs]
-		system_freetype = True
-		system_qhull = True
-		[packages]
-		tests = $(usex test True False)
-		[gui_support]
-		agg = True
-		gtk = False
-		gtkagg = False
-		macosx = False
-		pyside = False
-		pysideagg = False
-		qt4 = False
-		qt4agg = False
-		$(use_setup cairo)
-		$(use_setup gtk3)
-		$(use_setup qt5)
-		$(use_setup tk)
-		$(use_setup wxwidgets wx)
-	EOF
-
-	if use gtk3 && use cairo; then
-		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
-	else
-		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
-	fi
-}
-
-wrap_setup() {
-	local MAKEOPTS=-j1
-	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
-	"$@"
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-
-		# necessary for in-source build
-		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
-
-		VARTEXFONTS="${T}"/fonts \
-		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	# we need to rebuild mpl against bundled freetype, otherwise
-	# over 1000 tests will fail because of mismatched font rendering
-	grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
-		> "${BUILD_DIR}"/test-setup.cfg || die
-	local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
-	ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die
-	distutils-r1_python_compile -j1 --build-lib="${BUILD_DIR}"/test-lib
-	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
-
-	"${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(m.test(argv=['-m', 'not network'], verbosity=2))" || die
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-
-	# mpl_toolkits namespace
-	python_moduleinto mpl_toolkits
-	python_domodule lib/mpl_toolkits/__init__.py
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild b/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild
deleted file mode 100644
index 29caeb903c5c..000000000000
--- a/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild
+++ /dev/null
@@ -1,282 +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='tk?,threads(+)'
-
-inherit distutils-r1 flag-o-matic multiprocessing prefix toolchain-funcs \
-	virtualx
-
-FT_PV=2.6.1
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="
-	https://matplotlib.org/
-	https://github.com/matplotlib/matplotlib/
-	https://pypi.org/project/matplotlib/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	test? (
-		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
-	)
-"
-
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
-
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.22.0[${PYTHON_USEDEP}]
-	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=media-libs/qhull-2013:=
-	virtual/imagemagick-tools[jpeg,tiff]
-	cairo? (
-		dev-python/cairocffi[${PYTHON_USEDEP}]
-	)
-	excel? (
-		dev-python/xlwt[${PYTHON_USEDEP}]
-	)
-	gtk3? (
-		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-	latex? (
-		virtual/latex-base
-		app-text/dvipng
-		app-text/ghostscript-gpl
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		dev-texlive/texlive-xetex
-	)
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	webagg? (
-		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
-	)
-	wxwidgets? (
-		$(python_gen_cond_dep '
-			dev-python/wxpython:*[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-
-BDEPEND="
-	${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		>=app-text/dvipng-1.15-r1
-		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
-		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
-		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
-		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-luatex
-		dev-texlive/texlive-xetex
-		>=media-gfx/graphviz-2.42.3[cairo]
-	)
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-"
-
-distutils_enable_tests pytest
-
-use_setup() {
-	local uword="${2:-${1}}"
-	if use "${1}"; then
-		echo "${uword} = True"
-		echo "${uword}agg = True"
-	else
-		echo "${uword} = False"
-		echo "${uword}agg = False"
-	fi
-}
-
-python_prepare_all() {
-# Generates test failures, but fedora does it
-#	local PATCHES=(
-#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
-#		"${FILESDIR}"/${P}-unbundle-agg.patch
-#	)
-#	rm -r agg24 CXX || die
-#	rm -r agg24 || die
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	# Affects installed _version.py, bug #854600
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-	local PATCHES=(
-		"${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
-		"${FILESDIR}"/matplotlib-3.5.2-test.patch
-	)
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	hprefixify setupext.py
-
-	rm -rf libqhull || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -DNDEBUG  # or get old trying to do triangulation
-	tc-export PKG_CONFIG
-
-	unset DISPLAY # bug #278524
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-
-	# create setup.cfg (see setup.cfg.template for any changes).
-
-	# common switches.
-	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
-		[directories]
-		basedirlist = ${EPREFIX}/usr
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[libs]
-		system_freetype = True
-		system_qhull = True
-		[packages]
-		tests = True
-		[gui_support]
-		agg = True
-		gtk = False
-		gtkagg = False
-		macosx = False
-		pyside = False
-		pysideagg = False
-		qt4 = False
-		qt4agg = False
-		$(use_setup cairo)
-		$(use_setup gtk3)
-		$(use_setup qt5)
-		$(use_setup tk)
-		$(use_setup wxwidgets wx)
-	EOF
-
-	if use gtk3 && use cairo; then
-		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
-	else
-		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
-	fi
-}
-
-wrap_setup() {
-	local MAKEOPTS=-j1
-	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
-	"$@"
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-
-		VARTEXFONTS="${T}"/fonts \
-		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
-	fi
-}
-
-src_test() {
-	mkdir build || die
-	ln -s "${WORKDIR}/freetype-${FT_PV}" build/ || die
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken by -Wdefault
-		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg6-MatplotlibDeprecationWarning]"
-		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg7-MatplotlibDeprecationWarning]"
-		tests/test_testing.py::test_warn_to_fail
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# https://github.com/matplotlib/matplotlib/issues/23384
-		"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtagg', 'QT_API': 'PyQt5'}]"
-		"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtcairo', 'QT_API': 'PyQt5'}]"
-	)
-
-	# we need to rebuild mpl against bundled freetype, otherwise
-	# over 1000 tests will fail because of mismatched font rendering
-	grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
-		> "${BUILD_DIR}"/test-setup.cfg || die
-	local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
-
-	esetup.py build -j1 --build-lib="${BUILD_DIR}"/test-lib
-	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
-
-	# speed tests up
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	nonfatal epytest --pyargs matplotlib -m "not network" \
-		-p xdist.plugin -n "$(makeopts_jobs)" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/meson-python/Manifest b/dev-python/meson-python/Manifest
index 96ca9c5812c2..183e5908c60a 100644
--- a/dev-python/meson-python/Manifest
+++ b/dev-python/meson-python/Manifest
@@ -1,6 +1,6 @@
 AUX meson-python-0.7.0-defaults.patch 506 BLAKE2B 404c8d4803f4e6ca5244dc27c84f2c0440999e3fff87febeb12d1d304c7ed9f9358f6b958b5975d171995960bbf7681003180765d2bdb88e694e52c518a8381d SHA512 43b9825b9facdcf72f0b4b80a72aac8544ec1cedb14a79c53dbe37b190af170584acbb0d281d89ddeb199ea5ba720eb0de04c5294a3e7197019c58d7ee14d786
 DIST meson-python-0.10.0.gh.tar.gz 37739 BLAKE2B 028cbb191076b49946576b02d26a84079f412a178d9829bf85d579b8d3624e192e9394ade31524faf972ef4d105b7bf703e750529a7fafcbadf9a52d3c4876c6 SHA512 50d4d0bbf810948b4f218f25815058778b2a3ac8ff811d4d7cc699d1cfbcb75612d28789080b4e5ec3a47be03636389b7bf313366273abb733f77644758747cb
 DIST meson-python-0.9.0.gh.tar.gz 37253 BLAKE2B 29aa875dfc1c275ee4edab48bd2d46c783969fc0ab58f108be1a6443d5519028a2d36f666dc57c45d68ba77334cca2d11a0d4bfb8abb3822b537252c71b77286 SHA512 ae0927876533af65c5b1d8278ff6db3726f0551c160bfedcc602189fcad44c9412faa589738718aac2f10cf9497db8c632d89ccf1fb8519e6e7f4add78d8e52d
-EBUILD meson-python-0.10.0.ebuild 1005 BLAKE2B 927c2796ce70a0fb5216db118a728e6b7980016d8758822d57ffb4eaade86b3ee8281dbc88ffef432ebf0c13bc2823ececd74a30eeaba680fba1b8c4f8e4ef87 SHA512 dc160c9affef6ddd1f4e11317dcc408d8bce7e885c96ab137c4253a36b77f01ae8d3487d39e2c8d3591093fe1a36cd8142632228321bdd05887c44d590bd1199
+EBUILD meson-python-0.10.0.ebuild 1003 BLAKE2B 1670b8be0013fbb67787a92be6d65671821d9a0597e865ec84a2a92e22d31bb5fdd0fac760e2e3b91070bf9564ada05267618ddbd3e17f32d570c063e9d4838c SHA512 5f0a071573a1ca0e8a49e91cdf04c5f587a37ccc0751abd4891af9c40434144fc3e70296a40578abe561e70c463e7fbdf5a0f067f404f4ab09392e93eca6281a
 EBUILD meson-python-0.9.0.ebuild 988 BLAKE2B 6e2465b93b4de894ced85af09ff9e227c0a466a99551f51ef5c8f8f72475c6c9fe28c4a707c2f3ce8a3a393de2ec3ac80d26d477bab9584a91b533dd13206953 SHA512 9b5affd60de454a84150808d87c13b85ceb778558f5dd4c1a6fe74d37868aaccca355e4d6a4991420bf6444a1afed476791012745a85a4fa2fe5f657c7670b58
 MISC metadata.xml 352 BLAKE2B 581fd656bf2da3af0cb7a9f50ef99effc9c2fc54c5012a363a3aaf4cb5cb1715c8626aed86ea176ebbbc22ece33e8b0f76d5c818b4533f99b3bac5b92f75fff1 SHA512 7e57debaea115565ade7e8ab87af065c4580506225df1a203c92fea877a9b918ebfce6fd172412bf318be07a8a4548be492318e5626b31688ed2714f00594d54
diff --git a/dev-python/meson-python/meson-python-0.10.0.ebuild b/dev-python/meson-python/meson-python-0.10.0.ebuild
index 7ebf2dce84f0..f6bd5fa67ca2 100644
--- a/dev-python/meson-python/meson-python-0.10.0.ebuild
+++ b/dev-python/meson-python/meson-python-0.10.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 x86"
 
 RDEPEND="
 	>=dev-python/pyproject-metadata-0.6.1[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 5799a112d3ca..30d6cea8b740 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -3,6 +3,6 @@ DIST mkdocs-material-8.4.3.gh.tar.gz 9999624 BLAKE2B e7dbe0b3cd2e385db1882b5bdf9
 DIST mkdocs-material-8.5.2.gh.tar.gz 10262607 BLAKE2B 16fe2e9d377cf8361ddcf5bdd1f5b461783ef03a26894abd9cfe8ba3c88e4d89e5ee8da3e566b996ea1595a6600933d4140ca698f3a303e6fc4c2b32e208af1e SHA512 74066b3b85be3dc5f4380ab73a98dd07fc8430a65b6ec9a51f1513fa3f0703f3eff4567344642710bf8e91e8cf9193b552a58f865b86367f397d0c884e1849f8
 DIST mkdocs-material-8.5.7.gh.tar.gz 10362881 BLAKE2B 833e05a67570f7c341681f6fcc0b54f145044ae60512aef4fc6c366022700c6f257418a502cf0fd7c8a25f4be4c37f9ca591b5063e424ab2f6ef17b3fce01129 SHA512 d47866faed2c993d3e8daca0213cf9052a2e31449c2aa968c6a4451eaf2528094fdebda1ee7c6a12f1a0c502ef1c16a2aceaf03e7ec195117391beda8535a127
 EBUILD mkdocs-material-8.4.3.ebuild 1044 BLAKE2B bae6282cd8a771c6c6d9f11205442841ba82f970b1a0ce8490902931670a45fa0ff1b8ba08d2d4c9b819ab43a668b9acbbc4f84aa7c35f854519cd609b2472f8 SHA512 7aaf4b2f7e3f75e579300424d9d8c2418c96a96ca61c085b53ae15f152abbe142dbf13924b24d36eddf1321f6de1dc6d3d5a018e19612b2245cd860eb03818c6
-EBUILD mkdocs-material-8.5.2.ebuild 1045 BLAKE2B f973f72b347a875d6fe5e90915e7749217957554a6edbaee65ec27290db1de9b3631a6efd3ea5fa09680edede53351241fe33de203568cca45cd8d835dcce955 SHA512 bc18c7d13133c5a0c57475c90e97840cbd8d9ce3b067e29df10bed31da00b39b71f25caf7602e07316117d6c7dfacbda3a6216a027cb15f094f02cdd90be4a02
+EBUILD mkdocs-material-8.5.2.ebuild 1043 BLAKE2B 64de41e9ee9ed57b3648e038b535deac4f1750fd0dacc4efeb2ad9a465cf47276a58eacf5681ad5d6f8aaff10e5697b795baa32d92bd9210da7e0cfb94db6075 SHA512 7b6f13f3af4a5d5df020a5b40534e2a711d073cf139469be47217eede03efca4645c5c28e89f72921be478da080af9a5cce42985b95093b7f362dfc06aeb1854
 EBUILD mkdocs-material-8.5.7.ebuild 1262 BLAKE2B b53e7383ae9694fc31aff1a223003b346ab54b6fdc0840b0ed8c8b57b5e2d49685f191ed85d89d6a16c91e4a26e9ade7610286146efb44a00d6be3098722e2dc SHA512 5e23a1076f90df7ffb7d531deb11442420e3a51b7fd5ba20c6d32fa9df71483add41448c7444ee85cc8ba24df3ce942e972954d7b032497c525ec976eeb5f0bf
 MISC metadata.xml 1037 BLAKE2B 6997d0f85e31152c58092081b697d8934c54f933e188082eb55e5e9f252f57274f673e1d8e5b657907da2d1658f969cd67bdb32bdc05324746f211b718f3a4b2 SHA512 ccd4f4aa6e6e780d0aff5894b260eedb602d29cc25427c202561525d27de4a31d1e13f59267d8d732d0e12f3ca0485996bca6ef2a114e96b030259899e8ad47c
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.5.2.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.5.2.ebuild
index 0cb9c4691195..770d63466a9d 100644
--- a/dev-python/mkdocs-material/mkdocs-material-8.5.2.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-8.5.2.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-redirects/Manifest b/dev-python/mkdocs-redirects/Manifest
index 8aa0fb44970c..4737140a5bc8 100644
--- a/dev-python/mkdocs-redirects/Manifest
+++ b/dev-python/mkdocs-redirects/Manifest
@@ -1,5 +1,3 @@
-DIST mkdocs-redirects-1.1.0.gh.tar.gz 7000 BLAKE2B 7bb98549613926fd7ff3fd9ddf6469703589bb38051358baffc2989bc496df38b270f859f9f40a21d688a7a453d0a4d1532af339d4e43d1144324729ab84824f SHA512 4ccda56bc26fd005ed0a1b0651c65883ad1f87912fc1c61fa9089a0e84bf1d124e943d1fae6f5bac4a521676419dcd8d409524926334f2ea5ae8b0d2f2d4ee52
 DIST mkdocs-redirects-1.2.0.gh.tar.gz 7434 BLAKE2B cba7252865135c66ca467473e5c373b1779131dc0fdea47092d97d97d4222e6e9b38f9b312f0341af90b8a05a24c3c33250b060c2b3029d49dc970da0b2fc48e SHA512 e26260277f56005d8fab3a7e6d05187796356909d7ab4f8d6cd6edd535b0ee944e49faf5b6366269bfface1a855f399e3d95275a5f0967134f6c8e1256bef220
-EBUILD mkdocs-redirects-1.1.0.ebuild 708 BLAKE2B fcbd4e20062509d811174a6ca849fba6432c36163816acde5059fdf028b0a6993bd1ccccfe741af9c52340838f24b4336d7cc8f3d30822ecffb086802bf103a8 SHA512 a4d72cb9f7f8e5c09e364a15c7593dca6466a87d681f99e287f7c81b261550c727bf24faa5925bd73d846b85155a75629cf5e153160ad96722980cf5a13111f2
-EBUILD mkdocs-redirects-1.2.0.ebuild 710 BLAKE2B 78c9ecd5430897c885b5dfd7d23fafb3d8dc4177afa62aaef053397dd2415b1d77be7f62a0a41cd355ef36698e48aaeb6166cadc0d4ff740607649e19531fcaf SHA512 c8c86bad174b12776cb6ae74861729250938ac5c7a6b893753a7b12756ed64fa2c27c6492b062d05a97db867506a71c4af783f651899c74c228cb23b7da1ebe7
+EBUILD mkdocs-redirects-1.2.0.ebuild 708 BLAKE2B fcbd4e20062509d811174a6ca849fba6432c36163816acde5059fdf028b0a6993bd1ccccfe741af9c52340838f24b4336d7cc8f3d30822ecffb086802bf103a8 SHA512 a4d72cb9f7f8e5c09e364a15c7593dca6466a87d681f99e287f7c81b261550c727bf24faa5925bd73d846b85155a75629cf5e153160ad96722980cf5a13111f2
 MISC metadata.xml 425 BLAKE2B 0dba3e4e60feb48ee0e2b7bf308a6f8ba4f4c6bd6acf3f1cd9e61015fc550c1bc1dcfced21d42ae722286afa65a40b7491a73a159bc3d6244aead5104ab5fa68 SHA512 13a924e44d6c9689783e1c01473c055992a2b2b2357523e587ce1603c71928265045c306ecdee95de524f80dd5581a4dccd49e048369f128c37236744d1345d0
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.1.0.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.1.0.ebuild
deleted file mode 100644
index 6a3ecfd21ba6..000000000000
--- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.1.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
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Plugin for Mkdocs page redirects"
-HOMEPAGE="
-	https://github.com/mkdocs/mkdocs-redirects
-	https://pypi.org/project/mkdocs-redirects/
-"
-SRC_URI="
-	https://github.com/mkdocs/mkdocs-redirects/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
-	<dev-python/mkdocs-2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/twine[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild
index a1097be70143..6a3ecfd21ba6 100644
--- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild
+++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 922c3aa1d7b3..1283c493f5ab 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,30 +1,18 @@
-AUX numpy-1.21.0-no-hardcode-blasv2.patch 2839 BLAKE2B fcb8c6d538b00a1a5796ac58b06af2ee586200744e58fd8ba588f1ed4faba53fd3b4202a9469186db394eb3648b59240ab1304e233a6575d9f168e9d3e37b92c SHA512 8a88a34b8610771018cac7ac3fcad75b61a317a21423be7914473a4b9e2f40b18e80be486140da2e85c73544c2ed1cf030b23a1fbbd6815894a83b3536589125
-AUX numpy-1.21.4-build-compiler-args-ceph.patch 2033 BLAKE2B 63aae1b73e41332d5179d822aeefd5da3289505e9d6f6d7755a34746af5506113fb81eaccc08f1582ac5820d6fb2a1d00ee4ba98ef482f4adc72c7288069c6d1 SHA512 ffad960980048603012c0d435013f0f3326a8ecd26eba8ad27c1287b3eb624733c53ddeb270108c1d26339fefc1cb8faaea233ec6e2ac7a072a023ddb12868d0
 AUX numpy-1.22.0-no-hardcode-blasv2.patch 2710 BLAKE2B 71da07805e25acc58120da2b8d8692ec5893040eee3c2842620e2a9186062936082f34610d3056c44e44a921116f99158dfb7481c4eccc82d33b3b18a63b379e SHA512 87bcecee3435dedcd87128c81d0002a786b4b23928973216f32c8d12b797d6a9948c3e7b41142235abe35734683e6ef84c02ffe255ba492a0ad43626071dc5a9
 AUX numpy-1.22.4-py311.patch 1150 BLAKE2B b07b61133b70f59f350759d94fa45e9fe7ec6e9d795c9de5e374fc135dc2dc146a72b3b7f88c61ade00b511ae34ad304453d062c96a0278c153899229240788f SHA512 f55de836c2d9d379bb5ed7a87826143b1f54845d9eb0e215d416936096b2a0a6d4195857cd4dc2be1238c638059bff3e826d9b655acde7be859f00d93347382c
-DIST numpy-1.21.5.zip 10652289 BLAKE2B c5bded91e5d06670ea3ace51560411c61985dd89ff0455b833838320f1714cf788a21a60aefd7a0ff30ad0abb93c9d296f60e637944000efa090b6c259c1f47c SHA512 03affa9d0bbf42a8d35f5454f1527df28539e306dc2b313fa775625201a5fe9eb7376f443bba5d50e08567546708811beb7201819eeb2af5a0653b7d91249f78
 DIST numpy-1.22.4.zip 11458830 BLAKE2B c999a42119e8d71942e4df4802ea22eef6c1ab65e11ad1f8364dd811c3df0eae1c7499055e76b523dc011bc9574f4060e17ecc3ea8bd35f5247fa17e3e188364 SHA512 bb2993459157c43f8c419de98be1c832f108b4eb6b96e1d20f406eccd782681ad8d0f8653637962ac592abe7d75719c17678ec97f035f6c87d4c7f939a1a8a48
-DIST numpy-1.23.1.tar.gz 10716841 BLAKE2B c8b17bc6f1626a32fd62ac3e952f6ee4a5886ba9ab9721be540831d3cdb19c4ea7cefcb422b12384fd4804d12f6f4b0d8f1e0110306e426a2b92d5f98acd62f7 SHA512 b34fb627e0e548bae3cf4555c4c71ab4a170ade86a9ff4011a5dfac6aba29e2e04b1151b9364cd1efff004efc1c04b3bab111facbcdc3297f8c38d7a09c83e17
 DIST numpy-1.23.3.tar.gz 10726039 BLAKE2B 4b6d38fc0363ea89f173a0cd65368b7c154b45f7f661098378f7ef31208008d5ff17ae58eab72bed921d166d630a4eca3441fc3097cd41a4a945b8f8180375cc SHA512 e690ea2906c91e567df2c801fbfe41652dabd37208faa99d6e068bda423dcc9f88be013478e9b6c1a339c36ef4c44b07a067d44e4e9c4b2e4f1344cbcb0598a9
 DIST numpy-1.23.4.tar.gz 10728765 BLAKE2B bbac44cc8a09a36537e25f90833c2ad7d1e4025e7d3eebd3c73ae2f12f1109520b58d2a779324f542aa1f2787f8b6c50ea907eb5ab7b7b84ebe3f3342c3d8a09 SHA512 727ca8950b0fbd5670e939b1c9c5cea852781ec4254d56a1659a91dc0430fc10b01ffdd16e1bb28a62319f91029e087024f4c6298bfc859a6050bfb507edcff8
-DIST numpy-html-1.21.5.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.22.4.zip 23724824 BLAKE2B 44ea3da0a703a024a629c8413dfffaf760458b185d19452da0e7e23c819e19833291e10ebd07bdda794077574b8852a368036dda8335c2753cd481740497502a SHA512 4077d9974bfd7f2c189025c3740350652e6f8e0b5727fbc9711a1c0118c1e4ecc281d4876baf1c6a5dc802d20178d6b04a2922f14e9c321cd3b68228b1e295c3
-DIST numpy-html-1.23.1.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
 DIST numpy-html-1.23.3.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
 DIST numpy-html-1.23.4.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
-DIST numpy-ref-1.21.5.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-ref-1.22.4.pdf 7537013 BLAKE2B 702398fddde349901f9303f4788a3ae3cc4bb78b4d310e169fcc6193fd62b33947c89ede45ba9aaea55e74f6a6abc755d3d94428adce9a8163678c6718aec2da SHA512 c1617817f94ccdfe2bbdebdc9c6869beefa1369d5ab0897c1573d8fb5cb3de153f90d5588aae84a0f498fba57ad6bc5c0c5c2c3aefb119e2913e4ddf007cc8e1
-DIST numpy-ref-1.23.1.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
 DIST numpy-ref-1.23.3.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
 DIST numpy-ref-1.23.4.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
-DIST numpy-user-1.21.5.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 DIST numpy-user-1.22.4.pdf 3978348 BLAKE2B 87cc73cb1c406446eb9d86ea6cbaeac6ba13c7d2b2ffd47524483af1698c3efdfaafe61e987624c5ce01939494861413b271e9a96f49abbbe69d634b9be55c95 SHA512 8e04c0c90255038471de6ef0f8f4ed9e356d646b028bb16f667f3c59170eddaa0d86d48226462c5c17b8123b2a28a09982764979e9e76658b4e26cd0a976f3a1
-DIST numpy-user-1.23.1.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
 DIST numpy-user-1.23.3.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
 DIST numpy-user-1.23.4.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
-EBUILD numpy-1.21.5.ebuild 4250 BLAKE2B 566a16851c2b64a2960c578dd462380573c861ce31aae4ae04f298caa7be278a1d81bb315ae45d6d616d9169ce8c83c4e8308e979149b069f7aee909ef114fa5 SHA512 73185b6fb426e2c0851796ec9487992dfc5655f7b2e862ee881e9af2b9e8121beab5b81f315c91faf287f8aa50215956f5ae9298c8a16e7ad0ba8f5fd675bc50
 EBUILD numpy-1.22.4.ebuild 5017 BLAKE2B f96fc50d46976f644412066a0ca32f3f6cbe68e3af54076bd9567a827d2929cc5789483c54656f51cee2f3153f28382a3901ad0a79ddaef84e552be2ebe8e961 SHA512 368980e6e319284d242669515c225766c56805f95d53ee259b0e88b394132a9d1b0fdaa58c0577c5e12a9282755ce39701f6a8d463792d7a5cc0dd3d3340c6c6
-EBUILD numpy-1.23.1.ebuild 5065 BLAKE2B e984f016156601966e6eb5b8cfe23459e47ae98ae913758da1c8597e5aac41426c11ab902d898798b7faa6d2627b90573f3dfefb516ed6b68657a6d9af0ee267 SHA512 3ff53ea10a7dbcbaa106002cf533cf3f0369409145a4ca9588505e75a55adda8c96fde3e2ece3eb91f30c00a3e8f5a3436f68073417ebdfa801bd1a436ec875f
 EBUILD numpy-1.23.3.ebuild 4896 BLAKE2B cb89f6fd839ea412a25830cc3c94f5b3faa6fc7b2db52ef9d7e5852ccd1825774e1d9df8de918bb0113877bc4a3d8acf56de5c74073db54ef9a7914e550fa61e SHA512 634586d63cdd62f6286a54109b2ca1e699668e8698ca4e21ee9e6726b2f46f2b47304036d3c87177b415c5657a0385792aef0c6a53da81364b9ca6a25a5af520
 EBUILD numpy-1.23.4.ebuild 4904 BLAKE2B dc24a0d2a22d985086a49bdaf0333cdae749fa6ea344252636eb0279dfb6a706cf9574cff1529b64918bc99b0bf0184f76fad4228aa25df22c34dae8ac328a73 SHA512 c4771518334b27985b86b1fc41d322e4523b8a35309052a07a506400b1355e48abe88667550dd69e8c0e6fb9d6481eb1c24cd6edd1aa08b603dc1bd433de087e
 MISC metadata.xml 932 BLAKE2B 7a4af31f613bab05ff542da48bf6ff1484d9df2459f559516e71329451dd739d3df0fead507c8033d94ab9ed516b68efe7f21819a8cd6ca303643d8c8bc34e86 SHA512 32cb8c1ab61521a02cbec38f6ea383f074e50d46aa3462ddcb85710f9d348e8e628cf2a5725e3cd921cc32f02885a1b5f02125639f0ec885384eeeff7f468a06
diff --git a/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch b/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch
deleted file mode 100644
index 73c5cae90d00..000000000000
--- a/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Originally added in: https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-python/numpy/files?id=e5ce90a04e79f6413604e96e4803cb95ada7c859
-https://bugs.gentoo.org/567938
-diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
-index 82e864a5c..1d77e5854 100644
---- a/numpy/distutils/system_info.py
-+++ b/numpy/distutils/system_info.py
-@@ -501,33 +501,7 @@ def get_info(name, notfound_action=0):
-       1 - display warning message
-       2 - raise error
-     """
--    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
--          'atlas_threads': atlas_threads_info,                # ditto
--          'atlas_blas': atlas_blas_info,
--          'atlas_blas_threads': atlas_blas_threads_info,
--          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
--          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
--          'atlas_3_10': atlas_3_10_info,  # use lapack_opt or blas_opt instead
--          'atlas_3_10_threads': atlas_3_10_threads_info,                # ditto
--          'atlas_3_10_blas': atlas_3_10_blas_info,
--          'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
--          'lapack_atlas_3_10': lapack_atlas_3_10_info,  # use lapack_opt instead
--          'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info,  # ditto
--          'flame': flame_info,          # use lapack_opt instead
--          'mkl': mkl_info,
--          # openblas which may or may not have embedded lapack
--          'openblas': openblas_info,          # use blas_opt instead
--          # openblas with embedded lapack
--          'openblas_lapack': openblas_lapack_info, # use blas_opt instead
--          'openblas_clapack': openblas_clapack_info, # use blas_opt instead
--          'blis': blis_info,                  # use blas_opt instead
--          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
--          'blas_mkl': blas_mkl_info,          # use blas_opt instead
--          'accelerate': accelerate_info,      # use blas_opt instead
--          'openblas64_': openblas64__info,
--          'openblas64__lapack': openblas64__lapack_info,
--          'openblas_ilp64': openblas_ilp64_info,
--          'openblas_ilp64_lapack': openblas_ilp64_lapack_info,
-+    cl = {'flame': flame_info,          # use lapack_opt instead
-           'x11': x11_info,
-           'fft_opt': fft_opt_info,
-           'fftw': fftw_info,
-@@ -947,10 +921,7 @@ def get_libs(self, key, default):
-         return [b for b in [a.strip() for a in libs.split(',')] if b]
- 
-     def get_libraries(self, key='libraries'):
--        if hasattr(self, '_lib_names'):
--            return self.get_libs(key, default=self._lib_names)
--        else:
--            return self.get_libs(key, '')
-+        return self.get_libs(key, '')
- 
-     def library_extensions(self):
-         c = customized_ccompiler()
diff --git a/dev-python/numpy/files/numpy-1.21.4-build-compiler-args-ceph.patch b/dev-python/numpy/files/numpy-1.21.4-build-compiler-args-ceph.patch
deleted file mode 100644
index 6a31d2efe970..000000000000
--- a/dev-python/numpy/files/numpy-1.21.4-build-compiler-args-ceph.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://github.com/numpy/numpy/commit/689d905f501b7abbddf0fdef241fa586a83e5cd6
-https://github.com/numpy/numpy/pull/20116
-https://bugs.gentoo.org/802150
-
-From 7dcf62379f41407d8f9583d1c2016e3d8ec48384 Mon Sep 17 00:00:00 2001
-From: Hector Martin <marcan@marcan.st>
-Date: Thu, 14 Oct 2021 14:58:52 +0900
-Subject: [PATCH] MAINT: Fix issue with C compiler args containing spaces
-
-Instead of doing a dumb string split, use shlex to make sure args
-containing spaces are handled properly.
----
- numpy/distutils/unixccompiler.py | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py
-index 733a9fc5094..4884960fdf2 100644
---- a/numpy/distutils/unixccompiler.py
-+++ b/numpy/distutils/unixccompiler.py
-@@ -5,6 +5,7 @@
- import os
- import sys
- import subprocess
-+import shlex
- 
- from distutils.errors import CompileError, DistutilsExecError, LibError
- from distutils.unixccompiler import UnixCCompiler
-@@ -30,15 +31,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts
-     if 'OPT' in os.environ:
-         # XXX who uses this?
-         from sysconfig import get_config_vars
--        opt = " ".join(os.environ['OPT'].split())
--        gcv_opt = " ".join(get_config_vars('OPT')[0].split())
--        ccomp_s = " ".join(self.compiler_so)
-+        opt = shlex.join(shlex.split(os.environ['OPT']))
-+        gcv_opt = shlex.join(shlex.split(get_config_vars('OPT')[0]))
-+        ccomp_s = shlex.join(self.compiler_so)
-         if opt not in ccomp_s:
-             ccomp_s = ccomp_s.replace(gcv_opt, opt)
--            self.compiler_so = ccomp_s.split()
--        llink_s = " ".join(self.linker_so)
-+            self.compiler_so = shlex.split(ccomp_s)
-+        llink_s = shlex.join(self.linker_so)
-         if opt not in llink_s:
--            self.linker_so = llink_s.split() + opt.split()
-+            self.linker_so = self.linker_so + shlex.split(opt)
- 
-     display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src)
- 
diff --git a/dev-python/numpy/numpy-1.21.5.ebuild b/dev-python/numpy/numpy-1.21.5.ebuild
deleted file mode 100644
index cb8783f8a5e6..000000000000
--- a/dev-python/numpy/numpy-1.21.5.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs
-
-DOC_PV=${PV}
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://numpy.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
-	doc? (
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
-	)"
-LICENSE="BSD"
-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 ~x64-solaris ~x86-solaris"
-IUSE="doc lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	>=dev-python/cython-0.29.24[${PYTHON_USEDEP}]
-	lapack? ( virtual/pkgconfig )
-	test? (
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/numpy-1.21.0-no-hardcode-blasv2.patch
-	"${FILESDIR}"/numpy-1.21.4-build-compiler-args-ceph.patch
-)
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-python_prepare_all() {
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	# disable fuzzed tests
-	find numpy/*/tests -name '*.py' -exec sed -i \
-		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
-	# very memory- and disk-hungry
-	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	local deselect=(
-		numpy/typing/tests/test_typing.py::test_reveal[arrayterator.py]
-	)
-
-	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
-		# Degenerate case. arm32 chroot on arm64.
-		# bug #774108
-		deselect+=(
-			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
-		)
-	fi
-
-	if use x86 ; then
-		deselect+=(
-			# https://github.com/numpy/numpy/issues/18388
-			numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
-			# https://github.com/numpy/numpy/issues/18387
-			numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
-		)
-	fi
-
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TEST_DIR}/lib" || die
-	epytest ${deselect[@]/#/--deselect }
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.23.1.ebuild b/dev-python/numpy/numpy-1.23.1.ebuild
deleted file mode 100644
index 824af156fd66..000000000000
--- a/dev-python/numpy/numpy-1.23.1.ebuild
+++ /dev/null
@@ -1,192 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs
-
-DOC_PV=${PV}
-# For when docs aren't ready yet, set to last version
-#DOC_PV=1.23.0
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="
-	https://numpy.org/
-	https://github.com/numpy/numpy/
-	https://pypi.org/project/numpy/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
-	)
-"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
-	lapack? (
-		virtual/pkgconfig
-	)
-	doc? (
-		app-arch/unzip
-	)
-	test? (
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/numpy-1.22.0-no-hardcode-blasv2.patch
-)
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-python_prepare_all() {
-	# Allow use with setuptools 60.x
-	# See numpy-1.22.1-revert-setuptools-upper-bound.patch for details
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# very disk- and memory-hungry
-		numpy/lib/tests/test_io.py::test_large_zip
-
-		# precision problems
-		numpy/core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
-
-		# runs the whole test suite recursively, that's just crazy
-		numpy/core/tests/test_mem_policy.py::test_new_policy
-
-		# very slow, unlikely to be practically useful
-		numpy/typing/tests/test_typing.py
-	)
-
-	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
-		# Degenerate case. arm32 chroot on arm64.
-		# bug #774108
-		EPYTEST_DESELECT+=(
-			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
-		)
-	fi
-
-	if use x86 ; then
-		EPYTEST_DESELECT+=(
-			# https://github.com/numpy/numpy/issues/18388
-			numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
-			# https://github.com/numpy/numpy/issues/18387
-			numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
-			# more precision problems
-			numpy/core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
-		)
-	fi
-	if use arm || use x86 ; then
-		EPYTEST_DESELECT+=(
-			# too large for 32-bit platforms
-			numpy/core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
-		)
-	fi
-
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# known problem
-		'numpy/typing/tests/test_generic_alias.py::TestGenericAlias::test_pass[__dir__-<lambda>]'
-	)
-
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TEST_DIR}/lib" || die
-	epytest -k "not _fuzz"
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 8b703cef207e..c695ddd3fd38 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,8 +1,6 @@
-DIST pandas-1.4.4.tar.gz 4949620 BLAKE2B 7ce236ae28ed6c6857a3acf6936aad2b1dc53a048986809d8dedbb9595dd2234bacbe114b74d8a171a6b31254372ea262566b134e7b5b24d5d4666938c7e6154 SHA512 a12e92dd751ed2342d9291724833732cdadbc9791e59533b9efded570b9893bacbe2f10e6bc70d673adb9356dcb0ae3d64d8a1dfe6ae8a3c70e474556ded4d91
 DIST pandas-1.5.0.tar.gz 5191537 BLAKE2B c7dec1d0197e6ac860667177f0f255bb327dbd48fe4501280d578b93f4496e61c0847dc478effeb8c5729d7a9d3e8a643c01db095a9843d6d211a9420f94d42c SHA512 8d340da1e0dff9b64c8993359b35ddcfc796fa15fee1bf1a27ea5a12e33f8b20d45bfac0ff9275b16ff0d4f7855a73962629e06c62bc08ca5e21b4ef1ea29ec2
 DIST pandas-1.5.1.tar.gz 5199286 BLAKE2B 17d98870f3397d7a9289a18708021a614b1d456e2ea99dae8927727aabb8aab73bd31f25c3035947f8f4c38404e7d971bf999500b300307b19a2cf6029763d0e SHA512 e5f25f21f17f36c6488f14fbfa391beb9f1989652de01cb8346d2826dead9331fea27295ee1e6f42d0875f2f1a91fcd23d606edd339432589bca5ba8d89e5ecd
-EBUILD pandas-1.4.4.ebuild 6486 BLAKE2B 65421968a776be789bd034222242ec3ed5a43b25e0fbe7f136b20ed46d16f8bf99af85673a1544aceef25997fc761f7a558c10f9358b06061a654772529861b3 SHA512 78f9a087894510b87e777e6ed0c64d3c75b640858f8be52332767985dd111dca46d4338d40bfd662d0785d06e8f5609657108eae740442ae6edd0e8cdac9f5e7
-EBUILD pandas-1.5.0-r1.ebuild 6752 BLAKE2B cdf46e171d595990224a00261be8a70cf03c7bf4860d55ac04edf2a8fce8c92d77cc542814023ef9f1f775ed1689f98cbc3fa07dc09e4416a5ecf605e3be844f SHA512 3cb71918734101adf9c27ec6e3f72e41edb086b0a14fc48876bdb0c132f6aee8adc6914c86344319d4888050ad431f18481409198d5bcf7c15e546dac3204101
+EBUILD pandas-1.5.0-r1.ebuild 6749 BLAKE2B 24a084d7b7cd8074743e9b4b0aa12bce17fc65c25873f44485c59d388ace4a77ffc13cf1b588407167b2d89b2480ab86a0de51807e9a58192ece939b735e138b SHA512 c6a04878173dc01d7b2d823af04058b0932148270282e37b999249f00a0039e0273fb4a5eec476875715b86a5c7bcd52612453c02dcc7de05f6d20ced2c75913
 EBUILD pandas-1.5.0.ebuild 6573 BLAKE2B 3a9802fed6b00bc865b8fdf3ceeb68c537979f83e38b4aab3fd06e8ddd66e41c88a5b7c87cafc214c25139dcddbf44484c1fd0b9f0647ba6f14a468a256a903a SHA512 db1eec6bc4a5309daae1752f41cd6c8476528a812fe9d3f948b1392e155202ca6711d7244db7d7c7f88998b557ccfdfd214f2ae3c79ba5b730d9f08c45d0954a
 EBUILD pandas-1.5.1.ebuild 6837 BLAKE2B d1e6ba85ce3fecfa09420bdab447bc213e7cddb16a34e10135f1d04c734c3fde91caa298fdfdf4c7b9935af623f9a6a4e6cc85cb73498c9f68a54f04bd40e652 SHA512 186326daf4876ca1762fef866b08694c834a41ee18132f14e9e8ec7f7dee40bdb932e833192ba1a3c9888e894feb91652bbb4676d96c4e2dd2981b3bbeebc942
 MISC metadata.xml 920 BLAKE2B d6bd854acdd851d578038657d91adaedf4f220dbdc5905ebba5e35e74437c6d5bc2384061f7796a6f359aa128c526485635debfd0e1a9646d09daed740167c87 SHA512 dcd949e89cae9df918acb3cf8be5ad8c396ee5e646d2179aa2b646fafa15ffc11e9ccf853df8d7fdcc787f88ce7063639d8d87715aaba943774edc8ad98b540a
diff --git a/dev-python/pandas/pandas-1.4.4.ebuild b/dev-python/pandas/pandas-1.4.4.ebuild
deleted file mode 100644
index 15cb8dde1586..000000000000
--- a/dev-python/pandas/pandas-1.4.4.ebuild
+++ /dev/null
@@ -1,198 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-VIRTUALX_REQUIRED="manual"
-
-inherit distutils-r1 multiprocessing optfeature virtualx
-
-DESCRIPTION="Powerful data structures for data analysis and statistics"
-HOMEPAGE="https://pandas.pydata.org/
-	https://github.com/pandas-dev/pandas/"
-SRC_URI="
-	https://github.com/pandas-dev/pandas/releases/download/v${PV}/${P}.tar.gz
-"
-S="${WORKDIR}/${P/_/}"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="doc full-support minimal test X"
-RESTRICT="!test? ( test )"
-
-RECOMMENDED_DEPEND="
-	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/numexpr-2.7.0[${PYTHON_USEDEP}]
-"
-
-# TODO: add pandas-gbq to the tree
-OPTIONAL_DEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/blosc[${PYTHON_USEDEP}]
-	|| (
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	|| (
-		dev-python/openpyxl[${PYTHON_USEDEP}]
-		dev-python/xlsxwriter[${PYTHON_USEDEP}]
-	)
-	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/xarray-0.12.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/xlrd-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/xlwt-1.3.0[${PYTHON_USEDEP}]
-	!hppa? (
-		dev-python/statsmodels[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
-	)
-	X? (
-		|| (
-			dev-python/PyQt5[${PYTHON_USEDEP}]
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-COMMON_DEPEND="
-	>=dev-python/numpy-1.21.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.1-r3[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2020.1[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
-	doc? (
-		${VIRTUALX_DEPEND}
-		app-text/pandoc
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/nbsphinx[${PYTHON_USEDEP}]
-		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/xlrd[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		x11-misc/xclip
-	)
-	test? (
-		${VIRTUALX_DEPEND}
-		${RECOMMENDED_DEPEND}
-		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5.5.3[${PYTHON_USEDEP}]
-		dev-python/openpyxl[${PYTHON_USEDEP}]
-		dev-python/pymysql[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.31[${PYTHON_USEDEP}]
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
-		dev-python/xlsxwriter[${PYTHON_USEDEP}]
-		x11-misc/xclip
-		x11-misc/xsel
-	)
-"
-# dev-python/statsmodels invokes a circular dep
-#  hence rm from doc? ( ), again
-RDEPEND="
-	${COMMON_DEPEND}
-	!minimal? ( ${RECOMMENDED_DEPEND} )
-	full-support? ( ${OPTIONAL_DEPEND} )
-"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^              'sphinx.ext.intersphinx',/d" \
-		-i doc/source/conf.py || die
-
-	# requires package installed
-	sed -e '/extra_compile_args =/s:"-Werror"::' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile -j1
-}
-
-python_compile_all() {
-	# To build docs the need be located in $BUILD_DIR,
-	# else PYTHONPATH points to unusable modules.
-	if use doc; then
-		cd "${BUILD_DIR}"/lib || die
-		cp -ar "${S}"/doc . && cd doc || die
-		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# test for rounding errors, fails if we have better precision
-		# e.g. on amd64 with FMA or on arm64
-		# https://github.com/pandas-dev/pandas/issues/38921
-		pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
-
-		# TODO
-		pandas/tests/api/test_api.py::TestTesting::test_util_testing_deprecated
-		pandas/tests/api/test_api.py::TestTesting::test_util_testing_deprecated_direct
-		pandas/tests/io/test_clipboard.py::TestClipboard::test_raw_roundtrip
-
-		# TODO: these require a running db server
-		pandas/tests/io/test_sql.py::TestMySQLAlchemy
-		pandas/tests/io/test_sql.py::TestMySQLAlchemyConn
-		pandas/tests/io/test_sql.py::TestPostgreSQLAlchemy
-		pandas/tests/io/test_sql.py::TestPostgreSQLAlchemyConn
-	)
-
-	local -x LC_ALL=C.UTF-8
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
-	epytest pandas --skip-slow --skip-network -m "not single" \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
-		einfo "An initial build of docs is absent of references to statsmodels"
-		einfo "due to circular dependency. To have them included, emerge"
-		einfo "statsmodels next and re-emerge pandas with USE doc"
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
-	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
-	optfeature "for msgpack compression using blosc" dev-python/blosc
-	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
-	optfeature "Plotting support" dev-python/matplotlib
-	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-3.0.0" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
-	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
-	optfeature "R I/O support" dev-python/rpy
-	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
-	optfeature "SQL database support" ">=dev-python/sqlalchemy-1.3.0"
-	optfeature "miscellaneous statistical functions" dev-python/scipy
-	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
-}
diff --git a/dev-python/pandas/pandas-1.5.0-r1.ebuild b/dev-python/pandas/pandas-1.5.0-r1.ebuild
index b2de50f560c0..6f20e3a52481 100644
--- a/dev-python/pandas/pandas-1.5.0-r1.ebuild
+++ b/dev-python/pandas/pandas-1.5.0-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index 91575c096d73..3b9d74640182 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,5 +1,3 @@
-DIST peewee-3.15.2.gh.tar.gz 905707 BLAKE2B 7441586c8da5080a50964a4d8e5c73f28b8e1adeb45b4ced675c70f55cb3264460014dbab36f097fbacfc2fce8cf3f42ef36a6c1737a671ecd8bfede6af82c8e SHA512 6fa574161cdd224104bb428b9935574d3dc69ec574e5887ab68c7686d63af856787e3411e27703773c0e2f75f51915da569538662a908c225ace3c14c78892b9
 DIST peewee-3.15.3.gh.tar.gz 906883 BLAKE2B 4cc76b4288e8b8e36b4df2f42e31c8eeec314b2af28612d272699e6cc79d836fdc8800f18883e721fd98ca04bf58b0ed26ba61ab36280d28a32d1ca18ab6577c SHA512 bf297423178fca432add6e1ef2aba41ebd87d2bdc34e47872b5c35573dd9eedd42a290cad53dfce68e0bc0e07bb537064c25bf6b43b43d678302d6345eaa35a4
-EBUILD peewee-3.15.2.ebuild 793 BLAKE2B 778fd78312c5195d849b0c256370841eb7e6932c65709b7a47654ca5306330607bb433a853c2858c662d244a272b85d290677c531303f0a7857dcaa3c58f9467 SHA512 9a703a8aa38f152abfcceb24f1dbc1b26aaf50a5951a65fbb3d4efac8e2d0309197398823e1846191ff56ac78ac591d41c77bed40e1a39433abbd0a5be5b9f1b
-EBUILD peewee-3.15.3.ebuild 795 BLAKE2B 47791866b281534ea68bd6fb010e0b65710bf536d07150dfe35d0b6efe477e6b78aa3bd0b6e9788bfee318fcb251bf83d7ddfd37daa9ca5bfad41f7a3866a95f SHA512 c05561a8165b10933de8a922a0552f03418b0a8509fb5115bda18545652410e1c5802c0480030081dc108ee258b329b6b255ebc93d70f89704acf6effaec71dc
+EBUILD peewee-3.15.3.ebuild 793 BLAKE2B 778fd78312c5195d849b0c256370841eb7e6932c65709b7a47654ca5306330607bb433a853c2858c662d244a272b85d290677c531303f0a7857dcaa3c58f9467 SHA512 9a703a8aa38f152abfcceb24f1dbc1b26aaf50a5951a65fbb3d4efac8e2d0309197398823e1846191ff56ac78ac591d41c77bed40e1a39433abbd0a5be5b9f1b
 MISC metadata.xml 365 BLAKE2B 144b870f5470e3de971f47316313980f95a3453c684fb7c326da025bef8a4e29dc0731808eefdecbb059a49ad77dd4166b3595554ac42d0578bda75c17fc06bf SHA512 9445bc6cf059e5c95c1e9ce5eebad887a43133ea0fad3fb7b70f60395e79bf30a42d893aa65d4c328e7c304b24a86fbdf3939b9ecccad318db01e95c3b4521f3
diff --git a/dev-python/peewee/peewee-3.15.2.ebuild b/dev-python/peewee/peewee-3.15.2.ebuild
deleted file mode 100644
index f02e5148a095..000000000000
--- a/dev-python/peewee/peewee-3.15.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Small Python ORM"
-HOMEPAGE="
-	https://github.com/coleifer/peewee/
-	https://pypi.org/project/peewee/
-"
-SRC_URI="
-	https://github.com/coleifer/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	"${EPYTHON}" runtests.py -v 2 || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && DOCS=( examples/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/peewee/peewee-3.15.3.ebuild b/dev-python/peewee/peewee-3.15.3.ebuild
index 82b01219bc7a..f02e5148a095 100644
--- a/dev-python/peewee/peewee-3.15.3.ebuild
+++ b/dev-python/peewee/peewee-3.15.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index 0004489dac6c..4b7019e37f43 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -1,7 +1,6 @@
 AUX priority-1.3.0-test-timeout.patch 716 BLAKE2B b48691b508a4116c9656acaa3a31871e5c8a66c45d6724506590c95e09eac027969def8198c5bdaa14e50cd77ea105881b7ddb7f36c95665502799f5ea751b6d SHA512 9e809600bc972baf4e1f5366c65db5e5d050bcfd0df23da3d1f75f653a0fdc27f7e4a59e96e13bd42636360653dfdc1de1991e6684e95bfffbf0c4384d7dc550
 DIST priority-1.3.0.tar.gz 13827 BLAKE2B 8c100eb44ed42f4f624bfb37dd6f698a3da84812783bd44ba82afef565562379a7677b3cbc9e16c4ea5a5dcc91d0897fa47c341a81bc1875461a72aff328fcff SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a
 DIST priority-2.0.0.tar.gz 24792 BLAKE2B c230f74aba3153edafba4bf85965a726ac3d3f5e2293d7c496b65fda260722cc44e4582666eee9d715e0d0686695434f8e0cbbd089c105bb45b777bf6eb4d72c SHA512 f90648a3ff1ee4131f30e99ecd8c36110abf484733f507edefcede8fdcb9ec3a618b9278e85724855709f41facee438061e4c5cae201b6e916c22f4a451db575
-EBUILD priority-1.3.0-r1.ebuild 771 BLAKE2B 03f1e1e7622b96eee80e37a991ad03b622a2a00e61bfc82eaf79ef7f04dcac7d5e436a0abe05f4ebc18654c28453d9caca6b0fdc6f873cdb6e8782092c3ca357 SHA512 50e3ae2d7604c32d36f81d6c31c8614a81b778782503f808eb64f3545af6419d7428d2deb85bad4f736f80b49eef62ce832e72c5348dd75e8545f5f78dce9fe6
-EBUILD priority-1.3.0.ebuild 718 BLAKE2B 31df88a983cca618ab29ea6e17efc147a7e3c9b76e4648e3070e58ee0ebc71ab99848090b2f5640ef73e79fee515164f82c15bf4fed3a336d045c141b8cd5d72 SHA512 f0e97a067ebb736e5a50e840ab39618455730cda04991a31f9cc1905f55753635ccc5daf1e2738c654d557ef751ad16580910b531d39115dec6ab83bb3c31ea0
+EBUILD priority-1.3.0-r1.ebuild 763 BLAKE2B ccc0e43cd0cff1ffa1ed46838f205654782b17f8b942a7267b5dd78461a376ad4bfce984340ae702bf05004b39032116d3dd99000117762f24413ea32b29cf4e SHA512 4a7d47528242cc50c09f8ee1c11e953adb7c64f182d2763c520e7970327e6701be7461744c4b474a1965145a93e0581e0945b29ab5be5e6301f713f6f11d6e4d
 EBUILD priority-2.0.0-r1.ebuild 701 BLAKE2B 4f965add99cf3b4e05740b8e4658900897c19147e8103ebb908c144b6859a8fd65efc5639a18c30a409764229f4d9b1d87999254e9a7808a8b5fbe46a0d98978 SHA512 410e923e0e0bfbf4c4fa3b9e38d2b762068b8e997462d587f701bd7f227e3c2779092de77b58ce199b70de3b3401bd6eb54ccd9af5fbaba810859a2cb72f9bb8
 MISC metadata.xml 864 BLAKE2B a4d4d8f4f8c2f4fa5223060a708f5ce75d8cb8c9bbee43e3c9a71eb4d06e0ae675e8864fb3538c971617f138cf4f548e2bc2884f930a0fb40bdb270aad0c2736 SHA512 4c9a614833f2e769551cd584cc80601ea7bd5a630afd4de760a6a219cf50bb65fba9db137dcd8ebed52a0a00e606a24288f347785a3e2fbce4777ade324e0080
diff --git a/dev-python/priority/priority-1.3.0-r1.ebuild b/dev-python/priority/priority-1.3.0-r1.ebuild
index 7d55561bc434..dc8588ddef73 100644
--- a/dev-python/priority/priority-1.3.0-r1.ebuild
+++ b/dev-python/priority/priority-1.3.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? ( >=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}] )
diff --git a/dev-python/priority/priority-1.3.0.ebuild b/dev-python/priority/priority-1.3.0.ebuild
deleted file mode 100644
index 3f3f8c48a67e..000000000000
--- a/dev-python/priority/priority-1.3.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure-Python implementation of the HTTP/2 priority tree"
-HOMEPAGE="https://python-hyper.org/priority/en/latest/
-	https://github.com/python-hyper/priority
-	https://pypi.org/project/priority/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? ( >=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/priority-1.3.0-test-timeout.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/pydiffx/Manifest b/dev-python/pydiffx/Manifest
index eacdac5f1264..7ab206c1f139 100644
--- a/dev-python/pydiffx/Manifest
+++ b/dev-python/pydiffx/Manifest
@@ -1,5 +1,5 @@
 DIST diffx-pydiffx-release-1.0.1.tar.gz 82838 BLAKE2B 80ac477ff6b72dd089f134afc988251b20f7675e05c429e12238800145ed70f57acca835ddfdd77a2b22e53767b77d741537aad02f93bdefcee06a44965c7904 SHA512 dcb6b9dad321c5bec940d13dcf64853587c4e7636d34ea3ac4bc2b54df8915e1ac9804932034c069fcfba5f10f05972cc7dc46ba0d37c2e08c684bcbb2c2409e
 DIST diffx-pydiffx-release-1.1.gh.tar.gz 83721 BLAKE2B fb38b40f4385e00bd8ac45111ac6308b8a5ba7148e74c020c9e7c6b5480466b2301e580f93c98d761087f443339394c124eee061edafd454f0d71839103a6caf SHA512 596d9d70134cadcbdb8fbdd10fe22f8922276d1a822c60430e765b70b0fba9cd16578c94743aef4afaae7ab8409cc2e171028a154cd1231ad6c54dbe229b93e3
-EBUILD pydiffx-1.0.1-r1.ebuild 855 BLAKE2B 40717678dd1d34802f14953f3cde16336ae8e80d233bc0147d6a6e6fdd667fefcd0fb60aedfe5ca54aebce0fd4367a9a952de746565c4a7cbb6379fff5955990 SHA512 accd8ffd126b6dfdd4f5500ff9c69a46126fafc7653ae6a8ad88b9c48dff98372fe3a523405be020a6eab03a25b62fcd82aa4f747ff0eceb7b77767d2de85785
+EBUILD pydiffx-1.0.1-r1.ebuild 853 BLAKE2B ed3077dd40aed16740e358bf4bfabe19a321af5191013b8f32c50bfdece1521888a5ae3b3b97ffb4306bf8f61ec4f3f6e5bd6266ff7057a231b23e1eeb88e4ee SHA512 6b446798dc901f1a1b190642ab464bda2876f92805524e4e56498dfa74ab775629887ce6a36347bbd5f8fdeabc1dfd751ff6cf399a30690018c87a49206e6d65
 EBUILD pydiffx-1.1.ebuild 858 BLAKE2B a81026d2922ebc38f20c3a24be68a832c8b761d8900e057308d13ba53a9095bf64122db7a28d2b1ba3396f668abc309824c7fc70df7cfe32bcf4a6d8f89616a2 SHA512 8b81a39fb024d1b9eae848ca9a50db5fb3297f384a222ead5493f18d53503cf3429ee0b94b8f0dfb40a1a3330facae76e76ca3511ab4f9fa2bd76b8ba5caa70a
 MISC metadata.xml 391 BLAKE2B 76c0b2eac63df75f2ad64518c4afff762891acab6983e22f7b5e7e270fc3eec64f5e8b05dfd82125cf2b9a251dd827eca9a5173852345dcf37cb5a7a41940ccb SHA512 2f15007d5da3fb592458d72cb0ad267f5fdc2e3cbb1c6df351fcf28f897ff7a98992d6ffd7e3c1050edcd57b1d40ef66874e8bb25178c01762feae62f23e436c
diff --git a/dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild b/dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild
index a5106d25a571..92f4b98b4615 100644
--- a/dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild
+++ b/dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}/python
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/pykerberos/Manifest b/dev-python/pykerberos/Manifest
index f6f06a7e2a5e..025ff80aaa16 100644
--- a/dev-python/pykerberos/Manifest
+++ b/dev-python/pykerberos/Manifest
@@ -1,5 +1,5 @@
 AUX pykerberos-1.3.1-python3.10.patch 1099 BLAKE2B afe1d4639bd3773f075453a4549c270450a5c89671b650e9ee76219abec84b6c1dd2fcc1b2b77db6937d5303f89e562deda1405a3963221259bec3ce506def5f SHA512 dae8c3f6419ecc22ec9f3385053275bd13f9468721c1a419c9166153e49251d5499582f184f2dbaa7a194a591436229d9bcbe558cedf46237dc5cc15929faa05
 DIST PyKerberos-1.3.1.tar.gz 41954 BLAKE2B b95a3473c5803ebcb461db7f2589caa03e92f4cb3ba3a4890a31db99b687aa4c77ae4e58f09ae2339a1fd8acf6fe9ab5797e3b7178dfeb2ee7a95bb851fff402 SHA512 dcadc5c3b095d8bba947a745ac84cc558d7eebad139a0e86260891966786506a7a62600fde93fa14683971e436da8cc5cd3795817b20ba45ce7e39f8c05deb53
-EBUILD pykerberos-1.3.1-r1.ebuild 1342 BLAKE2B 5346af5a57b23c571c34a314fa27a55cd93e2d58aa3f82c9fe5b0943b442f255634876f4108b2ce41ff6b589b98fe97bdf44f40b56eea34931e11cfa7bae5225 SHA512 874c0f660ef5cc84aa1417a173354f7f8c0fc6906d835c268bf23fb6222664f2c3cfd0a5695b3ccfdd63471a3da4dceaa18907a26e5724de4834bed138b7a6b3
+EBUILD pykerberos-1.3.1-r1.ebuild 1340 BLAKE2B 4f96183d3c8180d04b30daf9a213f4f4b23eeebcd0500054a1c97114df282a59a30d9904bdf1b682debbd1e7944e99c79b1b05a8d06e5d2aa3afa4a5d9392f9d SHA512 b55fabd181d3476f2618c040a5b14034f1512398ea1fcc613f8049ce54f02ce6beb5a90cb93a6311209288c5dbd53ec9b448c53c37bd292c1dff74794ceb9d66
 EBUILD pykerberos-1.3.1.ebuild 1283 BLAKE2B 19ecf428a0c437ddd2fb5786cc67913c884625be7c9eb220a6a40ec03a503f4cc2dd62e8940a644a99da808512bc1444da38b65bb109bdeeee48601ce689cb90 SHA512 9fa37d66f2c00937a1b23aa675d4faf15c65cb3dbb36e9821965140f65d257bc8d0ad866d1333050f6f9bba8712d301471046765da61dcadaa1e0bf43e696d8b
 MISC metadata.xml 372 BLAKE2B c666d6e6558e8c2ef8ec75b2125883e113dda896f01a9129c4e1fc0508946ad5a9e94f06cfd9deed11636779f1476c2e652dc445b6d8c3309056f6867d044eff SHA512 3db0bcddfd8d31b06fec3d1e3384b991a1018a5e491a61491aec3c3d3017d56c761f6078d12a533f8ad7c4094896be60e942f8e90409526eab40c1596f0a1aa1
diff --git a/dev-python/pykerberos/pykerberos-1.3.1-r1.ebuild b/dev-python/pykerberos/pykerberos-1.3.1-r1.ebuild
index 85c4d3730dfd..de86c98fefe7 100644
--- a/dev-python/pykerberos/pykerberos-1.3.1-r1.ebuild
+++ b/dev-python/pykerberos/pykerberos-1.3.1-r1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/ccs-pykerberos-${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~riscv x86"
 # test environment is non-trivial to set up, so just use docker
 # (see python_test below)
 # also for alpha/beta Python releases support:
diff --git a/dev-python/pyproject-metadata/Manifest b/dev-python/pyproject-metadata/Manifest
index e08856e9610c..f9cfddaf9f05 100644
--- a/dev-python/pyproject-metadata/Manifest
+++ b/dev-python/pyproject-metadata/Manifest
@@ -2,5 +2,5 @@ AUX pyproject-metadata-0.5.0-no-install-tests.patch 279 BLAKE2B 51598be4b5d055e8
 DIST pyproject-metadata-0.5.0.gh.tar.gz 13816 BLAKE2B 8f5613c1279539116e99b6f319b687a08160360109e1ed71d5bc6c0434ee316ef7c0b7109d6769a03452a41c1b258765c849fe416b4632b4ba25990b6b3702aa SHA512 66cd447a01d0d01ab37611415bd620517600af667d7179a2696f763ae031c013393c8145ebd33f27b43629659333effa58596a02dfc5c217935c90475250b822
 DIST pyproject-metadata-0.6.1.gh.tar.gz 14047 BLAKE2B d97be3532450541f4f464eca8d3e241259463bbd9d8277df380e3bf38908b9fd4e279d4ec88051e974a51091da9afef0691c7d723213e244c9fb5a6b6fa1e7ac SHA512 4af84f9534a5c71e192e1355e1e99f99e82b97d01411c011ed2f1dff579a7420a0f5d982eea5a032de8549c14191b64334c8e2aeea22fe767837e662e8d8b588
 EBUILD pyproject-metadata-0.5.0.ebuild 664 BLAKE2B 0ad4c61e0a704bbaf6d7d7c5dc178691908223b8329c34fbd4df1693ce4271cc6cd981cdbb862ef09f024639235f0d09a52df09947c75b21068f69607ac2b1da SHA512 666b3d87777b5b4307fc5dc5bc1743b4aa39294a454fea51eaef1d4e3f042d40b4cf1368259a09dff6cbcf189859ed09a208d131c60755d2df50e559fe319de9
-EBUILD pyproject-metadata-0.6.1.ebuild 649 BLAKE2B 6fa1c978e1c9bdea0f3d615d2ab9f5dad4aeac07f01c811c9c823c2347edb536f24becf33719693c61659f7ec96f70a142b45e9977dc92d0b1d435eb341c6180 SHA512 c5c46cdb8bb4ccd114755dc73e23bbf7aff1becc60f05dc6df39bf192e667bee6e782b13adb1ebc96d06c8f521487f8d2d7cb9f6d78f858655a24ad68197bf66
+EBUILD pyproject-metadata-0.6.1.ebuild 647 BLAKE2B 67a3cb9261eacb9bad1c4233f06c50afe762f846045cdd0e1f98627c5856ea123c39f5e32ac0713cabd85e22b0748b16451741de1a24b3840a253bfdbc97305d SHA512 65b8826019eb4f5a8fdbb73ff58027c7e14e521230b3d4476a7c01ecac036fea93cd8f1a2c89c985c8e23fdf150b33e1e888d69b05451c6b03717140c8245f73
 MISC metadata.xml 371 BLAKE2B 9495774fe62ac433fa655bb324c38b18242dfda38e0e331739b6c35b9a64563aa03b95395930ff8c2d20ff16aaaa1513673c27db973e88293fd6c8e09d2ef0e4 SHA512 5c8dec2e04b6f2e7ca0bead64c4987d3226e985085262870c9502b26f76270ffec818cc76271ccfca8c719e991884bc40e5da18d092cad801dffc8ccc5207b59
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild
index 2b29eeae69a2..8f4e508a72c3 100644
--- a/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild
+++ b/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/python-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-httpserver/Manifest b/dev-python/pytest-httpserver/Manifest
index b37912f39af7..c8de0ddf3b92 100644
--- a/dev-python/pytest-httpserver/Manifest
+++ b/dev-python/pytest-httpserver/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-httpserver-1.0.5.gh.tar.gz 80395 BLAKE2B 68c075032c57f25854d390f73bf61b7efbe18f78d7f0b2a2a3be10d586ca9cc3ce4a1b390a2ba0da1e88558513782388069c419dae4908a0581e8d583f452bee SHA512 8275475bb044d54769e906571520fafbb9f6fa32fc003f4a00f72b9ff9930e4b80ee84564df1521569cc2a15f5d371c6315129263bc167d0621141004d509a25
 DIST pytest-httpserver-1.0.6.gh.tar.gz 83737 BLAKE2B d0db97227bcb3336a4bd944cf26e2d3e96132baee5991cdff901a1f546174e977b6472458911fc6b92bb13b6d3dae499e0bf3507be265385601e838c4781f0a3 SHA512 5eacfbf159f3a09d73f54da8f3ff885b8d2138e430af27df6039a30e63d7ebcbcf088efe8e7fa56ed50b66ea5b7e3ad7a61c0e8a57d5cb100c2a063df7b6f5c4
-EBUILD pytest-httpserver-1.0.5.ebuild 771 BLAKE2B 28e023ec39114a662c965a349ce49497c3d5728ed7135acdfcfc7ea4374ef273670d83ad46a94e4bb61d70d8eb121d2b8b7b8d3c6486c9e192f87f6d90b29c2e SHA512 d56a4522d74cc97f7521b59fb4e291ff987538582d00c7b96a9d0352416ab6bc483fcfb8552fde5e72542ff70bf97594ca8f46e617c5ee195d6d6c3eace898b3
-EBUILD pytest-httpserver-1.0.6.ebuild 852 BLAKE2B 0320ede25f1055d2d926cd476a686fe7a95a6233c2fd2d2e48f785a0baf207f1e3ef4830f6cf8d3bb04108b4b99ca6529ead99c4e1116693ad57901155a3578b SHA512 8a37a0058c37f1e0d0c05eceb33b78947250e1d8d69a9acaac73fc1e824ed8dce08b7bd3610ae3092eb196bdeb5f7ff62f22ae61e84dc384fd6b3fe0a48bdda0
+EBUILD pytest-httpserver-1.0.6.ebuild 850 BLAKE2B 6c248496d67d534248b60df85ef68e070e6d466d71e358344f276f9dcf76fd07c939596ec8acbfbd4b1c98bd700015f395a51a9b04aced8fab8807b566ba9767 SHA512 8a8ffbe7bd0856ac04b40a4a3f2e0c45738ae262276dd5b040a1ff6cf933234e17cd03aa228c4d203c71a2aa06276ee0854948ef34a06e65770759b2defed90a
 MISC metadata.xml 411 BLAKE2B f74c6327167acc706faa9d9e60e2f964e476f33cf33b525287850dcd46e1fd35d6a770d495c929b36bc288c6e2a08d32077bd5265c522598477bb61c4abdd367 SHA512 a536367a8872d3d722f7671d6824d05d1912e9ba53a25ade91bab5cfa4dca3cb2e3f669c7a70416c68a200f1272c5709509b37133886f0d64816b096918fb4f0
diff --git a/dev-python/pytest-httpserver/pytest-httpserver-1.0.5.ebuild b/dev-python/pytest-httpserver/pytest-httpserver-1.0.5.ebuild
deleted file mode 100644
index 434d89778a4f..000000000000
--- a/dev-python/pytest-httpserver/pytest-httpserver-1.0.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP server for pytest to test HTTP clients"
-HOMEPAGE="https://github.com/csernazs/pytest-httpserver"
-SRC_URI="
-	https://github.com/csernazs/pytest-httpserver/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/werkzeug[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e '/^include = \[/,/\]/d' pyproject.toml || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest -p no:localserver
-}
diff --git a/dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild b/dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild
index 041d42cbc468..379659ceb752 100644
--- a/dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild
+++ b/dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/werkzeug[${PYTHON_USEDEP}]
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index 06939c1b96e7..82c1b4dcf0d5 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,6 +1,6 @@
 DIST python-ldap-3.4.2.gh.tar.gz 377981 BLAKE2B 6efa768dd035f8867abacfd9cc1b9ceca1a468c79550d2529130bd8eaf7546e4474d5798cf9090a9a74f05286ca30a33b8e54821292b8aa2e27358f93d72cb7b SHA512 3a68dd2c160d7d74061d9c9eb060be6faeec1f607f3853722f969d7d1dc76c7da160aa20a4c139feb4d2eba6dbf2e2cfb02551cabd6fbf413654f32f73e94c15
 DIST python-ldap-3.4.3.gh.tar.gz 378215 BLAKE2B d5c165e668ed8bf1415e06e28e306bb757dea71ee7cc1ad380c35a5d911767fd08e249577aef0e5e888c1e9129072f93f499560e8b70e6848fbad4d7f9bb95a6 SHA512 a52403b7d9fc4d114b995640ff34f5aefd313d36cea5ff6de73ea9f46036694ebd43cd9d11382daf3be9da887f62c6675b49d684c05a7d5f0c93d446b16d1981
 EBUILD python-ldap-3.4.2.ebuild 1704 BLAKE2B 49a15455aa8afe1b2b4e9cf3c97212dd0d9364b4fd6f27bdecec856dc8cdcb502914db1b43acc195a6abac64e105097956571492dce7c040b7da1369b5811ad3 SHA512 d611b9039ac4bffb96e93c08ccf0653ac390c7498745466139b42507953b1c3e68ea681f889c85dd6a907a7ac49f0f5aa947477b0ba7e7ee77524bbe20af58f4
-EBUILD python-ldap-3.4.3.ebuild 1706 BLAKE2B 62c86ba817465066b12235eeebd56652bc078d29e8931d40c5d072ca371cbda6597d4740ff6e98735ef1a2f4980fabd2bf0184f1eff7749d1f91e31cc40505f3 SHA512 145b075e26130e6b7951ea8fc379f40de66abfc7d2069205979ef35c4720adb84dd1ede971acb8fccf4aaae9c2dc32f3b76847a1c7ba74df8feaf2a6be39682d
+EBUILD python-ldap-3.4.3.ebuild 1704 BLAKE2B 49a15455aa8afe1b2b4e9cf3c97212dd0d9364b4fd6f27bdecec856dc8cdcb502914db1b43acc195a6abac64e105097956571492dce7c040b7da1369b5811ad3 SHA512 d611b9039ac4bffb96e93c08ccf0653ac390c7498745466139b42507953b1c3e68ea681f889c85dd6a907a7ac49f0f5aa947477b0ba7e7ee77524bbe20af58f4
 EBUILD python-ldap-9999.ebuild 2000 BLAKE2B 1340f010714318a6a8e90ffa228a3c0799909ee1f70af5ec5cbd73449d6982a18df35353a3d356d559a89c43be1c44f097698236a6118ad66fac5630a75d57c8 SHA512 c58a4c82d5e18bb29b62024a826b063f0f47ee3f9e4a798251175b4115a31f5a5803962ec597c12d8855faba83c259f559083a6499524f41197d2ecfd0d3a9fb
 MISC metadata.xml 449 BLAKE2B 14ffa18ca09eb663d3ef4ff5bd0ebc8511fa408a4e96c93885ba2beaccdf3bb82a9733a01149e088c8b66d6cb938f94fc3940c0c0cca5685599191e772443cb6 SHA512 2f5c014e55f838b84abf6ba630b000620a01e2fca6d1f1bd1b30db309f820df50c2ef7feddc17c69ee0188c3cbc91a388933b4bccfc8d2ea0cb18c6dae85cda6
diff --git a/dev-python/python-ldap/python-ldap-3.4.3.ebuild b/dev-python/python-ldap/python-ldap-3.4.3.ebuild
index f4f3f6014077..11a39e58e3e2 100644
--- a/dev-python/python-ldap/python-ldap-3.4.3.ebuild
+++ b/dev-python/python-ldap/python-ldap-3.4.3.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~x86-solaris"
 IUSE="examples sasl ssl"
 
 RDEPEND="
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index 9e5f7724c045..d95b32def16a 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,11 +1,5 @@
-DIST python-nbxmpp-3.2.1.tar.bz2 129362 BLAKE2B bbbeb5751fc5751cffe73c9a54c3330de9a1b48041c7a7964cefdfedbf8ae2966c8f5adaa7153386eebea44568af38ec1964d612b8baf48d6f318c83705e18d8 SHA512 3ebe1169475fcd65875cb2e6079f802a7f98717957e26e7dfcab5a71b1f94e967145a430f6d959a01b39842317d858c3b6275bcd909bf65f70699536e298b6e4
-DIST python-nbxmpp-3.2.2.tar.bz2 131769 BLAKE2B 51e6d090ad1461dfdb2d0f863ac31e72b1abe2e7ad273eed5105eb55cc11a0ce6ec989241d8d928400e55e7c61a720925104f92e32110e2124e63f396b68029f SHA512 bdbcdb3978c57ef6b62c9e0da57e624ab92f1d10521f5d8b096a1b654bfa0e0026eddd6814c037bf7342e2933eb76c1c67d8f7e309e3c770bd606153f09c8ebe
-DIST python-nbxmpp-3.2.3.tar.bz2 131789 BLAKE2B 7cdabe3357950b8694b85bfe1c23e8742575e37d066f61a741a017a0c96f32a9bba9c3cefcf0409b818ea366f806242c711d5bb3829c3275660e03592935f732 SHA512 7b444cf58a7abc8455d8cb2e720c77ae15fec3c0c4fc6984e51e587f122b842cbecd38f9ef225346e0fa86ccf5a4cdbc3452a78f302237f5069efb626554dd02
 DIST python-nbxmpp-3.2.4.tar.bz2 131867 BLAKE2B bfe0fe559b62e0ba526adac810bf9ed4e491349ce8535ea6ab3d476a1b1c18accfeb450a327b1e81994f2960a475b872169a61aac67d1f16767bad18f6e5e223 SHA512 4ac1c69741b4c202c463ade601bb027f4a5442da1052e2657b1319f2b9bb6dd723033b3dcf175d655205f2e918ef1b7e3e93410fc812c847d2da7ceb48420d37
 DIST python-nbxmpp-nbxmpp-2.0.6.tar.bz2 122203 BLAKE2B 925604002f4363f1e0b72f05c13742f4652ba565a9faa48faf8d47688f480a7f1d7585c593b0dcf07bded8c4aa3a1d02e9697742a07b9e815daec062dfb93104 SHA512 a536b25c8a6298892a51adef4b64b75ffab88ce02fb08fc07ecd1cfe2bc794262d4d58a93248439723e6e0544485da7351bb98189b0e422a1f77b01c6f6d238e
 EBUILD python-nbxmpp-2.0.6.ebuild 771 BLAKE2B d26169a1d21a1d512f27711653642514b64c644f6dc786d5b701e1651df0e3e3ccae11a25ab77641a8ea6244df6ed3f9bb28cd0224018859171d6a5aded3ad73 SHA512 df49ab8432177b1c35b72b8015a9f7f5184a8cca6172271c840f4c4c15a937d463946a16ce863787a2050e14b5e54ab81c2738565e002e9d9dc11c5eeeade72b
-EBUILD python-nbxmpp-3.2.1.ebuild 745 BLAKE2B fb76ccda9625fcfedcda1be5f950ed12b0bde5901fb7989b25055c1cf08e738b52473eb972d2b336230b08c2d013b0b7fd012daff7851517be5ee77f4c2b70dc SHA512 262c7f37244669ef510b105db6034712673d5234ce3cbf9faef7c2786c41e07f31c84d3c301447c77dea6eef82c903f4ce260e61ce7790992426c62462af7fd6
-EBUILD python-nbxmpp-3.2.2.ebuild 747 BLAKE2B 6ccf123262480eefb28bc977c298400bd530322ac9f078d1ccd0b774b5e2601efe1d5d883ce13af849528ab0ad33ee5c9593fa28c9d426caee25a9c8afce5e69 SHA512 b7b830733f566e9297804782c9d1d50a9641e6ff7ccac0e1ded9b3812b9e8e164ab580fb3978b3744520247888868e1bea6839b85b3994c2a9b8f4f57c0695a3
-EBUILD python-nbxmpp-3.2.3.ebuild 747 BLAKE2B 6ccf123262480eefb28bc977c298400bd530322ac9f078d1ccd0b774b5e2601efe1d5d883ce13af849528ab0ad33ee5c9593fa28c9d426caee25a9c8afce5e69 SHA512 b7b830733f566e9297804782c9d1d50a9641e6ff7ccac0e1ded9b3812b9e8e164ab580fb3978b3744520247888868e1bea6839b85b3994c2a9b8f4f57c0695a3
-EBUILD python-nbxmpp-3.2.4.ebuild 747 BLAKE2B 6ccf123262480eefb28bc977c298400bd530322ac9f078d1ccd0b774b5e2601efe1d5d883ce13af849528ab0ad33ee5c9593fa28c9d426caee25a9c8afce5e69 SHA512 b7b830733f566e9297804782c9d1d50a9641e6ff7ccac0e1ded9b3812b9e8e164ab580fb3978b3744520247888868e1bea6839b85b3994c2a9b8f4f57c0695a3
+EBUILD python-nbxmpp-3.2.4.ebuild 745 BLAKE2B fb76ccda9625fcfedcda1be5f950ed12b0bde5901fb7989b25055c1cf08e738b52473eb972d2b336230b08c2d013b0b7fd012daff7851517be5ee77f4c2b70dc SHA512 262c7f37244669ef510b105db6034712673d5234ce3cbf9faef7c2786c41e07f31c84d3c301447c77dea6eef82c903f4ce260e61ce7790992426c62462af7fd6
 MISC metadata.xml 426 BLAKE2B 2772501445c7b3f8db801d5d6c52c6004cc6c67527b30cfcd5f48b54c3e483f1ace9307632f0da179cc4462e3ffde741b66af38c76e248004ff7238a591a15bf SHA512 0f456e67e255e045d97f969ed16c7e304d07a6b9a60d938dded30e78235a2ef984f5883c08f655e14084a8d76f54cd578c3d1eb387f0cc4d8502a5188dac987d
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-3.2.1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-3.2.1.ebuild
deleted file mode 100644
index fafffe2d9512..000000000000
--- a/dev-python/python-nbxmpp/python-nbxmpp-3.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="
-	https://dev.gajim.org/gajim/python-nbxmpp/
-	https://pypi.org/project/nbxmpp/
-"
-SRC_URI="
-	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${P}.tar.bz2
-"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	net-libs/libsoup[introspection]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/precis-i18n[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-3.2.2.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-3.2.2.ebuild
deleted file mode 100644
index 20ab63a80429..000000000000
--- a/dev-python/python-nbxmpp/python-nbxmpp-3.2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="
-	https://dev.gajim.org/gajim/python-nbxmpp/
-	https://pypi.org/project/nbxmpp/
-"
-SRC_URI="
-	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${P}.tar.bz2
-"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	net-libs/libsoup[introspection]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/precis-i18n[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-3.2.3.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-3.2.3.ebuild
deleted file mode 100644
index 20ab63a80429..000000000000
--- a/dev-python/python-nbxmpp/python-nbxmpp-3.2.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="
-	https://dev.gajim.org/gajim/python-nbxmpp/
-	https://pypi.org/project/nbxmpp/
-"
-SRC_URI="
-	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${P}.tar.bz2
-"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	net-libs/libsoup[introspection]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/precis-i18n[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-3.2.4.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-3.2.4.ebuild
index 20ab63a80429..fafffe2d9512 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-3.2.4.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-3.2.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-libs/gobject-introspection
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index 4eeb4cadad93..d1781af329c7 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,4 +1,3 @@
 DIST python-xlib-0.31.tar.bz2 211425 BLAKE2B c0a15b11c264942479c86088d8d5bdc0c759ae71df8939feee200ff58ec30d3b2c0a99a119cc56e5c32279b26517e7925cf9124a367dc7d32fcaf0be4f7cd41e SHA512 f98978cd0058ae18f08f9da71b4ff31cd7811040ec1eb03ce065c187f312259d674dd76aad447752c8f508e585838948c90182eef5d5240e6c06b0a5dd1fbd33
 EBUILD python-xlib-0.31-r1.ebuild 923 BLAKE2B 2ae27f4e486622488190da030e3f9df00d693e1ee26e29c70f1008f8db425cc6fc520059fc716deff6664ce787d51c268951c2c8511fbcaecff7c86ce2b96eb8 SHA512 c1ce2f17ff40bc0b09395666a391b59a4f9ef58433d3aa8cd5fb08a65712ca106d7f2a49ddc55031a27e4034a650e4a0ffad3e9dedc0c4cade2bda442f680e3b
-EBUILD python-xlib-0.31.ebuild 891 BLAKE2B 4047fe5708424f0ebeedcdc94bb307218fe3e6faf494e15015a1adc6217fad84589e9451f4c95331523ebcae404e7bcc92e5cd19da7d299d058cca3b6eac770d SHA512 345e6deec4c0146fad01d9b004bb0629a58dc189424273e95f4a4c9d24201d9813fb04f27271bacee726b2e76381c0290760b931e6c2947026122e2b99772753
 MISC metadata.xml 434 BLAKE2B 3fa5d4e6b3b0347d1872805cf074795e486fe64a6b5b3edf326e9a8f81c1f5b86472ec6d906e85ef11493e9aeff9ef8ecfbece69103df037c8237fee3bbbaac9 SHA512 38738c99171d5351a797b12384a0f29b38250bb62cb17ff6250e3215a580500eec3210e22ee9605356c71477b8574b9fde34c5dee944b8437b901adc9b417218
diff --git a/dev-python/python-xlib/python-xlib-0.31.ebuild b/dev-python/python-xlib/python-xlib-0.31.ebuild
deleted file mode 100644
index abe871e44760..000000000000
--- a/dev-python/python-xlib/python-xlib-0.31.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-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/pytoolconfig/Manifest b/dev-python/pytoolconfig/Manifest
index 9b1ac06ff5fe..9e60b97d4d87 100644
--- a/dev-python/pytoolconfig/Manifest
+++ b/dev-python/pytoolconfig/Manifest
@@ -1,3 +1,5 @@
+AUX pytoolconfig-1.2.2-fix-licence.patch 577 BLAKE2B d79330fa814c1f2039ac6b0b1b46a3d1f119ff4459f0491d316aadcf280f9d1c23cbd7026e83d8ab10d5fbf688f6d4d81bf9f5d707fa965c13d74f66a5db2564 SHA512 81dc0ff4b7dd620b5905cb3b31f802c352d401c47ad4a95075c34f192e3bb010a29766808359c3be49603fe8b6360ac50884908160b1115173ec8b0badff787d
 DIST pytoolconfig-1.2.2.tar.gz 16195 BLAKE2B 02434bf9bc815fe1beeb13496427d6735fd0eebca66371eaa1a8df5d318879584b9e27d7b2272535e41af91b46544264d570b2727e524e6ba52c4e4be475ad84 SHA512 5bcbf7f2fc7941e128b3e717ff213e1e43be417ca3b906fa75a40f822815a4ea79b55cbb3e297caa3abf9032fedda1a791165491f52d4bbce5f4d29eea3c3599
+EBUILD pytoolconfig-1.2.2-r1.ebuild 829 BLAKE2B 660650640cc81cd8f418684a986c2935b8bee629bc0f85c7eeabf29ccd45bd16dec3e896a87cf9577bdea0878ae5d22a5561f3b0ae109b42a68a401d6925b68a SHA512 c187eba9364ee5b140ff157f014f575625cb4d0833d382777ddfa6ed0b6c9174ee914b7a6aaf7762fbcba497e3827bf78cb03094517273dc3c4d9cc29d561aa4
 EBUILD pytoolconfig-1.2.2.ebuild 728 BLAKE2B 8922935d63dd065d0a3ffb5bcb9dbdc2c871339cbcd6ddf91e98058395e2cd582881c95cced867625695fe9dac30db677cd496fa7e498d62be11948972e7bd1a SHA512 81798221f46cfc1404efceaef26962b6ac8ff31743c9081259f4a1ba6abefed4f2b38170b0e78d58568ae23476bcb623374eb7c106238cf8640205a113c4d6a1
 MISC metadata.xml 423 BLAKE2B 3007e2ab50dfd0a5b91d18dfa30099586f14daf29583323da9b275fdfa8c8c2e1cfc575e78a0f5b7983c6d23b03767ebe8f2f2dfb83d35638c0577257e2de62f SHA512 556361958961c85b7f3fc8b5d15009329b0534db086c15392e0c8067357576848a5533fb5ad4d2b75295b7a245f69fd81de63cc5aad555e77211e8f46552e147
diff --git a/dev-python/pytoolconfig/files/pytoolconfig-1.2.2-fix-licence.patch b/dev-python/pytoolconfig/files/pytoolconfig-1.2.2-fix-licence.patch
new file mode 100644
index 000000000000..47c222fba143
--- /dev/null
+++ b/dev-python/pytoolconfig/files/pytoolconfig-1.2.2-fix-licence.patch
@@ -0,0 +1,21 @@
+https://github.com/bagel897/pytoolconfig/commit/7fbd830f1c302ed8151ecc2bd52c40cf70b1a580
+https://bugs.gentoo.org/878189
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -2,7 +2,7 @@
+ name = "pytoolconfig"
+ version = "1.2.2"
+ description = "Python tool configuration"
+-license-expression = "LGPL-3.0-or-later"
++license = "LGPL-3.0-or-later"
+ dependencies = [
+     "tomli>=2.0; python_version < \"3.11\"",
+     "packaging>=21.3",
+@@ -70,6 +70,6 @@ strict = true
+ 
+ [build-system]
+ requires = [
+-    "pdm-pep517>=1.0.0",
++    "pdm-pep517>=1.0.5",
+ ]
+ build-backend = "pdm.pep517.api"
diff --git a/dev-python/pytoolconfig/pytoolconfig-1.2.2-r1.ebuild b/dev-python/pytoolconfig/pytoolconfig-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..b664169b4b4d
--- /dev/null
+++ b/dev-python/pytoolconfig/pytoolconfig-1.2.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python tool configuration"
+HOMEPAGE="
+	https://pypi.org/project/pytoolconfig/
+	https://github.com/bageljrkhanofemus/pytoolconfig/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{8..10} )
+"
+BDEPEND="
+	>=dev-python/pdm-pep517-1.0.5[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/sphinx-4.5.0[${PYTHON_USEDEP}]
+		>=dev-python/tabulate-0.8.9[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-licence.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/qtawesome/Manifest b/dev-python/qtawesome/Manifest
index 75044b9ab9ff..130ee6595e4d 100644
--- a/dev-python/qtawesome/Manifest
+++ b/dev-python/qtawesome/Manifest
@@ -1,5 +1,7 @@
 DIST QtAwesome-1.1.1.tar.gz 2277767 BLAKE2B ca8668e0b6633087b7e09ffcec19809c8b7e12af2caa0beac896940cdbf3a113206f6952916fbe81c53899a56f8222e613df9c028f59907a2553174551ef9fcf SHA512 3cf04b822464c14f52f23499e64515f50f743aba40a8d22224d22315342cef760da476dc9b2ae42e901ac8ef8440e105a6bf6175efc6749250e0fbbbc255e08f
 DIST QtAwesome-1.2.0.tar.gz 2280428 BLAKE2B 15053a87ca4cf2c25b1633de67f54838b144db05f5165023c121fc84017cc4db6e24238d8518ee2494c0b21752b9b82007ef96f04e6d072b1f51ed84c12bcada SHA512 11307af5592da83fd357e33e5f679821cd16d070f0e751619c28ea29a5511dec7a1d62e81713c91660125899624d5700097d597c85e718f3738b4d47b6477b32
+DIST QtAwesome-1.2.1.tar.gz 2280937 BLAKE2B 4d54e8d9fabd833ca4a430ed9573da4feb6aeaae9090fbdf7874d68214de0c0548be18b2f5d2c643add754c748f6af97eaa821aa3d341ed6dd563b8769c1a5c7 SHA512 dd4ef533c5a7bc5fc7eba549c166653efb2352e12412d5678e30cc8865fe44684ca6e070ca61801910c3eefd5673325cb87555e0fb30007b5fd0b53d04dc1c44
 EBUILD qtawesome-1.1.1-r1.ebuild 939 BLAKE2B cdb36334f7aabfbc699b2a35e58af8ca0675b6523515312c3f355570b14cf0d21380b3f4e2f726415d179fd892ddc95dd40751f0bc238d7b3c886d1b80a352e1 SHA512 04227f83f62819d26ce53a4529ea4ed68bb3559d9dae4eac4522845eccdd8cd49e38f3a5b1fe90136abae6976382cb1fca852865ba5f0dddc185c8a55031ddfd
 EBUILD qtawesome-1.2.0.ebuild 975 BLAKE2B dc025dc6deb8c783c409db762176846d3458fc47b175762a16ccdf56a4d3586658c4cee1d551287d7159a8e1f093c1027a97e68585b8a848a8e835d9f7c5bcb8 SHA512 e76512918ba9e24e14a54781e11244a550bdf56d1dd84e29e19c1e37a8f00566a546b50f378d4986087ff01e49832b1c5e4816b9966baa49c5429d05bcfa3eb2
+EBUILD qtawesome-1.2.1.ebuild 975 BLAKE2B dc025dc6deb8c783c409db762176846d3458fc47b175762a16ccdf56a4d3586658c4cee1d551287d7159a8e1f093c1027a97e68585b8a848a8e835d9f7c5bcb8 SHA512 e76512918ba9e24e14a54781e11244a550bdf56d1dd84e29e19c1e37a8f00566a546b50f378d4986087ff01e49832b1c5e4816b9966baa49c5429d05bcfa3eb2
 MISC metadata.xml 810 BLAKE2B 7d9237109b80816eea90f955a2a7f4f989589b4b16aef6151017a68dc4808b5b13e524d0356f88ff57f05c40be268729f016ae3f9bd059eda6d06ba75ee03ef5 SHA512 9b15bd5c9e0486fc64d49c6a7a1ef2fafc4c7e9e25ac57ca5811e435cc49c24421ca695c7dbaaee7b317c4a90fd5e9f929c3f79d7e57ce8cac85c6267e103dab
diff --git a/dev-python/qtawesome/qtawesome-1.2.1.ebuild b/dev-python/qtawesome/qtawesome-1.2.1.ebuild
new file mode 100644
index 000000000000..4b24498382b2
--- /dev/null
+++ b/dev-python/qtawesome/qtawesome-1.2.1.ebuild
@@ -0,0 +1,39 @@
+# 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
+
+MY_PN="QtAwesome"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Enables iconic fonts such as Font Awesome in PyQt"
+HOMEPAGE="https://github.com/spyder-ide/qtawesome/ https://pypi.org/project/QtAwesome/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-fonts/fontawesome
+	dev-python/QtPy[pyqt5(+),gui,${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/pytest-qt[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# Tests fail with pyside2, so depend on QtPy[pyqt5] and explicitly run
+	# the tests with pyqt5
+	PYTEST_QT_API="pyqt5" epytest || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/rapidfuzz/Manifest b/dev-python/rapidfuzz/Manifest
index 59ca8c0c99c9..9308e8cc21b8 100644
--- a/dev-python/rapidfuzz/Manifest
+++ b/dev-python/rapidfuzz/Manifest
@@ -1,5 +1,7 @@
 DIST rapidfuzz-2.11.0.tar.gz 812669 BLAKE2B e7897b2770202d46cb70323d19a79c6f34c379cf43ab211e2ba4d05ef6f1630d49b3cef70ab52bba1ac0a9cc15cd934e86aab829ec84195a6b583a561efc8cb2 SHA512 df5e77248c2a005ff1e0fbd4b4ef15fbdb88a6738d66823ba9bf8c380943c59fe82ac317dab1e6279b33112d2484563d65c33e972d52ab82b083cd8a8aae7ce0
 DIST rapidfuzz-2.11.1.tar.gz 813221 BLAKE2B 1fab9b564396f820c9bd5c240df95a2e864b0e3efffb4239fa2ad719b92d2997d9519ccf906fe04c61a0fc1daf9ed0df734f95d4cdd19529e46716935182030b SHA512 19f6dbff31f11cc16f031f9bf53f7c60051a84f2f81dfc1c17fc83827a7d8551d708420b4116ab91e56b5d6de652b4d571f4055ebcb208e5dd57e8778050ca29
+DIST rapidfuzz-2.12.0.tar.gz 836008 BLAKE2B 7d8cb6637247711f2f6fed63c9f26e2d3b8871b9a4926b86e37f6d42fed0f5ac2af727a1b350f4b55787b6fd5a393c3b90ee91d122731bb3f64acb4edb5126f0 SHA512 06c5e46332c98ea8feb83a89b879efc12a737f58312a862ab426e899bdfd3661601d4a417f7bc518e1006a2f05fa31ce1003ae9dd67c1e7d58f903e65f9eb6e7
 EBUILD rapidfuzz-2.11.0.ebuild 918 BLAKE2B e0f99f5d8fcc95f2cfd4a29495f0aae2a2e18993a50fc6dfa39110ac0d3cb66cf369de990ed11e78e9104a91e35b12995e892c9140c76c2973fb31fcb4ff20fc SHA512 ed0a3809ffcc7f86b45f2f53c12cb24991ca3f99766381c5d2d08074fdee2928a3daafed49a12469710e8c5bb249c9188f24f910128e99ddac3bd0cd745accdf
 EBUILD rapidfuzz-2.11.1-r1.ebuild 1063 BLAKE2B 66f6e70028be5440193e8351136d0b274921c04f390e98aea20e0ba9bfcd705a8436d826d8e6504327ab09120c683855813ce725e31fdcad212fa470ffa38ab0 SHA512 714ddd5411bf8f1eb25117cfccdbe215baa7b0ac5e428414af456328d20bb48c47e63bb8c27c2e9bd6546f4b4b745aa6e014cd99fb1a9cd01120fe639b9a2f33
+EBUILD rapidfuzz-2.12.0.ebuild 1063 BLAKE2B fb1e264d9208e8687a165862c80b8b3b1e48db17bfa567c6ee310a089dd9aa96645ee6213c733ce11874bc826babbdf28470873f6dabe95ac8a2cd86f21c2438 SHA512 20595aceba65640f9bc5c365e7c839c1d5ace7f6a8ce637b76fce474e0c23c474930c03e2e1ea3659105e72d87395a3bdff822f006a32a89768bd769dba1b71b
 MISC metadata.xml 374 BLAKE2B e6ee89a9850276b8c22c9bc851ebea2cde2ea696d122d70c6465e09a9371c59f81d1976b3253e8ee90afae5e3e30e993481b402058bac0c58ec01f71a0b7c3b4 SHA512 9a39c4bcf8e8de0a6d6a356a9aeb415f8f49667caf5716eee50bf251f1fd53bb076e817fac0b15bf64e65c1b9625c78810da61a5d96b273a20b2669a18084d6e
diff --git a/dev-python/rapidfuzz/rapidfuzz-2.12.0.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.12.0.ebuild
new file mode 100644
index 000000000000..96a84cdd08a5
--- /dev/null
+++ b/dev-python/rapidfuzz/rapidfuzz-2.12.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# custom wrapper over setuptools
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Rapid fuzzy string matching in Python using various string metrics"
+HOMEPAGE="
+	https://github.com/maxbachmann/RapidFuzz/
+	https://pypi.org/project/rapidfuzz/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+# all these are header-only libraries
+DEPEND="
+	>=dev-cpp/taskflow-3.0.0
+	>=dev-cpp/rapidfuzz-cpp-1.9.0
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/rapidfuzz_capi[${PYTHON_USEDEP}]
+	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# sterilize build flags
+	sed -i -e '/CMAKE_INTERPROCEDURAL_OPTIMIZATION/d' CMakeLists.txt || die
+
+	distutils-r1_src_prepare
+
+	export RAPIDFUZZ_BUILD_EXTENSION=1
+}
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index f997a642a655..63d99e75e222 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -3,5 +3,5 @@ AUX regex-2021.4.4-pypy3-fix-test_issue_18468.patch 1078 BLAKE2B 3545ee5167790fb
 DIST regex-2022.8.17.tar.gz 385777 BLAKE2B c4425e01fea5c25b9ad77e645d3671d65e747a6ee9bd7b8c1870396b4bd989c3a3ec73c33b72eb5e00f24b8e9fff2cef8c229280d2b98a13df7dd8a07bd1b2c9 SHA512 6a305c00a6355dfb9293876292e7d22de58cc00f15d7beadfaf49b49b5ef512404ad5d689f4b90f6302c5246610cb08ebd8ad6a4739818a43c6eb84fc5bc6421
 DIST regex-2022.9.13.tar.gz 391531 BLAKE2B 83e8f1aabe15e65fb4f96072be3ccd5ddf1dcbffeeecb9d7a2889fb910d4095e902bfd45f43184b0df115b1116ddfc3e67d68a2fa903f19a8cbc6844ce023a3b SHA512 a991d6358001297db2b57855e76b8de680941ddefe9d18af1e9ee033da4e519df7b4553d138e7adf32b30593290284c91a954363bcc30b215409efe121e41e69
 EBUILD regex-2022.8.17.ebuild 889 BLAKE2B 2f4739ef643cd8ce3dce81e94160c6943bfb5f5309f62306bad54dbdf0ff0035fdac591d776c5da341060b4da89d12396b54e2436855bb85e4e449c454e6552d SHA512 e95dc22617b73dcd0e01504dd8e974f09260c79f0935fe9cc9d6a2842640556ed1f34d619fdf31917ae2d466dda860ed02fb9539178c5700ed26ec1132c738b0
-EBUILD regex-2022.9.13.ebuild 891 BLAKE2B b4b113b21cfb13bdbd552e8adcd2cd565c0f34468d3146612810f67ecf6e078f5ad2675685c6f2e7bac1b86fa241004fc645f4a7142237138e7fd96d783d807c SHA512 c3f61e5c1157943e53471217a251cfabedf7bd7d7f513858325c652abe420eaef8da177e6ccacb7791959b6a32ce3c00713d60dcd250288878ca9bf16869ee95
+EBUILD regex-2022.9.13.ebuild 890 BLAKE2B 7abf15fbf1a1de148d96962e604c8927262607fdbe83adb8cfc89b70f4d9bbe81aac89d2e552628dbfd60b912456e8d7f59be224c973d59fbc0bc602b03ee115 SHA512 87e933f73faa767427994e8ce186f0d576e7af5e703a2f4133011a9695c3170be853f695f355b9462233418548ec9fb1f10c8a1761755329e9d40eeb5e57f43f
 MISC metadata.xml 385 BLAKE2B 90c9075dcf3be9bd447746b249c438f50bc84a7c6c63051e808c5feb19b2c6208f85a681e449a025fe43cd0d5b2ab541752966b04b787052d78b92d5230d8e62 SHA512 f554035e72bcfff83e693f3651198f09fd354babfbadd5fef26dca3015ef8cc00c47072648794123c69bbd12c637eeaf9e9471680bab847ec701da2146462817
diff --git a/dev-python/regex/regex-2022.9.13.ebuild b/dev-python/regex/regex-2022.9.13.ebuild
index 1f24743362c3..8c598c047dba 100644
--- a/dev-python/regex/regex-2022.9.13.ebuild
+++ b/dev-python/regex/regex-2022.9.13.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index d13cf1090588..d7cc36283074 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -2,7 +2,9 @@ AUX requests-toolbelt-0.8.0-test-tracebacks.patch 1428 BLAKE2B 6f9645f2a456cde3a
 AUX requests-toolbelt-0.9.1-py310.patch 1470 BLAKE2B 864c496f712b9667de991afe7d8db0071b15e6c546fb495c3df5aa25d354bb2873f697d5777f5e6f1a9890289bad192a5c5053d11ab71eb0967762b30c35a977 SHA512 3780eeef7835319d5696f1ac8273c682c4b2a97171b7fed889c1960e3887f1fa6eecf13d4c961a9c2aa9e02e919e885f18bfde8eeabf452e16267ff671d07703
 AUX requests-toolbelt-0.9.1-tests.patch 5781 BLAKE2B ff7339a1daf0ba2df49914847000f0b8b5ff2d097a59bcb02bcb2b20a885f18223a1da1f44a99d846dcff423239108411c193da5092bbb27fdf50bf211dd59f7 SHA512 86919154164274efe8bceb42eb9fc17524d4e144a541e82bc10692da66e533220cdc7186362d77fd4f3acdc639744cdf5273c2e4e2091eb4d33c1fdc6c631ec5
 DIST requests-toolbelt-0.10.0.tar.gz 211210 BLAKE2B 73196e33d42ff6f4532cd2904537451cc237627a149fa759fca7a66e360c0ddb8baf8c4537c880baf03a25065226380788449bae05434aad37962034e1324acb SHA512 75e3a3e609625254e1f078d3c48c664b3118f5a406c84e59c4e9acdeb20a79b5d38ceaaf9578920063f063aa8385139310c06331499aaa92d3c51146f908f1a1
+DIST requests-toolbelt-0.10.1.gh.tar.gz 201504 BLAKE2B 48c5b9f46000d9809e482278626bbce805b93ed2a4a5d074bad4f7fbda75984dd55919eca31909c98c9a74ca7b323e73c90691dced0734964621d4ba5748d464 SHA512 ad6dfe3329c8be5a4521d223d25ec303201e706b34199c084efd0a30b8bc8cfb3382e80a502dc25bd5f7e5b2774a119d2255c49408979aaec45e221f412a7b52
 DIST requests-toolbelt-0.9.1.tar.gz 207286 BLAKE2B 6123677a9abafebddf7dffde2150b2426b5132ebe0c330ff891322ecc3d69232a5b15a0c66e3e1fb4832dc04f5a636a939613fba041e499e9fbca9814f548c7e SHA512 12229928df5df71cb57bc65ef453dc0e4a2bbe190c1579811b2c2823673bd81aeba856b00000fa20b253d0f0fa4fff55ea1e750794ca3785f71c376b1df7fd93
 EBUILD requests-toolbelt-0.10.0.ebuild 1237 BLAKE2B 9b0e5ce0fbecf76dbe13094860c77cb79fcec54fe7ee79ea3e8c42a8396850bee3d1cb1e64d15596221e79fc3ffbafe92e445c6ae0a6abc86c257463d1916a18 SHA512 22b05a4b17fde32b56a4c4b43bdc655e3a7b31c3f8f765c3575cbd00cde45831c8b1ef4314113e374ac094110ec77acf4d753e87d10220617b0123ec12c29052
+EBUILD requests-toolbelt-0.10.1.ebuild 1304 BLAKE2B 85926d28401972dd9f6cb450847a21bfed0426ebd35f9883898895452585256bc99454066cec937fa3cc6935511a99a9a45f052278837cafd37c65fd27b5a061 SHA512 1c8d9dccc756423895eee66dcb1c5d015d9785ddb41459c8468efd5805b1d9ca04ec1ede90cd90fe0d060369a09f47594223789bea0255bc33c3a8bf224a0f22
 EBUILD requests-toolbelt-0.9.1-r1.ebuild 1441 BLAKE2B ed064f4ee21e74de5a5474fd741e6fd047d4def4f1ce3c887dfb643d965a18105c4914395d9156353218b5a9e160dbe3ad6e84f7896f64ff8ffa4cd059a7cd7b SHA512 567bb53929f4e20ee443f882510f6c53a635e648206120a15da32c345fac935bb39eb8acc36fe6ddcd9f2f78f601458e14d3b6aead926e7be293dccca63bcc3f
 MISC metadata.xml 423 BLAKE2B 71af8f087b4bf8d805a70aed1dcb46128b0252f68a1e892530c5393bc6666c8d203e147558214935803a34b5be32bc90f6bb3fa103af4406c0fe6d974acbd739 SHA512 1c875ab992aa1d463fdd52468597f5bebb7aff54c6d665660d2b4df1d41b78e78575be4629b11eef10b783ef1dd4b048b86742ce20eb4584558bc8d87b17988f
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.10.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.10.1.ebuild
new file mode 100644
index 000000000000..0a202b6dec23
--- /dev/null
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.10.1.ebuild
@@ -0,0 +1,52 @@
+# 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 utility belt for advanced users of python-requests"
+HOMEPAGE="
+	https://toolbelt.readthedocs.io/
+	https://github.com/requests/toolbelt/
+	https://pypi.org/project/requests-toolbelt/
+"
+SRC_URI="
+	https://github.com/requests/toolbelt/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${P#requests-}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/betamax[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( AUTHORS.rst HISTORY.rst README.rst )
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Internet
+	tests/test_multipart_encoder.py::TestFileFromURLWrapper::test_no_content_length_header
+	tests/test_multipart_encoder.py::TestFileFromURLWrapper::test_read_file
+	tests/test_multipart_encoder.py::TestMultipartEncoder::test_reads_file_from_url_wrapper
+)
+
+EPYTEST_IGNORE=(
+	# certs have expired
+	# (if you ever fix this, look into git history for proper
+	# cryptography/pyopenssl logic)
+	tests/test_x509_adapter.py
+)
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 7dc1d73def6f..71f836232011 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -7,7 +7,7 @@ DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d
 DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728
 EBUILD scipy-1.8.1.ebuild 5275 BLAKE2B 0b2f1bb8c37c253aae87941aa9cb15352d82ff5bc34089ae7cf93cad7d264b0ceaecd7f8f0ff02670d24282a61032eaa52bf16de03e1d25d8a18fbfe7d63c981 SHA512 d7ed5f3bc61e27f898937387f88cd934147149ba40ccc01b160571db97074ccba2eb68510899bb4ee70083e47cf3e2c5c6e53435f56933cc5652e9b21a231763
 EBUILD scipy-1.9.1.ebuild 2287 BLAKE2B 01f8dbe3bc789af389da8f7eb4853f3f1c84329368f7baa8542ec3da0ea8f13abcb7ea9b7048ade6c8978ed877abe7b305711123046000c6bead9eec9d2774a4 SHA512 9a328fa90b73836e297f975e9a67faf359a581ba5021c91fedc99d1054704fe8f63e1bb199e15749fd54f2f3f5641ca7f13ecf3b0955b2870ee32edbe99f0fb9
-EBUILD scipy-1.9.2.ebuild 2356 BLAKE2B af2b689a25267748c97854b268c89ccd8b437cdf88f5cec5e9f2d35ac61be5320fed45743da85e7b27b6add471379a82f70c4d0e5348ea2103b28882169b2650 SHA512 193261870ecfff15d086872b4c3645fdf558380c34830222c092af9b049bb0cef239367acf5cdc25a4b6d270373753225be09dfe4c376de38f5184a0a85be691
+EBUILD scipy-1.9.2.ebuild 2354 BLAKE2B c013d3f8f9ddf0ba89246c9af4d4285f06b6aefdafb3c988924c93b3f70e97486c352933a6855e0b33d2d62dca49a6a58a0202b590f0b32f7834894a4e97db55 SHA512 dc72624aefd000730f8b8837e0ee7f4b56f57905e211c5eff186d3b9b21d891f8eda4484235edaccbf2505bbb02e25d5945b49f51265dedc9b4fe6ec0fc18b0f
 EBUILD scipy-1.9.3.ebuild 2360 BLAKE2B 4461feef60a9df1d573a4dc523f28c5b5a69c623921bf54427d2fbbf9fee9845506464b6902c177b20f00af653099f6a8d497dfaf07575815ba5278c7c978d0b SHA512 0b27f11b9c104ce37d69217f0fecb7ba0e63eb7f76bee4b1eaa1badcbf896b1b323aebe023b5db0e64c426df61f21f542ddd3cb1365a950e6337750080ebc1fa
 EBUILD scipy-1.9.9999.ebuild 2339 BLAKE2B 8b34952534298e156de44cffe5552c1895c343095bf4ec0e9d199fc915dcff549ac9b44cae9255634b244f207396b31428f817b8a4920dcf8c8bafc6c89ac7d2 SHA512 fbdfaabc2de08aa51f6d27ca230c69c812590de18adaca11fb956ebac77d56e98c88a710f9916b88f1ae9e783ed4a89b4ed763fa5fd4b109829cddacbaa76da1
 MISC metadata.xml 1148 BLAKE2B bd532eb47b00da1ff18e9bb5be287ef32136412fd7542e92a522c9d3d9d9663d2312b74fd2fc6d4239e4fc581c8e881ac6e682fcfd14b0debb08210237878398 SHA512 a913d7013caece759f2fd36f8814589a512e7650afca19edf444694b1fceeeda02f0bffb4ced81a46a376b2d6d54b292257a236549418aecf20d99e70715babb
diff --git a/dev-python/scipy/scipy-1.9.2.ebuild b/dev-python/scipy/scipy-1.9.2.ebuild
index 1a242c77f427..ad4e9d5107c0 100644
--- a/dev-python/scipy/scipy-1.9.2.ebuild
+++ b/dev-python/scipy/scipy-1.9.2.ebuild
@@ -38,7 +38,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 arm arm64 -hppa ppc ppc64 ~riscv ~s390 ~x86"
+		KEYWORDS="amd64 arm arm64 -hppa ppc ppc64 ~riscv ~s390 x86"
 	fi
 fi
 
diff --git a/dev-python/setuptools-rust/Manifest b/dev-python/setuptools-rust/Manifest
index 9d2722e50d9e..6916fe99595a 100644
--- a/dev-python/setuptools-rust/Manifest
+++ b/dev-python/setuptools-rust/Manifest
@@ -81,5 +81,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 setuptools-rust-1.5.1.ebuild 3212 BLAKE2B aded7568d241e6ae09bcffd5378365a395e472ee33a3ca3a0c1040a3e7036361e14aca32f6d2cba46bf6b61b9ea52098ba66bd7311a0bda8ff8b283984cd7acc SHA512 5cf29bffae0f68610bb7498820f87a42a10b1cdc9cc707d9282e8ae33610c19c716a56d5063a146d302389b9f45b56cb98105ff83e115657305b6c3c30e87e18
-EBUILD setuptools-rust-1.5.2.ebuild 3246 BLAKE2B 0e7630a585f7560a0e106c610bb85f52aedd2f797161e313cbadb57811846bd3a0b5ded55eca33e53f9c7adbda705dc35a3d5ffc72c73fba9a114f44fe5e700b SHA512 f5f6bb43fe184d60477c0e218d725735182a83ee170217b5d0da392770fea6c8d63757e65195570cb7086c358329d8bedf5e5c2685e44f6c34e57be4b00e8932
+EBUILD setuptools-rust-1.5.2.ebuild 3245 BLAKE2B 1604ffc9368081e51132168417e071ff0552221e0205867bad6bb7f11693a87f771f4c34b5c91ed1f153bab52a3e3e8eb765bea51f9b21514d4b1cb0551d62b8 SHA512 46df285b68dfbd8bfd756b463dda23f6fa20d7289c08c42c7e93bc7857719bd5c17e079f46d9cc119124a1cd51b53e4c47559b02a6562f66e46904431edbd555
 MISC metadata.xml 476 BLAKE2B c8f0ef0779f0a4412a7d9b97e1bb03e3bfb3c031209f489a100b30402d99224014e379712989afd0cb76c85be301dcf9a51e21e8f9195262c5920dd1db0703d1 SHA512 af74755e9e8fb61cbded2dc3e63cd20f95393ef2650bed9f81e299f7759ae79c63b45df8048cd0fe25397ec7db10156be681fa5278606a20481f78d5279b815b
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.5.2.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.5.2.ebuild
index 998a0e76ed15..b483598201a3 100644
--- a/dev-python/setuptools-rust/setuptools-rust-1.5.2.ebuild
+++ b/dev-python/setuptools-rust/setuptools-rust-1.5.2.ebuild
@@ -100,7 +100,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/spur/Manifest b/dev-python/spur/Manifest
index 668de22fa54a..b25637a7334f 100644
--- a/dev-python/spur/Manifest
+++ b/dev-python/spur/Manifest
@@ -1,5 +1,4 @@
 DIST spur-0.3.22-nose2pytest.diff 31953 BLAKE2B 6ff1ab74215df036101720ca7b1ed5c7f0f9e6dc000a55175da85024d771354cad33d967c7d5ce63bf47dc2009d82147d3da8091a8b605176040f1cef274429e SHA512 ed8617021fe3ea43d8e53dc601b3778026f20e472e7bea2ee9a7565ccc4568a29cb669d7892cb0e16afeb64cb04d0f3973b85a151b20e94ef7b7df4210b17f9d
 DIST spur.py-0.3.22.gh.tar.gz 17760 BLAKE2B 676484e73fa38ebcd3bcc2ace21853590b652d0ec2dc31f7635a55a8bbb213e559fbdd7b70e545091e7e28e6000862ef45eba748e13c546b765756b41c352028 SHA512 36518a080d3fff97fdab5af8e7e3045c58ad6b1acad9fb79e11da688d484565ee4d50868f3c3ee10299e135f2c01bd35348256df7bb1b4f6200aa175cafc7f0a
-EBUILD spur-0.3.22-r1.ebuild 902 BLAKE2B 07a6a0597a759296dfbeb9b36977154541b447b9735e989e0cea7f3a6413dd27e31e6ad8d95f9e246bd2263ddd4439f9be77b9e4ebce8b23858ad8b7359394c5 SHA512 2037f58c6f88da3e88d6f060c16d0acbb3976c614bbf086b5ec81e06aa8d54c31d9e59f1e1979fcfec35c9e08d37f8365d5c07506b323e6e3b8efcd8f427673d
-EBUILD spur-0.3.22.ebuild 1195 BLAKE2B 3b9c00dbf50ecac6ac5c4ebac350b4897bf9bbbe2c55f1b20675fc156cbf68f66b852a71a2a015c2168fbe8ea33d638095fb31e75a81e6fa5dc0b4756ce5b660 SHA512 77ee31dee19770962a3296d398925963ac35ce5b5c6a894c0b14ea1fcbd8e6c72802f4fc823ff5b0c602f2dfecbde874f11b51ad5a5d1ba85747efe58fcb76e4
+EBUILD spur-0.3.22-r1.ebuild 900 BLAKE2B ecd498de40f2da5dffc416abd519efaaac37d5d8609742c7165ad1c6075f323fe9188a6880efea8967aeff5f50d70af189f43a8120197377418e8fe43ddddec5 SHA512 b3c00891b945e9e61f810a619e29090df66d97439abcb0e8ab1a832ddc98f9e867e32a825b6f4f23b6b5a9f21bb10ef89f747be5a3e5286462ff33d7d1858cbd
 MISC metadata.xml 310 BLAKE2B 79198594601ed73656452cab90b2989e68ce1bb1ee3f93fa0b68a99e5952122244426f6dd8e5bed3d85adcdc6540ebec2d2b7e98c36c1f88762a876af18c7a90 SHA512 11b496bc054b786a938911ef5c5813168872af2646fa187bd8fbb45555f30d192207befa6e633033e94d841d1e7ef291b25243d13860b4bf0a66d8cc76565419
diff --git a/dev-python/spur/spur-0.3.22-r1.ebuild b/dev-python/spur/spur-0.3.22-r1.ebuild
index 3ae202674b5d..0ab6ca76649e 100644
--- a/dev-python/spur/spur-0.3.22-r1.ebuild
+++ b/dev-python/spur/spur-0.3.22-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/paramiko[${PYTHON_USEDEP}]
diff --git a/dev-python/spur/spur-0.3.22.ebuild b/dev-python/spur/spur-0.3.22.ebuild
deleted file mode 100644
index 0b5e31be2505..000000000000
--- a/dev-python/spur/spur-0.3.22.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P=spur.py-${PV}
-DESCRIPTION="Run commands locally or over SSH using the same interface"
-HOMEPAGE="https://github.com/mwilliamson/spur.py"
-SRC_URI="
-	https://github.com/mwilliamson/spur.py/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	# TODO: set up a local SSH server?
-	rm tests/{ssh_tests,testing}.py || die
-
-	# does random guesswork on top of exceptions that stopped working
-	# in py3.8;  this only causes a different exception to be raised
-	# https://github.com/mwilliamson/spur.py/issues/85
-	sed -e 's:spawning_command_that_uses_path_env_variable_asks_if_command_is_installed:_&:' \
-		-e 's:spawning_non_existent_command_raises_specific_no_such_command_exception:_&:' \
-		-e 's:using_non_existent_command_and_correct_cwd_raises_no_such_command_exception:_&:' \
-		-i tests/process_test_set.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/tenacity/Manifest b/dev-python/tenacity/Manifest
index 62bd62dbc2e9..e5f45db81fd9 100644
--- a/dev-python/tenacity/Manifest
+++ b/dev-python/tenacity/Manifest
@@ -1,5 +1,3 @@
-DIST tenacity-8.0.1.tar.gz 37492 BLAKE2B 10438b3877862baa88d164837b201773c287e7ce11b6213c677c227cbddda02434b423c0f331746495e68ab130ff9a9c720cccd2def3efa8ca6df8eef441eee9 SHA512 b5a615306e25c93d2734d408cc73f4db5361d92b713c1e7bbb57cd7bf635f82c5ccffafe9c0a6bc0da4057d11c92012d2337a5e4f15465bf4e6839d1fa97b877
 DIST tenacity-8.1.0.tar.gz 37658 BLAKE2B 4f9e2ea44ac0f0ed8b694b0f60e938fadbcf65bd989e9d641f7a40750f499aa9635a70d80e406aa2ebf436ebd37cde0d88e8ecb6cb3436ba755c2d921541c8e8 SHA512 194312e80233d6edcdf30496a355b272a4de4809bbe187948a7ce9c1382958845d12401498569f2b8d4251ede2857317820779f13a65bb2e69dcb97dde9bb501
-EBUILD tenacity-8.0.1-r1.ebuild 813 BLAKE2B ef4522a950cbd2a2ea88d1e7a2189682d3b59aace1e385ebe36577bba27fb6db1aa4620d254a2e77c443df90129615e75fd65092f7ba02498557fcf730878e04 SHA512 b7b2e54b6271c7bb4aed7cc20ba1e3b7c41c06db027a74eae8a8f9786b46a9a24c776d8f22f3bc0f7c9b7199b2f093bd81b690cb16c9ae14d54312cabae9b388
-EBUILD tenacity-8.1.0.ebuild 815 BLAKE2B ad7bdd9ad4068a7be40366ed141058c8b3043b40ee6de5ad493a5ba3c8e0c70378e4b39856ef7245c88ec4a6249534d14ac36c74875f18280cecbe3878d427c2 SHA512 dd08f0f6fd5a83bfb8178f1d7a13e854066da1dbb788683ead582fdf0735cf841598f4b8efc624a326dda434db1a4a8aa456615d5de53ee54d43036b5149eac0
+EBUILD tenacity-8.1.0.ebuild 813 BLAKE2B ef4522a950cbd2a2ea88d1e7a2189682d3b59aace1e385ebe36577bba27fb6db1aa4620d254a2e77c443df90129615e75fd65092f7ba02498557fcf730878e04 SHA512 b7b2e54b6271c7bb4aed7cc20ba1e3b7c41c06db027a74eae8a8f9786b46a9a24c776d8f22f3bc0f7c9b7199b2f093bd81b690cb16c9ae14d54312cabae9b388
 MISC metadata.xml 856 BLAKE2B af0d5417912404af6b5be19c32d150db197d27b55681871cbd45f983d1caf8b8ba7c8c44936b1465ecf00b4d185552399d0023bbfc16e84451e4fbf006eefcab SHA512 1fe2c8617bfaeba198a8b5430c2b38acf60f17c29fc89599d198037310589b4a5bb1170919e2f57c3e27951288d06ab281ec5a55ae64e6a0a33296a89be17839
diff --git a/dev-python/tenacity/tenacity-8.0.1-r1.ebuild b/dev-python/tenacity/tenacity-8.0.1-r1.ebuild
deleted file mode 100644
index 763a7ee97acb..000000000000
--- a/dev-python/tenacity/tenacity-8.0.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="General-purpose retrying library"
-HOMEPAGE="
-	https://github.com/jd/tenacity/
-	https://pypi.org/project/tenacity/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/tornado[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	if ! has_version "dev-python/typeguard[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_tenacity.py::TestRetryTyping::test_retry_type_annotations
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/tenacity/tenacity-8.1.0.ebuild b/dev-python/tenacity/tenacity-8.1.0.ebuild
index 052487637fd9..763a7ee97acb 100644
--- a/dev-python/tenacity/tenacity-8.1.0.ebuild
+++ b/dev-python/tenacity/tenacity-8.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/textdistance/Manifest b/dev-python/textdistance/Manifest
index 54d4686260c7..32e1f6799c43 100644
--- a/dev-python/textdistance/Manifest
+++ b/dev-python/textdistance/Manifest
@@ -1,5 +1,3 @@
-DIST textdistance-4.4.0.gh.tar.gz 45542 BLAKE2B ae144cb7179b589f4106ea378e538e0d0240e6e2ac74dc5de8222ec2f671fcd09c4705cb5b30308fdb2f6071578d337c0f88983511229d9f7eb86c924d65bf56 SHA512 727696b76ee8fdfc9bcf028a93baad38882893f62612fa08725e5e8cd104b9450977e3682995c4aa7d997afcc8fdb73e3c72ea6c1a097a9a19dbce98957d4798
 DIST textdistance-4.5.0.gh.tar.gz 46674 BLAKE2B 5bac2690c48fc518b56f7d781803684c1ccccbb54e62c613f87a58f2acf81d28b405be5ffc41c7a304e62bd19732cdf99a03816c00765698439073b76c5be6c0 SHA512 ae51a2a0b69acd5fd64cab9509ad58713044a1307eee884ecf00508f406a9442414b1d8c71798f2c3ed0e9f5b22cca0a467f6d5a5928510adda43c6997ea497c
-EBUILD textdistance-4.4.0.ebuild 838 BLAKE2B 6d7dc0949a8d10a700e19c78ccd3b0c7f4a3a5797be2f1998dd79ef1ed87d6a3bca769b0f5c5bd8cafb602dbf2768de362c3d2c5700d9b234b79fcf461f40cea SHA512 4522f9bf017e67ec047486897286957ac49bfab696f3b01450d10afab4bed7b8bdf1ef80bbaf2c3942ec997f414f7b8bc53b08b5ca1320b7b468054a8c653a47
-EBUILD textdistance-4.5.0.ebuild 840 BLAKE2B 8d6e2ee67118d70c73b27cdc7913bde4ce73cf03ed36658a9f94ce9ac21d89d946457777584d5f4496b27b696b99df06867185d51b723a39b44722c0a481188c SHA512 46aeccc5fb7204836c72d26fa069bb5c267f89f908fb05437c76ae946ebb0c73282a87d891a63935bc733efccf1b73984ae44099da3583cce6fc8965f14f5514
+EBUILD textdistance-4.5.0.ebuild 838 BLAKE2B 6d7dc0949a8d10a700e19c78ccd3b0c7f4a3a5797be2f1998dd79ef1ed87d6a3bca769b0f5c5bd8cafb602dbf2768de362c3d2c5700d9b234b79fcf461f40cea SHA512 4522f9bf017e67ec047486897286957ac49bfab696f3b01450d10afab4bed7b8bdf1ef80bbaf2c3942ec997f414f7b8bc53b08b5ca1320b7b468054a8c653a47
 MISC metadata.xml 517 BLAKE2B a429684151f5700f148c5350b16026e797fdedc80b950d3c79c050a4d7418763918a05936eaeeed07b9756d9ec39602128570cd8c27049234bbda27e006ff00f SHA512 be445c2c21f5fd0bee241f8f76094b51c2fcbd7fe0d2175f7455beb881c3b83e8070c8a14817695d2b7a7dfabcdb856e12d7749aadc91ca31f7af8187e9a409e
diff --git a/dev-python/textdistance/textdistance-4.4.0.ebuild b/dev-python/textdistance/textdistance-4.4.0.ebuild
deleted file mode 100644
index fb039fa7c401..000000000000
--- a/dev-python/textdistance/textdistance-4.4.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..10} )
-inherit distutils-r1
-
-DESCRIPTION="Compute distance between the two texts"
-HOMEPAGE="https://github.com/life4/textdistance"
-SRC_URI="
-	https://github.com/life4/textdistance/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-BDEPEND="
-	test? (
-		dev-python/abydos[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/isort[${PYTHON_USEDEP}]
-		dev-python/jellyfish[${PYTHON_USEDEP}]
-		dev-python/Levenshtein[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pyxDamerauLevenshtein[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	tests/test_external.py
-)
diff --git a/dev-python/textdistance/textdistance-4.5.0.ebuild b/dev-python/textdistance/textdistance-4.5.0.ebuild
index 427ee9e48841..fb039fa7c401 100644
--- a/dev-python/textdistance/textdistance-4.5.0.ebuild
+++ b/dev-python/textdistance/textdistance-4.5.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/uc-micro-py/Manifest b/dev-python/uc-micro-py/Manifest
index 9c9bde9d9468..52c1d84733f0 100644
--- a/dev-python/uc-micro-py/Manifest
+++ b/dev-python/uc-micro-py/Manifest
@@ -1,3 +1,3 @@
 DIST uc.micro-py-1.0.1.gh.tar.gz 6235 BLAKE2B 7ba5935e97d9926789cde37491ce09235f467781ddd99dc841f70bd42a13c87bdc3a7970684cab81684620c1c49e1bc316faa0d4e8664293c76cf7c86e24c446 SHA512 c6747943bd4ac9a3b7bf8d02a52947df04d4d4986311da7fa77d6ae010d512de9ad429d78a436a2f8e11c6f2d8dde00bea70ea0b1237a35e5b16ed4ad6b430fe
-EBUILD uc-micro-py-1.0.1.ebuild 645 BLAKE2B 2185ed84a1efe11dc3c6e55bde8052a1a59091cb7cd6023fb23e8a267afab8e908bdb1c616a056254d541040c75dc29eb978d214664e06ffd700ab097d88093c SHA512 e627899ccd71b5ce940c941a0a36e69a7e3e16684c1e1f76c51d8f46ef549124b2bd9ec89ce83f33971f816b0bd1e82a239304a5c28d63936334dd0906a3ee1d
+EBUILD uc-micro-py-1.0.1.ebuild 643 BLAKE2B 317374c2619d4cd6744e39c309e52b7582de73e46957124491cd2e822e3f67cfd1372cf28dd98b5041a3fc7e1d5902ad6bdf489764a88c64728c4a4be2f1633b SHA512 27865de48a1d5efdb6dc70a5f4907e5b14f5c621ab26fc05037a1243506892ae94f9fdbe7259cb3e2d3c4265bd178cbfcf78129df23e4f473372d3fe3e49d2a2
 MISC metadata.xml 398 BLAKE2B 50edd762e30f62e95f9dcb2adf2e41ff274dc211503ce4da4bd2bd44730c4d23e8eb35acf76ad00cf7207f197d277eea2dfedcfec776a09157d0975d00738fd2 SHA512 4b4e9fbc1618864bb5007f8d10b4d54768152e09a043f719559063ef4799ce87bf500580cd68694988b3d42e4c43bd21b728f2c37de48b59d968718292726ce6
diff --git a/dev-python/uc-micro-py/uc-micro-py-1.0.1.ebuild b/dev-python/uc-micro-py/uc-micro-py-1.0.1.ebuild
index 393dd5290f80..3643ec606c64 100644
--- a/dev-python/uc-micro-py/uc-micro-py-1.0.1.ebuild
+++ b/dev-python/uc-micro-py/uc-micro-py-1.0.1.ebuild
@@ -22,6 +22,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 562e127aef18..348d100fac61 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,5 +1,3 @@
-DIST ujson-5.4.0.tar.gz 7139576 BLAKE2B d3bd6bcc4dc733cafc47e613e2dc503e8cf7faf562d2fad91ea66b1a62dd4a8d67a2c80c392eba0c224f382280e58ff3fff51308c22862aaae5e671b5183027c SHA512 9622e872391d5467455b32e324d7b680487664ca486bfc56ba8c3969853e5db94725cd45e81b535dca80af4a3c718af171ce7adb6dcb9b98a37a8068824f89c6
 DIST ujson-5.5.0.tar.gz 7140414 BLAKE2B cca99fbb8cec447500c0dec34a952c4474acd0149783c887ee713cee60859570e41c9e349d49ff7eeba645d0c04a7e368da2ec8c42b6f55f59e971f834449e3a SHA512 883c0bd8b933557fc98556af1679de6df0372ee83a5533d8ea3f994dc13cd9bcd3140e2532ea1ad24419dab9ffbb59027e00f0a5e7ca285bf68358205a07bcd5
-EBUILD ujson-5.4.0.ebuild 879 BLAKE2B f58b2f5d57429fd3d899023579443447348e2784052777267ccc86c5ab53e79ee72aa09effc370a8ed5fdd43b7d98fe08bb00ccb3e3083e6c3ddfb1d890cd542 SHA512 25da7256c33440a0f8577ebaf46900254fa66be01651895609ca28d2cf244262d2164bcf2f8f550e163bfa6cbc6a2c63c77ebbdbca315b7c354e77f9457869dd
-EBUILD ujson-5.5.0.ebuild 881 BLAKE2B 9f61b276e05d546727363273fb7b13b96447d4927a679876d425a356832a8d6f22b6c69da13d146c177f5ec16e33a2fd04e6a0d0ecac458e9da1964a5d4528b7 SHA512 f57e791c78de0477b0f332ab91c9a4d850dc1387992218ce51bde67a694b4f4c97b6aa08efb3beb17607c634086cab955ba60d181eb045a22d9e34e42867bb78
+EBUILD ujson-5.5.0.ebuild 879 BLAKE2B f58b2f5d57429fd3d899023579443447348e2784052777267ccc86c5ab53e79ee72aa09effc370a8ed5fdd43b7d98fe08bb00ccb3e3083e6c3ddfb1d890cd542 SHA512 25da7256c33440a0f8577ebaf46900254fa66be01651895609ca28d2cf244262d2164bcf2f8f550e163bfa6cbc6a2c63c77ebbdbca315b7c354e77f9457869dd
 MISC metadata.xml 494 BLAKE2B 8e20150926d62643e7ff2110cba22313db0c0e3112290ce08302d57103aa35c42a56921d0b46e0acca2ef83756eb4f7384f23ddb06fe41ef6c4a28921f11ec33 SHA512 d9c0a59f916b84d50e51a21152c1815fea90a909dc9bd44ea620b2a33ca6a92ee237aafe29debcc9d1a2bf63c84112300845309eb0ab1265e5d2b0c05dd313f0
diff --git a/dev-python/ujson/ujson-5.4.0.ebuild b/dev-python/ujson/ujson-5.4.0.ebuild
deleted file mode 100644
index 3c98bbb8b172..000000000000
--- a/dev-python/ujson/ujson-5.4.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
-HOMEPAGE="
-	https://github.com/ultrajson/ultrajson/
-	https://pypi.org/project/ujson/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	dev-libs/double-conversion:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	export UJSON_BUILD_DC_INCLUDES="${EPREFIX}/usr/include/double-conversion"
-	export UJSON_BUILD_DC_LIBS="-ldouble-conversion"
-	export UJSON_BUILD_NO_STRIP=1
-}
diff --git a/dev-python/ujson/ujson-5.5.0.ebuild b/dev-python/ujson/ujson-5.5.0.ebuild
index 9c6a7833ecc6..3c98bbb8b172 100644
--- a/dev-python/ujson/ujson-5.5.0.ebuild
+++ b/dev-python/ujson/ujson-5.5.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	dev-libs/double-conversion:=
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index fc5baad5bcc5..5e51b575d429 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -5,5 +5,5 @@ DIST uvloop-0.17.0.tar.gz 2279973 BLAKE2B 7ccbf3b8e723e36c1010a70e256de0ad1a9728
 EBUILD uvloop-0.15.3-r1.ebuild 1393 BLAKE2B 025fce332c25bb7e1fb1188ad9257a8d807da11c71a3b6bcf02b3bcdb54b22b0522cbe0ebf3ee7a2bacc90342d6820ea6952473e45baf9dd92e7638dc1a545ae SHA512 b6e13f27b6b06046c133c0af0d55a03a211c5a56cbf8eb37fe8f6b33b4e8a3440f2353f50485dfe415145f0c17b1b6f24329d5fa16524d86baae68cba3ab4a64
 EBUILD uvloop-0.15.3.ebuild 1193 BLAKE2B fc992ae7c17888c29828b7cd7b56c77c8465e914b85b62935e1b2392448a9c5bd6ba19b59d10168ab7255761aea277922d56522007ba8212e4b774072d3124a0 SHA512 779c79417e4b2ef607e96619600c2a4f996957408e0ebebb9fa900e144aa20f409ae72ea9b9c05ab3dd90711a67edf3f424187551eedafdbd77ebae6e950c62c
 EBUILD uvloop-0.16.0.ebuild 1418 BLAKE2B 5ee1d50ac599e891886a6a2b9e72a93a2e0da3d327cb6d645e01b0ee02ddf05c5ca3a941144a5b98af6618c313dae561a5903f2099be11de8b82044d7d386014 SHA512 9ca8fadb5a77f5888479828f225b378c9f501e2fa520a646cfa46c7b44cba8981f846d9862c983fffadb0db7e7f2f7d33656a665d95ee8fff1e391e8c73266cb
-EBUILD uvloop-0.17.0.ebuild 1844 BLAKE2B 17955a3da62ec9c657aca7d0475c3013af363c92f5d5145885545f1882a98f29ee779bb96d87f2004f085bf143ae37f3b1fbbd5bed64b1919cbe1528e7a9fc0b SHA512 1e473fdeca939f589c92943649a999c1940073f19fe6bff3620b2e2a4c232113e71973d8b8aea865a5736f503a28c03feb950c6abe5297569923d348a9883a86
+EBUILD uvloop-0.17.0.ebuild 1843 BLAKE2B e5c5f751d69dbd6e65896956d924fc76ab82f6ef2d0646867bcefbbf6f08ce9805381fcfe1e83668525c3deded1e1488d56219132465d5e20b2e311ccfe1ce81 SHA512 f31a077473e6f9da18b0e69bafb1c8a7b4cd832151ff0c37df14552e6781dc50e9dc41edcc3fa444610617a1ab2159f542a0f04d192783b3fa198c3392c11a47
 MISC metadata.xml 527 BLAKE2B 2db44bdfb681fcce35ef35f13155293ac3fdffa12a695b654ed8acc608cf1f769243136e66b6b2c1afd57caa7e59a66a60d34631c37a4b98a474bd0635fcbaa3 SHA512 02540835a23405c467293395fa7984741e02ca1aca75f527edd3b988d307b41db0f729d5cc0b3a826a652fb7104dec7be86a9a57f4d5646d2af87255cc2d90de
diff --git a/dev-python/uvloop/uvloop-0.17.0.ebuild b/dev-python/uvloop/uvloop-0.17.0.ebuild
index a3880a3bf1b2..8435741ffde1 100644
--- a/dev-python/uvloop/uvloop-0.17.0.ebuild
+++ b/dev-python/uvloop/uvloop-0.17.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 arm arm64 ppc ppc64 -riscv sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 -riscv sparc ~x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="examples"
diff --git a/dev-python/zope-hookable/Manifest b/dev-python/zope-hookable/Manifest
index 2d78ac11a68d..d53d470bd421 100644
--- a/dev-python/zope-hookable/Manifest
+++ b/dev-python/zope-hookable/Manifest
@@ -1,5 +1,3 @@
-DIST zope.hookable-5.1.0.tar.gz 21922 BLAKE2B c8bb0c6fb20718127fc2b3d7a2654035a14f87a52b41331ec3d564fe7dd175a977911e1a5847e544e30eeeb473b1fdb5d75ece7ece4b5a4212fec8f6d85a3d44 SHA512 af63fd7c83bbaf2c6c1faaefc7081a9a739b835fb5f1fe48f8f6b66a82596d52d0559df8de1beceb129578ee2ed9711ee05a9aa2dd0eec98dca6db40b45a4665
 DIST zope.hookable-5.2.tar.gz 24004 BLAKE2B f1b64a906a849442437a3829d509210280066b41bc97fbedcd02b462fa9c7761910a7a71ed00430679f7c3ec9648c8a9ab5e88d4e8143018e44194d56611353a SHA512 b04107acedcc245fa99a59de71ffeaabe270ec15eaac32df1f5433ca16ea568d60c272349c8c8d7e512dfadef4fc8fcebf63a62ee9c8607fc02505a4457e1ed3
-EBUILD zope-hookable-5.1.0.ebuild 973 BLAKE2B d1325d1ae489dd9c7c9f757eab994cf01a2bfcde734b841b5cb771d7970eb5086fd3144786ecd8db19a667ce54700acbccd4859369bbd279b08d8287eda2ec1b SHA512 13b12baf36909a19225011ffbea033a4de5fa4176649c41dfcbb57acd9dc38dc7083538e40bbe11def7051c3bd3b983c3287834029d46aea5d7a72c8d60e28dd
-EBUILD zope-hookable-5.2.ebuild 974 BLAKE2B 53a6b36ec8f18de09db6ef8b25888469efddbfa2e7c862a31030991182a6ab97dca53dd6bff8172216435ce014e1e1420e1b7bfcbcf2dc10290b2b49a95ac006 SHA512 eac06b5af5e634509998e86df57dc6c98293942dfee2bca33eb67d1af0d82a0a61b6e3451fe60c31bfe025fea9d1f20a1a1d3cb5cf40211949288355bbc381c4
+EBUILD zope-hookable-5.2.ebuild 973 BLAKE2B d1325d1ae489dd9c7c9f757eab994cf01a2bfcde734b841b5cb771d7970eb5086fd3144786ecd8db19a667ce54700acbccd4859369bbd279b08d8287eda2ec1b SHA512 13b12baf36909a19225011ffbea033a4de5fa4176649c41dfcbb57acd9dc38dc7083538e40bbe11def7051c3bd3b983c3287834029d46aea5d7a72c8d60e28dd
 MISC metadata.xml 363 BLAKE2B 292afad5ddaa2ae9ea128a842934b751d16d84aebd617a9e5f6c2165245137f11089670fc78791ce46ccb260c5acbf0527030889d709725f6f89532f3972c0c2 SHA512 40afd7e868b05d352bc5f268d056f3550e924e22b07b1f0e41afd25429017cb28fd5b6caf565df04bfcecf5cc1c183d12a122a906affd813542ef32cbbc230a3
diff --git a/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild b/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild
deleted file mode 100644
index 6907af03c507..000000000000
--- a/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Efficient creation of 'hookable' objects"
-HOMEPAGE="
-	https://pypi.org/project/zope.hookable/
-	https://github.com/zopefoundation/zope.hookable/
-"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/zope-testing[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# strip rdep specific to namespaces
-	sed -i -e "/'setuptools'/d" setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	eunittest -s "${BUILD_DIR}/install$(python_get_sitedir)/zope/hookable/tests"
-}
diff --git a/dev-python/zope-hookable/zope-hookable-5.2.ebuild b/dev-python/zope-hookable/zope-hookable-5.2.ebuild
index 486c9f59477e..6907af03c507 100644
--- a/dev-python/zope-hookable/zope-hookable-5.2.ebuild
+++ b/dev-python/zope-hookable/zope-hookable-5.2.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
 
 BDEPEND="
 	test? (
author	V3n3RiX <venerix@koprulu.sector>	2022-10-25 15:53:58 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-10-25 15:53:58 +0100
commit	b8c48743664466ac0f638f0949fd78bfb9f5eae6 (patch)
tree	dd60615a286df950811f8267c0631e1fd97eac58 /dev-python
parent	cf9065b9fe1f8c33a6e488fce1ee75d893cd351f (diff)