Adding metadata

80 files changed, 42 insertions, 1387 deletions

diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index ed160288497a..6262ace17b25 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,2 +1 @@
-DIST PyGithub-1.56.gh.tar.gz 3144624 BLAKE2B 04ee4784802f04b39da3fe28b67a884f14adc3d60f3085a5490d91e7b56fcadb735e70e8295ffddb63f21ca417932f1f8da0adf592e59034d3f7449d3c837aad SHA512 fe20d5eaa0f0267c49141fdd4d37bff81fe766a7db48662ceabc5a3f69ae7587bba6958d959a67dd224d4402f9b5785b67b461cac4c2f1bf5a15e8fcf8ae98ec
 DIST PyGithub-1.57.gh.tar.gz 3159952 BLAKE2B e753a72c0fe20f0697ff3246fd2c3445571079ae18bee50abf6543da51d9e889c67cafa0bf36a980223f3423cf880c36d24ce74a6bf245117a080186a209ddcb SHA512 6c8880d21c5134581be6bc5549184c3f13cef8f360a46a459234f22f3dd4fc5f8b573cc3a5d870bba6c6129ff7b670e739d87e42f2e34ddcdf357a3fe2b3cadc
diff --git a/dev-python/PyGithub/PyGithub-1.56.ebuild b/dev-python/PyGithub/PyGithub-1.56.ebuild
deleted file mode 100644
index cc162f4b4a1f..000000000000
--- a/dev-python/PyGithub/PyGithub-1.56.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to access the Github API v3"
-HOMEPAGE="
-	https://github.com/PyGithub/PyGithub/
-	https://pypi.org/project/PyGithub/
-"
-SRC_URI="
-	https://github.com/PyGithub/PyGithub/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/deprecated[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/httpretty-0.9.6[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/PyGithub/PyGithub-1.57.ebuild b/dev-python/PyGithub/PyGithub-1.57.ebuild
index 385e18b81bf3..195f07ccffd9 100644
--- a/dev-python/PyGithub/PyGithub-1.57.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.57.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/deprecated[${PYTHON_USEDEP}]
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index f1dde829b80a..a901c627763c 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,2 +1 @@
-DIST PyQt5_sip-12.10.1.tar.gz 121271 BLAKE2B 5f1720a85b8522f552259be990d1d27c0f40d8c0c3ca0395679da02851e73b45210a6390b66d899fc00cabfeeda57f2bac4c8d108cd05ebc179302343fbe0457 SHA512 a6336195d8d5a1b216a85461c5f7acf3563c6db2255079734e955a9412522cfdb82663dbff5d60574acc7bb29dd5ef11f98f2c0c3c3d3fcbf290b039cda31638
 DIST PyQt5_sip-12.11.0.tar.gz 122792 BLAKE2B a2cde0a741fb5ef6d6805a382b66405dcebe09a18cbe1b7d88b277d96995b93b0a939900be9ed347ab46c8ed5d14b222c56f2e19e1506b72ebfda46aab8a22b1 SHA512 1542747ef1912c05b0054ffec16294046e20dd4eb757bb664fb92d7b6ed924521469e88d27e515146f725d153e3ebe3a3bf72805de6451fb52ff86ed5b9128d7
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-12.10.1.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-12.10.1.ebuild
deleted file mode 100644
index 48f311b39d01..000000000000
--- a/dev-python/PyQt5-sip/PyQt5-sip-12.10.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="sip extension module for PyQt5"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/PyQt5-sip/"
-
-MY_P=${PN/-/_}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-12.11.0.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-12.11.0.ebuild
index 9d2c5c8fd205..7bcfb0012083 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-12.11.0.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-12.11.0.ebuild
@@ -20,4 +20,4 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
diff --git a/dev-python/aiopylgtv/aiopylgtv-0.4.1.ebuild b/dev-python/aiopylgtv/aiopylgtv-0.4.1.ebuild
index 0f92364a9043..0fa54b560559 100644
--- a/dev-python/aiopylgtv/aiopylgtv-0.4.1.ebuild
+++ b/dev-python/aiopylgtv/aiopylgtv-0.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~arm64"
 RESTRICT="test" # No tests.
 
 RDEPEND="
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index dc458f6bece8..c301685e208e 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,3 +1 @@
-DIST aws-sam-translator-1.53.0.gh.tar.gz 1158682 BLAKE2B 4bc8430936a1b180dc04637e540ecad7eb82cd7a5da5254f2b823075878a03ad3e63422c183b365b0dad927bcdf063b8ab40984ab23abe1d91d8bc3c411aa2f1 SHA512 292259bf8d4002b72be51db0358673eee61fe368be5db15e7faff195baae8fa194bef882fd0f5a9b5c46379fe5f9593d101a212121da8d0636aca709dd087f05
-DIST aws-sam-translator-1.54.0.gh.tar.gz 1004760 BLAKE2B acb875f6f25c43d605dc1a2ee38bde66eacc8de85aaa8c3231ded77a9252e1d722a82724e2d8bb8016e1d8cb7bd188c7dcb76e50ac79af20109713160b90a891 SHA512 a8dbf74e983eab124cfab7627f64fb013a59340b77820a96c5654503956370aeca51a676508b688d2f1c96c1fb9586c7711f03af5ca68f680edbb19516007f4f
 DIST aws-sam-translator-1.55.0.gh.tar.gz 1006734 BLAKE2B 5fbfd8719ad605e0df7acd8ecb25ca681f5863e67e97b57624c470fa6e77bb431d7ff19f5e00a181120ea809019d93bd75416e46ba1424e8839f80c10002b30f SHA512 4d2f1e3458cb9d2014f73575946e863e1d74e7432e2aaf17128638d69d9f092b4d531224e45c2110b50103a1e7c4343fc0282ad38fe959cf45af4a0a2b4663aa
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
deleted file mode 100644
index 0b085516b0b0..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.53.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_{7,8,9,10,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.54.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.54.0.ebuild
deleted file mode 100644
index be2c2f881325..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.54.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,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
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.55.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.55.0.ebuild
index be2c2f881325..b72780f342cf 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.55.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.55.0.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/serverless-application-model-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/boto3-2[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.26.16.ebuild b/dev-python/boto3/boto3-1.26.16.ebuild
index 0f6cd94927a6..0b3a958987ef 100644
--- a/dev-python/boto3/boto3-1.26.16.ebuild
+++ b/dev-python/boto3/boto3-1.26.16.ebuild
@@ -25,7 +25,7 @@ else
 		https://github.com/boto/boto3/archive/${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
diff --git a/dev-python/botocore/botocore-1.29.16.ebuild b/dev-python/botocore/botocore-1.29.16.ebuild
index b9de8810f9e0..b570833230a4 100644
--- a/dev-python/botocore/botocore-1.29.16.ebuild
+++ b/dev-python/botocore/botocore-1.29.16.ebuild
@@ -24,7 +24,7 @@ else
 		https://github.com/boto/botocore/archive/${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/comm/comm-0.1.1.ebuild b/dev-python/comm/comm-0.1.1.ebuild
index 03bc8cedb05e..8d5c468e4555 100644
--- a/dev-python/comm/comm-0.1.1.ebuild
+++ b/dev-python/comm/comm-0.1.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>dev-python/traitlets-5.3[${PYTHON_USEDEP}]
diff --git a/dev-python/crashtest/Manifest b/dev-python/crashtest/Manifest
index fb4279de071b..34f3984abc07 100644
--- a/dev-python/crashtest/Manifest
+++ b/dev-python/crashtest/Manifest
@@ -1,2 +1 @@
-DIST crashtest-0.4.0.gh.tar.gz 13564 BLAKE2B 9c29694f5c96a981e19cce16853460cfed7277a2a933c14be9bdefcac9f79e9d835454fd79b3da2fb5f62946f933452202eee05199dfa048b919a3fc3dd93f40 SHA512 98d9623eeef584baed7bd336a3846af9b4f3aa55662b643e915b17b0a7dce4968785052ce3d37f55fc0217dbb6662b6f5d34efeb4d45dbace876551871be4e4a
 DIST crashtest-0.4.1.gh.tar.gz 19114 BLAKE2B aa46efb2dbabfeaab54f9149da42cb033f5dca3ab1c75032ca2542018058cf16775f56450cadf3e1272e738d602f32f21b9a6668a99f2733cd53d23c1754a0bc SHA512 83faf66fb422c8fb13780ac5a8ddd4c47ebb77f248bea0eb94962caff24265b107fd8bbc0d577853969c4aecedd83977e9c74c81dc7e772b7684e09a832a0a2f
diff --git a/dev-python/crashtest/crashtest-0.4.0.ebuild b/dev-python/crashtest/crashtest-0.4.0.ebuild
deleted file mode 100644
index a502b599cf2d..000000000000
--- a/dev-python/crashtest/crashtest-0.4.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-DESCRIPTION="Python library that makes exceptions handling and inspection easier"
-HOMEPAGE="https://github.com/sdispater/crashtest"
-SRC_URI="
-	https://github.com/sdispater/crashtest/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/crashtest/crashtest-0.4.1.ebuild b/dev-python/crashtest/crashtest-0.4.1.ebuild
index 6f51f2474278..a9028987dfa2 100644
--- a/dev-python/crashtest/crashtest-0.4.1.ebuild
+++ b/dev-python/crashtest/crashtest-0.4.1.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/frozenlist/frozenlist-1.3.3.ebuild b/dev-python/frozenlist/frozenlist-1.3.3.ebuild
index 5cbcc9bf942a..c4ea114447a2 100644
--- a/dev-python/frozenlist/frozenlist-1.3.3.ebuild
+++ b/dev-python/frozenlist/frozenlist-1.3.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index c3ee9e7acb26..3c0363962dd1 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1,2 +1 @@
-DIST guessit-3.4.3.tar.gz 166183 BLAKE2B 30b08719b12580ade5354a501217cf2b0547965d1ef8016ffce313d257a3ca80a0736e0c904b4e3f7f639d24919839afc3887d81e2912e6aafb37861f979766f SHA512 2719683487baa7bf0f212d4150486f3e673721683361004aa4397204fdc1a3414de86dd4b05b805dc91427d897cd391a7431e6c25e1576b0855f4cc3aabade7a
 DIST guessit-3.5.0.tar.gz 158094 BLAKE2B 2091fa8b0066dda70e1a504fd4aa8b7b4f2ba9b3a88f93b22aff0d084511d9a1c93e052558fe6791021e4c44a95e9adc5e7372c937e0e438b419417ff88d2fc0 SHA512 072b6874449679ed34eeb19fe70502abbec3a4284c2ba40e3e69861ce2b9e92f4ff8146840f7fc25079efed62f048c9e25ee3ddf5833b192480c512b9c93905a
diff --git a/dev-python/guessit/guessit-3.4.3.ebuild b/dev-python/guessit/guessit-3.4.3.ebuild
deleted file mode 100644
index 8dcdb545b343..000000000000
--- a/dev-python/guessit/guessit-3.4.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for guessing information from video filenames"
-HOMEPAGE="
-	https://github.com/guessit-io/guessit/
-	https://pypi.org/project/guessit/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
-	>=dev-python/rebulk-3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# Disable benchmarks as they require unavailable pytest-benchmark.
-	guessit/test/test_benchmark.py
-)
diff --git a/dev-python/guessit/guessit-3.5.0.ebuild b/dev-python/guessit/guessit-3.5.0.ebuild
index c874d30f7a35..8dcdb545b343 100644
--- a/dev-python/guessit/guessit-3.5.0.ebuild
+++ b/dev-python/guessit/guessit-3.5.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
diff --git a/dev-python/helpdev/helpdev-0.7.1-r1.ebuild b/dev-python/helpdev/helpdev-0.7.1-r1.ebuild
index 8cae33eb7990..4871a0f0c0c4 100644
--- a/dev-python/helpdev/helpdev-0.7.1-r1.ebuild
+++ b/dev-python/helpdev/helpdev-0.7.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/helpdev/helpdev-0.7.1.ebuild b/dev-python/helpdev/helpdev-0.7.1.ebuild
deleted file mode 100644
index c378919b838f..000000000000
--- a/dev-python/helpdev/helpdev-0.7.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Helping users and developers to get information about the environment"
-HOMEPAGE="https://gitlab.com/dpizetta/helpdev"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_{7..8} )
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? ( dev-python/pip[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
diff --git a/dev-python/html5-parser/html5-parser-0.4.10-r1.ebuild b/dev-python/html5-parser/html5-parser-0.4.10-r1.ebuild
index 676a3081a8cd..beff5e031647 100644
--- a/dev-python/html5-parser/html5-parser-0.4.10-r1.ebuild
+++ b/dev-python/html5-parser/html5-parser-0.4.10-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 BDEPEND="
 	virtual/pkgconfig
diff --git a/dev-python/html5-parser/html5-parser-0.4.10.ebuild b/dev-python/html5-parser/html5-parser-0.4.10.ebuild
deleted file mode 100644
index 697ebcc8d704..000000000000
--- a/dev-python/html5-parser/html5-parser-0.4.10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Fast C based HTML 5 parsing for python"
-HOMEPAGE="https://github.com/kovidgoyal/html5-parser/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="dev-libs/libxml2:="
-RDEPEND="${DEPEND}
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	# Soup is not used when lxml is available.
-	rm test/soup.py || die
-	sed -i -e 's:-O3::' setup.py build.py || die
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	export PKGCONFIG_EXE=$(tc-getPKG_CONFIG)
-}
diff --git a/dev-python/ipykernel/ipykernel-6.18.3.ebuild b/dev-python/ipykernel/ipykernel-6.18.3.ebuild
index 0b1dab65c6fd..d3acdba8afc9 100644
--- a/dev-python/ipykernel/ipykernel-6.18.3.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.18.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/comm[${PYTHON_USEDEP}]
diff --git a/dev-python/lark/lark-1.1.4.ebuild b/dev-python/lark/lark-1.1.4.ebuild
index 6affc132efc1..9156cec8a860 100644
--- a/dev-python/lark/lark-1.1.4.ebuild
+++ b/dev-python/lark/lark-1.1.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/lark/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/moto/moto-4.0.10.ebuild b/dev-python/moto/moto-4.0.10.ebuild
index a4d952121013..b265797f2c11 100644
--- a/dev-python/moto/moto-4.0.10.ebuild
+++ b/dev-python/moto/moto-4.0.10.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/pivy/Manifest b/dev-python/pivy/Manifest
index 1b8c15c0ff99..c7ff605c4fef 100644
--- a/dev-python/pivy/Manifest
+++ b/dev-python/pivy/Manifest
@@ -1,2 +1 @@
-DIST pivy-0.6.7.tar.gz 6618410 BLAKE2B 22ebe63a75fa624b772cb3d3ff6f03336258f6c8b638613413c19fcea072f83f73396bc91d35f0e06bc27ec57471ae67965ee492e62a7e73919f7827de645175 SHA512 606eac3527b5906ad6884c25775b5625bfd2a1b1c78f75017b05e662d622c75d30e70fd5785ec2145902f5a02d99098b52cc776aee12fab02f0319762ee104b0
 DIST pivy-0.6.8.tar.gz 6618458 BLAKE2B 08c57f0d7bff15a7f9d49b56b75b44c587416eb0feb2b237db48d7e2edd478f9212d7e898f4dd102b9d5dd10046dd652f37a9974861598c7ba91d7fdb1145c91 SHA512 723b09028f2e3075056b9588cebad0ddccbc98d0c15552b9565c177b0de764b9645f88ea2bc534ccf606f2e0b59f91e1d03551b55ece66c0654ce9cdf09a1a7c
diff --git a/dev-python/pivy/pivy-0.6.7.ebuild b/dev-python/pivy/pivy-0.6.7.ebuild
deleted file mode 100644
index c989cb820252..000000000000
--- a/dev-python/pivy/pivy-0.6.7.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_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Coin3D bindings for Python"
-HOMEPAGE="https://github.com/coin3d/pivy"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	PIVY_REPO_URI="https://github.com/coin3d/pivy.git"
-else
-	SRC_URI="https://github.com/coin3d/pivy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="ISC"
-SLOT="0"
-IUSE="+quarter soqt test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( quarter soqt )
-"
-
-RDEPEND="
-	>=media-libs/coin-4.0.0
-	quarter? ( media-libs/quarter )
-	soqt? ( >=media-libs/SoQt-1.6.0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/swig
-	dev-util/cmake
-	test? ( ${RDEPEND} )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.6-0001-fix-CMakeLists.txt-for-distutils_cmake.patch
-	"${FILESDIR}"/${PN}-0.6.6-0002-Gentoo-specific-clear-swig-deprecation-warning.patch
-	"${FILESDIR}"/${P}-find-qmake.patch
-)
-
-DOCS=( AUTHORS HACKING NEWS README.md THANKS )
-
-python_test() {
-	# visual_test.py is interactive
-	# pyside_test.py currently fails
-	# quarter_tests.py needs pyside2, which currently lacks py3_11 support
-	for f in tests/coin_tests.py; do
-		"${EPYTHON}" "${f}" || die "Test ${f} failed with ${EPYTHON}"
-	done
-}
diff --git a/dev-python/pivy/pivy-0.6.8.ebuild b/dev-python/pivy/pivy-0.6.8.ebuild
index cf7827efb65a..3b3d89c062d9 100644
--- a/dev-python/pivy/pivy-0.6.8.ebuild
+++ b/dev-python/pivy/pivy-0.6.8.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	PIVY_REPO_URI="https://github.com/coin3d/pivy.git"
 else
 	SRC_URI="https://github.com/coin3d/pivy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="ISC"
diff --git a/dev-python/pychm/pychm-0.8.6-r1.ebuild b/dev-python/pychm/pychm-0.8.6-r1.ebuild
index cd37c7da7e23..303f7292183a 100644
--- a/dev-python/pychm/pychm-0.8.6-r1.ebuild
+++ b/dev-python/pychm/pychm-0.8.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dottedmag/pychm/archive/v${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 
 RDEPEND="dev-libs/chmlib"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pychm/pychm-0.8.6.ebuild b/dev-python/pychm/pychm-0.8.6.ebuild
deleted file mode 100644
index 05a59acc4322..000000000000
--- a/dev-python/pychm/pychm-0.8.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the chmlib library"
-HOMEPAGE="https://github.com/dottedmag/pychm"
-SRC_URI="https://github.com/dottedmag/pychm/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-
-RDEPEND="dev-libs/chmlib"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# need to avoid relative import of 'chm' directory but tests rely
-	# on locating files relatively via tests/...
-	mv tests .. || die
-	cd .. || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 9a3a580f670d..e94b122221dc 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,3 +1 @@
-DIST pygit2-1.10.1.gh.tar.gz 752254 BLAKE2B b0f09eb65be19e9bb0e21afab4613478e1ad516f2cdd10c01328b73233e4e7f3a33d2c90c5ccb35a55050b18e6bf1e1dadb330457a78d0fed9d75da5a4082588 SHA512 d545b5919b6c1ef5411a20acc7463a7ff934852bef209c7254b33365ccb6e127f136537745088be387a07a70e99d2a12466570a515fcb9410216a34a565e7ea9
-DIST pygit2-1.11.0.gh.tar.gz 757139 BLAKE2B aef7dd1e9dfe8961be9e34c63ab07b13f9cd3affde2b28cc97a2c227c121662f7464ba1af741a5a06a3ac153531c4158699ffb94b393bcf954248afa10088ede SHA512 2bde656d0f6565a827cb2d090a4e3211d838a6822954cbaf01db67976e6959bbb21a24b4671398f59f3793923c5b6bb484e62b6b8af28998b06cfe3758165668
 DIST pygit2-1.11.1.gh.tar.gz 757247 BLAKE2B 0cd5cf276e1bec375635905ca072b021e29821f9ebc878dc1ae92d0c0a0cbca00481ed3501550161827e4d6e9e018edf165a2e59eb0cbd0ec0004d6c1c10f7eb SHA512 c831afb30ec4c0c4972687f28196915ccb428bf2e242eed17ff50bf700f06db59dcec254e1104bea9a335bc7955f36143085395d8463a750f4492e8c701b2061
diff --git a/dev-python/pygit2/pygit2-1.10.1.ebuild b/dev-python/pygit2/pygit2-1.10.1.ebuild
deleted file mode 100644
index 9b5df483b502..000000000000
--- a/dev-python/pygit2/pygit2-1.10.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="
-	https://github.com/libgit2/pygit2/
-	https://pypi.org/project/pygit2/
-"
-SRC_URI="
-	https://github.com/libgit2/pygit2/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-DEPEND="
-	=dev-libs/libgit2-1.5*:=
-"
-BDEPEND="
-	>=dev-python/cffi-1.9.1:=[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-	${BDEPEND}
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unconditionally prevent it from using network
-	sed -i -e '/has_network/s:True:False:' test/utils.py || die
-}
-
-src_test() {
-	rm -r pygit2 || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/pygit2/pygit2-1.11.0.ebuild b/dev-python/pygit2/pygit2-1.11.0.ebuild
deleted file mode 100644
index ee6b95654f3a..000000000000
--- a/dev-python/pygit2/pygit2-1.11.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="
-	https://github.com/libgit2/pygit2/
-	https://pypi.org/project/pygit2/
-"
-SRC_URI="
-	https://github.com/libgit2/pygit2/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-DEPEND="
-	=dev-libs/libgit2-1.5*:=
-"
-BDEPEND="
-	>=dev-python/cffi-1.9.1:=[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-	${BDEPEND}
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unconditionally prevent it from using network
-	sed -i -e '/has_network/s:True:False:' test/utils.py || die
-}
-
-src_test() {
-	rm -r pygit2 || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/pygit2/pygit2-1.11.1.ebuild b/dev-python/pygit2/pygit2-1.11.1.ebuild
index ee6b95654f3a..9b5df483b502 100644
--- a/dev-python/pygit2/pygit2-1.11.1.ebuild
+++ b/dev-python/pygit2/pygit2-1.11.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 DEPEND="
 	=dev-libs/libgit2-1.5*:=
diff --git a/dev-python/pyglet/pyglet-2.0.0.ebuild b/dev-python/pyglet/pyglet-2.0.0.ebuild
index f83b2dd63795..88e9bd334e2c 100644
--- a/dev-python/pyglet/pyglet-2.0.0.ebuild
+++ b/dev-python/pyglet/pyglet-2.0.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.gh.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples image +sound"
 
 BDEPEND="
diff --git a/dev-python/pykwalify/pykwalify-1.8.0-r2.ebuild b/dev-python/pykwalify/pykwalify-1.8.0-r2.ebuild
deleted file mode 100644
index 9b8532e4f642..000000000000
--- a/dev-python/pykwalify/pykwalify-1.8.0-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python lib/cli for JSON/YAML schema validation"
-HOMEPAGE="https://pypi.org/project/pykwalify/ https://github.com/Grokzen/pykwalify"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/docopt-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/testfixtures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-S.patch
-)
diff --git a/dev-python/pykwalify/pykwalify-1.8.0-r3.ebuild b/dev-python/pykwalify/pykwalify-1.8.0-r3.ebuild
index 3e36761cc1d1..9b8532e4f642 100644
--- a/dev-python/pykwalify/pykwalify-1.8.0-r3.ebuild
+++ b/dev-python/pykwalify/pykwalify-1.8.0-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/docopt-0.6.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 9b6facc7fc5c..a3658643b87b 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,3 +1 @@
-DIST pymdown-extensions-9.7.gh.tar.gz 1015024 BLAKE2B 6b2b1a86e693a2e4bca889c66bd97c099976e9e9e56291c35b25d8a99554dbae8e4e7b913b774ed9de6406fcaa8850009e000ee97bc97b1dfd09bbc514f4bd6e SHA512 0e6a28ac991ec02821abc1525de30007ded891d8437a8e4f9eb349e26c18702f9477fac0ca6728d5c3fdb5f0fdea451a3f00db3ea354115f20a69bb0f4a114f2
-DIST pymdown-extensions-9.8.gh.tar.gz 1012711 BLAKE2B 451dba60e42d8ad5e1368ac02c89a99a086d99b24402a2570f1fc51c73416163c200d2056a0667f03f6a7c5611cd3b3b870d8dd9ae934ca1d867c9ed9f3a985b SHA512 f9937625984dee09ba2dfdf9e706bdc382017f906f89c42080db38af63b17c1475cc7ffaf94c967ea116c735419168eb35d9dc272d971fe7d92a5950f67673cd
 DIST pymdown-extensions-9.9.gh.tar.gz 1013192 BLAKE2B 51b9baf40f8a40f3553529f0670a895d141b3b92c2b5a66b215e8551246c20ba7b96891714b2012a005056b1534d72bb0cc644cc719b230ae1f3bb03e2258203 SHA512 000ca793d891abdbeac3c9902c25d842d5ed2c209a0e32deb5cdab41f2019dc85e0be41abdbecc369b4def1291d30e4bf9a71e86d522f45d629423b4d42c6d8b
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.7.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.7.ebuild
deleted file mode 100644
index ddd36b094a8b..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.7.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=hatchling
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pymdown-lexers
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-SRC_URI="
-	https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	default
-	# We need to do this manually instead of relying on docs_compile
-	# https://bytemeta.vip/repo/facelessuser/pymdown-extensions/issues/1446
-	# https://bugs.gentoo.org/859637
-	if use doc; then
-		python -m mkdocs build || die "Failed to make docs"
-		# Colliding files found by ecompress:
-		rm site/sitemap.xml.gz || die
-		HTML_DOCS=( "site/." )
-	fi
-}
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.8.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.8.ebuild
deleted file mode 100644
index 3e96a7d65801..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.8.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=hatchling
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pymdown-lexers
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-SRC_URI="
-	https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	default
-	# We need to do this manually instead of relying on docs_compile
-	# https://bytemeta.vip/repo/facelessuser/pymdown-extensions/issues/1446
-	# https://bugs.gentoo.org/859637
-	if use doc; then
-		python -m mkdocs build || die "Failed to make docs"
-		# Colliding files found by ecompress:
-		rm site/sitemap.xml.gz || die
-		HTML_DOCS=( "site/." )
-	fi
-}
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.9.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.9.ebuild
index 5d26af030514..4993f7017f71 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.9.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-9.9.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pyrsistent/pyrsistent-0.19.2.ebuild b/dev-python/pyrsistent/pyrsistent-0.19.2.ebuild
index 9c0db8eaa95a..8c4597574b22 100644
--- a/dev-python/pyrsistent/pyrsistent-0.19.2.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.19.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index c843ffef946c..2e6d0134e908 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1,2 +1 @@
-DIST pytest-httpx-0.21.1.gh.tar.gz 23997 BLAKE2B feba932cd8a4e7e36cbf98a5c07f8e3264c9f95568568dd4ec4b882a509a4feafd740d3c25a547b7ea28f7e5450083a5f5f7afde0b19bfe46f7999b01565fbe3 SHA512 22cd471996202c78c3d3b433f8ed525e0282df431f0923cfbce42fd543b56a2af20723062773a1a3e3f406a0ce6aa6eed27faaa76731472a903cdad6fb13f771
 DIST pytest-httpx-0.21.2.gh.tar.gz 24311 BLAKE2B ae1ce7ada3977c3bd68f31b5e20e93ac32f2459359bcff30d1ccf358b07ce269f38acb06b46211ddaed1085a9cf78fcefb921a978a5ca4f6c84fe25b602a3a25 SHA512 d8a9d1381a7c1bb1f907effce48bcd4cad29b2eb135e5d18e7ba3025ba2f18d97c7914f0cfb835416dfa608c59ed51db653b0366d407cfbb82fc520808f3792e
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.21.1.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.21.1.ebuild
deleted file mode 100644
index 7990a1c18def..000000000000
--- a/dev-python/pytest-httpx/pytest-httpx-0.21.1.ebuild
+++ /dev/null
@@ -1,38 +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_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/_}"
-DESCRIPTION="Send responses to HTTPX using pytest"
-HOMEPAGE="
-	https://colin-b.github.io/pytest_httpx/
-	https://github.com/Colin-b/pytest_httpx/
-	https://pypi.org/project/pytest-httpx/
-"
-SRC_URI="
-	https://github.com/Colin-b/pytest_httpx/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	=dev-python/httpx-0.23*[${PYTHON_USEDEP}]
-	<dev-python/pytest-8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.21.2.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.21.2.ebuild
index 4d4084163aab..7990a1c18def 100644
--- a/dev-python/pytest-httpx/pytest-httpx-0.21.2.ebuild
+++ b/dev-python/pytest-httpx/pytest-httpx-0.21.2.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	=dev-python/httpx-0.23*[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-salt-factories/Manifest b/dev-python/pytest-salt-factories/Manifest
index cac5c3882756..37d3cdb24b5e 100644
--- a/dev-python/pytest-salt-factories/Manifest
+++ b/dev-python/pytest-salt-factories/Manifest
@@ -1,4 +1,2 @@
 DIST pytest-salt-factories-0.121.1.tar.gz 102121 BLAKE2B 92cd5953b11377f1646f01b86a677a50216d16bcb944235a3f04176aecbb005974c415adcbf23cc391aab41b1ee9596984516ab61ecdd8c944d4ce707c39ab00 SHA512 32252695c6e8b17ef17d3330c4b0b38bdce89201d5573b4efa3531a72e826ee1fb26fea3ad0408401dec867cee405f21031804c32eb8fe6ceaa00925b17725a1
-DIST pytest-salt-factories-1.0.0_rc13.tar.gz 148418 BLAKE2B 3688f05d137df23266ebc7e999bc3b3a8ec198173b38dc98bd4a1e2655b982a37485278691e970da0be700cee6f609c57933b041a6d8403e75fb197f5d23d5d4 SHA512 f3713410704540ee48b7263973d3a9bf3159fb63e53e5ef5002201aea3fdcf0b4eaf00e1dd1e67d869b42242985d8117a117568d63abf5ad366e247fb3e1d83f
 DIST pytest-salt-factories-1.0.0_rc20.gh.tar.gz 160140 BLAKE2B 7ecd9af695626c465e5776ed218bd92f30a556394cf4af0c2b6fb87c182f8aaf2d8f998358a7eef95fae53c85a6be2d4ed5a6ff191496fcac62a97e25cf19063 SHA512 5677c6638b5dc7f90c01f2c2204e1910c2bf6ea2c10b714173d3443d4c682b5f515ad7881e2ceee66f6eaf619e399d6fa10052604fdc9c5157c58348b63c8f2b
-DIST pytest-salt-factories-1.0.0_rc20.tar.gz 160140 BLAKE2B 7ecd9af695626c465e5776ed218bd92f30a556394cf4af0c2b6fb87c182f8aaf2d8f998358a7eef95fae53c85a6be2d4ed5a6ff191496fcac62a97e25cf19063 SHA512 5677c6638b5dc7f90c01f2c2204e1910c2bf6ea2c10b714173d3443d4c682b5f515ad7881e2ceee66f6eaf619e399d6fa10052604fdc9c5157c58348b63c8f2b
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc13.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc13.ebuild
deleted file mode 100644
index ed5123bbb2fd..000000000000
--- a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc13.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-DESCRIPTION="The new generation of the pytest-salt Plugin"
-HOMEPAGE="https://github.com/saltstack/pytest-salt-factories"
-SRC_URI="https://github.com/saltstack/${PN}/archive/${PV//_/}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${PN}-${PV//_/}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
-	dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
-	dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-	>=app-admin/salt-3001.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/pytest-salt-factories-1.0.0_rc13-tests.patch"
-)
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	sed -r -e "s:use_scm_version=True:version='${PV}', name='${PN//-/.}':" -i setup.py || die
-	sed -r -e '/(setuptools|setup_requires)/ d' -i setup.cfg || die
-
-	sed -i 's:tool.setuptools_scm:tool.disabled:' pyproject.toml || die
-	printf '__version__ = "%s"\n' "${PV}" > src/saltfactories/version.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local tempdir
-
-	# ${T} is too long a path for the tests to work
-	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
-	addwrite "${tempdir}"
-
-	distutils_install_for_testing --via-root
-
-	(
-		cleanup() { rm -rf "${tempdir}" || die; }
-
-		trap cleanup EXIT
-		env SHELL="/bin/bash" TMPDIR="${tempdir}" \
-			pytest -vv -x || die "Tests failed with ${EPYTHON}"
-	)
-}
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc20-r1.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc20-r1.ebuild
index 6f88852e0af6..f130446a700a 100644
--- a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc20-r1.ebuild
+++ b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc20-r1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${PN}-${PV//_/}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc20.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc20.ebuild
deleted file mode 100644
index 1e83b1eb18d7..000000000000
--- a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc20.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-DESCRIPTION="The new generation of the pytest-salt Plugin"
-HOMEPAGE="https://github.com/saltstack/pytest-salt-factories"
-SRC_URI="https://github.com/saltstack/${PN}/archive/${PV//_/}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${PN}-${PV//_/}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
-	dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
-	>=dev-python/pytest-shell-utilities-1.4.0[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-	>=app-admin/salt-3001.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/pytest-salt-factories-1.0.0_rc20-tests.patch"
-)
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	sed -r -e "s:use_scm_version=True:version='${PV}', name='${PN//-/.}':" -i setup.py || die
-	sed -r -e '/(setuptools|setup_requires)/ d' -i setup.cfg || die
-
-	sed -i 's:tool.setuptools_scm:tool.disabled:' pyproject.toml || die
-	printf '__version__ = "%s"\n' "${PV}" > src/saltfactories/version.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local tempdir
-
-	# ${T} is too long a path for the tests to work
-	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
-	addwrite "${tempdir}"
-
-	distutils_install_for_testing --via-root
-
-	(
-		cleanup() { rm -rf "${tempdir}" || die; }
-
-		trap cleanup EXIT
-		env SHELL="/bin/bash" TMPDIR="${tempdir}" \
-			pytest -vv -x || die "Tests failed with ${EPYTHON}"
-	)
-}
diff --git a/dev-python/pytest-system-statistics/Manifest b/dev-python/pytest-system-statistics/Manifest
index 1cd15b29538a..dceabab2f895 100644
--- a/dev-python/pytest-system-statistics/Manifest
+++ b/dev-python/pytest-system-statistics/Manifest
@@ -1,2 +1 @@
 DIST pytest-system-statistics-1.0.2.gh.tar.gz 55147 BLAKE2B 9b1217102a23e723090e04652fdd727818e2404bf110e4f54289251eb92f4abb59861ba6c6fc611c843960cf0595fa5cbd636071033327d4e602606e8ab63abf SHA512 1fab5038dde504ab0d5d0f4da851c9a8260849adb38a1196c6399131d77cc24a1926e68310dd0701ed001a20a7fcfb57c5202c5ebfd6de4c85aac4be49fc7347
