Adding metadata

35 files changed, 315 insertions, 422 deletions

diff --git a/dev-python/Faker/Faker-12.1.0.ebuild b/dev-python/Faker/Faker-12.1.0.ebuild
new file mode 100644
index 000000000000..5bb772b69fe2
--- /dev/null
+++ b/dev-python/Faker/Faker-12.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index a14567a02857..b04b1b66c27c 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -5,3 +5,4 @@ DIST Faker-11.3.0.tar.gz 1215886 BLAKE2B 01a0e9cff30597536cc1d6f4ae3f67c43e0e1ec
 DIST Faker-11.4.0.tar.gz 1347314 BLAKE2B 0399302df718a9283ecb59ab044f438891f2874a2dd752d97bd88cf7e2de4536ad34ee818576c9c9926d90b5a18626759fb12dcd2cbf6ba54a3a9d2366caec66 SHA512 a12dbc6e3011839852fe978004520c546a42fab7b84ba03d890fe12a40299d36b7ce0ffbe1e678dfb74879fe17410589c459ff2ac904bdd15c9c03b816e8c7c0
 DIST Faker-12.0.0.tar.gz 1428698 BLAKE2B 3dbf231c0969d3f5d0826d69362f57a3bbb8e006c42453d7a6178663b3947b74f773aad8d22237f12c6e152d30a91a883b603d65f562b69a298f34501f6b65f6 SHA512 1998eafec97d16624c4d19f5abe3f083ca75d4a72f49e6fe2df657aae1ce41ddf7ec198ab601bd6a377f86ef8b4e027e031d6830149972b7775e4b656eb2c3b7
 DIST Faker-12.0.1.tar.gz 1428846 BLAKE2B 25206e612983735504129118e13b4f8e50d604c4abc78146897f42bed1929f5c10b4dda86d40a90dda9162ac1cbd55bd9a30137208c579329040a7c6df7fb3ee SHA512 8dc26162d6f841e2e33385064eef3104ef58e018c59664b86f17efa83578b1ff871799ac7e5b335dab0249627569fcf6bf1b8462c9bbda2db025448a721f336e
+DIST Faker-12.1.0.tar.gz 1429360 BLAKE2B 7833be81a8bc465b4c147e1b4ab78b1385127f01bbaf718006fd03dd2a35492f249d0c33a0b9d5cf6a5313951b05f1035528f795f950914106446f57d1e5cd7b SHA512 56dfa966cb20adac1e9e45da2a9f38747fae918b675f2d410150403b273a921588c44a287be513e5b94889a02726c1def03c0d974ed4dd9d1193ca5a61673724
diff --git a/dev-python/asyncstdlib/Manifest b/dev-python/asyncstdlib/Manifest
index d3dc401a51c9..54b7d6f2ce18 100644
--- a/dev-python/asyncstdlib/Manifest
+++ b/dev-python/asyncstdlib/Manifest
@@ -1 +1,2 @@
 DIST asyncstdlib-3.10.2.gh.tar.gz 45697 BLAKE2B 8f9bbee8d2a4e9f6a60a5088ef00940f22c2aec79557070d1b13d8d7256179bddaf1130ace0393e95e06e077824dd862e27a6c5d644ae52dab2d80989bb08027 SHA512 be5a8cbb521b8082ad9898907bce1a888443eafb24e2030f9dfbb2dff293646376ad44ebbc53d12e539ad70af935d833f2f114e383171388b9d724f274eb8421
