gentoo auto-resync : 15:09:2022 - 23:13:44

43 files changed, 759 insertions, 325 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index bca5224af02a..dceec3f5c66b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/blake3-py-c/Manifest b/dev-python/blake3-py-c/Manifest
new file mode 100644
index 000000000000..c4ed29cb50a1
--- /dev/null
+++ b/dev-python/blake3-py-c/Manifest
@@ -0,0 +1,4 @@
+AUX blake3-py-c-0.3.1-backports.patch 2271 BLAKE2B 22fb38af9b13be8f729cf3f7ccb76e1ae5141f2a9d3ca75345854030a08f15f36ca4db42f3f4f8ddd9bd84604aa32bf61164fcf22ea729cc60d19206af69b7bc SHA512 acf5237b16a10ddb0223f75dad9d273041eb1879a8c78fddbf9ffbe109c8a4077f1747918bc55c7de97207a5a8506bec05a557af45c69d031658ff9cc6eb0b9a
+DIST blake3-py-0.3.1.gh.tar.gz 131798 BLAKE2B 6c816bab8d1e432453d4d40f4acc4d33bb45d305a2ab8458dded72bfee6ffd687a016d257dad4c2d656ddd5d765e5ad450e18fdd4af084a51f1973ce56daea68 SHA512 d3901339df9dc3409f8c2407c6f4f02fb9e13e8e7a76d77c06d9f58c6cceea4829cedf71a687fdded8ad70897d3a4833f2b124f39837b0ffa5fb8b907b51fd56
+EBUILD blake3-py-c-0.3.1.ebuild 761 BLAKE2B 0c409d941e5b0536e00aa82e18cfce2d3739d7b3a96e46f4863804aeaccd319047b0c6809a2192f9e84e2d0a609a0d8adb91a877b4b55684076910ea73681b4a SHA512 239156e1753874a877ed4548ed54a74272bb9a890ca7cf653db1db5376295d66d05e6ed04acf67627943529c821610a011a3957bf36562619ebdee62cab22cb8
+MISC metadata.xml 326 BLAKE2B 0f883faa7377c344baf1515844f711bc3c8c9e1fd0315311d382c50a065af4065accb592b79d152bf5110984cbe4d620f393db2ce2a43f7108b07690f5236d32 SHA512 18bc804d4f01849b61fc903e3d21d867d58e39a5e2fb9d2bfadb9b1299cc82ae57fd70416a1d457613a6dbf7393c8108ab45b91fec6b4ecb6a3f96228905046a
diff --git a/dev-python/blake3-py-c/blake3-py-c-0.3.1.ebuild b/dev-python/blake3-py-c/blake3-py-c-0.3.1.ebuild
new file mode 100644
index 000000000000..954d842bcbe7
--- /dev/null
+++ b/dev-python/blake3-py-c/blake3-py-c-0.3.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=${P/-c}
+DESCRIPTION="Python bindings for the BLAKE3 cryptographic hash function"
+HOMEPAGE="https://github.com/oconnor663/blake3-py/"
+SRC_URI="
+	https://github.com/oconnor663/blake3-py/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/c_impl
+
+LICENSE="|| ( CC0-1.0 Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	!dev-python/blake3-py[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-backports.patch
+)
+
+python_test() {
+	cd .. || die
+	epytest
+}
diff --git a/dev-python/blake3-py-c/files/blake3-py-c-0.3.1-backports.patch b/dev-python/blake3-py-c/files/blake3-py-c-0.3.1-backports.patch
new file mode 100644
index 000000000000..0c36aaa5ff21
--- /dev/null
+++ b/dev-python/blake3-py-c/files/blake3-py-c-0.3.1-backports.patch
@@ -0,0 +1,73 @@
+From 0d7526621087fd016d4ab5d34abfb35c715ec0cd Mon Sep 17 00:00:00 2001
+From: Thomas Waldmann <tw@waldmann-edv.de>
+Date: Tue, 29 Mar 2022 17:31:02 +0200
+Subject: [PATCH] c_impl: compatibility fix for python < 3.10
+
+---
+ blake3module.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/blake3module.c b/blake3module.c
+index f4160fb..0fce6ad 100644
+--- a/blake3module.c
++++ b/blake3module.c
+@@ -414,7 +414,8 @@ PyMODINIT_FUNC PyInit_blake3(void) {
+     goto exit;
+   }
+ 
+-  if (PyModule_AddObjectRef(module, "blake3", (PyObject *)&Blake3Type) < 0) {
++  if (PyModule_AddObject(module, "blake3", (PyObject *)&Blake3Type) < 0) {
++    Py_DECREF((PyObject *)&Blake3Type);
+     goto exit;
+   }
+ 
+From 52676a355eccfb0050b372cd36a14ab49878e8b3 Mon Sep 17 00:00:00 2001
+From: Thomas Waldmann <tw@waldmann-edv.de>
+Date: Tue, 29 Mar 2022 18:18:46 +0200
+Subject: [PATCH] c_impl: apple silicon build fix, fixes #31
+
+On Apple Silicon (M1 CPU), the platform.machine() call returns "arm64".
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index a159d8b..863c7ea 100644
+--- a/setup.py
++++ b/setup.py
+@@ -66,7 +66,7 @@ def targeting_x86_32():
+ 
+ 
+ def is_aarch64():
+-    return platform.machine().lower() == "aarch64"
++    return platform.machine().lower() in ("aarch64", "arm64")
+ 
+ 
+ def force_intrinsics():
+From 5eac8ae62d8f4e0a574164b73c42837ddc6ff356 Mon Sep 17 00:00:00 2001
+From: Thomas Waldmann <tw@waldmann-edv.de>
+Date: Tue, 29 Mar 2022 20:30:30 +0200
+Subject: [PATCH] c_impl: fix usedforsecurity argument variable type, fixes #34
+
+the python docs state that this must be int (not: bool).
+
+as seen in #34, using the wrong type here seems to overflow the variable
+and leads to a wrong value in max_threads, which leads to that strange
+test failure.
+---
+ blake3module.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/blake3module.c b/blake3module.c
+index 0fce6ad..a9562cf 100644
+--- a/blake3module.c
++++ b/blake3module.c
+@@ -53,7 +53,7 @@ static PyObject *Blake3_new(PyTypeObject *type, PyObject *args,
+   Py_buffer key = {0};
+   const char *derive_key_context = NULL;
+   Py_ssize_t max_threads = 1;
+-  bool usedforsecurity = true;
++  int usedforsecurity = 1;
+ 
+   PyObject *ret = NULL;
+ 
diff --git a/dev-python/blake3-py-c/metadata.xml b/dev-python/blake3-py-c/metadata.xml
new file mode 100644
index 000000000000..3091c4dd69fe
--- /dev/null
+++ b/dev-python/blake3-py-c/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">oconnor663/blake3-py</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/cachecontrol/Manifest b/dev-python/cachecontrol/Manifest
index c4f236c96f21..f2e116edd26e 100644
--- a/dev-python/cachecontrol/Manifest
+++ b/dev-python/cachecontrol/Manifest
@@ -1,3 +1,5 @@
 DIST cachecontrol-0.12.11.gh.tar.gz 41338 BLAKE2B 09ce2336216b69dbe9796d658db9f5b0d378259484cba3a78ecd789843e19683adc2b1b90d579cea8700d07ed55a93ecc3a56e5da2c8ab025e5084d2847d4dbf SHA512 be1c91f58edda36192f1267a8fdfdc50685ff57da5d84f5348b608982327993333f18f5c318a20cf258b16d2bc83272ba58317e8c4c44a84d5d1f93b522dfc8b
-EBUILD cachecontrol-0.12.11.ebuild 804 BLAKE2B 93a9ec6fc31e8fd9d10b8fda60ea43dd3bbc9705ff3332093c22f2d0c886587f4907e20a8ffdb3d5c49f15e80d6c24248a7b3b8981d4fc57b1b4b3296375fbf2 SHA512 d7f82d0d92aa0646b7f950fd5d18696de8ad41bfbbeceac88e7049eb33f8700cf14da93374b50a45097090364c13df42a4de1de661bb7201e1ace8e00635edd9
+DIST cachecontrol-0.12.12.gh.tar.gz 41909 BLAKE2B 1b36424e692beba817b650dfc493b78e99a99c7e1f27a845751d1372a926ce4750096aa3c608ea6c499d2bbb60b5410e18d963aeff1a3228cc835af0bd68c081 SHA512 d7477da4c3b64da2c9bbc1e65ee0a389d4631abd2aa7d7f2bbc66f96888dc036e717f8e4042f2adcd75215bdedce8626f7f4cb67c117d43ca546114f0fabd65c
+EBUILD cachecontrol-0.12.11.ebuild 803 BLAKE2B 8b1bc5b167bacb5abdc9cd5ef17910598d07ede5caeaeb37280d20325cf8e419ec2e3f74dbcfe5da0cf5d13a89fc4a2543811c9a515d5c9ea3f48ccbf1b9452b SHA512 e6d013d8d0e330e4eace8416598b4e6a3de34c82a8c4c7ad89997d2ad428066bd5c250128abb3283117710ab65f10060f7f4b05ef5cbdcb2d5e00f0bd0adb39c
+EBUILD cachecontrol-0.12.12.ebuild 937 BLAKE2B 124bad473a8f2a8f7f9f7d0d24c44f1a6dc799b14f55bbbd113621329b7bc88546f7bdb4331cd024c171d7d677417da46ecac6a882636fc97e091316d6608d3d SHA512 081d676bfcb7e3151e7fb040062377c22a58ebb92d0ca37db672307d4968100c8f8176953f66cf88ba9e18a5957ce0880bfe838c6c7302af5ec08bb3bf5456ff
 MISC metadata.xml 400 BLAKE2B 0a4de3dff77966722a153ca7d1b4e6531932fc2ae1c99bf4c7482fa83a35ccdc1bf647e3c7a9097ff2844e2127af90709a47ed4f6b47e38c1ca0f240896b270e SHA512 992efa678056928cfaeb04df9a6a7c5523bef32ea0665d86e06faf7b61decaf424cb1c8f813fe19bab74ab25427b5a70f3e106e61cfaab1cc3fa3a359f052e8c
diff --git a/dev-python/cachecontrol/cachecontrol-0.12.11.ebuild b/dev-python/cachecontrol/cachecontrol-0.12.11.ebuild
index d08ad04d1958..7b4ad555642b 100644
--- a/dev-python/cachecontrol/cachecontrol-0.12.11.ebuild
+++ b/dev-python/cachecontrol/cachecontrol-0.12.11.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/cachecontrol/cachecontrol-0.12.12.ebuild b/dev-python/cachecontrol/cachecontrol-0.12.12.ebuild
new file mode 100644
index 000000000000..4dde1a489c2f
--- /dev/null
+++ b/dev-python/cachecontrol/cachecontrol-0.12.12.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="httplib2 caching for requests"
+HOMEPAGE="
+	https://pypi.org/project/CacheControl/
+	https://github.com/ionrock/cachecontrol/
+"
+SRC_URI="
+	https://github.com/ionrock/cachecontrol/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/cherrypy[${PYTHON_USEDEP}]
+		dev-python/filelock[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e 's/setuptools.find_packages(/&exclude=["tests", "tests.*"]/' -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 92937d0730a6..5f13b020e80b 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -4,10 +4,12 @@ DIST cfn-lint-0.63.0.gh.tar.gz 9613588 BLAKE2B 96f36310b9201e39a03fb9ca4e102feed
 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
 DIST cfn-lint-0.64.1.gh.tar.gz 9792758 BLAKE2B 95bc86fa41c17498575abfd4eb7e16d9e8a8dfc36d4304aa216890773e52d1e43f4deb178f2bd69c8edc445a417ca37ef53069ac9d398ccf27e3b9a6d90ee8c9 SHA512 edd7296e74db943c6ae818c2ae8f5220c4d8834eb7858c474e38f7852c1a7839b89ba949c105a3d2044f4b952e56fdc9e7a08493ed74e06b29ec9c0ea0b48a6a
+DIST cfn-lint-0.65.0.gh.tar.gz 9807118 BLAKE2B abafc4fac788ba0af80359997b92cd60089472dee51952fc3029485a87be8e8fb9deb1599610471216ee8da103f7198808f9122727182005140c527672a921f8 SHA512 68eeb18914fb92cdacea9f80d4564937eba92b645f62a3fc22e874001554837ac3107741d4134cc8b1d880eaca38a560a92631c6ae3dfb2c412ad6fcb3f91cab
 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
 EBUILD cfn-lint-0.64.1.ebuild 1640 BLAKE2B ab0b276a17eb6e1736a03f89d00a70a55840063177efdb4ca391f399acb5dea04480b4a31bf9bba12c607f35381d95b44dd6e346141d9e7e084eb4d48fe829e7 SHA512 ebc9ee814224010bf27a5e9675de5e1eed72073441da99ef9b8a3f8c17041eb6855d0951d97aa9e7f6f3d5aab758d594cdb3c93d9d990b4dac990e0fb9434a9a
+EBUILD cfn-lint-0.65.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.65.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.65.0.ebuild
new file mode 100644
index 000000000000..57fd1d8c6029
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.65.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/fasteners/Manifest b/dev-python/fasteners/Manifest
index 04a84f267736..03899f45b00f 100644
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@@ -1,3 +1,5 @@
 DIST fasteners-0.17.3.gh.tar.gz 29409 BLAKE2B b4cd5c2f5dcd87808b4edf42ba160eb6b0bf08df544cbe1cc96ab3dd43f8fee02342a56a8b9529354e102f8e4280f9375f89f58318e46f2e8d52fa49bdb0f5ac SHA512 bed890d674bbb8d0442cb0a36c81bd5d1b4e555534ce4451f1cf70dcf72e222d52ae98154d09ac0ad1e52d1a2026c532fd40df715fbbd6bc95f874a916911ec7
+DIST fasteners-0.18.gh.tar.gz 42343 BLAKE2B 702ca6a68733ed202ae0f8a2d9d430012c5786ef8d779903186815f9250ed7b2ccf781694aa57ef230009a470ef7c6bd0e83cc7bc9fcb809d2335542e799e3d6 SHA512 40928e93fa94ca9e67335d15acede73b70906885f8cc34262b00e2dfba9dfed8647f11490ab0df4c8fcfd94778362cfdc4bd0053063660b962202524dd5bda18
 EBUILD fasteners-0.17.3.ebuild 698 BLAKE2B 551e573cef04e462f7dce16cb8fdca7dfa9f1e676139b719532ef6ca7c01f42cc3cf86108b14e948d095c356a2f951ab26aefd58fd1cd1b22144a28bb430ec26 SHA512 9faca9eb50967a1f2857539aad0f7c108daebc4cb7e2ebe144e32cfb9c7574952b2db68678ea5e983459302d5e624cc5c8e79f369f18f87adec8e71561284757
+EBUILD fasteners-0.18.ebuild 759 BLAKE2B 3d33e9dbccb2cf58faa628160d816f1709985c858795f801fe531137700f9be252d0175a6e56fc63bbde6726b768c6a2592e293b430029e81f750ba961d02e3f SHA512 bb49057280203f1b7e6d769ae45f020888a3e4e629c9778ce1126a25361db0d01a405d14cc63050a60fb170f81276c5278a98be7375477ff985cc052e5afa0de
 MISC metadata.xml 510 BLAKE2B 1431fe8c5a7c8f6eccb512ec7690ae53360275c13bc368af6b51d02c7684dd74cc6340b7ff53b2cda7877b8e8224bdb4d2194e93ed678a88e79f0ae8bd7268fd SHA512 f9b0a1c15a6bd818f1366004814908c538249cb16ef8f09d3fe905e8e0a15e7d70b80ee87966f0ed990c44ccee7ecc45cdbf3eaac668638202f640a55525478d
diff --git a/dev-python/fasteners/fasteners-0.18.ebuild b/dev-python/fasteners/fasteners-0.18.ebuild
new file mode 100644
index 000000000000..202225cc48d9
--- /dev/null
+++ b/dev-python/fasteners/fasteners-0.18.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Python package that provides useful locks"
+HOMEPAGE="https://github.com/harlowja/fasteners/"
+SRC_URI="
+	https://github.com/harlowja/fasteners/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/diskcache[${PYTHON_USEDEP}]
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	tests_eventlet/test_eventlet.py
+)
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index 248e7c635748..fb0ec7b026b1 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -1,3 +1,5 @@
 DIST idna-3.3.tar.gz 286689 BLAKE2B b804759b23157ff3d81fcd37f04baf83d7e522e98e8d842e3f228a242bbd9b1f9302ca28b8989a4221512bbbe92839cd593641830a0c6b2e12061b3501b1bd45 SHA512 70b7cc8718e7d7899c75cfe476f044eae5a2fa03801fc9c12e3a092627ca943ffc4a578f9b8a55e181a11564835e125cfaaa577c02a6461dbb97366e620e53ad
+DIST idna-3.4.tar.gz 183077 BLAKE2B dd6c94104e17b441a7a63aec4e28f1969278996964c402865da8ad1040878539f798956e26532281cc44934544fd6fa33407949caf4a34fa2b48d7aafbb8fb5e SHA512 4060a9304c9bac04efdd0b97ec8f5aeb7e17417e767bf51c5dfc26605edad25ab67456cf6f6a3c5a9f32b8247e46f6343edfd8a6ffbcd6d1075c71e66d089d6a
 EBUILD idna-3.3-r1.ebuild 733 BLAKE2B 3cdca635e5738932af0fae8d8e3cbf85295499a5877ac382bdfcccc4725e0a602cf7c408908765004eac01cf208abf1647dae38fde0dadb82b21d05de883ecd3 SHA512 744493755decc90394869b75c9040b2c4d9e1546c5312ffeb601adcd18d2e248f446956d23495f3f6731fa6666bbdb51e91a90c23a35b5e20d4358198aeb5473
+EBUILD idna-3.4.ebuild 735 BLAKE2B 78876f89a0dba18a18a1717a919fa1c56a4a5a1979becae8fbac7423e8cd4cbf314e7ea3422be151a0e6df0f9729c6f3c2131eb0662d1ea7c236cf333befff7c SHA512 cc71ba939f783219cff7d0f1d1545c382285cc25b81b21cd18791e68dca1e63bc3fec1d3f7a01577414513a0660ba7494a4bd64a10cb311c92538368c492b14a
 MISC metadata.xml 393 BLAKE2B b3d4476896bbd50dbf61021bb6ffd653b72ca62b58c034aeba5119189fce3ee331cd44aa95ef8e680a4ef5f82206cf8b0ca1b902d73b56931b509c10c2a18685 SHA512 bf8a9a9b4e0a7cb67b6d541291e5de201a8ba9e32addcc6be0b60fd2035485775a7862f0def6bca3ec0e24155170fbeb08f3d24f9c517fbb9bd2223d25904a3a
diff --git a/dev-python/idna/idna-3.4.ebuild b/dev-python/idna/idna-3.4.ebuild
new file mode 100644
index 000000000000..a433a84cc248
--- /dev/null
+++ b/dev-python/idna/idna-3.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
+HOMEPAGE="
+	https://github.com/kjd/idna/
+	https://pypi.org/project/idna/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_tests unittest
diff --git a/dev-python/immutables/Manifest b/dev-python/immutables/Manifest
index e487fb8c6d33..735131b2c0e4 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -1,3 +1,5 @@
 DIST immutables-0.18.gh.tar.gz 84891 BLAKE2B 2e800e1b7b354781ef221315b80877e57ef446753c4a42e411196379e2bc921f71918c5ecd5cc693ca54cb7c401bef31161e9d249407b705626fe95d0e4e9fcc SHA512 1477ff6d9a6c02c3619b209352096abefb913cf53d392748e0940160067ecdcf2b89ad9ce807161ededaa5062105a2e5c5a3303bd02752a5f07b5f68f1c1044c
+DIST immutables-0.19.gh.tar.gz 85695 BLAKE2B b6457bd4e61c79ffc4ae83c1be3845ea1914ef6604ee8b0886c1ab24dba96e226444af5adc1032dc36e6f3058acac8a8f0289ce97f97874b02aae85eb3bc2ee1 SHA512 b1027e9ab4a304dcb953037a1ea4af082d0524255bcf3f3f368deda85b9a9e5b1c556638aab7a10cbf200fc14b85c8b739f212035f8ead1dff941b8f6da09668
 EBUILD immutables-0.18.ebuild 811 BLAKE2B 4fa65ad7440492d0113f3801a968af96840cfba36f24f45780c1ac3265184c82b0c3de2948b63886cdb9f63fe87ce18109bdd2eb6011c49a25984334393980af SHA512 d4156d40e6b4fa634d16781aad141b18bb3de8cc85bfcee0537369c76086024dc51dc6004f6dda9b6af0f8ec069c1db17784ff892eba87b997e78dd61787703b
+EBUILD immutables-0.19.ebuild 819 BLAKE2B 159c2540d4497bd2cd7dddc7f8546ea23edcb699f93d0329a5e3ace3602b732f6ac98c00ace369d8f8049954af2fb6606ed5b73de9c27524f71f705b22cf27d0 SHA512 06897fd5625aad737082d018376e383ca71641d3edad8d6dd17212444406efc307014312fab8633f405cf4779ae552992f4600b042c372b6ae6edccff9dabf0e
 MISC metadata.xml 353 BLAKE2B 5ba3a63b6d65aa989535ec78a5e097fb15e6bcb392e846471fb01efd4a4b546a3ba861cc3829d13e71f1f5c31b582a99e1f5e4adf6b60c2b6fb17bdfb9265c99 SHA512 ede81f3aec8f6ee374c8d39d60f4193cfb701f2561858f2ddfadbe68d531849cec13fb8c13cc671e14d8ab1f18b08759d030c562cc496f959517c6ce67ac9781
diff --git a/dev-python/immutables/immutables-0.19.ebuild b/dev-python/immutables/immutables-0.19.ebuild
new file mode 100644
index 000000000000..e0907ac8cb89
--- /dev/null
+++ b/dev-python/immutables/immutables-0.19.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2019-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
+
+DESCRIPTION="A high-performance immutable mapping type for Python"
+HOMEPAGE="
+	https://github.com/MagicStack/immutables/
+	https://pypi.org/project/immutables/
+"
+SRC_URI="
+	https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/mypy/d' tests/conftest.py || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	local EPYTEST_IGNORE=(
+		tests/test_mypy.py
+	)
+
+	rm -r immutables || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/indexed_gzip/Manifest b/dev-python/indexed_gzip/Manifest
index 4ac13dcf4615..75f92e86e14c 100644
--- a/dev-python/indexed_gzip/Manifest
+++ b/dev-python/indexed_gzip/Manifest
@@ -1,3 +1,5 @@
 DIST indexed_gzip-1.6.13.tar.gz 102730 BLAKE2B 8ab5490c3c830121ce3104c624fe36cb0064f6265b5e5f9ebd6efb0402c33e206b4d97c35803fa10fdbc25a7ccac61f19b2fd9bfb205e07acee40737d6404659 SHA512 de8a606f712a0bddf618cedac12d2b5613e14aaaacc93d1930352101bdeaca8bd5126dd67df36d691f31bc27d553a61901934bbb0b2514e4360c6cd49e395c41
+DIST indexed_gzip-1.7.0.tar.gz 103849 BLAKE2B b33ef1f19e47c2dc12fd6e6fcc972badf4faaecaa5571aa44c765a6fafbec8e32fe2c4254d4e62722b6e744cfa27470ce517d08025b0492e8c032663b094344e SHA512 80f82699c6b64248f0609fb34e54e3838e642040820381cc64feb70b46721b69207686f9cccd55ebfb10dfcdee5fb5c1bf6404d1cfec07eb5a97767635c5dc4e
 EBUILD indexed_gzip-1.6.13.ebuild 1133 BLAKE2B fa60b491bf4c84cbd6119806db881f228effbf1bb23f2c6eaff40ecdfbc8b6566cd4e101761034f88734cac2d12d60be50074f96be717140b1ba545d33ac33fa SHA512 6baa8f0c3b2d40029a51930bd2c88982b5c9a45e63daae9b4403d22195ac7749f2df13ee20b9b8db756d2521cb01ee18dcb9374c46ab06e18aea9c981122e174
+EBUILD indexed_gzip-1.7.0.ebuild 1133 BLAKE2B 120d5b2e97a0c31d3ab51382ffdd1d5d6586ed42661eea181f1071d0c50783a96110af64882c9cd92fc7be6caa15d7e360bf8e76c60416c71f575c800ad07176 SHA512 f03318c0f047deb7674d3c2fa40d6a52e6805277850fa13d04c2c6a4cdb55d3f17729b0fca5057e504310fa2a7aa2ecd2b39760d4811b950b05d9f3e7f8d7779
 MISC metadata.xml 1028 BLAKE2B 936137cbcbbee70168a4e3514fab4f41b27c7f244f905272bff8bd77f7ee1e9e45a1299f008257c944ef519cce09ced963fc14da02dcbbd9faae803dc5bf7672 SHA512 5e11938d84fc159a02713f357d616bb619881aaac8135cd454a45f9f9c6193ba99340c48c89a04b227a35ad12826d83aad3bb1a90f5e1cbb711fcf8d27d07f6f
diff --git a/dev-python/indexed_gzip/indexed_gzip-1.7.0.ebuild b/dev-python/indexed_gzip/indexed_gzip-1.7.0.ebuild
new file mode 100644
index 000000000000..11a55ef5459b
--- /dev/null
+++ b/dev-python/indexed_gzip/indexed_gzip-1.7.0.ebuild
@@ -0,0 +1,58 @@
+# 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="Fast random access of gzip files in Python"
+HOMEPAGE="
+	https://pypi.org/project/indexed-gzip/
+	https://github.com/pauldmccarthy/indexed_gzip/
+"
+SRC_URI="
+	https://github.com/pauldmccarthy/indexed_gzip/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	sys-libs/zlib:=
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# strip custom "clean" command that doesn't support "-a"
+	# https://bugs.gentoo.org/838955
+	# TODO: this can be removed once distutils-r1 stops using clean
+	sed -e '/cmdclass/d' -i setup.py || die
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	if use test; then
+		export INDEXED_GZIP_TESTING=1
+	fi
+	distutils-r1_src_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)/indexed_gzip/tests" || die
+	epytest
+}
diff --git a/dev-python/jwcrypto/Manifest b/dev-python/jwcrypto/Manifest
index 987cc7c7a09d..3d555c6f20f5 100644
--- a/dev-python/jwcrypto/Manifest
+++ b/dev-python/jwcrypto/Manifest
@@ -1,3 +1,5 @@
 DIST jwcrypto-1.3.1.gh.tar.gz 91903 BLAKE2B 49fb3cb9548c85d406d47074a410f6bc89cbc32f16a0244b4ac5e3fa219bc66fc1e4ed32056f5c9885608b5225c2ed3423555813938465924e60dabb8f39749b SHA512 bc43a1acdb12a4e25251a3c5f9c85286c5a4234bd098efe69b7e3bd3da9ec72e80d7239cc20b1f971e17218cce9a7febe6a92efca33da2f2e1479fe64150bb71