-DIST pytest-system-statistics-1.0.2.tar.gz 55147 BLAKE2B 9b1217102a23e723090e04652fdd727818e2404bf110e4f54289251eb92f4abb59861ba6c6fc611c843960cf0595fa5cbd636071033327d4e602606e8ab63abf SHA512 1fab5038dde504ab0d5d0f4da851c9a8260849adb38a1196c6399131d77cc24a1926e68310dd0701ed001a20a7fcfb57c5202c5ebfd6de4c85aac4be49fc7347
diff --git a/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2-r1.ebuild b/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2-r1.ebuild
index e771d8d15799..75c8a1afc7d6 100644
--- a/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2-r1.ebuild
+++ b/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/saltstack/${PN}/archive/refs/tags/${PV}.tar.gz -> ${
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2.ebuild b/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2.ebuild
deleted file mode 100644
index e5661a9335d0..000000000000
--- a/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2.ebuild
+++ /dev/null
@@ -1,49 +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_{7,8,9,10,11} )
-inherit distutils-r1
-
-DESCRIPTION="Pytest Plugin Which Reports System Usage Statistics"
-HOMEPAGE="
-	https://pypi.org/project/pytest-system-statistics/
-	https://github.com/saltstack/pytest-system-statistics
-"
-SRC_URI="https://github.com/saltstack/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
-	sed -e "/setuptools_scm/ d" -i setup.cfg || die
-	sed -e "s/tool.setuptools_scm/tool.disabled/" -i pyproject.toml || die
-
-	printf '__version__ = "${PV}"\n' > src/pytestsysstats/version.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest -k 'not proc_sys_stats'
-}
diff --git a/dev-python/pytest-tempdir/Manifest b/dev-python/pytest-tempdir/Manifest
index 838f3407fcbb..f5c600d7b5b0 100644
--- a/dev-python/pytest-tempdir/Manifest
+++ b/dev-python/pytest-tempdir/Manifest
@@ -1,2 +1 @@
 DIST pytest-tempdir-2019.10.12.gh.tar.gz 9859 BLAKE2B fe4d32d2de3d577952b90a811c38f1cfa0c16badf9115a1b70faf07f0123e29935c01bfc3c1b9c616a0eeb3e0da9f42a4415687a4862830e0edea505a99dfc04 SHA512 d6f8994423d9be90f4be20878f980ad4604475ccd4b65975cd3cad357c2d6a2a7bb8623e4ccd7441437ad72b7899d8b59ae19ca3a52c35a6c24456e44b7626de
