Adding metadata

69 files changed, 273 insertions, 556 deletions

diff --git a/dev-python/configargparse/configargparse-1.5.3.ebuild b/dev-python/ConfigArgParse/ConfigArgParse-1.5.3.ebuild
index 56637d7b6ca5..4ad29d851c61 100644
--- a/dev-python/configargparse/configargparse-1.5.3.ebuild
+++ b/dev-python/ConfigArgParse/ConfigArgParse-1.5.3.ebuild
@@ -5,25 +5,27 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10} )
+
 inherit distutils-r1
 
-MY_PN="ConfigArgParse"
-MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
 HOMEPAGE="
 	https://github.com/bw2/ConfigArgParse/
 	https://pypi.org/project/ConfigArgParse/"
 SRC_URI="
 	https://github.com/bw2/ConfigArgParse/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S="${WORKDIR}/${MY_P}"
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="
-	test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
+	test? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/configargparse/Manifest b/dev-python/ConfigArgParse/Manifest
index 6e371ece30a4..6e371ece30a4 100644
--- a/dev-python/configargparse/Manifest
+++ b/dev-python/ConfigArgParse/Manifest
diff --git a/dev-python/configargparse/metadata.xml b/dev-python/ConfigArgParse/metadata.xml
index ea8988e8af6a..ea8988e8af6a 100644
--- a/dev-python/configargparse/metadata.xml
+++ b/dev-python/ConfigArgParse/metadata.xml
diff --git a/dev-python/dbutils/dbutils-3.0.2.ebuild b/dev-python/DBUtils/DBUtils-3.0.2-r1.ebuild
index 6295dc71f2fc..6c131da875c7 100644
--- a/dev-python/dbutils/dbutils-3.0.2.ebuild
+++ b/dev-python/DBUtils/DBUtils-3.0.2-r1.ebuild
@@ -3,11 +3,10 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
 
-MY_PN="DBUtils"
-MY_P="${MY_PN}-${PV}"
+inherit distutils-r1
 
 DESCRIPTION="Database connections for multi-threaded environments"
 HOMEPAGE="
@@ -15,8 +14,7 @@ HOMEPAGE="
 	https://github.com/WebwareForPython/DBUtils/
 	https://pypi.org/project/DBUtils/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/DBUtils/DBUtils-3.0.2.ebuild b/dev-python/DBUtils/DBUtils-3.0.2.ebuild
