Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-05-15 12:39:43 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-05-15 12:39:43 +0000
commit: 900fb1489f150f10356a7455bbe7565df7acfc9a (patch)
tree: 6a27ccc96bddfb5c6c3b6ceff6219b69438e5465 /dev-python
parent: 1718a3de3d39e0052f2bca93fe0662036915c9b6 (diff)
download: baldeagleos-repo-900fb1489f150f10356a7455bbe7565df7acfc9a.tar.gz
baldeagleos-repo-900fb1489f150f10356a7455bbe7565df7acfc9a.tar.xz
baldeagleos-repo-900fb1489f150f10356a7455bbe7565df7acfc9a.zip
137 files changed, 624 insertions, 1679 deletions
diff --git a/dev-python/anyio/anyio-3.6.1.ebuild b/dev-python/anyio/anyio-3.6.1.ebuild
index c2bcc864b9b4..6ad7f362c851 100644
--- a/dev-python/anyio/anyio-3.6.1.ebuild
+++ b/dev-python/anyio/anyio-3.6.1.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
 		amd64? (
 			$(python_gen_cond_dep '
 				>=dev-python/uvloop-0.15[${PYTHON_USEDEP}]
-			' 'python*')
+			' python3_{8..10})
 		)
 	)
 "
diff --git a/dev-python/beautifulsoup4/Manifest b/dev-python/beautifulsoup4/Manifest
index 337f309ccf28..c417a2b0a8dc 100644
--- a/dev-python/beautifulsoup4/Manifest
+++ b/dev-python/beautifulsoup4/Manifest
@@ -1,2 +1 @@
-DIST beautifulsoup4-4.10.0.tar.gz 399890 BLAKE2B 61f044064a81e94b64a72fd49cca164faa05442bc76f897c8a7fa4481acca039bcb9e4f7a1853a7155504fa25e56c518806d8af016369bc37316ecb95b59d7d3 SHA512 92be99ed0fd479b86519395143516e28f7b80f54a8251223d6e7b88dc98f8dfca9585079f5f1d89bfe68f577de3dff433711642486303203f46bc76754959a18
 DIST beautifulsoup4-4.11.1.tar.gz 517113 BLAKE2B bc0cc8dbb1bffca2d3441a274147f201b79447f2147f7b4c329f05f6d230f9986eebd3709199d0b3c7dba8c15e4ce42e9dc75e290a2bfdfdae643f5dfe07e767 SHA512 7446be07cd55f23def929e6491f0d74a940cf50206ed520b8ae7b9d57bd19ecf6aa821f446ca4f26f1e08b43fcc71fb397886f51a3f0ec691f9e53dfdc7a0cf8