+DIST jwcrypto-1.4.2.gh.tar.gz 94465 BLAKE2B 23b3a18694793cdbdd1875bd9b107ecab8248ac2c6cbf1bf142144633f7dc6efea91b693b808a4a6153b78c1117dbb2fe1f831f7f2558d2476e146961a501c17 SHA512 9967e626bc4a13a12ef09bbf3dada589c2c5374f4addff743c3ca9762c66659f59ca2e0f495cda6bc5821b6ed62aae95d478bf14de0acd6b2696bf0e1a9e7a49
 EBUILD jwcrypto-1.3.1.ebuild 842 BLAKE2B d81c732703a83443f1bab3668256170a4c3a44691c891d6dcf06c68c1fa7283268bba5a5005fca7db7ca9af3785bc5ad056282fed4c3e6fd23a135b3f3a8d126 SHA512 9f8f2f49bbb7704f477a4a7eb9bed40e63261348c0d972e91d7b991ed5da168955c10787ea85865032bb033f81d983046fc15da8060dde557dab52b8a201b42e
+EBUILD jwcrypto-1.4.2.ebuild 847 BLAKE2B a1aa7608405aa4fbcf1763ebfb46c9f904431dda31978a6ae474919012b94f6a0fab40dd5d5642c4bded38d4b075b31c4090d6803abf3fed447f83dade868925 SHA512 55947c42faea78a660ff9fb17a8f900a169a2a1884cd7feaf4f0da44bc1d8fa096293e7d5c7f366913f093b2e755b29e35c313023456599a179504d6262aff9d
 MISC metadata.xml 369 BLAKE2B c7868e0b20a2875964290642cddb457b71628e361f0e032875ac45f4405abeb76c8c53bcfe623c9a2e49ea6e184505503b4e43f34c456528ff3250aea5110b10 SHA512 a1fec6ac31bbb096e508b0ebd644aa8a96418e6972d852512d4b7702b67f241f858610235dbd68430c588d8b837c7a0866f333c8aab182e7cd01e10325031d34
