Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-09-26 12:44:20 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-09-26 12:44:20 +0000
commit: 654b2d454aba72929fc868804a7ba17fe84bd504 (patch)
tree: bf2e34429c7cbbcbac8d25ab2ca99e9e599e710f /dev-python
parent: b39ab8798d1982c08957abb2f317e66efb9ef82a (diff)
download: baldeagleos-repo-654b2d454aba72929fc868804a7ba17fe84bd504.tar.gz
baldeagleos-repo-654b2d454aba72929fc868804a7ba17fe84bd504.tar.xz
baldeagleos-repo-654b2d454aba72929fc868804a7ba17fe84bd504.zip
175 files changed, 1024 insertions, 1682 deletions
diff --git a/dev-python/APScheduler/APScheduler-3.9.1.ebuild b/dev-python/APScheduler/APScheduler-3.9.1.ebuild
index 73fef4e190a6..0aae3c90e1b4 100644
--- a/dev-python/APScheduler/APScheduler-3.9.1.ebuild
+++ b/dev-python/APScheduler/APScheduler-3.9.1.ebuild
@@ -25,7 +25,7 @@ BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index bd1de2f51492..9286268d8cdf 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -4,5 +4,6 @@ DIST PyPDF2-2.10.5.gh.tar.gz 6443691 BLAKE2B 6b60ea4d1a044ee5f20718744118f5739a4
 DIST PyPDF2-2.10.6.gh.tar.gz 6443648 BLAKE2B 4b5282363dea4bcec65ee6fddec787a95055ae900636b75c118fa3f2a4f5afc73807425b611c81cff6a580d4109c4df14083a1f64d7d6c373a1cd6ff9cb92fb3 SHA512 c158e6eec44429bdc103cd7f0e358289a14de92dc1d23b77f58e45a7a9851e9072fab3c8c5710f1755fdc5093380d3756db4fd12d0bdc8461cb9119d499fe012
 DIST PyPDF2-2.10.8.gh.tar.gz 6444481 BLAKE2B 888cfb7977dd34c5b7d12d0fc9d2e81aaa76b837036e98537fc0829dedb6193ea4f5e9c40d2a677b036f9fc2ff09adb47afde8ad7d1e5e037613e1dda93c8faf SHA512 29bcadfb8e7fd9285ffe7b5d706cd43bec3ce9b80425232d77b834010513cd9907bf65d90e820ee1d0718be0ed384a7ff3e097c4d16d614d6cd89e272e767174
 DIST PyPDF2-2.10.9.gh.tar.gz 6448504 BLAKE2B 5508ce0b2b0d3cb00f1057a4e52dafde3ff0dbf5eaa79be46e9d20a5041b76968fd46ba74b86f15e9fb2948f2c053fd1f722f11806cfbed552d241a768d01f00 SHA512 43aec1a381e97b26145b7c8e3414a4cab33d0d03520be73b3e5e4c9565db10e9bfd764280b56f328ec5931cc41d1a6f558b29d59d0930d92de8da00b52e2f7da
+DIST PyPDF2-2.11.0.gh.tar.gz 6452850 BLAKE2B 695e39336cb93f138b06182b221aa7ed1f90a582bbfff9111763b60b26b37fd13f70ed3ef67c2237d19dbb845c1703944190d04fbfe6694d0afe67671b188d73 SHA512 b0574d31d7487b3346d093229cb768baa2668619c1a3b8dde135c40f9b65cc6e291cd8e012c4fcae403f3163a3ded6445491e42efdf49c36653b3167544ce64b
 DIST PyPDF2-sample-files-b6f4ff3de00745783d79f25cb8803901d1f20d28.gh.tar.gz 5522867 BLAKE2B 9a6cb3b92032f9ec697b972b1a257b2c2528d36cd4a7e40092ac6dbf0a4955c5b204b8c82d37f9bad4a19fccddf0070b095ee2f3b56de22d738ed3d8a3b555c0 SHA512 74aad38060f441ace87f6650de152a28f4a251e4f47574a8d46066857c8fbbb187cd3cd275caa198dce2c1557e90664b288f071995c2bbb9bf13a341210313e8
 DIST PyPDF2-sample-files-bedcbe077c4898e1b97c6c6f81d937f5048b4630.gh.tar.gz 7198720 BLAKE2B 91d177e7329fd137322972a3a38841cb0611de7f839071fe2fa5ecff0343cbffdf6976f42f4a779f520a8a2bac2d6573c5cd65bf2f1bc68395077e6e9c7322d9 SHA512 0cdaee85f1da12cf678165f06c8d351aa0808137d25f68c07f19f1bd3c929eeb52e604041dfaa0df94665379aeb7d19a43426d724a5e6602b7e4fbe7a62e753d
diff --git a/dev-python/PyPDF2/PyPDF2-2.11.0.ebuild b/dev-python/PyPDF2/PyPDF2-2.11.0.ebuild
new file mode 100644
index 000000000000..56014cf76ecb
--- /dev/null
+++ b/dev-python/PyPDF2/PyPDF2-2.11.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_{7,8,9,10} )
+
+inherit distutils-r1
+
+SAMPLE_COMMIT=bedcbe077c4898e1b97c6c6f81d937f5048b4630
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/PyPDF2/
+	https://github.com/py-pdf/PyPDF2/
+"
+SRC_URI="
+	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
+			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
+	)
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+RESTRICT="test"
+# 150+ tests require network, too many to deselect
+PROPERTIES="test_network"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# rely on -Werror
+	tests/test_utils.py::test_deprecate_no_replacement
+	tests/test_workflows.py::test_orientations
+)
+
+src_unpack() {
+	default
+	if use test; then
+		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
+	fi
+}
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index c63286ee0e16..ffe6159bd51c 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -1,3 +1,2 @@
-DIST ansible-compat-2.1.0.tar.gz 37840 BLAKE2B 5ac74cdaef1c932094996f331ed94418836b3351cbd376ae35ef22046b68dad0a8ab68fd293015db9954e0a5e1df4b5c529b3845cee5778daed2bb207733ca4f SHA512 a85681aff3d34ef4a4cdad8f419017a174bf315034495bc032a7e33d586cbcf72de74d163b6faf3cd21988704e5dbb922872b83a23981891311dbb18e53797a3
 DIST ansible-compat-2.2.0.tar.gz 38772 BLAKE2B dbe74d23d2f2e4275bd9df2303417ea83517e780e65c6a34bd6ae1022be265ac816b50b309fc45f88e0c7fac7d7a22c83a826cc15be050698a6f35b267a36ac3 SHA512 3bd199431659ecba52743c6c985d2cdc6ee55396444241ba2456bc5430bbc87e26087dffbfff62ac341fa854e19baa0d7052cf79f20511222fd9e001dd020136
 DIST ansible-compat-2.2.1.tar.gz 39126 BLAKE2B c4d0512606c99ba8f07e0287620c94af6b46d7bf0077f12dcbfd9689fc7106f164a87db25de1625249ac2930858bfa655bd93d83aba0d85ed4f8bdd42cd345dc SHA512 3e941eb2c5303f83b7e7c057d08801f192889b636d9c6e56a2ac21cf75144a52ba2916eaedeba7bf848dd268387bf4d3261541d75145b213cc3f6baca6a06e5e
diff --git a/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild b/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild
deleted file mode 100644
index 0c8457c0264e..000000000000
--- a/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
-HOMEPAGE="
-	https://pypi.org/project/ansible-compat/
-	https://github.com/ansible/ansible-compat/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="
-	>=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.5.1[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-6.3.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-markdown[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-plus[${PYTHON_USEDEP}]
-	)
-"
-
-# All these tests attempt to connect to galaxy.ansible.com
-EPYTEST_DESELECT=(
-	test/test_runtime.py::test_install_collection
-	test/test_runtime.py::test_install_collection_dest
-	test/test_runtime.py::test_prepare_environment_with_collections
-	test/test_runtime.py::test_prerun_reqs_v1
-	test/test_runtime.py::test_prerun_reqs_v2
-	test/test_runtime.py::test_require_collection_no_cache_dir
-	test/test_runtime.py::test_require_collection_wrong_version
-	test/test_runtime.py::test_require_collection
-	test/test_runtime.py::test_upgrade_collection
-	test/test_runtime_example.py::test_runtime
-)
-
-distutils_enable_sphinx docs \
-	dev-python/ansible-pygments \
-	dev-python/myst_parser \
-	dev-python/sphinx_ansible_theme
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p pytest_markdown.plugin
-}
diff --git a/dev-python/aspectlib/aspectlib-1.5.2.ebuild b/dev-python/aspectlib/aspectlib-1.5.2.ebuild
index 35ed6bc0c0f3..b07fbaf19629 100644
--- a/dev-python/aspectlib/aspectlib-1.5.2.ebuild
+++ b/dev-python/aspectlib/aspectlib-1.5.2.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 RDEPEND="dev-python/fields[${PYTHON_USEDEP}]"
 BDEPEND="test? (
 	dev-python/process-tests[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
 )"
 
 S="${WORKDIR}/python-${P}"
diff --git a/dev-python/cairocffi/cairocffi-1.4.0.ebuild b/dev-python/cairocffi/cairocffi-1.4.0.ebuild
index 09916d871e3c..a8bf40670150 100644
--- a/dev-python/cairocffi/cairocffi-1.4.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/cherrypy/cherrypy-18.8.0.ebuild b/dev-python/cherrypy/cherrypy-18.8.0.ebuild
index 5717fce2f343..25366d46e38b 100644
--- a/dev-python/cherrypy/cherrypy-18.8.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-18.8.0.ebuild
@@ -40,7 +40,7 @@ BDEPEND="
 		dev-python/routes[${PYTHON_USEDEP}]
 		dev-python/simplejson[${PYTHON_USEDEP}]
 		dev-python/objgraph[${PYTHON_USEDEP}]
-		dev-python/path-py[${PYTHON_USEDEP}]
+		dev-python/path[${PYTHON_USEDEP}]
 		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
 		dev-python/pytest-services[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 4d1bc3f24027..04542f02bf03 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -3,4 +3,5 @@ DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf
 DIST llvm-project-15.0.1.src.tar.xz 112068688 BLAKE2B 8fd6690445f7cbc8b47a7c1dd1f2c4fbc39f9a97f9d4a0015d466726454b090b0d1ff9b0d926eba7065e84782901687f74e6540a36dc6656a93f3c92c7bc7e06 SHA512 cef84bc173118a30db3ece5e5c6f874bf689c77afc40a4792fdcb7556555ac14a8e6de1dc811755405e5d162d63bc69abaecba30d220a42765160d69f0073fda
 DIST llvm-project-15.0.1.src.tar.xz.sig 438 BLAKE2B d8f634adab531bb19178fb27bc83b3a90c856e9402dd5af700f9af43813f68d20c21b9112dd95e9f6f10609ee51ed5aaf77edb96ca16fb93136b8aea432affd3 SHA512 cbf2570840d8dc12f6436c495a23cf9d439ee195755c01a6d1d5bcc20133599dc956dc43a0f5016698e3c9a960826f5f3c2840a73f993467e275856a67999fda
 DIST llvm-project-303526ef3aa211c1930be2885deae15eeeda3b18.tar.gz 167503164 BLAKE2B 143c72c58517b3e40ee74c1a0df47bfd0d0f9e71926bc8c39a007e674a08df95d0ffe05f523f97e4409b248349e13719cabbc7ac6938feebe702959e84a07243 SHA512 9aa5c86de6c6be1d26c085eb29ea283429e41330e937e5fdbd545bb3f5b996ac82cd6268701fcbbd202e89ee35f2b67e595fc595bb7383778e9ad5fd52ca10a0
+DIST llvm-project-4f188ef89ce5a3bee21fd0b4e8fcdf7f030f64b2.tar.gz 168720595 BLAKE2B 10bd3ac4eea674fc171f17414f6892a681529b020a5d513e075920f7792fb31d6d4a3584679ebea24bc839c2a233459b935d368c7ea57c94ad27c7c81da05cff SHA512 77ae7eb57c8c50affb516581dabe3b31e342f7ed899440521b6738aeec3b6e795c50c078bbe0f483a070961c9b5b73a7bbe28e2f109e2ce69d238ddbda8e134f
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
diff --git a/dev-python/clang-python/clang-python-15.0.1.9999.ebuild b/dev-python/clang-python/clang-python-15.0.2.9999.ebuild
index 63106cbd0017..63106cbd0017 100644
--- a/dev-python/clang-python/clang-python-15.0.1.9999.ebuild
+++ b/dev-python/clang-python/clang-python-15.0.2.9999.ebuild
diff --git a/dev-python/clang-python/clang-python-16.0.0_pre20220926.ebuild b/dev-python/clang-python/clang-python-16.0.0_pre20220926.ebuild
new file mode 100644
index 000000000000..63106cbd0017
--- /dev/null
+++ b/dev-python/clang-python/clang-python-16.0.0_pre20220926.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		sys-devel/clang:${PV%%.*}
+	)
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	# tests rely on results from a specific clang version, so override
+	# the search path
+	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${PV%%.*}/$(get_libdir)
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/contourpy/contourpy-1.0.5.ebuild b/dev-python/contourpy/contourpy-1.0.5.ebuild
index b152ce186509..4efc5ddc7c81 100644
--- a/dev-python/contourpy/contourpy-1.0.5.ebuild
+++ b/dev-python/contourpy/contourpy-1.0.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~hppa ~riscv"
 
 RDEPEND="
 	>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
diff --git a/dev-python/css-parser/Manifest b/dev-python/css-parser/Manifest
index 326256e92810..c5f1369f7569 100644
--- a/dev-python/css-parser/Manifest
+++ b/dev-python/css-parser/Manifest
@@ -1 +1,2 @@
 DIST css-parser-1.0.7.tar.gz 348843 BLAKE2B 72fd2a0555eea2b912d3088b1d38a4bf082862a47a414c4c00718ad1b31299a3df3b2e9dcf4f22c3195520c28f5652aaf4103a9a999ceb3ea6b8c785f50bb40e SHA512 51e4ca836b18f963d798a14762bed78cbd3034598cc828dfe81b3f7d921a5bfe52374b0dc6160e1c01e40a8c8147a10664b9f7edeee867ca1086e6a4a96ff162
+DIST css-parser-1.0.8.tar.gz 349363 BLAKE2B 2e67d74422cf87e1c593793f6acc9089a745d020cba18c63c70bc2099f53aad95bd5de1def49a3f5ab7cbff7f91efb3a60b3d2d9f1efa55244d99770f0d7baec SHA512 1b22665a172b8a29e277217f39bac1512867dbd5acdfe37ddf078eab71452467adc3dcdac68e424df32cc204f3e55da45d31663f8e7aa143c0243818df32487a
diff --git a/dev-python/css-parser/css-parser-1.0.8.ebuild b/dev-python/css-parser/css-parser-1.0.8.ebuild
new file mode 100644
index 000000000000..5258d4cdac87
--- /dev/null
+++ b/dev-python/css-parser/css-parser-1.0.8.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A CSS Cascading Style Sheets library (fork of cssutils)"
+HOMEPAGE="
+	https://github.com/ebook-utils/css-parser/
+	https://pypi.org/project/css-parser/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/chardet[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index 9f2760a10e0c..6a46a4588eaa 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -1,4 +1,2 @@
-DIST elasticsearch-7.14.1-no-jdk-linux-x86_64.tar.gz 191559419 BLAKE2B c4099d2e7a121b47549b44c081f60cd966a371a01827aa19380d171619cb6ef6f30fd411f75de00d41c6a93df2c899ac9dbc5cf2bf2264d7885ace6a61cf55c3 SHA512 77dca78ba865ae74863b3b2a3cd61e8a8e4478cd02eb020184dbf89fa32cf145a6bbd1d11a1cb88c2236a3b8cdb8b0047e3c0f1a40f609f31b898c905b2c211d
 DIST elasticsearch-7.17.6-no-jdk-linux-x86_64.tar.gz 167439665 BLAKE2B a0f2a57fbdd5bce1d476e410ec31555be7ebffa5961ad9b51d65753b50f05833e5991ee41c4b00906a8253146f72dc24895d5790a9d6afeea722d4b9b1a12443 SHA512 d3d1a16c2276d7ede911fc53915c988e17532a6481f9e4827677f6b40e6ccade6a9655a28bdb6460e98a4229f7cef807441e20afcdc161010f674ce1483da4f4
