Adding metadata

44 files changed, 358 insertions, 436 deletions

diff --git a/dev-python/black/black-22.6.0.ebuild b/dev-python/black/black-22.6.0.ebuild
index 0fada3f54fe0..a405d50f4f34 100644
--- a/dev-python/black/black-22.6.0.ebuild
+++ b/dev-python/black/black-22.6.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/boolean-py/boolean-py-4.0.ebuild b/dev-python/boolean-py/boolean-py-4.0.ebuild
index d6ca55773997..dba75afd99a6 100644
--- a/dev-python/boolean-py/boolean-py-4.0.ebuild
+++ b/dev-python/boolean-py/boolean-py-4.0.ebuild
@@ -22,6 +22,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index c706364b9664..6b912adb909c 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,3 +3,4 @@ DIST boto3-1.24.31.gh.tar.gz 519387 BLAKE2B 8581d1018f0e1f0802779851edb52fdb6860
 DIST boto3-1.24.36.gh.tar.gz 522156 BLAKE2B b76cb50f01ff85c960a0984f950e72f02ac6e85131fd344142b886a3c745cb8b9073f865527911b88c462912413fce6df4066752ab5eec8ad1561d349ad22437 SHA512 fe00e78cc522248c449f83f869bb7d76793db9aa436259e74d0aa25984a02876191a7df41b1ad7658b06e418f248ad616743698c87a5c9696f77a196a53c561e
 DIST boto3-1.24.37.gh.tar.gz 522233 BLAKE2B ab361fd7443ff499c18a8e86c9a80da14e6a1d960fbac26d2e12d8806684daf169010225ce7a402626a814cb29fcc281ea61d293eb5eb197f48dccdb8a7a14ef SHA512 b75ea002f3a3e3b8c498797278adbf5f7d4b220baf7b8fa3be8c972bf2981933d962878b7d96a7c01c9a28be267effea34b48692716e7eabfa077ede380c816e
 DIST boto3-1.24.40.gh.tar.gz 524303 BLAKE2B 750d366914ebbfaab262a88d96afb1df6f16c108e1e07537e0ae2234df95500c7dabaeae27afc5c5cbb8b0370b3a088b97c16a8c48e3d2f5741744841f29fa1b SHA512 240b78619783a30919dc62c6240b07d51c8a4e4ee0fcb6c4daba19c6d5830d8623923de6cb984e7310bf5e745b0d20a2471578a2f8650089aca96e9575d3542a
+DIST boto3-1.24.41.gh.tar.gz 523844 BLAKE2B 0cff30d6aba5e8eddb8f545737e22a146ef9a3c33df2ad5b4f6d0ef8fd67cb46183eb7fa21e8a961d2597df8d965478bcb0038f5dda117611bcfe15f0de26eac SHA512 ad3a6035352c54f7ba0197357a5a4e001c8fe7548121a9a3931acb69f9c098feb8da1d1699ac98d3ff00626f39082753434f1c992351a82cf269ce2c6a4eab06
diff --git a/dev-python/boto3/boto3-1.24.31.ebuild b/dev-python/boto3/boto3-1.24.31.ebuild
index e4a98e2e28f5..ec8f4d61c530 100644
--- a/dev-python/boto3/boto3-1.24.31.ebuild
+++ b/dev-python/boto3/boto3-1.24.31.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/boto3/boto3-1.24.41.ebuild b/dev-python/boto3/boto3-1.24.41.ebuild
new file mode 100644
index 000000000000..e4a98e2e28f5
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.41.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.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index c58306720607..05b4bf605ec1 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,3 +3,4 @@ DIST botocore-1.27.31.tar.gz 9184651 BLAKE2B 01dcd9e94490923f7d0f463d3019007f58c
 DIST botocore-1.27.36.gh.tar.gz 9465835 BLAKE2B c22c341d6e762316f3d8719bd8c1fd52140642739361a7ade326d739005dbd141a6b4e1798287b40bf7ba40cd5e158d36f195893d529f5ba375b06087d2122b9 SHA512 09ef156b3c0457ceef341bf26e3f060d3e91808f1da66d1dbb06ba2826be3c61e047383dc9d8a719bb8e172e91f6475f4613c14d30c57c6a909b51c8ba7334cc
 DIST botocore-1.27.37.gh.tar.gz 9466348 BLAKE2B 56c670e22204dcd12164094d52b1ed4ec820241f1423738e008f24762a5702149f2eb57283ec194a77cc2d57bc1183d91a90ca55ae0cf977aa1abdacb922ed86 SHA512 adb18c54a757077f7cff4b9b6716d015998432faeb3eb7d0a631631e5b0cf7814b40843ba379841cef920d3eca1367623f52491f53fed9f318898b3a6197eac9
 DIST botocore-1.27.40.gh.tar.gz 9491717 BLAKE2B 4c4e96969432426b711642265573b1a3026ea60dbee2328ff34f0c64ad5c911bb773078e8f86882c94abc2b340567e65475ebed146651e92307ddf1629cbe2a0 SHA512 03d174f3c8490470a40ba54568b3ec1fed740acae143964db0618e7d57fd03fd6aae992d7e9dfe3882eae70a082a6974d3356cd7e2c49625eec8270fcb2ef784