-DIST pytest-tempdir-2019.10.12.tar.gz 9859 BLAKE2B fe4d32d2de3d577952b90a811c38f1cfa0c16badf9115a1b70faf07f0123e29935c01bfc3c1b9c616a0eeb3e0da9f42a4415687a4862830e0edea505a99dfc04 SHA512 d6f8994423d9be90f4be20878f980ad4604475ccd4b65975cd3cad357c2d6a2a7bb8623e4ccd7441437ad72b7899d8b59ae19ca3a52c35a6c24456e44b7626de
diff --git a/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12-r1.ebuild b/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12-r1.ebuild
index 1044709eb8a4..4f52368db518 100644
--- a/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12-r1.ebuild
+++ b/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12-r1.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://github.com/saltstack/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild b/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild
deleted file mode 100644
index 3a5a02eb3c08..000000000000
--- a/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-DESCRIPTION="Pytest plugin to support for a predictable and repeatable temporary directory"
-HOMEPAGE="https://github.com/saltstack/pytest-tempdir"
-SRC_URI="https://github.com/saltstack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/regex/regex-2022.10.31.ebuild b/dev-python/regex/regex-2022.10.31.ebuild
index cd7dfb388caf..176a920f7f98 100644
--- a/dev-python/regex/regex-2022.10.31.ebuild
+++ b/dev-python/regex/regex-2022.10.31.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/rsa/rsa-4.9.ebuild b/dev-python/rsa/rsa-4.9.ebuild
index ea7d9b9b67de..8bbadf7acf4e 100644
--- a/dev-python/rsa/rsa-4.9.ebuild
+++ b/dev-python/rsa/rsa-4.9.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlitedict/Manifest b/dev-python/sqlitedict/Manifest
index 77daa8afcae4..10d3c6871266 100644
--- a/dev-python/sqlitedict/Manifest
+++ b/dev-python/sqlitedict/Manifest
@@ -1 +1 @@
-DIST sqlitedict-2.0.0.tar.gz 46266 BLAKE2B c320c5b61e535ff668462fc079cd501e8aae4fb334230ed0b9c5eae0c53f569c8971a8484cddf85575b1e2d28b051d2f0fa8376a1176e3116a1a0516e36202aa SHA512 3ba84676680e5e9408804618e4ae871d09fcfdc999f06c1143f42329059e6033abb2d897ed485d9d84dc2761032fa07f00f08b259f1d9e6426c4ee0068446ed8
+DIST sqlitedict-2.1.0.tar.gz 21846 BLAKE2B 727d37cefcd1f847b29297f15dc97d70e516d44953dec69e4453bb7649b08edcb6b090d3915826b2b607864dbe28faa489d72fc930d2b1497077e6330d76f99f SHA512 b981dfd70b0d8d0a51e71c14db484fec523adf6cd3af70fcf5c24ae743dc97694113f977cd10c89746e5220aa9334f4ebe89bcf47aebaecd03bd8a4695b03fc9
diff --git a/dev-python/sqlitedict/sqlitedict-2.0.0.ebuild b/dev-python/sqlitedict/sqlitedict-2.1.0.ebuild
index 0f628b5332cf..4b4ee655e678 100644
--- a/dev-python/sqlitedict/sqlitedict-2.0.0.ebuild
+++ b/dev-python/sqlitedict/sqlitedict-2.1.0.ebuild
@@ -18,13 +18,13 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~arm64"
 
 DOCS=( README.rst )
 
 distutils_enable_tests pytest
 
