Adding metadata

50 files changed, 183 insertions, 204 deletions

diff --git a/dev-python/aesara/aesara-2.6.6.ebuild b/dev-python/aesara/aesara-2.6.6.ebuild
index e14277ca56ad..915a0192213a 100644
--- a/dev-python/aesara/aesara-2.6.6.ebuild
+++ b/dev-python/aesara/aesara-2.6.6.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cons[${PYTHON_USEDEP}]
diff --git a/dev-python/apsw/apsw-3.38.1_p1.ebuild b/dev-python/apsw/apsw-3.38.1_p1.ebuild
index c953a5ec475a..e6ccf7a4c8ce 100644
--- a/dev-python/apsw/apsw-3.38.1_p1.ebuild
+++ b/dev-python/apsw/apsw-3.38.1_p1.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/astor/astor-0.8.1-r1.ebuild b/dev-python/astor/astor-0.8.1-r1.ebuild
index 386eaa16240c..62f24abc0964 100644
--- a/dev-python/astor/astor-0.8.1-r1.ebuild
+++ b/dev-python/astor/astor-0.8.1-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://pypi.org/project/astor/"
 
 LICENSE="BSD"
 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/backoff/backoff-2.0.1.ebuild b/dev-python/backoff/backoff-2.0.1.ebuild
index f275ea10057f..0f0675638593 100644
--- a/dev-python/backoff/backoff-2.0.1.ebuild
+++ b/dev-python/backoff/backoff-2.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DOCS=( README.rst )
 
diff --git a/dev-python/blosc/blosc-1.10.6.ebuild b/dev-python/blosc/blosc-1.10.6.ebuild
index b060d8b38305..f466c7a99abc 100644
--- a/dev-python/blosc/blosc-1.10.6.ebuild
+++ b/dev-python/blosc/blosc-1.10.6.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 46d85dbbc035..115b608953e7 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -8,3 +8,4 @@ DIST boto3-1.23.5.tar.gz 501625 BLAKE2B 5a996b4dffd325ea2d6582450b027767ca9845e8
 DIST boto3-1.23.6.tar.gz 502243 BLAKE2B d5b20d24d76df16669de25bdd9486766e4c4983f2619b9690a1bb318172d3343ae67cc9746438964817c60b1a2e7b3cb530f0dc54e15c13fe14c8cd1a566875b SHA512 3f940e394a15d10593b23ad67ffa16c9a45bbc5d6231b9ae621f90af3bc3497173f309191af7f3d9c3d4ea0331109228853c08d3fed7a84226481a8d911837ed
 DIST boto3-1.23.7.tar.gz 502686 BLAKE2B 10ca206d1b7add5f9c88c5c474af4b6b4ac6fe4e690fa6ed2d1b4fb833874dfc6901c5c693ba96d72ac5af72533362065e107bb43f225f74fa18e41b52832482 SHA512 2970bbbccda3a74c821ab8598dc24204f838a417ea06b7816d16dda828123725162287d0d6ff4c9c815678f365220d5cea16a25abf5b70a4512845d157ab4f75
 DIST boto3-1.23.8.tar.gz 503306 BLAKE2B 98e0f2aafd0ead06ea9ca7593f211e04d1f9639d3703cc172becc5745858e10a3f7633da4cd3e7a6b8fa8ff84d471f76fb75e9ee4018532c485bd3bdcc2eb972 SHA512 87be75109df80d1ff29ce13b196630c0f43ee8443f35854afaa7a337f77511a42483176e7271d4988dc22c922a47cb2d2c67ddbf7fe9bde43e9cc1c341bdc756