+DIST botocore-1.27.41.gh.tar.gz 9493802 BLAKE2B dff510a658e77fe7185a8d118228cd80d06ea066328d39c56eaa8f01459dd11131ca73dcfe464a5e1403f8aceaa96065d5ea335bb268155c81c9b71299488d45 SHA512 29f419c4338e37bcc7fce38836b1f3b0ed1e552ea94cbe77ea09cd18c3c0b80d3405cd4a3468570c7eb6f1301bfed0d26dcc98feb7a1f62b9e8b1b11c61cdac5
diff --git a/dev-python/botocore/botocore-1.27.31.ebuild b/dev-python/botocore/botocore-1.27.31.ebuild
index 1f52e2694e84..cde5d8a56cc5 100644
--- a/dev-python/botocore/botocore-1.27.31.ebuild
+++ b/dev-python/botocore/botocore-1.27.31.ebuild
@@ -21,7 +21,7 @@ if [[ "${PV}" == "9999" ]]; then
 	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"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.27.41.ebuild b/dev-python/botocore/botocore-1.27.41.ebuild
new file mode 100644
index 000000000000..6a8e7e93c947
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.41.ebuild
@@ -0,0 +1,69 @@
+# 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="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 2d5c1b3d89a5..d6e5a1a9c5a5 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,3 +1,4 @@
 DIST cfn-lint-0.61.1.gh.tar.gz 9351410 BLAKE2B 442fa5957f8816dc501e91593873c28b1b2e39ec14870b82574d4ca351f321b94a813fd351cc09c7602a177a8451d09cf8459c8aa47b683b9938654c99476e19 SHA512 63071cd1df0115624341fb64bd12a51d7bd38fe4993229a790ca09011b370487cb49397d90916f4df42b5c978cd3832e2de4cec15660ac8668e994adc0e681c3
 DIST cfn-lint-0.61.2.gh.tar.gz 9477584 BLAKE2B 8b65151edcd9323dd44d6a77c39fb3dd90a1934bc1cf3e6cb419e6a33595afeb740591a77a80178cbaa5dadd5183759064807a5a135545c2fb7e8c5a2c8970ba SHA512 ed8e9813f1d12ec0ded203c4c2246592c2aa3466f69ee2a478d9ac579807a610836d862768c259ebec6e421bbe92a5a120c056a5e4b70873e6e044e0c606d021
 DIST cfn-lint-0.61.3.gh.tar.gz 9528542 BLAKE2B 27f5c82c09a7c1dde520189647480032faf808089083ca45a9a2a24e4c158cb8e62ee6ae2f906d6c68021cc34b654ff46c9402876e09dd3330115dead5db44a8 SHA512 db5369a12d88754f6241b4ef529b53d142a80bfcb0c58ac7ec03217e7e4cb7e53f3fde1dde45dfdac82ab3fde4b885bb40dae3076b85edf34ca68cc73dc5aeb1
