Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-09-07 05:35:16 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-09-07 05:35:16 +0000
commit: d017a0c14d36b6a7f9ce0f9392298c5f513ebe6f (patch)
tree: dba71c71c5b139ef35f6d164419519522a1d79e9 /dev-python
parent: 87c86c88d888f47594a8fc0060e8cdc373df1591 (diff)
download: baldeagleos-repo-d017a0c14d36b6a7f9ce0f9392298c5f513ebe6f.tar.gz
baldeagleos-repo-d017a0c14d36b6a7f9ce0f9392298c5f513ebe6f.tar.xz
baldeagleos-repo-d017a0c14d36b6a7f9ce0f9392298c5f513ebe6f.zip
97 files changed, 559 insertions, 1541 deletions
diff --git a/dev-python/PyPDF2/PyPDF2-2.9.0.ebuild b/dev-python/PyPDF2/PyPDF2-2.9.0.ebuild
index cf8852094514..f3a725b71dc1 100644
--- a/dev-python/PyPDF2/PyPDF2-2.9.0.ebuild
+++ b/dev-python/PyPDF2/PyPDF2-2.9.0.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/ansible-runner/Manifest b/dev-python/ansible-runner/Manifest
index dddca394997a..648a6e00631e 100644
--- a/dev-python/ansible-runner/Manifest
+++ b/dev-python/ansible-runner/Manifest
@@ -1,2 +1,2 @@
-DIST ansible-runner-1.4.9.tar.gz 48022 BLAKE2B 9d413a3502450ad964301fb22c280e6474794604a4d8a2d3bbbc92a1d2e7568351feabce3e9e6790916032ffb72881812c0ef9456a589e7af7cab1dea3d3182c SHA512 198091472c74ab2641dd3a72afa90fcdb4b120c0a10518b55055933f3ae9934bfe229a6a006e84646ce491ce3eec828f9ffa692e6b215398e64aa55afbcb3bae
-DIST ansible-runner-2.2.1.tar.gz 144297 BLAKE2B 07a1d4ce673325ab224aa97a2974ea0180cd04e09bd1e3d944d228fb9facb66161ab18f79181257753bf476c1065f824a8a7a699fe5acc546c1dd55d64ad9cc2 SHA512 65364b9e8c92e8bc1ee51b8773c75ff8c171c88716e643b94b041581782d6eacc94b6498ea7360fe20a31d107aee9ed96d0885dc300689c4bb94d5db3dca0057
+DIST ansible-runner-2.1.0.tar.gz 158798 BLAKE2B b6a1a50c1b66210c9a29b0b52e798fc6a922a840664c5924e5234a3f5ec2cea32a137e676bae732115cb10a99155df660281233fe5bd10c10282926d0ec92abe SHA512 c96a7a122e4fdc02d6ebab79bbf3f2d9f96eb6c966789deae5c36e9b4c55aa9fede994b22309bdb18a8a4f1c9a615f9b454f01c4170c4d0c1fb5e447da52cf00
+DIST ansible-runner-2.2.1.tar.gz 172121 BLAKE2B b4bb0917570b2b7ba4a7f44bf0276713eb3842ec8a9db62ec5bec8f90e91603b69cf2651f16dd150c8267b3ff25529d4c1bbcd628a26564b74362325b9c75ba8 SHA512 e9ba5c7afd3d8542af37bd9ef3ba7a417bd7ebb430b2dca6f2bb6289633dc89a14e7beb39236f75b75b802c6fc07501c6e6fa06102c69037e34568c396d6642d
diff --git a/dev-python/ansible-runner/ansible-runner-1.4.9.ebuild b/dev-python/ansible-runner/ansible-runner-2.1.0.ebuild
index ead3af087535..cdbb2994544b 100644
--- a/dev-python/ansible-runner/ansible-runner-1.4.9.ebuild
+++ b/dev-python/ansible-runner/ansible-runner-2.1.0.ebuild
@@ -11,6 +11,8 @@ inherit distutils-r1
 DESCRIPTION="A tool and python library that helps when interfacing with Ansible"
 HOMEPAGE="https://github.com/ansible/ansible-runner"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+# TODO: fix broken tests
