Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-06-01 12:52:02 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-06-01 12:52:02 +0000
commit: df899fa791750d19ac5a7dc30a1778095d3f8d60 (patch)
tree: 4aff626b567f25f42c616d1c81fdc1d243d95cab /dev-python
parent: 215476f669d20b307ff052c3ff0d420102108e58 (diff)
download: baldeagleos-repo-df899fa791750d19ac5a7dc30a1778095d3f8d60.tar.gz
baldeagleos-repo-df899fa791750d19ac5a7dc30a1778095d3f8d60.tar.xz
baldeagleos-repo-df899fa791750d19ac5a7dc30a1778095d3f8d60.zip
263 files changed, 1833 insertions, 3283 deletions
diff --git a/dev-python/MutatorMath/Manifest b/dev-python/MutatorMath/Manifest
index bb4890bf5c6f..fc02a1687782 100644
--- a/dev-python/MutatorMath/Manifest
+++ b/dev-python/MutatorMath/Manifest
@@ -1 +1 @@
-DIST MutatorMath-3.0.1.tar.gz 234416 BLAKE2B 999b0fb3c5cca8252fc27efa099e5046d17604b77a38322fd3a13b7e96d7b6ac123dafe75f3a295e908ec8891e5342df319c7faca3612d953849895e8c99f17a SHA512 a1be360c866783543b375872a406eb61ac41ce21a6fd7c9b8d349758525c998d7d2613ad55208a5f8709a81c0ea8ea7e4bad76f0a554e8ce8e62aa6c9a00bbb5
+DIST MutatorMath-3.0.1.gh.tar.gz 234416 BLAKE2B 999b0fb3c5cca8252fc27efa099e5046d17604b77a38322fd3a13b7e96d7b6ac123dafe75f3a295e908ec8891e5342df319c7faca3612d953849895e8c99f17a SHA512 a1be360c866783543b375872a406eb61ac41ce21a6fd7c9b8d349758525c998d7d2613ad55208a5f8709a81c0ea8ea7e4bad76f0a554e8ce8e62aa6c9a00bbb5
diff --git a/dev-python/MutatorMath/MutatorMath-3.0.1.ebuild b/dev-python/MutatorMath/MutatorMath-3.0.1-r1.ebuild
index ad1b6cd5f03c..a05652c40209 100644
--- a/dev-python/MutatorMath/MutatorMath-3.0.1.ebuild
+++ b/dev-python/MutatorMath/MutatorMath-3.0.1-r1.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit distutils-r1
 
-SRC_URI="https://github.com/LettError/MutatorMath/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
 DESCRIPTION="A library for piecewise linear interpolation in multiple dimensions"
 HOMEPAGE="https://github.com/LettError/MutatorMath"
+SRC_URI="https://github.com/LettError/MutatorMath/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+KEYWORDS="~amd64"
 LICENSE="BSD"
 SLOT="0"
 
diff --git a/dev-python/PyQt-builder/PyQt-builder-1.12.2.ebuild b/dev-python/PyQt-builder/PyQt-builder-1.12.2.ebuild
index 194a9d7a9ff4..a91248097168 100644
--- a/dev-python/PyQt-builder/PyQt-builder-1.12.2.ebuild
+++ b/dev-python/PyQt-builder/PyQt-builder-1.12.2.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=8
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/PyQt5/PyQt5-5.15.6.ebuild b/dev-python/PyQt5/PyQt5-5.15.6.ebuild
index 72e8a6d51d96..6fd3b91376dd 100644
--- a/dev-python/PyQt5/PyQt5-5.15.6.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.6.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=8
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 
 # TODO: QtNfc, QtQuick3D, QtRemoteObjects
 IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.5.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.5.ebuild
index f6c7da9f92d5..07d558bcecb9 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.5.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.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=8
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="debug"
 
 REQUIRED_USE="
diff --git a/dev-python/aiosmtplib/aiosmtplib-1.1.6.ebuild b/dev-python/aiosmtplib/aiosmtplib-1.1.6.ebuild
index b7d956223c12..45a252c56d1f 100644
--- a/dev-python/aiosmtplib/aiosmtplib-1.1.6.ebuild
+++ b/dev-python/aiosmtplib/aiosmtplib-1.1.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+DISTUTILS_USE_PEP517=poetry
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit distutils-r1
@@ -18,19 +18,19 @@ KEYWORDS="~amd64"
 
 DEPEND="
 	test? (
-		dev-python/aiosmtpd
-		dev-python/atpublic
-		dev-python/hypothesis
-		dev-python/pytest-asyncio
+		dev-python/aiosmtpd[${PYTHON_USEDEP}]
+		dev-python/atpublic[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 	)
 "
 
-RESTRICT="mirror"
+EPYTEST_DESELECT=( tests/test_connect.py::test_connect_via_socket_path )
 
 distutils_enable_tests pytest
-distutils_enable_sphinx docs "dev-python/sphinx-autodoc-typehints"
+
+distutils_enable_sphinx docs dev-python/sphinx-autodoc-typehints
 
 python_test() {
-	epytest --event-loop=asyncio \
-		--deselect tests/test_connect.py::test_connect_via_socket_path
+	epytest --event-loop=asyncio
 }
diff --git a/dev-python/aiosqlite/aiosqlite-0.17.0-r1.ebuild b/dev-python/aiosqlite/aiosqlite-0.17.0-r1.ebuild
index 6dd046088cb8..ea790543ba11 100644
--- a/dev-python/aiosqlite/aiosqlite-0.17.0-r1.ebuild
+++ b/dev-python/aiosqlite/aiosqlite-0.17.0-r1.ebuild
@@ -4,14 +4,14 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS="pyproject.toml"
+DISTUTILS_USE_PEP517=flit
 inherit distutils-r1
 
 DESCRIPTION="asyncio bridge to the standard sqlite3 module"
 HOMEPAGE="
 	https://aiosqlite.omnilib.dev
 	https://pypi.org/project/aiosqlite/
-	https://github.com/jreese/aiosqlite
+	https://github.com/omnilib/aiosqlite
 "
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 1aff1af3d6e1..d655fd44f7a9 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1 +1,2 @@
 DIST alembic-1.7.7.tar.gz 1247590 BLAKE2B 9906a266b71d658bd66b00b237bc21bb092646077584ddb5c245f73709087f0e476e86eb022bf041e57a68e16ee89e5a3a047dc7ec2d43ffa941b2e803aef0fe SHA512 dcb4ba2faafc3ee789981931e0548f7328c1118938150789218e720f39386fd5e7e2543ab241838bcc1faaf36db07900fd065963496e68ced0896a5f4795d63d
+DIST alembic-1.8.0.tar.gz 1252636 BLAKE2B dfe6130a08a8bfcdeb10e02187a9f597bb55de8194c91909ab06d72f5daaaaf4c7154570a141a82be8568195d8f5f76db661f1dd192b92a5991434ade1a389ed SHA512 601366f21bcadaef1a5b7f7d4a1edfd9c146340f8a5d07b41e3b381e1e00866e79520d8393330e4a80369664b36b549c9d5ab3ea13ad7aa8010b165e73038bcd
diff --git a/dev-python/alembic/alembic-1.8.0.ebuild b/dev-python/alembic/alembic-1.8.0.ebuild
new file mode 100644
index 000000000000..58d1dcb4398b
--- /dev/null
+++ b/dev-python/alembic/alembic-1.8.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="https://github.com/sqlalchemy/alembic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' pypy3 python3_8)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/almost/almost-0.1.5.ebuild b/dev-python/almost/almost-0.1.5.ebuild
index d14d2693bef4..731e909618bc 100644
--- a/dev-python/almost/almost-0.1.5.ebuild
+++ b/dev-python/almost/almost-0.1.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="8"
diff --git a/dev-python/aspectlib/Manifest b/dev-python/aspectlib/Manifest
index c0a357938bf9..b2f724d61bdd 100644
--- a/dev-python/aspectlib/Manifest
+++ b/dev-python/aspectlib/Manifest
@@ -1 +1 @@
-DIST aspectlib-1.5.2.tar.gz 155976 BLAKE2B a5f98c78e098226002a9cfb95cd69d2da057fe5a56cab5ae13c80666e1220c8a0fb9ae1b3f652e85d54ab9829429f9aad37162eac9cc74a4ffaab9ab1f609c1c SHA512 33642f828989d07c6af78bdf9adc9f2abbc419df89b878cfe7bd9c8df226a59401176b56b1f2b3ba48661ea5a145520de0bc7a0980226b742b0a79f31ab7dd7f
+DIST aspectlib-1.5.2.gh.tar.gz 155976 BLAKE2B a5f98c78e098226002a9cfb95cd69d2da057fe5a56cab5ae13c80666e1220c8a0fb9ae1b3f652e85d54ab9829429f9aad37162eac9cc74a4ffaab9ab1f609c1c SHA512 33642f828989d07c6af78bdf9adc9f2abbc419df89b878cfe7bd9c8df226a59401176b56b1f2b3ba48661ea5a145520de0bc7a0980226b742b0a79f31ab7dd7f
diff --git a/dev-python/aspectlib/aspectlib-1.5.2.ebuild b/dev-python/aspectlib/aspectlib-1.5.2.ebuild
index 1e850c10d448..35ed6bc0c0f3 100644
--- a/dev-python/aspectlib/aspectlib-1.5.2.ebuild
+++ b/dev-python/aspectlib/aspectlib-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ HOMEPAGE="
 	https://github.com/ionelmc/python-aspectlib
 	https://pypi.org/project/python-aspectlib/
 "
-SRC_URI="https://github.com/ionelmc/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ionelmc/python-${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/asyncssh/Manifest b/dev-python/asyncssh/Manifest
index 30f844cf43da..95cc262dc35f 100644
--- a/dev-python/asyncssh/Manifest
+++ b/dev-python/asyncssh/Manifest
@@ -1,2 +1 @@
-DIST asyncssh-2.10.0.tar.gz 481494 BLAKE2B fc06ad0579f9dc00af7fd0355f8a3a87144cc6fd5f928cfd7798e9a0942b6b549bd94877ab6371470f014cda040f4092df8980e792c37e37402d77d2f5d7bfe3 SHA512 698d97ca607582d75e74fe39798d9a8490b80c1aa5cfafa0152537c9f2354528a7386b26620d0c18b6d986c710e6c16888404ba7263b821f471211b5eae3d21f
 DIST asyncssh-2.10.1.tar.gz 483000 BLAKE2B a588d671b3afe9f77f15974578f27e9001e8138284e4313d8188766c66e81942a8d37598ba79af4971c11f900fa7009311c20c86fce0e058d1fdeeec72c9320a SHA512 adaf68f2e4209e9bf91c2018298a281dab490d723bda9d6f7db892aa43e796e38ff904cf39f56c8b545439ca71c89b419e53521f323cb753cf7a2290beb04e12
diff --git a/dev-python/asyncssh/asyncssh-2.10.0.ebuild b/dev-python/asyncssh/asyncssh-2.10.0.ebuild
deleted file mode 100644
index 1d91fc853dc3..000000000000
--- a/dev-python/asyncssh/asyncssh-2.10.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOCS_BUILDER="sphinx"
-DOCS_DIR="docs"
-EPYTEST_DESELECT=(
-	tests/test_connection.py::_TestConnection::test_connect_timeout_exceeded
-	tests/test_connection.py::_TestConnection::test_connect_timeout_exceeded_string
-	tests/test_connection.py::_TestConnection::test_connect_timeout_exceeded_tunnel
-) # network tests
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 docs optfeature
-
-DESCRIPTION="Asynchronous SSHv2 client and server library"
-HOMEPAGE="
-	https://asyncssh.timeheart.net
-	https://pypi.org/project/asyncssh/
-	https://github.com/ronf/asyncssh
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ECL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.6[${PYTHON_USEDEP}]
-"
-DEPEND="${REDEPEND}"
-BDEPEND="
-	test? (
-		>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
-		>=dev-python/gssapi-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/libnacl-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-17.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-pkcs11-0.7.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-pkg_postinst() {
-	optfeature "support for OpenSSH private key encryption" dev-python/bcrypt
-	optfeature "support for key exchange and authentication with U2F/FIDO2 security keys" dev-python/fido2
-	optfeature "support for accessing PIV keys on PKCS#11 security tokens" dev-python/python-pkcs11
-	optfeature "support for GSSAPI key exchange and authentication on UNIX" dev-python/gssapi
-	optfeature "if you have a version of OpenSSL older than 1.1.1b installed and you want support for Curve25519 key exchange, Ed25519 keys and certificates, or the Chacha20-Poly1305 cipher" dev-python/libnacl
-	optfeature "support for UMAC cryptographic hashes" dev-python/libnettle
-	optfeature "support for X.509 certificate authentication" dev-python/pyopenssl
-}
diff --git a/dev-python/automaton/Manifest b/dev-python/automaton/Manifest
index 5280300b3586..f5a745562b2a 100644
--- a/dev-python/automaton/Manifest
+++ b/dev-python/automaton/Manifest
@@ -1,2 +1 @@
-DIST automaton-2.4.0.tar.gz 34381 BLAKE2B dda40e6e8b5978e808e80a83581b7c101cca2d5abfd9f46388960608979ce44a1a6457e4cdcb7e7b527f3527c83c0db994c8c55908f61bacd5369ef1bce585fa SHA512 e399fd12fd883112d49aff0d092fbc2b51952a24e3b40eae47d0bd7f5e2648689ab76413a2d404ef686ce5622e4661db1beb3e44a690c5c0279b85f69d267ecd
 DIST automaton-2.5.0.tar.gz 34476 BLAKE2B d2f3fbe486a84af022586fada7b02d0a498d7335aec1c8b47f28607375ca9523674cfc7a113e8ac096c2aa127740b421b288fc76fc22f4b9c9fb67e8f1f789c3 SHA512 ff7c15240e587653a67c3be821855a0102985db31effcb2c3dba79431d052e9aacc14ab0f4d0736c4043143e7aefd7b4bcaf5821e1496b9d83e90721dcead4c4
diff --git a/dev-python/automaton/automaton-2.4.0.ebuild b/dev-python/automaton/automaton-2.4.0.ebuild
deleted file mode 100644
index 5ee0a414f411..000000000000
--- a/dev-python/automaton/automaton-2.4.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="Friendly state machines for python."
-HOMEPAGE="
-	https://pypi.org/project/automaton/
-	https://opendev.org/openstack/automaton
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-3.1.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/avro/avro-1.11.0.ebuild b/dev-python/avro/avro-1.11.0.ebuild
index 6dc24d30b137..43dbcb2ddf7a 100644
--- a/dev-python/avro/avro-1.11.0.ebuild
+++ b/dev-python/avro/avro-1.11.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=8
diff --git a/dev-python/axisregistry/axisregistry-0.2.0.ebuild b/dev-python/axisregistry/axisregistry-0.2.0.ebuild
index 2ee57f645791..9a265350cd99 100644
--- a/dev-python/axisregistry/axisregistry-0.2.0.ebuild
+++ b/dev-python/axisregistry/axisregistry-0.2.0.ebuild
@@ -24,6 +24,8 @@ DEPEND="
 	>=dev-python/setuptools_scm-4[${PYTHON_USEDEP}]
 "
 
+PATCHES=( "${FILESDIR}/${P}-remove-setuptools_scm-constraint.patch" )
+
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/dev-python/axisregistry/files/axisregistry-0.2.0-remove-setuptools_scm-constraint.patch b/dev-python/axisregistry/files/axisregistry-0.2.0-remove-setuptools_scm-constraint.patch
new file mode 100644
index 000000000000..630f539832bd
--- /dev/null
+++ b/dev-python/axisregistry/files/axisregistry-0.2.0-remove-setuptools_scm-constraint.patch
@@ -0,0 +1,11 @@
+--- a/setup.py
++++ b/setup.py
+@@ -45,7 +45,7 @@
+         'Programming Language :: Python :: 3'
+     ],
+     python_requires=">=3.7",
+-    setup_requires=['setuptools_scm>=4,<6.1'],
++    setup_requires=['setuptools_scm>=4'],
+     install_requires=[
+         'protobuf'
+     ]
diff --git a/dev-python/babelfont/Manifest b/dev-python/babelfont/Manifest
index fa63c917640a..e788ac7da119 100644
--- a/dev-python/babelfont/Manifest
+++ b/dev-python/babelfont/Manifest
@@ -1,2 +1 @@
-DIST babelfont-2.0.2.tar.gz 636572 BLAKE2B 4b30f4e4ce3840ab3e0be895d1d87d5067488405d1ba9bbb30ec9f62b02561067f2f536e910a59eeebbfeadbfc70fdd3b22370bdfd42841fa9d75490e5351109 SHA512 478dfb9aacd42b6e1bdf361912644d43a81dd4f0bba8a3414529f9aebd0132f98db24749073c35e82caceb4c371a1bba01e4d2bcaf530b8a97286bc8f26cfd8b
 DIST babelfont-3.0.0a8.tar.gz 27232 BLAKE2B d6e4e78d09014169f10960bcf4f90670d307013486b6634d4b5ec80befe6e78f49f11eb1ed42ee1ab01a972187d9b5d2cbebb972c192f396f50093d55d8a9ac3 SHA512 e2d429bbad4cea7927da75e0ac09a59ecfa94b9c38aaabe9c155e29f3cdda224e021cbc3c0c3d5863e68f306e1f57f42f0eff318b6092cf0704419811853422c
diff --git a/dev-python/babelfont/babelfont-2.0.2.ebuild b/dev-python/babelfont/babelfont-2.0.2.ebuild
deleted file mode 100644
index 6ad44e80f1fc..000000000000
--- a/dev-python/babelfont/babelfont-2.0.2.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="Interrogate and manipulate UFO, TTF and OTF fonts with a common interface"
-HOMEPAGE="https://github.com/simoncozens/babelfont"
-SRC_URI="https://github.com/simoncozens/babelfont/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/defcon[${PYTHON_USEDEP}]
-	dev-python/fontParts[${PYTHON_USEDEP}]
-	dev-python/fonttools[${PYTHON_USEDEP}]
-	dev-python/glyphsLib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/base58/Manifest b/dev-python/base58/Manifest
index db3fd16b5f6f..1e93990c3e34 100644
--- a/dev-python/base58/Manifest
+++ b/dev-python/base58/Manifest
@@ -1 +1 @@
-DIST base58-2.1.0.tar.gz 6351 BLAKE2B 0ec76670a5257cc9ff855f0cee359932ba8a25733bdf034e98a41c9cd42a30d89765c399b0e4ef211ed90be23eb41bd790c3d8bae283c35afc36a0c9f8416788 SHA512 1912d01eed30d923fecef72f643f1a1e9954c80505805ef5d673e361eb8ee73d5cbb7cdb48599cfa3b28969b79fb4fd9994aea21dc7a9779a1bb21d729dc058c
+DIST base58-2.1.1.tar.gz 6528 BLAKE2B 7ef740243fed7e2f39d3e6f1abe4782c0877415f7f8edbeba419e0ccf4ac7c6e0f6425f419a883df7f040abede7b88071c5d34f95b8e5f26d572cfda39b3af31 SHA512 b62620cf19716a70acaef1d2361f11e4188661935b1c349a73e8f0757b7643807a0e0ff2f98c7a672fd24d8d5301352998b86953583e690fb687c66929632a54
diff --git a/dev-python/base58/base58-2.1.0.ebuild b/dev-python/base58/base58-2.1.1.ebuild
index 53bd8c7142d4..498f2194e451 100644
--- a/dev-python/base58/base58-2.1.0.ebuild
+++ b/dev-python/base58/base58-2.1.1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
 inherit distutils-r1
 
 DESCRIPTION="Base58 and Base58Check implementation"
diff --git a/dev-python/beziers/Manifest b/dev-python/beziers/Manifest
index 741bb58ab04c..c5e8ceba44ab 100644
--- a/dev-python/beziers/Manifest
+++ b/dev-python/beziers/Manifest
@@ -1,2 +1 @@
-DIST beziers-0.3.1.tar.gz 486554 BLAKE2B 4458913acfd8d72607f4154547e895b7eac0f3f7d5ddc0a3adee1cd4a33c508b085643cb3adffcab47a6a3782395a1e54d686759dcb3566f31ac624f12b00922 SHA512 f49e9a84a1e2f8c06758211341ab2ba981c349ed546e3dabb8012c6bfa4f8bfb0c8b23ca38fe4877a5e286634f7353e4eb350c4b343643b86b0c32b4df9353d4
 DIST beziers-0.4.0.tar.gz 37943 BLAKE2B 6309b90a7dd8dbaeaef761314e158cf5f60913fca15086d1a3f59db2a46dbd61b39a02d6b00395fdcfba75c0510d237bf8847617e4b56ebf5a4eb347f1f42e13 SHA512 7568417e559c516bb37fc30f68be78ce9ba11282e8ebb1c1ae87409d1a1d560252da67566dab25069390c4b72d7164942bcd7494a6ac3017e401796a7a58e362
diff --git a/dev-python/beziers/beziers-0.3.1.ebuild b/dev-python/beziers/beziers-0.3.1.ebuild
deleted file mode 100644
index 4e5fb216e32b..000000000000
--- a/dev-python/beziers/beziers-0.3.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MYPN="${PN}.py"
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bezier manipulation library"
-HOMEPAGE="https://github.com/simoncozens/beziers.py"
-SRC_URI="https://github.com/simoncozens/${MYPN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MYPN}-${PV}"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pyclipper[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	sci-libs/shapely[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/dotmap[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 5a2ac0ce24a2..4ac8822f1e09 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,12 +1,3 @@
-DIST boto3-1.22.9.tar.gz 497262 BLAKE2B c3fad6d556c62403578347600f2781b5fbf34a5ba975b596878f892cd1981bd06e25e50e4c67e5b5b27d6a0fec3aa8af0ea6e30a38277dcf1ae157719d95b3c5 SHA512 f32d6b9b2a8f2d6fcf975446f2c3530a8ba29dc8a3d55ed7b675bc7fb68694c3e6e1f0c54c3f6a715923f9c10268c7db04d897b73add7098f0e43062d2f28775
-DIST boto3-1.23.0.tar.gz 499085 BLAKE2B d606370e274564f909be46cfac838212de3213fd8407f1f2ac26afc3287feaa4aec8bf25ac6db4f1058739b2cbefc99c8e16c9dd0c12a5bdeaacf4700e9b0015 SHA512 c44237239cadb98f257796e152b13514839d2003d2a8157bf5f8a41c726401a3e248ff021ccfcd3e6b8099939744fb309c6f1ba342ff066e84632f1ac97dbaf8
-DIST boto3-1.23.1.tar.gz 499867 BLAKE2B 1ea53a7bf5f453a202347f29f0278d5397d6d10cfb52253a64a09ccb6ddfe1a95631045ecf7b526016f314c8773db04d25ed8cd2a539ae20776629079c168b61 SHA512 a1cc49cd53444bbda3fe0bbb1ec6e7e445a53d94af1eda0ed2984f7e0ddc4af14eed09b269cb4b4e62a15d647071bd9a9e5182b7049da745c19ba8da74e5c9b8
 DIST boto3-1.23.10.gh.tar.gz 504080 BLAKE2B 1840715ec72b10131a430abdb303adf7619fb4dc542cb22acefffe378c96d094eb7d024c068df1df48882a22fc52e3883791da39d0e4fb34abdddad4d78c0ce8 SHA512 88d0abfc990eba2118698c27fe9f556a2b2ef27d0e287c2b3d65a1d485d4be264a5e9ccc02c017c404941c34efdb5f9d480ceb7c5752f99ebf95d3fab184dded
-DIST boto3-1.23.2.tar.gz 500287 BLAKE2B b997f18cfb2b5c03eab7decd14a60d70546eb60fb2d52f02d94ee478686bd520e4e8111757e9e073f17f7f415d9eb7243fdcd9ac2e0f2b98f6bd6d34473dc794 SHA512 6a774199b719496143af79b1a8a0612441a4f1d9ce426dfc3d495679bb0fda3856b7b0e81e8403d050de52bf8363dec9f0242cca6b32cf39d172d559d6ddf548
-DIST boto3-1.23.3.tar.gz 501196 BLAKE2B 8fbe6ec091e249bf675b9245a3ad73416bfae77de8c197f6b5bc6d919e7082aa36b53a93034d5658d7f27c928c932b0f077fc9beea6bbc9015c26e925cc565c2 SHA512 96fa0382a4841901eb961a1135799823710af24c236c4be6def180597bdb53a852fa2c0ea34cf6d1b8cfba0e5c5a2b10f361677a993b733bc14729ee68af16f2
-DIST boto3-1.23.4.tar.gz 501445 BLAKE2B f38c963558c99fade5b55c0b8d96221de7af7a215f7be2a4863285152720318f05cbaf996f8f0910f68830fdbb214b242d2e8e2e538ae345e4877a0ed733c148 SHA512 85298ddbb4a305354c50f4f63e9e6d0a1c821ac18e15dfaaf3d8ea3e03fd86fb6ea913402c6ac5cde4305895f387cf25eca928b7f00403198ad2eb5efe965eb7
 DIST boto3-1.23.5.tar.gz 501625 BLAKE2B 5a996b4dffd325ea2d6582450b027767ca9845e8096193ef4a8a63ecd61999c67a83cc3b5bc4e77d1f50035188f97003942f1b64293adb36a9cd6e71781b2279 SHA512 5496de026313e9a767f3ba42fe903093ce69777627835a00d75dac4aa966c803a46682b4d766002af793c7e8c95be141cd0d0bbbf27961bd020ac18ef64f5175
-DIST boto3-1.23.6.tar.gz 502243 BLAKE2B d5b20d24d76df16669de25bdd9486766e4c4983f2619b9690a1bb318172d3343ae67cc9746438964817c60b1a2e7b3cb530f0dc54e15c13fe14c8cd1a566875b SHA512 3f940e394a15d10593b23ad67ffa16c9a45bbc5d6231b9ae621f90af3bc3497173f309191af7f3d9c3d4ea0331109228853c08d3fed7a84226481a8d911837ed
-DIST boto3-1.23.7.tar.gz 502686 BLAKE2B 10ca206d1b7add5f9c88c5c474af4b6b4ac6fe4e690fa6ed2d1b4fb833874dfc6901c5c693ba96d72ac5af72533362065e107bb43f225f74fa18e41b52832482 SHA512 2970bbbccda3a74c821ab8598dc24204f838a417ea06b7816d16dda828123725162287d0d6ff4c9c815678f365220d5cea16a25abf5b70a4512845d157ab4f75
-DIST boto3-1.23.8.tar.gz 503306 BLAKE2B 98e0f2aafd0ead06ea9ca7593f211e04d1f9639d3703cc172becc5745858e10a3f7633da4cd3e7a6b8fa8ff84d471f76fb75e9ee4018532c485bd3bdcc2eb972 SHA512 87be75109df80d1ff29ce13b196630c0f43ee8443f35854afaa7a337f77511a42483176e7271d4988dc22c922a47cb2d2c67ddbf7fe9bde43e9cc1c341bdc756
-DIST boto3-1.23.9.gh.tar.gz 503767 BLAKE2B fcd4556331020c6db015fe1591344c5fc4ee80302ade3d3bfea7468a3d5c32075d3ceff6c951ab0fe2ff4ded8843abdb0b55f4338a86afccba34ef1a48d05c0f SHA512 1d9c3e7077136d5c8117d57c5df9c50ce16fc8d0aee322002fb0fec1edc5fbeaf7c1386de31f0b496a298cdaf79c3fc77ea5c0b549141a07bd057eee08a0f0f0
+DIST boto3-1.24.0.gh.tar.gz 504647 BLAKE2B 85ff8d83abc9c116de2b54bdfe61239494723bf5214ed6edad380fc15a0a8bde5167125aa2289425395d18c4c459ea7eef1ca9af706b6414302dd23543ff43ab SHA512 6c494557521b0cf2e4d172e4e631c9e10c5d2a1047a592d4fc99566d5bad2c5028b74b8a4bfb090fd289558d2e007d3d038da27d416cdf123e19be96af11f4a3
diff --git a/dev-python/boto3/boto3-1.22.9.ebuild b/dev-python/boto3/boto3-1.22.9.ebuild
deleted file mode 100644
index 348e3525da22..000000000000
--- a/dev-python/boto3/boto3-1.22.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
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.23.0.ebuild b/dev-python/boto3/boto3-1.23.0.ebuild
deleted file mode 100644
index b62a1bd2ec8f..000000000000
--- a/dev-python/boto3/boto3-1.23.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.23.1.ebuild b/dev-python/boto3/boto3-1.23.1.ebuild
deleted file mode 100644
index b62a1bd2ec8f..000000000000
--- a/dev-python/boto3/boto3-1.23.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.23.2.ebuild b/dev-python/boto3/boto3-1.23.2.ebuild
deleted file mode 100644
index b62a1bd2ec8f..000000000000
--- a/dev-python/boto3/boto3-1.23.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.23.3.ebuild b/dev-python/boto3/boto3-1.23.3.ebuild
deleted file mode 100644
index b62a1bd2ec8f..000000000000
--- a/dev-python/boto3/boto3-1.23.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.23.4.ebuild b/dev-python/boto3/boto3-1.23.4.ebuild
deleted file mode 100644
index b62a1bd2ec8f..000000000000
--- a/dev-python/boto3/boto3-1.23.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.23.5.ebuild b/dev-python/boto3/boto3-1.23.5.ebuild
index b62a1bd2ec8f..348e3525da22 100644
--- a/dev-python/boto3/boto3-1.23.5.ebuild
+++ b/dev-python/boto3/boto3-1.23.5.ebuild
@@ -22,7 +22,7 @@ if [[ "${PV}" == "9999" ]]; then
 	BOTOCORE_PV=${PV}
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
diff --git a/dev-python/boto3/boto3-1.23.6.ebuild b/dev-python/boto3/boto3-1.23.6.ebuild
deleted file mode 100644
index b62a1bd2ec8f..000000000000
--- a/dev-python/boto3/boto3-1.23.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.23.7.ebuild b/dev-python/boto3/boto3-1.23.7.ebuild
deleted file mode 100644
index b62a1bd2ec8f..000000000000
--- a/dev-python/boto3/boto3-1.23.7.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.23.8.ebuild b/dev-python/boto3/boto3-1.23.8.ebuild
deleted file mode 100644
index b62a1bd2ec8f..000000000000
--- a/dev-python/boto3/boto3-1.23.8.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.23.9.ebuild b/dev-python/boto3/boto3-1.24.0.ebuild
index ed819b4695d0..e4a98e2e28f5 100644
--- a/dev-python/boto3/boto3-1.23.9.ebuild
+++ b/dev-python/boto3/boto3-1.24.0.ebuild
@@ -34,7 +34,7 @@ fi
 RDEPEND="
 	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
 	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/boto3/boto3-9999.ebuild b/dev-python/boto3/boto3-9999.ebuild
index ed819b4695d0..e4a98e2e28f5 100644
--- a/dev-python/boto3/boto3-9999.ebuild
+++ b/dev-python/boto3/boto3-9999.ebuild
@@ -34,7 +34,7 @@ fi
 RDEPEND="
 	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
 	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 09ef0463627f..19961e18086d 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,12 +1,3 @@
-DIST botocore-1.25.9.tar.gz 8962451 BLAKE2B 5930499f514d5e9b9f0fa0c87a2461071a0432bb3957779a4669448bd7b34e94a5339598703419f36c01e505c8487217a4f525ce63832bc97ad35ef584ef45f3 SHA512 533c5ff383e53aa2b00a83b182207e9dd2d40ea000c7a0f1e74e30989c6c15f54fd26eb67375ceeb90c1a6ab158bda7de75ac40fe6b14614209ebb7063b9e2a1
-DIST botocore-1.26.0.tar.gz 8968864 BLAKE2B fc07441c4a759273a1abe6826048082b0e2ce38964de507a9091d5898d998ffb30e9bab835c9a6be2d3d01c15813230fda3a1d0457c5e7aa8573fc262cd9e4d4 SHA512 2bc8cd2c7db5549fa1f8f1364d42a4a6463b1fc8d0a80cd5026ec5f765b2a02108274eb33a6d5d00b3bb07a30351b458e1829b547c07134420a6aed343526990
-DIST botocore-1.26.1.tar.gz 8972136 BLAKE2B cf5d18d87fe5e78f6bb623e82dea9ec712867301e7b1fdd46724eb3aa37b7395d91dc206bc9329df96bab9c8072c8b071eaaea767848794db349982c630ab0d2 SHA512 c18160d1eb6f9feb6b4db2441c360112c1d8f88d8d2a3624f89b6ee4815c200c68d70601fbea1c93682af506cc6809a7e34568f543a25adbfd7ca09c309236ff
 DIST botocore-1.26.10.tar.gz 9008316 BLAKE2B a05078ec5732015cbd8ea4da2d2d82e28f4241b7c3164f3410ae396a19f79c116f7a9059a3361e99eacc952f860a516b187375dbf64ee5e4e5648e8c3b0f95a5 SHA512 b12e9002dc8e0912a9681938f343b51d628f0b2798693dc81636fe7ede01d006d5bc8a901f92edf10a88d97c3c6311aaf97206a6f55070e645747536fe39b144
-DIST botocore-1.26.2.tar.gz 8990271 BLAKE2B 95ddae48b54ba0455959a95eb4dc992bf1a28b5b0004c8004298bea30eb729cc20d0bf7b189a0e62a12939365fd106ccfc06a00092b3229077b665bdcaebd86f SHA512 df478a29511a9436bcab16dca448d4d196988402a326fd8be8f0dd4fbfab0b97ef16b31f241c44e9f9973bbeafc99d79f317838e0e6a83f25299218fd5fce1ac
-DIST botocore-1.26.3.tar.gz 8992054 BLAKE2B 74937d1a12f4c7509e0835ad273850a6de6df2f67d594cc30ea4bac7ef0b920e8d606aa39e4f47ec3a08fd0e47867cf7832db9218d9eebf4f2a08194ece63f4a SHA512 aae80723446a9f3ac4beb1fdd3690f62c2eb87cf41c2d5106d5ad1679507c7ac82da8b375a5c67a773057f7c1692e85d723952edb4ba62fe378788324b758b55
-DIST botocore-1.26.4.tar.gz 8993009 BLAKE2B 4d968ed094a8581efa08ce7b51ea8967937e41192e1d7ef71a8d26220250c1534f3c9f4753913ce2763c3bb90305a31823507a7ff9f1c318b4c7b0fff06a59dc SHA512 80f2205e86e36e7c5ae7e29626fc5ff9b6e92741d752b68e37d835255d0a58663169232a7a57b57eb09dc84c6050b2d96fb1d17f571f894fe7a2f31135cc2a4f
 DIST botocore-1.26.5.tar.gz 8994964 BLAKE2B 472bc20b1a579674b97fa42f5b7bba2f06f1bcc40b11d5d5fa31b283a1d8648be82db4ee7e7170097d2e695bad2d1f9e398dfa7e4b85381134f151010f212be2 SHA512 a696c241989f6754596f69577c4e4f5d92df87e9b6488533e930b28b85e02fae8af1ac73d907790a75496a46824b45beb7df220c72be3bfc0bee8153b4846939
-DIST botocore-1.26.6.tar.gz 8998364 BLAKE2B f4e735b919ab6343419fb37945e3fbbf253d5ffdd25b3903888c544127417006eb8b44ddd330f56172ab2c106efbe9e7d9ae2a74e7d1ff51752fee1e08bff3ff SHA512 4a5a982dcb2b2fdbc51726ec6a59855c4c073cb921648f372ca5b6a602c70be5285e4fb98da13ae57f2b312bd5374b903ad857112f64e1ac38f2be6bee1303d3
-DIST botocore-1.26.7.tar.gz 9004937 BLAKE2B 7aaa6e7383ba2dae73477bf498028175d5c62945428facf34c7f9b1145a8715a970383cea316f89e5727171c92bf1fd9f25f772335ecfbfcb0be6e5f8de39a2d SHA512 362e2f213cd51271608fc1501845a74a9702fb60ee6619cedc7baf3a37c3dedd12976b51bd182cb4601f2c33e3ebc5358356365d9e32ba8eff308ee5775178ac
-DIST botocore-1.26.8.tar.gz 8996827 BLAKE2B fb7b30a1f013e9625f20980bdfd2192bc57044f5b7f277e35c8495414bd6b0c99c10d6a9d02c68e67a244249695db7ad3c9cee00db9b46114ec92c8504a07ceb SHA512 93223e428d2464eb2bca1806ba1574d43da07c457aaada8d7839fe1508258d4f8ed7ad644539ec8b5a80307e436f4654f549b23704199ba0d4bd7fcefff2c6fd
-DIST botocore-1.26.9.tar.gz 9005786 BLAKE2B c68e4ca970a4b66e95fae1b5fea1c4515994e9313c608044afe94bdfc27a2df098a8163f143f7d991960c4e5cb07080cf3dcff2c29f9db248d680b3172bed816 SHA512 adbc339738cc8506a3333f13650e835c316528c0212c4dea61049257aae7cb766619c520dfc3c482e8559b32623e92986e19042ebb23db37da2c89b4b2c1e489
+DIST botocore-1.27.0.tar.gz 9013575 BLAKE2B e00cf7d071bc510a96e32bbc41bb0b3a151974c0c10ada01fc8222d261e680b938f248ffddd5985c8ff92bb3a4a8021a6e3867870d5411cd9ba8544b12f41dfc SHA512 386128c57a584cd6b8d51ff46817678e18292cef3f22194c64abfa007418b9ef906e85d0c0f731e0e8efc8e6a01aa71ba9230c94f86c6d0c248d385a1f79e5d9
diff --git a/dev-python/botocore/botocore-1.25.9.ebuild b/dev-python/botocore/botocore-1.25.9.ebuild
deleted file mode 100644
index 5ecb002c2d09..000000000000
--- a/dev-python/botocore/botocore-1.25.9.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.26.0.ebuild b/dev-python/botocore/botocore-1.26.0.ebuild
deleted file mode 100644
index 1556c4f3687e..000000000000
--- a/dev-python/botocore/botocore-1.26.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-	"${FILESDIR}/botocore-1.26.0-py311.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.26.1.ebuild b/dev-python/botocore/botocore-1.26.1.ebuild
deleted file mode 100644
index 1556c4f3687e..000000000000
--- a/dev-python/botocore/botocore-1.26.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-	"${FILESDIR}/botocore-1.26.0-py311.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.26.2.ebuild b/dev-python/botocore/botocore-1.26.2.ebuild
deleted file mode 100644
index 1556c4f3687e..000000000000
--- a/dev-python/botocore/botocore-1.26.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-	"${FILESDIR}/botocore-1.26.0-py311.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.26.3.ebuild b/dev-python/botocore/botocore-1.26.3.ebuild
deleted file mode 100644
index 1556c4f3687e..000000000000
--- a/dev-python/botocore/botocore-1.26.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-	"${FILESDIR}/botocore-1.26.0-py311.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.26.4.ebuild b/dev-python/botocore/botocore-1.26.4.ebuild
deleted file mode 100644
index 1556c4f3687e..000000000000
--- a/dev-python/botocore/botocore-1.26.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-	"${FILESDIR}/botocore-1.26.0-py311.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.26.5.ebuild b/dev-python/botocore/botocore-1.26.5.ebuild
index 97701266bf61..123d74087ee3 100644
--- a/dev-python/botocore/botocore-1.26.5.ebuild
+++ b/dev-python/botocore/botocore-1.26.5.ebuild
@@ -21,7 +21,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.26.7.ebuild b/dev-python/botocore/botocore-1.26.7.ebuild
deleted file mode 100644
index 97701266bf61..000000000000
--- a/dev-python/botocore/botocore-1.26.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/botocore-1.26.0-py311.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.26.8.ebuild b/dev-python/botocore/botocore-1.26.8.ebuild
deleted file mode 100644
index 97701266bf61..000000000000
--- a/dev-python/botocore/botocore-1.26.8.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/botocore-1.26.0-py311.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.26.9.ebuild b/dev-python/botocore/botocore-1.26.9.ebuild
deleted file mode 100644
index 97701266bf61..000000000000
--- a/dev-python/botocore/botocore-1.26.9.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/botocore-1.26.0-py311.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.26.6.ebuild b/dev-python/botocore/botocore-1.27.0.ebuild
index 97701266bf61..97701266bf61 100644
--- a/dev-python/botocore/botocore-1.26.6.ebuild
+++ b/dev-python/botocore/botocore-1.27.0.ebuild
diff --git a/dev-python/bracex/Manifest b/dev-python/bracex/Manifest
index f2e35cbff530..87161d35c8ea 100644
--- a/dev-python/bracex/Manifest
+++ b/dev-python/bracex/Manifest
@@ -1,2 +1,3 @@
 DIST bracex-2.2.1.tar.gz 27642 BLAKE2B e9eb12dd70b3cf1c6abd8a59f19d8f77f8fc85e07efad02a2c0213266b93641406d05fa8454b2b4cd6870b7f866a22c0b2132d690444f1910a599c9b17594065 SHA512 cad9faf73258493581606bf5c8068d34a82fdcca338dd6a1d7da5dacfbee1932f48d04d6f295151d79f02495ddf89aa6a5d53d6596db7bd53ddb3cd23d59a71d
 DIST bracex-2.3.tar.gz 27489 BLAKE2B c48b668c35d40337fe9096c8fbc67565ea74abf330a278e1fe070055fcf8835a60dc23fba40c0f1c0677d506c7d8f8ca5168f809b13ab0442868bc962faaf1d5 SHA512 73f3b951ce1119154794883106a317e9ed4bbe8d96dc914afb6ca6d358104ae4908bc587504e2761c751a3795adf7f2136e96a2d46634b10478c7523fbee4f60
+DIST bracex-2.3_p1.tar.gz 27541 BLAKE2B a9e33e01f014c6b784b059a76da338a708a24ff88787c98c0916a6d13ac5497a1f4f14d711cab8bde1281a9968db68bdc8fdfbc23a531ef6c89adfa9974492b1 SHA512 3c5a8a81adb78c9d3d40b57328a6a47b3257bb0072be2685c8049cf8a91501993ce470dfd394a61d0a0fdcd082405b204e5e3e0666018978b5aa820b0d74b631
diff --git a/dev-python/bracex/bracex-2.3_p1.ebuild b/dev-python/bracex/bracex-2.3_p1.ebuild
new file mode 100644
index 000000000000..6b4688cabcdf
--- /dev/null
+++ b/dev-python/bracex/bracex-2.3_p1.ebuild
@@ -0,0 +1,56 @@
+# 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=hatchling
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-material
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs_pymdownx_material_extras
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+MY_PV="${PV%_p1}.post1"
+
+DESCRIPTION="Bash style brace expansion for Python"
+HOMEPAGE="
+	https://github.com/facelessuser/bracex/
+	https://pypi.org/project/bracex/
+"
+SRC_URI="
+	https://github.com/facelessuser/${PN}/archive/${MY_PV}.tar.gz
+		-> ${P}.tar.gz
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+BDEPEND="
+	test? (
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin needs git repo
+	if use doc; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/bson/Manifest b/dev-python/bson/Manifest
index 7aada9940b21..57173e566c08 100644
--- a/dev-python/bson/Manifest
+++ b/dev-python/bson/Manifest
@@ -1,2 +1 @@
-DIST bson-0.5.10.tar.gz 24735 BLAKE2B a658598d9cac3bf55327ec2084d4c884b92d00e1ffaa084bcfdbebe24fd53b342d117449fde9d394f08b5fc04f9ea9c6856394bdb90806131c65111478c75f72 SHA512 6c74344a75eaeb7f53609ab78a9223218ac89edd320e503898145668cd746d5b76624d91640223a826af7ab978b107715cdb9904f16f6499c9be1ce9f54a09f8
-DIST bson-0.5.8.tar.gz 24114 BLAKE2B e35055dcd3c8b1cf77ec9d9496d32d4bca4e9ab31ecf79399a8449c459d1b5e67375bd88743175f1450311519b55cbca8c11a8da736ba87907e1497b5a94b363 SHA512 68bd69d1f5d0d11014d51c0901e7f44b7a3d9f7ad013af4137b7ac48bc42f81bd1423115b67939beedf6e7336794e7ffd4d0d539222d4eaa50845ae25622f21a
+DIST bson-0.5.10.gh.tar.gz 24735 BLAKE2B a658598d9cac3bf55327ec2084d4c884b92d00e1ffaa084bcfdbebe24fd53b342d117449fde9d394f08b5fc04f9ea9c6856394bdb90806131c65111478c75f72 SHA512 6c74344a75eaeb7f53609ab78a9223218ac89edd320e503898145668cd746d5b76624d91640223a826af7ab978b107715cdb9904f16f6499c9be1ce9f54a09f8
diff --git a/dev-python/bson/bson-0.5.10.ebuild b/dev-python/bson/bson-0.5.10.ebuild
index ed23a418969d..4d0da0a500fd 100644
--- a/dev-python/bson/bson-0.5.10.ebuild
+++ b/dev-python/bson/bson-0.5.10.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Independent BSON codec for Python that doesn't depend on MongoDB"
 HOMEPAGE="https://github.com/py-bson/bson"
-SRC_URI="https://github.com/py-bson/bson/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/py-bson/bson/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/bson/bson-0.5.8.ebuild b/dev-python/bson/bson-0.5.8.ebuild
deleted file mode 100644
index 05c0b755a620..000000000000
--- a/dev-python/bson/bson-0.5.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Independent BSON codec for Python that doesn't depend on MongoDB"
-HOMEPAGE="https://github.com/py-bson/bson"
-SRC_URI="https://github.com/py-bson/bson/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	"${EPYTHON}" test.py || die
-}
diff --git a/dev-python/cchardet/cchardet-2.1.7.ebuild b/dev-python/cchardet/cchardet-2.1.7.ebuild
index 739dace9f851..41432b165636 100644
--- a/dev-python/cchardet/cchardet-2.1.7.ebuild
+++ b/dev-python/cchardet/cchardet-2.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cffsubr/Manifest b/dev-python/cffsubr/Manifest
index c0a09a37122a..98aba92a6ff1 100644
--- a/dev-python/cffsubr/Manifest
+++ b/dev-python/cffsubr/Manifest
@@ -1,2 +1 @@
-DIST cffsubr-0.2.8.tar.gz 124245 BLAKE2B fa78acf9158faf3917f194a2c30a13c2a598a7476a89dc79f95440eb04fe91663e7620729e6be1635ce1df24fff34068c42ea155abb17f016f50e961d13f52af SHA512 5f5a655168c6157799d17e20762893f23a7f7d90e739fb5bbe0a4fd895dc2b1c5359b5bdb92f4cb8333f841cd5b471359825d709f2477afd2bd7322760359d24
-DIST cffsubr-0.2.9_p1.tar.gz 124635 BLAKE2B c040339d113247b34195d7b7a220b449810ced52ffeea209bde2bb871c964a1da7d734c7167ece88ade03b26e722dca7f235a70326ff8c9b268b707ba5730a79 SHA512 8f1ea1fb732b772c1ac479883df6993ff2d56457c725d621bb1ebebf7a27393bb96771b9db8364513ae7f815bc74da15dd8c22695eeaf6f65d8dc62c8ae947dc
+DIST cffsubr-0.2.9_p1.gh.tar.gz 124635 BLAKE2B c040339d113247b34195d7b7a220b449810ced52ffeea209bde2bb871c964a1da7d734c7167ece88ade03b26e722dca7f235a70326ff8c9b268b707ba5730a79 SHA512 8f1ea1fb732b772c1ac479883df6993ff2d56457c725d621bb1ebebf7a27393bb96771b9db8364513ae7f815bc74da15dd8c22695eeaf6f65d8dc62c8ae947dc
diff --git a/dev-python/cffsubr/cffsubr-0.2.8.ebuild b/dev-python/cffsubr/cffsubr-0.2.8.ebuild
deleted file mode 100644
index 8b64599ecb3d..000000000000
--- a/dev-python/cffsubr/cffsubr-0.2.8.ebuild
+++ /dev/null
@@ -1,39 +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
-
-SRC_URI="https://github.com/adobe-type-tools/cffsubr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-DESCRIPTION="Standalone CFF subroutinizer based on AFDKO tx tool"
-HOMEPAGE="https://github.com/adobe-type-tools/cffsubr"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	>=dev-util/afdko-3.6.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-system_tx.diff"
-	"${FILESDIR}/${P}-fix-setup-py.patch"
-)
-
-distutils_enable_tests pytest
-
-pkg_setup() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}"
-}
-
-src_prepare() {
-	#no bundled afdko
-	rm -rf external || die
-	default
-}
diff --git a/dev-python/cffsubr/cffsubr-0.2.9_p1.ebuild b/dev-python/cffsubr/cffsubr-0.2.9_p1.ebuild
index f0e6b1e17b78..c001e5c3ed05 100644
--- a/dev-python/cffsubr/cffsubr-0.2.9_p1.ebuild
+++ b/dev-python/cffsubr/cffsubr-0.2.9_p1.ebuild
@@ -4,15 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-MYPV="${PV/_p/.post}"
 PYTHON_COMPAT=( python3_{7,8,9,10} )
-
 inherit distutils-r1
 
+MY_PV="${PV/_p/.post}"
 DESCRIPTION="Standalone CFF subroutinizer based on AFDKO tx tool"
 HOMEPAGE="https://github.com/adobe-type-tools/cffsubr"
-SRC_URI="https://github.com/adobe-type-tools/cffsubr/archive/refs/tags/v${MYPV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MYPV}"
+SRC_URI="https://github.com/adobe-type-tools/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
 KEYWORDS="~amd64"
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -21,8 +21,7 @@ RDEPEND="
 	>=dev-python/fonttools-4.10.2[${PYTHON_USEDEP}]
 	>=dev-util/afdko-3.6.1[${PYTHON_USEDEP}]
 "
-DEPEND="
-	${RDEPEND}
+BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 "
 
@@ -38,7 +37,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	#no bundled afdko
-	rm -rf external || die
 	default
+
+	# remove bundled afdko
+	rm -rf external || die
 }
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index de2ed1a1a1f9..b68cd6eb9e89 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -2,3 +2,4 @@ DIST cfn-lint-0.59.0.tar.gz 9004743 BLAKE2B e778c1081e45dacc813f8a4ae7726eb929fa
 DIST cfn-lint-0.59.1.tar.gz 9065067 BLAKE2B 63fc591f7ed60eed2ef7fa1e9ea212e3e8569cfd20dec8bb8505dbfb8e96ee8f8ab6136d88de58b2db8823675946dc99b38adeb3b5c784d165083e1353100b00 SHA512 a08b4bf4dc8e7ab41bb72eb9309ca4f03eed3b6f5c31b3876dc9d08610312377a7c229de883c287e7e5ed6597f8eada79a111882785888e43b0ff20160e39fe0
 DIST cfn-lint-0.60.0.tar.gz 9127890 BLAKE2B f3e1e99f4657cad13037a74e94cca53548ecfb5bd41c11f8dc82c5fe962d7dc87b7a62aeaa12bc7012a11472736d9026fa51a7e7bc39e67b062a4e8449dd0eb6 SHA512 5eb0ecd51a2d845bad52e2aa7decc6ff7d28d008bc63aa1419ba122bca6df56b5689cb91e669384ca98418537bd36e460f19fb9dfd96e718260d29e228ea824e
 DIST cfn-lint-0.60.1.tar.gz 9144208 BLAKE2B ff0cc155aee6fb0c72a3011a5fbaf147158d23ab8ed11426a9fc922971019cb276b74ca4e8972ddc2dbab7b1239ddb00b1d7a60281763a9773157b97ce5a8105 SHA512 8d023773a82b0b8486431e438d298e80812726d197017aafd925d6d9aa8272db99dc594f1b8f7582843ffaa9d421d6d9300f80c3bb6e932e705ae019d1cd8e21