+DIST cfn-lint-0.61.4.gh.tar.gz 9556069 BLAKE2B 71572546d7e523c11214e32130a7d52461580e487b514846137e6592cb7a1786414556e4bea191aa2e4dddaf338c24e8ea9001e617221ea74b03bd0ea900a5a9 SHA512 fd85af770b5b519c9de4df0acbbaa66a8a7f61efd210a793c2e28ad9e6d6ed2d8b3042ca41d7743b2bc4dc0446b42ea2929cba454fdbf097a482a7c268e04000
diff --git a/dev-python/cfn-lint/cfn-lint-0.61.4.ebuild b/dev-python/cfn-lint/cfn-lint-0.61.4.ebuild
new file mode 100644
index 000000000000..a98bb23dc7cd
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.61.4.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} )
+
+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.47.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/clang-python/clang-python-14.0.6.ebuild b/dev-python/clang-python/clang-python-14.0.6.ebuild
index e347899e1291..59a11b274d02 100644
--- a/dev-python/clang-python/clang-python-14.0.6.ebuild
+++ b/dev-python/clang-python/clang-python-14.0.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
index 8a643c701056..1483e3dbbf2d 100644
--- a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
+++ b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT PSF-2.4"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/flit_scm/flit_scm-1.6.2.ebuild b/dev-python/flit_scm/flit_scm-1.6.2.ebuild
index 77972d7c606f..18983ae46092 100644
--- a/dev-python/flit_scm/flit_scm-1.6.2.ebuild
+++ b/dev-python/flit_scm/flit_scm-1.6.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/flit_core-3.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 56b07d9475f3..c232913e5bc4 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -4,4 +4,3 @@ DIST hypothesis-6.52.2.gh.tar.gz 9321530 BLAKE2B d54b97bf15895b503d14629c61cd99d
 DIST hypothesis-6.52.3.gh.tar.gz 9321591 BLAKE2B 50415d463d2513b023b8a6ac87a2bb6dae433b823fd209ec1137a26184bb5550fb9606e006cffecbff09c523fb244b9f8c119e1c9dc765b925f8aa6b0dc43bed SHA512 f8aae5976cc2bd47e157310434d2717caea5e639daf1d794fa6c45332fe44fc5873904451f1fb0b53d56e64147428c4c87e130b4776fd3b14e2c2b961660231d
 DIST hypothesis-6.52.4.gh.tar.gz 9323011 BLAKE2B fece23da48d4849252a0fa48ae741506f49aa1f2b63f81afe3b71d18e0325a4e337bebde1a1707390d38bdf57e2ce1145985231f68557b36c58886d82774a7d9 SHA512 c51f29d52757d08652f83deda48825ca38c86e0bc67743c2cff9c85f52d726671f07d0249dfdc761b2ba8250d40beacdf5e037e8629f24df5baeddd297f38030
 DIST hypothesis-6.53.0.gh.tar.gz 9323355 BLAKE2B 589cd4803351e72cc1896453e5e548bb6fb5f998032bce91708e02f3c8ff5d288ec76d65eeffde5fa31b6b86fbb3ad81dfe3eebaaac841f197de3a07acfa12bd SHA512 ab4de3764ca3ce8e5e50966ea94fcadd85e7c9f170dbbd17383b5516528e091ebfe3b06846513ee77a1f7a2e827236d323c12cc120cac421ec7aa9f3a2ca5e4a
-DIST hypothesis-hypothesis-python-6.46.11.gh.tar.gz 9312248 BLAKE2B 78b5ca5bd38bd62d2fe50ab929df075e253c059aed329d6b52051fb01449f8de84ae340ba42a4af94ef592411139a45d34aad232fe4bb2d8412165730bbeca01 SHA512 6fdd54f28d275eb65a4f6e6919437d503eba6254c25e22298c34ac67e6de03cd99a5178b1a475b1da7f7afeed8406e89c20b4818436143f442222d26f0d94796
diff --git a/dev-python/hypothesis/hypothesis-6.46.11.ebuild b/dev-python/hypothesis/hypothesis-6.46.11.ebuild
deleted file mode 100644
index 73b1f123c2b0..000000000000
--- a/dev-python/hypothesis/hypothesis-6.46.11.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{8..10} )
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-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 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
-
-	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.49.1.ebuild b/dev-python/hypothesis/hypothesis-6.49.1.ebuild
index 7c43fc3ad48a..ce28c004b522 100644
--- a/dev-python/hypothesis/hypothesis-6.49.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.49.1.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}/hypothesis-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/license-expression/license-expression-30.0.0.ebuild b/dev-python/license-expression/license-expression-30.0.0.ebuild
index 3b59bb05f1a8..67cb6e55cba6 100644
--- a/dev-python/license-expression/license-expression-30.0.0.ebuild
+++ b/dev-python/license-expression/license-expression-30.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/boolean-py-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/lit/lit-14.0.6.ebuild b/dev-python/lit/lit-14.0.6.ebuild
index b944deb27c4c..7930f8c3232d 100644
--- a/dev-python/lit/lit-14.0.6.ebuild
+++ b/dev-python/lit/lit-14.0.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 42f128d7d32b..6f06f70e857c 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,5 +1,2 @@
-DIST mypy-0.942.tar.gz 2701940 BLAKE2B 5501466e57b4afb8825e6c804cbdc270c79ff457c39f2e5834f4b68df70263c05b2b9abb08fe58202ee65f5e22d2291f39fcb1fc47168416134538c5f6e12ab3 SHA512 79b83587eefad10d7d20d3bfd8484a9e8b2d363e68c1e5ffaa3a82ca8b8f8d9183036ea46695a634f9156911d6f918af684ac636105b37b3a5d0e958f5d661f4
-DIST mypy-0.950.tar.gz 2746164 BLAKE2B 8466012fd3622f5e730acef774115ac84ff8c6f5488213a450de63d5acc790f937b7c69a1b05b46deef6fe8f81a13ed8e85f83c6c22cce9abdbb73b2ecf4179c SHA512 949d1dade3f225bbef0934fff040f7d5aec47039f554a669ca491d6cb46d56de3fcae0186864cdcaf5dec1347bc3af453218520536a0afa77e89a5c0e4640500
-DIST mypy-0.960.tar.gz 2767017 BLAKE2B 54ca4b9ffeef1f9211569ae8daee3ae201bfc6239eb9530dd5b7bb53983b0f9d343951dc49e4c4cd257660491be3805d7b8a3b5621dd25f1b7726f522a1c74df SHA512 1caa5ea5d87631a00acabd712053193aac4ed2f475760da90e395d64c44092797e45a4793a5fa2dc05458e9d2411b5cde14811c8a5112376c00baf9792df923f
 DIST mypy-0.961.gh.tar.gz 2767264 BLAKE2B 333e860f2416d065fd26f29f818e88c25f223c8f558bd174280ccfbe856c823253095830cc9cc44dd453b3661583d7626e5679ce1e44479b62ed75139051a9a2 SHA512 f7f57d38777256a45c950a45e832b6f1b9465a6663056472a9b32dc8c1d38b4d28ed856f4de12202de5910eeb6197a22073e12924a1e3f58d5631aaa938c0f2a
 DIST mypy-0.971.gh.tar.gz 2808674 BLAKE2B 7f3b183a4c5342ddfc501b8091c078ac55803db86d43042220e18e3e616664ce91ddeb341b45b1d80c7686f8c2f3606af074a5dcb9c9eaacd6307578d3689981 SHA512 5088efbd74385b5a8c155ae6e756deed274bf3e597df13e57970a29c029c34c91453c45fc1d2d03b7d83cd786b8930a387a781e1b9cb72102c1f07263a346c6d