+RESTRICT+=" test"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -33,6 +35,6 @@ BDEPEND="
 distutils_enable_tests pytest
 
 python_prepare_all() {
-	sed -e 's|find_packages()|find_packages(exclude=["test", "test.*"])|' -i setup.py || die
+	sed -e '/cov/d' -i pytest.ini || die
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/ansible-runner/ansible-runner-2.2.1.ebuild b/dev-python/ansible-runner/ansible-runner-2.2.1.ebuild
index d0b7b60e2899..cdbb2994544b 100644
--- a/dev-python/ansible-runner/ansible-runner-2.2.1.ebuild
+++ b/dev-python/ansible-runner/ansible-runner-2.2.1.ebuild
@@ -1,5 +1,6 @@
-# Copyright 2022 Liguros Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
@@ -9,9 +10,9 @@ inherit distutils-r1
 
 DESCRIPTION="A tool and python library that helps when interfacing with Ansible"
 HOMEPAGE="https://github.com/ansible/ansible-runner"
-SRC_URI="
-	https://github.com/ansible/ansible-runner/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+# TODO: fix broken tests
+RESTRICT+=" test"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -19,7 +20,6 @@ KEYWORDS="~amd64"
 
 RDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
 	dev-python/python-daemon[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -35,13 +35,6 @@ BDEPEND="
 distutils_enable_tests pytest
 
 python_prepare_all() {
-	sed -e 's|find_packages()|find_packages(exclude=["test", "test.*"])|' -i setup.py || die
-	git init -q || die
-	git add . || die
-	git config user.email "dev@liguros.net" || die
-	git config user.name "Liguros development" || die
-	git commit -m "init" || die
-	git tag -a "${PV}" -m "${PV}" || die
-
+	sed -e '/cov/d' -i pytest.ini || die
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/ansible-runner/metadata.xml b/dev-python/ansible-runner/metadata.xml
index 9387d37e9fb6..73f9f867647a 100644
--- a/dev-python/ansible-runner/metadata.xml
+++ b/dev-python/ansible-runner/metadata.xml
@@ -17,8 +17,7 @@
 		interface abstraction to Ansible.
 	</longdescription>
  <upstream>
-  <remote-id type="cpe">cpe:/aredhat:ansible_runner</remote-id>
   <bugs-to>https://github.com/ansible/ansible-runner/issues</bugs-to>
  </upstream>
- <origin>ports</origin>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/apsw/apsw-3.39.2.1.ebuild b/dev-python/apsw/apsw-3.39.2.1-r1.ebuild
index d5f332da9b81..b28adf88c615 100644
--- a/dev-python/apsw/apsw-3.39.2.1.ebuild
+++ b/dev-python/apsw/apsw-3.39.2.1-r1.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 python_compile() {
 	# Needed for e.g. bug #851741
 	# Enable column-metadata to match dev-db/sqlite
-	distutils-r1_python_compile --enable=load_extension --enable=column_metadata
+	distutils-r1_python_compile --enable=load_extension,column_metadata
 }
 
 python_test() {
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 378db8a1911b..5980da730fda 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -3,3 +3,4 @@ DIST astroid-2.12.2.gh.tar.gz 430857 BLAKE2B 8b34366368718cd4329298bdff3b761cab5
 DIST astroid-2.12.3.gh.tar.gz 432731 BLAKE2B 276537b9a97bfbba2177538c6546a8e55fd1a144dde2fc2104460b0867d5439433e10be58bdac4f7da17a22e61c9484045ee979b8de11dcb485b9979a50f1e30 SHA512 5927c54d2ae000a96615a7b81f83b39bd8ce4b15e6652b494d18cf085ed455fb9e59b9c0c35ba8de7e2ea12c036e06ceb741dacdf882158cfd7e9ed3750dad88
 DIST astroid-2.12.4.gh.tar.gz 432812 BLAKE2B 1efd0af2b8695411aba0c1db21c464c742058c662d14b2a338c577f41f13c582f24dd5445ee2e2aa51f63096ce086d601750b2894280fb9f054f734165755dff SHA512 55a585dad9fcd319845fc2b16536867a5c0552b7f3a87b5ac40cc069a43a25a1de2862ec6cd2b6cd8e9dbd78efd508995152012399722056949ce460c23f57a0
 DIST astroid-2.12.5.gh.tar.gz 433354 BLAKE2B dfe643ebe77200664bd630c1c5795809c8bca5ff0ad01d9361b6df302c33ab42529f33148649fada34ed6dc768c63f49c2eb2abc771ff0e13404146bee5e0fa6 SHA512 4bae868e21ef4751fd195b2990ffb3c9781e51654e9f327ee5bc220b53d553fb13744a2d683e30f1cb929ce1ec4cfd31382a4a42e867dd7a75a118202ccf377b
+DIST astroid-2.12.8.gh.tar.gz 434545 BLAKE2B 3ad3ff1a7e1a0c9433387b4167041adcc405e9b6d0fc0a850073960db9e7458d0b6989e3a0f78679ba4730f1da2fe9d35de3f984d2c79532d9f96c2a726b1f0e SHA512 76052caaef27f983751e3abfb44c38ad497a4d2d659521ee55c99080c9cacea90cf3603d6468b01cc9b127cd8318157faae56bb151c6449145c70545719c6c51
diff --git a/dev-python/astroid/astroid-2.12.8.ebuild b/dev-python/astroid/astroid-2.12.8.ebuild
new file mode 100644
index 000000000000..cd9a4873f0ea
--- /dev/null
+++ b/dev-python/astroid/astroid-2.12.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Version specified in pyproject.toml
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
+	<dev-python/wrapt-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+		tests/unittest_brain_dataclasses.py::test_pydantic_field
+		tests/unittest_brain.py::SixBrainTest::test_from_imports
+		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
+		# some problem with warnings (our options?)
+		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
+		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
+		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker
+}
diff --git a/dev-python/autobahn/autobahn-22.7.1.ebuild b/dev-python/autobahn/autobahn-22.7.1.ebuild
index edeb5f071acd..560099d180d8 100644
--- a/dev-python/autobahn/autobahn-22.7.1.ebuild
+++ b/dev-python/autobahn/autobahn-22.7.1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 IUSE="test xbr"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index 4b1105c6afb0..a4d5566e86b3 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -1,2 +1 @@
-DIST bottle-0.12.21.tar.gz 74229 BLAKE2B 88674389d2c087a7416443d031995ee923a98b790eb85d81b625f11b2fb0baee35d90a3ee2dba5b9d4744a343a34396a50edef0f85a2d6f4f0f4da95bae31b5b SHA512 3d621f6684f439a4a5718ad25e8b45eb0d1100cd565ec5b797adf67141e01d835cde671e687f5515cb6eab69bb465e9c7d004131634609266c2e1b69b0adbf43
 DIST bottle-0.12.23.tar.gz 73965 BLAKE2B ccd3dc3aad5c4c8b6899f55f03550cf9178e51788c27ece9808e1cff92693cc09dab145be16f814d29dae02ce53374a0470b2c4b032bc66a0ec2b1a11ec5ca44 SHA512 0550aa95680dd79d9c63c5de854845377183c86015893d9ee4e67126eca201582ef79d40ff0d1cbe79fe8a250118a775c63102475e337e18cfc1a65afe18f62a
diff --git a/dev-python/bottle/bottle-0.12.21.ebuild b/dev-python/bottle/bottle-0.12.21.ebuild
deleted file mode 100644
index 929002b31639..000000000000
--- a/dev-python/bottle/bottle-0.12.21.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A fast and simple micro-framework for small web-applications"
-HOMEPAGE="
-	https://bottlepy.org/
-	https://github.com/bottlepy/bottle/
-	https://pypi.org/project/bottle/
-"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/mako[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/bottle-0.12.8-py3.5-backport.patch
-	"${FILESDIR}"/bottle-0.12.19-py311.patch
-)
-
-python_prepare_all() {
-	sed -i -e '/scripts/d' setup.py || die
-
-	# Remove test file requring connection to network
-	rm test/test_server.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" test/testall.py || die "tests failed under ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "Templating support" dev-python/mako
-	elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
-	elog "we do as most other distros and do not install the script anymore."
-	elog "If you do want/have to call it directly rather than through your app,"
-	elog "please use the following instead:"
-	elog '  `python -m bottle`'
-}
diff --git a/dev-python/bottle/bottle-0.12.23.ebuild b/dev-python/bottle/bottle-0.12.23.ebuild
index 1e3dd38b210b..e581361e8f39 100644
--- a/dev-python/bottle/bottle-0.12.23.ebuild
+++ b/dev-python/bottle/bottle-0.12.23.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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/bottle/files/bottle-0.12.19-py311.patch b/dev-python/bottle/files/bottle-0.12.19-py311.patch
deleted file mode 100644
index c7c36c3a37ee..000000000000
--- a/dev-python/bottle/files/bottle-0.12.19-py311.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 232f671fd0a28d435550afc4e2a9fde63c9e0db2 Mon Sep 17 00:00:00 2001
-From: Riley Banks <waultah@gmail.com>
-Date: Sun, 11 Oct 2015 10:21:43 +0100
-Subject: [PATCH] Implement getargspec using inspect.Signature
-
----
- bottle.py | 20 +++++++++++++++++++-
- 1 file changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/bottle.py b/bottle.py
-index 9806efd..18ed730 100644
---- a/bottle.py
-+++ b/bottle.py
-@@ -41,9 +41,27 @@ import base64, cgi, email.utils, functools, hmac, itertools, mimetypes,\
- from datetime import date as datedate, datetime, timedelta
- from tempfile import TemporaryFile
- from traceback import format_exc, print_exc
--from inspect import getargspec
- from unicodedata import normalize
- 
-+# inspect.getargspec was removed in Python 3.6, use
-+# Signature-based version where we can (Python 3.3+)
-+try:
-+    from inspect import signature
-+    def getargspec(func):
-+        params = signature(func).parameters
-+        args, varargs, keywords, defaults = [], None, None, []
-+        for name, param in params.items():
-+            if param.kind == param.VAR_POSITIONAL:
-+                varargs = name
-+            elif param.kind == param.VAR_KEYWORD:
-+                keywords = name
-+            else:
-+                args.append(name)
-+                if param.default is not param.empty:
-+                    defaults.append(param.default)
-+        return (args, varargs, keywords, tuple(defaults) or defaults)
-+except ImportError:
-+    from inspect import getargspec
- 
- try: from simplejson import dumps as json_dumps, loads as json_lds
- except ImportError: # pragma: no cover
--- 
-2.35.1
-
diff --git a/dev-python/bottle/files/bottle-0.12.8-py3.5-backport.patch b/dev-python/bottle/files/bottle-0.12.8-py3.5-backport.patch
deleted file mode 100644
index 86e1ac04bc41..000000000000
--- a/dev-python/bottle/files/bottle-0.12.8-py3.5-backport.patch
+++ /dev/null
@@ -1,36 +0,0 @@
- test/test_environ.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/test/test_environ.py b/test/test_environ.py
-old mode 100755
-new mode 100644
-index 2b8079b..2feebe3
---- a/test/test_environ.py
-+++ b/test/test_environ.py
-@@ -592,7 +592,7 @@ class TestResponse(unittest.TestCase):
-         r.set_cookie('name2', 'value', max_age=datetime.timedelta(days=1))
-         cookies = sorted([value for name, value in r.headerlist
-                    if name.title() == 'Set-Cookie'])
--        self.assertEqual(cookies[0], 'name1=value; Max-Age=5')
-+        self.assertEqual(cookies[0].lower(), 'name1=value; max-age=5')
-         self.assertEqual(cookies[1], 'name2=value; Max-Age=86400')
- 
-     def test_set_cookie_expires(self):
-@@ -602,7 +602,7 @@ class TestResponse(unittest.TestCase):
-         r.set_cookie('name2', 'value', expires=datetime.datetime(1970,1,1,0,0,43))
-         cookies = sorted([value for name, value in r.headerlist
-                    if name.title() == 'Set-Cookie'])
--        self.assertEqual(cookies[0], 'name1=value; expires=Thu, 01 Jan 1970 00:00:42 GMT')
-+        self.assertEqual(cookies[0].lower(), 'name1=value; expires=thu, 01 jan 1970 00:00:42 gmt')
-         self.assertEqual(cookies[1], 'name2=value; expires=Thu, 01 Jan 1970 00:00:43 GMT')
- 
-     def test_delete_cookie(self):
-@@ -611,7 +611,7 @@ class TestResponse(unittest.TestCase):
-         response.delete_cookie('name')
-         cookies = [value for name, value in response.headerlist
-                    if name.title() == 'Set-Cookie']
--        self.assertTrue('name=;' in cookies[0])
-+        self.assertTrue('Max-Age=-1' in cookies[0])
- 
-     def test_set_header(self):
-         response = BaseResponse()
diff --git a/dev-python/cachecontrol/cachecontrol-0.12.11.ebuild b/dev-python/cachecontrol/cachecontrol-0.12.11.ebuild
index 9de707149b3a..3d034883d6fe 100644
--- a/dev-python/cachecontrol/cachecontrol-0.12.11.ebuild
+++ b/dev-python/cachecontrol/cachecontrol-0.12.11.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
 
 RDEPEND="
 	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index ed21a1baf63c..fc5e8c8a4432 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -2,3 +2,4 @@ DIST cfn-lint-0.61.5.gh.tar.gz 9580886 BLAKE2B 0e83a604bc8761cd6007039cc28d90e47
 DIST cfn-lint-0.62.0.gh.tar.gz 9610430 BLAKE2B fdeed685abab1bb701698b02ba961d0460c2fbf631ee6c8c51d17e8087bdbd2a26d366afd6916ff118e047bc1e45e0ac4124cf5140b7dede5cb116e5e49bec3e SHA512 830f3929330cbb6d3ae74c9d172c4540272def94bae4f5a0d181fd41688479bf9e9a82ccb9ccea20b823b8580743722a8cb551d790cab92322c7e472e679d28a
 DIST cfn-lint-0.63.0.gh.tar.gz 9613588 BLAKE2B 96f36310b9201e39a03fb9ca4e102feed68bd71c6af10f48875055d8e5ce42dff61772d5ba702b3f390a49c5e10077a70eb86206145c132d03f6998ea3f26f4a SHA512 daa8412254234d36b3e65a27fc93dc6af2283830afa6de58c979759b7dc02ec220ebf18b1d116f38356a368223efec787135b36aaac4d2a6444ec6820a0303fb
 DIST cfn-lint-0.63.2.gh.tar.gz 9672817 BLAKE2B dcd445c2372bf044bc4eab4b33056d2113914cdeeb1a2b376643cc4bbb3d92dcfdaaf2e6aa5f0d0473be00b42ecea0eda2a5ae3fa493d4e648be12db81b9d9e7 SHA512 d9bff0c43f7c2b710536fb7212e3d78d3827d7838ef8246767625c3de1a2ee0e5056df42b6b94e0efd7e7b2933d477a9962e0e3d53a78a3cca774fd52706a330
+DIST cfn-lint-0.64.0.gh.tar.gz 9792738 BLAKE2B f74d8131d46c5fc1cf78fcf7e3a6620d1c19288437c3eda896fe357518aa91056826e7c80c860c636a7394a021852b4ef93451d0bcf03efb1b7b1da41f0b1652 SHA512 4e4cc098f0f7024456278e5994b0508408cb70230934ced084c67ddecae2070c1686430b367b0c812274d40201256a9f8ca0d30c208ee00c2435dcad09419d80
diff --git a/dev-python/cfn-lint/cfn-lint-0.64.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.64.0.ebuild
new file mode 100644
index 000000000000..a98bb23dc7cd
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.64.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.47.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	test/unit/module/test_template.py::TestTemplate::test_build_graph
+	# requires git repo
+	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+	# Internet
+	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/clang-python/clang-python-15.0.0.ebuild b/dev-python/clang-python/clang-python-15.0.0.ebuild
index 04eb349df22e..e347899e1291 100644
--- a/dev-python/clang-python/clang-python-15.0.0.ebuild
+++ b/dev-python/clang-python/clang-python-15.0.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/dask/dask-2022.8.1.ebuild b/dev-python/dask/dask-2022.8.1.ebuild
index 6ab4fc5376db..c50dd60bb37c 100644
--- a/dev-python/dask/dask-2022.8.1.ebuild
+++ b/dev-python/dask/dask-2022.8.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
diff --git a/dev-python/django/django-4.1.ebuild b/dev-python/django/django-4.1.ebuild
index b8c39fedf12f..da914b835eb4 100644
--- a/dev-python/django/django-4.1.ebuild
+++ b/dev-python/django/django-4.1.ebuild
@@ -28,7 +28,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 608d2d03566f..18ae453b4afc 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,3 +1,2 @@
-DIST Flask-2.1.3.tar.gz 630206 BLAKE2B 83c876fe94d2cb1b35677227214664b35b6908270097d3ef0e1150a7259cdce82fb91fa6ba7cc90e819623bb9cc79f8254cc5688c6dd1e1dedaa673f23591bfb SHA512 6289bcaa295265c501fda1292b496911768525acf4155c856e14479a213aec4ca50a45ddd81b30ccd31fd684da1942ec10400f2dc8280ceff6ded9baf55494e5
 DIST Flask-2.2.1.tar.gz 687433 BLAKE2B 9d5fbc6827110882c64102f596b1d272bf5b16fd5540eedf0bad52f4456b54c3ab53e474ec74bb0e7d3cc7cfc26a22d19fd908d0973b94e64b47ee3a66c5a4e6 SHA512 845857cd6441e935a5274f362708c1e84654f757b0412bb57dd1235943d1d0562b081b53e77920ab9891bbe6810a06f7564e828cda472844413f7a1249335d1a
 DIST Flask-2.2.2.tar.gz 677389 BLAKE2B a7385c619dee7c25538a69bc514393c6efa2ee3cbd8394cde28c64a41d7252b4f12896728bf76a4b8bf5247cf19614bd9b8f94d7d82f22a6a8073011286758fc SHA512 d330398829cb0393e07a4dcf495a3939f0e8f7962c0a517fc866d333425dffe1ce8fd26e39a40445259028d46eff4566e97b3f5eba0d6bddf14b9d7bac138945
diff --git a/dev-python/flask/flask-2.1.3.ebuild b/dev-python/flask/flask-2.1.3.ebuild
deleted file mode 100644
index a1a0626df3a9..000000000000
--- a/dev-python/flask/flask-2.1.3.ebuild
+++ /dev/null
@@ -1,63 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
-HOMEPAGE="
-	https://palletsprojects.com/p/flask/
-	https://github.com/pallets/flask/
-	https://pypi.org/project/Flask/
-"
-MY_PN="Flask"
-MY_P="${MY_PN}-${PV}"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/click-8.0[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-2.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-3.6.0[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
-		!!dev-python/shiboken2
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/pallets-sphinx-themes \
-	dev-python/sphinx-issues \
-	dev-python/sphinx-tabs \
-	dev-python/sphinxcontrib-log_cabinet
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p no:httpbin
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask/flask-2.2.1.ebuild b/dev-python/flask/flask-2.2.1.ebuild
index be1528a9943b..152011277643 100644
--- a/dev-python/flask/flask-2.2.1.ebuild
+++ b/dev-python/flask/flask-2.2.1.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/frozenlist/frozenlist-1.3.1.ebuild b/dev-python/frozenlist/frozenlist-1.3.1.ebuild
index b321fc37f3b0..caa4d0be85d7 100644
--- a/dev-python/frozenlist/frozenlist-1.3.1.ebuild
+++ b/dev-python/frozenlist/frozenlist-1.3.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/google-auth/google-auth-2.10.0.ebuild b/dev-python/google-auth/google-auth-2.10.0.ebuild
index b54cee0615a6..eacb2920974f 100644
--- a/dev-python/google-auth/google-auth-2.10.0.ebuild
+++ b/dev-python/google-auth/google-auth-2.10.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/humanize/humanize-4.3.0.ebuild b/dev-python/humanize/humanize-4.3.0.ebuild
index c95640b18f8b..a9fc518d372a 100644
--- a/dev-python/humanize/humanize-4.3.0.ebuild
+++ b/dev-python/humanize/humanize-4.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 8d500ee5a0f4..18929650288f 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,6 +1,3 @@
-DIST hypothesis-6.53.0.gh.tar.gz 9323355 BLAKE2B 589cd4803351e72cc1896453e5e548bb6fb5f998032bce91708e02f3c8ff5d288ec76d65eeffde5fa31b6b86fbb3ad81dfe3eebaaac841f197de3a07acfa12bd SHA512 ab4de3764ca3ce8e5e50966ea94fcadd85e7c9f170dbbd17383b5516528e091ebfe3b06846513ee77a1f7a2e827236d323c12cc120cac421ec7aa9f3a2ca5e4a
-DIST hypothesis-6.54.1.gh.tar.gz 9324403 BLAKE2B 897fa4901a5c5c0e32c4197020702dbe5d85a5ada79f52b66fc7f19180a32f4dce54f5300722f500fb560766e1ff76b5df648be6be0f229ece4b3aa0af856fc3 SHA512 ba4a7a3f5daa7437e903604d26a9dd0e4ce77d0a44a2e81fec5620f48a5f6a9080b5e5401fa1f7ee6c66d4e1d51cca095ce7e74999b0439b5a8a0c2d26f64464
-DIST hypothesis-6.54.2.gh.tar.gz 9324746 BLAKE2B 25e3effa9667e8b6c57dff0ed00c14cc36385678475a1a1ac9fd30d2e293ea3a49d76ad34e391b33bad7214ce97b5d23aebedcb5d7f74686f3182a72e133416f SHA512 f53d589426b2340f6d747763cc4228f632474bc833e53e2d67fd6545437fc46cf976055dd0f1a55c4cb6377667ce0b0d8bc7dae33454157fbb91af7a5b009b62
 DIST hypothesis-6.54.3.gh.tar.gz 9325211 BLAKE2B e0d6bc21057b50676ef98d1c9721b82c30986670758b2a7bfd1b101cc8d42258bf0d61887867445aafe13b8064c47d64583ab492e21b6fea510ef0c26fe01782 SHA512 288c5ea9c1dd8ee0839c11385f52ba8b8122f408aa11c6d2416460233ef78890e3014e659ef4312da4822da3abe2dd9163f68d2711556800e805ae41280aa132
 DIST hypothesis-6.54.4.gh.tar.gz 9325437 BLAKE2B 2000c806a0c791d1eb353a829e5e96d53e935d360fd450b3807186121fec4dfd171b8821e08b6c23b0cbea8d24b0d88c32126281173a0de2f12b29d09ec2d62b SHA512 7e5b70cc2df874163205e3d35f3f5e6a71319e779b35f1596c69222373e9b766a143ccf37aa1699de6b98827978e44ccbca0b1e30e6ffe29c8b68c83bb3af869
 DIST hypothesis-6.54.5.gh.tar.gz 9325448 BLAKE2B b4cb8a413ad96f11f4dbf4a1a529e389dbca45561264cf0922721a25009d1065fdce21064faf53bd7aad2f589c159b52d899aa7b12c12da68beae8c9186c0505 SHA512 37205ea28b44537409a94592e466376e9612f84a8501ad2ff5504fc648e062555ffb600416bdd1f9a74f39ba39729defd581025e0611c501839721721f7cf6e3
diff --git a/dev-python/hypothesis/hypothesis-6.53.0.ebuild b/dev-python/hypothesis/hypothesis-6.53.0.ebuild
deleted file mode 100644
index ce28c004b522..000000000000
--- a/dev-python/hypothesis/hypothesis-6.53.0.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
-CLI_COMPAT=( python3_{8..10} )
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
-
-	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.54.1.ebuild b/dev-python/hypothesis/hypothesis-6.54.1.ebuild
deleted file mode 100644
index 5b926953a2fd..000000000000
--- a/dev-python/hypothesis/hypothesis-6.54.1.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
-CLI_COMPAT=( python3_{8..10} )
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
-
-	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.54.2.ebuild b/dev-python/hypothesis/hypothesis-6.54.2.ebuild
deleted file mode 100644
index 5b926953a2fd..000000000000
--- a/dev-python/hypothesis/hypothesis-6.54.2.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
-CLI_COMPAT=( python3_{8..10} )
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
-
-	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.54.3.ebuild b/dev-python/hypothesis/hypothesis-6.54.3.ebuild
index 5b926953a2fd..ce28c004b522 100644
--- a/dev-python/hypothesis/hypothesis-6.54.3.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.54.3.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}/hypothesis-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index 72be75db756a..32c0dcf601db 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,2 +1,3 @@
 DIST identify-2.5.2.gh.tar.gz 101399 BLAKE2B f0ef048c6543b32016ad47a84e4b4b049a88424e496b159ce6ec1a1358172a87849e132b045a7345e818b02aee359e6d9458c458430a4d5d2b9f918cba685ed7 SHA512 72aaf406e5aa7acc83189820c389e82e90cf775541013e4ad91e5d25abdecd8526d1c47d203baa8ab8e5e028836da755a7045e74fded7e8e3167397557d4b1f0
 DIST identify-2.5.3.gh.tar.gz 101397 BLAKE2B 8782a4dfcea2d84facec9fefac8c7241c978ca1f494aa3e0602171dc017b41d24545ec7a3537b07a5e9962edcc4813fa4f45f76d807ba8ba69243041bc777d1b SHA512 d6cc5737b119498af5fb3cc9478881960b4d9532eec552622e942292ec3f1c75182f50ccc94fe7e1bb8993525c5e50fcdfd58881a9226da52fbe5feb3b83a8c3
+DIST identify-2.5.5.gh.tar.gz 101461 BLAKE2B b3a4dc2273435cf9244af64b08b9a9a922025f7d32f479fb2641fcdd9f8a05d2778db126104b1e3b765b82af7ecc1660163de1f71098900296135cd1ccd129c5 SHA512 e02688805310a4f92d0435af562383a10297afa7fc468e44f73be40118c73e2ceac1b4ba7525c375fd0b671ea2700ba66307115c78558a370c525de8cba33c83
diff --git a/dev-python/identify/identify-2.5.3.ebuild b/dev-python/identify/identify-2.5.3.ebuild
index 77bcb9aabee1..6b1e5d8f2709 100644
--- a/dev-python/identify/identify-2.5.3.ebuild
+++ b/dev-python/identify/identify-2.5.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/ukkonen[${PYTHON_USEDEP}]
diff --git a/dev-python/identify/identify-2.5.5.ebuild b/dev-python/identify/identify-2.5.5.ebuild
new file mode 100644
index 000000000000..77bcb9aabee1
--- /dev/null
+++ b/dev-python/identify/identify-2.5.5.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} )
+
+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/jsonschema/jsonschema-4.9.1.ebuild b/dev-python/jsonschema/jsonschema-4.9.1.ebuild
index 2519796a1928..ca2a47e86112 100644
--- a/dev-python/jsonschema/jsonschema-4.9.1.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.9.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/libtmux/libtmux-0.14.0.ebuild b/dev-python/libtmux/libtmux-0.14.0.ebuild
index 24a2b89b7b9a..6062358d2d60 100644
--- a/dev-python/libtmux/libtmux-0.14.0.ebuild
+++ b/dev-python/libtmux/libtmux-0.14.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=app-misc/tmux-3.0a
diff --git a/dev-python/lit/lit-15.0.0.ebuild b/dev-python/lit/lit-15.0.0.ebuild
index 804d31b11189..b944deb27c4c 100644
--- a/dev-python/lit/lit-15.0.0.ebuild
+++ b/dev-python/lit/lit-15.0.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.5.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.5.ebuild
index 1f358fb1ac0b..1cb0ec97687a 100644
--- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.5.ebuild
+++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.5.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-3.0.0.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-3.0.0.ebuild
index 77d96cbf6138..0cd2d533ddc7 100644
--- a/dev-python/openstackdocstheme/openstackdocstheme-3.0.0.ebuild
+++ b/dev-python/openstackdocstheme/openstackdocstheme-3.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~riscv ~s390 x86"
 
 BDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-5.0.0-r1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-5.0.0-r1.ebuild
index 37296c171fd9..5cb3ad8c9357 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-5.0.0-r1.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-5.0.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN/-/.}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pdm-pep517/pdm-pep517-1.0.4.ebuild b/dev-python/pdm-pep517/pdm-pep517-1.0.4.ebuild
index 773c078ae24f..f764745cb7df 100644
--- a/dev-python/pdm-pep517/pdm-pep517-1.0.4.ebuild
+++ b/dev-python/pdm-pep517/pdm-pep517-1.0.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index daf35a4de584..a8566fa2d9e6 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,3 +1,2 @@
-DIST python-phonenumbers-8.12.52.gh.tar.gz 4904385 BLAKE2B c063fee535e3d1dd30844ea7a974601962fb8fd6b56608046e0c488e638624456020100b2b775f979f770ea1690bda38044d4f7457341d1261132f4323a6de86 SHA512 638ec8e09d58adc5131e855a9436b45f1f0252c084638a13130df793d5357fc249e695668e2cce4902a534300c4683b64078e08620fdd2636857f6d328a45d82
 DIST python-phonenumbers-8.12.53.gh.tar.gz 4904940 BLAKE2B c8da67f781c71265faa4d24e5cadf7d2c4e707de6f6fc2efae37f0b846cafd6c00814188c2d89d98ec0fb7dbeef9fedc45dc908adf117643bc2b2a0ab56a4496 SHA512 aa699e5df1b612bbcf384e01b80251099872e67fd5632dab35e53861ab6b28157266ac0a1700f4371a0a2975f0484256fb46b6287b87dc8e69aca85323475490
 DIST python-phonenumbers-8.12.54.gh.tar.gz 4905001 BLAKE2B 5fc206b3dd5f5cc96ecfc91b33369fb12d8a11245f846039478bf77f9dbc8e1bfe0e169eb6f1c360ac2a730f79b512178b115f82434790baeb3b2d26d5eaa370 SHA512 0da4f3ffa57f0c2ddaf843eea1440b33844be7ee45122a21d00b5630b720eac059777dca2051e00baf39158737478d5077f97ec6b9293528b11a9844294a621c
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.52.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.52.ebuild
deleted file mode 100644
index 3bdc5aaeaf92..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.52.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} )
-
-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.53.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.53.ebuild
index 9767e4c2d82d..3bdc5aaeaf92 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.53.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.53.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/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild b/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild
index f3738881d4dd..e50b12488f27 100644
--- a/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild
+++ b/dev-python/pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.ebuild
@@ -18,4 +18,4 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 79a4dc3be840..f11c351a7182 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,3 +1,4 @@
 DIST psycopg-3.0.16.gh.tar.gz 386693 BLAKE2B c6c0bd9832e65180e7de76b04ef7c81f4c2d0981894d090b933ce0efaaafdf6b62d1d71a4c70c7c9b848b67e576a71953116925f9e991a4ed99b53067e24cbba SHA512 655e01bb00972dacae590f2e8ce5948226acb827b55099e7f362fdee9210f07b755f4da10d2fadd468aa95eaa3f72e7658a1ab26870d4ac159ee266ce1f8140c