+DIST boto3-1.23.9.gh.tar.gz 503767 BLAKE2B fcd4556331020c6db015fe1591344c5fc4ee80302ade3d3bfea7468a3d5c32075d3ceff6c951ab0fe2ff4ded8843abdb0b55f4338a86afccba34ef1a48d05c0f SHA512 1d9c3e7077136d5c8117d57c5df9c50ce16fc8d0aee322002fb0fec1edc5fbeaf7c1386de31f0b496a298cdaf79c3fc77ea5c0b549141a07bd057eee08a0f0f0
diff --git a/dev-python/boto3/boto3-1.23.9.ebuild b/dev-python/boto3/boto3-1.23.9.ebuild
new file mode 100644
index 000000000000..ed819b4695d0
--- /dev/null
+++ b/dev-python/boto3/boto3-1.23.9.ebuild
@@ -0,0 +1,68 @@
+# 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} )
+
+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.3.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-9999.ebuild b/dev-python/boto3/boto3-9999.ebuild
index b62a1bd2ec8f..ed819b4695d0 100644
--- a/dev-python/boto3/boto3-9999.ebuild
+++ b/dev-python/boto3/boto3-9999.ebuild
@@ -21,7 +21,10 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 	BOTOCORE_PV=${PV}
 else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	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
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 2445a6259423..6b1d6dabaaad 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -8,3 +8,4 @@ DIST botocore-1.26.5.tar.gz 8994964 BLAKE2B 472bc20b1a579674b97fa42f5b7bba2f06f1
 DIST botocore-1.26.6.tar.gz 8998364 BLAKE2B f4e735b919ab6343419fb37945e3fbbf253d5ffdd25b3903888c544127417006eb8b44ddd330f56172ab2c106efbe9e7d9ae2a74e7d1ff51752fee1e08bff3ff SHA512 4a5a982dcb2b2fdbc51726ec6a59855c4c073cb921648f372ca5b6a602c70be5285e4fb98da13ae57f2b312bd5374b903ad857112f64e1ac38f2be6bee1303d3
 DIST botocore-1.26.7.tar.gz 9004937 BLAKE2B 7aaa6e7383ba2dae73477bf498028175d5c62945428facf34c7f9b1145a8715a970383cea316f89e5727171c92bf1fd9f25f772335ecfbfcb0be6e5f8de39a2d SHA512 362e2f213cd51271608fc1501845a74a9702fb60ee6619cedc7baf3a37c3dedd12976b51bd182cb4601f2c33e3ebc5358356365d9e32ba8eff308ee5775178ac
 DIST botocore-1.26.8.tar.gz 8996827 BLAKE2B fb7b30a1f013e9625f20980bdfd2192bc57044f5b7f277e35c8495414bd6b0c99c10d6a9d02c68e67a244249695db7ad3c9cee00db9b46114ec92c8504a07ceb SHA512 93223e428d2464eb2bca1806ba1574d43da07c457aaada8d7839fe1508258d4f8ed7ad644539ec8b5a80307e436f4654f549b23704199ba0d4bd7fcefff2c6fd