diff --git a/dev-python/jwcrypto/jwcrypto-1.4.2.ebuild b/dev-python/jwcrypto/jwcrypto-1.4.2.ebuild
new file mode 100644
index 000000000000..e6056edc5f0d
--- /dev/null
+++ b/dev-python/jwcrypto/jwcrypto-1.4.2.ebuild
@@ -0,0 +1,37 @@
+# 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
+
+DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
+HOMEPAGE="
+	https://github.com/latchset/jwcrypto/
+	https://pypi.org/project/jwcrypto/
+"
+SRC_URI="
+	https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
+	dev-python/deprecated[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Do not install doc in non-standard paths
+	sed -e "/data_files/d" -i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/loky/Manifest b/dev-python/loky/Manifest
index 15080056ce5a..191c2d2e323d 100644
--- a/dev-python/loky/Manifest
+++ b/dev-python/loky/Manifest
@@ -1,3 +1,5 @@
 DIST loky-3.1.0.tar.gz 139211 BLAKE2B 32e95312c40d6f8d8f9fc8daf5a1e85f1b874cbb902a4885621983d84a5fa9da42f05ff7d5d6bf58cf04a320c04c6e698ff0105cdad9ddd3248a109cc71c9883 SHA512 8bf6b032bb4f770d89c8de93d95c5805fa90dae34f2754f14c3a9fe7860230e8ce8ea97e1b09fa2cdf67f8aecdbd6d1e47ae4fb746fb1c6912d2dd65033f5b6f
+DIST loky-3.3.0.gh.tar.gz 141130 BLAKE2B 35560dca81cf41e03b24c8be6e70952c19b88fc9794cb13d7c910ac67ec4554555233026a215c6f147dc1354ad11bc14117b4eb6455ba758b79ea6650dc01f62 SHA512 120f771c75fe8691a198c93a91bf683af3d32c1bcaf2fa3e9c439d16546bff9feb6ce203667bd6c4e06ac326500b7bd117948e4deea6f53b04682af1f8d65734
 EBUILD loky-3.1.0.ebuild 1022 BLAKE2B 8e014af6e93ceee128843e0ac678c45bd11a7ceb90e0ec77e56b4614a67d824fa743f65844b110a85c53b47bbab15f77f33811659c0dba8dd7b5e3b306542c2e SHA512 e833f2d6bdc500f7ef621c07c5da660f17be99b5adb41cbe7fbf60f7f7d6efe89c750949d83fc6b516fdb4c9e8fcba5ce64f5bff5647a4b77aa56ab7f89159af
+EBUILD loky-3.3.0.ebuild 1118 BLAKE2B a0496faa2c161cc8933c507cfbdfaeb1b14770fc8700fa32570221b3edde0ca88ec4ce7231e5d5d5b89cfe7ec39dbe9accd13bddf5da13e1ccb2861abc524e9f SHA512 3ab0454a33f79cdc31fc486d79695def126e5cd61a170343974d781ccd8965884665f6131ab76e67d6a2cce44f686c0092834caeb7bda107360ff714fd99ed4d
 MISC metadata.xml 383 BLAKE2B 9d990e2f5b4fbf959925d9d7c1f03ecb3acddcc8564c9362f14741d531d79f3e4c6d98a8c84695d8b1f761fa11a80e768b8e8b48ff8be314732d7f574d767223 SHA512 89d9a1f5c253bf99992d16b974d81175d1ae0d17649ffe1a485430735bec38f45e8e1a35c9ba2d99cb1610db3b200adb5af847b2a161c348e29f0cfa89f8076f
diff --git a/dev-python/loky/loky-3.3.0.ebuild b/dev-python/loky/loky-3.3.0.ebuild
new file mode 100644
index 000000000000..ec4771d80692
--- /dev/null
+++ b/dev-python/loky/loky-3.3.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2020-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="Robust and reusable Executor for joblib"
+HOMEPAGE="https://github.com/joblib/loky"
+SRC_URI="
+	https://github.com/joblib/loky/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	EPYTEST_DESELECT=(
+		# docker, seriously?
+		tests/test_loky_module.py::test_cpu_count_cfs_limit
+		# hangs, and even pytest-timeout does not help
+		tests/test_reusable_executor.py::TestExecutorDeadLock::test_deadlock_kill
+		tests/test_reusable_executor.py::TestResizeExecutor::test_reusable_executor_resize
+	)
+
+	# high memory test needs a lot of memory + is broken on 32-bit platforms
+	epytest --skip-high-memory
+}
diff --git a/dev-python/pyotp/Manifest b/dev-python/pyotp/Manifest
index b6435b8f5250..e041ade7c860 100644
--- a/dev-python/pyotp/Manifest
+++ b/dev-python/pyotp/Manifest
@@ -1,3 +1,5 @@
 DIST pyotp-2.6.0.tar.gz 15687 BLAKE2B 9e1b97c5fd5a3d9b335c173d44922a0427f9f49f4fb27579ee528d1e6f4776b33db31a1664a9bd6295bbec331458e17ac380c1fcd9860bc200577051f2af2e7e SHA512 8d650c6840dd243c4dcb522745ae80b462c1819bcafef226923d13be6a2b096cf5f2146829fd553d5e096d82b67725706d69d0cbb15a5d6586ea234201671bcd