+DIST psycopg-3.1.1.gh.tar.gz 464501 BLAKE2B 1796ae830051ee0719e4723036ca672ac005793beb88da21b9775cdc96dd4f58b3d008eb3f3a87c3f7293ea097480bbe72a8591b68371d1f7c7261c37927e40f SHA512 a243626c5e0ee0ef414c193b9168f58ec6fa3bfc5652c25c3c1f355f4cea29bcc993ba631a125c0a0335155c15fc068f6cfa5e8974de0cd32e007ae6d3db23dc
 DIST psycopg-3.1.gh.tar.gz 463892 BLAKE2B 94100bed4807771f6c4d0469737b160955f3f6bfcff84240c9e15dd9b7b88765583952b712642740c97f6ec42223edcf74fb2c5390a185f44ca0eb8858e76100 SHA512 057a14d614ccb9f36a7db7a82c3d48953658a1c6af2a2265a93a3f6c1db421275e51e1be4d59e2ea98b638f3da8c24c9d2a4d9aabf6190c47691dd632c9339f9
 DIST psycopg2-2.9.3.tar.gz 380611 BLAKE2B 78099da7378dcfa8b7f28aae4d533a7e890cdb7ae4c0cc718a9411e630fd07b56f074760fc29de8fe08fe727328cca39414a5f297fb92ed2f7471a24e633d18d SHA512 048184d1d162a371fc0fba711448a6fa8a6aac193421f4484c7f7b91c39065d5b632fa34fc15a901eca055d597302b1f9e38330b248ed0e4653dcdc544b0d660
