Adding metadata

50 files changed, 374 insertions, 38 deletions

diff --git a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.11.0.ebuild b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.11.0.ebuild
index 5a11bba2e72b..3b2e7df5cdab 100644
--- a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.11.0.ebuild
+++ b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.11.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 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/botocore-1.12.122[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.26.16.ebuild b/dev-python/boto3/boto3-1.26.16.ebuild
index 9debb920aa1f..1f8dc6734498 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 c2820e323e30..27144e76e2e5 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/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 0ddca0f58da4..ffdcba58cd27 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,3 +1,4 @@
 DIST cfn-lint-0.71.1.gh.tar.gz 2984397 BLAKE2B faa2164ee0f469f8e9118b82d5c86dee05e5404feb5ae28abd9e4218122677dba09308d5a573c4eaabb8f321932b8de621a39bc20f1c86724dc24fedac7e7a93 SHA512 dee916eaa43eabcc4cf2db7fb08db8875f68292a56aa97d29d0d291da51a828a78b681162b71759ec0dc3d246570dbce8fe33a41ce61c22e6fbf2a4ff15f49ff
 DIST cfn-lint-0.72.2.gh.tar.gz 3114298 BLAKE2B 5a426a046d1a0ffb773f9b34c544ccf9f55467de156f3bc0c3324c9877a1f101da69130c39a0d0144d57557c75e9bbcecc41bb1823fe41c00f14874c516c0033 SHA512 2248e2854410ba889180dd20df1f8c1ec70150b8433a7b4d564c6d9a9c7ceaedc81bf051eeaf1906878e57dc395c5e4c08623574cb9f4dced9ea0a8fbe73325d
 DIST cfn-lint-0.72.4.gh.tar.gz 3199849 BLAKE2B b0c81be6e2f21ffbc7ee4ebbfc4994d1b413516dc3a47d11f554278b33ead1d3c3c055b541e25a7401fa911c16998cf3c3c85863d2e0f295c1d3df86b78f8847 SHA512 994f418519e72e1814f2ee38e3e5a42f7e2dc1556cda5cb5632b0e57daadbad57425e14d1eff67ba39f0ca1dd22df22f43277f1b1b3d6b66679cc3526fbeedd0
+DIST cfn-lint-0.72.5.gh.tar.gz 3220306 BLAKE2B 381b069e4d35d9af8fa7bab9765f3b249dc6eb114f3965e7b86fecdb2a30abd1fd4bf0c4efdc78490a9c672f6bb30093a05cf162a6f41a872d7ee93d22167aa5 SHA512 f7628894558bb3718edf6ac9f1ea27af913146d060749521900e6bd8122ddda09552dbc1a0a0f4a7c58736b7dd95a0ea8e408b798be7a06e88724e7e7d0cbed2
diff --git a/dev-python/cfn-lint/cfn-lint-0.72.5.ebuild b/dev-python/cfn-lint/cfn-lint-0.72.5.ebuild
new file mode 100644
index 000000000000..a97ac0834660
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.72.5.ebuild
@@ -0,0 +1,54 @@
+# 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="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.55.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	test/unit/module/test_template.py::TestTemplate::test_build_graph
+	# requires git repo
+	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+	# Internet
+	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index ddece4c080ad..56258a1c2c22 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1 +1,2 @@
 DIST chameleon-3.10.1.gh.tar.gz 137135 BLAKE2B c11520792a833bccc0997ea82e7876e309905ac0cdfd8701c4d83eee7befe1d152787f27b076df15c4ba299d2702ac6a262dc193d1ee7f6d44398e57af73772e SHA512 e79b261ce6f480358191ff3d23af325c0559e9c0b6be8b2c44d4bb3869fb7e09fa759906933d9b4d6f7107779f19bb225170add73ec3205ddf73b9bdb1bcfb9a
+DIST chameleon-3.10.2.gh.tar.gz 137228 BLAKE2B a25aa7fc4b9b77afb5f108d515f06c24a01cc52da1630b7db7bc86571ca5635b276ddf5ec800cb9f9ed26f88c1e5bcae89a3b92c391d61814bd104e24ec3f6c9 SHA512 a00de545812d25fbaab86a0252b81d47a7e6a6460c6874ab536e6e65a4b56301cd54a31c390c4503453bd4e04863f83e3eec381f69e87b8bb7046943e0a24493
diff --git a/dev-python/chameleon/chameleon-3.10.2.ebuild b/dev-python/chameleon/chameleon-3.10.2.ebuild
new file mode 100644
index 000000000000..f71eb44c59d3
--- /dev/null
+++ b/dev-python/chameleon/chameleon-3.10.2.ebuild
@@ -0,0 +1,30 @@
+# 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
+
+DESCRIPTION="Fast HTML/XML template compiler for Python"
+HOMEPAGE="
+	https://github.com/malthe/chameleon/
+	https://pypi.org/project/Chameleon/
+"
+SRC_URI="
+	https://github.com/malthe/chameleon/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests unittest
+
+src_test() {
+	cd src || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.13.1.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.13.1.ebuild
index e8bb319ae75d..b15314d3de10 100644
--- a/dev-python/cx_Freeze/cx_Freeze-6.13.1.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-6.13.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/importlib_metadata[${PYTHON_USEDEP}]
diff --git a/dev-python/dulwich/dulwich-0.20.50.ebuild b/dev-python/dulwich/dulwich-0.20.50.ebuild
index 7d21149b5bb3..a3344c795432 100644
--- a/dev-python/dulwich/dulwich-0.20.50.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.50.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ Apache-2.0"
 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"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/flask-migrate/flask-migrate-4.0.0.ebuild b/dev-python/flask-migrate/flask-migrate-4.0.0.ebuild
index 4e4f629cdc62..d2f11f45abfa 100644
--- a/dev-python/flask-migrate/flask-migrate-4.0.0.ebuild
+++ b/dev-python/flask-migrate/flask-migrate-4.0.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/alembic-0.7[${PYTHON_USEDEP}]
diff --git a/dev-python/fsspec/fsspec-2022.11.0.ebuild b/dev-python/fsspec/fsspec-2022.11.0.ebuild
index b8dad9991409..6a068e59068d 100644
--- a/dev-python/fsspec/fsspec-2022.11.0.ebuild
+++ b/dev-python/fsspec/fsspec-2022.11.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.68.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.68.0.ebuild
index 63e5333c4693..bd7d4f9ea4a7 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.68.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.68.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth/google-auth-2.14.1.ebuild b/dev-python/google-auth/google-auth-2.14.1.ebuild
index e1be3d9ce804..f104a5155797 100644
--- a/dev-python/google-auth/google-auth-2.14.1.ebuild
+++ b/dev-python/google-auth/google-auth-2.14.1.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/googleapis-common-protos/googleapis-common-protos-1.57.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.57.0.ebuild
index c452e57ca004..d2f6f53a5eb5 100644
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.57.0.ebuild
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.57.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	<dev-python/protobuf-python-5[${PYTHON_USEDEP}]
diff --git a/dev-python/greenlet/greenlet-2.0.1.ebuild b/dev-python/greenlet/greenlet-2.0.1.ebuild
index 558fa7d39328..653ef7bd0815 100644
--- a/dev-python/greenlet/greenlet-2.0.1.ebuild
+++ b/dev-python/greenlet/greenlet-2.0.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 -hppa -ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_sphinx docs
 distutils_enable_tests unittest
diff --git a/dev-python/hypothesis/hypothesis-6.59.0.ebuild b/dev-python/hypothesis/hypothesis-6.59.0.ebuild
index 2ade964b48e2..b5baf39ef699 100644
--- a/dev-python/hypothesis/hypothesis-6.59.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.59.0.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}/hypothesis-python"
 
 LICENSE="MPL-2.0"
 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="cli"
 
 RDEPEND="
diff --git a/dev-python/ini2toml/ini2toml-0.11.3.ebuild b/dev-python/ini2toml/ini2toml-0.11.3.ebuild
index bf4a148bf703..ba46beeedd67 100644
--- a/dev-python/ini2toml/ini2toml-0.11.3.ebuild
+++ b/dev-python/ini2toml/ini2toml-0.11.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MPL-2.0"
 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/packaging-20.7[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_client/jupyter_client-7.4.7.ebuild b/dev-python/jupyter_client/jupyter_client-7.4.7.ebuild
index b7fec765ec0a..0f6025ca1879 100644
--- a/dev-python/jupyter_client/jupyter_client-7.4.7.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-7.4.7.ebuild
@@ -19,7 +19,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/entrypoints[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_core/jupyter_core-5.0.0-r1.ebuild b/dev-python/jupyter_core/jupyter_core-5.0.0-r1.ebuild
index 26256bd82a97..9a843fbff11f 100644
--- a/dev-python/jupyter_core/jupyter_core-5.0.0-r1.ebuild
+++ b/dev-python/jupyter_core/jupyter_core-5.0.0-r1.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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/platformdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.7.0.ebuild b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.7.0.ebuild
index 180954743d8f..de8508ef7818 100644
--- a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.7.0.ebuild
+++ b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.7.0.ebuild
@@ -26,7 +26,7 @@ SRC_URI="https://github.com/timvink/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 # Tests are broken outside of upstream git repo
 RESTRICT="test"
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.3.1.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.3.1.ebuild
index bd10b4732f53..b83bd7685cb8 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.3.1.ebuild
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.3.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-material-8.3.3[${PYTHON_USEDEP}]
diff --git a/dev-python/nautilus-python/nautilus-python-4.0.ebuild b/dev-python/nautilus-python/nautilus-python-4.0.ebuild
index 34951e41a531..031cc221246d 100644
--- a/dev-python/nautilus-python/nautilus-python-4.0.ebuild
+++ b/dev-python/nautilus-python/nautilus-python-4.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://projects.gnome.org/nautilus-python/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64"
 IUSE="gtk-doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/nbsphinx/nbsphinx-0.8.10.ebuild b/dev-python/nbsphinx/nbsphinx-0.8.10.ebuild
index 0c3b0b52e666..ec8f8cf7a7fc 100644
--- a/dev-python/nbsphinx/nbsphinx-0.8.10.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.8.10.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-log/oslo-log-5.0.2.ebuild b/dev-python/oslo-log/oslo-log-5.0.2.ebuild
index 2a98d28e7ecb..a3320653c1c8 100644
--- a/dev-python/oslo-log/oslo-log-5.0.2.ebuild
+++ b/dev-python/oslo-log/oslo-log-5.0.2.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/oslo.log-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/parsedatetime/parsedatetime-2.6-r1.ebuild b/dev-python/parsedatetime/parsedatetime-2.6-r1.ebuild
index d23033927021..f06133304cdc 100644
--- a/dev-python/parsedatetime/parsedatetime-2.6-r1.ebuild
+++ b/dev-python/parsedatetime/parsedatetime-2.6-r1.ebuild
@@ -17,6 +17,6 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/parver/parver-0.4.ebuild b/dev-python/parver/parver-0.4.ebuild
index d51ef16b7673..20af35ad71d4 100644
--- a/dev-python/parver/parver-0.4.ebuild
+++ b/dev-python/parver/parver-0.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/Arpeggio-1.7[${PYTHON_USEDEP}]
diff --git a/dev-python/pathspec/pathspec-0.10.3.ebuild b/dev-python/pathspec/pathspec-0.10.3.ebuild
index 76e06f8e59a0..e33021e1dbf0 100644
--- a/dev-python/pathspec/pathspec-0.10.3.ebuild
+++ b/dev-python/pathspec/pathspec-0.10.3.ebuild
@@ -17,6 +17,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests unittest
diff --git a/dev-python/pebble/pebble-5.0.3.ebuild b/dev-python/pebble/pebble-5.0.3.ebuild
index f7657a62393c..c1aa4d854df2 100644
--- a/dev-python/pebble/pebble-5.0.3.ebuild
+++ b/dev-python/pebble/pebble-5.0.3.ebuild
@@ -20,6 +20,6 @@ S=${WORKDIR}/${P^}
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/peewee/peewee-3.15.4.ebuild b/dev-python/peewee/peewee-3.15.4.ebuild
index fed46a1d4056..1a5696266f2c 100644
--- a/dev-python/peewee/peewee-3.15.4.ebuild
+++ b/dev-python/peewee/peewee-3.15.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/psutil/psutil-5.9.4.ebuild b/dev-python/psutil/psutil-5.9.4.ebuild
index e9a3821024d2..f3fc790e094e 100644
--- a/dev-python/psutil/psutil-5.9.4.ebuild
+++ b/dev-python/psutil/psutil-5.9.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index f42169d47844..7293fdabf6e5 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,3 +1,4 @@
 DIST psycopg-3.1.4.gh.tar.gz 469317 BLAKE2B a6df49a5adefbeb310602473e950ef77f0c613d8a33d41ee37dbfec544dfd014dba8dae5f78ce2bc89f2d9531ccbdd6ea07665ca638f29a4a7d0d1006bc0d778 SHA512 2bf49d6eb7e20c6f22adf47cef6dce691f38f4b310f2fbf3986f3ad14c7d390d53b9edeb3365bbf096941cc2d2affe2ddd542fe93ef37c41109742c9f9af4ba7
 DIST psycopg-3.1.5.gh.tar.gz 478528 BLAKE2B f0e6d1970b81875481bf0939d750d585f9ce4be1ccf838d1884a54d366614ec1ca76756b455d28b559ef4f49696eda68fa3b42f8c0cc18d9ce9fd1ce21029830 SHA512 006a9a6b7d34ed6f0411c33001334b9e9d29c8d1fe5e9e3b940d5664cc5c06ce10bc278ee1906a96073843ca2f8effaada8789aa390de97e543e19cc452546d1
+DIST psycopg-3.1.6.gh.tar.gz 478611 BLAKE2B d947344d033e034a94545bcbdcb27b5f903bbf344ce11f52de2b2e514892d2dfd87e3b26f130736c8c3798654c2d59d4f00c1093ce09f777b442d40eef8633c2 SHA512 2dc77cc90692fb92715add1dcbd9b82f10b811e7cf6782fa9d0cb7d076cf699be6d81ecb73d5b4b2772c08fb8070782956eb97b0fc4f0169c5bddb9b7df7a0ad
 DIST psycopg2-2.9.4.tar.gz 384017 BLAKE2B 4bc0afcc890c8a257c1ccd5c6e4e5301857a80f8b1428aa46c1473c9e18f5d2914a2e592c13336b06106217bb334d9b0321835bdd123f1627cbeb29dedf97bf7 SHA512 259088e42e0ab0d8a1a0ccf04f5e560f32c6179b4a0a0059e91bcf269baa8f4b0f1f949c332c640a2438c927a29b2c144078a861f8e18ba9c764da7c93c73b8d
diff --git a/dev-python/psycopg/psycopg-3.1.6.ebuild b/dev-python/psycopg/psycopg-3.1.6.ebuild
new file mode 100644
index 000000000000..9acb43a38569
--- /dev/null
+++ b/dev-python/psycopg/psycopg-3.1.6.ebuild
@@ -0,0 +1,78 @@
+# 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="PostgreSQL database adapter for Python"
+HOMEPAGE="
+	https://www.psycopg.org/psycopg3/
+	https://github.com/psycopg/psycopg/
+	https://pypi.org/project/psycopg/
+"
+SRC_URI="
+	https://github.com/psycopg/psycopg/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${P}/psycopg
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+DEPEND="
+	>=dev-db/postgresql-8.1:*
+"
+RDEPEND="
+	${DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/backports-zoneinfo-0.2.0[${PYTHON_USEDEP}]
+	' 3.8)
+	>=dev-python/typing-extensions-4.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-db/postgresql-8.1[server]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/dnspython[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# tests are lurking in top-level directory
+	cd .. || die
+
+	initdb -D "${T}"/pgsql || die
+	# TODO: random port
+	pg_ctl -w -D "${T}"/pgsql start \
+		-o "-h '' -k '${T}'" || die
+	createdb -h "${T}" test || die
+
+	local -x PSYCOPG_TEST_DSN="host=${T} dbname=test"
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# tests for the psycopg_pool package
+		tests/pool
+		# some broken mypy magic
+		tests/test_module.py::test_version
+		tests/test_module.py::test_version_c
+		tests/test_typing.py
+		tests/crdb/test_typing.py
+		# TODO, relying on undefined ordering in Python?
+		tests/test_dns_srv.py::test_srv
+	)
+
+	# leak tests seem to be brittle
+	epytest -p no:django -k "not leak"
+}
diff --git a/dev-python/pyclipper/pyclipper-1.3.0_p4.ebuild b/dev-python/pyclipper/pyclipper-1.3.0_p4.ebuild
index 929f0c3f97d9..5f654bbc791f 100644
--- a/dev-python/pyclipper/pyclipper-1.3.0_p4.ebuild
+++ b/dev-python/pyclipper/pyclipper-1.3.0_p4.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND="
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.4.1.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.4.1.ebuild
index 60f035ff25e8..75980c63cd81 100644
--- a/dev-python/pyproject-fmt/pyproject-fmt-0.4.1.ebuild
+++ b/dev-python/pyproject-fmt/pyproject-fmt-0.4.1.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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
diff --git a/dev-python/pyrfc3339/pyrfc3339-1.1-r1.ebuild b/dev-python/pyrfc3339/pyrfc3339-1.1-r1.ebuild
index f0de0cc5a268..f17b55c1a286 100644
--- a/dev-python/pyrfc3339/pyrfc3339-1.1-r1.ebuild
+++ b/dev-python/pyrfc3339/pyrfc3339-1.1-r1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/pyRFC3339-${PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.20.3.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.20.3.ebuild
index 1ac6b9aa6ccc..cffa0473ae2c 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.20.3.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.20.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 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"
 
 RDEPEND="
 	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index a9300e16ea4b..a54c43561e7d 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1 +1,2 @@
 DIST python-cinderclient-9.1.0.tar.gz 234608 BLAKE2B 9ff63454e8162d731517ce2d98b6ea0c3cf04ef5a885e30afaa67444eb7f814c1ac205a0a216c7a3b92311be5687b9e2561aa02936e87b91ca61c8ea663e069f SHA512 2aa55331d5f372cccb946a4be2e25d4cc6a1d9d9676f1f32b9b51f141d107f74bcb1d0d7a5ef94b931fc5a5ccacb43f639db635217a7833d7738296734938f8b
+DIST python-cinderclient-9.2.0.tar.gz 235773 BLAKE2B 1b4e1c27dec6d74a2c95e3aadbdfb296bf6105ba5a23599babfcf8fc5c37fb52eecf7897eaa0680277b903b1725de2cb7d9a108942fa1be5067b25dce8ca0c72 SHA512 76032779bfa2dbc6c7aecc6631ab42b80bff21437d5037e6bbc5d78a23ce493a7a185c4ee8c1657b41c0bf376a6c919b027f81577f2826fc4222334d8216fda5
diff --git a/dev-python/python-cinderclient/python-cinderclient-9.2.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-9.2.0.ebuild
new file mode 100644
index 000000000000..76193f6a3ae8
--- /dev/null
+++ b/dev-python/python-cinderclient/python-cinderclient-9.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Cinder API"
+HOMEPAGE="https://launchpad.net/python-cinderclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/keystoneauth-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-5.0.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-5.5.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.3.0[${PYTHON_USEDEP}]
+"
+# Tests fail with dev-python/prettytable-3.4.0
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ddt[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/oslo-serialization[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		<dev-python/prettytable-3.4.0[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9.1.0-fix-py3.11-argparse.patch"
+	"${FILESDIR}/${PN}-9.1.0-fix-py3.11-crashes.patch"
+)
+
+distutils_enable_tests unittest
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest -b cinderclient/tests/unit
+}
diff --git a/dev-python/python-fire/Manifest b/dev-python/python-fire/Manifest
index 29b34cfaacd7..2cc94f379579 100644
--- a/dev-python/python-fire/Manifest
+++ b/dev-python/python-fire/Manifest
@@ -1 +1,2 @@
 DIST python-fire-0.4.0.tar.gz 104198 BLAKE2B 1060931356753c00daa5c138234a8214c3662ae8aab54fa050488df89251be7cdf9846af46defd4fbeed817ca2cc1992e7978ad68579ad753749cdf3e9b6c011 SHA512 24473cae1cbaf01a6a07939fd77b8d26d97e5efb0bca349f65ed6a8bbf132167d74140b42030dcee0404945581d039230e0e8f8edb0bf8664e8e9f6555dfdeb5
+DIST python-fire-0.5.0.gh.tar.gz 105701 BLAKE2B 25acb51c3a76ec14c82157edfa2f0ac4fd49a58f78a62c98f1680cd0817413088820c6db00c5062cee30ed9849696c890054bad214ddfe1d7c613b0c30d31d1e SHA512 9d99b53d03568993f93f4742549b68c6a09668dec51fafc62b66b88cda123e055d0408b61e88ce88ee63d153afc543cec435aeddba9bbfaf2d587ba9bb8ed2ef
diff --git a/dev-python/python-fire/python-fire-0.5.0.ebuild b/dev-python/python-fire/python-fire-0.5.0.ebuild
new file mode 100644
index 000000000000..0084a33b14e1
--- /dev/null
+++ b/dev-python/python-fire/python-fire-0.5.0.ebuild
@@ -0,0 +1,25 @@
+# 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="Library for automatically generating command line interfaces from Python objects"
+HOMEPAGE="https://pypi.org/project/python-fire/"
+SRC_URI="https://github.com/google/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/six
+	dev-python/termcolor
+"
+BDEPEND=""
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-glanceclient/python-glanceclient-4.2.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-4.2.0.ebuild
index 2eca47ea2c74..7553dd5d0a1a 100644
--- a/dev-python/python-glanceclient/python-glanceclient-4.2.0.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-4.2.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/keystoneauth-3.6.2[${PYTHON_USEDEP}]
diff --git a/dev-python/simplejson/simplejson-3.18.0.ebuild b/dev-python/simplejson/simplejson-3.18.0.ebuild
index f6a0b8d065bc..2c5d10546b9a 100644
--- a/dev-python/simplejson/simplejson-3.18.0.ebuild
+++ b/dev-python/simplejson/simplejson-3.18.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT AFL-2.1 )"
 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DOCS=( README.rst CHANGES.txt )
 
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.5.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.5.ebuild
index a1104fdad046..98e7e8b2233f 100644
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.5.ebuild
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.5.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.10.1.ebuild b/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.10.1.ebuild
index 40896349a939..c5fe12ebdae2 100644
--- a/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.10.1.ebuild
+++ b/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.10.1.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="
 	dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.7.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.7.0.ebuild
index 5eef388b60c8..9fc3fc79afaa 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.7.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.7.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pyenchant[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.44.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.44.ebuild
index b0ee1b2543de..0a46e0e44ac5 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.44.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.44.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 BDEPEND="
diff --git a/dev-python/stevedore/stevedore-4.1.1.ebuild b/dev-python/stevedore/stevedore-4.1.1.ebuild
index ee7704e0a34d..cabe5c08a293 100644
--- a/dev-python/stevedore/stevedore-4.1.1.ebuild
+++ b/dev-python/stevedore/stevedore-4.1.1.ebuild
@@ -18,7 +18,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 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 307600f3920d..68e3805fda9c 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,5 +1,6 @@
 DIST tox-3.27.1.gh.tar.gz 309006 BLAKE2B fa8aaa9cd5b03e54c166bb6b748290420b91498b26d2d124d9f88a64806b9ac0578c1886845b25aa024907f6a782c45609fa6c7657d9e1f538b59c2d9f0f4e14 SHA512 5f568bc6c53f871aae91928681dd6f2419b876a8e6ca925e65abae845b548ee3d00513741882875bbbacb78bf64935228d98213f940d3da8c3f788b73f177b79
 DIST tox-4.0.11.gh.tar.gz 280239 BLAKE2B 094d0749bc2d7942919ce9df2110c373aacd512f4daffb8b74f43a7b815ae3e6b8f9959cef3baa36565365fa8d1f6da2b6f0595999d1075dce98f1c70e8683af SHA512 a35857cb4aee70ac2081185a273415d1db037965906df7844653ca9f1c155fc07244dfb5578a0ac380ef2183ff104603b183b9d1ba06424b686e7e64d33f1263
+DIST tox-4.0.12.gh.tar.gz 282817 BLAKE2B 7237f33086c9e0147457bf46db47f6b4e6fcaf33929d0950e439e04950119e3199c3d41c4f6856935bb4cd27f613a9c925f4e366a61f22067d5837f1f5f2307c SHA512 7ffc0ed622c59df8ab0b1692dc774ab8efa1753dd4f872e0baaca213b4da29b9c3718b63eb3f655802a23d6493c61e3d3e003d192d73bb536f0da16411db2685
 DIST tox-4.0.5.gh.tar.gz 277741 BLAKE2B 19250ec4365a38a149c59de99ebd3b819cc4aba7721c076cc6700a17eb56b7c4b61d5c3b11046dc6857d082f1c04e98c6a78b8c768551468bca5a6810c4b7749 SHA512 7bc6f5479df577b66a7e43b61520995d1d31d056baf5b6297d9dc6acb19da58ed1f7d0db13930ab114417f0ad752799ac512765af18041ec800022b18676db20
 DIST tox-4.0.8.gh.tar.gz 278697 BLAKE2B ef87b02d95447d52135aa745fd224f7ec1f76f5e99e37ee8dc4990a1577a5f4d2103f21d26e4b32946c20ccbc44aa7e3954e167dcf7599f548466574121ff7dd SHA512 bac13d4a74d76405c658a05eb50df258ae8f5ae8b821b36bc41d473562a0930667bf3b4eb96d873e92f89811af2a8dfd19009622efca8836f163aed53476b46a
 DIST tox-4.0.9.gh.tar.gz 279196 BLAKE2B 4e0c869a4bf28865eae50a6457875bc29012547069cdfe666fc1a8a12007fb5cff1501bf0f4c2791d38680328f2222bbbb37342bbfc6e7fc3ee4587ce6e70035 SHA512 341894cf879d48e4fbdd11271dfdff59ae5b719b02d8be46fa712b68528ad69ffe7df63639537b95e3f6dcf747dbf99b2d8daa18a87513d9c141e28cc59d6363
diff --git a/dev-python/tox/tox-4.0.12.ebuild b/dev-python/tox/tox-4.0.12.ebuild
new file mode 100644
index 000000000000..620c2a4536f4
--- /dev/null
+++ b/dev-python/tox/tox-4.0.12.ebuild
@@ -0,0 +1,91 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P/_}
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="
+	https://tox.readthedocs.io/
+	https://github.com/tox-dev/tox/
+	https://pypi.org/project/tox/
+"
+SRC_URI="
+	https://github.com/tox-dev/tox/archive/${PV/_}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/cachetools-5.2[${PYTHON_USEDEP}]
+	>=dev-python/chardet-5.1[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3.8.2[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.6[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
+	>=dev-python/pyproject-api-1.2.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	>=dev-python/virtualenv-20.17.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/hatch-vcs-0.2.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/build[${PYTHON_USEDEP}]
+		>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/flaky-3.7[${PYTHON_USEDEP}]
+		>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-3.1[${PYTHON_USEDEP}]
+		>=dev-python/re-assert-1.1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/time-machine-2.8.2[${PYTHON_USEDEP}]
+		' 'python*')
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+src_prepare() {
+	# the minimal bounds in tox are entirely meaningless and new packaging
+	# breaks setuptools
+	sed -i -e '/packaging/s:>=22::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# devpi_process is not packaged, and has lots of dependencies
+	cat > "${T}"/devpi_process.py <<-EOF || die
+		def IndexServer(*args, **kwargs): raise NotImplementedError()
+	EOF
+
+	local -x PYTHONPATH=${T}:${PYTHONPATH}
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
+	)
+	local EPYTEST_IGNORE=(
+		# requires devpi*
+		tests/test_provision.py
+	)
+	if ! has_version "dev-python/time_machine[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=(
+			tests/util/test_spinner.py
+		)
+	fi
+
+	epytest
+}
diff --git a/dev-python/whatthepatch/whatthepatch-1.0.3.ebuild b/dev-python/whatthepatch/whatthepatch-1.0.3.ebuild
index fe5cd2216862..545a9728e23c 100644
--- a/dev-python/whatthepatch/whatthepatch-1.0.3.ebuild
+++ b/dev-python/whatthepatch/whatthepatch-1.0.3.ebuild
@@ -17,6 +17,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 distutils_enable_tests pytest