new file mode 100644
index 000000000000..a0c4eef87ee6
--- /dev/null
+++ b/dev-python/DBUtils/DBUtils-3.0.2.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} )
+inherit distutils-r1
+
+DESCRIPTION="Database connections for multi-threaded environments"
+HOMEPAGE="
+	https://webwareforpython.github.io/DBUtils/
+	https://github.com/WebwareForPython/DBUtils/
+	https://pypi.org/project/DBUtils/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	dodoc docs/*.rst
+	rm docs/*.rst || die
+	local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/dbutils/Manifest b/dev-python/DBUtils/Manifest
index 999ddb65d850..999ddb65d850 100644
--- a/dev-python/dbutils/Manifest
+++ b/dev-python/DBUtils/Manifest
diff --git a/dev-python/dbutils/metadata.xml b/dev-python/DBUtils/metadata.xml
index 46da0a61cbde..46da0a61cbde 100644
--- a/dev-python/dbutils/metadata.xml
+++ b/dev-python/DBUtils/metadata.xml
diff --git a/dev-python/Frozen-Flask/Frozen-Flask-0.18-r1.ebuild b/dev-python/Frozen-Flask/Frozen-Flask-0.18-r1.ebuild
new file mode 100644
index 000000000000..74ecb9bcf8d8
--- /dev/null
+++ b/dev-python/Frozen-Flask/Frozen-Flask-0.18-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Freezes a Flask application into a set of static files"
+HOMEPAGE="
+	https://github.com/Frozen-Flask/Frozen-Flask/
+	https://pypi.org/project/Frozen-Flask/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	dev-python/flask-sphinx-themes
+distutils_enable_tests unittest
diff --git a/dev-python/frozen-flask/frozen-flask-0.18.ebuild b/dev-python/Frozen-Flask/Frozen-Flask-0.18.ebuild
index 87f3dc5b9f1e..3df982f00a7d 100644
--- a/dev-python/frozen-flask/frozen-flask-0.18.ebuild
+++ b/dev-python/Frozen-Flask/Frozen-Flask-0.18.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
@@ -7,19 +7,20 @@ PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 
 inherit distutils-r1
 
-MY_PN="Frozen-Flask"
-MY_P="${MY_PN}-${PV}"
-
 DESCRIPTION="Freezes a Flask application into a set of static files"
-HOMEPAGE="https://github.com/Frozen-Flask/Frozen-Flask https://pypi.org/project/Frozen-Flask/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
+HOMEPAGE="
+	https://github.com/Frozen-Flask/Frozen-Flask/
+	https://pypi.org/project/Frozen-Flask/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+"
 
 distutils_enable_sphinx docs \
 	dev-python/flask-sphinx-themes
diff --git a/dev-python/frozen-flask/Manifest b/dev-python/Frozen-Flask/Manifest
index c58d5b858a48..c58d5b858a48 100644
--- a/dev-python/frozen-flask/Manifest
+++ b/dev-python/Frozen-Flask/Manifest
diff --git a/dev-python/frozen-flask/metadata.xml b/dev-python/Frozen-Flask/metadata.xml
index ea8988e8af6a..ea8988e8af6a 100644
--- a/dev-python/frozen-flask/metadata.xml
+++ b/dev-python/Frozen-Flask/metadata.xml
diff --git a/dev-python/ipy/ipy-1.01-r1.ebuild b/dev-python/IPy/IPy-1.01-r1.ebuild
index 62d93bb53774..cf3f95a05103 100644
--- a/dev-python/ipy/ipy-1.01-r1.ebuild
+++ b/dev-python/IPy/IPy-1.01-r1.ebuild
@@ -8,15 +8,12 @@ PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit distutils-r1
 
-MY_PN="IPy"
-MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Class and tools for handling of IPv4 and IPv6 addresses and networks"
 HOMEPAGE="
 	https://github.com/autocracy/python-ipy/
 	https://pypi.org/project/IPy/
 "
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/ipy/Manifest b/dev-python/IPy/Manifest
index 23bdf7c8ec7f..23bdf7c8ec7f 100644
--- a/dev-python/ipy/Manifest
+++ b/dev-python/IPy/Manifest
diff --git a/dev-python/ipy/metadata.xml b/dev-python/IPy/metadata.xml
index ea8988e8af6a..ea8988e8af6a 100644
--- a/dev-python/ipy/metadata.xml
+++ b/dev-python/IPy/metadata.xml
diff --git a/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild b/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild
index 2f6383c1e599..bfc3e5ddb658 100644
--- a/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild
@@ -24,7 +24,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390
 RDEPEND="
 	app-arch/brotli[python,${PYTHON_USEDEP}]
 	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/async_timeout-4.0.0_alpha3[${PYTHON_USEDEP}]
+	>=dev-python/async-timeout-4.0.0_alpha3[${PYTHON_USEDEP}]
 	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
 	>=dev-python/charset_normalizer-2.0[${PYTHON_USEDEP}]
 	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/aiohttp/aiohttp-3.8.1.ebuild b/dev-python/aiohttp/aiohttp-3.8.1.ebuild
index cfa90ddf21db..86295987b6fe 100644
--- a/dev-python/aiohttp/aiohttp-3.8.1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.8.1.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc
 RDEPEND="
 	app-arch/brotli[python,${PYTHON_USEDEP}]
 	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/async_timeout-4.0.0_alpha3[${PYTHON_USEDEP}]
+	>=dev-python/async-timeout-4.0.0_alpha3[${PYTHON_USEDEP}]
 	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
 	>=dev-python/charset_normalizer-2.0[${PYTHON_USEDEP}]
 	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/aioredis/aioredis-2.0.1.ebuild b/dev-python/aioredis/aioredis-2.0.1.ebuild
index 28add3b00813..a82117468837 100644
--- a/dev-python/aioredis/aioredis-2.0.1.ebuild
+++ b/dev-python/aioredis/aioredis-2.0.1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
-	dev-python/async_timeout[${PYTHON_USEDEP}]
+	dev-python/async-timeout[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async-timeout/Manifest
index d2f3d5fd58b2..d2f3d5fd58b2 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async-timeout/Manifest
diff --git a/dev-python/async_timeout/async_timeout-4.0.2-r1.ebuild b/dev-python/async-timeout/async-timeout-4.0.2-r1.ebuild
index aea8eb5881c3..c32c0002e60f 100644
--- a/dev-python/async_timeout/async_timeout-4.0.2-r1.ebuild
+++ b/dev-python/async-timeout/async-timeout-4.0.2-r1.ebuild
@@ -8,14 +8,12 @@ PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 
 inherit distutils-r1
 
-MY_P=${PN/_/-}-${PV}
 DESCRIPTION="Timeout context manager for asyncio programs"
 HOMEPAGE="
 	https://github.com/aio-libs/async-timeout/
 	https://pypi.org/project/async-timeout/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/async_timeout/metadata.xml b/dev-python/async-timeout/metadata.xml
index 6fb0e4bdaca7..6fb0e4bdaca7 100644
--- a/dev-python/async_timeout/metadata.xml
+++ b/dev-python/async-timeout/metadata.xml
diff --git a/dev-python/click-default-group/click-default-group-1.2.2-r1.ebuild b/dev-python/click-default-group/click-default-group-1.2.2-r1.ebuild
index cf35ba0c7d7c..f9ca92ec44cd 100644
--- a/dev-python/click-default-group/click-default-group-1.2.2-r1.ebuild
+++ b/dev-python/click-default-group/click-default-group-1.2.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/click-contrib/${PN}/archive/v${PV}.tar.gz -> ${P}.gh
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/dictdiffer/dictdiffer-0.9.0-r1.ebuild b/dev-python/dictdiffer/dictdiffer-0.9.0-r1.ebuild
index 4b99c528ae5b..e8f8d3df51b8 100644
--- a/dev-python/dictdiffer/dictdiffer-0.9.0-r1.ebuild
+++ b/dev-python/dictdiffer/dictdiffer-0.9.0-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild b/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild
deleted file mode 100644
index 10342edc9878..000000000000
--- a/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild
+++ /dev/null
@@ -1,39 +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="Dictdiffer is a library that helps you to diff and patch dictionaries"
-HOMEPAGE="
-	https://github.com/inveniosoftware/dictdiffer/
-	https://pypi.org/project/dictdiffer/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-# Requires self to be already installed
-#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-
-python_prepare_all() {
-	# remove dep on pytest-runner
-	sed -i -e '/pytest-runner/d' setup.py || die
-
-	# remove dep on pytest-pep8 and pytest-cov
-	sed -i -e '/addopts/d' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/eyeD3/eyeD3-0.9.6-r1.ebuild b/dev-python/eyeD3/eyeD3-0.9.6-r1.ebuild
index 2818a2a5d3eb..ea413108e5e1 100644
--- a/dev-python/eyeD3/eyeD3-0.9.6-r1.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.9.6-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0.7"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/deprecation[${PYTHON_USEDEP}]
diff --git a/dev-python/eyeD3/eyeD3-0.9.6.ebuild b/dev-python/eyeD3/eyeD3-0.9.6.ebuild
deleted file mode 100644
index e2dbd7670ace..000000000000
--- a/dev-python/eyeD3/eyeD3-0.9.6.ebuild
+++ /dev/null
@@ -1,45 +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="Module for manipulating ID3 (v1 + v2) tags in Python"
-HOMEPAGE="https://eyed3.nicfit.net/"
-SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://eyed3.nicfit.net/releases/eyeD3-test-data.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0.7"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/deprecation[${PYTHON_USEDEP}]
-	dev-python/filetype[${PYTHON_USEDEP}]"
-# note: most of the deps are optional runtime deps / plugin deps
-BDEPEND="
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pylast[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# requires unpackaged factory-boy, doesn't seem to relevant
-	# to anything but eyeD3 usage with factory-boy
-	rm tests/test_factory.py || die
-	# requires unpackaged grako
-	rm tests/test_display_plugin.py || die
-
-	if use test; then
-		mv "${WORKDIR}"/eyeD3-test-data tests/data || die
-	fi
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/fonttools/files/fonttools-4.33.3-py3.11-tests.patch b/dev-python/fonttools/files/fonttools-4.33.3-py3.11-tests.patch
new file mode 100644
index 000000000000..9b5e9983ba3d
--- /dev/null
+++ b/dev-python/fonttools/files/fonttools-4.33.3-py3.11-tests.patch
@@ -0,0 +1,40 @@
+https://github.com/fonttools/fonttools/pull/2655/commits/7787525b
+From: Parag Nemade <pnemade@fedoraproject.org>
+Date: Wed, 15 Jun 2022 18:24:04 +0530
+Subject: [PATCH] Fix tests for Python 3.11
+--- a/Tests/pens/cu2quPen_test.py
++++ b/Tests/pens/cu2quPen_test.py
+@@ -12,6 +12,7 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ 
++import sys
+ import unittest
+ 
+ from fontTools.pens.cu2quPen import Cu2QuPen, Cu2QuPointPen
+@@ -257,8 +258,12 @@ def test_ignore_single_points(self):
+         quadpen.closePath()
+ 
+         self.assertGreaterEqual(len(log.records), 1)
+-        self.assertIn("ignore_single_points is deprecated",
+-                      log.records[0].args[0])
++        if sys.version_info < (3, 11):
++            self.assertIn("ignore_single_points is deprecated",
++                          log.records[0].args[0])
++        else:
++            self.assertIn("ignore_single_points is deprecated",
++                          log.records[0].msg)
+ 
+         # single-point contours were ignored, so the pen commands are empty
+         self.assertFalse(pen.commands)
+--- a/Tests/ufoLib/ufoLib_test.py
++++ b/Tests/ufoLib/ufoLib_test.py
+@@ -35,7 +35,7 @@ def test_formatVersionTuple(ufo_path):
+     assert reader.formatVersionTuple == (3, 0)
+     assert reader.formatVersionTuple.major == 3
+     assert reader.formatVersionTuple.minor == 0
+-    assert str(reader.formatVersionTuple) == "3.0"
++    assert str(reader.formatVersionTuple) in ("3.0", "UFOFormatVersion.FORMAT_3_0")
+ 
+ 
+ def test_readMetaInfo_errors(ufo_path):
diff --git a/dev-python/fonttools/fonttools-4.33.3.ebuild b/dev-python/fonttools/fonttools-4.33.3.ebuild
index 1fd94fb5cd9e..d52f5edfd54f 100644
--- a/dev-python/fonttools/fonttools-4.33.3.ebuild
+++ b/dev-python/fonttools/fonttools-4.33.3.ebuild
@@ -28,6 +28,10 @@ BDEPEND="${RDEPEND}
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${P}-py3.11-tests.patch
+)
+
 python_prepare_all() {
 	# When dev-python/pytest-shutil is installed, we get weird import errors.
 	# This is due to incomplete nesting in the Tests/ tree:
diff --git a/dev-python/gssapi/gssapi-1.7.3-r1.ebuild b/dev-python/gssapi/gssapi-1.7.3-r1.ebuild
index fb02b3ec602b..5e60c25e0076 100644
--- a/dev-python/gssapi/gssapi-1.7.3-r1.ebuild
+++ b/dev-python/gssapi/gssapi-1.7.3-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/python-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/decorator[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index a95fc5ed958f..4d8a6af6ac3e 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -7,4 +7,3 @@ DIST hypothesis-hypothesis-python-6.47.2.gh.tar.gz 9314053 BLAKE2B df607e7d81a28
 DIST hypothesis-hypothesis-python-6.47.3.gh.tar.gz 9314739 BLAKE2B 282b012e020fc6494b628ba629c576f604db831c219878ab92539fbd1d980f3363e490ef35f888b68902661dd82e682393641d13a882c1177d8570ec232b217a SHA512 c7231ff06ae5846f718e76c48ed4bb8a1fc0f9aff80c7ddd1ff0ead219eb93dcc7f9d5c5e591390661e81a33bcac79773ea620cfe3f246210114635f0c089144
 DIST hypothesis-hypothesis-python-6.47.4.gh.tar.gz 9314838 BLAKE2B 183048d7d784f8e64bcac1f5bb53b6b9f945b38d555aebd84d0966bcf64178e952f767dcf63122d9b3e8d41d79034b4b11074335e5dbb7575b5f78e152d05c25 SHA512 17a7388ac03ea9029bc5a90f24aa85c3f825bd04ceee963ff7f144ff675b0465afdd22edc5608931f1fd60e83c59d10be24dd74ed64015f942c3f09956b652d7
 DIST hypothesis-hypothesis-python-6.47.5.gh.tar.gz 9315253 BLAKE2B f1b9829c2b0ba7f82dd49289feaf22100901674e0f394520c3c8d43d2eaab77669cc9d8f355455c1ea23210a17786c8ee6e982d7ca49067c51571491e3c7f43b SHA512 f08d1ac0237292fb3232e0ba11e81520a16f03d2c266f4d05495ffc3d1e801de7fbceee1973c73311f2b18e0cdc88988a2635968e1dd5c493f6887e5d63812fe
-DIST hypothesis-python-6.46.9.tar.gz 9311955 BLAKE2B f8cf7e216650401ea8a9b427311d10bc65a21b79eb231864c4ff429baea4600f8d84b05e4b94120551ebe17f1b4b99a65e76157efe9d0a133ad68c22b1c46452 SHA512 e4fed5210ba11977958d4d14f9fb32427b812ea7903f391bbf977ade7ae268770e846b0cd2193585f519a02681e4fabfead23eea5bcededaccc0e7a9857e98cf
diff --git a/dev-python/hypothesis/hypothesis-6.46.11.ebuild b/dev-python/hypothesis/hypothesis-6.46.11.ebuild
index 0dd5c5134055..73b1f123c2b0 100644
--- a/dev-python/hypothesis/hypothesis-6.46.11.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.46.11.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}/hypothesis-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/hypothesis/hypothesis-6.46.9.ebuild b/dev-python/hypothesis/hypothesis-6.46.9.ebuild
deleted file mode 100644
index 6738cac7eb78..000000000000
--- a/dev-python/hypothesis/hypothesis-6.46.9.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{8..10} )
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
-
-	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/jeepney/jeepney-0.8.0.ebuild b/dev-python/jeepney/jeepney-0.8.0.ebuild
index 073afdcdea9e..acb03b57bebf 100644
--- a/dev-python/jeepney/jeepney-0.8.0.ebuild
+++ b/dev-python/jeepney/jeepney-0.8.0.ebuild
@@ -19,7 +19,7 @@ IUSE="examples"
 
 BDEPEND="
 	test? (
-		dev-python/async_timeout[${PYTHON_USEDEP}]
+		dev-python/async-timeout[${PYTHON_USEDEP}]
 		>=dev-python/pytest-asyncio-0.7.1[${PYTHON_USEDEP}]
 		dev-python/testpath[${PYTHON_USEDEP}]
 		sys-apps/dbus
diff --git a/dev-python/jupyter_packaging/Manifest b/dev-python/jupyter_packaging/Manifest
index 319227ba2602..5f854383d2be 100644
--- a/dev-python/jupyter_packaging/Manifest
+++ b/dev-python/jupyter_packaging/Manifest
@@ -1,3 +1 @@
-DIST jupyter_packaging-0.12.0.tar.gz 25258 BLAKE2B 1e8897297e6d1e592a5e3d934f850a9fadc27b7fd97484c6ef3dda9ae5d6da0c48116846e0f3fe7757c3c4794a7a8e2e3eaa69b3fe3a68f73cc952707fa27ec1 SHA512 2a34b64a34f6931b7ba0578a9c1c270285a970043136f65c4a7afbc8e9a5e70feb1bffdc00f682d1fa49fe1f5f91bd3a093437f0f05232e6a57c97eda7f1fc29
-DIST jupyter_packaging-0.12.1.tar.gz 27813 BLAKE2B 8b36d672bfd30734239486fc048f4f6f591511ec4009a9707a44ee12e71e06edc4944ff72e6e63206731705aca092efaa7ef185cf0c216ebfbe4f940ca3d7a27 SHA512 d1216c6b4b65f7e2706bf28d19110e3f8bc6c01d5821d3c3b6bdbbfeb6ebda40f893ef596bf67d87d157e9db436acc751640ea518880063eb387dda8cd78ef15
 DIST jupyter_packaging-0.12.2.tar.gz 27990 BLAKE2B 0cd07fa760fe0bd4529e8430bd52863034cc4c78d8f906f55530a6825c496b8a1bf2fff76da3f4e963ee43c80fc19347edbaf20d16fbfe51584b040b0ab4d3ed SHA512 f4167c7beb3188d2e4b0fa8601fb8cdede8b20dc8c16e0bccbcf9e317e75e24ea1469a9d904bb35b2d81dec351caf49526ef35e5d91460a099a8e4ed6974e1b1
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.12.0-r1.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.12.0-r1.ebuild
deleted file mode 100644
index a1f0b9fe2be7..000000000000
--- a/dev-python/jupyter_packaging/jupyter_packaging-0.12.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tools to help build and install Jupyter Python packages"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-60.2.0[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-	dev-python/deprecation[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# require Internet
-	tests/test_build_api.py::test_build_package
-	tests/test_build_api.py::test_deprecated_metadata
-)
-
-src_prepare() {
-	# https://github.com/jupyter/jupyter-packaging/pull/135
-	cat >> setup.cfg <<-EOF
-		[options.packages.find]
-		exclude = tests
-	EOF
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.12.1.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.12.1.ebuild
deleted file mode 100644
index c09bba7ed613..000000000000
--- a/dev-python/jupyter_packaging/jupyter_packaging-0.12.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tools to help build and install Jupyter Python packages"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-60.2.0[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-	dev-python/deprecation[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# require Internet
-	tests/test_build_api.py::test_build_package
-	tests/test_build_api.py::test_deprecated_metadata
-)
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.12.2.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.12.2.ebuild
index a21918637b67..27f98500718c 100644
--- a/dev-python/jupyter_packaging/jupyter_packaging-0.12.2.ebuild
+++ b/dev-python/jupyter_packaging/jupyter_packaging-0.12.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/krb5/krb5-0.3.0-r1.ebuild b/dev-python/krb5/krb5-0.3.0-r1.ebuild
index bf2b3ea47a25..4e9e7b3f5173 100644
--- a/dev-python/krb5/krb5-0.3.0-r1.ebuild
+++ b/dev-python/krb5/krb5-0.3.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~riscv ~x86"
 
 RDEPEND="
 	virtual/krb5
diff --git a/dev-python/libpillowfight/libpillowfight-0.3.0_p20210816.ebuild b/dev-python/libpillowfight/libpillowfight-0.3.0_p20210816.ebuild
index 3ec7921942da..a7ad90c98eb9 100644
--- a/dev-python/libpillowfight/libpillowfight-0.3.0_p20210816.ebuild
+++ b/dev-python/libpillowfight/libpillowfight-0.3.0_p20210816.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
 
-distutils_enable_tests nose
+distutils_enable_tests pytest
 
 python_prepare_all() {
 	ln -s "${S}"/tests "${T}"/tests || die
diff --git a/dev-python/nbclient/nbclient-0.6.4.ebuild b/dev-python/nbclient/nbclient-0.6.4.ebuild
index d813ead69722..1384c7dd785e 100644
--- a/dev-python/nbclient/nbclient-0.6.4.ebuild
+++ b/dev-python/nbclient/nbclient-0.6.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/nptyping/Manifest b/dev-python/nptyping/Manifest
index a66d77bd4017..723ee657fbc5 100644
--- a/dev-python/nptyping/Manifest
+++ b/dev-python/nptyping/Manifest
@@ -1,5 +1,3 @@
-DIST nptyping-2.0.1.gh.tar.gz 54790 BLAKE2B 75aadc4310dc3e5262aa8f007bc65584ee110fd0f2c1d0737c35a0c57bb0f0a5191f0260dbc0a6c80cab0f546d1e3ade219d6b6318cc2d195ba0579318c20841 SHA512 d832cc0d701a36a94c97bc6db2445c7ff72ec7c41fbcb48ea2006fa201bfca169012be9501029f77f4da7a2fd126227292bd16ba5d0bd7cb6924e3eb74cfaa01
-DIST nptyping-2.1.1.gh.tar.gz 63606 BLAKE2B 846d85230f7391a1119cab522e17424cae20276981a06897921a82bb739296ad449197526f36da542fcb263ff6595913d9c333fd0b83b10fc835cea338f7f094 SHA512 4e9993a01650b8bbd8616b2721e92d1e7a2fa87e8cdc55239a30b09f6e323bbcebb532b6cacb4891b50c4aa6cabe8f00dc25d4b052bddb1827fc1e3d021299ae
 DIST nptyping-2.1.2.gh.tar.gz 64535 BLAKE2B c050c7c49e4c4570b73496a3ac2aa24742844e7cbc1db353d1bf065eea4fdd892221139a085d217a9118dea5b19b0bcec512577c943cc841492f1cc0b14c3681 SHA512 f6d600f7595294829bae5b8cade8b66952df02f30b795af6b193401083d61e5dc8ac4ac474ddd5ef72c3fe3e7f11a4a895a5ff89ab7ddd2664382fbe4f8017c2
 DIST nptyping-2.1.3.gh.tar.gz 65157 BLAKE2B cae8b1a34ac42bdb805193437d2bc02d16c4c37b6cfd04e84e777ec11ce40b32a8422e89e7c63e876b99fa785bf2b15fcf0ea295313ae8a46e662ecb2e370d5e SHA512 7d0c47f5fc67af6ef3af4c757e75d2b415011c4bb7ef08100b4649dd17a8afe3b430ae1b621d36097e19ee635bdaa95ecda6e62c6fb01a58983c66386b51717c
 DIST nptyping-2.2.0.gh.tar.gz 65224 BLAKE2B 11b77690dc83492a13f5a58839655c210d3bd48368e14d0c97be4b5e51f4de54d4e4a238f5865826309b40dc7bb50376ca45827e9e74360dad215bd798610809 SHA512 3c29689994ca87418614e55811b66d03087d127b9e620c2dc3407e3e3ff984cdecd789b0dbd955db460f865a34941f061a7496362ef9944351f59a0e4c3ef483
diff --git a/dev-python/nptyping/nptyping-2.0.1.ebuild b/dev-python/nptyping/nptyping-2.0.1.ebuild
deleted file mode 100644
index 10ccfd9e7e03..000000000000
--- a/dev-python/nptyping/nptyping-2.0.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Type hints for Numpy"
-HOMEPAGE="
-	https://pypi.org/project/nptyping/
-	https://github.com/ramonhagenaars/nptyping/
-"
-SRC_URI="
-	https://github.com/ramonhagenaars/nptyping/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		dev-python/mypy[${PYTHON_USEDEP}]
-		dev-python/typeguard[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# TODO: package beartype?
-	tests/test_beartype.py
-	# relies on Internet access to fetch packages for pip
-	tests/test_wheel.py
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/nptyping/nptyping-2.1.1.ebuild b/dev-python/nptyping/nptyping-2.1.1.ebuild
deleted file mode 100644
index dce5344c969a..000000000000
--- a/dev-python/nptyping/nptyping-2.1.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Type hints for Numpy"
-HOMEPAGE="
-	https://pypi.org/project/nptyping/
-	https://github.com/ramonhagenaars/nptyping/
-"
-SRC_URI="
-	https://github.com/ramonhagenaars/nptyping/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		dev-python/mypy[${PYTHON_USEDEP}]
-		dev-python/typeguard[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# TODO: package beartype?
-	tests/test_beartype.py
-	# relies on Internet access to fetch packages for pip
-	tests/test_wheel.py
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/nptyping/nptyping-2.1.2.ebuild b/dev-python/nptyping/nptyping-2.1.2.ebuild
index 042e67171869..4a78d086329c 100644
--- a/dev-python/nptyping/nptyping-2.1.2.ebuild
+++ b/dev-python/nptyping/nptyping-2.1.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/pafy/pafy-0.5.5.ebuild b/dev-python/pafy/pafy-0.5.5.ebuild
index ef5e77534ca9..d99d5a807f72 100644
--- a/dev-python/pafy/pafy-0.5.5.ebuild
+++ b/dev-python/pafy/pafy-0.5.5.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
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Python library to retrieve YouTube content and metadata"
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index d5e83e4dc2ff..dfc36c650a9d 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1 +1,2 @@
 DIST pocketlint-0.22.tar.gz 23779 BLAKE2B 3698927cc4a3f6ee6de74d205b5a7f937405e7ce2e9d987e34b35ce209635cab37357d0221a6762deb66350cd2b991420a9b12af2c9e6792f713e5c95dfedb59 SHA512 7ee9e6b969975274e7697d1d16fadaac82fa0a1855401d9f240aaae123831dc32e381dd24f88a3f004ab45df9f0251c408ed8f60a08fe99caf629af617c80ea0
+DIST pocketlint-0.23.gh.tar.gz 23854 BLAKE2B 2ff3388b639ba29ae60ccd0013cea9b1f437d03d552c03089c91ba65f4fdf7b6b739ac2b926248bc5738e29cd41fa104d7c2742385cfe7a454841f2ed252b0fa SHA512 36a6f7fbc5b9475a145bc03ccf9a6918e49ed29279913b1bcc7090961bcc842333a4d31b4eb809a7ca7b384e79c186d1e6397c379c1921943ddd49c3c736aaed
diff --git a/dev-python/pocketlint/pocketlint-0.23.ebuild b/dev-python/pocketlint/pocketlint-0.23.ebuild
new file mode 100644
index 000000000000..5d75eba23de1
--- /dev/null
+++ b/dev-python/pocketlint/pocketlint-0.23.ebuild
@@ -0,0 +1,23 @@
+# 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="Shared code for running pylint against rhinstaller projects"
+HOMEPAGE="https://github.com/rhinstaller/pocketlint"
+SRC_URI="
+	https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/pylint[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pyalsa/pyalsa-1.2.7.ebuild b/dev-python/pyalsa/pyalsa-1.2.7.ebuild
index 0f79d346cb82..d7efbd28e609 100644
--- a/dev-python/pyalsa/pyalsa-1.2.7.ebuild
+++ b/dev-python/pyalsa/pyalsa-1.2.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/pyalsa/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc ~x86"
 IUSE=""
 
 RDEPEND="media-libs/alsa-lib"
diff --git a/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild
index 692f1245227a..7a8edc63b69d 100644
--- a/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/cryptography-35.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-libevdev/Manifest b/dev-python/python-libevdev/Manifest
index dba8f1e16801..3bb0da2c4734 100644
--- a/dev-python/python-libevdev/Manifest
+++ b/dev-python/python-libevdev/Manifest
@@ -1,2 +1 @@
-DIST python-libevdev-0.10.tar.bz2 32385 BLAKE2B ae962d714168a3c035220dc9343ae5907e5de5a645b9d5857cfd884a847fb5b2b13cbdcc6204a66940ad406e92a3add332755c3adb5a10b7cc6a5ae62468c1ff SHA512 1ea54c5e335d348182fad71151ab37103a8c295c8efb73a60f40b41e399cc5fc48525006b15337e591147fc5385e8e56a12dcbcec2dd2e07652a7b60f85eaf1c
 DIST python-libevdev-0.11.tar.bz2 32406 BLAKE2B 0291a9008590a2900961d9e790c2946b67bc045a5b0df43f9f40d9c8838b332e1a839c21411ee88eddc92e9c59a038bc7ce8dd365bab71075fdd0a8c629c3a34 SHA512 6fb6181fc97cb1a7a087d298a933891cf05d0160d033c6d6300bcb6a904064b727a15e8e75665ee2933d0e8a0aeab2638f01bbd8d9f803f508157fd0e5ca41fc
diff --git a/dev-python/python-libevdev/python-libevdev-0.10.ebuild b/dev-python/python-libevdev/python-libevdev-0.10.ebuild
deleted file mode 100644
index 5a0b3e77eef0..000000000000
--- a/dev-python/python-libevdev/python-libevdev-0.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrappers for the libevdev library"
-HOMEPAGE="https://gitlab.freedesktop.org/libevdev/python-libevdev"
-SRC_URI="https://gitlab.freedesktop.org/libevdev/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="test? ( dev-libs/libevdev )"
-PDEPEND="dev-libs/libevdev"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source \
-	dev-python/sphinx_rtd_theme
diff --git a/dev-python/python-libevdev/python-libevdev-0.11.ebuild b/dev-python/python-libevdev/python-libevdev-0.11.ebuild
index b8bce84872a8..dce7044b8fe6 100644
--- a/dev-python/python-libevdev/python-libevdev-0.11.ebuild
+++ b/dev-python/python-libevdev/python-libevdev-0.11.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/python-socks/python-socks-2.0.3.ebuild b/dev-python/python-socks/python-socks-2.0.3.ebuild
index 8f48c9d5fa51..e1312225e727 100644
--- a/dev-python/python-socks/python-socks-2.0.3.ebuild
+++ b/dev-python/python-socks/python-socks-2.0.3.ebuild
@@ -22,14 +22,14 @@ KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc 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}]"
+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/async-timeout[${PYTHON_USEDEP}]
 		dev-python/flask[${PYTHON_USEDEP}]
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 		dev-python/yarl[${PYTHON_USEDEP}]
diff --git a/dev-python/readthedocs-sphinx-ext/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest
index 9dac374d4bfb..a43d4162004e 100644
--- a/dev-python/readthedocs-sphinx-ext/Manifest
+++ b/dev-python/readthedocs-sphinx-ext/Manifest
@@ -1,2 +1 @@
-DIST readthedocs-sphinx-ext-2.1.7.tar.gz 12351 BLAKE2B 4646016330591dd32d7065d3805f6158aa57aaee44848e91ac7550149a151ed32ff0d6945165c0112e39cd211126b773713ef8d8f669156c36e9f70a24afbd1b SHA512 bbf4a0e266248374198eedeb84b9866cb69e7a8531bbdbb6ad765f2d7013aa1b0b51cc57205b59be04592959b026c71e887035e663b7eb2c0ed6769272542162
 DIST readthedocs-sphinx-ext-2.1.8.tar.gz 12359 BLAKE2B 9a1c66725d4d48b6511462c5eea5d87fb28962444f8ff921208579bb2118571da34d2697d2bc91dc1ff71a2e3b7cb1c5b20021bc2f053fffd34f4eb0ae99d387 SHA512 2766c0ce69d7d3738cd454c8d3e733542849e6cd96414e1714f337defb62f9260c89a00c9bcc26582e15ce1629d61c48441826c2af84d92da0a6a5b65f474891
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.7.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.7.ebuild
deleted file mode 100644
index a06946aac3d6..000000000000
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Code specific for Read the Docs and Sphinx"
-HOMEPAGE="
-	https://github.com/readthedocs/readthedocs-sphinx-ext/
-	https://pypi.org/project/readthedocs-sphinx-ext/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-PDEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( ${PDEPEND} )
-"
-
-# unittest should be sufficient but tests are very verbose, so pytest's
-# output capture is most welcome
-distutils_enable_tests pytest
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.8.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.8.ebuild
index a462f86fafb5..efcb5f861ddf 100644
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.8.ebuild
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 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"
 
 RDEPEND="
 	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
diff --git a/dev-python/recommonmark/recommonmark-0.7.1-r1.ebuild b/dev-python/recommonmark/recommonmark-0.7.1-r1.ebuild
index e516a9f282f4..18998098cf57 100644
--- a/dev-python/recommonmark/recommonmark-0.7.1-r1.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.7.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rtfd/recommonmark/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/commonmark-0.8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/recommonmark/recommonmark-0.7.1.ebuild b/dev-python/recommonmark/recommonmark-0.7.1.ebuild
deleted file mode 100644
index 402a7566ca8b..000000000000
--- a/dev-python/recommonmark/recommonmark-0.7.1.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 docutils-compatibility bridge to CommonMark"
-HOMEPAGE="https://recommonmark.readthedocs.io/"
-SRC_URI="https://github.com/rtfd/recommonmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/commonmark-0.8.1[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.14[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.0-sphinx3-1.patch"
-	"${FILESDIR}/${PN}-0.6.0-sphinx3-2.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/redis-py/redis-py-4.2.2.ebuild b/dev-python/redis-py/redis-py-4.2.2.ebuild
index 9918b59b12e7..8082d0032015 100644
--- a/dev-python/redis-py/redis-py-4.2.2.ebuild
+++ b/dev-python/redis-py/redis-py-4.2.2.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
-	>=dev-python/async_timeout-4.0.2[${PYTHON_USEDEP}]
+	>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
 	>=dev-python/deprecated-1.2.3[${PYTHON_USEDEP}]
 	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/redis-py/redis-py-4.3.3.ebuild b/dev-python/redis-py/redis-py-4.3.3.ebuild
index 0a8f178b9ea3..b92d87359427 100644
--- a/dev-python/redis-py/redis-py-4.3.3.ebuild
+++ b/dev-python/redis-py/redis-py-4.3.3.ebuild
@@ -23,7 +23,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
-	>=dev-python/async_timeout-4.0.2[${PYTHON_USEDEP}]
+	>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
 	>=dev-python/deprecated-1.2.3[${PYTHON_USEDEP}]
 	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/redis-py/redis-py-4.3.4.ebuild b/dev-python/redis-py/redis-py-4.3.4.ebuild
index 0a8f178b9ea3..b92d87359427 100644
--- a/dev-python/redis-py/redis-py-4.3.4.ebuild
+++ b/dev-python/redis-py/redis-py-4.3.4.ebuild
@@ -23,7 +23,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
-	>=dev-python/async_timeout-4.0.2[${PYTHON_USEDEP}]
+	>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
 	>=dev-python/deprecated-1.2.3[${PYTHON_USEDEP}]
 	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/sphinx-tabs/Manifest b/dev-python/sphinx-tabs/Manifest
index 713f4d5bca94..45e78f2419ff 100644
--- a/dev-python/sphinx-tabs/Manifest
+++ b/dev-python/sphinx-tabs/Manifest
@@ -1,2 +1,3 @@
 DIST sphinx-tabs-3.3.1.tar.gz 523932 BLAKE2B 8b941eb549ea8a10fcd329e880b8fa15742ba7903f4f9d6422335cf889c344a1fec8f16798c286b0c0f7561c128ea297153c31d0445b867e5e23f7960698d31a SHA512 d93ba1149a20711b52f8a76f22d212fdbb97349561f3e13b53873cdb4dba8f18f645e2d73ef378c2dde3d1c0c585c1402d73f4102da0e973be0c90a5912e7036
 DIST sphinx-tabs-3.4.0.gh.tar.gz 524212 BLAKE2B 18688d10d37e5794340ccfc5d798a31bf80374ed74e64dcb54ae53dc557d7538de39b4e29002d16735cab5ed4618189af54da2682dce195c503af442f554fef7 SHA512 2833586c7040e454cac65963a3dfb22ac7e09b0a4cd5cba9ea449d798a5d7120ce3d19ac0a9d638a9389d52773bd98ab4bde33d06924170757036ff3218f6d55
+DIST sphinx-tabs-3.4.1.gh.tar.gz 524071 BLAKE2B 5aecb9c22a298c1347bf82cbbc16709f3f6cd38b0f0f6e4948411f1fdd79ba17d3e75178b8c092df7b8abc812dd4b0102879774708552a062aad0fe0b0653717 SHA512 b6079d3ae91479d40aaf35926226eb7dd783de7cec0e721cb13a036fc520bb3afda0dffb0669dc5054fc665125c3620261b1ea7ffe685d5b177bc980e3b4d7e4
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.4.1.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.4.1.ebuild
new file mode 100644
index 000000000000..a11b52bb11eb
--- /dev/null
+++ b/dev-python/sphinx-tabs/sphinx-tabs-3.4.1.ebuild
@@ -0,0 +1,57 @@
+# 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="Tabbed views for Sphinx"
+HOMEPAGE="
+	https://github.com/executablebooks/sphinx-tabs/
+	https://pypi.org/project/sphinx-tabs/
+"
+SRC_URI="
+	https://github.com/executablebooks/sphinx-tabs/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/sphinx-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+EPYTEST_DESELECT=(
+	# Unpackaged rinohtype
+	tests/test_build.py::test_rinohtype_pdf
+)
+
+src_prepare() {
+	# annoying, incorrect version limitations
+	sed -i -e '/install_requires/d' setup.py || die
+
+	# fix tests for >=sphinx-5
+	sed -e 's/\(Permalink to this\) heading/\1 headline/g' \
+		-i tests/test_build/test_*.html || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0-r1.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0-r1.ebuild
index b9188ef9b1b3..32d2a4ef3186 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0-r1.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=""
 
 RDEPEND="
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0.ebuild
deleted file mode 100644
index e75c9a7c54e6..000000000000
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="ReadTheDocs.org theme for Sphinx"
-HOMEPAGE="https://github.com/readthedocs/sphinx_rtd_theme"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE=""
-
-PDEPEND=">=dev-python/sphinx-1.6[${PYTHON_USEDEP}]"
-RDEPEND="<dev-python/docutils-0.18[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${PDEPEND}
-		dev-python/readthedocs-sphinx-ext[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	# CI=1 disables rebuilding webpack that requires npm use
-	# yes, that surely makes sense
-	export CI=1
-}
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index d43c67bfb3e7..129b6c665af3 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1,4 +1,3 @@
-DIST sphinxcontrib-spelling-7.3.3.tar.gz 51912 BLAKE2B 6a9bd90db2298beb78686252d555dd5e77d0c9042eb0986dd2eeab9e413a921c5f5f594c539c2cfe6315002c2f2892241b789b10976e634158f3ca1d8be1b627 SHA512 7406bd846c5eac507f8e4481ada4d0d725d0a3ad8cf2f8fd3328389128cf54091bb0e304dfe23fdf771a26d9103d2c028d2f7f29e1949ca59fcf43de5bac9cb1
 DIST sphinxcontrib-spelling-7.5.0.tar.gz 54978 BLAKE2B ed56e27434a43d688a63ff6ca8aa7889a80a0a750abdebc5e9307c68fae8a14ae7ba065b127c583fff11499e75750aee6f017b4d442204b1a2308a5c8692e73c SHA512 d306d19664990cfb6ceff947f3a34243a8ead95b0e6076f9da924cd0ef43e2621178bd374400f805970592f803d6a129c74a32a6c6837d41e4f72118da667138
 DIST sphinxcontrib-spelling-7.5.1.tar.gz 55547 BLAKE2B 61415fb62b0d47672901048276897d7578f891732278d9ea0b4fe0ca5f42654114f76d600ffcf0f602afe1c0d46f4bf466c326337accf910090f768c1cee1c69 SHA512 d38114421e519ed127eae712637677a8ae75cc640087d2e7740d8c106a0d7058e633f65fb1ac9ee2fa75d295b218aa98d3a3279b077f2a89ea947a3b4c0fd05a
 DIST sphinxcontrib-spelling-7.6.0.tar.gz 56329 BLAKE2B e26a3fcb39edf622b20bce0d79d1ce2d2a13e4dd8bdef0bb5cc31108a8ee42afd728975fd65e840c91bc6c6510a57904ebc478b458a52a96031bf44f1cbfa8b6 SHA512 102202eb73767ffface2aa5555c8ee2658bcd3c1eb7f3a925e8713e2f233d1bcf0eb307fed6c264c4e4e6503c30d83a3025b0c39ef608451d2fe86664aeb48c5
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.3.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.3.ebuild
deleted file mode 100644
index f13a2b24491c..000000000000
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx spelling extension"
-HOMEPAGE="
-	https://github.com/sphinx-contrib/spelling/
-	https://pypi.org/project/sphinxcontrib-spelling/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		app-dicts/myspell-en
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires the git repo
-	tests/test_filter.py::test_contributors
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	rm -rf sphinxcontrib || die
-	epytest tests
-}
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.5.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.5.0.ebuild
index b8d27861b9f0..f13a2b24491c 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.5.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.5.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pyenchant[${PYTHON_USEDEP}]
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index fa006a7844b3..d64db0b78a87 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1 +1,2 @@
 DIST ujson-5.3.0.tar.gz 7137499 BLAKE2B 5aa61c465156c02aab6095acbd9764fec9cfdc1c42312852e804573b0f0e677591812d31b362f671468caea8159d0c5719eefc49847b993cf571ab40416f8652 SHA512 7342ab3548980e14ff7a931b40aa9886703c167b3f079d01e1d07c9f6408b2994a84cf157ff8966400af057cdd8f332d6f47e2747b918efcd67129727434c501
+DIST ujson-5.4.0.tar.gz 7139576 BLAKE2B d3bd6bcc4dc733cafc47e613e2dc503e8cf7faf562d2fad91ea66b1a62dd4a8d67a2c80c392eba0c224f382280e58ff3fff51308c22862aaae5e671b5183027c SHA512 9622e872391d5467455b32e324d7b680487664ca486bfc56ba8c3969853e5db94725cd45e81b535dca80af4a3c718af171ce7adb6dcb9b98a37a8068824f89c6
diff --git a/dev-python/ujson/ujson-5.4.0.ebuild b/dev-python/ujson/ujson-5.4.0.ebuild
new file mode 100644
index 000000000000..6007480a5725
--- /dev/null
+++ b/dev-python/ujson/ujson-5.4.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
+HOMEPAGE="
+	https://github.com/ultrajson/ultrajson/
+	https://pypi.org/project/ujson/
+"
+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"
+
+DEPEND="
+	dev-libs/double-conversion:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	export UJSON_BUILD_DC_INCLUDES="/usr/include/double-conversion"
+	export UJSON_BUILD_DC_LIBS="-ldouble-conversion"
+	export UJSON_BUILD_NO_STRIP=1
+}