diff --git a/dev-python/psycopg/psycopg-3.1.1.ebuild b/dev-python/psycopg/psycopg-3.1.1.ebuild
new file mode 100644
index 000000000000..e2ea7d3f0728
--- /dev/null
+++ b/dev-python/psycopg/psycopg-3.1.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="
+	https://www.psycopg.org/psycopg3/
+	https://github.com/psycopg/psycopg/
+	https://pypi.org/project/psycopg/
+"
+SRC_URI="
+	https://github.com/psycopg/psycopg/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${P}/psycopg
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+DEPEND="
+	>=dev-db/postgresql-8.1:*
+"
+RDEPEND="
+	${DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/backports-zoneinfo-0.2.0[${PYTHON_USEDEP}]
+	' 3.8)
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-4.1[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+BDEPEND="
+	test? (
+		>=dev-db/postgresql-8.1[server]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/dnspython[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# tests for the psycopg_pool package
+	tests/pool
+	# some broken mypy magic
+	tests/test_module.py::test_version
+	tests/test_module.py::test_version_c
+	tests/test_typing.py
+	tests/crdb/test_typing.py
+	# TODO, relying on undefined ordering in Python?
+	tests/test_dns_srv.py::test_srv
+)
+
+src_test() {
+	# tests are lurking in top-level directory
+	cd .. || die
+
+	initdb -D "${T}"/pgsql || die
+	# TODO: random port
+	pg_ctl -w -D "${T}"/pgsql start \
+		-o "-h '' -k '${T}'" || die
+	createdb -h "${T}" test || die
+
+	local -x PSYCOPG_TEST_DSN="host=${T} dbname=test"
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+}
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index 878b404c85a2..ea7f79125c0c 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1,4 +1,5 @@
 DIST pydantic-1.10.0b1.gh.tar.gz 886824 BLAKE2B f5ae306cf27143723bc2cb87608cdef3eee29ea9e45cde3f61412820858e7b8ab290ba74329317ac916dddb6bd03d011205a1f0d8cd9ba266e4a8655f24b9b61 SHA512 6f962e2983bd13bcd79da06d1a663da8c2cae39b7f80184d70e61a23a55661fe79f3bc7d00656f4e14f2aa5746cb889c8463473688dd7572ea825f461e263ec2
 DIST pydantic-1.10.1.gh.tar.gz 887019 BLAKE2B 5ca8d11528c7a7666136224c97dd0b078cf6f936a23227aa9dcd62af3c6a0af8f07c4c92751bd2c203497a626d4f93a78fd594bfc71dd0c43886c2dacc257af4 SHA512 2be3f10a82d655a94b3f250ed4c78439b4195dde3f7f6aa66028105b5c9b0e56aa8176701d563e5372533ae34e0b6d0fe2254df9429b04815607bcfc94e40370
+DIST pydantic-1.10.2.gh.tar.gz 888288 BLAKE2B 9aac69ace185ccc56255cf36f9af472caf4c6bcbdcbb81eec66353f755673e9a240e7713c0a2ecff00a02e07b0069e4b3f1edda41f345698a979b79dd54b354a SHA512 dc2acfb271cd62b6de08bbaa48dbc76ec8d3a3f3142778ffa2cb9a2a1cad62dbdb3c7470a50e9a2825837b65a48c6aefb8736411f32c398aa9ca779841b53ac5
 DIST pydantic-1.9.1.tar.gz 306846 BLAKE2B c22e892f403b6ca5eff7f888c68f9df5c198fa03c8dab833edc556b3b1a4819fc28c9818a649bf5d9c4bb745b0bde826e164eda7760cd26f88e278c86776ad84 SHA512 19d2a50ef054b76cc7e8756759f3d67a14a58614dd6ff1b4f60e73354b0028e08743aa3bb5944da7ae357ab279134d3685c454d6affa6524b267c7cd9a40375e
 DIST pydantic-1.9.2.tar.gz 307957 BLAKE2B ee3b188dcf058fc81b5f8491a5e757114a3b39db4d9aee3265051559f6ac25cff01bfb3b0536d0f0425534bd9a5a6444b6e6f2ef84b91a6c11085e15ac25265a SHA512 524595aea9401e82d2e985fdb5aa9b4a8b39edfed856d08e057695c786d65c3455991e4f57ce326902ff9cbed328bcb5e6f4133bda769fecea5affb68f3b4345
diff --git a/dev-python/pydantic/pydantic-1.10.2.ebuild b/dev-python/pydantic/pydantic-1.10.2.ebuild
new file mode 100644
index 000000000000..ad4b23860fbc
--- /dev/null
+++ b/dev-python/pydantic/pydantic-1.10.2.ebuild
@@ -0,0 +1,77 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P/_beta/b}
+DESCRIPTION="Data parsing and validation using Python type hints"
+HOMEPAGE="
+	https://github.com/pydantic/pydantic/
+	https://pypi.org/project/pydantic/
+"
+SRC_URI="
+	https://github.com/pydantic/pydantic/archive/v${PV/_beta/b}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/python-dotenv[${PYTHON_USEDEP}]
+		>=dev-python/python-email-validator-1.2.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/CFLAGS/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	if [[ ${EPYTHON} == pypy3 ]]; then
+		# do not build extensions on PyPy to workaround
+		# https://github.com/cython/cython/issues/4763
+		local -x SKIP_CYTHON=1
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_mock
+
+	local EPYTEST_DESELECT=(
+		# flaky test, known upstream
+		tests/test_hypothesis_plugin.py::test_can_construct_models_with_all_fields
+	)
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				tests/test_private_attributes.py::test_private_attribute
+				tests/test_private_attributes.py::test_private_attribute_annotation
+				tests/test_private_attributes.py::test_private_attribute_factory
+				tests/test_private_attributes.py::test_private_attribute_multiple_inheritance
+				tests/test_private_attributes.py::test_underscore_attrs_are_private
+			)
+			;;
+	esac
+	rm -rf pydantic || die
+	epytest
+}
diff --git a/dev-python/pygobject/pygobject-3.42.2.ebuild b/dev-python/pygobject/pygobject-3.42.2.ebuild
index 650fffa6b20a..b979db22b0ce 100644
--- a/dev-python/pygobject/pygobject-3.42.2.ebuild
+++ b/dev-python/pygobject/pygobject-3.42.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pylibmc/pylibmc-1.6.2.ebuild b/dev-python/pylibmc/pylibmc-1.6.2.ebuild
index a0ef187027b2..d98383c5397d 100644
--- a/dev-python/pylibmc/pylibmc-1.6.2.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.6.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
 DEPEND="
 	>=dev-libs/libmemcached-0.32
