gentoo auto-resync : 06:09:2022 - 22:33:57

author: V3n3RiX <venerix@koprulu.sector> 2022-09-06 22:33:57 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-09-06 22:33:57 +0100
commit: c4b3d05f2d4415c0d6f135a3ea0d2055d6e055b5 (patch)
tree: 3ed89f0ec34cf85a0c06c027a6889e7890e08db6 /dev-python
parent: 8965d348ad07c326c8e17e3137c151bcc98b0a53 (diff)
62 files changed, 597 insertions, 1036 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 51895acb659e..0b3998b5806c 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 8af72bf862d0..a6218da482d4 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -3,9 +3,11 @@ 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
 EBUILD astroid-2.11.6.ebuild 1786 BLAKE2B 56b20263f11843ff7b511229e3cf7af3cf61b0ae95ae0a12409fe6895b7f232bb85ba9286940b80291c4264223b9bbbcd406ffd2f7f88a029205fe195dedf50f SHA512 90e3ede82dfd55199b56671640c30adb0252df7deb49257a730a7ca13b8186425dde611b1b2539a8c5bee076bcf9dc0b96bb160276036033277022b2d516d28f
 EBUILD astroid-2.12.2.ebuild 1808 BLAKE2B 40ae0cdd718a0e862da50b8ff0d01081ea02b75c2725cd1cb5b18aac82c0472d9357ed135e1b5d3c3ae7a2311ad51a22edcd5d0510e3ea8a6b97da1c15e6104d SHA512 92747d9cc013de6177180c065cb1f5e92d206245d544d4f630e44592ae000cea1b15d887ea0ec02b1b6c0567b9c43a938fc91fdf14c82417c90b7f41536c2b29
 EBUILD astroid-2.12.3.ebuild 1816 BLAKE2B a01fa3bf6df8cf612e145178e7f6925223f38b51895bb3a5bcfe9032887de8b86fd57cecca439a1b2ae86a8bdcb542bb9932b6045979425bc39a1aea69797eb1 SHA512 6ab8b78285f781ced5cb70973f6a11d80db11acbe25f37941ca58014cf6d27f593d7fdb1a7a1497417af8c0fdf0b6c79e970e834e0be5f5c4eaaae2994d4ec43
 EBUILD astroid-2.12.4.ebuild 1816 BLAKE2B a01fa3bf6df8cf612e145178e7f6925223f38b51895bb3a5bcfe9032887de8b86fd57cecca439a1b2ae86a8bdcb542bb9932b6045979425bc39a1aea69797eb1 SHA512 6ab8b78285f781ced5cb70973f6a11d80db11acbe25f37941ca58014cf6d27f593d7fdb1a7a1497417af8c0fdf0b6c79e970e834e0be5f5c4eaaae2994d4ec43
 EBUILD astroid-2.12.5.ebuild 1816 BLAKE2B a01fa3bf6df8cf612e145178e7f6925223f38b51895bb3a5bcfe9032887de8b86fd57cecca439a1b2ae86a8bdcb542bb9932b6045979425bc39a1aea69797eb1 SHA512 6ab8b78285f781ced5cb70973f6a11d80db11acbe25f37941ca58014cf6d27f593d7fdb1a7a1497417af8c0fdf0b6c79e970e834e0be5f5c4eaaae2994d4ec43
+EBUILD astroid-2.12.8.ebuild 1816 BLAKE2B a01fa3bf6df8cf612e145178e7f6925223f38b51895bb3a5bcfe9032887de8b86fd57cecca439a1b2ae86a8bdcb542bb9932b6045979425bc39a1aea69797eb1 SHA512 6ab8b78285f781ced5cb70973f6a11d80db11acbe25f37941ca58014cf6d27f593d7fdb1a7a1497417af8c0fdf0b6c79e970e834e0be5f5c4eaaae2994d4ec43
 MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
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..de2148b20e43
--- /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_{8..11} )
+
+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/Manifest b/dev-python/autobahn/Manifest
index fc63ef54c1cf..8a26440716cd 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,5 +1,5 @@
 DIST autobahn-22.6.1.tar.gz 467355 BLAKE2B 54015ee50fa45f23fa589927da232b3ea523efae291b56b44704b66d171075d9459f1c3cf6b96b34fec119deddd2731ebd0695d49345a724bc84b57d7494f332 SHA512 b99f9e4508650fe9484e680b0cd9a0023935445b26ea42fce7565152a5692fc0d1c80f9854b4b3b3004ea17f60d13663477a8710e977211509a14dfad973c635
 DIST autobahn-22.7.1.tar.gz 476789 BLAKE2B 4860a6ec1a2631986dd5d8e94069134e75650eedb67dce18dd4c1e8ad45bd76ca183b4dcbca6ef4474c25f6feb4a1407c9fed4c74f0751e9c0c7fbca2b013406 SHA512 ea2c4d61d3f0f8ef35a31b599bc432781536dccaa316cda474a61003b10df0ef6346615d16228848cc5acb24a4e5f4c50be1fe759daf35b629f636da55688137
 EBUILD autobahn-22.6.1.ebuild 3681 BLAKE2B b243c031a8db9bbb87b668ea39f2b3f674d05c054590889d5b7b2f7309b124762e59d278e2eb3e40517344995bd7f8892dcf6fc3bafc5a5cfb80e621ecb32e15 SHA512 c779c1d38e54f125739b178ce06278b98735ecee1dfecdbd98c21f0cb2c1eddb58e6f05a62aca166f1d43c26df5f52ed3bba55c4a027813dfe1aaba3fcbe7ba8
-EBUILD autobahn-22.7.1.ebuild 3696 BLAKE2B 41c24bc853524f25c4ca94118708cbfc56f733dc0e06113343f2126305f63d6fc00470500db12a965e476a5e97684e077425a29301bc73fc3c2694b4775c2f38 SHA512 e9a61719bed1b14d39626acec28d255a7908a3ac73d99439960916d20d70a48ce7023f429d3b3cc0d38a7076fcff2cc3a62a9dd91f1af755e22f6ae45af5c221
+EBUILD autobahn-22.7.1.ebuild 3695 BLAKE2B 19a0726b1f06f43108742b1a46c6824612ab934669cc9a1e6f63461650bf6ac6d3750984229936b92843618fd4c87a53fdf6d1ab0fdf20d66e8b016f43c79a1b SHA512 5c0791cfa69ccd14a584b8134f9ab46f89415980833609033735e764b7a0f70da6eb581db019d8030bfdf7a743e41ffd957552adcfb0284fc84dcde58fc510da
 MISC metadata.xml 596 BLAKE2B 07cc4fbcb4c6fde6b1bb49a0a30fa8d2ef7ff4424397e29053a6ac89d87acd9fa7b1897c5381910d53f590192945a89a5b987fcdb9595e42f67f23333010a0ba SHA512 4d4cecf09593ec201711b13de1820e59f007f745b41611471ec737da4d679323787ac06a3a987cede9bf2c8dff71c9dbcb197e6a9c9109cf4d3a34d9247f9962
diff --git a/dev-python/autobahn/autobahn-22.7.1.ebuild b/dev-python/autobahn/autobahn-22.7.1.ebuild
index 0746e269c44b..9258c5cf873e 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 d0d63fc985b9..2fa4980ed6e7 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -1,7 +1,3 @@
-AUX bottle-0.12.19-py311.patch 1606 BLAKE2B 78808f90cf5c32ad6ac4675c3f55b144cb3d6d4fb5299a7e78de785553de13d5c9e44da78a9444aa92f869cede8d8e75a52773c1d5bea5d5a29893d27d8edbc4 SHA512 584ef8a5a66175841c318596c63c6ffa702a4c5b0958c1465f8def98a89aa32c9e36ad6caaf361bfdcfed050f4b2361e58b32fbffa2490014bd51c29244bd39d
-AUX bottle-0.12.8-py3.5-backport.patch 1720 BLAKE2B 63081eee3765d060d7381a0eeca97fde17367273b0308449678301f0d2ed9357c90881aeeff31c6a26920ff256b76b0567a74628499fb4d9f2325bc75de6a2e8 SHA512 10f8b95d77d35db582be9bb937ca0c52050c22faa191f373b34039c6ddec24a8e71ce26f6bc9c3f3af7973670343b2f3131c02ed626e3d161a636f8c9e4cdd2b
-DIST bottle-0.12.21.tar.gz 74229 BLAKE2B 88674389d2c087a7416443d031995ee923a98b790eb85d81b625f11b2fb0baee35d90a3ee2dba5b9d4744a343a34396a50edef0f85a2d6f4f0f4da95bae31b5b SHA512 3d621f6684f439a4a5718ad25e8b45eb0d1100cd565ec5b797adf67141e01d835cde671e687f5515cb6eab69bb465e9c7d004131634609266c2e1b69b0adbf43
 DIST bottle-0.12.23.tar.gz 73965 BLAKE2B ccd3dc3aad5c4c8b6899f55f03550cf9178e51788c27ece9808e1cff92693cc09dab145be16f814d29dae02ce53374a0470b2c4b032bc66a0ec2b1a11ec5ca44 SHA512 0550aa95680dd79d9c63c5de854845377183c86015893d9ee4e67126eca201582ef79d40ff0d1cbe79fe8a250118a775c63102475e337e18cfc1a65afe18f62a