+DIST pyotp-2.7.0.tar.gz 16709 BLAKE2B 83b565afe4b718185274682540ad41591913a710d6683c0131dd7a47c100514e6dfea20d432aed39ab80ec232122329206841c3e024290160a86c74e3e8b3f65 SHA512 e2d67de9a7e4a711d4d0037c2a52c05be5b0ecb5fc85f942a1b9a14b261300dff0058be2fe2d2829d351cf665a0d238d3602c27184f56f7886a9049120c4e44f
 EBUILD pyotp-2.6.0-r1.ebuild 498 BLAKE2B a92ee36c0ac76c38474112f47997f483fa5002e23557c95d30bb7a9aaa47d61df6dfde7e20626aa305cf7d40195abbf30c45179d3539260c53c5c2d4ab87804c SHA512 113c6d95e962461f8f3ef9e901aefadc6bfbf3e8befb1ce5dca18f3eeb9a7dc8cf99b6d89af667129d66000f235ae4a66b162165248e9ed0a9450779246a287a
+EBUILD pyotp-2.7.0.ebuild 498 BLAKE2B a92ee36c0ac76c38474112f47997f483fa5002e23557c95d30bb7a9aaa47d61df6dfde7e20626aa305cf7d40195abbf30c45179d3539260c53c5c2d4ab87804c SHA512 113c6d95e962461f8f3ef9e901aefadc6bfbf3e8befb1ce5dca18f3eeb9a7dc8cf99b6d89af667129d66000f235ae4a66b162165248e9ed0a9450779246a287a
 MISC metadata.xml 385 BLAKE2B 9f2d57ca90c859506181e9960deef6e0bf83854cc35066a18cabfdd1c49ea9019123f1ba3edef1d94c45c826ca0064d9a390a62e758fad87120813ee014dee76 SHA512 0f42bd43b2ef566bfc8b2a7ddb858dae6fe92d5fba0f19d6c0ba6cd38b010b6ba927f87c171327665af0a9bff541381d3b3ffe500988ca15d19da40188e06e77
diff --git a/dev-python/pyotp/pyotp-2.7.0.ebuild b/dev-python/pyotp/pyotp-2.7.0.ebuild
new file mode 100644
index 000000000000..7491d02761fa
--- /dev/null
+++ b/dev-python/pyotp/pyotp-2.7.0.ebuild
@@ -0,0 +1,20 @@
+# 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="PyOTP is a Python library for generating and verifying one-time passwords"
+HOMEPAGE="https://github.com/pyauth/pyotp
+	https://pypi.org/project/pyotp/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pysimdjson/Manifest b/dev-python/pysimdjson/Manifest
index 6c1fb3b6aa5f..98451d1d1969 100644
--- a/dev-python/pysimdjson/Manifest
+++ b/dev-python/pysimdjson/Manifest
@@ -1,3 +1,5 @@
 DIST pysimdjson-5.0.1.gh.tar.gz 3827732 BLAKE2B e42d3fd2ef857ab7c22a5afa6abc3313ff1ea0aabc8a6e8213df3eaef65eb3df501bbcdba2d0de501fdec310aba00c110a30814d548255401fa0b51ca7ee03d4 SHA512 4ace2feca976afdf113b92dd263918f88f7be32156ab6f3b6fe4b798d83bb7c66029bdd7e63fb1bb3bf6568e85b14ad227934114fa7e0da0961888cdfdca8943
