gentoo auto-resync : 19:11:2022 - 13:00:31

90 files changed, 783 insertions, 1212 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 00ba06842e7d..d361b981683b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/autocommand/Manifest b/dev-python/autocommand/Manifest
index 63782deb9bc1..6abdd2a5d939 100644
--- a/dev-python/autocommand/Manifest
+++ b/dev-python/autocommand/Manifest
@@ -1,3 +1,5 @@
 DIST autocommand-2.2.1_p20211118.gh.tar.gz 22093 BLAKE2B 186062c0234fc0cc553c5d2a474a5fef46e0de25de8220228715265630fc95ed5f9b64321131322af71fadcc70ef79690652cd555a908b4e8628603a8ee494b2 SHA512 488228c7536f00ff9fbed99677440bfd7228aa64189bbcfb6aad7a92dc698d8283dfbd619ffeaeef883b0e600a90e2a0f56fa79958f144ce673dff53f8d59f89
+DIST autocommand-2.2.2.gh.tar.gz 22188 BLAKE2B 757fd96d0505466e7d3e371e13e931d0dd20d9b02da3e88c2bf85b1b946ef6c67fb14366856fe66c23adab5d635c4bd08d51acc7e55830636cce5aa0a0c265bc SHA512 5ed109db16a0e309ed5107b26db0b70ed8669d73817e82eb5a219650d29f53785aa1f9471b2ac71d21dbffc9f0a13ea0fdf69e63ab534fd84407a1d6741cf5b5
 EBUILD autocommand-2.2.1_p20211118.ebuild 702 BLAKE2B d2f27bc8796fad99781c28694abcec3a496f53e7b859b05d7336b45bc739443029f446d4b1e5c22c9c82fbcc83d883b95ca99d95847bffd21ee2b559594fcc15 SHA512 687c1136b7efd25161331c5aede215c0dc18eebc6cd96dcbb9a6e0a8725cb467184b94da1150c10b4300becdcba7c96dc12136a92b0630f3d982c613efcae8ca
+EBUILD autocommand-2.2.2.ebuild 628 BLAKE2B 40afc227cbbc513f76252e29b2ea6e179b7e40047550574f4a48dffae63d48d04f23fc418579ee6c379a66cfc4366670fac6b5bcda3b982f3dec9f044c152b7f SHA512 679dc9bec12c3899d36fe0edeffe83476aa397f1ff3522b7f6c7930461a3544365553bf19092ee81eff74358a7b77d2ff564684b2cad8f7d0abfef7e51077ccc
 MISC metadata.xml 400 BLAKE2B 95ed35eafef6d3e0b7535b90e4d3d6f4972ad285decfb2b8a74b118f30899aabf883399ece61272713bcea1a20d0dc56447fab6ac6c11b05c23f542a1a4074b4 SHA512 2d74432fd9281403f4ca70f5b44bdea14a87bb63f70b3b5a53cd4bd5ba1c9b8af64968e351b0605adaeec0bcf9424902c8df821606b54559b6932226d17e6405
diff --git a/dev-python/autocommand/autocommand-2.2.2.ebuild b/dev-python/autocommand/autocommand-2.2.2.ebuild
new file mode 100644
index 000000000000..6cae5f6f33a5
--- /dev/null
+++ b/dev-python/autocommand/autocommand-2.2.2.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_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Library to create a command-line program from a function"
+HOMEPAGE="
+	https://github.com/Lucretiel/autocommand/
+	https://pypi.org/project/autocommand/
+"
+SRC_URI="
+	https://github.com/Lucretiel/autocommand/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index e9c591158cb3..9ada312b9f06 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,10 +1,12 @@
 DIST boto3-1.25.5.gh.tar.gz 550814 BLAKE2B 85f345b635fe16a978853d21192f49804837b050539aba650195bf788c7912f8713aa3a826de6f5ae4c28c4c3795e7053a2105622757f3087579e827eda3487f SHA512 6f4cd909b7a6670f74df6c7cac4a140114a0e05f736ed23c5a53351c5c6505f02d40e81ad1314db86db67d16429b38f78708e9cc8ce2cb08f28742ec209c2755
 DIST boto3-1.26.11.gh.tar.gz 561018 BLAKE2B 3bd4ddd23d0752dcaad9795041658909f8df88eb75a89fd727866a25bd0e8a3106a497776c1be8e53274d85302d9185f9bb95b777efd89fed3f5a33edfe04fa1 SHA512 f31e15bf46fa4338418507840ac3961c06f3573502a71892a262bf24bfc38b4058888cccef1abc6e59859a9985f917c4463e698a1a92543519a8da3ff6221a67
 DIST boto3-1.26.12.gh.tar.gz 563006 BLAKE2B 3618532b3156029590dbfb9cabb62506bd1a945bac78cf7d4a4e95300ba6a4c9d2258801f8f69107670c57bada7cb2fb37811ad18db891c2b4d50dda257a8f28 SHA512 0a7d504bfcfd0f6c0a7f1ee799911e3828094d104472d150ef8ccdd8e0ecd10b25e88d845fe701bf2a93629bf0f71bf673ba07c469a76aa301fc5e9bbe3c9ece
+DIST boto3-1.26.13.gh.tar.gz 565005 BLAKE2B 445b5d49dec5983213166c1365a38f721d945d6ff32a2c6d2fd74bf87512d5a5d5dbac5379eb0f5da10744e7e4c3993f206d2f224c9fa09723c263c615183ad0 SHA512 ba2948cefd0bb8befbe0de5c082c0e7de6ddd44be1e05b245ab2b4cf7bf464ac1efa37c12a9ddd6aebadb6b71ec3b8ab6f7f3038c8d538b73ff0cf3b2e1a2199
 DIST boto3-1.26.8.gh.tar.gz 557012 BLAKE2B 211bb7441acc8b1f901ebf5251288dc7c9073fa6e34f5a34426424ef064efb0fb3031deaf48ef336ec43bb015f95f618598da43d12ec83cbf814e1b4097b28a0 SHA512 738190cedfb0b85d3a1e9558b03e7f2fb14e43b152bc9627fd95c8ecc4a0ddc17f4c87ccb6129c1fbf5f47db9eea4dbc5c2cfbb69b903bc6f3ff417ef86b6f6b
 EBUILD boto3-1.25.5.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.26.11.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.26.12.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.26.13.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.26.8.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.13.ebuild b/dev-python/boto3/boto3-1.26.13.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.13.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_{8..11} )
+
+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 71db6e711c1e..370ad9aec66e 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,10 +1,12 @@
 DIST botocore-1.28.5.gh.tar.gz 9842427 BLAKE2B ed185346c21eeb0d05b39b55e99e065d9a5448fbe8206de49b3c128d12f4aabe1f6258153710350783846d10e5e10a22ccf77f6d27345297ec64e7ce74e51b87 SHA512 8b41b79826a71ed31c27534129e959e0896d9f4cb1769b4f14f1760d173500563a579aa0e00aaff5058275d5b5e8b921fed34b12825cf16ba4e216b174e4bba5
 DIST botocore-1.29.11.gh.tar.gz 10660645 BLAKE2B 0d5f8a7e34f99947e1488b468699e682acf0077fcc9f3bfb87e00f4966571970e335964edeabb20b41e4f900aee8c5075a004e8e3b09ce7d04a38f4c729d3361 SHA512 f1e2d948b7123316084228b574c8d0a0cc7dac1e615edfc525f9f42e081bf87d107ec948b5f209a6013b37c0f9617d1e585ef602a1f76c106dbd2369ae6e4514
 DIST botocore-1.29.12.gh.tar.gz 10675051 BLAKE2B 8ccf2f7fe711556d05771712b365a5317aa386411b3a98eaf3240fe14b7f14f04974e2847dc3c49178f4c22a8add957f3286b75f96f10dc68f99e2260a2ade77 SHA512 8728ac25d6dba86d99998a336b17446f1b5000dab9e0f01e0bd61afcf9b806cb2fd3ac747119dac9a9b063463555cd977b2edac2a0b363b79d18ae68b1e8bdb1
+DIST botocore-1.29.13.gh.tar.gz 10704244 BLAKE2B 593fb236ac87e13fca6688e91ee680404506f308a312b35e1a92205b3e533c24fb9dd39a0eedbd64887128daf388607fdce74b439d0e3e1fa1df970e73b22c79 SHA512 673e7ec32cbfb4aff51ad0399ffbf51cafacd7d29f06769290a00284d54f43891d0a25dfef3d805b6808130cdafeebf07c0f4cec7ac614b22aa8daba1c79cda6
 DIST botocore-1.29.8.gh.tar.gz 10636661 BLAKE2B 3ebd9e5cb6cc1a9d4ddb877e806e0a845e6a19a4604b4489dbdb9a0f35251201de5d7062f3b0193db3e28f5170d8c3315fdc0b2bec7668a61880ff3e9305d3bc SHA512 c4a1a3993576bd0340de4eeb25e10650219e9d74c21f7e51e5298120bc92a8359143c38d5a991b940316fc5eac483e4e838298881a5c068fa91dc3ebf92a7f5a
 EBUILD botocore-1.28.5.ebuild 1801 BLAKE2B 224b9b1ebd6786f36115c25699b06ef4ace30f13c8c97fbac20f37ec3dec7219e89fae3fdc70ef2b808342e7dab564755b758952cd565f06ef68b1e387c1ee7e SHA512 f26fd77fbbc424dc20e7844807bb7650e73e989e15fa5c20c9733e3bc322f4a2fffda47fcd29f82490be7262648582b162f86b4951c8d338d9ebbb1312df8294
 EBUILD botocore-1.29.11.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa73a78b627988165703230bd47488a99b1b38bfbdf1dae735806a0de9ca9a17db8afb526121f8c5402e97ca659a6b9 SHA512 9aa2a546360c0bc286bfabb5adb2c95af40d4d405d89fc4186856814b9b88d158fa952d82fd42126876270615e88a24820ac61132e8fba8414db4ac01da2f72b
 EBUILD botocore-1.29.12.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa73a78b627988165703230bd47488a99b1b38bfbdf1dae735806a0de9ca9a17db8afb526121f8c5402e97ca659a6b9 SHA512 9aa2a546360c0bc286bfabb5adb2c95af40d4d405d89fc4186856814b9b88d158fa952d82fd42126876270615e88a24820ac61132e8fba8414db4ac01da2f72b
+EBUILD botocore-1.29.13.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa73a78b627988165703230bd47488a99b1b38bfbdf1dae735806a0de9ca9a17db8afb526121f8c5402e97ca659a6b9 SHA512 9aa2a546360c0bc286bfabb5adb2c95af40d4d405d89fc4186856814b9b88d158fa952d82fd42126876270615e88a24820ac61132e8fba8414db4ac01da2f72b
 EBUILD botocore-1.29.8.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-9999.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.13.ebuild b/dev-python/botocore/botocore-1.29.13.ebuild
new file mode 100644
index 000000000000..eed342eb3cfa
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.13.ebuild
@@ -0,0 +1,74 @@
+# 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_{8..11} )
+
+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
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index 61950808b1cb..39c9db2293ff 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1,7 +1,9 @@
 DIST charset_normalizer-2.1.0.gh.tar.gz 85498 BLAKE2B f18c491b7d2b32cfc3cd92b1dc074b89f562c11a1bdebb9d4ff7c230ac7c2394c6f7cb30caa8cde9d8da26f1ed527a01c28236099b793808274c1146f258546d SHA512 a14e9e1d58eb23c9c568e7e74ab88361f522a76575b5ddc30df392f33584c821cf4943029395d2535c641d8fe441256803e6d2212e52c6f4b0544db64bd73b7c
 DIST charset_normalizer-2.1.1.gh.tar.gz 86023 BLAKE2B aefd9b5f78a5c75701b4239d443f0ca2f6ec755703c7b51ddecff5bf014c7e9203650a5f09ac791b76793c6ef999c31236dceb6721e81959c5df40d70c7cb20f SHA512 77df5bdf9ca2f6b2594cc6a5ff54d1d50fd17c2175f96d6853ef6b3a48cdfc0d2852e1dcffc4814fa9bba30ebc3e26ce992c7139b6b21dfaf46fd9c9e8b0c95e
 DIST charset_normalizer-3.0.0.gh.tar.gz 88411 BLAKE2B f57f24e79da20a60570d5350bb848d77b2cf5980da00813f706b09ff691235473d955740d0575355da2d9c6e58ea69a441000c1429033cdb8478506f0580c26b SHA512 240589047b177b38b1f59723699cb8336ca43cabff8269e877f9c62430a3c3a8875cdfcf66a10801a33136279c5e0c150b873ff2b5f596b5dbb2049122e18fc2
+DIST charset_normalizer-3.0.1.gh.tar.gz 89120 BLAKE2B ce46758a0e188c2c3370e8cadcf35430e62fc7abb158d4c6c86b4a93a75b30fbff10b584ebaaf9489c47bdcfe9ad3b04d0fe3e474b03b89700364b676caf4e0f SHA512 9c78713b17e9e8d10b2ac8de26b8481dd039aab98eb990d0788f82c354afc8290040da1aa07faed6f90590fed098e793fdf2aa257825222e44571c1810f263ec
 EBUILD charset_normalizer-2.1.0.ebuild 833 BLAKE2B b4eae98442517b4f1cfecfa10d79d4fbc17adf4d11e4c08bbb4b1671b67d4fcdfc7ad08c0921b01f80a549de20b3df7d6a8d6ffe8e7a6908caa7ddf2930704b2 SHA512 3163ac5e95a9c4c4b592f6b6ce68db87c1ddca51d7ebe7e06cd124c76cfdecb2876e62b564088bbf5d6e0bfa3f4fb173123080002e51ef74769e511ff3f66263
 EBUILD charset_normalizer-2.1.1-r1.ebuild 833 BLAKE2B b4eae98442517b4f1cfecfa10d79d4fbc17adf4d11e4c08bbb4b1671b67d4fcdfc7ad08c0921b01f80a549de20b3df7d6a8d6ffe8e7a6908caa7ddf2930704b2 SHA512 3163ac5e95a9c4c4b592f6b6ce68db87c1ddca51d7ebe7e06cd124c76cfdecb2876e62b564088bbf5d6e0bfa3f4fb173123080002e51ef74769e511ff3f66263
 EBUILD charset_normalizer-3.0.0.ebuild 767 BLAKE2B 8eaac6a36db65d6f8632df3574ec961310000348a7d88cf5e3841673dc254406b9fd2fba8d0c02f6853566b3a502352352edb9c95a1cfd43100eba7a05d979ee SHA512 60a935aede02c7e3f2f26a4ae589644daf654d4b0fe050d19264e605a30edb3bff65ba8c504b6ad66551e9c21b6d1e1d425b4a6f8f0020cbe3411c2f13374a05
+EBUILD charset_normalizer-3.0.1.ebuild 767 BLAKE2B 8eaac6a36db65d6f8632df3574ec961310000348a7d88cf5e3841673dc254406b9fd2fba8d0c02f6853566b3a502352352edb9c95a1cfd43100eba7a05d979ee SHA512 60a935aede02c7e3f2f26a4ae589644daf654d4b0fe050d19264e605a30edb3bff65ba8c504b6ad66551e9c21b6d1e1d425b4a6f8f0020cbe3411c2f13374a05
 MISC metadata.xml 389 BLAKE2B 3bbd21163c92f582c6f19a38c41a73b96adc3e3a3e84ecad87127fd4d77bc7b90f225f3fee8c0799b212881b5890717e65c23e1191cf1ce6a524887a747c4cec SHA512 51d4143d0e35df3d828b8d907cd5420518664c540d059e73c4f91692ca810bc36ee31083eb5d234318d2233348429422f31aa276b605eb74a9a1adcca7a72538
diff --git a/dev-python/charset_normalizer/charset_normalizer-3.0.1.ebuild b/dev-python/charset_normalizer/charset_normalizer-3.0.1.ebuild
new file mode 100644
index 000000000000..d23e9f44b22f
--- /dev/null
+++ b/dev-python/charset_normalizer/charset_normalizer-3.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 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=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="The Real First Universal Charset Detector"
+HOMEPAGE="
+	https://pypi.org/project/charset-normalizer/
+	https://github.com/Ousret/charset_normalizer/
+"
+SRC_URI="
+	https://github.com/Ousret/charset_normalizer/archive/${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"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -o addopts=
+}
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 3c0010612190..0787cf2c445f 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,3 +1,5 @@
 DIST cliff-4.0.0.tar.gz 82758 BLAKE2B 47bc6d15426208c35582e852b7c52620b4fde292f2cc8bba1ba18ca01ef0cb3eda442ec406d2da7abb525fd659e055d08fa64c390a2274a8eea714489435957d SHA512 2886c2697c81c640cd3909c7e00fa50b0e39ed3824c8594d45af30e876cbfa73161be35c668c9bf964a5716bbb2b6e0cfef69526346e1d35156b5dbc24a7dc06
+DIST cliff-4.1.0.tar.gz 82892 BLAKE2B 2d4da66ca6ba86c9f0f33fa36f637363a25ac0ea5c7a1561a4e682769e7ecc97525fca93fde0597062e8f23c4d3334fbf08a305f1c5bb15918e5752a45992d0e SHA512 4bab3404207d21cf8111a6dc1a0ece2c8da5d3bf5ee261b351b7b7ade73f162c4cea225be6fac7444ae95de70d3079e727086fd954fbf56b6d61fb1c7eb4c44a
 EBUILD cliff-4.0.0.ebuild 1167 BLAKE2B 8112e1adc286394be327ff1b8518d06a665bb6ce66dac278fef8f24f5cfaedf4592b9a1ff05a734a2ece7f97ca54d04a050ccc152daa2e57ee53ec9aa14d0bcc SHA512 49df5cc5958ca2d6880be834ca2b32f299f01782f95f37fc121291aabf769c66a898fee027166540500c83dcecc96d62c204b2c73ecd18881cbf3e79befe204e
+EBUILD cliff-4.1.0.ebuild 1171 BLAKE2B 2a1a8b33053d5dc861fb8668fc8d099d95478f056ba5aaffb445d1f01879791220cb6c62853c4db5238529c7e24f1997f8975ebb8824af5192108da760f8d757 SHA512 c355ee124cf3ebc71028c2b0bf4a896c8d2c2aafb3c162ce8953f333272a28ee816cab5e83b51f77a2e01388382cf4be9c4d29de068b52410ea453d2503fc5f8
 MISC metadata.xml 767 BLAKE2B d9d994960046172167f20f59073011b2defe84e94144386db5465a973050e48e05abccff88d7f84cbe9f20615eddc5b61a46920f8b27c4dc9b2587f762f3e368 SHA512 018a0bfac3f0126341207d16203fab4a666b17d8a5dcf9f101335c396797f2e724e2250910fca39e12cb6616614983a756a42dac03aa215d2a1b51af5246269b
diff --git a/dev-python/cliff/cliff-4.1.0.ebuild b/dev-python/cliff/cliff-4.1.0.ebuild
new file mode 100644
index 000000000000..8bf1ddb73cae
--- /dev/null
+++ b/dev-python/cliff/cliff-4.1.0.ebuild
@@ -0,0 +1,43 @@
+# 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_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command Line Interface Formulation Framework"
+HOMEPAGE="
+	https://opendev.org/openstack/cliff/
+	https://github.com/openstack/cliff/
+	https://pypi.org/project/cliff/
+"
+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"
+
+RDEPEND="
+	>=dev-python/autopage-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 4dab5b28d242..5d096c0305dc 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,5 +1,5 @@
 DIST coverage-6.4.4.tar.gz 772949 BLAKE2B 87b4c51ac43ac3bd2202496f6db6de5c74dd9925521bf3092cd862b86d8d7c0e3d008ee550c90e890febd87cc4d167669e830668f15da94ef4ea72e82154bf26 SHA512 f210f2471b170e05d4dac2cc9a91e3f0d4ba6456cdf91dc1c0ef67a02a11f4279c5beca5df8854c42660346995492b1eff020e1ac578d2a0a129627dadd17114
 DIST coverage-6.5.0.tar.gz 775224 BLAKE2B 1ff7db1c72856553717d07d5a13443c210a3d85b3ce1f1eee802b986f71e3c13ac9df6bbca498fbeaa961ee33baab29c5e38f0c0e7b21c378830dfe85d797798 SHA512 4f2ec0bf69a83471a2b5a73b6a2212372ee6e32ccc4c72e0d33eef915939152f3213ab60e1a22ce2b72791e706c2223b0c81c87b95bbfadd1e828fa1a9fff120
 EBUILD coverage-6.4.4-r1.ebuild 1766 BLAKE2B bc03a444006297a7a5d10719b60f0f2c9e3517baa4536f4ee8ac390e3f643fbc60a2c6839c75ed59dc95315bf10f5127150e984680472ba1cb270eb317df8abc SHA512 ad862638ae24159c78edcd8dd7b59431e62ef7e50bc16eb22067aff0cd8c27ae96c034a8fae4a3a1f84d147311b33de08dba819462590256fe5aede95e1f05f4