diff --git a/dev-python/pyroute2/Manifest b/dev-python/pyroute2/Manifest
index e093d0376607..2e397ebdeb8f 100644
--- a/dev-python/pyroute2/Manifest
+++ b/dev-python/pyroute2/Manifest
@@ -1,2 +1 @@
-DIST pyroute2-0.5.19.gh.tar.gz 457432 BLAKE2B ffb2717c60badb1453eeb15f5b83f1494e851ee011fcdebd3a5d249ecc4bea7064069a1af2fe2d34aefe9812c8b6808b8a14cbe518383c165b0b008d10505c5c SHA512 19b0acbff17415acad20a214e0622ca9a3fc51b92e603ab15663ea7e8da290fc0b2033aeca1c20200307e34173802f89998151f77d5bcfc5f87eb8b42ba591ce
 DIST pyroute2-0.7.2.gh.tar.gz 469459 BLAKE2B 06aa7640bb21c0a7b8035723069d78b28ca39b554b5bdc0a031dbc7376251265b118b222cb4283156c02136e63de4b77103c02a88b700ac5f49fa8ceac28528a SHA512 6c032b39675d539958642bb16b3b964e78613cdd2d49e2e206a13d5256872e3800de5c73cff761e4a756d31df0e07f18f08d193a0543c87be89da348662e6dbd
diff --git a/dev-python/pyroute2/files/pyroute2-0.5.19-exclude-tests.patch b/dev-python/pyroute2/files/pyroute2-0.5.19-exclude-tests.patch
deleted file mode 100644
index 723c638349b7..000000000000
--- a/dev-python/pyroute2/files/pyroute2-0.5.19-exclude-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: pyroute2-0.5.19/setup.cfg
-===================================================================
---- pyroute2-0.5.19.orig/setup.cfg
-+++ pyroute2-0.5.19/setup.cfg
-@@ -35,5 +35,8 @@ packages_dir =
-     =pyroute2
- packages = find:
- 
-+[options.packages.find]
-+exclude = tests
-+
- [options.extras_require]
- ss2 = psutil~=5.0
diff --git a/dev-python/pyroute2/pyroute2-0.5.19.ebuild b/dev-python/pyroute2/pyroute2-0.5.19.ebuild
deleted file mode 100644
index 3f9f8fc8b3af..000000000000
--- a/dev-python/pyroute2/pyroute2-0.5.19.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="A pure Python netlink and Linux network configuration library"
-HOMEPAGE="https://github.com/svinota/pyroute2"
-SRC_URI="
-	https://github.com/svinota/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-PATCHES=(
-	"${FILESDIR}/${P}-exclude-tests.patch"
-)
-
-# tests need root access
-RESTRICT="test"
diff --git a/dev-python/pyroute2/pyroute2-0.7.2.ebuild b/dev-python/pyroute2/pyroute2-0.7.2.ebuild
index 417aa1494c05..82ef09a34c6b 100644
--- a/dev-python/pyroute2/pyroute2-0.7.2.ebuild
+++ b/dev-python/pyroute2/pyroute2-0.7.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/python-cstruct/Manifest b/dev-python/python-cstruct/Manifest
index 636836e5e0e4..0e27bc491e7a 100644
--- a/dev-python/python-cstruct/Manifest
+++ b/dev-python/python-cstruct/Manifest
@@ -1,2 +1,3 @@
 DIST python-cstruct-2.2.gh.tar.gz 18764 BLAKE2B 75aaffae27fef59799e52866f8169cc5d7362ef1553a56986f361ef7cfb7ca3e7d8c67fe0f112ec8e03ddacf45885e19fc1ce0d9d27c7581deafbf7e7fe1789b SHA512 5a1d62b596fef08a48020557e82fc81360430d94f18ce0667919815d57b944102067c2fe5723372616f73c995afd3a1f674e4a37e406d0dc7eeaf9fe3ef8f484
 DIST python-cstruct-2.3.gh.tar.gz 19043 BLAKE2B dd445da91d155dc576523d5c15dc963493dfb62e7e79fae6c436e69654432eadbc30b0001026f5613268800eb0a3a01392120b11e7b3995cff16477850818c9f SHA512 5700a3d8ef58130bc5b3b5d7c36102f6a878fd8d5b9104804f0c206e583e77d7a9c9ff8e8008d9bd1ee72d55167e48cd3f9ba776816eb25ceb8ceaf0c880b597
+DIST python-cstruct-3.0.gh.tar.gz 25950 BLAKE2B 7ea8c77ed87e4fb740c3f7a4ed53a7532ee5aca15ee46fbb40da7308ae62ceacd7ccc67a958e6355904604ae67c9594acc9cae5d18bfed0558b91f7e9c8ad0a9 SHA512 dd1c85363512edc4df0379dec40e7d7fe3ceff1cc4014eae8dab0e91c47ea9c3619211e1a637aeec134ce713d0681688630b7fde97f02c6bcd7103a32f258a73
diff --git a/dev-python/python-cstruct/python-cstruct-3.0.ebuild b/dev-python/python-cstruct/python-cstruct-3.0.ebuild
new file mode 100644
index 000000000000..870df7088705
--- /dev/null
+++ b/dev-python/python-cstruct/python-cstruct-3.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="C-style structs for Python"
+HOMEPAGE="https://github.com/andreax79/python-cstruct
+	https://pypi.org/project/cstruct/"
+SRC_URI="
+	https://github.com/andreax79/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	sed -e "/find_packages(/s@exclude=\[@&'tests', @" -i setup.py || die
+}
diff --git a/dev-python/pytoolconfig/Manifest b/dev-python/pytoolconfig/Manifest
index b04f3cc405f5..e9a86dcc77cf 100644
--- a/dev-python/pytoolconfig/Manifest
+++ b/dev-python/pytoolconfig/Manifest
@@ -1,2 +1 @@
-DIST pytoolconfig-1.2.1.tar.gz 15182 BLAKE2B 667ded3571855edd78540d60d973f09b325e614b9c85bf8b4a1d235ca4bb4bfbe992f511fd65991740a87c61e8a2bc4ec35f00723e7556bf9ca8c9c2752a5f63 SHA512 01620f98494f3f73192f530727e007aca0b7ebd7c2f0d363604d138aef13bcd4b394f59eb980504da03ad323016fe1a5f36e2abca0bb6462828aba77ed4ce1c5
 DIST pytoolconfig-1.2.2.tar.gz 16195 BLAKE2B 02434bf9bc815fe1beeb13496427d6735fd0eebca66371eaa1a8df5d318879584b9e27d7b2272535e41af91b46544264d570b2727e524e6ba52c4e4be475ad84 SHA512 5bcbf7f2fc7941e128b3e717ff213e1e43be417ca3b906fa75a40f822815a4ea79b55cbb3e297caa3abf9032fedda1a791165491f52d4bbce5f4d29eea3c3599