+DIST pysimdjson-5.0.2.gh.tar.gz 3828487 BLAKE2B 6197fa9adaa353df82def9f56f821e8b7f9ec955769e9ac28d990542fc0661f3afbe9cd8f7abfc55cdce8eac94c0e5fc78dba9102c7dcfc4e3c4307d0a6fc5bf SHA512 bd7ba4d6f95967f3cd086077406a2c65b895016c9baf16fa9be6dbf77d31487ad5c40e9e3dd2496070605ef37c6a1dc75f3c1b4c96ddc8465132fbcdbde77fd3
 EBUILD pysimdjson-5.0.1.ebuild 1023 BLAKE2B 9650e4c0badaad29593dd959a6910e0d117468b664be910acca5f1346cbeb134c51eb1516280f2970d4292b57ee0fad9abff1d13d0ff86ef4e6d077f708d0d9a SHA512 512fb2427e871a8e6ed1d62dc8330d31355248b6a084b375415690f6b9b32688b1cd729a3c6a7ed06a924b85d36137a06b015a01f1e4517410d79b297968878e
-MISC metadata.xml 424 BLAKE2B 2ce7103dd2d65113aaac5d7acbb50e6fd92726f640c3917339bb1bcdf6124b6c3f1d926c73ce0beba130aa20ede87252a2fe9e0fe4d89bb7c4c9501b4931afd8 SHA512 ba65f9b7d1340d102a782321859be6b03aebd755eb4c8bb604a0e71ad25056f2029a77c92fcf623130f8accd6137f1722e99db3d0b91d9d00d2331cdea5a9bc7
+EBUILD pysimdjson-5.0.2.ebuild 1023 BLAKE2B 9650e4c0badaad29593dd959a6910e0d117468b664be910acca5f1346cbeb134c51eb1516280f2970d4292b57ee0fad9abff1d13d0ff86ef4e6d077f708d0d9a SHA512 512fb2427e871a8e6ed1d62dc8330d31355248b6a084b375415690f6b9b32688b1cd729a3c6a7ed06a924b85d36137a06b015a01f1e4517410d79b297968878e
+MISC metadata.xml 481 BLAKE2B 003dcb11f0a4855cd8dd86dad350442af6d410e7e1a9eb73ed986f970f12296c9fb48534c15b838a782eef814c2525e26cebf1de3e8cc31fc985d0d7d266d985 SHA512 4bfb851c32fbe0691f89e9fe18e03a96d54bb165e6853b75cef1c03645d562c8ebd33bf220966fe3e645d807cc68944a7d9732f363eb9e8fc686e9056c33c4d7
diff --git a/dev-python/pysimdjson/metadata.xml b/dev-python/pysimdjson/metadata.xml
index 07c10616edff..1d5122e2c352 100644
--- a/dev-python/pysimdjson/metadata.xml
+++ b/dev-python/pysimdjson/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pysimdjson</remote-id>
+		<remote-id type="github">TkTech/pysimdjson</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pysimdjson/pysimdjson-5.0.2.ebuild b/dev-python/pysimdjson/pysimdjson-5.0.2.ebuild
new file mode 100644
index 000000000000..16140f582754
--- /dev/null
+++ b/dev-python/pysimdjson/pysimdjson-5.0.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for simdjson"
+HOMEPAGE="
+	https://github.com/TkTech/pysimdjson/
+	https://pypi.org/project/pysimdjson/
+"
+SRC_URI="
+	https://github.com/TkTech/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=dev-libs/simdjson-2.0.1:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# benchmarks aren't run
+	sed -i -e 's:pytest-benchmark:: ; /license_file/ d' setup.cfg || die
+	# force regen
+	rm simdjson/csimdjson.cpp || die
+	# unbundle
+	> simdjson/simdjson.cpp || die
+	echo "#include_next <simdjson.h>" > simdjson/simdjson.h || die
+
+	distutils-r1_src_prepare
+
+	export BUILD_WITH_CYTHON=1
+}
+
+python_compile() {
+	distutils-r1_python_compile --libraries simdjson
+}
diff --git a/dev-python/python-cstruct/Manifest b/dev-python/python-cstruct/Manifest
index 95c7f271608e..e4b33557ec9a 100644
--- a/dev-python/python-cstruct/Manifest
+++ b/dev-python/python-cstruct/Manifest
@@ -1,7 +1,9 @@
 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
+DIST python-cstruct-3.1.gh.tar.gz 26633 BLAKE2B 449510cc8cc6661270d2618cd347eea2044eacc8f665ed2f55bc6fcd95bcf79f29f8bce6498d372d8b5b78f854edb06afb89a3f3ef7f5de37582ebf68d178db1 SHA512 00e2165c14dcc4461600a8eeef5c71bcaa6e59955c23d08055aff2186b16f20d6c10fdb1a02f6e263e27070fda562c712df0c4ad2440a25dc5f23afaa9c88719
 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
+EBUILD python-cstruct-3.1.ebuild 636 BLAKE2B 7a4e7e53b2959d84b7fa9405c8cd6a0bd00d8a1b3823b31a220902d8b44107c0d0ec0f42e4e3d9871867dd56a5a50f0ca7f788f9ad4b14a3a0f813eb617d5345 SHA512 9d8bdec9c0059c57a53bac9ea3d2b45c4602b3460c1dd9ae2782153972ce3dbc429669d62577572961893ab7e304faa457e5b728dd26c3c0ab84a236e1c7dbec
 MISC metadata.xml 454 BLAKE2B 5138bc275b0b9e18cab52fb309283c6b6dab8be5dcc3c86dd6526f350b216c68bc94dd2aabc7a33a4879c23165924563396c6d5991f5c702a12e184067d25cdb SHA512 bb259a25444029d8ea63577f0576ab283282298d27987e276bf4eb6d4ef00853ed019ad199830e9bb4e738f9a151feb55d53e76917508f1033c2b3ecd246276f
diff --git a/dev-python/python-cstruct/python-cstruct-3.1.ebuild b/dev-python/python-cstruct/python-cstruct-3.1.ebuild
new file mode 100644
index 000000000000..7b8d01c50942
--- /dev/null
+++ b/dev-python/python-cstruct/python-cstruct-3.1.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/pyupgrade/Manifest b/dev-python/pyupgrade/Manifest
index 37979e223181..97057276590d 100644
--- a/dev-python/pyupgrade/Manifest
+++ b/dev-python/pyupgrade/Manifest
@@ -1,3 +1,5 @@
 DIST pyupgrade-2.37.3.gh.tar.gz 64041 BLAKE2B 531ac8038c7084a4e46bac15d8da056d04496d979beb1fa98ab0832fab50425f412e3b17de3a52a24264acf489af9a9dde6094dd8a5939877269b38d1997d9ad SHA512 dd7e31c2e586d412902d25f30102dc7d229f76f4735e61ad9c77ad59642c2c2ed65d937cc5c6cde9bd50a1a2dad99d06a97c88fb6b0bd034cbc139685045f738
+DIST pyupgrade-2.38.0.gh.tar.gz 63620 BLAKE2B 73f551e92a6d68e0e1e2b1f21a3afd0f26ece7889450135fe7c68ad3ce094799cba669547965ff3c5589f1e667568e8dcf60709e8d1b3699fd36680494b79f96 SHA512 c65534c59f1810730cd039375678c648565023e1fbb03df4bd14846be95757b33d712c51197f54009e907da647a04700dd8d8ff1094188ef7ba0dbf2352084cf
 EBUILD pyupgrade-2.37.3.ebuild 555 BLAKE2B 46e3ea0d4ddcbee0f27f1754f29eca45cac1cc219f599b5b5eecdf50e924f5ef5fff6425785c046942a1e98185066d6b6b703090dc7b9e917bc6da617751a51a SHA512 79027c18626cca68143da7fa0b88a1f14f5f54cdc5108386a33541eddc49aa891e3483eb354c5c7a94a03c8f36893fde3d55e7b4cf7b54bbbdd5faa28c60037e
+EBUILD pyupgrade-2.38.0.ebuild 555 BLAKE2B 46e3ea0d4ddcbee0f27f1754f29eca45cac1cc219f599b5b5eecdf50e924f5ef5fff6425785c046942a1e98185066d6b6b703090dc7b9e917bc6da617751a51a SHA512 79027c18626cca68143da7fa0b88a1f14f5f54cdc5108386a33541eddc49aa891e3483eb354c5c7a94a03c8f36893fde3d55e7b4cf7b54bbbdd5faa28c60037e
 MISC metadata.xml 603 BLAKE2B a9513a08115930ae37b1a3dc5bd2c0649e646bfdad961f10478b9575c597ffad2847b13642e9433ed7ffa41a2ffae0410616e7eb1cc2a00dfdc181f98639419a SHA512 f9da5ac513c1ee7e1411642119344abf4d409bffc2b1cac997bee625add8ceb5982931d9cddeee082d1943f405a70bea617b06b3bbc6f3787ea987b8e43554b1
diff --git a/dev-python/pyupgrade/pyupgrade-2.38.0.ebuild b/dev-python/pyupgrade/pyupgrade-2.38.0.ebuild
new file mode 100644
index 000000000000..eb59646e97ec
--- /dev/null
+++ b/dev-python/pyupgrade/pyupgrade-2.38.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Tool + pre-commit hook to automatically upgrade syntax for newer Pythons"
+HOMEPAGE="https://github.com/asottile/pyupgrade"
+SRC_URI="https://github.com/asottile/pyupgrade/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/tokenize-rt[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pywavelets/Manifest b/dev-python/pywavelets/Manifest
index 57abdf6159a6..87d4908d7f45 100644
--- a/dev-python/pywavelets/Manifest
+++ b/dev-python/pywavelets/Manifest
@@ -1,3 +1,5 @@
 DIST PyWavelets-1.3.0.tar.gz 4585209 BLAKE2B 0835fe2ea375eb6036862f137569f77c9723203c581695688f73704e9f21e7dd4034e535b67bcf2b6e2819d2ebc69e6336b8d1ea16702412ce637f914a830b3c SHA512 57eaf4bd5d92f40658208a14c75f58dd7a523f702e209a1383b01e2f5a6d62b15d498126151819060bd2931aea6e280fd5c2dea1e22c21953c16a60d9f184c6f