diff --git a/dev-python/mypy/mypy-0.942.ebuild b/dev-python/mypy/mypy-0.942.ebuild
deleted file mode 100644
index 34ed7e0c7705..000000000000
--- a/dev-python/mypy/mypy-0.942.ebuild
+++ /dev/null
@@ -1,66 +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} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Optional static typing for Python"
-HOMEPAGE="http://www.mypy-lang.org/"
-SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# stubgen collides with this package: https://bugs.gentoo.org/585594
-RDEPEND="
-	!dev-util/stubgen
-	>=dev-python/psutil-4[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
-		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
-		>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-# this requires packaging a lot of type stubs
-export MYPY_USE_MYPYC=0
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Fails with pytest-xdist 2.3.0
-		# https://github.com/python/mypy/issues/11019
-		mypy/test/teststubtest.py
-		# fails due to setuptools deprecation warnings
-		mypyc/test/test_run.py::TestRun::run-imports.test::testImports
-	)
-
-	[[ "${EPYTHON}" == "python3.10" ]] && EPYTEST_DESELECT+=(
-		# https://github.com/python/mypy/issues/11018
-		mypyc/test/test_commandline.py::TestCommandLine::testErrorOutput
-	)
-
-	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
-	# fail with high COLUMNS values
-	local -x COLUMNS=80
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/mypy/mypy-0.950.ebuild b/dev-python/mypy/mypy-0.950.ebuild
deleted file mode 100644
index db1a1b496ded..000000000000
--- a/dev-python/mypy/mypy-0.950.ebuild
+++ /dev/null
@@ -1,55 +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} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Optional static typing for Python"
-HOMEPAGE="http://www.mypy-lang.org/"
-SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# stubgen collides with this package: https://bugs.gentoo.org/585594
-RDEPEND="
-	!dev-util/stubgen
-	>=dev-python/psutil-4[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
-		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
-		>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-# this requires packaging a lot of type stubs
-export MYPY_USE_MYPYC=0
-
-python_test() {
-	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
-	# fail with high COLUMNS values
-	local -x COLUMNS=80
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/mypy/mypy-0.960.ebuild b/dev-python/mypy/mypy-0.960.ebuild
deleted file mode 100644
index 46423f40a6c2..000000000000
--- a/dev-python/mypy/mypy-0.960.ebuild
+++ /dev/null
@@ -1,61 +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} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Optional static typing for Python"
-HOMEPAGE="
-	http://www.mypy-lang.org/
-	https://github.com/python/mypy/
-	https://pypi.org/project/mypy/
-"
-SRC_URI="
-	https://github.com/python/mypy/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# stubgen collides with this package: https://bugs.gentoo.org/585594
-RDEPEND="
-	!dev-util/stubgen
-	>=dev-python/psutil-4[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
-		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
-		>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-# this requires packaging a lot of type stubs
-export MYPY_USE_MYPYC=0
-
-python_test() {
-	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
-	# fail with high COLUMNS values
-	local -x COLUMNS=80
-	epytest -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/mypy/mypy-0.961.ebuild b/dev-python/mypy/mypy-0.961.ebuild
index ee14a45bca5d..501cc0d3c939 100644
--- a/dev-python/mypy/mypy-0.961.ebuild
+++ b/dev-python/mypy/mypy-0.961.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
diff --git a/dev-python/nodeenv/Manifest b/dev-python/nodeenv/Manifest
index 63d22456e84f..8954876560a5 100644
--- a/dev-python/nodeenv/Manifest
+++ b/dev-python/nodeenv/Manifest
@@ -1,2 +1 @@
-DIST nodeenv-1.6.0.tar.gz 35407 BLAKE2B b952fa95787b02353ff01c27a3e4b692c0cb27954e99af4c4aec682c00692bf3e509947ffd378639dcfdcb2d8077e1b2679f56cef7818997a13a31f882251a2a SHA512 abf4fe55ba478570a32ff3bb24fc3c60ba2d100822f8295c4c55c301ccdff2dc2d20ef76990ea3ac203e30db8a1e85f3ef2df671f87c0cf7305cf1aeb788efdd
 DIST nodeenv-1.7.0.gh.tar.gz 36209 BLAKE2B ff5853c04f9c442ffee883f7c981e574704c4ccbb37a8627257c4c7af3c86d70034a2e62b4bc6f4e7c6da32e0edb4f5b9216bf288f47991d9b42f21be454634f SHA512 1e3e4068591d51d8915de73ab0f82f04620ca628152ec5a454e7ad18001ff20b698f9818353c44b80200ab529d95fa3196a3dbc85f0c497ea49f60eaa5dc9ea7
diff --git a/dev-python/nodeenv/nodeenv-1.6.0.ebuild b/dev-python/nodeenv/nodeenv-1.6.0.ebuild
deleted file mode 100644
index d0508d88e158..000000000000
--- a/dev-python/nodeenv/nodeenv-1.6.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Node.js virtual environment builder"
-HOMEPAGE="https://github.com/ekalinin/nodeenv"
-SRC_URI="https://github.com/ekalinin/nodeenv/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
-
-# requires network access
-RESTRICT="test"
diff --git a/dev-python/nodeenv/nodeenv-1.7.0.ebuild b/dev-python/nodeenv/nodeenv-1.7.0.ebuild
index 0131ebfed7ba..feb693adfb97 100644
--- a/dev-python/nodeenv/nodeenv-1.7.0.ebuild
+++ b/dev-python/nodeenv/nodeenv-1.7.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
 
 # requires network access
 RESTRICT="test"
diff --git a/dev-python/pdm-pep517/pdm-pep517-1.0.3.ebuild b/dev-python/pdm-pep517/pdm-pep517-1.0.3.ebuild
index 773c078ae24f..f764745cb7df 100644
--- a/dev-python/pdm-pep517/pdm-pep517-1.0.3.ebuild
+++ b/dev-python/pdm-pep517/pdm-pep517-1.0.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
diff --git a/dev-python/pep517/Manifest b/dev-python/pep517/Manifest
index a7c369ebdc32..463cb98685b7 100644
--- a/dev-python/pep517/Manifest
+++ b/dev-python/pep517/Manifest
@@ -1 +1,2 @@
 DIST pep517-0.12.0.gh.tar.gz 24726 BLAKE2B 7d022ab88c68b7254df5d922db2f571e2bab2ee58b8a2ed0ce1adeadf89f22f11f6a609b558133acfed5342a9cf6a398d805949bdfb485a4abf272e2b9322e05 SHA512 6b224759733c1f5e346909788233b0acf49c60a0b6ef2d99d953b2e7bb570b2913fd0b133d5bc6884ec3de98adf2e41fa9506fed344b8fd76cc58dfcd1778e80
+DIST pep517-0.13.0.gh.tar.gz 23816 BLAKE2B d1bab5fe1a629384dcd264c0ea3d42d6b11de3530441de5de49516543630293b9a8023c8a55b291a7a415f8c90d4077f156cd036ed7fd477339d1210bfe47059 SHA512 dc534e73ea8659994041a39c8bfc92ee0a81b164c2d1ee383e3549d830f513fc89227d1bda3f749352532d0610e450de6b2be956aa4387f4b2f272d9f8aec0a0
diff --git a/dev-python/pep517/pep517-0.13.0.ebuild b/dev-python/pep517/pep517-0.13.0.ebuild
new file mode 100644
index 000000000000..dfe7b362ddeb
--- /dev/null
+++ b/dev-python/pep517/pep517-0.13.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Wrappers to build Python packages using PEP 517 hooks"
+HOMEPAGE="
+	https://pypi.org/project/pep517/
+	https://github.com/pypa/pep517/
+	https://pep517.readthedocs.io/
+"
+SRC_URI="
+	https://github.com/pypa/pep517/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/tomli[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# require Internet
+	tests/test_meta.py
+)
+
+src_prepare() {
+	sed -i -e '/--flake8/d' pytest.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pytoolconfig/pytoolconfig-1.2.1.ebuild b/dev-python/pytoolconfig/pytoolconfig-1.2.1.ebuild
index d94532ce2702..ff81b96fddcb 100644
--- a/dev-python/pytoolconfig/pytoolconfig-1.2.1.ebuild
+++ b/dev-python/pytoolconfig/pytoolconfig-1.2.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/rope/rope-1.2.0.ebuild b/dev-python/rope/rope-1.2.0.ebuild
index f9de617b6edf..c4dc67cb694d 100644
--- a/dev-python/rope/rope-1.2.0.ebuild
+++ b/dev-python/rope/rope-1.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 259e3786068a..a29c70f2473a 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,4 +1,5 @@
 DIST scipy-1.8.1.tar.gz 38196215 BLAKE2B 180ae646adba2031a4bf99cd4feefe652b8e340110b3b2872e61aa1083054aadf369c7e3b3e3fd8fb71fcd831c95841d2dadd1c71e35e5f7d95800e5551173f0 SHA512 f6fc71c209991fe82baa4b10d8ade0deb1057f6f5942a91dfb7ae45f3eb78a4535efa2861badf5e2d37239fa99dbd99de760aa7e4854b95991ade0263004e7ea
+DIST scipy-1.9.0.tar.gz 42016757 BLAKE2B ca25b3ad44091230c5ecdfa832b382a1f5449565aa460b169a886505e7583399d316fe48f420d45b9993e6522d46fbbd6405e08fcfb8dc02ed5febb2e09749e7 SHA512 03d38f3298e2ca2dcc376acb09593f47a007f2b166508b91cd6f3e3cc417fa3579084aaa806365afee8679b473340b0eba86b36def957da45be404c4b6607675
 DIST scipy-1.9.0rc3.tar.gz 42021439 BLAKE2B 148c5a2517ef18015123503837d921a24258996047b4c5df22a279febc98d0633bb8b6bd9c7b886db9458583e8a5c15886b6349e2095a0ed7d60a7c976d24145 SHA512 1e4f0eb3fc5d8cdc24c2e4f7ea8400f5db039d4a2bb7a7d7c4869392fbdca6836d4dfb0a1ead2452b177fe49a60aa7ef86d7d6aee596e001e870df79a5cbce04
 DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d26b8e86c1558e427a715093f5a29ced3847ab6ecfe88ce1017664f36ac3e9fa9bbf72ede7e0fd3812b5f41fe933 SHA512 95153dc1f404aa64898a700c94c0deea3ca842c3152167d0987edabcf4a8eba16b6c8e6bc38a6775a849dc621e6a21434baf53d1669b1865fa5049cffa4387ac
 DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728
diff --git a/dev-python/scipy/metadata.xml b/dev-python/scipy/metadata.xml
index 728a5c2aed03..7469ad4a6d1a 100644
--- a/dev-python/scipy/metadata.xml
+++ b/dev-python/scipy/metadata.xml
@@ -10,13 +10,13 @@
   <name>Python</name>
  </maintainer>
  <longdescription lang="en">
-  SciPy is an open source library of scientific tools for Python. SciPy
-  supplements the popular numpy module, gathering a variety of high level
-  science and engineering modules together as a single package.
-  SciPy includes modules for graphics and plotting, optimization,
-  integration, special functions, signal and image processing, genetic
-  algorithms, ODE solvers, and others.
-</longdescription>
+	SciPy is an open source library of scientific tools for Python. SciPy
+	supplements the popular numpy module, gathering a variety of high level
+	science and engineering modules together as a single package.
+	SciPy includes modules for graphics and plotting, optimization,
+	integration, special functions, signal and image processing, genetic
+	algorithms, ODE solvers, and others.
+	</longdescription>
  
  <use>
   <flag name="pythran">Use <pkg>dev-python/pythran</pkg> to accelerate runtime</flag>
diff --git a/dev-python/scipy/scipy-1.9.0.ebuild b/dev-python/scipy/scipy-1.9.0.ebuild
new file mode 100644
index 000000000000..1a1d05302463
--- /dev/null
+++ b/dev-python/scipy/scipy-1.9.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit fortran-2 distutils-r1 multiprocessing
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="
+	https://scipy.org/
+	https://github.com/scipy/scipy/
+	https://pypi.org/project/scipy/
+"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	# Need submodules, so git for now.
+	EGIT_REPO_URI="https://github.com/scipy/scipy"
+	EGIT_BRANCH="maintenance/$(ver_cut 1-2).x"
+	EGIT_SUBMODULES=( '*' )
+else
+	# Upstream is often behind with doc updates
+	DOC_PV=1.8.1
+	MY_PV=${PV/_rc/rc}
+	MY_P=${PN}-${MY_PV}
+
+	SRC_URI="
+		mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
+		doc? (
+			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
+			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf
+		)"
+	S="${WORKDIR}"/${MY_P}
+
+	if [[ ${PV} != *rc* ]] ; then
+		KEYWORDS="~amd64 -hppa"
+	fi
+fi
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc +sparse"
+
+DEPEND="
+	>=dev-python/numpy-1.18.5[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:0=
+	virtual/cblas
+	>=virtual/lapack-3.8
+	sparse? ( sci-libs/umfpack:0= )"
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]"
+# TODO: restore pythran optionality?
+BDEPEND="
+	dev-lang/swig
+	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	dev-python/pythran[${PYTHON_USEDEP}]
+	>=dev-util/meson-0.62.2
+	dev-util/patchelf
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.9999-meson-options-lapack.patch
+)
+
+EPYTEST_DESELECT=(
+	linalg/tests/test_decomp.py::TestSchur::test_sort
+	linalg/tests/test_solvers.py::test_solve_discrete_are
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${T}" || die
+
+	epytest -n "$(makeopts_jobs)" --pyargs scipy
+}
diff --git a/dev-python/scipy/scipy-1.9.0_rc3.ebuild b/dev-python/scipy/scipy-1.9.0_rc3.ebuild
index e2cbeb267282..3fe6ea177b4d 100644
--- a/dev-python/scipy/scipy-1.9.0_rc3.ebuild
+++ b/dev-python/scipy/scipy-1.9.0_rc3.ebuild
@@ -38,7 +38,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+		KEYWORDS="~amd64 -hppa"
 	fi
 fi
 
diff --git a/dev-python/scipy/scipy-1.9.9999.ebuild b/dev-python/scipy/scipy-1.9.9999.ebuild
index fcd16071ee40..1a1d05302463 100644
--- a/dev-python/scipy/scipy-1.9.9999.ebuild
+++ b/dev-python/scipy/scipy-1.9.9999.ebuild
@@ -38,7 +38,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+		KEYWORDS="~amd64 -hppa"
 	fi
 fi
 
@@ -60,6 +60,7 @@ BDEPEND="
 	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
 	dev-python/pybind11[${PYTHON_USEDEP}]
 	dev-python/pythran[${PYTHON_USEDEP}]
+	>=dev-util/meson-0.62.2
 	dev-util/patchelf
 	virtual/pkgconfig
 	doc? ( app-arch/unzip )
@@ -69,6 +70,11 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.9.9999-meson-options-lapack.patch
 )
 
+EPYTEST_DESELECT=(
+	linalg/tests/test_decomp.py::TestSchur::test_sort
+	linalg/tests/test_solvers.py::test_solve_discrete_are
+)
+
 distutils_enable_tests pytest
 
 python_test() {
diff --git a/dev-python/sphinx-tabs/Manifest b/dev-python/sphinx-tabs/Manifest
index 45e78f2419ff..741ae43b25cd 100644
--- a/dev-python/sphinx-tabs/Manifest
+++ b/dev-python/sphinx-tabs/Manifest
@@ -1,3 +1 @@
-DIST sphinx-tabs-3.3.1.tar.gz 523932 BLAKE2B 8b941eb549ea8a10fcd329e880b8fa15742ba7903f4f9d6422335cf889c344a1fec8f16798c286b0c0f7561c128ea297153c31d0445b867e5e23f7960698d31a SHA512 d93ba1149a20711b52f8a76f22d212fdbb97349561f3e13b53873cdb4dba8f18f645e2d73ef378c2dde3d1c0c585c1402d73f4102da0e973be0c90a5912e7036
-DIST sphinx-tabs-3.4.0.gh.tar.gz 524212 BLAKE2B 18688d10d37e5794340ccfc5d798a31bf80374ed74e64dcb54ae53dc557d7538de39b4e29002d16735cab5ed4618189af54da2682dce195c503af442f554fef7 SHA512 2833586c7040e454cac65963a3dfb22ac7e09b0a4cd5cba9ea449d798a5d7120ce3d19ac0a9d638a9389d52773bd98ab4bde33d06924170757036ff3218f6d55
 DIST sphinx-tabs-3.4.1.gh.tar.gz 524071 BLAKE2B 5aecb9c22a298c1347bf82cbbc16709f3f6cd38b0f0f6e4948411f1fdd79ba17d3e75178b8c092df7b8abc812dd4b0102879774708552a062aad0fe0b0653717 SHA512 b6079d3ae91479d40aaf35926226eb7dd783de7cec0e721cb13a036fc520bb3afda0dffb0669dc5054fc665125c3620261b1ea7ffe685d5b177bc980e3b4d7e4
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.3.1-r1.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.3.1-r1.ebuild
deleted file mode 100644
index 984779e46563..000000000000
--- a/dev-python/sphinx-tabs/sphinx-tabs-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,43 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tabbed views for Sphinx"
-HOMEPAGE="
-	https://github.com/executablebooks/sphinx-tabs/
-	https://pypi.org/project/sphinx-tabs/
-"
-SRC_URI="https://github.com/executablebooks/sphinx-tabs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	=dev-python/docutils-0.17*[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/sphinx-testing[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-
-EPYTEST_DESELECT=(
-	# Unpackaged rinohtype
-	tests/test_build.py::test_rinohtype_pdf
-)
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.4.0.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.4.0.ebuild
deleted file mode 100644
index af11fcaf04e7..000000000000
--- a/dev-python/sphinx-tabs/sphinx-tabs-3.4.0.ebuild
+++ /dev/null
@@ -1,52 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tabbed views for Sphinx"
-HOMEPAGE="
-	https://github.com/executablebooks/sphinx-tabs/
-	https://pypi.org/project/sphinx-tabs/
-"
-SRC_URI="
-	https://github.com/executablebooks/sphinx-tabs/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/sphinx-testing[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-
-EPYTEST_DESELECT=(
-	# Unpackaged rinohtype
-	tests/test_build.py::test_rinohtype_pdf
-)
-
-src_prepare() {
-	distutils-r1_src_prepare
-	# annoying, incorrect version limitations
-	sed -i -e '/install_requires/d' setup.py || die
-}
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.4.1.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.4.1.ebuild
index a11b52bb11eb..7b87e35efa3a 100644
--- a/dev-python/sphinx-tabs/sphinx-tabs-3.4.1.ebuild
+++ b/dev-python/sphinx-tabs/sphinx-tabs-3.4.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild
index 493962adeaf0..df603a1ab986 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 BDEPEND="
diff --git a/dev-python/suds-community/Manifest b/dev-python/suds-community/Manifest
index e21933e8f839..ecae0d478968 100644
--- a/dev-python/suds-community/Manifest
+++ b/dev-python/suds-community/Manifest
@@ -1,2 +1 @@
-DIST suds-community-1.1.1.tar.gz 284934 BLAKE2B 9df1a5f6b4dd2ca060c639147a090cef6a194f275706e03a3fdafa46c4d18b890f7c94249db8db6202e95abea71948e0c42fe42f14f659ca14bb0aca11b4b5f5 SHA512 9b343d704b2db123ff44685fb03da8f6912cefb32d38e9b79f9f84aeebff32ba26936a0f70a6121628c6f2c5388e94d380f08ed546f55fbf84fdc8e4fdbd3d0a
 DIST suds-community-1.1.2.tar.gz 285409 BLAKE2B 6cf047bb6fa6aed147fa519fee4300f52195c94a409aaa769feffaaf4d43552a566efb0162e440092c3dcb8ec21cf441325db449e5417b81a5f859133a078b83 SHA512 9f26ebbf36fcbd915281f3c3afd4ea776ca409ede4ba9e487b746ef4e527171ee2fdb44075100d52b5bba0658fafec817eea2cbf64b8d2851bdc974aee430d57
diff --git a/dev-python/suds-community/suds-community-1.1.1.ebuild b/dev-python/suds-community/suds-community-1.1.1.ebuild
deleted file mode 100644
index 5c95c7104f48..000000000000
--- a/dev-python/suds-community/suds-community-1.1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Lightweight SOAP client"
-HOMEPAGE="
-	https://github.com/suds-community/suds/
-	https://pypi.org/project/suds-community/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-DOCS=( README.md notes/. )
-
-BDEPEND="
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/suds-community/suds-community-1.1.2.ebuild b/dev-python/suds-community/suds-community-1.1.2.ebuild
index 34ce6ef5491e..5c95c7104f48 100644
--- a/dev-python/suds-community/suds-community-1.1.2.ebuild
+++ b/dev-python/suds-community/suds-community-1.1.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 DOCS=( README.md notes/. )