-EBUILD coverage-6.5.0-r1.ebuild 1887 BLAKE2B c42061e654f62985d632de8e02fb39b1e67b8610fc005e0772bfd2e650f104695fc8dd59a4f66e37df3e5a63167cd90c6ae2cf7cfd657cf791be063b399a0636 SHA512 363d29518513828e3b07c72dafe1c89341e9b772b1505875b9e2534c1af12d1a41818b870c5e1f43dc39259942c2a9a519a51769c08493f2e451202a63be5d02
+EBUILD coverage-6.5.0-r1.ebuild 1882 BLAKE2B e458016cc7b5c08c0545f8f49379b41659f6bb83537a4cfce39b86c407ee2cdb3245c0d793afe4ec6b56a725f189bfecc1b5877397be75c08d50f88b05573783 SHA512 fd24bb24224cd1e13889c221614ef039aa1775f7945037df454ec924fb850a672209137001ba7681188b59b9095a652baa00e9193bcc0f387882df9bf439fc0c
 MISC metadata.xml 714 BLAKE2B c0d2641f795a21a80b6fa36206973f41421effe055e4c5e41bf752869759eb48e8fe42a0ab00af55b5d5111bfaccd330676d63e263013dc9bd3c344cb038a3a6 SHA512 412d70b7c9c2871bb93ae6ed6ae110a9f29c26957f6e1b24cc531c7d49f292ecb5206df10b409f2e44d2f814b119ef4ed973bca608df999026bda8df2156df24
diff --git a/dev-python/coverage/coverage-6.5.0-r1.ebuild b/dev-python/coverage/coverage-6.5.0-r1.ebuild
index ffeda11b21d4..fd68f6e786dd 100644
--- a/dev-python/coverage/coverage-6.5.0-r1.ebuild
+++ b/dev-python/coverage/coverage-6.5.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 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="
 	$(python_gen_cond_dep '
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 6230275a0ef1..d52c97374c18 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -60,5 +60,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD cryptography-38.0.1.ebuild 3193 BLAKE2B f42a5dd98deb51f1fd1bebcd1c7b9b0248f6d93e549db9318cfbb9017dfeed728c1073f3addf465abd2125dd1f10f6ad2eb3057fd8439c0ff5a8de11f7975887 SHA512 392fefefa77b56103b843239b959478909e92cb9f667c8b6f9e175a3375d917d5ef4c77134c585046f7847d6758cd07e7c1ea9bc1563d5130d92e5d84261b761
 EBUILD cryptography-38.0.2.ebuild 3200 BLAKE2B faa7d9fc8f709098d3dfccf11d234bf8a9d96a20a1814824719f14d7d46d95aef2605ac561d6bc55eb6f0d8cc67159bb84c59468e3a67327ca485d074fc14f33 SHA512 3c666509d1ffb0c675d65e2503818e78f89503ca6d71aa07b3c4832171df5d86717ba0836e70480c175dfd736f413246f8b1d4ff261125dc737e63dac25f6237
-EBUILD cryptography-38.0.3.ebuild 3200 BLAKE2B faa7d9fc8f709098d3dfccf11d234bf8a9d96a20a1814824719f14d7d46d95aef2605ac561d6bc55eb6f0d8cc67159bb84c59468e3a67327ca485d074fc14f33 SHA512 3c666509d1ffb0c675d65e2503818e78f89503ca6d71aa07b3c4832171df5d86717ba0836e70480c175dfd736f413246f8b1d4ff261125dc737e63dac25f6237
+EBUILD cryptography-38.0.3.ebuild 3195 BLAKE2B acfbd28931173b898cc62713dff1b646448166eb7222ca6669b85f8e82906b50691683600c2935be9837b1530250a246bbb23b17a83ad42975e248f6738f5183 SHA512 633aeded669c6f6004e599434ae08768e445f176b4dd01e832dbecf93b6522683a44352ef5094e6cb31a95ccfb62d8c16b2f47a84a092b151c7d4c36beead25e
 MISC metadata.xml 464 BLAKE2B 96c0bd97b83c9718910d129260402fdc37e88a96ac6002c8f6dd19fb21d6daf31211b83ff7423036811e27954811ebdc810c8328f18c620682bd9428f42ba1f9 SHA512 2f36a186bb195a8cbafe1d8dd6630fadf0ea56b22906ebaf3c90954adb8b66e1017f599169e2b1ca386e1113c1a6b834fff90f2bec527bed53f62985120732d6
diff --git a/dev-python/cryptography/cryptography-38.0.3.ebuild b/dev-python/cryptography/cryptography-38.0.3.ebuild
index 62f6288176c9..3b3971fec164 100644
--- a/dev-python/cryptography/cryptography-38.0.3.ebuild
+++ b/dev-python/cryptography/cryptography-38.0.3.ebuild
@@ -84,7 +84,7 @@ SRC_URI="
 # extra licenses come from Rust deps
 LICENSE="Apache-2.0 BSD BSD-2 MIT Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2o-r6:0=
diff --git a/dev-python/cx_Freeze/Manifest b/dev-python/cx_Freeze/Manifest
index c7d226c3d8a4..52059483a5c4 100644
--- a/dev-python/cx_Freeze/Manifest
+++ b/dev-python/cx_Freeze/Manifest
@@ -4,7 +4,7 @@ DIST cx_Freeze-6.12.0.gh.tar.gz 1483040 BLAKE2B 78faa77b7bd12344f601bcc5811dff43
 DIST cx_Freeze-6.13.0.gh.tar.gz 1486127 BLAKE2B f0f54db5ce6f0d8d70efc3321741a70d496773742505cf316646051c41154f9f11dba2fc964f6e16d01e2aa54ed2c9988ec006c3bbbf70b1e37f623aee0a061a SHA512 ed6a9607dd93bfe608036beae6f52a535c240fed222d5ae5da43037ef135cd9423e815066539f975facced221d466db5393bb207eadaec3654ed409c664c2f83
 DIST cx_Freeze-6.13.1.gh.tar.gz 1486207 BLAKE2B aa0151fed482714e41a859059f9672950249ad7fe50fa2accaa9d6af7ddc183a8f74d87337f274849a34a404dda0c732300343b58cd872f3bd03bf275c2f4d97 SHA512 48d569fdce5c6cb100232ce3577f0a55a40f3d1dcafa884a4d62af7f27200a21eb892504b47fb7cd106f410354b70d98a8e5245382431bc1f6d990510c77cb36
 EBUILD cx_Freeze-6.11.1.ebuild 1179 BLAKE2B 63fd22bdd45f3dab448c516205d16222cbadf7b4144c87800c8ab540cd6e132d8ef8e5f3c001c216c17f06caf18e4e20e74ca01a40533dfd4136434dcdbd2b3d SHA512 25ba7339735397d32d1c96c499826893ca661ae49daa544a28195038b82a43239789854e606a7cfe4795242b3204c943cca39f715010f1e0e264a8b4f5905e1f
-EBUILD cx_Freeze-6.12.0.ebuild 1274 BLAKE2B f89de13356f9b3bd6a48863b5a3927fb07f7e4cf1bdcae5d7a5b42d402b642f36cab779a42c1dcf16f8444a611278722ace3f596781bf95df3f5d0b1070d279b SHA512 6cc113a26520e6880898bd7b37cd9d59be14811cc62470e6f0c672b436b9253cac1669476bd7aeea3da94e8572c6326b899e1ec7ae78e7e9a54e20d52c1919fd
+EBUILD cx_Freeze-6.12.0.ebuild 1273 BLAKE2B 57171baad01762dc828aeb11dd999a550175d7684853d191bb0f40c23ad703972bd23b048a99fb6ea64154c21f8bca3585e3824eb2c8fd6fd74097dbf58ebd61 SHA512 161e7fc0aadcb4a5d73939673a6dae6295936c7754843a95fed0551ca98a17fb61e6a959cbf36ff5a495789541b94aa341fb5b4fb897a204d4ca4bab70d8fed6
 EBUILD cx_Freeze-6.13.0.ebuild 1274 BLAKE2B f89de13356f9b3bd6a48863b5a3927fb07f7e4cf1bdcae5d7a5b42d402b642f36cab779a42c1dcf16f8444a611278722ace3f596781bf95df3f5d0b1070d279b SHA512 6cc113a26520e6880898bd7b37cd9d59be14811cc62470e6f0c672b436b9253cac1669476bd7aeea3da94e8572c6326b899e1ec7ae78e7e9a54e20d52c1919fd
 EBUILD cx_Freeze-6.13.1.ebuild 1274 BLAKE2B f89de13356f9b3bd6a48863b5a3927fb07f7e4cf1bdcae5d7a5b42d402b642f36cab779a42c1dcf16f8444a611278722ace3f596781bf95df3f5d0b1070d279b SHA512 6cc113a26520e6880898bd7b37cd9d59be14811cc62470e6f0c672b436b9253cac1669476bd7aeea3da94e8572c6326b899e1ec7ae78e7e9a54e20d52c1919fd
 MISC metadata.xml 485 BLAKE2B 622c1dd3d46998fd3d1efa840e0f3b9af105d889b77d7ed779d5caacb384238a54e94c262ff15f4e09db710a44590cee03de6b2a749c24584060acad6925c445 SHA512 b5e45e9a331ffdfd888d5c5daed5658fb156f00a6974466c1b7a865ec7f0a8b839e1d7e4ffdc39903bea68eb9375a608c0094081f62097a7b3f92a7d2e8e370c
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.12.0.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.12.0.ebuild
index ee713d33b641..bb24d400330a 100644
--- a/dev-python/cx_Freeze/cx_Freeze-6.12.0.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-6.12.0.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/dask/Manifest b/dev-python/dask/Manifest
index 8e80655664f1..de01bf140022 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,9 +1,11 @@
 DIST dask-2022.10.0.gh.tar.gz 8778168 BLAKE2B d352f574cbf478747a95896c8b074c40c9bb413ccc6cd7b12d344b0dc7dc89bdc0613bf5b142e000b85f1c2a5a02e6eb8ac00b6db459a8580927cb4d7c54cf46 SHA512 d35ee0c710f4cccbdddca028a33f3f855ea26f94bebae1dd2a8c761cd0d116324daa03fd7fb5a4cb57d040f549f922b7373a0c089c9667b4da25fbb3b83efa02
 DIST dask-2022.10.1.gh.tar.gz 8781108 BLAKE2B 2030cf0670d054a222123ef836573ae7f5e574a879089a57b9a7730ae5cc33e43da2af3b470ce24174169f9045415cf71543aa05fd368b4471111a01982c5b7c SHA512 58b5515be46086a02a895f97db7120423a51651dcefef6f14d631a719e4faa0315b7a32640e4cd823064ae754319b84cc7c74bb4d4e9d904177816115abc48e5
 DIST dask-2022.11.0.gh.tar.gz 8223664 BLAKE2B d92a393877ecdc24ee20ada65f5a14bb6559c2b266f68a19fe30a8d18b63e543d0115d1a0d3bd3deefa476810722e37016be13035e097a7cc73f196c93052727 SHA512 e4294fa041a64227ecb40cbdb72b5c0f0a7f026ad51da37b778330b01a05a14cf5ab67feafe098388f40edb571ab9c6b688270063433567785048c477cf2a6f4
+DIST dask-2022.11.1.gh.tar.gz 8223813 BLAKE2B 1c7f4ed26022673ebb3a337520eee4cfb6c48449c06bfc1906431de6f03b4a4df313630326f96cf5ef8aefdc1306ded21158946997d9cf79153f7d83659575bd SHA512 c954de12d512e5be7d4891e9e702ae21c69e42be703e3859bb2d6893dd600fc7255ce25677bfdf9e119f84450510877ce018ac8ef425291fdf90c04af169e2e7
 DIST dask-2022.9.2.gh.tar.gz 8767605 BLAKE2B ad0d9b7f849f984316768f1d1983e13177c3263b6803ce6d861b15b8d88c21c7dce4dae917ca28f8688797573503c6fd518816ca7d993d67c56172ef2adc73ec SHA512 467411933432821413f8440e6434b18c2bf76c616a92ec990bc71c141ea2cab235c1330e888ed77f429b6d00d588042928cd3b06d9b693d51302cf8c114700dd
 EBUILD dask-2022.10.0.ebuild 1780 BLAKE2B 24148b6128c95f1b700b3a5f1d53cf1e05147bc234a7092d8d64991c99af531e18664e413d4c35124f6062a25f32da5112846297650c54d719f48a5aa7cd3761 SHA512 559f6e575414a68c1e2db39a355120abd40d60d17ac9bda60919d508e0414776c5a0abeea2e70adf6f19a6039edf101dd20cbccd9079b18cc2b7dcef9f6ad767
 EBUILD dask-2022.10.1.ebuild 1780 BLAKE2B 24148b6128c95f1b700b3a5f1d53cf1e05147bc234a7092d8d64991c99af531e18664e413d4c35124f6062a25f32da5112846297650c54d719f48a5aa7cd3761 SHA512 559f6e575414a68c1e2db39a355120abd40d60d17ac9bda60919d508e0414776c5a0abeea2e70adf6f19a6039edf101dd20cbccd9079b18cc2b7dcef9f6ad767
 EBUILD dask-2022.11.0.ebuild 1780 BLAKE2B 24148b6128c95f1b700b3a5f1d53cf1e05147bc234a7092d8d64991c99af531e18664e413d4c35124f6062a25f32da5112846297650c54d719f48a5aa7cd3761 SHA512 559f6e575414a68c1e2db39a355120abd40d60d17ac9bda60919d508e0414776c5a0abeea2e70adf6f19a6039edf101dd20cbccd9079b18cc2b7dcef9f6ad767
+EBUILD dask-2022.11.1.ebuild 1780 BLAKE2B 24148b6128c95f1b700b3a5f1d53cf1e05147bc234a7092d8d64991c99af531e18664e413d4c35124f6062a25f32da5112846297650c54d719f48a5aa7cd3761 SHA512 559f6e575414a68c1e2db39a355120abd40d60d17ac9bda60919d508e0414776c5a0abeea2e70adf6f19a6039edf101dd20cbccd9079b18cc2b7dcef9f6ad767
 EBUILD dask-2022.9.2.ebuild 1779 BLAKE2B 4dea87e8411ff0ecb0aa0f647a0ca84f6b95f3289be3e9cf232bb66108bc1ecfbda8327960712df44cbdf1dcc6713c1a11cc3294ac6d8df7a700de5c058d9fd7 SHA512 4de6ded112a26208ef4c4ac039a2aa55464a47431d48b040c198e0e3fba3dc167af2a8786220cc8b1744ee2ffcaa0869eba90c187f1c481aa89e2fc5604f2f84
 MISC metadata.xml 724 BLAKE2B 9af7553cec2b66228a21f146372d86b8d620048d68f94c1fd09006c8ee7ddaa4e212c2a359b937a5ee37ac23df01e10af0796e8b4cf952237cb4c73a2dff7ca0 SHA512 89b83402c13b06f7adf10cd1cc08b96b90dbc2ca3b5c0c6c422b6e2394e03fd51346306479557c11fcfdbd4a81a574890f2367228ea38531b5f05c02a30b8dcb
diff --git a/dev-python/dask/dask-2022.11.1.ebuild b/dev-python/dask/dask-2022.11.1.ebuild
new file mode 100644
index 000000000000..8f2f893b8e30
--- /dev/null
+++ b/dev-python/dask/dask-2022.11.1.ebuild
@@ -0,0 +1,61 @@
+# 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_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="
+	https://www.dask.org/
+	https://github.com/dask/dask/
+	https://pypi.org/project/dask/
+"
+SRC_URI="
+	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# another test relying on -Werror
+	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
+	# TODO
+	dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
+	dask/tests/test_config.py::test__get_paths
+	dask/array/tests/test_linalg.py::test_solve_assume_a
+	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>0-float-5-1-True]"
+	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>1-float-5-1-True]"
+)
+
+python_test() {
+	epytest -p no:flaky -m "not network"
+}
diff --git a/dev-python/ensurepip-pip/Manifest b/dev-python/ensurepip-pip/Manifest
index 610e87b313dc..8f170d64623d 100644
--- a/dev-python/ensurepip-pip/Manifest
+++ b/dev-python/ensurepip-pip/Manifest
@@ -1,7 +1,3 @@
-DIST pip-22.2.2-py3-none-any.whl 2044706 BLAKE2B 254427e593e44d9f1ce48276fd40f214e8ca9d27b6c31b7a6ed5fa4566df6b1f723215c6a1766a534ce18174f2363c383dbff19368d1b89f1519a53bebd34215 SHA512 142d3144c14b692c645613d98bf35dd91193128d5e21b61a8a702548f1247fac662499d6e39b65c0aa9a0444d2d92983fd8c410439796626485a4e1be99a102f
-DIST pip-22.3-py3-none-any.whl 2051507 BLAKE2B e9822b6154aed421066a1cb173f08281ecb4769136607775d6d5f75a038613899b960fe3cd4f0356d8d6b2b891b64f54f69eff46a2875ddca49200c1e4e88222 SHA512 4e71295da5d1a26c71a0baa8905fdccb522bb16d56bc964db636de68688c5bf703f3b2880cdeea07138789e0eb4506e06f9ccd0da906c89d2cb6d55ad64659ea
 DIST pip-22.3.1-py3-none-any.whl 2051534 BLAKE2B b15f5eac6b3d8d12b382aabfb7fc920bea564be7f9133050d7cb0b4627a92c1de19676dced6bcb79971701898bb1606f3ea1b44349ab35527de90936c0057c71 SHA512 f09c2a48e85108514c20fdc58466b9be6a9b7f234241ccd46e23249f690bd1ec03fa5e60c9df80f4cf31a9be64d7d59b2fa786c1d7779e284fec42b04bffc257
-EBUILD ensurepip-pip-22.2.2.ebuild 654 BLAKE2B f18d5964a7314be76d7445f5187493d135bab4b7d8a26326b044ab4e0fb136373c27f46d3132d08de7cf53b475cfd4d9f3a12f1ba943344a9d39b388633f9dd2 SHA512 0e3db321efe3784abdab74e682a479ee0f5bd5681c6ea36e7a1c8caa20adfcf1a090e8c5bbfb81cd11ea3972321162f425ef62b7e06ec876eb03cde028ef389c
-EBUILD ensurepip-pip-22.3.1.ebuild 662 BLAKE2B 1addda7174ad9464d074dd238c3e70a3f2a2fda7b754fb79f461a1ad9dc2f03871ec98a2432374a3e336b64d4fa50dc48faa4c6922d6e792e759e73a895560d4 SHA512 779467e32d2a2ba759b1ae03a4d649c704ac666a57f980c3e0db33fe9493e4f546d39ff0cad43d7f00ffe87592cba20bca8b70515cc12cfbdff5e666714009a9
-EBUILD ensurepip-pip-22.3.ebuild 662 BLAKE2B 1addda7174ad9464d074dd238c3e70a3f2a2fda7b754fb79f461a1ad9dc2f03871ec98a2432374a3e336b64d4fa50dc48faa4c6922d6e792e759e73a895560d4 SHA512 779467e32d2a2ba759b1ae03a4d649c704ac666a57f980c3e0db33fe9493e4f546d39ff0cad43d7f00ffe87592cba20bca8b70515cc12cfbdff5e666714009a9
+EBUILD ensurepip-pip-22.3.1.ebuild 654 BLAKE2B f18d5964a7314be76d7445f5187493d135bab4b7d8a26326b044ab4e0fb136373c27f46d3132d08de7cf53b475cfd4d9f3a12f1ba943344a9d39b388633f9dd2 SHA512 0e3db321efe3784abdab74e682a479ee0f5bd5681c6ea36e7a1c8caa20adfcf1a090e8c5bbfb81cd11ea3972321162f425ef62b7e06ec876eb03cde028ef389c
 MISC metadata.xml 309 BLAKE2B 197e5620aab85ff590270ae6838c9188cd699943af4c9c3eeb7de92c2e9390c082eec603e63bc2bba39477586f19e58da2e5fe2d5ffe9b59b87ae5386c939df1 SHA512 c678bc8fb62f6e6850939ebff56962503bb03393572cfff7e5f7d38e8cf5ca71d8e38e402355c5f963fb718eed24bca463d7c63fede5cbb550f6f32a9c06af9e
diff --git a/dev-python/ensurepip-pip/ensurepip-pip-22.2.2.ebuild b/dev-python/ensurepip-pip/ensurepip-pip-22.2.2.ebuild
deleted file mode 100644
index f502d3d7b09b..000000000000
--- a/dev-python/ensurepip-pip/ensurepip-pip-22.2.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=${PN#ensurepip-}
-WHL=${MY_PN}-${PV}-py3-none-any.whl
-
-DESCRIPTION="Shared pip wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/pip/"
-SRC_URI="
-	https://files.pythonhosted.org/packages/py3/${MY_PN::1}/${MY_PN}/${WHL}
-"
-S=${DISTDIR}
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${WHL}"
-}
diff --git a/dev-python/ensurepip-pip/ensurepip-pip-22.3.1.ebuild b/dev-python/ensurepip-pip/ensurepip-pip-22.3.1.ebuild
index 27ee812d0240..f502d3d7b09b 100644
--- a/dev-python/ensurepip-pip/ensurepip-pip-22.3.1.ebuild
+++ b/dev-python/ensurepip-pip/ensurepip-pip-22.3.1.ebuild
@@ -15,7 +15,7 @@ S=${DISTDIR}
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
 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/ensurepip-wheels-100
diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index e1a53e1a8c5a..07f5febab66e 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -1,3 +1,5 @@
 DIST setuptools-65.5.1-py3-none-any.whl 1232712 BLAKE2B 7ffda4e3e3e148a2ec55964ddb2a191710e6b5c8ec77c2f1af0cb2427992bce90c1fe309c916e404afe7cac8dcb87e8ef6351d0946432a455bdd91a9b6550884 SHA512 8fe0472001b1589caf81f1e0fe17777e524f003fc414d0a17a431209ba5aa8292741bdf13ae4346227afba2491099ea7369bf767ce621ef3fa38dda7b304b5c0
+DIST setuptools-65.6.0-py3-none-any.whl 1233669 BLAKE2B 7e373901fd822df571141422bb6ca308646383faff85d5e4cbae8907c1e7430045c28ac4b6492a12ca182122e83c8fbb8fdfa0c36d585166f9aa649b8b0d48cc SHA512 5184fcc94393b9f057bf49b5cc822304966c7e6391623b8c5de476f5c765a8d65e72c07a70422c6b7b77d634671808445c19e042cba9080f9d6f9c1a545e1bad
 EBUILD ensurepip-setuptools-65.5.1.ebuild 619 BLAKE2B ee5b00332e47f02390ebd2878b96dac800f2fe11f5357af2dc70ce13d6acc7c878883b444cf023c44a9f6a392d6a057b37f6b617150162d28cefe5951986066d SHA512 6cc9cdd806a12658a32f6d19693251e8a3b859c7a866c3e33f444903ffe060d448ac49105f04303f07db7dd2775324ec051ffac00ef3dd668580fedd5eb844c9
+EBUILD ensurepip-setuptools-65.6.0.ebuild 627 BLAKE2B f9effdc2c370edaacfe107c69a461aea1d737b5134c35647f4cff0919f577099ab7e59423f9eae9d0bf48bb04efa8ffae91a797176b485501ab68ba991a8e126 SHA512 79952939def604a65c67c39b61938c7c24e644c4c841c1d466a2a8d6030d4a942213365c7389612edbd43df5db0df113ea8f6da7b62ff5681819f0de9cb11c0e
 MISC metadata.xml 316 BLAKE2B 17947c657b45cb01758e222aa6051a459bf0bd9a026a73c0df0ae0c3a0c901f6e2315d459ee37036ecd283481a8d97791d64688c108a0706e745a739e3f9e8f8 SHA512 af18f4ae51b253552752e14210789988c815d0dbf0e1d8ff7057e48a09303c4abc1fb240d6f7f15fc0993b33e4c8ee395c2755754b3a2cbfd4c3a3f0dad41cfe