-EBUILD bottle-0.12.21.ebuild 1417 BLAKE2B f5c8c1d9e0f9a45aef84a0a68b7117d955b31d78988a104a5b668f60c37c8c4e5b9c312cd6d92b83c4af6bbe9518df5432af76726fba05ed14c4a0b2e2b27a3e SHA512 b11d4a990ff0986af51d0b90513c41169f62c7af08b2af30a7762c70aa8b54b442ebf45d8424ac2a888caf16a30d634666bb36b99a3082d52ceaf52eec8add85
-EBUILD bottle-0.12.23.ebuild 1227 BLAKE2B a5fd579be6148f9fa931a1b6ac837b6f4e20d309757fcd8e9851bcf978b466befdf9ed14571b83b3bd6731e29697518118987edff4692b42fa9dc7d87cc42b49 SHA512 ca013100a4311a28448904db9a3f93117f5a3b3438ad4097e91253741400dca17f8d6ac669862f5111c5b1022314473747a94cc5c0a860412b1e820790ea3f68
+EBUILD bottle-0.12.23.ebuild 1219 BLAKE2B c4d228593e7530cc0888cede2ebd99ee2305dfd77741e8df6078f3da8064a70736c04b94034d4b3f81e91f996d1093b740dc359ab1de39a0a8101ae1b1b57d92 SHA512 334e0e07001c4e69d37de836e7426dcca4960acad3dd53d6ae6449e8dde68db0014aa50264a75b58a45e2d410936892963801d3cee233c14243a0fed1aa14f46
 MISC metadata.xml 345 BLAKE2B aef224dc08d75b22612e8f781673a84f4de7a50d2dd2af98c31286cbfbae19a1f4777f60c279b73a5291e7167581640c1bf9928884c95d8489f6f6c2045b9898 SHA512 62bdb54efd9580ecba9372b45973138202d7524bad742fd8752ef09149daa5f650c278aabaadec3de7c852595775ca7c858451a3dbf78a8f1f4df11379fe275e
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 5f1690c5bbf0..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_{8..11} 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 41a0b614f742..5839a4a80ef9 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/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 5d360aab328c..bc29d860d2f5 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -2,8 +2,10 @@ 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
 EBUILD cfn-lint-0.61.5.ebuild 1638 BLAKE2B aac7fa1a1a77be545e0198503a3557beff145ac1eff3615039ba66a994189f6de72f6062d2a6829199cb071bd03a3b23234992a293546178dc59af5bfc77ef74 SHA512 9eef4abcf551f313e508f2c3f1ffdae56142b2aa933942c0e9733d7e80a9d8324edd870d03a225683586a06fbd3a78dda5f95e81aac648e7864dcfc785797225
 EBUILD cfn-lint-0.62.0.ebuild 1640 BLAKE2B ab0b276a17eb6e1736a03f89d00a70a55840063177efdb4ca391f399acb5dea04480b4a31bf9bba12c607f35381d95b44dd6e346141d9e7e084eb4d48fe829e7 SHA512 ebc9ee814224010bf27a5e9675de5e1eed72073441da99ef9b8a3f8c17041eb6855d0951d97aa9e7f6f3d5aab758d594cdb3c93d9d990b4dac990e0fb9434a9a
 EBUILD cfn-lint-0.63.0.ebuild 1640 BLAKE2B ab0b276a17eb6e1736a03f89d00a70a55840063177efdb4ca391f399acb5dea04480b4a31bf9bba12c607f35381d95b44dd6e346141d9e7e084eb4d48fe829e7 SHA512 ebc9ee814224010bf27a5e9675de5e1eed72073441da99ef9b8a3f8c17041eb6855d0951d97aa9e7f6f3d5aab758d594cdb3c93d9d990b4dac990e0fb9434a9a
 EBUILD cfn-lint-0.63.2.ebuild 1640 BLAKE2B ab0b276a17eb6e1736a03f89d00a70a55840063177efdb4ca391f399acb5dea04480b4a31bf9bba12c607f35381d95b44dd6e346141d9e7e084eb4d48fe829e7 SHA512 ebc9ee814224010bf27a5e9675de5e1eed72073441da99ef9b8a3f8c17041eb6855d0951d97aa9e7f6f3d5aab758d594cdb3c93d9d990b4dac990e0fb9434a9a
