Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-11-19 10:26:39 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-11-19 10:26:39 +0000
commit: 728c174672e7adf0ca5515c8248a288397715001 (patch)
tree: 762d0906e38d8e8b1b8c94af14a45e7c91426533 /dev-python
parent: 3443dff87b38b06b0053660b0358b34a2a63efee (diff)
download: baldeagleos-repo-728c174672e7adf0ca5515c8248a288397715001.tar.gz
baldeagleos-repo-728c174672e7adf0ca5515c8248a288397715001.tar.xz
baldeagleos-repo-728c174672e7adf0ca5515c8248a288397715001.zip
100 files changed, 761 insertions, 1277 deletions
diff --git a/dev-python/Levenshtein/Levenshtein-0.20.8.ebuild b/dev-python/Levenshtein/Levenshtein-0.20.8.ebuild
index 88a4b8e0fc05..69b633b738f5 100644
--- a/dev-python/Levenshtein/Levenshtein-0.20.8.ebuild
+++ b/dev-python/Levenshtein/Levenshtein-0.20.8.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc"
 
 DEPEND="
 	>=dev-cpp/rapidfuzz-cpp-1.7.0
diff --git a/dev-python/autocommand/Manifest b/dev-python/autocommand/Manifest
index 40298bf7338c..d5b86e98df25 100644
--- a/dev-python/autocommand/Manifest
+++ b/dev-python/autocommand/Manifest
@@ -1 +1,2 @@
 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
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..d4816e85f6b1
--- /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_{7,8,9,10,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 1a3924b54476..26d7125bd92c 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,4 +1,5 @@
 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
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..3d7d652a3b69
--- /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_{7,8,9,10,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 7d8df3af6038..ba36935ff14e 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,4 +1,5 @@
 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
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..40131f66e350
--- /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_{7,8,9,10,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/cachecontrol/cachecontrol-0.12.12.ebuild b/dev-python/cachecontrol/cachecontrol-0.12.12.ebuild
index d72101740bd9..ebd5fa16ef8f 100644
--- a/dev-python/cachecontrol/cachecontrol-0.12.12.ebuild
+++ b/dev-python/cachecontrol/cachecontrol-0.12.12.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index f4df63e290dd..b92436040f7b 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1,3 +1,4 @@
 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
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..3b8994b67196
--- /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_{7,8,9,10,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/cheroot/cheroot-8.6.0-r1.ebuild b/dev-python/cheroot/cheroot-8.6.0-r1.ebuild
index 2a4b9a12693b..e633eefaf2d2 100644
--- a/dev-python/cheroot/cheroot-8.6.0-r1.ebuild
+++ b/dev-python/cheroot/cheroot-8.6.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/cherrypy/cherrypy-18.8.0.ebuild b/dev-python/cherrypy/cherrypy-18.8.0.ebuild
index da2d60fe615b..b8e174ed62bf 100644
--- a/dev-python/cherrypy/cherrypy-18.8.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-18.8.0.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="ssl test"
 
 RDEPEND="
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 4668b5ae75d0..7ea7f8da2bd6 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1 +1,2 @@
 DIST cliff-4.0.0.tar.gz 82758 BLAKE2B 47bc6d15426208c35582e852b7c52620b4fde292f2cc8bba1ba18ca01ef0cb3eda442ec406d2da7abb525fd659e055d08fa64c390a2274a8eea714489435957d SHA512 2886c2697c81c640cd3909c7e00fa50b0e39ed3824c8594d45af30e876cbfa73161be35c668c9bf964a5716bbb2b6e0cfef69526346e1d35156b5dbc24a7dc06
+DIST cliff-4.1.0.tar.gz 82892 BLAKE2B 2d4da66ca6ba86c9f0f33fa36f637363a25ac0ea5c7a1561a4e682769e7ecc97525fca93fde0597062e8f23c4d3334fbf08a305f1c5bb15918e5752a45992d0e SHA512 4bab3404207d21cf8111a6dc1a0ece2c8da5d3bf5ee261b351b7b7ade73f162c4cea225be6fac7444ae95de70d3079e727086fd954fbf56b6d61fb1c7eb4c44a
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..dff5f2c8071c
--- /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_{7,8,9,10,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/construct/construct-2.10.68.ebuild b/dev-python/construct/construct-2.10.68.ebuild
index 9ff73aaab137..252ddb3c254d 100644
--- a/dev-python/construct/construct-2.10.68.ebuild
+++ b/dev-python/construct/construct-2.10.68.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/coverage/coverage-6.5.0-r1.ebuild b/dev-python/coverage/coverage-6.5.0-r1.ebuild
index 11f1a3e9c39e..f1c01b591718 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/cx_Freeze/cx_Freeze-6.12.0.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.12.0.ebuild
index ed87d2ef2782..e8bb319ae75d 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 06cdb778cfd9..a9e520873ea2 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,4 +1,5 @@
 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
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..1155624f33af
--- /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_{7,8,9,10,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 f4d72484dcba..f3e58ec59c9f 100644
--- a/dev-python/ensurepip-pip/Manifest
+++ b/dev-python/ensurepip-pip/Manifest
@@ -1,3 +1 @@
-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
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 06974779641b..6c551b7e9297 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -1 +1,2 @@
 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
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 eb47e9e52350..9f9a06534142 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,3 +1,4 @@
 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
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..4269c46b25ac
--- /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=( python3_{7,8,9,10,11} pypy3 )
+
+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 cf343fcf1f01..cf52da922161 100644
--- a/dev-python/flask-sqlalchemy/Manifest
+++ b/dev-python/flask-sqlalchemy/Manifest
@@ -1,4 +1,2 @@
 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
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 f6032c75ec13..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=( python3_{7,8,9,10,11} pypy3 )
-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 d84de8e9daf7..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=( python3_{7,8,9,10,11} pypy3 )
-
-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 473c04b65428..75010fc0b534 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 391e5030be45..68a7c9ea51bb 100644
--- a/dev-python/hatchling/Manifest
+++ b/dev-python/hatchling/Manifest
@@ -1,2 +1 @@
-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
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 bc09bea27ecf..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=( python3_{7,8,9,10,11} pypy3 )
-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 b9545e7a5c5d..a84c53e961be 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 ac642e673a1c..2be3bb9fe39f 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1 +1,2 @@
 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
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..ec11278e081a
--- /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=( python3_{7,8,9,10,11} pypy3 )
+
+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 a5857e81e1dd..914e42324ab2 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,3 +1,4 @@
 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
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..83479ee1e55e
--- /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_{7,8,9,10,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 7f351eacd69d..f5f2a8f3da05 100644
--- a/dev-python/incremental/Manifest
+++ b/dev-python/incremental/Manifest
@@ -1,2 +1 @@
-DIST incremental-21.3.0.tar.gz 17058 BLAKE2B a6c49d15eb73abbab129e675d937e795a47aca10f74a8d5fc80ebf6575ca996cc7dc16aac9ca02c7a206cf8f59b239f3fc04fc00b28827d0a3c76a88189dabf7 SHA512 b8b50151cd2467e552d9268decadbb839b047cf58a450b72e0437ffc5f9af7d78c20a24193c0668cf48dd6264b852d9cee68e59529018e0ca07825e0c185d1e8
 DIST incremental-22.10.0.tar.gz 18305 BLAKE2B 8e3f19e1825c608d72259729674da2dfa5005a64fb336d3c2144f20fdfd40e84ce1988cb6e00c2c86412e48f71bf2c5bd0d4f226cb49b1ff8e799065dd9fda42 SHA512 23a7572db731d1dd9871d309a02f8a29a92b7f1d897e64a2fe053575e7b486ec87e54d5ae9658eb1a82f90ba36b1b1694b58a991d841553f6cb98983725a49c3
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 dee9048a1ee5..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_{7,8,9,10,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 31e8a523f02a..dee9048a1ee5 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-collections/jaraco-collections-3.8.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.8.0.ebuild
index 0b87c11c5a0c..9d5ee95a8c65 100644
--- a/dev-python/jaraco-collections/jaraco-collections-3.8.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-3.8.0.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/jaraco-classes[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-context/Manifest b/dev-python/jaraco-context/Manifest
index f343f6dd56c7..6bc286838a8a 100644
--- a/dev-python/jaraco-context/Manifest
+++ b/dev-python/jaraco-context/Manifest
@@ -1 +1,2 @@
 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
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..b8b1ea38b869
--- /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_{7,8,9,10,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 0bfbd9d5df80..55f151b4c189 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,4 +1,3 @@
 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
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 7109274d2d7e..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_{7,8,9,10,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 29aa91c70453..25b7f1cfe2cc 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 bf488eebe42d..06dca92e0dff 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,2 +1 @@
-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
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 a30aac14df17..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_{7,8,9,10,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 76c902a490b5..a30aac14df17 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/msgpack/msgpack-1.0.4.ebuild b/dev-python/msgpack/msgpack-1.0.4.ebuild
index 868a94139875..1988ad352151 100644
--- a/dev-python/msgpack/msgpack-1.0.4.ebuild
+++ b/dev-python/msgpack/msgpack-1.0.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="+native-extensions"
 
 # extension code is relying on CPython implementation details
diff --git a/dev-python/numpy/numpy-1.23.4.ebuild b/dev-python/numpy/numpy-1.23.4.ebuild
index 50cfaab79d39..36139a9c3400 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/objgraph/objgraph-3.5.0-r1.ebuild b/dev-python/objgraph/objgraph-3.5.0-r1.ebuild
index b9800333e413..219eaa0fa2af 100644
--- a/dev-python/objgraph/objgraph-3.5.0-r1.ebuild
+++ b/dev-python/objgraph/objgraph-3.5.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest
index 3c49b81829c8..13af0bc6a3ef 100644
--- a/dev-python/pastedeploy/Manifest
+++ b/dev-python/pastedeploy/Manifest
@@ -1,2 +1 @@
-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
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 98bfae41c8f8..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_{7,8,9,10,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 c7fbccd70c46..1798e8babcc1 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 442d69c11b37..5620091e7caa 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,3 +1,2 @@
-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
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 d20be7defd4c..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_{7,8,9,10,11} )
-
-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 99028fc767a1..d20be7defd4c 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 b697cd9d7b92..fbee9bbfc87a 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,6 +1,4 @@
-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
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 22103caa8a6c..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_{7,8,9,10,11} )
-PYTHON_COMPAT=( python3_{7,8,9,10,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 5e2c3bc02503..8d65470a354c 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 77988964211a..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_{7,8,9,10,11} )
-PYTHON_COMPAT=( python3_{7,8,9,10,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 0ab86e722a22..2e500c89babd 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,2 +1 @@
-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
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 53bddf83fce4..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_{7,8,9,10,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 d1965907d78a..bb00fc584979 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/psutil-5.9.3.ebuild b/dev-python/psutil/psutil-5.9.3.ebuild
index 868843ea80d0..80f85dc738b9 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/pyatspi/pyatspi-2.46.0.ebuild b/dev-python/pyatspi/pyatspi-2.46.0.ebuild
index d86500cde187..98d8f8abd610 100644
--- a/dev-python/pyatspi/pyatspi-2.46.0.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.46.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 # Note: only some of the tests are GPL-licensed, everything else is LGPL
 LICENSE="LGPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pymilter/metadata.xml b/dev-python/pymilter/metadata.xml
index 5ac37da1506c..e7fb26a48c36 100644
--- a/dev-python/pymilter/metadata.xml
+++ b/dev-python/pymilter/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>gentoo@seichter.de</email>
-  <name>Ralph Seichter</name>
- </maintainer>
- <maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
- </maintainer>
  <longdescription>
 		A python extension module to enable python scripts to attach
 		to sendmail’s libmilter functionality. Additional python
diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest
index 6c4aaf7288cc..d918e4b4a498 100644
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@@ -1,2 +1 @@
-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
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 74c9cd69a23d..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_{7,8,9,10,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 76388155c8d3..294542c5c741 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 c4e0c945f72b..69d38d493d4b 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,2 +1 @@
-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
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 0db7b3fc19fd..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_{7,8,9,10,11} 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 65e8e801f511..bcd30d3d5506 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 13714ea5f0aa..31422edc4d80 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,2 +1 @@
-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
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 3fd875ab028e..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_{7,8,9,10,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 e905cf25bd40..3fd875ab028e 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 962fe829659c..d8a7417dd4fd 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -1 +1,2 @@
 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
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..424fb1909a30
--- /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_{7,8,9,10,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/python-systemd/Manifest b/dev-python/python-systemd/Manifest
index 98ada322756b..995668ddefba 100644
--- a/dev-python/python-systemd/Manifest
+++ b/dev-python/python-systemd/Manifest
@@ -1,2 +1 @@
-DIST python-systemd-234.tar.gz 53900 BLAKE2B 2658ee7083036ed8259e5f4ad0714ea15227ee836ad34c7fbbdb55dd9df48751b8d9998350d789b4f47e78fe7b4a7134e12d637e5a6ebeb29a0b31e5a4575d91 SHA512 164e34ba46827711e9c6ff9ed58b2706d9a22abfc7001de030ed7d463d8ddf783eb5fee93b207c29950a3c566018cc3f1a21a549421cf3e05c1287b433367eb2
 DIST python-systemd-235.gh.tar.gz 59858 BLAKE2B 8dbf112773dce4dfe9fb2b0e660a349481fa29c9532c5aa2d125e5bfc255b2408f63b5bd873b6fee9ebbad775ecfaf32497593b17052189797403fa31b05fd6f SHA512 f1286a477200cc7b4d2c44b43452da576e8e660925711466659795775bcee44796688e1ede6cc22e61cb5b03e631c396d22f9a133327ae1147506bce09bab47f
diff --git a/dev-python/python-systemd/files/python-systemd-234-fix-py3.10.patch b/dev-python/python-systemd/files/python-systemd-234-fix-py3.10.patch
deleted file mode 100644
index 52045b4475e1..000000000000
--- a/dev-python/python-systemd/files/python-systemd-234-fix-py3.10.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From c71bbac357f0ac722e1bcb2edfa925b68cca23c9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Thu, 12 Nov 2020 16:55:56 +0100
-Subject: [PATCH] reader: make PY_SSIZE_T_CLEAN
-
----
- systemd/_reader.c | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/systemd/_reader.c b/systemd/_reader.c
-index 8de7f6a..3b6a4d0 100644
---- a/systemd/_reader.c
-+++ b/systemd/_reader.c
-@@ -18,7 +18,12 @@
-   along with python-systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
- 
-+#define PY_SSIZE_T_CLEAN
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wredundant-decls"
- #include <Python.h>
-+#pragma GCC diagnostic pop
-+
- #include <structmember.h>
- #include <datetime.h>
- #include <time.h>
-@@ -710,11 +715,17 @@ PyDoc_STRVAR(Reader_add_match__doc__,
-              "Match is a string of the form \"FIELD=value\".");
- static PyObject* Reader_add_match(Reader *self, PyObject *args, PyObject *keywds) {
-         char *match;
--        int match_len, r;
-+        Py_ssize_t match_len;
-+        int r;
-         if (!PyArg_ParseTuple(args, "s#:add_match", &match, &match_len))
-                 return NULL;
- 
--        r = sd_journal_add_match(self->j, match, match_len);
-+        if (match_len > INT_MAX) {
-+                set_error(-ENOBUFS, NULL, NULL);
-+                return NULL;
-+        }
-+
-+        r = sd_journal_add_match(self->j, match, (int) match_len);
-         if (set_error(r, NULL, "Invalid match") < 0)
-                 return NULL;
- 
diff --git a/dev-python/python-systemd/python-systemd-234-r2.ebuild b/dev-python/python-systemd/python-systemd-234-r2.ebuild
deleted file mode 100644
index fecdcd8a9768..000000000000
--- a/dev-python/python-systemd/python-systemd-234-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2015-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for native access to the systemd facilities"
-HOMEPAGE="https://github.com/systemd/python-systemd"
-SRC_URI="https://github.com/systemd/python-systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~s390 sparc x86"
-
-DEPEND="sys-apps/systemd:0="
-RDEPEND="${DEPEND}
-	!sys-apps/systemd[python(-)]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-py3.10.patch
-)
-
-distutils_enable_tests pytest
-
-python_compile() {
-	# https://bugs.gentoo.org/690316
-	distutils-r1_python_compile -j1
-}
-
-python_test() {
-	unset NOTIFY_SOCKET
-	cd "${T}" || die
-	epytest --pyargs systemd -o cache_dir="${T}"
-}
diff --git a/dev-python/rapidfuzz/rapidfuzz-2.13.2.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.13.2.ebuild
index a97256de4b6e..4646fa05a2d5 100644
--- a/dev-python/rapidfuzz/rapidfuzz-2.13.2.ebuild
+++ b/dev-python/rapidfuzz/rapidfuzz-2.13.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc"
 
 # all these are header-only libraries
 DEPEND="
diff --git a/dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild b/dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild
index 3ab979260a27..46ad223fdadf 100644
--- a/dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild
+++ b/dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild
@@ -20,4 +20,4 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc"
diff --git a/dev-python/repoze-lru/repoze-lru-0.7-r3.ebuild b/dev-python/repoze-lru/repoze-lru-0.7-r3.ebuild
index 9a5acf0fdce3..70202ea3bebb 100644
--- a/dev-python/repoze-lru/repoze-lru-0.7-r3.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.7-r3.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	!dev-python/namespace-repoze
diff --git a/dev-python/routes/routes-2.5.1-r2.ebuild b/dev-python/routes/routes-2.5.1-r2.ebuild
index 6cd5a0d83cda..fdd0a7dba7c9 100644
--- a/dev-python/routes/routes-2.5.1-r2.ebuild
+++ b/dev-python/routes/routes-2.5.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/repoze-lru-0.3[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 126086f5dd88..d86e67dd06d3 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1 +1,2 @@
 DIST setuptools-65.5.1.tar.gz 2616576 BLAKE2B 84ecb833305e06861d4e0ab5377235f6a5e3a109db9d5296f19f7d67840ba220847a18e6e2529265aadec265cabc8ed3d43f9ebf755f8eb8eacb092291b9248d SHA512 e75eb7fdb0bc5ffdc76ed864cf753c2672d097a60f8747ac5cd40a49276d33df31fb619877234b4c22693b627d9978ecdd48a5c6c48aa0bbb856d48dec70fb0a
+DIST setuptools-65.6.0.tar.gz 2616763 BLAKE2B 76b02b8b1fb07632c8934be568337b859c24cbb6680683608c8cce5c5ba2fd5c782c7ec120712ce76ebfc00108ebfd52b9297ef3197248ee34f90a239f81d953 SHA512 2896a00f47dbc7b1661facb2b96a97349b96e5cf0d86b63cd9dcc0e190b73d0440c77d1c54b63618103ac426292ef0f27c2de1103de9004bdf7415c21b24cf7a
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..f8e97471f8cc
--- /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_{7,8,9,10,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 c9d4ef56a475..eff8b03d6e5e 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,3 +1,2 @@
 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
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 944b14a51158..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_{7,8,9,10,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 ba2d1a1a5813..3576e13653d5 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/sqlalchemy-1.4.43.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.43.ebuild
index b0ee1b2543de..a1edb54b5ff0 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 46ae668de239..5ed4d9d7e27e 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,5 +1,3 @@
-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
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 d8c9e6866e4b..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_{7,8,9,10,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 ee7704e0a34d..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_{7,8,9,10,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 ee7704e0a34d..cabe5c08a293 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 35666e532ce5..e888817561bc 100644
--- a/dev-python/tinycss2/Manifest
+++ b/dev-python/tinycss2/Manifest
@@ -1,3 +1,2 @@
 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
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 3357630a1232..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_{7,8,9,10,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 27cd1b461db5..285fb0dab6a2 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}]
diff --git a/dev-python/vncdotool/vncdotool-1.0.0-r1.ebuild b/dev-python/vncdotool/vncdotool-1.0.0-r1.ebuild
index d8ca115aa69d..b32042d91360 100644
--- a/dev-python/vncdotool/vncdotool-1.0.0-r1.ebuild
+++ b/dev-python/vncdotool/vncdotool-1.0.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sibson/vncdotool/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 # A lot of errors such as the following appear
 # pexpect.exceptions.ExceptionPexpect: The command was not found or was not executable: vncev.
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-11-19 10:26:39 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-11-19 10:26:39 +0000
commit	728c174672e7adf0ca5515c8248a288397715001 (patch)
tree	762d0906e38d8e8b1b8c94af14a45e7c91426533 /dev-python
parent	3443dff87b38b06b0053660b0358b34a2a63efee (diff)
download	baldeagleos-repo-728c174672e7adf0ca5515c8248a288397715001.tar.gz baldeagleos-repo-728c174672e7adf0ca5515c8248a288397715001.tar.xz baldeagleos-repo-728c174672e7adf0ca5515c8248a288397715001.zip