diff --git a/dev-python/ensurepip-pip/ensurepip-pip-22.3.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.6.0.ebuild
index 27ee812d0240..96c75c915768 100644
--- a/dev-python/ensurepip-pip/ensurepip-pip-22.3.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.6.0.ebuild
@@ -6,14 +6,14 @@ EAPI=8
 MY_PN=${PN#ensurepip-}
 WHL=${MY_PN}-${PV}-py3-none-any.whl
 
-DESCRIPTION="Shared pip wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/pip/"
+DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
+HOMEPAGE="https://pypi.org/project/setuptools/"
 SRC_URI="
 	https://files.pythonhosted.org/packages/py3/${MY_PN::1}/${MY_PN}/${WHL}
 "
 S=${DISTDIR}
 
-LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 67b65854ade1..1327b920b5c4 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,7 +1,9 @@
 DIST fakeredis-py-1.10.0.gh.tar.gz 88305 BLAKE2B 71ffec7f872c8021914e24ee83f250e1e27bf2117fabb3513b54ad635692f43cefaf565090d3829ee189844a83ccc517016d8a4f9c31da82b2188d8d951c4dcf SHA512 8fb32917c70931de50ef90526854ee7c0d888c04582a284864c19956868961cd689db0a7b3ad39e783f53741efde5a33cc600faf09fdeac7046fe29e9cd75933
 DIST fakeredis-py-1.10.1.gh.tar.gz 91420 BLAKE2B a88711b5d167aafcf6a74dc538b809a0410c60bff95c82fe81c1236b743d9fc0cacbc9057bcd5df20ed87b22c12b2e9346342e0991556caa51f4e88038fabcb5 SHA512 2a139dde02c00e516959173fbfe5ecae26d20ee56158de9ae7bc57360dabc58e4e919f11ba7979079019d981af8a2cbd17a1d8ac795003e26a7cbcbedd5588a8
 DIST fakeredis-py-1.9.4.gh.tar.gz 87232 BLAKE2B b02b14960071ed38f6144b60d845d31d0d102f4d061dd2f156610f90385f35ff3128ab293fbf24049fd1f18a7558e9e13cc2f7179230a9837313acb2a7121053 SHA512 2fe74c5cc798edeef391136f8b09a651381faa04b7dd1e5a07007e6f89596e45970977b435e6fbdad03b73e9826a439da2e105ca9592fb3733547789d106182e
+DIST fakeredis-py-2.0.0.gh.tar.gz 112218 BLAKE2B 9bbbf76e6fe00a42d25c1688654906a71b93e65a20f3eca2b7d9fd13eedd48251e832e550b37dc82dcf5e65c686c408b291ba60d04c707df7d7d7f396f00190a SHA512 e291782f27cdfa11520eef3b0bbd0d68ec7479a4630ad1e5a38d8d1d28109049fee0288e104e74f72caf9b04db553cc24f22843bd170d8bdb5efc47b8e9f5d6e
 EBUILD fakeredis-1.10.0.ebuild 2004 BLAKE2B 67f4176b7ce6141071c05d4f2ee007eb006c3c0a672e37980f56e027b0983effe2f317b2d03d8bdc35a680f5b274007ce9e0a18a40d409c4a9c2d35a045966fb SHA512 0e3f8edc71ce23ce6b28b63b80861eed4fec6f3c8ed8d627f9b6873b2a99af62c5e5c37796eb8fb7c46183a49311db21dcf6936bfee710ca4eda96eba8c4bae6
 EBUILD fakeredis-1.10.1.ebuild 2004 BLAKE2B f869cd6250a3913369e7bb3796ad47218c58f1d357ef7390f420fb79f9041dc90880e812b1ca0485485e74944e692e32d5b62bd81d29516f3a28d1d176a101d9 SHA512 692ea0c3c24f19cbbdeaa538626a1de4cafc65197769f815bfc9bc7fd44dbe38ddaf1f5844637df13df73682a19f698aaecb1b695fc7c2c7a71e23353e37e99b
 EBUILD fakeredis-1.9.4.ebuild 2000 BLAKE2B 85def0d73dffa271d589c38e6cf08dd8d9fdc0d091405edf8fbcbf316b24edeac4379c36ca9a71f9d8aea917a156a6e9602eea51de72c00869667f8a5bec32e4 SHA512 4e8a5134b8bc0926682f55a21b3305304dc65eb851e90d2317e4446e07d179896e2d30a8638c3c64ad4a1e93a4031c0a12b98f784067b22ce593f594a8e09a79
+EBUILD fakeredis-2.0.0.ebuild 2004 BLAKE2B f869cd6250a3913369e7bb3796ad47218c58f1d357ef7390f420fb79f9041dc90880e812b1ca0485485e74944e692e32d5b62bd81d29516f3a28d1d176a101d9 SHA512 692ea0c3c24f19cbbdeaa538626a1de4cafc65197769f815bfc9bc7fd44dbe38ddaf1f5844637df13df73682a19f698aaecb1b695fc7c2c7a71e23353e37e99b
 MISC metadata.xml 373 BLAKE2B 1de33db59658e6190cd0346be58208cae6c9143a52f49dc289e68aaa0d860b5bd68dfb54f2e0b005f60a67f5caa430e2ce94fc69e64bd27e1bbebb07ad29e602 SHA512 24bfcf4919363fef45c182b6de66221e580ee0e9e99ce46e91b767655dc0b6f8a9fa6c3512ba84d1040698c43a0b6a853ad8d63c1ee5fbc00a1d192defb24db5
diff --git a/dev-python/fakeredis/fakeredis-2.0.0.ebuild b/dev-python/fakeredis/fakeredis-2.0.0.ebuild
new file mode 100644
index 000000000000..a75d02ef0771
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-2.0.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=fakeredis-py-${PV}
+DESCRIPTION="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+	https://github.com/cunla/fakeredis-py/
+	https://pypi.org/project/fakeredis/
+"
+SRC_URI="
+	https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
+	<dev-python/redis-py-4.5[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin redis
+	sed -i -e '/redis/s:<[0-9.]*:*:' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# also lupa
+		test/test_aioredis2.py::test_failed_script_error
+		# TODO
+		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
+		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
+	)
+	local EPYTEST_IGNORE=(
+		# these tests fail a lot...
+		test/test_hypothesis.py
+	)
+	local args=(
+		# tests requiring lupa (lua support)
+		-k 'not test_eval and not test_lua and not test_script'
+	)
+	epytest "${args[@]}"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/flask-sqlalchemy/Manifest b/dev-python/flask-sqlalchemy/Manifest
index 5deaf45468a5..21ca31f44a1a 100644
--- a/dev-python/flask-sqlalchemy/Manifest
+++ b/dev-python/flask-sqlalchemy/Manifest
@@ -1,9 +1,5 @@
 DIST Flask-SQLAlchemy-2.5.1.tar.gz 132750 BLAKE2B 6378766e9ae5e697f9a0fe23471f0264e5ac1f4c824657e5197f6c35f9f12eb756528641c1078b1bf470170c557c3201314a80b922b4ab84e4664a0ccaad2a6c SHA512 5d483418204030837e62769d45c16af88c5be6dbafc7c340cc4e67ef1736ea5102f506156119864cd7673cf382b0d3f27050bda64273b93ef4805fce9e1a0f6f
-DIST Flask-SQLAlchemy-3.0.0.tar.gz 127234 BLAKE2B 97737e16e3929b4449b7c004463d5976263bebdeb4d06f93afc531ad10545f7648103ebdaf8792967d504ec4e404e5f0411397216944eff8deebb1a69d01efe7 SHA512 48461453555cc659b1f35ea0d255c080784222a51a90de1cb5761ed08f3fffa83b6647a7346b860f2354484496e6cdbf1420cb9f0405b128174e7e6f1e30cbbe
-DIST Flask-SQLAlchemy-3.0.1.tar.gz 128448 BLAKE2B 69294c328df5a6bd8c40b5bc74b411ccd616a926db55c579aa00f777b7b0a3e7045c719487c2d2cffaee804fbe4690e45cee06f9ec860b5ad75de62b1e1811e7 SHA512 5b4a79f700b6e42d4796d0b4c9fc9ab489cdbf7d0598f5df3adfa8d9edef8c9203ab3d53805c24764f7e9f2668b907af9782b51310492b21d355cb2440b3453f
 DIST Flask-SQLAlchemy-3.0.2.tar.gz 128634 BLAKE2B 0203de67bd4c3a61562ad8bd69b6be2826ce7a49b763f101b5455a8452a1950728dee4a6a627c82f6ef741f57334de41511675b254a8da3c334021fcdbe8fd63 SHA512 89fa71796efe53e993ef8fc264b04f64c3174cadc960a9e51944e4fe70513a1c91e244e55f70690623f1d7d6d7c215729581a6989484bb0369b4bb0e412f499c
 EBUILD flask-sqlalchemy-2.5.1.ebuild 770 BLAKE2B d197db5d301949b5ccb7a911fdc40d9a69a993327517cc41c08b0c889b0d0c68865234ef8953557216c7996ad83a73463a87db6f2fc9beed655fa6f26234e089 SHA512 77f2e0076a57ec17ae06a36a3a7304ed6a9cf12c4e74b50589c8be62ea54c4455ea34dfe032bb07d0a47ee39afd5e6260dc6bd4403e2fd49b193aed62a0cde2b
-EBUILD flask-sqlalchemy-3.0.0.ebuild 841 BLAKE2B afe4889881626035e8b07908a4db02f240229308b93f9cdef065b86f7854e8064bdac6d6b7c66e0b003cff5883382c2109208c234f3ea7a24009ae118feb5faf SHA512 1605c0c4fa2c432157c6c3f145f9c71ded809f499fcd930b4888646191f08f196d85ad5b92381f7ce555e488be67e637d837cebdc0bc273e79e6f8b3cd5b5fa8
-EBUILD flask-sqlalchemy-3.0.1.ebuild 897 BLAKE2B 29b4aa8c2344c6bf13f306f16f00f38e19a2726203e536b1027597de390ca9346c1a8cae23139d08c1ff3c2f3747375c2080556c53535adc5de7f053d1e63e1c SHA512 d285269ee19c0617d5047cba100d7d1fd049e6622a7ea1d419371ec211e8c6bb6ee6eb717d62ba206cd8ec7a1be3352bad6b51ec5807ca65b5d2dd3aaed57d2e
-EBUILD flask-sqlalchemy-3.0.2.ebuild 902 BLAKE2B 2791d0b1b317803cbd32dd5c61a79a35e4528375cacfa221716a6de3563efe314ec9c8c0dc1b2871e512e8e4b8f0f8a4ed0873fb757d9edbb2278722d69d62ac SHA512 4c097410adf279be379a541111c599f3243fc266484eb5716064a57d0eb06b87a1df3caad00bb32c88d5e1eeaee6eb5f2f0d66941838f4a99645bc2e4fdbcfd3
+EBUILD flask-sqlalchemy-3.0.2.ebuild 900 BLAKE2B bf0030a64d547baf823464c85b80ba036db635e80beb2b45f5990baebc4f19cd20a314006b30006707a5d5f82274a723fccf44de3c1034be8d48adcb68e23298 SHA512 4ac3baa7639dfcd6112ee3a0c16934a5e73a7415a0e0e1a0b34a5f3b1356ca364f6e2ef03ee8bbbdaeacb781ef0f342ffd390d14cd57e9c5173729ad408e7f26
 MISC metadata.xml 728 BLAKE2B 460134fb84c2af57ce63bfe8c25a248ae4fb8c97bcc669807bac949d4f8c33ad728b6757ee96abf36354e3e1931cad1fde4cb3d17486c98c93df3dfa178c132b SHA512 72190b1d84680e846b3aee8dba5e2e9d3b172fdec925b006b182e9f7fec62c45042b8549ac6c5c32e80b5f4e1ec34b08ba14d9719fbec63739c46b8bcb2078fe
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.0.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.0.ebuild
deleted file mode 100644
index ab0b0b8b3054..000000000000
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-inherit distutils-r1
-
-MY_PN="Flask-SQLAlchemy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="SQLAlchemy support for Flask applications"
-HOMEPAGE="https://pypi.org/project/Flask-SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/flask-2.2[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.4.18[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/blinker[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/pallets-sphinx-themes \
-	dev-python/sphinx-issues \
-	dev-python/sphinxcontrib-log_cabinet
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.1.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.1.ebuild
deleted file mode 100644
index 4f1c66408c0b..000000000000
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_PN="Flask-SQLAlchemy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="SQLAlchemy support for Flask applications"
-HOMEPAGE="
-	https://github.com/pallets-eco/flask-sqlalchemy/
-	https://pypi.org/project/flask-sqlalchemy/
-"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/flask-2.2[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.4.18[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/blinker[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/pallets-sphinx-themes \
-	dev-python/sphinx-issues \
-	dev-python/sphinxcontrib-log_cabinet
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.2.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.2.ebuild
index bba4a508aee3..796c98b64082 100644
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.2.ebuild
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.2.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/flask-2.2[${PYTHON_USEDEP}]
diff --git a/dev-python/hatchling/Manifest b/dev-python/hatchling/Manifest
index 70cdb0de0370..b93d9f3db996 100644
--- a/dev-python/hatchling/Manifest
+++ b/dev-python/hatchling/Manifest
@@ -1,5 +1,3 @@
-DIST hatch-hatchling-v1.10.0.gh.tar.gz 256897 BLAKE2B 87a15624018d9919f29304f44520649465514bc594d266c152d28c08b99635b6f2d9b2f0ef68604e4d497860162cf9224d68ac78c22291fb80585a341a5d9704 SHA512 afb7f634f819cb3b914ede5c818a587f4a75f3a2c8e753f265f973e9b7d9c53e030dfdfdc862fb5b44cbdfd2564b1b863e3f12d7b7a31b4b62f7e316267de9c7
 DIST hatch-hatchling-v1.11.1.gh.tar.gz 367624 BLAKE2B 006f9f9ab266eba7b7e489d4359a9ddb17a6e079c31e189662da8c4d090884eeae4bf108301d5c315d823e92cb813841e41211cc55618f4ee9109bccdde61e1e SHA512 7bdf5a2930950503dbe534f6ead724ed84420193ba55137600a5b98a085e94588e333bb5a14ad944746dc400522ebbea4849718686420fd6ed7de3d6e8852d8e
-EBUILD hatchling-1.10.0-r1.ebuild 2039 BLAKE2B 09fefca93c10d41870954d6cdcda97463e30c7f5bbf87c48469b83420cb35de8761adbd48e7d12ca579fbb191bd8dce43025e7aa7aea478c6682eb980e453757 SHA512 78374b7e80aaeae0eab064faf95db6224a46a00eacfd657b0aa1a9c82701eaaab351069bd02e61117ce4e95d11c3d80d2f0fe9841c74aae684f3738674f9a6c0
-EBUILD hatchling-1.11.1.ebuild 2090 BLAKE2B bcd3d25d3065cd4ddbab031c8390a4e8fd74003ef491f384d7809af875c2bcd3b4870256639ed1ece8cc307e2d604dab8210f960a5cbdb51f83df8b9d7612096 SHA512 e25eed96a2cbd215e7702c7bf70cb81f288916e8ba6b32b6fce11967b92778a65cb53508910b47b10d8a5c3ca779492a636cfcb137bab705050fc77c5be65307
+EBUILD hatchling-1.11.1.ebuild 2082 BLAKE2B 0f9d32f0b2ca899bb82c4d409b438345c9596ff2a87f789ee941ca0e31e03405755e80ef98e7fd9c0995083966db741f0a31e9d211a6f3c5f0c54b701848a709 SHA512 ab4353e61b1ac31137819b304eb2e1b2990cec970dedc401dd67b4bb46fbb60d3f1d7d3f00f4ef2ae773f674d94bdc1afe454a519742922787ca104f99fc088e
 MISC metadata.xml 365 BLAKE2B 5a40a6cf6df042e6e8387830babd0171c9d8bc5d490fe2175b83d1588d827e826b49044ef29de48553515996b742fc475bb9699dcfa8ec05229162b22e0ed317 SHA512 f11bb25bc12c2bb0b0a0a4691115b9a2af525d9e44b33e0d6db98c7fcef0b49b5989fb7574ee8b27bc88f1dd2543bfdd492a6614de172e2c4edabbee8bf6161e
diff --git a/dev-python/hatchling/hatchling-1.10.0-r1.ebuild b/dev-python/hatchling/hatchling-1.10.0-r1.ebuild
deleted file mode 100644
index 1aa4d2b9da8f..000000000000
--- a/dev-python/hatchling/hatchling-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( pypy3 python3_{8..11} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1
-
-TAG=${P/-/-v}
-MY_P=hatch-${TAG}
-DESCRIPTION="Modern, extensible Python build backend"
-HOMEPAGE="
-	https://pypi.org/project/hatchling/
-	https://github.com/pypa/hatch/
-"
-SRC_URI="
-	https://github.com/pypa/hatch/archive/${TAG}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/backend
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# deps are listed in backend/src/hatchling/ouroboros.py
-RDEPEND="
-	>=dev-python/editables-0.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/atomicwrites[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-			dev-python/httpx[${PYTHON_USEDEP}]
-			dev-python/platformdirs[${PYTHON_USEDEP}]
-			dev-python/rich[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x EPYTEST_DESELECT=(
-		# these run pip to install stuff
-		tests/backend/dep/test_core.py::test_dependency_found
-		tests/backend/dep/test_core.py::test_extra_met
-		tests/backend/dep/test_core.py::test_extra_no_dependencies
-		tests/backend/dep/test_core.py::test_extra_unmet
-		tests/backend/dep/test_core.py::test_unknown_extra
-		tests/backend/dep/test_core.py::test_version_unmet
-	)
-
-	# top-level "tests" directory contains tests both for hatch
-	# and hatchling
-	cd "${WORKDIR}/${MY_P}" || die
-	local -x PYTHONPATH="src:${PYTHONPATH}"
-	epytest tests/backend
-}
diff --git a/dev-python/hatchling/hatchling-1.11.1.ebuild b/dev-python/hatchling/hatchling-1.11.1.ebuild
index 20362b7c383c..62d54027328f 100644
--- a/dev-python/hatchling/hatchling-1.11.1.ebuild
+++ b/dev-python/hatchling/hatchling-1.11.1.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}/backend
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # deps are listed in backend/src/hatchling/ouroboros.py
 RDEPEND="
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index 4e406469241e..374fa84ecc62 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,4 +1,6 @@
 AUX httpx-0.23.0-cgi.patch 2002 BLAKE2B 3f7c7e2a85d812d1a6cbd96a21b5d9716581b59528f651facd1c1b4f4b692aef24c1e8ef8d90315dd34dfbb84914c2cf23dce95499f401ad333632d15a6bfc0b SHA512 26c02d8c7bd6c50c72533e114377950d3f58a1ebe23193d8d6424c03c5f0efafb2f81dc155b5c16572dacd71bb2ad2aaea19816982a61ee19f2b531192796324
 DIST httpx-0.23.0.gh.tar.gz 2160686 BLAKE2B 036c66b2c3f743cd069716297f331f0d75043a98180b9db3e156c5692ae8bf9c68d1db87169953a7f44aaf7ee8554d0166f70b508f77b7ff4b0ebc0500bc02ad SHA512 3cfdf2b3b2f15967a1eec0be05ed947c5e18a46576b68a9cbfd5147dfd4736cb7c389f5431732b93f3a11f3ec6c6f25f7cbb3d96d845f00b58e2b8dae047c1d5
+DIST httpx-0.23.1.gh.tar.gz 2161798 BLAKE2B ee01771377bbfebbc4a9346280c8d59508c78295e61b6f9d60a07099e44dfb0fc208d37b68f511bbbacb48438cf6daa73ef82d7a7ae75470409c8346ddad0ad5 SHA512 3fe280b6d3cb1a12bdd502e7bd432588375f9cebfcd9e071acb6e851866a56d84a715428599a297f5df43d73997b2a0c02ba1a12b3e32d292b2051161a350751
 EBUILD httpx-0.23.0-r1.ebuild 2240 BLAKE2B 008a5e77c120facb896e0d0249d07cd98ece5e03b27df435d6f85f510e699d592d19386a6aaf848b5fb7f9b3108fd8a59dea4e8cb914ed9604f7d93254502f69 SHA512 2d7190ff15fb361f7200f09bcabe8fa223b0cd40bfb27a3b19ff43eee2c0fc22a2b7f9ed36819c0f404d5d10fb75c3ba534188ba4d721b0240d78665d1a66766
+EBUILD httpx-0.23.1.ebuild 2127 BLAKE2B df12b5c1cde35a3059e461db0ad509226f599e501e5e47855e0828a608b6e07343f5329a9f7fd70e34a1afadf454b2b6625dfbb38fc8e249722c539bccad91c7 SHA512 f1d177cedfb773056fa9acd15b9b84c2234d1e2afaf1d2941e3558a00911995f277f0a02d56580dee05fd09274674771f8ca8b88940f6894af637fa162ebb598
 MISC metadata.xml 518 BLAKE2B 063b5b95529cd5a31aac83998c0acbdfef208c34e931c96ae8ee767a326301a597a8297514b5c97bef2b3b706b8938d38c0e5f5d752307a9dd06984792c799a2 SHA512 3a29dffa0f951255a67468b28917590d4108ca12e14af03bfddef80f6d48e266fcccdd991e778ab9e267c0bc76ff0017e07905c1f2f45dc440a9af89f6cae6aa
diff --git a/dev-python/httpx/httpx-0.23.1.ebuild b/dev-python/httpx/httpx-0.23.1.ebuild
new file mode 100644
index 000000000000..5ffaaf198d4e
--- /dev/null
+++ b/dev-python/httpx/httpx-0.23.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1 optfeature # docs
+
+DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
+HOMEPAGE="
+	https://www.python-httpx.org/
+	https://github.com/encode/httpx/
+	https://pypi.org/project/httpx/
+"
+SRC_URI="
+	https://github.com/encode/httpx/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	<dev-python/httpcore-0.17[${PYTHON_USEDEP}]
+	>=dev-python/httpcore-0.15[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
+	dev-python/sniffio[${PYTHON_USEDEP}]
+	cli? (
+		=dev-python/click-8*[${PYTHON_USEDEP}]
+		=dev-python/pygments-2*[${PYTHON_USEDEP}]
+		<dev-python/rich-13[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+	test? (
+		dev-python/brotlicffi[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/h2[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-trio[${PYTHON_USEDEP}]
+		dev-python/socksio[${PYTHON_USEDEP}]
+		dev-python/trio[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+		dev-python/uvicorn[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	if ! use cli; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/client/test_proxies.py::test_async_proxy_close
+		tests/client/test_proxies.py::test_sync_proxy_close
+	)
+	local EPYTEST_IGNORE=(
+		# TODO: package multipart
+		tests/test_multipart.py
+	)
+
+	use cli || EPYTEST_IGNORE+=(
+		tests/test_main.py
+	)
+
+	epytest
+}
+
+pkg_postinst() {
+	optfeature "HTTP/2 support" dev-python/h2
+	optfeature "SOCKS proxy support" dev-python/socksio
+	optfeature "Decoding for brotli compressed responses" dev-python/brotlicffi
+}
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index a57db9577333..67081ba4edd7 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,7 +1,9 @@
 DIST identify-2.5.6.gh.tar.gz 101460 BLAKE2B c540934d4a482521758a64a1eb5e84b346eef0e0cccecbb9ad06e53e4b6872acb9c6fc94fccab9b75a7cf5658af78ad319d808a17f7ec44dfd08ae9c9a3b9f58 SHA512 9a35eb42767b0d2365b8da7c5aa5d7644272de5b65a505c5876cce0781222d8e52937b5c2d5594e560c5ab2fbbf4329555df15443b8f6110ac48880691af9089
 DIST identify-2.5.7.gh.tar.gz 101472 BLAKE2B 519f35e08258dac5ff4b897f4ee55cf432641e57c55ff1d05d3fdf564aa7eed441ba839f222b430eae96f55a8e6a5d14a9c25fc78b3536dad59c3604a3bff7c2 SHA512 186a0c36e3abadd4b2db1439daa837fed55db706c4eb1821d9ecf1288cd667706b708e1251f84d67a480cdd28e6a57960443b707c327e19a9342f5e2afdb1a7c
 DIST identify-2.5.8.gh.tar.gz 101476 BLAKE2B 2b59ac3cb416c7e3d6bd4031bfed30594b9be70f94d1e0d8e9f436b76e9241cde32f847c0f6b40607d2cb37ff7d67270a35a4d22be4cd6b216324e4eba30f136 SHA512 b43b8ba50d4d58a6d82c99141c708a45317f64693aea567105ed7f3957446e00102ddd303120a9f1238b04b6e0655e1dd6f807f6d878e972c7967a510f8b24b2
+DIST identify-2.5.9.gh.tar.gz 101496 BLAKE2B 045e32b6aa84cedee100332c9b26d1fbbc32f704ef1048ce380fcc40c8a3fcf2e5c96db83058b04d7ead6dea0681ea114e6469d89aa7cd10458ce98cb3f77c58 SHA512 fdecd728bed3828d3a5465943b390ce3aab05255ba06249f462a2367dcd3702ef85fbe57e06562a951e3eeb24f7f417b04d54e30bd711802a8afe37c2e1eb1f0
 EBUILD identify-2.5.6.ebuild 588 BLAKE2B eff914d7f68c76704a11dcdbfef21c51f52f0abcb6d29f669ba173106369d2eaedc818e9d89ed2d35e765184b07fe471c3d9c86db84f0093ebe87e46bf951152 SHA512 2ff5036390cf415ad56c87cc4bc7e1c2fbf0992ebf92ef3cbdf44ed40832a0326bb5f946e4fa432d4e429f8b224c7e6b37fb3ebac56d2388201df754205bd42e
 EBUILD identify-2.5.7.ebuild 590 BLAKE2B 9903b2478df4f9ce56ff68e2877d9b8e5d86a814e3c021b0533f3db6a1aabc5709c5cda6a719e47126c1ffac7ef34bfac74531395e035055a856a9427b9ca179 SHA512 b9c852d73351dc0386609a4db9072467a47fcf768205fbcfdc7798d0acac40de383315a734547acf4b3fc46cc1c21c66fabc0d97583c2fa0ad946ad89551be03
 EBUILD identify-2.5.8.ebuild 590 BLAKE2B 9903b2478df4f9ce56ff68e2877d9b8e5d86a814e3c021b0533f3db6a1aabc5709c5cda6a719e47126c1ffac7ef34bfac74531395e035055a856a9427b9ca179 SHA512 b9c852d73351dc0386609a4db9072467a47fcf768205fbcfdc7798d0acac40de383315a734547acf4b3fc46cc1c21c66fabc0d97583c2fa0ad946ad89551be03
+EBUILD identify-2.5.9.ebuild 590 BLAKE2B 9903b2478df4f9ce56ff68e2877d9b8e5d86a814e3c021b0533f3db6a1aabc5709c5cda6a719e47126c1ffac7ef34bfac74531395e035055a856a9427b9ca179 SHA512 b9c852d73351dc0386609a4db9072467a47fcf768205fbcfdc7798d0acac40de383315a734547acf4b3fc46cc1c21c66fabc0d97583c2fa0ad946ad89551be03
 MISC metadata.xml 501 BLAKE2B da95534590927f7290f78f47e30484e3349c9058048c15522e7346a74d9a2c96141a18897b10b230adf966d3c237217ef1d2dcfe59814ccfffd58ab4c38c1ebf SHA512 8d78245bbd2e14016eb70f1d8f8d6129e6b265084f7da95bd915f01ce5af94f86bd69c33c1514195de70d0f834332d9ca968a18afb59a7016c8cb58681d04d24
diff --git a/dev-python/identify/identify-2.5.9.ebuild b/dev-python/identify/identify-2.5.9.ebuild
new file mode 100644
index 000000000000..8ce2bd5b0e7d
--- /dev/null
+++ b/dev-python/identify/identify-2.5.9.ebuild
@@ -0,0 +1,29 @@
+# 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_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="File identification library for Python"
+HOMEPAGE="
+	https://github.com/pre-commit/identify/
+	https://pypi.org/project/identify/
+"
+SRC_URI="
+	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/ukkonen[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/incremental/Manifest b/dev-python/incremental/Manifest
index e9cc02025fd1..bc5e7d427964 100644
--- a/dev-python/incremental/Manifest
+++ b/dev-python/incremental/Manifest
@@ -1,5 +1,3 @@
-DIST incremental-21.3.0.tar.gz 17058 BLAKE2B a6c49d15eb73abbab129e675d937e795a47aca10f74a8d5fc80ebf6575ca996cc7dc16aac9ca02c7a206cf8f59b239f3fc04fc00b28827d0a3c76a88189dabf7 SHA512 b8b50151cd2467e552d9268decadbb839b047cf58a450b72e0437ffc5f9af7d78c20a24193c0668cf48dd6264b852d9cee68e59529018e0ca07825e0c185d1e8
 DIST incremental-22.10.0.tar.gz 18305 BLAKE2B 8e3f19e1825c608d72259729674da2dfa5005a64fb336d3c2144f20fdfd40e84ce1988cb6e00c2c86412e48f71bf2c5bd0d4f226cb49b1ff8e799065dd9fda42 SHA512 23a7572db731d1dd9871d309a02f8a29a92b7f1d897e64a2fe053575e7b486ec87e54d5ae9658eb1a82f90ba36b1b1694b58a991d841553f6cb98983725a49c3
-EBUILD incremental-21.3.0-r1.ebuild 871 BLAKE2B dab0c91aff7a011352dabc9e3bf41406d60e5ad5e924c8aae5f35973feae497295fd796fc76321bd3d7c4c48e136c36c65b668b6d233f085a845d437934b6a4b SHA512 d348436bddd600283fb88a72d7858e9a1617544e0477748cdcc9cf001d9d7867e32232aa0fcc90c43f32fb4ae1572e7e628f757f099314c0198545e95eff33fd
-EBUILD incremental-22.10.0.ebuild 879 BLAKE2B 30bf67452a1e313cb24c6b82362919a56643c5b0a5473e094c51edcc37523846c68c50177478b6f81116a5e11aaa29e6de3e123500cd370e9afd2a699186a7c3 SHA512 7f29ca8950986c1794ac2a81e8d69b687f9ce40306128ac6f517779080c93fa87d0e13ba9b6fc4914ba09d96d7c6c965497aa6ef24ab4a2ab62c195ce922b136
+EBUILD incremental-22.10.0.ebuild 871 BLAKE2B dab0c91aff7a011352dabc9e3bf41406d60e5ad5e924c8aae5f35973feae497295fd796fc76321bd3d7c4c48e136c36c65b668b6d233f085a845d437934b6a4b SHA512 d348436bddd600283fb88a72d7858e9a1617544e0477748cdcc9cf001d9d7867e32232aa0fcc90c43f32fb4ae1572e7e628f757f099314c0198545e95eff33fd
 MISC metadata.xml 501 BLAKE2B b83d40e36b124d2aedb279a12ac7d1e4f43d4bf289211491fbf1b37232c651df27e38869269fc5bf1960f9a0f04524920839a1595a6b5a7beed5a50a5219b4c1 SHA512 ec1f4c5ee87bd2ad6c247fa182c2ea1d8d0f544308fe64afa925aada1200e0c0bb4955971e0d7a3a9a4eb25486b0693c499b64a6de1cefba2868c58e319967cc
diff --git a/dev-python/incremental/incremental-21.3.0-r1.ebuild b/dev-python/incremental/incremental-21.3.0-r1.ebuild
deleted file mode 100644
index 314d735f88a9..000000000000
--- a/dev-python/incremental/incremental-21.3.0-r1.ebuild
+++ /dev/null
@@ -1,30 +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_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Incremental is a small library that versions your Python projects"
-HOMEPAGE="https://github.com/twisted/incremental https://pypi.org/project/incremental/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( dev-python/twisted[${PYTHON_USEDEP}] )"
-
-python_test() {
-	"${EPYTHON}" -m twisted.trial incremental ||
-		die "Tests failed on ${EPYTHON}"
-}
diff --git a/dev-python/incremental/incremental-22.10.0.ebuild b/dev-python/incremental/incremental-22.10.0.ebuild
index f21ea148b437..314d735f88a9 100644
--- a/dev-python/incremental/incremental-22.10.0.ebuild
+++ b/dev-python/incremental/incremental-22.10.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-context/Manifest b/dev-python/jaraco-context/Manifest
index f338773f02cf..7d1c03260a81 100644
--- a/dev-python/jaraco-context/Manifest
+++ b/dev-python/jaraco-context/Manifest
@@ -1,3 +1,5 @@
 DIST jaraco.context-4.1.2.tar.gz 8315 BLAKE2B 7e8b74c087462401999eb672d922634fa7bfd4f26797a547a21e4f85b12d2e7c8ac208f55eb782a0d74dfffc09e1f5d730b34a25fb83d701e55501a574159dae SHA512 297271b3508e7e979125c6f03962aba0b932337d60b51c4e48e995d60528f4e8bf7e031a877e9c58d8adaf5e3299affe83e01d9ab266e331ce0a131c7b541ee0
+DIST jaraco.context-4.2.0.tar.gz 9308 BLAKE2B 047474e325846a5e01407cd5c6c64da4f7185d3a26b3664f06e3ca76bdb5989fd741a62ab32a667d56a80a4280824e8614cc64a27aa45f97f81d93c344f06f31 SHA512 829284682ead392ae7620c1881e89b7091e7ddc7c1d293c05792f7ce4276a5745554598a222a52ed93a7b2b401d20f3d066cfd32de65ad2f0f3c8c5f5cd2c75a
 EBUILD jaraco-context-4.1.2.ebuild 1338 BLAKE2B dfc304de586f7485722c3ed6f004545ff08502d756e08f3d5d830d3f2dd70487ac67e3d6ca813906c557c7f18eea670320aa5cdeb3f68bcade1e64c6d756813f SHA512 e97fda252c4999c44a0e13a0063b97c29ee607a4691f4028ebf47f1abd9109753c7c1ed60bfc197b9fa75d8ae4c0b2644c45081b76aa11c9f762c1084b9b8d55
+EBUILD jaraco-context-4.2.0.ebuild 1392 BLAKE2B b566410574949a641f75c4be38fe39a643978df96d5452805f52d10f745d40207a450af7bf111e24af05041fc4ccae2554f120636713d776d03690420d468537 SHA512 07da399e6e59ade7ec9034c615c10868877f0df04afbc850018bc088014bedf16cd164259b97b2478cf9b7e8fce718d276c1fb07f5588cebb3b340e6012dbb82
 MISC metadata.xml 342 BLAKE2B 814e419c25d4719a2cd0ee3f8d9d5e82f594fcf1a88fc6547a7b9e0f893451be84b099b35d32536fee97c6ecf401e7b93749968ab4ec5e67d352e4ab9777ee34 SHA512 958abf9745fd7fc9896bad75cb4802b9056e023d854ec3539568ceccbbc4f246327ad794999d083ccac5addc98f56e1bd20e2d705a34c4bab3035ca04e93d63a
diff --git a/dev-python/jaraco-context/jaraco-context-4.2.0.ebuild b/dev-python/jaraco-context/jaraco-context-4.2.0.ebuild
new file mode 100644
index 000000000000..53cadb9c3a37
--- /dev/null
+++ b/dev-python/jaraco-context/jaraco-context-4.2.0.ebuild
@@ -0,0 +1,48 @@
+# 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=flit
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="Context managers by jaraco"
+HOMEPAGE="
+	https://github.com/jaraco/jaraco.context/
+	https://pypi.org/project/jaraco.context/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/.}/${MY_P}.tar.gz"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "jaraco.context"
+		version = "${PV}"
+		description = "Context managers by jaraco"
+	EOF
+}
+
+python_install() {
+	distutils-r1_python_install
+	# rename to workaround a bug in pkg_resources
+	# https://bugs.gentoo.org/834522
+	mv "${D}$(python_get_sitedir)"/jaraco{_,.}context-${PV}.dist-info || die
+}
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 70cb4ce7abd2..9d55e5c6d275 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,9 +1,7 @@
 DIST keyring-23.10.0.gh.tar.gz 47127 BLAKE2B 1179cd0b835d2c394f9649782c692ff719d55ee15e975266951df356f97d946a0d7270e454bcaf4dca902ab511d90460c935369773ddf8f553835e0a83123479 SHA512 74d0049b300c2740b00d89de1a9688fc5901006d1d499af9a33f6f12d8634b749450d2527420404086ac7ec7606ca9fad4cb002fd217dfa82ccef173aa8e61e9
 DIST keyring-23.11.0.gh.tar.gz 47229 BLAKE2B cb5f4a771bc94db058d5783e6bcfc84a29359d8445f55a38b125fe5e751a7e13ce54533fcdf7ab47b50f5fb37a20858c4113ad7ec683b2123f136a7059763bff SHA512 8f200455229ef944729bab557845b2e4220fdd5146d3610105c907fe14ae4358ce85fab0c63c2a0598968871fc01e8b564c8e4d436930f3d39f11e93ae0b209c
-DIST keyring-23.9.1.gh.tar.gz 46768 BLAKE2B 4b1acd33f53244a8932efbd54a8edc065071cf2ce2049d590a7804b171b90719fb18d982aa7bea217f76beab80e2cce5d4ff4f5440d23342879aed5ee79d7c82 SHA512 e384c4e592b2c4b9b6505c1fe22d9192c6d577add52e874490833dadaf1aba9dfc708593762471de0f5995bc6bb35f61ba541590a152528b489128fca629c623
 DIST keyring-23.9.3.gh.tar.gz 46913 BLAKE2B d55425c8e18f65362aab531b707e261b0990ab9c4f890286a63964fd2b29380ad9e2c19eae4c723848e3fcfff0eb6d3dcd4377e7151fa2dc5731987f2b468121 SHA512 8ee5da4f464fae90237f246037e2c675740dfda4945d6afcf2e5a4fdaf076766442590db92f9d32bda2dc820446a95a6e8ee3ccbccdb9c09e6c71bbd0e52f5b1
 EBUILD keyring-23.10.0.ebuild 1261 BLAKE2B 70abd801d8dc9ea52709ac35074da87e29248ffc11a020c89b71c63d90f5542c4708d8d3201ceca6b1e95a72679a2964ee381f465d4bdc9429af934593bf03aa SHA512 c75a0c8924d213728dd6e37d1d9ed6e3eeaed53d5bbc912ad2744679c382e8050be7fb1a9c64e4cb5c82ff15939564442893355905d8d37dda73cdc7831e88a6
 EBUILD keyring-23.11.0.ebuild 1261 BLAKE2B 70abd801d8dc9ea52709ac35074da87e29248ffc11a020c89b71c63d90f5542c4708d8d3201ceca6b1e95a72679a2964ee381f465d4bdc9429af934593bf03aa SHA512 c75a0c8924d213728dd6e37d1d9ed6e3eeaed53d5bbc912ad2744679c382e8050be7fb1a9c64e4cb5c82ff15939564442893355905d8d37dda73cdc7831e88a6
-EBUILD keyring-23.9.1.ebuild 1196 BLAKE2B 7d2f2f2a4882d589ab30a8f790400ce677967ff48e9c6943ed5a5f8eab48c140756fe6f8bc7f9bb068d76ebdbf9eed8593c3ef1e5f0ce14938d5a42518226c21 SHA512 5a884c745d5a228d19a175d8fad76fb749a04fc5fccceec4c068719ffebb9e0455a8904c0ea28c435780389986eae0cc5f44fce1c40286bcd48d39e021b9363f
-EBUILD keyring-23.9.3-r1.ebuild 1248 BLAKE2B 0c7e9b679ff2cd25a9b055684a2b94e28ff5c8510fd4e756bdd595264dd89734187e08a64bc8b2ec25b1ffde0ea7ad3ca1a57bb545050abce72248b38f8c692a SHA512 594ce9d4271d6b19f2e441c095213f797d5b7685ccf1a351902586811b1d5a046a9fa94e5f14d489f816c36d40f8ab4b5f4da567f371fdc9acad73768f3ca1db
+EBUILD keyring-23.9.3-r1.ebuild 1241 BLAKE2B a0342e09a7a9aee90367b13c3dbe726b4e2536c5719bc49ca4bbb0f9530491ca06bce7d1c0b64fdf9680097ce948cec8da97e6e8dfaf966f447e65cc57e5ec9a SHA512 97f118060a04d03471c4d127784a815680d3a55ba27d4d15c80d1519d9afc190f12d8018e77c43add1f4ac6d593eadffebce5b39fd7ac731d81bc57abbc730f2
 MISC metadata.xml 611 BLAKE2B 7f938075d992467e01da200f0c859e9bc6a6128296151b3529b2168b68364605bd7dbadf69f7820d459d5db6950908e0b0acb09a636f1fc45862093df6d08334 SHA512 a0ad1729c53b18fedf227053648b04541f5adcf56bfaa73218e214f8c2409ebe2574a5917442c5218084b38da34691b6566f2c65390ef6487985a123f62f9efb
diff --git a/dev-python/keyring/keyring-23.9.1.ebuild b/dev-python/keyring/keyring-23.9.1.ebuild
deleted file mode 100644
index 0117af9dd0a3..000000000000
--- a/dev-python/keyring/keyring-23.9.1.ebuild
+++ /dev/null
@@ -1,51 +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_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="
-	https://github.com/jaraco/keyring/
-	https://pypi.org/project/keyring/
-"
-SRC_URI="
-	https://github.com/jaraco/keyring/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
-	>=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-EPYTEST_DESELECT=(
-	# this test fails if importlib-metadata returns more than one
-	# entry, i.e. when keyring is installed already
-	tests/test_packaging.py::test_entry_point
-)
-
-EPYTEST_IGNORE=(
-	# apparently does not unlock the keyring properly
-	tests/backends/test_libsecret.py
-	# hangs
-	tests/backends/test_kwallet.py
-)
diff --git a/dev-python/keyring/keyring-23.9.3-r1.ebuild b/dev-python/keyring/keyring-23.9.3-r1.ebuild
index bc128f0e248b..a2b812627da3 100644
--- a/dev-python/keyring/keyring-23.9.3-r1.ebuild
+++ b/dev-python/keyring/keyring-23.9.3-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 4bac6fab510c..b65a34ae3396 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,5 +1,3 @@
-DIST more-itertools-8.14.0.tar.gz 102642 BLAKE2B 8315bf1d5c2096ae2365a8212bed790b1e443e31a17a3a094f3bbf2b85feb71ba15a79489473a53af6680db3d8dacc54849769db8ef43ded6c5b3f44767c4213 SHA512 a85ad9359ddd65caa81b743ff342c3917420d57ffc53b130eaa2d049fc90b55e0e00f12c878b49eb5f882b62e3a3b2a4ea04677c4e959958eab89aa5dd26eb0d
 DIST more-itertools-9.0.0.tar.gz 104237 BLAKE2B 523fe14889862edc2f05da79156914e12984d62168df46630fbe3169ebbe48ba66e018a65bd17dfad54676e5334335dbcda5c442556970442ccc2a792940bcc4 SHA512 a1e73a7a3e4530d070d639baa01c08d91ca11cdab6fec36131764001c2b78f1649e19ddf78ee3c1295f2f9d9951ea7483a4fd1f7c12d5655c3b696db7de35c1e
-EBUILD more-itertools-8.14.0.ebuild 811 BLAKE2B 76c933f588077a282e7c0473918aa2ea821117b71d800f29da1c02c93e54d2a922149c49fd1a46b056d9a10f45dce80873223dfd083417f3f503f85a56d27627 SHA512 a985e7a6754b20b156eeb5746a4ad88b426efcca0e3ccd8b2386bcf9a8e6ddcb1b74db3e66588c995699e592c7a69981d65f1a79b051677ae53a791bd188c0fe
-EBUILD more-itertools-9.0.0.ebuild 819 BLAKE2B 6d9d5596cd54586b7471545484062bcc6d26111c1d72d3cb88ee3cfc1cc592c38a60f3acafc6dee5382a565dd869d9954d46dd37cbdfd6d87efc12acf5739f8c SHA512 3dcb0ef2b1cd40ab24deb2b9a0bbaaf537dfdf5a70fe688925210495a42079ee618f14cf29668d1a27bdb7db34896e9dfee12cdae750bd0aa7765a992933926a
+EBUILD more-itertools-9.0.0.ebuild 811 BLAKE2B 76c933f588077a282e7c0473918aa2ea821117b71d800f29da1c02c93e54d2a922149c49fd1a46b056d9a10f45dce80873223dfd083417f3f503f85a56d27627 SHA512 a985e7a6754b20b156eeb5746a4ad88b426efcca0e3ccd8b2386bcf9a8e6ddcb1b74db3e66588c995699e592c7a69981d65f1a79b051677ae53a791bd188c0fe
 MISC metadata.xml 488 BLAKE2B b2b63c92548ad22348cd8801eacf52c7cb9e7eae7f3db303986891d6aa0e69c28aadf815aab089a199d6238b00da43f609a5e1f0b730bbce6cce7f76bd57e6a6 SHA512 d8ee6881bd90416c5e3aaa68a3158675d3e65fd786f70287d12a2bc6d79e7e5e8e16f291d0c6d673f8c1d182953ccbee0fb4fd80faf9fca6176a16679f334070
diff --git a/dev-python/more-itertools/more-itertools-8.14.0.ebuild b/dev-python/more-itertools/more-itertools-8.14.0.ebuild
deleted file mode 100644
index fda8ede7b374..000000000000
--- a/dev-python/more-itertools/more-itertools-8.14.0.ebuild
+++ /dev/null
@@ -1,25 +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=flit
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="
-	https://github.com/more-itertools/more-itertools/
-	https://pypi.org/project/more-itertools/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests unittest
diff --git a/dev-python/more-itertools/more-itertools-9.0.0.ebuild b/dev-python/more-itertools/more-itertools-9.0.0.ebuild
index 1857cb45c541..fda8ede7b374 100644
--- a/dev-python/more-itertools/more-itertools-9.0.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-9.0.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 1283c493f5ab..db70dad169ad 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -14,5 +14,5 @@ DIST numpy-user-1.23.3.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0
 DIST numpy-user-1.23.4.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
 EBUILD numpy-1.22.4.ebuild 5017 BLAKE2B f96fc50d46976f644412066a0ca32f3f6cbe68e3af54076bd9567a827d2929cc5789483c54656f51cee2f3153f28382a3901ad0a79ddaef84e552be2ebe8e961 SHA512 368980e6e319284d242669515c225766c56805f95d53ee259b0e88b394132a9d1b0fdaa58c0577c5e12a9282755ce39701f6a8d463792d7a5cc0dd3d3340c6c6
 EBUILD numpy-1.23.3.ebuild 4896 BLAKE2B cb89f6fd839ea412a25830cc3c94f5b3faa6fc7b2db52ef9d7e5852ccd1825774e1d9df8de918bb0113877bc4a3d8acf56de5c74073db54ef9a7914e550fa61e SHA512 634586d63cdd62f6286a54109b2ca1e699668e8698ca4e21ee9e6726b2f46f2b47304036d3c87177b415c5657a0385792aef0c6a53da81364b9ca6a25a5af520
-EBUILD numpy-1.23.4.ebuild 4904 BLAKE2B dc24a0d2a22d985086a49bdaf0333cdae749fa6ea344252636eb0279dfb6a706cf9574cff1529b64918bc99b0bf0184f76fad4228aa25df22c34dae8ac328a73 SHA512 c4771518334b27985b86b1fc41d322e4523b8a35309052a07a506400b1355e48abe88667550dd69e8c0e6fb9d6481eb1c24cd6edd1aa08b603dc1bd433de087e
+EBUILD numpy-1.23.4.ebuild 4898 BLAKE2B c8573fa85c91e644314fac57ae556685454a8e804455f0640c04b9f5eb8f9a78cfe2a02b4ca0e855c67f3f10e7ca745455f9cb9cafc528c15c73882599df3c98 SHA512 1e827f7e623770ca6b8b8d564850285fa4942dcd61bf0c42b02bc3bba06a08c3ddf3c3178ea006c3425d862c65fb51b882529fdef8ebdeeb53c8b921ee9dcdb2
 MISC metadata.xml 932 BLAKE2B 7a4af31f613bab05ff542da48bf6ff1484d9df2459f559516e71329451dd739d3df0fead507c8033d94ab9ed516b68efe7f21819a8cd6ca303643d8c8bc34e86 SHA512 32cb8c1ab61521a02cbec38f6ea383f074e50d46aa3462ddcb85710f9d348e8e628cf2a5725e3cd921cc32f02885a1b5f02125639f0ec885384eeeff7f468a06
diff --git a/dev-python/numpy/numpy-1.23.4.ebuild b/dev-python/numpy/numpy-1.23.4.ebuild
index 18d0a7787bc5..21f49e0dfe09 100644
--- a/dev-python/numpy/numpy-1.23.4.ebuild
+++ b/dev-python/numpy/numpy-1.23.4.ebuild
@@ -29,7 +29,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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest
index 184e2e58a0ce..47ec1f2595a0 100644
--- a/dev-python/pastedeploy/Manifest
+++ b/dev-python/pastedeploy/Manifest
@@ -1,6 +1,4 @@
 AUX pastedeploy-2.1.1-change-sphinx-theme.patch 752 BLAKE2B fc381dfb1ee909471b89413a8e5b8f68876cc66615776664e8eadbaf15833b36c9799139db15fe551c9cd7d50fe305e13d104d4a2dc1176eb7ba576b0cc7cc05 SHA512 479d0e34f2d86254855335874499eb5bff2151a2f08cd04f021976933441005062670487108374ec24084dd8ea7881cb69938c61fd7a28ded53a32bc0e5df972
-DIST pastedeploy-2.1.1.tar.gz 32339 BLAKE2B d11affa480e5c9b7be53d0431090e4ec9d66f8862b1aadf6a993a09f9c952380d7698eaa7442614936a8316e2ac50404a096bf64bb3ef31f55cbee35b5982166 SHA512 0109e30cb5ae9bdd7f06a79f6236c90f96c3bcfe507258572b1329796a1821486d9762d954673ccbac76ee63c6a69e64fe5e2cae5402fecf4a5affe88cf46930
 DIST pastedeploy-3.0.1.gh.tar.gz 33420 BLAKE2B d96e9429852ce2f6b82aac834c3a1da069f02d542f7379935e42a9e663cdee807230bbede3acc03fb5cccc3b4462d3f3afaa84eec09225bbaffe6ece4534f3fe SHA512 2b06351b9104da1e0d30c90492ee31113aacf5cde7a66a34482c4625af902b855eab2af80073db4eb18805a192f858dac360062dadf58a161cc3cfabf5b67a1a
-EBUILD pastedeploy-2.1.1-r3.ebuild 992 BLAKE2B 71b2d8fb06be52e58f05f6d7a51926b934be953224fe68ba2aea95ae5defd82fab3cb0ca086f1b1e86a26ceb104467d97695689748fac670e0f4e6a46b69b43f SHA512 0d991ee7a060edc097b32184cca0cb7a017d2f0850f38d7ad685a4fe80235891895b5728f2968c2698d4dd7055c646cb553a7cf90f6cb62a6c6e129b4a9cf5c2
-EBUILD pastedeploy-3.0.1.ebuild 932 BLAKE2B 8e9c266d09bf744c3f188ee77aa8cbc4fa9af41cf4d20eb50e40255201e403307db871046d4610b687cf4a4efa5d2d4abf1455962b757ec77f1b2fb76db4736e SHA512 5cee38c8116a7ca9197aa47371ddccf8418666c2d55c1c3d7955acb5a8dd3abd2e77d037cda83d391472f4e84b3e9e7a6639ee27deceed662314d61ad732410e
+EBUILD pastedeploy-3.0.1.ebuild 924 BLAKE2B 43968baf0b8971e70074dc5cb450d37f106657a0f7ab45d2675f2082fdab291d6be84ff376a41c963422fc6b729f649f1472cad78097a91b1f7290637b6b9157 SHA512 b9386e4cd274ef1061b38cd016a91a15a71d555a0c9f8339127702e4f5af3d78466b84b5c168a41138b55963ae312edc3430eba508ca1d64559fad5391d63623
 MISC metadata.xml 965 BLAKE2B afd902e013f9f3ffa27225cff2a97551875a2cc4a02d968c5366cbbccda0442ac8e381eb8d93655a7a5d6101c97f2e00b362657272ddef4123af57ee1173b045 SHA512 2ab7460b4b6baeedbb1a7c64a760914278f4af622a3e0fc9452fcfccb7274383a26b559f45f7eb11a1f4cf546d24b7582a0dd61f64198b8760d247b6b4a2cd16
diff --git a/dev-python/pastedeploy/pastedeploy-2.1.1-r3.ebuild b/dev-python/pastedeploy/pastedeploy-2.1.1-r3.ebuild
deleted file mode 100644
index 8fda2c1f81ff..000000000000
--- a/dev-python/pastedeploy/pastedeploy-2.1.1-r3.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_{8..11} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="PasteDeploy"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Load, configure, and compose WSGI applications and servers"
-HOMEPAGE="
-	https://github.com/Pylons/pastedeploy/
-	https://pypi.org/project/PasteDeploy/
-"
-# pypi tarball does not include tests
-SRC_URI="
-	https://github.com/Pylons/pastedeploy/archive/${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-
-RDEPEND="
-	!dev-python/namespace-paste
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-change-sphinx-theme.patch"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/pastedeploy/pastedeploy-3.0.1.ebuild b/dev-python/pastedeploy/pastedeploy-3.0.1.ebuild
index eb65cd769e0d..32ddba043830 100644
--- a/dev-python/pastedeploy/pastedeploy-3.0.1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-3.0.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 
 RDEPEND="
 	!dev-python/namespace-paste
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 4afe971d82f8..d051eb03ae0d 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,7 +1,5 @@
-DIST python-phonenumbers-8.12.56.gh.tar.gz 4906531 BLAKE2B d55d828a26bc3a86660b6341c9577de6f489d3511971c5a843f10c14c05f0c82340109f13cc86c261119d6598ade95c2c3c9afdea485b09f3f73be891ee2a16e SHA512 675cf8d15536efd156a230cff9e027cdba718a32ca2facb493b235f39dc1a0c86f6a376d3d501690b25a5e52d6d411309626b8ecce9a065456e42774da04ea49
 DIST python-phonenumbers-8.12.57.gh.tar.gz 4906700 BLAKE2B b755e6e27c3006ce2b72f8e8900937ac2b7d2bd464052cd9a788ba5cdbd08ead4628963ea794a5dee962531753f6674342a3eed092edfb421c1d8f203d90b2b3 SHA512 8da340dd88c4bd41fd18af264667211e7d9dea97dcb71306c901feb3f32ee7a7012dfa1a66b8ddac746ceaab972529c32d9fc19e331893296f9938c7249173ba
 DIST python-phonenumbers-8.13.0.gh.tar.gz 4907144 BLAKE2B 8441eb3bae743c92aacd581c0dfbea32d04353dbb6e45a3fd24ed4b9ef2e6a80ee70167b59ad288383cf409bdad73ed9bded6c991b7809d6ff2bbcc68519aab3 SHA512 1f8e78b3fa1418dec1cc89c02a7e8544847f343912be99d2b62aa49250aa0d89d67d27f0f9c40481ef6125872be7cc772de25bdd9ce26df512e7715f4f8281f2
-EBUILD phonenumbers-8.12.56.ebuild 808 BLAKE2B ef45a7f57cab5aa38bb958cae5b0bb0bbca327073d8d4bc41aa56552037a2ae91e5e01b3e6af6e9d948ad4f7edd5ff7fd0808c2a7d742845040fbcd55a6b3b77 SHA512 2786479b7b053e0c900d5548a1339a0d81c0d4c44a25d0b33ce6058e06a872710d7c887d4ee20b7c705065e2a2e4eee6519bb76960902afc45f86c3806819108
-EBUILD phonenumbers-8.12.57.ebuild 810 BLAKE2B 3b18782b7466900c6dcf66ada03d333fefd3df0a6a02bc1417de82a4e692e0baf316db5d1b4bf070d4a73b7f8b5133018c22587f5549fbe8863b8e3ec6859441 SHA512 9f1fc8118ab9fc7284723238e398f9152d6e491bfe0be97fa5b181f1bb30a0d96900c1e1674b6ca325daefb8813bc25dfae44f1ab172361e367725c5a040ba4e
+EBUILD phonenumbers-8.12.57.ebuild 808 BLAKE2B ef45a7f57cab5aa38bb958cae5b0bb0bbca327073d8d4bc41aa56552037a2ae91e5e01b3e6af6e9d948ad4f7edd5ff7fd0808c2a7d742845040fbcd55a6b3b77 SHA512 2786479b7b053e0c900d5548a1339a0d81c0d4c44a25d0b33ce6058e06a872710d7c887d4ee20b7c705065e2a2e4eee6519bb76960902afc45f86c3806819108
 EBUILD phonenumbers-8.13.0.ebuild 810 BLAKE2B f6d524ccd4b5766f56f5b019096727e3b9bb091b7636e39369d2443511ac533c98a1d03c7b917c9572349e4601f556aed15661316a47f6f55da72199b105cad7 SHA512 beae3b028c737ebef7a3b45a8d8fe428b67dbbf9d0c6aacf14467f80b11ddc858e35e72fc1afb06e3d98cdcb47aa2c30f90956c5fe0e0ff43214e101c2a15188
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.56.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.56.ebuild
deleted file mode 100644
index fa0f470bb38b..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.56.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="
-	https://github.com/daviddrysdale/python-phonenumbers/
-	https://pypi.org/project/phonenumbers/
-"
-SRC_URI="
-	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ../README.md )
-
-python_test() {
-	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.57.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.57.ebuild
index baab22b23fc7..fa0f470bb38b 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.57.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.57.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}/python
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index d5211978a99a..0b27695f117e 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,12 +1,8 @@
 AUX pip-20.0.2-disable-system-install.patch 1298 BLAKE2B a384ee2114e59b8bc719fc14270cf6efbe8914854c404395beb1126db3278683b940e8fcfee83423d78e2aed6521e0bc57566ab0f5618f473262bbd9b7b0bffa SHA512 d2772105d4f4f880606e1e8ab3381af6768a96604a5fdcaa155dd42f8eea731c3a1b733b027d3e591d81f962ba14758b19da4a2c6c12946cd9a9d77c51ca4e78
 AUX pip-22.2.1-no-coverage.patch 1805 BLAKE2B 790a6736194d3ad7cadbb7965978f19c251a65b98b67c64726072f2baa24831f3e3788fdba560c247cde948183c6589b6edf18d5861468801e5729ba53c42995 SHA512 5fd775c0a1cb0f88c6c632a90294f11788916371b7d4bb8b378ed1530b461a9788f289a06d6619e66fcb45dd08a7063a749a608c5f12a778db84dfcbb5e79cba
-DIST pip-22.2.2.gh.tar.gz 9279218 BLAKE2B 2179b0d3f5f05bbd678f1785b4dbc0613078c09c83b45faa62d766182dfeb564095abda809ed99f45644abcb06c125efc528aeaed3ad40ab1c9e8972e33ccbb2 SHA512 bd59e28b55475b77a8f11ea771cbad3b2602ff974e219f9a55288963a9522c9279a5b00fde40fb65cfebefae0e905d3da3c06fe50b402aa5326b25f70a98a015
 DIST pip-22.3.1.gh.tar.gz 9326504 BLAKE2B b125599a9f77e49414dae13ca3fe0ac27c9b7e127f6ca7f467f3af4e0b51d835f2790f8311b2ec616966c299fb431403b456f7b38ea1f3fe1e7f769f7d5a78e5 SHA512 c7865c4ce79b0fea7ba469fe593af3be205b3bdb574a6ae019842e0f82a0af406ec905d8c6ff02fbbafe01630c8899a398d071ce74501ca830249160f2f6df98
-DIST pip-22.3.gh.tar.gz 9326079 BLAKE2B 68c0151f9c1ae14a6cb9b41d39521b3898b156f642361df5f3b272e4ba1640e794189d5d991dcb56156745c587cfbe02161763683965c2bb8a69adb9f109fd00 SHA512 804c5bad805da77d922e5e123440f6b7639a33769b41ab5cd1c27e5c5f0e4548ce6e5a0cc4c4d4fa42d25e4699d67d60db059045f97ba974b2ea4d552683a693
 DIST setuptools-62.3.2-py3-none-any.whl 1225929 BLAKE2B 608952e201f749ebf557e3962ba9856d5bdcbc534f3a25598cab0d6c53282cfb3b9f007ba135497a8addf49db4c02bc4387c486d95a4529d01ce4114154ec28a SHA512 366d69dc44e326dd7549cdacd8dec481a14dce4feef4338adc38b9de5c4c338f04d61696e13ce8603be1315f2e8734100f92d3fe4b4b11843e19f550c9631978
 DIST virtualenv-16.7.12.gh.tar.gz 8906590 BLAKE2B a1f206769e4e5797562906162e492e44c4a72720e4f88a0362dc802ce2df20c65aaab6a72dce2238445601a10fae59bd90cd362217994d30911f105afd71c5fa SHA512 0278b33fb19f6553e70ad3dcffa6ea1a455ff435b216ac9b4fadff216b2932714faa2bb6027af3058010111d8511a5c2fcd424f31c9645be361603971f111c8e
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
-EBUILD pip-22.2.2.ebuild 4460 BLAKE2B 78923780f9190e2ee787ae5ee0bc5794a07d0c4f0aa475fbff52ba8bbb4a48fdf2b8eb00710ec0305496dedb2ed815e4a1778a6a8b454486bb5387d371317872 SHA512 bbae33a2f9197f9a6433ecef1057105fb61b8e6cef2a569cc6f095fe3c0c45b78ea45ca22f6342a72ba4801286d3954ed66c8c1d7d5132b096a661ee0279b00b
-EBUILD pip-22.3.1.ebuild 4663 BLAKE2B 87cca91089e67263439c949c891e5bcf7855d252e6d191deb84ad161c1e3fa4c652b4c55ea8dc07473a80b6680c5f6b6693c5feab9c00c55f77bdd2ccd5da27c SHA512 1dcdd3d4992a68950c4ffce1e8c9e66241ba1e6be58698bb445787fedf3781105caed799b8c5e7322ede4c3212b049a43f84e899740272914242522b12a4320d
-EBUILD pip-22.3.ebuild 4468 BLAKE2B c14ee701970eb474e4dedc8ec4e44a83ab1e8bcb51cc1924a7e4c6578be85aa803a23e3a0949c473404c0e36a017e210464c1e34dd2f70cfe823bab0703d5c77 SHA512 9d565d5de24258ea42cbb9d7d59b4e3c0398ae55d981713778bb72ffab7c46d8753c752b8d490ce3494549f0d0836d0c6f868b13c3ede816bfb646991889bc02
+EBUILD pip-22.3.1.ebuild 4655 BLAKE2B adfba62d79932406fbcce7b54713bd8de4ea7a1730a1028f17d21d112a35023493ebe8ef68be4cca6c9b626da1895ac67f6823c154e3829f0a80031f3d215684 SHA512 d10768ada64507d6a66915b386ccf1a921a9b8189e4acda39cf0c87245de17e814a32c3c8a6034d21fd1ebd748247fafaf64417cbbf30157f62b837ef99ca115
 MISC metadata.xml 392 BLAKE2B 94ea3de1220cb9ca64ae1186597789cc83a54adfe44695932c07dd5065df0e5f9ee5078a495e3a12563b36809d781d8ab86bb6c92c485c023199d92547b74f27 SHA512 603199f6547105f3bb64f4fcaf004e9ef62fa2e0f8ec6eab56078119684b0f5119161e0f164fe02b2cf6dd6b115588c9ef77d727eeb6d138e281f1cb0bcb5de9
diff --git a/dev-python/pip/pip-22.2.2.ebuild b/dev-python/pip/pip-22.2.2.ebuild
deleted file mode 100644
index ff18a3946fa0..000000000000
--- a/dev-python/pip/pip-22.2.2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# please bump dev-python/ensurepip-wheels along with this package!
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{8..10} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_11 pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-62.3.2-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-# upstream still requires virtualenv-16 for testing, we are now fetching
-# it directly to avoid blockers with virtualenv-20
-VENV_PV=16.7.12
-
-DESCRIPTION="The PyPA recommended tool for installing Python packages"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/
-"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
-			-> virtualenv-${VENV_PV}.gh.tar.gz
-	)
-"
-
-LICENSE="MIT"
-# bundled deps
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-IUSE="test-rust vanilla"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/freezegun[${PYTHON_USEDEP}]
-			dev-python/pretend[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/scripttest[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			test-rust? (
-				dev-python/cryptography[${PYTHON_USEDEP}]
-			)
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/pip-22.2.1-no-coverage.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
-			tests/data/common_wheels/ || die
-	fi
-}
-
-python_compile_all() {
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
-	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
-	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON} since virtualenv-16 is broken"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_inspect.py::test_inspect_basic
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		# Internet
-		tests/functional/test_install.py::test_install_dry_run
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-		tests/functional/test_install.py::test_editable_install__local_dir_no_setup_py_with_pyproject
-		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
-	)
-
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/functional/test_install.py::test_install_sends_client_cert
-			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		)
-	fi
-
-	local -x GENTOO_PIP_TESTING=1
-	local -x PYTHONPATH="${WORKDIR}/virtualenv-${VENV_PV}"
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
-	epytest -m "not network" -n "$(makeopts_jobs)"
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	newbashcomp completion.bash pip
-
-	insinto /usr/share/zsh/site-functions
-	newins completion.zsh _pip
-}
diff --git a/dev-python/pip/pip-22.3.1.ebuild b/dev-python/pip/pip-22.3.1.ebuild
index 3fce9e17c779..9db32c537555 100644
--- a/dev-python/pip/pip-22.3.1.ebuild
+++ b/dev-python/pip/pip-22.3.1.ebuild
@@ -39,7 +39,7 @@ SRC_URI="
 LICENSE="MIT"
 # bundled deps
 LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-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"
 SLOT="0"
 IUSE="test-rust vanilla"
 
diff --git a/dev-python/pip/pip-22.3.ebuild b/dev-python/pip/pip-22.3.ebuild
deleted file mode 100644
index a68d14862a7d..000000000000
--- a/dev-python/pip/pip-22.3.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# please bump dev-python/ensurepip-wheels along with this package!
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{8..10} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_11 pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-62.3.2-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-# upstream still requires virtualenv-16 for testing, we are now fetching
-# it directly to avoid blockers with virtualenv-20
-VENV_PV=16.7.12
-
-DESCRIPTION="The PyPA recommended tool for installing Python packages"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/
-"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
-			-> virtualenv-${VENV_PV}.gh.tar.gz
-	)
-"
-
-LICENSE="MIT"
-# bundled deps
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE="test-rust vanilla"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/freezegun[${PYTHON_USEDEP}]
-			dev-python/pretend[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/scripttest[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			test-rust? (
-				dev-python/cryptography[${PYTHON_USEDEP}]
-			)
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/pip-22.2.1-no-coverage.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
-			tests/data/common_wheels/ || die
-	fi
-}
-
-python_compile_all() {
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
-	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
-	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON} since virtualenv-16 is broken"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_inspect.py::test_inspect_basic
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		# Internet
-		tests/functional/test_install.py::test_install_dry_run
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-		tests/functional/test_install.py::test_editable_install__local_dir_no_setup_py_with_pyproject
-		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
-	)
-
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/functional/test_install.py::test_install_sends_client_cert
-			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		)
-	fi
-
-	local -x GENTOO_PIP_TESTING=1
-	local -x PYTHONPATH="${WORKDIR}/virtualenv-${VENV_PV}"
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
-	epytest -m "not network" -n "$(makeopts_jobs)"
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	newbashcomp completion.bash pip
-
-	insinto /usr/share/zsh/site-functions
-	newins completion.zsh _pip
-}
diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index d89cd93c68ee..57432d036c46 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,5 +1,3 @@
-DIST prometheus_client-0.14.1.gh.tar.gz 76321 BLAKE2B fd924e80d32df9fceb8898530893148f3f1131a13e97a3bac56540ba2fe3846c5498bb78d3cdcb312827dd8a8db2624e831880c5c1f348da0522db96dd0ef29e SHA512 882e7193cb344d154df8a7b7fbdfb5c635363c1aea8bde1ea174a7614bc868fe337399db7a1fb90a94128d7bdfedbc741f5f6c44d514d1ca9ab684c7527e7317
 DIST prometheus_client-0.15.0.gh.tar.gz 82056 BLAKE2B d9d94fe823edf99d273e9a85c27a8363c59c24a7d125a62bbadecd9abc81485949a27dacfc5faec31f27fdb263fec412210545b18f72c40a357c24d380242200 SHA512 ea11cb2fc08bd5e10ea97ee3be3068a2c37cbaa45ab3e146f8a0080074f69e7744ff90d1a0fb4f01eaefd1efc5f76428d6c898bead85d5fa37b6a59e9f832134
-EBUILD prometheus_client-0.14.1.ebuild 695 BLAKE2B 72d5f5866d8293655155debfd214c9ac0057b950bcb07231ccb7d195daef7b74aacdfbe3a4290dde5cc175a80052577b2551fc93bd472f7b1315447ef8dcff36 SHA512 64d9795ca0ac2795f8c0fe1bfb741543b9d1573f0499a985101569ca400821ae0c8032b228d58068ec03214b0a445dc7f2ba868ad9e2bd128a70bbb0bb99141c
-EBUILD prometheus_client-0.15.0.ebuild 703 BLAKE2B 036481569b334077f6ee09d86c9d50d64fae756d5aa90e40ea70dca93341d9a5a0cbf3450719ffe4ec695d71eb0c9c7bfcaefe0b19b38e0a0e01994d13b43d33 SHA512 5ae1e89bc822673f2c7fb6acad801f13ecde004bbe4dd03c6a3cb53f035ed0e5bdc6fee65631328cc5e5ccbb59fd0e9c37edac40fd180e87f981642fdb01c999
+EBUILD prometheus_client-0.15.0.ebuild 695 BLAKE2B 1d02870809469d135af93b878add60b5f3c718c941d9f1ff2a8976d460b0119bad65e4bc24241742bf7a36d460436039e3724c4cbcf88f5aff8309af696b8290 SHA512 9beea22d8b06a2005957751dd6c639f6d38c9da049ba38f111d052f4c0a3b912b044cd77d0775543a87bd254f79200a7a7fc88e3c142cd0d1695b6a2a87bc1bc
 MISC metadata.xml 409 BLAKE2B 900f1046ec87679dabe88792bfea55cdf6dbbc1f332260e5487628530a1e5b2e07a1b5776313c484ed2355c205dea165547628297da3fd3e0d9e7c352f4f7a54 SHA512 beee1bb3823aa235e8c2667b18157254335777dbf1169beaee54190d41819dd0e82c58a8ea09c4981740370d7e5463ce11d327e02bf411093dfb653a557077ff
diff --git a/dev-python/prometheus_client/prometheus_client-0.14.1.ebuild b/dev-python/prometheus_client/prometheus_client-0.14.1.ebuild
deleted file mode 100644
index 60739a3214ee..000000000000
--- a/dev-python/prometheus_client/prometheus_client-0.14.1.ebuild
+++ /dev/null
@@ -1,30 +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_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="
-	https://pypi.org/project/prometheus-client/
-	https://github.com/prometheus/client_python/
-"
-SRC_URI="
-	https://github.com/prometheus/client_python/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/client_python-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/twisted[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prometheus_client/prometheus_client-0.15.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.15.0.ebuild
index 06513e319162..585e8af0d5ff 100644
--- a/dev-python/prometheus_client/prometheus_client-0.15.0.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.15.0.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/client_python-${PV}"
 
 LICENSE="Apache-2.0"
 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/twisted[${PYTHON_USEDEP}]
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index d98cc163fd22..e9d9116ea093 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -4,6 +4,6 @@ DIST psutil-5.9.3-tests-r1.patch.xz 3648 BLAKE2B df56e3b11da307fdd4441284d1a7928
 DIST psutil-5.9.3.tar.gz 483579 BLAKE2B c1b5c77483a1e280cc68aa3ae5ca39fcc3992f3c07a591bbe92278050e9517a9e9c0e17338f2932f5ec680a19c4f6958e21e4b9b02158041e76dd877b5311c21 SHA512 d226364b416823783058f19c06dae4ac1ea03f061646f01ea6953ded8fbb89aed92aa743c9e55181e4d57101f7dbbb78336043e1fc7a3bd62ff82b19f0a4efae
 DIST psutil-5.9.4.tar.gz 485825 BLAKE2B ce5257e653876fc0c4bb005c964f677c0b4010f853cc7b8ff3451aa1efd7fde6b7e5d2150fb936cd38b667d5c167f180d5cae0792bdf50a8aa2e528795ed9897 SHA512 ff8d6213b153b5a3428e4f65ddbc41cb1f37caae4acab02760632107d95a50a74d3ee563f0cb2d623b37cdddd16425d2084e7f841e4a46af8988a7676f6975e6
 EBUILD psutil-5.9.1.ebuild 1242 BLAKE2B 0b8bc2e058d875c436e51dda98773cebdc0acf1feed749edf3814c752c7d2bd01163a7e0dc39366772aaa25de124c6cd3caceabc5af98abe918b2ae8def710ae SHA512 b2fb3b749cb2b45296bf2b42d9253ae47887213d5ae750e489be469d9d8e0ddd6a68a0b00c8c27dd2a7982fda46fad4d291ea429d8e921b7f717950d68039bbe
-EBUILD psutil-5.9.3.ebuild 1255 BLAKE2B f740459a556efa90ff8b4344ca879dd631087a032d0498aa580d0482f88cad33df5583c9ea79864b82ac57f94a1b618fbe2e317932dade7d528e40dd5ce22c66 SHA512 e71b2442d4f1c9af8436462f1bc84f3605c82ec2c29e63b35136f6efe338dc8677a0421e92721511357aeeb1cf593c706b8195cf245534119c28e12755f236d9
+EBUILD psutil-5.9.3.ebuild 1250 BLAKE2B 8cf934c57c68bdc5fd5ffbb925db8865d397cf74f2c2738da391f756011ffd036fdaaa299c5fc1b1ab5e04d2f1d66c76e394f6cf3fbaa7f3b8678bd078c3c76f SHA512 1e24ccac716a872761fb8ae43b32480052772604febf5098d71ef98e1d19a23a75e045ef421f852ee6cf46a310cca894dd9226194cd24ca51dbc5c08083b8aee
 EBUILD psutil-5.9.4.ebuild 1255 BLAKE2B f740459a556efa90ff8b4344ca879dd631087a032d0498aa580d0482f88cad33df5583c9ea79864b82ac57f94a1b618fbe2e317932dade7d528e40dd5ce22c66 SHA512 e71b2442d4f1c9af8436462f1bc84f3605c82ec2c29e63b35136f6efe338dc8677a0421e92721511357aeeb1cf593c706b8195cf245534119c28e12755f236d9
 MISC metadata.xml 378 BLAKE2B 235c056a427ab18383c401143074ec62b91d471087c34e2bd48d5192c6221e089e32170d18cd0d69d51eb2bb02fb8a0efe59245af9224b284557812b32c341b5 SHA512 96492308dac753fb176e4810efa71757e66413d16589e52a942b02c91256b48f9873b53a698006923aef12aa7d1539d6fd7aa07632c073b6a92cc8920f6ce6c0
diff --git a/dev-python/psutil/psutil-5.9.3.ebuild b/dev-python/psutil/psutil-5.9.3.ebuild
index 609517d00b2f..9301d5db144d 100644
--- a/dev-python/psutil/psutil-5.9.3.ebuild
+++ b/dev-python/psutil/psutil-5.9.3.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/pypiserver/Manifest b/dev-python/pypiserver/Manifest
index 58f8e19c097a..2af6ff9a618e 100644
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@@ -1,6 +1,4 @@
 AUX pypiserver-1.5.0-unbundle-bottle.patch 3428 BLAKE2B f30c9c5b7204b3efed6f6515ce11ca6921ad44a5af69af6ea19059daa9b07396bf7312d649b93492e3e1f98bcc3e0df16c9178aa0abda77b048634b0461ae194 SHA512 fca45138c22b8c12c5fe5fc1742f5a7034d9353e7a520a8870b4a0b4d113b915ed8a34dc9cc9f268ff8f9220425f1131db8ea13443ff9050852bcd9d362ac942
-DIST pypiserver-1.5.0.gh.tar.gz 149963 BLAKE2B bfc0760982f97e93357702342eb5b1776f72c43e66742a8741ee2ba3109839006e99e49b65e04380097500c400e09bce77b74fc5f9072c7670349817ae3a73cb SHA512 c93e724a3aa6ec265d483c2989129292a05132d3d52db6d9b9c1429610ee23b56e106c9389bdfaad142f34071ee258bdd4291668c11f8bb412df043bf4555611
 DIST pypiserver-1.5.1.gh.tar.gz 150145 BLAKE2B 23ceba3064da4a0d7a19af0a48f370913948dd8cec101cdee43f59c78087b71adcb0fb3a494ca1a94cf3cc2c42751f8710f9cf9037401d73bec7f94f300dbf6b SHA512 35797c37ecfc2c7de21211c5c5f9c0edf98ba49e54fbee779099e411dde73377706aeddcd3dfb34c3ae2ef7d7f4ebf9146c3fb02b0778742d688f8ac17a64cfd
-EBUILD pypiserver-1.5.0-r2.ebuild 1769 BLAKE2B 59a0dbae7110b1979f31260f9425dfcdace440950a7980ae29c3f881d0abf14315f0e5e55867d0722e316619812d4fff2826042ea3b099911d035dc0454badf0 SHA512 943c7bb68b3b75e9f4b08291d4c37104b11ca155b0e4f492bf4076c2da3708d5d4f73a3c6604913eadcc41da8e8301e8a0df5282f8a931041901ef8b34e783a2
-EBUILD pypiserver-1.5.1.ebuild 1784 BLAKE2B 1352c62381edc8a7bbd3d2c71e8d435b8b8453cef4268529303d87376e4448b0ee1753312a172a2aaf0edf2535708ebbd0a63498cc1244cecdd884cfb641e9c7 SHA512 2f74cbba811498af482c0d6cc2ef2abe91459ab25687cf3afd927fd93fbe74c8e8e9e4f65e5cec502bbafd0ee1f40f1f3b8772f87ebd57a28aea1b735f6bcd34
+EBUILD pypiserver-1.5.1.ebuild 1776 BLAKE2B dd304915e2e2da8b7504e02afc9201c2cdf1a267c9ec5595458cff873da2ef4642584d6d16fe10d6d55f34e453a0a13bdb26a60f91f3dab0b22451005c19b5d9 SHA512 481899351666c0c9ed79bde2297229d4c14afcb29ac01d3a158f26bef1e90800d6f14d2491709ff69ddb057171aeb707b766867836ebef91122fea97ce1eefd6
 MISC metadata.xml 399 BLAKE2B e8726c9c4a494a64dd1490aa88f8bbca6536635af045364307d057d5dfa4762a1b0d59d3eacf7d84c9002ac38516eb7d2228ebd872db762a669bd6015139a4ec SHA512 a3d90eb11fc5bb2c78e53a4d64cffaf213a445c1677939c46fb400e01f4e74d1f206df2259ab348b61d27e3a9b3f03e94a49485be948b2e4106ba254154c7ada
diff --git a/dev-python/pypiserver/pypiserver-1.5.0-r2.ebuild b/dev-python/pypiserver/pypiserver-1.5.0-r2.ebuild
deleted file mode 100644
index f62175c1fedc..000000000000
--- a/dev-python/pypiserver/pypiserver-1.5.0-r2.ebuild
+++ /dev/null
@@ -1,76 +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_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Minimal PyPI server"
-HOMEPAGE="
-	https://github.com/pypiserver/pypiserver/
-	https://pypi.org/project/pypiserver/
-"
-SRC_URI="
-	https://github.com/pypiserver/pypiserver/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/bottle[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.25.0[${PYTHON_USEDEP}]
-"
-# NB: many test deps are optional/specific to tests we skip
-BDEPEND="
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/passlib-1.6[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( README.rst )
-
-PATCHES=(
-	"${FILESDIR}/${P}-unbundle-bottle.patch"
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove bundled bottle (sic!)
-	rm pypiserver/bottle.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/test_server.py::test_hash_algos
-		tests/test_server.py::test_pipInstall_openOk
-		tests/test_server.py::test_pipInstall_authedOk
-		# TODO
-		tests/test_app.py::test_root_count
-		tests/test_server.py::test_pip_install_open_succeeds
-		tests/test_server.py::test_pip_install_authed_succeeds
-		# seems to rely on internal bottle details
-		tests/test_main.py::test_auto_servers
-	)
-
-	if ! has_version dev-python/twine; then
-		EPYTEST_DESELECT+=(
-			tests/test_server.py::test_twine_upload
-			tests/test_server.py::test_twine_register
-		)
-	fi
-
-	epytest tests
-}
diff --git a/dev-python/pypiserver/pypiserver-1.5.1.ebuild b/dev-python/pypiserver/pypiserver-1.5.1.ebuild
index 3796c36d2b11..f5a17201e7d2 100644
--- a/dev-python/pypiserver/pypiserver-1.5.1.ebuild
+++ b/dev-python/pypiserver/pypiserver-1.5.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/bottle[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index c0cc9027d9ce..f63d4ba31983 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,6 +1,4 @@
 AUX pytest-cov-3.0.0-coverage-6.2.patch 1034 BLAKE2B 433d761faae7c929b09e6d7a346fa1129acb427939756efa4d465ed6a6a20fb45ad09f890ce9d9b95c45862bc072a20d9038a1acca06de1963008119188b3e87 SHA512 85501e1c16f9716a3c2b04c79786e657e71ed58a6b0d338458e4cd17abff19eb85dd4b4c6d427e5f17d259d8ce970e79682c613a51b252cd506b1cd895fd8ee6
-DIST pytest-cov-3.0.0.tar.gz 61440 BLAKE2B 85f0b079c4c373191553271e34e78af68ac69ea53e3721aa0d43eb9dd55be935570eb15c0f8b954e4c0de6201c004ddef435ea70b03cfda893ecdcc230c283e7 SHA512 289d1b1e29dcc3461276de4c1bbd3884e4ec957efb7dd4c330bc3f25f1b978cbee64c0e2882b419eee5f9ccf44c9d1a23ce47a1b7cc7e436b9ebe894e4c11ae8
 DIST pytest-cov-4.0.0.tar.gz 62013 BLAKE2B af8a12955e3f22cd9dc257874f86c04c3c6e29f4af2d2838f37ca196c4955dcf4007c7b404f31c303d0eef6c3735fa1a6268c3bb9f01ed54860750ca2f83b6f5 SHA512 fb993be4d86b29a44e4f2ccd2309d99ab9fe8e6b291abbc2a8a3fc8b36479491165a242a20bfa9886dfd296fcc827da9984b556fdbe9a3ac496ac5b6ba379012
-EBUILD pytest-cov-3.0.0-r2.ebuild 1674 BLAKE2B 208e60b0bb9822052febb2ad0eb529d71990ebf1a747fae9418e624ab9be7dda2907993a45e9041c0e01c0f2268ec626519be9a56b2f797ab3ef444797721925 SHA512 46812502d1bcc60008259389da960a9b079107f927a2ba1812171a5ace49dd4fec498bcb6993c71876b229869117bafc58c2e5be5c4da5f35024760f5c8af7bb
-EBUILD pytest-cov-4.0.0-r1.ebuild 1629 BLAKE2B 413446408487309a1f9e24ba65f4040f40f2aeabbd9690b00788f17bc0aac7563b38b82a29b4b3d96387d8ed0cadc93f61e35a9f645be5cab6eb11a3535973e4 SHA512 d4ac75a3cf9d87f2f1dc9e6f453599cce8e4a6cfa03386cb41a68e098cd95779ec48a8e5c4446aa0d5521cbce73286653133518c8e84d4e329a27a97a2b81b45
+EBUILD pytest-cov-4.0.0-r1.ebuild 1622 BLAKE2B 4be244b7d41479a37edfbf05714a41b531462bd9517058dff86202b9148085c2f6f3aaae8f7756e927b388e8277151f52348b14bf813411d7bd534a8c4170614 SHA512 4c38a2e1093bd1a4a0088aa07b8a6f7b556fc286795feb5960fe8635957919450016e3ee36d154842f604b6928a2f835cf7c95acc50b35e74f9ce3e526985216
 MISC metadata.xml 412 BLAKE2B 0d79131c6fd8adf72493a7c333959e065cf4f2231f6c770800b6d05ff9afcc246cd202406bea6e28f6b0fd23ee6197aa8dac2dd59d0a89d9b07741f57e8fa5e8 SHA512 d1aab9ea8042bf810398a4195fd3595a8abbeb060ab38fd7b7e40085c8d5f22ecb78bab02e2331d4588199d88e0d3848413d75a18fe4373ecd9940a3c990c604
diff --git a/dev-python/pytest-cov/pytest-cov-3.0.0-r2.ebuild b/dev-python/pytest-cov/pytest-cov-3.0.0-r2.ebuild
deleted file mode 100644
index 65c69c8579d3..000000000000
--- a/dev-python/pytest-cov/pytest-cov-3.0.0-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin for coverage reporting"
-HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-	>=dev-python/coverage-6.4.4-r1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/fields[${PYTHON_USEDEP}]
-		>=dev-python/process-tests-2.0.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-py3doc-enhanced-theme
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/pytest-dev/pytest-cov/pull/518
-	"${FILESDIR}"/${P}-coverage-6.2.patch
-)
-
-python_test() {
-	# NB: disabling all plugins speeds tests up a lot
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_cov.plugin,xdist.plugin,xdist.looponfail
-
-	local EPYTEST_DESELECT=(
-		# attempts to install packages via pip (network)
-		tests/test_pytest_cov.py::test_dist_missing_data
-	)
-
-	# TODO: why do we need to do that?!
-	# https://github.com/pytest-dev/pytest-cov/issues/517
-	ln -s "${BROOT}$(python_get_sitedir)/coverage" \
-		"${BUILD_DIR}/install$(python_get_sitedir)/coverage" || die
-
-	epytest -x
-
-	rm "${BUILD_DIR}/install$(python_get_sitedir)/coverage" || die
-}
diff --git a/dev-python/pytest-cov/pytest-cov-4.0.0-r1.ebuild b/dev-python/pytest-cov/pytest-cov-4.0.0-r1.ebuild
index cdc52ee9890b..61bbc23db863 100644
--- a/dev-python/pytest-cov/pytest-cov-4.0.0-r1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-4.0.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index 15000834136c..80da7a59867c 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,5 +1,3 @@
-DIST python-debian_0.1.47.tar.xz 189036 BLAKE2B b929b3785064560bbad202d95d88fa330a9fb34e0dc4338865ce17910c9ff986696778dba847097fa1ccbb04ad6b298a5b84e4a550e038ca754a598d78f7cbef SHA512 fdf37476d4658b790ea4bbb43fca43a627cc569881f9e45666eae4221ddb71d57eba7d009e06e8e2864cd41c7718b9bf41e319f6fc0785549b6171de981b6ed7
 DIST python-debian_0.1.48.tar.xz 189096 BLAKE2B 3b273f1e90069e00a93aeb9c2333d20d479b057613c93325344f42a73230bd569160a487a25d1c7f90f7f00f42feeab55c9850cf44121e1ca423cd1f40a991a4 SHA512 85bd12ce8ade9b43d502bd60ac1ac826d9a81b5bf32262ff9377b4ba5a1c95306683098d10a64fd6a1331ed7eb44a7fb09ad90f0ee6c885d69ea16f85c4eda59
-EBUILD python-debian-0.1.47.ebuild 963 BLAKE2B 71e8142ac149f35932ed279d9710442fff2b8a142274ca2b7b223af745e091a3cb9bbac14ce90694990b4ab036ef8156b5a422d57bce5a0aa30914ae0ed24c8c SHA512 3d2a3f4c197a54f1bef45d9efc312dc8203d409707a275551f8b69a4d9af03f891c8f9b1f422df49e18bb29e6a9a149f9c9d2aeabce88b2665c265d4ab6cb31b
-EBUILD python-debian-0.1.48.ebuild 966 BLAKE2B 603a89e178cdde7e72085b616803c263c7b4874fb6abbf71fb306d81feed10d6fa3010476e7fd177d69764bdf0a7332cf08ce8e45bac37820048bcc2fdfef654 SHA512 3550de40d71c5c7aef4db108121109cd3e79deb0b7e17c3ee446484ceac6256ed31271f58be72422022a7fe90d250151b9041d527b5ccfeb4a81e2695787f452
+EBUILD python-debian-0.1.48.ebuild 963 BLAKE2B 71e8142ac149f35932ed279d9710442fff2b8a142274ca2b7b223af745e091a3cb9bbac14ce90694990b4ab036ef8156b5a422d57bce5a0aa30914ae0ed24c8c SHA512 3d2a3f4c197a54f1bef45d9efc312dc8203d409707a275551f8b69a4d9af03f891c8f9b1f422df49e18bb29e6a9a149f9c9d2aeabce88b2665c265d4ab6cb31b
 MISC metadata.xml 448 BLAKE2B bccb39bdfb24e81bc05028fc92033468f5256be096cb409b4413f69444d59d3d9a3469047337a7fec79ac707ddf4d269b44b20c725f7fc4935bd10335e1f9374 SHA512 8e3fb6ca4bf305e23a51ff56cf84648aad1e96d36aa7a4fb138f7136ea77a6a76a8985557ecb1c9da962479c8c9e36c253655d6e6602c1833f2a2230b44540aa
diff --git a/dev-python/python-debian/python-debian-0.1.47.ebuild b/dev-python/python-debian/python-debian-0.1.47.ebuild
deleted file mode 100644
index 15b1e315ea43..000000000000
--- a/dev-python/python-debian/python-debian-0.1.47.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2011-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python modules to work with Debian-related data formats"
-HOMEPAGE="
-	https://salsa.debian.org/python-debian-team/python-debian/
-	https://pypi.org/project/python-debian/
-"
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		app-arch/dpkg
-	)
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# See debian/rules.
-	sed -e "s/__CHANGELOG_VERSION__/${PV}/" lib/debian/_version.py.in \
-		> lib/debian/_version.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# See debian/rules.
-	"${EPYTHON}" lib/debian/doc-debtags > README.debtags || die
-}
-
-python_test() {
-	eunittest lib
-}
diff --git a/dev-python/python-debian/python-debian-0.1.48.ebuild b/dev-python/python-debian/python-debian-0.1.48.ebuild
index 3c07375c1483..15b1e315ea43 100644
--- a/dev-python/python-debian/python-debian-0.1.48.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.48.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-python/python-slugify/Manifest b/dev-python/python-slugify/Manifest
index bd39641877fc..865c543da16f 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -1,3 +1,5 @@
 DIST python-slugify-6.1.2.tar.gz 13302 BLAKE2B 600ac1cc37cd0001ca3c08cdccb4655dd3754f7673596eada2dfb6adcb6c190f0e5644bd1cba4debf0fae42ae183b3d81acdcc09270e3ade94076d69ba25895a SHA512 3748c18d469032fc002318fbd5730b96a6f8430ff7b0b1a9afb4c19d4dd8e7528400682fa6b2fcc11ec4230917d7e7f61de290f5b199935d77d5335006af0ffb