-EPYTEST_DESELECT=(
-	tests/test_core.py::TablenamesTest::test_tablenames
-	tests/test_onimport.py::SqliteDictPython24Test::test_py24_error
-)
+python_test() {
+	mkdir -p tests/db || die
+	distutils-r1_python_test
+}
diff --git a/dev-python/statsmodels/statsmodels-0.13.5.ebuild b/dev-python/statsmodels/statsmodels-0.13.5.ebuild
index ce459c81a5e4..5c0df4071174 100644
--- a/dev-python/statsmodels/statsmodels-0.13.5.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.13.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/subunit/subunit-1.4.2.ebuild b/dev-python/subunit/subunit-1.4.2.ebuild
index ba04c51c014e..bf99bb6e3c4a 100644
--- a/dev-python/subunit/subunit-1.4.2.ebuild
+++ b/dev-python/subunit/subunit-1.4.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 29a97563ae14..2cbda00d760f 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,3 +1,2 @@
-DIST trimesh-3.15.8.gh.tar.gz 11972365 BLAKE2B 2dd76c5f3c6949b79992dc23a4a80f3fc80c63c08ac7f8c6c11d6b1209b7b23f4843fe0da74528fbec0738bf83d2791260183cca710d2fe046c1bb8ef747c82b SHA512 806a8a10ff86a5198f7dc134f07fa3fd3f84d8e1b10f2d1f8dbc4a5783d2d24474d7c32f0427fd740f2af63d544fc4f3e710f1904cca0412390e6913092b1741
 DIST trimesh-3.16.0.gh.tar.gz 11970053 BLAKE2B 3898dd2fd12fd070bc9a3a10e21bd255b75f7758deb38e0d36314524b4e24b7ada6514865c06677a1db39b1723b918e5ec6dcf491bf0c946c3e22495cf7dcd01 SHA512 7b56a5007614eae8a7cef1a69334ef3b21499572b5bfaa414bd29097a431266e1ec4d7dda540dbf502a57f5b0ce9d3fb3763675821714ac25d924e0d15e22c71
 DIST trimesh-3.17.1.gh.tar.gz 12653345 BLAKE2B df286132ca01e1a7e8c226b7c98ffa0682b9bf2e225c4114c88395611d1a65a02be4395940ad04b67ae3b6909664b46e18e9fd018d892c86f8f5a4fcfe532210 SHA512 8cbf0bedd21c0867c5aa307e9bb8b4e4caff2aabee89cfadfa11513293304caa4b6a5ecce21064b7fa157a2453b58d401eb6010d0ea32bbd5a99c3075f38b826