+EBUILD cfn-lint-0.64.0.ebuild 1640 BLAKE2B ab0b276a17eb6e1736a03f89d00a70a55840063177efdb4ca391f399acb5dea04480b4a31bf9bba12c607f35381d95b44dd6e346141d9e7e084eb4d48fe829e7 SHA512 ebc9ee814224010bf27a5e9675de5e1eed72073441da99ef9b8a3f8c17041eb6855d0951d97aa9e7f6f3d5aab758d594cdb3c93d9d990b4dac990e0fb9434a9a
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
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..57fd1d8c6029
--- /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_{8..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/Manifest b/dev-python/clang-python/Manifest
index ecd325b16803..286d1d73fe33 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -6,6 +6,6 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD clang-python-13.0.1.ebuild 925 BLAKE2B 1dab0cbb672643072e7d824a262c81505d19e555f24f97f82156473affc2f5ba6fc34ec493ffeedbc82feb1245fc6a39126e1b81fcdc8f8b4ddd0b7fe108e4bb SHA512 11eaf5c7a484d756f01986eacce19c912666518892f3213ff42367c126c2d8474abf6608cca24e6250c64e7423464e7cb3e58c2b069c7febf4893b249f2ee304
 EBUILD clang-python-14.0.6.ebuild 956 BLAKE2B 491c8335c64484034663fd84ca2397e13afdd8cab6d3b4adfcc9317379e7a3620372ffe5996d4a0029a7d412f11a0d598f741a6893803ebadba85d330e49682a SHA512 4ef0d1ab2cbc3d277d4cced33fa87de7c3d43295a60a3b418ad4a95399e8de8c2e1e5c594681bf7ce1bfc465732d34b2db3a9e8636c0ed124ddf79c8ed7a5750
 EBUILD clang-python-15.0.0.9999.ebuild 935 BLAKE2B d1b871cd5604ded49427be7bbd4453b30b11515c6befc0d4202bb5602c387e41b789a6e14eebefc2a55723a1b4f683a82d41de4bdcbbdfdd85117f5ce64674c4 SHA512 e55abe1dfb64dc1d85c564013d1a01da128cbcb252aa118529ef61b8f0f17a0ae8653ef757a0b59f1b7d45e887951fdcc242bdc1cedaf9b1628047e4a33678cb
-EBUILD clang-python-15.0.0.ebuild 935 BLAKE2B d1b871cd5604ded49427be7bbd4453b30b11515c6befc0d4202bb5602c387e41b789a6e14eebefc2a55723a1b4f683a82d41de4bdcbbdfdd85117f5ce64674c4 SHA512 e55abe1dfb64dc1d85c564013d1a01da128cbcb252aa118529ef61b8f0f17a0ae8653ef757a0b59f1b7d45e887951fdcc242bdc1cedaf9b1628047e4a33678cb
+EBUILD clang-python-15.0.0.ebuild 958 BLAKE2B 6b0d87d018c18fc77fe4296055f2c8192b47f9668484f40120e610153dd757569dc15abcc1d2824cf9d365103db8974fe7d850ab086b4a6674f0a886cd6b05b8 SHA512 14d3e27966b677c56a1d3f67c7d51c2766967084eebe24d9ea9919dc20de35db8f500afa51c4f762c060bbe62c785f9192cf7d3cf03ba630d84b88278a703a44
 EBUILD clang-python-16.0.0.9999.ebuild 935 BLAKE2B d1b871cd5604ded49427be7bbd4453b30b11515c6befc0d4202bb5602c387e41b789a6e14eebefc2a55723a1b4f683a82d41de4bdcbbdfdd85117f5ce64674c4 SHA512 e55abe1dfb64dc1d85c564013d1a01da128cbcb252aa118529ef61b8f0f17a0ae8653ef757a0b59f1b7d45e887951fdcc242bdc1cedaf9b1628047e4a33678cb
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
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 2891edc42793..3e0bc84f48a0 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/flask/Manifest b/dev-python/flask/Manifest
index cc5a7417b337..36e755470e2a 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,7 +1,5 @@
-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
-EBUILD flask-2.1.3.ebuild 1512 BLAKE2B 4c087e67a6aac823a44f27a9040ba4af1b3e1d083043be671a39bfccfc4369490e746a869aeea137877c229b50a77da4dcc1e56907c2b0fb0c1f3dd6550a8e52 SHA512 dc6b6ecc43fecf840ac2fff079f9b9fc8e9650fa0ad761c1b4b9726935038f4685084a782fae385212be01ae640404ad53e12af5bf9a10fe988200cad86425aa
-EBUILD flask-2.2.1.ebuild 1520 BLAKE2B a81452c06be28a3670e745a543a4a07c906cc4738693ea7a065a8107798b495e86304bfe7cbaf6cacd3a5f8b71a11b517dd3b783547f017c5f45a6f98c65ae21 SHA512 11d80c89560d6cc9aeb9e57ce30770ab97453df65bfd0cd8e6bffb5f37de638e96a255510c1e5cb4d00419dd004935a4c58117b65aa78222f7881c3815e7e3d2
+EBUILD flask-2.2.1.ebuild 1512 BLAKE2B 1cb1e9da369cd226be31f05bf88dba214ee7351f31dae5014999ddf1073c93835efcd9a9bc76ab32dd96221ae0b5ee5eab509bc6a67204863fd21dac56fc193b SHA512 4c03ac62d99a8cf882f9d305174496c33610b5d4669f8657e747015664a1c3e027b6e2c25414a5a01dfa0d9459edea669668f2b3ae43d4380e8b1a832e393cbf
 EBUILD flask-2.2.2.ebuild 1520 BLAKE2B a81452c06be28a3670e745a543a4a07c906cc4738693ea7a065a8107798b495e86304bfe7cbaf6cacd3a5f8b71a11b517dd3b783547f017c5f45a6f98c65ae21 SHA512 11d80c89560d6cc9aeb9e57ce30770ab97453df65bfd0cd8e6bffb5f37de638e96a255510c1e5cb4d00419dd004935a4c58117b65aa78222f7881c3815e7e3d2
 MISC metadata.xml 386 BLAKE2B b449c54b966bc8943f7b7b12d6126867a89a2759eb749c08f7ad53a174e93ecad07f09b5e30c8562c63ab05df75a82e2f48f550ea8cf3a546f5afc2eef5a896d SHA512 123334db31948046e47f3cdbe0237cdec3dc2207485c8243d1e34e065436995423b6a89909563a6158741a8cc62a7fdad95923870a7114cf69e58ef715e7ec5c
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 48df9fe3e438..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_{8..11} 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 3a8c008e1ad8..493571f27224 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/Manifest b/dev-python/frozenlist/Manifest
index e1a87662c7df..b2f1301d8628 100644
--- a/dev-python/frozenlist/Manifest
+++ b/dev-python/frozenlist/Manifest
@@ -1,5 +1,5 @@
 DIST frozenlist-1.3.0.gh.tar.gz 27669 BLAKE2B d09e18455893f7ede59c37a080e79ea5e085cc3362e53bc7016db64338b2cf26baf44e95ec0c691535527b0eef4a40ec1fbe814e5d4ae238300125438d21b467 SHA512 780f0ec0e1a701b009e5afcd7f62b2950eda5365140ad5842c09db85b0a3cf282ab70ff9ba752ea6dc7a97542fc7399023aaaca8fdd8ecbd5c26bf64f305f5f4
 DIST frozenlist-1.3.1.gh.tar.gz 27705 BLAKE2B 7428d936926978acb90a857e0f76b303dddea684c3e815b3fd583e888102e114cc629fcd8e862a4e72775f8525193becfd4b9cd844a36f5b2c7964605008bb84 SHA512 4986f3635ebd2d3ca9623299a66375b03938a7be72f7a1d3437b1bf8c0739513942e6babf00476b61055c9ebee3638ec807dad521c52990104d4d57017efdfb2
 EBUILD frozenlist-1.3.0.ebuild 951 BLAKE2B 34f0f1ccfea43960817d487f3db1b0a8e898ab2540da1603e63d502dd08ad773a03164ad625264a4eb927f8d5102aee16861bdb62dfd207432025f1f3bb26967 SHA512 481e569cd7f6694cab015085efa0ae9f87daa608c6f9f6aeae6887ede168461fa31383c30d3690beb9b02bc074bad9334b9cb009c6c0d65eeef446177cadb988
-EBUILD frozenlist-1.3.1.ebuild 959 BLAKE2B a747d4160ba57a6412a86fbe8e00daec54ae331c306e541609eab5b5ad5bdb601b31741409340a0cab25cbf89ae9cf46073351c390dfd36e6dbb0644502b0fcc SHA512 8bf36bdb8951eebb9e69080c8bf443b8c71f19f8ca361163c426c60b5814a4fc2bd186779d5befb905243bb5312da8c451130666d89101519a850dd43ba9bfdf
+EBUILD frozenlist-1.3.1.ebuild 957 BLAKE2B e4f220b8422487ebf8d998a32fb146c9a087a0992d3c667cea0944ee5945856d908e8d20461f49fab42d27ea0b9287589777bf3f934bb8f25bfaf4e9e04f426a SHA512 3645f38041ce05f2aed1fe5fcefffb4d7093790619e6b7e32bfc7d4ac3900bc8d5c18187a632aaaed3eecb2960a36567075d230dec87f02ac83eaa40468be9b9
 MISC metadata.xml 351 BLAKE2B 354fa5d9789eb9f28cfe13a39e80f5ba41f4ef9f8daa3437cbab5f1fb61074baf9d1a196814cb459c0a1d3b3c1fbe806ee77580023d71b8b8c6314ad23405765 SHA512 a5b647914f9a7b2004bb3e1c02a6fe07dcaad58dda503cb6a41d6735dcfe80c4e60e4ca51ba83110557518e23f01a656f05266553a6b5acfe95a0560ecb2829e
diff --git a/dev-python/frozenlist/frozenlist-1.3.1.ebuild b/dev-python/frozenlist/frozenlist-1.3.1.ebuild
index f8146bda6935..0ba378ae6a81 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/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index e6657dd00921..bb077fc32818 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,13 +1,7 @@
-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
-EBUILD hypothesis-6.53.0.ebuild 2078 BLAKE2B 11eee6781b06ca0da65094d20403b7783d83799a1f0e3684fb450784faabd97cc624caa681d1b89974dae552d98ea8c98f8a2de3dfa57c97b4246afe9370f621 SHA512 972d703e77d7403ca70447f2b27617874be3a0eff802c79ee05d7c0991acb931bb2a91967055c27f244568049d86879ec1a77153a7a48aaa4305132b0b537eb4
-EBUILD hypothesis-6.54.1.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
-EBUILD hypothesis-6.54.2.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
-EBUILD hypothesis-6.54.3.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
+EBUILD hypothesis-6.54.3.ebuild 2078 BLAKE2B 11eee6781b06ca0da65094d20403b7783d83799a1f0e3684fb450784faabd97cc624caa681d1b89974dae552d98ea8c98f8a2de3dfa57c97b4246afe9370f621 SHA512 972d703e77d7403ca70447f2b27617874be3a0eff802c79ee05d7c0991acb931bb2a91967055c27f244568049d86879ec1a77153a7a48aaa4305132b0b537eb4
 EBUILD hypothesis-6.54.4.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 EBUILD hypothesis-6.54.5.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
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 4fc4aa3ee205..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=( "${CLI_COMPAT[@]}" python3_11 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 1065b755121f..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=( "${CLI_COMPAT[@]}" python3_11 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 1065b755121f..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=( "${CLI_COMPAT[@]}" python3_11 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 1065b755121f..4fc4aa3ee205 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 7373d8875a2b..95382a79e9a2 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD identify-2.5.2.ebuild 588 BLAKE2B eff914d7f68c76704a11dcdbfef21c51f52f0abcb6d29f669ba173106369d2eaedc818e9d89ed2d35e765184b07fe471c3d9c86db84f0093ebe87e46bf951152 SHA512 2ff5036390cf415ad56c87cc4bc7e1c2fbf0992ebf92ef3cbdf44ed40832a0326bb5f946e4fa432d4e429f8b224c7e6b37fb3ebac56d2388201df754205bd42e
 EBUILD identify-2.5.3.ebuild 590 BLAKE2B 9903b2478df4f9ce56ff68e2877d9b8e5d86a814e3c021b0533f3db6a1aabc5709c5cda6a719e47126c1ffac7ef34bfac74531395e035055a856a9427b9ca179 SHA512 b9c852d73351dc0386609a4db9072467a47fcf768205fbcfdc7798d0acac40de383315a734547acf4b3fc46cc1c21c66fabc0d97583c2fa0ad946ad89551be03
+EBUILD identify-2.5.5.ebuild 590 BLAKE2B 9903b2478df4f9ce56ff68e2877d9b8e5d86a814e3c021b0533f3db6a1aabc5709c5cda6a719e47126c1ffac7ef34bfac74531395e035055a856a9427b9ca179 SHA512 b9c852d73351dc0386609a4db9072467a47fcf768205fbcfdc7798d0acac40de383315a734547acf4b3fc46cc1c21c66fabc0d97583c2fa0ad946ad89551be03
 MISC metadata.xml 501 BLAKE2B da95534590927f7290f78f47e30484e3349c9058048c15522e7346a74d9a2c96141a18897b10b230adf966d3c237217ef1d2dcfe59814ccfffd58ab4c38c1ebf SHA512 8d78245bbd2e14016eb70f1d8f8d6129e6b265084f7da95bd915f01ce5af94f86bd69c33c1514195de70d0f834332d9ca968a18afb59a7016c8cb58681d04d24
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..8ce2bd5b0e7d
--- /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_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="File identification library for Python"
+HOMEPAGE="
+	https://github.com/pre-commit/identify/
+	https://pypi.org/project/identify/
+"
+SRC_URI="
+	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/ukkonen[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index d719aa568e84..733693bbcecd 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -6,6 +6,6 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD lit-13.0.1.ebuild 907 BLAKE2B 786bc45254014c19e47997b263eba9245fc44459a6f12d46e69803fdf57c1b8f3d07d7e0354ea23ab17471771f57af8e792ca942b9f195462a26629d8d6bfb8b SHA512 ca254f8d0d3af0e01b24e73de8e15b77d687fd0f23a4848dd4e85522426e7dbdcd8ae77e25d8f88e637e390131fe78362ae7ba4ecd192a4c970cc3311b371dfa
 EBUILD lit-14.0.6.ebuild 914 BLAKE2B 80f1bb1010f71ff835aef8e87cc0bca5de0dd97e74debaee4e26d698e530468b755bc632884c11616a0ae082befa75a7b6c11043c70c3bb5679b0dae1c985d0a SHA512 77eafef2378be28fdcaa87f07fec8b1907f8c491b4a600b47d9f5970148f6684e6b4733ad6dafb753aa7a56ed1834b10ff30afc5995812c895749ea0c7294e47
 EBUILD lit-15.0.0.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
-EBUILD lit-15.0.0.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
+EBUILD lit-15.0.0.ebuild 920 BLAKE2B 44ddfc3adf60ca1c1a328ecda0d28b7fcbc416a0d472cdf31f978fa25beebec533686b71292a7b36be1654633026e029f04e2b496c06845e088bd9b416b1b6c0 SHA512 d4a2442ead255c0664f4a4946034632658d39dd36ccf3d88b5aaad7f7ebe25b0969dbfb368ad6a487c277f845c47a54f8f548df79db2da84bf3714883ec0fbea
 EBUILD lit-16.0.0.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 MISC metadata.xml 340 BLAKE2B c9ca851e49b4ab48c015686e983ec988f60c34ed0af77abd7bc03d046002f79f74b9b463ecb97db89f2230c1593af7acdaf6651fc51fed4aa92a459d07aabf18 SHA512 3fe8262ce6b971364162fbdbac3b02bf02f0a64896c8a2564e2a2998bd6e6bc74463bf9104e3f4ffaa9f5c1a16c877fc864b8a4f056ca0022f741799bc00f217
diff --git a/dev-python/lit/lit-15.0.0.ebuild b/dev-python/lit/lit-15.0.0.ebuild
index 8ace6ca8b915..a79ebb91d54a 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/psycopg/Manifest b/dev-python/psycopg/Manifest
index 79633b9f53f8..5b58ab7f78d4 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,7 +1,9 @@
 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
 EBUILD psycopg-2.9.3.ebuild 1306 BLAKE2B 166f519f6e4694fb2725e0f4e736a9ab907dc398c4fadee579da96e37f29faf6f6fe735e56dc9156eefa74302bc516915499d827b3762655863bda1162716e19 SHA512 ecb1f931618b74393cace6f850b35c7512fe5902bdf97eadf0cc1f54e60797c863fe558cda3117ca8a5cd025bd6a761545d6fc1d837aed8ec095c48e98cd7c1b
 EBUILD psycopg-3.0.16.ebuild 1653 BLAKE2B 91a5f64268d5304b46e14d3969bfb3a8df2fd1ebf6ca8d9adc365ce7200628efbe8d7c8bcf4e964881eeec743fb3c736ddf49f897df546161f053ed955284e58 SHA512 647f24602344c4016e440c4dc2d2c8247b5e6f549049140d9fcb03854d926bea1c1f494f836ab1f9f5be3f0239c680dd6cdc44fa14166981b149a2a1db707ed7
+EBUILD psycopg-3.1.1.ebuild 1732 BLAKE2B 346e6e31a3be765833c4a1d75009d3c8e7347aea9a4a38d35d0cc5c7da722d23abfc41c5b4943331a008b19238a7544c0b181eec83a23a68ae1bc68e5748757f SHA512 f808046857d7400d55ebd1e10ab5f090c26f78b181ded703798acd5a9531bff61bbb450350f904533e265f0fcd2c5032db53a9c1503ced826dc26002cc2a844e
 EBUILD psycopg-3.1.ebuild 1732 BLAKE2B 346e6e31a3be765833c4a1d75009d3c8e7347aea9a4a38d35d0cc5c7da722d23abfc41c5b4943331a008b19238a7544c0b181eec83a23a68ae1bc68e5748757f SHA512 f808046857d7400d55ebd1e10ab5f090c26f78b181ded703798acd5a9531bff61bbb450350f904533e265f0fcd2c5032db53a9c1503ced826dc26002cc2a844e
 MISC metadata.xml 369 BLAKE2B 042788638a82318248d4e4ea1e12bf1631af6ffc435fc0110e13849dad600854e8b57f5ba3397c4d4e5d103e165b342f8aba869e72e9b63efc500382d3423414 SHA512 5b216575e8cae847f71a09ed6b676a73fccf2070f3bea3b35f1bfbde95fb0154b2fbb356948e112cc9f2298fc9868ac3994a139e72939f80d59c084ec58d80bf
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..8bd1346c397b
--- /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_{8..11} )
+
+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/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index 841ff84e68f7..10bc81228bee 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -3,5 +3,5 @@ DIST pycodestyle-2.9.0.tar.gz 102014 BLAKE2B ee2c2cad332e7442f9e557f388c3de09ea0
 DIST pycodestyle-2.9.1.tar.gz 102127 BLAKE2B 701e6325a73173b8ab8540f03f794066f05ffe7f29cfac49f065ec6f8cc6a50b1334372b8fd7619a368a54605dde0214da9e9b3b59326c58803bf7f49d6981ea SHA512 da1c67815b50d13c8eb70cebcc12c761a6407518a4ed4a8780ee7064089c9e89a5c3246d05f19916c0ec293fc1a372d3b2adb72e11f775b1cfbd1fbbe07a1a83
 EBUILD pycodestyle-2.8.0-r1.ebuild 988 BLAKE2B 1a03070b2034e0980a1bcbccea10fb802cf8d29103ade396ad4834cbbe1b7f63c11e771467cdd53c188a0ee7025e5c0c5e7d7cc06d179d2d40c2e30194bdde99 SHA512 7ae95a135f574daea73067a52cd143bf502f54706264c7736673ed552cb7cd1bc33f2017f3fb8726d1605d86acfa294a469b9ed7e9fe69ac13ff61b55b1acc29
 EBUILD pycodestyle-2.9.0.ebuild 1067 BLAKE2B 440eb3e87210bbc3b2b013daec2ab9eb89c5d759d9a0d9553d1d817fe09a722281a7e478fcc34276ebcb38be84471bcf74263dc4d86ec1e7ef540fbcde348f0f SHA512 d3d9712990c3204b4d790f3ada1d438ab2618b6a34da97a647b2af73ab423845fd30181c3c6687fafbbe73c8ba8627cebe402080e050270bffbf766e2d514a7d
-EBUILD pycodestyle-2.9.1.ebuild 1067 BLAKE2B 440eb3e87210bbc3b2b013daec2ab9eb89c5d759d9a0d9553d1d817fe09a722281a7e478fcc34276ebcb38be84471bcf74263dc4d86ec1e7ef540fbcde348f0f SHA512 d3d9712990c3204b4d790f3ada1d438ab2618b6a34da97a647b2af73ab423845fd30181c3c6687fafbbe73c8ba8627cebe402080e050270bffbf766e2d514a7d
+EBUILD pycodestyle-2.9.1.ebuild 1059 BLAKE2B 55c3b8d2ad52d4555dff20cc0c84101041edfd4105e6d6f7daa35a7740574b4bbb9b5539e595aa4b7435a3c96072756172e6af236ab9fd814e638278146efe93 SHA512 7b079a4d4dd0e860235c377d4e3fc208a030b644740b5c3b0fc7fa89a7cd2cdca2891716767b059892e3b3d8d16922836d3e315b4c0bee03c3042b9448ac2c4e
 MISC metadata.xml 350 BLAKE2B 6ca2711d99bb29041b5cc2a65218ace68f8d4f2d1d2d0a19f62d17f2340cc44faa7488d4eb29b72e86a0b2f003ea6a2df5f5d4e7d95894ff9c8c229bb6441156 SHA512 db79cd77edb6be824903614c78a39f427af51e940c0b08e1512c264b634ef3474fdba21a1a8b6c9458c2687f871d9374ea5f9b5080da4f6e652dd919e89d990c
diff --git a/dev-python/pycodestyle/pycodestyle-2.9.1.ebuild b/dev-python/pycodestyle/pycodestyle-2.9.1.ebuild
index 509d1524f65a..2726262d4f39 100644
--- a/dev-python/pycodestyle/pycodestyle-2.9.1.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.9.1.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index e75085d1675f..52576f2586ac 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1,9 +1,11 @@
 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
 EBUILD pydantic-1.10.0_beta1.ebuild 1967 BLAKE2B acf8f14dfbdeb20ecd389acc4277dc75b1aa3901c1cf623061d55c65e26941fe2be673b02f4523dfb50f2b8e526f6081116c4ff3d566243496569e531d3a5f2e SHA512 14b7500e7ef2ca647a4e6d7b31ac8aed7279754ca07c08c8bd46d66aab36821dd0c6f6d6217a9584cf167aba1293ea89b721880ce23f33e4a76f2a41c2b428c0
 EBUILD pydantic-1.10.1.ebuild 1967 BLAKE2B acf8f14dfbdeb20ecd389acc4277dc75b1aa3901c1cf623061d55c65e26941fe2be673b02f4523dfb50f2b8e526f6081116c4ff3d566243496569e531d3a5f2e SHA512 14b7500e7ef2ca647a4e6d7b31ac8aed7279754ca07c08c8bd46d66aab36821dd0c6f6d6217a9584cf167aba1293ea89b721880ce23f33e4a76f2a41c2b428c0
+EBUILD pydantic-1.10.2.ebuild 1967 BLAKE2B acf8f14dfbdeb20ecd389acc4277dc75b1aa3901c1cf623061d55c65e26941fe2be673b02f4523dfb50f2b8e526f6081116c4ff3d566243496569e531d3a5f2e SHA512 14b7500e7ef2ca647a4e6d7b31ac8aed7279754ca07c08c8bd46d66aab36821dd0c6f6d6217a9584cf167aba1293ea89b721880ce23f33e4a76f2a41c2b428c0
 EBUILD pydantic-1.9.1.ebuild 2099 BLAKE2B 10a509b9b1b527e01c0aac2542a09dd9dd0a38132d45c2e02f3b8c0fc1d469d4d4ae6a5245e27ccc7cc85f8538edc86cf249c14e365e43233dee0a5127f85852 SHA512 c28f602375c529b5081ba5823c68452f5372fe97b9cddcd09100a617834f01fc9bfac731643cc18dc370387934c14c40a9afb4405a8c56f589545b243f82ac05
 EBUILD pydantic-1.9.2.ebuild 2107 BLAKE2B b1b0ec5c6da55a5b43219e43d49faecd2cdd5f9e44e681a7aaebadcd858dfd62c8ebc73da614e3871fdc7a6dad6d2e3580f398c749ac64a06eab2b04f6898b63 SHA512 e153ac82345090fe983b411395c2f7950bd884460e42b572108b0253a8a75606f835e122731df70a6f7c1d38658ecfcef5d092762a899a5266331d5f91710141
 MISC metadata.xml 484 BLAKE2B 5537370a640fd44c6fa0ac0827695c276824909c084343b2f679ebcf1d775846e05e8a657ea4c279737ea808f59ede0b1bb80f163c87da4451aad2c74d8b0a56 SHA512 2af95840f5898f61813d1ada5b4338398ff212a7896904095aa007f95458a4f8bb174e288e8629b2ab29a5b372aba1f068a4faa64d43d8a739518ad740cc4f77
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..c666dfdb266a
--- /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=( pypy3 python3_{8..11} )
+
+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/Manifest b/dev-python/pygobject/Manifest
index 6a19efb561b6..2f9612d82996 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,5 +1,5 @@
 DIST pygobject-3.42.1.tar.xz 557904 BLAKE2B 5264c1b187210622548203e0df5089262ea0b3e93d9e46679030b4722e74f1993f200cfe9357c389357902bcdfdb13c8fd9cc9d6efa3b5fa0f730c3b54017fe5 SHA512 b044d395f8334057be632fd56f670ae8405d9fc375bcbd7a0a3b2dcfb8efb06bad45e62e92d2ee5432e503642dba11d6f9bf91f26bf135fa5f9a871657105a18
 DIST pygobject-3.42.2.tar.xz 558724 BLAKE2B 3e98cf52e818eff42beb8b6120ee8eb4cbe3a6f49670d355e1081b71d411bc93fc701cc37108a321cfcc19698c39b8b61cce5a9369d871da58fd2a2c0455fb96 SHA512 eb604f839e0702e8aeff0f19665e44c05c56cae02ce892e9ab8a95ddb0d5d0216182d0c9a0059fc8e05990c0d5707f2f7456d8924bbfb95ce1d9a42908ac0119
 EBUILD pygobject-3.42.1.ebuild 1786 BLAKE2B 8da4bf87d753a965f24204363d4250554fceb822bf55090a401ac643d2bd91491ba6dbf3eef57517cfd684350261dc97e73058bf98656a9c92fc3e0dbd84d592 SHA512 aece28c7d33be016887008111abef907eed8d7746559d0527a8a1ef4c46cfde25a2689f620a7b4d4ed4edae332a07630d3b918ac767440b7c91eb892da4dea53
-EBUILD pygobject-3.42.2.ebuild 1746 BLAKE2B e2675bc2af6bab584da18df67b3e7f732b71e1bb8a648acfdfbb03e73f9bb111339516c8f80cfffe263bee19ae3d8c389a57a1dcf0a3860204a26e574a828c4b SHA512 edce4db869b7c2751fcc9ff4758feec3aaa5232772686f33dc03c539371cbdfcd79fd9fcbd83b762a6192d913c18014a3cd0cb81d380324e5f3d5e488e687040
+EBUILD pygobject-3.42.2.ebuild 1743 BLAKE2B b635cde6bb46808c85c0c07ae6a37fa47a8981b602fd74bd80f28ea9f7bb49d4163ce1eec0407befebe278f7e285b9107539de20fcbd9882c7cca09c6ccd25d5 SHA512 f93c7ac5133619556f1246edc60f2ce8101474069284730e5ac58f0f35147fae5980adced45ac1fb6c3fd0b89ff46bdbda6c3532101920b7efe0756bfddeb9b8
 MISC metadata.xml 1293 BLAKE2B f47bd4d3e2239697d3684223a8dcfed77c3af429414f6bbbcd6e37d1707d38796fc1ab6ba01402442dbf9cff8d89349888403240ab9dd348083968c61eae5cb8 SHA512 33ad074a03fa3ac7917dc7225218cf8e636776588015c9a9cd9c2274fe77b63a0695f288ff06e0cb94899e5286d11a9746457531df945f8a95fd7e031f601db3
diff --git a/dev-python/pygobject/pygobject-3.42.2.ebuild b/dev-python/pygobject/pygobject-3.42.2.ebuild
index d411290d7520..9f1ac85372da 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/Manifest b/dev-python/pylibmc/Manifest
index 569478d0fdac..a5e63616fd78 100644
--- a/dev-python/pylibmc/Manifest
+++ b/dev-python/pylibmc/Manifest
@@ -5,6 +5,6 @@ DIST pylibmc-1.6.1.tar.gz 72061 BLAKE2B ebaa6f9dfc341d862a8b46bbbf0db1420ff400cb
 DIST pylibmc-1.6.2.gh.tar.gz 71581 BLAKE2B 4fc9216150e122b6d80537184422b52c0a518f5b9fbcf5b54f794fde33d5ac6fcd474e08f71b8d71f0443351e91ea5d8ac2c24e94bd568605cf1183259394091 SHA512 1a1575fd5c3644d53e0ed49818bd958e0e28fe0354f41578c944b260f402f1b51a74baca8f98b32adfd0024e61ec8df1795c6ca7363509e35e4f34a907de063e
 DIST pylibmc-1.6.3.gh.tar.gz 72154 BLAKE2B 3367651d355cb9c6693d8162e740c855c8f84f6b2a5f54ba5fb7f505474263650b46d5ed04c11af2199a7b40c6d4cf0d13a63d2d76a395ff30570a4a3e5259ec SHA512 4bc85d305410f775a39d8d3f64a7e97538ed6ae890cd64833e5bff92fbb60fe8ebc4cc7956df015f6590eb55b7009bd36b299dc636ee0da7f71ed51cc98f3012
 EBUILD pylibmc-1.6.1-r2.ebuild 1383 BLAKE2B 722b240fc8e21ef8ad8007d788937c130159080dbc4f6da82a7b7fffc620c9f9945d2c6f330515b17eaf3124738386ee91c8a159743450f711ba281697baab1f SHA512 5b7fbaa7198f7a0eac192607d51a118ab3a1251f017c303ee0f92743b02e83fdc34a795573d821baeda02685a0a19ca02f9784f14c86b0ad67009ef8dd072e21
-EBUILD pylibmc-1.6.2.ebuild 1234 BLAKE2B a2b45998533c4b68074c5e58406a68a4cbf6574322cc0e29163164ced280ee9c15306b1b733db710c18c240adb604979e40806525192182de17d79140f755138 SHA512 99049e42ebb1aeca7c456cc5068fcb9e24d0a4ba7a94099622480ba92905323b2beff1a598788c0a9b6ed15354cb8472027f284d68c091550c3f365b4ad2c9a2
+EBUILD pylibmc-1.6.2.ebuild 1232 BLAKE2B 9d2430419f35c9da4b1131270643aa311aa2d89ff2cf9050ee69a65626c7634e564d223dfeaa2b6f4cf202d44291f40a19b2bcfe072059ad13d45c97a4ab38fb SHA512 9065780229d86891ce34557268ada02585ac14b555c5ff1fdad2cfc8884137adbe8f355266c4b1fedbe91c9382b14ad2648319caf6568ffd1ab1de4eb92577e9
 EBUILD pylibmc-1.6.3.ebuild 1234 BLAKE2B a2b45998533c4b68074c5e58406a68a4cbf6574322cc0e29163164ced280ee9c15306b1b733db710c18c240adb604979e40806525192182de17d79140f755138 SHA512 99049e42ebb1aeca7c456cc5068fcb9e24d0a4ba7a94099622480ba92905323b2beff1a598788c0a9b6ed15354cb8472027f284d68c091550c3f365b4ad2c9a2
 MISC metadata.xml 367 BLAKE2B fd37f3e072661e616dcfabb2054827a7b1c3830e555cb6fa461e93dadcd39ab1856c0ad4cbe03be85924889b97ba7cc88da651011a4b1c5622fcd950339f7e2d SHA512 33977c15a726c2039221bcbd282244c240013922bd4f1398e75f01ebd68dd0f8574ac890ddb578cb633a89b52584927800f86dcb4a1eb0ab27b165c38b9a91e6
diff --git a/dev-python/pylibmc/pylibmc-1.6.2.ebuild b/dev-python/pylibmc/pylibmc-1.6.2.ebuild
index b37179120315..a58498035067 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/python-cstruct/Manifest b/dev-python/python-cstruct/Manifest
index ecbe34c47ac8..95c7f271608e 100644
--- a/dev-python/python-cstruct/Manifest
+++ b/dev-python/python-cstruct/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD python-cstruct-2.2.ebuild 636 BLAKE2B 7a4e7e53b2959d84b7fa9405c8cd6a0bd00d8a1b3823b31a220902d8b44107c0d0ec0f42e4e3d9871867dd56a5a50f0ca7f788f9ad4b14a3a0f813eb617d5345 SHA512 9d8bdec9c0059c57a53bac9ea3d2b45c4602b3460c1dd9ae2782153972ce3dbc429669d62577572961893ab7e304faa457e5b728dd26c3c0ab84a236e1c7dbec
 EBUILD python-cstruct-2.3.ebuild 636 BLAKE2B 7a4e7e53b2959d84b7fa9405c8cd6a0bd00d8a1b3823b31a220902d8b44107c0d0ec0f42e4e3d9871867dd56a5a50f0ca7f788f9ad4b14a3a0f813eb617d5345 SHA512 9d8bdec9c0059c57a53bac9ea3d2b45c4602b3460c1dd9ae2782153972ce3dbc429669d62577572961893ab7e304faa457e5b728dd26c3c0ab84a236e1c7dbec
+EBUILD python-cstruct-3.0.ebuild 636 BLAKE2B 7a4e7e53b2959d84b7fa9405c8cd6a0bd00d8a1b3823b31a220902d8b44107c0d0ec0f42e4e3d9871867dd56a5a50f0ca7f788f9ad4b14a3a0f813eb617d5345 SHA512 9d8bdec9c0059c57a53bac9ea3d2b45c4602b3460c1dd9ae2782153972ce3dbc429669d62577572961893ab7e304faa457e5b728dd26c3c0ab84a236e1c7dbec
 MISC metadata.xml 454 BLAKE2B 5138bc275b0b9e18cab52fb309283c6b6dab8be5dcc3c86dd6526f350b216c68bc94dd2aabc7a33a4879c23165924563396c6d5991f5c702a12e184067d25cdb SHA512 bb259a25444029d8ea63577f0576ab283282298d27987e276bf4eb6d4ef00853ed019ad199830e9bb4e738f9a151feb55d53e76917508f1033c2b3ecd246276f
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..7b8d01c50942
--- /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_{8..11} )
+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/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index 9d33505f937e..60a8f6ff7aa4 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,5 +1,5 @@
-DIST readme_renderer-35.0.tar.gz 27224 BLAKE2B bb58a6cb39aace47714aa351c710663ca9f43f04055e21a5ea3954b2d1fff58dce073b0a41bdfb07f34ffe16f2fbba9ba59c2a6b8f84c0eacfb7d9f7cd881380 SHA512 29377cea5a029f7c4cf2ec0362771a280936e84fc39117c13fc6557172581570af298520ea6f5df53260e1da539ebe3fe4183bd1fb5620af48824bee04fefc75
 DIST readme_renderer-36.0.tar.gz 28680 BLAKE2B e356690bc791d5f4a27ef59c61e356b3932595623434feae8d0fc9cf99d1bd4a724d5c202e47f989017821ce2bd69604338912c37b879699677496b789453c56 SHA512 1e208e830060d2a94e608dbbef36376c7720b8b4e2c8619665e82c64b7111153f4b764c1c7a77b36d3c0d652adb1f49a14bc7306b7bb5c65598db7acec6e984e
-EBUILD readme_renderer-35.0.ebuild 826 BLAKE2B 07790975b0eeae82f5171b2694c92ab376a2f8195d05c68113e2852ca22c6e86f8a41c4c90d483d8a66253ed2651751f5c19e0f62363338287286afbbaf4b696 SHA512 58c1d989ce5bda468254c7971de1c00ce8f22a8159cf4364f182e589cd89632d7885e755ef276f6eda529aecfd78d65fb8e71ad075dd1e848a7bcb53e825c0f2
-EBUILD readme_renderer-36.0.ebuild 834 BLAKE2B a0917e8b520a5babb97322d4ad68418d431dcc7b12b180a7875c749f38149fe0750ac6f8768e2eb83e94a4b0329d60d2aa5d76d58f74d59918f8a9a415cd6302 SHA512 0746feea0ae0ad4cc1aa10a6b7021c53b24c52cf951c578366a8aa08997973f981557cbdaf464840911f7963251a0aa2a3d0160622536c1751c5fe31bc20b1e4
+DIST readme_renderer-37.1.tar.gz 29234 BLAKE2B 42a78cb5d19ee1d5cddd1d35c82801468bb2911c49037c4d4a07bc06cb1652046da99e306ed6b2864c2d26569092f824f1b7eeca53c147e6dcf6d60701679de9 SHA512 065dc1ee9baf88cea15d278dc130189b282c4bc04ccdb3d25cba423d4e32d41c8614b978ea96956913b925e1a2bdab0c2c162a369708ec253e8fae275b1c795b
+EBUILD readme_renderer-36.0.ebuild 826 BLAKE2B 07790975b0eeae82f5171b2694c92ab376a2f8195d05c68113e2852ca22c6e86f8a41c4c90d483d8a66253ed2651751f5c19e0f62363338287286afbbaf4b696 SHA512 58c1d989ce5bda468254c7971de1c00ce8f22a8159cf4364f182e589cd89632d7885e755ef276f6eda529aecfd78d65fb8e71ad075dd1e848a7bcb53e825c0f2
+EBUILD readme_renderer-37.1.ebuild 834 BLAKE2B a0917e8b520a5babb97322d4ad68418d431dcc7b12b180a7875c749f38149fe0750ac6f8768e2eb83e94a4b0329d60d2aa5d76d58f74d59918f8a9a415cd6302 SHA512 0746feea0ae0ad4cc1aa10a6b7021c53b24c52cf951c578366a8aa08997973f981557cbdaf464840911f7963251a0aa2a3d0160622536c1751c5fe31bc20b1e4
 MISC metadata.xml 416 BLAKE2B 1441314990a3eca464ea227d76e458a42b3c9bf44076f64a59d22cdddaace1fdbe219b3e6f8fb963cc40174aaf473852698facbc8816f55278821df0f452a1ed SHA512 50abec4287629f7982049959696e8f21e0a773618c40b42815d53e709d080ff6051235453a4659c50bd4cf856829d0489cdd0f4e1f56cc65f28d5de45d849b86
diff --git a/dev-python/readme_renderer/readme_renderer-36.0.ebuild b/dev-python/readme_renderer/readme_renderer-36.0.ebuild
index 4ce1fe0bd41c..8546ba34f288 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 8546ba34f288..4ce1fe0bd41c 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 da4cb1f32f99..13bb632278a9 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,5 +1,3 @@
-DIST rq-1.10.1.tar.gz 599678 BLAKE2B 0673ca0eea69c3f86e50f5609a9c4ed2c2d93d331479510365a744461a5d878e6de6a9683356562754a25760f8ba1d8a65f6d5acfe878e488a70c54dc0bb5b54 SHA512 1a12bd5db27eb3f9303b2f3465c2f22092f7eebfabfc1e6aa7f65de7ea139df3833f9bbdc7061de564b2418608641b3755993bb918efbf93b04df67ca942ea09
 DIST rq-1.11.gh.tar.gz 603425 BLAKE2B f6295e1d7ddbe229001076b8ca04f0f8c323eed988a7963449c2240cbc6168d48539297c16e1ce95f7ec2b8824e6f65fc1e026e76a6093e73c06dd1b847d1c5b SHA512 6e208f4c1c8c55f5847843d7933f17d2fae58e2b24cf1461fddba08894a860f8bcb55aac5c6840f2d9223b88538070c414e2e540e9bc846cef05a26b0ef38ffb
-EBUILD rq-1.10.1-r2.ebuild 1404 BLAKE2B 075b9a78ad5c728a9d1dcb878a321eb345571766135e8894deab7ff8a7ebd626c56892b5a7edfce6a41242d298ec6a82429aaeaebbfb784b367663f686b1dc6c SHA512 61c5d5351b791065b523eaa1be161a558806b9b9921a6a358aec548ecba720d454011f609cb01ac87395882fd7f7794fc9549e755b670b41a4fd14d98dd4a80b
-EBUILD rq-1.11.ebuild 1375 BLAKE2B 70eb305fec6216506ffc8b2210b1d68b2ac8ed863fe9034a3bc0cf887d837ba56af2131b949698e2d2fb02ec9f55468b95526b3354015d55e9dde00252a3e41e SHA512 3804fa0b22716ba73a30741039372400ebdb377df0068ce2f1e4b21b91b8756ed73522aa9ec6f090cc2fd9c6f3b097e85468d3cdcb09efbcbfb45f8da61c58f4
+EBUILD rq-1.11.ebuild 1371 BLAKE2B 3fcee646908865ea25633787fc3ab2aec1a74f7ff74641405b907e2022d549bbe41d524c34f5de419c979487ca8ef92ac4623f0aaa6561d71ed28643a69f3db3 SHA512 8292eb24a5aebeefec61da1855f6905293f0cf16416f2fe3193ba8523ed04276f0d645d9b946c3e853d6f754568988a1544a1954fd7a7f316f5f275123e510f3
 MISC metadata.xml 453 BLAKE2B 6a46d43b524fded1ad4749fb9669ea07f8b3e23940d0bf2a4db5d92564316b01fdfbe220771e30b1a110ef72c613ad683cdcb7940682ea32198a5b6f027e4db3 SHA512 104ef96c34b55a9fda377c1304ff85781219fdbccef1a83d1bef30cb2fbd0ef816cfe82715af8937f452499135f7ed65c65a29c34919a09b6144ada367c26af5
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 4eb54ea3094c..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_{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 6af76a6a12d6..65c60c770fd8 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/seaborn/Manifest b/dev-python/seaborn/Manifest
index 883a4cebcd44..10347ab62ae5 100644
--- a/dev-python/seaborn/Manifest
+++ b/dev-python/seaborn/Manifest
@@ -1,4 +1,6 @@
 AUX seaborn-Update-tests-for-compatability-with-matplotlib-3.5.0.patch 11538 BLAKE2B 67d5046d093ba693d41d6c26caf4da67e93eef45eae7253238764f4a5738e37fd12998acdff638bd9fc8c023226e87b59d04aaf24fc357682858a742a9f30089 SHA512 ea93fc34634cd325b8f5af611feacb4159cf4c4cbc31287dda1301a0f3b2182295c13f94604ddff83e82efb2090625213141d8cf34690fe4791895074827c8bc
 DIST seaborn-0.11.2.tar.gz 268839 BLAKE2B b1ba3a76431843921f01f714e601ebe7ed87a8c4136acb65a7cdb89059d67cb136484cb968efd713a5260caa552673efd5d06898a69624b36311fd3908f00179 SHA512 f08fe82b4ecca2b140a953c89bb7f811255d00ec819225809bb224aadde161ddabdeaf5cab53e3558bb84334cee828baafe0ee5efe465e80875a0513fb1ab9ac
+DIST seaborn-0.12.0.tar.gz 1407601 BLAKE2B 3da8db0a0c08a40a3969a2ffce248f5521b4c7c93ecf0f014850093ef48331326454572ceea6ee1133805bf92540b0d2acecdfb7cb789d238f743b30e6a28947 SHA512 b2b06a22d48f19ace2448f465ca5e700f3486971d9fb86e85a1a8c9e2956b904e5f4c2c8075f848299b182cf8f69b2fac22366fedbd8012b9c44adc0bcb7e060
 EBUILD seaborn-0.11.2.ebuild 1987 BLAKE2B 4583ebe9ed9c3dc27c1318025ea37526341b056a55d54d7e584fa10a1bb63ce21a66d27f2da9ec82a658274ae4af92317f25d01f661323c41bff30578c7eb665 SHA512 17fbb818c94a3a6c754f7002064b4c95cc8075376b293a42917336017a32065e26b1ddc7e66deb4f0ee7258626306d634d335fdb81bf584599e925aafdbee652
+EBUILD seaborn-0.12.0.ebuild 767 BLAKE2B 508bf5d36a6b8eaae5528bbcaa71490b8c43976017bf3a10eba5b0fb94bd457f173e9391a214b5192e53f776d1dbe664f4c9aed6c8fd98820b49cac3ccb7f211 SHA512 cb248f489b2ca44a6f1f66d3213ed2d6c7315e765d543a23c600a1f66c1b183efd2006a7eddf10d159bcde4764d27def3d65ffa11bcd22da15428f6c2923a394
 MISC metadata.xml 1766 BLAKE2B 7e449efa11d2101e2b6e5729ef66bbec42d51793e8543ad214578db7351e5174ac80a96e2b41c7715135c4af1bc4f6205ee9b43add6737279546e7c02251dd86 SHA512 074d5cc59baae5ea4333d735d19a9788cc7fd31e1cf0f90715ae623260853a1231d93663e975bb7c7fcafc116ea48ff6b4fda6900bec1093b0be3768cb3be6fb
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..1b7424aa37e5
--- /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_{8..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 cee92de6fa6e..bde10a8aa695 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,7 +1,9 @@
 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
 EBUILD sentry-sdk-1.9.5.ebuild 3201 BLAKE2B 371fb9d17f8f843c34c17857d68818de5e04c40267a1009ccb98fc2bcabcb67d80d9da36bab08962224936bcfa1c230be10ab88758a0bc4713f4ec68ad28b2a0 SHA512 fb5f857923833a77c952da761c6b4b8ab88037c981f5468913c83d22ce119026814f57b9902e72b21ab21ddbf83b12e60e707c340ed91aa5a39b5269515e3dd8
 EBUILD sentry-sdk-1.9.6.ebuild 3205 BLAKE2B cc50ae93fdb72f81c15ac975cb7359056feba2eb1f67b77335892f784be8f859bc5125fc341f370eaa4b1b3526387fb12246046b1b0d9db52d364f796c440236 SHA512 e78cbc57645b20a02a691cca4849f9728d95eaa10fc55ac035111b50b24b1d8766875a66db0306256b446c2a47a797d2d890ed11ffc1246e6cea43e243b97379
 EBUILD sentry-sdk-1.9.7.ebuild 3205 BLAKE2B cc50ae93fdb72f81c15ac975cb7359056feba2eb1f67b77335892f784be8f859bc5125fc341f370eaa4b1b3526387fb12246046b1b0d9db52d364f796c440236 SHA512 e78cbc57645b20a02a691cca4849f9728d95eaa10fc55ac035111b50b24b1d8766875a66db0306256b446c2a47a797d2d890ed11ffc1246e6cea43e243b97379
+EBUILD sentry-sdk-1.9.8.ebuild 3205 BLAKE2B cc50ae93fdb72f81c15ac975cb7359056feba2eb1f67b77335892f784be8f859bc5125fc341f370eaa4b1b3526387fb12246046b1b0d9db52d364f796c440236 SHA512 e78cbc57645b20a02a691cca4849f9728d95eaa10fc55ac035111b50b24b1d8766875a66db0306256b446c2a47a797d2d890ed11ffc1246e6cea43e243b97379
 MISC metadata.xml 510 BLAKE2B e00011699ac2cc83f1923e1f6fa813ede7eab8c57f9ce9d9fca04e721b089db1c5f2bdffaa7b9856f56b433abd9189125e07ffd3f329e4fa8d098e28a4f2d7bd SHA512 bafb77a102d94fe050cb526b298fb8cfd56775cb4d07eda280f6356fbec6fbe5df5c9ebd459d9d4457cd027c2e0d7c349e053fa6070b52f0d2989f6ec600b87d
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..9d1e2042e8f2
--- /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_{8..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/Manifest b/dev-python/setuptools/Manifest
index a0340e006106..358cbb20b441 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,8 +1,4 @@
 AUX setuptools-62.4.0-py-compile.patch 3704 BLAKE2B 9a5e70d2556b059be0ef060abd1db71298cd0e9aa1e2795d92cea5cdbaf0c82f4433e1a0c3095f4bc41bc72a457b63142253fe46c712afa1d7855a5d43607bca SHA512 48d7c065e2d8c29ce6e498effe6d79f9caa0f37d7cf6cadd0ed02c48d196a4d8a10a73cfa26744d6f74b48c63cd28a4074b161a6aae18c6169f6d8fffb044b1e
-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
@@ -10,11 +6,7 @@ DIST setuptools-65.1.0.tar.gz 2614949 BLAKE2B 89f4556b292afa7b46e558ff059647798a
 DIST setuptools-65.1.1.tar.gz 2615020 BLAKE2B 1c45d7106e5845b95e6eec52b72749f80f799f1c5695b39e79ae7b49f52c0eab39fba305a7d2cb54a852679479db3c512e562b52a931e6a325d640479e5d4399 SHA512 29ec01558d6f6432c82797313cf12f1b3125c2000d9582e89fff415f59362c44fbfa00340cfbc4f7f4f9898161b3b585058115d1bc5b4bbcdfc0991812f858a8
 DIST setuptools-65.2.0.tar.gz 2614890 BLAKE2B a2da0870eaa0d36200dcfcab3fc63ea641d7b8451467ada32e834e94a9d33f84428e517a402d5e64ee999b5b8c2a0fff20044781fa5227ce3e2cc2fcb8f0796a SHA512 84e6e23780e6ef2e0010d4574bebf373f25f6c1e833b4e914f510e2fb3eabdbe1155c8b7d2cfeb93fd59c73fd3ad5b47c7b54e00ffaffa9ea84cf33fa5a6ee69
 DIST setuptools-65.3.0.tar.gz 2615722 BLAKE2B 1344fe17c1c2a4ec60dbf37b3e1cbad56bb5299bed9f8e30a21015f2457e1e90d6782369dfc2d804973e7348d22a356ec0ef75d1aeabba7d77e20e5ddf36e576 SHA512 3c173b1e1a8dbbed0bf3bf600df1256aeabf1b9dec34d5f5d0b1429b0fe16f2aa61fa6c4f400a5b6da24b9d679954866b76e019130bcf2246b138fe017025de9
-EBUILD setuptools-63.2.0.ebuild 4077 BLAKE2B df8d3d5974d76cf4ee9089f73dacf365659432ee527e27b394d53311f3cf7ee69b3e612b5f1e8d634d0c30a8875c14924438a48b3466afdfdccb506ffbe5328a SHA512 d2173d8c251e7f2f4dec2e52887674d5ca31a3ba209b7455e9e9871befb96814852da137b5acb9a86364b0d8c1c0b394a306d8c4995aaa517a9eb950553b33bc
-EBUILD setuptools-63.3.0.ebuild 4153 BLAKE2B f91982c6f07cc0f4ac55572fc6aa1fe06697502e805f045236fc90bca0aae3e2dd2b9fdecf912290cc978be9dfee705d18c43e05c5da78f9030ae1e6bbefd672 SHA512 d047b71d51c1aa37f517649e96968cc1f741b47d7368c2c18b966737e39d29e427b123dcd96f3a0f8f7f19ca9f3264b79269bae2e87eda700233612fb8bd9a19
-EBUILD setuptools-63.4.1.ebuild 4153 BLAKE2B f91982c6f07cc0f4ac55572fc6aa1fe06697502e805f045236fc90bca0aae3e2dd2b9fdecf912290cc978be9dfee705d18c43e05c5da78f9030ae1e6bbefd672 SHA512 d047b71d51c1aa37f517649e96968cc1f741b47d7368c2c18b966737e39d29e427b123dcd96f3a0f8f7f19ca9f3264b79269bae2e87eda700233612fb8bd9a19
-EBUILD setuptools-63.4.2.ebuild 4153 BLAKE2B f91982c6f07cc0f4ac55572fc6aa1fe06697502e805f045236fc90bca0aae3e2dd2b9fdecf912290cc978be9dfee705d18c43e05c5da78f9030ae1e6bbefd672 SHA512 d047b71d51c1aa37f517649e96968cc1f741b47d7368c2c18b966737e39d29e427b123dcd96f3a0f8f7f19ca9f3264b79269bae2e87eda700233612fb8bd9a19
-EBUILD setuptools-63.4.3.ebuild 4153 BLAKE2B f91982c6f07cc0f4ac55572fc6aa1fe06697502e805f045236fc90bca0aae3e2dd2b9fdecf912290cc978be9dfee705d18c43e05c5da78f9030ae1e6bbefd672 SHA512 d047b71d51c1aa37f517649e96968cc1f741b47d7368c2c18b966737e39d29e427b123dcd96f3a0f8f7f19ca9f3264b79269bae2e87eda700233612fb8bd9a19
+EBUILD setuptools-63.4.3.ebuild 4145 BLAKE2B d81e28c9628dd01a3249b6d774c081c550f501be6056ac62a36e7208464240269841f78c8ab257132159a0281b60adb95b8203efdd98cbf116ba0b2d84568db9 SHA512 830f2c7c85c4e8e7373075025109b0b37b896f0126ffb3a032a4f57edb694fde68fb48500034a9c58b9e80fec6398909654c53b48881492a3b0193061f07a9a7
 EBUILD setuptools-64.0.3.ebuild 4265 BLAKE2B 90a66c5ece54c235bc5a0a0adc1fe880458bf8629e61f12877bb8fd9fc363f4a1b2e1bedfb9f809229de227dd2ac31b7c42a44b0bc7efa3f11173a58d48d5ee7 SHA512 ad5c82bb94c2c97dd4af5216b1cf1e53bfa9a58445ad5e76dedb346a4bcf5b2e51c2c9eaa03681d4428f8d5b19685b7644c4d9064e7af752d2be13a0b6dc3b67
 EBUILD setuptools-65.0.2.ebuild 4269 BLAKE2B 5df1501305bd2717a5671d8e0d9ec0b0f9b5da733e09d54858884ea3ef1fe0d1444f476295c8a42133e566e9db836d8ccc3be8709b6a35a9a02ab2c3a7a0e1a5 SHA512 3fbf979376dfe61f354af1b80d452203161411eb0538ccc1138852aa5daeac044af3a5a579a1c0f0beec41df16414af0b0f0c25c06a265a36c6e076ee3614fc6
 EBUILD setuptools-65.1.0.ebuild 4269 BLAKE2B 5df1501305bd2717a5671d8e0d9ec0b0f9b5da733e09d54858884ea3ef1fe0d1444f476295c8a42133e566e9db836d8ccc3be8709b6a35a9a02ab2c3a7a0e1a5 SHA512 3fbf979376dfe61f354af1b80d452203161411eb0538ccc1138852aa5daeac044af3a5a579a1c0f0beec41df16414af0b0f0c25c06a265a36c6e076ee3614fc6
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 46976e01afd9..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_{8..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/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 e6015c0fc03f..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_{8..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/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 e6015c0fc03f..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_{8..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/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 e6015c0fc03f..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_{8..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/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 e6015c0fc03f..60dfa52f8888 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/ubelt/Manifest b/dev-python/ubelt/Manifest
index ef422cd6620a..fe5a6c983ce2 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -2,8 +2,10 @@ 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
 EBUILD ubelt-1.1.1.ebuild 910 BLAKE2B e54c0a82b1b0b881cb42008ec7ed95fe931ec28bf910562fbf8c98f980ada79a2c61f9735e1bc50cbd8d4bbffe5ad2a91a2207c3463e7c8740a271ce3392b668 SHA512 bae44559a7367a187d032c306920c41382ad7f912a8319ae922de94caa5fdac9319a016c8da0f034214d13b61f2b698485d238ed5e7e3c9b050d1a765f976e39
 EBUILD ubelt-1.1.2.ebuild 910 BLAKE2B e54c0a82b1b0b881cb42008ec7ed95fe931ec28bf910562fbf8c98f980ada79a2c61f9735e1bc50cbd8d4bbffe5ad2a91a2207c3463e7c8740a271ce3392b668 SHA512 bae44559a7367a187d032c306920c41382ad7f912a8319ae922de94caa5fdac9319a016c8da0f034214d13b61f2b698485d238ed5e7e3c9b050d1a765f976e39
 EBUILD ubelt-1.2.0.ebuild 959 BLAKE2B a839b46f82ff9e2cc8652f779fd1e4b5a6e290fff28ebc946b0f8bdbd96bbf275a8093f403f07a15554d84438a62e818c2cd8b57513743fff0849cde649e3681 SHA512 4f276af50c72065e70b807233f1f395b26d968afc9c6e903df277f3d685118f6c74e8d95088757eee6965c01672ba1d268be66594c6819d45c62ae7e022e4c10
 EBUILD ubelt-1.2.1.ebuild 959 BLAKE2B a839b46f82ff9e2cc8652f779fd1e4b5a6e290fff28ebc946b0f8bdbd96bbf275a8093f403f07a15554d84438a62e818c2cd8b57513743fff0849cde649e3681 SHA512 4f276af50c72065e70b807233f1f395b26d968afc9c6e903df277f3d685118f6c74e8d95088757eee6965c01672ba1d268be66594c6819d45c62ae7e022e4c10
+EBUILD ubelt-1.2.2.ebuild 1024 BLAKE2B fb7294d7988b1d5d4b86a4a16544e9a9b6a205125d326438b6afbc19ce55d6cf5ecc881f6923ea22eccdb75711105e462253ac91e5f8ab997dcc0191a5e3e037 SHA512 5ccc9400a668bb46367f3beb22fc6acd6bdc4f8a43e2db022d6c2a78dd6635a0fe22e5574133f02c3da267bdfb957c2fbadb1221c9e112a5ef9759ec8464691f
 MISC metadata.xml 423 BLAKE2B 3327e3ecc16b8971759b84617779a2b4d5072a34547815c8314809a911e6d557fdea620c90a255ef7f89cb2c941a46a7e1dcbc62e5e6b46f19255758f42890fc SHA512 967c14f809f73fc1bb48d730406512d3f87531486701ad4be8dfb4e5cd0c1265c082596768d36c4950734c653cec56484fb3e5b79ce13dddde38977f88889124
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..0dd09d509f91
--- /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_{8..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/yarl/Manifest b/dev-python/yarl/Manifest
index dbf2bfff8c36..1429e1af49db 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,5 +1,5 @@
 DIST yarl-1.7.2.gh.tar.gz 108115 BLAKE2B 7bd212b652a77ac29fde4c6565c48c4067f2a24db6bbf735107f3dfa5ee8b6ad2e5a5c3c6206e8dc7692e4cfd5c975d4304dd93280087574bddd73a337417c52 SHA512 bf69c5758f523259757ff84a8737e28931f46311f12f6e141329a5074d34a0cfb45795bf79cb7b78cb676ca7bc38042a2fbd946a5f41bf1d149ada50b88b31ae
 DIST yarl-1.8.1.gh.tar.gz 109912 BLAKE2B c7390b78abb5074dd29e96848a77fdb31f6224e99d2bcfd5a28a8bd08881f5ff82cf55b2f54c97324d005a0fb3823732a9ed6bd3f1d837e4ac2341b89e2adb30 SHA512 267523216832c2bc83d92a42e621ff519d427e20c1ee84ac657e13f696a2df2259c837486f192d87944f5ebb834beea60ace791eb4c9c632fd7e552eb5dadf1b
 EBUILD yarl-1.7.2-r3.ebuild 910 BLAKE2B 68d8fc7b158dd40cb8dd08f9a2b39544b17ade53772f742ddf951d29dfcb55daee99bada90676a797d8ace257092842d72cd3cb3abfab2fe99203cbf6d4b0a88 SHA512 ecf4dcc5136ed7fa3c2a3c937d61466993cfef4e0408086a253340deabe8f46e9cfe56bfc8cdce8560cf12ba84d9904515ec4d783ed85d49ac04daf7ac01ba2e
-EBUILD yarl-1.8.1.ebuild 918 BLAKE2B 72373c54cf93ea0df89c030684cc0975fcc9aa6c508f10e19ef08dd4acd404477bc6cd2cfe02f6b334ddead19683f6416750eb9ecda206093a29b9d39253af4f SHA512 12460e120e522e3abb3355d0331e63ecc9c93a15e82219efde14c2afde343678e418987adc90d9e5a9ebe759ab9aa26d7918f58bf50a630651bf6433d07a9054
+EBUILD yarl-1.8.1.ebuild 915 BLAKE2B 5090e4af9c194d1954cac07c9ad7c3f02ea58e063dd742f16a97bbd175262afce5f6a0cf4dbaec678f5f17b8f9673a972d1288a8d69c08c51dd569b429e5d8cb SHA512 f1c1b8e7694ae2b02e94a365745c7ccb4bc394f62052eeab69a0608b5a5a90f50263bc24a391f54b71fa47e3bddb079ee101ce8e5df06a7b31ce7f55e3aa63a4
 MISC metadata.xml 440 BLAKE2B 10fd0e37c9be76c5d1dd90b9fd1cb1e5161fc5a7d2b51bcb5658a8c187a67d5f9573241733c3f9570e9fb7767bf84b38a6f8b2c212596627bea4e1686b7eb41e SHA512 c9e340124ed93cb0d52a0ae5abd43c10528197893c3d5ab57a0eb7046ebae5b80119f7b033d6697110c4bc064c0a8581d904788f6969cb52a433064067898cbe
diff --git a/dev-python/yarl/yarl-1.8.1.ebuild b/dev-python/yarl/yarl-1.8.1.ebuild
index 7ea5cc25c82f..47a16f49bfe7 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 addf4a675945..6543b5964c57 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,7 +1,9 @@
 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
 EBUILD zeroconf-0.38.6.ebuild 1365 BLAKE2B 0d2b743e81200bb4a3a2cf7053fd572ac6cfa1cdd8a32cca98ed0d2338a264a2d02782c8352746e5041aba9d518755e018277eabc3e33bf9302f826f03acc3ff SHA512 d8f8fdb6f2bca9dea6b2a1901e9cc84575222b1585e8c0eb1339cd413cf303e95487592582fb8a27cc982a015ef40e8886a02d6120c1c828a042081d828be7bc
 EBUILD zeroconf-0.38.7.ebuild 1365 BLAKE2B 0d2b743e81200bb4a3a2cf7053fd572ac6cfa1cdd8a32cca98ed0d2338a264a2d02782c8352746e5041aba9d518755e018277eabc3e33bf9302f826f03acc3ff SHA512 d8f8fdb6f2bca9dea6b2a1901e9cc84575222b1585e8c0eb1339cd413cf303e95487592582fb8a27cc982a015ef40e8886a02d6120c1c828a042081d828be7bc
 EBUILD zeroconf-0.39.0.ebuild 1419 BLAKE2B c058ed83251c9b6e71b7a0993da082b946c1639325535b64d799d234358ad2b4bd9cf9dcfa0370ba176e9df60dd8f0b37718eb9aac1a3892c03427a00e01ebf9 SHA512 6e4b958f26ea2f78a4bd3e7e5561af332d2b6eb376290cd2ff2b71c666a9a5085e24a8e077471e330d8bdf5b961ca45557d2454c30c5aa4aa4c4de2567125f52
+EBUILD zeroconf-0.39.1.ebuild 1419 BLAKE2B c058ed83251c9b6e71b7a0993da082b946c1639325535b64d799d234358ad2b4bd9cf9dcfa0370ba176e9df60dd8f0b37718eb9aac1a3892c03427a00e01ebf9 SHA512 6e4b958f26ea2f78a4bd3e7e5561af332d2b6eb376290cd2ff2b71c666a9a5085e24a8e077471e330d8bdf5b961ca45557d2454c30c5aa4aa4c4de2567125f52
 MISC metadata.xml 413 BLAKE2B f93eceda07029400d2fd7ab38f234e5a1747e3d86f228adc973bbd6cdc71456778a7d926457f976cb2c6f55678b2c671d2415e5c7a480306582f1e70f6f733dc SHA512 d228e198b2f495dd02cd3d9d948aae123461c70c8e0185a47b133000f0316a84ff33d9b6f4cc0196bca5cf638e53ae58a3cd746338c33729d957a1170a5f08dd
diff --git a/dev-python/zeroconf/zeroconf-0.39.1.ebuild b/dev-python/zeroconf/zeroconf-0.39.1.ebuild
new file mode 100644
index 000000000000..e803d214a211
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.39.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+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}]
+	>=dev-python/async-timeout-4.0.1[${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
+)
author	V3n3RiX <venerix@koprulu.sector>	2022-09-06 22:33:57 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-09-06 22:33:57 +0100
commit	c4b3d05f2d4415c0d6f135a3ea0d2055d6e055b5 (patch)
tree	3ed89f0ec34cf85a0c06c027a6889e7890e08db6 /dev-python
parent	8965d348ad07c326c8e17e3137c151bcc98b0a53 (diff)