Adding metadata

109 files changed, 620 insertions, 1950 deletions

diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index 854e221cc9f1..d8102ac9e4f7 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1,3 +1,2 @@
-DIST anyio-3.2.1.tar.gz 126277 BLAKE2B 510980c9251081d5188f7654279753051cd9f8221f2090fb99624612e48b6f5fc1f6d9f1808f1c329c350857f14ceaee0d72615857171de33dc35cc7ba35ab23 SHA512 ef78e5531a917e3a5ddc1106f45ba556ca147e52ab29ed6cb25a3bd287148a15a015942dde6b9535d683fbe5910affed27df6ce5c4049251610f689cd151ee89
 DIST anyio-3.4.0.tar.gz 135737 BLAKE2B 6023d051a10a067b8c86576dd80571a64c72a807c56235ecd7bad364b79b10c5b845c6b584c5310db01b3bfdd92deeaf64b855716b9fa817fe2fc590de33ec4c SHA512 276fb5fc243e2c7f80a069f604ef68eeaca923c0df6f533878f9bf2185e846e537a1b9a8f19260a3c9ad3aad70898884316e6783057044a936762f7eb1f1cb9a
 DIST anyio-3.5.0.tar.gz 136934 BLAKE2B 422d604c23658844467926f42c09895e54debfd3ddf2f7fa561eccae0c9cbc225f51d663cb9f98a2455736ad7a81eb4ae40a6f3ad66f3d2f0b02d0a5157203e0 SHA512 b91124c95d194eb7e4542405a973895d21562a2636d9600d528465da52536d1ffedbf5a6fc3ea5b1ff3e83e7dca2b42f090bb2ff6b077e32f5a2c314f07d3206
diff --git a/dev-python/anyio/anyio-3.2.1.ebuild b/dev-python/anyio/anyio-3.2.1.ebuild
deleted file mode 100644
index 2f6f46114a03..000000000000
--- a/dev-python/anyio/anyio-3.2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Compatibility layer for multiple asynchronous event loop implementations"
-HOMEPAGE="
-	https://github.com/agronholm/anyio
-	https://pypi.org/project/anyio/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
-	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		>=dev-python/uvloop-0.15[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinx-autodoc-typehints
-
-PATCHES=(
-	"${FILESDIR}"/${P}-missing-trio.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	epytest -Wdefault -m 'not network' -p no:django
-}
diff --git a/dev-python/anyio/anyio-3.4.0.ebuild b/dev-python/anyio/anyio-3.4.0.ebuild
index 2426d812be0f..2ed3197e944c 100644
--- a/dev-python/anyio/anyio-3.4.0.ebuild
+++ b/dev-python/anyio/anyio-3.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
diff --git a/dev-python/anyio/files/anyio-3.2.1-missing-trio.patch b/dev-python/anyio/files/anyio-3.2.1-missing-trio.patch
deleted file mode 100644
index 492fe40fe70e..000000000000
--- a/dev-python/anyio/files/anyio-3.2.1-missing-trio.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From d05f92bddc4b34a8d527f66d5d27513cd91c741a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 24 Jun 2021 09:16:01 +0200
-Subject: [PATCH] Handle missing trio gracefully
-
-Make it possible to use anyio without actually having to install trio.
-This involves modifying get_all_backends() to only return the backends
-that are actually present, and teaching the tests to skip trio if it
-is not importable.
----
- src/anyio/_core/_eventloop.py | 13 +++++++++----
- tests/conftest.py             |  9 ++++++++-
- tests/test_pytest_plugin.py   |  2 +-
- tests/test_taskgroups.py      | 10 ++++++++--
- 4 files changed, 26 insertions(+), 8 deletions(-)
-
-diff --git a/src/anyio/_core/_eventloop.py b/src/anyio/_core/_eventloop.py
-index f2364a3..431a922 100644
---- a/src/anyio/_core/_eventloop.py
-+++ b/src/anyio/_core/_eventloop.py
-@@ -10,8 +10,6 @@ import sniffio
- # This must be updated when new backends are introduced
- from ._compat import DeprecatedAwaitableFloat
- 
--BACKENDS = 'asyncio', 'trio'
--
- T_Retval = TypeVar('T_Retval')
- threadlocals = threading.local()
- 
-@@ -106,8 +104,15 @@ def current_time() -> DeprecatedAwaitableFloat:
- 
- 
- def get_all_backends() -> Tuple[str, ...]:
--    """Return a tuple of the names of all built-in backends."""
--    return BACKENDS
-+    """Return a tuple of the names of all available built-in backends."""
-+    backends = ['asyncio']
-+    try:
-+        import trio
-+    except ImportError:
-+        pass
-+    else:
-+        backends.append(trio)
-+    return tuple(backends)
- 
- 
- def get_cancelled_exc_class() -> Type[BaseException]:
-diff --git a/tests/conftest.py b/tests/conftest.py
-index f040ac8..5834395 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -8,6 +8,11 @@ import trustme
- from _pytest.fixtures import SubRequest
- from trustme import CA
- 
-+try:
-+    import trio
-+except ImportError:
-+    trio = None
-+
- uvloop_marks = []
- uvloop_policy = None
- try:
-@@ -30,7 +35,9 @@ pytest_plugins = ['pytester']
-                  id='asyncio'),
-     pytest.param(('asyncio', {'debug': True, 'policy': uvloop_policy}), marks=uvloop_marks,
-                  id='asyncio+uvloop'),
--    pytest.param('trio')
-+    pytest.param('trio',
-+                 marks=[pytest.mark.skipif(trio is None,
-+                                           reason='trio is not available')])
- ])
- def anyio_backend(request: SubRequest) -> Tuple[str, Dict[str, Any]]:
-     return request.param
-diff --git a/tests/test_pytest_plugin.py b/tests/test_pytest_plugin.py
-index bb254a5..d55d511 100644
---- a/tests/test_pytest_plugin.py
-+++ b/tests/test_pytest_plugin.py
-@@ -135,7 +135,7 @@ def test_asyncio(testdir: Testdir) -> None:
-     )
- 
-     result = testdir.runpytest('-v')
--    result.assert_outcomes(passed=2, failed=1, errors=2)
-+    result.assert_outcomes(passed=2, failed=1, errors=len(get_all_backends()))
- 
- 
- def test_autouse_async_fixture(testdir: Testdir) -> None:
-diff --git a/tests/test_taskgroups.py b/tests/test_taskgroups.py
-index 62a2389..47971c0 100644
---- a/tests/test_taskgroups.py
-+++ b/tests/test_taskgroups.py
-@@ -5,7 +5,6 @@ import time
- from typing import Any, AsyncGenerator, Coroutine, Dict, Generator, NoReturn, Set
- 
- import pytest
--import trio
- 
- import anyio
- from anyio import (
-@@ -13,6 +12,11 @@ from anyio import (
-     fail_after, get_cancelled_exc_class, move_on_after, sleep, wait_all_tasks_blocked)
- from anyio.abc import TaskGroup, TaskStatus
- 
-+try:
-+    import trio
-+except ImportError:
-+    trio = None
-+
- if sys.version_info < (3, 7):
-     current_task = asyncio.Task.current_task
- else:
-@@ -53,7 +57,9 @@ async def test_success() -> None:
- 
- @pytest.mark.parametrize('module', [
-     pytest.param(asyncio, id='asyncio'),
--    pytest.param(trio, id='trio')
-+    pytest.param(trio, id='trio',
-+                 marks=[pytest.mark.skipif(trio is None,
-+                                           reason='trio is not available')])
- ])
- def test_run_natively(module: Any) -> None:
-     async def testfunc() -> None:
--- 
-2.32.0
-
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index a714c3058169..778163fb5dff 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,3 +1,2 @@
-DIST croniter-1.1.0.tar.gz 39641 BLAKE2B 0c01d801b55b0fd6189d5b35f7493580aa25ea18e8be061152c6642fd05a9075c1211578124cd945bb754fda4704f637069a98c5080e41ce369cc3c959b35edf SHA512 ccc56e912d5ff684ec930f87ab096b0a739191014a2d0a76febddf0fe4155a6c319cf28011bea7b8f8034218a35813db65c3d4911ff575878a12f8fe1f75720e
 DIST croniter-1.2.0.tar.gz 39813 BLAKE2B eed3db9d96571de188f5bda3c3000ce4607e72fd97d2f70b34355495349744129c29ace03320d987f43d1692720dbfbb965e824091825b2e11222306a10d081c SHA512 0d7d59d617be16f7f1b6401a3c1260c3b644855c046fa6c2948cf2f2caaf7ee0183c659e0165c8d36068467893bb68bdd4024a246a85c76448ab0a62233c9ca1
 DIST croniter-1.3.1.tar.gz 40044 BLAKE2B b6542e25878ea15c0fd1c48f8af485fa0f03809473a09fb95367134edd91a5d3b9053673589902e8c70faa372d096e2fbbbaf02d9ebd08982f2dd382ecebd8c5 SHA512 40b211fedddcaa5cdc1de4e34cb1343063c684b70ef404aa5f92ebdbbf6afcc1f511af9a52fc4eda42c3f27556a35059681ddad2cda6f6b3e1f334bea7c1e3ce
diff --git a/dev-python/croniter/croniter-1.1.0.ebuild b/dev-python/croniter/croniter-1.1.0.ebuild
deleted file mode 100644
index a102545af5b6..000000000000
--- a/dev-python/croniter/croniter-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="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/croniter/croniter-1.2.0.ebuild b/dev-python/croniter/croniter-1.2.0.ebuild
index 510d86e3dcb9..a102545af5b6 100644
--- a/dev-python/croniter/croniter-1.2.0.ebuild
+++ b/dev-python/croniter/croniter-1.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]"
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 1fa77d1c0d04..8a052f8c189f 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,3 +1,4 @@
 DIST cython-0.29.25.gh.tar.gz 2100012 BLAKE2B 497c2550c870c808f1c972d3e9ffedd6672544b9976653faac4a4125008e4472ae5a2e0db0510c8b2c5fd11f73a5885e0e4394bbce2f1327b7610bf59b64f640 SHA512 1d655bb4de8bd3480bcd579c32cd0e5bfc5cfc3d966d3d892b98cc86f59c9bd0522066c4c5dbc4c6abeb3ebe3fcd3f49ec873dd724f9ad04976635f652fdf9e3
 DIST cython-0.29.26.gh.tar.gz 2100616 BLAKE2B 9990d8fd14a8042b1a27a4f60fcc8f6d4be42a1e475f0e5d37bc6c60439ca00a1a70b49ab708ad2dfac5184a62c25d75f27ff158ef7f0df9132355c570a9aac6 SHA512 936449dd0031c2e2baeb4402a448d632324c1b66bf062ae0e632cf63dc27556607efb8446e8f913253b761627d3946283c2a60fdcad8c2434e1601fe4b0fb60e
 DIST cython-0.29.27.gh.tar.gz 2101169 BLAKE2B ebc56ced8fdf61b3be9f9abe44f71ce6b243e002ac4992dbf3a0f58331c00a0d18498190b50cba921351a38c27cf410bbc3e6b146ca3e73b829f0292fa87eebf SHA512 ca9ef31a662b6971c437a3e8c931d8e000fc6a55b3afbb317588944f365d903676b2a394ecfdb2da0190bdad84d1daf699662b95a68f4008e78e31bab4085b66