+DIST python-slugify-7.0.0.gh.tar.gz 13257 BLAKE2B 6d50fd25ac89caed3a970f4cce786d9b61de68386fc183659c0d884877edc934e121ad07316259af08deb61a30ac33f0076a90b2d5a650dfb113e6b6416addfe SHA512 c22743a28ffb273546541eaf59d2a7beb9070a7f81e504acaf73d220c2be83a87d02012b5841076539ba6bae5778dd47309ee7ceef9f8479c993dda6b3e09837
 EBUILD python-slugify-6.1.2.ebuild 594 BLAKE2B 380f92dec445d336032dfef1275603db24ee4db779c8e1cbbe25df03d0ac6a81a26f02819147e01b80fc13624919d147b40b8c800424da89b79780a366484535 SHA512 d84326a73774731dfabe4c63604444bd3a21441ca7fe5ee932546f89ac19161f1bd5d372cf1d0291636aec26fbd03942ef56da32fdd38a80c5d0c82a72b2071a
+EBUILD python-slugify-7.0.0.ebuild 601 BLAKE2B 274201fc7a7ea4f6cc141fbb663e5239809690ba40c73576f4e49ec85007825a78a4adbe0880c6f8f4902448e2bc94254e95046a573decf737eb07b5c92ead1c SHA512 651019a1d7210c9231c034c37b5e5306fd7d3bf20a12c57d3f1c93c57d39c07a711478f5d2471c79715977f10c9ab30825d301b0c529faee627c95fb59648358
 MISC metadata.xml 637 BLAKE2B 4869f272370af0065e6d0479d660a8fba6665ad019a3072cb3a2f1b003fa0cd7ae57dc8e19ad8ceda33d97355c1e4d1ebebb96978935d016fa8bcd2b7fd72660 SHA512 bc09a7914759371c03436e5dd0ef50bc1972cfbf2b815e91048d78d277402d8431be59673f4106483b690dfe3b3cde7ca5e39719effc23dc77e1e9b505e14a01