diff --git a/dev-python/beautifulsoup4/beautifulsoup4-4.10.0.ebuild b/dev-python/beautifulsoup4/beautifulsoup4-4.10.0.ebuild
deleted file mode 100644
index c85092b6d67b..000000000000
--- a/dev-python/beautifulsoup4/beautifulsoup4-4.10.0.ebuild
+++ /dev/null
@@ -1,24 +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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
-HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/bs4/"
-SRC_URI="mirror://pypi/${P: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 ~x64-macos"
-
-RDEPEND="
-	dev-python/soupsieve[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source
diff --git a/dev-python/beautifulsoup4/beautifulsoup4-4.11.1.ebuild b/dev-python/beautifulsoup4/beautifulsoup4-4.11.1.ebuild
index be32bb464cea..81044ad8b22f 100644
--- a/dev-python/beautifulsoup4/beautifulsoup4-4.11.1.ebuild
+++ b/dev-python/beautifulsoup4/beautifulsoup4-4.11.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/soupsieve[${PYTHON_USEDEP}]
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 0076f2a300c8..ef4867956ee5 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,2 +1 @@
-DIST bleach-4.1.0.tar.gz 195798 BLAKE2B 68afd58aa099acb5c21f1ff76301c46834f326ea2aa4fe7a6f820c2cf31913e81dc72deecab4272b2a7ceab1ae01bec028a5cf5e6214cddef4cdec5ec05ea4c6 SHA512 34c522dde5126995789e23fd28f7938d025f56e97e30814dc326d33a772d40fc2ad2f25aed0b367fd4352b1e1e8f54b80282b931819203bf60448ffe2f120622
 DIST bleach-5.0.0.tar.gz 198789 BLAKE2B 0b2847e9342be1854a08679230b3ea0fcb1a514eaa6c11f344057e59310b6d769e2bee91272295a0f60fa0ed1c2e4503340276d99794d260b6a63e2c4ea76703 SHA512 5b8e0c94a7bd8270581719928ec869c5c3c91900be0a293adfb342acfc55df7e63211e95786e6a39b3661b3852e91a8b37ff805387fb3e6a286e8a5dce8e3655
diff --git a/dev-python/bleach/bleach-4.1.0.ebuild b/dev-python/bleach/bleach-5.0.0-r1.ebuild
index a47ed6522060..692373695b57 100644
--- a/dev-python/bleach/bleach-4.1.0.ebuild
+++ b/dev-python/bleach/bleach-5.0.0-r1.ebuild
@@ -1,20 +1,23 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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="An easy whitelist-based HTML-sanitizing tool"
 HOMEPAGE="
 	https://github.com/mozilla/bleach/
-	https://pypi.org/project/bleach/"
+	https://pypi.org/project/bleach/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/bleach/bleach-5.0.0.ebuild b/dev-python/bleach/bleach-5.0.0.ebuild
index db3603ed83f7..3e81ea1fa89c 100644
--- a/dev-python/bleach/bleach-5.0.0.ebuild
+++ b/dev-python/bleach/bleach-5.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/cachelib/Manifest b/dev-python/cachelib/Manifest
index 410a3fa7a4ca..9cfbbc2615bf 100644
--- a/dev-python/cachelib/Manifest
+++ b/dev-python/cachelib/Manifest
@@ -1 +1,2 @@
 DIST cachelib-0.6.0.tar.gz 21842 BLAKE2B a886e0d6558dd7b3e5cb70124ac48b1fd55de13bc15998da32111300505501252f96c419c2bf82f6101c51e70d2d98f5a49362554891513ea3d1c8522d17ab4c SHA512 a828b6a9e425efcfbae46c148f1f56fd6f4df2ce37ed72b90fc4c3ea9edec1273aa2f2e1f9ad59fad30d1b8e37d6794176b85a7b5afb2b65264bd992dfc5c4f6
+DIST cachelib-0.7.0.tar.gz 20650 BLAKE2B 427101910200e4b13e1cc98582499d4f78066c5b904797ae1e9565c5bc6ea445a9ab8f9eed4e6a9a18dcf8aa0ce369ed455edf6f551ff5476a8101aa75cec192 SHA512 034bc14a2de2eb7a7fe52a51f5ff1f96c700c1d915430c0fae5f95bb045989fbbe82458c1dc17cd8ea54e016d014679628a7470e8564f43cd763480eb06d3153
diff --git a/dev-python/cachelib/cachelib-0.7.0.ebuild b/dev-python/cachelib/cachelib-0.7.0.ebuild
new file mode 100644
index 000000000000..7a057b65587d
--- /dev/null
+++ b/dev-python/cachelib/cachelib-0.7.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of cache libraries in the same API interface. Extracted from werkzeug"
+HOMEPAGE="
+	https://pypi.org/project/cachelib/
+	https://github.com/pallets-eco/cachelib/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pylibmc[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+		dev-python/redis-py[${PYTHON_USEDEP}]
+		net-misc/memcached
+		www-servers/uwsgi[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# bug #818523
+	tests/test_redis_cache.py
+)
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index 07573ec9b4b2..150d934e2ad7 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1,2 +1 @@
 DIST chameleon-3.10.0.gh.tar.gz 136996 BLAKE2B a622fa4d972dc0bea9532f0815b586e17d56fc4da94bad37f83fb29d2a94442da2a7d1ebd00fdfb0a877fcf9a2d269c2c3780ec9cf96ad772952b096a1ca1db2 SHA512 de59a4f1d0243beae91008f93741e9565831ea3b07c3f39e20e15ecc7220711a78bf475844fcaa9dc25f2376b0e937779ca28bd58f7c9b95fa2cf35cc7212117
-DIST chameleon-3.9.1.gh.tar.gz 136555 BLAKE2B 277df179cd26f1edc6513bc6a80d6f7a7f9f95b1562efa23f454d7055ffbeaf59d7a726bfe8969505b0839138c7f97fdb810754bb0342060a79b23abecb3ad36 SHA512 53b0aeeef89df7cacc299dad20e05023c638e708604876ce5269f22bab00e5001b640123920aef0ef9a0f554bbd37d151bedfdfe55ec161defe6b6f3781d841e
diff --git a/dev-python/chameleon/chameleon-3.10.0.ebuild b/dev-python/chameleon/chameleon-3.10.0.ebuild
index 453d6d5462f0..9351104f8a56 100644
--- a/dev-python/chameleon/chameleon-3.10.0.ebuild
+++ b/dev-python/chameleon/chameleon-3.10.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/chameleon/chameleon-3.9.1.ebuild b/dev-python/chameleon/chameleon-3.9.1.ebuild
deleted file mode 100644
index 00c104b81c57..000000000000
--- a/dev-python/chameleon/chameleon-3.9.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Fast HTML/XML template compiler for Python"
-HOMEPAGE="https://github.com/malthe/chameleon/
-	https://pypi.org/project/Chameleon/"
-SRC_URI="
-	https://github.com/malthe/chameleon/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests unittest
-
-src_test() {
-	cd src || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index cd1eff9971fa..04940001380b 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1 +1,2 @@
 DIST croniter-1.3.4.tar.gz 39351 BLAKE2B 38701e865b67a382e8c6f511ebf801c83e27aec31cc0f0636b9f8a7b13405a27531b3314523ac819d5193c3907f8aecfc6132901856a1565e6c986ea73dceed0 SHA512 aa55f8849abfa0c8ff24514051362e21fab821d2ffcde182d9e0f267b3b5e1706278710eae80df3ced82a1444323af44eff25cfc34ab92bd15fbb31d7d791037
+DIST croniter-1.3.5.tar.gz 38606 BLAKE2B 45586ef4ef6622caca3611fd596818a875a451ade6353cf4a99219f38ab76e72656c885bd61238670a809203d487d78d884d700c5e2e4c6eb1bdf44dfc14a1c4 SHA512 9b59334f8537cd5b48e17be2c83fcb78f2c0a8c62b7c28091600c84cf202e6847d7d1d40ff5ebb57cac3a713013ca247620e348aa9f3a408483cf4110a88545f
diff --git a/dev-python/croniter/croniter-1.3.5.ebuild b/dev-python/croniter/croniter-1.3.5.ebuild
new file mode 100644
index 000000000000..61569554f5bc
--- /dev/null
+++ b/dev-python/croniter/croniter-1.3.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module to provide iteration for datetime object"
+HOMEPAGE="
+	https://github.com/kiorky/croniter/
+	https://pypi.org/project/croniter/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/tzlocal[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/dnspython/dnspython-2.2.1.ebuild b/dev-python/dnspython/dnspython-2.2.1.ebuild
index 4d639f9fc051..4b4d1cedbcb3 100644
--- a/dev-python/dnspython/dnspython-2.2.1.ebuild
+++ b/dev-python/dnspython/dnspython-2.2.1.ebuild
@@ -5,12 +5,19 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
 PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="https://www.dnspython.org/
-	https://pypi.org/project/dnspython/"
-SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://www.dnspython.org/
+	https://github.com/rthalley/dnspython/
+	https://pypi.org/project/dnspython/
+"
+SRC_URI="
+	https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
 
 LICENSE="ISC"
 SLOT="0"
@@ -19,7 +26,8 @@ IUSE="examples"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
-	<dev-python/idna-4.0[${PYTHON_USEDEP}]"
+	<dev-python/idna-4.0[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
index 2e24afb4ea79..6cd8ae9e5518 100644
--- a/dev-python/doit/Manifest
+++ b/dev-python/doit/Manifest
@@ -1,3 +1 @@
-DIST doit-0.34.2.tar.gz 1449767 BLAKE2B c7d81144da99147dbc6bf7d670b6f411879a8080e405866866bc97ae4701d9a47a3d4882db9672e2e36bc8af577ba9632da1fb4ed2c9f87717f719ac1cd53d34 SHA512 24afc8078fef42a446733554c6ab63298ee5bb734381fc2bfc9d623dc98394916a1f89a18bb28e7ef862da8c0449b5cf16d605295e8948a0ea6968a231a1c8e2
-DIST doit-0.35.0.tar.gz 1451502 BLAKE2B db0c1c9245897ca9c4ce4d3f5f43e5f2e5035c36cc4bd15e63d6fb9e69992b5068ca24839a02485680cdc75ba62cb95f139f6fd0ec24c1f26fd4c4b2e4fce27e SHA512 3eb3fc0284c4779db47c56c9e21bda16e31d053214f4a0272c1a26c9fd26bc0de7d00601bb08a79a3d0ed403464e773c03fe93d0fcd9ee59812c396e0f4ed7e6
 DIST doit-0.36.0.tar.gz 1448096 BLAKE2B 15558a39ccac031ddf3a429aa585bc6e1d49c2e7572df29979ca66d1025fa5d7a917f6cc5bcfd21f2749e4ed7e7885b0865ec67b6fa32817e1518d47da9ead97 SHA512 d4caa31701755c7f59213dde0f89fd3616c0c01b7f06245cbfd9f1a315d503e62f3556c3b86685cd0ebfcffcc9cae0987ca150f037aa7b3cd960439a1191be42
diff --git a/dev-python/doit/doit-0.34.2.ebuild b/dev-python/doit/doit-0.34.2.ebuild
deleted file mode 100644
index b4e5ab2a5674..000000000000
--- a/dev-python/doit/doit-0.34.2.ebuild
+++ /dev/null
@@ -1,56 +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 bash-completion-r1 distutils-r1
-
-DESCRIPTION="Automation tool"
-HOMEPAGE="https://pydoit.org/ https://pypi.org/project/doit/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	|| (
-		dev-python/toml[${PYTHON_USEDEP}]
-		dev-python/tomlkit[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/pyflakes[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND=">=dev-python/doit-py-0.4.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc \
-	dev-python/sphinx_rtd_theme
-
-EPYTEST_DESELECT=(
-	# test failing due to impact on PATH run in a sandbox
-	tests/test_cmd_strace.py::TestCmdStrace::test_target
-)
-
-src_prepare() {
-	# Replace custom theme with builtin for documentation
-	sed -e '/html_theme/s/press/sphinx_rtd_theme/' -i doc/conf.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	newbashcomp bash_completion_doit ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins zsh_completion_doit _${PN}
-}
diff --git a/dev-python/doit/doit-0.35.0.ebuild b/dev-python/doit/doit-0.35.0.ebuild
deleted file mode 100644
index cc9f2820ac38..000000000000
--- a/dev-python/doit/doit-0.35.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Automation tool"
-HOMEPAGE="https://pydoit.org/ https://pypi.org/project/doit/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	|| (
-		dev-python/toml[${PYTHON_USEDEP}]
-		dev-python/tomlkit[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/pyflakes[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND=">=dev-python/doit-py-0.4.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc \
-	dev-python/sphinx_rtd_theme
-
-EPYTEST_DESELECT=(
-	# test failing due to impact on PATH run in a sandbox
-	tests/test_cmd_strace.py::TestCmdStrace::test_target
-)
-
-src_prepare() {
-	# Replace custom theme with builtin for documentation
-	sed -e '/html_theme/s/press/sphinx_rtd_theme/' -i doc/conf.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	newbashcomp bash_completion_doit ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins zsh_completion_doit _${PN}
-}
diff --git a/dev-python/doit/doit-0.36.0.ebuild b/dev-python/doit/doit-0.36.0.ebuild
index b0239b105f15..00df73000393 100644
--- a/dev-python/doit/doit-0.36.0.ebuild
+++ b/dev-python/doit/doit-0.36.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/editables/Manifest b/dev-python/editables/Manifest
index c08afddb3914..9211bed99bcb 100644
--- a/dev-python/editables/Manifest
+++ b/dev-python/editables/Manifest
@@ -1,2 +1 @@
-DIST editables-0.2.gh.tar.gz 6488 BLAKE2B 02c3e0c352effa902306f5c5a7b6b96cae74c8d8f620dabb3fa4df2568c5d730ecf3a078bfdab8ef87bfa29cb95b24563587de361337a8617fa0776b890b35d2 SHA512 39adc72f9710c28853ffebc9c0757f779e948bed7fc32f78bf52bc26ef4a6a5b351bf011bbf9353fc68e6ef2506481927c3558f8fd6650d61ac7a09591566b74
 DIST editables-0.3.gh.tar.gz 12493 BLAKE2B 95e05e7553efa4856ee5bde2c18a2566f1e65318bfc46c8ecd732f4d6b42f10ce54cc3aecc4d53bcfc627e6938c4155d48a39ced5f64395dbafb9187cb009e4f SHA512 493f20d1e6b39f8ed6668adc208723d447a31ae3c3087f7db9a9a0de617958e8afebd3b3a1836638f749fb0ec911e51256b727deb4c0ce08327356238df0a3f3
diff --git a/dev-python/editables/editables-0.2.ebuild b/dev-python/editables/editables-0.2.ebuild
deleted file mode 100644
index a7dca24fd92c..000000000000
--- a/dev-python/editables/editables-0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python library for creating 'editable wheels'"
-HOMEPAGE="
-	https://pypi.org/project/editables/
-	https://github.com/pfmoore/editables/
-"
-SRC_URI="
-	https://github.com/mgorny/editables/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~m68k ~ppc ~riscv ~s390 ~sparc"
-
-distutils_enable_tests pytest
diff --git a/dev-python/editables/editables-0.3.ebuild b/dev-python/editables/editables-0.3.ebuild
index 2fee41eb04af..cfe942d30cf4 100644
--- a/dev-python/editables/editables-0.3.ebuild
+++ b/dev-python/editables/editables-0.3.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/eradicate/Manifest b/dev-python/eradicate/Manifest
index 83c173a3975f..7864f6650ec2 100644
--- a/dev-python/eradicate/Manifest
+++ b/dev-python/eradicate/Manifest
@@ -1,2 +1 @@
-DIST eradicate-2.0.0.tar.gz 8390 BLAKE2B 22dced2414622138655be80d1c10b746519d313959c7620cb54c4dc27247b0c29b7607c54934fe1dc379bec2cb729213b7ffb1d27f3f7f9b9a9d186aa9402674 SHA512 947a3890ccb1dbb52e73b37e632ae5ba1eff732d9d0b0dc127fa8dc908412e864fcda3203274d5eb1645b22f6e97a90ebb13cd4363a2360d6591475d909bdb96
 DIST eradicate-2.1.0.tar.gz 8706 BLAKE2B 5b5cab1c465c8295157bec1e8e39f0e33dbe31957da01ec44bbabf54a2b19c519a35cd7d2b92217d5395ce7397b3ae70175766a83b66d05e723fc5b5a019eb40 SHA512 a9b06745bceff909a1bbe34348b8e4c17d7f1e0ab3b554206633f350725c34a9b7238b3af6a40516081bc06aa86cdd593b27b90efa083ac024b0226f7cfc4df3
diff --git a/dev-python/eradicate/eradicate-2.0.0-r1.ebuild b/dev-python/eradicate/eradicate-2.0.0-r1.ebuild
deleted file mode 100644
index 7e352721219e..000000000000
--- a/dev-python/eradicate/eradicate-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,21 +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="Removes commented-out code from Python files"
-HOMEPAGE="https://github.com/myint/eradicate"
-# TODO: revert to PyPI tarball once it includes tests
-# https://github.com/myint/eradicate/pull/28
-SRC_URI="https://github.com/myint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/eradicate/eradicate-2.1.0.ebuild b/dev-python/eradicate/eradicate-2.1.0.ebuild
index 735580da535b..3bf8a3a97f02 100644
--- a/dev-python/eradicate/eradicate-2.1.0.ebuild
+++ b/dev-python/eradicate/eradicate-2.1.0.ebuild
@@ -9,13 +9,17 @@ PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Removes commented-out code from Python files"
-HOMEPAGE="https://github.com/myint/eradicate"
-# TODO: revert to PyPI tarball once it includes tests
-# https://github.com/myint/eradicate/pull/28
-SRC_URI="https://github.com/myint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://github.com/myint/eradicate/
+	https://pypi.org/project/eradicate/
+"
+SRC_URI="
+	https://github.com/myint/eradicate/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index d7fc8cbf2524..606ba0422a70 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,2 +1,3 @@
 DIST fakeredis-1.7.1.gh.tar.gz 71151 BLAKE2B 87877c94a4c03ad6ff4b55f307526f712daa860257374a97a8f7bd29440d171467e18e4041ca56bb6af30df30481a3d5b13c7d0657ba3eb7673a653664ffbe8a SHA512 f41d9393ae50bae9de064678948f4364fc47db06f489782e5b428f449828ad5813b08b2fb053bef878b2a1b500edbb0ea1881449dbd12c2b6e385f6a2fba4c59
 DIST fakeredis-py-1.7.4.gh.tar.gz 73024 BLAKE2B d3d18611d846a0dabb52d74ca53cad997b37e794ef320bc800ab5339f70710bc30f9e33c0820db941064fbf9dca0dde3e72c78298895b8c2510a93353898b355 SHA512 71c9ffe7c208453bc8f5e719b3647a9b9fc5406c5fe3856ef1dc42c019bd7128355d260be468b62dcb764a918a3510f193fb1aaf374bb3866e352c9c2bae90c6
+DIST fakeredis-py-1.7.5.gh.tar.gz 72932 BLAKE2B 3965df2d238e70f362e5e43a52fe763b2fec34ecc87d4bf38cb8fdf5e8f58b6bad87b59353a932d5e7e12ac243f3c884a19079752c48b6230795c53f7512d345 SHA512 bcefaa8e425cb47d7881c2f91d35e5ec5b46a94f3189b1ffbd71a92cd202a5fcc3d82df8250cf683475bacbbbec088f1e49545f71f2c98638adca58063cc0fa2
diff --git a/dev-python/fakeredis/fakeredis-1.7.5.ebuild b/dev-python/fakeredis/fakeredis-1.7.5.ebuild
new file mode 100644
index 000000000000..f9af80a055a9
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-1.7.5.ebuild
@@ -0,0 +1,93 @@
+# 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} pypy3 )
+
+inherit distutils-r1 optfeature
+
+MY_P=fakeredis-py-${PV}
+DESCRIPTION="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+	https://github.com/dsoftwareinc/fakeredis-py/
+	https://pypi.org/project/fakeredis/
+"
+SRC_URI="
+	https://github.com/dsoftwareinc/fakeredis-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/redis-py[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/sortedcontainers[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/aioredis[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin redis
+	sed -i -e '/redis/s:<=.*::' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# also lupa
+		test/test_aioredis2.py::test_failed_script_error
+		# TODO
+		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
+		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
+	)
+	local EPYTEST_IGNORE=(
+		# these tests fail a lot...
+		test/test_hypothesis.py
+	)
+	local args=(
+		# tests requiring lupa (lua support)
+		-k 'not test_eval and not test_lua and not test_script'
+	)
+	epytest "${args[@]}"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+	local redis_test_config="
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	"
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
+
+pkg_postinst() {
+	optfeature "Mock aioredis" dev-python/aioredis
+}
diff --git a/dev-python/fonttools/fonttools-4.33.3.ebuild b/dev-python/fonttools/fonttools-4.33.3.ebuild
index 324478a69c1c..e54e07315664 100644
--- a/dev-python/fonttools/fonttools-4.33.3.ebuild
+++ b/dev-python/fonttools/fonttools-4.33.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
 
 RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
diff --git a/dev-python/h11/h11-0.13.0-r1.ebuild b/dev-python/h11/h11-0.13.0-r1.ebuild
index de22b6986474..9464fc164825 100644
--- a/dev-python/h11/h11-0.13.0-r1.ebuild
+++ b/dev-python/h11/h11-0.13.0-r1.ebuild
@@ -18,6 +18,6 @@ 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"
 
 distutils_enable_tests pytest
diff --git a/dev-python/h11/h11-0.13.0.ebuild b/dev-python/h11/h11-0.13.0.ebuild
deleted file mode 100644
index 044b69a21839..000000000000
--- a/dev-python/h11/h11-0.13.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USEPEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure-Python implementation of HTTP/1.1 inspired by hyper-h2"
-HOMEPAGE="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 ppc ppc64 ~riscv sparc x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/hatchling/Manifest b/dev-python/hatchling/Manifest
index 45c29c86b663..18eeac7c5bc1 100644
--- a/dev-python/hatchling/Manifest
+++ b/dev-python/hatchling/Manifest
@@ -1,3 +1 @@
-DIST hatch-hatchling-v0.22.0.tar.gz 201590 BLAKE2B c75e48a19e10f04d9bb1d09beea0ec6598bded5dc9e595f363a076731b7708bae55169ee780931b548478c16db093053c65e30a5510f7b0136c1d339caf29d39 SHA512 cc532b66752d0494b62fb4ed88c8b7870d5618c991b301f46b644aa90b656cfe842efd2fa96797a6b96015deb3468ff8ff69058bd146133360de340d367a5489
-DIST hatch-hatchling-v0.23.0.tar.gz 212046 BLAKE2B 8cc73c68bc476cd282686dc69314fd401f5aac4d5d5df083a338aaf59125988aabc9d33f97ad556013d46886d43facef92e7951e7b0a7bc3fc1ab608a16fca11 SHA512 0666b95e68fcd6fbcdeda5fdce577a1178ca8a965226c58495cfc2699bac2aabe3f3bc162e8bb5b03c9c70ff7aa678be6aba5c343dd787600d2f5ee883685444
 DIST hatch-hatchling-v0.24.0.tar.gz 212154 BLAKE2B fc0fcdd20eb1a1040298a4c959911d291ca454cf82404b0a7a67a9d192e3af0b8ee5a50d169e803bd5602775cf3f9336fd56d83c6fa85aa8d9f805269205ed29 SHA512 f4a1764f129c6e3098d0b0c744dca4f0b499c43d53dcebffc7aa26e28e3f599a9370e0f1f8ee9b9130042f066e1c857e155ffbdcf86d2c18e32ff5bc9219c51e
diff --git a/dev-python/hatchling/hatchling-0.22.0.ebuild b/dev-python/hatchling/hatchling-0.22.0.ebuild
deleted file mode 100644
index be90cb841b42..000000000000
--- a/dev-python/hatchling/hatchling-0.22.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-TAG=${P/-/-v}
-MY_P=hatch-${TAG}
-DESCRIPTION="Modern, extensible Python build backend"
-HOMEPAGE="
-	https://pypi.org/project/hatchling/
-	https://github.com/ofek/hatch/
-"
-SRC_URI="
-	https://github.com/ofek/hatch/archive/${TAG}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}/backend
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~m68k ~ppc ~riscv ~s390 ~sparc"
-
-RDEPEND="
-	>=dev-python/editables-0.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.9[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/atomicwrites[${PYTHON_USEDEP}]
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/platformdirs[${PYTHON_USEDEP}]
-		dev-python/rich[${PYTHON_USEDEP}]
-		dev-python/tomli-w[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	# TODO: remove this when gpep517 is the norm
-	local -x PYTHONPATH=src
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local -x EPYTEST_DESELECT=(
-		# these run pip to install stuff
-		tests/backend/dep/test_core.py::test_dependency_found
-		tests/backend/dep/test_core.py::test_extra_met
-		tests/backend/dep/test_core.py::test_extra_no_dependencies
-		tests/backend/dep/test_core.py::test_extra_unmet
-		tests/backend/dep/test_core.py::test_unknown_extra
-		tests/backend/dep/test_core.py::test_version_unmet
-	)
-
-	# top-level "tests" directory contains tests both for hatch
-	# and hatchling
-	cd "${WORKDIR}/${MY_P}" || die
-	local -x PYTHONPATH="src:${PYTHONPATH}"
-	epytest tests/backend
-}
diff --git a/dev-python/hatchling/hatchling-0.23.0.ebuild b/dev-python/hatchling/hatchling-0.23.0.ebuild
deleted file mode 100644
index be90cb841b42..000000000000
--- a/dev-python/hatchling/hatchling-0.23.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-TAG=${P/-/-v}
-MY_P=hatch-${TAG}
-DESCRIPTION="Modern, extensible Python build backend"
-HOMEPAGE="
-	https://pypi.org/project/hatchling/
-	https://github.com/ofek/hatch/
-"
-SRC_URI="
-	https://github.com/ofek/hatch/archive/${TAG}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}/backend
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~m68k ~ppc ~riscv ~s390 ~sparc"
-
-RDEPEND="
-	>=dev-python/editables-0.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.9[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/atomicwrites[${PYTHON_USEDEP}]
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/platformdirs[${PYTHON_USEDEP}]
-		dev-python/rich[${PYTHON_USEDEP}]
-		dev-python/tomli-w[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	# TODO: remove this when gpep517 is the norm
-	local -x PYTHONPATH=src
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local -x EPYTEST_DESELECT=(
-		# these run pip to install stuff
-		tests/backend/dep/test_core.py::test_dependency_found
-		tests/backend/dep/test_core.py::test_extra_met
-		tests/backend/dep/test_core.py::test_extra_no_dependencies
-		tests/backend/dep/test_core.py::test_extra_unmet
-		tests/backend/dep/test_core.py::test_unknown_extra
-		tests/backend/dep/test_core.py::test_version_unmet
-	)
-
-	# top-level "tests" directory contains tests both for hatch
-	# and hatchling
-	cd "${WORKDIR}/${MY_P}" || die
-	local -x PYTHONPATH="src:${PYTHONPATH}"
-	epytest tests/backend
-}
diff --git a/dev-python/hatchling/hatchling-0.24.0.ebuild b/dev-python/hatchling/hatchling-0.24.0.ebuild
index 5a0986acfd11..1407e693f88b 100644
--- a/dev-python/hatchling/hatchling-0.24.0.ebuild
+++ b/dev-python/hatchling/hatchling-0.24.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}/backend
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/editables-0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/httpcore/httpcore-0.14.7-r1.ebuild b/dev-python/httpcore/httpcore-0.14.7-r1.ebuild
index 470d0fd62c81..eff186740628 100644
--- a/dev-python/httpcore/httpcore-0.14.7-r1.ebuild
+++ b/dev-python/httpcore/httpcore-0.14.7-r1.ebuild
@@ -9,9 +9,13 @@ PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 inherit distutils-r1 optfeature
 
 DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="https://www.encode.io/httpcore/"
+HOMEPAGE="
+	https://www.encode.io/httpcore/
+	https://github.com/encode/httpcore/
+	https://pypi.org/project/httpcore/
+"
 SRC_URI="
-	https://github.com/encode/${PN}/archive/${PV}.tar.gz
+	https://github.com/encode/httpcore/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/httpx/httpx-0.22.0-r2.ebuild b/dev-python/httpx/httpx-0.22.0-r3.ebuild
index e80b6c6686a9..cf895df43f8d 100644
--- a/dev-python/httpx/httpx-0.22.0-r2.ebuild
+++ b/dev-python/httpx/httpx-0.22.0-r3.ebuild
@@ -9,12 +9,17 @@ EAPI=8
 # DOCS_AUTODOC=1
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
 inherit distutils-r1 optfeature # docs
 
 DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
-HOMEPAGE="https://www.python-httpx.org/"
+HOMEPAGE="
+	https://www.python-httpx.org/
+	https://github.com/encode/httpx/
+	https://pypi.org/project/httpx/
+"
 SRC_URI="
-	https://github.com/encode/${PN}/archive/${PV}.tar.gz
+	https://github.com/encode/httpx/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 "
 
@@ -29,7 +34,6 @@ RDEPEND="
 	dev-python/sniffio[${PYTHON_USEDEP}]
 	=dev-python/httpcore-0.14*[${PYTHON_USEDEP}]
 	>=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
-	<dev-python/rfc3986-2[${PYTHON_USEDEP}]
 	cli? (
 		=dev-python/click-8*[${PYTHON_USEDEP}]
 		=dev-python/pygments-2*[${PYTHON_USEDEP}]
@@ -54,7 +58,8 @@ BDEPEND="
 distutils_enable_tests pytest
 
 src_prepare() {
-	sed -i -e '/rich/s:==10[.][*]:<13:' setup.py || die
+	# unpin deps
+	sed -i -e 's:==[0-9.*]\+::' -e 's:,<[0-9.]\+::' setup.py || die
 	if ! use cli; then
 		sed -i -e '/console_scripts/d' setup.py || die
 	fi
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 7e83c194765e..dc9db8a63565 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -8,3 +8,4 @@ DIST hypothesis-python-6.46.0.tar.gz 9192054 BLAKE2B acfb6136b43f29b62ebd843a8c1
 DIST hypothesis-python-6.46.1.tar.gz 9192240 BLAKE2B cb38e1f7fdc4a9586c3920f2d9270a9ad08a77eab52ba493e4ae4fb8ab17780b49f0e4f52004bc330021836a1470feffb96554757495259d34cf52f4ae2b264f SHA512 b273e6c77251544314babdc891e8c2f3f9098b97ba25cfa7eee960773e4508840c27af2b993daa00546cb269eb58d74b6bbfefef2d8869e2d202622983af520a
 DIST hypothesis-python-6.46.2.tar.gz 9305176 BLAKE2B 7d0abe4fc055eeb4660efbba9900b43209cc5ef1fd7b2362545e0d4145837cb7779cdf96c96cdd3770c1605ec8104818ece5cd012a90b164ab8ab63709d1c911 SHA512 207b4202aa36a28891c8051009ee6b8b6a8f0823840db7e4fc6840ebe6455060340f16f7e2e25bc5ad2adca1ff7fd8b58668ec2ca355b4579ec03aac616e786d
 DIST hypothesis-python-6.46.3.tar.gz 9306685 BLAKE2B a26c08361a7a58d8de8d8458a73c5c3c57f04dd2008ab31e604f0addc18fb7a52a7f4a98318498b398cd1ac5d2d718fd722c4d17e0b6ef326e0457355fda7482 SHA512 d55c3c4a57d18aa7f6d876123b09bcab32d508f5aa40048f2db7f0cab3948ebb6fab5f12d291ae4740cdd1c61c2d612c1ce804028bb59914efc132404224d1ee
+DIST hypothesis-python-6.46.5.tar.gz 9307648 BLAKE2B c99116c1ff4ee812b65c80fabaea2e46cadab00865e34030485cfcd97dc8ca7232fa13fae10604f70e8408d2a4570b30c138cced37debc7906c0b0fabcfd41a5 SHA512 dc347dd5aae31512b396fd14827963aa373e4ed499063e5cd76f3bbf1724ee7482cabf4939ff4707faa37dd5e252a410a71badbc45eeef639b1b7524975c447b
diff --git a/dev-python/hypothesis/hypothesis-6.46.5.ebuild b/dev-python/hypothesis/hypothesis-6.46.5.ebuild
new file mode 100644
index 000000000000..8b5222a2f449
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.46.5.ebuild
@@ -0,0 +1,64 @@
+# 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(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{8..10})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/immutables/immutables-0.17.ebuild b/dev-python/immutables/immutables-0.17.ebuild
index 759b05430704..4191f9afd06b 100644
--- a/dev-python/immutables/immutables-0.17.ebuild
+++ b/dev-python/immutables/immutables-0.17.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/jsondiff/Manifest b/dev-python/jsondiff/Manifest
index fc9ef7acb6af..925d9e5191c4 100644
--- a/dev-python/jsondiff/Manifest
+++ b/dev-python/jsondiff/Manifest
@@ -1,2 +1 @@
-DIST jsondiff-1.3.1.gh.tar.gz 15457 BLAKE2B f3896c85b601ac32859e59f2a5a29b51f124a1dd27fa2b0da40e44c4b776bbba933043fb7334e5ec20833eea25143d40cc7988a8308f56eff20510db982688b0 SHA512 cbbed17bf00f1757d81477e02435c3f5a9a3246774f3fd9a433be31de1617525acfe33d6790be33dcf9b5da5ef3d6910d13958fb7b8ea4fbd802c74485a9dc6f
 DIST jsondiff-2.0.0.gh.tar.gz 15405 BLAKE2B d69e5a9316e8ce32c6fd3e62162b609a471ff57bacb77f47a192b85352e77135a37c964d0ade5df4b4e37fe7d996eab13649dd4c6a3bc3fc0479294f840c82f9 SHA512 ca266040294c064b499763174613628125a9d426f37eddb8f63806d5774ce8828d514ca30ea4b42f6e2529aa34344c601ece05b6c1b42dcedd71c7b62ed0afba
diff --git a/dev-python/jsondiff/jsondiff-1.3.1.ebuild b/dev-python/jsondiff/jsondiff-1.3.1.ebuild
deleted file mode 100644
index dc6d3a96b1bf..000000000000
--- a/dev-python/jsondiff/jsondiff-1.3.1.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} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Diff JSON and JSON-like structures in Python"
-HOMEPAGE="
-	https://github.com/xlwings/jsondiff/
-	https://pypi.org/project/jsondiff/"
-SRC_URI="
-	https://github.com/xlwings/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		dev-python/nose-random[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# Avoid file collision with jsonpatch's jsondiff cli.
-	sed -e "/'jsondiff=jsondiff.cli/ d" -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jsondiff/jsondiff-2.0.0.ebuild b/dev-python/jsondiff/jsondiff-2.0.0.ebuild
index dc7a8857fdea..e2e6b572c966 100644
--- a/dev-python/jsondiff/jsondiff-2.0.0.ebuild
+++ b/dev-python/jsondiff/jsondiff-2.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/jupyter_packaging/Manifest b/dev-python/jupyter_packaging/Manifest
index 27800e479971..b42d0f161c15 100644
--- a/dev-python/jupyter_packaging/Manifest
+++ b/dev-python/jupyter_packaging/Manifest
@@ -1,2 +1 @@
-DIST jupyter_packaging-0.11.1.tar.gz 21715 BLAKE2B 68cde8becbe10710bc68912da43877db2704f59bbde5247bc2f27553b90cce47f16665326650e3cc2d1de8008d82ff22b8d485b0d2c782ecbb732e7bd059038c SHA512 1027e909222f9dbe9d317030fa07d7a71a91ef9de961681e6842e486e5e12cda03f998e0a7c2c0fc52e9c3ec3f527bf9643bc1640fa94b16b20b500fc69eff42
 DIST jupyter_packaging-0.12.0.tar.gz 25258 BLAKE2B 1e8897297e6d1e592a5e3d934f850a9fadc27b7fd97484c6ef3dda9ae5d6da0c48116846e0f3fe7757c3c4794a7a8e2e3eaa69b3fe3a68f73cc952707fa27ec1 SHA512 2a34b64a34f6931b7ba0578a9c1c270285a970043136f65c4a7afbc8e9a5e70feb1bffdc00f682d1fa49fe1f5f91bd3a093437f0f05232e6a57c97eda7f1fc29
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.11.1.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.11.1.ebuild
deleted file mode 100644
index e467549e91d0..000000000000
--- a/dev-python/jupyter_packaging/jupyter_packaging-0.11.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Tools to help build and install Jupyter Python packages"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-	dev-python/deprecation[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# TODO: package "build"
-		tests/test_build_api.py::test_build_package
-		tests/test_build_api.py::test_deprecated_metadata
-
-		# broken by Gentoo pip patch
-		# TODO: retry when we finally make the patch less intrusive
-		tests/test_datafiles_install.py
-		tests/test_install.py
-	)
-
-	distutils_install_for_testing --via-venv
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.12.0-r1.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.12.0-r1.ebuild
index 9cd50e6689b6..3a0c512a5a7c 100644
--- a/dev-python/jupyter_packaging/jupyter_packaging-0.12.0-r1.ebuild
+++ b/dev-python/jupyter_packaging/jupyter_packaging-0.12.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab_pygments/Manifest b/dev-python/jupyterlab_pygments/Manifest
index b675c068a17e..664a8ff7a6eb 100644
--- a/dev-python/jupyterlab_pygments/Manifest
+++ b/dev-python/jupyterlab_pygments/Manifest
@@ -1,4 +1 @@
-DIST jupyterlab_pygments-0.1.2.tar.gz 561989 BLAKE2B 85d6b59b2c959f838746c7c6fed99ad5adda89a514a77327cc8e9ba7d6a91b1c0206d999c09149e6c5b9c67911ca16914f0b17a67b3505db73c23a7194fe4566 SHA512 0b4f4c13017f8afbd83e9fb575b3c4ee44272bc01421761ae7b140ecab743d825aa195432caa5f6153bda0ef84fe3ab92dad61ffd9b048927736a916dd267b5a
-DIST jupyterlab_pygments-0.2.0.tar.gz 132386 BLAKE2B db2b1677227fc1817769aaabd7f9e559871b13a9f937e76f5912a6e99fd186b19ce136712a01c8cd6db2b246fd2e7176b897164c9084781a59eb5f72c21577a1 SHA512 0ac05c3f31e554c51e889c4bf4af6ba3f787ef152a7a7e1862ff9dc46d89418bc3567c57e42b30f3134f1b56cc9c31a6d96ef76905fdb6ee39decfa8cf388ca6
-DIST jupyterlab_pygments-0.2.1.tar.gz 144325 BLAKE2B ee3f9d9789652ee7226cff550505113a7e5f779bbf58405d699bad44455e7448b16cdf607515528f7240dbb5008b0a3b8502c23caa842bf731b5e6a54bbcf7c7 SHA512 746b490cffba3fce133d09e209939f45d7080b778d9c78feeaeb4ca4e7ba34668499bdc7ab4c70a972caa1ed4b53e0e5d788802478c6047d93b577e618214027
 DIST jupyterlab_pygments-0.2.2.tar.gz 132378 BLAKE2B a9db4c3bfea9e8e6f357c90e9b1861cf2bcb796fe5d7ea9a0f02677773b18dd5a02966d8555cd17e8314b283056ac9423948077d6cdc127985f34a5faf892ec1 SHA512 59d328522b11ecae6ae67ef8f9eb7168b0e4241cc6a68765096bf0ad26a20489f302179d50e7e46efd5b9de711520e2c67ab1e634cc583416277a98a5f663daa
diff --git a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild
deleted file mode 100644
index 083e822a6f96..000000000000
--- a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Pygments theme making use of JupyterLab CSS variables"
-HOMEPAGE="https://github.com/jupyterlab/jupyterlab_pygments"
-SRC_URI="https://github.com/jupyterlab/jupyterlab_pygments/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.0.ebuild b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.0.ebuild
deleted file mode 100644
index c8ad4fe5dbdc..000000000000
--- a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=jupyter
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pygments theme making use of JupyterLab CSS variables"
-HOMEPAGE="
-	https://pypi.org/project/jupyterlab-pygments/
-	https://github.com/jupyterlab/jupyterlab_pygments/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/pygments[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.1.ebuild b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.1.ebuild
deleted file mode 100644
index c8ad4fe5dbdc..000000000000
--- a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=jupyter
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pygments theme making use of JupyterLab CSS variables"
-HOMEPAGE="
-	https://pypi.org/project/jupyterlab-pygments/
-	https://github.com/jupyterlab/jupyterlab_pygments/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/pygments[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.2.ebuild b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.2.ebuild
index c8ad4fe5dbdc..733c534b5a5c 100644
--- a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.2.ebuild
+++ b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab_pygments/metadata.xml b/dev-python/jupyterlab_pygments/metadata.xml
index 37bf538ddc2d..a0d4c5913ba0 100644
--- a/dev-python/jupyterlab_pygments/metadata.xml
+++ b/dev-python/jupyterlab_pygments/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
  <maintainer type="project">
   <email>python@gentoo.org</email>
-  <description>Python</description>
  </maintainer>
  
  <origin>gentoo-staging</origin>
diff --git a/dev-python/mdurl/Manifest b/dev-python/mdurl/Manifest
index d69412801d3c..d074177f4a22 100644
--- a/dev-python/mdurl/Manifest
+++ b/dev-python/mdurl/Manifest
@@ -1,2 +1 @@
-DIST mdurl-0.1.0.gh.tar.gz 16148 BLAKE2B d7b64313b346b5af550165fb7cb2f6af0575db3b0a9e1450097e30c6bc4e411affd62d5b40d6b335cc6491f826fbe5133cf229436acc5449d120f9847ff8d840 SHA512 773f868702276c05e635f8ccae1238cb0836107dccf0a9c179929acc008645e09c92e07bc102dd66e2df98e637665444ffe77860066eefbc5c747ebbb70cd595
 DIST mdurl-0.1.1.gh.tar.gz 15265 BLAKE2B 1a0126c674c69f43df08be248e88bc65529ea25703f6d43f1cd5917181b547b55541a4dae953a4e20e1f18bdc3eac17e54e6347d9e90fe2957c6935bee3edaf2 SHA512 ae7ee5672f59595d96fa3fd8b45154d3175881432dea60c72ef6dbd0b22124a20183539c83552bb9a8dfa1fc1c4ac3132201ce389a6678853c55c0224aa04622
diff --git a/dev-python/mdurl/mdurl-0.1.0.ebuild b/dev-python/mdurl/mdurl-0.1.0.ebuild
deleted file mode 100644
index 573546d31ada..000000000000
--- a/dev-python/mdurl/mdurl-0.1.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-DISTUTILS_USE_PEP517=flit
-inherit distutils-r1
-
-DESCRIPTION="Markdown URL utilities"
-HOMEPAGE="https://pypi.org/project/mdurl/ https://github.com/hukkin/mdurl"
-SRC_URI="https://github.com/hukkin/mdurl/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mdurl/mdurl-0.1.1.ebuild b/dev-python/mdurl/mdurl-0.1.1.ebuild
index f1fda1b6a3f9..314afb4409ec 100644
--- a/dev-python/mdurl/mdurl-0.1.1.ebuild
+++ b/dev-python/mdurl/mdurl-0.1.1.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/mechanize/Manifest b/dev-python/mechanize/Manifest
index a612b571d21c..784c48600ec0 100644
--- a/dev-python/mechanize/Manifest
+++ b/dev-python/mechanize/Manifest
@@ -1,2 +1 @@
-DIST mechanize-0.4.7.tar.gz 217289 BLAKE2B 9254cc88141b08bd9f97b63ac1dcb6b417e042cbefcf710ea9e1c340e8f6331ef9301a47bc6dd989970810ef36b97b867b81b3a44c9a4cdf283a77b04f25decd SHA512 f2796f322b1000818bcd4bcedf1d88538ba3a43151b74c950594a60dd7b5cf96ea4fcb605e30c93a5df095da35418401487928b9adfcca932e95dbf964d74c53
 DIST mechanize-0.4.8.tar.gz 218055 BLAKE2B bd91738092ac473ee6e65ee5f175479515f735a0433b112241f17061adf7e60ef6fa410fa549f088390b6ef6c8b2ff95e00335a626322ad170c88923c96e8e44 SHA512 71087481d27359b3ce795eae440ebb3a146f8dd5a6d5ac5dc91ae3c63f2c487beb472aa06b2925d6121faa038a0a8be50f6cecc54ee7209eb2b61e16242ffaa3
diff --git a/dev-python/mechanize/mechanize-0.4.7.ebuild b/dev-python/mechanize/mechanize-0.4.7.ebuild
deleted file mode 100644
index aea4c0f13a73..000000000000
--- a/dev-python/mechanize/mechanize-0.4.7.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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Stateful programmatic web browsing in Python"
-HOMEPAGE="https://github.com/python-mechanize/mechanize"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( BSD ZPL )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-	)
-"
-
-python_test() {
-	"${EPYTHON}" run_tests.py || die
-}
diff --git a/dev-python/mechanize/mechanize-0.4.8.ebuild b/dev-python/mechanize/mechanize-0.4.8.ebuild
index 1146eef414dd..825f95c6c942 100644
--- a/dev-python/mechanize/mechanize-0.4.8.ebuild
+++ b/dev-python/mechanize/mechanize-0.4.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( BSD ZPL )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index b3fcc240a040..e50566c9192b 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,3 +1 @@
-DIST nbformat-5.2.0.gh.tar.gz 133519 BLAKE2B aa9ff18ff879fe4b85af6d552a7d2f44d10bb96366e7af15214f7ae4c9d193a24bee8d0dc0ae1b71da13f44abaf4093e412f32b8357b4846985940c002a17b7e SHA512 55718e84a5125f8c28c8cd1be0725669f4d56bc22e6dd92b907a0e8cda27e17f8f56aad29806ee9f1c2c58641dd80455f04241fe5a54f8b6309575bb7656fc87
-DIST nbformat-5.3.0.gh.tar.gz 133531 BLAKE2B 7d4e0fdee7c2b5cfdb09bf90ff225b6be184cb6e02e36319e52c5a021283b2ae884c189f1e98a9fd40f1e12811bafe37cc59d27f1e34433d38c00e5fb0cc9fbe SHA512 50cb0b98501c2ee640ae1e6036346912ebc58f63faa8f1e4535681eb3f468072d5bc462d3788cc4233108612239fe03a1da41acfe30c915e13e7428f35415a91
 DIST nbformat-5.4.0.gh.tar.gz 134574 BLAKE2B f61275ad501381f05dc22a79f24c175fa71610f09cf125a40aaa90d0e02d3b27d82d918c1036b0516d4f879609f65c1ce62de86b033012e25d353af453828b2e SHA512 f601438193bfcb11f1ceed74995ab6862ff8c916f9bddabe38fd70bb997f4407bede4318ae7034d75424b20b75846010ddda2a45b8fe8de6dd9310617b00fb9d
diff --git a/dev-python/nbformat/nbformat-5.2.0.ebuild b/dev-python/nbformat/nbformat-5.2.0.ebuild
deleted file mode 100644
index 81dabac406fe..000000000000
--- a/dev-python/nbformat/nbformat-5.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Reference implementation of the Jupyter Notebook format"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="
-	https://github.com/jupyter/nbformat/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/fastjsonschema[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/numpydoc
-distutils_enable_tests pytest
diff --git a/dev-python/nbformat/nbformat-5.3.0-r1.ebuild b/dev-python/nbformat/nbformat-5.3.0-r1.ebuild
deleted file mode 100644
index 201cc7186450..000000000000
--- a/dev-python/nbformat/nbformat-5.3.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Reference implementation of the Jupyter Notebook format"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="
-	https://github.com/jupyter/nbformat/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/fastjsonschema[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/numpydoc
-distutils_enable_tests pytest
diff --git a/dev-python/nbformat/nbformat-5.4.0.ebuild b/dev-python/nbformat/nbformat-5.4.0.ebuild
index 5d18f18322cb..ae8e05ff6022 100644
--- a/dev-python/nbformat/nbformat-5.4.0.ebuild
+++ b/dev-python/nbformat/nbformat-5.4.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/fastjsonschema[${PYTHON_USEDEP}]
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 8d4d93fee4a9..6811d131b64c 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,2 +1 @@
-DIST networkx-2.7.1.tar.gz 1923431 BLAKE2B 0b30a9cebc10708efdd446a688ee9a60523a06adf450af1b5a4726fe66b5041ef8c30625012c790042068aa9d5ac555ab814c3cce510365528d21afbe5007a89 SHA512 16b988d0b7faabc4126355a7530431d3a3870517812314097b73d1e3d0a02dc7cbf82d0e99db4a038dc3a23d72cf1a1712a17c925dfed360be2bf27cf01e9c42
 DIST networkx-2.8.tar.gz 1937426 BLAKE2B 5a094177ed480c6f7cbdacb6795fc4f2e0aec53ed89a33e19d78f47830d46238f35b7cd76098f6e00397f7cbdf305256910b7930cbb2c775ed4c2b18d9bd596f SHA512 72cd6637faa4228f6c802cf36935b5460fdf9b6cf191c3b375810bfc3732823e3286bdc1e6cbf7e6a7ffde83d0cf3bca157ae27ff98c537d43fdb4b8ef45ef4b
diff --git a/dev-python/networkx/networkx-2.7.1.ebuild b/dev-python/networkx/networkx-2.7.1.ebuild
deleted file mode 100644
index e4e9ac0e1f28..000000000000
--- a/dev-python/networkx/networkx-2.7.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="https://networkx.org/ https://github.com/networkx/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/numpy-1.19[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	virtx epytest -p no:django
-}
-
-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/networkx/networkx-2.8.ebuild b/dev-python/networkx/networkx-2.8.ebuild
index b91a9ab92c5e..e4e9ac0e1f28 100644
--- a/dev-python/networkx/networkx-2.8.ebuild
+++ b/dev-python/networkx/networkx-2.8.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/nptyping/Manifest b/dev-python/nptyping/Manifest
index 1e067e009479..709091022920 100644
--- a/dev-python/nptyping/Manifest
+++ b/dev-python/nptyping/Manifest
@@ -1,3 +1 @@
-DIST nptyping-1.4.4.gh.tar.gz 48098 BLAKE2B e13e7d6189a1ac826e8ea66918c006a63f0ec584e6d61cc7e0393b9a10709b41f75b43548ac94ce762c5180dc716e0717316573d45e8bec8951188d5df9bc1ad SHA512 4dd124734fde7e19867af0efd0c3a79f220b20576cb2f34a1cfb5e47c4fde44e936dca708d68bef99eb554afe7576f7fee447d6dd73f3c136340c8f48770f7b8
-DIST nptyping-2.0.0.gh.tar.gz 54691 BLAKE2B 05343da5b1b36ea0b06267ce0c8108b2e236c8d4124872da2ae5858b3fe9c06875846fdd07960abcc9bc961e468e1883a5da6b50d12e74b7628aacec9c1c1e16 SHA512 e7de94e93896af34285117be61799ee971cb2fabe87e8f04473393a042b299765e91ad7cf2d07339d2d1b7cee117e42ecea28197adda6de54686154e21754dc0
 DIST nptyping-2.0.1.gh.tar.gz 54790 BLAKE2B 75aadc4310dc3e5262aa8f007bc65584ee110fd0f2c1d0737c35a0c57bb0f0a5191f0260dbc0a6c80cab0f546d1e3ade219d6b6318cc2d195ba0579318c20841 SHA512 d832cc0d701a36a94c97bc6db2445c7ff72ec7c41fbcb48ea2006fa201bfca169012be9501029f77f4da7a2fd126227292bd16ba5d0bd7cb6924e3eb74cfaa01
diff --git a/dev-python/nptyping/nptyping-1.4.4.ebuild b/dev-python/nptyping/nptyping-1.4.4.ebuild
deleted file mode 100644
index d62f6eadc0fd..000000000000
--- a/dev-python/nptyping/nptyping-1.4.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Type hints for Numpy"
-HOMEPAGE="https://pypi.org/project/nptyping/
-	https://github.com/ramonhagenaars/nptyping"
-SRC_URI="
-	https://github.com/ramonhagenaars/nptyping/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"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/typish[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/nptyping/nptyping-2.0.0.ebuild b/dev-python/nptyping/nptyping-2.0.0.ebuild
deleted file mode 100644
index 332aee91e13e..000000000000
--- a/dev-python/nptyping/nptyping-2.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Type hints for Numpy"
-HOMEPAGE="
-	https://pypi.org/project/nptyping/
-	https://github.com/ramonhagenaars/nptyping/
-"
-SRC_URI="
-	https://github.com/ramonhagenaars/nptyping/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"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		dev-python/mypy[${PYTHON_USEDEP}]
-		dev-python/typeguard[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# TODO: package beartype?
-	tests/test_beartype.py
-	# relies on Internet access to fetch packages for pip
-	tests/test_wheel.py
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/nptyping/nptyping-2.0.1.ebuild b/dev-python/nptyping/nptyping-2.0.1.ebuild
index 2cdc8545d4e0..457490b41fe7 100644
--- a/dev-python/nptyping/nptyping-2.0.1.ebuild
+++ b/dev-python/nptyping/nptyping-2.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/pmw/pmw-2.0.1-r2.ebuild b/dev-python/pmw/pmw-2.0.1-r2.ebuild
deleted file mode 100644
index 70a4f794dde5..000000000000
--- a/dev-python/pmw/pmw-2.0.1-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="tk"
-
-inherit distutils-r1 virtualx
-
-MY_PN="Pmw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Toolkit for building high-level compound Python widgets using the Tkinter module"
-HOMEPAGE="http://pmw.sourceforge.net/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="py3"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc test"
-
-DEPEND="!dev-python/pmw:0"
-RDEPEND="${DEPEND}"
-# https://sourceforge.net/p/pmw/bugs/39/
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	VIRTUALX_COMMAND="${PYTHON}"
-	cd "${BUILD_DIR}/lib/Pmw/Pmw_${PV//./_}/" || die
-	cp tests/{flagup.bmp,earthris.gif} . || die
-	for test in tests/*_test.py; do
-		echo "running test "$test
-		PYTHONPATH=tests:../../ virtx emake -j1 $test || die
-	done
-}
-
-python_install_all() {
-	local DIR="Pmw/Pmw_${PV//./_}"
-
-	use doc && HTML_DOCS=( "${DIR}"/doc/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pmw/pmw-2.0.1-r3.ebuild b/dev-python/pmw/pmw-2.0.1-r3.ebuild
index 9205fd83ffc0..595bfaf8c735 100644
--- a/dev-python/pmw/pmw-2.0.1-r3.ebuild
+++ b/dev-python/pmw/pmw-2.0.1-r3.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="py3"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc test"
 # https://sourceforge.net/p/pmw/bugs/39/
 RESTRICT="test"
diff --git a/dev-python/puremagic/Manifest b/dev-python/puremagic/Manifest
index 646bf60e86db..209f64893b09 100644
--- a/dev-python/puremagic/Manifest
+++ b/dev-python/puremagic/Manifest
@@ -1,3 +1,4 @@
 DIST puremagic-1.11.tar.gz 295026 BLAKE2B 4d210807d9f5eb0c2eb88b0c18aa5cdf56170b347de4f95b92c08492d5f038759b39c1aa2d6ed4bc91e96e036e6f4d0891449af8aee3beac65c4d692fa295ec0 SHA512 4d4c9a93cd56a02aefb7090c92b41048f33923bef14022158f39c39ac93326b7180b8cc97495ad5ed3eec7d9f1379a5508829ee779aaba9b8aa8f975e787b1f5
 DIST puremagic-1.12.tar.gz 296831 BLAKE2B cd9979fba1016b1c4cbdd9ef1402d11dbe2faf37767e3232cf400b798cce328d90d224765cc2bf39fd0988abdfe39d1527dd7aa6e31b4737d00c1578f1cc3101 SHA512 b50e22b7597f206e8d6dbc0e2c120af21a7246568f059c6145e45471eedf04c797a9f00864468d5e05c9536f49f7fc6c7b30a83e67bf248e10ebaf8300726fde
 DIST puremagic-1.13.gh.tar.gz 300110 BLAKE2B d436735126d465cd43bc5537b2fb9385297d626b19b5b881c63fc7f3559600c9318c7ad91955cf66df2962ad122d2b42919bdee4460bc16ddb7750d4ffdc2fa2 SHA512 495777751874d4f2213b8bedb4bc3b2cdfdcacc5a1dd7cad85545fce473b8beca9a38fbe513d26c37455686265482b8bde7024111e76501d489aee7e5750d97f
+DIST puremagic-1.14.gh.tar.gz 295823 BLAKE2B b505f34d6744a0c9aa3a0c43846c150c9e1101884a825507b0941da84b181c1ed620dcf5457a5e60ec1fa5c93203d755297c4e3b37d311537dc6a248daf3031e SHA512 00d008f70849179a67a1794740cb34bd28386036e54a9c3f54aefb24c7fb6adccb624e0546ca86863e913c7178b6590473c3ce4fda906e9fd9306be483de28ec
diff --git a/dev-python/puremagic/puremagic-1.14.ebuild b/dev-python/puremagic/puremagic-1.14.ebuild
new file mode 100644
index 000000000000..91ed793e4648
--- /dev/null
+++ b/dev-python/puremagic/puremagic-1.14.ebuild
@@ -0,0 +1,27 @@
+# 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="Pure python implementation of magic file detection"
+HOMEPAGE="
+	https://github.com/cdgriffith/puremagic/
+	https://pypi.org/project/puremagic/
+"
+SRC_URI="
+	https://github.com/cdgriffith/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( CHANGELOG.md README.rst )
+
+distutils_enable_tests pytest
diff --git a/dev-python/pygpgme/pygpgme-0.3-r4.ebuild b/dev-python/pygpgme/pygpgme-0.3-r5.ebuild
index 1424635c2ea5..ac3ebc428178 100644
--- a/dev-python/pygpgme/pygpgme-0.3-r4.ebuild
+++ b/dev-python/pygpgme/pygpgme-0.3-r5.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
-DEPEND="app-crypt/gpgme:="
+DEPEND="app-crypt/gpgme:=[python,${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 
 python_configure_all() {
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index e07953887f28..d580319529e8 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,2 +1 @@
-DIST pyicu-v2.8.1.tar.bz2 242774 BLAKE2B eeb3c45124301b7072addcbfc3c97521d21fbdb5bdf2b0fe94f0181c225927a0b3bd6ab6271140fa9928d0220e5cb33c800b367cf4b0cf844ad64a2438aa016b SHA512 dc7fb292322c565da045db9d91e9b4cd58a559d6f78bf3f050bf25fbab942179b463b977340e08bbeb107e3a2be8a2eb0a0a91911e0c0b8b96327ba85fd13c46
 DIST pyicu-v2.9.tar.bz2 243533 BLAKE2B c2ea32f69637e2d12a57ded96b570ba7fd41c92aed4a0dea36ebe5c224b80fa8d1672251f8218e0a35d463957ab4291cff778c3e690f0763e465dc6f0a1af26d SHA512 f10025afe1a0de5a1726c3d4aaec5b10ba62064c33205117efe643185dcd3560e8971b600606e9699269cca795477bf86ed2f9e604e9c0e04bb75a86f31cd114
diff --git a/dev-python/pyicu/pyicu-2.8.1.ebuild b/dev-python/pyicu/pyicu-2.8.1.ebuild
deleted file mode 100644
index 5a6096ead2cf..000000000000
--- a/dev-python/pyicu/pyicu-2.8.1.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/-v}
-DESCRIPTION="Python bindings for dev-libs/icu"
-HOMEPAGE="
-	https://gitlab.pyicu.org/main/pyicu/
-	https://pypi.org/project/PyICU/"
-SRC_URI="
-	https://gitlab.pyicu.org/main/pyicu/-/archive/v${PV}/${MY_P}.tar.bz2"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="dev-libs/icu:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? ( dev-python/six[${PYTHON_USEDEP}] )"
-
-DOCS=( CHANGES CREDITS README.md )
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyicu/pyicu-2.9.ebuild b/dev-python/pyicu/pyicu-2.9.ebuild
index 24226b2c3258..efaaf13474b0 100644
--- a/dev-python/pyicu/pyicu-2.9.ebuild
+++ b/dev-python/pyicu/pyicu-2.9.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	dev-libs/icu:=
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index 9f35e7582c8a..e66544e65c5f 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,2 +1 @@
-DIST pylast-4.5.0.tar.gz 40175 BLAKE2B 394a6329d0c7f03ae70cf7ee5e19e310d4fc4b70f86a6e8ed66ad93674465433ff7ab06cfbfa82fd33302a6d85b9fe582402c2166746e7853d1bada9de5f2449 SHA512 c885f0ea415c2a6b96454abdbcef0b61732a5253ddff45a03d85a2b7d733f6bff47d1806576e4acc6d07763e404985e5c35341e37b88d586d1cbec811d984551
 DIST pylast-5.0.0.tar.gz 39868 BLAKE2B 0cb6d96ac74a2e62325b8a91cc3601ab4ea7ea629ef40c02ce1afe13fd067abc48f24092138fc4584382c9c7f8c62eb070f1a3173b39768ac4ff8e3904c255d2 SHA512 ebad77e66d39b5625d0afae3bba346769159f39dfbbca0fea6aa0e6ad683fea6ea04093dd4738e378ac419edcc9970e8070d7ff912cc08110a5f41f7993489ce
diff --git a/dev-python/pylast/pylast-4.5.0.ebuild b/dev-python/pylast/pylast-4.5.0.ebuild
deleted file mode 100644
index c56db83913cd..000000000000
--- a/dev-python/pylast/pylast-4.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to last.fm and other api-compatible websites"
-HOMEPAGE="https://github.com/pylast/pylast"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/flaky[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pylast/pylast-5.0.0.ebuild b/dev-python/pylast/pylast-5.0.0.ebuild
index 0ccdc15bd11b..266d4009160b 100644
--- a/dev-python/pylast/pylast-5.0.0.ebuild
+++ b/dev-python/pylast/pylast-5.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/httpx[${PYTHON_USEDEP}]
diff --git a/dev-python/pyte/Manifest b/dev-python/pyte/Manifest
index 076cb42d1e8f..65d87f2c846d 100644
--- a/dev-python/pyte/Manifest
+++ b/dev-python/pyte/Manifest
@@ -1,2 +1 @@
-DIST pyte-0.8.0.tar.gz 91320 BLAKE2B b973050912c7d3b67393208a5b17f382705fe78964528e003b71addc12586353a3a9c7eeb68c224dfb945b5f9d3b52823cd254885dd5ac6901be119583a71a2e SHA512 c488fd0a61c1dc34b27e12ed9ba1109bb2c331626c982da06e7540bdd168008cb5106a17c71e60e38c493f2dd9f21ba3cf05118928744dfa192d62e511b4c4e8
 DIST pyte-0.8.1.gh.tar.gz 92220 BLAKE2B f4f803ecbf9bc62936ea499929b7fb976c14ee09fe00ee56d5499bb2543a6ac769dd7c87e177c297bbf8ab082c34f154a26daf3a1c84917249400b09556c2b80 SHA512 f49d9394cca92c27fdd5319bdce164d5cac63b77d13156de7105bee6087a615e844fafa8507089c8bf6cf31a796cc858a3ccf597aa23cfa595d0d9e0adfab5d4
diff --git a/dev-python/pyte/metadata.xml b/dev-python/pyte/metadata.xml
index 853174b8f2ab..ea8988e8af6a 100644
--- a/dev-python/pyte/metadata.xml
+++ b/dev-python/pyte/metadata.xml
@@ -7,4 +7,5 @@
  </maintainer>
  
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/pyte/pyte-0.8.0-r1.ebuild b/dev-python/pyte/pyte-0.8.0-r1.ebuild
deleted file mode 100644
index f0424253d831..000000000000
--- a/dev-python/pyte/pyte-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple VTXXX-compatible terminal emulator"
-HOMEPAGE="https://pypi.org/project/pyte/ https://github.com/selectel/pyte"
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-# use github tarball as pypi is missing test data
-SRC_URI="https://github.com/selectel/pyte/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-3"
-KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# run pytest directly for tests
-	sed -i '/setup_requires=\["pytest-runner"\]/d' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyte/pyte-0.8.1.ebuild b/dev-python/pyte/pyte-0.8.1.ebuild
index 210a535b5bae..af8f1ef3c098 100644
--- a/dev-python/pyte/pyte-0.8.1.ebuild
+++ b/dev-python/pyte/pyte-0.8.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.20.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.20.0.ebuild
index df8f021a27f2..32bfe5e981c2 100644
--- a/dev-python/pytest-httpx/pytest-httpx-0.20.0.ebuild
+++ b/dev-python/pytest-httpx/pytest-httpx-0.20.0.ebuild
@@ -10,9 +10,13 @@ inherit distutils-r1
 
 MY_PN="${PN/-/_}"
 DESCRIPTION="Send responses to HTTPX using pytest"
-HOMEPAGE="https://colin-b.github.io/pytest_httpx/"
+HOMEPAGE="
+	https://colin-b.github.io/pytest_httpx/
+	https://github.com/Colin-b/pytest_httpx/
+	https://pypi.org/project/pytest-httpx/
+"
 SRC_URI="
-	https://github.com/Colin-b/${MY_PN}/archive/v${PV}.tar.gz
+	https://github.com/Colin-b/pytest_httpx/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 "
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/pytest-localftpserver/Manifest b/dev-python/pytest-localftpserver/Manifest
index 0bff5dd82d10..6ca729245df6 100644
--- a/dev-python/pytest-localftpserver/Manifest
+++ b/dev-python/pytest-localftpserver/Manifest
@@ -1 +1,2 @@
 DIST pytest_localftpserver-1.1.2.tar.gz 41275 BLAKE2B ddab430541208ea7e30b7091f0e5ed1ff347c4f289c79e1bf93e7fc56ac3d9076065afefb383e8e394cf702ce906747c7450acc0423df73cba5762cac01efec2 SHA512 44dfb4e680f82d6156212a06e320d437c5aa947b149177bb05a612473f882e0d2e8ff02751d0f79d56596cada82a299c9266b5849220687cea1028df7ca1bb00
+DIST pytest_localftpserver-1.1.3.tar.gz 44510 BLAKE2B 98085adc5dd31bb6556ea1f31c6342e8453a07c24658baf5fe94e91a001e9b88c5f6ef01a3a8419bd7b1bd3eb053ef52788c80926c5984b523d9f575224ff6ec SHA512 8058f7c6853acf709fdf4e0ce169af4281e2236a615261c0e148965dc1899af78b558ae5231600a106c538c1790ad886bea80ba7ebf278c70b6d553e58c0202b
diff --git a/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.3.ebuild b/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.3.ebuild
new file mode 100644
index 000000000000..ea61cdc3b163
--- /dev/null
+++ b/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.3.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
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A PyTest plugin which provides an FTP fixture for your tests"
+HOMEPAGE="https://pypi.org/project/pytest-localserver/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="dev-python/pyftpdlib[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+EPYTEST_IGNORE=(
+	# These tests require python wget module, but not in Portage
+	tests/test_pytest_localftpserver.py
+	tests/test_pytest_localftpserver_TLS.py
+	tests/test_pytest_localftpserver_with_env_var.py
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-toolbox/metadata.xml b/dev-python/pytest-toolbox/metadata.xml
index 161bf0562d10..42803984458e 100644
--- a/dev-python/pytest-toolbox/metadata.xml
+++ b/dev-python/pytest-toolbox/metadata.xml
@@ -7,4 +7,5 @@
  </maintainer>
  
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/pytest-toolbox/pytest-toolbox-0.4-r1.ebuild b/dev-python/pytest-toolbox/pytest-toolbox-0.4-r1.ebuild
index 0b404b7e4918..de5fde327ea2 100644
--- a/dev-python/pytest-toolbox/pytest-toolbox-0.4-r1.ebuild
+++ b/dev-python/pytest-toolbox/pytest-toolbox-0.4-r1.ebuild
@@ -9,7 +9,10 @@ PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Numerous useful plugins for pytest"
-HOMEPAGE="https://pypi.org/project/pytest-toolbox/ https://github.com/samuelcolvin/pytest-toolbox/"
+HOMEPAGE="
+	https://github.com/samuelcolvin/pytest-toolbox/
+	https://pypi.org/project/pytest-toolbox/
+"
 SRC_URI="
 	https://github.com/samuelcolvin/pytest-toolbox/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
@@ -17,11 +20,14 @@ SRC_URI="
 
 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"
 
 BDEPEND="
 	test? (
-		dev-python/pydantic[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pydantic[${PYTHON_USEDEP}]
+		' pypy3 python3_{8..10}  # TODO: python3_11
+		)
 	)
 "
 
@@ -31,3 +37,12 @@ src_prepare() {
 	sed -e '/addopts/d' -i setup.cfg || die
 	distutils-r1_src_prepare
 }
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	if ! has_version "dev-python/pydantic[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/test_comparison.py::test_close_to_now_{false,true}
+		)
+	fi
+}
diff --git a/dev-python/pytest-toolbox/pytest-toolbox-0.4.ebuild b/dev-python/pytest-toolbox/pytest-toolbox-0.4.ebuild
deleted file mode 100644
index eaa326f9edbe..000000000000
--- a/dev-python/pytest-toolbox/pytest-toolbox-0.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Numerous useful plugins for pytest"
-HOMEPAGE="https://pypi.org/project/pytest-toolbox/ https://github.com/samuelcolvin/pytest-toolbox/"
-SRC_URI="
-	https://github.com/samuelcolvin/pytest-toolbox/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/pydantic[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/addopts/d' -i setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 38e7728d3ef9..df208a565747 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,3 +1 @@
-DIST pytest-7.0.1.tar.gz 1249154 BLAKE2B fcaef6afc6e98f6716a80f6451671b2abbf9ad676330a6e66e917a73e018eef966de8e7ef7ab48a1213167476eef1eb37cc5e84ec2bd9e5eab4ec6f1a8071c87 SHA512 21493717159a64fe6467bd096b578b127d81438d04f5b03ba2f4047237054f865a1f50a4e291b9d95b1a144f59bc7a8b3a00008493f4fb4f14bff7fb65c5edc2
-DIST pytest-7.1.1.tar.gz 1255528 BLAKE2B cc70b61ab863c19db62fc765c1819624d2e330116e4c8561693a895d3157ea6011a9f2db4e96f22cb802b295ae841c81e71a741cec8f64d4b7f70c539356fa7e SHA512 53fd016f030ac0394ac686a3756fad05efca8363d6b93df04f90732efea7643cdbba9501dad6d9055d314fcaec0887674496d56986efeb73915976276bf0a700
 DIST pytest-7.1.2.tar.gz 1256241 BLAKE2B c59e477ba52f2ff6f9885b91bbdc9b70dd4ffced3902417cd2e8cf28ba778e92ab5738f1be4d1c8c5c41c7140ac56622b6d44261d618426ae39fd00026bf139c SHA512 e61c9b0a8fc053626da307d6bac1f5caab451c4948ef7c7f2e2f991c3433a55f81ec0d9412fca646c02f22e695c71e873ee48fc0ab0aad337ce01b70628df494
diff --git a/dev-python/pytest/pytest-7.0.1.ebuild b/dev-python/pytest/pytest-7.0.1.ebuild
deleted file mode 100644
index 8a95ec7cf996..000000000000
--- a/dev-python/pytest/pytest-7.0.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 multiprocessing
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="https://pytest.org/"
-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 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/iniconfig[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	>=dev-python/py-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-6.2.3[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-	)"
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x COLUMNS=80
-
-	local EPYTEST_DESELECT=(
-		# broken by epytest args
-		testing/test_warnings.py::test_works_with_filterwarnings
-
-		# tend to be broken by random pytest plugins
-		# (these tests patch PYTEST_DISABLE_PLUGIN_AUTOLOAD out)
-		testing/test_helpconfig.py::test_version_less_verbose
-		testing/test_helpconfig.py::test_version_verbose
-		testing/test_junitxml.py::test_random_report_log_xdist
-		testing/test_junitxml.py::test_runs_twice_xdist
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal_count
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_verbose
-		testing/test_terminal.py::TestProgressWithTeardown::test_xdist_normal
-		testing/test_terminal.py::TestTerminalFunctional::test_header_trailer_info
-		testing/test_terminal.py::TestTerminalFunctional::test_no_header_trailer_info
-
-		# unstable with xdist
-		testing/test_terminal.py::TestTerminalFunctional::test_verbose_reporting_xdist
-	)
-
-	epytest -p xdist -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/pytest/pytest-7.1.1.ebuild b/dev-python/pytest/pytest-7.1.1.ebuild
deleted file mode 100644
index 72dbe165a882..000000000000
--- a/dev-python/pytest/pytest-7.1.1.ebuild
+++ /dev/null
@@ -1,84 +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 multiprocessing
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="https://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/iniconfig[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	>=dev-python/py-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-6.2.3[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-	)"
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x COLUMNS=80
-
-	local EPYTEST_DESELECT=(
-		# broken by epytest args
-		testing/test_warnings.py::test_works_with_filterwarnings
-
-		# tend to be broken by random pytest plugins
-		# (these tests patch PYTEST_DISABLE_PLUGIN_AUTOLOAD out)
-		testing/test_helpconfig.py::test_version_less_verbose
-		testing/test_helpconfig.py::test_version_verbose
-		testing/test_junitxml.py::test_random_report_log_xdist
-		testing/test_junitxml.py::test_runs_twice_xdist
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal_count
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_verbose
-		testing/test_terminal.py::TestProgressWithTeardown::test_xdist_normal
-		testing/test_terminal.py::TestTerminalFunctional::test_header_trailer_info
-		testing/test_terminal.py::TestTerminalFunctional::test_no_header_trailer_info
-
-		# unstable with xdist
-		testing/test_terminal.py::TestTerminalFunctional::test_verbose_reporting_xdist
-	)
-
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		# regressions on pypy3.9
-		# https://github.com/pytest-dev/pytest/issues/9787
-		testing/test_skipping.py::test_errors_in_xfail_skip_expressions
-		testing/test_unraisableexception.py
-	)
-
-	epytest -p xdist -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/pytest/pytest-7.1.2.ebuild b/dev-python/pytest/pytest-7.1.2.ebuild
index f712f9aa1afd..68eb2074ea13 100644
--- a/dev-python/pytest/pytest-7.1.2.ebuild
+++ b/dev-python/pytest/pytest-7.1.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest
index 4d29d01ab4f8..52e44516f7ff 100644
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@@ -1,2 +1 @@
-DIST python-dotenv-0.19.2.tar.gz 31508 BLAKE2B f92285090b680d3cbf842f99b6ca49ab9af877a1ed6543cbc3a41ba592240739fdf94f2ea21f2e2e3c9b9e68eeb36c5b1c12004fa953674e3f47942176e125c6 SHA512 da411fa02326ec7407bbb6760dd4e5f22eaca60d725ade3ac89302ec4e33d00fe8c231e8a64d0bc22698a93701143085c098b6703e598c6d8c2e4c57b9bafa20
 DIST python-dotenv-0.20.0.tar.gz 32069 BLAKE2B 360c878241fe4df4cee2ef59a2a4967e3b5fff7250297e4adb4b7f2c50deaf66bdc76b97bc9a1998bcf3d7da7c5e40c98f93d3e3cc044a2e73e159a85a2d93fa SHA512 85e3953f296ec59130ea212b794557d479efde0ef519303dd3a8fe8da0be2d445728b9b8fd5a4bc13372a0fa322f49d290038538ddca580841d0df1f3758f0b7
diff --git a/dev-python/python-dotenv/files/python-dotenv-0.19.2-entry-points.patch b/dev-python/python-dotenv/files/python-dotenv-0.19.2-entry-points.patch
deleted file mode 100644
index a01806fbc8c1..000000000000
--- a/dev-python/python-dotenv/files/python-dotenv-0.19.2-entry-points.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/setup.py b/setup.py
-index a8122d3..c7bfe82 100644
---- a/setup.py
-+++ b/setup.py
-@@ -36,10 +36,12 @@ setup(
-     extras_require={
-         'cli': ['click>=5.0', ],
-     },
--    entry_points='''
--        [console_scripts]
--        dotenv=dotenv.cli:cli
--    ''',
-+    entry_points={
-+        "console_scripts": [
-+            "dotenv=dotenv.cli:cli",
-+            "python-dotenv=dotenv.cli:cli",
-+        ],
-+    },
-     license='BSD-3-Clause',
-     classifiers=[
-         'Development Status :: 5 - Production/Stable',
diff --git a/dev-python/python-dotenv/python-dotenv-0.19.2-r2.ebuild b/dev-python/python-dotenv/python-dotenv-0.19.2-r2.ebuild
deleted file mode 100644
index 8ca7f0229246..000000000000
--- a/dev-python/python-dotenv/python-dotenv-0.19.2-r2.ebuild
+++ /dev/null
@@ -1,44 +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="Manage .env files"
-HOMEPAGE="https://github.com/theskumar/python-dotenv"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-DEPEND="
-	test? (
-		>=dev-python/click-5[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/sh-1.09[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( CHANGELOG.md README.md )
-
-PATCHES=(
-	# rename the entry point (note: old name is needed in tests)
-	# https://bugs.gentoo.org/798648
-	# also fix syntax since it doesn't seem to work anymore
-	# https://bugs.gentoo.org/833389
-	"${FILESDIR}"/python-dotenv-0.19.2-entry-points.patch
-)
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-
-	# Avoid collision with dev-ruby/dotenv (bug #798648)
-	rm "${D}"/usr/bin/dotenv || die
-}
diff --git a/dev-python/python-dotenv/python-dotenv-0.20.0.ebuild b/dev-python/python-dotenv/python-dotenv-0.20.0.ebuild
index 58092b21b320..faab01259c9d 100644
--- a/dev-python/python-dotenv/python-dotenv-0.20.0.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.20.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 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"
 
 DEPEND="
 	test? (
diff --git a/dev-python/python-email-validator/Manifest b/dev-python/python-email-validator/Manifest
index 269f89a55846..b21b5e7cbffb 100644
--- a/dev-python/python-email-validator/Manifest
+++ b/dev-python/python-email-validator/Manifest
@@ -1,3 +1,2 @@
 DIST python-email-validator-1.1.3.tar.gz 19863 BLAKE2B 10700b4c6a48c50095045b6e3c9218cd565776b26e17c1c043633e208b9fbd346162cedaa4a1116ec2fccf63b4383438c7e1aef6faf9d2ead5512af7f934675c SHA512 d9087bf56783daf389909e13652a9db8f0408badf454f6239aa20f6a5e9510619d3662cf1567a03d0b14c4bbe81644509cd12975b2aa1b544d644b6c2b2854f4
-DIST python-email-validator-1.2.0.tar.gz 22603 BLAKE2B cc2364e903cf4f1c3983ad4764a46a317188353899f8cd929c72c60387a25a819405b0cf8253488fa11e4ce9be48df98c64bdc0c3df1664a74c2e6c9c4389e6a SHA512 3c4f87e0992615ae4d1f44e6e0fe9909b43d5810f2aca96129f5ee4dcadac7b4ec5a979dbf6e03f60b8bda2ff0d7cf87f9276c4b4c624e2d036627e2d5d8afad
 DIST python-email-validator-1.2.1.gh.tar.gz 24348 BLAKE2B 7cd19c07bd0b8c467c0f0ec15376f0677305c6025eff5a86854dfd7cad3fe6971e218e724d86d4040af3f590fe5e841e469dea7dc8526031dccb494845848630 SHA512 e758518ef114e08cca0f83c681e6ff7ec6fad54c1e0bba727ee0f8917e93040ed3873ba0207e21a4830208d98637937294c5c28d67c317dc4ad3351c7d3f99a4
diff --git a/dev-python/python-email-validator/python-email-validator-1.2.0.ebuild b/dev-python/python-email-validator/python-email-validator-1.2.0.ebuild
deleted file mode 100644
index 7eb92aa5e05a..000000000000
--- a/dev-python/python-email-validator/python-email-validator-1.2.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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A robust email syntax and deliverability validation library"
-HOMEPAGE="
-	https://github.com/JoshData/python-email-validator/
-	https://pypi.org/project/email-validator/
-"
-SRC_URI="https://github.com/JoshData/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# these tests rely on access to gmail.com
-	tests/test_main.py::test_deliverability_no_records
-	tests/test_main.py::test_deliverability_found
-	tests/test_main.py::test_deliverability_fails
-	tests/test_main.py::test_validate_email__with_caching_resolver
-	tests/test_main.py::test_validate_email__with_configured_resolver
-	# these tests rely on example.com being resolvable
-	tests/test_main.py::test_main_single_good_input
-	tests/test_main.py::test_main_multi_input
-	tests/test_main.py::test_main_input_shim
-)
diff --git a/dev-python/python-lsp-black/Manifest b/dev-python/python-lsp-black/Manifest
index 3647d928ca82..1764ee4a7edc 100644
--- a/dev-python/python-lsp-black/Manifest
+++ b/dev-python/python-lsp-black/Manifest
@@ -1,2 +1 @@
-DIST python-lsp-black-1.2.0.gh.tar.gz 9226 BLAKE2B a9efe698c32ac86060f360e1d1129620783d0dd1588cf16b6f96a4f805845d5c94e862b265d63643e877afc68916ad0fbbe922fc0c17e224ea08f61756a3fb41 SHA512 b5f999b0e02abc63dc194a2973f028aa5f74b3110d0ac35e6aefb45a4260bf3fb5b1f142f71a85feec431765af98409977a47039d28a79cfac5746cc677794c7
 DIST python-lsp-black-1.2.1.gh.tar.gz 9355 BLAKE2B f9c70ff07d9dfa31e3af919143deb8a49f43269469e8c64525f514624f4db67636da8254dae5274685ba2d883c8ddfd6dd9cb99981a337d7837d4007f15af11c SHA512 289b8f3642ed806409671d25e32997fb473720d0abd642c58c07d8c894831fa00f56dbc39e7d0fc8d98cad7de9f95ebdb6a0f637b8b4bbcc2a0716690feb647e
diff --git a/dev-python/python-lsp-black/python-lsp-black-1.2.0.ebuild b/dev-python/python-lsp-black/python-lsp-black-1.2.0.ebuild
deleted file mode 100644
index 8a4bce0cedbb..000000000000
--- a/dev-python/python-lsp-black/python-lsp-black-1.2.0.ebuild
+++ /dev/null
@@ -1,36 +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="Black plugin for the Python LSP Server"
-HOMEPAGE="
-	https://github.com/python-lsp/python-lsp-black/
-	https://pypi.org/project/python-lsp-black/
-"
-SRC_URI="
-	https://github.com/python-lsp/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/python-lsp-server-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/black-22.1.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/toml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-lsp-black/python-lsp-black-1.2.1.ebuild b/dev-python/python-lsp-black/python-lsp-black-1.2.1.ebuild
index da345517f9d8..1b26b9e4c221 100644
--- a/dev-python/python-lsp-black/python-lsp-black-1.2.1.ebuild
+++ b/dev-python/python-lsp-black/python-lsp-black-1.2.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/python-lsp-server-1.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-magic/python-magic-0.4.25.ebuild b/dev-python/python-magic/python-magic-0.4.25.ebuild
index f7b867edc065..b2e687bdad7f 100644
--- a/dev-python/python-magic/python-magic-0.4.25.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.25.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r2.ebuild b/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r2.ebuild
index 0296feb6cd45..49bae1782626 100644
--- a/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r2.ebuild
+++ b/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r2.ebuild
@@ -5,14 +5,18 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
 inherit distutils-r1
 
 MY_P=${P/_p/.post}
 
 DESCRIPTION="Shims to make deprecation of pytz easier"
-HOMEPAGE="https://pypi.org/project/pytz-deprecation-shim/ https://github.com/pganssle/pytz-deprecation-shim"
+HOMEPAGE="
+	https://github.com/pganssle/pytz-deprecation-shim/
+	https://pypi.org/project/pytz-deprecation-shim/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -21,14 +25,13 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s3
 RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
-	' python3_8 pypy3)
+	' 3.8)
 	sys-libs/timezone-data
 "
 BDEPEND="
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/re-assert/re-assert-1.1.0-r1.ebuild b/dev-python/re-assert/re-assert-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..cdb63e206a73
--- /dev/null
+++ b/dev-python/re-assert/re-assert-1.1.0-r1.ebuild
@@ -0,0 +1,29 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Show where your regex match assertion failed"
+HOMEPAGE="
+	https://github.com/asottile/re-assert/
+	https://pypi.org/project/re-assert/
+"
+SRC_URI="
+	https://github.com/asottile/re-assert/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/regex[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index 70693b1b34f1..f337d395d627 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -1,2 +1 @@
-DIST rfc3986-1.5.0.tar.gz 49378 BLAKE2B f5ef923626fdcbe4d13729a5599012a8a93d234eef7f9ac9dc61620320062a69646f810a8f0ea04f371b9c423850982685e68201f08ba96ad9ead3ab11a9b40d SHA512 b291b88b6890f8c9fcfc353e05d1b8c0435be62f22768568ecf714af083b3c51d7a9b301fc9196d37ad4e6eeb8c6a237ba40914098e755b4ccdf36b7df7906c2
 DIST rfc3986-2.0.0.tar.gz 49026 BLAKE2B 41e1ab9d1ad878336dc93fa0924c6cc90930d5fd3ba0bbb238be402512d3227cacfa555828c5d698810bee74b3b77f045abb7fcb5c854a4f49922f4cbe05004f SHA512 5c8370cb1e21811eaab91269b9a30972b8fbcbe1fa1d806fd3ceabe0e1937de856d757146137fee470fbdbcc7e948b236f72a42306da41a6d03807e7333983df
diff --git a/dev-python/rfc3986/rfc3986-1.5.0.ebuild b/dev-python/rfc3986/rfc3986-1.5.0.ebuild
deleted file mode 100644
index ddfc083c9f0b..000000000000
--- a/dev-python/rfc3986/rfc3986-1.5.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Validating URI References per RFC 3986"
-HOMEPAGE="https://tools.ietf.org/html/rfc3986
-	https://github.com/python-hyper/rfc3986
-	https://rfc3986.rtfd.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="idna"
-
-RDEPEND="
-	idna? ( dev-python/idna[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? ( dev-python/idna[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/rfc3986/rfc3986-2.0.0-r1.ebuild b/dev-python/rfc3986/rfc3986-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..6e5842d3dfce
--- /dev/null
+++ b/dev-python/rfc3986/rfc3986-2.0.0-r1.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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Validating URI References per RFC 3986"
+HOMEPAGE="
+	https://rfc3986.rtfd.org/
+	https://github.com/python-hyper/rfc3986/
+	https://pypi.org/project/rfc3986/
+	https://tools.ietf.org/html/rfc3986/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="idna"
+
+RDEPEND="
+	idna? (
+		dev-python/idna[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/idna[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/rich/rich-12.4.1.ebuild b/dev-python/rich/rich-12.4.1.ebuild
index 201fd9cf922a..79fcff64c856 100644
--- a/dev-python/rich/rich-12.4.1.ebuild
+++ b/dev-python/rich/rich-12.4.1.ebuild
@@ -36,6 +36,14 @@ python_test() {
 		# broken with =dev-python/pygments-2.12.0
 		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
 	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# the usual deal: output changes that cause test mismatches
+		tests/test_inspect.py::test_inspect_text
+		tests/test_inspect.py::test_inspect_builtin_function
+		tests/test_inspect.py::test_inspect_integer_with_methods
+		tests/test_log.py::test_log
+		tests/test_pretty.py::test_attrs_broken
+	)
 	epytest -p no:pytest-qt
 }
 
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index 2bbee94bc5a1..20aefabd8789 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,2 +1 @@
-DIST rope-0.23.0.tar.gz 260990 BLAKE2B 34064f45f72d6c9c5613eb5d9480dde25aeb5426ab3ea9b56e7ba5e4da1d9930735bd87757e3e885d4504ddcb24b23aa96b0d5be7c23ca4969201aedbaa3aa24 SHA512 1ab0a36c792fdc4d0fd1e554deec0fb6d1e877d91164fb8ee2e5f99240087f8a8d4608d1975be100bca87be0321d672b91579cf36795acffc742aa021cdf5e1b
 DIST rope-1.0.0.tar.gz 263335 BLAKE2B 5a2ecb494c7ab7833a75e54887e863fc5b35c2564d9ebcabb055084f1aff189bbedd2de13b1f8e0c56736886687c25111a42e47ff5ea84c217bb81927495e1a1 SHA512 f4a011750dfe51f092f29d1a911e4ce6c0425a31839f6ebade834d57472beeee9bae49cbd1f46ebcb2f3fe5c6aaf16edd583fd3a701b51b0f80d221c5aa23aed
diff --git a/dev-python/rope/rope-0.23.0.ebuild b/dev-python/rope/rope-0.23.0.ebuild
deleted file mode 100644
index 704851bb91bd..000000000000
--- a/dev-python/rope/rope-0.23.0.ebuild
+++ /dev/null
@@ -1,42 +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="Python refactoring library"
-HOMEPAGE="https://github.com/python-rope/rope"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-BDEPEND="
-	doc? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-python_compile_all() {
-	if use doc; then
-		pushd docs > /dev/null || die
-		mkdir build || die
-		local i
-		for i in ./*.rst; do
-			rst2html.py $i > ./build/${i/rst/html} || die
-		done
-		popd > /dev/null || die
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/rope/rope-1.0.0.ebuild b/dev-python/rope/rope-1.0.0.ebuild
index 83299cf01779..88394b88f5f0 100644
--- a/dev-python/rope/rope-1.0.0.ebuild
+++ b/dev-python/rope/rope-1.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="
diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
index 53b06ac7aae5..ae7c6d75df54 100644
--- a/dev-python/rpyc/Manifest
+++ b/dev-python/rpyc/Manifest
@@ -1,2 +1 @@
-DIST rpyc-5.0.1.tar.gz 1258657 BLAKE2B 84d0bee67004928c26a1765a26267e3e8eb5dc09a8fd53c1d75ca691cf313a7563398626b7e89a8893415294721623206204784da01444708edb56aec8101719 SHA512 57b0d6b2dba33c7f6c9d204b4deae8ab08ed56e5799aa2c7ae4bcb8ab98486055090e3079d8b0d615fcd517111a6e02893dff85607aaca5497ae76429abe3148
 DIST rpyc-5.1.0.tar.gz 1260651 BLAKE2B 4be17e5de4b0475cd63b99bf20e55e3221149f974b9efec638e0387d71815a5a2e4ea782578152690e019e7b8a4ece17405eed6626578a9c9e379d0f4b589008 SHA512 e9783392f423abca6b488dff5be36dae066980004bd221ca5a1c451f0f9dc7e1daf749650106802f9159de619a8d5e2cd6dc90e9a5f49d16f01bbedd59b504cf
diff --git a/dev-python/rpyc/rpyc-5.0.1.ebuild b/dev-python/rpyc/rpyc-5.0.1.ebuild
deleted file mode 100644
index 3bebe0a0d9e4..000000000000
--- a/dev-python/rpyc/rpyc-5.0.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
-HOMEPAGE="https://rpyc.readthedocs.io/en/latest/
-	https://pypi.org/project/rpyc/
-	https://github.com/tomerfiliba-org/rpyc"
-SRC_URI="https://github.com/tomerfiliba-org/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# USE flags gdb, numpy are used *only* to run tests depending on these packages
-IUSE="test numpy gdb"
-RESTRICT="!test? ( test )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] )
-	gdb? ( sys-devel/gdb )"
-
-RDEPEND="dev-python/plumbum[${PYTHON_USEDEP}]
-	dev-python/gevent[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-
-	# Windows specific test
-	rm tests/test_win32pipes.py || die "rm tests/test_win32pipes.py failed"
-
-	# These tests require running sshd
-	rm tests/test_ssh.py tests/test_deploy.py || die "rm test_ssh.py test_deploy.py failed"
-
-	# This test requires internet access
-	rm tests/test_registry.py || die "rm test_registry.py failed"
-
-	if ! use numpy
-	then rm tests/test_service_pickle.py || die "rm test_service_pickle.py failed"
-	fi
-
-	if ! use gdb
-	then rm tests/test_gdb.py || die "rm test_gdb.py failed"
-	fi
-}
-
-python_test() {
-	# for some reason, when tests are run via pytest or nose, some of them hung
-	pushd tests > /dev/null || die "pushd tests failed"
-	for x in test_*.py
-	do ${PYTHON} ${x} || die "${x} failed"
-	done
-	popd > /dev/null
-}
diff --git a/dev-python/rpyc/rpyc-5.1.0.ebuild b/dev-python/rpyc/rpyc-5.1.0.ebuild
index aafab66e8607..3115d3c99cac 100644
--- a/dev-python/rpyc/rpyc-5.1.0.ebuild
+++ b/dev-python/rpyc/rpyc-5.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tomerfiliba-org/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # USE flags gdb, numpy are used *only* to run tests depending on these packages
 IUSE="test numpy gdb"
diff --git a/dev-python/sh/sh-1.14.2-r1.ebuild b/dev-python/sh/sh-1.14.2-r1.ebuild
new file mode 100644
index 000000000000..799696c01b85
--- /dev/null
+++ b/dev-python/sh/sh-1.14.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python subprocess interface"
+HOMEPAGE="
+	https://github.com/amoffat/sh/
+	https://pypi.org/project/sh/
+"
+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 ~amd64-linux ~x86-linux"
+
+PATCHES=(
+	"${FILESDIR}/sh-1.12.14-skip-unreliable-test.patch"
+	"${FILESDIR}/sh-1.14.0-skip-unreliable-test.patch"
+)
+
+python_test() {
+	"${EPYTHON}" test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/slixmpp/Manifest b/dev-python/slixmpp/Manifest
index f0834f960727..40fb9ac6a697 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -1,2 +1 @@
-DIST slixmpp-1.8.1.tar.gz 532622 BLAKE2B d0c12c240c8a14df0a0765f8bac02eb545951a0b9749ec9569d651caa3457af1a71f1c6b3a10db879fe25648b1c3c456b78e48042a83124b0a8d4d35df60134d SHA512 13b355592d564b7e211e6007fa19099e619480d0a87332b68163115852840ad2f0c70063b4260fc88d4da67e13ea97c88972fc05999c1870256b0de0257409f9
 DIST slixmpp-1.8.2.tar.gz 535672 BLAKE2B 8af0329083d5e8bb630bfbedddbe67a78eadcbcb25ed5c9b9b0ddbfbedf973702110d2b3558f5bcf25257d6a7029b1e6afba87c57a37c1f0d4d36305b246979b SHA512 243223754a7c84b653d0282b38f4df58fb5905865635c210bc78b444e85c3b8b964feda7d42b66e9c414ea7a07ecadfc3206c446cc1d9fa625308e783e3d3be5
diff --git a/dev-python/slixmpp/slixmpp-1.8.1.ebuild b/dev-python/slixmpp/slixmpp-1.8.1.ebuild
deleted file mode 100644
index 804e40c26752..000000000000
--- a/dev-python/slixmpp/slixmpp-1.8.1.ebuild
+++ /dev/null
@@ -1,36 +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="Python 3 library for XMPP"
-HOMEPAGE="https://lab.louiz.org/poezio/slixmpp"
-LICENSE="MIT"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://lab.louiz.org/poezio/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64"
-fi
-
-DEPEND="
-	net-dns/libidn
-"
-RDEPEND="
-	dev-python/aiodns[${PYTHON_USEDEP}]
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	${DEPEND}
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/slixmpp/slixmpp-1.8.2.ebuild b/dev-python/slixmpp/slixmpp-1.8.2.ebuild
index 1896ec213bd6..0fafdae568c1 100644
--- a/dev-python/slixmpp/slixmpp-1.8.2.ebuild
+++ b/dev-python/slixmpp/slixmpp-1.8.2.ebuild
@@ -18,7 +18,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~riscv"
+	KEYWORDS="amd64 ~riscv"
 fi
 
 DEPEND="
diff --git a/dev-python/socksio/socksio-1.0.0.ebuild b/dev-python/socksio/socksio-1.0.0.ebuild
index a109f4b85bb0..8b3998ff7a0b 100644
--- a/dev-python/socksio/socksio-1.0.0.ebuild
+++ b/dev-python/socksio/socksio-1.0.0.ebuild
@@ -9,7 +9,10 @@ PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Sans-I/O implementation of SOCKS4, SOCKS4A, and SOCKS5"
-HOMEPAGE="https://pypi.org/project/socksio/ https://github.com/sethmlarson/socksio"
+HOMEPAGE="
+	https://github.com/sethmlarson/socksio/
+	https://pypi.org/project/socksio/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/soupsieve/soupsieve-2.3.2.ebuild b/dev-python/soupsieve/soupsieve-2.3.2.ebuild
index 51b79fe840c1..dd0ab88bbe9f 100644
--- a/dev-python/soupsieve/soupsieve-2.3.2.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.3.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/tempest/Manifest b/dev-python/tempest/Manifest
index 06deed59195f..449bf703f247 100644
--- a/dev-python/tempest/Manifest
+++ b/dev-python/tempest/Manifest
@@ -1,2 +1 @@
-DIST tempest-30.0.0.tar.gz 1110715 BLAKE2B b697ecbced21124719e6b1d7ebd2c4f8ba83528a84da0b8f8109c155b61124581b97c180bbdc6885ae53850fb28daed25772d12be5026c44ecc3fe4f0dad98a3 SHA512 fa9be713ccb130ad065628592f59bebda3dc1fa8222ab3c382ec5b299504dc0a730f2110ef80f98bbdd1288b5785ab745fe39b721b77f7343983c1bc0a036f19
 DIST tempest-30.1.0.tar.gz 1112219 BLAKE2B 864dbd01a843b9c480656788a3a673ea6c089af8bf67e66837fdb77ee46eef00f2caed3ee08722b113db45d1e39fee167dcb344676543ec82fe5f022ae8c713d SHA512 3c4469d5ab590fe2185dbe77cc1ca1179022b75b4da9f2fe0d43956b14598d56328dd4e62e8445197b25f93017c812edd75cb9fef2d81ae183aea478fd817b15
diff --git a/dev-python/tempest/tempest-30.0.0.ebuild b/dev-python/tempest/tempest-30.0.0.ebuild
deleted file mode 100644
index 613dfd58b555..000000000000
--- a/dev-python/tempest/tempest-30.0.0.ebuild
+++ /dev/null
@@ -1,69 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Integration Testing"
-HOMEPAGE="https://pypi.org/project/tempest/ https://docs.openstack.org/tempest/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		dev-python/stestr[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Small subset of tests, which fail as result of not using specific
-	# testing environment. Others expect to run suite using stestr.
-	rm -r tempest/tests/lib/services/volume/v3/ || die
-	rm tempest/tests/test_list_tests.py || die
-	rm tempest/tests/lib/cmd/test_check_uuid.py || die
-
-	# remove dep on hacking
-	rm tempest/tests/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x OS_LOG_CAPTURE=1 OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=320
-	eunittest -b -s tempest/tests -t .
-}
-
-src_install() {
-	distutils-r1_src_install
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/tempest/tempest-30.1.0.ebuild b/dev-python/tempest/tempest-30.1.0.ebuild
index c2e5f6994131..46377d7aa17a 100644
--- a/dev-python/tempest/tempest-30.1.0.ebuild
+++ b/dev-python/tempest/tempest-30.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 48fb4950b406..b1e65a15a5db 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,2 +1 @@
-DIST tox-3.24.5.tar.gz 306305 BLAKE2B a6d3338d21068d9123505a29da3beec4fd5a15c263bcaf5ba62f65a253d04e11d453bef159d06e88b2cbac9a895d786d0d9444cc16cd3de7a868eac6919b82ea SHA512 4e1ef81c978977e905edbdc00ff971eb4132b9009ce21456fcebf95d8ee2c583e04e464f1db5ca6e5454f4f1ad0353ffc9df7898f6389fe8084dc5b9726ca59b
 DIST tox-3.25.0.tar.gz 307073 BLAKE2B 2dda34fc6d6518897bdc587ca6a31b92f2add463c3bcce9df3f4e511d2588dc75265b60809195c2d78a9c1b0d08d79c32811aab1e2c01934faf40019a1882042 SHA512 9c10524c5a67b32a01cb0dd4d25cc01d0641e46ca4e0c03a4c76eb8913f6038075aeb21e647a94d6b8d99c80edb7701b1c62893ebd6a20584121fdf33b9d9010
diff --git a/dev-python/tox/tox-3.24.5.ebuild b/dev-python/tox/tox-3.24.5.ebuild
deleted file mode 100644
index 7d78995ce893..000000000000
--- a/dev-python/tox/tox-3.24.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-# doc disabled because of missing deps in tree
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
-# TODO: figure out how to make tests work without the package being
-# installed first.
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken without Internet
-		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
-		tests/integration/test_provision_int.py::test_provision_interrupt_child
-
-		# expects python2 to exist
-		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
-
-		# fragile and relies on checking stdout
-		tests/unit/util/test_spinner.py::test_spinner_progress
-	)
-
-	[[ ${EPYTHON} != pypy3 ]] && EPYTEST_DESELECT+=(
-		# TODO?
-		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
-
-		# broken without tox installed first
-		# TODO: why it can't import itself?
-		tests/integration/test_parallel_interrupt.py::test_parallel_interrupt
-	)
-
-	distutils_install_for_testing --via-venv
-	epytest --no-network
-}
diff --git a/dev-python/tox/tox-3.25.0.ebuild b/dev-python/tox/tox-3.25.0.ebuild
index 9f36d1750273..1787e25daef9 100644
--- a/dev-python/tox/tox-3.25.0.ebuild
+++ b/dev-python/tox/tox-3.25.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/trio/files/trio-0.20.0-py311.patch b/dev-python/trio/files/trio-0.20.0-py311.patch
new file mode 100644
index 000000000000..f7d447825a16
--- /dev/null
+++ b/dev-python/trio/files/trio-0.20.0-py311.patch
@@ -0,0 +1,26 @@
+diff --git a/trio/_core/_multierror.py b/trio/_core/_multierror.py
+index 6dfdaa7a5..de0d56d46 100644
+--- a/trio/_core/_multierror.py
++++ b/trio/_core/_multierror.py
+@@ -383,11 +383,10 @@ def traceback_exception_init(
+     capture_locals=False,
+     compact=False,
+     _seen=None,
++    **kwargs,
+ ):
+     if sys.version_info >= (3, 10):
+-        kwargs = {"compact": compact}
+-    else:
+-        kwargs = {}
++        kwargs["compact"] = compact
+ 
+     # Capture the original exception and its cause and context as TracebackExceptions
+     traceback_exception_original_init(
+@@ -421,6 +420,7 @@ def traceback_exception_init(
+                         # copy the set of _seen exceptions so that duplicates
+                         # shared between sub-exceptions are not omitted
+                         _seen=None if seen_was_none else set(_seen),
++                        **kwargs,
+                     )
+                 )
+         self.embedded = embedded
diff --git a/dev-python/trio/trio-0.20.0.ebuild b/dev-python/trio/trio-0.20.0.ebuild
index 7ceba8b21ddf..39f2780abcf5 100644
--- a/dev-python/trio/trio-0.20.0.ebuild
+++ b/dev-python/trio/trio-0.20.0.ebuild
@@ -38,19 +38,8 @@ BDEPEND="
 	)
 "
 
-EPYTEST_DESELECT=(
-	# Times out on slower arches (ia64 in this case)
-	# https://github.com/python-trio/trio/issues/1753
-	trio/tests/test_unix_pipes.py::test_close_at_bad_time_for_send_all
-
-	# incompatible ipython version?
-	trio/_core/tests/test_multierror.py::test_ipython_exc_handler
-)
-
-EPYTEST_IGNORE=(
-	# these tests require internet access
-	trio/tests/test_ssl.py
-	trio/tests/test_highlevel_ssl_helpers.py
+PATCHES=(
+	"${FILESDIR}/${P}-py311.patch"
 )
 
 distutils_enable_tests pytest
@@ -61,6 +50,26 @@ distutils_enable_sphinx docs/source \
 	dev-python/towncrier
 
 python_test() {
+	local EPYTEST_IGNORE=(
+		# these tests require internet access
+		trio/tests/test_ssl.py
+		trio/tests/test_highlevel_ssl_helpers.py
+	)
+
+	local EPYTEST_DESELECT=(
+		# Times out on slower arches (ia64 in this case)
+		# https://github.com/python-trio/trio/issues/1753
+		trio/tests/test_unix_pipes.py::test_close_at_bad_time_for_send_all
+
+		# incompatible ipython version?
+		trio/_core/tests/test_multierror.py::test_ipython_exc_handler
+	)
+
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# test for functionality that has been removed from py3.11
+		trio/tests/test_util.py::test_coroutine_or_error
+	)
+
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	epytest -m "not redistributors_should_skip"
 }
diff --git a/dev-python/tzlocal/tzlocal-4.2.ebuild b/dev-python/tzlocal/tzlocal-4.2.ebuild
index 41540118f18c..f2630bfa99b1 100644
--- a/dev-python/tzlocal/tzlocal-4.2.ebuild
+++ b/dev-python/tzlocal/tzlocal-4.2.ebuild
@@ -9,7 +9,10 @@ PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="tzinfo object for the local timezone"
-HOMEPAGE="https://github.com/regebro/tzlocal"
+HOMEPAGE="
+	https://github.com/regebro/tzlocal/
+	https://pypi.org/project/tzlocal/
+"
 SRC_URI="
 	https://github.com/regebro/tzlocal/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index 00527862f3cf..db661330a4fa 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,2 +1 @@
-DIST uvicorn-0.17.5.tar.gz 707840 BLAKE2B 70a5aa4c084f63231b2c4f11c9a4add6a84362789243fe59b4c954665b67f859dcd92076454cac7b960d30c878bccb52e6da5232e052d70ca0a71f4035804b96 SHA512 b73c99d03957bf5f37957386da77cad68e0c9603fb0bfe48ab81f1066953ca01bc75b2eb458a20a587df4f2e1f591fe1c56f26d8df84070c833ccbb912d55ca2
 DIST uvicorn-0.17.6.tar.gz 708048 BLAKE2B 83b06907c8109b38e13930d8b73584682fa4e34fe7e51fe14b6ca1ddc7ef8122d950a09e31cb364a02f5f12eead5d0522b41cbf428509c6900604d4e2776dfb2 SHA512 d5c5223759d59648f279e22f7e6af728fe8117ed75488d125c1db3e5e9d385a50d574cff72ac46db4eb0a78d0e4f690096cfe78c774674dfba61860e55b7494e
diff --git a/dev-python/uvicorn/uvicorn-0.17.5.ebuild b/dev-python/uvicorn/uvicorn-0.17.5.ebuild
deleted file mode 100644
index 0307f221a36d..000000000000
--- a/dev-python/uvicorn/uvicorn-0.17.5.ebuild
+++ /dev/null
@@ -1,47 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Lightning-fast ASGI server implementation"
-HOMEPAGE="https://www.uvicorn.org/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		>=dev-python/websockets-10.0[${PYTHON_USEDEP}]
-		dev-python/watchgod[${PYTHON_USEDEP}]
-		dev-python/wsproto[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# too long path for unix socket
-	tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
-	# need unpackaged httptools
-	"tests/middleware/test_logging.py::test_trace_logging_on_http_protocol[httptools]"
-	tests/protocols/test_http.py::test_fragmentation
-)
diff --git a/dev-python/uvicorn/uvicorn-0.17.6.ebuild b/dev-python/uvicorn/uvicorn-0.17.6.ebuild
index 5f169426b169..c4b5448f7e2a 100644
--- a/dev-python/uvicorn/uvicorn-0.17.6.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.17.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 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/asgiref-3.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/websockets/files/websockets-10.3-py311.patch b/dev-python/websockets/files/websockets-10.3-py311.patch
new file mode 100644
index 000000000000..d15eb2d32f81
--- /dev/null
+++ b/dev-python/websockets/files/websockets-10.3-py311.patch
@@ -0,0 +1,24 @@
+diff --git a/tests/legacy/test_client_server.py b/tests/legacy/test_client_server.py
+index f9de70c..05070c8 100644
+--- a/tests/legacy/test_client_server.py
++++ b/tests/legacy/test_client_server.py
+@@ -426,6 +426,10 @@ class CommonClientServerTests:
+                 self.used_for_read = True
+                 return super().recv(*args, **kwargs)
+ 
++            def recv_into(self, *args, **kwargs):
++                self.used_for_read = True
++                return super().recv_into(*args, **kwargs)
++
+             def send(self, *args, **kwargs):
+                 self.used_for_write = True
+                 return super().send(*args, **kwargs)
+@@ -1299,6 +1303,8 @@ class ClientServerOriginTests(ClientServerTestsMixin, AsyncioTestCase):
+         self.assertEqual(self.loop.run_until_complete(self.client.recv()), "Hello!")
+ 
+ 
++@unittest.skipIf(sys.version_info[:2] >= (3, 11),
++                 "asyncio.coroutine has been removed in Python 3.11")
+ class YieldFromTests(ClientServerTestsMixin, AsyncioTestCase):
+     @with_server()
+     def test_client(self):
diff --git a/dev-python/websockets/websockets-10.3.ebuild b/dev-python/websockets/websockets-10.3.ebuild
index e751d3ee4bf7..f48783a6acdc 100644
--- a/dev-python/websockets/websockets-10.3.ebuild
+++ b/dev-python/websockets/websockets-10.3.ebuild
@@ -25,6 +25,10 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}/${P}-py311.patch"
+)
+
 python_test() {
 	local EPYTEST_DESELECT=(
 		# very fragile to speed
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 49f92e7d0f6d..095fa9767007 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1 +1,2 @@
 DIST xmlschema-1.10.0.tar.gz 396057 BLAKE2B 44facdb16e79ddf16ca798b937c4cf35444f9d31278c26121f179e5055134b82d425cc5b69a8a2e4fdd44388cbd3e96534b55794a267a3b4c0b606752ede533e SHA512 c4358b210cc96e46617cc11b1b7e2a4d69c1bd6489cc73602552b184f209eb90b13eff353741aa7b1dbc3ff8514f90b7bb331ac18ffc466b3ce36f42f7497899
+DIST xmlschema-1.11.0.tar.gz 453958 BLAKE2B d6879e0f0445dad7e86d7b11e14d3f249b3cde5242c7cde7c327005fb4268ae9f20b4bf0bc3c140284e82842e09cbcdc2d12a7f8df0bede85ffc8db39989ed49 SHA512 507b57b8d4f48eb9f2463898ad0bd245791a8c8086a544d45da1fb2d4f6edafa5e555d44bdba50974408f14251cb8acae2dfc2c1b5c4544088f336fdfee0793a
diff --git a/dev-python/xmlschema/xmlschema-1.11.0.ebuild b/dev-python/xmlschema/xmlschema-1.11.0.ebuild
new file mode 100644
index 000000000000..34fc66f8f9e5
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-1.11.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-2.5.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}"
+}
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-05-15 12:39:43 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-05-15 12:39:43 +0000
commit	900fb1489f150f10356a7455bbe7565df7acfc9a (patch)
tree	6a27ccc96bddfb5c6c3b6ceff6219b69438e5465 /dev-python
parent	1718a3de3d39e0052f2bca93fe0662036915c9b6 (diff)
download	baldeagleos-repo-900fb1489f150f10356a7455bbe7565df7acfc9a.tar.gz baldeagleos-repo-900fb1489f150f10356a7455bbe7565df7acfc9a.tar.xz baldeagleos-repo-900fb1489f150f10356a7455bbe7565df7acfc9a.zip