-DIST elasticsearch-py-7.14.1.tar.gz 302277 BLAKE2B a4502edbaf1dbca9c687a32f012305fee7520555dd23f05888fcb8b82e2a9ffa3f9c5208320eca4ea8033498cd0a951003b94662b6847da664f302b8c2763004 SHA512 49b4e0cddc210e0d73cb7cb28f38dae4fd0595e22733cf017c41f50731479a1a3672307a119b067a0b5c1de3a138908e337145effd2b66bf930c2d439cd2ce0b
 DIST elasticsearch-py-7.17.6.gh.tar.gz 330159 BLAKE2B c72cf21ece1cc74c08f5f9a6718333bd89b6aece5902c4a053182bf63378b56afa84bb72cd7b07e7daba9eb19ac52f6c7f801124871cb4f555e456a66773218b SHA512 cb5f96e4e7a6c7a6bf52c55bcf3a4a3456574cea9815b002482a6e47a86c492d18aa85b3046ed6741361bd7e4e6fbc67c95a57b5a52e8320f102d3a5c1f4c719
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.14.1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.14.1.ebuild
deleted file mode 100644
index 2c68bc21f67d..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-7.14.1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Official Python low-level client for Elasticsearch"
-HOMEPAGE="https://github.com/elastic/elasticsearch-py"
-SRC_URI="
-	https://github.com/elastic/elasticsearch-py/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${PV}-no-jdk-linux-x86_64.tar.gz
-	)"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="async doc test"
-
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
-	<dev-python/urllib3-2.0.0[${PYTHON_USEDEP}]
-	async? (
-		>=dev-python/aiohttp-3[${PYTHON_USEDEP}]
-		<dev-python/aiohttp-4[${PYTHON_USEDEP}]
-	)"
-DEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-		virtual/jre:*
-		async? (
-			dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-			dev-python/unasync[${PYTHON_USEDEP}]
-		)
-	)"
-
-distutils_enable_sphinx docs/sphinx dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-src_prepare() {
-	default_src_prepare
-
-	if use test; then
-		local es_port="25124"
-
-		export ES_DIR="${WORKDIR}/elasticsearch-${PV}"
-		export ES_INSTANCE="gentoo-es-py-test"
-		export ES_JAVA_HOME=$(java-config -g JAVA_HOME || die)
-		export ELASTIC_PASSWORD="changeme"
-		export ELASTICSEARCH_URL="https://elastic:${ELASTIC_PASSWORD}@localhost:${es_port}"
-
-		cp -r "${S}/.ci/certs" "${ES_DIR}/config" || die
-
-		cat <<EOF > "${ES_DIR}/config/elasticsearch.yml" || die
-# Run elasticsearch on custom port
-http.port: ${es_port}
-cluster.routing.allocation.disk.threshold_enabled: false
-bootstrap.memory_lock: true
-node.attr.testattr: test
-repositories.url.allowed_urls: http://snapshot.test*
-action.destructive_requires_name: false
-ingest.geoip.downloader.enabled: false
-
-xpack.license.self_generated.type: basic
-xpack.security.enabled: true
-xpack.security.http.ssl.enabled: true
-xpack.security.http.ssl.verification_mode: certificate
-xpack.security.http.ssl.key: certs/testnode.key
-xpack.security.http.ssl.certificate: certs/testnode.crt
-xpack.security.http.ssl.certificate_authorities: certs/ca.crt
-xpack.security.transport.ssl.enabled: true
-xpack.security.transport.ssl.verification_mode: certificate
-xpack.security.transport.ssl.key: certs/testnode.key
-xpack.security.transport.ssl.certificate: certs/testnode.crt
-xpack.security.transport.ssl.certificate_authorities: certs/ca.crt
-EOF
-
-		# Set password in keystore
-		printf "y\n${ELASTIC_PASSWORD}\n" | ${ES_DIR}/bin/elasticsearch-keystore add "bootstrap.password" || die
-
-		# Deselect tests which require a non-free license in the server to succeed
-		EPYTEST_DESELECT+=(
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[token/11_invalidation[{0,1}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[token/10_basic[{1..4}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get_result_record[{1..6}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get_result_influencer[{1..8}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/datafeed_cat_apis[0]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/filter_crud[10]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/preview_data_frame_analytics[{3..5}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/custom_all_field[{0,1}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/data_frame_analytics_crud[{1,5,6,13,29,38,39,40,42,62,76,77,78,80,81,82,83}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/start_data_frame_analytics[{0,1,2,3,4,6,7,8}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get_result_categories[{0,1,2,3,4,5,6,7}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/forecast[{1,2,3,4,5,6}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/explain_data_frame_analytics[{3,5,6,7,8}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/delete_expired_data[{0,1,2,3}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/upgrade_job_snapshot[{0,1}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/inference_processor[{0,1}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get_result_buckets[{0,1,2,3,4,5,6,7,8,9,10,11}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/trained_model_cat_apis[0]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/revert_model_snapshot[{0,1}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/calendar_crud[{0,7,8,12,13,17,18}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/stop_data_frame_analytics[{0,1,2,3,4,5}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get[{0,1,2,3,4}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/preview_datafeed[{0,1,2,3,7,8,9}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/data_frame_analytics_cat_apis[{0,1,2,3}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/reset_job[{0,1}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/ml_anomalies_default_mappings[{0,1}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/get_model_snapshots[{0,1,2,3,4,5,6,7}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/get_datafeeds[{0,1,2,3}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/job_cat_apis[0]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[change_password/11_token[0]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[searchable_snapshots/10_usage[0]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[graph/10_basic[0]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[data_stream/10_data_stream_resolvability[4]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[xpack/20_info[0]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[authenticate/10_field_level_security[0]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[set_security_user/10_small_users_one_index[0]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[terms_enum/10_basic[{0..9}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[security/hidden-index/14_security-tokens-7_read[{0,1,2}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[security/hidden-index/13_security-tokens_read[{0,1,2}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get_result_records[{0..6}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[ml/jobs_get_result_influencers[{0..8}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[license/20_put_license[{5,7,8}]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[license/30_enterprise_license[0]
-			test_elasticsearch/test_server/test_rest_api_spec.py::test_rest_api_spec[token/10_basic[0]
-		)
-
-		use async || EPYTEST_DESELECT+=( test_elasticsearch/test_async test_elasticsearch/test_types/async_types.py )
-		export EPYTEST_DESELECT
-	fi
-}
-
-python_test() {
-	local es_instance="gentoo-py-test"
-	local es_log="${ES_DIR}/logs/${es_instance}-${EPYTHON}.log"
-	local es_temp="${T}/es_temp-${EPYTHON}"
-	local pid="${ES_DIR}/elasticsearch.pid"
-
-	mkdir ${es_temp} || die
-
-	# start local instance of elasticsearch
-	"${ES_DIR}"/bin/elasticsearch -d -p "${pid}" -Ecluster.name=${es_instance}-${EPYTHON} -Epath.repo=${es_temp}|| die
-
-	local i
-	local es_started=0
-	for i in {1..20}; do
-		grep -q "started" ${es_log} 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			es_started=1
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${es_log}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	epytest
-
-	pkill -F ${pid} || die
-}
diff --git a/dev-python/entrypoint2/entrypoint2-1.1.ebuild b/dev-python/entrypoint2/entrypoint2-1.1.ebuild
index 851d7225ad75..a3bee2f7158b 100644
--- a/dev-python/entrypoint2/entrypoint2-1.1.ebuild
+++ b/dev-python/entrypoint2/entrypoint2-1.1.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="amd64 ~arm64 ~riscv x86"
 BDEPEND="
 	test? (
 		dev-python/easyprocess[${PYTHON_USEDEP}]
-		dev-python/path-py[${PYTHON_USEDEP}]
+		dev-python/path[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/ephemeral-port-reserve/ephemeral-port-reserve-1.1.4.ebuild b/dev-python/ephemeral-port-reserve/ephemeral-port-reserve-1.1.4.ebuild
index 9844f462ca82..2f5e2372ed3d 100644
--- a/dev-python/ephemeral-port-reserve/ephemeral-port-reserve-1.1.4.ebuild
+++ b/dev-python/ephemeral-port-reserve/ephemeral-port-reserve-1.1.4.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
index e7fef1b3a9e3..e77448fa5590 100644
--- a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
+++ b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT PSF-2.4"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index e19305e0f696..46624c250e00 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -1,2 +1,3 @@
 DIST executing-0.10.0.gh.tar.gz 507523 BLAKE2B 5ab17adb1d40b83b0cf294aba350faf124a810b4c95e408e9bd2ba80d918154cb41d8b4d4748cd7d897d47e085883a30f431dedd595b00506beb5038e084f473 SHA512 f1ee25679cd1f88f273ee68e8e926a6e98b749a50d063ea3aa73f35ac0d7ea65b13364269f01265f164dba1d775a742cd7cf3594558e06efb39fb1157b3b9f5c
 DIST executing-1.0.0.gh.tar.gz 507720 BLAKE2B 601ddbd4c7dacd6b72317e9f07d8b8566d14b1c805bb7a2768449d51bf75818945f3b61b67dd0402d1d6171bd74165107ef98e835910529d82b8858bd016ac6d SHA512 912cea61ddb2ef12034432d68fa7239daad3c6365dbcbed72f08121b9fdc07e614b5c2233c53f5f7ee3472fca4f690af3db0944a0ed2c83623de8d682cff0a61
+DIST executing-1.1.0.gh.tar.gz 782214 BLAKE2B 56c97b1c0b6617db90a90f562409b406d0838e187fed4e45642506df85ae5e54824a393eb38982902bdb1c67fda2299bac282a5b260f3537cd06145b1c5b992e SHA512 090705c90051fdbf53310293fbb2e06bd2c2144cf83d3d02528768303c70871bd8b3a3d236705e29f8a9fc3132ca94bcb3375fe8834529a684b10b7c879faff0
diff --git a/dev-python/executing/executing-1.1.0.ebuild b/dev-python/executing/executing-1.1.0.ebuild
new file mode 100644
index 000000000000..035ca173df7b
--- /dev/null
+++ b/dev-python/executing/executing-1.1.0.ebuild
@@ -0,0 +1,43 @@
+# 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_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Get information about what a Python frame is currently doing"
+HOMEPAGE="
+	https://github.com/alexmojaki/executing/
+	https://pypi.org/project/executing/
+"
+SRC_URI="
+	https://github.com/alexmojaki/executing/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# asttokens is optional runtime dep
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/littleutils[${PYTHON_USEDEP}]
+		dev-python/rich[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	# this test explodes when collected by pytest
+	"${EPYTHON}" tests/test_main.py || die "Tests failed with ${EPYTHON}"
+	epytest tests/test_pytest.py
+}
diff --git a/dev-python/flit_scm/flit_scm-1.7.0.ebuild b/dev-python/flit_scm/flit_scm-1.7.0.ebuild
index 6711e7c6f648..61b97fc8a168 100644
--- a/dev-python/flit_scm/flit_scm-1.7.0.ebuild
+++ b/dev-python/flit_scm/flit_scm-1.7.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/flit_core-3.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 139a12ca7480..fe2cc097252e 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,4 +1,3 @@
-DIST google-api-python-client-2.57.0.gh.tar.gz 33298709 BLAKE2B 6c50bdcfc38180ece5f8202b0f3adcfc446cc0b057122aee7f706401248b7d860d9227c444b26faea49de5e4147010765edc5e54271907f6490e6f0d9fe0ac1e SHA512 f96c40b21f4191e5a06a4068b65c952d9d2bef3849a6aa821232c60dfc8b6c6598606b596c750cc87928871367cbbcb24af46b5626d602915ccf7a7f316988ba
 DIST google-api-python-client-2.58.0.gh.tar.gz 33498127 BLAKE2B c00ecad1e863e5abb92cfbbbf57778b63ceaf73ae4cfb00ddf4fd0ed31656a28e475b91a02c03a6231790c2f3ab3e3243d131a97ed0f51151946568f5b56e18c SHA512 00c1606fadb46a6f4f60939135e9fd2840b267cd962630e4cd2d123588e9bdc8c0ed397d9e038ae91a2f31b732eb7698476fc1cf2322771b5720c11a97321b00
 DIST google-api-python-client-2.60.0.gh.tar.gz 33586321 BLAKE2B 01bb4dcf8a9b90a65c4e58ded91a7c03c525c15d29dc5b63011e1d1b8281ea68c04526af29d7853f4b7e16681c2482970f3b95faa190522ddf2f0ad3dd4e5e50 SHA512 7cae2e66ae7a41d25e551a5e9b14757d62c0212fe18640b4c1b8f51ff9e0150cfb9a2492de67530c7d24d6d09231d365520c3c06ffb342ba4a68a1a07b69b27d
 DIST google-api-python-client-2.62.0.gh.tar.gz 34525876 BLAKE2B 0f2bcd7588a6635511d3851f0a0881761d9cf905a83b406aaa824ef1ac86a3f9af9df2f90193b30852028b804fd30d8aa6214a5be83e26401a626ce3156e884f SHA512 4348bce74db02f74bd386d0276de2e2ec0126e7c1b79bea962056612f868d2b2306c51663ca293672db750460bd3722a66fb22139d14f30adcd3e0d455a2118a
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.57.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.57.0.ebuild
deleted file mode 100644
index 07bbe9ded836..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.57.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-SRC_URI="
-	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	epytest tests
-}
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index e240b2dcad84..390f4d088b36 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,2 +1 @@
-DIST greenlet-1.1.2.tar.gz 91224 BLAKE2B 1430f96acfba3c184b9ac0f51acde7c48aa5d2e648a155cadf16399c878f527a4bafcb547d2b28835095ba2fd21c33096ee6fb51ce5feda0a8c5915be521b32a SHA512 e7bcc1bfffc80fcaee735ee69f6f53e8f68bd4d3ab8ad6ed813684ffad72340a347e4810f18cc32d9c3948b5c995aefc3a53ce4ae60324093dae12042d33183b
 DIST greenlet-1.1.3.tar.gz 91624 BLAKE2B 88ba03f7a5acc7de2ab757a04667de9774ec8979b0f3d45131f8174a4ea9a608e359e4d8ce2f7e57c58ce4844e58a082d35d983fd583fc6f53ffa38363fb7863 SHA512 9ece4a4e758de963c96c7cbd33aec33fa11ddd3d46b8dc4194e14d534f8f68787df551cb1e3be57fc8a65fbd8d5daf8fee59567927f6f272535dd7c720baa4f4
diff --git a/dev-python/greenlet/greenlet-1.1.2-r1.ebuild b/dev-python/greenlet/greenlet-1.1.2-r1.ebuild
deleted file mode 100644
index e2c0a7e36def..000000000000
--- a/dev-python/greenlet/greenlet-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-# Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Lightweight in-process concurrent programming"
-HOMEPAGE="
-	https://greenlet.readthedocs.io/en/latest/
-	https://github.com/python-greenlet/greenlet/
-	https://pypi.org/project/greenlet/
-"
-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 ~x64-macos"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.11.patch"
-)
-
-distutils_enable_sphinx docs
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest greenlet.tests
-}
diff --git a/dev-python/guidata/guidata-2.3.0.ebuild b/dev-python/guidata/guidata-2.3.0.ebuild
index e3bec789e87f..6d252c5550f7 100644
--- a/dev-python/guidata/guidata-2.3.0.ebuild
+++ b/dev-python/guidata/guidata-2.3.0.ebuild
@@ -25,4 +25,3 @@ RDEPEND="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
-
diff --git a/dev-python/h11/Manifest b/dev-python/h11/Manifest
index eb8286a51cd4..7ab504667b28 100644
--- a/dev-python/h11/Manifest
+++ b/dev-python/h11/Manifest
@@ -1 +1,2 @@
 DIST h11-0.13.0.tar.gz 100165 BLAKE2B 6cb610afa474f5945151300e6ec6c2860e8b959b9ab0224b58fb047f3fa0b417499adb0119b7b7727b9ebfb4b60360fef78843fde41935616784bbf450605503 SHA512 c3a16dd66287ab6491b664aab9d72e14f1e61950c19182d60e195b81b2857e47157c38137b2ee2a9cd35d9d54997f554f768a3933051030895ddf7bc5b813e02
+DIST h11-0.14.0.tar.gz 100418 BLAKE2B 09f0dfe4e1d3d117f772ec914cddb4af5c09f07269e0b148f78d95b3b177cb9c69f6406c518ec0ad81ef960c199749317141e50c38cdeee0faf24e1f9333ab27 SHA512 6146f6441ce62ea46d824a86c1687401224ea6084ca2703b9c841dce51cdfb5de49b39a4f4a7e95efae40ed83012ea4a8641700281f728c2f580a90ce42d82a5
diff --git a/dev-python/wsproto/wsproto-1.1.0.ebuild b/dev-python/h11/h11-0.14.0.ebuild
index 9c457997b5b7..de22b6986474 100644
--- a/dev-python/wsproto/wsproto-1.1.0.ebuild
+++ b/dev-python/h11/h11-0.14.0.ebuild
@@ -8,19 +8,16 @@ PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 
 inherit distutils-r1
 
-DESCRIPTION="WebSockets state-machine based protocol implementation"
+DESCRIPTION="A pure-Python implementation of HTTP/1.1 inspired by hyper-h2"
 HOMEPAGE="
-	https://github.com/python-hyper/wsproto/
-	https://pypi.org/project/wsproto/
+	https://h11.readthedocs.io/en/latest/
+	https://github.com/python-hyper/h11/
+	https://pypi.org/project/h11/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/h11-0.9[${PYTHON_USEDEP}]
-"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-22.7.0.ebuild b/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-22.7.0.ebuild
index 14cd9f8946a3..265ce1eed87e 100644
--- a/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-22.7.0.ebuild
+++ b/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-22.7.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/hatchling[${PYTHON_USEDEP}]
diff --git a/dev-python/httpretty/httpretty-1.1.4-r1.ebuild b/dev-python/httpretty/httpretty-1.1.4-r1.ebuild
index 175b6fc57052..4334512cd1bb 100644
--- a/dev-python/httpretty/httpretty-1.1.4-r1.ebuild
+++ b/dev-python/httpretty/httpretty-1.1.4-r1.ebuild
@@ -27,7 +27,7 @@ BDEPEND="
 		dev-python/freezegun[${PYTHON_USEDEP}]
 		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
 		dev-python/sure[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
+		>=dev-python/tornado-2.2[${PYTHON_USEDEP}]
 	)
 "
 # These are optional test deps, that are used to test compatibility
diff --git a/dev-python/hunter/hunter-3.4.3-r1.ebuild b/dev-python/hunter/hunter-3.4.3-r1.ebuild
index 102576572771..ddeed35576ad 100644
--- a/dev-python/hunter/hunter-3.4.3-r1.ebuild
+++ b/dev-python/hunter/hunter-3.4.3-r1.ebuild
@@ -53,7 +53,7 @@ distutils_enable_sphinx docs ">=dev-python/sphinx-py3doc-enhanced-theme-2.3.2"
 
 src_unpack() {
 	default
-	cp -a ${S} tests_package || die
+	cp -a "${S}" tests_package || die
 	mv -f tests_package/tests/setup.py tests_package || die
 }
 
diff --git a/dev-python/hypothesis/hypothesis-6.54.6.ebuild b/dev-python/hypothesis/hypothesis-6.54.6.ebuild
index ec7bfe874360..c89124eae10e 100644
--- a/dev-python/hypothesis/hypothesis-6.54.6.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.54.6.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}/hypothesis-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/ipykernel/ipykernel-6.15.1.ebuild b/dev-python/ipykernel/ipykernel-6.15.1.ebuild
index e842fdcf7812..7819c2c715e1 100644
--- a/dev-python/ipykernel/ipykernel-6.15.1.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.15.1.ebuild
@@ -26,8 +26,8 @@ RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
 "
 # RDEPEND seems specifically needed in BDEPEND, at least jupyter
 # bug #816486
diff --git a/dev-python/ipykernel/ipykernel-6.15.2.ebuild b/dev-python/ipykernel/ipykernel-6.15.2.ebuild
index cd7c7110072c..b80c06ea1818 100644
--- a/dev-python/ipykernel/ipykernel-6.15.2.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.15.2.ebuild
@@ -26,8 +26,8 @@ RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
 "
 # RDEPEND seems specifically needed in BDEPEND, at least jupyter
 # bug #816486
diff --git a/dev-python/ipykernel/ipykernel-6.15.3.ebuild b/dev-python/ipykernel/ipykernel-6.15.3.ebuild
index cd7c7110072c..b80c06ea1818 100644
--- a/dev-python/ipykernel/ipykernel-6.15.3.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.15.3.ebuild
@@ -26,8 +26,8 @@ RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
 "
 # RDEPEND seems specifically needed in BDEPEND, at least jupyter
 # bug #816486
diff --git a/dev-python/ipyparallel/ipyparallel-8.4.1.ebuild b/dev-python/ipyparallel/ipyparallel-8.4.1.ebuild
index ab24f7025689..925942467495 100644
--- a/dev-python/ipyparallel/ipyparallel-8.4.1.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-8.4.1.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	dev-python/psutil[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
 	dev-python/tqdm[${PYTHON_USEDEP}]
-	>=www-servers/tornado-5.1[${PYTHON_USEDEP}]
+	>=dev-python/tornado-5.1[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	dev-python/flit_core[${PYTHON_USEDEP}]
diff --git a/dev-python/ipython/metadata.xml b/dev-python/ipython/metadata.xml
index b0d8a90eb1a0..6519ba3f0a35 100644
--- a/dev-python/ipython/metadata.xml
+++ b/dev-python/ipython/metadata.xml
@@ -46,7 +46,7 @@
  </upstream>
  <use>
   <flag name="matplotlib">Add support for <pkg>dev-python/matplotlib</pkg></flag>
-  <flag name="notebook">Install requirements for the web notebook based on <pkg>www-servers/tornado</pkg></flag>
+  <flag name="notebook">Install requirements for the web notebook based on <pkg>dev-python/tornado</pkg></flag>
   <flag name="nbconvert">Enable support for converting notebooks to various formats using <pkg>app-text/pandoc</pkg></flag>
  </use>
  <origin>gentoo-staging</origin>
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.4.0.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.4.0.ebuild
index 0611f287797c..ce04a9ee3512 100644
--- a/dev-python/jaraco-envs/jaraco-envs-2.4.0.ebuild
+++ b/dev-python/jaraco-envs/jaraco-envs-2.4.0.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
-	dev-python/path-py[${PYTHON_USEDEP}]
+	dev-python/path[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jarowinkler/Manifest b/dev-python/jarowinkler/Manifest
index 9a21bec9dae1..f83a2d36bf17 100644
--- a/dev-python/jarowinkler/Manifest
+++ b/dev-python/jarowinkler/Manifest
@@ -1 +1,2 @@
 DIST jarowinkler-1.2.1.tar.gz 85696 BLAKE2B 4e9c4dd4160a80fa600ae57c7cc97abd794bb0a49881137ed3f69c03549268bbf71dc410b86f8bd782b92df4eac63738ebd32dd716d682a0ce8aaaf039a38f61 SHA512 1337a5f67e54a0c0990dde7fc631c263b63c64c7dbefae82579842a639a85ea7214185489d56b6e2be5a6362773fbaea29a958f62dbfa270beefba516c325654
+DIST jarowinkler-1.2.2.tar.gz 85899 BLAKE2B f070be3b6fe69159c63cb37261bb8e837fc5f621b438405cd29de8f037f1848d0e27175c47a27a12895ca7ccf66681ed1ebc67c1f81d59e101c5acb1e665bcf6 SHA512 956eed36d4cdf36aefd1ca8ffedf61fdcf2567adbf3752ef3c7b3605c8851b97777132654ec14bb2ff66a4b737d2fa8bb1b81779a282d40cf5cf64980a8a6fde
diff --git a/dev-python/jarowinkler/jarowinkler-1.2.2.ebuild b/dev-python/jarowinkler/jarowinkler-1.2.2.ebuild
new file mode 100644
index 000000000000..671a4fb6e8da
--- /dev/null
+++ b/dev-python/jarowinkler/jarowinkler-1.2.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# custom wrapper over setuptools
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast fuzzy string matching using Jaro and Jaro-Winkler similarity"
+HOMEPAGE="
+	https://github.com/maxbachmann/JaroWinkler/
+	https://pypi.org/project/jarowinkler/
+"
+SRC_URI="
+	mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-cpp/jarowinkler-cpp
+"
+BDEPEND="
+	dev-python/rapidfuzz_capi[${PYTHON_USEDEP}]
+	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export JAROWINKLER_BUILD_EXTENSION=1
diff --git a/dev-python/jsonschema/jsonschema-4.16.0.ebuild b/dev-python/jsonschema/jsonschema-4.16.0.ebuild
index f2556f433bab..72844b6519c6 100644
--- a/dev-python/jsonschema/jsonschema-4.16.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.16.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_client/jupyter_client-7.3.4.ebuild b/dev-python/jupyter_client/jupyter_client-7.3.4.ebuild
index ee2c63a4e01a..60fb1733c0a8 100644
--- a/dev-python/jupyter_client/jupyter_client-7.3.4.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-7.3.4.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/nest_asyncio-1.5.4[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-23.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
 	dev-python/traitlets[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/jupyter_client/jupyter_client-7.3.5.ebuild b/dev-python/jupyter_client/jupyter_client-7.3.5.ebuild
index ee2c63a4e01a..60fb1733c0a8 100644
--- a/dev-python/jupyter_client/jupyter_client-7.3.5.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-7.3.5.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/nest_asyncio-1.5.4[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-23.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
 	dev-python/traitlets[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/jupyter_server/jupyter_server-1.18.1.ebuild b/dev-python/jupyter_server/jupyter_server-1.18.1.ebuild
index 0a0824403a7e..a2345464f201 100644
--- a/dev-python/jupyter_server/jupyter_server-1.18.1.ebuild
+++ b/dev-python/jupyter_server/jupyter_server-1.18.1.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
 	dev-python/send2trash[${PYTHON_USEDEP}]
 	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.1[${PYTHON_USEDEP}]
 	dev-python/websocket-client[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/jupyterlab/jupyterlab-3.4.3.ebuild b/dev-python/jupyterlab/jupyterlab-3.4.3.ebuild
index b3212c3c1ac8..575f4c3f402c 100644
--- a/dev-python/jupyterlab/jupyterlab-3.4.3.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.4.3.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	>=dev-python/jupyter_server-1.16[${PYTHON_USEDEP}]
 	>=dev-python/nbclassic-0.2[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
 	net-libs/nodejs
 "
 
diff --git a/dev-python/jupyterlab/jupyterlab-3.4.5.ebuild b/dev-python/jupyterlab/jupyterlab-3.4.5.ebuild
index 0a4477b93c99..9333d8216b05 100644
--- a/dev-python/jupyterlab/jupyterlab-3.4.5.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.4.5.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=dev-python/nbclassic-0.2[${PYTHON_USEDEP}]
 	<dev-python/notebook-7[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
 	net-libs/nodejs
 "
 
diff --git a/dev-python/jupyterlab/jupyterlab-3.4.7.ebuild b/dev-python/jupyterlab/jupyterlab-3.4.7.ebuild
index 910a79e94d73..75d6cdb3f083 100644
--- a/dev-python/jupyterlab/jupyterlab-3.4.7.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.4.7.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=dev-python/nbclassic-0.2[${PYTHON_USEDEP}]
 	<dev-python/notebook-7[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
 	dev-python/tomli[${PYTHON_USEDEP}]
 	net-libs/nodejs
 "
diff --git a/dev-python/keyrings-alt/Manifest b/dev-python/keyrings-alt/Manifest
index 893bfa4be88f..15929005b4e3 100644
--- a/dev-python/keyrings-alt/Manifest
+++ b/dev-python/keyrings-alt/Manifest
@@ -1 +1 @@
-DIST keyrings-alt-4.1.2.gh.tar.gz 26661 BLAKE2B 14d0f0647441dbf74c7378c7546becbc800dc0b1693b5569261283c355dd41d3afcbb600e559b3c921395e13382dcef5de23a8b60bdf0f2db7b71902fbba5fe8 SHA512 a4c46f8a61bef65c6962ca78d0176a937a8267cdd10d9195b1d313fd4a6653cf3b736c0fcfe8cd40d73e6e69c1ff23a1e6550624cbdf5a8a94a299ce597aa61d
+DIST keyrings.alt-4.2.0.gh.tar.gz 27017 BLAKE2B 736c3de24f54340c7f0c1e8e2b5eb453211fa2a786ec8ac98f9ae959d6f8f661b6d572f06cd362550d0a72bc7e3fbd44746d192e670ab61f7964d4f614aab870 SHA512 395b5a53cb05f3bc96aaf0a2dd826b185902d1ef03f9603f4731bf334938cfd36c7430e41ed7f6c574d54c56ed6a77e1160c741b02877cd3c1169ae1ca86f437
diff --git a/dev-python/keyrings-alt/keyrings-alt-4.1.2.ebuild b/dev-python/keyrings-alt/keyrings-alt-4.1.2.ebuild
deleted file mode 100644
index 7f80892286a5..000000000000
--- a/dev-python/keyrings-alt/keyrings-alt-4.1.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-DESCRIPTION="Alternate keyring backend implementations for use with the keyring package"
-HOMEPAGE="
-	https://github.com/jaraco/keyrings.alt
-	https://pypi.org/project/keyrings.alt/
-"
-SRC_URI="https://github.com/jaraco/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-# dev-python/jaraco-packaging removed, cannot build docs
-
-pkg_setup() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/keyrings-alt/keyrings-alt-4.2.0.ebuild b/dev-python/keyrings-alt/keyrings-alt-4.2.0.ebuild
new file mode 100644
index 000000000000..c637e2d2955c
--- /dev/null
+++ b/dev-python/keyrings-alt/keyrings-alt-4.2.0.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_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+MY_P="${P/-/.}"
+DESCRIPTION="Alternate keyring implementations"
+HOMEPAGE="
+	https://github.com/jaraco/keyrings.alt/
+	https://pypi.org/project/keyrings.alt/
+"
+SRC_URI="
+	https://github.com/jaraco/keyrings.alt/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	!dev-python/keyrings_alt
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/keyring[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+src_prepare() {
+	# oldschool namespaces
+	rm keyrings/__init__.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest -k 'not Cryptodome'
+}
diff --git a/dev-python/keyrings-alt/metadata.xml b/dev-python/keyrings-alt/metadata.xml
index 311e10197831..ea8988e8af6a 100644
--- a/dev-python/keyrings-alt/metadata.xml
+++ b/dev-python/keyrings-alt/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>ceamac.paragon@gmail.com</email>
-  <description>Primary maintainer</description>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
  </maintainer>
  
- <origin>gentoo-guru-overlay</origin>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/libcst/libcst-0.4.3_p20220607.ebuild b/dev-python/libcst/libcst-0.4.3_p20220607.ebuild
index 51ca178b5e1b..ec843423d5fd 100644
--- a/dev-python/libcst/libcst-0.4.3_p20220607.ebuild
+++ b/dev-python/libcst/libcst-0.4.3_p20220607.ebuild
@@ -114,7 +114,7 @@ MY_PN="LibCST"
 
 inherit cargo distutils-r1
 
-DESCRIPTION="A concrete syntax tree parser and serializer library for Python that preserves many aspects of Python's abstract syntax tree"
+DESCRIPTION="Concrete syntax tree parser and serializer for Python"
 HOMEPAGE="https://github.com/Instagram/LibCST"
 SRC_URI="
 	https://github.com/Instagram/LibCST/archive/${MY_REV}.tar.gz -> ${P}.tar.gz
diff --git a/dev-python/linkify-it-py/linkify-it-py-2.0.0.ebuild b/dev-python/linkify-it-py/linkify-it-py-2.0.0.ebuild
index 28da7e615791..9d7c56a54bf1 100644
--- a/dev-python/linkify-it-py/linkify-it-py-2.0.0.ebuild
+++ b/dev-python/linkify-it-py/linkify-it-py-2.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/uc-micro-py[${PYTHON_USEDEP}]
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 4d1bc3f24027..04542f02bf03 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -3,4 +3,5 @@ DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf
 DIST llvm-project-15.0.1.src.tar.xz 112068688 BLAKE2B 8fd6690445f7cbc8b47a7c1dd1f2c4fbc39f9a97f9d4a0015d466726454b090b0d1ff9b0d926eba7065e84782901687f74e6540a36dc6656a93f3c92c7bc7e06 SHA512 cef84bc173118a30db3ece5e5c6f874bf689c77afc40a4792fdcb7556555ac14a8e6de1dc811755405e5d162d63bc69abaecba30d220a42765160d69f0073fda
 DIST llvm-project-15.0.1.src.tar.xz.sig 438 BLAKE2B d8f634adab531bb19178fb27bc83b3a90c856e9402dd5af700f9af43813f68d20c21b9112dd95e9f6f10609ee51ed5aaf77edb96ca16fb93136b8aea432affd3 SHA512 cbf2570840d8dc12f6436c495a23cf9d439ee195755c01a6d1d5bcc20133599dc956dc43a0f5016698e3c9a960826f5f3c2840a73f993467e275856a67999fda
 DIST llvm-project-303526ef3aa211c1930be2885deae15eeeda3b18.tar.gz 167503164 BLAKE2B 143c72c58517b3e40ee74c1a0df47bfd0d0f9e71926bc8c39a007e674a08df95d0ffe05f523f97e4409b248349e13719cabbc7ac6938feebe702959e84a07243 SHA512 9aa5c86de6c6be1d26c085eb29ea283429e41330e937e5fdbd545bb3f5b996ac82cd6268701fcbbd202e89ee35f2b67e595fc595bb7383778e9ad5fd52ca10a0
+DIST llvm-project-4f188ef89ce5a3bee21fd0b4e8fcdf7f030f64b2.tar.gz 168720595 BLAKE2B 10bd3ac4eea674fc171f17414f6892a681529b020a5d513e075920f7792fb31d6d4a3584679ebea24bc839c2a233459b935d368c7ea57c94ad27c7c81da05cff SHA512 77ae7eb57c8c50affb516581dabe3b31e342f7ed899440521b6738aeec3b6e795c50c078bbe0f483a070961c9b5b73a7bbe28e2f109e2ce69d238ddbda8e134f
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
diff --git a/dev-python/lit/lit-15.0.1.9999.ebuild b/dev-python/lit/lit-15.0.2.9999.ebuild
index 804d31b11189..804d31b11189 100644
--- a/dev-python/lit/lit-15.0.1.9999.ebuild
+++ b/dev-python/lit/lit-15.0.2.9999.ebuild
diff --git a/dev-python/lit/lit-16.0.0_pre20220926.ebuild b/dev-python/lit/lit-16.0.0_pre20220926.ebuild
new file mode 100644
index 000000000000..804d31b11189
--- /dev/null
+++ b/dev-python/lit/lit-16.0.0_pre20220926.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm
+	)
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/livereload/livereload-2.6.3.ebuild b/dev-python/livereload/livereload-2.6.3.ebuild
index 160478136ffb..978624011806 100644
--- a/dev-python/livereload/livereload-2.6.3.ebuild
+++ b/dev-python/livereload/livereload-2.6.3.ebuild
@@ -20,7 +20,7 @@ IUSE="examples"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/markdown-it-py/markdown-it-py-2.1.0-r2.ebuild b/dev-python/markdown-it-py/markdown-it-py-2.1.0-r2.ebuild
index fb7910c674a9..093fb0e14331 100644
--- a/dev-python/markdown-it-py/markdown-it-py-2.1.0-r2.ebuild
+++ b/dev-python/markdown-it-py/markdown-it-py-2.1.0-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/linkify-it-py[${PYTHON_USEDEP}]
diff --git a/dev-python/markdown2/Manifest b/dev-python/markdown2/Manifest
index 6a2ef23abf71..a0a1f6484ba4 100644
--- a/dev-python/markdown2/Manifest
+++ b/dev-python/markdown2/Manifest
@@ -1 +1,2 @@
 DIST markdown2-2.4.3.tar.gz 102973 BLAKE2B 7a856a9d0bd539e3de1e358aa7d4968aca62b67a30dc64a905633040a6a525b2ac1ec0d4cd7d8d4ed9b38e68e5df3f187cf0f56e1816a4ec10efe4e849356580 SHA512 b5eb5cb6ac52878a224aa6b4642ade86593de5340594271940b3ef25809a9e37b9b3cbb04f4fa9880a50a4fee8ed85c1c6d76b19065b0fd703363faf4d812679
+DIST markdown2-2.4.5.tar.gz 109389 BLAKE2B 52ef708f0b6df4d948f909b08a94c584738a34fdfc2c063713eead5b3ab9e657468ad2c112951f3296e167efe52c183997f5102a2dbcef15477de064b16bd89e SHA512 55ff010691110c2f79844031b0d4d7c6982c92dc75a1820e8659be02deeda868aca15931c1060795096e3228e6d451d247addc090f1d4939444331d37d5891c2
diff --git a/dev-python/markdown2/markdown2-2.4.5.ebuild b/dev-python/markdown2/markdown2-2.4.5.ebuild
new file mode 100644
index 000000000000..8b6ed7d72ca2
--- /dev/null
+++ b/dev-python/markdown2/markdown2-2.4.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Markdown language reimplementation"
+HOMEPAGE="
+	https://github.com/trentm/python-markdown2/
+	https://pypi.org/project/markdown2/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/pygments-2.7.3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	cd test || die
+	"${EPYTHON}" -m unittest test_markdown2.py -v ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild b/dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild
index d0ab54c74576..6141d34f1267 100644
--- a/dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild
@@ -69,7 +69,7 @@ RDEPEND="
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	)
 	webagg? (
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
 	)
 	wxwidgets? (
 		dev-python/wxpython:*[${PYTHON_USEDEP}]
@@ -102,7 +102,7 @@ BDEPEND="
 		dev-python/flaky[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
 		x11-libs/gtk+:3[introspection]
 	)
 "
diff --git a/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild b/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild
index 024e7a9fb0ff..3a5995245ce2 100644
--- a/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild
@@ -77,7 +77,7 @@ RDEPEND="
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	)
 	webagg? (
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
 	)
 	wxwidgets? (
 		$(python_gen_cond_dep '
@@ -113,7 +113,7 @@ BDEPEND="
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
 		x11-libs/gtk+:3[introspection]
 	)
 "
diff --git a/dev-python/matplotlib/matplotlib-3.5.3.ebuild b/dev-python/matplotlib/matplotlib-3.5.3.ebuild
index 9e44f3ce0547..4f443c082d72 100644
--- a/dev-python/matplotlib/matplotlib-3.5.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.5.3.ebuild
@@ -77,7 +77,7 @@ RDEPEND="
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	)
 	webagg? (
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
 	)
 	wxwidgets? (
 		$(python_gen_cond_dep '
@@ -113,7 +113,7 @@ BDEPEND="
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
 		x11-libs/gtk+:3[introspection]
 	)
 "
diff --git a/dev-python/matplotlib/matplotlib-3.6.0.ebuild b/dev-python/matplotlib/matplotlib-3.6.0.ebuild
index 2aeafd9a2081..0135e91c30af 100644
--- a/dev-python/matplotlib/matplotlib-3.6.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.6.0.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~hppa"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
@@ -78,7 +78,7 @@ RDEPEND="
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	)
 	webagg? (
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
 	)
 	wxwidgets? (
 		$(python_gen_cond_dep '
@@ -114,7 +114,7 @@ BDEPEND="
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
 		x11-libs/gtk+:3[introspection]
 	)
 "
diff --git a/dev-python/matplotlib/metadata.xml b/dev-python/matplotlib/metadata.xml
index 520d81506c32..34e7c44ba3dc 100644
--- a/dev-python/matplotlib/metadata.xml
+++ b/dev-python/matplotlib/metadata.xml
@@ -19,7 +19,7 @@
  <use>
   <flag name="excel">Pull <pkg>dev-python/xlwt</pkg> for the exceltools toolkit</flag>
   <flag name="gtk3">Enable <pkg>x11-libs/gtk+</pkg>:3 support</flag>
-  <flag name="webagg">Enable webagg backend that uses <pkg>www-servers/tornado</pkg></flag>
+  <flag name="webagg">Enable webagg backend that uses <pkg>dev-python/tornado</pkg></flag>
  </use>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/mkdocs-redirects/Manifest b/dev-python/mkdocs-redirects/Manifest
index 1e95435c2015..53b029566b98 100644
--- a/dev-python/mkdocs-redirects/Manifest
+++ b/dev-python/mkdocs-redirects/Manifest
@@ -1,3 +1,2 @@
-DIST mkdocs-redirects-1.0.5.gh.tar.gz 6624 BLAKE2B 2f974dcf2dc438d3d8e2289793150b0a5a0394027552a8f3878f83fc0ab78b0e1c38f29bcd155adccf40e5259e93e81b419741784584f924f5eb18a0059f3107 SHA512 3365f19792438262528236cb9531f12ef31bf368d849387855a58b6427cbe7be6b55292fe5174804f42b29acf0a921ce9987e8b3a7ed3870444fcf94d4a52df6
 DIST mkdocs-redirects-1.1.0.gh.tar.gz 7000 BLAKE2B 7bb98549613926fd7ff3fd9ddf6469703589bb38051358baffc2989bc496df38b270f859f9f40a21d688a7a453d0a4d1532af339d4e43d1144324729ab84824f SHA512 4ccda56bc26fd005ed0a1b0651c65883ad1f87912fc1c61fa9089a0e84bf1d124e943d1fae6f5bac4a521676419dcd8d409524926334f2ea5ae8b0d2f2d4ee52
 DIST mkdocs-redirects-1.2.0.gh.tar.gz 7434 BLAKE2B cba7252865135c66ca467473e5c373b1779131dc0fdea47092d97d97d4222e6e9b38f9b312f0341af90b8a05a24c3c33250b060c2b3029d49dc970da0b2fc48e SHA512 e26260277f56005d8fab3a7e6d05187796356909d7ab4f8d6cd6edd535b0ee944e49faf5b6366269bfface1a855f399e3d95275a5f0967134f6c8e1256bef220
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.5.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.5.ebuild
deleted file mode 100644
index 1cb0ec97687a..000000000000
--- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Plugin for Mkdocs page redirects"
-HOMEPAGE="
-	https://github.com/mkdocs/mkdocs-redirects
-	https://pypi.org/project/mkdocs-redirects/
-"
-SRC_URI="
-	https://github.com/mkdocs/mkdocs-redirects/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
-	<dev-python/mkdocs-2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/twine[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/nbconvert/nbconvert-6.5.0-r1.ebuild b/dev-python/nbconvert/nbconvert-6.5.0-r1.ebuild
index 172fd91843fe..4bf7f0c34769 100644
--- a/dev-python/nbconvert/nbconvert-6.5.0-r1.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.5.0-r1.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
 	dev-python/pygments[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
 	dev-python/testpath[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/nbconvert/nbconvert-6.5.0-r2.ebuild b/dev-python/nbconvert/nbconvert-6.5.0-r2.ebuild
index 3227a8da7d4b..e11cc6c192e7 100644
--- a/dev-python/nbconvert/nbconvert-6.5.0-r2.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.5.0-r2.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 	dev-python/tinycss2[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
 	dev-python/testpath[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/nbconvert/nbconvert-6.5.2.ebuild b/dev-python/nbconvert/nbconvert-6.5.2.ebuild
index 8e1601668ec9..a33f58663cc4 100644
--- a/dev-python/nbconvert/nbconvert-6.5.2.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.5.2.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	dev-python/tinycss2[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
 	dev-python/testpath[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/nbconvert/nbconvert-6.5.3.ebuild b/dev-python/nbconvert/nbconvert-6.5.3.ebuild
index 8e1601668ec9..a33f58663cc4 100644
--- a/dev-python/nbconvert/nbconvert-6.5.3.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.5.3.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	dev-python/tinycss2[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
 	dev-python/testpath[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/nbdime/nbdime-3.1.1-r1.ebuild b/dev-python/nbdime/nbdime-3.1.1-r1.ebuild
index 4b84de3a93a4..c7ab7c5e277b 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r1.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
 	webtools? ( net-libs/nodejs[npm] )"
 BDEPEND="
 	test? (
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 2b05ed0e8c1a..bf5ad17a9e01 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,2 +1 @@
-DIST networkx-2.8.5.tar.gz 1955125 BLAKE2B a98eb678f2d3b336e5675ac34b59677ead3d706347feb0150f553b49cad0f1936a5abf179eaa496e32b8e9d59103022e5103d9e2d758aac2df781f031254c2fb SHA512 0a4d50da0eff0ee7d79941d27bf07b5425493b92f482b4f91bd91a930e4e9c5eb1d3832aee44919aa708fd1e2d0a53fe2d77ff33864a54d0e3167b4108545dec
 DIST networkx-2.8.6.tar.gz 1957238 BLAKE2B 70c5256440d94c1b0fa01f733ef46fc5da6846cf57891b344b6a82c27029b983827ecec9f1154d47771cff464b789bf84a9150111a0ecf1533ec83f1d41b718b SHA512 d56ab1a3007a914227f09969c9300b0582a640e5c3ad35b25400d8159ec35986a5e9bad5d7f86f1474b7293f495471fa3cd9f3b890a0d5287646338128d09d35
diff --git a/dev-python/networkx/networkx-2.8.5.ebuild b/dev-python/networkx/networkx-2.8.5.ebuild
deleted file mode 100644
index 7476f51f6282..000000000000
--- a/dev-python/networkx/networkx-2.8.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_FULLY_TESTED=( python3_{8..10} )
-# networkx skips tests w/ missing deps and the available ones all pass w/ py3.11
-PYTHON_COMPAT=( "${PYTHON_FULLY_TESTED[@]}" )
-inherit distutils-r1 optfeature multiprocessing virtualx
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="
-	https://networkx.org/
-	https://github.com/networkx/networkx/
-	https://pypi.org/project/networkx/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-BDEPEND="
-	test? (
-		>=dev-python/lxml-4.5[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
-			>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
-		' "${PYTHON_FULLY_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	# virtx implies nonfatal
-	nonfatal epytest -p no:django -n "$(makeopts_jobs)" || die
-}
-
-src_install() {
-	distutils-r1_src_install
-	# those examples use various assets and pre-compressed files
-	docompress -x /usr/share/doc/${PF}/examples
-}
-
-pkg_postinst() {
-	optfeature "recommended dependencies" "dev-python/matplotlib dev-python/numpy dev-python/pandas dev-python/scipy"
-	optfeature "graph drawing and graph layout algorithms" "dev-python/pygraphviz dev-python/pydot"
-	optfeature "YAML format reading and writing" "dev-python/pyyaml"
-	optfeature "shapefile format reading and writing" "dev-python/gdal"
-	optfeature "GraphML XML format" "dev-python/lxml"
-}
diff --git a/dev-python/notebook/notebook-6.4.12.ebuild b/dev-python/notebook/notebook-6.4.12.ebuild
index e8a97895cff2..01383a4216c4 100644
--- a/dev-python/notebook/notebook-6.4.12.ebuild
+++ b/dev-python/notebook/notebook-6.4.12.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	dev-python/argon2-cffi[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index ac1908adfd3b..adca8d49d531 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,3 +1,4 @@
 DIST Nuitka-1.0.6.tar.gz 3890331 BLAKE2B 4a8240123b61ff7c8ec274e6c318ade2b5057f56b0b766f1a555451f501a194c137696bd51dff23bdd125e1ffa3679f790e3ad50b9c15e85ba5358f56d47b34f SHA512 f431c976b28b80ad10cdbc27c8f0d3321aadace08a104d18089c38d00b80ee96fd3aa051dd50eb668ed57f6aca25e4f918f07d065df00627c139bc34afdcb52c
 DIST Nuitka-1.0.7.tar.gz 3891250 BLAKE2B 6f401de98bae91688d0ceab210d178fdb8d2cb32beeb7dd6925eee7985d0e344e41edcaddbdff8313402625d40dc7236433f52ca71f1100a1168775b9bc3da8b SHA512 29cb7377c976f59d8ea49aedd74798ee11b38b98b597611bd41bd5bef5c2473cd76bb260f764afd277edc4b5bfb8359b995a532ba4814f1d2310fa9c90d1467d
 DIST Nuitka-1.0.8.tar.gz 3890590 BLAKE2B 04257834d79f0988800a06d9b4725e9fa694bf7f9aafebbfb9ddbb09a2a5f666c02f13bf8ee56fd3360216faa31cd7b14a30d9a2daf23eef719ed568bfd3501c SHA512 824830121ca87b33aebcee074e0af52e456942190168186248a9ed62937bb044c6741ff721bd4bcd7d657cae96d573c1a6b9cb1fde6374073c12c1e1f6a6df26
+DIST Nuitka-1.1.tar.gz 3920532 BLAKE2B 0d6ff01815bbc9216b5e5157bcb849b5182d025fe16523efde2bd812ca90d0b8008ba0d55e20e40b41c81250c2a1d309f99adff6498a3466f4d546ce8a7dfbca SHA512 abf9a2f07751f963bb727bc6c1affca0be3f02e6d1ead0206979b00589de0571a8e8e4e6af08bbc8fa285b1e2cbc5971bb88b417aca73c8069da200f7cd04fe5
diff --git a/dev-python/nuitka/nuitka-1.1.ebuild b/dev-python/nuitka/nuitka-1.1.ebuild
new file mode 100644
index 000000000000..d0ee11a36016
--- /dev/null
+++ b/dev-python/nuitka/nuitka-1.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1 flag-o-matic optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="
+	https://www.nuitka.net/
+	https://github.com/Nuitka/Nuitka/
+	https://pypi.org/project/Nuitka/
+"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/scons[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	doman doc/nuitka3.1 doc/nuitka3-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/openapi-schema-validator/Manifest b/dev-python/openapi-schema-validator/Manifest
index 022baf2e9b0b..7318f1cb59e5 100644
--- a/dev-python/openapi-schema-validator/Manifest
+++ b/dev-python/openapi-schema-validator/Manifest
@@ -1,5 +1,3 @@
 DIST openapi-schema-validator-0.2.3.gh.tar.gz 25501 BLAKE2B d961cabca647f59d4d4188f1941ce5b2475e02520bcc10e7cd29817c8ea8ebaaac5af1ffb0e3d5079ed2d1493414cdaf55336744b142385754585e748af8ac98 SHA512 e6dfe3d6cc99fa9723102ced42040203157639be68b0438d7bfae4499e51cdb6257a36dca10425a5d5e692cebb958468ebeee722116b99d800a6fcf972400c66
-DIST openapi-schema-validator-0.3.0.gh.tar.gz 27083 BLAKE2B 288f5d18874625c69eccf9be6442258ff8af735795eac0ee0449e5976584b1af22c1ea771bb79b4fa68623e60d417b140737e0d1ee85791027393650f0c1f747 SHA512 003ea97a1cac598eb3728d96291d8be56c6ba9e2d3cd4f77c1258962f67b460a887f4473fed39587870583e13a83403623c3b2f96fa8d02345583cd3bdaf008b
 DIST openapi-schema-validator-0.3.1.gh.tar.gz 23232 BLAKE2B d02f9004d7baf96e76fb035e212efbdb773f1d7685c8b73107d887ad1cdf2496afd4232bd4fbb263597106b6a7e7d0eb7e6efbe64f422ca11ff228d5f2f51fdb SHA512 72564409e80c8dd8578ba2a363865623aa03b8b2324abd37bea31c503632a367bacf81d8de801579b80347906d2b24c14371c9b37b70176e0bf51ca8c6b9e071
-DIST openapi-schema-validator-0.3.3.gh.tar.gz 16389 BLAKE2B af700555fd3a21e85cd7205dc549c305c5830bf8b3d3e36f8755153a12e0e6cd8db08cd75350760608db4f38774f369b51b239e47bb7dc6352a7559bf39ef02b SHA512 a621573f7d840bd6e8eb096a820a5ebdf4a07f186f2babda2128b34c66bd8249262d017cdeddec61d9984947666b73cb23a7ac419afd5ae892c14b7b754db57b
 DIST openapi-schema-validator-0.3.4.gh.tar.gz 16593 BLAKE2B 17882dff25d1bed05efa74792930a357d82cb404bbf746a6f348e9813b4af86842da1523a8e3dfaec1426c82efff6b0bddbfca89c8569ba36a4324ab4e5a418b SHA512 714f93594c875a04194a6980dc5e092866609787e424ef480d42da93c114e3b658a5efef13f78ed3db35f6e7399d7dda8adbc1d3bb8606512aa4f135edeaeb75
diff --git a/dev-python/openapi-schema-validator/metadata.xml b/dev-python/openapi-schema-validator/metadata.xml
index 7ad11570cc7d..a0d4c5913ba0 100644
--- a/dev-python/openapi-schema-validator/metadata.xml
+++ b/dev-python/openapi-schema-validator/metadata.xml
@@ -6,4 +6,5 @@
  </maintainer>
  
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.0.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.0.ebuild
deleted file mode 100644
index f8f00f379703..000000000000
--- a/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenAPI schema validation for Python"
-HOMEPAGE="
-	https://github.com/p1c2u/openapi-schema-validator/
-	https://pypi.org/project/openapi-schema-validator/
-"
-SRC_URI="
-	https://github.com/p1c2u/openapi-schema-validator/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/isodate[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/--cov/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.3.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.3.ebuild
deleted file mode 100644
index 2c287cc8bd19..000000000000
--- a/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenAPI schema validation for Python"
-HOMEPAGE="
-	https://github.com/p1c2u/openapi-schema-validator/
-	https://pypi.org/project/openapi-schema-validator/
-"
-SRC_URI="
-	https://github.com/p1c2u/openapi-schema-validator/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/isodate[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/--cov/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index c446601bb661..2e5d836b5485 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,2 +1 @@
-DIST openstacksdk-0.100.0.tar.gz 1065692 BLAKE2B 7941cb9a14f10924953ad114f9bce4847b7e26bbea4622790503209ab70a01c254f2ec59d3f794f64d1ecc8f320a9a2be2db8015cccad8b20fe06dc1e72683d0 SHA512 c3e47510518bc4abac78aab654f6f8aa7c0deec3f4355ec7ea064ffa32c1862a9015806fd04cc1975c3d7e688e9c5ee66e3837baa21ae6c82db8f39b4b8f8330
 DIST openstacksdk-0.101.0.tar.gz 1072136 BLAKE2B f73103fd65bdf11340b765918bc226b2d681a9846cba11f0a8dbd5d97f300690f82c1846e10ebbab413900f4e4199aa81de9b6213d07bcbcc817233758ac78a9 SHA512 95580b7c53c901ef21280420c6b27dfac20341c12f5490e5c7611df3f8c3d309b5b967f8d574e6e2d939f5224b8785bb5e07fbb3941955530cfbbc8c0049b269
diff --git a/dev-python/openstacksdk/openstacksdk-0.100.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.100.0.ebuild
deleted file mode 100644
index da6f81d3f29e..000000000000
--- a/dev-python/openstacksdk/openstacksdk-0.100.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of libraries for building applications to work with OpenStack"
-HOMEPAGE="
-	https://opendev.org/openstack/openstacksdk/
-	https://github.com/openstack/openstacksdk/
-	https://pypi.org/project/openstacksdk/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Internet?
-	sed -e 's:test_create_dynamic_large_object:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# TODO
-	sed -e 's:test_generate_form:_&:' \
-		-e 's:test_create_static_large_object:_&:' \
-		-e 's:test_object_segment_retries:_&:' \
-		-e 's:test_object_segment_retry_failure:_&:' \
-		-e 's:test_slo_manifest_retry:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# unhappy about paths due to test runner
-	sed -e 's:test_method_not_supported:_&:' \
-		-i openstack/tests/unit/test_exceptions.py || die
-	sed -e 's:test_repr:_&:' \
-		-i openstack/tests/unit/test_resource.py || die
-
-	# requires hacking
-	rm openstack/tests/unit/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b openstack/tests/unit
-}
diff --git a/dev-python/opentracing/opentracing-2.4.0.ebuild b/dev-python/opentracing/opentracing-2.4.0.ebuild
index a8f25635406e..bbc559302ae6 100644
--- a/dev-python/opentracing/opentracing-2.4.0.ebuild
+++ b/dev-python/opentracing/opentracing-2.4.0.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 		dev-python/gevent[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/osc-lib/Manifest b/dev-python/osc-lib/Manifest
index 04d01c5050cf..7778a42a2a74 100644
--- a/dev-python/osc-lib/Manifest
+++ b/dev-python/osc-lib/Manifest
@@ -1,2 +1 @@
-DIST osc-lib-2.6.1.tar.gz 98508 BLAKE2B 26ca0229c174ac17e17a3b3075e5a225add8272fbf6c28fd1cda40acff5c34092bc37ed7e8f4004734c5509213b9a92915c15e9f37e8e032d99f30fb143b7505 SHA512 ed62fe45ed324d2fa672b4d0366df2db0462e6fa40820ee028540afe853e394293d60d72168d09313fd86f204a55784fce7c038ed906a9b2f8b587f4958f3391
 DIST osc-lib-2.6.2.tar.gz 98556 BLAKE2B 69973ad3543ff16cea81d4dc3f749f147c62daa3d40d048acd3b39706a9a7d53f11de50c096511fc42d15db9d983e1085996fea5781fd5d17ac1f50d34de0a83 SHA512 5e310265dc0d77908bbe82a479ce55462d91393d09cf39732434fc52a4bcefab0a945aa5ceafe5a2c76a9214704f89509a667a85cf6f35210db8a48c35e2642d
diff --git a/dev-python/osc-lib/osc-lib-2.6.1.ebuild b/dev-python/osc-lib/osc-lib-2.6.1.ebuild
deleted file mode 100644
index ebdb7eeddfd4..000000000000
--- a/dev-python/osc-lib/osc-lib-2.6.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A package of common support modules for writing OSC plugins"
-HOMEPAGE="
-	https://opendev.org/openstack/osc-lib/
-	https://github.com/openstack/osc-lib/
-	https://pypi.org/project/osc-lib/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cliff-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# need to skip all tests under TestTagHelps class
-	# checks exact help message, based on another unittest runner
-	sed -e '179,$s/test_add_tag_/_&/' -i osc_lib/tests/utils/test_tags.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index dca15ef7b1f7..f55c31701067 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,2 +1 @@
-DIST oslo.utils-6.0.0.tar.gz 101261 BLAKE2B 8a659b4bedf49e40c85ee40fe026205964d2f4a919170e4700c85e754f4bbffdf5bb9305aea00f7b36233feec93e42bf5e0c72591eeedc02709a7fcdba64d9b6 SHA512 9f9dcd585419372711af69917daf717d7c694cc604aed4db242e508ca6bdea3db9a52a29c354dbb5c80473a819c80dec9eccad7e6f6ca297c3469bcd2db5c7d5
 DIST oslo.utils-6.0.1.tar.gz 102652 BLAKE2B c4a636bf3b049150499566520067215a34a965f3998202a0d006d5ab83a8c20496ce265ad57327747770d3cb090c2f814ad67c9c27ed00e1bcc0e10fcfdca899 SHA512 f005b7910909182ef7bcf1ff80186d352f1cb2222d08c0f83fa391ee7ca9e57699e29a07027774a24af3b1b5f503222292b0ccf4cb88acf025bce5ebf47f61ac
diff --git a/dev-python/oslo-utils/oslo-utils-6.0.0-r1.ebuild b/dev-python/oslo-utils/oslo-utils-6.0.0-r1.ebuild
deleted file mode 100644
index d1788ce99ea3..000000000000
--- a/dev-python/oslo-utils/oslo-utils-6.0.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-		' python3_{8..9})
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_compile() {
-	distutils-r1_python_compile
-	if ! has "${EPYTHON}" python3.{8..9}; then
-		find "${BUILD_DIR}"/install -name '*eventletutils*' -delete || die
-	fi
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	eunittest
-}
diff --git a/dev-python/path-py/Manifest b/dev-python/path-py/Manifest
deleted file mode 100644
index 38cd6ccae0ad..000000000000
--- a/dev-python/path-py/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST path-16.4.0.tar.gz 48289 BLAKE2B 5ae3272ecc92689c18ffc612b8b11923225dcface88fa47dc4f42b0dc960034fa6a3c856a9521ed83c9507616577efc3d1c0a5119b0c5605ea6f6b758cfe6d2b SHA512 bb78119f929fe3b160646b06db8911e737060695ae89c28bcce84835213dfbaa12a34300b540be6b51e9462c5b378b235e1e72536524750ec910255399c513d3
diff --git a/dev-python/path/Manifest b/dev-python/path/Manifest
new file mode 100644
index 000000000000..956b5ef26485
--- /dev/null
+++ b/dev-python/path/Manifest
@@ -0,0 +1,2 @@
+DIST path-16.4.0.tar.gz 48289 BLAKE2B 5ae3272ecc92689c18ffc612b8b11923225dcface88fa47dc4f42b0dc960034fa6a3c856a9521ed83c9507616577efc3d1c0a5119b0c5605ea6f6b758cfe6d2b SHA512 bb78119f929fe3b160646b06db8911e737060695ae89c28bcce84835213dfbaa12a34300b540be6b51e9462c5b378b235e1e72536524750ec910255399c513d3
+DIST path-16.5.0.gh.tar.gz 44286 BLAKE2B 1d96b0003c562044c1c2ba5eba7a525d5503bd9a58ec1f9611d74e9d52581f646447d3d754809b49b4418c18de9fbfd5de34077fe9edb1c4b3d3fd49f9c2af19 SHA512 0b9b306b2b5cce1e51d65a7555e54770e19a3d4796dbaf2d617bbe8282c771e3d7975112e443462e9b43bafc533d6dc61bedb8608b0d93cc0d1febec995d1780
diff --git a/dev-python/path-py/metadata.xml b/dev-python/path/metadata.xml
index ea8988e8af6a..ea8988e8af6a 100644
--- a/dev-python/path-py/metadata.xml
+++ b/dev-python/path/metadata.xml
diff --git a/dev-python/path-py/path-py-16.4.0.ebuild b/dev-python/path/path-16.4.0.ebuild
index 07c72b38bf20..07c72b38bf20 100644
--- a/dev-python/path-py/path-py-16.4.0.ebuild
+++ b/dev-python/path/path-16.4.0.ebuild
diff --git a/dev-python/path/path-16.5.0.ebuild b/dev-python/path/path-16.5.0.ebuild
new file mode 100644
index 000000000000..fdfb5946443b
--- /dev/null
+++ b/dev-python/path/path-16.5.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A module wrapper for os.path"
+HOMEPAGE="
+	https://github.com/jaraco/path/
+	https://pypi.org/project/path/
+"
+SRC_URI="
+	https://github.com/jaraco/path/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# unreliable, not really meaningful for end users
+	test_path.py::TestPerformance
+)
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index d7d0dfa5ad8b..f9d877ecbdf5 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,3 +1,2 @@
-DIST peewee-3.15.1.gh.tar.gz 903784 BLAKE2B 2570f12089728dd56bbcdf8715b7874fe11bed4790b80780b5850445188305a98695cbaac2e7a9b1cd53d9ae601a6a1be796219386dfa07da45610013151062d SHA512 eabfa7ae532fc6d392c7c89844ac28533787dd1a8e08ba797d6f0c5f70b9e60d74e3ca98e1a1e71e66744a7b48a3544c228289d7ac415619bfd81da15d6cf0fc
 DIST peewee-3.15.2.gh.tar.gz 905707 BLAKE2B 7441586c8da5080a50964a4d8e5c73f28b8e1adeb45b4ced675c70f55cb3264460014dbab36f097fbacfc2fce8cf3f42ef36a6c1737a671ecd8bfede6af82c8e SHA512 6fa574161cdd224104bb428b9935574d3dc69ec574e5887ab68c7686d63af856787e3411e27703773c0e2f75f51915da569538662a908c225ace3c14c78892b9
 DIST peewee-3.15.3.gh.tar.gz 906883 BLAKE2B 4cc76b4288e8b8e36b4df2f42e31c8eeec314b2af28612d272699e6cc79d836fdc8800f18883e721fd98ca04bf58b0ed26ba61ab36280d28a32d1ca18ab6577c SHA512 bf297423178fca432add6e1ef2aba41ebd87d2bdc34e47872b5c35573dd9eedd42a290cad53dfce68e0bc0e07bb537064c25bf6b43b43d678302d6345eaa35a4
diff --git a/dev-python/peewee/peewee-3.15.1.ebuild b/dev-python/peewee/peewee-3.15.1.ebuild
deleted file mode 100644
index acc9186eb336..000000000000
--- a/dev-python/peewee/peewee-3.15.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Small Python ORM"
-HOMEPAGE="
-	https://github.com/coleifer/peewee/
-	https://pypi.org/project/peewee/
-"
-SRC_URI="
-	https://github.com/coleifer/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	"${EPYTHON}" runtests.py -v 2 || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && DOCS=( examples/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pickleshare/pickleshare-0.7.5.ebuild b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
index c83e0e26697b..979b0aea0ce5 100644
--- a/dev-python/pickleshare/pickleshare-0.7.5.ebuild
+++ b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
@@ -14,6 +14,6 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
-	>=dev-python/path-py-6.2[${PYTHON_USEDEP}]"
+	>=dev-python/path-6.2[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pika/pika-1.3.0.ebuild b/dev-python/pika/pika-1.3.0.ebuild
index cdd744ff4d01..2da222c8ce1b 100644
--- a/dev-python/pika/pika-1.3.0.ebuild
+++ b/dev-python/pika/pika-1.3.0.ebuild
@@ -28,7 +28,7 @@ BDEPEND="
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/nose2[${PYTHON_USEDEP}]
 		dev-python/twisted[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
 		net-misc/rabbitmq-server
 	)
 "
diff --git a/dev-python/pikepdf/pikepdf-6.0.2.ebuild b/dev-python/pikepdf/pikepdf-6.0.2.ebuild
index d92cf02988df..1bca3d00851d 100644
--- a/dev-python/pikepdf/pikepdf-6.0.2.ebuild
+++ b/dev-python/pikepdf/pikepdf-6.0.2.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DEPEND="
 	>=app-text/qpdf-11.0.0:0=
diff --git a/dev-python/pip-run/pip-run-8.8.1.ebuild b/dev-python/pip-run/pip-run-8.8.1.ebuild
index 7087719ea2e5..0f8883362f91 100644
--- a/dev-python/pip-run/pip-run-8.8.1.ebuild
+++ b/dev-python/pip-run/pip-run-8.8.1.ebuild
@@ -25,7 +25,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv
 RDEPEND="
 	dev-python/autocommand[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/path-py[${PYTHON_USEDEP}]
+	dev-python/path[${PYTHON_USEDEP}]
 	dev-python/pip[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/prawcore/prawcore-2.3.0.ebuild b/dev-python/prawcore/prawcore-2.3.0.ebuild
index 2f13ebbdef15..4655bd79a36d 100644
--- a/dev-python/prawcore/prawcore-2.3.0.ebuild
+++ b/dev-python/prawcore/prawcore-2.3.0.ebuild
@@ -14,13 +14,14 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
 
+RESTRICT="test"
+
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
 BDEPEND="test? (
 	<dev-python/betamax-0.9[${PYTHON_USEDEP}]
 	<dev-python/betamax-matchers-0.5[${PYTHON_USEDEP}]
 	<dev-python/betamax-serializers-0.3[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
-	<dev-python/testfixtures-7[${PYTHON_USEDEP}]
 )"
 
 DOCS=( {AUTHORS,CHANGES,README}.rst )
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index ea7f79125c0c..1d7121b0583e 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1,5 +1,2 @@
-DIST pydantic-1.10.0b1.gh.tar.gz 886824 BLAKE2B f5ae306cf27143723bc2cb87608cdef3eee29ea9e45cde3f61412820858e7b8ab290ba74329317ac916dddb6bd03d011205a1f0d8cd9ba266e4a8655f24b9b61 SHA512 6f962e2983bd13bcd79da06d1a663da8c2cae39b7f80184d70e61a23a55661fe79f3bc7d00656f4e14f2aa5746cb889c8463473688dd7572ea825f461e263ec2
 DIST pydantic-1.10.1.gh.tar.gz 887019 BLAKE2B 5ca8d11528c7a7666136224c97dd0b078cf6f936a23227aa9dcd62af3c6a0af8f07c4c92751bd2c203497a626d4f93a78fd594bfc71dd0c43886c2dacc257af4 SHA512 2be3f10a82d655a94b3f250ed4c78439b4195dde3f7f6aa66028105b5c9b0e56aa8176701d563e5372533ae34e0b6d0fe2254df9429b04815607bcfc94e40370
 DIST pydantic-1.10.2.gh.tar.gz 888288 BLAKE2B 9aac69ace185ccc56255cf36f9af472caf4c6bcbdcbb81eec66353f755673e9a240e7713c0a2ecff00a02e07b0069e4b3f1edda41f345698a979b79dd54b354a SHA512 dc2acfb271cd62b6de08bbaa48dbc76ec8d3a3f3142778ffa2cb9a2a1cad62dbdb3c7470a50e9a2825837b65a48c6aefb8736411f32c398aa9ca779841b53ac5
-DIST pydantic-1.9.1.tar.gz 306846 BLAKE2B c22e892f403b6ca5eff7f888c68f9df5c198fa03c8dab833edc556b3b1a4819fc28c9818a649bf5d9c4bb745b0bde826e164eda7760cd26f88e278c86776ad84 SHA512 19d2a50ef054b76cc7e8756759f3d67a14a58614dd6ff1b4f60e73354b0028e08743aa3bb5944da7ae357ab279134d3685c454d6affa6524b267c7cd9a40375e
-DIST pydantic-1.9.2.tar.gz 307957 BLAKE2B ee3b188dcf058fc81b5f8491a5e757114a3b39db4d9aee3265051559f6ac25cff01bfb3b0536d0f0425534bd9a5a6444b6e6f2ef84b91a6c11085e15ac25265a SHA512 524595aea9401e82d2e985fdb5aa9b4a8b39edfed856d08e057695c786d65c3455991e4f57ce326902ff9cbed328bcb5e6f4133bda769fecea5affb68f3b4345
diff --git a/dev-python/pydantic/pydantic-1.10.0_beta1.ebuild b/dev-python/pydantic/pydantic-1.10.0_beta1.ebuild
deleted file mode 100644
index ad4b23860fbc..000000000000
--- a/dev-python/pydantic/pydantic-1.10.0_beta1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-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/pydantic/pydantic-1.10.1.ebuild b/dev-python/pydantic/pydantic-1.10.1.ebuild
index ca6f838e2647..3715a6df70cf 100644
--- a/dev-python/pydantic/pydantic-1.10.1.ebuild
+++ b/dev-python/pydantic/pydantic-1.10.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pydantic/pydantic-1.10.2.ebuild b/dev-python/pydantic/pydantic-1.10.2.ebuild
index ad4b23860fbc..581ecee89190 100644
--- a/dev-python/pydantic/pydantic-1.10.2.ebuild
+++ b/dev-python/pydantic/pydantic-1.10.2.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~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"
 
 RDEPEND="
 	>=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pydantic/pydantic-1.9.1.ebuild b/dev-python/pydantic/pydantic-1.9.1.ebuild
deleted file mode 100644
index 3156ec321e66..000000000000
--- a/dev-python/pydantic/pydantic-1.9.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Data parsing and validation using Python type hints"
-HOMEPAGE="https://github.com/samuelcolvin/pydantic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/typing-extensions[${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
-		python3.8)
-			EPYTEST_DESELECT+=(
-				# Those fail on python 3.8 as None changed typing semantic on >=3.9
-				"tests/test_types.py::test_none[value_type3]"
-				tests/test_typing.py::test_is_none_type
-			)
-			;;
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_dataclasses.py::test_self_reference_dataclass
-				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/pydantic/pydantic-1.9.2.ebuild b/dev-python/pydantic/pydantic-1.9.2.ebuild
deleted file mode 100644
index 3156ec321e66..000000000000
--- a/dev-python/pydantic/pydantic-1.9.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Data parsing and validation using Python type hints"
-HOMEPAGE="https://github.com/samuelcolvin/pydantic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/typing-extensions[${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
-		python3.8)
-			EPYTEST_DESELECT+=(
-				# Those fail on python 3.8 as None changed typing semantic on >=3.9
-				"tests/test_types.py::test_none[value_type3]"
-				tests/test_typing.py::test_is_none_type
-			)
-			;;
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_dataclasses.py::test_self_reference_dataclass
-				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/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index 3f97ef8c7f05..ed6f9b1fae25 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1 +1,2 @@
 DIST pyOpenSSL-22.0.0.tar.gz 178438 BLAKE2B d34c91a54aaf6b28d92ba83c26900fb308835512275267e11a5482ede4ab45177434559a53c64a116aa19c84d65dcdb459aecd3fc5587cb13e21cd2f196a0078 SHA512 3d7695f27b7909eb82f05527ab7551fe90a85a70f20ea980293b59672a62f9b015966180407fa0786e94b01ad1d1acfaa7d40426bb63410efd24a144e559e2f0
+DIST pyOpenSSL-22.1.0.tar.gz 181704 BLAKE2B b10a8db111726c5f6626cae670a04af73cc1856a3084d3ca683fcba942724e99e5bd4ab6eb7dc4eb02ea4c6f14aa21f7744020aae1532145e1db24dbe58976cd SHA512 7cccb48cbb1655414d21c5e66e7defee7ec370cb6b46294ae0307208f9a9bc13708345b2c088a43292262f5d5bb3d45241c18ae66d2ad6824046ffe30f0c707e
diff --git a/dev-python/pyopenssl/pyopenssl-22.1.0.ebuild b/dev-python/pyopenssl/pyopenssl-22.1.0.ebuild
new file mode 100644
index 000000000000..6b72c6bedbfb
--- /dev/null
+++ b/dev-python/pyopenssl/pyopenssl-22.1.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs
+
+MY_PN=pyOpenSSL
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the OpenSSL library"
+HOMEPAGE="
+	https://www.pyopenssl.org/
+	https://github.com/pyca/pyopenssl/
+	https://pypi.org/project/pyOpenSSL/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	<dev-python/cryptography-39[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-38.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/cffi[${PYTHON_USEDEP}]
+		' 'python*')
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx doc \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_test() {
+	local -x TZ=UTC
+	local EPYTEST_DESELECT=(
+		tests/test_ssl.py::TestContext::test_set_default_verify_paths
+	)
+
+	# test for 32-bit time_t
+	"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null <<-EOF &>/dev/null
+		#include <sys/types.h>
+		int test[sizeof(time_t) >= 8 ? 1 : -1];
+	EOF
+
+	if [[ ${?} -eq 0 ]]; then
+		einfo "time_t is at least 64-bit long"
+	else
+		einfo "time_t is smaller than 64 bits, will skip broken tests"
+		EPYTEST_DESELECT+=(
+			tests/test_crypto.py::TestX509StoreContext::test_verify_with_time
+		)
+	fi
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/pypugjs/pypugjs-5.9.11.ebuild b/dev-python/pypugjs/pypugjs-5.9.11.ebuild
index 349dafc4e770..02c07bde64d1 100644
--- a/dev-python/pypugjs/pypugjs-5.9.11.ebuild
+++ b/dev-python/pypugjs/pypugjs-5.9.11.ebuild
@@ -25,7 +25,7 @@ BDEPEND="
 		dev-python/django[${PYTHON_USEDEP}]
 		>=dev-python/jinja-3.1.1[${PYTHON_USEDEP}]
 		>=dev-python/mako-1.1.3[${PYTHON_USEDEP}]
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
 	)
 "
 
@@ -41,5 +41,5 @@ pkg_postinst() {
 	optfeature "converting to Django output" dev-python/django
 	optfeature "converting to Jinja2 output" dev-python/jinja
 	optfeature "converting to Mako output" dev-python/mako
-	optfeature "converting to Tornado output" www-servers/tornado
+	optfeature "converting to Tornado output" dev-python/tornado
 }
diff --git a/dev-python/pypugjs/pypugjs-5.9.12.ebuild b/dev-python/pypugjs/pypugjs-5.9.12.ebuild
index 06470b987327..520dd43f847a 100644
--- a/dev-python/pypugjs/pypugjs-5.9.12.ebuild
+++ b/dev-python/pypugjs/pypugjs-5.9.12.ebuild
@@ -28,7 +28,7 @@ BDEPEND="
 		dev-python/django[${PYTHON_USEDEP}]
 		>=dev-python/jinja-3.1.1[${PYTHON_USEDEP}]
 		>=dev-python/mako-1.1.3[${PYTHON_USEDEP}]
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
 	)
 "
 
@@ -44,5 +44,5 @@ pkg_postinst() {
 	optfeature "converting to Django output" dev-python/django
 	optfeature "converting to Jinja2 output" dev-python/jinja
 	optfeature "converting to Mako output" dev-python/mako
-	optfeature "converting to Tornado output" www-servers/tornado
+	optfeature "converting to Tornado output" dev-python/tornado
 }
diff --git a/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild b/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild
index dcb015c35e2c..685b5b9af13b 100644
--- a/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild
+++ b/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-python/msgpack[${PYTHON_USEDEP}]
 	|| (
 		app-admin/salt[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
 	)
 "
 #BDEPEND="
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r3.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r3.ebuild
index f2b6a989926c..d4ad22315ff3 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r3.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r3.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/path-py[${PYTHON_USEDEP}]
+	dev-python/path[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/termcolor[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/pytest-testinfra/Manifest b/dev-python/pytest-testinfra/Manifest
index 6ae69cbb4836..678fe70ff03e 100644
--- a/dev-python/pytest-testinfra/Manifest
+++ b/dev-python/pytest-testinfra/Manifest
@@ -1,2 +1 @@
-DIST pytest-testinfra-6.7.0.tar.gz 79187 BLAKE2B 08678f381392fe8a1fe335adc90ac6dc67c5bfa33c87f4e9d81b439eaabd29c393b8dc80cc79625784e76e5b0e264cdfc272cddb531acefbac9a8327be46f7be SHA512 d11f30da0eae9f215173d3f84e6ba7965d926b8ef6c49619c2ccae3d3ff215f351b950eea019e6516a56de0aa7bc533658af978d827a3ad3d1c50e37902b6f91
 DIST pytest-testinfra-6.8.0.tar.gz 78611 BLAKE2B ab1f9732db6a5d88730f4989cc47dc2086844f9809754d9f7811a8f0f092cf3d1e6f48fac2596200bf8e354cfd4aa3dc767bc21139267813141c9522d2116453 SHA512 e0c044430ffae1772b937b405572ef05b6177a645aff7b96e1f779d4f68449241757efae137a03ea8aec28db5f91c0e71574ab52aebef0052ca99ea0ca08db23
diff --git a/dev-python/pytest-testinfra/pytest-testinfra-6.7.0.ebuild b/dev-python/pytest-testinfra/pytest-testinfra-6.7.0.ebuild
deleted file mode 100644
index 89a7023f6523..000000000000
--- a/dev-python/pytest-testinfra/pytest-testinfra-6.7.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Write unit tests in Python to test actual state of your servers"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-testinfra/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-# Ansible is called via its CLI
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		<app-admin/ansible-5
-		dev-python/paramiko[${PYTHON_USEDEP}]
-		dev-python/pywinrm[${PYTHON_USEDEP}]
-		app-admin/salt[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	elog "For the list of available connection back-ends and their dependencies,"
-	elog "please consult https://testinfra.readthedocs.io/en/latest/backends.html"
-}
diff --git a/dev-python/pytest-tornado/pytest-tornado-0.8.1.ebuild b/dev-python/pytest-tornado/pytest-tornado-0.8.1.ebuild
index c889099cd3ab..732391e071e8 100644
--- a/dev-python/pytest-tornado/pytest-tornado-0.8.1.ebuild
+++ b/dev-python/pytest-tornado/pytest-tornado-0.8.1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-	>=www-servers/tornado-5[${PYTHON_USEDEP}]
+	>=dev-python/tornado-5[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-tornasync/pytest-tornasync-0.6.0_p2.ebuild b/dev-python/pytest-tornasync/pytest-tornasync-0.6.0_p2.ebuild
index 6936297b385f..9fbb4d1ddba9 100644
--- a/dev-python/pytest-tornasync/pytest-tornasync-0.6.0_p2.ebuild
+++ b/dev-python/pytest-tornasync/pytest-tornasync-0.6.0_p2.ebuild
@@ -22,7 +22,7 @@ RESTRICT="test"
 
 RDEPEND="
 	>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-5.0[${PYTHON_USEDEP}]
+	>=dev-python/tornado-5.0[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/python-engineio/python-engineio-4.3.2-r2.ebuild b/dev-python/python-engineio/python-engineio-4.3.2-r2.ebuild
index 5ab078a534fa..cb60e837710d 100644
--- a/dev-python/python-engineio/python-engineio-4.3.2-r2.ebuild
+++ b/dev-python/python-engineio/python-engineio-4.3.2-r2.ebuild
@@ -35,8 +35,8 @@ BDEPEND="
 		' python3_{8,9} )
 
 		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
 		dev-python/websockets[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/python-engineio/python-engineio-4.3.3.ebuild b/dev-python/python-engineio/python-engineio-4.3.3.ebuild
index 23b1f244a274..0661ea9068d3 100644
--- a/dev-python/python-engineio/python-engineio-4.3.3.ebuild
+++ b/dev-python/python-engineio/python-engineio-4.3.3.ebuild
@@ -36,8 +36,8 @@ BDEPEND="
 		' python3_{8,9} )
 
 		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
 		dev-python/websockets[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/python-engineio/python-engineio-4.3.4.ebuild b/dev-python/python-engineio/python-engineio-4.3.4.ebuild
index d4d19cf7ad6f..1c37e29789e1 100644
--- a/dev-python/python-engineio/python-engineio-4.3.4.ebuild
+++ b/dev-python/python-engineio/python-engineio-4.3.4.ebuild
@@ -36,8 +36,8 @@ BDEPEND="
 		' python3_{8,9} )
 
 		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
 		dev-python/websockets[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/python-gnupg/Manifest b/dev-python/python-gnupg/Manifest
index 0673d27a4470..20ba7a554e85 100644
--- a/dev-python/python-gnupg/Manifest
+++ b/dev-python/python-gnupg/Manifest
@@ -1,4 +1,2 @@
-DIST python-gnupg-0.4.9.tar.gz 59982 BLAKE2B 09ca33bf181239d2ed39930e2b017f30e5c3ff158ccf937a1a1e72366cd144bc7327c8a57517840f976b10fbf542f8181721fa6e203cf0b67766b3fea9ca2d16 SHA512 e59685bea966addbfacfd5516601c518c9ccd7a828250584a00dca5c2062b30bd859ae73b467bd16db60abd800bd0b66f68177e56d3c48654416a294e72f3e8f
-DIST python-gnupg-0.4.9.tar.gz.asc 801 BLAKE2B d95b5e5bb5613adfb5705851ba1f1ff4a9331bfedb452d3f15e7838aaaf66b9b161664e1dc7f16acc4490eb2647dcf6ed1d1cf9b5272bd9523527b7329917cfb SHA512 ca91795ae7c43e825f35bccbbb3464e6f9e60742f28d1e215e97680c4de454b07375d66593553ace53d6fc9ceb423253a34f3ea6a5bc1b27e7da9b0ba3c385f2
 DIST python-gnupg-0.5.0.tar.gz 61154 BLAKE2B 0ae7e8ff669f51b47410a7a5aef16ca6792db18f28c59d3ce6615d0852eba1e201e3d000d1f644ffc1a362a74ee56c0930dd5814c23238137d6d8696319fd130 SHA512 cfd302257b53fdc9318004db7323ea5bf4bddc055b65b24386a1ecb27cd476fdf1bc771adcdde70a4eef442982a0c57dc832b92274bbe5ba16cbdf3247f4e77a
 DIST python-gnupg-0.5.0.tar.gz.asc 801 BLAKE2B a3df8ea4c22c2df8351aeb51a670e36e2809eef2248507842b9580f819af5c4e5a7ad4902ef54f2a62c3629a2d658cac346cc1647838e8066b2a018939e1a751 SHA512 58fa1b201803bb542e3fb9c1c567d83abba0e897b52efa331942899684e15b4c44a225c28adce58c69c290d5059fc562556b79fec21f960c894b30a8f3642405
diff --git a/dev-python/python-gnupg/python-gnupg-0.4.9-r1.ebuild b/dev-python/python-gnupg/python-gnupg-0.4.9-r1.ebuild
deleted file mode 100644
index dc0165f08dbf..000000000000
--- a/dev-python/python-gnupg/python-gnupg-0.4.9-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/vinaysajip.asc
-inherit distutils-r1 verify-sig
-
-DESCRIPTION="A Python wrapper for GnuPG"
-HOMEPAGE="https://docs.red-dove.com/python-gnupg/"
-SRC_URI="https://github.com/vsajip/python-gnupg/releases/download/${PV}/${P}.tar.gz"
-SRC_URI+=" verify-sig? ( https://github.com/vsajip/python-gnupg/releases/download/${PV}/${P}.tar.gz.asc )"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-LICENSE="BSD"
-SLOT="0"
-
-# Need gnupg[nls] for avoiding decode errors and possible hangs
-# w/ e.g. sec-keys/openpgp-keys-gentoo-developers but other pkgs too.
-RDEPEND="app-crypt/gnupg[nls]"
-DEPEND="${RDEPEND}"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-vinaysajip )"
-
-distutils_enable_tests unittest
-
-python_test() {
-	# NO_EXTERNAL_TESTS must be enabled,
-	# to disable all tests, which need internet access.
-	NO_EXTERNAL_TESTS=1 eunittest
-}
diff --git a/dev-python/python-telegram-bot/python-telegram-bot-13.14.ebuild b/dev-python/python-telegram-bot/python-telegram-bot-13.14.ebuild
index 84652c4d741f..d7991d1b6a98 100644
--- a/dev-python/python-telegram-bot/python-telegram-bot-13.14.ebuild
+++ b/dev-python/python-telegram-bot/python-telegram-bot-13.14.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	dev-python/PySocks[${PYTHON_USEDEP}]
 	dev-python/ujson[${PYTHON_USEDEP}]
 	dev-python/urllib3[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
 "
 
 DEPEND="test? (
diff --git a/dev-python/python-telegram-bot/python-telegram-bot-9999.ebuild b/dev-python/python-telegram-bot/python-telegram-bot-9999.ebuild
index 84652c4d741f..d7991d1b6a98 100644
--- a/dev-python/python-telegram-bot/python-telegram-bot-9999.ebuild
+++ b/dev-python/python-telegram-bot/python-telegram-bot-9999.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	dev-python/PySocks[${PYTHON_USEDEP}]
 	dev-python/ujson[${PYTHON_USEDEP}]
 	dev-python/urllib3[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
 "
 
 DEPEND="test? (
diff --git a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
index fa220df00a56..f45ff9394174 100644
--- a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
+++ b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/python-xmp-toolkit/${PN}.git"
 else
 	SRC_URI="https://github.com/python-xmp-toolkit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Library for working with XMP metadata"
diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest
index 7fba0cc27350..5c7dc36e748b 100644
--- a/dev-python/pyudev/Manifest
+++ b/dev-python/pyudev/Manifest
@@ -1,2 +1 @@
-DIST pyudev-0.23.2.tar.gz 87199 BLAKE2B 0ce4300296f4fcc3a56ba4100d3ebe7734330b3096fde59475fe9880758a3279324c4c3df883b22d1ec9f4e0cfa83fc7c25fbe54ed03a5e019567595deb21211 SHA512 40b947d363dca73789f5ab77cbda4b48349e28fe04f2f5cafb93d20799d842ebeb2b7d78d1f16dcbcaac5c20aff1b931b372c75852706e731337e6e1d30b8538
 DIST pyudev-0.24.0.tar.gz 85887 BLAKE2B 82f23a1bbcd8ce5dd9e6f0551d967e7209067541185410668944734a5f0e17a907d6143cee81decb868d64cf8a0fe642dba7dc600f5ae3f03d9487f882d0aef3 SHA512 c711053a58cd857aff9e1df116ff11cfc17426d9f5a092810403150bec36239213a87b428bc31ec862b75b64a027f2d21081e15f76d914b67a9ddf39b0b73379
diff --git a/dev-python/pyudev/pyudev-0.23.2.ebuild b/dev-python/pyudev/pyudev-0.23.2.ebuild
deleted file mode 100644
index fc3dc72a919b..000000000000
--- a/dev-python/pyudev/pyudev-0.23.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python binding to libudev"
-HOMEPAGE="https://pyudev.readthedocs.io/en/latest/ https://github.com/pyudev/pyudev"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="qt5"
-
-# Known to fail on test system that aren't exactly the same devices as on CI
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	virtual/udev
-"
-BDEPEND="
-	test? (
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGES.rst README.rst )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	if use test; then
-		ewarn "If your PORTAGE_TMPDIR is longer in length then '/var/tmp/',"
-		ewarn "change it to /var/tmp to ensure tests will pass."
-	fi
-
-	# tests are known to pass then fail on alternate runs
-	# tests: fix run_path
-	sed -i -e "s|== \('/run/udev'\)|in (\1,'/dev/.udev')|g" \
-		tests/test_core.py || die
-
-	# disable use hypothesis timeouts (too short)
-	sed -e '/@settings/s/(/(deadline=None,/' -i tests{,/_device_tests}/*.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	optfeature "PyQt5 bindings" "dev-python/PyQt5"
-}
diff --git a/dev-python/pyupgrade/Manifest b/dev-python/pyupgrade/Manifest
index 219934dcd06e..d3175cc06615 100644
--- a/dev-python/pyupgrade/Manifest
+++ b/dev-python/pyupgrade/Manifest
@@ -1,2 +1,3 @@
 DIST pyupgrade-2.38.0.gh.tar.gz 63620 BLAKE2B 73f551e92a6d68e0e1e2b1f21a3afd0f26ece7889450135fe7c68ad3ce094799cba669547965ff3c5589f1e667568e8dcf60709e8d1b3699fd36680494b79f96 SHA512 c65534c59f1810730cd039375678c648565023e1fbb03df4bd14846be95757b33d712c51197f54009e907da647a04700dd8d8ff1094188ef7ba0dbf2352084cf
 DIST pyupgrade-2.38.1.gh.tar.gz 63637 BLAKE2B 348346d82f85c8df4edfaf2b09e8e519b5ee1d895920a896ae4c0a23f0af0da338ec2c1c2d2c175977da725313b4b5ace6ced65a3a54f5722146f35986485a9c SHA512 056e9886a8bacaf58d74461a7cbce8b7e67392b6758a7e42363404b4822df837067a7a2ec5da6a97411ce8297955ff260901f95b17d1a9e84835bce755071fca
+DIST pyupgrade-2.38.2.gh.tar.gz 64004 BLAKE2B 4d5456173d7202749e87726f5547f8f406ab226e2258d78393f10e1ee8129835a65272ee12c95d3d71139f57982c240c38d67353153af43dfa30a8dc7e4147e0 SHA512 e7184539f9e4c8090be02ba1fef1288564e7f8860457345b3305c06391962491af04497e5fe14297fb9c90a6e7e4de1f07a39235a5358188f5f5fa035ab7eb1b
diff --git a/dev-python/pyupgrade/pyupgrade-2.38.2.ebuild b/dev-python/pyupgrade/pyupgrade-2.38.2.ebuild
new file mode 100644
index 000000000000..13364dca8bd8
--- /dev/null
+++ b/dev-python/pyupgrade/pyupgrade-2.38.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tool + pre-commit hook to automatically upgrade syntax for newer Pythons"
+HOMEPAGE="
+	https://github.com/asottile/pyupgrade/
+	https://pypi.org/project/pyupgrade/
+"
+SRC_URI="
+	https://github.com/asottile/pyupgrade/archive/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/pyvirtualdisplay/pyvirtualdisplay-3.0.ebuild b/dev-python/pyvirtualdisplay/pyvirtualdisplay-3.0.ebuild
index 63af57265b40..3b1911c2e17e 100644
--- a/dev-python/pyvirtualdisplay/pyvirtualdisplay-3.0.ebuild
+++ b/dev-python/pyvirtualdisplay/pyvirtualdisplay-3.0.ebuild
@@ -27,7 +27,7 @@ BDEPEND="
 		' 3.8)
 		dev-python/easyprocess[${PYTHON_USEDEP}]
 		dev-python/entrypoint2[${PYTHON_USEDEP}]
-		dev-python/path-py[${PYTHON_USEDEP}]
+		dev-python/path[${PYTHON_USEDEP}]
 		dev-python/pillow[xcb,${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyscreenshot[${PYTHON_USEDEP}]
diff --git a/dev-python/pyzmq/pyzmq-23.2.1.ebuild b/dev-python/pyzmq/pyzmq-23.2.1.ebuild
index 86c71d3522d8..050f599b0e9b 100644
--- a/dev-python/pyzmq/pyzmq-23.2.1.ebuild
+++ b/dev-python/pyzmq/pyzmq-23.2.1.ebuild
@@ -41,7 +41,7 @@ BDEPEND="
 	' 'python*')
 	test? (
 		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
+		>=dev-python/tornado-5.0.2[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/pyzmq/pyzmq-24.0.1.ebuild b/dev-python/pyzmq/pyzmq-24.0.1.ebuild
index 50ba06f7ed44..8c04a8d39ab2 100644
--- a/dev-python/pyzmq/pyzmq-24.0.1.ebuild
+++ b/dev-python/pyzmq/pyzmq-24.0.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+draft"
 
 DEPEND="
@@ -41,7 +41,7 @@ BDEPEND="
 	' 'python*')
 	test? (
 		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
+		>=dev-python/tornado-5.0.2[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/rapidfuzz/Manifest b/dev-python/rapidfuzz/Manifest
index f1d4562c8239..f7e7df30c549 100644
--- a/dev-python/rapidfuzz/Manifest
+++ b/dev-python/rapidfuzz/Manifest
@@ -1,2 +1,3 @@
 DIST rapidfuzz-2.10.0.tar.gz 782698 BLAKE2B f2b4ead136162fd3592b16978a58cd3a2d66489f05aefdf58fd137ebf34f347368f437b3ee836b36122b00863f0c238c8191307f6b586676db59ebfa2d370e1c SHA512 b704a535021924e436a1cebe397e747d3e39b6a4ec12718bbb2a91c326d1977c51bd7ca9a4b2c2d380fdc27ea76b1549d61dea511ed86054aceb1d2180716627
+DIST rapidfuzz-2.10.1.tar.gz 782833 BLAKE2B a8be0ad8c617d8389b5fd22bff06e3887665dedd73580ac6ed29c3f5b895c399ffa0ac6ea983cb0a12d279d5312514e645f75d1a09a40be7108097b74e78c2d5 SHA512 006c714c4c2b86d77682042c7bd3e7a19328a56ff12b42f01e96712c4a94db654d63607363cf68b746416f107927bdee9dee9d7d29c80eda7c7fa74e0c21b75d
 DIST rapidfuzz-2.9.0.tar.gz 780939 BLAKE2B c43dfd89d18dc1f5b4738930f1d0d9c4956f66479217b4400844b50636e2b0bb13f15d8b9a6edc0ce30fc943f35a44dad802ecf90107556ed2dee7f70fcc16ac SHA512 b8f83cc35e84a4ed95e2086eb7bfbc6e7e2e25a05accc965092b8b51012c79e86e2af15397577bb91aadfa9a257a62d6f3d6bb9bf928a9c767d53468904a12be
diff --git a/dev-python/rapidfuzz/rapidfuzz-2.10.1.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.10.1.ebuild
new file mode 100644
index 000000000000..aca2e55b188c
--- /dev/null
+++ b/dev-python/rapidfuzz/rapidfuzz-2.10.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# custom wrapper over setuptools
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Rapid fuzzy string matching in Python using various string metrics"
+HOMEPAGE="
+	https://github.com/maxbachmann/RapidFuzz/
+	https://pypi.org/project/rapidfuzz/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	<dev-python/jarowinkler-2[${PYTHON_USEDEP}]
+	>=dev-python/jarowinkler-1.2.2[${PYTHON_USEDEP}]
+"
+# all these are header-only libraries
+DEPEND="
+	>=dev-cpp/taskflow-3.0.0
+	>=dev-cpp/jarowinkler-cpp-1.0.0
+	>=dev-cpp/rapidfuzz-cpp-1.0.1
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/rapidfuzz_capi[${PYTHON_USEDEP}]
+	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export RAPIDFUZZ_BUILD_EXTENSION=1
diff --git a/dev-python/readability-lxml/readability-lxml-0.6.1.ebuild b/dev-python/readability-lxml/readability-lxml-0.6.1.ebuild
index 97fb619c7f9f..441adfe5ad45 100644
--- a/dev-python/readability-lxml/readability-lxml-0.6.1.ebuild
+++ b/dev-python/readability-lxml/readability-lxml-0.6.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 inherit distutils-r1
 
-DESCRIPTION="fast python port of arc90's readability tool, updated to match latest readability.js!"
+DESCRIPTION="fast html to text parser (article readability tool)"
 HOMEPAGE="https://github.com/buriy/python-readability"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 2a8ea9c69900..a2c365c94910 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,3 +1,2 @@
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.6.11.tar.gz 4519404 BLAKE2B a099a4adcaf7186cbb558ba708abf47019cff33c6a5335b27bb1eb1377c3276ae9ecdf33e66f614880de2f72e195333f3a7839ce776b8946431e2d23872fb13b SHA512 2ef81850f4e30e78ef9e923d3aea7efac6c98dce83f90c0edd47384febd68eb6ac81e05c7038e7d67458bdae16d1b19b75e9aeb8da6a5283e9173e27e4369251
-DIST reportlab-3.6.7.tar.gz 4504447 BLAKE2B 3e691294d20f94850840ddc70565d2235bdcb37d47b5e869e34e5fea93dc9ba017d09f088e18b6479266354076b89461849dd1eb7d1d4e8b12a9c4a95706bf66 SHA512 51f98900ccf7ef34fefc237bf1c787931a525cd82284685bda26f411760b97d1b85fce5bffa59b133705f6c1769a8d3616ef85ea368ed59dfc72f24d5faf6e88
diff --git a/dev-python/reportlab/reportlab-3.6.11.ebuild b/dev-python/reportlab/reportlab-3.6.11.ebuild
deleted file mode 100644
index f6b60e76f31a..000000000000
--- a/dev-python/reportlab/reportlab-3.6.11.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="
-	https://www.reportlab.com/
-	https://pypi.org/project/reportlab/
-"
-SRC_URI="
-	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
-	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	media-libs/freetype
-	media-libs/libart_lgpl
-	sys-libs/zlib:=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
-"
-BDEPEND="
-	app-arch/unzip
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.6.9-paths.patch
-)
-
-distutils_enable_sphinx docs/source
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${P}/src/reportlab/fonts || die
-	unpack pfbfer-20070710.zip
-}
-
-src_configure() {
-	cat > local-setup.cfg <<-EOF || die
-		[OPTIONS]
-		no-download-t1-files = 1
-		use-system-libart = 1
-	EOF
-}
-
-python_test() {
-	pushd tests >/dev/null || die
-	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
-	popd >/dev/null || die
-}
diff --git a/dev-python/reportlab/reportlab-3.6.7.ebuild b/dev-python/reportlab/reportlab-3.6.7.ebuild
deleted file mode 100644
index 804aeca88f94..000000000000
--- a/dev-python/reportlab/reportlab-3.6.7.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="
-	https://www.reportlab.com/
-	https://pypi.org/project/reportlab/"
-SRC_URI="
-	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
-	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	media-libs/freetype
-	media-libs/libart_lgpl
-	sys-libs/zlib:="
-RDEPEND="
-	${DEPEND}
-	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
-BDEPEND="
-	app-arch/unzip"
-
-distutils_enable_sphinx docs/source
-
-PATCHES=(
-	# bug 738312, remove -L/usr/lib from link line
-	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${P}/src/reportlab/fonts || die
-	unpack pfbfer-20070710.zip
-}
-
-src_configure() {
-	cat > local-setup.cfg <<-EOF || die
-		[OPTIONS]
-		no-download-t1-files = 1
-		use-system-libart = 1
-	EOF
-}
-
-python_test() {
-	pushd tests >/dev/null || die
-	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
-	popd >/dev/null || die
-}
diff --git a/dev-python/rst-linker/rst-linker-2.3.1.ebuild b/dev-python/rst-linker/rst-linker-2.3.1.ebuild
index 32bfb063bd61..7e3fbc2a36cc 100644
--- a/dev-python/rst-linker/rst-linker-2.3.1.ebuild
+++ b/dev-python/rst-linker/rst-linker-2.3.1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 BDEPEND="
 	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
 	test? (
-		dev-python/path-py[${PYTHON_USEDEP}]
+		dev-python/path[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/scikit-build/scikit-build-0.15.0.ebuild b/dev-python/scikit-build/scikit-build-0.15.0.ebuild
index 25ecd70fa960..868a7aea6842 100644
--- a/dev-python/scikit-build/scikit-build-0.15.0.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.15.0.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/path-py[${PYTHON_USEDEP}]
+		dev-python/path[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index f4e14b25e914..bef706363aa8 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,3 +1,4 @@
 DIST Sphinx-4.5.0.tar.gz 6698212 BLAKE2B e6c46d35492c3d3068c4f97e497d33973ca86b40934578804fcec901fa89d2c52b45a7546b835b873846dd16936c1bd34a7b053aec8206c688d974671155fd56 SHA512 b44d2a81ed67adaefe16a07ae0cf053b5e6c775023aaa6c57d7b3950f171deac410e8004f787b151c3c2fc350650aa69a4dc2dc7239d1fd3d351e5194617cb2c
 DIST sphinx-5.1.1.gh.tar.gz 6766329 BLAKE2B ff385abe35d4a700cbb3cd8acc72313f7c923d48b38934cc35ea6128ef6c16eb6a33604daea25f81f60b65951b4623f62cd4c1a482b2c5e7285ce0ddb6226c80 SHA512 23261cabbcc73072134c22e7fb36f4c7911f4284cea9cc7be6006e500d9de65727f43214fb4427d307845cc684b9a569960ed276320855283a33b9542a2a6918
 DIST sphinx-5.2.0.gh.tar.gz 6777631 BLAKE2B 53514f0561a53e656f15f434f79a2e2a6c0b41989bbc98f8c7e3e0548ab180339d2908827a933124576dacbed76db7e519ee1e626597a3f50900a90cb8b1c23b SHA512 480c288cd9bf3c1bc61aa97fc4549dd6f0c3d23c2fb5cc5f15a20780984c518f50638a42a87b9c2c0b4eb24ef57e6cfbd812a82a9227ae439028a0fdd5f165a7
+DIST sphinx-5.2.1.gh.tar.gz 6777833 BLAKE2B 128c8bbeb1609eef353da88a6d7dc561839b9e60abc46325b96e668a2babc39695f65d7e9539ab8faaae7ba27f558e6ec300579f94f1a62da9ef0d9804eda893 SHA512 bb51a91f7eb9643cf30be732cd0d9d45a90a1358d8379d89ac3ec0a46dcb0724a57ec4d5062375b6a98bfbb5d688d709ca9a1ed65d7825f4402cacf01cc9e034
diff --git a/dev-python/sphinx/sphinx-5.2.1.ebuild b/dev-python/sphinx/sphinx-5.2.1.ebuild
new file mode 100644
index 000000000000..2a45a85990b6
--- /dev/null
+++ b/dev-python/sphinx/sphinx-5.2.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="
+	https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx/
+	https://pypi.org/project/Sphinx/
+"
+SRC_URI="
+	https://github.com/sphinx-doc/sphinx/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc latex"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.9[${PYTHON_USEDEP}]
+	<dev-python/docutils-0.20[${PYTHON_USEDEP}]
+	>=dev-python/imagesize-1.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-2.0[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.8[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+	!dev-python/namespace-sphinxcontrib
+"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		app-text/dvipng
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		virtual/imagemagick-tools[jpeg,png,svg]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
+	"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local EPYTEST_DESELECT=(
+		# these tests require Internet access
+		tests/test_build_latex.py::test_latex_images
+		tests/test_build_linkcheck.py::test_defaults
+		tests/test_build_linkcheck.py::test_defaults_json
+		tests/test_build_linkcheck.py::test_anchors_ignored
+		# TODO
+		tests/test_ext_autodoc_autoclass.py::test_classes
+		tests/test_ext_autodoc_autofunction.py::test_classes
+		tests/test_ext_inheritance_diagram.py::test_import_classes
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+		tests/test_ext_autodoc_autofunction.py::test_builtin_function
+		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+		tests/test_ext_autodoc_automodule.py::test_automodule_inherited_members
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+		tests/test_util_inspect.py::test_isattributedescriptor
+		tests/test_util_typing.py::test_stringify_type_hints_pep_585
+	)
+
+	epytest
+}
diff --git a/dev-python/sphinx_ansible_theme/Manifest b/dev-python/sphinx_ansible_theme/Manifest
index f22dd7a3afce..a36db7889bfa 100644
--- a/dev-python/sphinx_ansible_theme/Manifest
+++ b/dev-python/sphinx_ansible_theme/Manifest
@@ -1,2 +1 @@
-DIST sphinx-ansible-theme-0.8.0.tar.gz 34401 BLAKE2B 493663331e593da8d56683991762452419fd5fdb48e2c59ee3a38b6242216bccf56e047e59294ae73cccfb48a66606e55fac6c9a19d91e6ea778920f9919dbd1 SHA512 399af992428dd3212681efa66036af9ae7dbd9a9dd507452686cc76aa3e365aabee0ba7b599fbbed85f1f252075d5158ade9a816a9aad17b4e5ed696be1c962e
 DIST sphinx-ansible-theme-0.9.1.tar.gz 34505 BLAKE2B 533e665b30f5aa450e4a2240c55c4992340b9f6ee03d27758bf119dfe2eef987fbd4b98136349af376557d8e9a78e5391a648b9886136995d05410b0c26561f2 SHA512 f78602af8affe7be59988f466cf6a2aa67e174086f338cad855369a7bbee5a76d07bcffa8406dea5a819127b26d69e29b0d90dab38b82524b3e317f9082d0379
diff --git a/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.8.0.ebuild b/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.8.0.ebuild
deleted file mode 100644
index 850d3a5fc976..000000000000
--- a/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.8.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-MY_PN="${PN//_/-}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A reusable Ansible Sphinx theme"
-HOMEPAGE="https://github.com/ansible-community/sphinx_ansible_theme"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	doc? ( dev-python/ansible-pygments[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs 'dev-python/sphinx-notfound-page'
-
-S="${WORKDIR}"/${MY_P}
diff --git a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.3.0.ebuild b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.3.0-r1.ebuild
index c3b107a19281..2643479a01e8 100644
--- a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.3.0.ebuild
+++ b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.3.0-r1.ebuild
@@ -26,14 +26,6 @@ RDEPEND="
 distutils_enable_sphinx docs
 
 src_prepare() {
-	# fix for sphinx >= 4.0
-	sed -e 's/PyModulelevel/PyFunction/g' \
-		-e 's/PyClassmember/PyClassMethod/g' \
-		-i sphinxcontrib/asyncio.py || die
-	default
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	rm "${BUILD_DIR}/install$(python_get_sitedir)"/sphinxcontrib/__init__.py || die
+	rm sphinxcontrib/__init__.py || die
+	distutils-r1_src_prepare
 }
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0-r1.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0-r1.ebuild
index b5970f295ab2..3ea5553a9288 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0-r1.ebuild
@@ -31,7 +31,7 @@ BDEPEND="
 	test? (
 		dev-python/flask[${PYTHON_USEDEP}]
 		dev-python/bottle[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/spyder-terminal/spyder-terminal-1.2.2.ebuild b/dev-python/spyder-terminal/spyder-terminal-1.2.2.ebuild
index c65ef22e50a4..06856646f4af 100644
--- a/dev-python/spyder-terminal/spyder-terminal-1.2.2.ebuild
+++ b/dev-python/spyder-terminal/spyder-terminal-1.2.2.ebuild
@@ -20,5 +20,5 @@ RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	>=dev-python/spyder-5.2.0[${PYTHON_USEDEP}]
 	>=dev-python/terminado-0.13.1[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/stack_data/Manifest b/dev-python/stack_data/Manifest
index a9f6202054c9..a117530c32f6 100644
--- a/dev-python/stack_data/Manifest
+++ b/dev-python/stack_data/Manifest
@@ -1,2 +1,3 @@
 DIST stack_data-0.4.0.tar.gz 41638 BLAKE2B 1395ce2ba5ce12af2ab4e9c3d4b42c2b5c14fe09013469fb8c659899b0d9a78ce9d12b4a37223d651d4e8bafeb5c1d97437690084dc4592cf8c04fb7236f5b0d SHA512 63514aad17f8e01566606a6a080506c7b363f90538a4c5ae1427b1aa54358c4b95a2752869288b6e6d44641870effbfe466e8830864cbf6e4b6e70e8e28699de
 DIST stack_data-0.5.0.tar.gz 43332 BLAKE2B b9583717633902b4618981ceeb53eca7b817b7985fd5401cc79fe35b194e77fdb57e1c5c51adde0b4e604f6df5424d27056b2528c356a808a4b4c9e1dee1c56a SHA512 82573d9b115daf23a04921027878d55cf9de897a01cb0089b082ec0e7a7b42461afe47dddf4d16adfe186259280b57d651857884ceaf9673d8c983c48f479684
+DIST stack_data-0.5.1.tar.gz 43435 BLAKE2B eeebca4d2d8e3c8795e05d4a058c4a7421a2669e28b476400d541c79d5d7ebb66dde16cd39e2586eafa2f653341c041351c2684440d879ed71b2adf83ea1b4d9 SHA512 b33e3bfd31d285fcdb8f6db8f3e59b6e99fcbc0b912c7be01e52b164554a5914bc8f1a7fb7e665a18fa2d164b248afeb3c6a287f8e27ab7fa44f69b75d93d375
diff --git a/dev-python/stack_data/stack_data-0.5.1.ebuild b/dev-python/stack_data/stack_data-0.5.1.ebuild
new file mode 100644
index 000000000000..236b0c403ab1
--- /dev/null
+++ b/dev-python/stack_data/stack_data-0.5.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extract data from Python tracebacks for informative displays"
+HOMEPAGE="
+	https://github.com/alexmojaki/stack_data/
+	https://pypi.org/project/stack-data/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/asttokens[${PYTHON_USEDEP}]
+	dev-python/executing[${PYTHON_USEDEP}]
+	dev-python/pure_eval[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/typeguard[${PYTHON_USEDEP}]
+		dev-python/littleutils[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/tenacity/tenacity-8.0.1-r1.ebuild b/dev-python/tenacity/tenacity-8.0.1-r1.ebuild
index c486bc8c7c8d..fba0ae5aedfc 100644
--- a/dev-python/tenacity/tenacity-8.0.1-r1.ebuild
+++ b/dev-python/tenacity/tenacity-8.0.1-r1.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="amd64 ~arm64 ~riscv x86"
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
-		www-servers/tornado[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/tenacity/tenacity-8.1.0.ebuild b/dev-python/tenacity/tenacity-8.1.0.ebuild
index dc814951d4d5..6e41c9aee214 100644
--- a/dev-python/tenacity/tenacity-8.1.0.ebuild
+++ b/dev-python/tenacity/tenacity-8.1.0.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
-		www-servers/tornado[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/terminado/terminado-0.15.0.ebuild b/dev-python/terminado/terminado-0.15.0.ebuild
index 0c456a94adb4..2a8e749f95fe 100644
--- a/dev-python/terminado/terminado-0.15.0.ebuild
+++ b/dev-python/terminado/terminado-0.15.0.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd
 
 RDEPEND="
 	dev-python/ptyprocess[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/textdistance/Manifest b/dev-python/textdistance/Manifest
index 17f12744844f..ab4106862beb 100644
--- a/dev-python/textdistance/Manifest
+++ b/dev-python/textdistance/Manifest
@@ -1,3 +1,2 @@
-DIST textdistance-4.3.0.gh.tar.gz 45535 BLAKE2B e43ae62b0b7656a6c4f879b1d8e0c34ae6c83705d324aa99bb7ff6e2d0166faf1fed3ee7bc06602388c16c742a1983a4eaee143b09a7c371b9e941d53edca2b5 SHA512 30d68048b1f0b79e584f5f07731e03193af64cb2de3f52882c17154cc027f4ff8d590b994941bd5d62642d4da334ef0739d4bb65b6b12f039a1ee9aef154cde4
 DIST textdistance-4.4.0.gh.tar.gz 45542 BLAKE2B ae144cb7179b589f4106ea378e538e0d0240e6e2ac74dc5de8222ec2f671fcd09c4705cb5b30308fdb2f6071578d337c0f88983511229d9f7eb86c924d65bf56 SHA512 727696b76ee8fdfc9bcf028a93baad38882893f62612fa08725e5e8cd104b9450977e3682995c4aa7d997afcc8fdb73e3c72ea6c1a097a9a19dbce98957d4798
 DIST textdistance-4.5.0.gh.tar.gz 46674 BLAKE2B 5bac2690c48fc518b56f7d781803684c1ccccbb54e62c613f87a58f2acf81d28b405be5ffc41c7a304e62bd19732cdf99a03816c00765698439073b76c5be6c0 SHA512 ae51a2a0b69acd5fd64cab9509ad58713044a1307eee884ecf00508f406a9442414b1d8c71798f2c3ed0e9f5b22cca0a467f6d5a5928510adda43c6997ea497c
diff --git a/dev-python/textdistance/textdistance-4.3.0.ebuild b/dev-python/textdistance/textdistance-4.3.0.ebuild
deleted file mode 100644
index 035a128ad303..000000000000
--- a/dev-python/textdistance/textdistance-4.3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Compute distance between the two texts"
-HOMEPAGE="https://github.com/life4/textdistance"
-SRC_URI="
-	https://github.com/life4/textdistance/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-BDEPEND="
-	test? (
-		dev-python/abydos[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/isort[${PYTHON_USEDEP}]
-		dev-python/jellyfish[${PYTHON_USEDEP}]
-		dev-python/Levenshtein[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pyxDamerauLevenshtein[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-EPYTEST_DESELECT=(
-	tests/test_external.py
-)
diff --git a/dev-python/thriftpy2/thriftpy2-0.4.14-r1.ebuild b/dev-python/thriftpy2/thriftpy2-0.4.14-r1.ebuild
index 198c62ff548c..e1d3c4c91d1a 100644
--- a/dev-python/thriftpy2/thriftpy2-0.4.14-r1.ebuild
+++ b/dev-python/thriftpy2/thriftpy2-0.4.14-r1.ebuild
@@ -20,7 +20,7 @@ BDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/tornado/Manifest b/dev-python/tornado/Manifest
new file mode 100644
index 000000000000..76ef193658e1
--- /dev/null
+++ b/dev-python/tornado/Manifest
@@ -0,0 +1 @@
+DIST tornado-6.2.tar.gz 504849 BLAKE2B 18fee464e043e20dcdd5677bc3a72949140a64ce353e09a21242fcade6d8b668517553c649d65e892d9c3fabacea96903d4e42b70676a62759900abc8f4a202f SHA512 157cbeee21bef29ac68b319329e7fc57db4c68dbb5a245e2171b7a28427ebbfe16b745e3bdbdec5912caae5eaa60c3cbbf8830c9c76fec5ffdf025e234468517
diff --git a/dev-python/tornado/metadata.xml b/dev-python/tornado/metadata.xml
new file mode 100644
index 000000000000..853174b8f2ab
--- /dev/null
+++ b/dev-python/tornado/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/tornado/tornado-6.2.ebuild b/dev-python/tornado/tornado-6.2.ebuild
new file mode 100644
index 000000000000..b464a593ffd4
--- /dev/null
+++ b/dev-python/tornado/tornado-6.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python web framework and asynchronous networking library"
+HOMEPAGE="
+	https://www.tornadoweb.org/
+	https://github.com/tornadoweb/tornado/
+	https://pypi.org/project/tornado/
+"
+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 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinxcontrib-asyncio
+
+src_prepare() {
+	# Disable deprecation-warnings-as-errors because tornado has a lot of stuff deprecated in 3.10
+	sed 's/warnings.filterwarnings("error", category=DeprecationWarning, module=r"tornado\\..*")//' \
+		-i tornado/test/runtests.py || die
+	# broken upstream
+	sed -i -e 's:test_multi_line_headers:_&:' \
+		tornado/test/httpclient_test.py || die
+	# network-sandbox? ipv6?
+	sed -i -e 's:test_localhost:_&:' \
+		tornado/test/netutil_test.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x ASYNC_TEST_TIMEOUT=60
+	cd "${T}" || die
+	"${EPYTHON}" -m tornado.test.runtests --verbose ||
+		die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r demos/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index a799799ed4fc..7a9a59718794 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,5 +1,2 @@
-DIST trimesh-3.13.5.gh.tar.gz 11961925 BLAKE2B 8a4b069f2df49c9ca6121cd3ea446f959a4d5df16b2eafca039b7bc55f04830e054a1c03e012e25594ccda415fedf26b0ab3ae1dbe5e5d1b019bf9e899703169 SHA512 dd4bd7051d48f382ec3e96e55156a6d4cc554a097133d8deb033b9fbcf6f50cf446539484c2a0858243728bc3a7bb6973876919d900a7deb2ff1a6bd11dc397c
-DIST trimesh-3.14.0.gh.tar.gz 11962245 BLAKE2B 56ae1d987f43b6945191c80be6ac0a47cad51de370b4d4033baeec69b0aafa54ce4282e622d7f29a4906efde5ce7af2b13b8567b98a519eab8edf791de90f355 SHA512 495f90fe37bbeb339b7db4dbd366bac126a43e956ec18ec77c9ee697e7d8155f0c048f8e5280230684cb602b26a4be1be1e74335db94f4272b50816ab937e2ca
 DIST trimesh-3.14.1.gh.tar.gz 11961899 BLAKE2B eab37c94da03cfdefa2f4bff78a1a1cdd2a4c5d3d5da7ef5f462de331c7c2dbaaabbc53a0033ca95a3b4d9d61e072af2f2b689d291e32a89531ca2b5e9d8f8e2 SHA512 e8c43275552d2ddf2e6c1d7582c67f34d7bdaddd5df2cfac9a3758eac12a7fc8bc41748465317eb4e983d7d2d9d51209ab85bfa781022227c0be57618991e9b4
-DIST trimesh-3.15.1.gh.tar.gz 11956148 BLAKE2B 6b0486f779c440baa701f19c5ced085f6f4dcf93704720d8158dc216d1b8e0b46c7549c0adbebee83e34fe2b0eda42da44c61848a9f11bac9d66736566d58c9c SHA512 04459bbb99a1a12cb0a3626d7a1b465b612b7b36690b7c1e6f0dd358794a46a9f64d3465021271846112abc69b0b4f4465bf0b045deb194c28272a4680e65e65
 DIST trimesh-3.15.2.gh.tar.gz 11956076 BLAKE2B 4ec701056efd29eb24eaf4edc82d07af4b8e02713697f658ea86eaef6f94916d51c3b21873b3da720705f281054ab5564f4331dc3ee9614d37774bdc03dd1c77 SHA512 9ae3917f2485f5eba089fd04029187be356bbb032d8afa57801a5c19a897550a34bd6734848a47c937b42745fd4563a5a05352928f5e31a7146a3b002d6c765d
diff --git a/dev-python/trimesh/trimesh-3.13.5.ebuild b/dev-python/trimesh/trimesh-3.13.5.ebuild
deleted file mode 100644
index f04984f7d230..000000000000
--- a/dev-python/trimesh/trimesh-3.13.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimsh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)"
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-3.14.0.ebuild b/dev-python/trimesh/trimesh-3.14.0.ebuild
deleted file mode 100644
index 8a53861b3711..000000000000
--- a/dev-python/trimesh/trimesh-3.14.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimsh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)"
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-3.15.1.ebuild b/dev-python/trimesh/trimesh-3.15.1.ebuild
deleted file mode 100644
index 8a53861b3711..000000000000
--- a/dev-python/trimesh/trimesh-3.15.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimsh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)"
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/uc-micro-py/uc-micro-py-1.0.1.ebuild b/dev-python/uc-micro-py/uc-micro-py-1.0.1.ebuild
index a4e70d416395..ae70be9ad445 100644
--- a/dev-python/uc-micro-py/uc-micro-py-1.0.1.ebuild
+++ b/dev-python/uc-micro-py/uc-micro-py-1.0.1.ebuild
@@ -22,6 +22,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/urllib3/urllib3-1.26.12.ebuild b/dev-python/urllib3/urllib3-1.26.12.ebuild
index a5a4cb1d2768..3b1372ec8111 100644
--- a/dev-python/urllib3/urllib3-1.26.12.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.12.ebuild
@@ -40,8 +40,8 @@ BDEPEND="
 			dev-python/mock[\${PYTHON_USEDEP}]
 			dev-python/pytest[\${PYTHON_USEDEP}]
 			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
+			>=dev-python/tornado-4.2.1[\${PYTHON_USEDEP}]
 			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
 		" python3_{7..10})
 	)
 "
diff --git a/dev-python/werkzeug/werkzeug-2.2.2.ebuild b/dev-python/werkzeug/werkzeug-2.2.2.ebuild
index d449f2f54986..11474d27c4b3 100644
--- a/dev-python/werkzeug/werkzeug-2.2.2.ebuild
+++ b/dev-python/werkzeug/werkzeug-2.2.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild
index 204ad49e04da..45edd5589f80 100644
--- a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild
+++ b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 # We could depend on dev-python/cherrypy when USE=server, but
 # that is an optional component ...
-# Same for www-servers/tornado and USE=client ... so why not???
+# Same for dev-python/tornado and USE=client ... so why not???
 # pypy is viable but better with a cutdown set of deps
 
 EAPI=7
@@ -35,7 +35,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
 	>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
-	client? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] )
+	client? ( >=dev-python/tornado-3.1[${PYTHON_USEDEP}] )
 	server? ( >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] )"
 
 DEPEND="test? (
diff --git a/dev-python/ws4py/ws4py-9999.ebuild b/dev-python/ws4py/ws4py-9999.ebuild
index ee906f44745c..def62f8f5070 100644
--- a/dev-python/ws4py/ws4py-9999.ebuild
+++ b/dev-python/ws4py/ws4py-9999.ebuild
@@ -3,7 +3,7 @@
 
 # We could depend on dev-python/cherrypy when USE=server, but
 # that is an optional component ...
-# Same for www-servers/tornado and USE=client ... so why not???
+# Same for dev-python/tornado and USE=client ... so why not???
 # pypy is viable but better with a cutdown set of deps
 
 EAPI=7
@@ -35,7 +35,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
 	>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
-	client? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] )
+	client? ( >=dev-python/tornado-3.1[${PYTHON_USEDEP}] )
 	server? ( >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] )"
 
 DEPEND="test? (
diff --git a/dev-python/wsproto/Manifest b/dev-python/wsproto/Manifest
index 6a8de2285c39..74eba910df29 100644
--- a/dev-python/wsproto/Manifest
+++ b/dev-python/wsproto/Manifest
@@ -1,2 +1 @@
-DIST wsproto-1.1.0.tar.gz 52928 BLAKE2B 837f5d8411a55b026d8c5df8b03b44c92f71fe2856884e5199e639a5c060fabbe8eec39cb6861e8f88ae7fc366cbeef4f9d62dade2c95857d27339fa73e90638 SHA512 0cd726bc62ca4d11e96f470f51511008bd43dbb9e99a17633d2a40da7bdaf19716e0a1c995350f5c8f418f906848dd6f2b9b0a853c1b6858ddafa1cc02fab710
 DIST wsproto-1.2.0.tar.gz 53425 BLAKE2B 0b6bafb5d67be54a9b9c77a9682caf1071e82321fb9112ff977b643956ef5d2d5dcc7e523c6e3038c4548adb7b4f022fe2664112b7a10ab0e183d578158b0711 SHA512 43270687a1cfb5f35423c527de5b9db7ee2ddf27d416f47358386c1c94dc3f836a601f300bf66441c4b90130e6e6f502fb29dfeb2374dd76aefa19cfbb70a372
diff --git a/dev-python/wsproto/wsproto-1.2.0.ebuild b/dev-python/wsproto/wsproto-1.2.0.ebuild
index c4269416fe48..9c457997b5b7 100644
--- a/dev-python/wsproto/wsproto-1.2.0.ebuild
+++ b/dev-python/wsproto/wsproto-1.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/h11-0.9[${PYTHON_USEDEP}]
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index 270ed80f043b..ad47711adbfa 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1 +1,2 @@
 DIST xcffib-0.11.1.tar.gz 84713 BLAKE2B 6ab1ad6e582d71214cd719fdfa898e561e29d5750f5befe5c71173cfe34f2dff7dbd52fe93e618aab695646850f7ef5420114e2b1e725150c643904cdaba560a SHA512 09f4e19b88258446af26628c3a8e694c1f938fe3b5456e797b06174602fa0e9ef6e4eab76daccfd169d98fb7e869c910e6216d1f71fa2853e62b82c62c667669
+DIST xcffib-0.12.1.tar.gz 85272 BLAKE2B 6db2f19caf13d406297198c3829456cb45b5195e2d068b1f5ad01c25d4ed75e3187854da24156c3c5396a559b11c2d6949711b793c5bf5c83e18e9aa54307983 SHA512 6530fb53fa18a3905d7c9e8dd5d05ea084de4a5f392e32953a9786998dd194b2db55b54fa44dbc3e6b68e68ae00431de7432d6884f777734409d660dae325d6e
diff --git a/dev-python/xcffib/xcffib-0.12.1.ebuild b/dev-python/xcffib/xcffib-0.12.1.ebuild
new file mode 100644
index 000000000000..c11eead17947
--- /dev/null
+++ b/dev-python/xcffib/xcffib-0.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
+HOMEPAGE="
+	https://github.com/tych0/xcffib/
+	https://pypi.org/project/xcffib/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+DEPEND="
+	x11-libs/libxcb
+"
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
+	' 'python*')
+	dev-python/six[${PYTHON_USEDEP}]
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		x11-base/xorg-server[xvfb]
+		x11-apps/xeyes
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 23aa2486ee01..b58c2e8677b1 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,2 +1,3 @@
 DIST xmlschema-2.0.3.tar.gz 479014 BLAKE2B 19b5e3892a59e780c23c4b9789901a55509b63d3dd3466d473a47aa43eec8894ad2f99dbae7fa2063a53430d99db1455dd2e370fc0e1932750bf6aecc6657b8e SHA512 ab805229d28d53bbc265a4393ca286d0df81803c53ec16b52879ce3edcdc5e7576602088b5fe977e13dcfb5039af652ef96be5a3e9d23592fee104da5a486516
 DIST xmlschema-2.0.4.tar.gz 481517 BLAKE2B 105f382dee65a55c6b3073d20fee8582123e6f7aa55e5c02f57e8278354ecb5a05d3f00f5a6fac7a53168e8de258ec8380d6637eea881d5725cb8980c3cbff7b SHA512 57902a14c6b038f3f8e2e996ca9f07e87341a754ece9c4b636d1f8b53db1caf176c6d4a975a843ccdbf7e24ce721f51fb3f0a0efd04719c6f81601c0b56910ba
+DIST xmlschema-2.1.0.tar.gz 481921 BLAKE2B 4bda3a4a402808b1961ddef3509c93fa36ecc6dd4e1162015033d31c6b97f3e3a5a84692521dbdafcf127c9548346e9c78f67c5445aca6da3b2fe2e76cfd872b SHA512 a0a76626f40f2261840f5f97be58a3b3cd3183d7d5b722bd785d0f81dbdbcd327428ae6dd596ce1f6b266f751bb17b2c7f3661cd8947b67103789b3436bd654d
diff --git a/dev-python/xmlschema/xmlschema-2.1.0.ebuild b/dev-python/xmlschema/xmlschema-2.1.0.ebuild
new file mode 100644
index 000000000000..f62e3deaf5fc
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-2.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="An XML Schema validator and decoder"
+HOMEPAGE="
+	https://github.com/sissaschool/xmlschema/
+	https://pypi.org/project/xmlschema/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/elementpath-4[${PYTHON_USEDEP}]
+	>=dev-python/elementpath-3.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	"${EPYTHON}" tests/test_all.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/yara-python/Manifest b/dev-python/yara-python/Manifest
index 7fb67ee0f0f7..220814f1fb58 100644
--- a/dev-python/yara-python/Manifest
+++ b/dev-python/yara-python/Manifest
@@ -1,2 +1 @@
-DIST yara-python-4.2.0.gh.tar.gz 34459 BLAKE2B fce460385eaa75dd1779fe49c7937ff36d7604433deb310b6fe9e66af9ea521952f92bee61829372cf19c7efee170329609530f1f9e863991720e4887c3c1349 SHA512 ba08d709fc51679ec9fe36165e0864b79fc241f85c681bf59823fe7bb0e34e928cded050ff296147eb5bcb837485f39949aa93425a0eb9ca8b3730e60fac93f4
 DIST yara-python-4.2.3.gh.tar.gz 34465 BLAKE2B 4b9689cef21f9c712960d08c357087f0278d8c20cef3a16072a005a4f8687999aa273c02c22ea9c6d5ea9a6b609c1a6f4c51f01b04f238e9e1faeeaef275d88b SHA512 588875d820f4e1b2aa5c6bbe83814ba2756f5ed301ba652efd280d5ca9745f7388f1f9eaa3875d11de5644ce9c41dcb76eebbee86269f8d6723c7d16ffa134be
diff --git a/dev-python/yara-python/yara-python-4.2.0-r2.ebuild b/dev-python/yara-python/yara-python-4.2.0-r2.ebuild
deleted file mode 100644
index 8bb11875e310..000000000000
--- a/dev-python/yara-python/yara-python-4.2.0-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python interface for a malware identification and classification tool"
-HOMEPAGE="https://github.com/VirusTotal/yara-python"
-SRC_URI="https://github.com/virustotal/yara-python/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-RDEPEND="${PYTHON_DEPS}
-	=app-forensics/yara-$(ver_cut 1-2)*"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests unittest
-
-python_configure_all() {
-	cat >> setup.cfg <<-EOF
-	[build_ext]
-	dynamic-linking = True
-	EOF
-}
-
-python_test() {
-	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
-}
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-09-26 12:44:20 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-09-26 12:44:20 +0000
commit	654b2d454aba72929fc868804a7ba17fe84bd504 (patch)
tree	bf2e34429c7cbbcbac8d25ab2ca99e9e599e710f /dev-python
parent	b39ab8798d1982c08957abb2f317e66efb9ef82a (diff)
download	baldeagleos-repo-654b2d454aba72929fc868804a7ba17fe84bd504.tar.gz baldeagleos-repo-654b2d454aba72929fc868804a7ba17fe84bd504.tar.xz baldeagleos-repo-654b2d454aba72929fc868804a7ba17fe84bd504.zip