+DIST asyncstdlib-3.10.3.gh.tar.gz 50929 BLAKE2B 109c6bb7712c9d59a31f3993336fc35b6db0375a8705ec9996756ccb4f1f5982d193edd5907d1e1c4dee7e41fa41e59884a6dfda01b1594fa22b8354c6142515 SHA512 6c2f140495b806beb28a2cf56f71d35da1c15fad8da2727ce6e8dff40ff606c36c03370fab285d084cbf41dd675c9e40c199fa1384826b3f1aa84c2dadb7b1eb
diff --git a/dev-python/asyncstdlib/asyncstdlib-3.10.3.ebuild b/dev-python/asyncstdlib/asyncstdlib-3.10.3.ebuild
new file mode 100644
index 000000000000..62be029c42b2
--- /dev/null
+++ b/dev-python/asyncstdlib/asyncstdlib-3.10.3.ebuild
@@ -0,0 +1,23 @@
+# 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_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="The missing async toolbox"
+HOMEPAGE="
+	https://github.com/maxfischer2781/asyncstdlib/
+	https://pypi.org/project/asyncstdlib/"
+SRC_URI="
+	https://github.com/maxfischer2781/asyncstdlib/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/autocommand/autocommand-2.2.1_p20211118.ebuild b/dev-python/autocommand/autocommand-2.2.1_p20211118.ebuild
index a2009df3d262..54892f37e84b 100644
--- a/dev-python/autocommand/autocommand-2.2.1_p20211118.ebuild
+++ b/dev-python/autocommand/autocommand-2.2.1_p20211118.ebuild
@@ -20,6 +20,6 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 6199407edcc1..f99ec54dd9c4 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,3 +3,4 @@ DIST boto3-1.20.37.tar.gz 461197 BLAKE2B 4ae94815809401378bbd6c6b7774776c62436c3
 DIST boto3-1.20.46.tar.gz 464857 BLAKE2B 40eb0f2c298821530028c84f90d8acd9757a4b6c74e8355ca644ee2a87297d7ba3b70a2614e83c83befe0f6e3b64e0f1e023cc2fc3edbf3deb40f86382265338 SHA512 3ad8808ace2ce24eba54c60aa1ece5b904a2138a1497ec5c180a9aa1bef95cd61e2eabf26614d35690ae790cb56400afb6e32d0c005911e0eb42deaee7dc2602
 DIST boto3-1.20.47.tar.gz 465774 BLAKE2B ab615d29d79b209671808770968c38c2ef26b83ae48d1e18c3129c2886a274ae8a9fc7680fa851f205c28161bd16b20eef075c1a6cdbc5cfaf835c7ead974313 SHA512 c3a84ba9df6670879605e9085ea7aa15077d9f1c30117de6e9cd9cbb427a6a06097a388feb80a0ebc7ad1f422a40df402986d3dc9b004abf5252dab16524c761
 DIST boto3-1.20.48.tar.gz 466063 BLAKE2B 7ba92d1cfbd576d4262e0f99a9e9aa118747fbbe60caa703c14f24559d4c2312b3e7695c40b6555bd58f7beb248e7ecfcedd64bc84badb44cb96812c9537cabe SHA512 e80f2e54909a3a54e5eba9c9a75c0ccbb2ba3f8907dfec9563f50bef1be56b82b593ae0bc0ee0bfab1a7c993d4bbf0c624486822ef3cd93ef425f39205b628f0
+DIST boto3-1.20.49.tar.gz 466426 BLAKE2B 82f2ed7f14576afd5a4d2dab91b99986904fef97b98460dce152e0806cb20e39b14975e4c3362c9d208c4dce9de3e7a4fa9fa60559aa0007ff735ce9e43995e4 SHA512 6ea92236726b9200a8b06f773483b0d6803585480cfad1f68eab227598ca86c3aa93cbeccec5338febc52eb48691f003c5983d52be56dd91e97735ddbfac7053
diff --git a/dev-python/boto3/boto3-1.20.49.ebuild b/dev-python/boto3/boto3-1.20.49.ebuild
new file mode 100644
index 000000000000..ed44d35fedd6
--- /dev/null
+++ b/dev-python/boto3/boto3-1.20.49.ebuild
@@ -0,0 +1,60 @@
+# 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_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/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/${PN}/archive/${PV}.tar.gz -> ${P}.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}]
+	)
+"
+
+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}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 5b594467ef8a..e77cc073d796 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,3 +3,4 @@ DIST botocore-1.23.37.tar.gz 8728451 BLAKE2B 039352d4c727433cc5aef435cd7527fa3bc
 DIST botocore-1.23.46.tar.gz 8743469 BLAKE2B 804e4ea772bbc74a12645fa5b5e1056115aa232eba0a21f347686143721a0a5e5d2bebe3841ff68fd0a3e464fa8fe88cb78e349c33eb22172b7481d1b5de7b28 SHA512 241d44bb509847e97744a0d4b8e38f44eba1f0e0b11d36b3194cd85b06b5a841dd5bee91b4602ddf3bc36c6945638104f22ca0083150fb5331f4c62a9e22c947
 DIST botocore-1.23.47.tar.gz 8757185 BLAKE2B 7d80ec4a869ed9c86b47a1fe8a7e9913381d56164827c9ffd8911c3c4f715867a6200c4a6cea5d8941e747ab72dbd61bfc4282aa5109a9f28679b47a9563c0ea SHA512 c69b4e4192e5acd85bb0664762e2d9eee7d317b48bb7071047dcbf58efdea7f96cc6915f71e83c134df795e810a4e507ff35702434785c92f9eadf6509b9e9a2
 DIST botocore-1.23.48.tar.gz 8757876 BLAKE2B e70a1aa1fdbeab5246640d9e5fc26ac6853491e32cdd0a29ef98d4dda441f4b61ae16011298cf2da0434d5668260010cd2a70c2cc760fc2c282b236b278158f3 SHA512 ad2d8e632ff7da1a1b677876b9d4345a9ba60a407f77deb8fe9df7108495853ff9a915b8e5956f6cf226501d6fe34d8328fdb7446c4a8db5b3f219ca2fbe1cb6