diff --git a/dev-python/pytoolconfig/pytoolconfig-1.2.1.ebuild b/dev-python/pytoolconfig/pytoolconfig-1.2.1.ebuild
deleted file mode 100644
index ff81b96fddcb..000000000000
--- a/dev-python/pytoolconfig/pytoolconfig-1.2.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python tool configuration"
-HOMEPAGE="
-	https://pypi.org/project/pytoolconfig/
-	https://github.com/bageljrkhanofemus/pytoolconfig/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{8..10} )
-"
-BDEPEND="
-	test? (
-		>=dev-python/sphinx-4.5.0[${PYTHON_USEDEP}]
-		>=dev-python/tabulate-0.8.9[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytoolconfig/pytoolconfig-1.2.2.ebuild b/dev-python/pytoolconfig/pytoolconfig-1.2.2.ebuild
index 43d20f235a96..6ead1bb7c4ea 100644
--- a/dev-python/pytoolconfig/pytoolconfig-1.2.2.ebuild
+++ b/dev-python/pytoolconfig/pytoolconfig-1.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.7.1.ebuild b/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.7.1.ebuild
index f12c288f7c4b..e06f4c0959a8 100644
--- a/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.7.1.ebuild
+++ b/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.7.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index b40364e24797..ae8432eed99c 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,2 +1,2 @@
-DIST readme_renderer-35.0.tar.gz 27224 BLAKE2B bb58a6cb39aace47714aa351c710663ca9f43f04055e21a5ea3954b2d1fff58dce073b0a41bdfb07f34ffe16f2fbba9ba59c2a6b8f84c0eacfb7d9f7cd881380 SHA512 29377cea5a029f7c4cf2ec0362771a280936e84fc39117c13fc6557172581570af298520ea6f5df53260e1da539ebe3fe4183bd1fb5620af48824bee04fefc75
 DIST readme_renderer-36.0.tar.gz 28680 BLAKE2B e356690bc791d5f4a27ef59c61e356b3932595623434feae8d0fc9cf99d1bd4a724d5c202e47f989017821ce2bd69604338912c37b879699677496b789453c56 SHA512 1e208e830060d2a94e608dbbef36376c7720b8b4e2c8619665e82c64b7111153f4b764c1c7a77b36d3c0d652adb1f49a14bc7306b7bb5c65598db7acec6e984e
+DIST readme_renderer-37.1.tar.gz 29234 BLAKE2B 42a78cb5d19ee1d5cddd1d35c82801468bb2911c49037c4d4a07bc06cb1652046da99e306ed6b2864c2d26569092f824f1b7eeca53c147e6dcf6d60701679de9 SHA512 065dc1ee9baf88cea15d278dc130189b282c4bc04ccdb3d25cba423d4e32d41c8614b978ea96956913b925e1a2bdab0c2c162a369708ec253e8fae275b1c795b
diff --git a/dev-python/readme_renderer/readme_renderer-36.0.ebuild b/dev-python/readme_renderer/readme_renderer-36.0.ebuild
index f4000dcbcd9f..a1849f817498 100644
--- a/dev-python/readme_renderer/readme_renderer-36.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-36.0.ebuild
@@ -17,7 +17,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 ~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/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/readme_renderer/readme_renderer-35.0.ebuild b/dev-python/readme_renderer/readme_renderer-37.1.ebuild
index a1849f817498..f4000dcbcd9f 100644
--- a/dev-python/readme_renderer/readme_renderer-35.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-37.1.ebuild
@@ -17,7 +17,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 ~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/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index bfa2f9d0f1d4..f55c1e98a83b 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,2 +1 @@
-DIST rq-1.10.1.tar.gz 599678 BLAKE2B 0673ca0eea69c3f86e50f5609a9c4ed2c2d93d331479510365a744461a5d878e6de6a9683356562754a25760f8ba1d8a65f6d5acfe878e488a70c54dc0bb5b54 SHA512 1a12bd5db27eb3f9303b2f3465c2f22092f7eebfabfc1e6aa7f65de7ea139df3833f9bbdc7061de564b2418608641b3755993bb918efbf93b04df67ca942ea09
 DIST rq-1.11.gh.tar.gz 603425 BLAKE2B f6295e1d7ddbe229001076b8ca04f0f8c323eed988a7963449c2240cbc6168d48539297c16e1ce95f7ec2b8824e6f65fc1e026e76a6093e73c06dd1b847d1c5b SHA512 6e208f4c1c8c55f5847843d7933f17d2fae58e2b24cf1461fddba08894a860f8bcb55aac5c6840f2d9223b88538070c414e2e540e9bc846cef05a26b0ef38ffb
diff --git a/dev-python/rq/rq-1.10.1-r2.ebuild b/dev-python/rq/rq-1.10.1-r2.ebuild
deleted file mode 100644
index c8c681172ef6..000000000000
--- a/dev-python/rq/rq-1.10.1-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="simple, lightweight library for creating and processing background jobs"
-HOMEPAGE="
-	https://python-rq.org/
-	https://github.com/rq/rq/
-"
-SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/sentry-sdk[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	# Spawn Redis itself for testing purposes
-	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
-	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the actual tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/rq/rq-1.11.ebuild b/dev-python/rq/rq-1.11.ebuild
index 00d08903ed89..e5be0dadc805 100644
--- a/dev-python/rq/rq-1.11.ebuild
+++ b/dev-python/rq/rq-1.11.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/click-5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sabyenc/Manifest b/dev-python/sabyenc/Manifest
index 26a0a7656ff2..c3cc9df57aff 100644
--- a/dev-python/sabyenc/Manifest
+++ b/dev-python/sabyenc/Manifest
@@ -1,2 +1 @@
-DIST sabyenc-4.0.2.tar.gz 19579235 BLAKE2B 26af61a979f94b954a6fb7fa425ca07a8d757fb16c9d434e9a1e0019d84d156b527e9309cc65113fef64dd3f2afb92b46619dc9506327273f2ba7822337e9ccf SHA512 88e8b47b1438ca55b51dbf8a407c33ec335f0604abf8a3dcbc45853b6dadadf9932d97cf3f0adabd71a9405e2deaeff2777483d9ea692c9d3cbab99dfbfbc901
 DIST sabyenc-5.4.2.gh.tar.gz 19774424 BLAKE2B fbb954435236eb1794611a8e5852534b0f7dbd79806e8a9ca1bb57274df7cc89a6a26aa92c89c596e0c2857d4bfbd4e4c34f1d529cb5d2464a669d6d15a3f392 SHA512 a07a57e6b3416e147fcef4f27e52fea4b3a522ebb722b4d223469b63e9d08f42689950d86c544a41bfe81bba934514a43094c13b98aa585167cae69a5aa1f405
diff --git a/dev-python/sabyenc/files/sabyenc-4.0.2-fix-segfault.patch b/dev-python/sabyenc/files/sabyenc-4.0.2-fix-segfault.patch
deleted file mode 100644
index 1a80d5f13da8..000000000000
--- a/dev-python/sabyenc/files/sabyenc-4.0.2-fix-segfault.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Arthur Zamarin <arthurzam@gmail.com>
-Date: Sat, 18 Sep 2021 21:07:45 +0300
-Subject: Fix Segfault during testing
-
-decode_usenet_chunks might receive it argument as bytesarray, or
-as bytes object, but the C code expects only bytesarray.
-Add code, to apply variant for each case, and fail using assert when
-both don't apply.
-
-Signed-off-by: Arthur Zamarin <arthurzam@gmail.com>
-
---- a/src/sabyenc3.c
-+++ b/src/sabyenc3.c
-@@ -593,7 +593,13 @@ PyObject* decode_usenet_chunks(PyObject* self, PyObject* args) {
-         num_bytes_reserved = 0;
-         lp_max = (int)PyList_Size(Py_input_list);
-         for(lp = 0; lp < lp_max; lp++) {
--            num_bytes_reserved += (int)PyByteArray_GET_SIZE(PyList_GetItem(Py_input_list, lp));
-+            PyObject *temp = PyList_GetItem(Py_input_list, lp);
-+            if (PyByteArray_Check(temp))
-+                num_bytes_reserved += (int)PyByteArray_GET_SIZE(temp);
-+            else if (PyBytes_Check(temp))
-+                num_bytes_reserved += (int)PyBytes_GET_SIZE(temp);
-+            else
-+                assert(PyByteArray_Check(temp) || PyBytes_Check(temp));
-         }
-     }
-
diff --git a/dev-python/sabyenc/sabyenc-4.0.2.ebuild b/dev-python/sabyenc/sabyenc-4.0.2.ebuild
deleted file mode 100644
index b4485301817f..000000000000
--- a/dev-python/sabyenc/sabyenc-4.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Module providing raw yEnc encoding/decoding for SABnzbd"
-HOMEPAGE="https://github.com/sabnzbd/sabyenc"
-SRC_URI="https://github.com/sabnzbd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-BDEPEND="test? (
-		dev-python/chardet[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( CHANGES.md README.md doc/yenc-draft.1.3.txt )
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-segfault.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/sabyenc/sabyenc-5.4.2.ebuild b/dev-python/sabyenc/sabyenc-5.4.2.ebuild
index bfd28b8b0d70..7c026eb0d2fc 100644
--- a/dev-python/sabyenc/sabyenc-5.4.2.ebuild
+++ b/dev-python/sabyenc/sabyenc-5.4.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/seaborn/Manifest b/dev-python/seaborn/Manifest
index bd3ce794d459..a8e8ec89b47a 100644
--- a/dev-python/seaborn/Manifest
+++ b/dev-python/seaborn/Manifest
@@ -1 +1,2 @@
 DIST seaborn-0.11.2.tar.gz 268839 BLAKE2B b1ba3a76431843921f01f714e601ebe7ed87a8c4136acb65a7cdb89059d67cb136484cb968efd713a5260caa552673efd5d06898a69624b36311fd3908f00179 SHA512 f08fe82b4ecca2b140a953c89bb7f811255d00ec819225809bb224aadde161ddabdeaf5cab53e3558bb84334cee828baafe0ee5efe465e80875a0513fb1ab9ac
+DIST seaborn-0.12.0.tar.gz 1407601 BLAKE2B 3da8db0a0c08a40a3969a2ffce248f5521b4c7c93ecf0f014850093ef48331326454572ceea6ee1133805bf92540b0d2acecdfb7cb789d238f743b30e6a28947 SHA512 b2b06a22d48f19ace2448f465ca5e700f3486971d9fb86e85a1a8c9e2956b904e5f4c2c8075f848299b182cf8f69b2fac22366fedbd8012b9c44adc0bcb7e060
diff --git a/dev-python/seaborn/seaborn-0.12.0.ebuild b/dev-python/seaborn/seaborn-0.12.0.ebuild
new file mode 100644
index 000000000000..89e07b8c5f07
--- /dev/null
+++ b/dev-python/seaborn/seaborn-0.12.0.ebuild
@@ -0,0 +1,33 @@
+# 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} )
+inherit distutils-r1
+
+DESCRIPTION="Statistical data visualization"
+HOMEPAGE="https://seaborn.pydata.org https://github.com/mwaskom/seaborn"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	cat > matplotlibrc <<- EOF || die
+		backend : Agg
+	EOF
+	distutils-r1_src_test
+}
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 1b94513dc246..56c8d8ce2086 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,3 +1,4 @@
 DIST sentry-sdk-1.9.5.gh.tar.gz 272096 BLAKE2B 179be647b92a74a1836f26add33e4b98007d19eff7454eb4968a2029003b7c1601d2eecad162a109508942b2f65086db32df6191c7f7986b5ab831295a8d3775 SHA512 d909ea9552a845b7022fdbbd06e3c49b2f136ca66771f20cb74b82f9eda7f63bee6c095eddefad7623a224bb9d6bf2b775c3c9405a0b55cd520952c3fe67c22d
 DIST sentry-sdk-1.9.6.gh.tar.gz 270120 BLAKE2B d5918f4ed21f3ee50d76a780416c458b3f917a314a9dfbdbe4b4b63727fa3b7ead61d04546b6ebf57c262143ccc694811e6f888ca1d39155aa98f3225508ab94 SHA512 ad8717f456706edb31e01e8c19b8b81d98b15423d62b2dba8a86fc78a4756c8176b4a0758ebb599f84dd4e6e85258c47e350c8f55e80314a4a70631966c83de6
 DIST sentry-sdk-1.9.7.gh.tar.gz 270209 BLAKE2B d1671bb45efa8aa785dc33a5d27e1d44843000809a88c4b081bbaca31be9ece65c6b192cadd46df912e1e1ca8650c7246f9946adb85117e88d13446965e190ac SHA512 d5c9a32e2c4001892cd03357d3b0cfe4c789eb0f4a12f6431920624795d4ed70a4055351541e12d9ee0be6e0fa689190e53c05fac53a27dad30e9f9fbe0711c1
+DIST sentry-sdk-1.9.8.gh.tar.gz 271425 BLAKE2B 27135f4fee24d80a544d852261555d8a8498990f815bbe7438b67bbf5717ed4b6e92c8f3e6781929332cbaba75986538294cf4b97c5bbe845ab57a32333d1d6f SHA512 7c9136b4100537e327ccbc2a96967007a1d2de653098ffa3463cc135ca604e49bd066d6a85046c752f38bdfc2698298e46a5d26bbf1a31a19f1631cf92ad9c8d
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.9.8.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.9.8.ebuild
new file mode 100644
index 000000000000..aa4b4106f18f
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-1.9.8.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="
+	https://sentry.io/
+	https://github.com/getsentry/sentry-python/
+	https://pypi.org/project/sentry-sdk/
+"
+SRC_URI="
+	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/eventlet[${PYTHON_USEDEP}]
+		' python3_{8..9})
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# tests require Internet access
+	tests/integrations/httpx/test_httpx.py
+	tests/integrations/requests/test_requests.py
+	tests/integrations/stdlib/test_httplib.py
+	tests/integrations/flask/test_flask.py
+	tests/integrations/django/test_basic.py
+	# wtf is it supposed to do?!
+	tests/integrations/gcp/test_gcp.py
+	# broken by rq-1.10.1 (optional dep)
+	tests/integrations/rq/test_rq.py
+	# fastapi is not packaged
+	tests/integrations/asgi/test_fastapi.py
+	# TODO
+	tests/integrations/bottle
+	# requires python-multipart (TODO: package it)
+	tests/integrations/starlette
+)
+
+EPYTEST_DESELECT=(
+	# hangs
+	'tests/test_transport.py::test_transport_works'
+	# TODO
+	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+	tests/test_client.py::test_databag_depth_stripping
+	tests/test_client.py::test_databag_string_stripping
+	tests/test_client.py::test_databag_breadth_stripping
+	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
+	tests/integrations/asgi/test_asgi.py::test_websocket
+	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
+	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
+	# incompatible version?
+	tests/integrations/falcon/test_falcon.py
+	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
+	# test_circular_references: apparently fragile
+	'tests/integrations/threading/test_threading.py::test_circular_references'
+	# test for new feature, fails with IndexError
+	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
+	# TODO
+	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
+	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
+)
diff --git a/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.3.0.ebuild b/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.3.0.ebuild
index 47c556288819..ac884516decb 100644
--- a/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.3.0.ebuild
+++ b/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.3.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 7029ff83bd89..3c8069623511 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,7 +1,3 @@
-DIST setuptools-63.2.0.tar.gz 2605892 BLAKE2B c9475a64fbe22be348277d25582a0c1789544822a891ebfb8e8e79b122631d31bf3535aac1b408a254c1f29ea9ca20bd9b270e4d78ddc539aea4e3c59a6e7f7b SHA512 e55c19bb95415a5f831fd23dfc32cb79fdad71867bc225f2a76caecb3c188fa6a5dac8d13e131a97d1833672a245b28a53a11ceafd67ac19cacd4a247ba7d291
-DIST setuptools-63.3.0.tar.gz 2598685 BLAKE2B 8562824cf6e45f2757cbaf4360c0b7c8e592233875a00e5490de5f2af47ca2d43a6feac5876ca9e866fb840c62dc1b0aa2b2d7c1e5e9baf34741404803b02d31 SHA512 01f3b658862f70e8ce2dd74d9dd82a293216b356f1f3abb3b6b4fa77dd5347156a58959da6e6df349a1c114d58f617890e4bc8c6603f06be0fb3caec9bf21fe2
-DIST setuptools-63.4.1.tar.gz 2598515 BLAKE2B ae75b12d18e35c0d7d48c43eaf8f114dafc739253f672eb3ff2646a8951d0895df95c2d46fd77bb42aeca49a460e652eff41ac109fff24460fbcf02f7400faa1 SHA512 525bba1c07370a633c827629879bd4bf0147aec461ed2d935eaade21635527515eef6bdd1c8809304522cc890929ae0b12a5357e0035807d04cb8fb5a65fbf39
-DIST setuptools-63.4.2.tar.gz 2600520 BLAKE2B e5cedf9f5e58044ec74e45b7232ef64680854ba7be8f2c22e33373c7a8f5fc80578f99c9103eb81bc609fef56021fc7a311b03682842facea019d14387031f89 SHA512 a9cb002f3c9fd3e8ed189f800c45a9ab7bc51640430585226f290c2d6b24655999fbe827ddcc30fdd7f8a6ebd5e87dfc085d2ae1efbf35968213bb7dc77eeaee
 DIST setuptools-63.4.3.tar.gz 2600453 BLAKE2B 927be74bdc11271589134aca26849e61c5ae23d5780a57c96b9c4a9fe5f93e57fa8a80787c8db1c555f32fab1e007a956e91a374ed285db393e26d9486805ef9 SHA512 f19478921ffcf5441ec60a2af17c695456fee064f287e2130c4ff14d471a1124bd37104ad43adc7623ea0cba4ed170ed4aa37c6883aff8fd811ab960e6d12453
 DIST setuptools-64.0.3.tar.gz 2631478 BLAKE2B ff21a4cf81aed36561ac5a0da7d44c1cbe714bbd39de30041c48134c8e1204ad9edcb74540c392e4f4cf01ea161ae0ca4bdc55319e015748069986f30aa2d337 SHA512 0333322479d40b9d30187bcbb3ceadc5dd5ef8a5dcbcebc75f451b9fea06a5b7ca5d5db44c39278d62e932df7f563578c86fcd2cab9a41000caf15374a5cf182
 DIST setuptools-65.0.2.tar.gz 2619562 BLAKE2B e00e6ff7fd18c77c3924151bdbb40b36243b48eb389b67cee3279a82abd41943e08b4f8b7422edcce67b90e4c989fc170d96b140a18c78918ca7970039af8b29 SHA512 ccaf438b78a0d33ec4ec606f0fe64dcaf306dfe8935076b7534b984d0c0bfdf023d37a2b50e94572d54a5c8150e1458baabe811a4236410aedb75ee2a9215862
diff --git a/dev-python/setuptools/setuptools-63.2.0.ebuild b/dev-python/setuptools/setuptools-63.2.0.ebuild
deleted file mode 100644
index c95f74b4480a..000000000000
--- a/dev-python/setuptools/setuptools-63.2.0.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{7,8,9,10} 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/mock[${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-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_distutils_adoption.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
-	)
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-63.3.0.ebuild b/dev-python/setuptools/setuptools-63.3.0.ebuild
deleted file mode 100644
index 49fd143a5347..000000000000
--- a/dev-python/setuptools/setuptools-63.3.0.ebuild
+++ /dev/null
@@ -1,125 +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
-
-# please bump dev-python/ensurepip-wheels along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{7,8,9,10} 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/mock[${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-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_distutils_adoption.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
-	)
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-63.4.1.ebuild b/dev-python/setuptools/setuptools-63.4.1.ebuild
deleted file mode 100644
index 49fd143a5347..000000000000
--- a/dev-python/setuptools/setuptools-63.4.1.ebuild
+++ /dev/null
@@ -1,125 +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
-
-# please bump dev-python/ensurepip-wheels along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{7,8,9,10} 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/mock[${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-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_distutils_adoption.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
-	)
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-63.4.2.ebuild b/dev-python/setuptools/setuptools-63.4.2.ebuild
deleted file mode 100644
index 49fd143a5347..000000000000
--- a/dev-python/setuptools/setuptools-63.4.2.ebuild
+++ /dev/null
@@ -1,125 +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
-
-# please bump dev-python/ensurepip-wheels along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{7,8,9,10} 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/mock[${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-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_distutils_adoption.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
-	)
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-63.4.3.ebuild b/dev-python/setuptools/setuptools-63.4.3.ebuild
index 49fd143a5347..5720ca40103f 100644
--- a/dev-python/setuptools/setuptools-63.4.3.ebuild
+++ b/dev-python/setuptools/setuptools-63.4.3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 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"
+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 )"
 