+DIST cython-0.29.28.gh.tar.gz 2101301 BLAKE2B 980c04545e935deb4b4b1653f167dcbc94b8e2b24bc8897b5cc996dfca977645f7475c32aa973251ffcbbb31e725e27693af61ceaf66f2332c9525b02653dc76 SHA512 52490d0b5355e13cbe586830f763173d7556cf3d79d79192ca75138b1190e7a4c1f3feeb0568349802ef3b97300c3805f54eef5ffd73a5180d68f023ac2a44cd
diff --git a/dev-python/cython/cython-0.29.28.ebuild b/dev-python/cython/cython-0.29.28.ebuild
new file mode 100644
index 000000000000..a31f71c5421a
--- /dev/null
+++ b/dev-python/cython/cython-0.29.28.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs elisp-common
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
+	https://github.com/cython/cython"
+SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="emacs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+BDEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
+			'python3*')
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
+	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
+)
+
+SITEFILE=50cython-gentoo.el
+
+distutils_enable_sphinx docs
+
+python_compile() {
+	# Python gets confused when it is in sys.path before build.
+	local -x PYTHONPATH=
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+}
+
+python_test() {
+	tc-export CC
+	# https://github.com/cython/cython/issues/1911
+	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/debtcollector/Manifest b/dev-python/debtcollector/Manifest
index 889e03b196c5..89e697a12f6c 100644
--- a/dev-python/debtcollector/Manifest
+++ b/dev-python/debtcollector/Manifest
@@ -1,2 +1 @@
-DIST debtcollector-2.3.0.tar.gz 31537 BLAKE2B 6c4993edf08dd72e8378bd82e4578a491f0540d35165e3c67e918ef5a659de06e4fd83d2737458cddd27ef08dfd01a38679b940e80a4b460e145ab20789940e5 SHA512 d8a9a65ec33bf6bc777d6766842cd6351c265752f552bda3bfd1db86a08c8c89c3f871c6eff15648a8c1a79d7820368711256d404934fd826ee6cb0c7c53f77a
 DIST debtcollector-2.4.0.tar.gz 31376 BLAKE2B ccd34005133a888b164538c01ed482da26e91e2dd5d9f11bb0efacc0941c9eb1c0357ce8d0c237734ad450226512263ba8aa52f3b8e712a33a40fac384db2791 SHA512 31287e223524d5997e9dc776766c5ab2ec77c771fca6e9b27e058fdd94a20b67a73147c538f9a7a3155c4ce6eb85a20e8276bedd1a53a81bebcb5daaceb1b463
diff --git a/dev-python/debtcollector/debtcollector-2.3.0.ebuild b/dev-python/debtcollector/debtcollector-2.3.0.ebuild
deleted file mode 100644
index 09f56ad7721e..000000000000
--- a/dev-python/debtcollector/debtcollector-2.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python deprecation patterns and strategies that collect technical debt"
-HOMEPAGE="https://www.openstack.org/"
-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/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/subunit[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/debtcollector/debtcollector-2.4.0.ebuild b/dev-python/debtcollector/debtcollector-2.4.0.ebuild
index 2f3c8bd44274..cce27e56b297 100644
--- a/dev-python/debtcollector/debtcollector-2.4.0.ebuild
+++ b/dev-python/debtcollector/debtcollector-2.4.0.ebuild
@@ -13,7 +13,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/easyprocess/Manifest b/dev-python/easyprocess/Manifest
index 4fe488cafc89..060ca08b6c1a 100644
--- a/dev-python/easyprocess/Manifest
+++ b/dev-python/easyprocess/Manifest
@@ -1,3 +1 @@
-DIST easyprocess-0.3.tar.gz 11310 BLAKE2B d26405863f213a94687d646f57aed98d0285bd57c0dfe9c40d2f49e5cfe46710e0435ff20eb1d697648e6fd1b63a38adf46a03f0fe970e35d44bfe3ad058d63f SHA512 3a10a02b28139c2d3d53134ac7842dcc7027c855e55b17747be1545cbf77cf86303531b595a54d92d7dc8133aee210388d25f3362b705ee554323c01d742d336
-DIST easyprocess-1.0.tar.gz 13757 BLAKE2B 40af585cc27a5b238d2688be6a55b39433fb8d3f62835ad64f93c5bd0fd98de8928796fbf262f6c390a08dc0e3b103bfb10adbf387a521c20e68e5615e4fee53 SHA512 d20c4b855403b5bc637ae4572563bd21d3bec7dcc083b06066020e1ad9ceb4645a2bde3575cbdc3e13607ad048c86d75fc7e7ef9c5367d99bb9556a1630f9cdd
 DIST easyprocess-1.1.tar.gz 13755 BLAKE2B 1d1c0d66e34fbb3ea58736cf4750b5fa48dc6e97d07a568086129fc58ca910d26a383e032dd0030da78235695269da6b7886871e6ef0f0ce7a482275ff2aa0e6 SHA512 fd5d0453cab79bb93806ac0dcef97ba207171c087bc5232f30d6fa210fa479e0dff83bdd7bb5c59d71f65582dcb3dfbf5f25ea2e2ee162d8d5feb8ca8d223a68
diff --git a/dev-python/easyprocess/easyprocess-0.3-r1.ebuild b/dev-python/easyprocess/easyprocess-0.3-r1.ebuild
deleted file mode 100644
index cfef70e12aa9..000000000000
--- a/dev-python/easyprocess/easyprocess-0.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy to use Python subprocess interface"
-HOMEPAGE="https://github.com/ponty/EasyProcess"
-SRC_URI="https://github.com/ponty/EasyProcess/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/EasyProcess-${PV}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-BDEPEND="test? (
-	dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	x11-base/xorg-server[xvfb]
-)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/easyprocess/easyprocess-1.0.ebuild b/dev-python/easyprocess/easyprocess-1.0.ebuild
deleted file mode 100644
index eb7c39bd077e..000000000000
--- a/dev-python/easyprocess/easyprocess-1.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy to use Python subprocess interface"
-HOMEPAGE="https://github.com/ponty/EasyProcess"
-SRC_URI="https://github.com/ponty/EasyProcess/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/EasyProcess-${PV}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xvfb]
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# looks like a problem within imagemagick itself
-	tests/test_fast/test_deadlock.py::test_has_imagemagick
-	# TODO
-	tests/test_fast/test_deadlock.py::test_deadlock_pipe
-)
diff --git a/dev-python/easyprocess/easyprocess-1.1.ebuild b/dev-python/easyprocess/easyprocess-1.1.ebuild
index eb7c39bd077e..33a4e6beaa7f 100644
--- a/dev-python/easyprocess/easyprocess-1.1.ebuild
+++ b/dev-python/easyprocess/easyprocess-1.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/EasyProcess-${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/fasteners/Manifest b/dev-python/fasteners/Manifest
index aed20da6aeef..bb2b7a4c535d 100644
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@@ -1,4 +1,2 @@
-DIST fasteners-0.16.3.gh.tar.gz 29727 BLAKE2B 67b4bc260858abe7ee330c2c5a625ecfead11ed486f4f3c2a070eaa77addad300ee8398d6fe6d5ee0e517a25617dccd49500bd9e0abc3f9bad8216026c114686 SHA512 72b4ead49bb0c4f0e0c4ff47cab12f645af456e9100f270b72582b68239dd2536b1b641b38693f4f3635fc977e4ffa059c249e097e8842a1325333c4a6e864f9
-DIST fasteners-0.17.1.gh.tar.gz 29104 BLAKE2B 223d7a0813febc18abb8aa629ad001afaf745b3283e89fe01f5dbfac7b3e1855b0da256c62a702f59558aa9f80a26a3ff3cad20ee3fd0569b2ecfba561b2f9cc SHA512 491a968e81ae67f4e166dfb643012e261591780c2851012c62f74dc249a100196c8410eb2b35f1b15212f02c417e3135e46b5e32626dc7d3d5197953dd47d840
 DIST fasteners-0.17.2.gh.tar.gz 29097 BLAKE2B a7482beeea2d57494c07d1995a06f79a9047f44783d04a3c66b66f0a51cb90363805122c5cf3bda7a02e7f308527a43af18b204c8595bdd4412c6154aac33cb5 SHA512 98caa82fc2fa004f799db07b18ea17ddd757c25c2906bb373a2d9ce7ebfb5e684c5a2d49cc72b57b1d8a837c7cc0402e8a2b09ad5c439e8e079d193a4afdacce
 DIST fasteners-0.17.3.gh.tar.gz 29409 BLAKE2B b4cd5c2f5dcd87808b4edf42ba160eb6b0bf08df544cbe1cc96ab3dd43f8fee02342a56a8b9529354e102f8e4280f9375f89f58318e46f2e8d52fa49bdb0f5ac SHA512 bed890d674bbb8d0442cb0a36c81bd5d1b4e555534ce4451f1cf70dcf72e222d52ae98154d09ac0ad1e52d1a2026c532fd40df715fbbd6bc95f874a916911ec7
diff --git a/dev-python/fasteners/fasteners-0.16.3.ebuild b/dev-python/fasteners/fasteners-0.16.3.ebuild
deleted file mode 100644
index 94701a93b3f6..000000000000
--- a/dev-python/fasteners/fasteners-0.16.3.ebuild
+++ /dev/null
@@ -1,28 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package that provides useful locks"
-HOMEPAGE="https://github.com/harlowja/fasteners/"
-SRC_URI="
-	https://github.com/harlowja/fasteners/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/diskcache[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/fasteners/fasteners-0.17.1.ebuild b/dev-python/fasteners/fasteners-0.17.1.ebuild
deleted file mode 100644
index 610fab5a4617..000000000000
--- a/dev-python/fasteners/fasteners-0.17.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="Python package that provides useful locks"
-HOMEPAGE="https://github.com/harlowja/fasteners/"
-SRC_URI="
-	https://github.com/harlowja/fasteners/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/diskcache[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/fasteners/fasteners-0.17.2.ebuild b/dev-python/fasteners/fasteners-0.17.2.ebuild
index 5381e0196d3e..992a799ac3cc 100644
--- a/dev-python/fasteners/fasteners-0.17.2.ebuild
+++ b/dev-python/fasteners/fasteners-0.17.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index 634b51cb64a4..150ef358bf57 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,2 +1 @@
-DIST filesystem_spec-2021.11.1.tar.gz 325020 BLAKE2B a5d1a483bb446a6241e34d4d6f505b46657d837209ff259c6638843205b606a4f6823b9b2510c88fea2e4adec01aabd36df1ceb188444b8786b4acb4e34e33f1 SHA512 a7985e46d7ac989908a8d5bfdb47baa49d84e220fe16774db029d25408cf9f3d956ab468bb351fc956ca388b8e7d0054151fa33e380d50f0e1d8303bbed15890
 DIST filesystem_spec-2022.01.0.tar.gz 325470 BLAKE2B 1a6dccad133a449ba9b78516f968586a0f300e97150a6aa887f2f65fafe6e2bae708620ef185789024a7248877405d736839292011f3db2221c119fb80bbb5ac SHA512 50e36c9aded9ee9824694bad563b8e92ee564c6fb6fc30d3a51b8b2e8b4a1e5f605fdbaff00eefb354b0201cce4bced0ed95b48817c5ef15ad1f09965d311ac0
diff --git a/dev-python/fsspec/fsspec-2021.11.1.ebuild b/dev-python/fsspec/fsspec-2021.11.1.ebuild
deleted file mode 100644
index 8317c61d34ec..000000000000
--- a/dev-python/fsspec/fsspec-2021.11.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-MY_P=filesystem_spec-${PV}
-DESCRIPTION="A specification that python filesystems should adhere to"
-HOMEPAGE="https://github.com/fsspec/filesystem_spec/
-	https://pypi.org/project/fsspec/"
-SRC_URI="
-	https://github.com/fsspec/filesystem_spec/archive/${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-BDEPEND="
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-src_test() {
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-	distutils-r1_src_test
-}
-
-EPYTEST_DESELECT=(
-	fsspec/tests/test_spec.py::test_find
-)
-
-EPYTEST_IGNORE=(
-	# sftp and smb require server started via docker
-	fsspec/implementations/tests/test_dbfs.py
-	fsspec/implementations/tests/test_sftp.py
-	fsspec/implementations/tests/test_smb.py
-)
diff --git a/dev-python/fsspec/fsspec-2022.01.0.ebuild b/dev-python/fsspec/fsspec-2022.01.0.ebuild
index 60681a026fa6..215293e4e08f 100644
--- a/dev-python/fsspec/fsspec-2022.01.0.ebuild
+++ b/dev-python/fsspec/fsspec-2022.01.0.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="
 	dev-python/versioneer[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 133c60aba5ee..f81f523b63a8 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,4 +1,3 @@
-DIST hypothesis-python-6.33.0.tar.gz 9177426 BLAKE2B ad1b1a358345f9b92bf41cee196c7bba5374054c84b7ca96500cf41b095e7ae6df12499dcb3b656907df30b360d167630d3d4c640c9d5d903125158af6db3089 SHA512 0165b7c431980d7758be50e834dbe04356478590d5fc54656ea9d31508bbae81f9fbb53b38178862b2d4959e17fa3564bc6971d466ba95555c8e80a6fb208639
 DIST hypothesis-python-6.35.1.tar.gz 9179056 BLAKE2B 3667ed7fe2a5402a3055941c44afe8e3e909381a0cbc1bec61cdcec18cb102796d283c737d5642ff6242fee4f0a2dc88774befe880a58f64bb4e183789b21e09 SHA512 839c9b2cf607f44fccf20c814a774889484f61a40a93e976f7bcb457dceac272bf6b775231fb36009e115181cf2089907bcad898f795e266d98ca218c5c4af28
 DIST hypothesis-python-6.36.1.tar.gz 9179567 BLAKE2B 67c5e33667287107b80684011076448d3761f09759592eeb42c4763080a23c9bdcffd21d0566282b856f55cc3b527e365f5b91f12abf0de77aee842ef2da719d SHA512 53a2054cfad778e59d56b483075a2de0cb3b15c80be3d2101607c593eb4e997516c350a44e542ec4ecf6b265058733d0362d557b908d58a934e57369b08334be
 DIST hypothesis-python-6.36.2.tar.gz 9179500 BLAKE2B e627ddfbef2e0955df0f4d8a388157352779aa73ca422f6372ba966b4b815bef26822f664983de089c9036eef05ae810deefd76615b37dffe5561fef9862495f SHA512 e2dd6ca73a72c30c0f0a6b3bdce44ef070f0497400f1de6758ab2daf948185afd607d34ffb604c8f55746beec60dca1289f9c4d71fc666b7904f7dcbe0d66cd7
diff --git a/dev-python/hypothesis/hypothesis-6.33.0.ebuild b/dev-python/hypothesis/hypothesis-6.33.0.ebuild
deleted file mode 100644
index 11a1d13357c5..000000000000
--- a/dev-python/hypothesis/hypothesis-6.33.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="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 ~m68k 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..9})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{8..9}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-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
-
-	distutils_install_for_testing
-	epytest tests/cover tests/pytest tests/quality \
-		-x \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.35.1.ebuild b/dev-python/hypothesis/hypothesis-6.35.1.ebuild
index 055f7e43d5ee..e0faf6724a6e 100644
--- a/dev-python/hypothesis/hypothesis-6.35.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.35.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/jsmin/Manifest b/dev-python/jsmin/Manifest
index 95348704b732..c0c1bcf9e353 100644
--- a/dev-python/jsmin/Manifest
+++ b/dev-python/jsmin/Manifest
@@ -1,2 +1 @@
-DIST jsmin-3.0.0.tar.gz 11519 BLAKE2B 192a3c8e325e9c3f56b39be983272a7f5d0c6e241bfff41ce3b064cfb60541d150041ee58e7c033b0afb56252573c3a6f10ff6e74658a9e7647e06672308c86f SHA512 46c42d1306fbda1d37324b514650e1ede50db40219dcb54b9b845bc91c23eeb865b2fcfec70cb44ade61439d1c4f96d35bfb15279ec25e0e39ab6023ef58c4cf
 DIST jsmin-3.0.1.tar.gz 13925 BLAKE2B bfce2368f622cfcc34e716f09638850c773d2381c539fb72a2aaf45830bb7eaf152dd7111f36815b0a067778f617fcec434ac19d7c5278bc963d94ea9d195285 SHA512 f65ead107ffcda67bbea1aea2070d1012139043cd1094d95c0393b1370e2e11a6c6e09af2f3af6f32ab0acc35fd702431954175d930a1898a142808fc3d57b71
diff --git a/dev-python/jsmin/jsmin-3.0.0.ebuild b/dev-python/jsmin/jsmin-3.0.0.ebuild
deleted file mode 100644
index 2fc19086023e..000000000000
--- a/dev-python/jsmin/jsmin-3.0.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="JavaScript minifier"
-HOMEPAGE="https://pypi.org/project/jsmin/ https://github.com/tikitu/jsmin/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 ~riscv x86"
-LICENSE="MIT"
-SLOT="0"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	sed -e 's/jsmin.is_3/True/' -i jsmin/test.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/jsmin/jsmin-3.0.1.ebuild b/dev-python/jsmin/jsmin-3.0.1.ebuild
index bbae095fd371..d01bebfd4baa 100644
--- a/dev-python/jsmin/jsmin-3.0.1.ebuild
+++ b/dev-python/jsmin/jsmin-3.0.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="JavaScript minifier"
 HOMEPAGE="https://pypi.org/project/jsmin/ https://github.com/tikitu/jsmin/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index d9853fb3ecd3..7796e6e0e6b5 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1 +1,2 @@
 DIST lxml-4.7.1.tar.gz 958025 BLAKE2B d48a7aec9537235207fa387af7c49fe055ffa8e03bcea3e59807dfe35c72f1b1e01586aded550b53d5b7fac733baa1d47fbeea8fba937844de6dab10e02a3832 SHA512 33c88ff07152437a09268f3348ada97549686b5a59e2135631991ecc79ad02f35c20aae5d8363d2795bf058b05ef70fa6fbb56b081308cd89b073e176f4872d9
+DIST lxml-4.8.0.tar.gz 959376 BLAKE2B a40be5e058153e1dc3f8501b645b0211f4498928ed71b161df54a67501356e9968064401b6d17e17dc8d62223b29e794eaa2bee7ff78ffee203d9f9a22f3e1c2 SHA512 bbcd8ea001cfa2820dcac4e00de6ded81700b2f0bd4a58bcdd4da05a19a107f57cd56280c4838fe19ee7ecd6be105878bf8c2f1c0e5111899c4ad1a2ba03537f
diff --git a/dev-python/lxml/lxml-4.8.0.ebuild b/dev-python/lxml/lxml-4.8.0.ebuild
new file mode 100644
index 000000000000..ceb23517bd26
--- /dev/null
+++ b/dev-python/lxml/lxml-4.8.0.ebuild
@@ -0,0 +1,97 @@
+# 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 optfeature toolchain-funcs
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
+SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
+S=${WORKDIR}/lxml-${P}
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples +threads test"
+RESTRICT="!test? ( test )"
+
+# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
+RDEPEND="
+	>=dev-libs/libxml2-2.9.12-r2
+	>=dev-libs/libxslt-1.1.28"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/docutils[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		')
+	)
+	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
+	"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch
+)
+
+python_check_deps() {
+	use doc || return 0
+	has_version "dev-python/docutils[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pygments[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
+}
+
+python_prepare_all() {
+	# avoid replacing PYTHONPATH in tests.
+	sed -i -e '/sys\.path/d' test.py || die
+
+	# don't use some random SDK on Darwin
+	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
+		setupinfo.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	tc-export PKG_CONFIG
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake html
+}
+
+python_test() {
+	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
+	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
+	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
+
+	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		local DOCS=( README.rst *.txt doc/*.txt )
+		local HTML_DOCS=( doc/html/. )
+	fi
+	if use examples; then
+		dodoc -r samples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4
+	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
+}
diff --git a/dev-python/mapbox_earcut/Manifest b/dev-python/mapbox_earcut/Manifest
new file mode 100644
index 000000000000..2e96eda8bf7e
--- /dev/null
+++ b/dev-python/mapbox_earcut/Manifest
@@ -0,0 +1 @@
+DIST mapbox_earcut_python-1.0.0.tar.gz 11418 BLAKE2B af1b2c34fe5807145de4b8db3f4b8803c3c03a89f6f3c9fa053ec256eaa5089867d570b9ff66d19a11808e1a452039cf6d194494fbe964cc18f233a528203293 SHA512 8f3687ac11497ad73c2a3dd1d1203dccf655da623d1638e638978a59388e0c057ca6f895782b609d59a2a4be478d6daf2294523a946c8a5d232dcfe718e4eec9
diff --git a/dev-python/mapbox_earcut/mapbox_earcut-1.0.0.ebuild b/dev-python/mapbox_earcut/mapbox_earcut-1.0.0.ebuild
new file mode 100644
index 000000000000..c86a76a83e26
--- /dev/null
+++ b/dev-python/mapbox_earcut/mapbox_earcut-1.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+MY_PN="${PN}_python"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python bindings to the mapbox earcut C++ library"
+HOMEPAGE="https://github.com/skogler/mapbox_earcut_python"
+# No tests in PyPI and GitHub release tarballs
+SRC_URI="https://github.com/skogler/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/pybind11[${PYTHON_USEDEP}]"
+
+DOCS=( CHANGELOG.md README.md )
+
+distutils_enable_tests pytest
+
+S="${WORKDIR}"/${MY_P}
diff --git a/dev-python/mapbox_earcut/metadata.xml b/dev-python/mapbox_earcut/metadata.xml
new file mode 100644
index 000000000000..67ff0f1899ad
--- /dev/null
+++ b/dev-python/mapbox_earcut/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>marecki@gentoo.org</email>
+  <name>Marek Szuba</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">mapbox-earcut</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/meshio/Manifest b/dev-python/meshio/Manifest
new file mode 100644
index 000000000000..ad8706dcafa4
--- /dev/null
+++ b/dev-python/meshio/Manifest
@@ -0,0 +1 @@
+DIST meshio-5.3.0.tar.gz 491246 BLAKE2B 0fd867c2ddabb29cd88dfdea1b5ef04ebf8d63ed957df5df7c426a00f0de409dcd556de4530dec91e71126671e7048af071f734e3d1c375fc67de0403edd7f37 SHA512 2304c75b74093120655cbfae6ec7b770de6bfdbe677c84e997449df91d7d3fd6b61c946d00bf57eba99e5812a08a032c55bf2d4c81316b356016d818b329f795
diff --git a/dev-python/meshio/meshio-5.3.0.ebuild b/dev-python/meshio/meshio-5.3.0.ebuild
new file mode 100644
index 000000000000..010d60a33638
--- /dev/null
+++ b/dev-python/meshio/meshio-5.3.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Input/output for many mesh formats"
+HOMEPAGE="https://github.com/nschloe/meshio"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hdf5 netcdf"
+
+# Only some of the hdf5 tests are skipped if h5py is not found
+REQUIRED_USE="test? ( hdf5 )"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/rich[${PYTHON_USEDEP}]
+	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
+	netcdf? ( dev-python/netcdf4-python[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/meshio/metadata.xml b/dev-python/meshio/metadata.xml
new file mode 100644
index 000000000000..44465f78636e
--- /dev/null
+++ b/dev-python/meshio/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>marecki@gentoo.org</email>
+  <name>Marek Szuba</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">meshio</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/minidb/Manifest b/dev-python/minidb/Manifest
index 603c0b63df2c..ec0240127fc0 100644
--- a/dev-python/minidb/Manifest
+++ b/dev-python/minidb/Manifest
@@ -1 +1,2 @@
 DIST minidb-2.0.5.tar.gz 11957 BLAKE2B 31b500e420f256988ddaff7271b143f628aea5ebf0abe77125d9ce5143dca3d3d3fb1061c39d325d5df564514b786d751dec90d82fc3310c0f76daf1b4683d02 SHA512 889e678a99c7a5dff5ae7ae2c3540e978f09616384450934f2f16797a3a06c9d863b57eced4b2cde0a4bdfa4923b754e473bde0905c86d948d3bdb81a8e6dbad
+DIST minidb-2.0.6.tar.gz 12019 BLAKE2B 00e070d1cbe1966d44228f6ad13b9280ee8d79b1b37a72d685dc53b05d329e6ee02f77a7cac729e6c4e651d66d88d1fcd7be7f704e91b3ef2dddd8c928bfed50 SHA512 17c845d5bd45a99020a96a1e1aeaf2d7663f41dc23828b4ec00e49bebb066e021d751b9a1e1ee846973306198224f91543d20219beaa40b4d245cccc4f746b93
diff --git a/dev-python/minidb/minidb-2.0.6.ebuild b/dev-python/minidb/minidb-2.0.6.ebuild
new file mode 100644
index 000000000000..d481aca871b7
--- /dev/null
+++ b/dev-python/minidb/minidb-2.0.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Simple SQLite-based object store"
+HOMEPAGE="https://thp.io/2010/minidb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mistune/Manifest b/dev-python/mistune/Manifest
index d58d530a65f1..e24b9188ab36 100644
--- a/dev-python/mistune/Manifest
+++ b/dev-python/mistune/Manifest
@@ -1,3 +1,2 @@
 DIST mistune-0.8.4.tar.gz 58322 BLAKE2B e65d45c5c95706a49a7fd407afe5f10e82a475766ca272ec3bebba8c89e670fe6efced7b09537efb69d3fd36e75091e370170a15ad7488b5cbe9186e2ccaf4db SHA512 36c3ef5d5537f5cceaa43e4da20a84b27c378cb744a93f0380024faefde490bcb42c453f79002ca049083fc437278f4afb3e10de5462f9eeb9077ca2a2fcaea7
-DIST mistune-2.0.1.tar.gz 75657 BLAKE2B 399ad8902aeb88e8e3645f5200bbfea5011157d3251af33188d2a0298c46dfb5f8e70cd951b216762942a84d29df1bc12e0750bc928f2e0c8e96034246438f53 SHA512 f6a0e08fecfeaad7d4eb0cae155bdd5ab67c66ae15a3a067c9f6cbf47a229cb9b540d49ecdb5c2fa98c8344863e1249ef86f84bc4d966fe473ade18a266c1ec6
 DIST mistune-2.0.2.tar.gz 75778 BLAKE2B 6ed690a70c54a0a06f154d42151d7d857f0e70cfe32529d7176726bd1e2f7a4fb9bf66be476af139c338c9f8b0d0de6541727e18718f6537d3a07771f34441f8 SHA512 8250243bf6cd2496ca1309e1fb062507f37c197817a4c5ec1a8e3c5865b6cc58866b88158b3a2e2967ad53b1f1a668a2e4282c30179ce126242c528000215992
diff --git a/dev-python/mistune/mistune-2.0.1.ebuild b/dev-python/mistune/mistune-2.0.1.ebuild
deleted file mode 100644
index b3da9c3bc9d9..000000000000
--- a/dev-python/mistune/mistune-2.0.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="The fastest markdown parser in pure Python"
-HOMEPAGE="https://pypi.org/project/mistune/ https://github.com/lepture/mistune"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mistune/mistune-2.0.2.ebuild b/dev-python/mistune/mistune-2.0.2.ebuild
index c76b021e9d69..23c7e9cc6b46 100644
--- a/dev-python/mistune/mistune-2.0.2.ebuild
+++ b/dev-python/mistune/mistune-2.0.2.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 3cc169939a64..88350d794c0e 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,4 +1,2 @@
-DIST mkdocs-material-8.1.4.tar.gz 7892710 BLAKE2B 3e986279bc93be4599568b431818313e01fe036420a1654a2883f5d855818a7fde64ef04bdf81a9688873a66ecb1e9692147e18a56292071ffbad93157ff06ac SHA512 9298400feb21d9d0027dc22f363f8bdff160b00623ebf09886add90359f739b69c3ee79c3bfc9a4dc18eb2d4cdb5544897aae6a807b0a379cca0dc9df82d16fc
-DIST mkdocs-material-8.1.7.tar.gz 7939617 BLAKE2B 67727822e492dba780539b27290e41fe78b48b47e1c55b0d9b0a0d820685b096ac636b8d2a9ab54a7785390689087a651d833d2f609fbdb4d2ff3702896a1b90 SHA512 2580d046960e76253d0312b677538914fe62f1e58d894d956a3a6932e0bad185a24447fde011f4982b128744429e65bf4383562a62c0ea2601790f22e84f20d1
 DIST mkdocs-material-8.1.8.gh.tar.gz 7942776 BLAKE2B 368f922f4b8b4723db36354697131a7055fcad4af0db015ef7e9c43b37431a8e7e64635241232b845bf73ab5a45a738f7741dc6d5e47d364c54be61df6a0a314 SHA512 9e3bc19d9c23b484c4c9dcd7f357efd151d351e1ab15be70a44607b4a6b59e367e93d3ccf4c31e5975cb41cb63939614cf26ca9ba6788abf000ad94b3a920b7b
 DIST mkdocs-material-8.1.9.gh.tar.gz 7969721 BLAKE2B 91c72e67baac0889077ed7b93afb697042f7b09a144e3cdb343cad88a7d7f55dafa01aa96d7fdc10b09b60213e849027bcb158dd4cb41d5f5443e43f43258628 SHA512 6a1e4284364215cb9f53a67c493b4e01e6449fa0970e8c93ca84a2bd585c631255599254bb215a281a1462dc9e6ea1db478a90647b32702e175c63a59f2b0d21
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.1.4.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.1.4.ebuild
deleted file mode 100644
index d1274602a5df..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-8.1.4.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} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material
-	https://pypi.org/project/mkdocs-material
-"
-SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.10[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-9.0[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.1.7.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.1.7.ebuild
deleted file mode 100644
index e4cd824b4880..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-8.1.7.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} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material
-	https://pypi.org/project/mkdocs-material
-"
-SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.10[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-9.0[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.1.8.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.1.8.ebuild
index e14930b2a612..ad673167c1ba 100644
--- a/dev-python/mkdocs-material/mkdocs-material-8.1.8.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-8.1.8.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index c2e1cfcafafd..789672197da2 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,3 +1,4 @@
 DIST pikepdf-4.3.1.tar.gz 2348339 BLAKE2B 9b1f04a87e7e7d2dc2589eaa7db4a670e8ceda753191e473e1a5da9ead532121d0d7d4f734fa234d60a9b5a5931d022f46e252a8c69947e9553df67b81043a06 SHA512 0156ad57a9af2d39538f9f728231e931e1a44ecea74d26e850640fa062f2dc60d427deeea5fc25ab33037d11d7a403cefe5f930c7ed92be92a6d3432f87d8fa6
 DIST pikepdf-4.4.1.tar.gz 2350630 BLAKE2B 3a0973bda758952ad4f2bbbb37061882e86cc17776ff72a5ac69950c46adfe0584f447f3dbe0ddac80d41b3b183fe31caad96dbd4c1db4c14499b449c8cdd371 SHA512 4158ff7f8e5ee6098ea73ec3bc47686b3113d941d9522ded0ffd572e624d3b1099939b5103de8eb90c73048fe8ca2be8bc5e1b3946ebe8159df877cf9633f6fa
 DIST pikepdf-4.5.0.tar.gz 2353720 BLAKE2B 6c15a07b686a6279d1c8bbccc1534a153ae6e809f2b1b63bf4a44f9d49f064cd8b102aa2bb50cb824689c25cc4850d84fb04355fa66dea1e0fc8582d9a2743ad SHA512 d664a192cee28143c06cd7653ba225c7fb559a6480b9fab3b87cfb5231678967af5ec1f896b8c48938cc1f1ca3ff00b1dd5a0df1807a84d17fa104a7dcd98dec
+DIST pikepdf-5.0.0.tar.gz 2353902 BLAKE2B f6c73372b73d303f0c17b68d8e317c0aeecf6515d720e8eb748123385f57fc49b7eba54243462864a5d6fe9b19acce85140bc3ece15695c086faec69c60ed98a SHA512 8ac3d2682b1490dc9fa4509d0db14508e3bbf001b34d5ba495eaee0d29d6a189309b6a71b3f92e620cfc3422218152edb4103e9e30cad87e4202571d23c04dfe
diff --git a/dev-python/pikepdf/pikepdf-5.0.0.ebuild b/dev-python/pikepdf/pikepdf-5.0.0.ebuild
new file mode 100644
index 000000000000..1a53777aa254
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-5.0.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=app-text/qpdf-10.6.2:0="
+RDEPEND="${DEPEND}
+	<dev-python/pillow-10[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)"
+
+#distutils_enable_sphinx docs \
+#	dev-python/ipython \
+#	dev-python/matplotlib \
+#	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/-n auto/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index 552d3e34ffb8..042de689a969 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1 +1,2 @@
 DIST pybind11-2.9.0.tar.gz 698784 BLAKE2B bfbe173d580131e445d759bd9b1a8929ceb9fc357a1ed8873aa8024fb9226a37bb97293dc0189a67ae61a232f3790ca6f635a30d0a0401c867cde98f1010438c SHA512 87184c9e09e1340f2d34786a66560fe77684a3629b517f78321073a1f0dfdb766365d3698dcf6f08e5141b1f4da50ec917e61b36538e5a1ec9fd1b68f29cd396
+DIST pybind11-2.9.1.tar.gz 703882 BLAKE2B cc162332b637f81ea5d3098a2e9882f16a9c889e83e6ccd36d2a2da2f90361d8d188abd559f2313b45ff1de7d9ee56ee198c1193b47829d1fdf6d8871ce35b0c SHA512 1f268cc6df1f572658bfc3e60f7f010bec9b9444d6a6d6c95f7b26f7b4b7dd42846e65ae5a611c01c0341335fdfa84b01272b5c1b2cc11a418f64fecabfa0588
diff --git a/dev-python/pybind11/files/pybind11-2.9.1-numpy-1.22.patch b/dev-python/pybind11/files/pybind11-2.9.1-numpy-1.22.patch
new file mode 100644
index 000000000000..c7f16fb53364
--- /dev/null
+++ b/dev-python/pybind11/files/pybind11-2.9.1-numpy-1.22.patch
@@ -0,0 +1,173 @@
+From 116f8c7db5a11d0e1e7830de3f2bbf3e5ed1316c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 3 Feb 2022 17:41:45 +0100
+Subject: [PATCH 1/2] test: Strip whitespace when comparing numpy dtypes for
+ 1.22 compat
+
+Strip whitespace when comparing numpy dtype str() in order to preserve
+test compatibility with both numpy 1.22 and older versions whose output
+differ by whitespace.
+
+Fixes #3680
+---
+ tests/test_numpy_dtypes.py | 44 +++++++++++++++++++-------------------
+ 1 file changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/tests/test_numpy_dtypes.py b/tests/test_numpy_dtypes.py
+index 06e578329e..43480334aa 100644
+--- a/tests/test_numpy_dtypes.py
++++ b/tests/test_numpy_dtypes.py
+@@ -32,8 +32,8 @@ def dt_fmt():
+     e = "<" if byteorder == "little" else ">"
+     return (
+         "{{'names':['bool_','uint_','float_','ldbl_'],"
+-        " 'formats':['?','" + e + "u4','" + e + "f4','" + e + "f{}'],"
+-        " 'offsets':[0,4,8,{}], 'itemsize':{}}}"
++        "'formats':['?','" + e + "u4','" + e + "f4','" + e + "f{}'],"
++        "'offsets':[0,4,8,{}],'itemsize':{}}}"
+     )
+ 
+ 
+@@ -46,7 +46,7 @@ def simple_dtype_fmt():
+ def packed_dtype_fmt():
+     from sys import byteorder
+ 
+-    return "[('bool_', '?'), ('uint_', '{e}u4'), ('float_', '{e}f4'), ('ldbl_', '{e}f{}')]".format(
++    return "[('bool_','?'),('uint_','{e}u4'),('float_','{e}f4'),('ldbl_','{e}f{}')]".format(
+         np.dtype("longdouble").itemsize, e="<" if byteorder == "little" else ">"
+     )
+ 
+@@ -77,7 +77,7 @@ def partial_nested_fmt():
+     partial_size = partial_ld_off + ld.itemsize
+     partial_end_padding = partial_size % np.dtype("uint64").alignment
+     partial_nested_size = partial_nested_off * 2 + partial_size + partial_end_padding
+-    return "{{'names':['a'], 'formats':[{}], 'offsets':[{}], 'itemsize':{}}}".format(
++    return "{{'names':['a'],'formats':[{}],'offsets':[{}],'itemsize':{}}}".format(
+         partial_dtype_fmt(), partial_nested_off, partial_nested_size
+     )
+ 
+@@ -123,25 +123,25 @@ def test_dtype(simple_dtype):
+ 
+     e = "<" if byteorder == "little" else ">"
+ 
+-    assert m.print_dtypes() == [
++    assert [x.replace(' ', '') for x in m.print_dtypes()] == [
+         simple_dtype_fmt(),
+         packed_dtype_fmt(),
+-        "[('a', {}), ('b', {})]".format(simple_dtype_fmt(), packed_dtype_fmt()),
++        "[('a',{}),('b',{})]".format(simple_dtype_fmt(), packed_dtype_fmt()),
+         partial_dtype_fmt(),
+         partial_nested_fmt(),
+-        "[('a', 'S3'), ('b', 'S3')]",
++        "[('a','S3'),('b','S3')]",
+         (
+-            "{{'names':['a','b','c','d'], "
+-            + "'formats':[('S4', (3,)),('"
++            "{{'names':['a','b','c','d'],"
++            + "'formats':[('S4',(3,)),('"
+             + e
+-            + "i4', (2,)),('u1', (3,)),('"
++            + "i4',(2,)),('u1',(3,)),('"
+             + e
+-            + "f4', (4, 2))], "
+-            + "'offsets':[0,12,20,24], 'itemsize':56}}"
++            + "f4',(4,2))],"
++            + "'offsets':[0,12,20,24],'itemsize':56}}"
+         ).format(e=e),
+-        "[('e1', '" + e + "i8'), ('e2', 'u1')]",
+-        "[('x', 'i1'), ('y', '" + e + "u8')]",
+-        "[('cflt', '" + e + "c8'), ('cdbl', '" + e + "c16')]",
++        "[('e1','" + e + "i8'),('e2','u1')]",
++        "[('x','i1'),('y','" + e + "u8')]",
++        "[('cflt','" + e + "c8'),('cdbl','" + e + "c16')]",
+     ]
+ 
+     d1 = np.dtype(
+@@ -238,7 +238,7 @@ def test_recarray(simple_dtype, packed_dtype):
+     ]
+ 
+     arr = m.create_rec_partial(3)
+-    assert str(arr.dtype) == partial_dtype_fmt()
++    assert str(arr.dtype).replace(' ', '') == partial_dtype_fmt()
+     partial_dtype = arr.dtype
+     assert "" not in arr.dtype.fields
+     assert partial_dtype.itemsize > simple_dtype.itemsize
+@@ -246,7 +246,7 @@ def test_recarray(simple_dtype, packed_dtype):
+     assert_equal(arr, elements, packed_dtype)
+ 
+     arr = m.create_rec_partial_nested(3)
+-    assert str(arr.dtype) == partial_nested_fmt()
++    assert str(arr.dtype).replace(' ', '') == partial_nested_fmt()
+     assert "" not in arr.dtype.fields
+     assert "" not in arr.dtype.fields["a"][0].fields
+     assert arr.dtype.itemsize > partial_dtype.itemsize
+@@ -285,12 +285,12 @@ def test_array_array():
+     e = "<" if byteorder == "little" else ">"
+ 
+     arr = m.create_array_array(3)
+-    assert str(arr.dtype) == (
+-        "{{'names':['a','b','c','d'], "
+-        + "'formats':[('S4', (3,)),('"
++    assert str(arr.dtype).replace(' ', '') == (
++        "{{'names':['a','b','c','d'],"
++        + "'formats':[('S4',(3,)),('"
+         + e
+-        + "i4', (2,)),('u1', (3,)),('{e}f4', (4, 2))], "
+-        + "'offsets':[0,12,20,24], 'itemsize':56}}"
++        + "i4',(2,)),('u1',(3,)),('{e}f4',(4,2))],"
++        + "'offsets':[0,12,20,24],'itemsize':56}}"
+     ).format(e=e)
+     assert m.print_array_array(arr) == [
+         "a={{A,B,C,D},{K,L,M,N},{U,V,W,X}},b={0,1},"
+
+From 2c4a1e98e56a257fbc8dd0e8644181acd6d7e5a7 Mon Sep 17 00:00:00 2001
+From: "pre-commit-ci[bot]"
+ <66853113+pre-commit-ci[bot]@users.noreply.github.com>
+Date: Thu, 3 Feb 2022 16:45:33 +0000
+Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks
+
+for more information, see https://pre-commit.ci
+---
+ tests/test_numpy_dtypes.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/test_numpy_dtypes.py b/tests/test_numpy_dtypes.py
+index 43480334aa..0098eccb87 100644
+--- a/tests/test_numpy_dtypes.py
++++ b/tests/test_numpy_dtypes.py
+@@ -123,7 +123,7 @@ def test_dtype(simple_dtype):
+ 
+     e = "<" if byteorder == "little" else ">"
+ 
+-    assert [x.replace(' ', '') for x in m.print_dtypes()] == [
++    assert [x.replace(" ", "") for x in m.print_dtypes()] == [
+         simple_dtype_fmt(),
+         packed_dtype_fmt(),
+         "[('a',{}),('b',{})]".format(simple_dtype_fmt(), packed_dtype_fmt()),
+@@ -238,7 +238,7 @@ def test_recarray(simple_dtype, packed_dtype):
+     ]
+ 
+     arr = m.create_rec_partial(3)
+-    assert str(arr.dtype).replace(' ', '') == partial_dtype_fmt()
++    assert str(arr.dtype).replace(" ", "") == partial_dtype_fmt()
+     partial_dtype = arr.dtype
+     assert "" not in arr.dtype.fields
+     assert partial_dtype.itemsize > simple_dtype.itemsize
+@@ -246,7 +246,7 @@ def test_recarray(simple_dtype, packed_dtype):
+     assert_equal(arr, elements, packed_dtype)
+ 
+     arr = m.create_rec_partial_nested(3)
+-    assert str(arr.dtype).replace(' ', '') == partial_nested_fmt()
++    assert str(arr.dtype).replace(" ", "") == partial_nested_fmt()
+     assert "" not in arr.dtype.fields
+     assert "" not in arr.dtype.fields["a"][0].fields
+     assert arr.dtype.itemsize > partial_dtype.itemsize
+@@ -285,7 +285,7 @@ def test_array_array():
+     e = "<" if byteorder == "little" else ">"
+ 
+     arr = m.create_array_array(3)
+-    assert str(arr.dtype).replace(' ', '') == (
++    assert str(arr.dtype).replace(" ", "") == (
+         "{{'names':['a','b','c','d'],"
+         + "'formats':[('S4',(3,)),('"
+         + e
diff --git a/dev-python/pybind11/pybind11-2.9.1.ebuild b/dev-python/pybind11/pybind11-2.9.1.ebuild
new file mode 100644
index 000000000000..ee09c3de0aec
--- /dev/null
+++ b/dev-python/pybind11/pybind11-2.9.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+inherit cmake distutils-r1
+
+DESCRIPTION="AST-based Python refactoring library"
+HOMEPAGE="https://pybind11.readthedocs.io/en/stable/"
+SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	dev-cpp/eigen:3
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	export PYBIND11_USE_CMAKE=1
+	cmake_src_prepare
+
+	local PATCHES=(
+		# https://github.com/pybind/pybind11/pull/3682
+		"${FILESDIR}"/${P}-numpy-1.22.patch
+	)
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	local mycmakeargs=(
+		# disable forced lto
+		-DPYBIND11_LTO_CXX_FLAGS=
+		-DPYBIND11_INSTALL=ON
+		-DPYBIND11_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Compilation only does anything for tests
+	use test && cmake_src_compile
+}
+
+python_test() {
+	cmake_build check
+}
+
+python_install() {
+	distutils-r1_python_install
+	cmake_src_install
+}
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index c876000068fa..aa140d3b2def 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,3 +1,2 @@
-DIST pyfakefs-4.5.3.tar.gz 204661 BLAKE2B 87340d98850cad83b5288d310a5e5d9774247bb71ce7fa314243e38ec3d8e0d42f50f73da2e8c732694c35359e36286c896cb7b2703aa91443d22df95aebbe6b SHA512 0fa42a81acb565292d8a9fde220f033100a4fc07eb8d095e79ed98af415fc285d4db46dd9b891e595f599a9ab48323ff7aad4928b47a6df0d5bbf94c975f605c
 DIST pyfakefs-4.5.4.tar.gz 205086 BLAKE2B c8d9273b351ce4db66764e8972afd4d221bba7735ae2796855c1a23825fe9d678b8e8bd8b8185b37779c5fd263a2109867f261157b61db20cb56b9622cf99ae9 SHA512 419452dae9de2c046be269f7d5f5c14e9a4e14ea6d4d1a9df4a3993ef4fd350011875d4b9484f180a760974a0123bcc7460a32a85d39708837261beeee8be93f
 DIST pyfakefs-4.5.5.tar.gz 206012 BLAKE2B f23c612493d7817784cd823bc984b0fce264882bc75787fb985b33bd91875fac83073e17cfe988718413209d95a34838ffd02840c7900740e119fed162b1f0bf SHA512 338813ac1b64c95376c890d8655e70f4c9b6f6361608f868f8569c2151fed66fa30a680c000912e3821c271c6ccebd3407257ea03dfa6d58461d0d25ea6bee86
diff --git a/dev-python/pyfakefs/pyfakefs-4.5.3.ebuild b/dev-python/pyfakefs/pyfakefs-4.5.3.ebuild
deleted file mode 100644
index 92c2c75bfa88..000000000000
--- a/dev-python/pyfakefs/pyfakefs-4.5.3.ebuild
+++ /dev/null
@@ -1,23 +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 )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
-SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${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"
-
-distutils_enable_tests pytest
-
-python_test() {
-	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyfakefs/pyfakefs-4.5.4.ebuild b/dev-python/pyfakefs/pyfakefs-4.5.4.ebuild
index fdd9e2153e08..38a3d48e5841 100644
--- a/dev-python/pyfakefs/pyfakefs-4.5.4.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.5.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pyopencl/pyopencl-2021.2.13.ebuild b/dev-python/pyopencl/pyopencl-2021.2.13.ebuild
index 0c558a6407c3..6e9573a0f5f8 100644
--- a/dev-python/pyopencl/pyopencl-2021.2.13.ebuild
+++ b/dev-python/pyopencl/pyopencl-2021.2.13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="examples opengl"
 
 DEPEND=">=virtual/opencl-2"
diff --git a/dev-python/pyrsistent/pyrsistent-0.18.1.ebuild b/dev-python/pyrsistent/pyrsistent-0.18.1.ebuild
index 2d4fbe813530..9b54fc1776ef 100644
--- a/dev-python/pyrsistent/pyrsistent-0.18.1.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.18.1.ebuild
@@ -13,7 +13,7 @@ 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 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index dbbd02a470db..c8294324c9bd 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,4 +1,2 @@
-DIST pytest-asyncio-0.16.0.tar.gz 15819 BLAKE2B c999b8680a45704bcb6f4690a910aa3d2edd9965e53cf4eb59dc8119696add4553d6b3e1b010c3cac52c8fd8563be8c86afe0616132a274e73df673630b032a7 SHA512 f0059a6d05bf0c4e208f0058e30d5baf8284e630b8b91fa217f52eec18abe6b057dabfdadce2c5282e02bd4ea4cdb27f9ef62c4c308375cce1795d75a036db22
-DIST pytest-asyncio-0.17.0.tar.gz 22275 BLAKE2B 0151b7e264b2c2435735bdc184020b6997d20b0ed82224b0b528ec366ab7554a0282619c5268d92f2544d700bed2dbaf85adaaf1752e333c417cc044bffb6aac SHA512 cfff79cf0632153819c511d3751777858e87081b074bfb49f3fe49417d1be647b4d07a4b64149acec36b4e6b1872ac03f1055703c70cccce18648482c9b727db
 DIST pytest-asyncio-0.17.1.tar.gz 23694 BLAKE2B 30856f9635db84fade650c1ecebe9c713d8cd801acd646e3dffb97996c591e4a11378faba8abe30002a1fa0f6dc62aae53029f059504478d4527e88c404929c2 SHA512 691bedb0d84e05179815d9a5c11108568dc59fc8fe6e8549e54e14b83e5e6bcad37d512980ea27f87f927f623c0496bbddf0aff1f44fc78f9bea1d9106b0800c
 DIST pytest-asyncio-0.17.2.tar.gz 23805 BLAKE2B 0501a193518cefb0596b1595a58e8f18915b61ba2b502726b457e78c10b5849e5fc1980192d4b5aceb7499af15556c185efc42b76153e2b8f72ab4e36249ad23 SHA512 f1f6a586a7a3a1672ed76e8758a76e8bd427b0da055461597ab3b6296e3ae50002a9a259aba57f0b6191d606db6fa61377dbf03099d3437272a4a1f4144aa58e
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.16.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.16.0.ebuild
deleted file mode 100644
index 6d4f46dc1929..000000000000
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.16.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-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="Library for testing asyncio code with pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-asyncio
-	https://pypi.org/project/pytest-asyncio/"
-SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.17.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.17.0.ebuild
deleted file mode 100644
index eaea33b5ba20..000000000000
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.17.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2019-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="Library for testing asyncio code with pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-asyncio
-	https://pypi.org/project/pytest-asyncio/"
-SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-EPYTEST_DESELECT=(
-	# rely on precise warning counts
-	tests/modes/test_legacy_mode.py
-)
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.17.1.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.17.1.ebuild
index eaea33b5ba20..e8d4c6b0236d 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.17.1.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.17.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index 793e467b8c2f..a00a357b5107 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1,4 +1,3 @@
-DIST pytest-httpx-0.17.3.tar.gz 23737 BLAKE2B 1f335542c1d6940d68b023682df6a1fabe93e8e21b70e113830bc4895481fe1cbf074490b176ecd91f595df960790f7e305c3809af3ba5039b96c8748b40ee40 SHA512 b3c2dc8c5015f44a511659b51843cb9cf8ada163ebd7fe4ccb50438d6e191fdc84bb84f38fcd0c27dbfe0592314da0df8d319caecad32f37e3a30de40b496299
 DIST pytest-httpx-0.18.0.gh.tar.gz 22939 BLAKE2B a55923e63ad47ebd6ef05eafdadcec4caabab1341ab5f70e68357bc44cab53006a38b0d07f9540007ac46686499fd7355610a22a82b075a1e674d1fa3250efe9 SHA512 a7f24eefb8ba371e8c86526dd63e5ec7a6fa2e7a122643c8907a3da3b9a17a06e99416c5dc927f42320aa88fc213d5a327f53ec92e345853d5350902801fa1bc
 DIST pytest-httpx-0.19.0.gh.tar.gz 22971 BLAKE2B e62dbd043ff727d6b91d82963514d62f23766ad69380675334b6a429c11f00e2062cd0cc9dedce662c5ec13ff42f3eb9bb2620d0f021bfe9b5f4ad7ae7694d28 SHA512 a3a296445894cb8f68a8ce367b5e3e399471be45c6fa1d5fa4957910b45af244393957f49b5fb0ec2c0a0e8c507e63d572a0fa672430fe030b2529c2fefa6911
 DIST pytest-httpx-0.20.0.gh.tar.gz 23106 BLAKE2B b44890bc0f916a10d57b1fe16523808cc9ab9a364d39980c49b4d26823afe7c9388b442cf99225605d741d192b5f282acdce0c7929e00ea076f10f04a55597a3 SHA512 54f588ddaaa0b9909f38a25ae1cf08d63f943a0fa169d4b77d2e8b967fc001af1f667b7c91dfcaf14bbed948d72df22ec133468ad692157b31259b2b155ebd88
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.17.3.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.17.3.ebuild
deleted file mode 100644
index 8b02e52f8386..000000000000
--- a/dev-python/pytest-httpx/pytest-httpx-0.17.3.ebuild
+++ /dev/null
@@ -1,29 +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} )
-inherit distutils-r1
-
-MY_PN="${PN/-/_}"
-DESCRIPTION="Send responses to HTTPX using pytest"
-HOMEPAGE="https://colin-b.github.io/pytest_httpx/"
-SRC_URI="https://github.com/Colin-b/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	=dev-python/httpx-0.21*[${PYTHON_USEDEP}]
-	=dev-python/pytest-6*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.18.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.18.0.ebuild
index 1b2cee334a7b..2cf3553ba3ef 100644
--- a/dev-python/pytest-httpx/pytest-httpx-0.18.0.ebuild
+++ b/dev-python/pytest-httpx/pytest-httpx-0.18.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	=dev-python/httpx-0.21*[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-subtests/Manifest b/dev-python/pytest-subtests/Manifest
index c5f2c46ed776..83cf5c338de2 100644
--- a/dev-python/pytest-subtests/Manifest
+++ b/dev-python/pytest-subtests/Manifest
@@ -1,3 +1,2 @@
-DIST pytest-subtests-0.5.0.tar.gz 9793 BLAKE2B c671eb14189c0fd34180a636592b20c9e2b4225c5faf3b702103164e60bdbac4c9644e464f1e0c783da3da1263f7b841ea7a4149bcbf1de23325a8ef3ce5c030 SHA512 e3d7e90c3ab66950eb80d25049bc6f6f75b08b3da5ce0de5f3fc55d6a176a8d1fdcb19a19f7d9d137aeadcc82b214550474f76d5611bc5592ca649ddd8257a2a
 DIST pytest-subtests-0.6.0.gh.tar.gz 9698 BLAKE2B 7b8f8c78ca503d107466d1ff34830aa08c3c5ec9b0f9e962b0e61472bf4f7413eb7e71db5768d898d476eb186a5a14c6703f14a990eb57c8664153a4ac384678 SHA512 9b4fa2e1957388f0e61a13a3cce95976fb5fdea64def627c5a1bf75049a0272e82f19ed9aa117bac0d02c6fd8832f22e7cfe409694ea81920def49742142eb93
 DIST pytest-subtests-0.7.0.gh.tar.gz 9714 BLAKE2B 027badb226c6889ed2fb809eb0b3944ef227a804ea58562fe9337f37526a07a41b11cdfd356d8e9a29f9affc9d0702dead59045db9781504c92186ee613ccb1a SHA512 96531a42c06a20cdf3f3665993d3e80d198a60d536246f4dc46df20b56e47f3f6fdce9478351a8922e370435f974e63d565550213fbbeed8487eedc131f46404
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.5.0-r1.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.5.0-r1.ebuild
deleted file mode 100644
index 9a2948de4bdc..000000000000
--- a/dev-python/pytest-subtests/pytest-subtests-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 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="unittest subTest() support and subtests fixture"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-subtests/
-	https://pypi.org/project/pytest-subtests/"
-SRC_URI="
-	https://github.com/pytest-dev/pytest-subtests/archive/refs/tags/${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/pytest-5.3.0[${PYTHON_USEDEP}]
-"
-# pytest-xdist is used to test compatibility
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.6.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.6.0.ebuild
index ed31ebd46bb2..4658522afd3c 100644
--- a/dev-python/pytest-subtests/pytest-subtests-0.6.0.ebuild
+++ b/dev-python/pytest-subtests/pytest-subtests-0.6.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
 # pytest-xdist is used to test compatibility
diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index 509445a7bb6a..de536ceb6030 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,2 +1 @@
-DIST python-debian_0.1.42.tar.xz 173928 BLAKE2B 615be084cba8ff11eaaefc1b40335b73a16604b864600dbeb717ba65ee94f1d3a62f845a59c3db5b915346de4211fdde811593db989b143f4d60e7b425b98d2d SHA512 923831077d0a42dafd22277579e714af33b99612e5282f5d95bc884b2faec05321f8caaad20b72b25ce88d8c2449a6a23913c5377ed0bdc30d4ef87e39341ff7
 DIST python-debian_0.1.43.tar.xz 175832 BLAKE2B 2b43da25392c844a3c8fa8e159695ef4c871c6620be88d286abde31b9285e3f005e3c20997617d24014fe94a1a3c446c8721f8d92c35018ac308da8703788bcd SHA512 510dd37ef65be2ee0f9c4c4c15010b94fc7c05c621de2cb25fee4f6e741f51dff2e4cdc333313bac8269bfa621533217b3f72ecbd8b0b6368aa52c54e5237bb6
diff --git a/dev-python/python-debian/python-debian-0.1.42.ebuild b/dev-python/python-debian/python-debian-0.1.42.ebuild
deleted file mode 100644
index 10c7d51eb06a..000000000000
--- a/dev-python/python-debian/python-debian-0.1.42.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python modules to work with Debian-related data formats"
-HOMEPAGE="https://salsa.debian.org/python-debian-team/python-debian"
-SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? ( app-arch/dpkg )
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# See debian/rules.
-	sed -e "s/__CHANGELOG_VERSION__/${PV}/" lib/debian/_version.py.in > lib/debian/_version.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# See debian/rules.
-	${EPYTHON} lib/debian/doc-debtags > README.debtags || die
-}
-
-python_test() {
-	eunittest lib
-}
diff --git a/dev-python/python-debian/python-debian-0.1.43.ebuild b/dev-python/python-debian/python-debian-0.1.43.ebuild
index 5f130f355ec7..3f571aa873bc 100644
--- a/dev-python/python-debian/python-debian-0.1.43.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.43.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-python/python-dotenv/files/python-dotenv-0.18.0-second-entrypoint.patch b/dev-python/python-dotenv/files/python-dotenv-0.18.0-second-entrypoint.patch
deleted file mode 100644
index 9d69c8b6b008..000000000000
--- a/dev-python/python-dotenv/files/python-dotenv-0.18.0-second-entrypoint.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c57f0aa05145ff84b708ffd64106ae741096027e Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 26 Jun 2021 01:38:14 +0200
-Subject: [PATCH] setup.py: Add second entrypoint "python-dotenv"
-
----
- setup.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/setup.py b/setup.py
-index fd5785a..bb31c40 100644
---- a/setup.py
-+++ b/setup.py
-@@ -42,6 +42,7 @@ setup(
-     entry_points='''
-         [console_scripts]
-         dotenv=dotenv.cli:cli
-+        python-dotenv=dotenv.cli:cli
-     ''',
-     license='BSD-3-Clause',
-     classifiers=[
--- 
-2.31.1
-
diff --git a/dev-python/python-mpd/Manifest b/dev-python/python-mpd/Manifest
index b84379843fc8..6628cba6a65b 100644
--- a/dev-python/python-mpd/Manifest
+++ b/dev-python/python-mpd/Manifest
@@ -1,2 +1 @@
-DIST python-mpd2-3.0.4.tar.gz 66173 BLAKE2B f92a97512f19ac5f71846d3997240e5a37a4fd9bc353e131c582547ddc6e9520d2d09a02b4de62168707ba4a2cbfc28a019cba7e0a113242ecc38ecdc86c19a9 SHA512 7adf0daf64c6132dcd4d347f0772e9cbef903f9f5fba5315b745708dd2179090f53c5303b7ce905c685076861d21f7a14951e598c88eb65be423dea627dbb26a
 DIST python-mpd2-3.0.5.tar.gz 67224 BLAKE2B a0c78e3a2624247a7ed4228725dcc09457804636b01b09006bcd61800deefac8887fc9f76b9d7bb21c973e2dd9558e934f3864b2f8f5c041a94633a29f9a781e SHA512 521345b905113eaa56e6ec983e4d968d77dca30f839ab52a00e146f311269828ed383bce460ba1daf61b7f98c63ae3b7a3cbcb55cf917b1c5a5a11cf62b6a7d5
diff --git a/dev-python/python-mpd/python-mpd-3.0.4.ebuild b/dev-python/python-mpd/python-mpd-3.0.4.ebuild
deleted file mode 100644
index 4b3294e34f3f..000000000000
--- a/dev-python/python-mpd/python-mpd-3.0.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-MY_P=python-mpd2-${PV}
-DESCRIPTION="Python MPD client library"
-HOMEPAGE="
-	https://github.com/Mic92/python-mpd2/
-	https://pypi.org/project/python-mpd2/"
-SRC_URI="
-	https://github.com/Mic92/python-mpd2/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-3+"
-KEYWORDS="amd64 ppc ppc64 x86"
-SLOT="0"
-IUSE="examples +twisted"
-
-RDEPEND="twisted? ( dev-python/twisted[${PYTHON_USEDEP}] )"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( README.rst doc/{changes.rst,commands_header.txt} doc/topics/. )
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	epytest mpd/tests.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	use examples && dodoc -r examples/.
-}
diff --git a/dev-python/python-mpd/python-mpd-3.0.5.ebuild b/dev-python/python-mpd/python-mpd-3.0.5.ebuild
index 2c5a18e82d02..0c5c9e88f3dc 100644
--- a/dev-python/python-mpd/python-mpd-3.0.5.ebuild
+++ b/dev-python/python-mpd/python-mpd-3.0.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 SLOT="0"
 IUSE="examples +twisted"
 
diff --git a/dev-python/python-slugify/Manifest b/dev-python/python-slugify/Manifest
index 7b0689bb709f..c19bed9e151f 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -1,2 +1,3 @@
 DIST python-slugify-4.0.1.tar.gz 11509 BLAKE2B b505c62c959dae3823db4441b8811ed98ec8afa0278325cb2715abb63a84b5de1506362699bc39216bbac4100ae265671f940dbbbdaf9164fd251bdaa7af462a SHA512 c1d99a9dc891c4cfa927e4d2bc5701f47b23b7882cce22350283a53c6ded18e1290196c3bb9838883c29c9cb3582e5e684edffd50dfbb4e9da9c2b821ea54bb5
 DIST python-slugify-5.0.2.tar.gz 11728 BLAKE2B 701fb3f679cd4f714b5c57c14fb8cbfefa5b8268e9c4b877dd1e558e8a7dac325d69519b8e666043b70540908dcb250f561cebf0c5f444f9a3cfae34d97456b1 SHA512 79cdd1d0312c9e34b07dca2e898f177a85b31d3f290403375032ae962df61f3a9c4167f4bdf10f47afd17d544731d6961810f8a081ef615d76d8758c1207e6b7
+DIST python-slugify-6.0.1.tar.gz 12184 BLAKE2B ecc39ad73ba4bf68a630c105b22c234c9f8089c5063457c02b21ae5bbe5c021741ce754eabec51bb125ae549274b26f6cf8d986b66ce0ede5a653e70b4528712 SHA512 b97aba9f3b74009a802b1a7bd356d1eb27d239a05d8617c8f0107391e9f09e9a7cb6b45437755a1c86c4eed966e8975f74f6b760e17090d2c56e4db5935c0b69
diff --git a/dev-python/python-slugify/python-slugify-6.0.1.ebuild b/dev-python/python-slugify/python-slugify-6.0.1.ebuild
new file mode 100644
index 000000000000..430be0aad116
--- /dev/null
+++ b/dev-python/python-slugify/python-slugify-6.0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python Slugify application that handles Unicode"
+HOMEPAGE="
+	https://github.com/un33k/python-slugify/
+	https://pypi.org/project/python-slugify/"
+SRC_URI="
+	https://github.com/un33k/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="dev-python/text-unidecode[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/python-socks/Manifest b/dev-python/python-socks/Manifest
index 045ec93ff4c9..c04f6b362063 100644
--- a/dev-python/python-socks/Manifest
+++ b/dev-python/python-socks/Manifest
@@ -1,5 +1,2 @@
-DIST python-socks-1.2.4.gh.tar.gz 32192 BLAKE2B fa06f9158348292bef874c81623c11a54556db9c36cd7428d7a835428d152f3a4925d59e14d87518dfaae9e6937324e35db99bb5e1000f29fe9caf11fa2f8318 SHA512 6e70d8d98b2901e97250d30b350002944d979356bb6cd7dd4022af420e166076259a7b1aa4845d771243b18ab3f06ee955f07482c527835bb0135f0622d804be
-DIST python-socks-2.0.0.gh.tar.gz 38176 BLAKE2B 84711bd6747dd9ef8d7f47d90e7e1beeb99db7c51a370c01a272789e7d5356cdf3d0e3b1e822e1beb88a29ebbe23acac8f68206cf7a3f8b924f79d3783426f93 SHA512 088a606ca6e13de79cfa8b180d76e91cca129b3e1ffad2243e5924dc10530340924ea815eb9af0e53b5369daa9cf3e66b2f623da6913ed32916b91d24a47c1e4
-DIST python-socks-2.0.1.gh.tar.gz 40710 BLAKE2B 185131be6e2ef85e3d1cb41ff03e57c1d3e8921c04d11df4d3e1d3c7ed6f3cd10459730d0cc5ad63981dcfe0f8cd987f0f287a70f6727727550d63c0ff6040bc SHA512 08afe55b9a5e8d1c0aa5150511e7d3918fd8c6da10bb80037baa4f3c8004fa9e50b30ce7bda26e73f77208b64cb85544029ffd2edf197f6a23614b3c7f56114b
 DIST python-socks-2.0.2.gh.tar.gz 40722 BLAKE2B cfcb3bf26ad9b306ea74ede172d4c8e7cf5412c1e212fb2b806e61bd5fa085c53c47a5846105bc84e9a197198f00d85689dee55c97c691cd1b8b48bad56cc449 SHA512 fac699e2d5898553cfb0045990e5f56c16f910a5434a2e5f9c549872761835170ad7e505833f1cbc4b31cba864c1c0dddc95a530c5b0a7c2002afe0766dd6029
 DIST python-socks-2.0.3.gh.tar.gz 40697 BLAKE2B c1e6f72763d1bd767af78ea1188e411814a6d41f703488dd67165d5a9b9ce1e2f9070b35a46cd72859b65c10519cdb02c91d1702a97c2d82cb5891b46187d02a SHA512 9d51e61d03b4a46e94a66fc037ac759715db2e2c5d631aaf6088a0363ad13140c00da44a513088a40c0f149b9d4ee2bb4165f59f76c3956f0aede8104772fc5d
diff --git a/dev-python/python-socks/python-socks-1.2.4.ebuild b/dev-python/python-socks/python-socks-1.2.4.ebuild
deleted file mode 100644
index 69c98a1a21e0..000000000000
--- a/dev-python/python-socks/python-socks-1.2.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2020-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="SOCKS4, SOCKS5, HTTP tunneling functionality for Python"
-HOMEPAGE="
-	https://pypi.org/project/python-socks/
-	https://github.com/romis2012/python-socks/"
-SRC_URI="
-	https://github.com/romis2012/python-socks/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-
-# trio, curio are not packaged
-# asyncio is the only backend we have, so dep on its deps unconditionally
-RDEPEND="dev-python/async_timeout[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/async_timeout[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/yarl[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-socks/python-socks-2.0.0.ebuild b/dev-python/python-socks/python-socks-2.0.0.ebuild
deleted file mode 100644
index 830d34960412..000000000000
--- a/dev-python/python-socks/python-socks-2.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2020-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="SOCKS4, SOCKS5, HTTP tunneling functionality for Python"
-HOMEPAGE="
-	https://pypi.org/project/python-socks/
-	https://github.com/romis2012/python-socks/"
-SRC_URI="
-	https://github.com/romis2012/python-socks/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-# trio, curio are not packaged
-# asyncio is the only backend we have, so dep on its deps unconditionally
-RDEPEND="dev-python/async_timeout[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/async_timeout[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/yarl[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-socks/python-socks-2.0.1.ebuild b/dev-python/python-socks/python-socks-2.0.1.ebuild
deleted file mode 100644
index cf6a2661cc47..000000000000
--- a/dev-python/python-socks/python-socks-2.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020-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="SOCKS4, SOCKS5, HTTP tunneling functionality for Python"
-HOMEPAGE="
-	https://pypi.org/project/python-socks/
-	https://github.com/romis2012/python-socks/"
-SRC_URI="
-	https://github.com/romis2012/python-socks/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-# curio is not packaged
-# asyncio is the only backend we have, so dep on its deps unconditionally
-# TODO: revisit
-RDEPEND="dev-python/async_timeout[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-			dev-python/trio[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/async_timeout[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/yarl[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-socks/python-socks-2.0.2.ebuild b/dev-python/python-socks/python-socks-2.0.2.ebuild
index e6a7c1631682..e5db58b990ec 100644
--- a/dev-python/python-socks/python-socks-2.0.2.ebuild
+++ b/dev-python/python-socks/python-socks-2.0.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 # curio is not packaged
 # asyncio is the only backend we have, so dep on its deps unconditionally
diff --git a/dev-python/quantities/Manifest b/dev-python/quantities/Manifest
index e4e1eb9c9b3c..0495c7ec9fe7 100644
--- a/dev-python/quantities/Manifest
+++ b/dev-python/quantities/Manifest
@@ -1,2 +1 @@
-DIST python-quantities-0.12.5.tar.gz 105130 BLAKE2B db1cf09fa2efc249bc722abe34ed71d0f59d85595f70baf44203785c32179a3598be8aac225adadfd7d5f09c44ec077dcef310ee2fe7ce4d49a1533b04cb9de6 SHA512 db81e45d464e65d6b144d05e1b990fccc5c17ab7fdd47c7bb0c0094ebcacd6af52a3692492561af3a694741810ddac03e4c887d7c6effed833f196493da5f156
 DIST python-quantities-0.13.0.tar.gz 107187 BLAKE2B ead5c223892f65c68ced2265356f8c1e5374f80a1507ec561370e56e28e8965217a7b99f5c46cb83a5f6a1b1f12eb9f501844650488871d48794f13a4383df38 SHA512 ec0a61d8df8e48e7ee08cab5c899a8c8ad96b964ee0132ab130f272f062436d91e6370aac9d85453eeb3d95e17e79e8dfb80412397eada1f0a4310c0494fa217
diff --git a/dev-python/quantities/files/quantities-0.12.5-numpy-1.21.patch b/dev-python/quantities/files/quantities-0.12.5-numpy-1.21.patch
deleted file mode 100644
index 34dd5a075412..000000000000
--- a/dev-python/quantities/files/quantities-0.12.5-numpy-1.21.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f32e0ce2feeb588eb8b7236700c8c1176e2bc499 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 17 Aug 2021 08:24:07 +0200
-Subject: [PATCH] fix expected np.arctan2() exception for numpy 1.21
-
-NumPy 1.21 has changed the exception type for incorrect np.arctan2()
-arguments from ValueError to TypeError.  Adjust the test appropriately.
-
-Fixes #190
----
- quantities/tests/test_umath.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/quantities/tests/test_umath.py b/quantities/tests/test_umath.py
-index f5aeb78..a7ebb18 100644
---- a/quantities/tests/test_umath.py
-+++ b/quantities/tests/test_umath.py
-@@ -226,7 +226,7 @@ class TestUmath(TestCase):
-             np.arctan2(3*pq.V, 3*pq.V),
-             np.radians(45)*pq.dimensionless
-             )
--        self.assertRaises(ValueError, np.arctan2, (1*pq.m, 1*pq.m))
-+        self.assertRaises((TypeError, ValueError), np.arctan2, (1*pq.m, 1*pq.m))
- 
-     def test_hypot(self):
-         self.assertQuantityEqual(np.hypot(3 * pq.m, 4 * pq.m),  5 * pq.m)
--- 
-2.32.0
-
diff --git a/dev-python/quantities/quantities-0.12.5.ebuild b/dev-python/quantities/quantities-0.12.5.ebuild
deleted file mode 100644
index fd4899f7b784..000000000000
--- a/dev-python/quantities/quantities-0.12.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-MY_P="python-quantities-${PV}"
-DESCRIPTION="Support for physical quantities with units, based on numpy"
-HOMEPAGE="https://github.com/python-quantities/python-quantities"
-SRC_URI="
-	https://github.com/python-quantities/python-quantities/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/numpy[$PYTHON_USEDEP]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-numpy-1.21.patch
-)
-
-EPYTEST_DESELECT=(
-	# unexpected success
-	quantities/tests/test_umath.py::TestUmath::test_fix
-)
diff --git a/dev-python/quantities/quantities-0.13.0.ebuild b/dev-python/quantities/quantities-0.13.0.ebuild
index de2adebc0ff7..a9c2cb6a24a0 100644
--- a/dev-python/quantities/quantities-0.13.0.ebuild
+++ b/dev-python/quantities/quantities-0.13.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/numpy-1.16[$PYTHON_USEDEP]
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index d7d38713b654..42c5e9bf3007 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,5 +1,3 @@
-DIST redis-py-4.1.0.tar.gz 2346542 BLAKE2B 3d59f904f376df7bca14dcd7bc8547d7a7b41b8d934a50ade6dbf5e74f3da8deef59b3b7cf683fe3c7389859f76fe1d3307f91b52250da945f91b90c629640ab SHA512 85cd09570f4faf34a735befd0677aa8ca2cb0d62b0285c4c040380c2440f2774e47762ec4219381294465343353a15804b96f06b4d6eefa7159a224eb9e72001
-DIST redis-py-4.1.1.tar.gz 2349319 BLAKE2B adebda19239e1fd4cf685c0de7a9b2c2fc4e8f23df0e80f2ecdf5f4b9b8b2698fbab613975bd380ea74dc275710d8ed58ee0720486c079bf554612cb7d8b392e SHA512 a974a910dcbaf75516e311badbe6e019cdce668a6d8cd918503934bb92bf97f7ea373fae32139f89a9eecdb360184ae42d24d742ef8b008e95eae648bd992e64
 DIST redis-py-4.1.2.tar.gz 2349862 BLAKE2B 3e68918654e63c3403f2408350b2a877027a3c3990b623818332e0e77e1fbaa413e85912ea586a90788a87e0206ebe408ab55df522864dc534907c31a690c0c1 SHA512 beb6e50051eae61e84e7cf37f9f3e3efbc404d49e506b0b3bdae0d0c45fd940f12c801434a6394505519bf327b5933c076ad4f8c66ad812441bc08b3aa682542
 DIST redis-py-4.1.3.tar.gz 2349885 BLAKE2B d1c16a88e7ec70cf2b954fa9cf841f971c02023b7c9387e3e680e16972d546347ee454febf096e54f7bfcd4dabf163e22e1a0ba3186cbb9417cdd7a613d5a992 SHA512 797c1ee4ff4f0e32b52add5bc1cc81fd36cb1eb4d6f9328b38dca46c79a01bc105bc172f56d3bea20d802ee7a6eb934c2ee3ab5f611a49d77f9c4c50d7a4b0d8
 DIST redis-py-4.1.4.tar.gz 2352106 BLAKE2B a7f40d381e3e1d295d2ce88f0adb897704d0065ee7d5bb00108c2c8c67ef649ea63d4ca06dbbe2b21b2f92d70d96f8e2d32a7992ecf702bb4c73589f30c1bae8 SHA512 6dd1bc7622529382901b2fe6e63a5f9d6a4b89175b486c879a63cc8f0e708737431dfe5b834124f0d33f34540ac54813a0e6953bbed3a9dbd226597b4b1cb3ae
diff --git a/dev-python/redis-py/redis-py-4.1.0.ebuild b/dev-python/redis-py/redis-py-4.1.0.ebuild
deleted file mode 100644
index 8b12623c922d..000000000000
--- a/dev-python/redis-py/redis-py-4.1.0.ebuild
+++ /dev/null
@@ -1,78 +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
-
-MY_PN="redis"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python client for Redis key-value store"
-HOMEPAGE="https://github.com/redis/redis-py"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
-
-RDEPEND="
-	dev-python/deprecated[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-
-	local EPYTEST_DESELECT=(
-		# Flaky test
-		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
-
-		# Needs a second Redis running
-		tests/test_commands.py::TestRedisCommands::test_sync
-		tests/test_commands.py::TestRedisCommands::test_psync
-	)
-
-	local EPYTEST_IGNORE=(
-		# SSL tests need Docker/stunnel:
-		# https://github.com/redis/redis-py/commit/18c6809b761bc6755349e1d7e08e74e857ec2c65
-		tests/test_ssl.py
-
-		# Needs multiple Redises running
-		tests/test_cluster.py
-	)
-
-	epytest -k "not redismod and not ssl"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	# Spawn Redis itself for testing purposes
-	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
-	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/redis-py/redis-py-4.1.1.ebuild b/dev-python/redis-py/redis-py-4.1.1.ebuild
deleted file mode 100644
index d7093764dd8a..000000000000
--- a/dev-python/redis-py/redis-py-4.1.1.ebuild
+++ /dev/null
@@ -1,78 +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
-
-MY_PN="redis"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python client for Redis key-value store"
-HOMEPAGE="https://github.com/redis/redis-py"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/deprecated[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-
-	local EPYTEST_DESELECT=(
-		# Flaky test
-		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
-
-		# Needs a second Redis running
-		tests/test_commands.py::TestRedisCommands::test_sync
-		tests/test_commands.py::TestRedisCommands::test_psync
-	)
-
-	local EPYTEST_IGNORE=(
-		# SSL tests need Docker/stunnel:
-		# https://github.com/redis/redis-py/commit/18c6809b761bc6755349e1d7e08e74e857ec2c65
-		tests/test_ssl.py
-
-		# Needs multiple Redises running
-		tests/test_cluster.py
-	)
-
-	epytest -k "not redismod and not ssl"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	# Spawn Redis itself for testing purposes
-	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
-	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/redis-py/redis-py-4.1.2.ebuild b/dev-python/redis-py/redis-py-4.1.2.ebuild
index 5057612ad9ab..57611c5637dd 100644
--- a/dev-python/redis-py/redis-py-4.1.2.ebuild
+++ b/dev-python/redis-py/redis-py-4.1.2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/deprecated[${PYTHON_USEDEP}]"
diff --git a/dev-python/simpleeval/Manifest b/dev-python/simpleeval/Manifest
index 5a0982e8fe2c..2c4d541389ec 100644
--- a/dev-python/simpleeval/Manifest
+++ b/dev-python/simpleeval/Manifest
@@ -1,2 +1 @@
-DIST simpleeval-0.9.11.tar.gz 21996 BLAKE2B f7721b06da05bd7e16f81366df5ce73d343f199a917a4741c3444e9c6f5623d584fdf5ebd1afbaddd4f33d200dbdf3e266d66661c53cb36b0f23280326b046d9 SHA512 cfa3f965eb3749a8bdfae93760bdeebcf3b7621ed1aa64b5f267cd8405dbfcd00a1613b6018e49bcf274d18914cec27ecc029f779035b1e8030d0e502f225307
 DIST simpleeval-0.9.12.tar.gz 22693 BLAKE2B 6c0b08859df8b7b55970d0d2a96d2b58a98c9bf43efed4952c7f0220594b1aa531398e881b9fa41caf40d2bd8d5d2e615c4da724a2850ddc05f9bfbda52c8841 SHA512 9b00bfd13a7c7bd05c1c68c43dcd2b52abe0ea648d640780a05499c95ff96bb4366add1d92086ec7e840075fcbff692e133ddbf4c2b8497dd80e115c24367641
diff --git a/dev-python/simpleeval/simpleeval-0.9.11.ebuild b/dev-python/simpleeval/simpleeval-0.9.11.ebuild
deleted file mode 100644
index d1c1b2b1117e..000000000000
--- a/dev-python/simpleeval/simpleeval-0.9.11.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple, safe single expression evaluator library"
-HOMEPAGE="https://github.com/danthedeckie/simpleeval"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/simpleeval/simpleeval-0.9.12.ebuild b/dev-python/simpleeval/simpleeval-0.9.12.ebuild
index 5ac1a075d995..b72834e01ebd 100644
--- a/dev-python/simpleeval/simpleeval-0.9.12.ebuild
+++ b/dev-python/simpleeval/simpleeval-0.9.12.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index fea5f7cd5de1..e011e4c62a41 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,2 +1 @@
-DIST Sphinx-4.3.2.tar.gz 6657148 BLAKE2B 952cecc20e3f7e046c3ae2abc8524091af82f7947f889320deab3ec82947f793d4dab86ae47f117c84ecdb2e4e50fe531469dffca2806c45500a06c7322bb11b SHA512 2045e1964aef54826a2cde30e6c09b7ec35d49a45b7e449c07ee107c41304435eb51e2be307af77bed4ec50534e6e4009501d58187baa1a129134b69cdc56dff
 DIST Sphinx-4.4.0.tar.gz 6690021 BLAKE2B 5f63a6a70b8fb663ff1729766183f8936c9cd3bab81437526fb099ccc2a49c2abd42b602e2fc37af79254a9c8f1238fb4c99f2659142e9b9c2c1a2bd385ac100 SHA512 f5780a7da7a5d758b0e145ab9a7f191a9c65fd3ca4624ca3a04f0d161e3cd6c7133df53ff56e42f012687cbce0460178c2e7957974b5b929b341c98db996c640
diff --git a/dev-python/sphinx/sphinx-4.3.2.ebuild b/dev-python/sphinx/sphinx-4.3.2.ebuild
deleted file mode 100644
index fdf744af8ca7..000000000000
--- a/dev-python/sphinx/sphinx-4.3.2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinx"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-S=${WORKDIR}/${P^}
-
-LICENSE="BSD"
-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 ~x64-solaris"
-IUSE="doc latex"
-
-RDEPEND="
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	<dev-python/docutils-0.18[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)"
-BDEPEND="
-	doc? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
-	"${FILESDIR}/${PN}-4.3.2-doc-link.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable internet access
-	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
-		doc/conf.py || die
-
-	# remove unnecessary upper bounds
-	sed -e '/Jinja2/s:,<3.0::' \
-		-e '/MarkupSafe/s:<2.0::' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
-	popd >/dev/null || die
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-
-	local deselect=(
-		# these tests require Internet access
-		tests/test_build_latex.py::test_latex_images
-		tests/test_build_linkcheck.py::test_defaults
-		tests/test_build_linkcheck.py::test_defaults_json
-		tests/test_build_linkcheck.py::test_anchors_ignored
-	)
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
-		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
-		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
-		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
-		tests/test_ext_autodoc.py::test_automethod_for_builtin
-		tests/test_ext_autodoc.py::test_cython
-		tests/test_ext_autodoc.py::test_partialfunction
-		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
-		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
-		tests/test_ext_autodoc_autofunction.py::test_builtin_function
-		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
-		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
-		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
-		tests/test_pycode_parser.py::test_annotated_assignment
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/sphinx/sphinx-4.4.0.ebuild b/dev-python/sphinx/sphinx-4.4.0.ebuild
index 8b5bf19fe84c..1e03be66d57e 100644
--- a/dev-python/sphinx/sphinx-4.4.0.ebuild
+++ b/dev-python/sphinx/sphinx-4.4.0.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${P^}
 
 LICENSE="BSD"
 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 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc latex"
 
 RDEPEND="
diff --git a/dev-python/trimesh/trimesh-3.10.0.ebuild b/dev-python/trimesh/trimesh-3.10.0.ebuild
index 4a0a3efb91df..a26842747420 100644
--- a/dev-python/trimesh/trimesh-3.10.0.ebuild
+++ b/dev-python/trimesh/trimesh-3.10.0.ebuild
@@ -43,6 +43,8 @@ distutils_enable_tests pytest
 pkg_postinst() {
 	optfeature_header "${PN} functionality can be extended by installing the following packages:"
 	optfeature "making GUI applications with 3D stuff" dev-python/glooey
+	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
+	optfeature "loading a number of additional mesh formats" dev-python/meshio
 	optfeature "figuring out how much memory we have" dev-python/psutil
 	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
 }
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 06f514275b6a..cc06b17e4c79 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -1,3 +1,2 @@
-DIST twisted-21.7.0.tar.gz 3895345 BLAKE2B 510165ad2933f07005e508df5a8bdf2863a7988c0f18fcc089e948d190c65aab32fc876d3120e311e91d6989f1ea2d8b3b5f5db4a9dfc63c38da56213f718728 SHA512 a946769a6bc6c72af26e7763b9e0675788f134b4d005ea89d935da1b1d5f60d92c84fdb2615e442e7da2b98291ee8a63d5236ec7ba72ef04ad3f847b092feecb
 DIST twisted-22.1.0.tar.gz 3883519 BLAKE2B 0b438481af94fbfe08c7470a71421e176ca4994efaf7144b2bd3bc7e69c774295e04831d5356af104d087d970856c1c153b30331cb1598226f83e761b624a53c SHA512 1db52865d00e07044bc755b25bef2fa260cf269a8b51512bec97a015fa484d0b331b41154b52f97b5e8c477d3e5ad1d003f5ac15c7361988d073d097c6e7355d
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
diff --git a/dev-python/twisted/files/twisted-21.7.0-force-gtk3.patch b/dev-python/twisted/files/twisted-21.7.0-force-gtk3.patch
deleted file mode 100644
index a2e40559ec59..000000000000
--- a/dev-python/twisted/files/twisted-21.7.0-force-gtk3.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From eec6b60116e12e015387fe1fa3a729553d3848bf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 22 May 2021 01:11:48 +0200
-Subject: [PATCH] Force using GTK+3 in twisted.internet.gireactor
-
-Modify twisted.internet.gireactor to explicitly request GTK+ version 3.
-Otherwise it uses the newest version installed which could be GTK+4
-that gireactor is currently incompatible with.
----
- src/twisted/internet/gireactor.py           | 3 +++
- src/twisted/internet/test/test_gireactor.py | 3 +++
- src/twisted/newsfragments/10200.bugfix      | 1 +
- 3 files changed, 7 insertions(+)
- create mode 100644 src/twisted/newsfragments/10200.bugfix
-
-diff --git a/src/twisted/internet/gireactor.py b/src/twisted/internet/gireactor.py
-index 92596db1d..a577825a8 100644
---- a/src/twisted/internet/gireactor.py
-+++ b/src/twisted/internet/gireactor.py
-@@ -24,6 +24,7 @@ On Python 3, pygobject v3.4 or later is required.
- from twisted.internet.error import ReactorAlreadyRunning
- from twisted.internet import _glibbase
- from twisted.python import runtime
-+import gi  # type: ignore[import]
- import gi.pygtkcompat  # type: ignore[import]
- from gi.repository import GLib  # type: ignore[import]
- 
-@@ -68,6 +69,7 @@ class GIReactor(_glibbase.GlibReactorBase):
-     def __init__(self, useGtk=False):
-         _gtk = None
-         if useGtk is True:
-+            gi.require_version("Gtk", "3.0")
-             from gi.repository import Gtk as _gtk
- 
-         _glibbase.GlibReactorBase.__init__(self, GLib, _gtk, useGtk=useGtk)
-@@ -112,6 +114,7 @@ class PortableGIReactor(_glibbase.PortableGlibReactorBase):
-     def __init__(self, useGtk=False):
-         _gtk = None
-         if useGtk is True:
-+            gi.require_version("Gtk", "3.0")
-             from gi.repository import Gtk as _gtk
- 
-         _glibbase.PortableGlibReactorBase.__init__(self, GLib, _gtk, useGtk=useGtk)
-diff --git a/src/twisted/internet/test/test_gireactor.py b/src/twisted/internet/test/test_gireactor.py
-index d15a92622..af5092a36 100644
---- a/src/twisted/internet/test/test_gireactor.py
-+++ b/src/twisted/internet/test/test_gireactor.py
-@@ -25,6 +25,9 @@ else:
-         gtk3reactor = None
-     else:
-         gtk3reactor = _gtk3reactor
-+        import gi  # type: ignore[import]
-+
-+        gi.require_version("Gtk", "3.0")
-         from gi.repository import Gtk
- 
- from twisted.internet.error import ReactorAlreadyRunning
-diff --git a/src/twisted/newsfragments/10200.bugfix b/src/twisted/newsfragments/10200.bugfix
-new file mode 100644
-index 000000000..7afb343be
---- /dev/null
-+++ b/src/twisted/newsfragments/10200.bugfix
-@@ -0,0 +1 @@
-+twisted.internet.gireactor was fixed to force GTK+3 in order to fix use of incompatible GTK+4 API when installed
--- 
-2.32.0
-
diff --git a/dev-python/twisted/twisted-21.7.0-r1.ebuild b/dev-python/twisted/twisted-21.7.0-r1.ebuild
deleted file mode 100644
index 82411ee0e67e..000000000000
--- a/dev-python/twisted/twisted-21.7.0-r1.ebuild
+++ /dev/null
@@ -1,162 +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="threads(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-HOMEPAGE="https://www.twistedmatrix.com/trac/"
-SRC_URI="
-	https://github.com/twisted/twisted/archive/${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="conch crypt http2 serial test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
-	>=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyhamcrest-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.6.5[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	conch? (
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-	)
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
-	)
-	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
-	http2? (
-		>=dev-python/h2-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/h2-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/priority-2.0[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-		dev-python/cython-test-exception-raiser[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		net-misc/openssh
-		$(python_gen_cond_dep '
-			dev-python/gmpy[${PYTHON_USEDEP}]
-		' 'python*')
-		!alpha? ( !hppa? ( !ia64? (
-			>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-			>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-			dev-python/service_identity[${PYTHON_USEDEP}]
-		) ) )
-	)
-"
-
-PATCHES=(
-	# https://twistedmatrix.com/trac/ticket/10200
-	"${FILESDIR}/${P}-force-gtk3.patch"
-)
-
-python_prepare_all() {
-	# upstream test for making releases; not very useful and requires
-	# sphinx (including on py2)
-	rm src/twisted/python/test/test_release.py || die
-
-	# puts system in EMFILE state, then the exception handler may fail
-	# trying to open more files due to some gi magic
-	sed -e '/SKIP_EMFILE/s:False:True:' \
-		-i src/twisted/internet/test/test_tcp.py || die
-
-	# multicast tests fail within network-sandbox
-	sed -e 's:test_joinLeave:_&:' \
-		-e 's:test_loopback:_&:' \
-		-e 's:test_multiListen:_&:' \
-		-e 's:test_multicast:_&:' \
-		-i src/twisted/test/test_udp.py || die
-
-	# accesses /dev/net/tun
-	sed -e '/class RealDeviceTestsMixin/a\
-    skip = "Requires extra permissions"' \
-		-i src/twisted/pair/test/test_tuntap.py || die
-
-	# These tests rely on warnings which seems work unreliably between python versions
-	sed -e 's:test_currentEUID:_&:' \
-		-e 's:test_currentUID:_&:' -i src/twisted/python/test/test_util.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" -m twisted.trial twisted ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# own the dropin.cache so we don't leave orphans
-	touch "${D}$(python_get_sitedir)"/twisted/plugins/dropin.cache || die
-
-	python_doscript "${WORKDIR}"/twisted-regen-cache
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
-
-python_postinst() {
-	twisted-regen-cache || die
-}
-
-pkg_postinst() {
-	python_foreach_impl python_postinst
-
-	einfo "Install complete"
-	if use test ; then
-		einfo ""
-		einfo "Some tests have been disabled during testing due to"
-		einfo "known incompatibilities with the emerge sandboxes and/or"
-		einfo "not runnable as the root user."
-		einfo "For a complete test suite run on the code."
-		einfo "Run the tests as a normal user for each python it is installed to."
-		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
-	fi
-}
-
-python_postrm() {
-	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
-}
-
-pkg_postrm() {
-	# if we're removing the last version, remove the cache file
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		python_foreach_impl python_postrm
-	fi
-}
diff --git a/dev-python/twisted/twisted-21.7.0.ebuild b/dev-python/twisted/twisted-21.7.0.ebuild
deleted file mode 100644
index 9f60a345aafe..000000000000
--- a/dev-python/twisted/twisted-21.7.0.ebuild
+++ /dev/null
@@ -1,164 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-HOMEPAGE="https://www.twistedmatrix.com/trac/"
-SRC_URI="
-	https://github.com/twisted/twisted/archive/${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="conch crypt http2 serial test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
-	>=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyhamcrest-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.6.5[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	conch? (
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-	)
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
-	)
-	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
-	http2? (
-		>=dev-python/h2-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/h2-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/priority-2.0[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-		dev-python/cython-test-exception-raiser[${PYTHON_USEDEP}]
-		dev-python/gmpy[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		net-misc/openssh
-		!alpha? ( !hppa? ( !ia64? (
-			>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-			>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-			dev-python/service_identity[${PYTHON_USEDEP}]
-		) ) )
-	)
-"
-
-PATCHES=(
-	# https://twistedmatrix.com/trac/ticket/10200
-	"${FILESDIR}/${P}-force-gtk3.patch"
-)
-
-python_prepare_all() {
-	# upstream test for making releases; not very useful and requires
-	# sphinx (including on py2)
-	rm src/twisted/python/test/test_release.py || die
-
-	# puts system in EMFILE state, then the exception handler may fail
-	# trying to open more files due to some gi magic
-	sed -e '/SKIP_EMFILE/s:False:True:' \
-		-i src/twisted/internet/test/test_tcp.py || die
-
-	# multicast tests fail within network-sandbox
-	sed -e 's:test_joinLeave:_&:' \
-		-e 's:test_loopback:_&:' \
-		-e 's:test_multiListen:_&:' \
-		-e 's:test_multicast:_&:' \
-		-i src/twisted/test/test_udp.py || die
-
-	# accesses /dev/net/tun
-	sed -e '/class RealDeviceTestsMixin/a\
-    skip = "Requires extra permissions"' \
-		-i src/twisted/pair/test/test_tuntap.py || die
-
-	# These tests rely on warnings which seems work unreliably between python versions
-	sed -e 's:test_currentEUID:_&:' \
-		-e 's:test_currentUID:_&:' -i src/twisted/python/test/test_util.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	# TODO: upstream seems to override our build paths
-	distutils_install_for_testing
-
-	"${EPYTHON}" -m twisted.trial twisted ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	cd "${D}$(python_get_sitedir)" || die
-
-	# own the dropin.cache so we don't leave orphans
-	touch twisted/plugins/dropin.cache || die
-
-	python_doscript "${WORKDIR}"/twisted-regen-cache
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
-
-python_postinst() {
-	twisted-regen-cache || die
-}
-
-pkg_postinst() {
-	python_foreach_impl python_postinst
-
-	einfo "Install complete"
-	if use test ; then
-		einfo ""
-		einfo "Some tests have been disabled during testing due to"
-		einfo "known incompatibilities with the emerge sandboxes and/or"
-		einfo "not runnable as the root user."
-		einfo "For a complete test suite run on the code."
-		einfo "Run the tests as a normal user for each python it is installed to."
-		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
-	fi
-}
-
-python_postrm() {
-	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
-}
-
-pkg_postrm() {
-	# if we're removing the last version, remove the cache file
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		python_foreach_impl python_postrm
-	fi
-}
diff --git a/dev-python/twisted/twisted-22.1.0.ebuild b/dev-python/twisted/twisted-22.1.0.ebuild
index c4c60d155456..4eada42d5fff 100644
--- a/dev-python/twisted/twisted-22.1.0.ebuild
+++ b/dev-python/twisted/twisted-22.1.0.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="conch crypt http2 serial test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 9a4719a18ea7..c81d092a5c9b 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,2 +1 @@
-DIST ujson-5.0.0.tar.gz 7128113 BLAKE2B 9ce58a57d85203f2e20690494ae627b87caf8524781eb07e63b97ecd40dbd7e25bc2e5a217fca738e4b8b2fe5bc9a9e7a7ad032a089bf8e5b5104d1e107671b7 SHA512 cda9b29baf77e5aa0f3adb8ba09445753fc6730eab95a7f483b0c0b0c8bb389d12e438324f63808e5c36815330ce6508a460700882a7661bc3640721a7cc906f
 DIST ujson-5.1.0.tar.gz 7128147 BLAKE2B edd5b944e98790f3b98c4e2dbeebd1bb058c7b10e07d7919d3354cc2bcc1c8398b5bea08d27cdad438f2aa4a5d340da377ca9ef9b4b03b3d5b0e3053787ee618 SHA512 8988696918402f9e540e878eeafb2d29ed2819d4fa6ca801251a0411981eab2663eb16599a37ffa531e2e036706bd27cb1467bac17c33579e010d106da488951
diff --git a/dev-python/ujson/ujson-5.0.0.ebuild b/dev-python/ujson/ujson-5.0.0.ebuild
deleted file mode 100644
index 335997d413d9..000000000000
--- a/dev-python/ujson/ujson-5.0.0.ebuild
+++ /dev/null
@@ -1,22 +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="Ultra fast JSON encoder and decoder for Python"
-HOMEPAGE="https://pypi.org/project/ujson/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/pytz[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ujson/ujson-5.1.0.ebuild b/dev-python/ujson/ujson-5.1.0.ebuild
index 512b101e8f6c..fea176a56c5e 100644
--- a/dev-python/ujson/ujson-5.1.0.ebuild
+++ b/dev-python/ujson/ujson-5.1.0.ebuild
@@ -12,7 +12,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"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index 1d2d96027f85..fa147619b83c 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,7 +1,3 @@
-DIST uvicorn-0.15.0_p20210913.gh.tar.gz 542385 BLAKE2B 1e551ffccac6f92981b0ef62cc80fb494b57dc19bddf8430c54b8a06801ee81cdc31a3167a56e90dd8e0f318cc84dfc71443f74beb39dc68ccc252bc6d6c1042 SHA512 865fe148900c8c00847017bab3ef17a9514e7ef7878ad6220633e2bd6d89b2e65a79a82fdabb8beec83841346a175f0c20807bea07536071a06a884c74418e0d
-DIST uvicorn-0.16.0.tar.gz 707858 BLAKE2B 604aa23f8eac6409396ed603c89a524ce61630e3edd354cfe86950c535f3829aa1ececc8a91a8eeb8164d125e2b20add14f457ba0b23a0d0efd085c168739bee SHA512 68eb5daeb72b457a43fa89e352bfe281c79c1057ad9616ba083f96c1392aeb56759f13a3ee7e9eb90749f92df137f1db2bf8c90256751513d770d6679e971003
-DIST uvicorn-0.17.0.tar.gz 708241 BLAKE2B 77f87f0ecb911bb19d599fd48d6ea51105c19432f3bee59b3ccefca002fd7ca9e791ed20f1d92ba3ea755461d494cda3e6c26e08d628038594367c7fa7b6238d SHA512 dc67bc7f881cc98a753e1ee494d48860f5174a21c662673398f8c385897fc1a14f389b30e91f8a2d2ff71e0da1beba682315c83a588321f98fe87fa1e1ff7974
-DIST uvicorn-0.17.1.tar.gz 708124 BLAKE2B ee376b5d5c23c955dde9a8994ef589bcaa253f4c35617faa6996f5e2e82ea9268f59e25a0c9a092383ba308a03d98c2964b11d7997a3265dd13d3736a48b89ec SHA512 3a34f04757c4487d64351359da5e12b0ae9cd617ab8cab79cfe8c1e3521c91b324ff253c3dcf774b897c06b24e8e78c0c4c4ee52e7bce4971cba2b3d4fe90b2d
 DIST uvicorn-0.17.3.tar.gz 706936 BLAKE2B f96f1707fc966f2972392a413517ba4f3f65097c83134bd648a759ef65496ffa166507d64a2c51d5c301adab4203e0766ab2b359d1182dceeb31dd70e6bbf8e3 SHA512 d2a35a69420b2715c2688be341860958b8697c1565d5b2665d4b9c6fa7bf72060e61f72bfd99fb7c346df48f4a962e3c7a7118dd1d0782bc35ac0fcc57cb4e1d
 DIST uvicorn-0.17.4.tar.gz 706950 BLAKE2B 51d30a97f70984929bc4d4eb3934a16514307ff3e504f86813d0b5ea81467cc5fcc06da6aaa298f0319b2ccddf88b02ee4006ba9f1d573da50365cc4455f5da3 SHA512 4e61d712551ee6e6471f88f511e31b5543ef16d8ebe960447f5de6d02753bdbc38fd5fbae0d736b54b01a61d8519ef3891db2bbc1c7440806650b92a765d1d23
 DIST uvicorn-0.17.5.tar.gz 707840 BLAKE2B 70a5aa4c084f63231b2c4f11c9a4add6a84362789243fe59b4c954665b67f859dcd92076454cac7b960d30c878bccb52e6da5232e052d70ca0a71f4035804b96 SHA512 b73c99d03957bf5f37957386da77cad68e0c9603fb0bfe48ab81f1066953ca01bc75b2eb458a20a587df4f2e1f591fe1c56f26d8df84070c833ccbb912d55ca2
diff --git a/dev-python/uvicorn/uvicorn-0.15.0_p20210913.ebuild b/dev-python/uvicorn/uvicorn-0.15.0_p20210913.ebuild
deleted file mode 100644
index e66f225c97f3..000000000000
--- a/dev-python/uvicorn/uvicorn-0.15.0_p20210913.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-COMMIT="99acac598682b45be98094216f7db223c1fdf5f2"
-
-DESCRIPTION="Lightning-fast ASGI server implementation"
-HOMEPAGE="https://www.uvicorn.org/"
-SRC_URI="https://github.com/encode/${PN}/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 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]"
-)
diff --git a/dev-python/uvicorn/uvicorn-0.16.0.ebuild b/dev-python/uvicorn/uvicorn-0.16.0.ebuild
deleted file mode 100644
index 66ff6fa92333..000000000000
--- a/dev-python/uvicorn/uvicorn-0.16.0.ebuild
+++ /dev/null
@@ -1,44 +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} )
-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]"
-)
diff --git a/dev-python/uvicorn/uvicorn-0.17.0.ebuild b/dev-python/uvicorn/uvicorn-0.17.0.ebuild
deleted file mode 100644
index 70ed0e196855..000000000000
--- a/dev-python/uvicorn/uvicorn-0.17.0.ebuild
+++ /dev/null
@@ -1,44 +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} )
-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]"
-)
diff --git a/dev-python/uvicorn/uvicorn-0.17.1.ebuild b/dev-python/uvicorn/uvicorn-0.17.1.ebuild
deleted file mode 100644
index bb81866d3012..000000000000
--- a/dev-python/uvicorn/uvicorn-0.17.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-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]"
-)
diff --git a/dev-python/uvicorn/uvicorn-0.17.3.ebuild b/dev-python/uvicorn/uvicorn-0.17.3.ebuild
index bb81866d3012..22ccdc2f2d54 100644
--- a/dev-python/uvicorn/uvicorn-0.17.3.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.17.3.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]