+DIST cfn-lint-0.61.0.gh.tar.gz 9252192 BLAKE2B 08a5a8648e6de27eb86629bf27fd2a40700eaa84b101c2003a2acda61b48a6ec2795dbce4dcfaa9e42664c75ab932c9cd84836d7b61bc438a586203502123d9a SHA512 3e70e5ccdc2a9909cddf9a289c5ed0d292580ecc236a1d64088fdb9ecce913814de88739ddb5b6bde5b4091e0e1efca86860157fde6e6f94e992503e4c1f83be
diff --git a/dev-python/cfn-lint/cfn-lint-0.61.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.61.0.ebuild
new file mode 100644
index 000000000000..18e82b5cdbe1
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.61.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.45.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	test/unit/module/test_template.py::TestTemplate::test_build_graph
+	# requires git repo
+	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+	# Internet
+	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/click-default-group/Manifest b/dev-python/click-default-group/Manifest
index 82a2fa1941d1..86387c75a24a 100644
--- a/dev-python/click-default-group/Manifest
+++ b/dev-python/click-default-group/Manifest
@@ -1 +1,2 @@
+DIST click-default-group-1.2.2.gh.tar.gz 4753 BLAKE2B 919e3921ef3c6723b92cab8433032237af4e5583084badb6cc53d82971d81aa910ae6553deefea2ac46067d2618bb8f6d2003f0b2c4ced04acc5b46588012614 SHA512 6f296d154813e0c3dbf8e435c4c1b4394f51a000320c5585aeb78b81f30fe15bd27a8aad0fdbb71fccb88dc3083682519f1dd06572c8d5c35639fb9c3acf73fa
 DIST click-default-group-1.2.2.tar.gz 4753 BLAKE2B 919e3921ef3c6723b92cab8433032237af4e5583084badb6cc53d82971d81aa910ae6553deefea2ac46067d2618bb8f6d2003f0b2c4ced04acc5b46588012614 SHA512 6f296d154813e0c3dbf8e435c4c1b4394f51a000320c5585aeb78b81f30fe15bd27a8aad0fdbb71fccb88dc3083682519f1dd06572c8d5c35639fb9c3acf73fa
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
new file mode 100644
index 000000000000..cf35ba0c7d7c
--- /dev/null
+++ b/dev-python/click-default-group/click-default-group-1.2.2-r1.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} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Extends click. Group to invoke a command without explicit subcommand name"
+HOMEPAGE="https://github.com/click-contrib/click-default-group"
+SRC_URI="https://github.com/click-contrib/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.2-tests-click-8.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/click-default-group/files/click-default-group-1.2.2-tests-click-8.patch b/dev-python/click-default-group/files/click-default-group-1.2.2-tests-click-8.patch
new file mode 100644
index 000000000000..e2612704116d
--- /dev/null
+++ b/dev-python/click-default-group/files/click-default-group-1.2.2-tests-click-8.patch
@@ -0,0 +1,21 @@
+https://github.com/click-contrib/click-default-group/pull/18
+https://github.com/click-contrib/click-default-group/issues/16
+
+From 9415c77d05cf7d16876e7d70a49a41a6189983b4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
+Date: Sun, 20 Jun 2021 16:11:42 +0200
+Subject: [PATCH] make tests compatible with click 8
+
+It now outputs "No such option".
+--- a/test.py
++++ b/test.py
+@@ -30,7 +30,7 @@ def bar():
+ 
+ def test_default_command_with_arguments():
+     assert r.invoke(cli, ['--foo', 'foooo']).output == 'foooo\n'
+-    assert 'no such option' in r.invoke(cli, ['-x']).output
++    assert 'no such option' in r.invoke(cli, ['-x']).output.lower()
+ 
+ 
+ def test_group_arguments():
+
diff --git a/dev-python/cmarkgfm/Manifest b/dev-python/cmarkgfm/Manifest
index ac2d67978e0d..8860d29831c8 100644
--- a/dev-python/cmarkgfm/Manifest
+++ b/dev-python/cmarkgfm/Manifest
@@ -1,2 +1 @@
-DIST cmarkgfm-0.6.0.tar.gz 12667 BLAKE2B 8eab0a7f0b9903ddeca59a8dcd00efcd2a9ed136b0920cfd7ce40bf49a5b4d9c8d492c2096090a647deaa514b4032878e58d006852d279f91e8d439850e61add SHA512 de4653ae4b27e55b98f885b67d50f71cffa92f13511f1a5efb885a474f5aefb924ce6eb019f4241499b66ad43a7e0630053a7743e844e5c34c652050c0f83ef2
-DIST cmarkgfm-2022.3.4.tar.gz 11853 BLAKE2B 51c66b6e54856a269214731c68e496f242293fdecbcc9848fdd8f3044531409c8e80ec1c311acacc4f079346a1ca2de060c185293c32449711aa415aed83da94 SHA512 e3336f34059a29237a977e37ddc56b850f5baa204d10a4fc90d6cfa805da9d09d007428dcaae698c4ab9aab8129aa44d2907eb16809e01ee2bc3f94f78939076
+DIST cmarkgfm-2022.3.4.gh.tar.gz 11853 BLAKE2B 51c66b6e54856a269214731c68e496f242293fdecbcc9848fdd8f3044531409c8e80ec1c311acacc4f079346a1ca2de060c185293c32449711aa415aed83da94 SHA512 e3336f34059a29237a977e37ddc56b850f5baa204d10a4fc90d6cfa805da9d09d007428dcaae698c4ab9aab8129aa44d2907eb16809e01ee2bc3f94f78939076
diff --git a/dev-python/cmarkgfm/cmarkgfm-0.6.0.ebuild b/dev-python/cmarkgfm/cmarkgfm-0.6.0.ebuild
deleted file mode 100644
index 87baefe6a381..000000000000
--- a/dev-python/cmarkgfm/cmarkgfm-0.6.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="Python bindings for GitHub's cmark"
-HOMEPAGE="https://github.com/theacodes/cmarkgfm"
-SRC_URI="https://github.com/theacodes/cmarkgfm/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	app-text/cmark-gfm
-	virtual/python-cffi[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="app-text/dos2unix"
-
-PATCHES=( "${FILESDIR}/${P}-use-system-cmark-gfm.patch" )
-
-src_prepare() {
-	dos2unix src/cmarkgfm/build_cmark.py || die
-	default
-}
-
-distutils_enable_tests pytest
diff --git a/dev-python/cmarkgfm/cmarkgfm-2022.3.4.ebuild b/dev-python/cmarkgfm/cmarkgfm-2022.3.4.ebuild
index 4dbc5b8e2d8f..06d897c435f5 100644
--- a/dev-python/cmarkgfm/cmarkgfm-2022.3.4.ebuild
+++ b/dev-python/cmarkgfm/cmarkgfm-2022.3.4.ebuild
@@ -5,11 +5,11 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 edos2unix
 
 DESCRIPTION="Python bindings for GitHub's cmark"
 HOMEPAGE="https://github.com/theacodes/cmarkgfm"
-SRC_URI="https://github.com/theacodes/cmarkgfm/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/theacodes/cmarkgfm/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 KEYWORDS="~amd64"
@@ -20,12 +20,11 @@ RDEPEND="
 	virtual/python-cffi[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
-BDEPEND="app-text/dos2unix"
 
 PATCHES=( "${FILESDIR}/${PN}-0.6.0-use-system-cmark-gfm.patch" )
 
 src_prepare() {
-	dos2unix src/cmarkgfm/build_cmark.py || die
+	edos2unix src/cmarkgfm/build_cmark.py
 	default
 }
 
diff --git a/dev-python/collidoscope/Manifest b/dev-python/collidoscope/Manifest
index 926e11589cb5..d9595565284e 100644
--- a/dev-python/collidoscope/Manifest
+++ b/dev-python/collidoscope/Manifest
@@ -1,2 +1 @@
-DIST collidoscope-0.0.6.tar.gz 30056 BLAKE2B 44979e6748cbf1db46ae7bdcba561e39ab40a51a108ce0b357a833b7a0e260d1df2de9b139010cbc50f8ac060db0bfe6d20ebdb7a2e06b0d9d6c2941278c9188 SHA512 fd38dcef982fee3ef55f8d6a500d5a56bd0f5e3adbffbae8da6506d4ad3e447864c0571042327f92d5b18212510bbee65ed07100c0c963f1fcef9ec70ad8df1a
-DIST collidoscope-0.4.1.tar.gz 32178 BLAKE2B 05b85b9321ad486a619a65b5ddbfbfe5550549d3a3f337432e07c7e1d6d80d03f7fa478ce2a19d551f846a05e27c8d6431d0a3138ef4886d48b4ac88123bd0c8 SHA512 a38fb10eeb50388024498d4900323c217a504695507a9d67b0009a0ab9e6f99b8fb836a86e0139752e7008f139363344f1761e9413f17830dc44d615212b437d
+DIST collidoscope-0.4.1.gh.tar.gz 32178 BLAKE2B 05b85b9321ad486a619a65b5ddbfbfe5550549d3a3f337432e07c7e1d6d80d03f7fa478ce2a19d551f846a05e27c8d6431d0a3138ef4886d48b4ac88123bd0c8 SHA512 a38fb10eeb50388024498d4900323c217a504695507a9d67b0009a0ab9e6f99b8fb836a86e0139752e7008f139363344f1761e9413f17830dc44d615212b437d
diff --git a/dev-python/collidoscope/collidoscope-0.0.6.ebuild b/dev-python/collidoscope/collidoscope-0.0.6.ebuild
deleted file mode 100644
index 5fa940e4b67a..000000000000
--- a/dev-python/collidoscope/collidoscope-0.0.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Brute force detection of glyph collisions"
-HOMEPAGE="https://github.com/simoncozens/collidoscope"
-SRC_URI="https://github.com/simoncozens/collidoscope/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	dev-python/fonttools[${PYTHON_USEDEP}]
-	dev-python/glyphtools[${PYTHON_USEDEP}]
-	dev-python/pyclipper[${PYTHON_USEDEP}]
-	dev-python/uharfbuzz[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/collidoscope/collidoscope-0.4.1.ebuild b/dev-python/collidoscope/collidoscope-0.4.1.ebuild
index 155e35851760..645d5c73a45e 100644
--- a/dev-python/collidoscope/collidoscope-0.4.1.ebuild
+++ b/dev-python/collidoscope/collidoscope-0.4.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Brute force detection of glyph collisions"
 HOMEPAGE="https://github.com/simoncozens/collidoscope"
-SRC_URI="https://github.com/simoncozens/collidoscope/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/simoncozens/collidoscope/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 KEYWORDS="~amd64"
diff --git a/dev-python/compreffor/compreffor-0.5.1_p1.ebuild b/dev-python/compreffor/compreffor-0.5.1_p1.ebuild
index eabf885c5008..14d8ec87f34a 100644
--- a/dev-python/compreffor/compreffor-0.5.1_p1.ebuild
+++ b/dev-python/compreffor/compreffor-0.5.1_p1.ebuild
@@ -25,10 +25,10 @@ RDEPEND="
 	>=dev-python/fonttools-4[${PYTHON_USEDEP}]
 "
 BDEPEND="
+	app-arch/unzip
 	>=dev-python/cython-0.29.24[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 "
-BDEPEND="app-arch/unzip"
 
 PATCHES=( "${FILESDIR}/${P}-remove-unwanted-dependencies.patch" )
 
diff --git a/dev-python/confluent-kafka/Manifest b/dev-python/confluent-kafka/Manifest
index 4936eaa58236..51177ae93cba 100644
--- a/dev-python/confluent-kafka/Manifest
+++ b/dev-python/confluent-kafka/Manifest
@@ -1 +1 @@
-DIST confluent-kafka-1.8.2.tar.gz 250172 BLAKE2B 9fabaaf2417343ae2743b662c359925487011cee9c63e5f8d07bfa049212e0f9890530072b463fd39fcc991d46e8e2e4ce07d79b8a63b367685c7da9d658291d SHA512 6db66371b7cac822aafeaa4acb491556d9a866f8502d76e2acfe52d18b282caab338cd3f51f84845eab2ec5b2c44ed80426a7ad8afd0314a8a5ddc1a9299d693
+DIST confluent-kafka-1.8.2.gh.tar.gz 250172 BLAKE2B 9fabaaf2417343ae2743b662c359925487011cee9c63e5f8d07bfa049212e0f9890530072b463fd39fcc991d46e8e2e4ce07d79b8a63b367685c7da9d658291d SHA512 6db66371b7cac822aafeaa4acb491556d9a866f8502d76e2acfe52d18b282caab338cd3f51f84845eab2ec5b2c44ed80426a7ad8afd0314a8a5ddc1a9299d693
diff --git a/dev-python/confluent-kafka/confluent-kafka-1.8.2-r1.ebuild b/dev-python/confluent-kafka/confluent-kafka-1.8.2-r1.ebuild
index b1f06f84328e..e78c6d946328 100644
--- a/dev-python/confluent-kafka/confluent-kafka-1.8.2-r1.ebuild
+++ b/dev-python/confluent-kafka/confluent-kafka-1.8.2-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://pypi.org/project/confluent-kafka/
 	https://github.com/confluentinc/confluent-kafka-python
 "
-SRC_URI="https://github.com/confluentinc/${MYPN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/confluentinc/${MYPN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 S="${WORKDIR}/${MYPN}-${PV}"
 
 LICENSE="Apache-2.0"
@@ -30,6 +30,11 @@ BDEPEND="
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/requests-mock[${PYTHON_USEDEP}]
 		>=dev-python/trivup-0.8.3[${PYTHON_USEDEP}]
+
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/cu2qu/Manifest b/dev-python/cu2qu/Manifest
index 49964751a7f4..ac22d15d4cc6 100644
--- a/dev-python/cu2qu/Manifest
+++ b/dev-python/cu2qu/Manifest
@@ -1 +1,2 @@
+DIST cu2qu-1.6.7.post1.zip 136959 BLAKE2B 9b1ffbe234177794b0c3726c8959351e614d2e9a03e5b95e462beacaa2a6ba2932732b92e32d2dd91a712c6b73beeeab50f143b6d4248073975a057dc20dd1eb SHA512 a0dbed28403ae2bbdbf4719d9e34d5861250dc1510129d658b336d773a5153e0955d5f2ff018f5f93d88394658918fad2a58aebb99cef998d4cf9128a300f489
 DIST cu2qu-1.6.7.zip 215819 BLAKE2B 328df385c459f82805eaa9483ccf49ab1faae2f4a878381d2a7fd1e2be01d15f55eb5f2afabc1a0487d3bed4ae407cc2042989bc820620bd1ac0b33f95d441bc SHA512 929d353cf8ef6f989cd373c49ba77082cfdd35edce6aafa1c13d983782562a16245d75d086d3a7e28dd217bda6c19d50966a4fb1ce50d5a0397eb1304816a28f
diff --git a/dev-python/cu2qu/cu2qu-1.6.7_p1.ebuild b/dev-python/cu2qu/cu2qu-1.6.7_p1.ebuild
new file mode 100644
index 000000000000..2ec5cfec57d6
--- /dev/null
+++ b/dev-python/cu2qu/cu2qu-1.6.7_p1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+MYPV="${PV/_p/.post}"
+MYP="${PN}-${MYPV}"
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Cubic-to-quadratic bezier curve conversion"
+HOMEPAGE="https://github.com/googlefonts/cu2qu"
+SRC_URI="mirror://pypi/${MYP:0:1}/${PN}/${MYP}.zip"
+S="${WORKDIR}/${MYP}"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/fonttools-3.32[${PYTHON_USEDEP}]
+	>=dev-python/defcon-0.6.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	app-arch/unzip
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/fs[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	export CU2QU_WITH_CYTHON=1
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/dbus-next/dbus-next-0.2.3-r1.ebuild b/dev-python/dbus-next/dbus-next-0.2.3-r1.ebuild
new file mode 100644
index 000000000000..2a54974ae1c7
--- /dev/null
+++ b/dev-python/dbus-next/dbus-next-0.2.3-r1.ebuild
@@ -0,0 +1,46 @@
+# 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 virtualx
+
+DESCRIPTION="The next great DBus library for Python with asyncio support"
+HOMEPAGE="https://python-dbus-next.readthedocs.io/en/latest/"
+SRC_URI="https://github.com/altdesktop/python-dbus-next/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/python-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="test? (
+		dev-python/pygobject[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.3-glib-crash.patch
+)
+
+EPYTEST_IGNORE=(
+	# "interface not found on this object: org.freedesktop.DBus.Debug.Stats"
+	# Seems like we build dbus w/o this?
+	test/client/test_signals.py
+)
+
+distutils_enable_tests pytest
+
+src_test() {
+	local dbus_params=(
+		$(dbus-daemon --session --print-address --fork --print-pid)
+	)
+	local -x DBUS_SESSION_BUS_ADDRESS=${dbus_params[0]}
+
+	virtx distutils-r1_src_test
+
+	kill "${dbus_params[1]}" || die
+}
diff --git a/dev-python/dbus-next/files/dbus-next-0.2.3-glib-crash.patch b/dev-python/dbus-next/files/dbus-next-0.2.3-glib-crash.patch
new file mode 100644
index 000000000000..714d733f3689
--- /dev/null
+++ b/dev-python/dbus-next/files/dbus-next-0.2.3-glib-crash.patch
@@ -0,0 +1,33 @@
+https://github.com/altdesktop/python-dbus-next/pull/114
+https://github.com/altdesktop/python-dbus-next/issues/113
+https://gitlab.gnome.org/GNOME/pygobject/-/issues/525
+
+From 445bc2cd0df80e36154e45ea3c4f268b550890b5 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 22 Mar 2022 22:11:01 +1000
+Subject: [PATCH] glib: destroy the _AuthLineSource explicitly
+
+See https://gitlab.gnome.org/GNOME/pygobject/-/issues/525 for an
+explanation, the summary is: we need to explicitly call source.destroy()
+if dispatch returns GLib.SOURCE_REMOVE.
+
+Deleting the source by resetting it to None causes invalid memory
+accesses and eventual crashes.
+
+This can be reproduced with a basic call to
+    bus = dbus_next.glib.MessageBus(bus_type=dbus_next.BusType.SESSION).connect_sync()
+and a GLib.MainLoop() after this call. Run in valgrind --tool=memcheck.
+
+Fixes #113
+--- a/dbus_next/glib/message_bus.py
++++ b/dbus_next/glib/message_bus.py
+@@ -457,7 +457,7 @@ def line_notify(line):
+                 self._stream.write(Authenticator._format_line(resp))
+                 self._stream.flush()
+                 if resp == 'BEGIN':
+-                    self._readline_source = None
++                    self._readline_source.destroy()
+                     authenticate_notify(None)
+                     return True
+             except Exception as e:
+
diff --git a/dev-python/dictdiffer/dictdiffer-0.9.0-r1.ebuild b/dev-python/dictdiffer/dictdiffer-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..4b99c528ae5b
--- /dev/null
+++ b/dev-python/dictdiffer/dictdiffer-0.9.0-r1.ebuild
@@ -0,0 +1,40 @@
+# 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="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/easyprocess/easyprocess-1.1-r1.ebuild b/dev-python/easyprocess/easyprocess-1.1-r1.ebuild
new file mode 100644
index 000000000000..9ff58ac824cb
--- /dev/null
+++ b/dev-python/easyprocess/easyprocess-1.1-r1.ebuild
@@ -0,0 +1,34 @@
+# 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="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/entrypoint2/entrypoint2-1.0-r1.ebuild b/dev-python/entrypoint2/entrypoint2-1.0-r1.ebuild
new file mode 100644
index 000000000000..fbc47f47a05a
--- /dev/null
+++ b/dev-python/entrypoint2/entrypoint2-1.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Easy to use command-line interface for python modules"
+HOMEPAGE="https://github.com/ponty/entrypoint2"
+SRC_URI="https://github.com/ponty/entrypoint2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/easyprocess[${PYTHON_USEDEP}]
+		dev-python/path-py[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-python311.patch"
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/entrypoint2/files/entrypoint2-1.0-python311.patch b/dev-python/entrypoint2/files/entrypoint2-1.0-python311.patch
new file mode 100644
index 000000000000..95de1d3b689a
--- /dev/null
+++ b/dev-python/entrypoint2/files/entrypoint2-1.0-python311.patch
@@ -0,0 +1,13 @@
+diff --git a/entrypoint2/__init__.py b/entrypoint2/__init__.py
+index 63ab78b..a99a298 100644
+--- a/entrypoint2/__init__.py
++++ b/entrypoint2/__init__.py
+@@ -345,7 +345,7 @@ def _correct_args(func, kwargs):
+     Convert a dictionary of arguments including __argv into a list
+     for passing to the function.
+     """
+-    args = inspect.getargspec(func)[0]
++    args = inspect.getfullargspec(func)[0]
+     return [kwargs[arg] for arg in args] + kwargs["__args"]
+ 
+ 
diff --git a/dev-python/enzyme/enzyme-9999.ebuild b/dev-python/enzyme/enzyme-0.4.1-r3.ebuild
index 554f48d3508e..d8667cee4f82 100644
--- a/dev-python/enzyme/enzyme-9999.ebuild
+++ b/dev-python/enzyme/enzyme-0.4.1-r3.ebuild
@@ -1,20 +1,24 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 PYTHON_REQ_USE='xml(+)'
 
-inherit distutils-r1 git-r3
+inherit distutils-r1
 
 DESCRIPTION="Python video metadata parser"
 HOMEPAGE="https://github.com/Diaoul/enzyme https://pypi.org/project/enzyme/"
-EGIT_REPO_URI="https://github.com/Diaoul/${PN}.git"
-SRC_URI="test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
+"
 
 LICENSE="Apache-2.0"
 SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -28,11 +32,6 @@ BDEPEND="
 
 distutils_enable_tests setup.py
 
-src_unpack() {
-	default_src_unpack
-	git-r3_src_unpack
-}
-
 python_prepare_all() {
 	if use test; then
 		mkdir enzyme/tests/test_{mkv,parsers} || die
diff --git a/dev-python/etcd3gw/Manifest b/dev-python/etcd3gw/Manifest
index 7218e6348255..31e8ea62dc7c 100644
--- a/dev-python/etcd3gw/Manifest
+++ b/dev-python/etcd3gw/Manifest
@@ -1,2 +1 @@
-DIST etcd3gw-1.0.1.tar.gz 27309 BLAKE2B dbc2c4cc76b6602d5d631609fed49dd556c86f763d4d59f14d7d514f0e7fb43ea94e5841883b9eacfa599ec0c7bb09797496017b51b23b362dd3b1bfd42b447e SHA512 d90b69afd64f023cd16e5f9ac31c61e285887db9f364ebcf176dae56b02e4e9f7b05713d358cebde3a3d8769896a768499f99945e34d015a73634251c28b31fe
 DIST etcd3gw-1.0.2.tar.gz 27345 BLAKE2B e529525cbd60fffa1b0bf3ea83f14fcda6ba5a88a666b4f06a2ea66c76c809a00371b998477594f9bce5943047dfa6051efae6d75c2876046297015f2e43ee74 SHA512 dbdf61d0f19d730993fd61270fbe76838e3aa027ef1059f0083a1dd6071dd66eea99bbd4807884b91209c8eee262a5143e67aebf309175b43fd7aa1d94beca82
diff --git a/dev-python/etcd3gw/etcd3gw-1.0.1.ebuild b/dev-python/etcd3gw/etcd3gw-1.0.1.ebuild
deleted file mode 100644
index ea387fd73fdb..000000000000
--- a/dev-python/etcd3gw/etcd3gw-1.0.1.ebuild
+++ /dev/null
@@ -1,43 +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="A python client for etcd3 grpc-gateway v3 API"
-HOMEPAGE="
-	https://opendev.org/openstack/etcd3gw
-	https://pypi.org/project/etcd3gw/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/pbr-2.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/futurist-0.16.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pifpaf-0.10.0[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/urllib3-1.15.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/exifread/Manifest b/dev-python/exifread/Manifest
index 0f724a1a9276..479d02244ded 100644
--- a/dev-python/exifread/Manifest
+++ b/dev-python/exifread/Manifest
@@ -1,2 +1 @@
-DIST exifread-2.3.2.tar.gz 42796 BLAKE2B 0dca89f484a5f21ee2510af6ab069ba76dfeb4a31bc79261951ef062bb695f6f1adc6c7378ecbdf0e1a46540ec767555cb46bb77ab39b002199ac490ca58fd6b SHA512 d37cc6a70793aa894947b1b24f973ff2f9c15ba3dfe99674c5ea61e5a469b259035fc48a1d2c4d4d7021289bad431e57a4e137e2d4feb0c5352b0b162e61376a
-DIST exifread-3.0.0.tar.gz 44891 BLAKE2B 867644edfabaee6c90b4dd540a4225e74df45babee69ac3935644033d0e973b5d06cfc3fbba521ca352bda08eda44548e233c203b66978e4021db28ec45b29d6 SHA512 3b819718f5fc9f7807dc245908c2724d1023ce6345b6f6a84ea0c10d62b47939ae4dce23db868d67b6eeaa07e5c88fd406520106f31883d15442eaabcebb0746
+DIST exifread-3.0.0.gh.tar.gz 44891 BLAKE2B 867644edfabaee6c90b4dd540a4225e74df45babee69ac3935644033d0e973b5d06cfc3fbba521ca352bda08eda44548e233c203b66978e4021db28ec45b29d6 SHA512 3b819718f5fc9f7807dc245908c2724d1023ce6345b6f6a84ea0c10d62b47939ae4dce23db868d67b6eeaa07e5c88fd406520106f31883d15442eaabcebb0746
diff --git a/dev-python/exifread/exifread-2.3.2.ebuild b/dev-python/exifread/exifread-2.3.2.ebuild
deleted file mode 100644
index b2a02b0f80bc..000000000000
--- a/dev-python/exifread/exifread-2.3.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-MY_PN="exif-py"
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy to use Python module to extract Exif metadata from tiff and jpeg files"
-HOMEPAGE="
-	https://pypi.org/project/ExifRead/
-	https://github.com/ianare/exif-py
-"
-SRC_URI="https://github.com/ianare/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-python/exifread/exifread-3.0.0.ebuild b/dev-python/exifread/exifread-3.0.0.ebuild
index a184cd25bc9a..8cc98f7caaeb 100644
--- a/dev-python/exifread/exifread-3.0.0.ebuild
+++ b/dev-python/exifread/exifread-3.0.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 	https://pypi.org/project/ExifRead/
 	https://github.com/ianare/exif-py
 "
-SRC_URI="https://github.com/ianare/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ianare/${MY_PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
diff --git a/dev-python/factory_boy/Manifest b/dev-python/factory_boy/Manifest
index 4d792cb42e95..bcb816980777 100644
--- a/dev-python/factory_boy/Manifest
+++ b/dev-python/factory_boy/Manifest
@@ -1,2 +1 @@
-DIST factory_boy-3.2.0.tar.gz 141428 BLAKE2B e8f25b84f31c27af5450af3dadae2ca7af41a8e0a0c71e6a88227404ac1082418059fae43cab57878e6373e3ee981d188098f01ff1001abed34e51e7826b5be5 SHA512 1e9736491229aa1648cfe9956c157738f5b9ecfd43e39a2f1d299e3c018763518f04b9bde7b19c1c7dbef48e5a93db818f1010068be541b02453313f71bc37c0
-DIST factory_boy-3.2.1.tar.gz 141947 BLAKE2B f7668e945c653276fdf8c28aca728e4dd0aa24e980868a22e116cdb6395170f37f60d9b021c915586681b93d84a50f254b6d4a0b8f75e15991fac91aa4b17e0c SHA512 45f88970fa2adf15160d489335d7843ebf78178ae619e6b1ad2cc2e3af8e6c14763cf1afe21bc4e66d1d7196458d8045862db4d5878d5cfc1f2aa658ccba1812
+DIST factory_boy-3.2.1.gh.tar.gz 141947 BLAKE2B f7668e945c653276fdf8c28aca728e4dd0aa24e980868a22e116cdb6395170f37f60d9b021c915586681b93d84a50f254b6d4a0b8f75e15991fac91aa4b17e0c SHA512 45f88970fa2adf15160d489335d7843ebf78178ae619e6b1ad2cc2e3af8e6c14763cf1afe21bc4e66d1d7196458d8045862db4d5878d5cfc1f2aa658ccba1812
diff --git a/dev-python/factory_boy/factory_boy-3.2.0.ebuild b/dev-python/factory_boy/factory_boy-3.2.0.ebuild
deleted file mode 100644
index e16ccaa96124..000000000000
--- a/dev-python/factory_boy/factory_boy-3.2.0.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
-
-DESCRIPTION="A fixtures replacement tool"
-HOMEPAGE="https://github.com/FactoryBoy/factory_boy"
-SRC_URI="https://github.com/FactoryBoy/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/Faker-0.7.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/mongoengine[${PYTHON_USEDEP}]
-		dev-python/pillow[jpeg,${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/factory_boy[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# Fix symbolic link QA
-	rm ChangeLog || die "remove failed"
-	cp docs/changelog.rst ChangeLog || die "copy failed"
-
-	# Disable online tests
-	sed -i -e 's:tearDownClass:_&:' \
-		-e 's:test_creation:_&:' \
-		tests/test_mongoengine.py  || die
-
-	distutils-r1_python_prepare_all
-}
-
-distutils_enable_tests --install unittest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-spelling
diff --git a/dev-python/factory_boy/factory_boy-3.2.1.ebuild b/dev-python/factory_boy/factory_boy-3.2.1.ebuild
index 89bae3788fb3..b9b993ca66a9 100644
--- a/dev-python/factory_boy/factory_boy-3.2.1.ebuild
+++ b/dev-python/factory_boy/factory_boy-3.2.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A fixtures replacement tool"
 HOMEPAGE="https://github.com/FactoryBoy/factory_boy"
-SRC_URI="https://github.com/FactoryBoy/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/FactoryBoy/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -20,7 +20,6 @@ BDEPEND="
 	test? (
 		$(python_gen_impl_dep sqlite)
 		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/mongoengine[${PYTHON_USEDEP}]
 		dev-python/pillow[jpeg,${PYTHON_USEDEP}]
 		dev-python/sqlalchemy[${PYTHON_USEDEP}]
 	)
@@ -34,14 +33,12 @@ python_prepare_all() {
 	rm ChangeLog || die "remove failed"
 	cp docs/changelog.rst ChangeLog || die "copy failed"
 
-	# Disable online tests
-	sed -i \
-		-e 's|tearDownClass|_&|' \
-		-e 's|test_creation|_&|' \
-		tests/test_mongoengine.py  || die
+	# depends on masked dev-python/mongoengine
+	rm tests/test_mongoengine.py || die
 
 	distutils-r1_python_prepare_all
 }
 
 distutils_enable_tests --install unittest
+
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-spelling
diff --git a/dev-python/fake-useragent/Manifest b/dev-python/fake-useragent/Manifest
index 366fc02d739f..d36f1307f34d 100644
--- a/dev-python/fake-useragent/Manifest
+++ b/dev-python/fake-useragent/Manifest
@@ -1 +1 @@
-DIST fake-useragent-0.1.11.tar.gz 20989 BLAKE2B affa8cb9c6102076ed19429310ed870d2ebb6f3948ddd12508c80e27648bdcd502c3e5b04e836b0be4ac5e1cd6e400054d5a3d1d9d721298cfa1d9ad4161d6fd SHA512 f73e1348af2694469a22a4cc91e9a5d57cce33b969d016903fc7fb4f91375ea5b24a5835cff38181f53dd92794d5606f52822e06d43801c0442f2b389378b2d2
+DIST fake-useragent-0.1.11.gh.tar.gz 20989 BLAKE2B affa8cb9c6102076ed19429310ed870d2ebb6f3948ddd12508c80e27648bdcd502c3e5b04e836b0be4ac5e1cd6e400054d5a3d1d9d721298cfa1d9ad4161d6fd SHA512 f73e1348af2694469a22a4cc91e9a5d57cce33b969d016903fc7fb4f91375ea5b24a5835cff38181f53dd92794d5606f52822e06d43801c0442f2b389378b2d2
diff --git a/dev-python/fake-useragent/fake-useragent-0.1.11-r1.ebuild b/dev-python/fake-useragent/fake-useragent-0.1.11-r1.ebuild
index 19ae5ebb2524..425c8ed63118 100644
--- a/dev-python/fake-useragent/fake-useragent-0.1.11-r1.ebuild
+++ b/dev-python/fake-useragent/fake-useragent-0.1.11-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 		https://github.com/hellysmile/fake-useragent
 		https://pypi.org/project/fake-useragent/
 "
-SRC_URI="https://github.com/hellysmile/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/hellysmile/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 818610c1dd53..aa0baf310a64 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,2 +1,3 @@
 DIST py-filelock-3.6.0.tar.gz 204238 BLAKE2B f65a6e8ca8645dbeaf5ebbad00a8001cd88065da997097ef2ce74b5eee4dabfaf44d53a240498e82905589943f045422b44776c3b8de3077656a3b9612396156 SHA512 f55ad90d79e90eb5a915afffecc632566456604a62b89fb13304c5812e05a34c508c863e76246a254acd98f55930d3179b0908a06d1e5a203d578a826a048ae2
 DIST py-filelock-3.7.0.tar.gz 204366 BLAKE2B 9ef0a488603a5d210a232e472d2bcdce7f867b7b3fdb8dbe167dde54cd8c7085561f09d5a746ad7565ae7853495bd84c0b14cfa136a9d466f18f037ea0b9e8d1 SHA512 1b01a25a1ec194be1727a7245d6bada3a5f6e38bc16c0c78793ec0cf3dcdee6cc6b5c04fc74ae3687afd354379c73e189f7f3a8964853b8533a489ed2a0c6a04
+DIST py-filelock-3.7.1.gh.tar.gz 204373 BLAKE2B e3ef657488a68caf8dc8158d5060a07447b74b53b26a2ad05eb67211a5ae7ef5deadeb8527cb6cd95ce225e0fcd29a0ce2dd53b68b7e2cacde4c0f2242966b21 SHA512 66708398ae3c4dcd97a6031feca6a1b7d1010a5ee605c5adce29a9cfabe67c5464eefb3812c66e2c32c3547240fdc7acac6eec25cc8dfb2d5255079c5e6b44b4
diff --git a/dev-python/filelock/filelock-3.7.1.ebuild b/dev-python/filelock/filelock-3.7.1.ebuild
new file mode 100644
index 000000000000..2488230bd0bb
--- /dev/null
+++ b/dev-python/filelock/filelock-3.7.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2018-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+MY_P=py-filelock-${PV}
+DESCRIPTION="A platform independent file lock for Python"
+HOMEPAGE="
+	https://github.com/tox-dev/py-filelock/
+	https://pypi.org/project/filelock/
+"
+SRC_URI="
+	https://github.com/tox-dev/py-filelock/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/fontFeatures/Manifest b/dev-python/fontFeatures/Manifest
index 2b6429c494d3..c06ea2e1e1d7 100644
--- a/dev-python/fontFeatures/Manifest
+++ b/dev-python/fontFeatures/Manifest
@@ -1,2 +1 @@
-DIST fontFeatures-1.6.4.tar.gz 1236722 BLAKE2B 0efcda0175de36d5e3d78c02fc6e835f3f39a14e6d050340d23dbf391ecf6cee9385822e8a005ed45d783bb467f25b087c1b473f4af1186dff98d7d9502c6b4e SHA512 fef775845b1d6dbd2b81a7f44429586ba63bdbcc3f2a5124e4dda41e8af62ac81b143e6d7e1443c3bb90e12f7f592b512bcd90bcbdc18e5eb07de195956cc196
-DIST fontFeatures-1.7.0.tar.gz 1237478 BLAKE2B dadc4ce4b43cfbea246169f6df8f3d0d63382f1ffb65cf6c325581079b52053c0c2f419c4e153c1c9bbed06db598e94a61b0b06bc49298565918c77750296661 SHA512 80977f36d6b0ad4ed8fd320b7b2ecd1fc47ce2703300cf3b47071cb8e31f3d756a07270a5c34edff8d59a97c58e3ff45107fc19958a60a384041c106c68731f9
+DIST fontFeatures-1.7.0.gh.tar.gz 1237478 BLAKE2B dadc4ce4b43cfbea246169f6df8f3d0d63382f1ffb65cf6c325581079b52053c0c2f419c4e153c1c9bbed06db598e94a61b0b06bc49298565918c77750296661 SHA512 80977f36d6b0ad4ed8fd320b7b2ecd1fc47ce2703300cf3b47071cb8e31f3d756a07270a5c34edff8d59a97c58e3ff45107fc19958a60a384041c106c68731f9
diff --git a/dev-python/fontFeatures/fontFeatures-1.6.4.ebuild b/dev-python/fontFeatures/fontFeatures-1.6.4.ebuild
deleted file mode 100644
index 477de329b80d..000000000000
--- a/dev-python/fontFeatures/fontFeatures-1.6.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for manipulating OpenType font features"
-HOMEPAGE="https://github.com/simoncozens/fontFeatures"
-SRC_URI="https://github.com/simoncozens/fontFeatures/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/fs[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.28.0[${PYTHON_USEDEP}]
-	>=dev-python/glyphtools-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/beziers-0.1.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		>=dev-python/youseedee-0.3.0[${PYTHON_USEDEP}]
-		>=dev-python/babelfont-3.0.0_alpha1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/fontFeatures/fontFeatures-1.7.0.ebuild b/dev-python/fontFeatures/fontFeatures-1.7.0.ebuild
index 477de329b80d..1e101ab94d19 100644
--- a/dev-python/fontFeatures/fontFeatures-1.7.0.ebuild
+++ b/dev-python/fontFeatures/fontFeatures-1.7.0.ebuild
@@ -9,7 +9,8 @@ inherit distutils-r1
 
 DESCRIPTION="Python library for manipulating OpenType font features"
 HOMEPAGE="https://github.com/simoncozens/fontFeatures"
-SRC_URI="https://github.com/simoncozens/fontFeatures/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/simoncozens/fontFeatures/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
 KEYWORDS="~amd64"
 LICENSE="MIT"
 SLOT="0"
@@ -18,7 +19,6 @@ RDEPEND="
 	dev-python/fs[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	>=dev-python/fonttools-4.28.0[${PYTHON_USEDEP}]
-	>=dev-python/glyphtools-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/beziers-0.1.0[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
@@ -28,5 +28,6 @@ BDEPEND="
 		>=dev-python/babelfont-3.0.0_alpha1[${PYTHON_USEDEP}]
 	)
 "
+PDEPEND=">=dev-python/glyphtools-0.7.0[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
diff --git a/dev-python/fontMath/Manifest b/dev-python/fontMath/Manifest
index 7f5699fc4e72..ae0ebc4b2c1a 100644
--- a/dev-python/fontMath/Manifest
+++ b/dev-python/fontMath/Manifest
@@ -1,2 +1 @@
-DIST fontMath-0.9.1.tar.gz 30031 BLAKE2B 204ba6b7cd9e1b03030d8ad10106a8ff001b513bf8e253c661cd69ec71c63c513b404a2f9772c527b480c62cfd8c45db527481319e0fc6137281450341a19b8c SHA512 36d8db21b6bf1bb08a79297c97c85fe5bf019e4a4e051e6ee7b72fab26bcc1ce50b78d5b182f440eb800544c7c2263ffb673df6dd5edb5c255d5023e90af6838
-DIST fontMath-0.9.2.tar.gz 29835 BLAKE2B 0be37992c5009c5f0271da1cdfa464983e720f0b558b177b03abb5fa1f700f8171b40d39144e0976d815c33ba86e5bab90364502f3464cbab5cb18ad27cd88a8 SHA512 5305da4d688716a473b440114f37eb342eaf26d801c8c10361b8d98f84022f6da3afc112828b32a4286992d35b2f0075cad7a33086768f3e004b80fe59b0117e
+DIST fontMath-0.9.2.gh.tar.gz 29835 BLAKE2B 0be37992c5009c5f0271da1cdfa464983e720f0b558b177b03abb5fa1f700f8171b40d39144e0976d815c33ba86e5bab90364502f3464cbab5cb18ad27cd88a8 SHA512 5305da4d688716a473b440114f37eb342eaf26d801c8c10361b8d98f84022f6da3afc112828b32a4286992d35b2f0075cad7a33086768f3e004b80fe59b0117e
diff --git a/dev-python/fontMath/fontMath-0.9.1.ebuild b/dev-python/fontMath/fontMath-0.9.1.ebuild
deleted file mode 100644
index 43ce57125835..000000000000
--- a/dev-python/fontMath/fontMath-0.9.1.ebuild
+++ /dev/null
@@ -1,27 +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
-
-SRC_URI="https://github.com/robotools/fontMath/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-DESCRIPTION="A collection of objects that implement fast font math"
-HOMEPAGE="https://github.com/robotools/fontMath"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/fonttools-4.9[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-pkg_setup() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}"
-}
diff --git a/dev-python/fontMath/fontMath-0.9.2.ebuild b/dev-python/fontMath/fontMath-0.9.2.ebuild
index b7d47b7adfc0..9a8d193bded3 100644
--- a/dev-python/fontMath/fontMath-0.9.2.ebuild
+++ b/dev-python/fontMath/fontMath-0.9.2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A collection of objects that implement fast font math"
 HOMEPAGE="https://github.com/robotools/fontMath"
-SRC_URI="https://github.com/robotools/fontMath/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/robotools/fontMath/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
 LICENSE="MIT"
diff --git a/dev-python/fontParts/Manifest b/dev-python/fontParts/Manifest
index 8d038490ce62..2ab0eef0ef69 100644
--- a/dev-python/fontParts/Manifest
+++ b/dev-python/fontParts/Manifest
@@ -1,2 +1 @@
-DIST fontParts-0.10.4.tar.gz 428116 BLAKE2B c3f7dcab8f8825a118373d0ba282bbbdf86073c5f0862a6ef04b88b35152370687c625933b41e1bd4da615af0325d971178186e74d2005fd12f85035d36e2979 SHA512 35bf88b80edeef3a52c46e7b8bb991e99ee93bf6a65909b81368a5a514898f7fe60354134200c176761787e8927170c064997a4d16979585d3b8ddf9962f3afe
 DIST fontParts-0.10.5.tar.gz 431282 BLAKE2B f0585b0220b35f9b6fc18ace6b517b69fecf87e2d0e1fda7ea5753512851e49b2fd122af628286a638d9c178212602e0ca467b38a94577d11ea3bb117d944a6b SHA512 961507c60de82da516f5cefbb3ca998533751234953c01c28e2ca534d47916e534c1cd6dc95add182e7da10ff57b1a0e0e5ad20fcbe4c385d5f2f58dde0be927
diff --git a/dev-python/fontParts/fontParts-0.10.4.ebuild b/dev-python/fontParts/fontParts-0.10.4.ebuild
deleted file mode 100644
index bec4e7b4d8d1..000000000000
--- a/dev-python/fontParts/fontParts-0.10.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="An API for interacting with the parts of fonts"
-HOMEPAGE="https://github.com/robotools/fontParts"
-SRC_URI="https://github.com/robotools/fontParts/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/booleanOperations-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/defcon-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/fontMath-0.4.8[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-3.32.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-python/fontPens[${PYTHON_USEDEP}] )"
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}"
-}
-
-python_test() {
-	"${EPYTHON}" Lib/fontParts/fontshell/test.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/fontPens/Manifest b/dev-python/fontPens/Manifest
index 332d1c31525d..7debcc413fa8 100644
--- a/dev-python/fontPens/Manifest
+++ b/dev-python/fontPens/Manifest
@@ -1 +1 @@
-DIST fontPens-0.2.4.tar.gz 17680 BLAKE2B 82577a022f020e255a75bb8317a2f804467626095374103fbf091ba96773d287dcc7af1ef641e200ae8abef2d07cbe7b1f1868ca8b9934d9c77c83e51ba70870 SHA512 cbef24fbf421f4b09e1d9b474500e748f424ef1df2d9871424761e6bc0ac68a5b13484cf933f6fdac390f0f5e66573a1bcfc321b04de3e19e8ae9923da6768bb
+DIST fontPens-0.2.4.gh.tar.gz 17680 BLAKE2B 82577a022f020e255a75bb8317a2f804467626095374103fbf091ba96773d287dcc7af1ef641e200ae8abef2d07cbe7b1f1868ca8b9934d9c77c83e51ba70870 SHA512 cbef24fbf421f4b09e1d9b474500e748f424ef1df2d9871424761e6bc0ac68a5b13484cf933f6fdac390f0f5e66573a1bcfc321b04de3e19e8ae9923da6768bb
diff --git a/dev-python/fontPens/fontPens-0.2.4.ebuild b/dev-python/fontPens/fontPens-0.2.4-r1.ebuild
index e4e1663d5819..b1c56c93c62e 100644
--- a/dev-python/fontPens/fontPens-0.2.4.ebuild
+++ b/dev-python/fontPens/fontPens-0.2.4-r1.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit distutils-r1
 
-SRC_URI="https://github.com/robotools/fontPens/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
 DESCRIPTION="A collection of classes implementing the pen protocol for manipulating glyphs"
 HOMEPAGE="https://github.com/robotools/fontPens"
+SRC_URI="https://github.com/robotools/fontPens/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
 LICENSE="BSD"
 SLOT="0"
 
diff --git a/dev-python/gflanguages/files/gflanguages-0.4.0-remove-setuptools_scm-constraint.patch b/dev-python/gflanguages/files/gflanguages-0.4.0-remove-setuptools_scm-constraint.patch
new file mode 100644
index 000000000000..369e531b5e47
--- /dev/null
+++ b/dev-python/gflanguages/files/gflanguages-0.4.0-remove-setuptools_scm-constraint.patch
@@ -0,0 +1,16 @@
+From 18d71003c12f241831811eff86337ddf2223d754 Mon Sep 17 00:00:00 2001
+From: Alessandro Barbieri <lssndrbarbieri@gmail.com>
+Date: Tue, 31 May 2022 10:52:28 +0200
+Subject: [PATCH] remove setuptools_scm constraint
+
+--- a/setup.py
++++ b/setup.py
+@@ -51,7 +51,7 @@
+         'Programming Language :: Python :: 3'
+     ],
+     python_requires=">=3.7",
+-    setup_requires=['setuptools_scm>=4,<6.1'],
++    setup_requires=['setuptools_scm>=4'],
+     install_requires=[
+         'protobuf'
+     ]
diff --git a/dev-python/gflanguages/gflanguages-0.4.0.ebuild b/dev-python/gflanguages/gflanguages-0.4.0.ebuild
index 2453f167120c..945f89b63b3c 100644
--- a/dev-python/gflanguages/gflanguages-0.4.0.ebuild
+++ b/dev-python/gflanguages/gflanguages-0.4.0.ebuild
@@ -24,6 +24,8 @@ DEPEND="
 	>=dev-python/setuptools_scm-4[${PYTHON_USEDEP}]
 "
 
+PATCHES=( "${FILESDIR}/${P}-remove-setuptools_scm-constraint.patch" )
+
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/dev-python/glyphsLib/Manifest b/dev-python/glyphsLib/Manifest
index 3903580d8519..7dbcf21e9d6e 100644
--- a/dev-python/glyphsLib/Manifest
+++ b/dev-python/glyphsLib/Manifest
@@ -1,2 +1 @@
-DIST glyphsLib-6.0.4.tar.gz 31130361 BLAKE2B c53cc57bc001e2a5c0cc229db36767cc240659325cbb0f471c91de54adc805d73a794bb91b8e73400261ccb5ccc79c939b77f5a2fd5fc50a8c30fdc6ea9eb053 SHA512 782dfcccfb29d44c492aed790d8f52d670f4ef36e2285390e47bc799c37aec8037b6c717c923234d2bc43e2132f16a27c70c0448b594b8f64ad1af91bcbc840e
-DIST glyphsLib-6.0.5.tar.gz 31132348 BLAKE2B 7c4dbaac9db5142421e9b9785f363f6a8af3923f62b2c635d22072ce7a60a3c775371d7c1f75410509bb072e81cb1922e4d294fa2eb4b68c5fd67859c949f058 SHA512 71c371fac446f313c373923d3fcd675e3007ab9ffddf7bb0540a305c6412fcfccc7be90208398e8238d4774b40488b819517cbf170b789ad276168ac416b9c06
+DIST glyphsLib-6.0.5.gh.tar.gz 31132348 BLAKE2B 7c4dbaac9db5142421e9b9785f363f6a8af3923f62b2c635d22072ce7a60a3c775371d7c1f75410509bb072e81cb1922e4d294fa2eb4b68c5fd67859c949f058 SHA512 71c371fac446f313c373923d3fcd675e3007ab9ffddf7bb0540a305c6412fcfccc7be90208398e8238d4774b40488b819517cbf170b789ad276168ac416b9c06
diff --git a/dev-python/glyphsLib/glyphsLib-6.0.4.ebuild b/dev-python/glyphsLib/glyphsLib-6.0.4.ebuild
deleted file mode 100644
index 03a82d9072ad..000000000000
--- a/dev-python/glyphsLib/glyphsLib-6.0.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to provide a bridge from Glyphs source files to UFOs"
-HOMEPAGE="https://github.com/googlefonts/glyphsLib"
-SRC_URI="https://github.com/googlefonts/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/fonttools-4.27.1[${PYTHON_USEDEP}]
-	>=dev-python/ufoLib2-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/openstep-plist-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-python/setuptools_scm-6.0[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/defcon[${PYTHON_USEDEP}]
-		dev-python/ufoNormalizer[${PYTHON_USEDEP}]
-		dev-python/ufo2ft[${PYTHON_USEDEP}]
-		>=app-text/xmldiff-2.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/glyphsLib/glyphsLib-6.0.5.ebuild b/dev-python/glyphsLib/glyphsLib-6.0.5.ebuild
index 03a82d9072ad..37f31349c86c 100644
--- a/dev-python/glyphsLib/glyphsLib-6.0.5.ebuild
+++ b/dev-python/glyphsLib/glyphsLib-6.0.5.ebuild
@@ -5,12 +5,11 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10} )
-
 inherit distutils-r1
 
 DESCRIPTION="A library to provide a bridge from Glyphs source files to UFOs"
 HOMEPAGE="https://github.com/googlefonts/glyphsLib"
-SRC_URI="https://github.com/googlefonts/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/googlefonts/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="Apache-2.0 MIT"
 KEYWORDS="~amd64"
diff --git a/dev-python/glyphsets/Manifest b/dev-python/glyphsets/Manifest
index a670b1a4eb85..6a1b8f7a7b75 100644
--- a/dev-python/glyphsets/Manifest
+++ b/dev-python/glyphsets/Manifest
@@ -1 +1 @@
-DIST glyphsets-0.5.0.tar.gz 1473150 BLAKE2B d745b7689c9eee7cd1a25035d13f19d6eb6db7c8e603ecf87ed689f0cb2e2d1a421b4d5a4f08c7d470def2d5d8db7636a01941f3445579a0712f2ab506a9571a SHA512 94d6ab956a5ab16f061b57e5210ea59733486a27bde3093e8af279ac8f5f1e2efce71d5135ac7182ec027916e31d86433939e743084c405653250893d9221a02
+DIST glyphsets-0.5.0.gh.tar.gz 1473150 BLAKE2B d745b7689c9eee7cd1a25035d13f19d6eb6db7c8e603ecf87ed689f0cb2e2d1a421b4d5a4f08c7d470def2d5d8db7636a01941f3445579a0712f2ab506a9571a SHA512 94d6ab956a5ab16f061b57e5210ea59733486a27bde3093e8af279ac8f5f1e2efce71d5135ac7182ec027916e31d86433939e743084c405653250893d9221a02
diff --git a/dev-python/glyphsets/files/glyphsets-0.5.0-remove-setuptools_scm.constraint.patch b/dev-python/glyphsets/files/glyphsets-0.5.0-remove-setuptools_scm.constraint.patch
new file mode 100644
index 000000000000..8155756ebd77
--- /dev/null
+++ b/dev-python/glyphsets/files/glyphsets-0.5.0-remove-setuptools_scm.constraint.patch
@@ -0,0 +1,16 @@
+From 334f83007cb24f076d59ee97d9d1c489d0e18437 Mon Sep 17 00:00:00 2001
+From: Alessandro Barbieri <lssndrbarbieri@gmail.com>
+Date: Tue, 31 May 2022 10:35:47 +0200
+Subject: [PATCH] remove constraint on setuptools_scm
+
+--- a/setup.py
++++ b/setup.py
+@@ -55,7 +55,7 @@
+         'Programming Language :: Python :: 3'
+     ],
+     python_requires=">=3.7",
+-    setup_requires=['setuptools_scm>=4,<6.1'],
++    setup_requires=['setuptools_scm>=4'],
+     install_requires=[
+         'setuptools',
+         'FontTools[ufo]',
diff --git a/dev-python/glyphsets/glyphsets-0.5.0.ebuild b/dev-python/glyphsets/glyphsets-0.5.0.ebuild
index 521e9189693a..7f56bfa20740 100644
--- a/dev-python/glyphsets/glyphsets-0.5.0.ebuild
+++ b/dev-python/glyphsets/glyphsets-0.5.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://github.com/googlefonts/glyphsets
 	https://pypi.org/project/glyphsets/
 "
-SRC_URI="https://github.com/googlefonts/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/googlefonts/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="Apache-2.0"
 KEYWORDS="~amd64"
@@ -28,6 +28,8 @@ DEPEND="
 	>=dev-python/setuptools_scm-4[${PYTHON_USEDEP}]
 "
 
+PATCHES=( "${FILESDIR}/${P}-remove-setuptools_scm.constraint.patch" )
+
 python_prepare_all() {
 	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
 	distutils-r1_python_prepare_all
diff --git a/dev-python/glyphtools/Manifest b/dev-python/glyphtools/Manifest
index bd7b36b6879c..61e972919776 100644
--- a/dev-python/glyphtools/Manifest
+++ b/dev-python/glyphtools/Manifest
@@ -1,2 +1 @@
-DIST glyphtools-0.7.4.tar.gz 20023 BLAKE2B a771f626220dc2f26ba643edb21fd64460369b192bf21ccf4e798ee7179a8c7a35d69cd07ca700193cf0be579db757a9487434280168fc2b8c4d5b330ddcb344 SHA512 e04df8ebdfb4738d3f277dc7dce5ab1d8ad3f4e97bd30192779f362ebb65124fb688fb6f586fadf767e24b2efd7af519ffc9c4fc14adaf6d0546a07e8075c759
 DIST glyphtools-0.8.0.tar.gz 20010 BLAKE2B 19c131793875c95f5b1d4be6ac481ac1a32e5548c43a6ef598a4b1f33a8e8978cc55e45198f58be815044965c3289c27a65e2ae8326f164a8a7a1eb0c72c6672 SHA512 700e5996bee73044050caf0beeedfca6e26ac898ed33fade9000d4cc97eca300d5f8290fab4b607f0ac9c9f8a28b877ac7b35f782fec1f614bfaf1d8fe7f8fa1
diff --git a/dev-python/glyphtools/glyphtools-0.7.4.ebuild b/dev-python/glyphtools/glyphtools-0.7.4.ebuild
deleted file mode 100644
index ec33f2149683..000000000000
--- a/dev-python/glyphtools/glyphtools-0.7.4.ebuild
+++ /dev/null
@@ -1,29 +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="Routines for extracting information from fontTools glyphs"
-HOMEPAGE="https://github.com/simoncozens/glyphtools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	dev-python/babelfont[${PYTHON_USEDEP}]
-	dev-python/beziers[${PYTHON_USEDEP}]
-	dev-python/glyphsLib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinxcontrib-napoleon \
-	dev-python/sphinxcontrib-restbuilder
diff --git a/dev-python/glyphtools/glyphtools-0.8.0.ebuild b/dev-python/glyphtools/glyphtools-0.8.0.ebuild
index 006e59a51e88..cfb1d8a1c2e9 100644
--- a/dev-python/glyphtools/glyphtools-0.8.0.ebuild
+++ b/dev-python/glyphtools/glyphtools-0.8.0.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} )
-
 inherit distutils-r1
 
 DESCRIPTION="Routines for extracting information from fontTools glyphs"
@@ -21,9 +20,6 @@ RDEPEND="
 	dev-python/glyphsLib[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}"
 
 distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinxcontrib-napoleon \
-	dev-python/sphinxcontrib-restbuilder
+distutils_enable_sphinx docs dev-python/sphinxcontrib-restbuilder
diff --git a/dev-python/gpxpy/Manifest b/dev-python/gpxpy/Manifest
index 62bb1da44a6a..e2a6d3174398 100644
--- a/dev-python/gpxpy/Manifest
+++ b/dev-python/gpxpy/Manifest
@@ -1,2 +1 @@
-DIST gpxpy-1.4.2.tar.gz 109735 BLAKE2B ff7dd9ef9179de60693f683a68e4068e632f795ccba0b0047abdd8775902a8528d0fefb8532ea69d9d1f591cd5b72be555339fd8b500e7a4fcc0f6b87056ed95 SHA512 34c851be1cd8dd243b11ed69588a254f932b79e7db0106142bd1dedbad6c3693be8ba65495b631e2cc149f39bd2af0a0347f1471a850799e91e215a35ffa5adb
-DIST gpxpy-1.5.0.tar.gz 113446 BLAKE2B 0ed256a3eb869a610027ffea1706c4a3465cc8c7f9ec67cbeebe93a643b03d2ff1cb24442122928624f37d11115f9bfb8f8e83d0e0f1d3a89d132b4f07b71456 SHA512 08705fa0f78e0539d4b6b84723b01fa6b62a13de0ec25d034da2c14e6cabea14debe92e2a9c4120476bd21f6ea502da8e68217043ad9a401c365895bb69698b0
+DIST gpxpy-1.5.0.gh.tar.gz 113446 BLAKE2B 0ed256a3eb869a610027ffea1706c4a3465cc8c7f9ec67cbeebe93a643b03d2ff1cb24442122928624f37d11115f9bfb8f8e83d0e0f1d3a89d132b4f07b71456 SHA512 08705fa0f78e0539d4b6b84723b01fa6b62a13de0ec25d034da2c14e6cabea14debe92e2a9c4120476bd21f6ea502da8e68217043ad9a401c365895bb69698b0
diff --git a/dev-python/gpxpy/gpxpy-1.4.2.ebuild b/dev-python/gpxpy/gpxpy-1.4.2.ebuild
deleted file mode 100644
index b37fe997d74b..000000000000
--- a/dev-python/gpxpy/gpxpy-1.4.2.ebuild
+++ /dev/null
@@ -1,21 +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="GPX file parser and GPS track manipulation library"
-HOMEPAGE="
-	https://github.com/tkrajina/gpxpy
-	https://pypi.org/project/gpxpy/
-"
-SRC_URI="https://github.com/tkrajina/gpxpy/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-distutils_enable_tests unittest
diff --git a/dev-python/gpxpy/gpxpy-1.5.0.ebuild b/dev-python/gpxpy/gpxpy-1.5.0.ebuild
index c0c13ca379c2..0f18e5b6474b 100644
--- a/dev-python/gpxpy/gpxpy-1.5.0.ebuild
+++ b/dev-python/gpxpy/gpxpy-1.5.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://github.com/tkrajina/gpxpy
 	https://pypi.org/project/gpxpy/
 "
-SRC_URI="https://github.com/tkrajina/gpxpy/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
+SRC_URI="https://github.com/tkrajina/gpxpy/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 KEYWORDS="~amd64"
 LICENSE="Apache-2.0"
diff --git a/dev-python/graphene/Manifest b/dev-python/graphene/Manifest
index 795eaed04e0f..898383797133 100644
--- a/dev-python/graphene/Manifest
+++ b/dev-python/graphene/Manifest
@@ -1,4 +1,2 @@
 DIST graphene-3.0.0.tar.gz 116388 BLAKE2B 8e0c5732a8c267e1f492c4d07b070a40777e2ac7b41badc0c4b06471c4268e58bab47d170cf3e74940755f0de3d4be246c1a67eae44654bcfbf531fa1eeefb6d SHA512 dbd651ad509248e66c739acc16778753817b040e573514820a221647e1cf4fb96d22f499d1479eb39d921f17c696fcfe9acce3bb2b89b23ffd9e43f949dc4262
-DIST graphene-3.0.0_beta7.tar.gz 113258 BLAKE2B 4a3adadfea6dc6fd936b8bad83cf02c1b2b7937648712ee26ce3c5eb7e6d6631790ae2f22fff334de4495ed3197761862e88450e7f837ee06f71e7de4009efe4 SHA512 df4dee75c8c5bc5643dd5231bff61f7f1e2efe7203e61a3e32b10c80c2f44139a408ca99726fea51d6aa6e844e648c860c41e3e20ee4679dd3573f43047e71fa
 DIST sphinx-graphene-3.0.0.zip 22270 BLAKE2B 7cc467f12e7857cedb0336c7d0708f9429b9ccaa7f65077e6453a3e4ce0af92cbdb6d4dd3bec5801bd3e5fb233b4994dbce52fabe690da196ee25b5eec7fb63f SHA512 00cdaee50a7c16729d9d820de7d6c0f61215e3b906777b0705f2de0d2029f2ffb1f86134b1d673d00675d77729be47765999537fc42aeefafb026248b9b0b3b0
-DIST sphinx-graphene-3.0.0_beta7.zip 22270 BLAKE2B 7cc467f12e7857cedb0336c7d0708f9429b9ccaa7f65077e6453a3e4ce0af92cbdb6d4dd3bec5801bd3e5fb233b4994dbce52fabe690da196ee25b5eec7fb63f SHA512 00cdaee50a7c16729d9d820de7d6c0f61215e3b906777b0705f2de0d2029f2ffb1f86134b1d673d00675d77729be47765999537fc42aeefafb026248b9b0b3b0
diff --git a/dev-python/graphene/graphene-3.0.0_beta7.ebuild b/dev-python/graphene/graphene-3.0.0_beta7.ebuild
deleted file mode 100644
index 93bd2f6af254..000000000000
--- a/dev-python/graphene/graphene-3.0.0_beta7.ebuild
+++ /dev/null
@@ -1,63 +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_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="GraphQL Framework for Python"
-HOMEPAGE="https://graphene-python.org
-	https://pypi.org/project/graphene/
-	https://github.com/graphql-python/graphene
-"
-SRC_URI="https://github.com/graphql-python/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	doc? ( https://graphene-python.org/sphinx_graphene_theme.zip -> sphinx-${P}.zip )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/aniso8601[${PYTHON_USEDEP}]
-	dev-python/graphql-core[${PYTHON_USEDEP}]
-	dev-python/graphql-relay[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	doc? ( app-arch/unzip )
-	test? (
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/promise[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/snapshottest[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	if use doc ; then
-		unpack sphinx-${P}.zip
-		mv "${WORKDIR}"/sphinx_graphene_theme "${S}"/docs || die
-	fi
-}
-
-python_test() {
-	epytest --benchmark-disable \
-		--deselect graphene/types/tests/test_schema.py::TestUnforgivingExecutionContext::test_unexpected_error
-}
diff --git a/dev-python/graphql-core/Manifest b/dev-python/graphql-core/Manifest
index 06f7e595cae1..ffe12ee735d3 100644
--- a/dev-python/graphql-core/Manifest
+++ b/dev-python/graphql-core/Manifest
@@ -1,2 +1 @@
-DIST graphql-core-3.1.5.tar.gz 497629 BLAKE2B 28b8a32669c7367bb1343e04bf3f5a1b20ce13f83e2514d243b69df067306f2fbd8d380d6a9f833fe1296831853898b3f1a0d0ec73fc3d0ea8a4726ed3062674 SHA512 d6fccd751ecc575649c4eb697b98f6b581d56db58e4d4d8b73eec8cf8285cc749dd55c6e3dc54fe9aeb216b1ae4a6d14c9e617ca65eecba4fe1d3ba41de6f7c4
 DIST graphql-core-3.1.6.tar.gz 499188 BLAKE2B c47d95854601de6f524b266de84384d334c99f05aa9c1a226a55413b9a55111dc2eb87813d2650253c502e2bd9904aa1eeaef5373b830ffa1ab8efdf0bec80e7 SHA512 fe7068fb9100e57f2198f653166136d81e98c863f56f3ac1a6b04c65f31ef73d8d1aff5e70870e13c01f333542b442a772157111db58992a4a0b36a17e0e7120
diff --git a/dev-python/graphql-core/graphql-core-3.1.5.ebuild b/dev-python/graphql-core/graphql-core-3.1.5.ebuild
deleted file mode 100644
index b962de8848f0..000000000000
--- a/dev-python/graphql-core/graphql-core-3.1.5.ebuild
+++ /dev/null
@@ -1,28 +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="GraphQL for Python"
-HOMEPAGE="https://github.com/graphql-python/graphql-core"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-describe[${PYTHON_USEDEP}]
-		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/gssapi/Manifest b/dev-python/gssapi/Manifest
index 4db00152bc0b..fc20187ef1fe 100644
--- a/dev-python/gssapi/Manifest
+++ b/dev-python/gssapi/Manifest
@@ -1 +1,2 @@
+DIST gssapi-1.7.3.gh.tar.gz 3830322 BLAKE2B ea3d633b9b88ab5105b5ba67dfd0ec138ac76e121be2ee82c43ca4f2a229c4592f5d417f5b9b0c8d2ce894bdcc35025361431280c4dc8a17782d1ea920390805 SHA512 8bb6346ef9dc5cb380bbe5e51931aa3470149d33a3eeef68a758ce0b2ef06785bdca9cb7ae809a8329ab2a05ac802ac3100f9d8e3d7d3034b4bbce1bc87b4268
 DIST gssapi-1.7.3.tar.gz 1260350 BLAKE2B 0db3c75e158b237ac72e15b01709451fd4004f318e2feb35bc0468cc2b1959e03e6edd50229fce8014da7c82a5dc4dd546b7208a94c70dba7911be3d6b696142 SHA512 ffdff3ee2a8b47d2606b891fb6300331055faaecbf285ab57b6af56ec4d63f95e2c9445248269a3e3974ed4c9ac9664d4265693b15f7a66d1dac328eebc81292
diff --git a/dev-python/gssapi/gssapi-1.7.3-r1.ebuild b/dev-python/gssapi/gssapi-1.7.3-r1.ebuild
new file mode 100644
index 000000000000..fb02b3ec602b
--- /dev/null
+++ b/dev-python/gssapi/gssapi-1.7.3-r1.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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low and high level wrappers around the GSSAPI C libraries"
+HOMEPAGE="https://github.com/pythongssapi/python-gssapi https://pypi.org/project/gssapi/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+# Needed to recythonise for Python 3.11
+SRC_URI="https://github.com/pythongssapi/python-gssapi/releases/download/v${PV}/python-${P}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}"/python-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	virtual/krb5
+"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	virtual/krb5
+	test? (
+		dev-python/k5test[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${T}" || die
+	epytest --pyargs gssapi
+}
diff --git a/dev-python/hijri-converter/Manifest b/dev-python/hijri-converter/Manifest
index c21a8cc048ea..26e799a0132d 100644
--- a/dev-python/hijri-converter/Manifest
+++ b/dev-python/hijri-converter/Manifest
@@ -1,2 +1 @@
-DIST hijri-converter-2.2.3.tar.gz 42009 BLAKE2B c19caa6e8225406ca99a32fa1418890a1b380a4dfbe3b3c00d4ef99956b239e6313db619329c6becc8bf78f763060799693f664db8d4c7ed5139b4b629983cf2 SHA512 b038605ea020ded6f5eb555bfc159137cb29527693e258ca002a198932f1312ee5513ef4d1a4baa242b695337da959f203032cc6896dfce7b245b1befaddf6f1
 DIST hijri-converter-2.2.4.tar.gz 42179 BLAKE2B b8a935b87314e31a710eacfe49c9668684bf26deb678c6d7150e9b9c7c59ff07f03724395465f003b5cbdc0164cf1217816a8f0c8d62c1943c60596b4ac6ccb9 SHA512 4387e9bfcd23b1ac4a755070b45626a00ef71ad4bb82c48e23573dc95d90302571ffec0f9162b28c06054ae10c1b4da06859609db0106dada96a39bc279ad785
diff --git a/dev-python/hijri-converter/hijri-converter-2.2.3.ebuild b/dev-python/hijri-converter/hijri-converter-2.2.3.ebuild
deleted file mode 100644
index 14d63e44bd37..000000000000
--- a/dev-python/hijri-converter/hijri-converter-2.2.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Accurate Hijri-Gregorian date converter based on the Umm al-Qura calendar"
-HOMEPAGE="https://github.com/dralshehri/hijri-converter"
-SRC_URI="https://github.com/dralshehri/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs
diff --git a/dev-python/httmock/Manifest b/dev-python/httmock/Manifest
index ab823700c00c..50aef2fe19f9 100644
--- a/dev-python/httmock/Manifest
+++ b/dev-python/httmock/Manifest
@@ -1 +1,2 @@
+DIST httmock-1.4.0.gh.tar.gz 6439 BLAKE2B 68136f0dd3f1adb7f431893ade8037ce98de3870c5da094ec8a4dfde3eba07667989b71b957673e969548d7d5115455d02af2bcbb1eeb59dc0891e2ffac2c1ff SHA512 49dec760da7dc57a3fb0392c121ddbf9a430fa64c2a6f923ca62da2e697805a61941cde5cf35fc8af30de199227edd72d7f1985745ebd427b1f5d74807e3862c
 DIST httmock-1.4.0.tar.gz 6439 BLAKE2B 68136f0dd3f1adb7f431893ade8037ce98de3870c5da094ec8a4dfde3eba07667989b71b957673e969548d7d5115455d02af2bcbb1eeb59dc0891e2ffac2c1ff SHA512 49dec760da7dc57a3fb0392c121ddbf9a430fa64c2a6f923ca62da2e697805a61941cde5cf35fc8af30de199227edd72d7f1985745ebd427b1f5d74807e3862c
diff --git a/dev-python/httmock/httmock-1.4.0-r1.ebuild b/dev-python/httmock/httmock-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..5709ebd5f2ec
--- /dev/null
+++ b/dev-python/httmock/httmock-1.4.0-r1.ebuild
@@ -0,0 +1,21 @@
+# 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 mocking library for requests"
+HOMEPAGE="https://github.com/patrys/httmock"
+SRC_URI="https://github.com/patrys/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/requests-1.0.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/hypercorn/Manifest b/dev-python/hypercorn/Manifest
index b2361427ee16..08d4946041ad 100644
--- a/dev-python/hypercorn/Manifest
+++ b/dev-python/hypercorn/Manifest
@@ -1 +1 @@
-DIST hypercorn-0.13.2.tar.gz 151984 BLAKE2B b0176016819409cb6958a758041bfe710a008d141a52348ce545deb285cb9e6fc0a4c05321d021bfae5b9de96149db9302f9ce40d01b57c3176d6ad9aef61402 SHA512 c7f12c173b2e9da6108388b2a66b2abca7e26e0d2952e9f3828e94d37b9e3df6076395afd8438aaaa7e328f9a4b085d62f6efd28e2503c4db9bc1f430795048e
+DIST hypercorn-0.13.2.gh.tar.gz 151984 BLAKE2B b0176016819409cb6958a758041bfe710a008d141a52348ce545deb285cb9e6fc0a4c05321d021bfae5b9de96149db9302f9ce40d01b57c3176d6ad9aef61402 SHA512 c7f12c173b2e9da6108388b2a66b2abca7e26e0d2952e9f3828e94d37b9e3df6076395afd8438aaaa7e328f9a4b085d62f6efd28e2503c4db9bc1f430795048e
diff --git a/dev-python/hypercorn/hypercorn-0.13.2.ebuild b/dev-python/hypercorn/hypercorn-0.13.2.ebuild
index 1cec1cc3eaf0..2070118cfb38 100644
--- a/dev-python/hypercorn/hypercorn-0.13.2.ebuild
+++ b/dev-python/hypercorn/hypercorn-0.13.2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+# bug #834994
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 inherit distutils-r1
@@ -14,7 +15,7 @@ HOMEPAGE="
 	https://github.com/pgjones/hypercorn
 	https://pypi.org/project/hypercorn/
 "
-SRC_URI="https://github.com/pgjones/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/pgjones/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -41,6 +42,4 @@ PATCHES=( "${FILESDIR}/${P}-no-coverage.patch" )
 
 distutils_enable_tests pytest
 
-distutils_enable_sphinx docs \
-	dev-python/sphinxcontrib-napoleon \
-	dev-python/pydata-sphinx-theme
+distutils_enable_sphinx docs dev-python/pydata-sphinx-theme
diff --git a/dev-python/hyperglot/Manifest b/dev-python/hyperglot/Manifest
index 1b03ea8eaca8..03ad41e79307 100644
--- a/dev-python/hyperglot/Manifest
+++ b/dev-python/hyperglot/Manifest
@@ -1 +1 @@
-DIST hyperglot-0.3.8.tar.gz 7535789 BLAKE2B ea95372cfff195d2f991cc9a6bc3e26a9576e234167dde0c3a550979f6657e23b2169beb9d67b05fe8de1922e8a299ae24653da611e4277027798b2d139bc12f SHA512 32b8a08795fad10bfe909ddcab9578a53d1a0faf5a9ac79c2a129d2529d00166336560528f298ff8433fdc1149791da948fa2ef4f4d67780bd79b8f8126bdaf6
+DIST hyperglot-0.3.8.gh.tar.gz 7535789 BLAKE2B ea95372cfff195d2f991cc9a6bc3e26a9576e234167dde0c3a550979f6657e23b2169beb9d67b05fe8de1922e8a299ae24653da611e4277027798b2d139bc12f SHA512 32b8a08795fad10bfe909ddcab9578a53d1a0faf5a9ac79c2a129d2529d00166336560528f298ff8433fdc1149791da948fa2ef4f4d67780bd79b8f8126bdaf6
diff --git a/dev-python/hyperglot/hyperglot-0.3.8.ebuild b/dev-python/hyperglot/hyperglot-0.3.8.ebuild
index 935c57bf4d05..035b059759e7 100644
--- a/dev-python/hyperglot/hyperglot-0.3.8.ebuild
+++ b/dev-python/hyperglot/hyperglot-0.3.8.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://github.com/rosettatype/hyperglot
 	https://pypi.org/project/hyperglot/
 "
-SRC_URI="https://github.com/rosettatype/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/rosettatype/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="GPL-3+ OFL"
 KEYWORDS="~amd64"
diff --git a/dev-python/iuliia/Manifest b/dev-python/iuliia/Manifest
index 0621c9a3428b..cbd260e4b949 100644
--- a/dev-python/iuliia/Manifest
+++ b/dev-python/iuliia/Manifest
@@ -1,2 +1 @@
-DIST iuliia-0.11.4.tar.gz 21376 BLAKE2B 181c7ace6ff35c10d6dbb1669621f94e51391ae4dc22c0f1d046856c99c7fce2dfd8d70f395b9dfa58d00212f3010049d02bcf8cf1ff9ac215274ae31236355e SHA512 29b36c1df9ddd4ddd0700d93f42615729984e82b20e5b8d9e72040936ee50b6df06cea95eca98497d12992913a6618ab67900d2f60e32f6c8d1043e784781827
 DIST iuliia-0.11.5.tar.gz 21585 BLAKE2B 99492fb2783b92ed36231fdaaf06ff405e4ec29fa0766a29657a4fce901050e995cb88238fccffbd7bb80ab949d4b6428ad6cb251cb35568d7b95f4e650e0686 SHA512 86e9dbff7a32486ed35782055fdabb6abb014ceb4e4f26acc0933007f4be11ccbb439e13d01edfcadd19b64e241bfacbce1d4e2faf368d9aa697f3d307b4ff84
diff --git a/dev-python/iuliia/iuliia-0.11.4.ebuild b/dev-python/iuliia/iuliia-0.11.4.ebuild
deleted file mode 100644
index 5947ac1a3e29..000000000000
--- a/dev-python/iuliia/iuliia-0.11.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS="pyproject.toml"
-inherit distutils-r1
-
-DESCRIPTION="Transliterate Cyrillic to Latin in every possible way"
-HOMEPAGE="
-	https://dangry.ru/iuliia/
-	https://pypi.org/project/iuliia/
-	https://github.com/nalgeon/iuliia-py
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jc/Manifest b/dev-python/jc/Manifest
index 68ff675b5ad2..7288ee743cfd 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -1 +1,2 @@
 DIST jc-1.19.0.tar.gz 10264610 BLAKE2B 4f05464196e4e60b3e4a423b7c05a0bfd35128caf3f04b9c846c96bf9cb6e594ac0d46c678e1dca7080212c06d2c679acdffcc0b954b6577925ff5ff80d8f044 SHA512 668fc71d6a4b0d7ba9aac591c2328536df4f61dd9267ecdc6c311efde8dbcc3f244d6236fabd593ca1907fc25eb2a7fc53215756989160167d382e7068e2cf79
+DIST jc-1.20.0.gh.tar.gz 10338183 BLAKE2B d19fec89ae96f3a9fc2a30715521dcd0ce5b9ee27ec7df85970dede61958e2ce580a53a34da78571de8d4287b531733746ebf5cc687e709085fbdf254d6c4c8a SHA512 f7aafcf531ad6dfd6cfb870803df4e1f6780483429fb3ddb52a3c57dd8f6fb62f1f776bfa97f15f813a8e97e01061c334f6bb4268d077195e013c423b7d9dd50
diff --git a/dev-python/jc/jc-1.20.0.ebuild b/dev-python/jc/jc-1.20.0.ebuild
new file mode 100644
index 000000000000..f0da51437f69
--- /dev/null
+++ b/dev-python/jc/jc-1.20.0.ebuild
@@ -0,0 +1,31 @@
+# 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="Converts the output of popular command-line tools and file-types to JSON"
+HOMEPAGE="
+	https://github.com/kellyjonbrazil/jc/
+	https://pypi.org/project/jc/
+"
+SRC_URI="
+	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+RDEPEND="
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/jupyter_packaging/Manifest b/dev-python/jupyter_packaging/Manifest
index b42d0f161c15..65067989986d 100644
--- a/dev-python/jupyter_packaging/Manifest
+++ b/dev-python/jupyter_packaging/Manifest
@@ -1 +1,2 @@
 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
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.12.1.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.12.1.ebuild
new file mode 100644
index 000000000000..c09bba7ed613
--- /dev/null
+++ b/dev-python/jupyter_packaging/jupyter_packaging-0.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/krb5/krb5-0.3.0-r1.ebuild b/dev-python/krb5/krb5-0.3.0-r1.ebuild
new file mode 100644
index 000000000000..bf2b3ea47a25
--- /dev/null
+++ b/dev-python/krb5/krb5-0.3.0-r1.ebuild
@@ -0,0 +1,34 @@
+# 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="Kerberos API bindings for Python"
+HOMEPAGE="https://pypi.org/project/krb5/ https://github.com/jborean93/pykrb5"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	virtual/krb5
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? ( dev-python/k5test[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	# Needed for Python 3.11, can drop in next release (after 0.3.0)
+	cd src/krb5 || die
+	rm _*.c || die
+	cythonize -f -3 *.pyx || die
+}
diff --git a/dev-python/llfuse/Manifest b/dev-python/llfuse/Manifest
index cdc4ca4377a7..e7b6859f1462 100644
--- a/dev-python/llfuse/Manifest
+++ b/dev-python/llfuse/Manifest
@@ -1 +1,2 @@
 DIST llfuse-1.4.1.tar.gz 774540 BLAKE2B f135ff3cde6effe72f5adf1b9ed58566183775ad45acbd1906db1f5c60a38ab74f0c7b6cda949b3ff2c4b46f036c91e16f9231ede1c78359c87758e6abde9ea4 SHA512 e94045018e9d78b7b16355dd499a27694a77a70d61102d05938223b99686e4b9d90b5e14745d92a187ac8e34aa593a12d99bff1baccb19d4236d54eb66ec3e4f
+DIST llfuse-1.4.2.tar.gz 834763 BLAKE2B 60bdfdd4567de4aa6ab5ea6692f48e6d68572bc13976e30fa9850c96b8a2c8a77638d3750df549b827a2bba0cc2dfa2a3f2cac3c4729278515a2703ecde446a1 SHA512 6a368af9e49f8537bbea396dfcd9fc024f8b93b161d3c6167d13c4ffb0ab20b6c8393447e71b5c147c82d4d1ee590ae08c512c93ccb28df78a06ab6833ac3705
diff --git a/dev-python/llfuse/llfuse-1.4.2.ebuild b/dev-python/llfuse/llfuse-1.4.2.ebuild
new file mode 100644
index 000000000000..89e854e0fb83
--- /dev/null
+++ b/dev-python/llfuse/llfuse-1.4.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the low-level FUSE API"
+HOMEPAGE="
+	https://github.com/python-llfuse/python-llfuse/
+	https://pypi.org/project/llfuse/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="doc examples"
+
+RDEPEND="
+	>=sys-fs/fuse-2.8.0:0
+"
+DEPEND="
+	${RDEPEND}
+	sys-apps/attr
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/llfuse-1.3.5-cflags.patch
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# force regen
+	rm src/llfuse.c || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	if [[ ! -f src/llfuse.c ]]; then
+		esetup.py build_cython
+	fi
+	distutils-r1_python_compile
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/lxml/lxml-4.9.0.ebuild b/dev-python/lxml/lxml-4.9.0-r1.ebuild
index 8734df52c2bf..b7cd9122c7a9 100644
--- a/dev-python/lxml/lxml-4.9.0.ebuild
+++ b/dev-python/lxml/lxml-4.9.0-r1.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 "
 BDEPEND="
 	virtual/pkgconfig
-	dev-python/cython[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.29[${PYTHON_USEDEP}]
 	doc? (
 		$(python_gen_any_dep '
 			dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/md-environ/Manifest b/dev-python/md-environ/Manifest
deleted file mode 100644
index 34d49662a2fe..000000000000
--- a/dev-python/md-environ/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST md-environ-0.1.0.tar.gz 3060 BLAKE2B 5e201b1eacd648d57eac39ff465c3d6772128515d102d68e2bb9ea2b9cae4197b173c8a3a926fc5c57cbee695ad4c7d82853826ba18e68517c4e6ecf46d9a692 SHA512 6a6455666410d4fccecd3ef059fb08f06d9d68bd40c64795d99e1f779f69b6361b322ce2e6853d17e0b9bb99f014b65a0466ad519fd24422ffaa657863aa3460
diff --git a/dev-python/md-environ/md-environ-0.1.0.ebuild b/dev-python/md-environ/md-environ-0.1.0.ebuild
deleted file mode 100644
index b7b4f0b82bd2..000000000000
--- a/dev-python/md-environ/md-environ-0.1.0.ebuild
+++ /dev/null
@@ -1,24 +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="Syntax which allows for inclusion of contents of other Markdown docs"
-HOMEPAGE="https://github.com/cmacmackin/md-environ"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-RDEPEND="dev-python/markdown[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	# Fix QA Notice: setuptools warning
-	sed -i "s/description-file/description_file/" setup.cfg || die
-	eapply_user
-}
diff --git a/dev-python/md-environ/metadata.xml b/dev-python/md-environ/metadata.xml
deleted file mode 100644
index e17867d085c8..000000000000
--- a/dev-python/md-environ/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>torokhov-s-a@yandex.ru</email>
-  <name>Sergey Torokhov</name>
- </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-python/mechanize/files/mechanize-0.4.8-python3.11-test-order.patch b/dev-python/mechanize/files/mechanize-0.4.8-python3.11-test-order.patch
new file mode 100644
index 000000000000..0808460dcc67
--- /dev/null
+++ b/dev-python/mechanize/files/mechanize-0.4.8-python3.11-test-order.patch
@@ -0,0 +1,79 @@
+https://github.com/python-mechanize/mechanize/commit/529d2c4cb8f31284f8026642968ba3adb9de1171
+https://github.com/python-mechanize/mechanize/commit/7ba3d586368c03577c061c35bc27664a907f5435
+https://github.com/python-mechanize/mechanize/commit/560839d51e54943890c2d37c0d0854792479cb80
+
+From: Kovid Goyal <kovid@kovidgoyal.net>
+Date: Tue, 24 May 2022 11:13:16 +0530
+Subject: [PATCH] Use asserts for failing test so we get better feedback on the
+ failure
+
+--- a/test/test_cookies.py
++++ b/test/test_cookies.py
+@@ -1028,10 +1028,10 @@ def test_Cookie_iterator(self):  # noqa
+             i = 0
+             for c in cs:
+                 # assert isinstance(c, Cookie)
+-                assert c.version == versions[i]
+-                assert c.name == names[i]
+-                assert c.domain == domains[i]
+-                assert c.path == paths[i]
++                self.assertEqual(c.version, versions[i])
++                self.assertEqual(c.name, names[i])
++                self.assertEqual(c.domain, domains[i])
++                self.assertEqual(c.path, paths[i])
+                 i = i + 1
+ 
+         self.assertRaises(IndexError, lambda cs=cs: cs[5])
+
+From: Kovid Goyal <kovid@kovidgoyal.net>
+Date: Tue, 24 May 2022 17:54:50 +0530
+Subject: [PATCH] DRYer
+
+--- a/test/test_cookies.py
++++ b/test/test_cookies.py
+@@ -1025,14 +1025,9 @@ def test_Cookie_iterator(self):  # noqa
+ 
+         # sequential iteration
+         for i in range(4):
+-            i = 0
+-            for c in cs:
++            for c, expected in zip(cs, zip(versions, names, domains, paths)):
+                 # assert isinstance(c, Cookie)
+-                self.assertEqual(c.version, versions[i])
+-                self.assertEqual(c.name, names[i])
+-                self.assertEqual(c.domain, domains[i])
+-                self.assertEqual(c.path, paths[i])
+-                i = i + 1
++                self.assertEqual((c.version, c.name, c.domain, c.path), expected)
+ 
+         self.assertRaises(IndexError, lambda cs=cs: cs[5])
+ 
+Date: Tue, 24 May 2022 18:09:16 +0530
+Subject: [PATCH] Change test to not rely on order of cookie iteration
+
+python 3.11 iterates in add order, earlier pythons iterate in domain
+sorted order
+
+Fix #74
+--- a/test/test_cookies.py
++++ b/test/test_cookies.py
+@@ -1022,13 +1022,12 @@ def test_Cookie_iterator(self):  # noqa
+             "www.acme.com"
+         ]
+         paths = ["/", "/", "/", "/blah", "/blah/"]
+-
++        expected = set(zip(versions, names, domains, paths))
+         # sequential iteration
+-        for i in range(4):
+-            for c, expected in zip(cs, zip(versions, names, domains, paths)):
+-                # assert isinstance(c, Cookie)
+-                self.assertEqual((c.version, c.name, c.domain, c.path), expected)
+-
++        # python 3.11 iterates in add order, earlier pythons iterate in domain
++        # sorted order
++        actual = {(c.version, c.name, c.domain, c.path) for c in cs}
++        self.assertEqual(expected, actual)
+         self.assertRaises(IndexError, lambda cs=cs: cs[5])
+ 
+     def test_parse_ns_headers(self):
+
diff --git a/dev-python/mechanize/mechanize-0.4.8.ebuild b/dev-python/mechanize/mechanize-0.4.8.ebuild
index b9085e697b40..7f706f1e2dcb 100644
--- a/dev-python/mechanize/mechanize-0.4.8.ebuild
+++ b/dev-python/mechanize/mechanize-0.4.8.ebuild
@@ -24,6 +24,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.8-python3.11-test-order.patch
+)
+
 python_test() {
 	"${EPYTHON}" run_tests.py || die
 }
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 0543ff306457..f1d729a9316e 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,2 +1,3 @@
 DIST mkdocs-material-8.2.15.gh.tar.gz 8337955 BLAKE2B 542871c9be9c67c83a0b62d3bb61c10628bf0fb4bd380b75e8263d566ff3cedb97e208993f3e8141d4a641f3afbf6d0db7b1962d407ab6162bfdb87065406db9 SHA512 fdc57e173678a7910d48fad94779864bbf65ce817700ca325eec9121c18f7cf2bf8e29ca64bc6f9a62f5bcd60a15cbe815edd320d2771f1a8d247099ed5d5ce3
+DIST mkdocs-material-8.2.16.gh.tar.gz 8358163 BLAKE2B f3102be342d697e462c798fe8227febd7f3ec99fcd9791dde96103ec39f9ec86c68c8682170b48e1bf56e03d4be45fa6cd372b1b4391ef4ecbd1bef2866d3e90 SHA512 4ebc03e2b9954e3d64c1837b20df7c85d610ffa63303ba07e5f42ae680777fd577b1aa4744732352da6bfab4f70e2ca17afeb092d3a494f3e0a7c5f7b2149fb7
 DIST mkdocs-material-8.2.8.gh.tar.gz 8304608 BLAKE2B ff44912e812a32c7bc99fb7a07178864a952ecfbe953fe8e4d06188e2cf79f87276a881aeba1b2e5b5c290b4e12afa72761b35988290b7039163c643ec51c154 SHA512 fd2308f78c2dfff81d917f958903fee44fdd214a209464c4279d399812a686a26084e40367b0809889f682adfe5d1fe3b4707dc206621f3aa216be59e13d5d0a
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.2.16.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.2.16.ebuild
new file mode 100644
index 000000000000..c6c3069f44ba
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-8.2.16.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} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	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}.gh.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.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.4[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/nbclient/Manifest b/dev-python/nbclient/Manifest
index f4554ea5a041..3994a720b465 100644
--- a/dev-python/nbclient/Manifest
+++ b/dev-python/nbclient/Manifest
@@ -1,4 +1,2 @@
-DIST nbclient-0.5.13.gh.tar.gz 75335 BLAKE2B 02a1d7d84b51c3af81f4d511e3a68a94d28478d09241a174309d9338a10be9c2e7cc48601bfb844dcad979eca867890e96df47d0e2aa6d7f7881a2e899b79ab5 SHA512 cebb9c4216d4c1668908a0b332a32d63825e7c3cfcf78b3e918df16364a04a12c396646f4e0b215a9bbc40d1be907a361f90aff3721e299d17c852f8acec0d04
-DIST nbclient-0.6.0.gh.tar.gz 76454 BLAKE2B a6b9f829d4d67f18d489d913000d6507d988ba2e88a0a63c1e750941fa24d071b4c711f1bf2f8af154b62b853378c9c1a97426d8b4082bf6911be1da6935cb26 SHA512 3e986b44ebafde75b95042fc32f38d152487b5ce3a62aac4a41eca27c35d24c795c4dd0e694a9f211d06bc37ea4f76959ce30ebb8a19e04ed4ffafd5b8f1a4a1
-DIST nbclient-0.6.2.tar.gz 77390 BLAKE2B 0281b8fdfb01f31f2a1b9ed4b85b4dae1f3becc4afce29bb4359291840cf0dd69ee8acc97872e7c7e532c337d3a41a5d694b3ba644883f11ccf503439216eafa SHA512 878657911f30ae573a42f5a85d5e6359b32ae1aed178491912a51947677263137ce8ab7de0a34bb149a2fd4aab872c34977eb6ce1c77701ebfd1082b60576dd5
 DIST nbclient-0.6.3.tar.gz 77571 BLAKE2B 41b96f8c174506a97b257b352e2614f023785137bf79d57d9bd4fd38942b54cc9db97bdf63c65579e67f88afd57ff81cbc798880080842e981797ee07be9f441 SHA512 bf267f3f49289cadcce412dc772f01dab5cd4d5a4ceb3fa12b076357d04191a15573d540773d47d58a14570fe219a9591ab539b917b52f3f7a902aac0493ba82
+DIST nbclient-0.6.4.gh.tar.gz 78101 BLAKE2B 91a653eb1735fe1a43044f18da773bcb0c4afd485fe7bfd3630c8c6a80776c9ff7e4cb08130c4e3953f03832933c429e68d7383677d8e56c54b485d55b8c5469 SHA512 a953b40b314ce104b28dfb9178a004ca4726d8a5912c84c168bf71527ee224082d3910f11040b172b6e62683493978b9b10161b69cadbca48a5652a4f98b5009
diff --git a/dev-python/nbclient/nbclient-0.5.13.ebuild b/dev-python/nbclient/nbclient-0.5.13.ebuild
deleted file mode 100644
index f27a34914cd0..000000000000
--- a/dev-python/nbclient/nbclient-0.5.13.ebuild
+++ /dev/null
@@ -1,39 +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="A client library for executing Jupyter notebooks"
-HOMEPAGE="
-	https://nbclient.readthedocs.io/en/latest/
-	https://github.com/jupyter/nbclient/
-	https://pypi.org/project/nbclient/"
-SRC_URI="
-	https://github.com/jupyter/nbclient/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/xmltodict[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/nbclient/nbclient-0.6.0.ebuild b/dev-python/nbclient/nbclient-0.6.0.ebuild
deleted file mode 100644
index adec072b1a33..000000000000
--- a/dev-python/nbclient/nbclient-0.6.0.ebuild
+++ /dev/null
@@ -1,42 +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="A client library for executing Jupyter notebooks"
-HOMEPAGE="
-	https://nbclient.readthedocs.io/en/latest/
-	https://github.com/jupyter/nbclient/
-	https://pypi.org/project/nbclient/
-"
-SRC_URI="
-	https://github.com/jupyter/nbclient/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-		dev-python/xmltodict[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/nbclient/nbclient-0.6.3.ebuild b/dev-python/nbclient/nbclient-0.6.3.ebuild
index 28a83bfde42d..2f34db659d2c 100644
--- a/dev-python/nbclient/nbclient-0.6.3.ebuild
+++ b/dev-python/nbclient/nbclient-0.6.3.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/nbclient/nbclient-0.6.2.ebuild b/dev-python/nbclient/nbclient-0.6.4.ebuild
index 2680f4f1a009..d813ead69722 100644
--- a/dev-python/nbclient/nbclient-0.6.2.ebuild
+++ b/dev-python/nbclient/nbclient-0.6.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/jupyter/nbclient/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
+		-> ${P}.gh.tar.gz
 "
 
 LICENSE="BSD"
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
 	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
 	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.2.2[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
@@ -40,3 +40,7 @@ BDEPEND="
 "
 
 distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	'nbclient/tests/test_client.py::test_run_all_notebooks[Interrupt.ipynb-opts6]'
+)
diff --git a/dev-python/openstep-plist/Manifest b/dev-python/openstep-plist/Manifest
index ceac7099e22b..2fe0edf0e982 100644
--- a/dev-python/openstep-plist/Manifest
+++ b/dev-python/openstep-plist/Manifest
@@ -1 +1 @@
-DIST openstep-plist-0.3.0.tar.gz 20692 BLAKE2B 4be8190b08ad6146df92f774597405977af898dfa0dd7b639d8c07674641fec54c139f292ec15f04c44062c9c128e29716f1fa642e4d04d160d6c1b310128a68 SHA512 623fbe4b169805f42828e41ff949c2a9a91620b76c0adda33e4e66c19345826bef21ac645571e5c52208f029389b37b6b9918ad3e85388475b50c243e16ca715
+DIST openstep-plist-0.3.0.gh.tar.gz 20692 BLAKE2B 4be8190b08ad6146df92f774597405977af898dfa0dd7b639d8c07674641fec54c139f292ec15f04c44062c9c128e29716f1fa642e4d04d160d6c1b310128a68 SHA512 623fbe4b169805f42828e41ff949c2a9a91620b76c0adda33e4e66c19345826bef21ac645571e5c52208f029389b37b6b9918ad3e85388475b50c243e16ca715
diff --git a/dev-python/openstep-plist/openstep-plist-0.3.0.ebuild b/dev-python/openstep-plist/openstep-plist-0.3.0.ebuild
index abec11aa3d59..90cd7eba31f1 100644
--- a/dev-python/openstep-plist/openstep-plist-0.3.0.ebuild
+++ b/dev-python/openstep-plist/openstep-plist-0.3.0.ebuild
@@ -10,23 +10,17 @@ inherit distutils-r1
 
 DESCRIPTION="ASCII plist parser written in Cython"
 HOMEPAGE="https://github.com/fonttools/openstep-plist"
-SRC_URI="https://github.com/fonttools/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/fonttools/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 KEYWORDS="~amd64"
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-	>=dev-python/cython-0.28.5[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
+DEPEND=">=dev-python/cython-0.28.5[${PYTHON_USEDEP}]"
 BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-cython[${PYTHON_USEDEP}]
-		dev-python/pytest-randomly[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/orjson/Manifest b/dev-python/orjson/Manifest
index 3b2a2ac718e9..ea3a935a0e27 100644
--- a/dev-python/orjson/Manifest
+++ b/dev-python/orjson/Manifest
@@ -2,45 +2,27 @@ DIST ahash-0.7.6.crate 38030 BLAKE2B aca3661477fcd7822d6d10970151e05c28e1615f8cd
 DIST arrayvec-0.7.2.crate 29341 BLAKE2B eae9d3f494033ea2d837a6024cb24bd4574683ed1e76ac6be7f7c6b0d8ee65c0eaf03dbae7fea04cf0921299f69234ad91e1cf41342de86f554f74e287dd3ba1 SHA512 80cc6e55b6032f4882362813de970d3d99e600ada774b28ac6a24c9c8e018fda3b35c5750ac3a09fca6fb9496e2e3fe608b58d21b1b84685ebd170f567a0ecbc
 DIST associative-cache-1.0.1.crate 14048 BLAKE2B 77f36f2d23b6d07e556f20e743c9a0e47c0b54899397c64dd6d4fc9b4c31469481d4a99ceb28b250924e0aa5f52de9fb65ce93ed96f23191f2984c32156bace0 SHA512 2ad673ab907c71cbd45abf3cf59630fd56aeb95888c94932b9fe5d83d71d0c14f908915670cbc0566b691035f82ac2069ed17589edbc97db1e4388225ac2a040
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
-DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bytecount-0.6.2.crate 12347 BLAKE2B 1ed4fa4a515567d8eabc2af03f0e1a3c89a24aa6cd77696a57bb94c25650f02b2f0e1e476fe9cb024a17d910442b940ea21bac3a99588146b8d89ab4adab0eca SHA512 990460eedfd41b6b52278c9dfcac81872e755d40cb839d162bddf44a30eec3a9fd76369847f10edf6c2b2d95cbec562e9a2a6c6dce37f2ee59ca9edfe972a279
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
-DIST encoding_rs-0.8.30.crate 1370089 BLAKE2B dae26cea51a7814536d1fba835f36cf7b0d536be0f26390fc4c1785720521a37651bc33acd9f7692f4967a3658d056da11a870aea071f53e803a71036d42448c SHA512 0addba12c6021a1211639cf80a956b50a5fc8bda90f127f73920941980d11a265e43de83e91f9ab423ec520ab11f6111c0d982da2d73e640128bb12aab1083f3
 DIST encoding_rs-0.8.31.crate 1370113 BLAKE2B aedcc32bafb95c54a034c6ab082d722834c744c33b525b176ad00ca2ede4157de6765f41e52678fb05a8a1271ed234933ac26a1bfb2cf08096420384ba88e0d1 SHA512 a9e582ab63d00bfd17c9f813f886c5908279fe4d23cdd70f79580931f3a0479162b78210a27b113a7bf6fbc4f8d62bbf098ef645d598fe0eaa428639c35cec31
-DIST getrandom-0.2.4.crate 26800 BLAKE2B 68836e848f1f87f5db77e64314b027bf47517746ddfa7677191ab518c9fb77d9a554cf4d1f9490bce1d8aa22a35c1952b088e200374dfd5c5d84555ed082510f SHA512 a7e63985824dcc8459736e44b1c0c4798a212955c89e5d3a3b852a3f80643d0231c4825f6cd416e87724aab80c19097210b06bccd2006e56115ae94920241716
 DIST getrandom-0.2.6.crate 28043 BLAKE2B b9871b18389f6e5503b3b817baa37dc585eec980851114b3407f34d25bbf68fd70e8bdef60ab682967a1397cb9659b343312deee740aa2107bbf38d1f4629d60 SHA512 3fca26198bbab1a9e189fb45ad6cc7c7a18969eed6f68ca43407a2d463fe004955b1d199c1794a23a53ba21fedb61eff86d380d2bf49bfdb6c7055c11d543096
 DIST inlinable_string-0.1.15.crate 19290 BLAKE2B 9e4f5b27ffde334ff5e8325db8a6f4e23c4fe9804761b9c8896597c841b129d9f5121c9426cf858c34003f2eaa8ac6a9b944b5908eb9dbd79c311d27d8ee34af SHA512 9421e0893937ce7b5d0f5e7fa27f4e6783c80665e897c8476b9f2f9ff41f1ad2e5f4ea959b8fbc3789bb1ea97165c373106c37a521aab88458cc2c1187e84754
-DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST itoa-1.0.1.crate 11059 BLAKE2B 5a2e22ab891ec883a90f652c88f924113252765579c03c783e43210fb2604e9e3ccbd4c1571087791be07bb99c4e85c7f85253be831b3ea883bc0ac18a927980 SHA512 8e7bc1e9bf4fc06871b9fe20caad4e0af965477d724f4c8d0e2a3a4d87aedf99f92e4e583a6440ce574d0fb43fc9d6a2e80add52a2f64210c6aa3b402e424295
-DIST libc-0.2.117.crate 566541 BLAKE2B a0ee103e6167ccf84cbaca9e41934ccaa1f4abcbaad9d7a4d4a8cccdc2f22ff36ccc46a16a295fed9c3113e1534df86a3d19eda9e0cb609bb75145acf8ca9a0a SHA512 1ff22201cad04f8a21674c25bd57e2c708738af7ff1d5677b513d728ecb99f4eec4b78e9685aa633518672de0d44d5dd2e727ee7b6b06c74718181565df3fa7f
 DIST libc-0.2.123.crate 577487 BLAKE2B 57ee1f6ec9e35cb3c48e54a90dc0d9ac0cfccb1e18e0360b5d2a54bfdd9f47f70bead04b02a1419cb1d1ca72ddbaf5cc008f21ddf0d5bd9063dc1c394fc62a58 SHA512 527c89b84d9839a240653fd2e66941f8fdd82f01ed70aa5451073d3480a56e6daf53e3ddc077a9884bfbbbc69510cea672c74c9c818e914d4414cbc7ec0e3f9c
 DIST libm-0.1.4.crate 110593 BLAKE2B 5018f4efbc8fd45ff88a28e92c273bb3b48724009e17eadd0d4abb8e34b0fc8784607f71eebaa2f308dedb3185969f092d4305cd1d2cef7a53f7d8774390e38f SHA512 6bc647425ec8be5995ad4798427a86e28282b06532b8e6a53745e2a2ac16652d087b84c0946a4858a49d98995b9e543e1764765d270bf5569cd2ad92d52b81f2
-DIST lock_api-0.4.6.crate 25215 BLAKE2B af1d28010f7c340dc0857afbaf8acd2396228cabca26e52f79526cc4eafb072c2aee8987bdd9ace4ba87c272f6fc816fc6f62a69e4d7e66a5c6e91ae3e824ede SHA512 ba14d341564eba91bb5ec58bb2e0d6c87e70b3694c4609396f0c0f4afc0c6c105a88cb99c303b1e9761b0fc6cae56f79ba6a7663b063454ab1ede4d49274906d
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
-DIST once_cell-1.9.0.crate 30702 BLAKE2B 3d492e64db120d8a23c08490a34d376a006e46b28bb5f0f44c3a955896e6e597c67ced35daeb4ccc7f7748f142d3bf2cb1d81ee61a99dc6526c48730c86a2fdc SHA512 cfdb6aa4bcc0f50d4c37eb69867d2deefa70323a7b607e55180b7d417b7188c4f2889417fd04fc51671c65eac75c7d9e7eda06a87dedb846056def66d14eaa46
-DIST orjson-3.6.7.tar.gz 653068 BLAKE2B 2d666885420745d1e783b1d2795bd9814530447818e14f7ea4203a225849869a30962da9a377a86af1f012e3119b9377a723ebf08cf61127b5e50bd3125bdc4a SHA512 5fd7d354f19a01a72218bca4bb7d767ebb73cc79398c5e32c482fed65a93d9f98d58835ebaa0c5e85a975e5eb29d2522a1051bad8f03de8bc227dc2838b8a72b
-DIST orjson-3.6.8.tar.gz 652805 BLAKE2B 520f038aaf058e2ddd6e41575d8fd6b88111a1627fd9000800bf695385a6292ce73911d37d268878ac6e08f3a84d5dc46eeb8ba7183d8bc5d0daee5b93a7e034 SHA512 d929e26f98c5a50ccc45f782b0a7de85e68cc8631597f7c27262a35fa15d5d8c30a5493ab67279d5ea691562a572b0001509b809440c0a018cca1e99d665937d
+DIST orjson-3.6.8.gh.tar.gz 652805 BLAKE2B 520f038aaf058e2ddd6e41575d8fd6b88111a1627fd9000800bf695385a6292ce73911d37d268878ac6e08f3a84d5dc46eeb8ba7183d8bc5d0daee5b93a7e034 SHA512 d929e26f98c5a50ccc45f782b0a7de85e68cc8631597f7c27262a35fa15d5d8c30a5493ab67279d5ea691562a572b0001509b809440c0a018cca1e99d665937d
 DIST packed_simd_2-0.3.7.crate 97413 BLAKE2B 085590fc264fd515e64db65a68a9ebf761a2f8ef17d70ac01f60c0eb7f40c78f9390fcd127d263a1eede024049009c5b011089e27e21903ae04a137de50aa5c7 SHA512 ebc1dfb306ff62a419808519996e624001142fa8a84f264e120fd0e26d879eb285a4425d05547cab47098375f014118e03e9850a632b25e6baaeabc9100a0efd
-DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
-DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
-DIST pyo3-0.15.1.crate 370722 BLAKE2B b755c93d8dca8e778b886ed1d16e83ddca483d0f6c932b3241edb2e1211306cb0257d2a6bc31ba4298335f277898e59aad67e9f675ed4ad9a2bb9d596400bda3 SHA512 9168911db76f2c9629615c997accfc4234bf91cc72293dcdb3db14b4e93f93af9df3b3aa7900384121719aeda4a0b6dd68c0cb380bfe5424724b0be5303c02e6
-DIST pyo3-build-config-0.15.1.crate 22095 BLAKE2B 47803b389f30f15f487daf96d32e374ebc83b1b41ddee1d2dcadd1a0fbaef40c4c1af2312b86ec085637e3192b1bd213c93b5f4e8dee173d81e510f480fa6953 SHA512 a9aae6bb4a4a56f7857262276bf1c95510912a367e32470b871f2fe2d6adbffd87247ed2e3b5fa2dfd273a3b0e139d92f25f3228e15c6d8c206c6ba919f38a9c
 DIST pyo3-build-config-0.16.4.crate 28562 BLAKE2B 973df4b148acf98cc92145fb732da33a3c1ff5e5e62bea60ca60fbdc54b8135bc5f6cca0b397a9fa949ad74644d41db777fc0fa2197313abd4fb63488f9020c3 SHA512 60044e707e4d15176b02069994950b2a0557801ddee7ec9fbbd839e303b15facef62f2b07f81925c921aefcf341ecfae9bf4ce86d23da931d14698d48529f660
 DIST pyo3-ffi-0.16.4.crate 60544 BLAKE2B aa76de43d9f83a5c5ce08158e7ffb882a84a98d10c9bb19bb62c833dffc296175fbb6a4b0f31daa8ff44a425b299818fb6ae77a725e024be70f08f38c69d4f5e SHA512 d41868fec5e850bf6b1a796a2d1119310ebe1765a750581a8fdcd83fabf92587fa6eb91a32a85f8084cd41a92b7741c2a266928c5658536fde7f76ed20b844c9
-DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
 DIST ryu-1.0.9.crate 48391 BLAKE2B d5c1035ffd6340d846009953cb4303fb8c250a3a6ac60b51a2fec77a6cb3648524420064b7380fe31af33c57011f950f6f739a1f0114196675b3b5de4b54efc6 SHA512 4e7c2c7ec73da1ddb32e18d36b8159cb4047b9f4feeb975361e7ba68135e671e11419bb7786df789f5d08e5895231d2c98e36035b515f2c64ac40474d08905cb
-DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
 DIST serde_json-1.0.79.crate 144451 BLAKE2B d04f8788d3ef0d4854d73232a4f441c1f3a42934442679a91853c311262ac9a4f554240d0c44c69f2e22cdd225a3e4d4751dc928ee5092b4371c198325fca0b3 SHA512 83987c1a7eddc6adf8ae359c30e2db1fea98edabd6dc49bde840c37a56258fa845612e8ae270a7dca4cfbe9a3532dc55028091e14cdf1dd3b1ceea4bb86a2dd7
-DIST simdutf8-0.1.3.crate 25813 BLAKE2B 333301ce1309de60efc30bc0ca7ad15440975289e2a7074e6adfecc8f0d802ca8e6d02e6b054bc1bc6f680d599cced85560a7a132fb3e0f002adbcff0e5df9a5 SHA512 513a2f172541143cd585e7e124f6394605ea940e9adcb5fb21c6909959443478eed7323792d94df092020aaf2e464eb0b1b19163c86853d1e2c2246e732010aa
 DIST simdutf8-0.1.4.crate 28621 BLAKE2B 94ab48bc899e603acf3805dd45ae8489d565aa39ff79606e80a1731b59d11f429d71bb6c65becf3ceab123767f2d20612cb9f86410fd1aad00d0a796091ad045 SHA512 9f821035e147c035707910227b51e01d3f761ab8b578d95a86a776b2a4da01bc4d8ef28df7ea2c16ca125a2699d8903b826ad07a5937728e33dd58753ebd704c
 DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
 DIST target-lexicon-0.12.3.crate 22990 BLAKE2B 7ca04aab44917345e51c7212e8f9d24cc0c7b759cba6031313c2a6f5bf4139b34be27e65ad150fd83f14b440a8e4ce125d156634409cbb2ec01cd370b213e738 SHA512 4ba0de71cf27c4ee330c9b61fc0318cfa3e179b57a7b0a79f296e0b33602c664c4ee2a676d09e0e104add2e0b56144cb5ddcc096a16f332f67862ee94b052f86
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
-DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
-DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
diff --git a/dev-python/orjson/orjson-3.6.7.ebuild b/dev-python/orjson/orjson-3.6.7.ebuild
deleted file mode 100644
index 4ae4e7b601b1..000000000000
--- a/dev-python/orjson/orjson-3.6.7.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	ahash-0.7.6
-	arrayvec-0.7.2
-	associative-cache-1.0.1
-	autocfg-1.1.0
-	bitflags-1.3.2
-	bytecount-0.6.2
-	cfg-if-1.0.0
-	chrono-0.4.19
-	encoding_rs-0.8.30
-	getrandom-0.2.4
-	inlinable_string-0.1.15
-	instant-0.1.12
-	itoa-1.0.1
-	libc-0.2.117
-	libm-0.1.4
-	lock_api-0.4.6
-	num-integer-0.1.44
-	num-traits-0.2.14
-	once_cell-1.9.0
-	packed_simd_2-0.3.7
-	parking_lot-0.11.2
-	parking_lot_core-0.8.5
-	pyo3-0.15.1
-	pyo3-build-config-0.15.1
-	redox_syscall-0.2.10
-	ryu-1.0.9
-	scopeguard-1.1.0
-	serde-1.0.136
-	serde_json-1.0.79
-	simdutf8-0.1.3
-	smallvec-1.8.0
-	version_check-0.9.4
-	wasi-0.10.2+wasi-snapshot-preview1
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-x86_64-pc-windows-gnu-0.4.0
-
-"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-EPYTEST_DESELECT=(
-	test/test_datetime.py::DatetimeTests::test_datetime_pendulum_positive
-	test/test_datetime.py::DatetimeTests::test_datetime_partial_second_pendulum_supported
-	test/test_datetime.py::DatetimeTests::test_datetime_pendulum_negative_dst
-	test/test_datetime.py::DatetimeTests::test_datetime_pendulum_negative_non_dst
-	test/test_datetime.py::DatetimeTests::test_datetime_partial_hour
-	test/test_datetime.py::DatetimeTests::test_datetime_pendulum_partial_hour
-	test/test_api.py::ApiTests::test_version
-)
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-QA_FLAGS_IGNORED="*"
-
-inherit cargo distutils-r1
-
-DESCRIPTION="Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
-HOMEPAGE="https://github.com/ijl/orjson"
-SRC_URI="
-	https://github.com/ijl/orjson/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})
-"
-
-LICENSE="
-	Apache-2.0 MIT
-	BSD
-	|| ( Apache-2.0 MIT )
-	|| ( Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT )
-	|| ( Apache-2.0 Boost-1.0 )
-"
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="debug"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/arrow[${PYTHON_USEDEP}]
-			dev-python/orjson[${PYTHON_SINGLE_USEDEP}]
-			dev-python/pendulum[${PYTHON_USEDEP}]
-			dev-python/psutil[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-		')
-
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' python3_{8,9})
-		$(python_gen_cond_dep '>=dev-python/xxhash-1.4.3[${PYTHON_USEDEP}]' python3_8)
-	)
-	app-arch/unzip
-	dev-lang/rust[nightly]
-	dev-util/maturin
-"
-
-QA_FLAGS_IGNORED=".*"
-PATCHES=( "${FILESDIR}/${P}-no-strip.patch" )
-
-distutils_enable_tests pytest
-
-src_compile() {
-	maturin build --no-sdist --manylinux off --interpreter ${EPYTHON} $(usex debug "" --release) || die
-	unzip target/wheels/${P}-*.whl || die
-}
-
-src_install() {
-	python_domodule orjson/orjson*.so
-	dodoc README.md
-}
diff --git a/dev-python/orjson/orjson-3.6.8-r1.ebuild b/dev-python/orjson/orjson-3.6.8-r1.ebuild
index b4066b456db6..1f380caea369 100644
--- a/dev-python/orjson/orjson-3.6.8-r1.ebuild
+++ b/dev-python/orjson/orjson-3.6.8-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+CARGO_OPTIONAL=1
 CRATES="
 	ahash-0.7.6
 	arrayvec-0.7.2
@@ -41,7 +42,7 @@ inherit cargo distutils-r1
 DESCRIPTION="Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
 HOMEPAGE="https://github.com/ijl/orjson"
 SRC_URI="
-	https://github.com/ijl/orjson/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/ijl/orjson/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
 	$(cargo_crate_uris ${CRATES})
 "
 
@@ -72,3 +73,7 @@ BDEPEND="
 PATCHES=( "${FILESDIR}/${PN}-3.6.7-no-strip.patch" )
 
 distutils_enable_tests pytest
+
+src_unpack() {
+	cargo_src_unpack
+}
diff --git a/dev-python/orjson/orjson-3.6.8.ebuild b/dev-python/orjson/orjson-3.6.8.ebuild
deleted file mode 100644
index ce29cff6b910..000000000000
--- a/dev-python/orjson/orjson-3.6.8.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	ahash-0.7.6
-	arrayvec-0.7.2
-	associative-cache-1.0.1
-	autocfg-1.1.0
-	bytecount-0.6.2
-	cfg-if-1.0.0
-	chrono-0.4.19
-	encoding_rs-0.8.31
-	getrandom-0.2.6
-	inlinable_string-0.1.15
-	itoa-1.0.1
-	libc-0.2.123
-	libm-0.1.4
-	num-integer-0.1.44
-	num-traits-0.2.14
-	once_cell-1.10.0
-	packed_simd_2-0.3.7
-	pyo3-build-config-0.16.4
-	pyo3-ffi-0.16.4
-	ryu-1.0.9
-	serde-1.0.136
-	serde_json-1.0.79
-	simdutf8-0.1.4
-	smallvec-1.8.0
-	target-lexicon-0.12.3
-	version_check-0.9.4
-	wasi-0.10.2+wasi-snapshot-preview1
-"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-QA_FLAGS_IGNORED="*"
-
-inherit cargo distutils-r1
-
-DESCRIPTION="Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
-HOMEPAGE="https://github.com/ijl/orjson"
-SRC_URI="
-	https://github.com/ijl/orjson/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})
-"
-
-LICENSE="
-	Apache-2.0 MIT
-	BSD
-	|| ( Apache-2.0 MIT )
-	|| ( Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT )
-	|| ( Apache-2.0 Boost-1.0 )
-"
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="debug"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/arrow[${PYTHON_USEDEP}]
-			dev-python/orjson[${PYTHON_SINGLE_USEDEP}]
-			dev-python/pendulum[${PYTHON_USEDEP}]
-			dev-python/psutil[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-		')
-
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' python3_{8,9})
-		$(python_gen_cond_dep '>=dev-python/xxhash-1.4.3[${PYTHON_USEDEP}]' python3_8)
-	)
-	app-arch/unzip
-	dev-lang/rust[nightly]
-	dev-util/maturin
-"
-
-QA_FLAGS_IGNORED=".*"
-PATCHES=( "${FILESDIR}/${PN}-3.6.7-no-strip.patch" )
-
-distutils_enable_tests pytest
-
-src_compile() {
-	maturin build --no-sdist --manylinux off --interpreter ${EPYTHON} $(usex debug "" --release) || die
-	unzip target/wheels/${P}-*.whl || die
-}
-
-src_install() {
-	python_domodule orjson/orjson*.so
-	dodoc README.md
-}
diff --git a/dev-python/oslo-policy/Manifest b/dev-python/oslo-policy/Manifest
index 9e9ad265f4c7..da6ee1f1faba 100644
--- a/dev-python/oslo-policy/Manifest
+++ b/dev-python/oslo-policy/Manifest
@@ -1,2 +1 @@
 DIST oslo.policy-3.10.1.tar.gz 113864 BLAKE2B 87a506ce39a4540dc315eb910b777edc58834dcedfa1ff4bc9202f574ddd50805f54b7da630e428188251b736df6ca1f006341aa2a6915c6ab237f22dd400c96 SHA512 88d44c1114368d485aebe38df0eb5e14232fe5a7e112f188be3055c3534ccc3c730b0bfdb570b87e43b455d4c2d2d038baf9fd4b9ed56b67b008858c8eb20b1a
-DIST oslo.policy-3.8.2.tar.gz 112412 BLAKE2B ecfec4c18597b18a2b37e83e5e398b7bed7d9cb11c44186528517eca9a1967779ffcb22b6726f1064b55b8206af27c4396982cf2da9247535e070c56e5cd6134 SHA512 6daea44a93f53608529314b5eb780d999a1ffd65c3c54f05d58341254f99754c94e177ad01bb37aa036f98f3211bb3705c499ad6244a68165ae56fa59943c79a
diff --git a/dev-python/oslo-policy/oslo-policy-3.8.2.ebuild b/dev-python/oslo-policy/oslo-policy-3.8.2.ebuild
deleted file mode 100644
index 0219296bcf9d..000000000000
--- a/dev-python/oslo-policy/oslo-policy-3.8.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Support for RBAC policy enforcement across all OpenStack services"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.policy
-	https://pypi.org/project/oslo.policy/
-	https://github.com/openstack/oslo.policy
-"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
-S="${WORKDIR}/oslo.policy-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.40.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ots-python/Manifest b/dev-python/ots-python/Manifest
index 547ec2bc94da..8634ad2acdd0 100644
--- a/dev-python/ots-python/Manifest
+++ b/dev-python/ots-python/Manifest
@@ -1,2 +1 @@
-DIST ots-python-8.1.4.tar.gz 10830 BLAKE2B f75e4e71c942a2214d9995184dd70505800a9a58d6238fc2321afde0efe17ee4e24906edb01f0690e12e245c5316f80fb313ae416d8a64e30c23c239c9929409 SHA512 466efae7d40dc24e0af22cb29d03d7c8bb5beb592c65c36a8e2d1678c141dd9b591184cbc01bc4879705a99cbf13e61c35bb51e878fdf866e82f82cbed75099d
 DIST ots-python-8.2.1.tar.gz 10577 BLAKE2B d642bc539b422375388cdfc94fe7541d1bee102e8292bc6186ad25764461e19974786034788ed86268e4565b3b17db22ba50fc257c1dc18d2f1289658b66f7da SHA512 be48bb860c9a1147a79fc2819f361a500d28d6655c302110cdc9596d4be1e127f4137a13e2cebf6a600209ba5356229eb4f019bf9e993231c9ed25f96ea1a74b
diff --git a/dev-python/ots-python/ots-python-8.1.4-r1.ebuild b/dev-python/ots-python/ots-python-8.1.4-r1.ebuild
deleted file mode 100644
index 44e88e039f68..000000000000
--- a/dev-python/ots-python/ots-python-8.1.4-r1.ebuild
+++ /dev/null
@@ -1,30 +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="A Python wrapper for OpenType Sanitizer"
-HOMEPAGE="
-	https://github.com/googlefonts/ots-python
-	https://pypi.org/project/opentype-sanitizer/
-"
-SRC_URI="https://github.com/googlefonts/ots-python/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND=">=dev-util/ots-${PV}"
-
-PATCHES=( "${FILESDIR}/${P}-ots-sanitize.patch" )
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV/_p/.post}"
-	mkdir -p src/c/ots || die
-	default
-}
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 569c9ed592a5..aa0b682d200c 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,4 +1 @@
-DIST paramiko-2.10.3.tar.gz 347738 BLAKE2B ccc66a7e0fe3f777e74b94374ed59435eda440fe0aeab3871e68a132610193d2fadca1fd200db3d194566b8a2a8d6ff889d71594fed69a01fb97ca43b967e957 SHA512 e1fce2ad33ee2942b519458d53497671e66d4777c23877954b135cf9bb8ec43357156147c7e012956ccf6198de800835a617b541a4b0faf54df00f936128514b
-DIST paramiko-2.10.4.tar.gz 348637 BLAKE2B 8ce0d34418b6a1dc1d98fc180d2b2f0fb4333b7e1c52fcf7edabc3b0fc096f1b644dbc21a5b37f9001f046969c3d513ad5f6d7261339a71fa3ec922161cd7be7 SHA512 df39958e647dd6519929f68c4870228a61f54e763751e6b1d07b5e802786c85dfc34af39588009e729c4d189ca17d3aa09a58d4242403a1a1a53d36f6cd313b1
-DIST paramiko-2.10.5.tar.gz 349619 BLAKE2B 12ea66afa9a2e8181363dec08d6b1bfe74d2750a45ae98ed00e53d28aa7b88eb380a0d4df4ad34a4fd08f7223eb262d45f04db522bed30e586cd0cc489389c66 SHA512 319e0e765c8fa7c7c86717d081b2431e9b42540adace693088dd2a541922704dc5a02fcb89666f6eca9a08abd79de1c994949d83a910af67326df7e389f266cd
 DIST paramiko-2.11.0.tar.gz 350793 BLAKE2B 86358e08407f8a820a9b33a60e771ac3adb8f3e003ccbc4704ba69a52bd427f38a9c49a20e6a07220d07c25dbcc35a472b2091fa9f7bc1447bab0d7a1ce16b35 SHA512 59e439bd54d83938f91d6c9888f2278bafa4ca48582939580bdabc6207dbe6dc856f6006ad26b7ec91b9d39e92ca70dc6270c6b5d4f77a5e1fa0ec8bd084d4b5
diff --git a/dev-python/paramiko/files/paramiko-2.7.1-tests.patch b/dev-python/paramiko/files/paramiko-2.7.1-tests.patch
deleted file mode 100644
index a25b7c24ef27..000000000000
--- a/dev-python/paramiko/files/paramiko-2.7.1-tests.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From e91cac80d679dfe16897988b0c14c1293a93c805 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 16 Apr 2020 09:22:59 +0200
-Subject: [PATCH 1/2] Replace pytest-relaxed with plain pytest.raises
-
-There is really no technical reason to bring pytest-relaxed to call
-@raises as a decorator while plain pytest works just fine.  Plus,
-pytest.raises() is used in test_sftp already.
-
-pytest-relaxed causes humongous breakage to other packages
-on the system.  It has been banned from Gentoo for this reason.
----
- dev-requirements.txt |  1 -
- setup.cfg            |  3 ---
- tests/test_client.py | 20 ++++++++++----------
- 3 files changed, 10 insertions(+), 14 deletions(-)
-
-diff --git a/dev-requirements.txt b/dev-requirements.txt
-index f4f84748..b1b0cdf5 100644
---- a/dev-requirements.txt
-+++ b/dev-requirements.txt
-@@ -2,7 +2,6 @@
- invoke>=1.0,<2.0
- invocations>=1.2.0,<2.0
- pytest==4.4.2
--pytest-relaxed==1.1.5
- # pytest-xdist for test dir watching and the inv guard task
- pytest-xdist==1.28.0
- mock==2.0.0
-diff --git a/tests/test_client.py b/tests/test_client.py
-index 60ad310c..88fd1d53 100644
---- a/tests/test_client.py
-+++ b/tests/test_client.py
-@@ -33,7 +33,7 @@ import warnings
- import weakref
- from tempfile import mkstemp
- 
--from pytest_relaxed import raises
-+import pytest
- from mock import patch, Mock
- 
- import paramiko
-@@ -684,10 +684,10 @@ class PasswordPassphraseTests(ClientTest):
- 
-     # TODO: more granular exception pending #387; should be signaling "no auth
-     # methods available" because no key and no password
--    @raises(SSHException)
-     def test_passphrase_kwarg_not_used_for_password_auth(self):
--        # Using the "right" password in the "wrong" field shouldn't work.
--        self._test_connection(passphrase="pygmalion")
-+        with pytest.raises(SSHException):
-+            # Using the "right" password in the "wrong" field shouldn't work.
-+            self._test_connection(passphrase="pygmalion")
- 
-     def test_passphrase_kwarg_used_for_key_passphrase(self):
-         # Straightforward again, with new passphrase kwarg.
-@@ -705,14 +705,14 @@ class PasswordPassphraseTests(ClientTest):
-             password="television",
-         )
- 
--    @raises(AuthenticationException)  # TODO: more granular
-     def test_password_kwarg_not_used_for_passphrase_when_passphrase_kwarg_given(  # noqa
-         self
-     ):
-         # Sanity: if we're given both fields, the password field is NOT used as
-         # a passphrase.
--        self._test_connection(
--            key_filename=_support("test_rsa_password.key"),
--            password="television",
--            passphrase="wat? lol no",
--        )
-+        with pytest.raises(AuthenticationException):
-+            self._test_connection(
-+                key_filename=_support("test_rsa_password.key"),
-+                password="television",
-+                passphrase="wat? lol no",
-+            )
--- 
-2.26.1
-
-From af228a2d950654ccdd4a5d665da0018bd976c108 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 16 Apr 2020 09:46:39 +0200
-Subject: [PATCH 2/2] Skip tests requiring invoke if it's not installed
-
-Since invoke is an optional dependency and only one group of tests
-require it, skip them gracefully rather than failing if it's not
-present.
----
- tests/test_config.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_config.py b/tests/test_config.py
-index 5e9aa059..5eeaeac3 100644
---- a/tests/test_config.py
-+++ b/tests/test_config.py
-@@ -6,7 +6,11 @@ from socket import gaierror
- 
- from paramiko.py3compat import string_types
- 
--from invoke import Result
-+try:
-+    from invoke import Result
-+except ImportError:
-+    Result = None
-+
- from mock import patch
- from pytest import raises, mark, fixture
- 
-@@ -705,6 +709,7 @@ def _expect(success_on):
-     return inner
- 
- 
-+@mark.skipif(Result is None, reason='requires invoke package')
- class TestMatchExec(object):
-     @patch("paramiko.config.invoke", new=None)
-     @patch("paramiko.config.invoke_import_error", new=ImportError("meh"))
--- 
-2.26.1
-
diff --git a/dev-python/paramiko/paramiko-2.10.3.ebuild b/dev-python/paramiko/paramiko-2.10.3.ebuild
deleted file mode 100644
index 2a6f4beb2e8e..000000000000
--- a/dev-python/paramiko/paramiko-2.10.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="https://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="examples server"
-
-RDEPEND="
-	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
-	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx sites/docs
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-2.7.1-tests.patch"
-	)
-
-	if ! use server; then
-		PATCHES+=( "${FILESDIR}/${PN}-2.4.2-disable-server.patch" )
-	fi
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc -r demos/*
-	fi
-}
diff --git a/dev-python/paramiko/paramiko-2.10.4.ebuild b/dev-python/paramiko/paramiko-2.10.4.ebuild
deleted file mode 100644
index fde6af462a11..000000000000
--- a/dev-python/paramiko/paramiko-2.10.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="https://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="examples server"
-
-RDEPEND="
-	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
-	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx sites/docs
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-2.7.1-tests.patch"
-	)
-
-	if ! use server; then
-		PATCHES+=( "${FILESDIR}/${PN}-2.4.2-disable-server.patch" )
-	fi
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc -r demos/*
-	fi
-}
diff --git a/dev-python/paramiko/paramiko-2.10.5.ebuild b/dev-python/paramiko/paramiko-2.10.5.ebuild
deleted file mode 100644
index 6ee259423661..000000000000
--- a/dev-python/paramiko/paramiko-2.10.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="
-	https://www.paramiko.org/
-	https://github.com/paramiko/paramiko/
-	https://pypi.org/project/paramiko/
-"
-SRC_URI="
-	https://github.com/paramiko/paramiko/archive/${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="examples server"
-
-RDEPEND="
-	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
-	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx sites/docs
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-2.7.1-tests.patch"
-	)
-
-	if ! use server; then
-		PATCHES+=( "${FILESDIR}/${PN}-2.4.2-disable-server.patch" )
-	fi
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc -r demos/*
-	fi
-}
diff --git a/dev-python/paramiko/paramiko-2.11.0.ebuild b/dev-python/paramiko/paramiko-2.11.0.ebuild
index d9a17aa0f80e..b2f608f21879 100644
--- a/dev-python/paramiko/paramiko-2.11.0.ebuild
+++ b/dev-python/paramiko/paramiko-2.11.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="examples server"
 
 RDEPEND="
diff --git a/dev-python/pip-api/Manifest b/dev-python/pip-api/Manifest
index a49cf928a69f..a964eb935c9e 100644
--- a/dev-python/pip-api/Manifest
+++ b/dev-python/pip-api/Manifest
@@ -1,2 +1 @@
-DIST pip-api-0.0.26.tar.gz 110021 BLAKE2B c286f8daa2470785525466053f3c431e93e4c7ffee19cac29b26bc0feb8f65a21eb285650981b6a3f726be471f47c8649a24cace2080a2e7e0b122cd26103548 SHA512 5d3a1eb53af73633f72210dd5aa974c619b8c96f050d7c549582829330183aba558a4d96490e15db6feddd15e14e63d0dfae60b2bba63768f61476f6b61362ea
 DIST pip-api-0.0.29-1af2c0f4cc2aa3c50d906adc8da7a6ceb2ba5df7.tar.gz 118238 BLAKE2B d7f0a5cadaaf0a673a76dfd6448c36f86cd5fac9a4633d22361fe3d2b75d4a7841c0ea3fbf2e1b6dffd4d1f3760ce8cac875172312927d878b8df98a933f8b51 SHA512 466e2e9a74c3f7d196a505475500352646655a446e4c8412d9f4dffd3ff988c0f6944bd9d32ece065a0242da49e9f9dce52bc06a4fb0021403328706e6b80236
diff --git a/dev-python/pip-api/pip-api-0.0.26.ebuild b/dev-python/pip-api/pip-api-0.0.26.ebuild
deleted file mode 100644
index bd89ded5499e..000000000000
--- a/dev-python/pip-api/pip-api-0.0.26.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SETUPTOOLS="pyproject.toml"
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="An unofficial, importable pip API"
-HOMEPAGE="https://github.com/di/pip-api"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/pip[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	tests/test_installed_distributions.py::test_installed_distributions_legacy_version
-	tests/test_installed_distributions.py::test_installed_distributions_multiple_paths
-)
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 9e0d2bdafb02..dd69099730ad 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,8 +1,9 @@
 DIST pip-22.0.4.tar.gz 9325766 BLAKE2B 9ce5a25e6fb9aedc39e2cddab2a8af3b47dbaaaf8bd22c39f8301b784e6e9f5434f63d5ef467f4d819b15bcd5cf8d3da52db34b3514c7b4a15823f77cb47e1c1 SHA512 af6d1787b4fe97f2eec9c2e3e3f0f756efca8cb83f6ecdae797986fb6050ee60d872a8a8eb7502a32c4334fc0c7af8cf3c58ce980407d0e9f89eec28a4290093
 DIST pip-22.1.1.tar.gz 9346893 BLAKE2B 2ecf113b644536c125150584ad3e05382c8cc3fa291bb227b7457a203222676721dfe6ba3d5bcde9a2d901ba11c674f0f49c14387023594ea2f0248e688224d8 SHA512 3f67171848c4b1282e3abb3a55b1e3d1bdd87e418c535298c8d91ec12d59da271182d7d45f07d080b46a27d9f53c0180ebbfe9379cc640a21f2ec9dd60b06e3e
+DIST pip-22.1.2.gh.tar.gz 9346675 BLAKE2B f709f8977d467d5a3170884bb75cd2f74a2f40801ae02a3725d442e18e4073f9c4a39cd1c9d2ce3949eb888be69d151f67d0cf2d0cbad7e2ec1ec6e78150b5c7 SHA512 7dd13150023f1cca8f5e01da7688ae418b5d0b36364efcfc15374a5147c7cabd46ff1d34e6499bc8e182dc0d34a366f5fe21d8ab4de4d112d269a97200401305
 DIST setuptools-57.4.0-py3-none-any.whl 819017 BLAKE2B afba86cf9aeea58ee869fdc11bbb192abbf2f89710e468b90dc291fec228ca16202483e36195a5ad4e2b8d210326bc83e2be6ec696ab413d94ffaeb05bb9c030 SHA512 9bf230f4e0e72acab07ab372a6ca05adb3d175a8079d2f73d327c632f3d27b8ee10442d3e60f4c94a6e61d5ba2212fc78187ca6e1717e15bb570bdce4263fd0b
 DIST setuptools-62.2.0-py3-none-any.whl 1143965 BLAKE2B 42bf650892d2e5810f18f8002fc6318b5abf890d04b2a3050784b93da88d806af5118eee65ed89b06e1cb908e4c7f6aa50222fba4b8617ab36923cfb624528ae SHA512 496593580b5537fb142bc775d060d01ef3c9069fc06564b5e9cb8e2a56e8f264c1dc7438d38a17f8b7e20d509a6b4f62cdfaf290c4ed82e071a1cc10a297b8b8
 DIST setuptools-62.3.2-py3-none-any.whl 1225929 BLAKE2B 608952e201f749ebf557e3962ba9856d5bdcbc534f3a25598cab0d6c53282cfb3b9f007ba135497a8addf49db4c02bc4387c486d95a4529d01ce4114154ec28a SHA512 366d69dc44e326dd7549cdacd8dec481a14dce4feef4338adc38b9de5c4c338f04d61696e13ce8603be1315f2e8734100f92d3fe4b4b11843e19f550c9631978
 DIST virtualenv-16.7.11.tar.gz 8134533 BLAKE2B ea81e11c210d911bf9576edf7b1754721b270adcc5d9633415d33b8f659149d64932fe2d366200121ec00c266c25dae380e248add438fc357477114eba4dfb4e SHA512 82d0d2a964508511e8e1686703581ff543f65791dc2449d9741d46ea57c4c89673947d2477ba374176f05fcea2a5ca572aa650c61c4f3271c4d73d1ff9d9ff42
-DIST virtualenv-16.7.12.tar.gz 8906590 BLAKE2B a1f206769e4e5797562906162e492e44c4a72720e4f88a0362dc802ce2df20c65aaab6a72dce2238445601a10fae59bd90cd362217994d30911f105afd71c5fa SHA512 0278b33fb19f6553e70ad3dcffa6ea1a455ff435b216ac9b4fadff216b2932714faa2bb6027af3058010111d8511a5c2fcd424f31c9645be361603971f111c8e
+DIST virtualenv-16.7.12.gh.tar.gz 8906590 BLAKE2B a1f206769e4e5797562906162e492e44c4a72720e4f88a0362dc802ce2df20c65aaab6a72dce2238445601a10fae59bd90cd362217994d30911f105afd71c5fa SHA512 0278b33fb19f6553e70ad3dcffa6ea1a455ff435b216ac9b4fadff216b2932714faa2bb6027af3058010111d8511a5c2fcd424f31c9645be361603971f111c8e
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
diff --git a/dev-python/pip/pip-22.0.4-r1.ebuild b/dev-python/pip/pip-22.0.4-r1.ebuild
index a37c828464dc..05ec19222d61 100644
--- a/dev-python/pip/pip-22.0.4-r1.ebuild
+++ b/dev-python/pip/pip-22.0.4-r1.ebuild
@@ -29,7 +29,7 @@ SRC_URI="
 		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
 		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
 		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
-			-> virtualenv-${VENV_PV}.tar.gz
+			-> virtualenv-${VENV_PV}.gh.tar.gz
 	)
 "
 
diff --git a/dev-python/pip/pip-22.1.1.ebuild b/dev-python/pip/pip-22.1.1.ebuild
index 6d12773c0899..0c20cfc9e262 100644
--- a/dev-python/pip/pip-22.1.1.ebuild
+++ b/dev-python/pip/pip-22.1.1.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
 		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
 		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
-			-> virtualenv-${VENV_PV}.tar.gz
+			-> virtualenv-${VENV_PV}.gh.tar.gz
 	)
 "
 
diff --git a/dev-python/pip/pip-22.1.2.ebuild b/dev-python/pip/pip-22.1.2.ebuild
new file mode 100644
index 000000000000..e2b94d7bcb96
--- /dev/null
+++ b/dev-python/pip/pip-22.1.2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+# setuptools & wheel .whl files are required for testing,
+# the exact version is not very important.
+SETUPTOOLS_WHL="setuptools-62.3.2-py3-none-any.whl"
+WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
+# upstream still requires virtualenv-16 for testing, we are now fetching
+# it directly to avoid blockers with virtualenv-20
+VENV_PV=16.7.12
+
+DESCRIPTION="The PyPA recommended tool for installing Python packages"
+HOMEPAGE="
+	https://pip.pypa.io/en/stable/
+	https://pypi.org/project/pip/
+	https://github.com/pypa/pip/
+"
+SRC_URI="
+	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+	test? (
+		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
+		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
+		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
+			-> virtualenv-${VENV_PV}.gh.tar.gz
+	)
+"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="vanilla"
+
+RDEPEND="
+	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/freezegun[${PYTHON_USEDEP}]
+			dev-python/pretend[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-python/scripttest[${PYTHON_USEDEP}]
+			dev-python/tomli-w[${PYTHON_USEDEP}]
+			dev-python/werkzeug[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			!alpha? ( !hppa? ( !ia64? (
+				dev-python/cryptography[${PYTHON_USEDEP}]
+			) ) )
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/pip-21.3-no-coverage.patch"
+	)
+	if ! use vanilla; then
+		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
+	fi
+
+	distutils-r1_python_prepare_all
+
+	if use test; then
+		mkdir tests/data/common_wheels/ || die
+		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
+			tests/data/common_wheels/ || die
+	fi
+}
+
+python_compile_all() {
+	# 'pip completion' command embeds full $0 into completion script, which confuses
+	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
+	# This trick sets correct $0 while still calling just installed pip.
+	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
+	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
+	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
+}
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON} since virtualenv-16 is broken"
+		return 0
+	fi
+
+	local EPYTEST_DESELECT=(
+		tests/functional/test_install.py::test_double_install_fail
+		tests/functional/test_list.py::test_multiple_exclude_and_normalization
+		# Internet
+		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
+		tests/functional/test_install.py::test_editable_install__local_dir_no_setup_py_with_pyproject
+		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
+	)
+
+	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/functional/test_install.py::test_install_sends_client_cert
+			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
+			tests/functional/test_install_config.py::test_prompt_for_authentication
+			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
+		)
+	fi
+
+	local -x GENTOO_PIP_TESTING=1
+	local -x PYTHONPATH="${WORKDIR}/virtualenv-${VENV_PV}"
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
+	epytest -m "not network" -n "$(makeopts_jobs)"
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
+	distutils-r1_python_install_all
+
+	newbashcomp completion.bash pip
+
+	insinto /usr/share/zsh/site-functions
+	newins completion.zsh _pip
+}
diff --git a/dev-python/praw/Manifest b/dev-python/praw/Manifest
index e341506c63a4..09c772fcfa21 100644
--- a/dev-python/praw/Manifest
+++ b/dev-python/praw/Manifest
@@ -1 +1,2 @@
 DIST praw-7.5.0.tar.gz 24818192 BLAKE2B f65c65ce03df146386537c3a0d1ae188f8627b71f51b5497544723495922a4db5c0f16f971e54158e3da8101fe56d6c3f599676002ae4248d6db1b7ba691a2a4 SHA512 df2da306819df8387c9ad018b0ea886390c065e4d0af1b1b22ae2bfed3d4f612ce2ac2a029c7cee92ea90ca30cc13c7a6640373fd621dc70dd2ac175bea1b4ee
+DIST praw-7.6.0.gh.tar.gz 25122812 BLAKE2B 58010c2d2d223e8f64744453eff1416c5b6edd79cc2e3e6916792c60933b635a3272d7933fa885e6ce64663141eaf5b5e4091f5d7320b52e16c05d97f1747434 SHA512 6702936b193542756e1b035fc7b7e2d9c398d44bb1631046af0a06b93833c26cfdae61d58d160e27e1b56b63777eda709e6e6bee2c6e4c76451837a6eead6ac4
diff --git a/dev-python/praw/praw-7.6.0.ebuild b/dev-python/praw/praw-7.6.0.ebuild
new file mode 100644
index 000000000000..f3cdb2a48572
--- /dev/null
+++ b/dev-python/praw/praw-7.6.0.ebuild
@@ -0,0 +1,42 @@
+# 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 Reddit API Wrapper"
+HOMEPAGE="https://pypi.org/project/praw/ https://github.com/praw-dev/praw"
+SRC_URI="https://github.com/praw-dev/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=( {AUTHORS,CHANGES,README}.rst SECURITY.md )
+
+RDEPEND="
+	<dev-python/prawcore-3[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+"
+BDEPEND="test? (
+	dev-python/betamax[${PYTHON_USEDEP}]
+	dev-python/betamax-matchers[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable optional dependencies
+	sed "/update_checker/d" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# spams deprecation warnings
+	epytest -p no:asyncio
+}
diff --git a/dev-python/pyalsa/Manifest b/dev-python/pyalsa/Manifest
index b54a9e207301..c02a647321c4 100644
--- a/dev-python/pyalsa/Manifest
+++ b/dev-python/pyalsa/Manifest
@@ -1 +1,2 @@
 DIST pyalsa-1.2.6.tar.bz2 40171 BLAKE2B d142d5818527b30b333d2552045892854df25eb14a7983320fe56e30a6239d3fe947ef1f0e1202ed3b5aad7722002e0e5e82ab9f89564bb9640aca2dc03c7887 SHA512 11b8eed822e0f8acc96ff0e10eeec0ba26b2997c7a0000b1d82561661f59931cd6b6aa6397b46c5944a0853344517878ede6c9ba13bea241cefc72b72bf1d9ff
+DIST pyalsa-1.2.7.tar.bz2 40132 BLAKE2B c100d16bd8c0d9fc6eddcda360f3582c55ed1b143a58a49caf76a62494882952d311271941ce0ecdf57ac934f3564dc922c80e8a5f5742b593341ff4215b700c SHA512 126501fe7b9c006f28e9290bdd3ad907ea9e053b71e21e2c6f0b0beeecdba07b4b557014041b03452f96be690f59f2e647e075487ee87054f21f66df7f39b34b
diff --git a/dev-python/pyalsa/pyalsa-1.2.7.ebuild b/dev-python/pyalsa/pyalsa-1.2.7.ebuild
new file mode 100644
index 000000000000..0f79d346cb82
--- /dev/null
+++ b/dev-python/pyalsa/pyalsa-1.2.7.ebuild
@@ -0,0 +1,25 @@
+# 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 flag-o-matic
+
+DESCRIPTION="Python bindings for ALSA library"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+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"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${PN}-1.1.6-no-build-symlinks.patch" )
+
+# Testsuite appears to require installed state
diff --git a/dev-python/pybtex-docutils/Manifest b/dev-python/pybtex-docutils/Manifest
index 20328ec890f1..5463b4b87b59 100644
--- a/dev-python/pybtex-docutils/Manifest
+++ b/dev-python/pybtex-docutils/Manifest
@@ -1 +1,2 @@
 DIST pybtex-docutils-1.0.1.tar.gz 14234 BLAKE2B 3c3946309ad19acb19703c0ecd7fce048808580df27ba39ce7acadbc0db154bee1f1e31d448015a8ebbbe034812e2f76fbed6f47a687c035750fc2908ca940c2 SHA512 8f84a822287e78a09b935a0f358b48e8a02be21303907fdce352515a844fe22dadb44646ca1abc44c8a8e7523c4f7074f3673fd6d565b178c862589cf58e9a48
+DIST pybtex-docutils-1.0.2.tar.gz 18450 BLAKE2B 84521d36994e3ca5bfdcebd308e6aaeb17f7202d024799612d34dbf58b1b1e58d42b898a4c792815a472b0a7008e28558fd722f39462cd3b1ee24b921f746a4d SHA512 1190fcbdfb89b858a1164dd2c99a5da7afb76a23f5b314963babd894e7578d75e80f2552319c6621e9c7738018fd1b8f4a3772057ed65466f2d9fc3e15c57e2b
diff --git a/dev-python/pybtex-docutils/pybtex-docutils-1.0.2.ebuild b/dev-python/pybtex-docutils/pybtex-docutils-1.0.2.ebuild
new file mode 100644
index 000000000000..6b1af2f8a6ef
--- /dev/null
+++ b/dev-python/pybtex-docutils/pybtex-docutils-1.0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="A docutils backend for pybtex"
+HOMEPAGE="https://github.com/mcmtroffaes/pybtex-docutils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/docutils-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pybtex-0.16[${PYTHON_USEDEP}]
+
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc
diff --git a/dev-python/pymeeus/Manifest b/dev-python/pymeeus/Manifest
index 254a51b4ee8d..0236e94359e2 100644
--- a/dev-python/pymeeus/Manifest
+++ b/dev-python/pymeeus/Manifest
@@ -1,2 +1 @@
-DIST PyMeeus-0.4.2.tar.gz 5299266 BLAKE2B ff2361762f7e1c8eeb81f521dce75acbda90228133e3fc0c9aea494ff2f9b2a5b5f70c7f58e6c864f2fae025fb7dda3ce390642362fefb4d8a6ac23dc3986324 SHA512 d3f3341b1546d6a632d18916f8aefec7e4cb437693d8373a09a87d3a28525436acd7b8b6ada57d127e1449a493e5d676af985e874cb330b53f80e0bcbc91dffc
 DIST PyMeeus-0.5.11.tar.gz 5368346 BLAKE2B d1bde9d62bd3349533b086ecbf5f6c455caf333cbdb0f32d11cac450db07708e442bc44cb085ec5140231158b95068e688e9c8abfcc62ba0e52e1cdd2de294b8 SHA512 9c109a7ed0ff3635e8b1eb4ee444bc5086528169fc942719385b02c5d5eca1f1ec3d3988bb06140e94f3d4ab741473880d8a36e187c468b9b91a3254575b92e6
diff --git a/dev-python/pymeeus/pymeeus-0.4.2.ebuild b/dev-python/pymeeus/pymeeus-0.4.2.ebuild
deleted file mode 100644
index 08cae4871da7..000000000000
--- a/dev-python/pymeeus/pymeeus-0.4.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="PyMeeus"
-MY_P="${MY_PN}-${PV}"
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of Jean Meeus astronomical routines"
-HOMEPAGE="https://github.com/architest/pymeeus"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
diff --git a/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild
index bc945a02d2f6..5ced33934aeb 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 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/cryptography-35.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pyscreenshot/pyscreenshot-3.0-r1.ebuild b/dev-python/pyscreenshot/pyscreenshot-3.0-r1.ebuild
new file mode 100644
index 000000000000..d8e1f5907539
--- /dev/null
+++ b/dev-python/pyscreenshot/pyscreenshot-3.0-r1.ebuild
@@ -0,0 +1,42 @@
+# 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 virtualx
+
+DESCRIPTION="Python screenshot library"
+HOMEPAGE="https://github.com/ponty/pyscreenshot"
+SRC_URI="https://github.com/ponty/pyscreenshot/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/easyprocess[${PYTHON_USEDEP}]
+	dev-python/entrypoint2[${PYTHON_USEDEP}]
+	dev-python/jeepney[${PYTHON_USEDEP}]
+	dev-python/mss[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/python-xlib[${PYTHON_USEDEP}]
+		dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
+		media-gfx/imagemagick
+		media-gfx/pqiv
+		x11-apps/xdpyinfo
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# skip GNOME/KDE tests that require D-BUS
+	local -x XDG_CURRENT_DESKTOP=none
+	virtx epytest --deselect tests/test_check.py::test_speedtest
+}
diff --git a/dev-python/pysrt/pysrt-1.1.2-r1.ebuild b/dev-python/pysrt/pysrt-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..f2f3b41ef66b
--- /dev/null
+++ b/dev-python/pysrt/pysrt-1.1.2-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Python library used to edit or create SubRip files"
+HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt/"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/byroot/pysrt.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pysrt/pysrt-9999.ebuild b/dev-python/pysrt/pysrt-9999.ebuild
index 11dd3eb517a8..f2f3b41ef66b 100644
--- a/dev-python/pysrt/pysrt-9999.ebuild
+++ b/dev-python/pysrt/pysrt-9999.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python library used to edit or create SubRip files"
 HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt/"
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/byroot/pysrt.git"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="GPL-3+"
@@ -21,4 +22,4 @@ SLOT="0"
 
 RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
 
-distutils_enable_tests nose
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-benchmark/Manifest b/dev-python/pytest-benchmark/Manifest
index f02988a91720..f59164a391f2 100644
--- a/dev-python/pytest-benchmark/Manifest
+++ b/dev-python/pytest-benchmark/Manifest
@@ -1 +1 @@
-DIST pytest-benchmark-3.4.1.tar.gz 322758 BLAKE2B d29254f412aee0955429e7957fa31e9443b3319bec256b601c456efa7020abbd5b4d9ed43799fda62f53f70f14de3f42a93b29b7366989294f037ec2ee3215fc SHA512 54fb5e3a176578b3c8f339878c7a9d047a0785befcbba42bb68c34b4b636d9b6f6a2097b36c5eefbbcf1a91f943bdae762c7978a0dba1af53514052f513ef4c5
+DIST pytest-benchmark-3.4.1.gh.tar.gz 322758 BLAKE2B d29254f412aee0955429e7957fa31e9443b3319bec256b601c456efa7020abbd5b4d9ed43799fda62f53f70f14de3f42a93b29b7366989294f037ec2ee3215fc SHA512 54fb5e3a176578b3c8f339878c7a9d047a0785befcbba42bb68c34b4b636d9b6f6a2097b36c5eefbbcf1a91f943bdae762c7978a0dba1af53514052f513ef4c5
diff --git a/dev-python/pytest-benchmark/pytest-benchmark-3.4.1.ebuild b/dev-python/pytest-benchmark/pytest-benchmark-3.4.1.ebuild
index aa5f812f7986..ccaceb018cd8 100644
--- a/dev-python/pytest-benchmark/pytest-benchmark-3.4.1.ebuild
+++ b/dev-python/pytest-benchmark/pytest-benchmark-3.4.1.ebuild
@@ -6,46 +6,42 @@ EAPI=8
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 inherit distutils-r1
 
-DESCRIPTION="py.test fixture for benchmarking code "
+DESCRIPTION="py.test fixture for benchmarking code"
 HOMEPAGE="
 	https://pypi.python.org/pypi/pytest-benchmark
 	https://github.com/ionelmc/pytest-benchmark
 "
-SRC_URI="https://github.com/ionelmc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ionelmc/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DOCS=( AUTHORS.rst CHANGELOG.rst README.rst )
+DOCS=( {AUTHORS,CHANGELOG,README}.rst )
 
-RDEPEND="dev-python/py-cpuinfo[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/py-cpuinfo[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
 BDEPEND="test? (
 	dev-python/aspectlib[${PYTHON_USEDEP}]
+	dev-python/elasticsearch-py[${PYTHON_USEDEP}]
 	dev-python/freezegun[${PYTHON_USEDEP}]
 	dev-python/hunter[${PYTHON_USEDEP}]
 	dev-python/pygal[${PYTHON_USEDEP}]
 	dev-python/pygaljs[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep \
-		'dev-python/elasticsearch-py[${PYTHON_USEDEP}]' python3_8 python3_9 )
 )"
 
+EPYTEST_DESELECT=(
+	tests/test_cli.py::test_help
+	tests/test_cli.py::test_help_compare
+)
+
 distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx-py3doc-enhanced-theme
 
-python_prepare() {
-	if [[ ${EPYTHON} == python3.10 ]]; then
-		rm tests/test_elasticsearch_storage.py || die
-	fi
-}
+distutils_enable_sphinx docs dev-python/sphinx-py3doc-enhanced-theme
 
 python_test() {
 	local -x PYTHONPATH="${S}/tests:${BUILD_DIR}/lib:${PYTHONPATH}"
-	local epytest_args=(
-		-o markers=benchmark
-		--deselect tests/test_cli.py::test_help
-		--deselect tests/test_cli.py::test_help_compare
-	)
-
-	epytest "${epytest_args[@]}"
+	epytest -o markers=benchmark
 }
diff --git a/dev-python/pytest-cases/Manifest b/dev-python/pytest-cases/Manifest
index 79003e686d89..06a9735c6c42 100644
--- a/dev-python/pytest-cases/Manifest
+++ b/dev-python/pytest-cases/Manifest
@@ -1,2 +1,2 @@
 DIST pytest-cases-3.6.11.tar.gz 1082043 BLAKE2B 396f7fa414729a49a8fb668126b959d13e5d10133ea0a47073cc42b8ce0a38c07df2e98c216e4904205696cf511a96d98e248e8f97a9324ee950e4399c1de746 SHA512 ee81d520eba8ab995bb4c32ba082a0107183d1d2892a29c3dc19d52a5324b1a73da2dbc97c202fdf6e6e17ac766f1d0383e87ee81ad22e49f7720a5e6417d0da
-DIST pytest-cases-3.6.9.tar.gz 1080527 BLAKE2B 9209c62eb5aebe496cfcad825c5eddf90881d6a23794e88fca34921ebc8a6036072a70cb693dd0dcd5d13d4ae67a192c52e6f770ae6c44c8a19265ecca55f552 SHA512 13d5ebdff00d14a39063d6dd4f41ff130b11fac9a073141d0f7acbb316a7b39730afaf1930bd18205ac068dabd236a37ff6bafda960c5f793eb723235eced6d3
+DIST pytest-cases-3.6.13.tar.gz 1082993 BLAKE2B c5259d78ce11dbeff2acca63762360622758edc19b8982f4cbade44459ae347c0c5b4334d9fcf42cf587ef301a193b9ab4c3a496462c403550580549c9be869b SHA512 70bb05afce137cc456dc98fd62d5fa778ce8728c7ffb30a05b765b88a689ce2ff01005f594c5be90e4892debbe925b2c05961d9e4bc567610da1be5b01f5a659
diff --git a/dev-python/pytest-cases/pytest-cases-3.6.9.ebuild b/dev-python/pytest-cases/pytest-cases-3.6.13.ebuild
index 9498462ab4a8..3f312b3dce19 100644
--- a/dev-python/pytest-cases/pytest-cases-3.6.9.ebuild
+++ b/dev-python/pytest-cases/pytest-cases-3.6.13.ebuild
@@ -32,6 +32,12 @@ BDEPEND="
 	)
 "
 
+EPYTEST_DESELECT=(
+	tests/pytest_extension/doc/test_doc_fixture_graph_union.py::test_closure
+	tests/pytest_extension/fixtures/fixture_unions/test_fixture_closure_edits.py::test_super_closure_edits2
+	tests/pytest_extension/fixtures/fixture_unions/test_fixtures_union_2hard.py::test_super_closure
+)
+
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/dev-python/pytest-httpserver/pytest-httpserver-1.0.4-r1.ebuild b/dev-python/pytest-httpserver/pytest-httpserver-1.0.4-r1.ebuild
index 6241a72b8257..d4989ed9d345 100644
--- a/dev-python/pytest-httpserver/pytest-httpserver-1.0.4-r1.ebuild
+++ b/dev-python/pytest-httpserver/pytest-httpserver-1.0.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${PV}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="dev-python/werkzeug[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pytest-instafail/pytest-instafail-0.4.2.ebuild b/dev-python/pytest-instafail/pytest-instafail-0.4.2.ebuild
index 1630d88086ab..54e8b26af33f 100644
--- a/dev-python/pytest-instafail/pytest-instafail-0.4.2.ebuild
+++ b/dev-python/pytest-instafail/pytest-instafail-0.4.2.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=8
diff --git a/dev-python/pytest-randomly/Manifest b/dev-python/pytest-randomly/Manifest
index e129eead2241..083bee42815a 100644
--- a/dev-python/pytest-randomly/Manifest
+++ b/dev-python/pytest-randomly/Manifest
@@ -1,2 +1 @@
-DIST pytest-randomly-3.11.0.tar.gz 30822 BLAKE2B 81411f8882f786c18ded69d42296117421498515ed0808064b4da418f94be5aa6e0dedf1dabf0e87f8f508b9cc886f8b645e4b5f845009cade4f20b8f437dd95 SHA512 6c2da071492d032b60782c17aee01751fe0728f921dfd192a17d9be95330ddf6dd0c960ef93a200dbe990c8457340008c556f28aea9cbc74677984fee0618ad7
-DIST pytest-randomly-3.12.0.tar.gz 30426 BLAKE2B 22e7ac58787a98b24a672f2fc2fdba8069213008f11c66eb05320be99662311b0273b0c32079d59792964075abe6fd2f224ce03eb0d3b2dcf0a79e180f1a067e SHA512 e2241c1304b9597f93cc57d6830808f85c59ea1b4815624dcd9d088f87eb4a34d6cb6394de9c31ebedcb8280fb6ff12b110fd5a559ab28c9e0381481fce52c4d
+DIST pytest-randomly-3.12.0.gh.tar.gz 30426 BLAKE2B 22e7ac58787a98b24a672f2fc2fdba8069213008f11c66eb05320be99662311b0273b0c32079d59792964075abe6fd2f224ce03eb0d3b2dcf0a79e180f1a067e SHA512 e2241c1304b9597f93cc57d6830808f85c59ea1b4815624dcd9d088f87eb4a34d6cb6394de9c31ebedcb8280fb6ff12b110fd5a559ab28c9e0381481fce52c4d
diff --git a/dev-python/pytest-randomly/pytest-randomly-3.11.0.ebuild b/dev-python/pytest-randomly/pytest-randomly-3.11.0.ebuild
deleted file mode 100644
index 2bef1d1e3407..000000000000
--- a/dev-python/pytest-randomly/pytest-randomly-3.11.0.ebuild
+++ /dev/null
@@ -1,38 +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="Pytest plugin to randomly order tests and control random.seed"
-HOMEPAGE="
-	https://pypi.python.org/pypi/pytest-randomly/
-	https://github.com/pytest-dev/pytest-randomly
-"
-SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/factory_boy[${PYTHON_USEDEP}]
-	dev-python/Faker[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/pytest-xdist[${PYTHON_USEDEP}]
-
-	$(python_gen_cond_dep '>=dev-python/importlib_metadata-3.6.0[${PYTHON_USEDEP}]' python3_{8,9})
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing --via-root
-	pytest -vv || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-randomly/pytest-randomly-3.12.0.ebuild b/dev-python/pytest-randomly/pytest-randomly-3.12.0.ebuild
index f039621209ee..6fff7c48adf1 100644
--- a/dev-python/pytest-randomly/pytest-randomly-3.12.0.ebuild
+++ b/dev-python/pytest-randomly/pytest-randomly-3.12.0.ebuild
@@ -13,26 +13,42 @@ HOMEPAGE="
 	https://pypi.python.org/pypi/pytest-randomly/
 	https://github.com/pytest-dev/pytest-randomly
 "
-SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/importlib_metadata-3.6.0[${PYTHON_USEDEP}]' python3_{8,9})
+"
+# tests pytest-xdist integration
+BDEPEND="test? (
 	dev-python/factory_boy[${PYTHON_USEDEP}]
 	dev-python/Faker[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pytest-xdist[${PYTHON_USEDEP}]
+)"
 
-	$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' python3_{8..10})
-	$(python_gen_cond_dep '>=dev-python/importlib_metadata-3.6.0[${PYTHON_USEDEP}]' python3_{8,9})
-"
-DEPEND="${RDEPEND}"
+EPYTEST_DESELECT=(
+	tests/test_pytest_randomly.py::test_entrypoint_injection
+	tests/test_pytest_randomly.py::test_it_runs_before_stepwise
+	tests/test_pytest_randomly.py::test_works_without_xdist
+
+	# Output mismatch
+	tests/test_pytest_randomly.py::test_class_test_methods_reordered
+	tests/test_pytest_randomly.py::test_classes_reordered
+	tests/test_pytest_randomly.py::test_doctests_in_txt_files_reordered
+	tests/test_pytest_randomly.py::test_doctests_reordered
+	tests/test_pytest_randomly.py::test_files_reordered
+	tests/test_pytest_randomly.py::test_files_reordered_when_seed_not_reset
+	tests/test_pytest_randomly.py::test_test_functions_reordered
+	tests/test_pytest_randomly.py::test_test_functions_reordered_when_randomness_in_module
+)
 
 distutils_enable_tests pytest
 
 python_test() {
-	distutils_install_for_testing --via-root
-	pytest -vv || die "Testsuite failed under ${EPYTHON}"
+	epytest -p no:randomly
 }
diff --git a/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r2.ebuild b/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r2.ebuild
new file mode 100644
index 000000000000..62b4d43be9b1
--- /dev/null
+++ b/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_REQ_USE="tk"
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="A pytest plugin to run Xvfb for tests"
+HOMEPAGE="https://pypi.org/project/pytest-xvfb/"
+SRC_URI="https://github.com/The-Compiler/pytest-xvfb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/pyvirtualdisplay-1.3[${PYTHON_USEDEP}]
+	x11-base/xorg-server[xvfb]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-poppler-qt5/python-poppler-qt5-21.3.0.ebuild b/dev-python/python-poppler-qt5/python-poppler-qt5-21.3.0.ebuild
index d313279ca6ca..956bcfac890f 100644
--- a/dev-python/python-poppler-qt5/python-poppler-qt5-21.3.0.ebuild
+++ b/dev-python/python-poppler-qt5/python-poppler-qt5-21.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/frescobaldi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/python-troveclient/Manifest b/dev-python/python-troveclient/Manifest
index 8bddde2b5795..204a0d88ce1e 100644
--- a/dev-python/python-troveclient/Manifest
+++ b/dev-python/python-troveclient/Manifest
@@ -1,2 +1 @@
-DIST python-troveclient-7.2.0.tar.gz 191972 BLAKE2B f3473856cd07b91e948392c52d307900cd79882d04b0e72c5e9a91938354be434a31e1f233432e650e7a808431025381ae9166af5117f23d6883f6f473eb522b SHA512 701d0e0be44f57f7798b91b90419e0ce26dda3d0f37532284cb0544b9a2f352a7b0ab816bdee4e63e210cf119e4c7e41dca0163c8ff5171958a57916cfc5a912
 DIST python-troveclient-7.3.0.tar.gz 192206 BLAKE2B 182d93a0247303d4ee119fbf98795b398b9b847123c783485973fc4e254ec3e0aca74460ed65f9addbd6f346237fce7874c8db9ffedaeb2d5ba6dabe9a88011b SHA512 13132826ecae633e8ffaf8842a7ee479832052cb19854c00ae0b157830f78ff35cd16eaccd239f6f145fd8b811455bea925318ea104e997bde429bbbe9f9f7af
diff --git a/dev-python/python-troveclient/python-troveclient-7.2.0.ebuild b/dev-python/python-troveclient/python-troveclient-7.2.0.ebuild
deleted file mode 100644
index 572305d91b1b..000000000000
--- a/dev-python/python-troveclient/python-troveclient-7.2.0.ebuild
+++ /dev/null
@@ -1,48 +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="A client for the OpenStack Trove API, a scalable relational database service"
-HOMEPAGE="
-	https://github.com/openstack/python-troveclient
-	https://opendev.org/openstack/python-troveclient
-	https://launchpad.net/python-troveclient
-	https://pypi.org/project/python-troveclient/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-mistralclient-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index f8c869790a14..d622857f6f6e 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -3,3 +3,4 @@ DIST python-utils-3.2.2.tar.gz 25202 BLAKE2B ae36d918bfd125ed1c01a71f8b448390b70
 DIST python-utils-3.2.3.tar.gz 25153 BLAKE2B b4e65b647b42288111edc7a90f7c1b1c3a222a999edacc2f0764e378f7c5f0b5c512842d73ea9f2e70052ba43ac48f9eb914a8a410b564bcd965c357672eda57 SHA512 85f1607faacf210c8e377a438c5d2f66e237cc870a91a9ed1ec7150aa8a7bb8f8fd5b3b0fb5e9585afb81801e7048f92b7ea46943205ddd9e271d6087b5e05d5
 DIST python-utils-3.3.0.tar.gz 27537 BLAKE2B 95570896c9a96161f0bcd2966ab8ffe8cf29ef29d50b8103ed6d0df4824aa3cbb6058d2b1d58b0ab98033775c5ea522c962bded2fd48b156bb57d686c8c872b0 SHA512 94a6ba6d303990cfd976d5676b5383df672d775385327e342b938483033fbd12fc75ce75afc6b66dd9fbf729d13e2a695246cc6a48073f579eeb7c0c82c7730e
 DIST python-utils-3.3.1.tar.gz 27565 BLAKE2B 79e865342d57ee1a841d9f17f26a26586ab477f5b7538ce514091f2c1f6d9054b34b8642ebc0f3555abdf696f74ce1473d80365844819829b9d8be37d1cc58f0 SHA512 d2c91f50999b3706696c161abd1f3bee5e39cb5078daa8d4604ad9c9905a02a221d0ffb7ae57bdb7c278b8d0c14c763d613305bf3371cb01adf4075ae55fd4f4
+DIST python-utils-3.3.3.tar.gz 28031 BLAKE2B d491e5ba1c8e2ab8d7c7797757cb6163f5f4cff223b898b4a9502f85b740df3c128234fd0034fc422d17efb38cfc7056aa7fb3aee9441f1f763fc742930da5b3 SHA512 6becb1873da57f66aec26b98dab22c7917dacddd1a843a0c6e4f2939986a33888cb3b6addfa3b98660f9f35ca54763cf6da34e4099cd3e21987660f12a574b27
diff --git a/dev-python/python-utils/python-utils-3.3.3.ebuild b/dev-python/python-utils/python-utils-3.3.3.ebuild
new file mode 100644
index 000000000000..e51c7aa0ebd5
--- /dev/null
+++ b/dev-python/python-utils/python-utils-3.3.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of small Python functions & classes"
+HOMEPAGE="
+	https://github.com/WoLpH/python-utils/
+	https://pypi.org/project/python-utils/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	docs
+	_python_utils_tests/test_logger.py
+	python_utils/loguru.py
+)
+
+python_prepare_all() {
+	sed -i -e '/--cov/d' -e '/--mypy/d' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-xlib/python-xlib-0.31-r1.ebuild b/dev-python/python-xlib/python-xlib-0.31-r1.ebuild
new file mode 100644
index 000000000000..40dd007c6518
--- /dev/null
+++ b/dev-python/python-xlib/python-xlib-0.31-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 virtualx
+
+DESCRIPTION="A fully functional X client library for Python, written in Python"
+HOMEPAGE="https://github.com/python-xlib/python-xlib"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	doc? ( sys-apps/texinfo )
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests unittest
+
+python_compile_all() {
+	use doc && emake -C doc/info
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_install_all() {
+	use doc && doinfo doc/info/*.info
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/qdarkstyle/Manifest b/dev-python/qdarkstyle/Manifest
index 423d9dc1df12..abae82f8b4ee 100644
--- a/dev-python/qdarkstyle/Manifest
+++ b/dev-python/qdarkstyle/Manifest
@@ -1 +1,2 @@
 DIST QDarkStyle-3.0.3.tar.gz 431182 BLAKE2B 3c9406aca5d01c3682123e044d2e5417b300b724c6366a411a00211b482582b26c687128f6c32e7a95a29fb70c3a322fd525483c48120e5671ddff713e4e0035 SHA512 2c44a4469971b127f7fb8c9a5bce452c98653aaf29dcdb7e0df2da7557d6730d64ebf6a649f8516fb13a2d4e77d0fdadc293457d94406d8e7491be3fd52a9313
+DIST QDarkStyle-3.1.tar.gz 698602 BLAKE2B 8c96b2dd5532c9db0c1d813fe0cf049b7cf55ef6469d2ebb21b5ea85fe6ecd23e8a247c45f45cfa674f8012a4a03ea377df8cb7efac8f13c079e2512091ecdc7 SHA512 275fe333bcf2502f8f1ef61eca3f82d8909e760e8f88a1605157c5043cb1e4cad97bbb8ddb0464ef2125c1b70f318bfa8f0106d2721d6b9862c162b5f716aa4b
diff --git a/dev-python/qdarkstyle/qdarkstyle-3.1.ebuild b/dev-python/qdarkstyle/qdarkstyle-3.1.ebuild
new file mode 100644
index 000000000000..458b1b41c4de
--- /dev/null
+++ b/dev-python/qdarkstyle/qdarkstyle-3.1.ebuild
@@ -0,0 +1,34 @@
+# 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 optfeature
+
+MY_PN="QDarkStyle"
+
+DESCRIPTION="A dark style sheet for QtWidgets application"
+HOMEPAGE="https://github.com/ColinDuquesnoy/QDarkStyleSheet"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/QtPy-1.9[gui,${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+	dev-python/qtsass[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.9[gui,testlib,${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "Retrieve detailed system information and report bugs upstream" dev-python/helpdev
+	optfeature "qdarkstyle.utils" dev-python/qtsass dev-python/watchdog
+}
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.13.1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.13.1.ebuild
index a83cb09d0d2b..8137e14f62d7 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.13.1.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.13.1.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=8
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}/Python
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="debug"
 
 REQUIRED_USE="
diff --git a/dev-python/rarfile/rarfile-4.0-r1.ebuild b/dev-python/rarfile/rarfile-4.0-r1.ebuild
new file mode 100644
index 000000000000..4c3a55567516
--- /dev/null
+++ b/dev-python/rarfile/rarfile-4.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTLS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Module for RAR archive reading"
+HOMEPAGE="https://github.com/markokr/rarfile"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+compressed test"
+REQUIRED_USE="test? ( compressed )"
+
+RDEPEND="compressed? ( app-arch/unrar )"
+
+PATCHES=( "${FILESDIR}"/${P}.patch )
+
+distutils_enable_tests pytest
diff --git a/dev-python/rstr/rstr-3.2.0.ebuild b/dev-python/rstr/rstr-3.2.0.ebuild
index acb6efb175a8..e5aa9c5e9e03 100644
--- a/dev-python/rstr/rstr-3.2.0.ebuild
+++ b/dev-python/rstr/rstr-3.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 
 inherit distutils-r1
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://github.com/leapfrogonline/rstr
 	https://pypi.org/project/rstr/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${PV}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT=0
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index fd9b9479bcc5..cd7a4cd0693c 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1 +1,2 @@
 DIST s3transfer-0.5.2.tar.gz 134873 BLAKE2B 55adab89ca04a9ed1f0195237cab55f97769a8f865e645437df6d95effcf1a27a734f1577daa981261123b681044b540ebbb876e1a8a3b4cf1cf4e5018f2c213 SHA512 6b035ff5b33ba5c048f6921f72684802a9b12516c70c75bd153e481e62a768015f45f569aa88071f887839fd2e004b5f9202813926ca33d58c30793218d14083
+DIST s3transfer-0.6.0.tar.gz 134871 BLAKE2B 7ab84f22dc20751dd461857f93d7f1aad1490432ed25e7506c5abe61f79d1f3cafd8ddb190a0942a2c5a9947c5068fcf397dce34f255a246381f4cf1f0d09e7a SHA512 0c1c3306015cab4a4436b1d2fec6708e17f4c5111f8a265fbfe134defebda33a43bd985e559be993b6175af9eee142e9f27da123f8d14f77cfc59e48ca1b905f
diff --git a/dev-python/s3transfer/s3transfer-0.6.0.ebuild b/dev-python/s3transfer/s3transfer-0.6.0.ebuild
new file mode 100644
index 000000000000..19dd0a1d2430
--- /dev/null
+++ b/dev-python/s3transfer/s3transfer-0.6.0.ebuild
@@ -0,0 +1,44 @@
+# 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="An Amazon S3 Transfer Manager"
+HOMEPAGE="
+	https://github.com/boto/s3transfer/
+	https://pypi.org/project/s3transfer/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/botocore-1.24.7[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests/{unit,functional}
+}
diff --git a/dev-python/sip/sip-6.5.0-r1.ebuild b/dev-python/sip/sip-6.5.0-r1.ebuild
index 911d53b36c9f..9c8e469c4fd6 100644
--- a/dev-python/sip/sip-6.5.0-r1.ebuild
+++ b/dev-python/sip/sip-6.5.0-r1.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
 SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	!<dev-python/sip-4.19.25-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/skia-pathops/Manifest b/dev-python/skia-pathops/Manifest
index 5b4c87f540dd..1e4302f0f785 100644
--- a/dev-python/skia-pathops/Manifest
+++ b/dev-python/skia-pathops/Manifest
@@ -1,2 +1 @@
-DIST skia-pathops-0.6.0.post2.zip 41471167 BLAKE2B b9da1ff7deade28e0b5ce4fa6590eb92b50976027fc9da805b50c9d1526a60c28661d5378ecdc4dc2de42f7d3d904dd2f768b49df716b345253ffe2475f1afe7 SHA512 3ebcf044d045a57531229841630dea6e656df434a4a9b994a9a1162c93f0c894ffb20cfb493159cefd1afbe40366e2f9742a4aeea1a693d917fa55841c887e86
 DIST skia-pathops-0.7.2.zip 61294134 BLAKE2B 7cd7d5b9c244ee108bbf9b6c086e210fa05f65a8d2e36e7036a9ad94a1ff9ad2f8777ce74e4227ddd15e6b197afa668fad1cf8d110e5ac87e496c85b6e97c8dd SHA512 bf4c02895d08ee174f700d83753e3d5ada1f1de018a07b2e1574f01bd3283edaf71b1859c732d27a45030fc070232c34098760b3144b2a91a7bee72ff220394d
diff --git a/dev-python/skia-pathops/skia-pathops-0.6.0_p2.ebuild b/dev-python/skia-pathops/skia-pathops-0.6.0_p2.ebuild
deleted file mode 100644
index 947c85a90d38..000000000000
--- a/dev-python/skia-pathops/skia-pathops-0.6.0_p2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MYP="${P/_p/.post}"
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the Skia Path Ops"
-HOMEPAGE="
-	https://github.com/fonttools/skia-pathops
-	https://skia.org/dev/present/pathops
-"
-SRC_URI="mirror://pypi/${MYP:0:1}/${PN}/${MYP}.zip"
-S="${WORKDIR}/${MYP}"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	media-libs/skia
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/pytest-cython[${PYTHON_USEDEP}]
-		dev-python/pytest-randomly[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	app-arch/unzip
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-pkg_setup() {
-	export BUILD_SKIA_FROM_SOURCE=0
-}
-
-python_test() {
-	# assert <pathops.Path object at 0x7fe53e76cc00: 1 contours> == <pathops.Path object at 0x7fe53e76c2a0: 1 contours>
-	epytest --deselect tests/pathops_test.py::PathTest::test_transform
-}
diff --git a/dev-python/skia-pathops/skia-pathops-0.7.2.ebuild b/dev-python/skia-pathops/skia-pathops-0.7.2.ebuild
index 88be24c9d929..1582e009721c 100644
--- a/dev-python/skia-pathops/skia-pathops-0.7.2.ebuild
+++ b/dev-python/skia-pathops/skia-pathops-0.7.2.ebuild
@@ -1,29 +1,30 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
-MYP="${P/_p/.post}"
 PYTHON_COMPAT=( python3_{7,8,9,10} )
-
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
+MY_P="${P/_p/.post}"
 DESCRIPTION="Python bindings for the Skia Path Ops"
 HOMEPAGE="
 	https://github.com/fonttools/skia-pathops
 	https://skia.org/dev/present/pathops
 "
-SRC_URI="mirror://pypi/${MYP:0:1}/${PN}/${MYP}.zip"
-S="${WORKDIR}/${MYP}"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN}/${MY_P}.zip"
+S="${WORKDIR}/${MY_P}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="media-libs/skia"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	app-arch/unzip
-	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest-cython[${PYTHON_USEDEP}] )
 "
diff --git a/dev-python/skills/skills-0.3.0-r1.ebuild b/dev-python/skills/skills-0.3.0-r1.ebuild
index 01460dbc8ed5..52300f25f2e4 100644
--- a/dev-python/skills/skills-0.3.0-r1.ebuild
+++ b/dev-python/skills/skills-0.3.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 ) # no py10 https://github.com/McLeopold/PythonSkills/issues/11
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-argparse/sphinx-argparse-0.3.1.ebuild b/dev-python/sphinx-argparse/sphinx-argparse-0.3.1.ebuild
index f34391eaa5c1..9853a9de3ebf 100644
--- a/dev-python/sphinx-argparse/sphinx-argparse-0.3.1.ebuild
+++ b/dev-python/sphinx-argparse/sphinx-argparse-0.3.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS="pyproject.toml"
+DISTUTILS_USE_PEP517=poetry
 inherit distutils-r1 optfeature
 
 DESCRIPTION="Sphinx extension that automatically documents argparse commands and options"
diff --git a/dev-python/sphinxcontrib-napoleon/Manifest b/dev-python/sphinxcontrib-napoleon/Manifest
deleted file mode 100644
index fdfb3f5ec85b..000000000000
--- a/dev-python/sphinxcontrib-napoleon/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sphinxcontrib-napoleon-0.7.tar.gz 21232 BLAKE2B c64433a9e42d7f68ffca0f3d45e927a10ff8a67e47d0d05f19614c1625db29633774155a9ddb48fb1a32fe04710ecb597fc13b393738afb7266afc6e62526346 SHA512 000fc00b21148ed38b3f0beed5163e232f50642369641a940fd77b30c3c426d799144b3e1c7fbc4dd86b5b1f526656b56be7d77239d4cd3a14dd93178c0e13f8
diff --git a/dev-python/sphinxcontrib-napoleon/metadata.xml b/dev-python/sphinxcontrib-napoleon/metadata.xml
deleted file mode 100644
index 736a1167c898..000000000000
--- a/dev-python/sphinxcontrib-napoleon/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- 
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.7.ebuild b/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.7.ebuild
deleted file mode 100644
index aa1b72dc591f..000000000000
--- a/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 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="Allow a different format in dosctrings for better clarity"
-HOMEPAGE="https://sphinxcontrib-napoleon.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/pockets[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/spyder/spyder-5.3.1.ebuild b/dev-python/spyder/spyder-5.3.1-r1.ebuild
index ba3b1449be7a..fd1820776f48 100644
--- a/dev-python/spyder/spyder-5.3.1.ebuild
+++ b/dev-python/spyder/spyder-5.3.1-r1.ebuild
@@ -51,7 +51,7 @@ RDEPEND="
 	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-22.1.0[${PYTHON_USEDEP}]
 	>=dev-python/qdarkstyle-3.0.2[${PYTHON_USEDEP}]
-	<dev-python/qdarkstyle-3.1.0[${PYTHON_USEDEP}]
+	<dev-python/qdarkstyle-3.1[${PYTHON_USEDEP}]
 	>=dev-python/qstylizer-0.1.10[${PYTHON_USEDEP}]
 	>=dev-python/qtawesome-1.0.2[${PYTHON_USEDEP}]
 	>=dev-python/qtconsole-5.3.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index cfe1dc6511aa..1354b6811f4a 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,3 +1,4 @@
 DIST SQLAlchemy-1.4.31.tar.gz 7999646 BLAKE2B 4c394aaa4bc5636cc90f06017466c227b5e16fc54c3a9a42b18cc13906640e4710146325e870598f8905074bf6dad42ea524febc029b1dd5f063e978ebc9a442 SHA512 e54261fcf992845b2e6be47d23f530aec28c7517e6741b1b6a101b9888d3dc3162c1eeab0acc1edb33f56f1360bae3cdccdbcbff0e1e88e477c93d0cd910c17c
 DIST SQLAlchemy-1.4.35.tar.gz 8136388 BLAKE2B 01a47eab8e11daef133a218a7ef13fa149fb4616b531c3c6d227cc26e3264c259f42770b72335a9fbda5e66ae1ce242fcbe676a528ca1af896d990a84a1f1a57 SHA512 195ab35934bca36e7c4c2127f153eff31775f7f150163912f79143efae63911eded67d8645e08ede2c533c675d18c3c5796235e0c0f6d1e6ebb97664ac13f171
 DIST SQLAlchemy-1.4.36.tar.gz 8146415 BLAKE2B 62560ac2f2c542d60588a24eef225d39f1b6c4cf6feddfac4631e06731206a837cc0f76b88b40c73600361243857e9e1768b4b4ac0bf5ee8e28736d81028ae58 SHA512 c9bb38ce5eeb7817727e93695f10cf5c247710b809f3298b233ed8be4e2cc08e5a14581d0c5aa2af02d7a49f036fe3a0bb7a88120b58bdce0f115016bdaf2c77
+DIST SQLAlchemy-1.4.37.tar.gz 8155965 BLAKE2B cf21c2ab73a5ba2576a857a12f30ea516265af946e25c1b137e57019d862bf04f4757b4755cee28e6f53642d1f1b58f43c99cd1c69f87640e47ac8a1d1ff8d28 SHA512 3f8a814f9bb6fa273f7b210c4567bf7411d0cf2e5caf010a5387fb946063704c342072145a858fb906545dfb1b959155d041e6073273674e51715356fc1f39e6
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.37.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.37.ebuild
new file mode 100644
index 000000000000..3ab33e29c920
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.37.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="
+	https://www.sqlalchemy.org/
+	https://pypi.org/project/SQLAlchemy/
+	https://github.com/sqlalchemy/sqlalchemy/
+"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# hardcode call counts specific to Python versions
+	test/aaa_profiling
+)
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# warning tests are unreliable
+		test/base/test_warnings.py
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# https://github.com/sqlalchemy/sqlalchemy/issues/8019
+		test/engine/test_logging.py::TransactionContextLoggingTest::test_log_messages_have_correct_metadata_echo
+	)
+	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-_exclusions0]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
+		)
+	fi
+
+	# upstream's test suite is horribly hacky; it relies on disabling
+	# the warnings plugin and turning warnings into errors;  this also
+	# means that any DeprecationWarnings from third-party plugins cause
+	# everything to explode
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=
+	# upstream automagically depends on xdist when it is importable
+	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+		PYTEST_PLUGINS+=xdist.plugin
+	fi
+	epytest
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "asyncio support" dev-python/greenlet
+	optfeature "MySQL support" \
+		dev-python/mysqlclient \
+		dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sse-starlette/Manifest b/dev-python/sse-starlette/Manifest
index 6747aaf69bf5..6eb33aa2f65b 100644
--- a/dev-python/sse-starlette/Manifest
+++ b/dev-python/sse-starlette/Manifest
@@ -1,2 +1 @@
-DIST sse-starlette-0.7.2.tar.gz 510457 BLAKE2B f56849be2725b62bb4dd17afed337f21ad07bd2d6c1e0ef9e4c2f33652df2306385caa3920cc81009a7daf699d7556d7af1aece6a7fa7f1299f95df843ed070b SHA512 c02b638e6a378be21a730059a340f08bb9b1100da7d38a506858c8f9aaadf24c230394923f04e1af1989e8cc0de2b1dda4784151460829ee6daca8bad6d6334b
 DIST sse-starlette-0.9.0.tar.gz 511176 BLAKE2B 0ff4cffb60c585af99d70c8fa710b342323b03e1fb9a52af63d5c43b41f49fa2ef71a78355d6677d8e89ab3ecc80ce75cc0a10a4cc48c728b82deec2acab027a SHA512 bca27f1bca8ac864af24dc03f3f49765d8249940583036830ccc805289a7b87f8dcf1c159af308c4e94b85641d8af50c6236be55eaa802bca9d02c7d5cead50d
diff --git a/dev-python/sse-starlette/sse-starlette-0.7.2.ebuild b/dev-python/sse-starlette/sse-starlette-0.7.2.ebuild
deleted file mode 100644
index c99bbba15c87..000000000000
--- a/dev-python/sse-starlette/sse-starlette-0.7.2.ebuild
+++ /dev/null
@@ -1,29 +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="Server Sent Events for Starlette"
-HOMEPAGE="
-	https://pypi.org/project/sse-starlette/
-	https://github.com/sysid/sse-starlette
-"
-SRC_URI="https://github.com/sysid/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/starlette"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio
-		dev-python/requests
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/statmake/Manifest b/dev-python/statmake/Manifest
index f039602efa34..59b00d62e712 100644
--- a/dev-python/statmake/Manifest
+++ b/dev-python/statmake/Manifest
@@ -1,2 +1 @@
-DIST statmake-0.4.1.tar.gz 38631 BLAKE2B a13bdfe6ab255bb255315786dd23c3108a8549fe2ecc510699d9562647a9a5c0669c5d43c17252bf08e6052facbda81043226da876a71071107a4cbc9b8d872e SHA512 d0423427aa29982863eba80ac1f52e0e56589504a9b47d76c2145edd47f9cc49eb7a1efbb9dd08445efd39f61be71cea99076c328f77770b115190d31a4b5438
-DIST statmake-0.5.0.tar.gz 39835 BLAKE2B cad6a4c8a803666ce45d165c46ce6278cdcb56de7a90166315ba229f07ac1202d4bd2e4db678e644e0eaea445b97b81c2eb2c24cdb9ad7d7d4fbee3465fb4bf8 SHA512 c28c85e5fce6904b109858b156ab607204b3ff906bb3ec09ca75a170f5640eba83fbdd310f6a5b70f123cfbff1b1af72af1bea541cfdec8175e52be273f8ac00
+DIST statmake-0.5.0.gh.tar.gz 39835 BLAKE2B cad6a4c8a803666ce45d165c46ce6278cdcb56de7a90166315ba229f07ac1202d4bd2e4db678e644e0eaea445b97b81c2eb2c24cdb9ad7d7d4fbee3465fb4bf8 SHA512 c28c85e5fce6904b109858b156ab607204b3ff906bb3ec09ca75a170f5640eba83fbdd310f6a5b70f123cfbff1b1af72af1bea541cfdec8175e52be273f8ac00
diff --git a/dev-python/statmake/statmake-0.4.1.ebuild b/dev-python/statmake/statmake-0.4.1.ebuild
deleted file mode 100644
index dd27375d548f..000000000000
--- a/dev-python/statmake/statmake-0.4.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Generate STAT tables for variable fonts from .stylespace files"
-HOMEPAGE="https://github.com/daltonmaag/statmake"
-SRC_URI="https://github.com/daltonmaag/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/cattrs[${PYTHON_USEDEP}]
-		dev-python/fonttools[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="test? (
-	$(python_gen_cond_dep 'dev-python/ufo2ft[${PYTHON_USEDEP}]')
-)"
-
-distutils_enable_tests pytest
-
-python_install() {
-	distutils-r1_python_install --skip-build
-	python_domodule "src/${PN}"
-}
-
-python_test() {
-	local -x PYTHONPATH="${S}/src:${PYTHONPATH}"
-	epytest
-}
diff --git a/dev-python/statmake/statmake-0.5.0.ebuild b/dev-python/statmake/statmake-0.5.0.ebuild
index b274ee0bbb6c..14394cc081d2 100644
--- a/dev-python/statmake/statmake-0.5.0.ebuild
+++ b/dev-python/statmake/statmake-0.5.0.ebuild
@@ -6,12 +6,11 @@ EAPI=8
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=poetry
 PYTHON_COMPAT=( python3_{7,8,9,10} )
-
 inherit distutils-r1
 
 DESCRIPTION="Generate STAT tables for variable fonts from .stylespace files"
 HOMEPAGE="https://github.com/daltonmaag/statmake"
-SRC_URI="https://github.com/daltonmaag/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/daltonmaag/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 KEYWORDS="~amd64"
 LICENSE="MIT"
diff --git a/dev-python/strictyaml/Manifest b/dev-python/strictyaml/Manifest
index a98c1cbc4a1f..6239b8cbb86c 100644
--- a/dev-python/strictyaml/Manifest
+++ b/dev-python/strictyaml/Manifest
@@ -1 +1 @@
-DIST strictyaml-1.6.1.tar.gz 287908 BLAKE2B ab59addc5a86624c242339ec371403dd0ebb509c0bcf6d9484e71c26ee2670df897458bc7613367eaabe1493068ecaff37cd0b5e2cf08dc97e10107b9f3061f2 SHA512 8492432b599a6af283bd4d9adeac7fba0fc5dd3e081fb5055526799475e62987de30527ca94eecfebf568673d9bd18ffa9a70bb298c88a49e81683e4eea11349
+DIST strictyaml-1.6.1.gh.tar.gz 287908 BLAKE2B ab59addc5a86624c242339ec371403dd0ebb509c0bcf6d9484e71c26ee2670df897458bc7613367eaabe1493068ecaff37cd0b5e2cf08dc97e10107b9f3061f2 SHA512 8492432b599a6af283bd4d9adeac7fba0fc5dd3e081fb5055526799475e62987de30527ca94eecfebf568673d9bd18ffa9a70bb298c88a49e81683e4eea11349
diff --git a/dev-python/strictyaml/strictyaml-1.6.1.ebuild b/dev-python/strictyaml/strictyaml-1.6.1.ebuild
index 166bec87cdbb..959b2b3b8f14 100644
--- a/dev-python/strictyaml/strictyaml-1.6.1.ebuild
+++ b/dev-python/strictyaml/strictyaml-1.6.1.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=8
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A type-safe YAML parser built atop ruamel.yaml"
 HOMEPAGE="https://github.com/crdoconnor/strictyaml"
-SRC_URI="https://github.com/crdoconnor/strictyaml/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/crdoconnor/strictyaml/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
 LICENSE="MIT"
diff --git a/dev-python/thriftrw/Manifest b/dev-python/thriftrw/Manifest
index e804affc0131..4de95eb6045f 100644
--- a/dev-python/thriftrw/Manifest
+++ b/dev-python/thriftrw/Manifest
@@ -1 +1 @@
-DIST thriftrw-1.8.1.tar.gz 91370 BLAKE2B 8e267b77f80ce1dec0bfd04a0a047cbe8279374f65f7a928ad65019ee11bb44afc991182c8f5525c34e3e6ce736deb1eb6a2e8428cf4e8853ad2d2e18649e8ed SHA512 ea40d4aa35d8f5f097557cb0b1c8800b2a935fc738c33266951163f4ade783b2a5d866a18433afe4e304f435b8de012f52c6d717e812b604e34c7a4ee61fd0fa
+DIST thriftrw-1.8.1.gh.tar.gz 91370 BLAKE2B 8e267b77f80ce1dec0bfd04a0a047cbe8279374f65f7a928ad65019ee11bb44afc991182c8f5525c34e3e6ce736deb1eb6a2e8428cf4e8853ad2d2e18649e8ed SHA512 ea40d4aa35d8f5f097557cb0b1c8800b2a935fc738c33266951163f4ade783b2a5d866a18433afe4e304f435b8de012f52c6d717e812b604e34c7a4ee61fd0fa
diff --git a/dev-python/thriftrw/thriftrw-1.8.1.ebuild b/dev-python/thriftrw/thriftrw-1.8.1.ebuild
index e17b450c98a0..0b4395c43193 100644
--- a/dev-python/thriftrw/thriftrw-1.8.1.ebuild
+++ b/dev-python/thriftrw/thriftrw-1.8.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://github.com/thriftrw/thriftrw-python
 	https://pypi.org/project/thriftrw/
 "
-SRC_URI="https://github.com/thriftrw/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/thriftrw/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 SLOT="0"
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index 6fe999fb015a..728fa4feabd0 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1,3 +1,4 @@
 DIST traitlets-5.1.1.tar.gz 130629 BLAKE2B 75a6f11d95e3989b9faffd576a1c9c45aa413b0b8c6ac853368902a60aad735ffd9699e721878af4e449d07ca6c2b0fae584fa2ae17707408ea9ca7591d38f75 SHA512 6ef5fcde81e1403b4b28c80e636c75f49819e319863dfa654aa5bbb96d18cca82ef8e7878cc8cccdb988d75201c3912fc49c31b673d7182a1f7d3cc78c115112
 DIST traitlets-5.2.0.tar.gz 97379 BLAKE2B af0d3b45803c7318139cc2efe2308db1c0c1ddbec9bcecf328db62681a168f924a21d2495e1ff8d8ea5aca2aad9fcd34f7f961b5a6937f2cbefb4b00f4eb7d67 SHA512 d052c00e6dcb83a056a015f49244230ecd82d9cbcb7ea7cee4f543229fe725cfb80d1b8d055ec5a466b8d16a5f42e6a7aa962f0f12d3f47b9d2edf2a1590aa84
 DIST traitlets-5.2.1.post0.tar.gz 136620 BLAKE2B 41b1f1310a52e42b5c4d41aca1bf46125d7b185d81898887f4d4c8e9164b6947ad13a3b8fd7c07bccc88f8deb1e6f5043519c807f0eb14ab9eb24801bef9c846 SHA512 001b1e62bf622334b086bfd49f62a724d1c171b134f0503638e0a96b043478799b97b8e4689d8a30f1a92d65914915f45c2b2bfc8236feb0cb8634fbb5a8f6f0
+DIST traitlets-5.2.2.post1.tar.gz 136827 BLAKE2B 8e85704bcb704ea6e3bb270abc62ba6739c1f9c4d3dccf182c129d7f28ad3f71882be26504762a57ace19ac58885b88f86ed1dedf9c4e34a080f57431b7d0cd9 SHA512 3651a383c8f761bc5ddf3c3aeee2848265c7c891c7af30111e12968069381e2d571ab57091b8c9c4e0deb7faa06a6338697d65054931fc6f512531f103cae99e
diff --git a/dev-python/traitlets/traitlets-5.2.2_p1.ebuild b/dev-python/traitlets/traitlets-5.2.2_p1.ebuild
new file mode 100644
index 000000000000..78dbdb1f6d15
--- /dev/null
+++ b/dev-python/traitlets/traitlets-5.2.2_p1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="A configuration system for Python applications"
+HOMEPAGE="
+	https://github.com/ipython/traitlets/
+	https://pypi.org/project/traitlets/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_sphinx docs/source \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/trivup/Manifest b/dev-python/trivup/Manifest
index c2acddf5c6f1..7a8ed75c5f8c 100644
--- a/dev-python/trivup/Manifest
+++ b/dev-python/trivup/Manifest
@@ -1 +1 @@
-DIST trivup-0.10.0-gh.tar.gz 194500 BLAKE2B 46e9f50e1602f270aab5720d205a3d16882a5c7fcf342913083a9172b86f97346b8a7d33267d666734c476f2c7ef7d2618a3fa234fbf1cd559ae614766e1c425 SHA512 8598280e3a38dee85c46d52e688dc2e146bc5ffcede678326af661ac9fd09f7719d6b892a7d264b94d147e0b02f117eca8472898d479bdc4a64b521c2807262a
+DIST trivup-0.10.0.gh.tar.gz 194500 BLAKE2B 46e9f50e1602f270aab5720d205a3d16882a5c7fcf342913083a9172b86f97346b8a7d33267d666734c476f2c7ef7d2618a3fa234fbf1cd559ae614766e1c425 SHA512 8598280e3a38dee85c46d52e688dc2e146bc5ffcede678326af661ac9fd09f7719d6b892a7d264b94d147e0b02f117eca8472898d479bdc4a64b521c2807262a
diff --git a/dev-python/trivup/trivup-0.10.0.ebuild b/dev-python/trivup/trivup-0.10.0.ebuild
index cf886b19bfc6..4581f842a387 100644
--- a/dev-python/trivup/trivup-0.10.0.ebuild
+++ b/dev-python/trivup/trivup-0.10.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://github.com/edenhill/trivup
 	https://pypi.org/project/trivup/
 "
-SRC_URI="https://github.com/edenhill/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}-gh.tar.gz"
+SRC_URI="https://github.com/edenhill/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-python/trueskill/Manifest b/dev-python/trueskill/Manifest
index e23d76215194..7630dee3d22c 100644
--- a/dev-python/trueskill/Manifest
+++ b/dev-python/trueskill/Manifest
@@ -1 +1 @@
-DIST trueskill-0.4.5_p20191014.tar.gz 30722 BLAKE2B b93162702f79cbb727f853132568ab02bbb844735c2dc3ebc77ab71c8ff77e16109672e5d30fedca951c6893df18f81f517415ecf707c7e25f6cacc96222a182 SHA512 9892eae7d581a3bbfe33ff0fdf274c177f0641db099a0ad6a630a27f6f2d94d39d65b5a7d47c18ab91b4958d161f00c8639c40f56388714cb71750949dd4bf12
+DIST trueskill-0.4.5_p20220422.gh.tar.gz 31010 BLAKE2B 0422df69be6bd520c587251a685271fbbdb1dfb09db3886b25a472d18e33e9c6822c3e46f90ea1fa53cebbea0d671c5d7dcdb86507e3096b2c7f03236d0cda43 SHA512 1f427baeb7868b0b69b8d7769d2bd39967280883e100417ebc9f4502985ca8d4f5dffdcd9fdbaa13cd1999d7db84bb9070cec25cdac2a6d7480790ffe7415d67
diff --git a/dev-python/trueskill/trueskill-0.4.5_p20191014.ebuild b/dev-python/trueskill/trueskill-0.4.5_p20220422.ebuild
index 1b1ea1112062..f216ac95b27a 100644
--- a/dev-python/trueskill/trueskill-0.4.5_p20191014.ebuild
+++ b/dev-python/trueskill/trueskill-0.4.5_p20220422.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="8"
+EAPI=8
 
-COMMIT="91c29b1ab6cd86d6d68fc983fd7ceba3a88ad544"
+COMMIT="c450c76af542761f6d806fbe9b10b93a9b013212"
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit distutils-r1
@@ -14,7 +14,7 @@ HOMEPAGE="
 	https://github.com/sublee/trueskill
 	https://pypi.org/project/trueskill/
 "
-SRC_URI="https://github.com/sublee/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/sublee/${PN}/archive/${COMMIT}.tar.gz -> ${PF}.gh.tar.gz"
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 SLOT="0"
diff --git a/dev-python/ttfautohint-py/Manifest b/dev-python/ttfautohint-py/Manifest
index 6b0d5950234e..c908d81c8c1a 100644
--- a/dev-python/ttfautohint-py/Manifest
+++ b/dev-python/ttfautohint-py/Manifest
@@ -1 +1 @@
-DIST ttfautohint-py-0.5.1.tar.gz 186884 BLAKE2B ab09325f262e631639433852a9709b52c23a08e2a179fb9f2bce46d851a5523205076ef2698de5c2af10828fc8290d905d5cfe58c44fbfecce4474d504c2d84c SHA512 0673daa17666af7df4fdd9836c978bb6e1620193524a9043d31900047191ef29dd75783afaf5929cb3a7b74137ec9b4e9b5c15793f811824ab6dc2a0780fd798
+DIST ttfautohint-py-0.5.1.gh.tar.gz 186884 BLAKE2B ab09325f262e631639433852a9709b52c23a08e2a179fb9f2bce46d851a5523205076ef2698de5c2af10828fc8290d905d5cfe58c44fbfecce4474d504c2d84c SHA512 0673daa17666af7df4fdd9836c978bb6e1620193524a9043d31900047191ef29dd75783afaf5929cb3a7b74137ec9b4e9b5c15793f811824ab6dc2a0780fd798
diff --git a/dev-python/ttfautohint-py/ttfautohint-py-0.5.1.ebuild b/dev-python/ttfautohint-py/ttfautohint-py-0.5.1.ebuild
index a0c764a969cb..b70c2a1c53d5 100644
--- a/dev-python/ttfautohint-py/ttfautohint-py-0.5.1.ebuild
+++ b/dev-python/ttfautohint-py/ttfautohint-py-0.5.1.ebuild
@@ -9,7 +9,8 @@ inherit distutils-r1
 
 DESCRIPTION="A Python wrapper for ttfautohint"
 HOMEPAGE="https://github.com/fonttools/ttfautohint-py"
-SRC_URI="https://github.com/fonttools/ttfautohint-py/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/fonttools/ttfautohint-py/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
 KEYWORDS="~amd64"
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/ufo2ft/Manifest b/dev-python/ufo2ft/Manifest
index 28493d4249a0..f2902c0d69d1 100644
--- a/dev-python/ufo2ft/Manifest
+++ b/dev-python/ufo2ft/Manifest
@@ -1,2 +1 @@
-DIST ufo2ft-2.26.0.tar.gz 173354 BLAKE2B 6271498143219e7a6870dc66eacf99a0ef4f6a0216d6d41e20b74517b0efa68f9a0a950c17c92d0a080a26c0761a86cf88d4918efb76658e233d9b08b76d1e9d SHA512 6a6d07603c0335adbe74f6913bfa3cb33d5eaaf6fb8b3ff0d92744bb2aaddcfa14bbfeedfd18215d3483fe39e4c6166352387b639768ce90a7d9c4905a79900d
 DIST ufo2ft-2.27.0.tar.gz 174521 BLAKE2B 2b80fa7bf234860e2d61940c662435d3f1a0f7a254e9a79a2acda1aded5b2948840a8e74455f177b6a76e6d5dc2950fc2328589cdc517a98b863cef228326594 SHA512 f1475424730a98d8eee4b1c3fcbcace97b55e8b5109cae5ad5a1de191d30483ac9ecfc8e1ade3eabb0d04e12dfb2bfc73478b17d637d65c566b7ddf41dc0caec
diff --git a/dev-python/ufo2ft/ufo2ft-2.26.0.ebuild b/dev-python/ufo2ft/ufo2ft-2.26.0.ebuild
deleted file mode 100644
index bd412cf995cf..000000000000
--- a/dev-python/ufo2ft/ufo2ft-2.26.0.ebuild
+++ /dev/null
@@ -1,38 +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="A bridge from UFOs to FontTool objects"
-HOMEPAGE="
-	https://github.com/googlefonts/ufo2ft
-	https://pypi.org/project/ufo2ft/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/booleanOperations-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/compreffor-0.5.1_p1[${PYTHON_USEDEP}]
-	>=dev-python/cffsubr-0.2.9_p1[${PYTHON_USEDEP}]
-	>=dev-python/cu2qu-1.6.7[${PYTHON_USEDEP}]
-	>=dev-python/defcon-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.29.1[${PYTHON_USEDEP}]
-	>=dev-python/skia-pathops-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/ufoLib2-0.13.1[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/glyphsLib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ufo2ft/ufo2ft-2.27.0.ebuild b/dev-python/ufo2ft/ufo2ft-2.27.0.ebuild
index bd412cf995cf..46960bcd3ab6 100644
--- a/dev-python/ufo2ft/ufo2ft-2.27.0.ebuild
+++ b/dev-python/ufo2ft/ufo2ft-2.27.0.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} )
-
 inherit distutils-r1
 
 DESCRIPTION="A bridge from UFOs to FontTool objects"
diff --git a/dev-python/ufoLib2/Manifest b/dev-python/ufoLib2/Manifest
index 18f3e01153fb..97393aadc49d 100644
--- a/dev-python/ufoLib2/Manifest
+++ b/dev-python/ufoLib2/Manifest
@@ -1 +1 @@
-DIST ufoLib2-0.13.1.tar.gz 88239 BLAKE2B 5c15c1ad9eedba904cb9730604d3853d21fc8f7ae30f440421349f233bac356947aaab7f57204cef9684f1beaabeeefbf913a973f44afc6b8dd185015abb9d87 SHA512 163304999912f1d838f995e3524f4538c176bbff471b07b7670147a0d7e706542c67601dacd29dd985bf5a7ae95688008b7c292f1d67c38756ec633069c7bd64
+DIST ufoLib2-0.13.1.gh.tar.gz 88239 BLAKE2B 5c15c1ad9eedba904cb9730604d3853d21fc8f7ae30f440421349f233bac356947aaab7f57204cef9684f1beaabeeefbf913a973f44afc6b8dd185015abb9d87 SHA512 163304999912f1d838f995e3524f4538c176bbff471b07b7670147a0d7e706542c67601dacd29dd985bf5a7ae95688008b7c292f1d67c38756ec633069c7bd64
diff --git a/dev-python/ufoLib2/ufoLib2-0.13.1.ebuild b/dev-python/ufoLib2/ufoLib2-0.13.1.ebuild
index 322c080fc68c..2ed7bec479b0 100644
--- a/dev-python/ufoLib2/ufoLib2-0.13.1.ebuild
+++ b/dev-python/ufoLib2/ufoLib2-0.13.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 	https://github.com/fonttools/ufoLib2
 	https://pypi.org/project/ufoLib2/
 "
-SRC_URI="https://github.com/fonttools/ufoLib2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/fonttools/ufoLib2/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/ufoProcessor/Manifest b/dev-python/ufoProcessor/Manifest
index 3760c9408f18..2df4d44e27b6 100644
--- a/dev-python/ufoProcessor/Manifest
+++ b/dev-python/ufoProcessor/Manifest
@@ -1 +1 @@
-DIST ufoProcessor-1.9.0.tar.gz 34299 BLAKE2B 06570e3e3ade479e470460fcec0e8af9e786d03d95b27f8a65b6b89519b281da0931f7fc4171fe212120881efcfce489c2d0c634467402981670d392cc6113bc SHA512 8e98777eebe0e4d470cb1d6765826ea8752fb3bdcf539581c7b28cede7907b53d68371406f0ee19e718b1de585a4f1d191ef07583fb9c3badc45fb4f3ceb576c
+DIST ufoProcessor-1.9.0.gh.tar.gz 34299 BLAKE2B 06570e3e3ade479e470460fcec0e8af9e786d03d95b27f8a65b6b89519b281da0931f7fc4171fe212120881efcfce489c2d0c634467402981670d392cc6113bc SHA512 8e98777eebe0e4d470cb1d6765826ea8752fb3bdcf539581c7b28cede7907b53d68371406f0ee19e718b1de585a4f1d191ef07583fb9c3badc45fb4f3ceb576c
diff --git a/dev-python/ufoProcessor/ufoProcessor-1.9.0.ebuild b/dev-python/ufoProcessor/ufoProcessor-1.9.0-r1.ebuild
index 7099c94712c6..ec2a4ba6df61 100644
--- a/dev-python/ufoProcessor/ufoProcessor-1.9.0.ebuild
+++ b/dev-python/ufoProcessor/ufoProcessor-1.9.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 
@@ -9,12 +9,12 @@ inherit distutils-r1
 
 DESCRIPTION="A Python package for processing and generating UFO files"
 HOMEPAGE="https://github.com/LettError/ufoProcessor"
-SRC_URI="https://github.com/LettError/ufoProcessor/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/LettError/ufoProcessor/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
 IUSE="test"
 KEYWORDS="~amd64"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	${PYTHON_DEPS}
@@ -26,12 +26,12 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	test? (
-		dev-python/unicodedata2[${PYTHON_USEDEP}]
-	)
+	test? ( dev-python/unicodedata2[${PYTHON_USEDEP}] )
 "
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
+RESTRICT="!test? ( test )"
+
 pkg_setup() {
 	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}"
 }
diff --git a/dev-python/uharfbuzz/Manifest b/dev-python/uharfbuzz/Manifest
index b7b76860ef5c..4cab0aa77734 100644
--- a/dev-python/uharfbuzz/Manifest
+++ b/dev-python/uharfbuzz/Manifest
@@ -1 +1 @@
-DIST uharfbuzz-0.26.0.tar.gz 36596 BLAKE2B b57782f5de371e2062d6a764fde9d20ca4a47a388b22ac3d169cead66103d30af12888e9d8f0af0aea7c7dbb4a3b7e0f4411e049417efaf1d2e7562ef5a34875 SHA512 0b356ceaf1cc40c2318e495939d51db454852043ebac60cb7b2a7481c4de6540e66d7ccf47a9fe6c1d819bf8a54e572bdb5a0799c7818f61730b820bb210ac83
+DIST uharfbuzz-0.26.0.gh.tar.gz 36596 BLAKE2B b57782f5de371e2062d6a764fde9d20ca4a47a388b22ac3d169cead66103d30af12888e9d8f0af0aea7c7dbb4a3b7e0f4411e049417efaf1d2e7562ef5a34875 SHA512 0b356ceaf1cc40c2318e495939d51db454852043ebac60cb7b2a7481c4de6540e66d7ccf47a9fe6c1d819bf8a54e572bdb5a0799c7818f61730b820bb210ac83
diff --git a/dev-python/uharfbuzz/uharfbuzz-0.26.0.ebuild b/dev-python/uharfbuzz/uharfbuzz-0.26.0.ebuild
index 2cc233e84242..75d545344f06 100644
--- a/dev-python/uharfbuzz/uharfbuzz-0.26.0.ebuild
+++ b/dev-python/uharfbuzz/uharfbuzz-0.26.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Streamlined Cython bindings for the HarfBuzz shaping engine"
 HOMEPAGE="https://github.com/harfbuzz/uharfbuzz"
-SRC_URI="https://github.com/harfbuzz/uharfbuzz/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/harfbuzz/uharfbuzz/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 KEYWORDS="~amd64"
 LICENSE="Apache-2.0"
diff --git a/dev-python/ukpostcodeparser/Manifest b/dev-python/ukpostcodeparser/Manifest
index 12535d75facc..ecec5d4154b4 100644
--- a/dev-python/ukpostcodeparser/Manifest
+++ b/dev-python/ukpostcodeparser/Manifest
@@ -1 +1 @@
-DIST ukpostcodeparser-1.1.2.tar.gz 5585 BLAKE2B c95f215f0e4b222b85ec3ab0a8d82186845d9cb161098240411a425094ada391bb6c891904293cca4a56e9370217829b51ba30e91824dd3d762279baef6c65f7 SHA512 8113522b728c095f937a9f53f21c369130e3e63c4fc3546dbea4ad1c53648742fb0e766b1254c76ee65d69dec585f1a90caa7d39ca540de1765ff5f989a702de
+DIST ukpostcodeparser-1.1.2.gh.tar.gz 5585 BLAKE2B c95f215f0e4b222b85ec3ab0a8d82186845d9cb161098240411a425094ada391bb6c891904293cca4a56e9370217829b51ba30e91824dd3d762279baef6c65f7 SHA512 8113522b728c095f937a9f53f21c369130e3e63c4fc3546dbea4ad1c53648742fb0e766b1254c76ee65d69dec585f1a90caa7d39ca540de1765ff5f989a702de
diff --git a/dev-python/ukpostcodeparser/ukpostcodeparser-1.1.2.ebuild b/dev-python/ukpostcodeparser/ukpostcodeparser-1.1.2-r1.ebuild
index 2e06e6ea6716..cebf7a90d887 100644
--- a/dev-python/ukpostcodeparser/ukpostcodeparser-1.1.2.ebuild
+++ b/dev-python/ukpostcodeparser/ukpostcodeparser-1.1.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="UK postcode parser library"
 HOMEPAGE="https://github.com/hamstah/ukpostcodeparser"
-SRC_URI="https://github.com/hamstah/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/hamstah/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/unicodedata2/Manifest b/dev-python/unicodedata2/Manifest
index e08fc3421d89..c29513be4013 100644
--- a/dev-python/unicodedata2/Manifest
+++ b/dev-python/unicodedata2/Manifest
@@ -1 +1 @@
-DIST unicodedata2-14.0.0.tar.gz 624067 BLAKE2B 0394af31670dbc3e89f616144f88081a69e1e4d9404d432a3f70c8973e967f28b914413219e0b22f089ccaa898193a45f4a2ce41bfe1f889622c69bd9b56735e SHA512 bb0b1e3834a892d23bda0d51443655b244e0f24cbb9ed51065afac3fdd2ed01a6382d4015ea0dcfaddc99c7858e19e3e3e86a9024a5600cb67cef219ebc719ba
+DIST unicodedata2-14.0.0.gh.tar.gz 624067 BLAKE2B 0394af31670dbc3e89f616144f88081a69e1e4d9404d432a3f70c8973e967f28b914413219e0b22f089ccaa898193a45f4a2ce41bfe1f889622c69bd9b56735e SHA512 bb0b1e3834a892d23bda0d51443655b244e0f24cbb9ed51065afac3fdd2ed01a6382d4015ea0dcfaddc99c7858e19e3e3e86a9024a5600cb67cef219ebc719ba
diff --git a/dev-python/unicodedata2/unicodedata2-14.0.0.ebuild b/dev-python/unicodedata2/unicodedata2-14.0.0.ebuild
index 664b0ba1ffac..d0e4da339ad0 100644
--- a/dev-python/unicodedata2/unicodedata2-14.0.0.ebuild
+++ b/dev-python/unicodedata2/unicodedata2-14.0.0.ebuild
@@ -10,17 +10,10 @@ inherit distutils-r1
 
 DESCRIPTION="Unicodedata backport for python 2/3 updated to the latest unicode version"
 HOMEPAGE="https://github.com/mikekap/unicodedata2"
-SRC_URI="https://github.com/mikekap/unicodedata2/archive/refs/tags/${MYPV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/mikekap/unicodedata2/archive/refs/tags/${MYPV}.tar.gz -> ${P}.gh.tar.gz"
 S="${WORKDIR}/${PN}-${MYPV}"
 KEYWORDS="~amd64"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-DEPEND="
-	test? (
-		dev-python/pytest-randomly[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
 distutils_enable_tests pytest
diff --git a/dev-python/versioningit/versioningit-1.1.1.ebuild b/dev-python/versioningit/versioningit-1.1.1.ebuild
index ee01add549ea..66e3d29e045c 100644
--- a/dev-python/versioningit/versioningit-1.1.1.ebuild
+++ b/dev-python/versioningit/versioningit-1.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
 BDEPEND="test? (
diff --git a/dev-python/vharfbuzz/Manifest b/dev-python/vharfbuzz/Manifest
index 7ee709c8b290..a0c417d00da5 100644
--- a/dev-python/vharfbuzz/Manifest
+++ b/dev-python/vharfbuzz/Manifest
@@ -1,2 +1 @@
-DIST vharfbuzz-0.1.2.tar.gz 9029 BLAKE2B 952956424ccb120b68f356086597bdb78c418ec3702517fe93483d25bc21b9de38d7f409d1f505467ff794880d90716f40bba252a0425a5bf6790d1516e7b2fc SHA512 12c3e18d27da6fbbf7cbc35c4f0c00e8669e521a1c46ae79e831f6b18710787d0ee8e551a52178e673d519231b3fd401e75453c420c6da6696f6443f6545ce8d
-DIST vharfbuzz-0.1.3.tar.gz 9359 BLAKE2B c4d7e2a1a939c59f63008f99cc6cf4ce622adebe493248c3536632051e32fe0e1ca9d48b91273ef3c157afefbfcc0062232d964cba954f1b867d91bbdc16ad41 SHA512 0b2e90da6ba613cbc24bf67d2815d6d2e857463e077410a6c86e4a4d77a734bc6b3ddaf3fbd564d06fcd2295eda13e095da55241cc31c38959703114b0cf56bf
+DIST vharfbuzz-0.1.3.gh.tar.gz 9359 BLAKE2B c4d7e2a1a939c59f63008f99cc6cf4ce622adebe493248c3536632051e32fe0e1ca9d48b91273ef3c157afefbfcc0062232d964cba954f1b867d91bbdc16ad41 SHA512 0b2e90da6ba613cbc24bf67d2815d6d2e857463e077410a6c86e4a4d77a734bc6b3ddaf3fbd564d06fcd2295eda13e095da55241cc31c38959703114b0cf56bf
diff --git a/dev-python/vharfbuzz/vharfbuzz-0.1.2.ebuild b/dev-python/vharfbuzz/vharfbuzz-0.1.2.ebuild
deleted file mode 100644
index 4ed4e471b0d6..000000000000
--- a/dev-python/vharfbuzz/vharfbuzz-0.1.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A user-friendlier way to use Harfbuzz in Python"
-HOMEPAGE="https://github.com/simoncozens/vharfbuzz"
-SRC_URI="https://github.com/simoncozens/vharfbuzz/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	dev-python/fonttools[${PYTHON_USEDEP}]
-	dev-python/uharfbuzz[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_sphinx docs dev-python/sphinxcontrib-napoleon
diff --git a/dev-python/vharfbuzz/vharfbuzz-0.1.3.ebuild b/dev-python/vharfbuzz/vharfbuzz-0.1.3.ebuild
index 9eefbe7655a9..b9cfd44ea500 100644
--- a/dev-python/vharfbuzz/vharfbuzz-0.1.3.ebuild
+++ b/dev-python/vharfbuzz/vharfbuzz-0.1.3.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A user-friendlier way to use Harfbuzz in Python"
 HOMEPAGE="https://github.com/simoncozens/vharfbuzz"
-SRC_URI="https://github.com/simoncozens/vharfbuzz/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/simoncozens/vharfbuzz/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 KEYWORDS="~amd64"
@@ -21,4 +21,4 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-distutils_enable_sphinx docs dev-python/sphinxcontrib-napoleon
+distutils_enable_sphinx docs
diff --git a/dev-python/vncdotool/vncdotool-0.13.0-r1.ebuild b/dev-python/vncdotool/vncdotool-0.13.0-r1.ebuild
new file mode 100644
index 000000000000..41b1817b89d5
--- /dev/null
+++ b/dev-python/vncdotool/vncdotool-0.13.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Command line VNC client"
+HOMEPAGE="https://github.com/sibson/vncdotool"
+SRC_URI="https://github.com/sibson/vncdotool/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# A lot of errors such as the following appear
+# pexpect.exceptions.ExceptionPexpect: The command was not found or was not executable: vncev.
+# to install those, a manual compile and install of examples from net-libs/libvncserver is needed
+RESTRICT="test"
+
+BDEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	dev-python/ptyprocess[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	dev-python/tox[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+)"
+RDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
diff --git a/dev-python/vncdotool/vncdotool-1.0.0-r1.ebuild b/dev-python/vncdotool/vncdotool-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..41b1817b89d5
--- /dev/null
+++ b/dev-python/vncdotool/vncdotool-1.0.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Command line VNC client"
+HOMEPAGE="https://github.com/sibson/vncdotool"
+SRC_URI="https://github.com/sibson/vncdotool/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# A lot of errors such as the following appear
+# pexpect.exceptions.ExceptionPexpect: The command was not found or was not executable: vncev.
+# to install those, a manual compile and install of examples from net-libs/libvncserver is needed
+RESTRICT="test"
+
+BDEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	dev-python/ptyprocess[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	dev-python/tox[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+)"
+RDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
diff --git a/dev-python/vttlib/vttlib-0.11.0.ebuild b/dev-python/vttlib/vttlib-0.11.0.ebuild
index caf66e6e9014..015154741da7 100644
--- a/dev-python/vttlib/vttlib-0.11.0.ebuild
+++ b/dev-python/vttlib/vttlib-0.11.0.ebuild
@@ -1,43 +1,39 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-MYPN="vttLib"
-MYPV="${PV/_p/.post}"
-MYP="${MYPN}-${MYPV}"
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10} )
-
 inherit distutils-r1
 
+MY_PN="vttLib"
+MY_PV="${PV/_p/.post}"
+MY_P="${MY_PN}-${MY_PV}"
 DESCRIPTION="Dump, merge and compile Visual TrueType data in UFO3 with FontTools"
 HOMEPAGE="
 	https://github.com/daltonmaag/vttLib
-	https://pypi.org/project/vttlib/
+	https://pypi.org/project/vttLib/
 "
-SRC_URI="mirror://pypi/${MYP:0:1}/${MYPN}/${MYP}.zip"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.zip"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-#install_requires
 RDEPEND="
 	>=dev-python/fonttools-4.10.2[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-2.4.7[${PYTHON_USEDEP}]
 	>=dev-python/ufoLib2-0.7.1[${PYTHON_USEDEP}]
 "
-#setup_requires
-DEPEND="
-	${RDEPEND}
+BDEPEND="
+	app-arch/unzip
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	dev-python/wheel[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/ufo2ft-2.14.0[${PYTHON_USEDEP}]
 	)
 "
-BDEPEND="app-arch/unzip"
-S="${WORKDIR}/${MYP}"
 
 distutils_enable_tests pytest
diff --git a/dev-python/watchgod/watchgod-0.8.2.ebuild b/dev-python/watchgod/watchgod-0.8.2.ebuild
index dcbb13e9184d..b3076a49cf38 100644
--- a/dev-python/watchgod/watchgod-0.8.2.ebuild
+++ b/dev-python/watchgod/watchgod-0.8.2.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	=dev-python/anyio-3*[${PYTHON_USEDEP}]
diff --git a/dev-python/webpy/webpy-0.62.ebuild b/dev-python/webpy/webpy-0.62.ebuild
index d82908cbf6b6..8c36ea8bc945 100644
--- a/dev-python/webpy/webpy-0.62.ebuild
+++ b/dev-python/webpy/webpy-0.62.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="8"
diff --git a/dev-python/webrtcvad/webrtcvad-2.0.10.ebuild b/dev-python/webrtcvad/webrtcvad-2.0.10.ebuild
index 6e08d0511e29..580724f34b1d 100644
--- a/dev-python/webrtcvad/webrtcvad-2.0.10.ebuild
+++ b/dev-python/webrtcvad/webrtcvad-2.0.10.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit distutils-r1
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-06-01 12:52:02 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-06-01 12:52:02 +0000
commit	df899fa791750d19ac5a7dc30a1778095d3f8d60 (patch)
tree	4aff626b567f25f42c616d1c81fdc1d243d95cab /dev-python
parent	215476f669d20b307ff052c3ff0d420102108e58 (diff)
download	baldeagleos-repo-df899fa791750d19ac5a7dc30a1778095d3f8d60.tar.gz baldeagleos-repo-df899fa791750d19ac5a7dc30a1778095d3f8d60.tar.xz baldeagleos-repo-df899fa791750d19ac5a7dc30a1778095d3f8d60.zip