diff --git a/dev-python/stripe/stripe-4.0.2.ebuild b/dev-python/stripe/stripe-4.0.2.ebuild
index 5dd93705bd06..42dcbc365ad0 100644
--- a/dev-python/stripe/stripe-4.0.2.ebuild
+++ b/dev-python/stripe/stripe-4.0.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 58c529c35ce3..8e5b0e993d50 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,7 +1,3 @@
-DIST trimesh-3.12.9.gh.tar.gz 10757706 BLAKE2B a81e01a665a2a80a6a8f5b8bfcd8eb92f4dacb0a62b63209afccde48bea4dc31e05eeef8abcd40f01844cab1c9b7fe644b322c9761257be3f6abdb1858356c88 SHA512 55f9830b7f9016dc9827f5b852e035fa36ce0dafb69618fee627395c12fe40db58ea400d8c66981a313dd9a3293d538d5a0dec1c107e9bbbe691295b1a1f5fc7
-DIST trimesh-3.13.0.gh.tar.gz 10803906 BLAKE2B aa99ecec3d108ca7a7c96183ff354f930d349e1d35f00b689cba1dfed1990d0f8f9dcf93d83bb55173280d31235766052d99ce06c64bb80ecc0bf17b5ea49da4 SHA512 db816f163faed97281dcf8d251d2d57a1b7cb7d4b90ec39d74426e87ef3b22508968cd8701accc49803c3dc73bc39f1f81554feb339a46a9a67bbff5f916f803
-DIST trimesh-3.13.1.gh.tar.gz 10803494 BLAKE2B 73d1f9c7a7610310155e9dd714cdb7dd27b7319b7fa54f092dad7e380484b5c650c4b9aa74235621599ef182043493e56b8ce90f02483a2ba75238fe84bd0c42 SHA512 eca0c6bb2866b2e52c9c92b238f303a0ecbe9e40b7e2109b9a5e714a3d2791bd4fdfb26f06c8e18b8815661d198018e37877f19b2b009efd022080ef87f9b679
-DIST trimesh-3.13.4.gh.tar.gz 10804452 BLAKE2B 26b2f82d64114b610e97e0e937a821bf1ef6809f702ee1de908a756b7a18e7dceee75b1bdb49b831952b1753f63cc5735201deb5ba709709ab58e43ffd8ed175 SHA512 4f56dd63cfafb59941fcd3d9955de7b5ef2dab1f0d961d91aed37295f4aaa37ad3a427a39fa2366a85ea407bc12bc8b8980b1da563f46480b653422632bab911
 DIST trimesh-3.13.5.gh.tar.gz 11961925 BLAKE2B 8a4b069f2df49c9ca6121cd3ea446f959a4d5df16b2eafca039b7bc55f04830e054a1c03e012e25594ccda415fedf26b0ab3ae1dbe5e5d1b019bf9e899703169 SHA512 dd4bd7051d48f382ec3e96e55156a6d4cc554a097133d8deb033b9fbcf6f50cf446539484c2a0858243728bc3a7bb6973876919d900a7deb2ff1a6bd11dc397c
 DIST trimesh-3.14.0.gh.tar.gz 11962245 BLAKE2B 56ae1d987f43b6945191c80be6ac0a47cad51de370b4d4033baeec69b0aafa54ce4282e622d7f29a4906efde5ce7af2b13b8567b98a519eab8edf791de90f355 SHA512 495f90fe37bbeb339b7db4dbd366bac126a43e956ec18ec77c9ee697e7d8155f0c048f8e5280230684cb602b26a4be1be1e74335db94f4272b50816ab937e2ca
 DIST trimesh-3.14.1.gh.tar.gz 11961899 BLAKE2B eab37c94da03cfdefa2f4bff78a1a1cdd2a4c5d3d5da7ef5f462de331c7c2dbaaabbc53a0033ca95a3b4d9d61e072af2f2b689d291e32a89531ca2b5e9d8f8e2 SHA512 e8c43275552d2ddf2e6c1d7582c67f34d7bdaddd5df2cfac9a3758eac12a7fc8bc41748465317eb4e983d7d2d9d51209ab85bfa781022227c0be57618991e9b4