diff --git a/dev-python/python-slugify/python-slugify-7.0.0.ebuild b/dev-python/python-slugify/python-slugify-7.0.0.ebuild
new file mode 100644
index 000000000000..a12154fd4646
--- /dev/null
+++ b/dev-python/python-slugify/python-slugify-7.0.0.ebuild
@@ -0,0 +1,29 @@
+# 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_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python Slugify application that handles Unicode"
+HOMEPAGE="
+	https://github.com/un33k/python-slugify/
+	https://pypi.org/project/python-slugify/
+"
+SRC_URI="
+	https://github.com/un33k/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/text-unidecode[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index e47382e16d5c..f0d544924db4 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,4 +1,6 @@
 AUX setuptools-62.4.0-py-compile.patch 3704 BLAKE2B 9a5e70d2556b059be0ef060abd1db71298cd0e9aa1e2795d92cea5cdbaf0c82f4433e1a0c3095f4bc41bc72a457b63142253fe46c712afa1d7855a5d43607bca SHA512 48d7c065e2d8c29ce6e498effe6d79f9caa0f37d7cf6cadd0ed02c48d196a4d8a10a73cfa26744d6f74b48c63cd28a4074b161a6aae18c6169f6d8fffb044b1e
 DIST setuptools-65.5.1.tar.gz 2616576 BLAKE2B 84ecb833305e06861d4e0ab5377235f6a5e3a109db9d5296f19f7d67840ba220847a18e6e2529265aadec265cabc8ed3d43f9ebf755f8eb8eacb092291b9248d SHA512 e75eb7fdb0bc5ffdc76ed864cf753c2672d097a60f8747ac5cd40a49276d33df31fb619877234b4c22693b627d9978ecdd48a5c6c48aa0bbb856d48dec70fb0a