+DIST botocore-1.23.49.tar.gz 8758361 BLAKE2B 5e53366fdd705e81af6752665f3078e26d55460bc2e3644fa030f6b3a4485bd504c445ac15d6b6abcdb164d6c93f33fe8a596d5eb8e7f85c10363cd93a3d3e58 SHA512 2450752613a815a67f007a23371e0349a2ebaa991f3b48062bab5ed5736fa11255e206a20cc71a2477b65673f689c5447229a9e0c14358ffcd322e1f55971a86
diff --git a/dev-python/botocore/botocore-1.23.49.ebuild b/dev-python/botocore/botocore-1.23.49.ebuild
new file mode 100644
index 000000000000..c44cf37adbf0
--- /dev/null
+++ b/dev-python/botocore/botocore-1.23.49.ebuild
@@ -0,0 +1,65 @@
+# 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_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/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[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.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}
+}
diff --git a/dev-python/ipython/ipython-8.0.1.ebuild b/dev-python/ipython/ipython-8.0.1.ebuild
index 982fa898fde6..a81f601c7915 100644
--- a/dev-python/ipython/ipython-8.0.1.ebuild
+++ b/dev-python/ipython/ipython-8.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~riscv ~sparc"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-context/jaraco-context-4.1.1-r1.ebuild b/dev-python/jaraco-context/jaraco-context-4.1.1-r1.ebuild
index 81ea8a8504cc..248d79138e9d 100644
--- a/dev-python/jaraco-context/jaraco-context-4.1.1-r1.ebuild
+++ b/dev-python/jaraco-context/jaraco-context-4.1.1-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/jaraco-text/jaraco-text-3.7.0-r1.ebuild b/dev-python/jaraco-text/jaraco-text-3.7.0-r1.ebuild
index 8bcceb2caf9d..83d374b0559b 100644
--- a/dev-python/jaraco-text/jaraco-text-3.7.0-r1.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.7.0-r1.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/jaraco-context-4.1.1-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/littleutils/littleutils-0.2.2.ebuild b/dev-python/littleutils/littleutils-0.2.2.ebuild
index 3a78f41cc635..61c21600f753 100644
--- a/dev-python/littleutils/littleutils-0.2.2.ebuild
+++ b/dev-python/littleutils/littleutils-0.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~riscv ~sparc"
 
 python_test() {
 	"${EPYTHON}" -m doctest -v ${PN}/__init__.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/pip-run/pip-run-8.8.0.ebuild b/dev-python/pip-run/pip-run-8.8.0.ebuild
index 7364cc1bfdf6..3ba1c490ab16 100644
--- a/dev-python/pip-run/pip-run-8.8.0.ebuild
+++ b/dev-python/pip-run/pip-run-8.8.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	dev-python/autocommand[${PYTHON_USEDEP}]
diff --git a/dev-python/pure_eval/pure_eval-0.2.2.ebuild b/dev-python/pure_eval/pure_eval-0.2.2.ebuild
index 444f4b3399d8..d54bbed96029 100644
--- a/dev-python/pure_eval/pure_eval-0.2.2.ebuild
+++ b/dev-python/pure_eval/pure_eval-0.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~riscv ~sparc"
 
 BDEPEND="dev-python/wheel[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 3c9af95faa47..f934f5c2f151 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,3 +1,4 @@
 DIST pycryptodome-3.12.0.tar.gz 15130980 BLAKE2B 5eb34a03523652d990ddfdd1eebcbbacea30bffbe4838289c195b07658a98814ebec322aaffbed7b3fa564bc005d52ea1e483dedcb9f40b65d00e50c28d78582 SHA512 67f2a814d74305614fdf9dfb633c4fd9d80d2064119d0ecab24ae52fd8ce4b6de1a1e82c6ba7bcf22fb7db1a5a850adf078e22317b4c07229cd7cb8cb7f1ffd4
 DIST pycryptodome-3.13.0.tar.gz 15306369 BLAKE2B 97ef26868fb2be2f3240960d8debd897cb82c4a6f1ea1c179fc790693eb2e37de14cbf16bd7deafe0ca1d28983e9bee8583cbe8adde2fa50533cf2bd1274108c SHA512 daafdc80ae8df7f5f282adbdd3fbd9f848b03a3de0c21739b3bb973368daf721c9cd306e56c16baceeda4a0ebc3470abbc0cddc4e8409b5e4fe4255f3d62ec2e
 DIST pycryptodome-3.14.0.tar.gz 15339838 BLAKE2B 804ceabfb5e29775df279a00eaadced776a10301e9bd254471b234f10c65fcfce507c8e51eb5dc5387eb81f856ccfe46ff035ca96a8acebf8b4f59c960fd35a4 SHA512 2f20a3a2bfef14a0f4c05587d64da3a4be7303ae37aaee02e49a3c7ef69009fa958e4b7151c1441f2cc63833cc29642d6d13c1006fb0f215743178d36c9de802
+DIST pycryptodome-3.14.1.tar.gz 15339859 BLAKE2B 72748a4eaf9f34be1ac3200a0ed0285a96111f52077b6d7cc5b4fa26599b6b8c6c17d79cdce4cabd7257cef840daf71440a78d00ded65deb52fa13e6b1b1efe6 SHA512 08e904aa2f3df19fcc75a8283fc867349617afe3919532912801d8abc9610f1cb64b878b56202cbdf0759cf5506ec5f793123093e21f18ba99acbf42fa4d9cf1
diff --git a/dev-python/pycryptodome/pycryptodome-3.14.1.ebuild b/dev-python/pycryptodome/pycryptodome-3.14.1.ebuild
new file mode 100644
index 000000000000..b5457786df89
--- /dev/null
+++ b/dev-python/pycryptodome/pycryptodome-3.14.1.ebuild
@@ -0,0 +1,46 @@
+# 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_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A self-contained cryptographic library for Python"
+HOMEPAGE="https://www.pycryptodome.org/
+	https://github.com/Legrandin/pycryptodome/
+	https://pypi.org/project/pycryptodome/"
+SRC_URI="
+	https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2 Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="
+	dev-libs/gmp:0=
+	>=dev-libs/libtomcrypt-1.18.2-r1:="
+BDEPEND="
+	virtual/python-cffi[${PYTHON_USEDEP}]"
+RDEPEND="
+	${DEPEND}
+	${BDEPEND}
+	!dev-python/pycrypto"
+
+PATCHES=(
+	"${FILESDIR}/pycryptodome-3.10.1-system-libtomcrypt.patch"
+)
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	# make sure we're unbundling it correctly
+	rm -r src/libtom || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index 49da47d27c7c..40cef1190584 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,2 +1 @@
-DIST pyproject2setuppy-21.tar.gz 12938 BLAKE2B 09b030e882e7ec66c3d8ad76d486c08b991c7ba725d628101c07475348890a55bc6d6f4ef96f3a9b0f8d40382c026f075aac6dd2fa970fa409c4824b625ba3f1 SHA512 d899bc81f01283dd854fa2c0c5d15e5b77bd273f4269e2dea8612dd41bb4d5404e63e0fc6db5cbefe2a65a69848a3a5c9eae56e93face1736b2e8a0aa39f2193
 DIST pyproject2setuppy-22.tar.gz 13046 BLAKE2B 5f59a08294f3d6d9dcbd6d9cbf6769abb523e8a409944157e9e8dc8a03944d173c1656c18da9138e220ad1ead31cb6af70bea8628c0e7164357af32a86700ec7 SHA512 8fc2975c8b4384b6a79008e2fc1de6acd2bcb27c9232b45ae5bda0e40f5a0be330ef7c9ef4ab36ab8ab33e9faf587b19d8fb431d95c866ccce46afc975f3cf26
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-21.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-22-r1.ebuild
index c663cab42f07..aef0e9af42a5 100644
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-21.ebuild
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-22-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]"
+	>=dev-python/tomli-1.2.3[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
 	test? (
 		dev-python/pytest-forked[${PYTHON_USEDEP}]
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-22.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-22.ebuild
deleted file mode 100644
index c663cab42f07..000000000000
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-22.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
-HOMEPAGE="https://github.com/mgorny/pyproject2setuppy"
-SRC_URI="
-	https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyrqlite/Manifest b/dev-python/pyrqlite/Manifest
index 0b40da3fa540..b8d16d384448 100644
--- a/dev-python/pyrqlite/Manifest
+++ b/dev-python/pyrqlite/Manifest
@@ -1 +1,2 @@
+DIST pyrqlite-2.1.1-test_cPragmaTableInfo.patch 2601 BLAKE2B 43dce906dea12d6d503ac589990c4688f07cf4186b6b4641534e50aa77e5dacd4f9f286d7707451bc843fb429fec4cdfb887a4922fa48aa9b7d7757bc1ff55bc SHA512 67c8593fd8a437011f9579e6a469323f60a70634469eb42d96b22f3997e48eab42d102013cbf300616fa23e2a0e64e1a0c4b4d7fdd1346402abd34255b252d85
 DIST pyrqlite-2.1.1.tar.gz 19538 BLAKE2B fba6caa68eb6d806ea807d40f36edafb0872e724a087cdb7736f79699692d0d492e05a8a7407467f92ec8e30df4a6ea1ed44bc12bec35ffc4753878335fa4275 SHA512 9fc404a480f42592ebbedef82f748707741e28de199be9381680db506dac4e3ce757d1058874ca06cf8f0dd1ec0e7b6411a4585f332a9fe7d8977071e492bd31
diff --git a/dev-python/pyrqlite/pyrqlite-2.1.1.ebuild b/dev-python/pyrqlite/pyrqlite-2.1.1.ebuild
index 9cb585f756a9..d026298692b8 100644
--- a/dev-python/pyrqlite/pyrqlite-2.1.1.ebuild
+++ b/dev-python/pyrqlite/pyrqlite-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,8 @@ inherit distutils-r1
 
 DESCRIPTION="Python client for rqlite"
 HOMEPAGE="https://github.com/rqlite/pyrqlite"
-SRC_URI="https://github.com/rqlite/pyrqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/rqlite/pyrqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/rqlite/pyrqlite/pull/42.patch -> ${P}-test_cPragmaTableInfo.patch"
 
 LICENSE="MIT"
 SLOT="0"
@@ -17,6 +18,8 @@ KEYWORDS="~amd64 ~x86"
 BDEPEND="test? ( >=dev-db/rqlite-6.7.0 )"
 RESTRICT+=" !test? ( test )"
 
+PATCHES=("${DISTDIR}/${P}-test_cPragmaTableInfo.patch")
+
 distutils_enable_tests pytest
 
 src_prepare() {
diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest
index ed167c9a1c1b..5e7c2e3aea1f 100644
--- a/dev-python/pyudev/Manifest
+++ b/dev-python/pyudev/Manifest
@@ -1 +1,2 @@
 DIST pyudev-0.22.0.tar.gz 85077 BLAKE2B 66c78aa4d3bea5ceae3660a93e5bd1733629bb5228d67d8e647abb8c237a2786c1061b07e034be5467f5bcab58d95ba30f91d74bdc54cd8253dff69be3ad4a80 SHA512 a09ed479a54a1772a6af68cb975fef792068c2de3655e20223905bc3f574fd32bd3dbe6b97062eee3ab5f08a8b041ad3ea86dfb68c839ea44e29d65ec1686670
+DIST pyudev-0.23.2.tar.gz 87199 BLAKE2B 0ce4300296f4fcc3a56ba4100d3ebe7734330b3096fde59475fe9880758a3279324c4c3df883b22d1ec9f4e0cfa83fc7c25fbe54ed03a5e019567595deb21211 SHA512 40b947d363dca73789f5ab77cbda4b48349e28fe04f2f5cafb93d20799d842ebeb2b7d78d1f16dcbcaac5c20aff1b931b372c75852706e731337e6e1d30b8538
diff --git a/dev-python/pyudev/metadata.xml b/dev-python/pyudev/metadata.xml
index 65a857f2b1bc..e4271387b445 100644
--- a/dev-python/pyudev/metadata.xml
+++ b/dev-python/pyudev/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
+ <maintainer type="person">
+  <email>arthurzam@gentoo.org</email>
+  <name>Arthur Zamarin</name>
+ </maintainer>
  <maintainer type="project">
   <email>python@gentoo.org</email>
   <name>Python</name>
diff --git a/dev-python/pyudev/pyudev-0.22.0-r1.ebuild b/dev-python/pyudev/pyudev-0.22.0-r1.ebuild
index b32feef9f8f5..89f588a768c1 100644
--- a/dev-python/pyudev/pyudev-0.22.0-r1.ebuild
+++ b/dev-python/pyudev/pyudev-0.22.0-r1.ebuild
@@ -15,6 +15,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="qt5"
 
+# Known to fail on test system that aren't exactly the same devices as on CI
+RESTRICT="test"
+
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	virtual/udev
diff --git a/dev-python/pyudev/pyudev-0.22.0.ebuild b/dev-python/pyudev/pyudev-0.22.0.ebuild
index 37d93b4d7ad8..77569857700b 100644
--- a/dev-python/pyudev/pyudev-0.22.0.ebuild
+++ b/dev-python/pyudev/pyudev-0.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,9 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="qt5"
 
+# Known to fail on test system that aren't exactly the same devices as on CI
+RESTRICT="test"
+
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	virtual/udev
diff --git a/dev-python/pyudev/pyudev-0.23.2.ebuild b/dev-python/pyudev/pyudev-0.23.2.ebuild
new file mode 100644
index 000000000000..9fb12a397fe5
--- /dev/null
+++ b/dev-python/pyudev/pyudev-0.23.2.ebuild
@@ -0,0 +1,57 @@
+# 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_{6,7,8,9,10} )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python binding to libudev"
+HOMEPAGE="https://pyudev.readthedocs.io/en/latest/ https://github.com/pyudev/pyudev"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="qt5"
+
+# Known to fail on test system that aren't exactly the same devices as on CI
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	virtual/udev
+"
+BDEPEND="
+	test? (
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGES.rst README.rst )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	if use test; then
+		ewarn "If your PORTAGE_TMPDIR is longer in length then '/var/tmp/',"
+		ewarn "change it to /var/tmp to ensure tests will pass."
+	fi
+
+	# tests are known to pass then fail on alternate runs
+	# tests: fix run_path
+	sed -i -e "s|== \('/run/udev'\)|in (\1,'/dev/.udev')|g" \
+		tests/test_core.py || die
+
+	# disable use hypothesis timeouts (too short)
+	sed -e '/@settings/s/(/(deadline=None,/' -i tests{,/_device_tests}/*.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	optfeature "PyQt5 bindings" "dev-python/PyQt5"
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 02afd997b152..cf71e608c296 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,8 +1,4 @@
 DIST python-gentoo-patches-3.10.0_p1.tar.xz 10068 BLAKE2B 1c9817b449831559f0a0b722c02a5f55d94b3dfde98e5882c1403fe24a4addf7074ab39c09b91cff6fd7ace2e4b6e8ed899d9a0b9ffd6612ce315c4c192bd309 SHA512 39aa41dbf17b6dc5255491c75031a3dae6962b44125e426dbfdce365a6533c5dae9856b1fff8016a189124b7cff72d2665ce99da344c2f9dff005ba685e8c2c4
 DIST setuptools-59.8.0.tar.gz 2282358 BLAKE2B 2f1b49285fc70420e24f958c4955200ef0407a7f3aa52fd581a165fd47c7bbde8366c26963f1bbb36f0f77797c12cbb9016fdc69e1a5cc696bb67aacca16d140 SHA512 d906558b498bda8abf28831224502c6f0290a4cdbf087fe07af8321dba3dfd1e19fa5b4a820033e54c4561b82ea8ec54c287b4fd657892ed28c2a7de91a9107e
-DIST setuptools-60.2.0.tar.gz 2282807 BLAKE2B 97d54353050d4e8a009e617a112c23d70726ad00625994d78639665f41245cee6f92544d5d5fc9962841ac0b2db3302ebbf0b5c6ee8f544f003fa05358c7ccf2 SHA512 9c7185843ead283ef97311018f1bb683c2e969f0333d5b246c7f1687c5ec6a9d6a2dafc39540ea7354e969d5a3f84e74c07dbce010970dd0ed46ebb48300a0bf
-DIST setuptools-60.3.0.tar.gz 2283824 BLAKE2B c0e1ffb6c19fd4c85aed2878a95e23372131e5c069551b39af477c72d591608e73d1bd9710d34a8540c226a0dbb91dd9def170121672daf2928d039f589c238e SHA512 71c19147e8f34a5eb2c830ad0942bcb1a468a3ae07c91035fb19eb50d549dbc3b9e992dd2b654383843ac6ba088a46dedfe928850417da92c24f1c5bf3e8b6c9
-DIST setuptools-60.3.1.tar.gz 2284193 BLAKE2B 0138acaf830d7f29db95c759e60d77986113385b13e96446974b63abf3621db2d2fd033f0f45bf380b6cfb2066ed66ff008446ca595f741c3f5446107f2a554b SHA512 7a2434d857b2914136d5ec0a7b9fbd89352a5dd3452bf2e3f7c0e2ef7317b45a3cfe6d3921b7f61a1f0a99a7c06f73428f9871dac0d7ae481fa1a1a0b97042cb
 DIST setuptools-60.5.0.tar.gz 2292478 BLAKE2B e41b2717b34d454b3959ee5b6f4fdc70dfec13d97fe6962bd1c1ea2296be8ee2d27bb14ed2cc5e6fb9a757661a0415984b3cf7cf1665347c62a50965f651f9d4 SHA512 b2cf7d99e60d0c862a7a4fd8e806019db52502de48ff77556df26ce39a8620f476de767e2e8be8aa260366f54d1429db8a42d538345ec2cd2cfd5286e62e770d
-DIST setuptools-60.6.0.tar.gz 2292575 BLAKE2B 410f4eee4e83c14dd1ebc3ab103f9e12bc5092e2e82dece8e71e7be57abc3d41c50763560e94343fe5089c7b903fa223fdab9c9c4648f423fcbd525551c501ef SHA512 9c0bed3d5f3e051fc996c26c2bc8d7ba0193c119a98678c7ef38ee1fdf8b42e569995598e64b527b5c6f1b4c77de655d1d7bdcd526a6d90288fd34efca92ff03
 DIST setuptools-60.7.1.tar.gz 2358541 BLAKE2B b48443b95cbd3891ec93d743eb4177302df6742624ea97a97779dd3f101c089ed38ba41d2ff65d35d7e3646d50e62111ecbdd23da9a45cab956006c38d1a42d0 SHA512 cf04353ffc2b1ca30fb219f00265eb6f89330f5489e57997d6975725a19b1e037ab02b9b74a8fcdc84a6234349cfc64855ae57535e0faa46ce4b280a364bb862
diff --git a/dev-python/setuptools/setuptools-60.2.0.ebuild b/dev-python/setuptools/setuptools-60.2.0.ebuild
deleted file mode 100644
index d386091769f9..000000000000
--- a/dev-python/setuptools/setuptools-60.2.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# Set to 'manual' to avoid triggering install QA check
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-CPY_PATCHSET="python-gentoo-patches-3.10.0_p1"
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/jaraco-envs[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' python3_{8..10} pypy3)
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	# apply distutils patches to the bundled distutils
-	pushd setuptools/_distutils >/dev/null || die
-	# TODO: distutils C++ patch?
-	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
-	popd >/dev/null || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# keep in sync with python_gen_cond_dep above!
-	has "${EPYTHON}" python3.{8..10} pypy3 || continue
-
-	distutils_install_for_testing
-	local EPYTEST_DESELECT=(
-		# network
-		setuptools/tests/test_distutils_adoption.py
-		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
-		# unhappy with pytest-xdist?
-		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		setuptools/tests/test_test.py::test_tests_are_run_once
-	)
-
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" epytest \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-60.3.0.ebuild b/dev-python/setuptools/setuptools-60.3.0.ebuild
deleted file mode 100644
index dd205e3e9a0d..000000000000
--- a/dev-python/setuptools/setuptools-60.3.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# Set to 'manual' to avoid triggering install QA check
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-CPY_PATCHSET="python-gentoo-patches-3.10.0_p1"
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/jaraco-envs[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' python3_{8..10} pypy3)
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	# apply distutils patches to the bundled distutils
-	pushd setuptools/_distutils >/dev/null || die
-	# TODO: distutils C++ patch?
-	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
-	popd >/dev/null || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# keep in sync with python_gen_cond_dep above!
-	has "${EPYTHON}" python3.{8..10} pypy3 || continue
-
-	distutils_install_for_testing
-	local EPYTEST_DESELECT=(
-		# network
-		setuptools/tests/test_distutils_adoption.py
-		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
-		# unhappy with pytest-xdist?
-		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		setuptools/tests/test_test.py::test_tests_are_run_once
-	)
-
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" epytest \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-60.3.1.ebuild b/dev-python/setuptools/setuptools-60.3.1.ebuild
deleted file mode 100644
index dd205e3e9a0d..000000000000
--- a/dev-python/setuptools/setuptools-60.3.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# Set to 'manual' to avoid triggering install QA check
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-CPY_PATCHSET="python-gentoo-patches-3.10.0_p1"
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/jaraco-envs[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' python3_{8..10} pypy3)
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	# apply distutils patches to the bundled distutils
-	pushd setuptools/_distutils >/dev/null || die
-	# TODO: distutils C++ patch?
-	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
-	popd >/dev/null || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# keep in sync with python_gen_cond_dep above!
-	has "${EPYTHON}" python3.{8..10} pypy3 || continue
-
-	distutils_install_for_testing
-	local EPYTEST_DESELECT=(
-		# network
-		setuptools/tests/test_distutils_adoption.py
-		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
-		# unhappy with pytest-xdist?
-		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		setuptools/tests/test_test.py::test_tests_are_run_once
-	)
-
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" epytest \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-60.6.0.ebuild b/dev-python/setuptools/setuptools-60.6.0.ebuild
deleted file mode 100644
index b1057472f942..000000000000
--- a/dev-python/setuptools/setuptools-60.6.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-CPY_PATCHSET="python-gentoo-patches-3.10.0_p1"
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/tomli[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' python3_{8..10} pypy3)
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]extern ::' -e 's:\w*[.]extern[.]::' \
-		-i {} + || die
-
-	# apply distutils patches to the bundled distutils
-	pushd setuptools/_distutils >/dev/null || die
-	# TODO: distutils C++ patch?
-	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
-	popd >/dev/null || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# keep in sync with python_gen_cond_dep above!
-	has "${EPYTHON}" python3.{8..10} pypy3 || continue
-
-	local EPYTEST_DESELECT=(
-		# network
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		# unhappy with pytest-xdist?
-		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		setuptools/tests/test_test.py::test_tests_are_run_once
-	)
-
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" epytest \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-60.7.1.ebuild b/dev-python/setuptools/setuptools-60.7.1.ebuild
index fc3bbdb6a410..1f9e4759aa61 100644
--- a/dev-python/setuptools/setuptools-60.7.1.ebuild
+++ b/dev-python/setuptools/setuptools-60.7.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/stack_data/stack_data-0.1.4.ebuild b/dev-python/stack_data/stack_data-0.1.4.ebuild
index 53a00a64cca1..ae71c5e6fd00 100644
--- a/dev-python/stack_data/stack_data-0.1.4.ebuild
+++ b/dev-python/stack_data/stack_data-0.1.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~riscv ~sparc"
 
 RDEPEND="
 	dev-python/asttokens[${PYTHON_USEDEP}]
diff --git a/dev-python/typeguard/typeguard-2.13.3.ebuild b/dev-python/typeguard/typeguard-2.13.3.ebuild
index 8942521cf484..91ad194db46d 100644
--- a/dev-python/typeguard/typeguard-2.13.3.ebuild
+++ b/dev-python/typeguard/typeguard-2.13.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~riscv ~sparc ~x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]