+DIST botocore-1.26.9.tar.gz 9005786 BLAKE2B c68e4ca970a4b66e95fae1b5fea1c4515994e9313c608044afe94bdfc27a2df098a8163f143f7d991960c4e5cb07080cf3dcff2c29f9db248d680b3172bed816 SHA512 adbc339738cc8506a3333f13650e835c316528c0212c4dea61049257aae7cb766619c520dfc3c482e8559b32623e92986e19042ebb23db37da2c89b4b2c1e489
diff --git a/dev-python/botocore/botocore-1.26.9.ebuild b/dev-python/botocore/botocore-1.26.9.ebuild
new file mode 100644
index 000000000000..97701266bf61
--- /dev/null
+++ b/dev-python/botocore/botocore-1.26.9.ebuild
@@ -0,0 +1,70 @@
+# 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} )
+
+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="mirror://pypi/${PN:0:1}/${PN}/${P}.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}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/botocore-1.26.0-py311.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cmd2/cmd2-2.4.1.ebuild b/dev-python/cmd2/cmd2-2.4.1.ebuild
index 9ca81d0feaaf..af3763d02c8a 100644
--- a/dev-python/cmd2/cmd2-2.4.1.ebuild
+++ b/dev-python/cmd2/cmd2-2.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/exceptiongroup/Manifest b/dev-python/exceptiongroup/Manifest
index 6f00ff32de32..3f3b2be30f63 100644
--- a/dev-python/exceptiongroup/Manifest
+++ b/dev-python/exceptiongroup/Manifest
@@ -1,3 +1 @@
-DIST exceptiongroup-1.0.0rc5.gh.tar.gz 16454 BLAKE2B 55af4d2240e4a5567f5669d15e8507c454d47c1f7d8f72212afeecfa37e0c4a6b36f9176a87a48d3f9edf0628a8c99863670d24aca3770dd88abaa463784c731 SHA512 dd5ee895b4531524c4f0dfaedf818ac76a1b6fe74cd75bbce824b6a0d2b981673ffd6ba36f71b5dacf3e17c89d196a258400d04a64c71f28c221d7fb0f934ab7
-DIST exceptiongroup-1.0.0rc6.gh.tar.gz 17184 BLAKE2B 75a1a07d683cbd4d23c25156f4ff3fbda3f08e7df3be67320b08e995f469a9cbd66ca90391fb586972c5c601aff60d44eba3ec5c2d3cccbc791a0482600caea2 SHA512 f74fe5b5df5c7ceb09076db4b7327e2a22202f61fbbfcaeef4f2ce7fb0725a8f57756473db6b2d92d3ee044e26c7ad135d8366944e0858439c4a77ed8b5b7362
 DIST exceptiongroup-1.0.0rc7.gh.tar.gz 17323 BLAKE2B fc96a1a7978c4ac403132fbb9fba57cd61e8078e1d99e7103e37d7273737c2d8fbf84441a9cfc3c21a355713b13ec78f9befedcc05a74d9bb954ca80965dc789 SHA512 272675f3322f904b6270689696b2a770d8a96f195d8b142986f574e9c67735865afbde8bba0c5bdd43d299fc1f44a3360d273f9b15097efdcfa46f21f40d62bf
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc5.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc5.ebuild
deleted file mode 100644
index c41a06ffb7ca..000000000000
--- a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit_scm
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="Backport of PEP 654 (exception groups)"
-HOMEPAGE="
-	https://github.com/agronholm/exceptiongroup/
-	https://pypi.org/project/exceptiongroup/
-"
-SRC_URI="
-	https://github.com/agronholm/exceptiongroup/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT PSF-2.4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV/_}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc6.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc6.ebuild
deleted file mode 100644
index c41a06ffb7ca..000000000000
--- a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit_scm
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="Backport of PEP 654 (exception groups)"
-HOMEPAGE="
-	https://github.com/agronholm/exceptiongroup/
-	https://pypi.org/project/exceptiongroup/
-"
-SRC_URI="
-	https://github.com/agronholm/exceptiongroup/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT PSF-2.4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV/_}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/fastimport/fastimport-0.9.14.ebuild b/dev-python/fastimport/fastimport-0.9.14.ebuild
index 1abd7c70475d..aefc8625fd09 100644
--- a/dev-python/fastimport/fastimport-0.9.14.ebuild
+++ b/dev-python/fastimport/fastimport-0.9.14.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 python_test() {
 	"${EPYTHON}" -m unittest -v fastimport.tests.test_suite ||
diff --git a/dev-python/funcparserlib/funcparserlib-1.0.0.ebuild b/dev-python/funcparserlib/funcparserlib-1.0.0.ebuild
index ec042f26193f..7e2fa774479a 100644
--- a/dev-python/funcparserlib/funcparserlib-1.0.0.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-1.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/genshi/genshi-0.7.7.ebuild b/dev-python/genshi/genshi-0.7.7.ebuild
index a4581303bb79..3c54b20e06b4 100644
--- a/dev-python/genshi/genshi-0.7.7.ebuild
+++ b/dev-python/genshi/genshi-0.7.7.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/gitdb/gitdb-4.0.9-r1.ebuild b/dev-python/gitdb/gitdb-4.0.9-r1.ebuild
index 451d2695b069..7b6cabdf7b7a 100644
--- a/dev-python/gitdb/gitdb-4.0.9-r1.ebuild
+++ b/dev-python/gitdb/gitdb-4.0.9-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-core/google-api-core-2.7.3.ebuild b/dev-python/google-api-core/google-api-core-2.7.3.ebuild
index e85779648c06..aef8eb912ffb 100644
--- a/dev-python/google-api-core/google-api-core-2.7.3.ebuild
+++ b/dev-python/google-api-core/google-api-core-2.7.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P//google/python}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth/google-auth-2.6.6-r1.ebuild b/dev-python/google-auth/google-auth-2.6.6-r1.ebuild
index b54cee0615a6..eacb2920974f 100644
--- a/dev-python/google-auth/google-auth-2.6.6-r1.ebuild
+++ b/dev-python/google-auth/google-auth-2.6.6-r1.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/h5py/h5py-3.6.0.ebuild b/dev-python/h5py/h5py-3.6.0.ebuild
index ca910e4e850f..e0836a90f11a 100644
--- a/dev-python/h5py/h5py-3.6.0.ebuild
+++ b/dev-python/h5py/h5py-3.6.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 # disable mpi until mpi4py gets python3_8
 #IUSE="examples mpi"
 IUSE="examples"
diff --git a/dev-python/installer/installer-0.5.1.ebuild b/dev-python/installer/installer-0.5.1.ebuild
index d1675f212869..6441b7d6178d 100644
--- a/dev-python/installer/installer-0.5.1.ebuild
+++ b/dev-python/installer/installer-0.5.1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	app-arch/unzip
diff --git a/dev-python/jedi/jedi-0.18.1.ebuild b/dev-python/jedi/jedi-0.18.1.ebuild
index 04e4d85709b8..5cd5fa5e3539 100644
--- a/dev-python/jedi/jedi-0.18.1.ebuild
+++ b/dev-python/jedi/jedi-0.18.1.ebuild
@@ -30,7 +30,7 @@ LICENSE="
 	test? ( Apache-2.0 )
 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	=dev-python/parso-0.8*[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_client/jupyter_client-7.3.1.ebuild b/dev-python/jupyter_client/jupyter_client-7.3.1.ebuild
index 874b2625b5c8..f9e60bc26bf4 100644
--- a/dev-python/jupyter_client/jupyter_client-7.3.1.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-7.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
diff --git a/dev-python/jwcrypto/jwcrypto-1.2.0.ebuild b/dev-python/jwcrypto/jwcrypto-1.2.0.ebuild
index 9d451b084945..290d3e4f0210 100644
--- a/dev-python/jwcrypto/jwcrypto-1.2.0.ebuild
+++ b/dev-python/jwcrypto/jwcrypto-1.2.0.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/lark/lark-1.1.2.ebuild b/dev-python/lark/lark-1.1.2.ebuild
index 109b0184b456..9c72ad5f4b28 100644
--- a/dev-python/lark/lark-1.1.2.ebuild
+++ b/dev-python/lark/lark-1.1.2.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-3.1.9.ebuild b/dev-python/moto/moto-3.1.9.ebuild
index b64e57ada481..3b6a3da0e098 100644
--- a/dev-python/moto/moto-3.1.9.ebuild
+++ b/dev-python/moto/moto-3.1.9.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 ~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/numpydoc/numpydoc-1.3.1.ebuild b/dev-python/numpydoc/numpydoc-1.3.1.ebuild
index f0a0d3662f18..2ba8058eb765 100644
--- a/dev-python/numpydoc/numpydoc-1.3.1.ebuild
+++ b/dev-python/numpydoc/numpydoc-1.3.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
diff --git a/dev-python/outcome/outcome-1.1.0-r1.ebuild b/dev-python/outcome/outcome-1.1.0-r1.ebuild
index 6156743589d4..5aeaba11dde0 100644
--- a/dev-python/outcome/outcome-1.1.0-r1.ebuild
+++ b/dev-python/outcome/outcome-1.1.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/portend/portend-3.1.0.ebuild b/dev-python/portend/portend-3.1.0.ebuild
index 47b03030ddb5..f55ffa336f52 100644
--- a/dev-python/portend/portend-3.1.0.ebuild
+++ b/dev-python/portend/portend-3.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/tempora-1.8[${PYTHON_USEDEP}]
diff --git a/dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild
index 0953860867e5..7a36207a11c3 100644
--- a/dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pyproj/pyproj-3.3.1.ebuild b/dev-python/pyproj/pyproj-3.3.1.ebuild
index a7a4575c6714..f819e9a89e8e 100644
--- a/dev-python/pyproj/pyproj-3.3.1.ebuild
+++ b/dev-python/pyproj/pyproj-3.3.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux"
 
 RDEPEND="
 	>=sci-libs/proj-8.0.0:=
diff --git a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2-r1.ebuild b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2-r1.ebuild
index af0b6955f9ae..d35437f713cf 100644
--- a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2-r1.ebuild
+++ b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/freezegun[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.12.29.ebuild b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.12.29.ebuild
index 68c36e8997cc..a497c8c31e2b 100644
--- a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.12.29.ebuild
+++ b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.12.29.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 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-trio/pytest-trio-0.7.0-r1.ebuild b/dev-python/pytest-trio/pytest-trio-0.7.0-r1.ebuild
index d5fce9774cf5..fa82d9817ce6 100644
--- a/dev-python/pytest-trio/pytest-trio-0.7.0-r1.ebuild
+++ b/dev-python/pytest-trio/pytest-trio-0.7.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 0e16eb4ec5b5..e9ac0c65e6e4 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,4 +1,2 @@
-DIST qtconsole-5.1.1.tar.gz 428840 BLAKE2B eb5f6dacf576133c07bc45a9f0fcfdfd041f72012d9564e288a40ac060a6843f6438c80836bcf2f35ffa1f575383bdffe347a498930fe96e2d99a1f1fbe3a032 SHA512 dd9f725fc6e55dea3910650c4c5641336ed1ed56e6eeaad91e6567743bc02fbd0ca567295c3c8897bb800df305ec0bf9f2d8caa8ad0099cdfa2d20c7ca96fbdc
-DIST qtconsole-5.2.1.tar.gz 429573 BLAKE2B 57d42dee8710576785dd1e2e054469b5b2325fad1c30aab1b071f1aac80f3146edc057b03b025d72f0c8691d002a06dbe45bf51d51876ff730d39106d4e4aaa4 SHA512 86e310da66f36e38a584758b18482da927acd70f095600554d4bef3c0b0fcfab5df9d9990b94943a14932afbb8d5ec1db5810c40ef2a7e59172788291684d9aa
 DIST qtconsole-5.2.2.tar.gz 429610 BLAKE2B 1a9f163dfa8a2d38829b2db5a5589b80605b82f144d95e51e3668f296b8e839fd3045c813505926a4c8690e438e79d82c0307c33416152d28899b2f0324aec1e SHA512 43727a08a0b828421bb051063055b3306a2111bedfd148aea6bccc04e103bbffb798c35440bfdb82ffa6bf17a2b0ce9e1ad2d0b3df9aaea294a23dcf582dfd57
 DIST qtconsole-5.3.0.tar.gz 430258 BLAKE2B 883c95124d911b17a1cebedc357f207e042a9679a09eb63bace09f7f39eac4b1f3a24ccd372760e3142494208119dc4131939cd82e8cab364dacecca184c8545 SHA512 6fcfaa7ad842f3f45d4e2286ce816a0b4c71e3c3fb07b86589934efcc637e2cd6f5712fa8a10c375b8e86d1e1e6ce32de9f2be2fc0decd554b51c658e106b120
diff --git a/dev-python/qtconsole/qtconsole-5.1.1.ebuild b/dev-python/qtconsole/qtconsole-5.1.1.ebuild
deleted file mode 100644
index fc1d3fe89620..000000000000
--- a/dev-python/qtconsole/qtconsole-5.1.1.ebuild
+++ /dev/null
@@ -1,45 +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} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
-"
-BDEPEND="
-	test? (
-		dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
-	)
-"
-# required by the tests that are removed:
-#		dev-python/flaky[${PYTHON_USEDEP}]
-#		dev-python/pytest-qt[${PYTHON_USEDEP}]
-
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-python_test() {
-	# TODO: these tests require virtx; however, running under virtx
-	# causes pytest to segv on exit (even though tests pass)
-	epytest --ignore qtconsole/tests/test_00_console_widget.py
-}
diff --git a/dev-python/qtconsole/qtconsole-5.2.1.ebuild b/dev-python/qtconsole/qtconsole-5.2.1.ebuild
deleted file mode 100644
index 9e92fdc1cca4..000000000000
--- a/dev-python/qtconsole/qtconsole-5.2.1.ebuild
+++ /dev/null
@@ -1,47 +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} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/ipykernel-4.1[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17.1[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
-"
-# The test suite tests both against pyqt5 *and* pyside2
-BDEPEND="
-	test? (
-		dev-python/QtPy[pyqt5,pyside2,${PYTHON_USEDEP},svg,testlib]
-	)
-"
-# required by the tests that are removed:
-#		dev-python/flaky[${PYTHON_USEDEP}]
-#		dev-python/pytest-qt[${PYTHON_USEDEP}]
-
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_test() {
-	# TODO: these tests require virtx; however, running under virtx
-	# causes pytest to segv on exit (even though tests pass)
-	epytest --ignore qtconsole/tests/test_00_console_widget.py
-}
diff --git a/dev-python/radon/radon-5.1.0-r2.ebuild b/dev-python/radon/radon-5.1.0-r2.ebuild
index 428e66aa84ba..3676f53f6a08 100644
--- a/dev-python/radon/radon-5.1.0-r2.ebuild
+++ b/dev-python/radon/radon-5.1.0-r2.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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/readme_renderer/readme_renderer-35.0.ebuild b/dev-python/readme_renderer/readme_renderer-35.0.ebuild
index f4000dcbcd9f..a1849f817498 100644
--- a/dev-python/readme_renderer/readme_renderer-35.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-35.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/regex/regex-2022.4.24.ebuild b/dev-python/regex/regex-2022.4.24.ebuild
index d2f1386cd89a..55ff5186be12 100644
--- a/dev-python/regex/regex-2022.4.24.ebuild
+++ b/dev-python/regex/regex-2022.4.24.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-cache/requests-cache-0.9.4.ebuild b/dev-python/requests-cache/requests-cache-0.9.4.ebuild
index 4cd8581e6e5c..b28d7c639272 100644
--- a/dev-python/requests-cache/requests-cache-0.9.4.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.9.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/rich/rich-12.4.1.ebuild b/dev-python/rich/rich-12.4.1.ebuild
index 79fcff64c856..e88c7200e49c 100644
--- a/dev-python/rich/rich-12.4.1.ebuild
+++ b/dev-python/rich/rich-12.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/secretstorage/secretstorage-3.3.2.ebuild b/dev-python/secretstorage/secretstorage-3.3.2.ebuild
index 6d21b7b37eeb..43516f4deb92 100644
--- a/dev-python/secretstorage/secretstorage-3.3.2.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.3.2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/setproctitle/setproctitle-1.2.3.ebuild b/dev-python/setproctitle/setproctitle-1.2.3.ebuild
index 7821486621be..cb3cd27753c5 100644
--- a/dev-python/setproctitle/setproctitle-1.2.3.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.2.3.ebuild
@@ -17,6 +17,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild b/dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild
index 9f30d07d6ec2..78280c376c53 100644
--- a/dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/twisted/twisted-22.4.0.ebuild b/dev-python/twisted/twisted-22.4.0-r1.ebuild
index 7f12122ec5d0..6e9c8dc61605 100644
--- a/dev-python/twisted/twisted-22.4.0.ebuild
+++ b/dev-python/twisted/twisted-22.4.0-r1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
 	http2? (
 		>=dev-python/h2-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/h2-4.0.0[${PYTHON_USEDEP}]
+		<dev-python/h2-5.0.0[${PYTHON_USEDEP}]
 		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
 		<dev-python/priority-2.0[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/typed-ast/typed-ast-1.5.3.ebuild b/dev-python/typed-ast/typed-ast-1.5.3.ebuild
index 29ccb0fd3d4a..b1430dbe43f6 100644
--- a/dev-python/typed-ast/typed-ast-1.5.3.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.5.3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P/-/_}"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/zope-component/zope-component-5.0.1.ebuild b/dev-python/zope-component/zope-component-5.0.1.ebuild
index cccfdb64b60e..ceb334554c42 100644
--- a/dev-python/zope-component/zope-component-5.0.1.ebuild
+++ b/dev-python/zope-component/zope-component-5.0.1.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"
 
 RDEPEND="
 	dev-python/zope-event[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild b/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild
index d822e7c25bc9..4273eee1dd7f 100644
--- a/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild
+++ b/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"
 
 BDEPEND="
 	test? (