+DIST PyWavelets-1.4.0.tar.gz 4589435 BLAKE2B 7a8711e3b1312de9fc8bba9d79212f63aa8d21b5e9ba5b1330553dad2dc96b8e4d19d550eee2e162bd92ca0f9b44d7f6784083446964c058095d941fd17a9f27 SHA512 e8b0400457fd336b86a01466b6ca2b998960bbefee06febc252b4588df8d3fe7ea364938a50ba1affc6b041f281afb249449c2d860e4d8d437bef608e0818ad0
 EBUILD pywavelets-1.3.0.ebuild 1002 BLAKE2B f01b34d40c8bf1212b306156aefcc0f604b78b08bf38a03e4fc9cb5bf0868eb51afc0511a5c68607aacc31b53dfed00f8b76303aaf4c46202eefaa20ba70b519 SHA512 867b620507100782b11bceb28ab57c559f016b35814d8dbf30b2deb881970b672c47eb5cf708136545fba9d2f541804e7ac92ede55bc3e8fc011c74f777bc0ae
+EBUILD pywavelets-1.4.0.ebuild 1002 BLAKE2B f01b34d40c8bf1212b306156aefcc0f604b78b08bf38a03e4fc9cb5bf0868eb51afc0511a5c68607aacc31b53dfed00f8b76303aaf4c46202eefaa20ba70b519 SHA512 867b620507100782b11bceb28ab57c559f016b35814d8dbf30b2deb881970b672c47eb5cf708136545fba9d2f541804e7ac92ede55bc3e8fc011c74f777bc0ae
 MISC metadata.xml 805 BLAKE2B ed7a8e670ccab1e38e43540cf439a3488e7684d2a2951f3bc7cd2eca5d294bd2e0ed3fd01f44c674297c15aae4ce4d07536882669692dfdeb279e460f6b0e6f4 SHA512 eee1c53a3b3c9579ff6960b763825001fd9aca8da7720dbd36658a2967c3b6c4bd77892449f15677a84b983b58811c831023bc1c152bc8f84f44412d49178199