diff --git a/dev-python/trimesh/trimesh-3.12.9.ebuild b/dev-python/trimesh/trimesh-3.12.9.ebuild
deleted file mode 100644
index f04984f7d230..000000000000
--- a/dev-python/trimesh/trimesh-3.12.9.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimsh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)"
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-3.13.0.ebuild b/dev-python/trimesh/trimesh-3.13.0.ebuild
deleted file mode 100644
index 8a53861b3711..000000000000
--- a/dev-python/trimesh/trimesh-3.13.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimsh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)"
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-3.13.1.ebuild b/dev-python/trimesh/trimesh-3.13.1.ebuild
deleted file mode 100644
index 8a53861b3711..000000000000
--- a/dev-python/trimesh/trimesh-3.13.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimsh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)"
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-3.13.4.ebuild b/dev-python/trimesh/trimesh-3.13.4.ebuild
deleted file mode 100644
index 8a53861b3711..000000000000
--- a/dev-python/trimesh/trimesh-3.13.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimsh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)"
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-3.13.5.ebuild b/dev-python/trimesh/trimesh-3.13.5.ebuild
index 8a53861b3711..f04984f7d230 100644
--- a/dev-python/trimesh/trimesh-3.13.5.ebuild
+++ b/dev-python/trimesh/trimesh-3.13.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index ac37b98b535b..3759d638e140 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -2,3 +2,4 @@ DIST ubelt-1.1.1.gh.tar.gz 263082 BLAKE2B c146cfa7084b1d04d5a16443e5f8bdd4858992
 DIST ubelt-1.1.2.gh.tar.gz 267530 BLAKE2B c00c0b9d548b324090c012a0b1786c7011e9a3ccbdf055e5db39597fe8b695c785f0499a0f089c63c61ea7da76cd6cd802122d0f0e2f77aef4c08568331a6be6 SHA512 e2e77b1736870a010a3256cef2d4071294fdb525c0c6ad8d4665cc85b05148b7381e66f06c2ff74d1ae3588d78daaa71fb8a1907ae1585edb3ff9f2c9fb62b59
 DIST ubelt-1.2.0.gh.tar.gz 290425 BLAKE2B f4bae0580dc70461082e906892dbe7bc635bbb3ce9f4cf82ec101deb7ac5b23633232ebb6fe579258c9b0add00fd9fc08d01312c140ae3fca431c646945f0d67 SHA512 4009a3de269140340dcdc70cf150ec55576a10506942195261b4420bb471d00a11771bae5366b72f901c89f74843a281a2b147e9b565c2d256f1a0fdcc2c665d
 DIST ubelt-1.2.1.gh.tar.gz 294026 BLAKE2B 7c1050a1107ebbc833c19adeb6c53377842634b8f7a861825d637d578ad7e1a5cab4410c9b07913c3a29fe9eb1f84bc61694269ce86b02cef5170eed4c3e5dd5 SHA512 6ac74a09a00693d8f4091952e1c7ec06646c48b0d8cf3affe7154e20c708ceb95ba9e113c4f10fa73fb971e6d932e3aea04b1aa7d2c9d446f1de5269f91cafa0
+DIST ubelt-1.2.2.gh.tar.gz 303629 BLAKE2B 624f56db069bb72ff3686db9d4ca47a1ac384ab9cb0810dd608fa8c12d00789b219d3d5a659e153cde87bb42a585f6176527c7b89fbef8afbf3f86433e456bbe SHA512 f0384cee3b8b474e2f3d893134cde6a7e96c73b98e4be6bb928dd410bdc763d9846409f867232c6b34840d0f77bcc95aa425b4a67dc3eeec3c634fd1c1311332
diff --git a/dev-python/ubelt/ubelt-1.2.2.ebuild b/dev-python/ubelt/ubelt-1.2.2.ebuild
new file mode 100644
index 000000000000..393f7a73da2b
--- /dev/null
+++ b/dev-python/ubelt/ubelt-1.2.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
+HOMEPAGE="
+	https://github.com/Erotemic/ubelt/
+	https://pypi.org/project/ubelt/
+"
+SRC_URI="
+	https://github.com/Erotemic/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
+		dev-python/xdoctest[${PYTHON_USEDEP}]
+		>=dev-python/xxhash-1.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	tests/test_editable_modules.py::test_import_of_editable_install
+	# relies on passwd home being equal to ${HOME}
+	ubelt/util_path.py::userhome:0
+)
diff --git a/dev-python/yappi/yappi-1.3.6.ebuild b/dev-python/yappi/yappi-1.3.6.ebuild
index cb1a8314d419..706c89894bdf 100644
--- a/dev-python/yappi/yappi-1.3.6.ebuild
+++ b/dev-python/yappi/yappi-1.3.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/yarl/yarl-1.8.1.ebuild b/dev-python/yarl/yarl-1.8.1.ebuild
index d01191dbb346..e6b26c9dfbfe 100644
--- a/dev-python/yarl/yarl-1.8.1.ebuild
+++ b/dev-python/yarl/yarl-1.8.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 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/multidict-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 61fabf74b706..02ab3f86484f 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,3 +1,2 @@
-DIST python-zeroconf-0.38.6.gh.tar.gz 134795 BLAKE2B 839d59d7c46d9ab16145e37bb58acc7a71072b00507ee0ae8325fea9a3ebc0e567f9e257937675f8eaf44095c7449f96e6bc42b82d34f75a39cc87fd29be2766 SHA512 274db525751191b0188a4f00505c795420f975de3f714f84f2207271ff484bb5de1c881c0ed00b1ad3a6265d5d461519cf46041ab907026d9e6937844bbab6af
-DIST python-zeroconf-0.38.7.gh.tar.gz 134866 BLAKE2B 060ffdc45d4ec8092cd278b99a74561fd1ea06aba3cdecadbd35c1c5e3f608befe3ced18009d8d64c5b37388ee57900b4b00a44c90d87923f259e798da5bb962 SHA512 a0ab90f30b843bc889daf95eab6d806a5e3fb4ffe5e3857c435f14a85de7b659b8386159f6428f05a34f2e3010f4582f7d3a55bbd6e6ede0008247821f666707
 DIST python-zeroconf-0.39.0.gh.tar.gz 135121 BLAKE2B 708f641934b1d155a464f532894e6f3ba3b83c57063b903eae23abcfaf76974920286a9ddcabc53d0211df21b247303c23b2ee36f78ccf809001395f0d1002a7 SHA512 401808d51b58905937b0c2f924bce6a9ae38f331f2faf7a0258bfcbc245ec618deaf1a707d22c47792d964a49a2036af5d2ab02438b001b228611a5855db897f
+DIST python-zeroconf-0.39.1.gh.tar.gz 135252 BLAKE2B 82efa3e39b6e18b9d73b45958190c1d76978231842c1f61ff4519b9a763fb2c1564dae9c0b1d31109e291acc966127cfae9fa02400f1695e97dcc1b0e5a509f7 SHA512 3e1bc4bd48b77bce711f8b49b9cdce1769d7af72094c9ebc161ecb833fe90c7bd36ec5b9fc35c524ddd8c30a67af5937f188c81cf3a251d80c0e71f4b7c3add7
diff --git a/dev-python/zeroconf/zeroconf-0.38.7.ebuild b/dev-python/zeroconf/zeroconf-0.38.7.ebuild
deleted file mode 100644
index 7b5c978f5837..000000000000
--- a/dev-python/zeroconf/zeroconf-0.38.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/jstasiak/python-zeroconf/
-	https://pypi.org/project/zeroconf/
-"
-SRC_URI="
-	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# network
-	tests/test_core.py::Framework::test_close_multiple_times
-	tests/test_core.py::Framework::test_launch_and_close
-	tests/test_core.py::Framework::test_launch_and_close_context_manager
-	tests/test_core.py::Framework::test_launch_and_close_v4_v6
-	tests/test_core.py::Framework::test_launch_and_close_v6_only
-	tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-
-	# fragile to timeouts (?)
-	tests/services/test_browser.py::test_service_browser_expire_callbacks
-	tests/utils/test_asyncio.py::test_run_coro_with_timeout
-)
diff --git a/dev-python/zeroconf/zeroconf-0.39.0.ebuild b/dev-python/zeroconf/zeroconf-0.39.0.ebuild
index 4951b945151d..dba06fd72757 100644
--- a/dev-python/zeroconf/zeroconf-0.39.0.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.39.0.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
diff --git a/dev-python/zeroconf/zeroconf-0.38.6.ebuild b/dev-python/zeroconf/zeroconf-0.39.1.ebuild
index 7b5c978f5837..4951b945151d 100644
--- a/dev-python/zeroconf/zeroconf-0.38.6.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.39.1.ebuild
@@ -22,10 +22,11 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/async-timeout-4.0.1[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-09-07 05:35:16 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-09-07 05:35:16 +0000
commit	d017a0c14d36b6a7f9ce0f9392298c5f513ebe6f (patch)
tree	dba71c71c5b139ef35f6d164419519522a1d79e9 /dev-python
parent	87c86c88d888f47594a8fc0060e8cdc373df1591 (diff)
download	baldeagleos-repo-d017a0c14d36b6a7f9ce0f9392298c5f513ebe6f.tar.gz baldeagleos-repo-d017a0c14d36b6a7f9ce0f9392298c5f513ebe6f.tar.xz baldeagleos-repo-d017a0c14d36b6a7f9ce0f9392298c5f513ebe6f.zip