diff --git a/dev-python/trimesh/trimesh-3.15.8.ebuild b/dev-python/trimesh/trimesh-3.15.8.ebuild
deleted file mode 100644
index 885721d59c9f..000000000000
--- a/dev-python/trimesh/trimesh-3.15.8.ebuild
+++ /dev/null
@@ -1,65 +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_{7,8,9,10,11} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimsh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)"
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-3.16.0.ebuild b/dev-python/trimesh/trimesh-3.16.0.ebuild
index 1c0c0119f89b..885721d59c9f 100644
--- a/dev-python/trimesh/trimesh-3.16.0.ebuild
+++ b/dev-python/trimesh/trimesh-3.16.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4-r1.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4-r1.ebuild
deleted file mode 100644
index 5e8c3abc9450..000000000000
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Set of extensions to Ian Bicking's virtualenv tool"
-HOMEPAGE="https://bitbucket.org/dhellmann/virtualenvwrapper
-	https://pypi.org/project/virtualenvwrapper/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# testsuite doesn't work out of the box.  Demand of a virtualenv outstrips setup by the eclass
-RESTRICT=test
-
-RDEPEND="
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-	dev-python/stevedore[${PYTHON_USEDEP}]
-	dev-python/virtualenv-clone[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]"
-
-python_test() {
-	bash ./tests/run_tests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4-r2.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4-r2.ebuild
index 157e6a484e3c..4a9f6b8cabe2 100644
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4-r2.ebuild
+++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 # testsuite doesn't work out of the box.  Demand of a virtualenv outstrips setup by the eclass
 RESTRICT=test
diff --git a/dev-python/xarray/xarray-2022.11.0.ebuild b/dev-python/xarray/xarray-2022.11.0.ebuild
index a6b179e77a8e..6e5f04179146 100644
--- a/dev-python/xarray/xarray-2022.11.0.ebuild
+++ b/dev-python/xarray/xarray-2022.11.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.22[${PYTHON_USEDEP}]
diff --git a/dev-python/zeep/Manifest b/dev-python/zeep/Manifest
index 5eba0b34e497..c03ab549db08 100644
--- a/dev-python/zeep/Manifest
+++ b/dev-python/zeep/Manifest
@@ -1,3 +1 @@
-DIST zeep-4.1.0.tar.gz 160333 BLAKE2B d29db92efe048ba854ff14cde062993c3f334cab6cfc122f6db9aa7a1a490c82f93a50ca5028a5f86e316d9ecf567ac40aef10f3e7d8db89376c7d8dea2a2e23 SHA512 acc54f99d21fe401e06418223591bcf8e7f8819e225f892beb0f6e2a1ee359a0da6f9d0aa4212899197c084af37cc56126879b93a22cdad2458e57674bf66ed5
-DIST zeep-4.2.0.tar.gz 161102 BLAKE2B e6d25ec10c1e50d6d3e029d65e0ec28ca70524b82ba67c261099fa970cbb0af320e9085539316ae64736600acce0e69793c081314c01e2de34a026208d8a5bef SHA512 dd7ea6fb80e41ae0ed81ebc26b9d0498685c9801baf0c46c124b0341e78127f521e429c7b55a2056018f3229128294f2715f8794ae8c00f313435cd8663c63f6
 DIST zeep-4.2.1.tar.gz 161072 BLAKE2B 01e3ec848bc4a98b301b7d091a0740f4a69057f3bb56e884a31b1d73ed51b0c62b4e0e148b2a59ebb6f01469aa949cb4079c0147dae7b3d8e7c8a2f66e5b31f8 SHA512 08de88c1e4cd1787137ea18f12bf343c5c9bb7b353ecd8781c58c7c1acf1b6ee8a0483b47d9a78eb24c79d8ecc347eb8595d460d9f75ca0428963f36a76dff5d
diff --git a/dev-python/zeep/files/zeep-4.1.0-cached-prop.patch b/dev-python/zeep/files/zeep-4.1.0-cached-prop.patch
deleted file mode 100644
index 368dca71ad38..000000000000
--- a/dev-python/zeep/files/zeep-4.1.0-cached-prop.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 25701f0b69ee46914179070b7e8906ea3e521480 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 11 Nov 2021 08:55:41 +0100
-Subject: [PATCH] Use stdlib functools.cached_property if available
-
-Python 3.8+ provides a functools.cached_property in the stdlib that is
-thread-safe, i.e. equivalent to threaded_cached_property.  Use it
-instead of adding third-party dependencies whenever available.
----
- setup.py                            | 2 +-
- src/zeep/wsdl/attachments.py        | 6 +++++-
- src/zeep/xsd/elements/indicators.py | 6 +++++-
- src/zeep/xsd/types/any.py           | 6 +++++-
- src/zeep/xsd/types/complex.py       | 6 +++++-
- 5 files changed, 21 insertions(+), 5 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index cb51ac4..8ef81b6 100755
---- a/setup.py
-+++ b/setup.py
-@@ -4,7 +4,7 @@ from setuptools import setup
- 
- install_requires = [
-     "attrs>=17.2.0",
--    "cached-property>=1.3.0",
-+    "cached-property>=1.3.0; python_version<'3.8'",
-     "isodate>=0.5.4",
-     "lxml>=4.6.0",
-     "platformdirs>=1.4.0",
-diff --git a/src/zeep/wsdl/attachments.py b/src/zeep/wsdl/attachments.py
-index 037e439..075bee5 100644
---- a/src/zeep/wsdl/attachments.py
-+++ b/src/zeep/wsdl/attachments.py
-@@ -6,7 +6,11 @@ See https://www.w3.org/TR/SOAP-attachments
- 
- import base64
- 
--from cached_property import cached_property
-+try:
-+    from functools import cached_property
-+except ImportError:
-+    from cached_property import cached_property
-+
- from requests.structures import CaseInsensitiveDict
- 
- 
-diff --git a/src/zeep/xsd/elements/indicators.py b/src/zeep/xsd/elements/indicators.py
-index 40325da..e9ef2c4 100644
---- a/src/zeep/xsd/elements/indicators.py
-+++ b/src/zeep/xsd/elements/indicators.py
-@@ -16,7 +16,11 @@ import operator
- import typing
- from collections import OrderedDict, defaultdict, deque
- 
--from cached_property import threaded_cached_property
-+try:
-+    from functools import cached_property as threaded_cached_property
-+except ImportError:
-+    from cached_property import threaded_cached_property
-+
- from lxml import etree
- 
- from zeep.exceptions import UnexpectedElementError, ValidationError
-diff --git a/src/zeep/xsd/types/any.py b/src/zeep/xsd/types/any.py
-index b4525e4..17f244e 100644
---- a/src/zeep/xsd/types/any.py
-+++ b/src/zeep/xsd/types/any.py
-@@ -1,7 +1,11 @@
- import logging
- import typing
- 
--from cached_property import threaded_cached_property
-+try:
-+    from functools import cached_property as threaded_cached_property
-+except ImportError:
-+    from cached_property import threaded_cached_property
-+
- from lxml import etree
- 
- from zeep.utils import qname_attr
-diff --git a/src/zeep/xsd/types/complex.py b/src/zeep/xsd/types/complex.py
-index 8141bc1..b2ed9bf 100644
---- a/src/zeep/xsd/types/complex.py
-+++ b/src/zeep/xsd/types/complex.py
-@@ -4,7 +4,11 @@ import typing
- from collections import OrderedDict, deque
- from itertools import chain
- 
--from cached_property import threaded_cached_property
-+try:
-+    from functools import cached_property as threaded_cached_property
-+except ImportError:
-+    from cached_property import threaded_cached_property
-+
- from lxml import etree
- 
- from zeep.exceptions import UnexpectedElementError, XMLParseError
--- 
-2.33.1
-
diff --git a/dev-python/zeep/zeep-4.1.0-r2.ebuild b/dev-python/zeep/zeep-4.1.0-r2.ebuild
deleted file mode 100644
index 5aea265590be..000000000000
--- a/dev-python/zeep/zeep-4.1.0-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A modern/fast Python SOAP client based on lxml / requests"
-HOMEPAGE="https://docs.python-zeep.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="async"
-
-RDEPEND="
-	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
-	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-file-1.5.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.7.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	async? ( >=dev-python/aiohttp-1.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/aioresponses[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/python-xmlsec[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpx[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cached-prop.patch
-)
-
-EPYTEST_DESELECT=(
-	# broken by new pytest-httpx?
-	tests/test_async_transport.py::test_load
-	tests/test_async_transport.py::test_load_cache
-	tests/test_async_transport.py::test_post
-	tests/test_async_transport.py::test_http_error
-)
diff --git a/dev-python/zeep/zeep-4.2.0.ebuild b/dev-python/zeep/zeep-4.2.0.ebuild
deleted file mode 100644
index 9f709e8b1076..000000000000
--- a/dev-python/zeep/zeep-4.2.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A modern/fast Python SOAP client based on lxml / requests"
-HOMEPAGE="https://docs.python-zeep.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="async"
-
-RDEPEND="
-	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
-	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-file-1.5.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.7.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	async? ( >=dev-python/aiohttp-1.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/aioresponses[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/python-xmlsec[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpx[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# broken by new pytest-httpx?
-	tests/test_async_transport.py::test_load
-	tests/test_async_transport.py::test_load_cache
-	tests/test_async_transport.py::test_post
-	tests/test_async_transport.py::test_http_error
-)
diff --git a/dev-python/zeep/zeep-4.2.1.ebuild b/dev-python/zeep/zeep-4.2.1.ebuild
index 97c7aec20dfe..fdc9215fafc5 100644
--- a/dev-python/zeep/zeep-4.2.1.ebuild
+++ b/dev-python/zeep/zeep-4.2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="async"
 
 RDEPEND="
diff --git a/dev-python/zope-i18nmessageid/Manifest b/dev-python/zope-i18nmessageid/Manifest
index 0a2f43152164..8ad933318d92 100644
--- a/dev-python/zope-i18nmessageid/Manifest
+++ b/dev-python/zope-i18nmessageid/Manifest
@@ -1,3 +1 @@
-DIST zope-i18nmessageid-5.1.0.gh.tar.gz 28278 BLAKE2B db376b9915b16b17f290ba3e58492bdc9f89e6ef066b981967f8f39a9734e9ff0d8338099450bdaa362f6404b589452070cf7bf036a643852df7a0abd886a6bc SHA512 4a60c37d10b0593cadc7885ef92ea106b8bf1c89df20388ec657859f95fe19d5c282bf8cd86c6e04ec267b4c826226f0f43e4f1d11883c29dbf4b024075e74dc
 DIST zope-i18nmessageid-5.1.1.gh.tar.gz 28570 BLAKE2B 3cddac039da8ce2920cc6b22468eb33e065f7068049743b405f98b96f7c4d4f7b48b614ab4e700c48875c03787f5c1c31f7d2fd6aec18feb538ce4e85582910e SHA512 b1afd92c9dc12d12b5e0bb8657f35bc464f81ebedcb4931d0a6ba7e4f4e1975e57cdf76b8344f94efdc41c1319d1aa66175deda145d34486a0b54fe02cb95222
-DIST zope.i18nmessageid-5.0.1.tar.gz 28217 BLAKE2B 67e31a18daa8c2d5ccc16b173d37188fc6154cc75b1fd7cd908d6ee3ebeca0092316546587103f01aa6b39d074aaa207bec86401c4d50f664efba179191c9719 SHA512 31af16581d59ce1b7d5d8fd86c715c56b84aee9a7a0756bb2b7ceac6db30903acc5fdff85d844c0250c0a112cb45ab03be2f56d3d4ca6165272ff76c09d40d8c
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1-r2.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1-r2.ebuild
deleted file mode 100644
index 395d262b2728..000000000000
--- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Zope support for i18nmessageid (tagging source of i18n strings)"
-HOMEPAGE="
-	https://pypi.org/project/zope.i18nmessageid/
-	https://github.com/zopefoundation/zope.i18nmessageid/
-"
-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"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	!dev-python/namespace-zope
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# strip rdep specific to namespaces
-	sed -i -e "s:'setuptools',::" setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	distutils_write_namespace zope
-	eunittest
-}
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.1.0.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.1.0.ebuild
deleted file mode 100644
index e2b57a9c9230..000000000000
--- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.1.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Zope support for i18nmessageid (tagging source of i18n strings)"
-HOMEPAGE="
-	https://pypi.org/project/zope.i18nmessageid/
-	https://github.com/zopefoundation/zope.i18nmessageid/
-"
-SRC_URI="
-	https://github.com/zopefoundation/zope.i18nmessageid/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	!dev-python/namespace-zope
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# strip rdep specific to namespaces
-	sed -i -e "s:'setuptools',::" setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	distutils_write_namespace zope
-	eunittest
-}
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.1.1.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.1.1.ebuild
index 515d0958ef7e..5fbb100c267b 100644
--- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.1.1.ebuild
+++ b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.1.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-interface/zope-interface-5.5.2.ebuild b/dev-python/zope-interface/zope-interface-5.5.2.ebuild
index e7e34f210427..812a06c7873e 100644
--- a/dev-python/zope-interface/zope-interface-5.5.2.ebuild
+++ b/dev-python/zope-interface/zope-interface-5.5.2.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	!dev-python/namespace-zope