diff --git a/dev-python/pywavelets/pywavelets-1.4.0.ebuild b/dev-python/pywavelets/pywavelets-1.4.0.ebuild
new file mode 100644
index 000000000000..fe8c19594c61
--- /dev/null
+++ b/dev-python/pywavelets/pywavelets-1.4.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_PN="${PN/pyw/PyW}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Discrete Wavelet Transforms in Python"
+HOMEPAGE="
+	https://pywavelets.readthedocs.io/en/latest/
+	https://github.com/PyWavelets/pywt/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17.3[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc/source \
+	dev-python/numpydoc
+
+python_test() {
+	epytest "${BUILD_DIR}/lib"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		docinto examples
+		dodoc -r demo
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 9b414fb9601d..089cf66ca5f7 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -2,6 +2,8 @@ AUX regex-2021.4.4-pypy3-fix-test_empty_array.patch 1103 BLAKE2B 2498de0ebaa68fc
 AUX regex-2021.4.4-pypy3-fix-test_issue_18468.patch 1078 BLAKE2B 3545ee5167790fbb1d068afdac3f6dbba28ea92d6c1d4ef31b60a8406061deb8609d7fd9a659b45715d4af0f2deb1da0ef9865aebe58919c2b392e2a1a833cae SHA512 182628709ef0f373037acf197c2ade3215684b2c805a96a600a3dfcb092e6fd134c261330ed76c7c248e72f439e464ccde432444bfe4a9610bd36c777bf45c9d
 DIST regex-2022.7.25.tar.gz 385022 BLAKE2B 64c2ff2e9a41d6d559ed199e978b7eb453ffe872d3cbe3d14f31ed6f7df546aa33079ce1d8279b815a35a18d9ea75da6f0beb38e4df576037995518a38db688a SHA512 1179239e8e2a1ff55150b6c2e483f2d2b795a7f5cb400310c315a59aad19590d410cc9c1a862c66be2ca93b24b387a4c4fa0a5467d497a9bc5ffc79dac7cb0ff
 DIST regex-2022.8.17.tar.gz 385777 BLAKE2B c4425e01fea5c25b9ad77e645d3671d65e747a6ee9bd7b8c1870396b4bd989c3a3ec73c33b72eb5e00f24b8e9fff2cef8c229280d2b98a13df7dd8a07bd1b2c9 SHA512 6a305c00a6355dfb9293876292e7d22de58cc00f15d7beadfaf49b49b5ef512404ad5d689f4b90f6302c5246610cb08ebd8ad6a4739818a43c6eb84fc5bc6421
+DIST regex-2022.9.13.tar.gz 391531 BLAKE2B 83e8f1aabe15e65fb4f96072be3ccd5ddf1dcbffeeecb9d7a2889fb910d4095e902bfd45f43184b0df115b1116ddfc3e67d68a2fa903f19a8cbc6844ce023a3b SHA512 a991d6358001297db2b57855e76b8de680941ddefe9d18af1e9ee033da4e519df7b4553d138e7adf32b30593290284c91a954363bcc30b215409efe121e41e69
 EBUILD regex-2022.7.25.ebuild 889 BLAKE2B 2f4739ef643cd8ce3dce81e94160c6943bfb5f5309f62306bad54dbdf0ff0035fdac591d776c5da341060b4da89d12396b54e2436855bb85e4e449c454e6552d SHA512 e95dc22617b73dcd0e01504dd8e974f09260c79f0935fe9cc9d6a2842640556ed1f34d619fdf31917ae2d466dda860ed02fb9539178c5700ed26ec1132c738b0
 EBUILD regex-2022.8.17.ebuild 897 BLAKE2B 409dbb1b548b25d5ac390fdd799e88f54255462fe43a054bb079396a58d2124f06b619c9f97bd95e09a84fec93ed76f0904ace13a81f40ba34ab54fedc885e30 SHA512 0c57dc92862339020b9caf9e727f75f577fbcc3710dfbc8657ba403d7791e2a7a42e0866d6fe82640b2d674167c60ac51e259dd03ed2acf8260435f0b352fbfd
+EBUILD regex-2022.9.13.ebuild 897 BLAKE2B 409dbb1b548b25d5ac390fdd799e88f54255462fe43a054bb079396a58d2124f06b619c9f97bd95e09a84fec93ed76f0904ace13a81f40ba34ab54fedc885e30 SHA512 0c57dc92862339020b9caf9e727f75f577fbcc3710dfbc8657ba403d7791e2a7a42e0866d6fe82640b2d674167c60ac51e259dd03ed2acf8260435f0b352fbfd
 MISC metadata.xml 385 BLAKE2B 90c9075dcf3be9bd447746b249c438f50bc84a7c6c63051e808c5feb19b2c6208f85a681e449a025fe43cd0d5b2ab541752966b04b787052d78b92d5230d8e62 SHA512 f554035e72bcfff83e693f3651198f09fd354babfbadd5fef26dca3015ef8cc00c47072648794123c69bbd12c637eeaf9e9471680bab847ec701da2146462817
diff --git a/dev-python/regex/regex-2022.9.13.ebuild b/dev-python/regex/regex-2022.9.13.ebuild
new file mode 100644
index 000000000000..d864a4bd8ea3
--- /dev/null
+++ b/dev-python/regex/regex-2022.9.13.ebuild
@@ -0,0 +1,35 @@
+# 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="Alternative regular expression module to replace re"
+HOMEPAGE="
+	https://bitbucket.org/mrabarnett/mrab-regex/
+	https://pypi.org/project/regex/
+"
+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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="doc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
+)
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/Features.html )
+	local DOCS=( README.rst docs/*.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/setuptools-rust/Manifest b/dev-python/setuptools-rust/Manifest
index 4afcd345d48c..adec9a35dda6 100644
--- a/dev-python/setuptools-rust/Manifest
+++ b/dev-python/setuptools-rust/Manifest
@@ -55,8 +55,6 @@ DIST selectors-0.22.0.crate 44199 BLAKE2B f749e0e53476b695b4937bc0cbf1add4f3f7d4
 DIST semver-1.0.6.crate 29941 BLAKE2B 1aad12eb93534a0a72fa1645a71fe4cc03121a2215520030d697e863427fa06edd9f63d05c522f696c5b9c1c45556803ae381cb4c77a2d4a7fc30f7363e3ecea SHA512 0470b9a3a6d398233d19a8240de3b0d18c4cd8f8fc6887658baac4053c88463d5de9b7145a564abd43f813e03b75a26050eedc1689450895953bc7f96b64859f
 DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
 DIST servo_arc-0.1.1.crate 9817 BLAKE2B 88586ca0c969df8bfb3a04ba4a689606995876434877a2cd48a72b26451deb6fdcf65273aa9b03948adcbc66b2450301840910e5c4162b993535d69585c62128 SHA512 59d531dcf7a9191b8462ce395e713194994714b65275c0af412186f862be169d0c6fc5d86603332a1aacd8af9ace934dc78531b9cb576cf8179ec35709225447
-DIST setuptools-rust-1.4.1.tar.gz 288848 BLAKE2B 28f4ac618ae3550158814ac14b87d628ce16f140840c3948d48f486cb5a7f50389eccd78385fe3e5be635dad61bf19e25464d39567c2fc760e247d5a2e692145 SHA512 3b92eb37564872b4094e77c8412b006f57a3557213d1368e2db883bc04f5d0d516a97a5b1f0b5255b362ecc32832d2ef734ac759a49db72439f227d54f8a86f5
-DIST setuptools-rust-1.5.0.gh.tar.gz 293081 BLAKE2B bf373915da5c4703d94fa1b63cb9a7037731fb6fd8260032d947b8c57ce6ea3a726956af1ec38f242a1953fc696d9ae5297ab391e2a01d59e5004493743a402d SHA512 40e204e4599a41032dd591d4ef6edecb9dd90c756932fdaeab1999dd24000b97a3f9efb51a20ac81f7d9f1f5a9b25b3891b5f56292951090b89887f947346704
 DIST setuptools-rust-1.5.1.gh.tar.gz 293895 BLAKE2B 039e1fc36e4d1d49bf930c01c124cb98a5e0d6d913ba6b96bea9121457a855446e3ac3a3b3be471fcf4fb8849e38ff7dc41a9f4ddc400f78f723ba3e0bfed571 SHA512 0a763f371b88f3d22ff0dced8dc23d29534130a70133b63fa9097f7466957e13ee1ac812bbdea1a46ac3effb39a2d4349f1314e6cb0d20dfba407e07d37c7c14
 DIST siphasher-0.3.10.crate 9889 BLAKE2B e5dd6d265340b4c9e4266ab1ff3a20f1fb87fd493b2d7b5fba32d26421cc858b38929e4ab96941d0c055375b8acebbd04236d994cadca324500ed05064b9bfc9 SHA512 f90425a2cccc9575d377bb92a765d34653ddef1ac12b7c63dc6d700aaa74b525787e11609061c2d3e44ea56fe0e4b8f93f7b13f0279b5de2e0f710c5caffd4ce
 DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
@@ -74,7 +72,5 @@ DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD setuptools-rust-1.4.1.ebuild 3224 BLAKE2B 25e906de1b79f958cc2858704cd4a8246cea21d09532e38025258a49818ed2a417ef7fbcbb786286adfe5077af40687add0a0637532df6015d2b9a2c02af8bae SHA512 a4e2423a3b6eb6fc4f037e14be94e7356dce94c6028c361a342421f3931092ca25fd3f3b8e18d0673a90c634d0edd96b6a36ceb817f1ba091dbf67db1957d300
-EBUILD setuptools-rust-1.5.0.ebuild 3219 BLAKE2B bf1a733cfae3069ce56013278c0232cb4f03404b6296ecaa1fe054ded092fef0946ff479fb4e6ff6450558699af7c1cf9c1aa9a3abf3dcf457d73fd790b471e6 SHA512 1692d33a52db827ea9c36d6bb232f33d862f7f69e9a3668309aadd15bc22b2256253553d7deb77be877128460ee582a3dfd6b09c114feb1319f440f715175041
-EBUILD setuptools-rust-1.5.1.ebuild 3213 BLAKE2B f9493a6aa61c364947d24333af9fcf4804d7448724a2847ed75c4db52e4d605e27ace52b2d9c99b89f268968535e8373292e5fa5671d04f84b9e4813a91697ee SHA512 7e2174994b10444cc00630f59e48907818136dbb9371d0bfdf3fc27c0ca331d9714e0a99d1b80b0107982ab5ad7f40fc45c16db4859aac4d84b7a76c65048b89
+EBUILD setuptools-rust-1.5.1.ebuild 3212 BLAKE2B aded7568d241e6ae09bcffd5378365a395e472ee33a3ca3a0c1040a3e7036361e14aca32f6d2cba46bf6b61b9ea52098ba66bd7311a0bda8ff8b283984cd7acc SHA512 5cf29bffae0f68610bb7498820f87a42a10b1cdc9cc707d9282e8ae33610c19c716a56d5063a146d302389b9f45b56cb98105ff83e115657305b6c3c30e87e18
 MISC metadata.xml 476 BLAKE2B c8f0ef0779f0a4412a7d9b97e1bb03e3bfb3c031209f489a100b30402d99224014e379712989afd0cb76c85be301dcf9a51e21e8f9195262c5920dd1db0703d1 SHA512 af74755e9e8fb61cbded2dc3e63cd20f95393ef2650bed9f81e299f7759ae79c63b45df8048cd0fe25397ec7db10156be681fa5278606a20481f78d5279b815b
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.4.1.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.4.1.ebuild
deleted file mode 100644
index 34b4fb25a23c..000000000000
--- a/dev-python/setuptools-rust/setuptools-rust-1.4.1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=yes
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-CRATES="
-	bitflags-1.3.2
-	byteorder-1.4.3
-	cfg-if-1.0.0
-	convert_case-0.4.0
-	cssparser-0.27.2
-	cssparser-macros-0.6.0
-	derive_more-0.99.17
-	dtoa-0.4.8
-	dtoa-short-0.3.3
-	futf-0.1.5
-	fxhash-0.2.1
-	getrandom-0.1.16
-	html5ever-0.25.1
-	indoc-1.0.4
-	instant-0.1.12
-	itoa-0.4.8
-	kuchiki-0.8.1
-	lazy_static-1.4.0
-	libc-0.2.121
-	lock_api-0.4.6
-	log-0.4.14
-	mac-0.1.1
-	markup5ever-0.10.1
-	matches-0.1.9
-	new_debug_unreachable-1.0.4
-	nodrop-0.1.14
-	once_cell-1.10.0
-	parking_lot-0.11.2
-	parking_lot_core-0.8.5
-	phf-0.8.0
-	phf_codegen-0.8.0
-	phf_generator-0.8.0
-	phf_macros-0.8.0
-	phf_shared-0.10.0
-	phf_shared-0.8.0
-	ppv-lite86-0.2.16
-	precomputed-hash-0.1.1
-	proc-macro2-1.0.36
-	proc-macro-hack-0.5.19
-	pyo3-0.16.5
-	pyo3-build-config-0.16.5
-	pyo3-ffi-0.16.5
-	pyo3-macros-0.16.5
-	pyo3-macros-backend-0.16.5
-	quote-1.0.16
-	rand-0.7.3
-	rand_chacha-0.2.2
-	rand_core-0.5.1
-	rand_hc-0.2.0
-	rand_pcg-0.2.1
-	redox_syscall-0.2.11
-	rustc_version-0.4.0
-	scopeguard-1.1.0
-	selectors-0.22.0
-	semver-1.0.6
-	serde-1.0.136
-	servo_arc-0.1.1
-	siphasher-0.3.10
-	smallvec-1.8.0
-	stable_deref_trait-1.2.0
-	string_cache-0.8.3
-	string_cache_codegen-0.5.1
-	syn-1.0.89
-	target-lexicon-0.12.3
-	tendril-0.4.3
-	thin-slice-0.1.1
-	unicode-xid-0.2.2
-	unindent-0.1.8
-	utf-8-0.7.6
-	wasi-0.9.0+wasi-snapshot-preview1
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit distutils-r1 cargo
-
-DESCRIPTION="A plugin for setuptools to build Rust Python extensions"
-HOMEPAGE="
-	https://github.com/PyO3/setuptools-rust/
-	https://pypi.org/project/setuptools-rust/
-"
-SRC_URI="
-	mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
-	test? ( $(cargo_crate_uris ${CRATES}) )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/rust
-	<dev-python/semantic_version-3[${PYTHON_USEDEP}]
-	>=dev-python/semantic_version-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-6.3.2[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/cffi[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-python_test() {
-	local examples=(
-		html-py-ever
-		namespace_package
-		rust_with_cffi
-	)
-	for example_dir in ${examples[@]}; do
-		pushd examples/${example_dir} >/dev/null || die
-		einfo "Running ${example_dir} test"
-		esetup.py build --build-lib=build/lib
-
-		case ${example_dir} in
-			html-py-ever)
-				pushd tests >/dev/null || die
-				local -x PYTHONPATH=../build/lib
-				${EPYTHON} run_all.py || die "Tests failed with ${EPYTHON}"
-				popd >/dev/null || die
-				;;
-			*)
-				pushd build/lib >/dev/null || die
-				epytest ../../tests
-				popd >/dev/null || die
-				;;
-		esac
-
-		rm -rf build || die
-		popd >/dev/null || die
-	done
-}
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.5.0.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.5.0.ebuild
deleted file mode 100644
index 47f9cfa253f4..000000000000
--- a/dev-python/setuptools-rust/setuptools-rust-1.5.0.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=yes
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-CRATES="
-	bitflags-1.3.2
-	byteorder-1.4.3
-	cfg-if-1.0.0
-	convert_case-0.4.0
-	cssparser-0.27.2
-	cssparser-macros-0.6.0
-	derive_more-0.99.17
-	dtoa-0.4.8
-	dtoa-short-0.3.3
-	futf-0.1.5
-	fxhash-0.2.1
-	getrandom-0.1.16
-	html5ever-0.25.1
-	indoc-1.0.4
-	instant-0.1.12
-	itoa-0.4.8
-	kuchiki-0.8.1
-	lazy_static-1.4.0
-	libc-0.2.121
-	lock_api-0.4.6
-	log-0.4.14
-	mac-0.1.1
-	markup5ever-0.10.1
-	matches-0.1.9
-	new_debug_unreachable-1.0.4
-	nodrop-0.1.14
-	once_cell-1.10.0
-	parking_lot-0.11.2
-	parking_lot_core-0.8.5
-	phf-0.8.0
-	phf_codegen-0.8.0
-	phf_generator-0.8.0
-	phf_macros-0.8.0
-	phf_shared-0.10.0
-	phf_shared-0.8.0
-	ppv-lite86-0.2.16
-	precomputed-hash-0.1.1
-	proc-macro2-1.0.36
-	proc-macro-hack-0.5.19
-	pyo3-0.16.5
-	pyo3-build-config-0.16.5
-	pyo3-ffi-0.16.5
-	pyo3-macros-0.16.5
-	pyo3-macros-backend-0.16.5
-	quote-1.0.16
-	rand-0.7.3
-	rand_chacha-0.2.2
-	rand_core-0.5.1
-	rand_hc-0.2.0
-	rand_pcg-0.2.1
-	redox_syscall-0.2.11
-	rustc_version-0.4.0
-	scopeguard-1.1.0
-	selectors-0.22.0
-	semver-1.0.6
-	serde-1.0.136
-	servo_arc-0.1.1
-	siphasher-0.3.10
-	smallvec-1.8.0
-	stable_deref_trait-1.2.0
-	string_cache-0.8.3
-	string_cache_codegen-0.5.1
-	syn-1.0.89
-	target-lexicon-0.12.3
-	tendril-0.4.3
-	thin-slice-0.1.1
-	unicode-xid-0.2.2
-	unindent-0.1.8
-	utf-8-0.7.6
-	wasi-0.9.0+wasi-snapshot-preview1
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit distutils-r1 cargo
-
-DESCRIPTION="A plugin for setuptools to build Rust Python extensions"
-HOMEPAGE="
-	https://github.com/PyO3/setuptools-rust/
-	https://pypi.org/project/setuptools-rust/
-"
-SRC_URI="
-	https://github.com/PyO3/setuptools-rust/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? ( $(cargo_crate_uris ${CRATES}) )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/rust
-	<dev-python/semantic_version-3[${PYTHON_USEDEP}]
-	>=dev-python/semantic_version-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/cffi[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-python_test() {
-	local examples=(
-		html-py-ever
-		namespace_package
-		rust_with_cffi
-	)
-	for example_dir in ${examples[@]}; do
-		pushd examples/${example_dir} >/dev/null || die
-		einfo "Running ${example_dir} test"
-		esetup.py build --build-lib=build/lib
-
-		case ${example_dir} in
-			html-py-ever)
-				pushd tests >/dev/null || die
-				local -x PYTHONPATH=../build/lib
-				${EPYTHON} run_all.py || die "Tests failed with ${EPYTHON}"
-				popd >/dev/null || die
-				;;
-			*)
-				pushd build/lib >/dev/null || die
-				epytest ../../tests
-				popd >/dev/null || die
-				;;
-		esac
-
-		rm -rf build || die
-		popd >/dev/null || die
-	done
-}
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.5.1.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.5.1.ebuild
index f89cc07ce7c9..948cfcc46b3c 100644
--- a/dev-python/setuptools-rust/setuptools-rust-1.5.1.ebuild
+++ b/dev-python/setuptools-rust/setuptools-rust-1.5.1.ebuild
@@ -98,7 +98,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index b5851dc73047..aad73322ae31 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -4,6 +4,6 @@ DIST SQLAlchemy-1.4.40.tar.gz 8277132 BLAKE2B fa4362a8abec9845beb3cdb65de4066a8a
 DIST SQLAlchemy-1.4.41.tar.gz 8281227 BLAKE2B 31fb2bfcb41ceefc2c6ed70444b5d8b38a862e06899dd9b5ede7fde0b624ce9f8be766028aaf32b36983268c35e61d87ada5a597260fb97efe72bfc27ce15a71 SHA512 f03a2d4d61a108b4091a4d2ccf2bf49ea22e6c30fcbd70758f89dc3817968e7b5ffa603ce0158812fe42814cd08bbadd00079609a47765d3c534d769835a5543
 EBUILD sqlalchemy-1.4.14.ebuild 2625 BLAKE2B cb12c0a41a713cad62ed92c4232a24a3ef0293e5d48488ed3ebf9cb70106a9febab2caa70bfbbb7c22e281d6db222f1a0e3cc5ce782272880effeda6a4ae2fd8 SHA512 dec936b66e10c04ce2c9eb2af65cf48c64a5e9b04ef1279c1133fb56d9a424853544ef5c3e7412d5cd5bc58c36c3697f34e2ce05cf847335872891d5f397e16c
 EBUILD sqlalchemy-1.4.39.ebuild 2617 BLAKE2B 8463ac4ba31b500c01b444cd7b305f2c4dfcc9e39752e68fa0d82b6e7a45a34c55fb72fc87e36035139c714dd5c74fdce6a9f7c9f5c39aa1e4b52b1c0695333b SHA512 53105444a9d92f70b4823ba420d533358c609f6e567911fbe1231eb791d552f6d2a34540718c2ed224b1fdb54d09df7faa04eb9f0684322cb11853b28eadd4f7
-EBUILD sqlalchemy-1.4.40.ebuild 2620 BLAKE2B b9e94cfaa0f18b71e3136d95d47e42a77a83456c2fcebd34e0eb8648578cdf366e6f300f15333a8aeb51f0af6da929300d4134667d4274b4649c450363b10ceb SHA512 001cd67cb99d01a32426a68c4b1da1fb80c9748ec69d0b254135141d33f67b421ee5be801093830e214a4eb21f176f13331a89dac328cc77c1e5ba25cb952297
+EBUILD sqlalchemy-1.4.40.ebuild 2619 BLAKE2B 552fe6faaa6c0a20bb93dc3ddc20196cf119855db2f4eeb7d06ce17dee2782a634a58ab51d6bf8fc30447a3c9d627d25c5f217fb6e34f2cdda5489a72fb48fd7 SHA512 f8d02ba5966079db37ba63caf0e436e489ea97eb9555d5fc3b8097b5f62d7d052d9470a4a69e05512bb9de5734272a9b36e8a372701c34b5d09221491943a4a7
 EBUILD sqlalchemy-1.4.41.ebuild 2698 BLAKE2B b1ff340d3abdc039f3d72a031e2157087dbe6eca30d8e56c147c5556366446aad8774665bea45c7f797ff07d016a51edc1282f08d52585f76a7859961fea90f6 SHA512 fca4a89adf8fbf44103d33c0443928c7e368c8a7e0b82bf3c82e5712ae54a25a9b98c2a13d0d751839bd91dcb6ab9f3aca301eddafe1d973d3cb1973f50afac0
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.40.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.40.ebuild
index 8154238b6446..5b1903c1327b 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.40.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.40.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 BDEPEND="
diff --git a/dev-python/zope-schema/Manifest b/dev-python/zope-schema/Manifest
index 891102d076b6..7f45754eeba2 100644
--- a/dev-python/zope-schema/Manifest
+++ b/dev-python/zope-schema/Manifest
@@ -1,3 +1,5 @@
 DIST zope.schema-6.2.0.tar.gz 104068 BLAKE2B 10d300b925f57a028b40bbcdfd7b0eb330815b63c86d6ded60fb594d549b1459cb67a99bd19e6d1782104a8bab204d8033ce422b5f9ebddb00e2fdfc1ab7d529 SHA512 f3083e4fc1dc54160c38cf7033519f9f37fef3e39f2f15b53fc4475d0989932448a018d77f8562870f4df85c5bf35bc756aec97868cd35ca07b733cf5796f00f
+DIST zope.schema-6.2.1.tar.gz 124649 BLAKE2B 71ac712d3dbd6c9063ddc213263ce3a356f0ec757466cacdbc216af95cdb9de3ca7f891c203880f9f22612e01259491d83c49fcbe9985ecaabf1629ea14e12ea SHA512 e3fabd3deabb4ac2087792be94b919b7c9a0f0c741316d6f67a42e24fe617091754183b32d8433664b6fa95569009def8e7e1e08f34013282b042eb32da323a6
 EBUILD zope-schema-6.2.0-r2.ebuild 1165 BLAKE2B b8668eb96c657b600d555bf0e8d2f1b89e3604013290d286881fc26adb653a17394b6ca5c573a0171ce553bcff756f91c0ae21bee9d210d77e0facd37a124ab3 SHA512 9a4aacceb011b05c5972b985ff8d15b08090b11de8396ab62548458850464926977ac934f69b7bd65c374ef5f35cb90d2f605de375be860811e93aa6a8d12aa0
+EBUILD zope-schema-6.2.1.ebuild 1168 BLAKE2B 11851644663843b5d9d8c51a1219c62261b127eeb39c682022d76d711c45361d6e25833086f1fe56366bf46b83d13ac0f3ba88d37e39d6853c34437e16e4b2f7 SHA512 8caabffc1f577c0f0920f1b4e953038a50c140ad76d6fe8e2df3f40bbb7c0f9b4ba1049a757d01dfe6971a6ed38b2574bcdd66373462932d75c99609681403a5
 MISC metadata.xml 498 BLAKE2B d5386b7a400de71c5c02d2b9788682d35dd34eaa6a132aea45432aa2d53ec47e54fee9f880cf6cc5abd8184e28cef0795fe2f58dfd47f619b4120ce914bd7c45 SHA512 5a8021ec0348af5929d3284f172f5b5fb26007df9064f5571a0cdb07c1259c24b9b352eb048811f5e4f68ab75b9fabeba49c93a0cdd6e8655b509a248447b794
diff --git a/dev-python/zope-schema/zope-schema-6.2.1.ebuild b/dev-python/zope-schema/zope-schema-6.2.1.ebuild
new file mode 100644
index 000000000000..8157f0091af8
--- /dev/null
+++ b/dev-python/zope-schema/zope-schema-6.2.1.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..11} pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Zope schema Architecture"
+HOMEPAGE="
+	https://pypi.org/project/zope.schema/
+	https://github.com/zopefoundation/zope.schema/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/zope-event[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-5.0.0[${PYTHON_USEDEP}]
+	!dev-python/namespace-zope
+"
+BDEPEND="
+	test? (
+		dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -i -e "/'setuptools'/d" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	distutils_write_namespace zope
+	eunittest
+}