+DIST setuptools-65.6.0.tar.gz 2616763 BLAKE2B 76b02b8b1fb07632c8934be568337b859c24cbb6680683608c8cce5c5ba2fd5c782c7ec120712ce76ebfc00108ebfd52b9297ef3197248ee34f90a239f81d953 SHA512 2896a00f47dbc7b1661facb2b96a97349b96e5cf0d86b63cd9dcc0e190b73d0440c77d1c54b63618103ac426292ef0f27c2de1103de9004bdf7415c21b24cf7a
 EBUILD setuptools-65.5.1.ebuild 4271 BLAKE2B 0b415a41751e24c823c1c7277c3e226860b57494f284537486fca1decdab36b4629a7b3587eef898217d90e34667fb81cbe1fd1cd8ea008c973655804e3594df SHA512 acf66b5b5f418cbd96eea8b2a0558df2ae25abd250959ba4c580d28f0f636260eeafa362247afe182640238e2f5750be3c913a754e1eebfa0d7d1ccf3d2806f3
+EBUILD setuptools-65.6.0.ebuild 4414 BLAKE2B 8182282df3770301d3b89c67cd31a4300e5c76f34bd422a06d16929c8df90c6f6916f0636592a4d7bc75fee4ae68af62bad9a73c9434ca1d2d004e08592d208a SHA512 e5975bc266f050bcf6b637f95b9ab5e14f4aa8392a1a3a7b48946604052c0ed0f4eb5db2479b081391aab84fbce47affd9b38f603128957818ec2e11a2211eef
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-65.6.0.ebuild b/dev-python/setuptools/setuptools-65.6.0.ebuild
new file mode 100644
index 000000000000..84081a4a8abd
--- /dev/null
+++ b/dev-python/setuptools/setuptools-65.6.0.ebuild
@@ -0,0 +1,129 @@
+# 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
+
+# please bump dev-python/ensurepip-setuptools along with this package!
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{8..11} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+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
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.9[${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/pip[${PYTHON_USEDEP}]
+			dev-python/pip-run[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-timeout[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	local PATCHES=(
+		# TODO: remove this when we're 100% PEP517 mode
+		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
+	)
+
+	# 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
+
+	distutils-r1_src_prepare
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# network
+		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_build_meta.py::test_legacy_editable_install
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_editable_install.py
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+		setuptools/tests/test_virtualenv.py::test_clean_env_install
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		# TODO
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		setuptools/tests/test_extern.py::test_distribution_picklable
+		# expects bundled deps in virtualenv
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
+		# fails if python-xlib is installed
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+	)
+
+	epytest -n "$(makeopts_jobs)" setuptools
+}
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index bdbf82551dba..f1fe0fe5bccb 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,9 +1,7 @@
 AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1
 AUX sphinx-4.3.2-doc-link.patch 745 BLAKE2B 94f190d63168be99c4719a917f0a1210c56284c278c3909d9de34a319b4d5afa2337133509c06f87e53d5ae488efd88b0f79542719e8870c137f160732c25189 SHA512 aed97412a49212856ea6ccb392c2aa210862ec25d49c4b81a7ff17bd2d0cfe4811d80f4047622f7b23473e31aad968c34098b590045c1d0592b19f4cb6ec8b3c
 DIST Sphinx-4.5.0.tar.gz 6698212 BLAKE2B e6c46d35492c3d3068c4f97e497d33973ca86b40934578804fcec901fa89d2c52b45a7546b835b873846dd16936c1bd34a7b053aec8206c688d974671155fd56 SHA512 b44d2a81ed67adaefe16a07ae0cf053b5e6c775023aaa6c57d7b3950f171deac410e8004f787b151c3c2fc350650aa69a4dc2dc7239d1fd3d351e5194617cb2c
-DIST sphinx-5.2.3.gh.tar.gz 6778166 BLAKE2B 0ba15fb7d558ee4d2d2ead5e04aa65d32dbda3b711d43723f8267dcd88ebf18711081aecdaa607e4bcac1198bd3f55409379f5f912e3a6a672508b941ed72891 SHA512 8a78beb63bdfafe4808c12e3d09adf1e222f0555171eb177f578c4434a454c0527171b1fc751e5df654c7a5f78b2b5709be5b32edaeb98f5f6ae71719efec327
 DIST sphinx-5.3.0.gh.tar.gz 6873479 BLAKE2B c57ede5e3d83447c6152d050d45df73bced62ce0cdcd84ea6316a48bff072590ad036c469dee053a9dc5eb1a7ae53b350aa25b5fe14c3378dc6543186552f720 SHA512 6877635d46f2e1f2b4cf4edaca463d85bf740a13bbeb867486efd57904aacc42626e6a4f58ad971e50808d31391d068702c4f2910a95e5c86dbd68d87e2552c8
 EBUILD sphinx-4.5.0-r1.ebuild 4293 BLAKE2B 4bef871b4129b6048a45ca8bf8752a45543191caf84c18e80d826fc8d8c87c012cae76279ec25c9656b5e2e5f3801f15744e122d187514f1a41638efcca794b9 SHA512 331f455811a822b44a398eca904857fc6db2f91f447468029a855d87a5d72378caf9e504cd168511e24896425820c833c5cc10c6dfac005f952471f5808c1d80
-EBUILD sphinx-5.2.3.ebuild 3989 BLAKE2B 8d89bb60eb48dfc7ba7bb88c9b3448761f42dd78b22d24c3e04c33a5ed8ed94b17ee248d9a5a665d8398db0fdc04ea9d6a2d50136f2f1966d3ed0e4459c55b75 SHA512 4c3db1ecf8de130a7af82d613ce15be666c30129e07bb6fe5c379daf3b828c3176c436a122c945c5898e71af5f65cf5ad155ceedd1e8dc060a7e9314fd0ffb36
-EBUILD sphinx-5.3.0.ebuild 4167 BLAKE2B 72018905c9ed8118284c5e165ba89d0fb94b440cd4dfd2e0d71682d45633f743a548a16fb429c03245c701557ae2c8669b420b9d6142a593fd813872e17aecdc SHA512 c72dca3481dc46db6bc95410ad6067f2294713797017d232231beff4b8976ff7ece8f1c9cf5606b240b3b2012f11442420c3678f4f65b334289565327431c480
+EBUILD sphinx-5.3.0.ebuild 4159 BLAKE2B accde61b8fbdf543a216f6847d34216b9f8762738c16372f86f2dd8588ca98aa22f697e7035490c7881c089ae52971ae35f7f807a703070ecdd01c52f8240810 SHA512 7e5eeb5fe0994d041d9e117acead996974d32c8b5f3dca1410035e62cc405ba417d5ba0be51b77bc4317f93f61822dd8d534aef2dbf8256e4790f9c2fa57a470
 MISC metadata.xml 568 BLAKE2B ddb7175070df6da4088813cc6b66f25bb4364e2619b1e7da94370f7ce8e73b68b12f618412f81e6be57fcb0c60c10e3913f26a6a578b0f9defa7b9ee8091fcde SHA512 d32b37cbe88f5e3db0c6968bc7aa22c7edfb3794bf7c62facd17e7ae1f4f0fbfc7c9f5512230cce16ed32e2ebb70c23dfe9b36ce38785c5f5b76585410313214
diff --git a/dev-python/sphinx/sphinx-5.2.3.ebuild b/dev-python/sphinx/sphinx-5.2.3.ebuild
deleted file mode 100644
index 693285adbd6f..000000000000
--- a/dev-python/sphinx/sphinx-5.2.3.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinx/
-	https://pypi.org/project/Sphinx/
-"
-SRC_URI="
-	https://github.com/sphinx-doc/sphinx/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-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 ~x64-solaris"
-IUSE="doc latex"
-
-RDEPEND="
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.9[${PYTHON_USEDEP}]
-	<dev-python/docutils-0.20[${PYTHON_USEDEP}]
-	>=dev-python/imagesize-1.3[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-2.0[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	!dev-python/namespace-sphinxcontrib
-"
-BDEPEND="
-	doc? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		app-text/dvipng
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		virtual/imagemagick-tools[jpeg,png,svg]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
-	"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable internet access
-	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
-		doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( build/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-
-	local EPYTEST_DESELECT=(
-		# these tests require Internet access
-		tests/test_build_latex.py::test_latex_images
-		tests/test_build_linkcheck.py::test_defaults
-		tests/test_build_linkcheck.py::test_defaults_json
-		tests/test_build_linkcheck.py::test_anchors_ignored
-		# TODO
-		tests/test_ext_autodoc_autoclass.py::test_classes
-		tests/test_ext_autodoc_autofunction.py::test_classes
-		tests/test_ext_inheritance_diagram.py::test_import_classes
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
-		tests/test_ext_autodoc.py::test_automethod_for_builtin
-		tests/test_ext_autodoc.py::test_cython
-		tests/test_ext_autodoc.py::test_partialfunction
-		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
-		tests/test_ext_autodoc_autofunction.py::test_builtin_function
-		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
-		tests/test_ext_autodoc_automodule.py::test_automodule_inherited_members
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
-		tests/test_util_inspect.py::test_isattributedescriptor
-		tests/test_util_typing.py::test_stringify_type_hints_pep_585
-	)
-
-	epytest
-}
diff --git a/dev-python/sphinx/sphinx-5.3.0.ebuild b/dev-python/sphinx/sphinx-5.3.0.ebuild
index cf3704315b77..4a9877879b49 100644
--- a/dev-python/sphinx/sphinx-5.3.0.ebuild
+++ b/dev-python/sphinx/sphinx-5.3.0.ebuild
@@ -22,7 +22,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 ~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="doc latex"
 
 RDEPEND="
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index f6551f177348..aaabcfcbf558 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -4,6 +4,6 @@ DIST SQLAlchemy-1.4.43.tar.gz 8510996 BLAKE2B 49e77ab7ac75c622981a5ba81efc75e393
 DIST SQLAlchemy-1.4.44.tar.gz 8516775 BLAKE2B 647a43b2c01bcf066891e6bf2247271ff051ebc0d75c2e06b04879d058aacc54dced5d1af00c9489ba515621c56bb6f358836e1658f0069295f125675956797e SHA512 ba4e022f7af77cdf099b59a7af088852d7d4e0b4c6d632a63d244f501ff0b76837e601de63619f219fe50e6d526cd13415c4e623a6127afb0a2f24b87a4c3ece
 EBUILD sqlalchemy-1.4.41.ebuild 2690 BLAKE2B 91e714783cea0d60aa2ad38dab70bcb1defdb4db95977958970c9ca14d58a66fd7c88ade7a2f8ef392e32238161c94dc28457288d223a1ccf506fb66f148c46a SHA512 2dbb1cbda431533fc0ca7f554c819c1f190f91b6e2c1c00216009a987fae864046109eb8656ec1b50450e7b70d090719e82a6f3c5dc313c6e05f43e870ffaf7d
 EBUILD sqlalchemy-1.4.42.ebuild 2698 BLAKE2B b1ff340d3abdc039f3d72a031e2157087dbe6eca30d8e56c147c5556366446aad8774665bea45c7f797ff07d016a51edc1282f08d52585f76a7859961fea90f6 SHA512 fca4a89adf8fbf44103d33c0443928c7e368c8a7e0b82bf3c82e5712ae54a25a9b98c2a13d0d751839bd91dcb6ab9f3aca301eddafe1d973d3cb1973f50afac0
-EBUILD sqlalchemy-1.4.43.ebuild 2868 BLAKE2B 5c8f5328cf5e64dd9a551ff4efa944e251d8ac64773c3ef9e3176143cd4dcd7224b15b770c48fe604472833e63d8cfc44aea6c8f5062e5ff0ab941c25a682dc6 SHA512 0482583472e1cc105ed2aacaff50b0126142426ecc5670143969c05fc0a4e250cd74b5b7a09e0d0d0cdb0690aef24fc01b7a3bb4d055cf9724043f3fb71a837b
+EBUILD sqlalchemy-1.4.43.ebuild 2862 BLAKE2B 2d49cdf9dec627637c1da7602f8783cda20db21170ec74e1b6ae0e4410fdce56f63dac898e3a171eaa5b64e00e3768ed915a0ee59a25e05050b6b982ff39cd6c SHA512 50a0bf602dc546da55561fb8fb2a01f8c87adbba9359e5ddf6aee176e0c195912f0b7f2116e963ff931d07e9f80cf1483fce6da501f6ca9c2381822d8490d240
 EBUILD sqlalchemy-1.4.44.ebuild 2868 BLAKE2B 5c8f5328cf5e64dd9a551ff4efa944e251d8ac64773c3ef9e3176143cd4dcd7224b15b770c48fe604472833e63d8cfc44aea6c8f5062e5ff0ab941c25a682dc6 SHA512 0482583472e1cc105ed2aacaff50b0126142426ecc5670143969c05fc0a4e250cd74b5b7a09e0d0d0cdb0690aef24fc01b7a3bb4d055cf9724043f3fb71a837b
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.43.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.43.ebuild
index 5d3491de0785..4ec8548643d1 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.43.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.43.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/Manifest b/dev-python/stevedore/Manifest
index 473002603058..f7a2596f763b 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,11 +1,7 @@
-DIST stevedore-4.0.0.tar.gz 513561 BLAKE2B 7d82b001546c49d4a9fd7891751b2ed35f6b798bbe5efbadb1017472008cf0e32bd148311d100ac062ca45ee8c823ffc394842f4a9d2296262e2587c021e20b7 SHA512 584421b0fd8f9f45f7f6fa960a98817ae85c2a7938b0ea49c0906b6b88ae8111d3ac3cc8eb61e9e45dea494d976fad8074e51b8550d870bfca82704b7c8900fc
-DIST stevedore-4.0.1.tar.gz 514044 BLAKE2B 843af8c8e393932e3db40e467c3957a839e0416c12bfb23c353075b838489a4b58a0a896ee269beeed108370054f0f93724a020f0f2102ae6e758a771a6aeaf0 SHA512 2c1c95a023c598a228d3786b681db2e803dc0c39884fdc910ab4bba75e7237081bfbe0ce1bbc847aecdda7b5e43bf165f0c03599717153bda37a52d0e35b7bac
 DIST stevedore-4.0.2.tar.gz 514088 BLAKE2B a07d48129fec62838af5ce920ef1eeb0cacb09ca4ee20bb5e44ba24a475957a771c72fdec6893f9b26df54e88387ec2f27b1dceaa8d8f41c291e68b1d9bfd059 SHA512 1cb14220e8bf8520af412670982b180bfbf1be3147cbd0359fc543bb6cb6113e292c87f492eb08756d29f16bdc49a48a03b280a8343bb620c78ae882efe6407b
 DIST stevedore-4.1.0.tar.gz 514078 BLAKE2B 503b79324fcbbf5d9b911eb999ac6e52eb76f0b0704e60c76a02a3843259bff082d9eaebc7e559d800c1011d18c2ef1f3cfb78501fddd38e4246cf2f86109650 SHA512 048360265539b880fe77af5214d4e27661ab0e9972317a7e4fa51e599aa67f525ad5227c921e4c3410c8a39baa80259a42417b8772def0e3b8b58d618a0adbeb
 DIST stevedore-4.1.1.tar.gz 514168 BLAKE2B b3b37bfae408adb1664562b99c9951ac035196babec8424068bcffa8226fed8da54044e6efe5b1b739b1caeb49bdaf1b65eca38ec6b4e200b837714d926e2dfb SHA512 9f75af586e4fff1bebb88351a242b171d6cce795d86cfffd021c47bafd9ced84a78a838a589d8828fa7bb0f183e767fe888b0780aeda9129895182bf4e0ff717
-EBUILD stevedore-4.0.0.ebuild 1363 BLAKE2B 0cb8470e708b39241344715f9b94b748db6d9f2db043c6c547fce4fad8abb8a47cf46f4a298bff41ddeaf9c7ab5b37de45731dc742ea20ab6e30741c1955c37b SHA512 dfd1ab0f730270f83e50293092e6a5be1aafa01273694c40b34d42409fddf919545e1a032b7a36a9b785b00836204ecbcbcfd134783550c80059365806a48d97
-EBUILD stevedore-4.0.1.ebuild 1212 BLAKE2B 292b1f3bf4622895c5c51f0e6c2e78ef61d010428f6cde20740b6940862a138959a362d747e20fab36bc3f07aa35fb35a9562168cef2cce8f5c5b1f9a251c635 SHA512 dbdf8faf7d0a8ab387174970c6df8568aa34a786f6adae68c2e80256876bb6b312bfd7431d57c13d90a89bc2a83c9c2da4441a4b57bd4f58f2bd8f6722f054cd
-EBUILD stevedore-4.0.2.ebuild 1212 BLAKE2B 292b1f3bf4622895c5c51f0e6c2e78ef61d010428f6cde20740b6940862a138959a362d747e20fab36bc3f07aa35fb35a9562168cef2cce8f5c5b1f9a251c635 SHA512 dbdf8faf7d0a8ab387174970c6df8568aa34a786f6adae68c2e80256876bb6b312bfd7431d57c13d90a89bc2a83c9c2da4441a4b57bd4f58f2bd8f6722f054cd
+EBUILD stevedore-4.0.2.ebuild 1208 BLAKE2B 8ecbd9edddaf44447d5781748e86f0b0d8bc224c1d406ecd622d4ad1ff451fe5cb5a981427b9f0d19a508230d7119670b69c32d0f0c0ffbd526e1e20ea9fde7c SHA512 95795078ef096894f7916d624c7a8b8c6fd1bdff31711e11f6cd9006d572205f82a4d0ca0c3c511ea4f0d7534c7ff779911497cbe7b0b8bbbdf328d48b75b259
 EBUILD stevedore-4.1.0.ebuild 1212 BLAKE2B 292b1f3bf4622895c5c51f0e6c2e78ef61d010428f6cde20740b6940862a138959a362d747e20fab36bc3f07aa35fb35a9562168cef2cce8f5c5b1f9a251c635 SHA512 dbdf8faf7d0a8ab387174970c6df8568aa34a786f6adae68c2e80256876bb6b312bfd7431d57c13d90a89bc2a83c9c2da4441a4b57bd4f58f2bd8f6722f054cd
 EBUILD stevedore-4.1.1.ebuild 1212 BLAKE2B 292b1f3bf4622895c5c51f0e6c2e78ef61d010428f6cde20740b6940862a138959a362d747e20fab36bc3f07aa35fb35a9562168cef2cce8f5c5b1f9a251c635 SHA512 dbdf8faf7d0a8ab387174970c6df8568aa34a786f6adae68c2e80256876bb6b312bfd7431d57c13d90a89bc2a83c9c2da4441a4b57bd4f58f2bd8f6722f054cd
 MISC metadata.xml 522 BLAKE2B 3ed51cb439d8350ff3df20a20a803c14bb11c9e0e5b15bd661f5780513f88a38f8a4d80703f6a7764488aa721f0fbbbf9a25d4fccb0f9916423198daa539bb69 SHA512 d08e11153dbb878de8f93d7a8293ddf2469adad8a2c436ef652f5c7cda7696a91f914260b841b3e64b3aab37d70dc76b1c369a08b9ef4bbd4f7c33c6a0ece690
diff --git a/dev-python/stevedore/stevedore-4.0.0.ebuild b/dev-python/stevedore/stevedore-4.0.0.ebuild
deleted file mode 100644
index f7b722d6adc9..000000000000
--- a/dev-python/stevedore/stevedore-4.0.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage dynamic plugins for Python applications"
-HOMEPAGE="
-	https://opendev.org/openstack/stevedore/
-	https://github.com/openstack/stevedore/
-	https://pypi.org/project/stevedore/
-"
-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"
-
-RDEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx 'doc/source' \
-	'>=dev-python/openstackdocstheme-1.18.1' \
-	'>=dev-python/reno-2.5.0' \
-	'>=dev-python/sphinx-2.0.0'
-
-python_prepare_all() {
-	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -i requirements.txt || die
-
-	# Known bug in tests
-	# https://bugs.launchpad.net/python-stevedore/+bug/1966040
-	sed -i -e 's:test_extras:_&:' stevedore/tests/test_extension.py || die
-
-	# Also known problem, inside venv
-	sed -i -e 's:test_disable_caching_file:_&:' \
-		stevedore/tests/test_cache.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/stevedore/stevedore-4.0.1.ebuild b/dev-python/stevedore/stevedore-4.0.1.ebuild
deleted file mode 100644
index 1f1a1237233b..000000000000
--- a/dev-python/stevedore/stevedore-4.0.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage dynamic plugins for Python applications"
-HOMEPAGE="
-	https://opendev.org/openstack/stevedore/
-	https://github.com/openstack/stevedore/
-	https://pypi.org/project/stevedore/
-"
-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"
-
-RDEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx 'doc/source' \
-	'>=dev-python/openstackdocstheme-1.18.1' \
-	'>=dev-python/reno-2.5.0' \
-	'>=dev-python/sphinx-2.0.0'
-
-python_prepare_all() {
-	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -i requirements.txt || die
-
-	# Also known problem, inside venv
-	sed -i -e 's:test_disable_caching_file:_&:' \
-		stevedore/tests/test_cache.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/stevedore/stevedore-4.0.2.ebuild b/dev-python/stevedore/stevedore-4.0.2.ebuild
index 1f1a1237233b..55e2be7f104a 100644
--- a/dev-python/stevedore/stevedore-4.0.2.ebuild
+++ b/dev-python/stevedore/stevedore-4.0.2.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/tinycss2/Manifest b/dev-python/tinycss2/Manifest
index be6dbc289a7f..4986e2443b09 100644
--- a/dev-python/tinycss2/Manifest
+++ b/dev-python/tinycss2/Manifest
@@ -1,6 +1,4 @@
 DIST css-parsing-tests-c5749e51dda3868b3e8062e65a36584c2fec8059.gh.tar.gz 35758 BLAKE2B d834011c3ac774eb79b35e2e74f3854ddc2bb871531a32194041d6f98bde3dc68db67baea25d5463a03e057197144237be69fee4eacfb8edb73167e6e4faf7be SHA512 ef44eb1144a6484f308fabe4187310b2ef0067f328bf5213969d87c475fccae3d716dc66640a0a554ab2a3d7da0efb3a168a288ac6eef7722f3ae46959943b49
-DIST tinycss2-1.1.1.gh.tar.gz 28261 BLAKE2B f86b25be62c4c107dd6dca0b9e49605bc0c04b6ec48c4283fa7a5a33249032dcc3a42bdb9910d6235da4c4ddbf581ef8ebdc404c3bb32eeca7f355c0081e6fb7 SHA512 788b57fbadd299a4d4745bcc1814a2ebf6db76e337f2de2637ffc1610a3dac5a70f01bb9ffbb2afbdb0c638a6b23cc1b2f199eebfbb77d84906a9da5dfecada6
 DIST tinycss2-1.2.1.gh.tar.gz 28351 BLAKE2B 42e1ba559e015654184be94afb02866f32bb6cfbdb0006df29ce64f8715d25a8751acd8380db7ad06bd9f5fdcc694519d2bc3c916dfd09816ba44c18a1f1d750 SHA512 59964398418fd895c6b5bdbdac47edb0bd421aeb8b3939307cb9ff864f50071fc171a9d6bb9b9b0adbbb645beedea0e14720af0d824949236e54b2d1b189bc72
-EBUILD tinycss2-1.1.1-r1.ebuild 1133 BLAKE2B b43e8e5eba7ab75db02c9404698faf668b0d077e7844df97aeaee9b7d4ee7555b629b9961a1496033f18e15380144407ecf057e4f10d8bdd79704056cd9a9769 SHA512 7d6e85f3fc0904922b64c98c55364985691f587a9131e2b6718db7b609c454c33e2e856b318a6b376f49d7ec9b853367b8650c7ec1afbaba2fcfaa2b064ea0d9
-EBUILD tinycss2-1.2.1.ebuild 1098 BLAKE2B 0731d64381d6674685e482bc2907aed4f58f9aa0629e7599341ae52c629ceda00a2368adf31bde66852829a9b9691cf1d05d790b57f1a8884bf029af447bde75 SHA512 6da3f526d30cdf07784060482aa285054ab683d289dde57c5064dc864bf51c6e29e93854240918019b6183c5d7db23a8888b8ed143c048a4afec0a8e2dfd6b54
+EBUILD tinycss2-1.2.1.ebuild 1090 BLAKE2B 90a938a3bea893bc543f571b6739724cf3e0859fbfad32fdcc278645efcdd45dff1744d6791f9b714e451b38a4b6e588da8d87b3ba7de37e4480ee5a78a14a8e SHA512 55b22acf3173a45d2d1756a4b42b7c6d6becb7b2d86a093840f5b4cb167195acd343436a0b816d63caee7d88ad87cce96b08c87d8482664ded152e49f917738c
 MISC metadata.xml 523 BLAKE2B 1590e6af6e994f20bd2087eb2ad0d9a05736f983a123cf5a7373d0f8e2608dbdd8886fe90fd62d978e0abcdcb9deef30a9cf9622302fc2d3d20a137ce1d4b563 SHA512 04c0ea9aa7b4d9317a262bda5486c1495a7978b44e6c87c1c67a44f7846807c2ba5dae6a55f32c21237adb8d25426746da0b0c63dba6668ea2e0f35223859a6c
diff --git a/dev-python/tinycss2/tinycss2-1.1.1-r1.ebuild b/dev-python/tinycss2/tinycss2-1.1.1-r1.ebuild
deleted file mode 100644
index 3a5b3083561f..000000000000
--- a/dev-python/tinycss2/tinycss2-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-CSS_TEST_COMMIT_ID=c5749e51dda3868b3e8062e65a36584c2fec8059
-
-DESCRIPTION="A complete yet simple CSS parser for Python"
-HOMEPAGE="
-	https://www.courtbouillon.org/tinycss2
-	https://github.com/Kozea/tinycss2/
-	https://pypi.org/project/tinycss2/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="
-	https://github.com/Kozea/tinycss2/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? (
-		https://github.com/SimonSapin/css-parsing-tests/archive/${CSS_TEST_COMMIT_ID}.tar.gz
-			-> css-parsing-tests-${CSS_TEST_COMMIT_ID}.gh.tar.gz
-	)
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/webencodings-0.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' pyproject.toml || die
-	if use test; then
-		mv "${WORKDIR}/css-parsing-tests-${CSS_TEST_COMMIT_ID}"/* \
-			tests/css-parsing-tests/ || die
-	fi
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/tinycss2/tinycss2-1.2.1.ebuild b/dev-python/tinycss2/tinycss2-1.2.1.ebuild
index 8263763b5bad..6e06bbf9906b 100644
--- a/dev-python/tinycss2/tinycss2-1.2.1.ebuild
+++ b/dev-python/tinycss2/tinycss2-1.2.1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 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/webencodings-0.4[${PYTHON_USEDEP}]