gentoo auto-resync : 03.08.2022 - 13:42:43

author: V3n3RiX <venerix@koprulu.sector> 2022-08-03 13:53:01 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-08-03 13:53:01 +0100
commit: 4b4d352fc9761396c68812d8eccc63b7b14d6558 (patch)
tree: 4f290d635d831599222130ba8ddbf1a726129426 /dev-python
parent: a2c1a301b2ea85c230b30ef69ff667f230a1bf88 (diff)
140 files changed, 1133 insertions, 2212 deletions
diff --git a/dev-python/Frozen-Flask/Frozen-Flask-0.18-r1.ebuild b/dev-python/Frozen-Flask/Frozen-Flask-0.18-r1.ebuild
index 8955aa189fbf..26d5ebe36dfb 100644
--- a/dev-python/Frozen-Flask/Frozen-Flask-0.18-r1.ebuild
+++ b/dev-python/Frozen-Flask/Frozen-Flask-0.18-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/flask[${PYTHON_USEDEP}]
diff --git a/dev-python/Frozen-Flask/Frozen-Flask-0.18.ebuild b/dev-python/Frozen-Flask/Frozen-Flask-0.18.ebuild
deleted file mode 100644
index b75c22ccece2..000000000000
--- a/dev-python/Frozen-Flask/Frozen-Flask-0.18.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Freezes a Flask application into a set of static files"
-HOMEPAGE="
-	https://github.com/Frozen-Flask/Frozen-Flask/
-	https://pypi.org/project/Frozen-Flask/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/flask[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/flask-sphinx-themes
-distutils_enable_tests nose
diff --git a/dev-python/Frozen-Flask/Manifest b/dev-python/Frozen-Flask/Manifest
index 9dfdcfe6fd14..69ed043d5bdb 100644
--- a/dev-python/Frozen-Flask/Manifest
+++ b/dev-python/Frozen-Flask/Manifest
@@ -1,4 +1,3 @@
 DIST Frozen-Flask-0.18.tar.gz 179245 BLAKE2B a82695892aef9b6b4e3aeb91f12f78d7d661f2f2b0efc57c11f64524ed467b85d8d9e0e7b147cb78c3d0a641dfef0f683e0f77cfda560aada79e1b435424c0ce SHA512 6c2e4d900547cc5c0de4af23b96c5b9e1925101fb40f710bedc67ac52c303282aa223f6972f5b9cc813878bb15eb90cb0a007619dd5a9db2dec762f04dcc7ba0
-EBUILD Frozen-Flask-0.18-r1.ebuild 620 BLAKE2B 0a29f7119f9ebbe525fd77afabc3d368afbec4d48feaabb559f1debfa75d558b2a1d28e7daa1490e980c38fabcffa9a7d833f8eaae1627ef6c35114516a15837 SHA512 4a5ea7a31cba2cc69ca87d507578e58ab7ac6768d9b452b38007ef93cc084ecce8f2ff3d1c3ef6e0486fd05fe45f61d87609372d4c6be01e80ce0daba81abaf3
-EBUILD Frozen-Flask-0.18.ebuild 582 BLAKE2B 57764929f38dcce97b873dd49663db0f85ab9689befb82c125032ba503d5624553bb5dd6d852fe89dff368f04d8a98b9e7404754e56488acaaa23036067713f9 SHA512 322413c86b74b1c017039aaf04a4c6257c3caf2ca03cd0cddced67b0d01a5f732a874e365e9ebdead6c56b557f4489831a8c45d59544e398352574f9a3be7441
+EBUILD Frozen-Flask-0.18-r1.ebuild 618 BLAKE2B ad188d335d14f5e3f72497593b821fa7ad5464fefab063e52404bd65fff6aed04799be7af1cc7408ae783c1da9dd12332bad978edeba0f847b31b13f954dd383 SHA512 7fbeb6e5185f0e538dd3a3c03f15d5ef5b6989d1798a4dbf526ef28112d27aaa3756fd9e5ffe153a942fe03c106bf626f7f9cc179bbc2037723b272aaf23c0c8
 MISC metadata.xml 418 BLAKE2B da73d29cda242f659f85fc281c49682670f0de29fb6d5edae6df2e2ed0bf7fafb080221f7512f27eb48b3210eaeb363371e70b8299aa650d5c901fbd7a6680f5 SHA512 95a895607e43532bb5e9e88499b86ca0d43aa3c9a310b960ff8ed7438548d62c1a2758e0ac97b7200399c6cef5ef317029dd4f56d5636175aa285880731e01a1
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 196d2f41770e..a55a839d9295 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt6/Manifest b/dev-python/PyQt6/Manifest
new file mode 100644
index 000000000000..bd9f25add6db
--- /dev/null
+++ b/dev-python/PyQt6/Manifest
@@ -0,0 +1,3 @@
+DIST PyQt6-6.3.1.tar.gz 1015220 BLAKE2B e225f2da11eec482ab8e00f886a858cec4a2c8add764f5e54bf603959394aad7f12d91b92c1ba6ab98d1b25903d4404e6667232258a87c52c95a2abdae9ccd2d SHA512 94319cd0983eb3f9bb0f1acbc620a1631a37f82e2fcffb9d0e58437fb1c120640be1e2a0a09e98e03f6c7082a2d94e9eabceefa6b07bae354f77bda02ba92d58
+EBUILD PyQt6-6.3.1.ebuild 4629 BLAKE2B 274a90de1c3408570ba0b2906bb330028d5ecba575e27f2aa93575337e2f2a44c483c88da8115477c357a001b0b08f8bec7b3db01f8f17fb39327ea3ff657d7a SHA512 8a246038979c91e536b2a68ae03b451d7e04a4b6e19b5621de5a1a54b106035bf742a367efe9701300c0a1b0a3c38d0a043940c9ef25af31c5a4a9c5b6b11404
+MISC metadata.xml 1915 BLAKE2B b4ca171871165e02fbc54d7931a52da3a70415b4acf5f85b23459d6949c7a720b68fbddba1a5c22d4d8b90e16faa7f628cb088cc93eb9f1db05da15d33967b1b SHA512 32671e148db535c25b9bf1dd48f945d3ddd74e9df86014af2beb92dccb8d49289e778a1ba38c57cc61dabab88528057ab1aa57ee48b95b80aa1254b1c765772b
diff --git a/dev-python/PyQt6/PyQt6-6.3.1.ebuild b/dev-python/PyQt6/PyQt6-6.3.1.ebuild
new file mode 100644
index 000000000000..4eee1c118cf4
--- /dev/null
+++ b/dev-python/PyQt6/PyQt6-6.3.1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=sip
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1 flag-o-matic multiprocessing qmake-utils
+
+QT_PV="6.3:6" # minimum tested qt version
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+# currently keeping defaults in sync with qtbase, and beside that trying to
+# stay minimal'ish given each builds relatively slowly (but still subject to
+# change if something is needed by most consumers)
+IUSE="
+	+dbus debug qml designer examples gles2-only +gui help multimedia
+	+network opengl positioning printsupport quick quick3d serialport
+	+sql +ssl svg testlib webchannel websockets +widgets +xml"
+# see `grep -r "%Import " sip` and `grep qmake_QT project.py`
+REQUIRED_USE="
+	designer? ( gui widgets )
+	help? ( gui widgets )
+	multimedia? ( gui network )
+	opengl? ( gui )
+	printsupport? ( gui widgets )
+	qml? ( network )
+	quick3d? ( gui qml )
+	quick? ( gui qml )
+	sql? ( widgets )
+	svg? ( gui )
+	testlib? ( gui widgets )
+	webchannel? ( network )
+	websockets? ( network )
+	widgets? ( gui )"
+
+# note: xml(+) for now given qtbase-6.3.1-r0 is missing IUSE=xml with a TODO
+DEPEND="
+	>=dev-qt/qtbase-${QT_PV}[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,widgets?,xml(+)?]
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		sys-apps/dbus
+	)
+	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+	help? ( >=dev-qt/qttools-${QT_PV}[assistant] )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
+	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
+	qml? ( >=dev-qt/qtdeclarative-${QT_PV} )
+	quick3d? ( >=dev-qt/qtquick3d-${QT_PV} )
+	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
+	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )"
+RDEPEND="
+	${DEPEND}
+	>=dev-python/PyQt6_sip-13.4[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/PyQt-builder-1.11[${PYTHON_USEDEP}]
+	>=dev-qt/qtbase-${QT_PV}
+	sys-devel/gcc
+	dbus? ( virtual/pkgconfig )"
+
+src_prepare() {
+	default
+
+	# hack: qmake wants g++ (not clang), try to respect ${CHOST} #726112
+	mkdir "${T}"/cxx || die
+	ln -s "$(type -P ${CHOST}-g++ || type -P g++ || die)" "${T}"/cxx/g++ || die
+	PATH=${T}/cxx:${PATH}
+}
+
+src_configure() {
+	append-cxxflags -std=c++17 # for clang and old gcc that default to <17
+
+	pyqt-use_enable() {
+		local state=$(usex ${1} --enable= --disable=)
+		shift
+		echo ${*/#/${state}}
+	}
+
+	# hack: currently lacking qt6_get_bindir (or alternatively have
+	# qmake6 in PATH like qmake5 is so it wouldn't matter)
+	local qmake6=$(qt5_get_bindir)/qmake6
+	qmake6=${qmake6//qt5/qt6}
+
+	DISTUTILS_ARGS=(
+		--jobs=$(makeopts_jobs)
+		--qmake="${qmake6}"
+		--qmake-setting="$(qt5_get_qmake_args)"
+		--verbose
+		--confirm-license
+
+		# TODO: enable/restrict more as qt6 packages/USE get added
+		--disable=QAxContainer
+		--disable=QtBluetooth
+		--enable=QtCore
+		$(pyqt-use_enable dbus QtDBus)
+		$(pyqt-use_enable designer QtDesigner)
+		$(pyqt-use_enable help QtHelp)
+		$(pyqt-use_enable gui QtGui)
+		#--disable=QtLocation # force-disabled in project.py
+		$(pyqt-use_enable multimedia QtMultimedia \
+			$(usev widgets QtMultimediaWidgets))
+		$(pyqt-use_enable network QtNetwork)
+		--disable=QtNfc
+		$(pyqt-use_enable opengl QtOpenGL \
+			$(usev widgets QtOpenGLWidgets))
+		$(pyqt-use_enable positioning QtPositioning)
+		$(pyqt-use_enable printsupport QtPrintSupport)
+		$(pyqt-use_enable qml QtQml)
+		$(pyqt-use_enable quick QtQuick \
+			$(usev widgets QtQuickWidgets))
+		$(pyqt-use_enable quick3d QtQuick3D)
+		--disable=QtRemoteObjects
+		--disable=QtSensors
+		$(pyqt-use_enable serialport QtSerialPort)
+		$(pyqt-use_enable sql QtSql)
+		$(pyqt-use_enable svg QtSvg \
+			$(usev widgets QtSvgWidgets))
+		$(pyqt-use_enable testlib QtTest)
+		#--disable=QtTextToSpeech # force-disabled in project.py
+		$(pyqt-use_enable webchannel QtWebChannel)
+		$(pyqt-use_enable websockets QtWebSockets)
+		$(pyqt-use_enable widgets QtWidgets)
+		$(pyqt-use_enable xml QtXml)
+
+		$(usev debug '--debug --qml-debug --tracing')
+
+		$(usev !dbus --no-dbus-python)
+		# TODO?: plugins not in wheels by upstream, see project.py#L215
+		# (if needed by something, will need to be added to python_install)
+		$(usev !designer --no-designer-plugin)
+		$(usev !qml --no-qml-plugin)
+
+		$(usev !gles2-only --disabled-feature=PyQt_OpenGL_ES2)
+		$(usev !ssl --disabled-feature=PyQt_SSL)
+	)
+}
+
+python_install_all() {
+	einstalldocs
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/PyQt6/metadata.xml b/dev-python/PyQt6/metadata.xml
new file mode 100644
index 000000000000..1872d32a4049
--- /dev/null
+++ b/dev-python/PyQt6/metadata.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<use>
+		<flag name="dbus">Build bindings for the QtDBus module</flag>
+		<flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag>
+		<flag name="gui">Build bindings for the QtGui module</flag>
+		<flag name="help">Build bindings for the QtHelp module</flag>
+		<flag name="multimedia">Build bindings for the QtMultimedia module</flag>
+		<flag name="network">Build bindings for the QtNetwork module</flag>
+		<flag name="opengl">Build bindings for the QtOpenGL module</flag>
+		<flag name="positioning">Build bindings for the QtPositioning module</flag>
+		<flag name="printsupport">Build bindings for the QtPrintSupport module</flag>
+		<flag name="qml">Build bindings for the QtQml module and enable the qml plugin</flag>
+		<flag name="quick">Build bindings for the QtQuick module</flag>
+		<flag name="quick3d">Build bindings for the QtQuick3D module</flag>
+		<flag name="serialport">Build bindings for the QtSerialPort module</flag>
+		<flag name="sql">Build bindings for the QtSql module</flag>
+		<flag name="svg">Build bindings for the QtSvg module</flag>
+		<flag name="testlib">Build bindings for the QtTest module</flag>
+		<flag name="webchannel">Build bindings for the QtWebChannel module</flag>
+		<flag name="websockets">Build bindings for the QtWebSockets module</flag>
+		<flag name="widgets">Build bindings for the QtWidgets module</flag>
+		<flag name="xml">Build bindings for the QtXml module</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://www.riverbankcomputing.com/mailman/listinfo/pyqt/</bugs-to>
+		<doc>https://www.riverbankcomputing.com/static/Docs/PyQt6/</doc>
+		<remote-id type="pypi">PyQt6</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/PyQt6_WebEngine/Manifest b/dev-python/PyQt6_WebEngine/Manifest
new file mode 100644
index 000000000000..6e7e1a4ed21f
--- /dev/null
+++ b/dev-python/PyQt6_WebEngine/Manifest
@@ -0,0 +1,3 @@
+DIST PyQt6_WebEngine-6.3.1.tar.gz 30607 BLAKE2B f07454684ce9c55ed8f477e7d7ba260af6d219b079e68d6752292310d1d8799b642acd3dad94b9259edfc9c41ee6249d2c1b69f57f7e5132dd71bc88e1e1d463 SHA512 61e30b6dbbd5d31dd03498b1d14279005bd00b59fe375f89b13cf318d5bdb6cbbf5449cd910303c9794ed14cbd25b0e63824ab952fc050d8c0451292c6f97be0
+EBUILD PyQt6_WebEngine-6.3.1.ebuild 1683 BLAKE2B a9867225b3f43c9621a5909d82e965f4a653f6e042501295fc894fe0d39947b45c4e9b05d56d58ff4b0557cbb56ac98c291c0c0c2a3c68dd802090c4b04e3895 SHA512 67a12a6339f1bc730c16a0903519b025f6de385a5cc76cb93d5f7ef1005aa74fa4ea4fe3af6ecdfcbadd24e1c9e6369dde75a9ab3f0d452f5e86a9d06b82371b
+MISC metadata.xml 572 BLAKE2B d0c911bf7d8f4f33e30daabfafe3447367045dce444dda4d8600ea47a844842996989ee7c64ccee6ce77a033bdbd1e7c58136e16ddd5f76a7b5688681f791d2c SHA512 11a8b7ab3fe9fa8e8a7160658aac5b8148a60f30b49bcba92cb08eee6d8f5021e4d117632dcddab98c9a0ebbbecd256ce09fbbe43f05105f7429355f9120e42f
diff --git a/dev-python/PyQt6_WebEngine/PyQt6_WebEngine-6.3.1.ebuild b/dev-python/PyQt6_WebEngine/PyQt6_WebEngine-6.3.1.ebuild
new file mode 100644
index 000000000000..f304d9d147f4
--- /dev/null
+++ b/dev-python/PyQt6_WebEngine/PyQt6_WebEngine-6.3.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=sip
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1 flag-o-matic multiprocessing qmake-utils
+
+QT_PV="6.3:6" # minimum tested qt version
+
+DESCRIPTION="Python bindings for QtWebEngine"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug quick +widgets"
+
+RDEPEND="
+	>=dev-python/PyQt6-${PV}[gui,ssl,${PYTHON_USEDEP}]
+	>=dev-qt/qtbase-${QT_PV}
+	>=dev-qt/qtwebengine-${QT_PV}[widgets]
+	quick? ( dev-python/PyQt6[qml] )
+	widgets? ( dev-python/PyQt6[network,printsupport,webchannel,widgets] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-python/PyQt-builder-1.11[${PYTHON_USEDEP}]
+	>=dev-qt/qtbase-${QT_PV}
+	sys-devel/gcc"
+
+src_prepare() {
+	default
+
+	# hack: qmake wants g++ (not clang), try to respect ${CHOST} #726112
+	mkdir "${T}"/cxx || die
+	ln -s "$(type -P ${CHOST}-g++ || type -P g++ || die)" "${T}"/cxx/g++ || die
+	PATH=${T}/cxx:${PATH}
+}
+
+src_configure() {
+	append-cxxflags -std=c++17 # for clang and old gcc that default to <17
+
+	# hack: currently lacking qt6_get_bindir (or alternatively have
+	# qmake6 in PATH like qmake5 is so it wouldn't matter)
+	local qmake6=$(qt5_get_bindir)/qmake6
+	qmake6=${qmake6//qt5/qt6}
+
+	DISTUTILS_ARGS=(
+		--jobs=$(makeopts_jobs)
+		--qmake="${qmake6}"
+		--qmake-setting="$(qt5_get_qmake_args)"
+		--verbose
+
+		--enable=QtWebEngineCore
+		$(usex quick --{enable,disable}=QtWebEngineQuick)
+		$(usex widgets --{enable,disable}=QtWebEngineWidgets)
+
+		$(usev debug '--debug --qml-debug --tracing')
+	)
+}
diff --git a/dev-python/PyQt6_WebEngine/metadata.xml b/dev-python/PyQt6_WebEngine/metadata.xml
new file mode 100644
index 000000000000..88c4a67e1477
--- /dev/null
+++ b/dev-python/PyQt6_WebEngine/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<use>
+		<flag name="quick">Build bindings for the QtWebEngineQuick module</flag>
+		<flag name="widgets">Build bindings for the QtWebEngineWidgets module</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://www.riverbankcomputing.com/mailman/listinfo/pyqt/</bugs-to>
+		<remote-id type="pypi">PyQt6-WebEngine</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/PyQt6_sip/Manifest b/dev-python/PyQt6_sip/Manifest
new file mode 100644
index 000000000000..f097d715861a
--- /dev/null
+++ b/dev-python/PyQt6_sip/Manifest
@@ -0,0 +1,3 @@
+DIST PyQt6_sip-13.4.0.tar.gz 111209 BLAKE2B 963d3788d0996565696e82e6a9c197c197322f8b1637cead79a4af8cf8d3ed1b82423ff41e507204aeddc5f16fa0b96b7e7a49c6848ac7438bd98885f3ae4dc6 SHA512 e93a88fedbb965a7ea605a33820798352c340d5656b3ad60c40adc8dbd24fdd18deb67e706595e3cb96e41d1e17d4c837f1224a1c250f0179c6b60b1a5b0e6a2
+EBUILD PyQt6_sip-13.4.0.ebuild 410 BLAKE2B c301cea78dff70e55607f175504e8457340adeb6b0dafce34d3212f6dd50e4eb8944dab7acc9b23f7c7e62dad90d0aa233c52b0fef633f88cbcb550bc3a0f3aa SHA512 e51f1064330c2c52fc194932989ffa2fe011eac282c06a4298464c1e614fe4a867b72ff08cdb9c4da153bed8989cf9886f724f877dba4403f280844755e4fbd4
+MISC metadata.xml 397 BLAKE2B e634d1d335e66f1999898912570f465e7f4e79f7e8aa60b9ad5e8038078ae65c93db31af3e25a7b879941b97704b81efe7e4ab8a698f710eecca914af733f4e7 SHA512 56fa4d44568faf5818bf66b2fef7c2e7cb5010de8c57c21c3c4c8550ab9da671af5afe71e83890e7432c73e5c299b46b6abf2fedbb519f408c21d395900fa490
diff --git a/dev-python/PyQt6_sip/PyQt6_sip-13.4.0.ebuild b/dev-python/PyQt6_sip/PyQt6_sip-13.4.0.ebuild
new file mode 100644
index 000000000000..c0e19cedab8a
--- /dev/null
+++ b/dev-python/PyQt6_sip/PyQt6_sip-13.4.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="sip module support for PyQt6"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-python/PyQt6_sip/metadata.xml b/dev-python/PyQt6_sip/metadata.xml
new file mode 100644
index 000000000000..a999cde076c9
--- /dev/null
+++ b/dev-python/PyQt6_sip/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://www.riverbankcomputing.com/mailman/listinfo/pyqt/</bugs-to>
+		<remote-id type="pypi">PyQt6-sip</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/aws-xray-sdk-python/Manifest b/dev-python/aws-xray-sdk-python/Manifest
index 9e5a0c984c22..9b504bb2a305 100644
--- a/dev-python/aws-xray-sdk-python/Manifest
+++ b/dev-python/aws-xray-sdk-python/Manifest
@@ -1,6 +1,4 @@
 AUX aws-xray-sdk-python-2.8.0-fix-py3.10-loops.patch 1533 BLAKE2B 709ffaa46c2934fda754745f918bd54444433d5d57c6bca65d8c9be5b940e7ec91f8de47e94a31262ecf7126bb2068ed453ad18a4d6a07fae42d2bf6e764a600 SHA512 fcea4f8e094d1c3354897349c8705e7268e264d9699ec61609796d451db865931b1c2fd4e273fb80427645c0968993756e685e688d303e7fbe7c0bdce88d968f
 DIST aws-xray-sdk-python-2.10.0.gh.tar.gz 270819 BLAKE2B caed5f5b92bdc25e0006663838549c9e9a85474829cce03f612ef4b9a36fce38460606e000c65bb140f7250225426bece2e8bc624a430bdfdcd4fc8808842aac SHA512 f5b4d08f5876cab2e833a763b1da52b6de1e3ca2c746b234a1b013f674155ec31686a6710225e411458f27ca096f68ee6413c8d1c360d5a326f1be94287d09b7
-DIST aws-xray-sdk-python-2.8.0.gh.tar.gz 267880 BLAKE2B 7a433a0b1b3ca38a100f3b23c79e9b0d7f84cb096f6d30832fdf16f171f9528aee8b81aaf3ba263a90d46f791de8b2f37a919651f9699e5fcf3073db83fc25b4 SHA512 e0fb3fb0bfbd963863714537ea12771df7ffa2857aaf4cdb6414d71ecdfc65c2623fa40a6a48c4eab30f4370d545a595db2762932133a6eba56121a4048502fb
-EBUILD aws-xray-sdk-python-2.10.0.ebuild 1923 BLAKE2B 2201ff273e3c6053b66a2a9f2244395afbf4f3679b0f552cc41f13d86fde30110e447c3e5ef5708fd0eace6eec634c8b6f527e981d6479f279c2f73d59b2b575 SHA512 d91c3fe7d380610b1cd8db5c11a30b41f8b7de6bc50980200d280254e432d1f4ceec989c9a9172b0e070c3dead3647a7cc93b29a8c88c79435da9ce700661254
-EBUILD aws-xray-sdk-python-2.8.0.ebuild 1903 BLAKE2B a100c485d032e3c80394222f7546112120a1c718098d3357ffc94c8c2e386a2499a5673926508c1ea94dcf1cd4e72ace16f68393e685d7a5c674f87111a57f6a SHA512 0bd8cdbb48b494eaf07ee0ea82a555d7b3e900fda2395580636d2379dd3d64fb1b7943ac6d17f56aafb91ecf8d33223f7e737c113703a0283315215e69a27e45
+EBUILD aws-xray-sdk-python-2.10.0.ebuild 1921 BLAKE2B 405220002f7969d032568b620acabc77a230a8dc8bcd08eac3028caa148dcce7f03e749ead339ce08fef5a55e5a5a89577ed185a050d8c7fd08dcf2173f57c4a SHA512 7b4103772341a16f230421fe391fe533d6ff83dfaef8e83bb0e993ccd85c8d2b20e9d0424a3ae23c76520a23edcd76007aec67f3f97c0d86f35667829988bc6a
 MISC metadata.xml 579 BLAKE2B 3f7aaed38bcceb97fb3597954ca9075ddf7a5718bcac69327be2b99d241c6d8cb0eefd369ca892c8d751703de9067c7eadf19f8c4445334ee8e4952b99fef69e SHA512 f3033cf16f60cae6727f80bd53944972f851579ffef8101cf6fda45e2575696183ec92ea8c994a77bbf3ffc8219be2ae2fae456faabe73a9896bcefddf3b5db5
diff --git a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.10.0.ebuild b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.10.0.ebuild
index 5cd390c0be9d..fa39672112ff 100644
--- a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.10.0.ebuild
+++ b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.10.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/botocore-1.12.122[${PYTHON_USEDEP}]
diff --git a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.8.0.ebuild b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.8.0.ebuild
deleted file mode 100644
index 6834ebf01d1e..000000000000
--- a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.8.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=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="AWS X-Ray SDK for Python"
-HOMEPAGE="https://github.com/aws/aws-xray-sdk-python https://pypi.org/project/aws-xray-sdk/"
-SRC_URI="
-	https://github.com/aws/aws-xray-sdk-python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-1.12.122[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.10-loops.patch"
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x DJANGO_SETTINGS_MODULE=tests.ext.django.app.settings
-	local -x AWS_SECRET_ACCESS_KEY=fake_key
-	local -x AWS_ACCESS_KEY_ID=fake_id
-
-	local EPYTEST_DESELECT=(
-		# Internet access
-		tests/test_patcher.py::test_external_file
-		tests/test_patcher.py::test_external_module
-		tests/test_patcher.py::test_external_submodules_full
-		tests/test_patcher.py::test_external_submodules_ignores_file
-		tests/test_patcher.py::test_external_submodules_ignores_module
-		tests/ext/aiohttp/test_client.py
-	)
-	local EPYTEST_IGNORE=(
-		# unpackaged deps
-		tests/ext/aiobotocore
-		tests/ext/pg8000
-		tests/ext/psycopg2
-		tests/ext/pymysql
-		tests/ext/pynamodb
-		tests/ext/sqlalchemy_core/test_postgres.py
-		tests/ext/django/test_db.py
-		# Internet access
-		tests/ext/httplib
-		tests/ext/requests
-	)
-
-	epytest -p no:django
-}
diff --git a/dev-python/awxkit/Manifest b/dev-python/awxkit/Manifest
index 7ed97136339d..d26e207d5d30 100644
--- a/dev-python/awxkit/Manifest
+++ b/dev-python/awxkit/Manifest
@@ -1,7 +1,9 @@
 DIST awxkit-21.1.0.gh.tar.gz 16516204 BLAKE2B 2891244e7dcb0aef7b2053713c4479b94528a69f1225a77c46243cb293ebfa2e86d59939bc906223e598c34a322a726c9b3f5fb9aa7859191385f9c15bae57a0 SHA512 2e2ff1ae5a1893e3ba464ff0ab3c5e98b7d0711c3ba1512b8a8f89e55385ab85df9623b23d6a81b2a800b0b184de1ef82fd23a655173fcbcebb1160e9eef973c
 DIST awxkit-21.2.0.gh.tar.gz 16531568 BLAKE2B aa6677408415b2abd6a8d0f3286e2147f0e5ad3d7650feb98dfe018c89431bf9b4fdc8c6c1c76aa9a26fe0d7c8a438cfa209fbe16b7480c7295c60352e30e21e SHA512 d2be8ffacc5b82600ecac5d909450f9eef3d205075c9783849bc50030abcc84ca6cae3682baf20de8e0efb9f651aa03374941d59cf52f9d4cb4b7892d5c0353c
 DIST awxkit-21.3.0.gh.tar.gz 15808522 BLAKE2B 0c8f563601e8140af763ef88d9c69232b1c5b5de726962c210883af78d400286f7a415971311a7543b150d165c10cadbfbbd11d58ea8b9336efe9db7a7d29493 SHA512 05f2996a51aedc059041d72a50c21b3dd161c958ac869e4c9d36b45ae483e2e4c6a743e8ba336acde8108fa43d9eec0131d76a8ef3cf0dbeec1416dc8317c698
+DIST awxkit-21.4.0.gh.tar.gz 16058858 BLAKE2B 215b18809bd1050c6e93a03711fd8cb1b96299c2f335d01e7c40ea54ee9aaefab652f86826914e908ff4a19a02e79a61fc13edd5533c6b619366f76aa7fcfa46 SHA512 fc4513e7adcbf75aa801dfedb1f92a08e1dbe804a0a8b18809ec5ef98dd42bdf08856c486a9781cc6d34a932a86d587a90eac28099016e956c7468078d44d3ba
 EBUILD awxkit-21.1.0.ebuild 960 BLAKE2B e05e602d0daf612c9b4818838600e71682202d4c87189c0c13797e80e958659b2b33c0f72bcc45bd9f961d6294597922c301ba82f27b2b10580500c4d9e5c62f SHA512 d374a109811987644fad287ddec4e83759de82e67d94435927d0d44f8b19e2f480eaaf08ac124317aaa77e6866b0f88bdbac7bb2c7123f6d510c6374f3d292f4
 EBUILD awxkit-21.2.0.ebuild 960 BLAKE2B e05e602d0daf612c9b4818838600e71682202d4c87189c0c13797e80e958659b2b33c0f72bcc45bd9f961d6294597922c301ba82f27b2b10580500c4d9e5c62f SHA512 d374a109811987644fad287ddec4e83759de82e67d94435927d0d44f8b19e2f480eaaf08ac124317aaa77e6866b0f88bdbac7bb2c7123f6d510c6374f3d292f4
 EBUILD awxkit-21.3.0.ebuild 960 BLAKE2B e05e602d0daf612c9b4818838600e71682202d4c87189c0c13797e80e958659b2b33c0f72bcc45bd9f961d6294597922c301ba82f27b2b10580500c4d9e5c62f SHA512 d374a109811987644fad287ddec4e83759de82e67d94435927d0d44f8b19e2f480eaaf08ac124317aaa77e6866b0f88bdbac7bb2c7123f6d510c6374f3d292f4
+EBUILD awxkit-21.4.0.ebuild 996 BLAKE2B 7137e273e2cbf2b5c494d94613f4a733844f6e9b71f2756f3d83d05a6678528654cfab2ef4e3b040fc223bc76c4507ce8c812bfd81c37dbacb3c456c129f35ae SHA512 72c18b13604394614e0cc429482448ba03a90737f8a7ffe7e8158fb8156cfc2f037cf40b8fdd4442349008d3c0a87f5cb828bb3bc7521b9d51da1621aa4d15d8
 MISC metadata.xml 512 BLAKE2B be7f98bdaff6b814e03c9f6c816a0f1f59dc2e8763298f8a48107ea50b0534eddb314bb6d8b8a0f8c1d7c89c381916031544eea4a06068fb9acab4d2c8c48a57 SHA512 7322d992e1d67ea200df0cbf144d08fd387d7cd6ccb72191fc94dd605c9aeecb4b8083917760e2203296d5514fccd7ca621133aef6622658d1ef2c33171c8b7d
diff --git a/dev-python/awxkit/awxkit-21.4.0.ebuild b/dev-python/awxkit/awxkit-21.4.0.ebuild
new file mode 100644
index 000000000000..f68b06f1595c
--- /dev/null
+++ b/dev-python/awxkit/awxkit-21.4.0.ebuild
@@ -0,0 +1,41 @@
+# 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_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command line interface for Ansible AWX"
+HOMEPAGE="https://github.com/ansible/awx"
+SRC_URI="https://github.com/ansible/awx/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/awx-${PV}/awxkit"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
+		-e "/'clean'/d" \
+		-i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 210e516e86f0..011bf0043d23 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,10 +3,12 @@ DIST boto3-1.24.31.gh.tar.gz 519387 BLAKE2B 8581d1018f0e1f0802779851edb52fdb6860
 DIST boto3-1.24.36.gh.tar.gz 522156 BLAKE2B b76cb50f01ff85c960a0984f950e72f02ac6e85131fd344142b886a3c745cb8b9073f865527911b88c462912413fce6df4066752ab5eec8ad1561d349ad22437 SHA512 fe00e78cc522248c449f83f869bb7d76793db9aa436259e74d0aa25984a02876191a7df41b1ad7658b06e418f248ad616743698c87a5c9696f77a196a53c561e
 DIST boto3-1.24.41.gh.tar.gz 523844 BLAKE2B 0cff30d6aba5e8eddb8f545737e22a146ef9a3c33df2ad5b4f6d0ef8fd67cb46183eb7fa21e8a961d2597df8d965478bcb0038f5dda117611bcfe15f0de26eac SHA512 ad3a6035352c54f7ba0197357a5a4e001c8fe7548121a9a3931acb69f9c098feb8da1d1699ac98d3ff00626f39082753434f1c992351a82cf269ce2c6a4eab06
 DIST boto3-1.24.42.gh.tar.gz 523969 BLAKE2B f8f802975f05246da85d5c1feafed0fbf612f5f67cb533178e189b1abc4edd9352dad5b0af44543d406dc405e7f18bf9792675e6b328c03c5ab0e5d55647289e SHA512 d0d102851d016cb4ae3db70c84005905495ba64142f79760fa2b477e6d0d6ea1f25062200fa5c42f685b07e5af3ef549562ef247a573c727ac8d341921bf4266
+DIST boto3-1.24.43.gh.tar.gz 524913 BLAKE2B f3a04f7ddd2b9b4cb9ca0c12a1306797d8bd96a459049f5fa0cf504a4d48afd5d83ec72f8c7bd6c5b3255bfe0d7ca0948c44c7a963c20773c4b04564167b6007 SHA512 b69eff403ffa4ebabf724168b664078d4e77f79f259f3bb2fbc7403067d5c0b7ad2fd067b6cd6227ce7289a25b16afd7a4ba219a18c2c616f3a266b2fcbe693d
 EBUILD boto3-1.24.26.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.31.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.36.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.41.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.42.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.43.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.24.43.ebuild b/dev-python/boto3/boto3-1.24.43.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.43.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+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/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.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.6.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/botocore/Manifest b/dev-python/botocore/Manifest
index 22ab5368d00d..10f211ffbd9f 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,10 +3,12 @@ DIST botocore-1.27.31.tar.gz 9184651 BLAKE2B 01dcd9e94490923f7d0f463d3019007f58c
 DIST botocore-1.27.36.gh.tar.gz 9465835 BLAKE2B c22c341d6e762316f3d8719bd8c1fd52140642739361a7ade326d739005dbd141a6b4e1798287b40bf7ba40cd5e158d36f195893d529f5ba375b06087d2122b9 SHA512 09ef156b3c0457ceef341bf26e3f060d3e91808f1da66d1dbb06ba2826be3c61e047383dc9d8a719bb8e172e91f6475f4613c14d30c57c6a909b51c8ba7334cc
 DIST botocore-1.27.41.gh.tar.gz 9493802 BLAKE2B dff510a658e77fe7185a8d118228cd80d06ea066328d39c56eaa8f01459dd11131ca73dcfe464a5e1403f8aceaa96065d5ea335bb268155c81c9b71299488d45 SHA512 29f419c4338e37bcc7fce38836b1f3b0ed1e552ea94cbe77ea09cd18c3c0b80d3405cd4a3468570c7eb6f1301bfed0d26dcc98feb7a1f62b9e8b1b11c61cdac5
 DIST botocore-1.27.42.gh.tar.gz 9493679 BLAKE2B 324c574bfa30b26428010750d1488a814946a505409afe356d7d7a55c4498d7c67c504638540083276c3ecf734693d21cb9c7650c1b3a05ef4f3638f92fdee21 SHA512 24ac5ddb90bb6b03369cf6ed1bc9364192d4f9a6904dbd285910c2c24efd0fe2fc9fffd55a94b6ad6ca38cb17748e7bc4a8fc54f6318d2ce6d915810d1f10aac
+DIST botocore-1.27.43.gh.tar.gz 9495496 BLAKE2B b445d81c9d56b4440e689559da576b82dc36c0c6cc8009ab97df16e5b012078b66367f4ce2140296b193d6fe729ddfeeae6fb3d561aab9a5018b18b1e62430c4 SHA512 f9314ed1dbca83c33f81f6454ada6566a401a9ce60dd77fbe491e0b8a5feab91161c953cbd6092c086fd9bbd4b2c8c6a0c9711941e1c8e96436d9062523ff656
 EBUILD botocore-1.27.26.ebuild 1572 BLAKE2B d019098e9bd4f40cfe93307947813ffe3e880e9462b25ff6eaa16caf3ffad2ea5c6db9e482b7b3dc995ca174bde48e90ecd8861a86291c1d454dcf6212bbe7d8 SHA512 db12020b9130b5b940a44ae7fca5a6b0e4c3d84fa2efcff156099d355cab185ea52cb3c4740ebbea25d865d6af8d64ae58ea1e4c6129b1c1026fe8bce6f0580d
 EBUILD botocore-1.27.31.ebuild 1572 BLAKE2B d019098e9bd4f40cfe93307947813ffe3e880e9462b25ff6eaa16caf3ffad2ea5c6db9e482b7b3dc995ca174bde48e90ecd8861a86291c1d454dcf6212bbe7d8 SHA512 db12020b9130b5b940a44ae7fca5a6b0e4c3d84fa2efcff156099d355cab185ea52cb3c4740ebbea25d865d6af8d64ae58ea1e4c6129b1c1026fe8bce6f0580d
 EBUILD botocore-1.27.36.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-1.27.41.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-1.27.42.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
+EBUILD botocore-1.27.43.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-9999.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.27.43.ebuild b/dev-python/botocore/botocore-1.27.43.ebuild
new file mode 100644
index 000000000000..6558cbe56a50
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.43.ebuild
@@ -0,0 +1,69 @@
+# 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_{8..11} )
+
+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="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.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}]
+	)
+"
+
+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/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index 277ebe98f7f9..e7415ffe3f06 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,6 +1,3 @@
-AUX bottleneck-1.3.4-install-test-data.patch 512 BLAKE2B 850df917f8b10b2c513c083863786072624c3e75c3dc81520f7325a3fe0b91d15b72fcf670b4fa047a56714ebcf7f101acd9b696c46cd0844105582cddd3ff7f SHA512 d1f27e5be6043b92372b1110b7705b3ca4fb01c4d62b9aefa9f5fe05b4d7cff9f8aef11d463785b55651b91b1c748851e1b571d801fc22d74c6d6e2ff52e9a09
-DIST bottleneck-1.3.4.gh.tar.gz 118739 BLAKE2B af4b32bf296f11538b12f364592553d407668762e1e2d94c814bf262bc9ef88f1338cd388ff1c02065f8266988fe6cad5f8461aed2a144a9bfaf98f8ae46eeae SHA512 0cb3837139f947a7da026bddc8ff6e8025ee0aac6aedf4046383eb8385789d1816158ae20438b15a28c7f0b6552c3570c18abdbb6ef265fa9f497edebae1d808
 DIST bottleneck-1.3.5.gh.tar.gz 118989 BLAKE2B 5b9338a77cb3f0253348f45e641dca9fce11b50fb632e697272203870dd604730c08f1adc94ebf9c6c21f551e3f06b5492bcb036d6f40eaec8853d08ca298873 SHA512 9a0f224337fd9d5c741a1e469197be26923eaffb143eddfe0969128ddc233c799da6a5f2ba4ef22f6267cf93e7f748c140fbb16f57149ad327c47fe87ffc3346
-EBUILD bottleneck-1.3.4.ebuild 863 BLAKE2B 3dbc46bbfde6c6633b7c76f7ca68ebab0d53def686fba15929b0b56a4b2b01d49b5375149582d5789ec3399093e2e8ff95d8a9ebf27ae8de8c5b043294018012 SHA512 2df59b21d20e23f0e8fe3a5603a54a126903cdb0d247ac0f9d8ca78f095805b8c4ecc0061e80dffe98766a59ac8f09964d3c79fde6158eef3dac984b8860a216
-EBUILD bottleneck-1.3.5.ebuild 766 BLAKE2B cb6679d17d3701a314388684599fe0017382e0c690254636f3d38e3ed07748ac0a1f12b5eb48b247deca2df74fce2c21424c10164185a30a8792292d1d18f1a1 SHA512 b96e714cef0eb07792f12eb10e50b517bb5c22b2e9fce6daaa9235e687bbdf04f89767fe5258f63354cb74808334c0358e9f7d371cc758f661712297e715ba38
+EBUILD bottleneck-1.3.5.ebuild 760 BLAKE2B a8b3242ccefd8ee88403581d830074475a685d59f82183a4a914353d7e26e48252c4f00d6b65069bccff0b6482c93f8a2cbe984fc4730b359dc9f1d59a9a694a SHA512 e1a58eb7d53b5256444e62cc7bb045874c06ccf89f508927d21f438e9e1535a32124f9754dd43ec15b534755b24421f99f2b32547c5621da5e3a75f9c234bf06
 MISC metadata.xml 519 BLAKE2B 5e5e712122fb0bbc898942cbae15c7cf623aa8462257f063f65a06bc9caae6662c373963f0945f99c5fffe01270e2792e8e5d01af93b49a04f5c3c22cd3a30f7 SHA512 55d2c03dedaa48c8f802d1e4d1d7db4e829fe7357b501c3b2955d28da501eae00675b2775ab36d1131cf2ef0a3d037183bde8df4c85e986d81510df4e234b0ae
diff --git a/dev-python/bottleneck/bottleneck-1.3.4.ebuild b/dev-python/bottleneck/bottleneck-1.3.4.ebuild
deleted file mode 100644
index c53291d5bbf6..000000000000
--- a/dev-python/bottleneck/bottleneck-1.3.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Fast NumPy array functions written in C"
-HOMEPAGE="
-	https://github.com/pydata/bottleneck/
-	https://pypi.org/project/Bottleneck/
-"
-SRC_URI="
-	https://github.com/pydata/bottleneck/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/pydata/bottleneck/pull/403
-	"${FILESDIR}"/${P}-install-test-data.patch
-)
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	epytest
-}
diff --git a/dev-python/bottleneck/bottleneck-1.3.5.ebuild b/dev-python/bottleneck/bottleneck-1.3.5.ebuild
index 818caeedd3bf..d1a52a75700d 100644
--- a/dev-python/bottleneck/bottleneck-1.3.5.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.3.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/bottleneck/files/bottleneck-1.3.4-install-test-data.patch b/dev-python/bottleneck/files/bottleneck-1.3.4-install-test-data.patch
deleted file mode 100644
index b1ac3edbcdf5..000000000000
--- a/dev-python/bottleneck/files/bottleneck-1.3.4-install-test-data.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/setup.py b/setup.py
-index db629bd..b0c10cd 100644
---- a/setup.py
-+++ b/setup.py
-@@ -185,7 +185,10 @@ metadata = dict(
-     platforms="OS Independent",
-     version=versioneer.get_version(),
-     packages=find_packages(),
--    package_data={"bottleneck": ["LICENSE"]},
-+    package_data={
-+        "bottleneck": ["LICENSE"],
-+        "bottleneck.tests": ["data/*/*"],
-+    },
-     requires=["numpy"],
-     install_requires=["numpy"],
-     extras_require={"doc": ["numpydoc", "sphinx", "gitpython"]},
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index 424ee5366c68..fa3f265c3935 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -2,5 +2,5 @@ AUX cffi-1.14.0-darwin-no-brew.patch 568 BLAKE2B 43afdb086a0385e913f287bc5c1534d
 DIST cffi-1.15.0.tar.gz 484058 BLAKE2B 0d2d470c7eb11b8a9526be816b153c4483a5cfb529d3d220a804842facae1f06e2a822aa2be9abb1b5648cb36a97033bffc1dd235d83bdf8c075d67a907aa7d9 SHA512 ee83efde6f77f4a0c5889088c4c208ed7b9071fe06dfc16a8d2396de07f78fe859e1e39866760198a9d700f3b7359e8715e8a3e4907feb81d3fc4b8dd0dbaca1
 DIST cffi-1.15.1.tar.gz 508501 BLAKE2B accc317385d9af7dbed3397afde63fbab63bfc935376d951802055c63796863ed102a940f192789924480b9b16751c8cf3d21caf9b262c479c61ffc977aac83c SHA512 e99cafcb029076abc29e435b490fa0573ee2856f4051b7ca8a5b38cd125d56dd9dae8b189f59ceb3d728a675da8ee83239e09e19f8b0feeddea4b186ab5173a5
 EBUILD cffi-1.15.0-r1.ebuild 1749 BLAKE2B c710a237cfe7792896a08d61896fc195ba5cc4f50a2a545dde4ed54dfed4a37baed202d5a94717805375caf853ed82ec68bae4abb81a995d2755c65f091b2b6c SHA512 3ede32681e8ce94d3988ac3d58e5788bb73f5bacc6c52c98df654aedae1f07b1377bd33ae133a7d79ee155bedce36a07bd46be7e4516423c77b93c70d932a12b
-EBUILD cffi-1.15.1.ebuild 1576 BLAKE2B 75fedd3cb62a77ebb676ff5deb5d925bfd538fc8d7e1de208af269d68f3edfb734d8b8c5912a83a8935dd7ffcfd7d6478f248b3c49829b988a6dc725a49d02fd SHA512 404c7becffa009cac6369feeccf63efbaba6c46f469f0ec9e334849dcaec6f10ea498dc2dc0142876d4025e22bcf8104307d7e9121c285103b478eff973cdd5a
+EBUILD cffi-1.15.1.ebuild 1570 BLAKE2B a0d736ac900f5dac784bbf76796b76a4dd82a6cd672c464a085381ef11c335162ab34b2269a3bd6c389051a047fa837cf448ed148571d5b0470220f21806cca1 SHA512 88c8eb9708b9929410d7e21cc17ebde7f7800f3ac1cf8476f0b4610a1c2bd49f6c418d8fac7f45b4b0a721e7ebcd0837580571603992925a44248d9864a7fff9
 MISC metadata.xml 318 BLAKE2B f914459fac4ae3d8ac9273fb721c52494513b932676f570f02cc4cfb2283705d8cfc761806ffed23c6f31c95a967398edee01c1536547c1830def5ca4144c003 SHA512 ec451f8c535f0d01dc7bcd248c002745947982cd469a02ac247d0d34f4d7a33374fa10c28d8f074932f0548dc500c3270b499dd08b18acbb9d308777bcc7e4f0
diff --git a/dev-python/cffi/cffi-1.15.1.ebuild b/dev-python/cffi/cffi-1.15.1.ebuild
index 54f6e3ffe8b7..f5e04846d0e8 100644
--- a/dev-python/cffi/cffi-1.15.1.ebuild
+++ b/dev-python/cffi/cffi-1.15.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	dev-libs/libffi:=
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index bdd40c4cea29..2b39984efb29 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,9 +1,7 @@
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
-DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD clang-python-13.0.1.ebuild 925 BLAKE2B 1dab0cbb672643072e7d824a262c81505d19e555f24f97f82156473affc2f5ba6fc34ec493ffeedbc82feb1245fc6a39126e1b81fcdc8f8b4ddd0b7fe108e4bb SHA512 11eaf5c7a484d756f01986eacce19c912666518892f3213ff42367c126c2d8474abf6608cca24e6250c64e7423464e7cb3e58c2b069c7febf4893b249f2ee304
-EBUILD clang-python-14.0.4.ebuild 956 BLAKE2B 491c8335c64484034663fd84ca2397e13afdd8cab6d3b4adfcc9317379e7a3620372ffe5996d4a0029a7d412f11a0d598f741a6893803ebadba85d330e49682a SHA512 4ef0d1ab2cbc3d277d4cced33fa87de7c3d43295a60a3b418ad4a95399e8de8c2e1e5c594681bf7ce1bfc465732d34b2db3a9e8636c0ed124ddf79c8ed7a5750
 EBUILD clang-python-14.0.6.ebuild 956 BLAKE2B 491c8335c64484034663fd84ca2397e13afdd8cab6d3b4adfcc9317379e7a3620372ffe5996d4a0029a7d412f11a0d598f741a6893803ebadba85d330e49682a SHA512 4ef0d1ab2cbc3d277d4cced33fa87de7c3d43295a60a3b418ad4a95399e8de8c2e1e5c594681bf7ce1bfc465732d34b2db3a9e8636c0ed124ddf79c8ed7a5750
 EBUILD clang-python-15.0.0.9999.ebuild 935 BLAKE2B d1b871cd5604ded49427be7bbd4453b30b11515c6befc0d4202bb5602c387e41b789a6e14eebefc2a55723a1b4f683a82d41de4bdcbbdfdd85117f5ce64674c4 SHA512 e55abe1dfb64dc1d85c564013d1a01da128cbcb252aa118529ef61b8f0f17a0ae8653ef757a0b59f1b7d45e887951fdcc242bdc1cedaf9b1628047e4a33678cb
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-python/clang-python/clang-python-14.0.4.ebuild b/dev-python/clang-python/clang-python-14.0.4.ebuild
deleted file mode 100644
index 414fb007ea1d..000000000000
--- a/dev-python/clang-python/clang-python-14.0.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-DEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/django-crispy-forms/Manifest b/dev-python/django-crispy-forms/Manifest
index f87be2a8180e..fa4bd0f8bf72 100644
--- a/dev-python/django-crispy-forms/Manifest
+++ b/dev-python/django-crispy-forms/Manifest
@@ -1,3 +1,3 @@
 DIST django-crispy-forms-1.14.0.tar.gz 295826 BLAKE2B 4be78ba2eb8b7dfd6d9813d2a94b26ca571f3c8767f22e37e64deca517b0044d1684343f82790860f024b6eaf6759acfdb6975e4497e40bb75cc64ace3ce9745 SHA512 964ebcd74dd284d11cd0a820238468cce415a61b9ac83afe401b1414da0e27b3e9e0a9aa4fec411a8ff9fa08aa6fb56550c6262e0a9d821b17e12590fc06970c
 EBUILD django-crispy-forms-1.14.0.ebuild 513 BLAKE2B a5fef681d0d4815787df6b3ac681e8e1a30d8300c5eef495d802ea842039b03b8f287af9efc2d803102350f9e0ce0e3a7714b6e6c8832b6ca80826f465927489 SHA512 4874e3e634fd83c5527653230e76c4b1c0f8ba85c0fe6ca2ea1b9b29c5f3732c91d84db0b50d77037881ae881e98d39eda55153169f8b6e8c18973f1ef506825
-MISC metadata.xml 408 BLAKE2B 562679975cbc8642795f2366edf7061fe22703d88b6e24b7f3cffa35dfa4982934834c3991f436a25f330cc4cb7e20e939a6e589dbbfbad25f23c99d36237c86 SHA512 f4dba401041c328d9e42f6d603d80fa943cdf441d6a12d140b753b3196d561d0a2cdd2fc4a2b81103674e6867f288d9847534651a53a3169c2cbcfa30b22d1fb
+MISC metadata.xml 409 BLAKE2B d9663843245601ca8675fd522ca3b4150c36611874fb852f3c0c7bf68ec9595cb45ef66c293d658c13670f18bca6949a2747cffbbf819b55cd9b30ca6340bfba SHA512 2b1091cac748a00099f3a1685150bc8dfdf252b18b7e5c2fc17a8ca5054ec7ac0e72286dba872ead0354b4bae02cc3c410a5d05828f9dc257919526077bffc8d
diff --git a/dev-python/django-crispy-forms/metadata.xml b/dev-python/django-crispy-forms/metadata.xml
index 0e3ee306f637..af8be72c1475 100644
--- a/dev-python/django-crispy-forms/metadata.xml
+++ b/dev-python/django-crispy-forms/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>tupone@gentoo.org</email>
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 6c627c024850..fd06dd774ce5 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,7 +1,5 @@
-DIST dulwich-0.20.43.tar.gz 423604 BLAKE2B e8f6b3fc22ac2289e6529d862f54d8c407725c8d22ba9ee7ddb0d700b4ea617f8b069b14168c43c25cccf6e84592e63f88d3402e58b15413952e5b139bda2c2b SHA512 68ef6e3928a202d76ab882d764d08f8948743825b3b07950a81bd86522c9db6865260c2c725a08b26365719e99343daa1c2a2d242bafe991be2552d06b2e3684
 DIST dulwich-0.20.44.tar.gz 425226 BLAKE2B ba120c682b0fd298a9f17eec524ffdd92af9024e30d0b8c52accda3ef8a1d4876b483e8aaa5f12b4beb73a6c1719ed4504c52396cd355244ab688ceab551faaf SHA512 124a3ae89abf5df9e192919f916012be67112195fc7cfd7c30e814a04d93749a3dc396e12f2d8df1456b113a24cdd1b2f3a1f2733864d5cfad22431a987c25fb
 DIST dulwich-0.20.45.tar.gz 424373 BLAKE2B 4eb6731312bd8bb45d35efdc1e640dd2cfb118b633de461c4f9ffa2a9e50258bada2c77b4d4bf2e72bc9947f143f89fd720e4e9411f0f84d67ab208f39f7b4b8 SHA512 5b7217fac88a84591e42db2cd3c812a0aae6482221e1da9474df9b3fd968a80b653353fec804103f36a29f0f96e650267f124575a260dd082a3106de5f13fc7b
-EBUILD dulwich-0.20.43.ebuild 1644 BLAKE2B c27c433faf91999c3a52391cde1bd690c19edaf77b12f5b7fbccb9c5c9c52f2cd7ff0bb1ee162991738ff46d8ab892b10d4590c3b2f6f0aa653b04a2dcbfdd0a SHA512 bd78b84c26d625706bffcecd4fa3cb187746392df0366f4107262628034dbbe7095ea9a54fc9d826acaa8ce315c7c5ec33d62a5b7c2e85d58c77d75504caeea6
-EBUILD dulwich-0.20.44.ebuild 1648 BLAKE2B 3fd03d65cbc5d76d7a6bb7dc1b65bf1e87c41a75479e891d43555dcfb5739649465c6548152011bf33e058a3da45b645ae1a8a8b527d6ef7154c9a1784d6aa99 SHA512 e89ffbc7baa3c8ee0df81ca231230d97ce837022bdbc001ba157d7074eff5900113c9fb23a0b4f7b7e5a555fd4dd505a39439bbbfc7a1b79241eb5bb0c518d46
+EBUILD dulwich-0.20.44.ebuild 1644 BLAKE2B c27c433faf91999c3a52391cde1bd690c19edaf77b12f5b7fbccb9c5c9c52f2cd7ff0bb1ee162991738ff46d8ab892b10d4590c3b2f6f0aa653b04a2dcbfdd0a SHA512 bd78b84c26d625706bffcecd4fa3cb187746392df0366f4107262628034dbbe7095ea9a54fc9d826acaa8ce315c7c5ec33d62a5b7c2e85d58c77d75504caeea6
 EBUILD dulwich-0.20.45.ebuild 1648 BLAKE2B 3fd03d65cbc5d76d7a6bb7dc1b65bf1e87c41a75479e891d43555dcfb5739649465c6548152011bf33e058a3da45b645ae1a8a8b527d6ef7154c9a1784d6aa99 SHA512 e89ffbc7baa3c8ee0df81ca231230d97ce837022bdbc001ba157d7074eff5900113c9fb23a0b4f7b7e5a555fd4dd505a39439bbbfc7a1b79241eb5bb0c518d46
 MISC metadata.xml 556 BLAKE2B 240554ff522160e9508bf6debadafcc44b5ccc4074dd4c9d3ce82358963084c60a1afae9fafee6ab1e6e5d898940ccb4d1b524cebff155e61bf6707c9396b647 SHA512 a7cdca224a01d5bd26bf4a5adb0273977ddff61f75cd02f5642132656fd0c6608114617efcb068d834f107804666cf4fb3725967e804b73d2ddcb67342dc30de
diff --git a/dev-python/dulwich/dulwich-0.20.43.ebuild b/dev-python/dulwich/dulwich-0.20.43.ebuild
deleted file mode 100644
index 8d39b956a1f3..000000000000
--- a/dev-python/dulwich/dulwich-0.20.43.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
-	https://github.com/jelmer/dulwich/
-	https://pypi.org/project/dulwich/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		!hppa? ( !ia64? ( !s390? (
-			dev-python/gevent[${PYTHON_USEDEP}]
-			dev-python/geventhttpclient[${PYTHON_USEDEP}]
-		) ) )
-		app-crypt/gpgme[python,${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/fastimport[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	# remove interference from the tests that do stuff like user.name
-	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
-		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
-	# Do not use make check which rebuilds the extension and uses -Werror,
-	# causing unexpected failures.
-	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite ||
-		die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/dulwich-0.20.44.ebuild b/dev-python/dulwich/dulwich-0.20.44.ebuild
index 95effa84bf17..8d39b956a1f3 100644
--- a/dev-python/dulwich/dulwich-0.20.44.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.44.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ensurepip-wheels/Manifest b/dev-python/ensurepip-wheels/Manifest
new file mode 100644
index 000000000000..f787efc6dd74
--- /dev/null
+++ b/dev-python/ensurepip-wheels/Manifest
@@ -0,0 +1,4 @@
+DIST pip-22.2.1-py3-none-any.whl 2044666 BLAKE2B 702699d059273182f248acb48f6f6c9ec287e2edb3de2c84c05402b4fc82da23c14f76e2d3ed8cc1c281e3c8d8fd1a467963d3b9ab6fa384c16d5057fce1561d SHA512 dad2ce78544502a3ec4492a57acc5c1cf6f34ee1d3200a46cf19246f7eda701524d745237909b154317c3d6be6d4e61b086be9562d31d54b60268ca573692638
+DIST setuptools-63.3.0-py3-none-any.whl 1228351 BLAKE2B 5a7a8d864b5fc992952a4c7f0230c3ebb6f33c7b4fc965ca8bfa4cf3b57948e8353f59074f7374e3d002866333d3ad5fd072ccd479f8470cbfcd14aa635efc54 SHA512 f2df66493fb9520b50e3e93560b17e5aa6f01e5fde27028a550249beb54f3ea6b2d8f0a2bcc57afaff193e38d5b217544c0623b254ac300652aed444abf06a14
+EBUILD ensurepip-wheels-63.3.0.22.2.1.ebuild 848 BLAKE2B 2d4062dcde645e944dcc73a9fe8150ded2473bdeb0656832223cc1071b8fbc9b99522eff3eef11778ac9f12e97a85a8c99bdd78a4fd85b7b87b6711439d5e0c4 SHA512 cd12ffe723070c282e9f92ce6c0b125ba0f336e73d063c68f49ad4c91e29dba542ed877dcfe1afd5913c71cfc1f0cc8333d0cb8f7f9ee36050e8f42610a3498d
+MISC metadata.xml 333 BLAKE2B 800dafc25b6f76bebd9f1d47d42e3427c7024ea0114c00201a766fd33d2cd2a466587da9e1cb22b2cd6e45637e8b8f93af7b6a52afd5fbbd460bea880f55a2e8 SHA512 40ee1087f3b5575c3a86368a5ee56c606442e8ace9396eb409bcfda734cc480e781f75d861253772cf9ef113d3cc4a05687b76df45ad5ecff984460ce54583e7
diff --git a/dev-python/ensurepip-wheels/ensurepip-wheels-63.3.0.22.2.1.ebuild b/dev-python/ensurepip-wheels/ensurepip-wheels-63.3.0.22.2.1.ebuild
new file mode 100644
index 000000000000..691136b4b5bb
--- /dev/null
+++ b/dev-python/ensurepip-wheels/ensurepip-wheels-63.3.0.22.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+SETUPTOOLS_WHL=setuptools-$(ver_cut 1-3)-py3-none-any.whl
+PIP_WHL=pip-$(ver_cut 4-)-py3-none-any.whl
+
+DESCRIPTION="Shared wheels for ensurepip Python module"
+HOMEPAGE="
+	https://pypi.org/project/pip/
+	https://pypi.org/project/setuptools/
+"
+SRC_URI="
+	https://files.pythonhosted.org/packages/py3/p/pip/${PIP_WHL}
+	https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
+"
+S=${DISTDIR}
+
+# combined license of setuptools and pip (with its bundled deps)
+LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+src_install() {
+	insinto /usr/lib/python/ensurepip
+	doins "${PIP_WHL}" "${SETUPTOOLS_WHL}"
+}
diff --git a/dev-python/ensurepip-wheels/metadata.xml b/dev-python/ensurepip-wheels/metadata.xml
new file mode 100644
index 000000000000..0c63c4e2b6a7
--- /dev/null
+++ b/dev-python/ensurepip-wheels/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pip</remote-id>
+		<remote-id type="pypi">setuptools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/fixtures/Manifest b/dev-python/fixtures/Manifest
index bf0128479b1d..b9d78b79f5b7 100644
--- a/dev-python/fixtures/Manifest
+++ b/dev-python/fixtures/Manifest
@@ -1,7 +1,3 @@
-AUX fixtures-4.0.0-py311.patch 5084 BLAKE2B 6cf7ec50b13ed6a76dcfd4f6b4a3c5dfc0062bcc3895811e1c26d156d15045c307f4e3050c086c0bb71b772f16dcd4f135126a6a853d622a5bc24f0c67aa11dc SHA512 99b7e5e3c26f58ce07b308cf4a53e2f90294b3a2fb2748276e882d28fcf4cb6ea5b0406beb6d3a920e775bb982cd6708b2852429b4e7676b9d0e9bd4849c516a
-AUX fixtures-4.0.0-pypy39.patch 2158 BLAKE2B a46f4983224a28c9ec5c8cf40565fb9fb744b00435f68e632a0f95b447eed8fce2776e8f1639fa8b50d92eec3fc5a0550eaf30eaf99f082fbaf49def1475df40 SHA512 d94427b5c8d44295311849d9c93271edf829393a30ab98030e0e0270b6fcbc10467e000f50ba8dd863845e12fb1958405ea1bcc6d0ecdaa56f7ca0e628eb5013
-DIST fixtures-4.0.0.tar.gz 56786 BLAKE2B 7fa8916d3e384a47c967b51ffeebb81c50c4be7432601aa94f220b6ae32ed189f16750cb126c2925995c2e945684c48041014a97902145343527e8856125b61a SHA512 dcd67c3df9efc16f2a21b6d2917a5b7e45ecc09d1ddbd1de98a5b4b717ea7da0fc82e1054f494255b419a792e841145110c77a1772444f4019fc02e9917c5b80
 DIST fixtures-4.0.1.tar.gz 56752 BLAKE2B bddda3976ec453129fa05e53da066344ed8f4db9626ec21dd0159e6720993da0c17e3b51ba37de2ef05cd7649809d674cc6409b16c8e1d242dc424d573010975 SHA512 722436f146768e4db1e3312a0db1edab2a7daa86107825fb2436654eaf74e00f569357531316df506ef3f80cef89ac7185aee1adf0b00a6ee85cbc9811ca8100
-EBUILD fixtures-4.0.0.ebuild 848 BLAKE2B 5937eee87567b573377df40ab2a7e6cda7f68b481a67a9b93153fdd4fb248b74882d37b2c6ee016d0e98c4c70711da49904c4eb98218d562c45c964c08a95083 SHA512 901a2eccb8ee1bd1f9fdbf449a1a9745ebe1efc88252591d2db8c8a523f1f3e1bd96e89a6789b0cdadc41bdae8434a8581a68d94d5a22129f29c35e875fed406
-EBUILD fixtures-4.0.1.ebuild 778 BLAKE2B a4e4f6898e00e9b17b2ae12788a97f686be28acf4d638bc575de58f643f975f3304b8013674b690b29b7ec98b5245eb83d1e7330cb51443de6c34360fdb3d07e SHA512 5134dccf7b4ec0855b25ae10a2662ab53416447cf5977ea67af44836e33970aa9771c19e0004c3055fb452acb74f2f8195692521fc383cd9ed834c602215f8f5
+EBUILD fixtures-4.0.1.ebuild 770 BLAKE2B f33e64792577e83e36cc92ba30894b9ee418b2318a2c4304d29c006136c8180aab2327908adf8998af55f96e163b4a7277dab9f863ac86062b773daf9e2a5df8 SHA512 c891024ddc95e84f26f80fcb65869139215c361e994afb3405e089cd8d641427743ec238306d32ba1f471cdc4b0535fc40ad535109dad241b5d64f00ecab9b55
 MISC metadata.xml 914 BLAKE2B 402ef182133763f0b36e4653622cd9ef0bfa1871b05518aaf01701f1c57665ce358d002dc6e638ebd224225069a5b57877ff393567db7607dd0496a872edb2e5 SHA512 368e2a3587fa361618e5208f4c34a15a223bcdc2597dcbd25f5ba8ca74e67a0de4abb1f690f853ca8059df22eee61bf259e974aa92b1e8050435099d81a7a0db
diff --git a/dev-python/fixtures/files/fixtures-4.0.0-py311.patch b/dev-python/fixtures/files/fixtures-4.0.0-py311.patch
deleted file mode 100644
index 6cda1104afca..000000000000
--- a/dev-python/fixtures/files/fixtures-4.0.0-py311.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 54ef596952d459d605fcb40f13bed6d07ef93f4c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 21 May 2022 12:15:21 +0200
-Subject: [PATCH 1/2] Update classmethod expectations (again) for Python 3.11
-
-It seems that the classmethod behavior in Python 3.11.0b1 is back
-to the one found in Python 3.8.  Adjust the test expectations again.
-This time around, we expect the "old-new" behavior in CPython 3.9
-and 3.10 only.
----
- fixtures/tests/_fixtures/test_monkeypatch.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/fixtures/tests/_fixtures/test_monkeypatch.py b/fixtures/tests/_fixtures/test_monkeypatch.py
-index 08cd1c8..fa08b24 100644
---- a/fixtures/tests/_fixtures/test_monkeypatch.py
-+++ b/fixtures/tests/_fixtures/test_monkeypatch.py
-@@ -24,7 +24,8 @@ from fixtures import MonkeyPatch, TestWithFixtures
- reference = 23
- 
- NEW_PY39_CLASSMETHOD = (
--    sys.version_info >= (3, 9) and not hasattr(sys, "pypy_version_info"))
-+    sys.version_info[:2] in ((3, 9), (3,10))
-+    and not hasattr(sys, "pypy_version_info"))
- 
- class C(object):
-     def foo(self, arg):
--- 
-2.35.1
-
-From 48d8626168a374c099fa891d7e734548e1e03683 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 21 May 2022 12:25:49 +0200
-Subject: [PATCH 2/2] Support Popen's process_group argument from Python 3.11
-
----
- fixtures/_fixtures/popen.py            |  9 +++++++--
- fixtures/tests/_fixtures/test_popen.py | 14 ++++++++++++++
- 2 files changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/fixtures/_fixtures/popen.py b/fixtures/_fixtures/popen.py
-index ffa9bf4..a099854 100644
---- a/fixtures/_fixtures/popen.py
-+++ b/fixtures/_fixtures/popen.py
-@@ -131,7 +131,8 @@ class FakePopen(Fixture):
-         restore_signals=_unpassed, start_new_session=_unpassed,
-         pass_fds=_unpassed, *, group=_unpassed, extra_groups=_unpassed,
-         user=_unpassed, umask=_unpassed, encoding=_unpassed,
--        errors=_unpassed, text=_unpassed, pipesize=_unpassed):
-+        errors=_unpassed, text=_unpassed, pipesize=_unpassed,
-+        process_group=_unpassed):
-         # Reject arguments introduced by newer versions of Python in older
-         # versions; this makes it harder to accidentally hide compatibility
-         # problems using test doubles.
-@@ -149,6 +150,10 @@ class FakePopen(Fixture):
-             raise TypeError(
-                 "FakePopen.__call__() got an unexpected keyword argument "
-                 "'pipesize'")
-+        if sys.version_info < (3, 11) and process_group is not FakePopen._unpassed:
-+            raise TypeError(
-+                "FakePopen.__call__() got an unexpected keyword argument "
-+                "'process_group'")
- 
-         proc_args = dict(args=args)
-         local = locals()
-@@ -158,7 +163,7 @@ class FakePopen(Fixture):
-             "universal_newlines", "startupinfo", "creationflags",
-             "restore_signals", "start_new_session", "pass_fds", "group",
-             "extra_groups", "user", "umask", "encoding", "errors", "text",
--            "pipesize"]:
-+            "pipesize", "process_group"]:
-             if local[param] is not FakePopen._unpassed:
-                 proc_args[param] = local[param]
-         proc_info = self.get_info(proc_args)
-diff --git a/fixtures/tests/_fixtures/test_popen.py b/fixtures/tests/_fixtures/test_popen.py
-index c7bf1bd..e9ab074 100644
---- a/fixtures/tests/_fixtures/test_popen.py
-+++ b/fixtures/tests/_fixtures/test_popen.py
-@@ -74,6 +74,8 @@ class TestFakePopen(testtools.TestCase, TestWithFixtures):
-             all_args["umask"] = "umask"
-         if sys.version_info >= (3, 10):
-             all_args["pipesize"] = "pipesize"
-+        if sys.version_info >= (3, 11):
-+            all_args["process_group"] = "process_group"
- 
-         def get_info(proc_args):
-             self.assertEqual(all_args, proc_args)
-@@ -110,6 +112,15 @@ class TestFakePopen(testtools.TestCase, TestWithFixtures):
-                 r".* got an unexpected keyword argument 'pipesize'"):
-             fixture(args="args", pipesize=1024)
- 
-+    @testtools.skipUnless(
-+        sys.version_info < (3, 11), "only relevant on Python <3.11")
-+    def test_rejects_3_11_args_on_older_versions(self):
-+        fixture = self.useFixture(FakePopen(lambda proc_args: {}))
-+        with testtools.ExpectedException(
-+                TypeError,
-+                r".* got an unexpected keyword argument 'process_group'"):
-+            fixture(args="args", process_group=42)
-+
-     def test_function_signature(self):
-         fake_signature = inspect.getfullargspec(FakePopen.__call__)
-         real_signature = inspect.getfullargspec(subprocess.Popen)
-@@ -130,6 +141,9 @@ class TestFakePopen(testtools.TestCase, TestWithFixtures):
-         fake_kwargs = set(fake_signature.kwonlyargs)
-         real_kwargs = set(real_signature.kwonlyargs)
- 
-+        if sys.version_info < (3, 11):
-+            fake_kwargs.remove('process_group')
-+
-         if sys.version_info < (3, 10):
-             fake_kwargs.remove('pipesize')
- 
--- 
-2.35.1
-
diff --git a/dev-python/fixtures/files/fixtures-4.0.0-pypy39.patch b/dev-python/fixtures/files/fixtures-4.0.0-pypy39.patch
deleted file mode 100644
index dfe7bade82fa..000000000000
--- a/dev-python/fixtures/files/fixtures-4.0.0-pypy39.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2adba3989fc3d1723eb6534ae0bc1aeaf1513cfa Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 28 Apr 2022 12:14:55 +0200
-Subject: [PATCH] Revert to the previous classmethod expectations for PyPy3.9
-
-Commit fe83067 has changed TestMonkeyPatch to account for changes
-in classmethod handling in CPython 3.9.  Unfortunately, this broke
-the tests on PyPy3.9.  Revert to the old expectations when using PyPy.
-
-Fixes #64
----
- fixtures/tests/_fixtures/test_monkeypatch.py | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/fixtures/tests/_fixtures/test_monkeypatch.py b/fixtures/tests/_fixtures/test_monkeypatch.py
-index 746f6dd..08cd1c8 100644
---- a/fixtures/tests/_fixtures/test_monkeypatch.py
-+++ b/fixtures/tests/_fixtures/test_monkeypatch.py
-@@ -23,6 +23,9 @@ from fixtures import MonkeyPatch, TestWithFixtures
- 
- reference = 23
- 
-+NEW_PY39_CLASSMETHOD = (
-+    sys.version_info >= (3, 9) and not hasattr(sys, "pypy_version_info"))
-+
- class C(object):
-     def foo(self, arg):
-         return arg
-@@ -196,7 +199,7 @@ class TestMonkeyPatch(testtools.TestCase, TestWithFixtures):
-             # with the class
-             #
-             # https://bugs.python.org/issue19072
--            if sys.version_info >= (3, 9):
-+            if NEW_PY39_CLASSMETHOD:
-                 cls, = C.foo_cls()
-                 self.expectThat(cls, Is(D))
-                 cls, = C().foo_cls()
-@@ -238,13 +241,13 @@ class TestMonkeyPatch(testtools.TestCase, TestWithFixtures):
-             self.expectThat(slf, Is(d))
-             # See note in test_patch_classmethod_with_classmethod on changes in
-             # Python 3.9
--            if sys.version_info >= (3, 9):
-+            if NEW_PY39_CLASSMETHOD:
-                 self.expectThat(cls, Is(None))
-             else:
-                 self.expectThat(cls, Is(C))
-             slf, cls = C().foo_cls()
-             self.expectThat(slf, Is(d))
--            if sys.version_info >= (3, 9):
-+            if NEW_PY39_CLASSMETHOD:
-                 self.expectThat(cls, Is(None))
-             else:
-                 self.expectThat(cls, Is(C))
--- 
-2.35.1
-
diff --git a/dev-python/fixtures/fixtures-4.0.0.ebuild b/dev-python/fixtures/fixtures-4.0.0.ebuild
deleted file mode 100644
index 75916b42f6b4..000000000000
--- a/dev-python/fixtures/fixtures-4.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pbr
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Fixtures, reusable state for writing clean tests and more"
-HOMEPAGE="
-	https://github.com/testing-cabal/fixtures/
-	https://pypi.org/project/fixtures/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/pbr-5.7.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pypy39.patch
-	"${FILESDIR}"/${P}-py311.patch
-)
diff --git a/dev-python/fixtures/fixtures-4.0.1.ebuild b/dev-python/fixtures/fixtures-4.0.1.ebuild
index 5bd679ac1415..9b3bfd2269d4 100644
--- a/dev-python/fixtures/fixtures-4.0.1.ebuild
+++ b/dev-python/fixtures/fixtures-4.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/pbr-5.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 4bbffce40d52..b60c93b38e9a 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -2,7 +2,9 @@ AUX flake8-4.0.1-upgrade-mccabe.patch 321 BLAKE2B 6febcff41b8064731f3a91bd978551
 DIST flake8-4.0.1.tar.gz 154905 BLAKE2B b93fea36236881da595ae924b056686e0cd35d2466c1858e3ee83262922df8bc38cf5cd40a910980d287d048572dc94eb8d7c8ee4b11ebd1b4a474dfca02490c SHA512 0bdbf0218ce893df1c3e61f51cd3f371a5c72bb49ef78fec39548b1684e49b024e91cf4e3dcea60ba1efc08727985ef485814c372461e062ff4f810da99a1796
 DIST flake8-5.0.1.gh.tar.gz 145559 BLAKE2B 27c49d0e30696be086a68382235611fccf978edbd73fff0b41cd285eb6443bc183f12d54337777d07348951a6e1775793608be567149fecdfcd40cb75e879fcd SHA512 63e91269c9cad7d5807a5b6cc6dfe5fc1db6353fe28bbb6b3459e9a7ee3140db2a40c202d5964acc69546af386d4f0ea5132cbcc60d07f179960249827062440
 DIST flake8-5.0.2.gh.tar.gz 145812 BLAKE2B 64ebbeebf8aa2dc4dca2e14cb09965cfa86f6a5353f5ff78cb0cb2a8e60cd05d041e3d1e1668a1f9c143030bb62ca6d8d17d8b084a2e56175843460cf0bfe78c SHA512 0d1ba9bff706060bd9d5ad0f230c7a4d8a2b70f30907c8a78222d54b0f099f77b7a48e5658251cb862d0894a45e230b058bf50ba324ea1d4ddcdf1336c343cb6
+DIST flake8-5.0.3.gh.tar.gz 145956 BLAKE2B c6a54c67962bad905827600632f08b73c34c42ffe4f4242b9448b222ef0d1339d9e68174bcb17a8b85f357783e847c3171f963f7d21d9d2014af02c4a5e5856d SHA512 db2ce4a2bbbcc97c3a79dbf64e299ef2853470ace99dceae0dd63a5f58603531af2d4afe3f3db76ac483bb5c8884bfbaf15ba4c9e61f6b507634cbff83dcbb47
 EBUILD flake8-4.0.1-r2.ebuild 1233 BLAKE2B 8b22865d9d36db9a860b4132b71dcc9ce9a4de8d00312538fe7f5880d70763a4300151379222d10bfffcbcae965533581096fd47b0bcb0a2d89337cabc44c8dc SHA512 d99542c787c24d2ea3473b3acaa24f0debf53a9b038d5f14374932efc1f760c68f1aa066729b4f60c0a55e75e7b0f2d260ab4867f85652065d294d0399b8e340
 EBUILD flake8-5.0.1.ebuild 1245 BLAKE2B 93f0af3655fe3a220a0085451f6212326531253cbb2566bc582757cf44cae1706b723050aa1a6be40459bc82d16ca844aec7d6fdf990722af4a9c0e9b0ec2e9e SHA512 f974db0529efa02f5853742e65a2466c3e0d3d0e396d3911a4f0e450280c91531203f504d5f4980e57d555484a15e05fb1eb44ea9d695aa5b3003be8bdb6e0f4
 EBUILD flake8-5.0.2.ebuild 1245 BLAKE2B 93f0af3655fe3a220a0085451f6212326531253cbb2566bc582757cf44cae1706b723050aa1a6be40459bc82d16ca844aec7d6fdf990722af4a9c0e9b0ec2e9e SHA512 f974db0529efa02f5853742e65a2466c3e0d3d0e396d3911a4f0e450280c91531203f504d5f4980e57d555484a15e05fb1eb44ea9d695aa5b3003be8bdb6e0f4
+EBUILD flake8-5.0.3.ebuild 1245 BLAKE2B 93f0af3655fe3a220a0085451f6212326531253cbb2566bc582757cf44cae1706b723050aa1a6be40459bc82d16ca844aec7d6fdf990722af4a9c0e9b0ec2e9e SHA512 f974db0529efa02f5853742e65a2466c3e0d3d0e396d3911a4f0e450280c91531203f504d5f4980e57d555484a15e05fb1eb44ea9d695aa5b3003be8bdb6e0f4
 MISC metadata.xml 399 BLAKE2B 70701bbf00aac5f16ae5bb241b56a69c79abe02eea8695d5cdf71fb427e5ed1f1e19dca0e77904889a99e22026b39d64c309d4072dc4175f7660e414aec3736d SHA512 98ef1cc82925436bd40fe18876be4ba3b8b5aee42e62e73406b46ac49cdd2c689a69e4e685fb5f69f5ea7fbf6335797dc059817f4cf36f51c73404255830acf9
diff --git a/dev-python/flake8/flake8-5.0.3.ebuild b/dev-python/flake8/flake8-5.0.3.ebuild
new file mode 100644
index 000000000000..37823287f388
--- /dev/null
+++ b/dev-python/flake8/flake8-5.0.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
+HOMEPAGE="
+	https://github.com/pycqa/flake8/
+	https://pypi.org/project/flake8/
+"
+SRC_URI="
+	https://github.com/PyCQA/flake8/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+# requires.txt inc. mccabe however that creates a circular dep
+RDEPEND="
+	>=dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
+	<dev-python/pycodestyle-2.10.0[${PYTHON_USEDEP}]
+"
+PDEPEND="
+	>=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.8.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		${PDEPEND}
+	)
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# fails if additional flake8 plugins are installed
+	tests/integration/test_plugins.py::test_local_plugin_can_add_option
+)
diff --git a/dev-python/furo/Manifest b/dev-python/furo/Manifest
index bba5c3f71b2e..c91448521c09 100644
--- a/dev-python/furo/Manifest
+++ b/dev-python/furo/Manifest
@@ -1,5 +1,5 @@
 DIST furo-2021.10.9.tar.gz 69755 BLAKE2B d9dec7f2161491c1b9806fe8e1e98bf6d8f405ae17931e86da6edf44121a0bfbfef4db26f35b53cc929e143926bdbfb4f223aa52fdd65912cd49bd423e574a43 SHA512 4100cb08f6f97ffde2527ec5678e94da759323521bf26ba49dfe4c0851aabc59556872b494a7dec26fbf6e4ac2f2dbc4c7d92f7ef47cae7f9d256af38da91f7e
 DIST furo-2022.6.21-py3-none-any.whl 323874 BLAKE2B aac38e9aaa8d4fc6fdb00a7da9df8781b18229146970a005077075b0049b6493f280377ed735e9dd5425fdce0c43f8cad5b149957018d9a084ad83c5e5fcabeb SHA512 096c9fd0a18c8c4263607a77703412fcc5d7334b08bb6c448e5369b93572f2176f7fbe3fc7eb0b8c72f09d00eeca379debfec2f6565305d2f5e1bd0518af1558
 EBUILD furo-2021.10.9.ebuild 690 BLAKE2B 01e614573d0aedb74def04b3762442520f3df7f2ec5dfa1232c65c003614e61ce3a5f2b03f139c4da8234c4fc7b6ef86f62b4041f5b760c2b12259949b79ac3e SHA512 34237d0f5a40b8ae1165ea7b359ef11d261d7f783bbfee4b73e024c986b5bc789df3f90da81d29385466fd23100c835440c18245fb5fad76005fc819930397f6
-EBUILD furo-2022.6.21.ebuild 984 BLAKE2B 88897fc03acadcd6f302a5e2f064746149ab03ea9b54cba35e0b8bbe34bba57cc70fe14e4f224758d838fd24152b5233707673355ba52f085ae304d4abd82ff7 SHA512 8e9545613875833bd6df509af9e2934264d157492ca5920d0b3bee2b7e8e3385b4c6d7f0ffd75e8b4135f15fd39449816ad76eccd596344db3a7001e560603ce
+EBUILD furo-2022.6.21.ebuild 977 BLAKE2B 4430cd379ad2611652a26dcff5d1ec6d62fa30d0d361d7a8bf974b661ab0f9aaead29547141fce29d71ae2cc0a3cb4360dc74da00b27a8d6a3cd58ff42174a45 SHA512 50f8e4f712d30ef1bed176dbd6171afb8c81bd56cca57a17167b1c322dee4ab9f3ad98b8e94529f1bc31c128d71f359f23c54212c0768e840d83cf39d7ce6ca4
 MISC metadata.xml 412 BLAKE2B 8152eadd336ba3c73fb48a1ff4bbc236e9857dde77e354811a131794f0b750c0871239fbc2fd773979ec306ca3ddf62166f784559d486e6cd6f5d6b5c3902818 SHA512 fc3918b91916a176ce85d9740caacc70aae03b74339a62c0d77ae1e1f1b92a3db055cf1a1bc655a822ed800178971c39f29c2e45178c5e0ad6ae96f05e42a0cf
diff --git a/dev-python/furo/furo-2022.6.21.ebuild b/dev-python/furo/furo-2022.6.21.ebuild
index 154f116846f9..8cf1bb529583 100644
--- a/dev-python/furo/furo-2022.6.21.ebuild
+++ b/dev-python/furo/furo-2022.6.21.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index bb21834c1439..fb45d00bd36d 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -1,5 +1,3 @@
-DIST hcloud-python-1.16.0.tar.gz 93731 BLAKE2B d94881550dbd08281226b9869008ea6c4a10bc544a21a5aa17e48d4862808baa92b4805dc101ea970bf66baca1f5a971912601c4b934fe47614351029ece9f04 SHA512 282d1accb3c387caefe9dce7ab70dccfe2ff830c6ec3cd665326ad79076d7f9e58ab2f3061fa262208731c9d1e09e6c52d13075adf119f8b19d6af50e0374556
 DIST hcloud-python-1.17.0.gh.tar.gz 98069 BLAKE2B b8fb2f1c4a3d139225a19599f956a845789872642bc62ec0434f5393e90f5ef64226b6363eeae0b3312084312aac4ddbe77e6e134b0502783e72568f23a71ee5 SHA512 829972585b5fe61aaaa2ee5294c97e6ad4a913229e8d87cec8e00d61480a780682b4eb75e2b9da5962bdb3dfda15b0a81afa74383be874e381a5f8e1a27d7014
-EBUILD hcloud-python-1.16.0.ebuild 992 BLAKE2B 3dd0917dec46e69ef727bc7624377ee988f2e0c81e55686441c9acb379089c68c4f24c8d672688fcc4f01cf081784e6f9062f3e468e7a867d0df2e06be0fe38b SHA512 1d84e62018caae9fc8f55e1f4af7c4eedc5061d3dd718e64189c5507036621909429e0cd5b08ef11866f3b647b2effd37ac7b887ab80e83822faa3d2ccbcaf7f
-EBUILD hcloud-python-1.17.0.ebuild 1003 BLAKE2B 80a8500a3bd1be5daef964218c6a45d33e5072938409e8556c05e5c9282a962dd3015004bd26c722a15edc65fc036f305fcea7b7662154b16e8ac9ba04040b6d SHA512 23d3ef108deeb2ff8c284d9f69c38ed981996b20c2fcd52d6f1b53f0efdb37f08a586ebb9932a302dfda762cfb994a59324e2dc24d43c4e3a614f33f6304fed3
+EBUILD hcloud-python-1.17.0.ebuild 1002 BLAKE2B bd842b951fb091df46ed8c46b991bf25c3b029ff536f203ff125f49411e232eee8086a884eb236acb9060a68a54437e012fdb9ba0f2c4d83f785b317e4b4a5d1 SHA512 a0e3c143bb97edc7f36200cde2607c4aa93e3925328b1946701cb70712fe5d545516395572b799aa5c89932f30580a72ee70238f93b1dd2d69a06191c56f0250
 MISC metadata.xml 483 BLAKE2B c945a22b776b5bf73deabf93718a1dea3a9b98f7257467e845106f71910347a803f96ef969227d7c10a119f1e35b904bcb7501b9672bf3ce5a2bef112d903e56 SHA512 4a6540a06d57eb3bc8c455d982531427157fbf1a85abf4b909032b0880c9e2847b295b3c9b02378be35e88f74876357503dd04bbe544ff9a9612df2b1c321b1c
diff --git a/dev-python/hcloud-python/hcloud-python-1.16.0.ebuild b/dev-python/hcloud-python/hcloud-python-1.16.0.ebuild
deleted file mode 100644
index d7f1238b07b8..000000000000
--- a/dev-python/hcloud-python/hcloud-python-1.16.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Official Hetzner Cloud python library"
-HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
-SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc examples"
-
-RDEPEND="
-	>=dev-python/future-0.17.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	# Integration tests need docker:
-	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
-	epytest --ignore tests/integration
-}
diff --git a/dev-python/hcloud-python/hcloud-python-1.17.0.ebuild b/dev-python/hcloud-python/hcloud-python-1.17.0.ebuild
index 16f234d26482..c429f98a9034 100644
--- a/dev-python/hcloud-python/hcloud-python-1.17.0.ebuild
+++ b/dev-python/hcloud-python/hcloud-python-1.17.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/huawei-lte-api/Manifest b/dev-python/huawei-lte-api/Manifest
index 57169a1b1506..f6cd773bf314 100644
--- a/dev-python/huawei-lte-api/Manifest
+++ b/dev-python/huawei-lte-api/Manifest
@@ -1,5 +1,3 @@
 DIST huawei-lte-api-1.6.1.gh.tar.gz 32963 BLAKE2B f159e1dc4cb759c09a88bb763c6ba5f43043eacf025e7ada871c816e0e72a238f9e7536dbc043f8596bef390ecfc2ee137c1a4c079ca33db6c3a3198147c9f98 SHA512 2a6a330c419af0d2b8eeff9d8b93a11cdf8050db04e609cb1d86a33ab770d7102c8e40652482c2500ce4bf4152b66b98ee1fc77be104db8ab9a9bbeec871ce20
-DIST huawei-lte-api-1.6.tar.gz 32617 BLAKE2B 194d2d983e7bd5bd456d3557b16795cda350ea157545c1ce37aa6d4dd0bace8a8a0c724b9d0ae4315e6f95585598b147a03acb77d84837bf879fa9b83737cafc SHA512 62f70853bba0fbd863e07e2d91309fc15c41508857486d01a02ec30ed513567d0880551744eed5a61517cc33a2f56583df892d22cca45124e95e24605ab23678
 EBUILD huawei-lte-api-1.6.1.ebuild 872 BLAKE2B bfbe5cba45ef654091a5bcb8d3dd672b0b81864d3747a3e5e41a2ff4a2f32b957729c9e8217bd6f55ed3007b43bf7c72dc116474434adba9a1504660bdf64106 SHA512 8fd9fd2c890214f14a9fb9c01f911ba46730996529678fb7136711980821b3d9e7aaee951381484cedb0370fb3bf8306903d59210283e0582bdd61b50e099a8b
-EBUILD huawei-lte-api-1.6.ebuild 869 BLAKE2B e3bab6beffb0e617b96619dd7233a0cd12f91933460d4c54463bff6b3e6c10edb5036d0493874a50e92fe879aa8ddae7da9bbcd229b0dabc7b1a4e67e50a16c3 SHA512 866e4bf8ce773ca9684db71e4591063ac7c23e3c41bc79997724e3b56c6addc4266177615125184012312e407abeb2e9b1403d013dac30e5f23e8b8c7f29d046
 MISC metadata.xml 487 BLAKE2B a4aa976286ea3cc4e02227109277faa4506f73a4b7f6c47ef9a318ae5d1c3fe61cc6eeb50ab99c0b10e5edb4ae02101d8e4d6267e7dc8f20520e9259b1d17fd2 SHA512 2ea5ccd73098a9c4d074340c9d6eb433bdaf4530d8fdb899f2a9632c097d2021d9162aa92fb9ffb54eaad2f41050d0323ddc68d0d29ec2f13060e5fe9e26f74d
diff --git a/dev-python/huawei-lte-api/huawei-lte-api-1.6.ebuild b/dev-python/huawei-lte-api/huawei-lte-api-1.6.ebuild
deleted file mode 100644
index cd6657cd97d2..000000000000
--- a/dev-python/huawei-lte-api/huawei-lte-api-1.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="API For huawei LAN/WAN LTE Modems"
-HOMEPAGE="
-	https://github.com/Salamek/huawei-lte-api/
-	https://pypi.org/project/huawei-lte-api/
-"
-SRC_URI="
-	https://github.com/Salamek/${PN}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# make cryptodome-friendly
-	sed -i -e 's:pycryptodomex:pycryptodome:' setup.py || die
-	find -name '*.py' -exec \
-		sed -i -e 's:Cryptodome:Crypto:g' {} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-distutils_enable_tests pytest
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index a771128ea5f7..a67d7eb7c54b 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -4,10 +4,12 @@ DIST hypothesis-6.52.2.gh.tar.gz 9321530 BLAKE2B d54b97bf15895b503d14629c61cd99d
 DIST hypothesis-6.52.3.gh.tar.gz 9321591 BLAKE2B 50415d463d2513b023b8a6ac87a2bb6dae433b823fd209ec1137a26184bb5550fb9606e006cffecbff09c523fb244b9f8c119e1c9dc765b925f8aa6b0dc43bed SHA512 f8aae5976cc2bd47e157310434d2717caea5e639daf1d794fa6c45332fe44fc5873904451f1fb0b53d56e64147428c4c87e130b4776fd3b14e2c2b961660231d
 DIST hypothesis-6.52.4.gh.tar.gz 9323011 BLAKE2B fece23da48d4849252a0fa48ae741506f49aa1f2b63f81afe3b71d18e0325a4e337bebde1a1707390d38bdf57e2ce1145985231f68557b36c58886d82774a7d9 SHA512 c51f29d52757d08652f83deda48825ca38c86e0bc67743c2cff9c85f52d726671f07d0249dfdc761b2ba8250d40beacdf5e037e8629f24df5baeddd297f38030
 DIST hypothesis-6.53.0.gh.tar.gz 9323355 BLAKE2B 589cd4803351e72cc1896453e5e548bb6fb5f998032bce91708e02f3c8ff5d288ec76d65eeffde5fa31b6b86fbb3ad81dfe3eebaaac841f197de3a07acfa12bd SHA512 ab4de3764ca3ce8e5e50966ea94fcadd85e7c9f170dbbd17383b5516528e091ebfe3b06846513ee77a1f7a2e827236d323c12cc120cac421ec7aa9f3a2ca5e4a
+DIST hypothesis-6.54.1.gh.tar.gz 9324403 BLAKE2B 897fa4901a5c5c0e32c4197020702dbe5d85a5ada79f52b66fc7f19180a32f4dce54f5300722f500fb560766e1ff76b5df648be6be0f229ece4b3aa0af856fc3 SHA512 ba4a7a3f5daa7437e903604d26a9dd0e4ce77d0a44a2e81fec5620f48a5f6a9080b5e5401fa1f7ee6c66d4e1d51cca095ce7e74999b0439b5a8a0c2d26f64464
 EBUILD hypothesis-6.49.1.ebuild 2078 BLAKE2B 11eee6781b06ca0da65094d20403b7783d83799a1f0e3684fb450784faabd97cc624caa681d1b89974dae552d98ea8c98f8a2de3dfa57c97b4246afe9370f621 SHA512 972d703e77d7403ca70447f2b27617874be3a0eff802c79ee05d7c0991acb931bb2a91967055c27f244568049d86879ec1a77153a7a48aaa4305132b0b537eb4
 EBUILD hypothesis-6.52.1.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 EBUILD hypothesis-6.52.2.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 EBUILD hypothesis-6.52.3.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 EBUILD hypothesis-6.52.4.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 EBUILD hypothesis-6.53.0.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
+EBUILD hypothesis-6.54.1.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.54.1.ebuild b/dev-python/hypothesis/hypothesis-6.54.1.ebuild
new file mode 100644
index 000000000000..1065b755121f
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.54.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/imagesize/Manifest b/dev-python/imagesize/Manifest
index c3aa91e14715..98bfb70a23f7 100644
--- a/dev-python/imagesize/Manifest
+++ b/dev-python/imagesize/Manifest
@@ -1,5 +1,3 @@
-DIST imagesize-1.3.0.tar.gz 1279535 BLAKE2B 926b90ad493b790db41941467dd2dd0385f86064fc1ce9547670a52f925965effc9b8b7f61057158a4452cac2223b65dbfaecc34a19ddaf52067a9057560b56a SHA512 3686e513f03cc16f5237ca206cd1bf131eea968015ee4906f620ab1c8932ed24d19881807225a02fa319d0465da4b01851ec0bd0a47146ef914053185bc0c755
 DIST imagesize-1.4.1.tar.gz 1280026 BLAKE2B 9293f56277e40a1ad74a96b2857e46535fd5bd320ab7dee48432762206f29b4f78e64d8713e19ea26c3f405ab6905ded3b04273d04e781f512e981bfe83e3f8c SHA512 f191d7fe34a01ab21b0f4f6519df8ab2a53c1ca54956f4d825d9cec5bd5f4c569491bdc26cb36fcaad2c453c35e51f69379f091362e206453aaefbda4802daa4
-EBUILD imagesize-1.3.0-r1.ebuild 655 BLAKE2B b9c7efdb5914b9ffaee8e02beee8df951ed967e5fa61dc2e6c0eba5d664a9e71a4e74b08b12b66679ece88572c04c9157e181338c6995101b13cd440a0805fb0 SHA512 a6df1d582c405958e4209d577a62296f85dd90c8c9e3d289c144b59362e82aa4df3d2c4d27548cebf4715a6763e8a161bfde9ccf6fdf889272504ce94785b792
-EBUILD imagesize-1.4.1.ebuild 705 BLAKE2B 4f6f0a9a7f1a8f4bb426d2a4e3dd0dbaba6bb55623d9079ff5cc6afd1bb1d79ecb6829f9a03f2fa5ec00266b170b39503f123db38a06717a0ce3fde105430448 SHA512 e395d3ec79f0bffabd4a859c1f6c6b9fd092e853a815cd7650f36457ccb83859a8992829af5515601f9803272a036f11f9683aa476b85c00550b40367cb9fe67
+EBUILD imagesize-1.4.1.ebuild 697 BLAKE2B 36763edafc38166671f7d32318129837a43fa4feced5c21a6a424a7825cb841b6578b0e8d34841fd41c4dffb8a23e9ee545d288f08cbbfbad81223d5d6072cfe SHA512 bada70115f90f9e82058b37eaab7189d4ed469b82b0e1d16abdcb594f492a5725e3926c451fae583d40a19e7773b311974d9fc801130c2e67813bce4c054473d
 MISC metadata.xml 484 BLAKE2B 9edce43c0b06aab59a3094cbe36b90393bf5d0a0eeba9bcdea7ea7298e7d42c2cbfa19ce8bb544022e01124743d877646709b90329796d77e916283398aef3ac SHA512 85d73b13ce95d9647d1afcdee5979fe2802a04cea213468c7d7714b976e191dd59715a93fa522dcd2646d33fd27a43911146c28dc477d9d34cd56cf42cc3ebb6
diff --git a/dev-python/imagesize/imagesize-1.3.0-r1.ebuild b/dev-python/imagesize/imagesize-1.3.0-r1.ebuild
deleted file mode 100644
index 62cddd30227a..000000000000
--- a/dev-python/imagesize/imagesize-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,23 +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_{8..11} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Pure Python module for getting image size from png/jpeg/jpeg2000/gif files"
-HOMEPAGE="https://github.com/shibukawa/imagesize_py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires Internet
-	test/test_get_filelike.py::test_get_filelike
-)
diff --git a/dev-python/imagesize/imagesize-1.4.1.ebuild b/dev-python/imagesize/imagesize-1.4.1.ebuild
index 02d40a1da3d4..9a690f29a7bc 100644
--- a/dev-python/imagesize/imagesize-1.4.1.ebuild
+++ b/dev-python/imagesize/imagesize-1.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/json5/Manifest b/dev-python/json5/Manifest
index 43bb6e79deec..2c6f9cf11357 100644
--- a/dev-python/json5/Manifest
+++ b/dev-python/json5/Manifest
@@ -1,3 +1,5 @@
 DIST pyjson5-0.9.8.gh.tar.gz 110629 BLAKE2B 7a2acfbf1228e8f143a19775750e6d020376d63b2b036eac75be032b7baed1e6b93ea3ee842b0c200db6f44dc0f16f3c6c2f18cb165b24918334a48f237f2a9f SHA512 e1fb7a7457bdc68c33e2d73ddae8913aeec6f001e25a70234f7233d8d28b8eee8dd023c76e26dec0d0a2051e8e2cd731044dbe7dc15af9ec95f0ce806fabac72
+DIST pyjson5-0.9.9.gh.tar.gz 111214 BLAKE2B ccf329ea148e576655b1fb24124c813d31e117291cdfc53affa02542330b11c136cd28e74418351a30478249c8f4c109be6547d69e423c8c7b5f96f77ef5daac SHA512 cd28c64708738484376a03908ec75b30bee44a8834a1e9dbe81be98a6f46ba75600d6f958c6298998f373125589209907f5e8b63714ed6a83bb7a1d27adbccd5
 EBUILD json5-0.9.8.ebuild 571 BLAKE2B 226bf2601231bb5babc121964ebb5284763f601aa56b2745e4de598c427517a4f957daa457dd6f0d18669a34b00b77dea6c3617fdd6750603bf0b02420b11c42 SHA512 45dbc8e285fce034b1ac5ce65d9809c215100009174de06c253263d1282073f31082055bdf2125e279a1d64bdb32f58d7d72afa28f579ce0cefece89ed63aaab
+EBUILD json5-0.9.9.ebuild 571 BLAKE2B 226bf2601231bb5babc121964ebb5284763f601aa56b2745e4de598c427517a4f957daa457dd6f0d18669a34b00b77dea6c3617fdd6750603bf0b02420b11c42 SHA512 45dbc8e285fce034b1ac5ce65d9809c215100009174de06c253263d1282073f31082055bdf2125e279a1d64bdb32f58d7d72afa28f579ce0cefece89ed63aaab
 MISC metadata.xml 502 BLAKE2B 9dc70229a26364dfb51ae26cff9817bcf82c47391d9fe3b6a4b11b79848f786989c62d6c3cbbed9b476da82dcbbbe9e19bf738d860ed423c3c9731c646314cf8 SHA512 257bb6f3e18053e852d693bef7eaba9e40ef5fb25ef449a275a7fbedd9a4247217bcdd016f0b3a93658ada922882bacd723235b2ab46c81dfd8cb42fe933ac74
diff --git a/dev-python/json5/json5-0.9.9.ebuild b/dev-python/json5/json5-0.9.9.ebuild
new file mode 100644
index 000000000000..0a10cb1d1bee
--- /dev/null
+++ b/dev-python/json5/json5-0.9.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=pyjson5-${PV}
+DESCRIPTION="A Python implementation of the JSON5 data format"
+HOMEPAGE="
+	https://github.com/dpranke/pyjson5/
+	https://pypi.org/project/json5/
+"
+SRC_URI="
+	https://github.com/dpranke/pyjson5/archive/refs/tags/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 49f0f007e9b2..231cebe2df08 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,9 +1,7 @@
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
-DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD lit-13.0.1.ebuild 907 BLAKE2B 786bc45254014c19e47997b263eba9245fc44459a6f12d46e69803fdf57c1b8f3d07d7e0354ea23ab17471771f57af8e792ca942b9f195462a26629d8d6bfb8b SHA512 ca254f8d0d3af0e01b24e73de8e15b77d687fd0f23a4848dd4e85522426e7dbdcd8ae77e25d8f88e637e390131fe78362ae7ba4ecd192a4c970cc3311b371dfa
-EBUILD lit-14.0.4.ebuild 915 BLAKE2B 1b5f3a2c173e1321cb172352f090e013d90535b1a97af0d37e5db9d7c4699638d627942f8ca0c90e56840039f6fa7b8d1360b069f89c4b0298a541015c4036aa SHA512 f40f818848819f460efdba91dd05215ab878f38cb0900ece6ed9e59bfa3c8b25ab025ea698bc377f92d535c6b6c189fc9b219d6832ad365f6c1bd01c70397b44
-EBUILD lit-14.0.6.ebuild 915 BLAKE2B 1b5f3a2c173e1321cb172352f090e013d90535b1a97af0d37e5db9d7c4699638d627942f8ca0c90e56840039f6fa7b8d1360b069f89c4b0298a541015c4036aa SHA512 f40f818848819f460efdba91dd05215ab878f38cb0900ece6ed9e59bfa3c8b25ab025ea698bc377f92d535c6b6c189fc9b219d6832ad365f6c1bd01c70397b44
+EBUILD lit-14.0.6.ebuild 914 BLAKE2B 80f1bb1010f71ff835aef8e87cc0bca5de0dd97e74debaee4e26d698e530468b755bc632884c11616a0ae082befa75a7b6c11043c70c3bb5679b0dae1c985d0a SHA512 77eafef2378be28fdcaa87f07fec8b1907f8c491b4a600b47d9f5970148f6684e6b4733ad6dafb753aa7a56ed1834b10ff30afc5995812c895749ea0c7294e47
 EBUILD lit-15.0.0.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 MISC metadata.xml 340 BLAKE2B c9ca851e49b4ab48c015686e983ec988f60c34ed0af77abd7bc03d046002f79f74b9b463ecb97db89f2230c1593af7acdaf6651fc51fed4aa92a459d07aabf18 SHA512 3fe8262ce6b971364162fbdbac3b02bf02f0a64896c8a2564e2a2998bd6e6bc74463bf9104e3f4ffaa9f5c1a16c877fc864b8a4f056ca0022f741799bc00f217
diff --git a/dev-python/lit/lit-14.0.4.ebuild b/dev-python/lit/lit-14.0.4.ebuild
deleted file mode 100644
index 8f9f37454230..000000000000
--- a/dev-python/lit/lit-14.0.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm
-	)
-"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/lit/lit-14.0.6.ebuild b/dev-python/lit/lit-14.0.6.ebuild
index 8f9f37454230..4ba84a917af2 100644
--- a/dev-python/lit/lit-14.0.6.ebuild
+++ b/dev-python/lit/lit-14.0.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index 5905eca1ecd0..2d0743f520b5 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,5 +1,3 @@
-DIST Mako-1.2.0.tar.gz 488603 BLAKE2B 30ef597e2dd500d52d02118e0ec8a40cfeeff00604eb9fec887df4aff794aed7d6a1d78b2defb6f985947f9429d912a083b9941ee30b1e53ef32890d19e94158 SHA512 ad608016d7785a735a28ea18f697be4882da747e3da32e4a7c7be4bf846d37e4d3374d78e62ef85607ae9f3f73ee35dc78b473347e4110c059a504be2c497c6e
 DIST Mako-1.2.1.tar.gz 489560 BLAKE2B c8006d5f7a814a1466ad6643200693f014c4a23f284701a9bea6a27246c196c87e5c4bf8e12ae0525563ce60c93944a58b1fa45afc6caf3362aa1d761148910a SHA512 02393054c9e3857ee412f494b01d702b5f367165d2f57a5ff9df34ba1a042b60c7b6c059ce2c53bcb91e3a4a21179eca884ee051bf5f5f3522c05253088d38a5
-EBUILD mako-1.2.0.ebuild 1593 BLAKE2B e1e87bc2dd0ca3e55f799123a9a6543839ec76a0851ee465573cc5bd2b4c313f685c996b1e27852f13379c84a0c15d33a27cc974a26b0074a7d25c844288d88c SHA512 4a6358eb6f6937b8ae135dae83efd5d7f33a7f768c009886d8ae2aae014a7b1893e79bee38da7327647fa2c415e86377185e86cbd1bed2bc56546625efa682c9
-EBUILD mako-1.2.1.ebuild 1364 BLAKE2B f40831532473734d7b85dd6956310da3cde701682a40b2434b36ff1c7ec0a0b75a23c16e0cb65f6e0f330f7a7cdd4abc6daeb74f0b9433b4c7f6ca21553003dd SHA512 20c1bb241db10c034831b7ca4998b170290135331f1683aadecf44c93e39905f6524d29476f0d3e38f0d622c0636fb90cfc25df3198b779be999d1ec7a1f4f40
+EBUILD mako-1.2.1.ebuild 1356 BLAKE2B 4bd5b04fe7f801097f25592c45d6b6af67cda6c85fdbe766764fe2df5232af603f0949ca81a0edbef769186db9fa81c57f0dc3b92939a88df3d0b254dd4044f7 SHA512 65e911911bf6a94f0d132fcc4dddf49cc5e9a3cf1883e341d8da1d5b5894170f51a606ce7b98c1bec36cbede1d4d58227279b1ab6e04646af0722a9574abc247
 MISC metadata.xml 450 BLAKE2B 271e9801e0361eb9cf222fa9aca34f641e6118e17707469a87c1b41a6de34c67ec6a19576a86cc3c7ba1f671f8a28f9df8e994b3f232fe224eda85f4b8cf8b8b SHA512 d168ca10d7759129088a0d10ad73e4d0973ccaed1e649828077158aee55a8640db2446c9d874ef0da4fba5b27a6a0eacdc9d9ff4ec04a19cd1b9699542b5b0c1
diff --git a/dev-python/mako/mako-1.2.0.ebuild b/dev-python/mako/mako-1.2.0.ebuild
deleted file mode 100644
index 16fca49e82f0..000000000000
--- a/dev-python/mako/mako-1.2.0.ebuild
+++ /dev/null
@@ -1,63 +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=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=${P^}
-DESCRIPTION="A Python templating language"
-HOMEPAGE="
-	https://www.makotemplates.org/
-	https://github.com/sqlalchemy/mako/
-	https://pypi.org/project/Mako/
-"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${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 ~x64-macos"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/Babel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# change in pygments
-		test/test_exceptions.py::ExceptionsTest::test_format_exceptions_pygments
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/test_exceptions.py::ExceptionsTest::test_alternating_file_names
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# py3.11 changed tracebacks
-		test/test_exceptions.py::ExceptionsTest::test_tback_no_trace_from_py_file
-		test/test_exceptions.py::ExceptionsTest::test_tback_trace_from_py_file
-	)
-	local EPYTEST_IGNORE=(
-		# lingua is not packaged in Gentoo and the skip is currently broken
-		# https://github.com/sqlalchemy/mako/pull/357
-		test/ext/test_linguaplugin.py
-	)
-	epytest
-}
-
-python_install_all() {
-	rm -r doc/build || die
-
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mako/mako-1.2.1.ebuild b/dev-python/mako/mako-1.2.1.ebuild
index 113cd08e2976..61bedd65c827 100644
--- a/dev-python/mako/mako-1.2.1.ebuild
+++ b/dev-python/mako/mako-1.2.1.ebuild
@@ -20,7 +20,7 @@ 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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
index b4a0f8e06ef8..5ea79ce3f481 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST mkdocs-git-revision-date-localized-plugin-1.0.1.tar.gz 375668 BLAKE2B 355b0fdced378305dd12c72d05186ef50fc1e5b7e5302c9c0887ced03329d598528367313e81d3c8a4658ed1bb2e940c9495c09c2e6e40a03cbc52833fbb13a5 SHA512 7f54ac18bb09ce1f396d593edb5e456476c18c68464dafc62e6b6e1f3aa89735319016925d2f2b8a4ff7aed03d8e02109da23f23a84d9ae0d138bbca278aafd5
 DIST mkdocs-git-revision-date-localized-plugin-1.1.0.gh.tar.gz 375907 BLAKE2B d39f1d807616da95962cca6bdc5a4501163d008f0a8fcac5df2e7542bf8401d04362a38383558689f467c9249f2ad6dff636a8ebf4568aa920ea0078f90fb367 SHA512 f5f911cba9b9e3747c5628e4c947a87fa07c798f854b6ed8783b74c732cf29e4afdacb37e074a5d04672d90f96de560ab6b86cd3d826ce46226d73f48c54c27d
-EBUILD mkdocs-git-revision-date-localized-plugin-1.0.1.ebuild 1465 BLAKE2B 1a56964093c775066e461c1d8aa8000ecc9b2a5556961b2f524efef14088024504f1cb7aa8945c2fc678c21e2f568a955b5f3e5193e3a2cecf6db6c357cadcf3 SHA512 c3040df805f5d9379ffa4e5ca6131052c75ea238aea4e512a298d0cc3e2420c2cbd8360f72151f37680931d506e8f876598138175b152212e24e98b82536cc87
-EBUILD mkdocs-git-revision-date-localized-plugin-1.1.0.ebuild 1470 BLAKE2B 9f7152fdd1a0d8e995891c991a312fb8dc1a498b2ddb8f2b9ceedde606778df912c114312d66a880916ab0d1e438d3af3e260afd30f12faf7b1626beea527831 SHA512 95c25ba5627471b0dd2be9c6feb4f45b93399a6094f12533b5172723748c94470babf17329fcd77fafe886f62c7fd5e0a2966d252397a06b37ceb1eb6eed173d
+EBUILD mkdocs-git-revision-date-localized-plugin-1.1.0.ebuild 1468 BLAKE2B 2a0c2d5949fc89bea7f9a861b22f8b9a724d97f245717c6eba9673e3a551d6cda6a3cc5cd39410ea27a88b3e9d2984a8c56a3d0dcfba37369188b2dbc3400e80 SHA512 7bb3486ef69ba05662db87ef1f734067bafa17f87d85abb2867d779a18630d415f4c7b45e81b118d7370d459f4f4f5cd7a777a8ecba47cd1b64b1c51a8e77b2a
 MISC metadata.xml 596 BLAKE2B 9010c7fd37265b6770544a605f918524b75d7b1afea8809075c3b5afb5e56f6848aff4c7fe98367b3dcb3de16f0d21682f9a2fc80f441783f32f904dd8f9a152 SHA512 431dff95204b056afa3a4dab48eec1559d72d0c1ae9a65d89d95fb97454f858c9022578043238a34ce205ac5a16871e6f6d68a3bfe3231c20852437c4fd66254
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.1.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.1.ebuild
deleted file mode 100644
index 9579e0437b9f..000000000000
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{8..11} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-i18n
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-authors-plugin
-	dev-python/mkdocs-git-revision-date-localized-plugin
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Display the localized date of the last git modification of a markdown file"
-HOMEPAGE="
-	https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/
-	https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
-"
-SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-		dev-python/mkdocs-i18n[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-	doc? ( dev-vcs/git )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin's tests need git repo
-	if use test || use doc; then
-		git init -q || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -qm 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.1.0.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.1.0.ebuild
index 2e2d9c9d4191..38f0810143ed 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.1.0.ebuild
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.1.0.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nbclient/Manifest b/dev-python/nbclient/Manifest
index 2526441f8712..d7a927f40e81 100644
--- a/dev-python/nbclient/Manifest
+++ b/dev-python/nbclient/Manifest
@@ -1,5 +1,3 @@
-DIST nbclient-0.6.4.gh.tar.gz 78101 BLAKE2B 91a653eb1735fe1a43044f18da773bcb0c4afd485fe7bfd3630c8c6a80776c9ff7e4cb08130c4e3953f03832933c429e68d7383677d8e56c54b485d55b8c5469 SHA512 a953b40b314ce104b28dfb9178a004ca4726d8a5912c84c168bf71527ee224082d3910f11040b172b6e62683493978b9b10161b69cadbca48a5652a4f98b5009
 DIST nbclient-0.6.6.gh.tar.gz 78247 BLAKE2B 06793fe792dcb8606d74e85a7a5c4d8f3ba850f81191bf205706e404e67bfe3d6914dff5790c5d6dca62d7797482518b5d87b06da34f06a5cb44a8a0ff6855e4 SHA512 8ca0333a47920994d8afe7c8943b366d4669e7ad91daab1a36c57480b70e51dfd05c7cd44acd2a2005b8c0a6b41c4fe6be0fc22b75a3efe291e9c35dd334643c
-EBUILD nbclient-0.6.4.ebuild 1144 BLAKE2B 73fc09af64e28fb76e971b9bce6850bf52dff38c0156640c64c1238fb4a1748942327407ac6487b6f8096122a0645ce96aec1e58d6f9862675d7a42fa1d8ae1d SHA512 74335ca36c54eab4e040e4f8146388055a94eb5abc486baa94fc005091a5eaf840129f15e058f1ef8f6db8072a5b896860adf084d20531730d5462b20866a066
-EBUILD nbclient-0.6.6.ebuild 1152 BLAKE2B 19fd773a0fb377cb4c48f94ea21682d850095ec7a72acdc8fa16e6fb8b67f354720d00e3290da2ad274204024415f5ff60a5ebfa996a35392ccabc9752dfa285 SHA512 2ee5cc22265d688fbad357d4a811efc6aa53add711ff9c7f1b7874dd72453f9df28da23a42e046e3b58b890ae70abe6647141686f79f641907615344e17da277
+EBUILD nbclient-0.6.6.ebuild 1144 BLAKE2B 73fc09af64e28fb76e971b9bce6850bf52dff38c0156640c64c1238fb4a1748942327407ac6487b6f8096122a0645ce96aec1e58d6f9862675d7a42fa1d8ae1d SHA512 74335ca36c54eab4e040e4f8146388055a94eb5abc486baa94fc005091a5eaf840129f15e058f1ef8f6db8072a5b896860adf084d20531730d5462b20866a066
 MISC metadata.xml 405 BLAKE2B d1efa5f7bb2a959bdbc6093b1bd3930e6cdb9bffbe872c6775c15dfc1024ae24d6bcb4651c8e1fb06242b17d6a86f683de3b528bbf1a60b5656a90c1f4ac81b7 SHA512 5b0de690d37dd5928e3bfd0b380336d154cced094e342b41dfd16d0caddd2b792a2158b209404a36461cf4d1b12d836024eae2aedf15093b90f4e363382b38bf
diff --git a/dev-python/nbclient/nbclient-0.6.4.ebuild b/dev-python/nbclient/nbclient-0.6.4.ebuild
deleted file mode 100644
index 857a17b52553..000000000000
--- a/dev-python/nbclient/nbclient-0.6.4.ebuild
+++ /dev/null
@@ -1,46 +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_{8..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.2.2[${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
-
-EPYTEST_DESELECT=(
-	'nbclient/tests/test_client.py::test_run_all_notebooks[Interrupt.ipynb-opts6]'
-)
diff --git a/dev-python/nbclient/nbclient-0.6.6.ebuild b/dev-python/nbclient/nbclient-0.6.6.ebuild
index cc41ec1e5d49..857a17b52553 100644
--- a/dev-python/nbclient/nbclient-0.6.6.ebuild
+++ b/dev-python/nbclient/nbclient-0.6.6.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/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index 3afbb6bde3af..b1e290a492b5 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,3 +1,5 @@
 DIST openstackdocstheme-2.4.0.tar.gz 1255985 BLAKE2B 6066ef5b4fc50093dd7a55d4e7824be9495f8cc9af5f20e1ee7ee5bacea1deb5d1e1a08e408470ba5923de9ece2658dc187bef9c6d5cb767d4c492543bbdc3c1 SHA512 34bc69fc3455c013ba05e6662ea362f0b9ac4070a9e70b34987846eec84197069622fbddd295251d2a363f08303c5a2e9b998b01207bdf6891ca68aa33682c78
+DIST openstackdocstheme-3.0.0.tar.gz 1256011 BLAKE2B ad00a9e5dc0902d99bd47ffbd7cd2cf7900a45f880744293871a869d03dfa449a91402e3eb50071e35c60d78c7858787fa3ae234f96e19f34cc40a2022069ec5 SHA512 0e4c5ca3f43e701692bb56d4e0823b52c55c49e9b4144d3920830903e178522f414930c0a253be415cd6d08534205f2d8e8fac107513bc32d1f667e8559a8c2f
 EBUILD openstackdocstheme-2.4.0.ebuild 607 BLAKE2B f217aa59ade34b83d2cc05fd93051cb81d8ff8d80befe46f5940d980d698142d696fb0f571c65fa4fdc3e5ff811ebfba1a2174d2f017b2978a623ed2bc712a5c SHA512 dba1ef34eb79e8e7a0fb4cb4cc9d8403eafd1ea45c18724770ceecf0b8d851e9e2cd02d910b20093f1405c34dc9727cae5bf7958719e710f6e6b94c7a783ff69
+EBUILD openstackdocstheme-3.0.0.ebuild 610 BLAKE2B a0be16e8abc0db9738c868bf4df5deecfeaf13ed95589590240b9e2eb11a3128361e183236ec093ec01cef930557e2ae309f6e9dad76dce906ab510b38931546 SHA512 cb1d0b0ce400fee9b4fd4f1f57356b8c7dc7005a29ffe97472b220577b866eb1a467c690cf751975df1183f3bfa2854652f21d69f6c82e086a36a3ae3ec091bb
 MISC metadata.xml 740 BLAKE2B d720f5054a6752889548dcff3665b0a02d8f55b05ad96e2783fb2d460d8ab9f9eda52b589c18df1aef3c0eb383bb5b94ab0182f41c0e04fb831b5bd023f1807d SHA512 8c2c6ba17eebf016e8c8e45b0181505d152cf099ab59f4d2c2b2e6447af7ce949ff1cef198253d4a70f7a4d37b19eb5ad6b2feb53ed3f83c54ba850a94d8f4e6
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-3.0.0.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-3.0.0.ebuild
new file mode 100644
index 000000000000..e49accd0905f
--- /dev/null
+++ b/dev-python/openstackdocstheme/openstackdocstheme-3.0.0.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_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Theme and extension support for Sphinx documentation"
+HOMEPAGE="https://docs.openstack.org/openstackdocstheme/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~s390 ~x86"
+
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${BDEPEND}
+	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pecan/Manifest b/dev-python/pecan/Manifest
index 13a4133dc245..deb9c47674fc 100644
--- a/dev-python/pecan/Manifest
+++ b/dev-python/pecan/Manifest
@@ -1,5 +1,3 @@
-DIST pecan-1.4.1.tar.gz 124777 BLAKE2B c3af6ba06aa9e24f9e49ace8117480affd34dfdc889639ab34565325e7504d3c75f17003da09f9f67f91edc536bde95080dbc51170cccc50fde3ec1929c63958 SHA512 bd5ba47935e2d97677bcdc25ad4678ec63293e0000750fa3b39a2447be326dc7e1fd4cf77ac0519e1b7c6ecc7ba7c3e66d98443e78e647fba92383f048775c83
 DIST pecan-1.4.2.tar.gz 124900 BLAKE2B bf78c630605dbf020bcda830855cf19dc660c8bdbfa6d68a9739a0da7c585ec17d30525d37337867e007aa31d3329e87224cfd4e0335b14496df911457af5c82 SHA512 cea290db5b7c4664057ec326e1f9ac11d4b523e2df83a84c3b47acbce0520f248bbd33de0f66379409a4ff463b6408b587238917362572479288d36843542ab0
-EBUILD pecan-1.4.1.ebuild 716 BLAKE2B 1b06ac38ab618bbf189394c4004ca11fd985f6c0ae7f4fedbdd3c1f7383ca19a70c8547e0325771e7d591d1926463f9d75105f8da23ee33a04125258b7aa40a7 SHA512 cf1e576a148bda7d81d3079c5cd1799a9476e5b7d4339db747ed51c7aa3dfb7966eb262a2d2806275f90a7f984ae0ac990c466b04764baba7a12750a8ae60b4a
-EBUILD pecan-1.4.2.ebuild 857 BLAKE2B d7c669015b877293518f2de7ddab0c742936074c72433aca5c263ca1282e7b3d2eab576f6678e041d5a2609fa4da7a03bd3ad04592e0555fd24bf1c75ea01de6 SHA512 585ce6ab3450adba6b5a337a6aad5acbdecabcadf6747cc25b080aaa8fab2031880dd64da311140d79e6c3270cac8713c16cc5f5d6b7ba33d82809ae09b67e05
+EBUILD pecan-1.4.2.ebuild 855 BLAKE2B 4a6058d85e484f9b4cc77a1f16498695d54e5ea9828bcb58f2977b4ff55297fb5cd3edb72968a1f3468fdd5561c8526f3078be9643e6f35cb07d6fc3bb82cdcd SHA512 4d42f5ce9ec6d5c3bce5bc70b3c74e040f6edd55ba46d3b8e6c37b4765d204e7cce86bcab53f0461701da7918582235ebbe76aafbe3ba998d13ebad8bc4dc994
 MISC metadata.xml 347 BLAKE2B 5d328910f51d402c88a420f3276e79513932d13af6a01e03a3d05840f8d867f4dfb824870c478757ad48e3db8c07e2d1f9d5864b14b526827b0fca0f598bc531 SHA512 6427cb256dff0c2ebd856820cc549c176d8e732b20806dbe3739ed7691bdbccb3c941e4dbca3e29de18f7014145788b5c81dfdaa5f4da5acad10c7eb544a6ab8
diff --git a/dev-python/pecan/pecan-1.4.1.ebuild b/dev-python/pecan/pecan-1.4.1.ebuild
deleted file mode 100644
index c736d6979670..000000000000
--- a/dev-python/pecan/pecan-1.4.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A WSGI object-dispatching web framework,  lean, fast, with few dependencies"
-HOMEPAGE="https://pypi.org/project/pecan/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
-	>=dev-python/mako-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/webtest-1.3.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/logutils-0.3.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pecan/pecan-1.4.2.ebuild b/dev-python/pecan/pecan-1.4.2.ebuild
index afa88af1668e..d5a6b0580205 100644
--- a/dev-python/pecan/pecan-1.4.2.ebuild
+++ b/dev-python/pecan/pecan-1.4.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 2c63f9bde11d..8b88f0c3dc97 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,7 +1,3 @@
-DIST python-phonenumbers-8.12.50.gh.tar.gz 4904755 BLAKE2B 60353aa081e4d4d0909302a97a45a89c1f94aac323a6a68fd93cd67146090189d0901b947c40e80e54e1718ce4a45c4a83d2799701ff1323666e82570174d358 SHA512 7a4406626d04a85e010036ceca20430a2562939ad8e7e2651afd65f0d5eb26feb1fbbe0c11f081ab58a9ab8bd81da2ccc153ad22f12eb8135b4f604077b5b29d
-DIST python-phonenumbers-8.12.51.gh.tar.gz 4903034 BLAKE2B 6d97e25c3601f817ad51eb8dac550fec4a13799dd9321235c9105386ca2a1ab3a7fa6403f31643197a5a2f162be50edf6b3705c8947098f2d9ff744f6af1dab6 SHA512 80f5ad4356e31bc505c929a8bb9b577ed1571b9173e7f8faebe972f62c16f5a5d764eab5e3bd8aa939faae2c4ebbe2b0fa11a5f2e6fe334be98148a68881c912
 DIST python-phonenumbers-8.12.52.gh.tar.gz 4904385 BLAKE2B c063fee535e3d1dd30844ea7a974601962fb8fd6b56608046e0c488e638624456020100b2b775f979f770ea1690bda38044d4f7457341d1261132f4323a6de86 SHA512 638ec8e09d58adc5131e855a9436b45f1f0252c084638a13130df793d5357fc249e695668e2cce4902a534300c4683b64078e08620fdd2636857f6d328a45d82
-EBUILD phonenumbers-8.12.50.ebuild 801 BLAKE2B 6a2726b7845d46717aacb23295f6248b11475b197ff1a37c0de0d2a4e409cac62e941f005057f715fced24909943303ee1f0e975e40484368d82a81578c26b14 SHA512 8b5f322852d39eeec3bf3f023765fda596f6459eba5fa70f9f7074bf5e45428a5f292b394bfcc7786cb25049e198c410d794aade497539b6f0e8964a9f72bbc4
-EBUILD phonenumbers-8.12.51.ebuild 810 BLAKE2B 3b18782b7466900c6dcf66ada03d333fefd3df0a6a02bc1417de82a4e692e0baf316db5d1b4bf070d4a73b7f8b5133018c22587f5549fbe8863b8e3ec6859441 SHA512 9f1fc8118ab9fc7284723238e398f9152d6e491bfe0be97fa5b181f1bb30a0d96900c1e1674b6ca325daefb8813bc25dfae44f1ab172361e367725c5a040ba4e
-EBUILD phonenumbers-8.12.52.ebuild 810 BLAKE2B 3b18782b7466900c6dcf66ada03d333fefd3df0a6a02bc1417de82a4e692e0baf316db5d1b4bf070d4a73b7f8b5133018c22587f5549fbe8863b8e3ec6859441 SHA512 9f1fc8118ab9fc7284723238e398f9152d6e491bfe0be97fa5b181f1bb30a0d96900c1e1674b6ca325daefb8813bc25dfae44f1ab172361e367725c5a040ba4e
+EBUILD phonenumbers-8.12.52.ebuild 808 BLAKE2B ef45a7f57cab5aa38bb958cae5b0bb0bbca327073d8d4bc41aa56552037a2ae91e5e01b3e6af6e9d948ad4f7edd5ff7fd0808c2a7d742845040fbcd55a6b3b77 SHA512 2786479b7b053e0c900d5548a1339a0d81c0d4c44a25d0b33ce6058e06a872710d7c887d4ee20b7c705065e2a2e4eee6519bb76960902afc45f86c3806819108
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.50.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.50.ebuild
deleted file mode 100644
index 8e4b363b03b6..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.50.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="
-	https://github.com/daviddrysdale/python-phonenumbers/
-	https://pypi.org/project/phonenumbers/
-"
-SRC_URI="
-	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ../README.md )
-
-python_test() {
-	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.51.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.51.ebuild
deleted file mode 100644
index baab22b23fc7..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.51.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="
-	https://github.com/daviddrysdale/python-phonenumbers/
-	https://pypi.org/project/phonenumbers/
-"
-SRC_URI="
-	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ../README.md )
-
-python_test() {
-	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.52.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.52.ebuild
index baab22b23fc7..fa0f470bb38b 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.52.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.52.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}/python
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index c45af789a5bb..3995a7d96172 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -8,7 +8,7 @@ DIST pip-22.2.gh.tar.gz 9278410 BLAKE2B e32fe63e81593a0ec9c0110af0f07f1a47ddd3d6
 DIST setuptools-62.3.2-py3-none-any.whl 1225929 BLAKE2B 608952e201f749ebf557e3962ba9856d5bdcbc534f3a25598cab0d6c53282cfb3b9f007ba135497a8addf49db4c02bc4387c486d95a4529d01ce4114154ec28a SHA512 366d69dc44e326dd7549cdacd8dec481a14dce4feef4338adc38b9de5c4c338f04d61696e13ce8603be1315f2e8734100f92d3fe4b4b11843e19f550c9631978
 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
-EBUILD pip-22.1.2.ebuild 4244 BLAKE2B eb572300446fe1697e4201024ba005d25edfcfec50c4102c2053b8b586af60ea261db2898e48b7e8b4f07d9deb289f5f6719918f66132ad078ba7a35756be7e2 SHA512 737f505103c8e2401cae1ba09f25407c598379bf085d28d9761abf93d4451d67c5aa08a8f446b5a03da2bf3ac68afb2f1bb6e57e0c8fec3b8fef4cd63a0b5b1d
-EBUILD pip-22.2.1.ebuild 4366 BLAKE2B 33d4c9e6fbcfdce50fe035c1f1d50bfb6c17a7165ce3aea0e29701fbc346299ca9d36b4af9639f7db0aa50dfebe9deeac1a6d43b462917cd01cb8509e2fe01f0 SHA512 f4ad58b7d2d4feac0324543becda9fa5b89847f6010297900c95e65a4f5c994143134189a540bc38c60601d12657e8c6bb5ba0b080fe0ee1cb18c184128ef5e4
-EBUILD pip-22.2.ebuild 4364 BLAKE2B ee44ac5c56d5dbb3c82c635e8ceef223910e75d66b2862329b4b046a6ffb3e1f2b2aa9aa87098f1d193964754f8495195cc45ed44dba1ea34effe026cbac9150 SHA512 6b15f734ad93107cfc848cf7a1261b573c3fad1c64cf1739cac7fbe3b0fbd53eca5d2ee44412a32fb0de888e729d32165a248411703cf49b55d824028ae59001
+EBUILD pip-22.1.2-r1.ebuild 4244 BLAKE2B eb572300446fe1697e4201024ba005d25edfcfec50c4102c2053b8b586af60ea261db2898e48b7e8b4f07d9deb289f5f6719918f66132ad078ba7a35756be7e2 SHA512 737f505103c8e2401cae1ba09f25407c598379bf085d28d9761abf93d4451d67c5aa08a8f446b5a03da2bf3ac68afb2f1bb6e57e0c8fec3b8fef4cd63a0b5b1d
+EBUILD pip-22.2-r1.ebuild 4440 BLAKE2B 28cf5c72f782107f7d322d418b503067a21217d8552580051641438883ecb18235b761bdc1e9574817e77bc5523104197dd0fe3472ed676d65619593b5726932 SHA512 c37dd2ce831728511b4cbc08b87076f1112cf23815eea1cc0cf959721d7d697ebe65bf458c27ed777475d54d58ee0d00fa9190c6829e06ae666e775e6fe03c03
+EBUILD pip-22.2.1-r1.ebuild 4510 BLAKE2B 60e0a608797cac42cc03cba07ef99733e5e9631e8044876a7e929394fde697edb89a95291ddd0d5db4ae7456458ec3ec15dcdf6fe2c1ab976488365d1e22daf3 SHA512 79bd859969f22b8cc20d38b3a152d93249848b3110c714bb95e4e14fa347fe77d3ee92422a46fca0a1008fb23f0959fd8985b9aa0c67fae473be8a05eb5a9b31
 MISC metadata.xml 392 BLAKE2B 94ea3de1220cb9ca64ae1186597789cc83a54adfe44695932c07dd5065df0e5f9ee5078a495e3a12563b36809d781d8ab86bb6c92c485c023199d92547b74f27 SHA512 603199f6547105f3bb64f4fcaf004e9ef62fa2e0f8ec6eab56078119684b0f5119161e0f164fe02b2cf6dd6b115588c9ef77d727eeb6d138e281f1cb0bcb5de9
diff --git a/dev-python/pip/pip-22.1.2.ebuild b/dev-python/pip/pip-22.1.2-r1.ebuild
index 92328155e736..92328155e736 100644
--- a/dev-python/pip/pip-22.1.2.ebuild
+++ b/dev-python/pip/pip-22.1.2-r1.ebuild
diff --git a/dev-python/pip/pip-22.2.ebuild b/dev-python/pip/pip-22.2-r1.ebuild
index 98f0a4fb0961..67d8b8ae610c 100644
--- a/dev-python/pip/pip-22.2.ebuild
+++ b/dev-python/pip/pip-22.2-r1.ebuild
@@ -35,6 +35,8 @@ SRC_URI="
 "
 
 LICENSE="MIT"
+# bundled deps
+LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE="vanilla"
diff --git a/dev-python/pip/pip-22.2.1.ebuild b/dev-python/pip/pip-22.2.1-r1.ebuild
index 5e07d0a0768b..8d3b6ef3e28e 100644
--- a/dev-python/pip/pip-22.2.1.ebuild
+++ b/dev-python/pip/pip-22.2.1-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+# please bump dev-python/ensurepip-wheels along with this package!
+
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_TESTED=( python3_{8..10} )
 PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_11 pypy3 )
@@ -35,6 +37,8 @@ SRC_URI="
 "
 
 LICENSE="MIT"
+# bundled deps
+LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE="vanilla"
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index c843c1fb0da3..7af1098e79ea 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,7 +1,3 @@
-DIST pocketlint-0.22.tar.gz 23779 BLAKE2B 3698927cc4a3f6ee6de74d205b5a7f937405e7ce2e9d987e34b35ce209635cab37357d0221a6762deb66350cd2b991420a9b12af2c9e6792f713e5c95dfedb59 SHA512 7ee9e6b969975274e7697d1d16fadaac82fa0a1855401d9f240aaae123831dc32e381dd24f88a3f004ab45df9f0251c408ed8f60a08fe99caf629af617c80ea0
-DIST pocketlint-0.23.gh.tar.gz 23854 BLAKE2B 2ff3388b639ba29ae60ccd0013cea9b1f437d03d552c03089c91ba65f4fdf7b6b739ac2b926248bc5738e29cd41fa104d7c2742385cfe7a454841f2ed252b0fa SHA512 36a6f7fbc5b9475a145bc03ccf9a6918e49ed29279913b1bcc7090961bcc842333a4d31b4eb809a7ca7b384e79c186d1e6397c379c1921943ddd49c3c736aaed
 DIST pocketlint-0.24.gh.tar.gz 23875 BLAKE2B b4699d1f0633ed6a3f84b97db972818c00a1d382a48648fd4fe6870f4c54f983fd36366f85a409a99b860f385902a9a05adec63199e35d1264a522a7a3086e31 SHA512 21c4055dd42c244760950b64ec4cd9359fc589014953be6f9296e0265101f098fbe34351e87f92630751fa0055de20281974a04b425f691acc4608cf929d4bf4
-EBUILD pocketlint-0.22.ebuild 487 BLAKE2B ddb58387ad3830f65c4b44cb627e86bbfdd4bf0210bd106071fa70a9e3a5fefc1ee0c4ac91fd6bde07abfce72dff455f1a32501e381460a2d192f4458a7b44cf SHA512 96bf0eb52b41e9696c97fb4161ff526fb9f3acf4fc1f3d83fa13c9f0166eec59e93382d3908257950649058ca522bcb1254984c30291dfcd3789db19b7b0ff97
-EBUILD pocketlint-0.23.ebuild 575 BLAKE2B 96eea8110471e78a93387adaf951758d84415e8488eedfab83f2dc231bb89690806750acecec28e3c3a31e110082bf0a51ffbbba271f83ec02246c7ebbad774b SHA512 a6a2693cfe1124ebf8dc7e6d1ed050076b6d3e0b8af45b2ee57307bad0922b1b551cc4e089942a3b2e5c7b77705866fd46c2f35c8cb5df98bbd0539d41ebd125
-EBUILD pocketlint-0.24.ebuild 658 BLAKE2B 07012aad8df4b7bf7cae37f00fb1161204c79e333ee1a77f2508a52a773b17e35c56e0a208a3e1f7bd21c5644af5dbe49ef97de6fdd3bb9bb87289fc187d5c96 SHA512 36ca02a98184b9dccd9b533cc64b309e37284063716d301a85a268edd2ad181554a2aebd942bace70b74805ed370fef6e8aa5d9921fd21d23b3a3b05be380a48
+EBUILD pocketlint-0.24.ebuild 651 BLAKE2B 976c60e5a02c88bdc1c7111b11c03381016009931f52cf8a13dca87a960fbe11e41045dc7f785d50d50e14b33e9d3d9b8a3d0c3d553669b0dbd8e06492d4d7e1 SHA512 9e272a87379beeb5b474d580c7954fdfc4a6da6fdbc9bdc512f84f4a08d962b23d51a602440e54d866f74a0f2c603733785900d1aef62399f0d2e3530cab100a
 MISC metadata.xml 303 BLAKE2B fd0ac0ccb8faa5f3e9b7074f238915f2b7babb9dc3af3b1574dd3f98e2970182d4cc0e579f59388601e43bd8991fa7cbca570c499f48060a25bdf8279a5c0751 SHA512 9f916df92044f8b6c2351e094e0ffdee2cf039e4d2d2d101ecc5a5e10af58dd4bafa19dc6cba47af87aaf73ad22abd64b50803c5e77cb283ae12c1f9e1653f43
diff --git a/dev-python/pocketlint/pocketlint-0.22.ebuild b/dev-python/pocketlint/pocketlint-0.22.ebuild
deleted file mode 100644
index 4deeca19afb9..000000000000
--- a/dev-python/pocketlint/pocketlint-0.22.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Shared code for running pylint against rhinstaller projects"
-HOMEPAGE="https://github.com/rhinstaller/pocketlint"
-SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
diff --git a/dev-python/pocketlint/pocketlint-0.23.ebuild b/dev-python/pocketlint/pocketlint-0.23.ebuild
deleted file mode 100644
index ca9e78b12cda..000000000000
--- a/dev-python/pocketlint/pocketlint-0.23.ebuild
+++ /dev/null
@@ -1,23 +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_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Shared code for running pylint against rhinstaller projects"
-HOMEPAGE="https://github.com/rhinstaller/pocketlint"
-SRC_URI="
-	https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/pylint[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pocketlint/pocketlint-0.24.ebuild b/dev-python/pocketlint/pocketlint-0.24.ebuild
index c6c11e93d7a8..ac21eab576ec 100644
--- a/dev-python/pocketlint/pocketlint-0.24.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.24.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/pyaudio/Manifest b/dev-python/pyaudio/Manifest
index 0041498127ff..67674e0672ce 100644
--- a/dev-python/pyaudio/Manifest
+++ b/dev-python/pyaudio/Manifest
@@ -1,5 +1,4 @@
 AUX pyaudio-0.2.11-python310-size_t.patch 845 BLAKE2B 68eee6ebd83440e0f42a51a1c88735f5c6a7b2b541413faadee0260c22f65baff4d922100304fe719e9a6818ec98e3ce0bb51c763c916ae76385511d0d4ae12c SHA512 a9db774bcaaeb6693871ae49ec584bf58543469cd5c166e5ecb61efc354be7fde2a4c3283c1fe070a3d9d102301fa1a5f39d844418d52cd88565e1e62348992b
 DIST PyAudio-0.2.11.tar.gz 37428 BLAKE2B 18db51a651876135a6afc6c8c60e2221017a311fe1aec10497905bc35b81a73b5e9f27201431566bac3d13bcf582ec12a3b818c51f0e5e70aeb4ad177608461a SHA512 64db5542ee60837c9b07677e146fc7b060ff47c8b1c04cbb575bce79dd3ed4776c201e169ff2860f27dbe9e00a77046ba0cb925b55f7c546f8de46c6df68954e
-EBUILD pyaudio-0.2.11-r1.ebuild 1091 BLAKE2B 7ebb50ca17f473fa13ebdf973da074cb00bc161b0c2bf46701a5935a4eeb20763f5790e813ba74f6518db9a7f1a9caabffc554a80755c45bb5156691e8177d3f SHA512 41a4115bb3b8a2da4403fb7358fc3602d83cce90118770d59c31199dadd6e0f639260e62f77b1235d22f16ecca00a860910ad9c75fb8dbdf6628cc7e6f346e05
-EBUILD pyaudio-0.2.11-r2.ebuild 1182 BLAKE2B 7ee7cb3992233b3a08e79fd17fcb81ac63f6fa51fdc8ac6066b0d9ce14afe1b4c50a64eda0bb99ab2f0d4892bae33327711c64d2b8e83e01187363101b8c4614 SHA512 cf7d5d4fd000b4a32f8f6537bf525c97e17a9849acba15955e91097cb50f3a5ca9f19d58f58449842cfa8102da422cc589e936273eedfc6f40885bd96c252f36
+EBUILD pyaudio-0.2.11-r2.ebuild 1180 BLAKE2B 5f1acdc1f34c015b296593f754f21294f84084528685a852254650098dfdd80d9045aca6982ee0e69b9f0e4649fd916c22e62f7589a4fb14d80a3526b93940b8 SHA512 842b273a771572b4e04201e14987980bf02f6d1d9d30bac6223f39d74fd627ca07e46bdad3b69cf5dc15a518e3238b6004672c9f1ea18eaff7c81b7d17050784
 MISC metadata.xml 629 BLAKE2B 13fcd9ca931e654d70fa328133f5c1aff9410c7c504338d7fd14f53f2ea971c5418c3f8e242d2cc35cd990c91494626379cf88e7e157a5bfc37b87c0c83bf7c8 SHA512 cc9475811d3f8265e79c80d2b7b817156942430843d23361c3ea9791730c422acd9c399755c8f6a775b6a3e9d7fb9138f22e87ebde9e7019591d68c696095d81
diff --git a/dev-python/pyaudio/pyaudio-0.2.11-r1.ebuild b/dev-python/pyaudio/pyaudio-0.2.11-r1.ebuild
deleted file mode 100644
index 2af98eb2c323..000000000000
--- a/dev-python/pyaudio/pyaudio-0.2.11-r1.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_{8..10} )
-inherit distutils-r1
-
-MY_PN="PyAudio"
-
-DESCRIPTION="Python bindings for PortAudio"
-HOMEPAGE="http://people.csail.mit.edu/hubert/pyaudio/"
-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"
-
-# Tests work if you have the correct HW device(s) to test. 0.2.11-r1.
-RESTRICT="test"
-
-RDEPEND="media-libs/portaudio"
-DEPEND="${RDEPEND}
-	test? ( dev-python/numpy )"
-
-distutils_enable_sphinx sphinx
-distutils_enable_tests unittest
-
-python_test() {
-	elog "These tests require an OS loopback sound device that forwards audio"
-	elog "output, generated by PyAudio for playback, and forwards it to an input"
-	elog "device, which PyAudio can record and verify against a test signal."
-
-	cd tests || die
-	# pyaudio_tests have very complicated runtime requirements, therefore skipping them.
-	"${EPYTHON}" -m unittest error_tests -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pyaudio/pyaudio-0.2.11-r2.ebuild b/dev-python/pyaudio/pyaudio-0.2.11-r2.ebuild
index b061423018d0..4460e98b3091 100644
--- a/dev-python/pyaudio/pyaudio-0.2.11-r2.ebuild
+++ b/dev-python/pyaudio/pyaudio-0.2.11-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Tests work if you have the correct HW device(s) to test. 0.2.11-r1.
 RESTRICT="test"
diff --git a/dev-python/pycxx/Manifest b/dev-python/pycxx/Manifest
index a30a5dc226c2..6fdbe8517037 100644
--- a/dev-python/pycxx/Manifest
+++ b/dev-python/pycxx/Manifest
@@ -1,4 +1,3 @@
 DIST pycxx-7.1.5.tar.gz 156343 BLAKE2B 099de7f88c19ec86aea67b503e6fbdc0df66bbdd3bdc0ff7f8ce77425be9486e6abebed8548f9ac764688a85e62cda77d3832f460e5678b4c07b1c6d2123b257 SHA512 0f980298739886d0c05ddd5ee23ebb234014b8276d811e62dc5b0a738666c6a011ad3f4aeeb7b1b404d8bff87dddfc30f68eec9c6bd13d5f262a2f7c53e273be
-EBUILD pycxx-7.1.5-r1.ebuild 920 BLAKE2B 9efc0b254e906f85d1f1efb749e9f2e3b469fe482f4b181ade62374dac30e2308f46949062d3894253ba1143e36ec673f483f0a89e30bf82dd1aa752786afbe3 SHA512 10672ecfb951098d926f76cca8a19f8b11dc7206e6cfa8aa66abb23e64644263f43b7f4db1ed19e6b595d9e88f498998599df7037bf7278b679ebeace8d9f33f
-EBUILD pycxx-7.1.5.ebuild 916 BLAKE2B 723d0ceac9c91cfb1e804802688a8df7b8090a8c05305001392b002c3e11b234894ca94568ca1fcdc6a9648cb9c8346cd8901b4e8f36109e937a6f82735ff782 SHA512 7fcdaf0ad47fa1835799cba9f2737a02f0de91189da07d25a7301882892314c99de63f4e973a12ecca7491f840a2b01f1f59c13d438b199835e79c9d5ad155ed
+EBUILD pycxx-7.1.5-r1.ebuild 916 BLAKE2B d81ef87e677e63cf27b7771240091a743e48384ac4339e16aa7a76af938f21ada1cccd3b5ab3d20ef144dcd524acf1167f138809dd4340f34dcfe1f8f851bbc4 SHA512 7ca22d46fd8646df4dc7e52836abe53d45561d2b5125d09e5ccf88b7b7f1c2e1a2a9205d656ee214ab096f8ddeb67454c17153c41f19403d0330ba2d8278ec29
 MISC metadata.xml 667 BLAKE2B 1d5c679b2fcac7f5f302c35517f3903e0b3e3fdf5b65ec0005e0f1b2137ebc2a2e175031100c1bca997a6b2d7aa20ce3642c5dfcd7245c607d70d57b890694fe SHA512 2dc5bce4a24791956ca064750f7998556796af5afdb8cb24eaacd1e6485e6b92c939f053e410507e3fe3d6c29e320061c897f8ea0972ba04e4ed46f60876663c
diff --git a/dev-python/pycxx/pycxx-7.1.5-r1.ebuild b/dev-python/pycxx/pycxx-7.1.5-r1.ebuild
index 20eddf8c6d66..42470d114ccf 100644
--- a/dev-python/pycxx/pycxx-7.1.5-r1.ebuild
+++ b/dev-python/pycxx/pycxx-7.1.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="doc examples"
 
 python_prepare_all() {
diff --git a/dev-python/pycxx/pycxx-7.1.5.ebuild b/dev-python/pycxx/pycxx-7.1.5.ebuild
deleted file mode 100644
index 6054ebaa5c9c..000000000000
--- a/dev-python/pycxx/pycxx-7.1.5.ebuild
+++ /dev/null
@@ -1,35 +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} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-DESCRIPTION="Set of facilities to extend Python with C++"
-HOMEPAGE="http://cxx.sourceforge.net"
-SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="doc examples"
-
-python_prepare_all() {
-	# Without this, pysvn fails.
-	# Src/Python3/cxxextensions.c: No such file or directory
-	sed -e "/^#include/s:Src/::" -i Src/*.{c,cxx} || die "sed failed"
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( Doc/. )
-	if use examples ; then
-		docinto examples
-		dodoc -r Demo/Python{2,3}/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index d4e2a4cd3bf4..57808cd9e3e7 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,8 +1,10 @@
 DIST pypy3.9-gentoo-patches-7.3.9_p1.tar.xz 3952 BLAKE2B 20ff145749d24f15214c0c78f3fdc5e1cdbfc307972ad9dbc03f1b9704b25ea962434aee0d58a882912374b45f726eb449f0abafd663bddf14867807951b0a7f SHA512 3ce7a126fb7c52754d3b65e3df0786c80a98522ce78ab44fd5f81cd84a41e8b5929df2d8e4f644ed6c2265ca5da397cd7f37d44944cd08f7c8ae1cc8a2fd7e0d
 DIST pypy3.9-gentoo-patches-7.3.9_p2.tar.xz 4548 BLAKE2B 9acdd315d98b5147a21e9affcf4f4be86385cfe7e96a59a4aee1edb478c3c23990c7c846d7a1b268b616491d57346c939ddf02d4284f3b92f0f050e223eb85ba SHA512 28bc05b249f9f98501cb92354eabcdcd27987bfb6f4867bdda40752384db5ecf2204913c792785ce5a0e6ce588ef0044a179a3932da23205e8706cad065d95e2
 DIST pypy3.9-gentoo-patches-7.3.9_p3.tar.xz 5296 BLAKE2B 2422e7d74c563d7328e5bc5c131d13f0cb41f133e06a514e56ad89d2cc8e0b9c57d4379d0e8810486e5e34ec2807a74e9553768a493ffe54fc27d404977097d3 SHA512 3470efdd50ba10e2137b4661c940a3aa807b804ef582a5201507227573637171981bd597b3b40faa3606890f3f51fb8c43ff70628de924a67e2c1226beda9269
+DIST pypy3.9-gentoo-patches-7.3.9_p4.tar.xz 8664 BLAKE2B cccb62bb7957ee21f45eb65a307f255f61ba097cf9313517743bd0c4471d4b4e7c4c2bf2509fffd7584be6efbb467b39aeaec5e70b597844ddd40bd2184f65e8 SHA512 cf9722c5ada7544608b95cb94da4d119fa5371def760c52baaffe57ee0128c729e41a78bbcbcce6677eb88ad063d3f0572667ab8889cf68ee8be7e578ca420c7
 DIST pypy3.9-v7.3.9-src.tar.bz2 26976726 BLAKE2B bf1ed21c575901abac020120aaff07ab57f1404713211b19cbd1eb4d6ffc675b7933be8c6fffc2b69ab467963d6598534cd5aa90c02feddad596611d2a6b6581 SHA512 83f8a6a2da351c190d2d224242cbc35e35529c7a8e8d842eaf5c945cbce2e172b02a340f32af3d49df8d5288370d794d5bc95fc12dd4a13d817c925abf06198a
 EBUILD pypy3-7.3.9_p1.ebuild 5459 BLAKE2B cecd4e9ef25bfa9c5c26e444d74eaccfe3a6f588c33af1f64ab0419cdf8944a5b6d78134fadcae6ca682edbe48197df765c830f9cc22a80fb2fa3e5a220fb61c SHA512 30c1a6315502c2fa6d219567c4ec827244257a4f4bdde204fbd0374fd0c1320cbf87097db029ef3822173fa2cd999799b7b79b51df3d1447f67140bee26ecc65
 EBUILD pypy3-7.3.9_p2.ebuild 5461 BLAKE2B 4086916df9196af0dfbc8cf9e2ca0bd4cd6d4d7b927d4d157abae2ff7f7460492d3c30ba4525d1140e4eee8f7f87067bcf6981a0982936cc3f60cd49f332e2fd SHA512 3a24f51744b66a511152a0c52c4d5bb4a41330e452b6d6d67abe87e74a6ffdc8eeb989b8657226c41bd18cdb600eca7ab924cd16839c0e0e6ac49db6a2e8ba9d
 EBUILD pypy3-7.3.9_p3.ebuild 5579 BLAKE2B 6b30c40b01e3e4e6ffa6eaa2095df5e061079bb5ea2e858564aa1fb9c03ac54b1bf5422b722a3ae6bc0d166e4a3f4a302862cbdf908034682d3d61930bb055b4 SHA512 a357b3c6fe57074821a5b7b95851e5dc22cda8135f1828dd9250715394d43a96369b43273bacff38865b5b2d3aeb29eadc0fb84b1d8746e5235a73cefc3d4c14
-MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
+EBUILD pypy3-7.3.9_p4.ebuild 5773 BLAKE2B 2f9fac9ca77b85d68f81f965324d7a58d87e2fd546653e9b72217a1cd7b716c49e94a482ed7ccfa907fcf8e936746879791a50d197709f80dceddc92bf430502 SHA512 6126c4b7e711930a039e4825396fcdfa784d2f4c54817a799b2f28e82a2cde9864fba17aa0cfddcfeee1828f4a0dc9eeccb9571693aee802295b4504e40bf355
+MISC metadata.xml 455 BLAKE2B 568930d8cb9c6efa7e41d2285fa487ab7aee2344c11fe5cc325d24d6dbcd1184daffcad3b262351b39a45cdf7994ed301b61946eafa1be901b7419636d2eebd9 SHA512 357104cf9ac21d9c7fa5d843cfa7e2c5883d2f11e0bc15ac0fa8ab36a9595194ac05165f5aee94c3eb98ad370f0bf16f4488819311f8f077e9f2a79586f711f0
diff --git a/dev-python/pypy3/metadata.xml b/dev-python/pypy3/metadata.xml
index efd7c8c21836..6bbdf5133f0c 100644
--- a/dev-python/pypy3/metadata.xml
+++ b/dev-python/pypy3/metadata.xml
@@ -5,4 +5,11 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<use>
+		<flag name="ensurepip">
+			Install the ensurepip module that uses bundled wheels
+			to bootstrap pip and setuptools (if disabled, it will
+			be only possible to use venv `--without-pip`)
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-python/pypy3/pypy3-7.3.9_p4.ebuild b/dev-python/pypy3/pypy3-7.3.9_p4.ebuild
new file mode 100644
index 000000000000..62da106fee36
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.9_p4.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python2_7 )
+inherit pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy3.9-v${PYPY_PV/_rc/rc}
+PATCHSET="pypy3.9-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.9) language"
+HOMEPAGE="
+	https://www.pypy.org/
+	https://foss.heptapod.net/pypy/pypy/
+"
+SRC_URI="
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
+SLOT="0/pypy39-pp73-336"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 +ensurepip gdbm +jit ncurses sqlite test tk"
+# many tests are failing upstream
+# see https://buildbot.pypy.org/summary?branch=py3.9
+RESTRICT="test"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy3-exe-${PYPY_PV}_p3:3.9-${PYPY_PV}[bzip2?,ncurses?]
+		>=dev-python/pypy3-exe-bin-${PYPY_PV}_p3:3.9-${PYPY_PV}
+	)
+	dev-lang/python-exec[python_targets_pypy3(-)]
+	dev-libs/openssl:0=
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy3-bin-7.3.0:0
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		!!dev-python/pytest-forked
+	)
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	mkdir bin || die
+	# switch to the layout expected for cffi module builds
+	mkdir include/pypy3.9 || die
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/bin/pypy3.9-c-${PYPY_PV} pypy3.9-c || die
+	cp -p "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/* include/pypy3.9/ || die
+	# (not installed by pypy-exe)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/pypy3.9/ || die
+	mv pypy/module/cpyext/parse/*.h include/pypy3.9/ || die
+	pax-mark m pypy3.9-c
+
+	# verify the subslot
+	local soabi=$(
+		./pypy3.9-c - <<-EOF
+			import importlib.util
+			import sysconfig
+			soabi = sysconfig.get_config_var("SOABI")
+			magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
+			print(f"{soabi}-{magic}")
+		EOF
+	)
+	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	# Add epython.py to the distribution
+	echo "EPYTHON='${EPYTHON}'" > lib-python/3/epython.py || die
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy3.9-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
+		import lib2to3.pygram
+		import lib2to3.patcomp
+		lib2to3.patcomp.PatternCompiler()
+	EOF
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+	# (NB: we build CFFI modules first to avoid error log when importing
+	# build_cffi_imports).
+	cffi_targets=( pypy_util blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma posixshmem )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3.9-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Verify that CFFI module list is up-to-date
+	local expected_cksum=63d4659f
+	local local_cksum=$(
+		../pypy3.9-c - <<-EOF
+			import binascii
+			import json
+			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
+			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
+		EOF
+	)
+	if [[ ${local_cksum} != ${expected_cksum} ]]; then
+		die "Please verify cffi_targets and update checksum to ${local_cksum}"
+	fi
+
+	# Cleanup temporary objects
+	find -name "*_cffi.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	# (--deselect for failing doctests)
+	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3.9-c -vv lib-python || die
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	dodir /usr/bin
+	dosym pypy3.9-c-${PYPY_PV} /usr/bin/pypy3.9
+	dosym pypy3.9 /usr/bin/pypy3
+	insinto /usr/lib/pypy3.9
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r lib-python/3/. lib_pypy/.
+	insinto /usr/include
+	doins -r include/pypy3.9
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy3.9/${x##*/}"
+	done
+
+	dodoc README.rst
+
+	local dest=/usr/lib/pypy3.9
+	rm -r "${ED}${dest}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${ED}${dest}"/ensurepip || die
+	fi
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/sqlite3 \
+			"${ED}${dest}"/_sqlite3* \
+			"${ED}${dest}"/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/{idlelib,tkinter} \
+			"${ED}${dest}"/_tkinter \
+			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy3
+	local -x PYTHON=${ED}/usr/bin/pypy3.9-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}/usr/bin/pypy3.9-c-${PYPY_PV}" "${PYTHON}" || die
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest
index 08512d62099f..880f4148894e 100644
--- a/dev-python/pyside2/Manifest
+++ b/dev-python/pyside2/Manifest
@@ -2,6 +2,5 @@ AUX pyside2-5.15.2-python310.patch 508 BLAKE2B bdfc33975d1dd0c9eb73d1bae3ec2aff8
 AUX pyside2-5.15.2-python311-fixups.patch 1962 BLAKE2B 37d91352ea09eaef6d36c600165e4fea74145b0fa05620e739254d3983acc501455154fc51ce3448aa4f60a00cd377f0896cb3dc14f1a921d6948dc53c500784 SHA512 39e999c80ed2717eaf59b47c12e64208d1b54d3d61daacf7a8ebeb4586f3b7312dd5db3fc53d4d2f3c426d80729e5d655e9b612153c704b40b7d261ddd57e580
 AUX pyside2-5.15.2-python311.patch 1777 BLAKE2B 1afa7c39755c4f91b4b4c951f59e1a3190f924d8b20cf2140ad5342c2fa046ff7e6bec540bea9d7652116894e0cb7f5fa5ea73067212ca5b631382e7139d7786 SHA512 b88f300e4944cbb9adc8ac887e263e74e088a1b291000c86f6677a01241939e612fa5eebba3807fb2318477e68de241914832cc92ed0470726804d3098486120
 DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B 099abeaf25059a88f299f90b18cf79aa45acd86580c0873767b09f76268d6746cc3576743a19493a605de59b520471ddee6bba0e5340801ef44a21f2a9d41507 SHA512 5043c1c9db4ba0133baaabb4d4943182e9741b1007bedd992394758707a37bba0688dc6413ea46620e7c2fb09daa3c74e6a7bb2c302b9d08e5f3bb7575d02b62
-EBUILD pyside2-5.15.2-r1.ebuild 8565 BLAKE2B e83634bda361686691269f351d55ebba635fda4070a4bd1542109e528e840a9f525bd2f92b80cf7c3560ba374b9e4f541cd33ba336c299a9e141f4ad546de956 SHA512 c770d2aba3ee2d1d3072e3f2779dc552ca6649bfecfe5f5ca6d0148fbd819c6d76a22e8626f7281772f6c7da1a9dc98db2a53fb6fb2b136ef2bd7eede1c77b8f
-EBUILD pyside2-5.15.2-r2.ebuild 8672 BLAKE2B 0a13b7fd9e71b0affc66a9d282313f69d256311c5a0faf71dac1af6413eaf102a6127956c548f58eba12be50b3dd71f6d2ce8b0471ceacbfdb37d90774090431 SHA512 8afb6c03c15e40f1032d8c790e70855a30cdea128139a29334badc6ce88fe65514069b450c0e3c221263f998da963008884a625307f34a6363737b8125664c33
+EBUILD pyside2-5.15.2-r2.ebuild 8669 BLAKE2B bffd6ee4d015761d13684a328dcd5a2c623646cd6ba3dee968941ac438b20d64cc8164ea61462a3c540e0b836a5f093883135e7c69b66a195c18d19403788e00 SHA512 4bc858eb5d75cfdc36e077064175efdf3d36980948546aad775561d1c25e90ad01be93035d2bf1713f687e1b86efe099f67fe17492a27fe16fa8a2153786651a
 MISC metadata.xml 2021 BLAKE2B 88a02910c29d93871a1b6d4709fec361712d083839186270ad9c5e6472876a3ba50d7aa9c4acd0b169de19caf3c8047a00b6d241ea64b24b65e0a7e796e6f418 SHA512 c42370395ed54c9a20d9969f0a764ef72537bd77a76fb35bd3a5f10abcb801c4794cdd4f2ca528e97e5fb7a1e9293c76845c6a77b973bde00a1ddd9c61b3e5ef
diff --git a/dev-python/pyside2/pyside2-5.15.2-r1.ebuild b/dev-python/pyside2/pyside2-5.15.2-r1.ebuild
deleted file mode 100644
index 49fc3f94a3d9..000000000000
--- a/dev-python/pyside2/pyside2-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake python-r1 virtualx
-
-# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects"
-# USE flag after an external "dev-qt/qtremoteobjects" package has been created.
-# TODO: Add conditional support for apidoc generation via a new "doc" USE flag.
-# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once
-# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support.
-# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note
-# that the "PySide2/QtGui/CMakeLists.txt" and
-# "PySide2/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by
-# testing whether the "Qt5::Gui" list property defined by
-# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation
-# time contains the substring "opengles2". Since cmake does not permit
-# properties to be overridden from the command line, these files must instead
-# be conditionally patched to avoid these tests. An issue should be filed with
-# upstream requesting a CLI-settable variable to control this.
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://wiki.qt.io/PySide2"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}/sources/pyside2"
-
-# See "sources/pyside2/PySide2/licensecomment.txt" for licensing details.
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="
-	3d charts concurrent datavis designer gles2-only +gui help location
-	multimedia +network positioning printsupport qml quick script scripttools
-	scxml sensors speech sql svg test testlib webchannel webengine websockets
-	+widgets x11extras xml xmlpatterns
-"
-
-# Manually reextract these requirements on version bumps by running the
-# following one-liner from within "${S}":
-#     $ grep 'set.*_deps' PySide2/Qt*/CMakeLists.txt
-# Note that the "designer" USE flag corresponds to the "Qt5UiTools" module.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	3d? ( gui network )
-	charts? ( widgets )
-	datavis? ( gui )
-	designer? ( widgets xml )
-	gles2-only? ( gui )
-	help? ( widgets )
-	location? ( positioning )
-	multimedia? ( gui network )
-	printsupport? ( widgets )
-	qml? ( gui network )
-	quick? ( qml )
-	scripttools? ( gui script widgets )
-	speech? ( multimedia )
-	sql? ( widgets )
-	svg? ( widgets )
-	testlib? ( widgets )
-	webengine? (
-		location quick
-		widgets? ( gui network printsupport webchannel )
-	)
-	websockets? ( network )
-	widgets? ( gui )
-	x11extras? ( gui )
-"
-
-#tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-2):5"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/shiboken2-${PV}[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5=
-	dev-qt/qtopengl:5=
-	dev-qt/qtserialport:5=
-	3d? ( >=dev-qt/qt3d-${QT_PV}[qml?] )
-	charts? ( >=dev-qt/qtcharts-${QT_PV}[qml?] )
-	concurrent? ( >=dev-qt/qtconcurrent-${QT_PV} )
-	datavis? ( >=dev-qt/qtdatavis3d-${QT_PV}[qml?] )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	gui? ( >=dev-qt/qtgui-${QT_PV}[jpeg,gles2-only?] )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	location? ( >=dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[qml?,widgets?] )
-	network? ( >=dev-qt/qtnetwork-${QT_PV} )
-	positioning? ( >=dev-qt/qtpositioning-${QT_PV}[qml?] )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
-	qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	script? ( >=dev-qt/qtscript-${QT_PV} )
-	scxml? ( >=dev-qt/qtscxml-${QT_PV} )
-	sensors? ( >=dev-qt/qtsensors-${QT_PV}[qml?] )
-	speech? ( >=dev-qt/qtspeech-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	testlib? ( >=dev-qt/qttest-${QT_PV} )
-	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV}[qml?] )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )
-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV}[qml?] )
-	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
-	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
-	xml? ( >=dev-qt/qtxml-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV}[qml?] )
-"
-DEPEND="${RDEPEND}
-	test? ( x11-misc/xvfb-run )
-"
-
-PATCHES=( "${FILESDIR}/${P}-python310.patch" )
-
-src_configure() {
-	# See COLLECT_MODULE_IF_FOUND macros in CMakeLists.txt
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DAnimation=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DCore=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DExtras=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DInput=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DLogic=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DRender=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Charts=$(usex !charts)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Concurrent=$(usex !concurrent)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DataVisualization=$(usex !datavis)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Gui=$(usex !gui)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Help=$(usex !help)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Location=$(usex !location)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Multimedia=$(usex !multimedia)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5MultimediaWidgets=$(usex !multimedia yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Network=$(usex !network)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=$(usex !positioning)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5PrintSupport=$(usex !printsupport)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Qml=$(usex !qml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Quick=$(usex !quick)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickWidgets=$(usex !quick yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Script=$(usex !script)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5ScriptTools=$(usex !scripttools)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Scxml=$(usex !scxml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=$(usex !sensors)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5TextToSpeech=$(usex !speech)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sql=$(usex !sql)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Svg=$(usex !svg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=$(usex !testlib)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5UiTools=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebChannel=$(usex !webchannel)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine=$(usex !webengine)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineCore=$(usex !webengine)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=$(usex !webengine yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebSockets=$(usex !websockets)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=$(usex !widgets)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=$(usex !x11extras)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Xml=$(usex !xml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5XmlPatterns=$(usex !xmlpatterns)
-	)
-
-	pyside2_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
-			-DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}"
-		)
-		cmake_src_configure
-	}
-	python_foreach_impl pyside2_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE
-	python_foreach_impl virtx cmake_src_test
-}
-
-src_install() {
-	pyside2_install() {
-		cmake_src_install
-		python_optimize
-
-		# Uniquify the shiboken2 pkgconfig dependency in the PySide2 pkgconfig
-		# file for the current Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		sed -i -e 's~^Requires: shiboken2$~&-'${EPYTHON}'~' \
-			"${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die
-
-		# Uniquify the PySide2 pkgconfig file for the current Python target,
-		# preserving an unversioned "pyside2.pc" file arbitrarily associated
-		# with the last Python target. (See the previously linked issue.)
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl pyside2_install
-
-	# CMakeLists.txt installs a "PySide2Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., pyside2-tools) to target one
-	# "libpyside2-*.so" library linked to one Python interpreter. See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i -e 's~pyside2-python[[:digit:]]\+\.[[:digit:]]\+~pyside2${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)/cmake/PySide2-${PV}/PySide2Targets-gentoo.cmake" || die
-}
diff --git a/dev-python/pyside2/pyside2-5.15.2-r2.ebuild b/dev-python/pyside2/pyside2-5.15.2-r2.ebuild
index 1956ebcc9ea0..c18757c9ac57 100644
--- a/dev-python/pyside2/pyside2-5.15.2-r2.ebuild
+++ b/dev-python/pyside2/pyside2-5.15.2-r2.ebuild
@@ -34,7 +34,7 @@ S="${WORKDIR}/${MY_P}/sources/pyside2"
 # See "sources/pyside2/PySide2/licensecomment.txt" for licensing details.
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="
 	3d charts concurrent datavis designer gles2-only +gui help location
 	multimedia +network positioning printsupport qml quick script scripttools
diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest
index df79eaa40761..b11ba96acbb6 100644
--- a/dev-python/pysvn/Manifest
+++ b/dev-python/pysvn/Manifest
@@ -1,4 +1,4 @@
 DIST pysvn-1.9.15.tar.gz 667161 BLAKE2B 35e9e0967d5c0b4cebf546e40df17b66c66406d0f8100c32e6e840220f60b0083c0ed3f3af5f54e2264d06905ea90970d6b7cbfad2bab872a14d5d4aea5900df SHA512 0809507134fd31f6bcc90217e7840eb166e2eb2ed56316010a549dd70f6f855599f596942574343cdefd5997947b12c847df2cd145669f50aa93f603e46a5ee0
-EBUILD pysvn-1.9.15-r1.ebuild 1275 BLAKE2B 144b78df07a049447f5207168ab371a79f5fd400fd589bc38a50cb0f6ba9baf81a257e60d6d294d376d84a00c6548193dc4727329bc9298070d5ae53b7c08f8a SHA512 cdd0628a59e3f5b3d6f80c463f279c22bae9d168ddf5105f8ae26fde92142e2546e9b8465c93e1fd4d34a7ca3521f0e240fb27cfa76b6defb2076093c35de5a4
+EBUILD pysvn-1.9.15-r1.ebuild 1274 BLAKE2B 4e3a440451e51bcc6e25114cb3ecc904fbf3a96661e45a953880a0eaa2f444fd17a38a696a56156128daff8ac373f4ebef38bf125eaba9daadd1bc074a271997 SHA512 67f6c2f99816ad0fa6b63337243b8885cce6ec7cf586b3807ad83be2eee62ea2e7cb264994cef9a37be9b3e1d3e2afce776f6c568aec6f68bdc4455b25164810
 EBUILD pysvn-1.9.15.ebuild 1272 BLAKE2B 0102cbd80681f495c9ebce636dbb417a2655a3ea3bba6f34298d82a5fb8ca3e0ed15ecb9a6d51a10fb5dd1b89c00a57b35d7f3375d16bd84ea84fffc86398bcc SHA512 1e847b4f98454ab1fa96eda0719dc80d18064271a6c02914851d3fc5e646eeff53764153908673c955639cc6868da6aa1815db0c140280be7e2f182326c4b068
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-python/pysvn/pysvn-1.9.15-r1.ebuild b/dev-python/pysvn/pysvn-1.9.15-r1.ebuild
index fb4f890e42e8..bd402ba42a47 100644
--- a/dev-python/pysvn/pysvn-1.9.15-r1.ebuild
+++ b/dev-python/pysvn/pysvn-1.9.15-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/pysvn/pysvn/V${PV}/${P}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc examples"
 
 DEPEND="
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index 176263061747..f5988bfff85a 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -1,6 +1,3 @@
-AUX requests-cache-0.9.3-cattrs-22.patch 6925 BLAKE2B f753c154741fe3a6b6fb05db19ddeadff669e2175a2113709921a2356dd53f4b867be8f9a3b91c36cbeeb891f9261c956b8728acdc03183a678117190afbd026 SHA512 f3258aa033e197dece2eca00169a833259d44c91488780edcc945839960bbeeb28f77d7dea806eecabcefea20aaa9c1a8c3448a0d34da58f89083cc7e82a597c
-DIST requests-cache-0.9.4.gh.tar.gz 1541821 BLAKE2B 90f3ffe8f4213a47d19c1190f1201bb484473a4ee2fae82dff59c9e80bc8c154739e99f5024aa55b436f9e620d5594441df61e2db44e3cbb381d394c1b6b4a0b SHA512 66023dc8b153070a532f160af58ac2102f6b9d536a0045c4c62ad1d4175f59df6e7db5a25422f5610a2f17049270ad0b63c6023ddddf64235432a63d2cce9b91
 DIST requests-cache-0.9.5.gh.tar.gz 1542034 BLAKE2B 01996e7536ce967dee2b909091d1eb08501b3882b6171a5460b2196666eed848dec89a85ef8ea0c892b2fd153f90107948239de04b973e7766d3acfad7b10059 SHA512 de1481ff609f3ff36ed662d986fb86a500a8d26755832478a9a4396f2c71934b5f65540137b92365eb36f66087b3fbc1cd72c63d37546d09c86bbee7340fd8eb
-EBUILD requests-cache-0.9.4.ebuild 1973 BLAKE2B 80dd5db6761f818e3b389fd063371cd549050b7636fff825637d106a58feeb678e9915b773d28beac892d00a1c7e63d5dfa24bcede8c66e7e1b7cd472253bafb SHA512 e82a49eb38e33ffedc1d1cb28482ac838549116a9c8ed73b08f79a74b4f4a2cf95c5638465828056d862a6762168d2678319ddfbedc825b48e4e8ccfec2c52c6
-EBUILD requests-cache-0.9.5.ebuild 1802 BLAKE2B 8addbff1f4603f7c28f8bc5fc3ca350ea1d1c01084e0c5461c04128680b05f5d93e8fe0ece13b9aaaa0ef42245120dee7d356991f2bfa76e6199df5013967980 SHA512 112cf3cba0fcd6f3bedbe4bcf12412c6ce5c77d01c93a187164b338e5958210df7a1c92b87230adb9dc341b296d86eaec51c3a68d13ef87f7f311d4fef96e0ee
+EBUILD requests-cache-0.9.5.ebuild 1800 BLAKE2B 94b814c239d343e3515c79c34b353a0920fba71b0139cac1f7d3332f891ac6d8cbfff2c68aaed8b47419606a4ed68b3950f04fe74ad83760eb17acf242983403 SHA512 c5483081f64e6a05343e9c57f32b715401d323558150bbb34e120fc351f3284a1439a50637dcf8045fa690b052597c43a60645972703241ff437f9e08f4e83da
 MISC metadata.xml 541 BLAKE2B a8fd81921a36e2fe5bdec38cc1039b9e91971c992a59cbe2dc4826977f753bd6cd2533f65b5f1a076308a898972fe70e85a2c8cf480259e9801f51b10c4de8a4 SHA512 64f29b67eaf3ce892a9f918abd7eaf8f020323e9e0d986b424cffc83e3ac1ba5cb14b534f0a0ec73a8e81694ca4e0e7f98ef02968ac5b43dab104b2b12e8e0f2
diff --git a/dev-python/requests-cache/files/requests-cache-0.9.3-cattrs-22.patch b/dev-python/requests-cache/files/requests-cache-0.9.3-cattrs-22.patch
deleted file mode 100644
index 258738158355..000000000000
--- a/dev-python/requests-cache/files/requests-cache-0.9.3-cattrs-22.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 7917ba0dd12901d88137d3f8b487307eda38d326 Mon Sep 17 00:00:00 2001
-From: Jordan Cook <jordan.cook@pioneer.com>
-Date: Sat, 9 Apr 2022 13:33:32 -0500
-Subject: [PATCH] Add compatibility with cattrs 21.1+, and clean up preconf
- module a bit
-
----
- requests_cache/__init__.py            |  2 +-
- requests_cache/serializers/preconf.py | 89 +++++++++++++++------------
- 2 files changed, 49 insertions(+), 42 deletions(-)
-
-diff --git a/requests_cache/__init__.py b/requests_cache/__init__.py
-index 87781ba..835586c 100644
---- a/requests_cache/__init__.py
-+++ b/requests_cache/__init__.py
-@@ -17,4 +17,4 @@ try:
-     from .session import *
- # Log and ignore ImportErrors, if imported outside a virtualenv (e.g., just to check __version__)
- except ImportError as e:
--    logger.warning(e)
-+    logger.warning(e, exc_info=True)
-diff --git a/requests_cache/serializers/preconf.py b/requests_cache/serializers/preconf.py
-index ed19fb4..cb099b8 100644
---- a/requests_cache/serializers/preconf.py
-+++ b/requests_cache/serializers/preconf.py
-@@ -1,3 +1,4 @@
-+# flake8: noqa: F841
- """The ``cattrs`` library includes a number of `pre-configured converters
- <https://cattrs.readthedocs.io/en/latest/preconf.html>`_ that perform some pre-serialization steps
- required for specific serialization formats.
-@@ -14,69 +15,75 @@ class that raises an ``ImportError`` at initialization time instead of at import
- """
- import pickle
- from functools import partial
--
--from cattr.preconf import bson as bson_preconf
--from cattr.preconf import json as json_preconf
--from cattr.preconf import msgpack, orjson, pyyaml, tomlkit, ujson
-+from importlib import import_module
- 
- from .._utils import get_placeholder_class
- from .cattrs import CattrStage
- from .pipeline import SerializerPipeline, Stage
- 
--base_stage = (
--    CattrStage()
--)  #: Base stage for all serializer pipelines (or standalone dict serializer)
-+
-+def make_stage(preconf_module: str):
-+    """Create a preconf serializer stage from a module name, if dependencies are installed"""
-+    try:
-+        return CattrStage(import_module(preconf_module).make_converter)
-+    except ImportError as e:
-+        return get_placeholder_class(e)
-+
-+
-+base_stage = CattrStage()  #: Base stage for all serializer pipelines
- dict_serializer = base_stage  #: Partial serializer that unstructures responses into dicts
--bson_preconf_stage = CattrStage(bson_preconf.make_converter)  #: Pre-serialization steps for BSON
--json_preconf_stage = CattrStage(json_preconf.make_converter)  #: Pre-serialization steps for JSON
--msgpack_preconf_stage = CattrStage(msgpack.make_converter)  #: Pre-serialization steps for msgpack
--orjson_preconf_stage = CattrStage(orjson.make_converter)  #: Pre-serialization steps for orjson
--yaml_preconf_stage = CattrStage(pyyaml.make_converter)  #: Pre-serialization steps for YAML
--toml_preconf_stage = CattrStage(tomlkit.make_converter)  #: Pre-serialization steps for TOML
--ujson_preconf_stage = CattrStage(ujson.make_converter)  #: Pre-serialization steps for ultrajson
--pickle_serializer = SerializerPipeline(
--    [base_stage, pickle], is_binary=True
--)  #: Complete pickle serializer
-+pickle_serializer = SerializerPipeline([base_stage, pickle], is_binary=True)  #: Pickle serializer
- utf8_encoder = Stage(dumps=str.encode, loads=lambda x: x.decode())  #: Encode to bytes
-+bson_preconf_stage = make_stage('cattr.preconf.bson')  #: Pre-serialization steps for BSON
-+json_preconf_stage = make_stage('cattr.preconf.json')  #: Pre-serialization steps for JSON
-+msgpack_preconf_stage = make_stage('cattr.preconf.msgpack')  #: Pre-serialization steps for msgpack
-+orjson_preconf_stage = make_stage('cattr.preconf.orjson')  #: Pre-serialization steps for orjson
-+toml_preconf_stage = make_stage('cattr.preconf.tomlkit')  #: Pre-serialization steps for TOML
-+ujson_preconf_stage = make_stage('cattr.preconf.ujson')  #: Pre-serialization steps for ultrajson
-+yaml_preconf_stage = make_stage('cattr.preconf.pyyaml')  #: Pre-serialization steps for YAML
- 
- 
- # Safe pickle serializer
--try:
-+def signer_stage(secret_key=None, salt='requests-cache') -> Stage:
-+    """Create a stage that uses ``itsdangerous`` to add a signature to responses on write, and
-+    validate that signature with a secret key on read. Can be used in a
-+    :py:class:`.SerializerPipeline` in combination with any other serialization steps.
-+    """
-     from itsdangerous import Signer
- 
--    def signer_stage(secret_key=None, salt='requests-cache') -> Stage:
--        """Create a stage that uses ``itsdangerous`` to add a signature to responses on write, and
--        validate that signature with a secret key on read. Can be used in a
--        :py:class:`.SerializerPipeline` in combination with any other serialization steps.
--        """
--        return Stage(Signer(secret_key=secret_key, salt=salt), dumps='sign', loads='unsign')
--
--    def safe_pickle_serializer(
--        secret_key=None, salt='requests-cache', **kwargs
--    ) -> SerializerPipeline:
--        """Create a serializer that uses ``pickle`` + ``itsdangerous`` to add a signature to
--        responses on write, and validate that signature with a secret key on read.
--        """
--        return SerializerPipeline(
--            [base_stage, pickle, signer_stage(secret_key, salt)], is_binary=True
--        )
-+    return Stage(Signer(secret_key=secret_key, salt=salt), dumps='sign', loads='unsign')
-+
-+
-+def safe_pickle_serializer(secret_key=None, salt='requests-cache', **kwargs) -> SerializerPipeline:
-+    """Create a serializer that uses ``pickle`` + ``itsdangerous`` to add a signature to
-+    responses on write, and validate that signature with a secret key on read.
-+    """
-+    return SerializerPipeline([base_stage, pickle, signer_stage(secret_key, salt)], is_binary=True)
-+
- 
-+try:
-+    import itsdangerous  # noqa: F401
- except ImportError as e:
-     signer_stage = get_placeholder_class(e)
-     safe_pickle_serializer = get_placeholder_class(e)
- 
- 
--# BSON serializer
--try:
-+def _get_bson_functions():
-+    """Handle different function names between pymongo's bson and standalone bson"""
-     try:
--        from bson import decode as _bson_loads
--        from bson import encode as _bson_dumps
-+        import pymongo  # noqa: F401
-+
-+        return {'dumps': 'encode', 'loads': 'decode'}
-     except ImportError:
--        from bson import dumps as _bson_dumps
--        from bson import loads as _bson_loads
-+        return {'dumps': 'dumps', 'loads': 'loads'}
-+
-+
-+# BSON serializer
-+try:
-+    import bson
- 
-     bson_serializer = SerializerPipeline(
--        [bson_preconf_stage, Stage(dumps=_bson_dumps, loads=_bson_loads)], is_binary=True
-+        [bson_preconf_stage, Stage(bson, **_get_bson_functions())], is_binary=True
-     )  #: Complete BSON serializer; uses pymongo's ``bson`` if installed, otherwise standalone ``bson`` codec
- except ImportError as e:
-     bson_serializer = get_placeholder_class(e)
--- 
-2.35.1
-
diff --git a/dev-python/requests-cache/requests-cache-0.9.4.ebuild b/dev-python/requests-cache/requests-cache-0.9.4.ebuild
deleted file mode 100644
index c9a10a8eef4c..000000000000
--- a/dev-python/requests-cache/requests-cache-0.9.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 optfeature
-
-HOMEPAGE="
-	https://pypi.org/project/requests-cache/
-	https://github.com/requests-cache/requests-cache/
-"
-DESCRIPTION="Persistent cache for requests library"
-SRC_URI="
-	https://github.com/requests-cache/requests-cache/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/cattrs[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/itsdangerous[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-		dev-python/ujson[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/requests-cache-0.9.3-cattrs-22.patch
-)
-
-src_prepare() {
-	# unpin the dep
-	sed -i -e '/cattrs/s:\^:>=:' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# These require extra servers running
-		tests/integration/test_dynamodb.py
-		tests/integration/test_gridfs.py
-		tests/integration/test_mongodb.py
-		tests/integration/test_redis.py
-	)
-	local EPYTEST_DESELECT=(
-		# Requires Internet access
-		tests/integration/test_compat.py::test_version_upgrade
-	)
-
-	local -x USE_PYTEST_HTTPBIN=true
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "redis backend" "dev-python/redis-py"
-	optfeature "MongoDB backend" "dev-python/pymongo"
-
-	optfeature "JSON serialization" "dev-python/ujson"
-	optfeature "YAML serialization" "dev-python/pyyaml"
-	optfeature "signing serialized data" "dev-python/itsdangerous"
-}
diff --git a/dev-python/requests-cache/requests-cache-0.9.5.ebuild b/dev-python/requests-cache/requests-cache-0.9.5.ebuild
index a05212c9f27b..836dbde0e04f 100644
--- a/dev-python/requests-cache/requests-cache-0.9.5.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.9.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/sabyenc/Manifest b/dev-python/sabyenc/Manifest
index c20d15482bc7..0694aad06115 100644
--- a/dev-python/sabyenc/Manifest
+++ b/dev-python/sabyenc/Manifest
@@ -1,4 +1,6 @@
 AUX sabyenc-4.0.2-fix-segfault.patch 1133 BLAKE2B af92dbd8413437562dbdc96bdceb2c2422002ec29dd67b206aa249d8c6135325779ee7de3a352caca57473f5224efe9b9847159bbc2def927e7769e4976f1dbb SHA512 97e5b4c99091fc8bc0dcb975afd72a70b5a26d46e4543f55caada492ee5da1909b8bcc344592d228c678b6f4ff4df36d4ddf8fe485d23e170be5ed358f943cc4
 DIST sabyenc-4.0.2.tar.gz 19579235 BLAKE2B 26af61a979f94b954a6fb7fa425ca07a8d757fb16c9d434e9a1e0019d84d156b527e9309cc65113fef64dd3f2afb92b46619dc9506327273f2ba7822337e9ccf SHA512 88e8b47b1438ca55b51dbf8a407c33ec335f0604abf8a3dcbc45853b6dadadf9932d97cf3f0adabd71a9405e2deaeff2777483d9ea692c9d3cbab99dfbfbc901
+DIST sabyenc-5.4.2.gh.tar.gz 19774424 BLAKE2B fbb954435236eb1794611a8e5852534b0f7dbd79806e8a9ca1bb57274df7cc89a6a26aa92c89c596e0c2857d4bfbd4e4c34f1d529cb5d2464a669d6d15a3f392 SHA512 a07a57e6b3416e147fcef4f27e52fea4b3a522ebb722b4d223469b63e9d08f42689950d86c544a41bfe81bba934514a43094c13b98aa585167cae69a5aa1f405
 EBUILD sabyenc-4.0.2.ebuild 613 BLAKE2B 9c5a2baea3973fa4b1ae29868a74111f30fe0b658d119b14a0871f0e136f918a64ed843f3b40fe8e9f686a299e2bec1f9ff4486ae51585cec1ca5b9d8e3bd867 SHA512 7daaf7d398a057026a075f2b8ca5fed662541dc00d39094012d8a4719e63876f93e0ea66a4b640408fcab5f6fe85f4f0f60bae032f9db9254939d1a913712b16
+EBUILD sabyenc-5.4.2.ebuild 593 BLAKE2B 4f5a8ebadab093b76d5dcd42f78f326846762b4f3da5f8ee1005af6adf519c2d8353ead45df099770f1aed0ca73021a05984e3246e92da85423852253fbe13bd SHA512 7c753abbc9f84041028a160abfca37532228a1191867b5932e8ede3263988671bbbfba7e76b2526f5fb632333eb57b20db9c7b288e0601deed1183a541d79b00
 MISC metadata.xml 238 BLAKE2B 69a87380f32f24cdbfda57721fd4dd89008a7dff64d60dce645f350f6020c1045143178f0e587345dbcf6730b0143dcf9c8c1484f143586548c39ab0d84340ac SHA512 42c9ac3c3d0fbeb78931eda833c52ac6d6f79d43bb6e25f0a88450f51f8f3e15cb3dd39d1ebbade988b5af3c01c63953af95db5818689ec87c0ed60f25a590e0
diff --git a/dev-python/sabyenc/sabyenc-5.4.2.ebuild b/dev-python/sabyenc/sabyenc-5.4.2.ebuild
new file mode 100644
index 000000000000..74f8328f2a0f
--- /dev/null
+++ b/dev-python/sabyenc/sabyenc-5.4.2.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_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Module providing raw yEnc encoding/decoding for SABnzbd"
+HOMEPAGE="https://github.com/sabnzbd/sabyenc"
+SRC_URI="
+	https://github.com/sabnzbd/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/chardet[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( README.md doc/yenc-draft.1.3.txt )
+
+distutils_enable_tests pytest
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 5298d1c254d1..9f0989ef7cd8 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -6,5 +6,5 @@ DIST setuptools-63.3.0.tar.gz 2598685 BLAKE2B 8562824cf6e45f2757cbaf4360c0b7c8e5
 EBUILD setuptools-62.6.0.ebuild 4077 BLAKE2B df8d3d5974d76cf4ee9089f73dacf365659432ee527e27b394d53311f3cf7ee69b3e612b5f1e8d634d0c30a8875c14924438a48b3466afdfdccb506ffbe5328a SHA512 d2173d8c251e7f2f4dec2e52887674d5ca31a3ba209b7455e9e9871befb96814852da137b5acb9a86364b0d8c1c0b394a306d8c4995aaa517a9eb950553b33bc
 EBUILD setuptools-63.1.0.ebuild 4085 BLAKE2B 3e4892512482fc1bc3adcb90bfc4f1a44b698957d6486f078fb6629ee73d7603eeddd768b072bde066a968a7c48900518d87336318c21b809e5c408623f8013c SHA512 49275430700aa47bb6df62e10d0252190437334078a6728c2cd24e9f8157e00e7266ce4f887aa98789819fa19b5aea1f8997f74686800a98be074c87f711063c
 EBUILD setuptools-63.2.0.ebuild 4085 BLAKE2B 3e4892512482fc1bc3adcb90bfc4f1a44b698957d6486f078fb6629ee73d7603eeddd768b072bde066a968a7c48900518d87336318c21b809e5c408623f8013c SHA512 49275430700aa47bb6df62e10d0252190437334078a6728c2cd24e9f8157e00e7266ce4f887aa98789819fa19b5aea1f8997f74686800a98be074c87f711063c
-EBUILD setuptools-63.3.0.ebuild 4085 BLAKE2B 3e4892512482fc1bc3adcb90bfc4f1a44b698957d6486f078fb6629ee73d7603eeddd768b072bde066a968a7c48900518d87336318c21b809e5c408623f8013c SHA512 49275430700aa47bb6df62e10d0252190437334078a6728c2cd24e9f8157e00e7266ce4f887aa98789819fa19b5aea1f8997f74686800a98be074c87f711063c
+EBUILD setuptools-63.3.0.ebuild 4153 BLAKE2B f91982c6f07cc0f4ac55572fc6aa1fe06697502e805f045236fc90bca0aae3e2dd2b9fdecf912290cc978be9dfee705d18c43e05c5da78f9030ae1e6bbefd672 SHA512 d047b71d51c1aa37f517649e96968cc1f741b47d7368c2c18b966737e39d29e427b123dcd96f3a0f8f7f19ca9f3264b79269bae2e87eda700233612fb8bd9a19
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-63.3.0.ebuild b/dev-python/setuptools/setuptools-63.3.0.ebuild
index 4133756fb9e7..e6015c0fc03f 100644
--- a/dev-python/setuptools/setuptools-63.3.0.ebuild
+++ b/dev-python/setuptools/setuptools-63.3.0.ebuild
@@ -4,6 +4,8 @@
 # please keep this ebuild at EAPI 7 -- sys-apps/portage dep
 EAPI=7
 
+# please bump dev-python/ensurepip-wheels along with this package!
+
 DISTUTILS_USE_PEP517=standalone
 PYTHON_TESTED=( python3_{8..11} pypy3 )
 PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index 0aef537c2d98..64534f88940c 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -3,6 +3,5 @@ AUX shiboken2-5.15.2-python310.patch 4408 BLAKE2B cd1a5c3f8c473a6667f8c942c24828
 AUX shiboken2-5.15.2-python311-fixups.patch 2059 BLAKE2B 746cc4c4f6f29895fc4c4d6989c2d578099f5d071129cf7b8dc78fef8641d10f189b4acf9293ae178cafe196d16cfce21e4e9d85a1ff7c107e9fc611b1dfea50 SHA512 8407f2b0166f8c3aed9bef3ecc8efc6177066c4a6148b8ff942f29b3e95752f15697a8447a58e51410d6982900e9e924d38be2a8857d7f15876badddbc37b507
 AUX shiboken2-5.15.2-python311.patch 4606 BLAKE2B 40cc608b4dd5eb305809e2cd2fe2908e8f5a47dcf2a2e6efc92cbcf26604c50cd63b007d4e49b061f017a6675c57542b897fa019820a72adc4c291f798f6f01e SHA512 8403955111e8d9f9f9d8795668ab6cb19d83e9a2434593a4578905a065f706c5a4fede2f17c9e9acd8d2f9d5d0e64a54b6e65f512b147ee91f152430ac171c5b
 DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B 099abeaf25059a88f299f90b18cf79aa45acd86580c0873767b09f76268d6746cc3576743a19493a605de59b520471ddee6bba0e5340801ef44a21f2a9d41507 SHA512 5043c1c9db4ba0133baaabb4d4943182e9741b1007bedd992394758707a37bba0688dc6413ea46620e7c2fb09daa3c74e6a7bb2c302b9d08e5f3bb7575d02b62
-EBUILD shiboken2-5.15.2-r1.ebuild 6551 BLAKE2B ba5cd749b4641a87c5d4edcf9c8e10d5c199dcd1f9888cd620b801f0d1e5c87d8988131011ecb5b4ea4077543f5a3c91bb5241ec21de091957b7e2cfe0b754bb SHA512 5a14af1ec01cd89b54652e6a1dfed547fcdccff6500ba221ab27796103605c5c9c16d812655478daa14be2fdc1e5a613223c44b9df67d47ef04a30882826e6b0
-EBUILD shiboken2-5.15.2-r2.ebuild 6557 BLAKE2B 4ea92a96a58d44bdc8a5108167d47e98d687334bbfd6e584822c11f4690b6f50b64f93c6bd71168fb4cf977a062e587c214629b53161f68ee2896148162d8b4a SHA512 140242eb4f4af1c609fab2ae3fd1f99d725a055af76fd5d565195481214548c80f9368a9b771cd82c848ff2e0aba61da39b2276595bd9a0eca4c878d0d989994
+EBUILD shiboken2-5.15.2-r2.ebuild 6554 BLAKE2B a4d2ba9ae4ff29d9b974b26a5c5c0c7db66790bab3433dab0b84e2c0465b08bd6c8a15df78ef342a8942472978c031cba809625286d619a0e3119e20e17bb27d SHA512 e0287e12b01024290b3b97103244bfcfb1e3385bc4e2d1fa4465894d6afc30dcaad50bd335bee4d26536d48db742c6aa0d924dce59d696721fedae747b09d01c
 MISC metadata.xml 496 BLAKE2B 060c13ebf383e609b257f50f65484eecaaa1909d3b9242ab2be2b12ec203cdaaf4b5a9402f01b9e511b3744a4d7a562161d86a0d2f9bc90f401ac7ee0cea8ba4 SHA512 7edc53f2bde5d688e8dcac866997ec282cf2f7c1230a064a304c83a7b3c54c2079f99f4c75082dc47f7e9248dc65296ef98e0cda7dea08cbb97e766da48c11d5
diff --git a/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild b/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild
deleted file mode 100644
index c8e150bc7ed5..000000000000
--- a/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# TODO: Split the "/usr/bin/shiboken2" binding generator from the
-# "/usr/lib64/libshiboken2-*.so" family of shared libraries. The former
-# requires everything (including Clang) at runtime; the latter only requires
-# Qt and Python at runtime. Note that "pip" separates these two as well. See:
-# https://doc.qt.io/qtforpython/shiboken2/faq.html#is-there-any-runtime-dependency-on-the-generated-binding
-# Once split, the PySide2 ebuild should be revised to require
-# "/usr/bin/shiboken2" at build time and "libshiboken2-*.so" at runtime.
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-# Fails to compile with python3.10
-# FAILED: libshiboken/CMakeFiles/libshiboken.dir/sbkstring.cpp.o
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake llvm python-r1 toolchain-funcs
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="Python binding generator for C++ libraries"
-HOMEPAGE="https://wiki.qt.io/PySide2"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}/sources/shiboken2"
-
-# The "sources/shiboken2/libshiboken" directory is triple-licensed under the
-# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3
-# with version 1.0 of a Qt-specific exception enabling shiboken2 output to be
-# arbitrarily relicensed. (TODO)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="+docstrings numpy test vulkan"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-#tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-2):5"
-
-# Since Clang is required at both build- and runtime, BDEPEND is omitted here.
-RDEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtcore-${QT_PV}
-	sys-devel/clang:=
-	sys-devel/clang-runtime:=
-	docstrings? (
-		>=dev-libs/libxml2-2.6.32
-		>=dev-libs/libxslt-1.1.19
-		>=dev-qt/qtxml-${QT_PV}
-		>=dev-qt/qtxmlpatterns-${QT_PV}
-	)
-	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	vulkan? ( dev-util/vulkan-headers )
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qttest-${QT_PV} )
-"
-
-DOCS=( AUTHORS )
-
-PATCHES=(
-	"${FILESDIR}/${P}-python310.patch"
-	"${FILESDIR}/${P}-numpy-1.23.patch"
-)
-
-# Ensure the path returned by get_llvm_prefix() contains clang as well.
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_prepare() {
-	# TODO: File upstream issue requesting a sane way to disable NumPy support.
-	if ! use numpy; then
-		sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \
-			libshiboken/CMakeLists.txt || die
-	fi
-
-	# Shiboken2 assumes Vulkan headers live under either "$VULKAN_SDK/include"
-	# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
-	if use vulkan; then
-		sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \
-			ApiExtractor/clangparser/compilersupport.cpp || die
-	fi
-
-	# Shiboken2 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/"
-	# subdirectory provides Clang builtin includes (e.g., "stddef.h") for the
-	# currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is
-	# the largest version specifier that exists under the "/usr/lib/clang/"
-	# subdirectory. This assumption is false in edge cases, including when
-	# users downgrade from newer Clang versions but fail to remove those
-	# versions with "emerge --depclean". See also:
-	#     https://github.com/leycec/raiagent/issues/85
-	#
-	# Sadly, the clang-* family of functions exported by the "toolchain-funcs"
-	# eclass are defective, returning nonsensical placeholder strings if the
-	# end user has *NOT* explicitly configured their C++ compiler to be Clang.
-	# PySide2 does *NOT* care whether the end user has done so or not, as
-	# PySide2 unconditionally requires Clang in either case. See also:
-	#     https://bugs.gentoo.org/619490
-	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \
-		ApiExtractor/clangparser/compilersupport.cpp || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Minimal tests for now, 2 failing with the extended version
-	# FIXME Subscripted generics cannot be used with class and instance checks
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DDISABLE_DOCSTRINGS=$(usex !docstrings)
-	)
-
-	shiboken2_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DUSE_PYTHON_VERSION="${EPYTHON#python}"
-		)
-		# CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable.
-		local -x LLVM_INSTALL_DIR="$(get_llvm_prefix)"
-		cmake_src_configure
-	}
-	python_foreach_impl shiboken2_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	python_foreach_impl cmake_src_test
-}
-
-src_install() {
-	shiboken2_install() {
-		cmake_src_install
-		python_optimize
-
-		# Uniquify the "shiboken2" executable for the current Python target,
-		# preserving an unversioned "shiboken2" file arbitrarily associated
-		# with the last Python target.
-		cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die
-
-		# Uniquify the Shiboken2 pkgconfig file for the current Python target,
-		# preserving an unversioned "shiboken2.pc" file arbitrarily associated
-		# with the last Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl shiboken2_install
-
-	# CMakeLists.txt installs a "Shiboken2Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., PySide2) to target one "libshiboken2-*.so"
-	# library and one "shiboken2" executable linked to one Python interpreter.
-	# See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i \
-		-e 's~shiboken2-python[[:digit:]]\+\.[[:digit:]]\+~shiboken2${PYTHON_CONFIG_SUFFIX}~g' \
-		-e 's~/bin/shiboken2~/bin/shiboken2${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)"/cmake/Shiboken2-${PV}/Shiboken2Targets-gentoo.cmake || die
-
-	# Remove the broken "shiboken_tool.py" script. By inspection, this script
-	# reduces to a noop. Moreover, this script raises the following exception:
-	#     FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py'
-	rm "${ED}"/usr/bin/shiboken_tool.py || die
-}
diff --git a/dev-python/shiboken2/shiboken2-5.15.2-r2.ebuild b/dev-python/shiboken2/shiboken2-5.15.2-r2.ebuild
index 4ba580569103..b022d8ba5b8c 100644
--- a/dev-python/shiboken2/shiboken2-5.15.2-r2.ebuild
+++ b/dev-python/shiboken2/shiboken2-5.15.2-r2.ebuild
@@ -29,7 +29,7 @@ S="${WORKDIR}/${MY_P}/sources/shiboken2"
 # arbitrarily relicensed. (TODO)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="+docstrings numpy test vulkan"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/sphinx-basic-ng/Manifest b/dev-python/sphinx-basic-ng/Manifest
index fb46374a9023..a4cd221fa5e0 100644
--- a/dev-python/sphinx-basic-ng/Manifest
+++ b/dev-python/sphinx-basic-ng/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-basic-ng-0.0.1.a11.gh.tar.gz 21539 BLAKE2B 31707bc8f3c6cd0c1af1aeff309543889119d33e5f5ae33194b58f88a0ff6ec424c5b876fef36b64161932ebb69c0f6108801697b49d47e10ad13affcf89e1fa SHA512 e9f9278a360d2c8d25a6679134d2d54b37c9f2e55285592fa910c85b2f8bfd4ab13d117b7078cb67d862703f8054c3d3a3ca68152551d67a26d7c1a8b75952ff
-EBUILD sphinx-basic-ng-0.0.1_alpha11.ebuild 939 BLAKE2B b74d9d5865dbfac8cde9a42fa94db01b2f8fdc7e325a72eba0a37a427aac9c88099f711e1f78f2222df7d4dc8e10557ce4278ef9c138ec376e63c6e3472ec603 SHA512 e1314d676726118f0f62215a957640558da118ee063f4d078c35ce3f93391ed0029106b7b02b6a9ce276292b3bebe064e75e7da235e893d6d22cbef8468b09c8
+EBUILD sphinx-basic-ng-0.0.1_alpha11.ebuild 932 BLAKE2B 63c8dce2ce3f1d8e721f27836e67933274faf883f54f58860da5d41563695d37241e1f36f86031274a2bc8c11dddeb67fe885168b92ac955cbf41c02f1b7bcf2 SHA512 3015486c318e505f2204b2c43b1bc494f2cb00cc9d061582a4a972a3b95c3db9937d43b60276ad44260933716967531da32626e3b6f3bb5d9cb3ed4e80a2bf0b
 MISC metadata.xml 362 BLAKE2B a93dc662c8ab618397c8d0504342e8f1bd74226b131ea4ca07771cdeb75eb8947451b4353c0da16760f07f935ebb75adcdef4f189ff39e0cf707d03e8fa319e2 SHA512 fb27130b3fcff9043b3ad33e34c92f638cae46d526dcbe77cfe088abf80e6b89992edb1e0b571a5a2447bc6c8ba31ae84776d153067a33b5d6d14326149e7f46
diff --git a/dev-python/sphinx-basic-ng/sphinx-basic-ng-0.0.1_alpha11.ebuild b/dev-python/sphinx-basic-ng/sphinx-basic-ng-0.0.1_alpha11.ebuild
index e6f2a27ae78a..ff3a7128264c 100644
--- a/dev-python/sphinx-basic-ng/sphinx-basic-ng-0.0.1_alpha11.ebuild
+++ b/dev-python/sphinx-basic-ng/sphinx-basic-ng-0.0.1_alpha11.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinxcontrib-doxylink/Manifest b/dev-python/sphinxcontrib-doxylink/Manifest
index b2d2b0f595c0..99c2bd6a67c2 100644
--- a/dev-python/sphinxcontrib-doxylink/Manifest
+++ b/dev-python/sphinxcontrib-doxylink/Manifest
@@ -1,5 +1,7 @@
 DIST sphinxcontrib-doxylink-1.12.0.gh.tar.gz 22589 BLAKE2B 322fdd0968147abc480a88247ee724daa8c4da4519ff97280af1d81e9f36d4636aca358f5bb1ba08e5ff0f138cf8446194d1fe819a9d18a227eb463b20ee5738 SHA512 7626fad06613a614b5d6efdea088825732571c7ed45f6f2d69f34e0aede020df0930716cb34ca14260891a29aa152019c7bfae8aad729039642ea1c6bbf7d09e
 DIST sphinxcontrib-doxylink-1.12.1.gh.tar.gz 22622 BLAKE2B 2818dc9e155156e60a23183ac35e72b51f316e5e3a8f08379236a141436bbca4fee2ad534a391495dbe9bbc7c0d9f32526f5646592d16c1610121c36275a4c27 SHA512 164c523d6fb081d2ee70fa249901eb0fa3233d20a2ba73b52c4f7bf5f31c3f088c0420e39ace36c66a65fceccc137d6d62c28f7b7b58f3fbf96a3f2f73372fc8
+DIST sphinxcontrib-doxylink-1.12.2.gh.tar.gz 23556 BLAKE2B 8d71de83ec304bbf2a74f414c46d157367fc950dc52bab7f685fba24520985fb06daf8bf760d49d73d7a2418da346bf6c84a493b24edef4ab53c5c09799f7c2e SHA512 e90594031067eed0eec1c7aad9c7d2ba7d9a4ce2012a905f6631947a7135659483d52a6261b923d3fa21fcde59ae8bf24c168507c8e95296e0539595e9589ed2
 EBUILD sphinxcontrib-doxylink-1.12.0.ebuild 1059 BLAKE2B 798ed1bcffcb23faffb634d7abbb27289989f0923ff76641f6ed15edca7ed2fa3eaf3917bf15592d93ee6d70ef24cef00cf125309635f7285a6bf1948ff88497 SHA512 09b4ca6a2fd0143e7c529540498918afdabbfac99cefa4a7bfe01c3419724249a99b013956bf4137098367d7bf68462bb5e1482c8458e1760a9ccb9636d7a1ce
 EBUILD sphinxcontrib-doxylink-1.12.1.ebuild 1092 BLAKE2B 62e65daf67508b9d1aa3a53d18b999504ee7a2c77d6f1a518cec1107c4306c2b93b60996806c89e3cafd4335f36e1d74eda4a5680fb553eb04d45d3634897e79 SHA512 e8dda95622862a60f30bab64a177d9546cc6624a88b5d50c3160e78e3a9d020ca18054f0898d366332e8858594c47bb50d0fd048b78e66633ea5e91688ca46c1
+EBUILD sphinxcontrib-doxylink-1.12.2.ebuild 1092 BLAKE2B 62e65daf67508b9d1aa3a53d18b999504ee7a2c77d6f1a518cec1107c4306c2b93b60996806c89e3cafd4335f36e1d74eda4a5680fb553eb04d45d3634897e79 SHA512 e8dda95622862a60f30bab64a177d9546cc6624a88b5d50c3160e78e3a9d020ca18054f0898d366332e8858594c47bb50d0fd048b78e66633ea5e91688ca46c1
 MISC metadata.xml 620 BLAKE2B e76f6c16f0f8280d0d7a99975a0dad33a76f93a634d99114df5eacf047e434c7356cb501c4021cdee1b17c3e7dd00e7ce4720d70c1ddddcf561c4e622b528549 SHA512 89afb14c72168f5a919347726c1445a205d5839925ead8b3969cc84f062caca0a666cc141f541c21d642f95c3c40fdfe677e3f1cce78aa1a5f6445e140ae7978
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.2.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.2.ebuild
new file mode 100644
index 000000000000..a6360df99206
--- /dev/null
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extension to link to external Doxygen API documentation"
+HOMEPAGE="
+	https://pypi.org/project/sphinxcontrib-doxylink/
+	https://pythonhosted.org/sphinxcontrib-doxylink/
+	https://github.com/sphinx-contrib/doxylink/
+"
+SRC_URI="
+	https://github.com/sphinx-contrib/doxylink/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/doxylink-${PV}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3.0.8[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		app-doc/doxygen
+		>=dev-python/testfixtures-6.18.5[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc \
+	dev-python/sphinx_rtd_theme
+
+python_test() {
+	distutils_write_namespace sphinxcontrib
+	cd "${T}" || die
+	epytest "${S}"/tests
+}
diff --git a/dev-python/tempest/Manifest b/dev-python/tempest/Manifest
index d7bae544ce29..6805d5e6731c 100644
--- a/dev-python/tempest/Manifest
+++ b/dev-python/tempest/Manifest
@@ -1,5 +1,3 @@
-DIST tempest-31.0.0.tar.gz 1110051 BLAKE2B 9c3c87db902220e3e8de6e88e0d282eae07cb3b155eaa415156e83aff9d52523416fbfcae5b49a335eb81ae3488e4e2aa4cf86d10a35820aa3e24184466576d8 SHA512 9f8cfae192a5fe0fd5d6c1659ae42b5f2042392945e2c91b3bb96cecc412a1e6e582bc46ab481452012dc2440d13bc8298ca875587d5b1592dc95971d9adf4f0
 DIST tempest-31.1.0.tar.gz 1114805 BLAKE2B 29c0f55db6812a4da6bdbce1159a7e5b87ef0caf4b21e0810b6c941633182da12b72675d86ec0f9f2b844d91258439305c059f6f03ed09d45f7758426c6c096f SHA512 56726d5c0aa8d576e3dc200d30a370be08fec178f357381f00ca08883ab1ccf56fbfaa53ec9322a5f4eb5383e0572f25d8cd277848bc0c3a3d12e57722860a2b
-EBUILD tempest-31.0.0.ebuild 2135 BLAKE2B d0c801530e7f5c9e19e607bcb7c2ac31ed6f5a322b8b294b641eb8494445fba7a3bf02632c2ea52ae521022a5e87108854eaf5af3fe3c4513a3f7f12aba56330 SHA512 8b02dcbf09d3e7025c50672a25f708fce68056a130262dfc363c1de74262d8fe064b5516a461a617b86e43f12c3d50527aa8de91f8bf5944bdd111a8db75f443
-EBUILD tempest-31.1.0.ebuild 2138 BLAKE2B c1c17ef2a0cce940b9befaafe8815d4707788a309b6aae90092adb35b7a0421d0b6a9aa886f217f64b097e617411901b49be719d81eaacd8a798dcf60072532f SHA512 9c321710e01ad2ab2181d023820838bc7ecceba6f9e4478d1d582a17e8f830069fb25a560884b52484886a1ae157089f56afe974a09a14514453d81e75d146ad
+EBUILD tempest-31.1.0.ebuild 2135 BLAKE2B aed4a3c33e8c909f1b40b8d9bb5b13cd38b038b340f0d156ceb6692238f6dfa04d7f2cb69d01728e590c9a16b9312f521ae1be418a9a9d4c846d7216ac77ae17 SHA512 62d4381d73e3d8bffa6e89cf8459553424e4059a09f897f34584d9c517a950531a2869aa1af0a3029fd4f5e17bcd4f01014f259d000397ecaba57de018064070
 MISC metadata.xml 503 BLAKE2B c048e018345a8d306f22fb944e8f04db6fa8ab0e9e7099b19e0fd24ad69632d9dd1dfed9620c092f2f740e80e06556617b59cfdd0121101fa030dd6415aafa34 SHA512 39986e26bad2304333d43fd0ed1b12db5d9c56059d30ceb3868b6967f6655f50edaa232a86059da3434a4e219847c8f74e98972cecfa074a8bd28b76b3e3ccbb
diff --git a/dev-python/tempest/tempest-31.0.0.ebuild b/dev-python/tempest/tempest-31.0.0.ebuild
deleted file mode 100644
index bb9f3e885feb..000000000000
--- a/dev-python/tempest/tempest-31.0.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Integration Testing"
-HOMEPAGE="
-	https://pypi.org/project/tempest/
-	https://docs.openstack.org/tempest/latest/
-	https://launchpad.net/tempest/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		dev-python/stestr[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Small subset of tests, which fail as result of not using specific
-	# testing environment. Others expect to run suite using stestr.
-	rm -r tempest/tests/lib/services/volume/v3/ || die
-	rm tempest/tests/test_list_tests.py || die
-	rm tempest/tests/lib/cmd/test_check_uuid.py || die
-
-	# remove dep on hacking
-	rm tempest/tests/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	mv "${BUILD_DIR}"/install/{usr/,}etc || die
-}
-
-python_test() {
-	local -x OS_LOG_CAPTURE=1 OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=320
-	eunittest -b -s tempest/tests -t .
-}
diff --git a/dev-python/tempest/tempest-31.1.0.ebuild b/dev-python/tempest/tempest-31.1.0.ebuild
index e5d757d4c5b8..003830d1993e 100644
--- a/dev-python/tempest/tempest-31.1.0.ebuild
+++ b/dev-python/tempest/tempest-31.1.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/textdistance/Manifest b/dev-python/textdistance/Manifest
index 85fb0ccdbdac..efab72134ed3 100644
--- a/dev-python/textdistance/Manifest
+++ b/dev-python/textdistance/Manifest
@@ -1,5 +1,3 @@
-DIST textdistance-4.2.2.tar.gz 45089 BLAKE2B 8b08db743a56c289cc10a9ceb606612acb2a13d12cd12f9627870a4748c415804bde7c3f1aee54d59a49053731727827dbbd5f4ed6c2cfcc302166575ba382ca SHA512 f181686153e6e8f1541a15ac752e6a86698445713732858e63b6465c96dfeb582d2ea6cad1f7c526a3dc60796d58064355480bc6ced7dc69268a5c0abbfabdb7
 DIST textdistance-4.3.0.gh.tar.gz 45535 BLAKE2B e43ae62b0b7656a6c4f879b1d8e0c34ae6c83705d324aa99bb7ff6e2d0166faf1fed3ee7bc06602388c16c742a1983a4eaee143b09a7c371b9e941d53edca2b5 SHA512 30d68048b1f0b79e584f5f07731e03193af64cb2de3f52882c17154cc027f4ff8d590b994941bd5d62642d4da334ef0739d4bb65b6b12f039a1ee9aef154cde4
-EBUILD textdistance-4.2.2.ebuild 820 BLAKE2B 666b87245e2d9ff6b5a074d4e4a615024ef928e1b8551ec1c02e6474991d710be1ba9081bbbe0c5fde3bf2c0bbb7cdb46995c485c18dc3ed81e07b5e655a8ebf SHA512 4c64c8b0acb9295218411d1448767fa48e8ae51cf6155da7443535cc2a367d71fb3acf9e55f4e0d6aa8ff2f86d6ce6bf8087e0f4c5b8946b274ccec7c5e5f015
-EBUILD textdistance-4.3.0.ebuild 825 BLAKE2B 05fc786b647ce8d4a964807a9ebd775e5a618caa1ba3f66055198bc0283d96352b1601780b5e4e82fbb8fc0d3f60c9e7ce24f32ab4c8a0b14792d29db49b895d SHA512 3e41fdc02ec6a32b74bd699e5c8360b28e4b7d82059ab8e44ea3f1aab37ee76850af10d9b4c7980bb1e13236180a49f2093262f0e9e345757aac4aed986264cf
+EBUILD textdistance-4.3.0.ebuild 823 BLAKE2B ca9eb7697c93acb7b5776287b90ca426976b9573cc6d0fa0818a825dc95890137134d2330daee415a0993b8b46396e4bcc5f39f44ee484100fa3f200c98f4889 SHA512 59c71638a315ba2760da220f3a19a4f11179d5f9ad95ff93ebed6a4493b768cdb94b1d95746bea7108d41649f68f5e1f3e8ec5a20aed934273d31bcf4633b679
 MISC metadata.xml 517 BLAKE2B a429684151f5700f148c5350b16026e797fdedc80b950d3c79c050a4d7418763918a05936eaeeed07b9756d9ec39602128570cd8c27049234bbda27e006ff00f SHA512 be445c2c21f5fd0bee241f8f76094b51c2fcbd7fe0d2175f7455beb881c3b83e8070c8a14817695d2b7a7dfabcdb856e12d7749aadc91ca31f7af8187e9a409e
diff --git a/dev-python/textdistance/textdistance-4.2.2.ebuild b/dev-python/textdistance/textdistance-4.2.2.ebuild
deleted file mode 100644
index 847aae2c9cfb..000000000000
--- a/dev-python/textdistance/textdistance-4.2.2.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_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Compute distance between the two texts"
-HOMEPAGE="https://github.com/life4/textdistance"
-SRC_URI="
-	https://github.com/life4/textdistance/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-BDEPEND="
-	test? (
-		dev-python/abydos[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/isort[${PYTHON_USEDEP}]
-		dev-python/jellyfish[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-levenshtein[${PYTHON_USEDEP}]
-		dev-python/pyxDamerauLevenshtein[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-EPYTEST_DESELECT=(
-	tests/test_external.py
-)
diff --git a/dev-python/textdistance/textdistance-4.3.0.ebuild b/dev-python/textdistance/textdistance-4.3.0.ebuild
index abcea1dd1ff6..b7752b1c5c8d 100644
--- a/dev-python/textdistance/textdistance-4.3.0.ebuild
+++ b/dev-python/textdistance/textdistance-4.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 714c43859246..ba763b55b8e8 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,5 +1,3 @@
-DIST tox-3.25.0.tar.gz 307073 BLAKE2B 2dda34fc6d6518897bdc587ca6a31b92f2add463c3bcce9df3f4e511d2588dc75265b60809195c2d78a9c1b0d08d79c32811aab1e2c01934faf40019a1882042 SHA512 9c10524c5a67b32a01cb0dd4d25cc01d0641e46ca4e0c03a4c76eb8913f6038075aeb21e647a94d6b8d99c80edb7701b1c62893ebd6a20584121fdf33b9d9010
 DIST tox-3.25.1.gh.tar.gz 307697 BLAKE2B 2c778df22388b101e6e68423636c9753f0e6faac2360184fd6b9022dc3bbb5662840cf24e7907dd4c652f6401723be3be35bcdeb0f290f9839325babf5ec776d SHA512 e0443cb72378fc18c9bc001413261d9bac2d6f89bb0ebff618a3848ffd5b02c80902cefbd90f7b0d0e3119f1df3cd22b46be23077db0ee90c03a9780ba4b248b
-EBUILD tox-3.25.0.ebuild 2184 BLAKE2B 4e0f8e9386fd2cdfa09d0e2f506fde89b2e0aa3fd12f9fd787478eaf8a45c3570e6c5da73b546d18744e5b3231cb8be96dfb29ecb93bdca26257cbe70757f95c SHA512 0529e0b5ce6819e82e2c4733234ab9a459449843e45d3296a3e0836bd795f279aa8bf109a65b7a673f9370b6b312b42247ab6fab886e8e225ea218e89e7849bc
-EBUILD tox-3.25.1.ebuild 1872 BLAKE2B 7876a07bc579ea6f6e0e36ed0ebbd6e71fa04334c99b7d7a0a961176b432d7d16f3620ef2689cedc91a3b97c03f4576c8cf471e47c3d272c5dcd1a11bd21ad2c SHA512 7363bd617c4e9c8f92b935b1fec3ccacafff89602ab5e622271f94c4e94bfae3c49affbbd7699dca057c89593d1baad76e04c0a5e3c76bcd50825394ee8a2e4f
+EBUILD tox-3.25.1.ebuild 1864 BLAKE2B fdcd8ed6dd3f83b1feeee06ddf30f0d5b5888f260b14fb5066d4293c46601e7c0f38389ae6e951fdf846260c78da68217d8a7505ec3bb48d9686678ea54940eb SHA512 17afb27a345739b9905a567f66d5e2188a9b6333c7690b88590fb2006f14998717e88eafefba3ad4eb943fa540e0f843340c2c964f84016b093267544d34c482
 MISC metadata.xml 382 BLAKE2B 7c0704c5c187ce4a7972fe0372b23c5537a81a8d62fd83436d9558a61761f10764adb5a4d5f6795f0dd1fe905afa604c0be77fe1d48d291847f6ae65dc1b032c SHA512 9d0ced4df9352a81034a50d5766a01534ae8fa889985d99cc9e2a8d0889e31c6c11550677d9a5a74e2aab57c320192ce3a42708a6d23b0419ee34a6054398344
diff --git a/dev-python/tox/tox-3.25.0.ebuild b/dev-python/tox/tox-3.25.0.ebuild
deleted file mode 100644
index 469205b08b07..000000000000
--- a/dev-python/tox/tox-3.25.0.ebuild
+++ /dev/null
@@ -1,74 +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_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-# doc disabled because of missing deps in tree
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken without Internet
-		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
-		tests/integration/test_provision_int.py::test_provision_interrupt_child
-
-		# expects python2 to exist
-		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
-
-		# fragile and relies on checking stdout
-		tests/unit/util/test_spinner.py::test_spinner_progress
-
-		# TODO
-		tests/unit/test_z_cmdline.py::TestSession::test_summary_status
-		tests/unit/session/test_provision.py::test_provision_bad_requires
-	)
-
-	[[ ${EPYTHON} != pypy3 ]] && EPYTEST_DESELECT+=(
-		# TODO?
-		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
-
-		# broken without tox installed first
-		# TODO: why it can't import itself?
-		tests/integration/test_parallel_interrupt.py::test_parallel_interrupt
-	)
-
-	epytest --no-network
-}
diff --git a/dev-python/tox/tox-3.25.1.ebuild b/dev-python/tox/tox-3.25.1.ebuild
index 3bbaa66f67b8..cb4f9d1950f3 100644
--- a/dev-python/tox/tox-3.25.1.ebuild
+++ b/dev-python/tox/tox-3.25.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/filelock[${PYTHON_USEDEP}]
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 47968612a880..6faadcc255f9 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,7 +1,3 @@
-DIST translate-3.7.0.gh.tar.gz 1152162 BLAKE2B 75d3b0a7f2a840766f983d6e1484aab16de2aa2bab74d0753910be9ad0d1c76ebfa553188318920a7d5a6f1ce6b72e755147eb45c501cdeb79246472c0329449 SHA512 18159f85d94768c32fe5a44f3d3e586038b281a0f3e386621bd57a5be64a9ae21a4272c05de8a2ea2a2467c98935205a8ef49a714dc9aabf9ed21de4f533fb93
-DIST translate-3.7.1.gh.tar.gz 1152674 BLAKE2B c4a7d8cb1eec656a261a1af145a1171e9d686348294a0849f29ae23dcd867d831c6f95f0927101325f62ef9b21e0891a7a574f08111bbc3e9c0ce2b996faa70c SHA512 5ed9d156f071f4ce567a0ff3f0ef5c0b42b312edaae82e96eee040ae9547f0cb3334f2973d8050b9181b752f7e81021cc183613bb5c6309aeb110bcacab212fb
 DIST translate-3.7.2.gh.tar.gz 1153306 BLAKE2B 986c531004cb0ee0a58a940043377ee047e13b0f32c6fda5ab80cc7fca96d18b45f2cd3e112d47f177cd06a7e99580777c6591df969a8237bcb9fe7a52b1d4fd SHA512 28d774ff670c92dedee5d98d7d33f21d32ed4b7afd6a8281fcf7abb39470e11a6c0d9c121576aa2be10edf18929c74b2cfc36b70984d66d432cfa5e337b9556c
-EBUILD translate-toolkit-3.7.0.ebuild 2418 BLAKE2B 156d03ffb8e361ee3a3808080deeabc17bafc37992d043cc5ed79d70dff97348beb24dc6b7bbefadd212e48e262ece204603a116a306e53e27c5b6f3b720c353 SHA512 0b15869bb2752e241d92f38dc05708440e118c26b956e9ecf5996be6db90f9d78c40abafd00485dd5b387fa1d143f9e728ee5e9ee5b4d7683a91eb398977b5df
-EBUILD translate-toolkit-3.7.1.ebuild 2421 BLAKE2B b5c818ed8fdef983bf87d3103c58e4bb6bbb12a555213d40c40feef74402588db68fdf14caa958aea3f0a8d64ba39af06c46239afd61652c17f409f74a2a2fe2 SHA512 ab76f4b06f9b1e73b2cd83e85e5d82b50b5427327b999735abcd8537d15a2ddf30a43b626d345731e5fb038334acbf69c84c60f3991c2674a91ec23250cd8350
-EBUILD translate-toolkit-3.7.2.ebuild 2423 BLAKE2B 567256ee0892925d8f4322e2908ba123b7a05e15d3fa8cb0e43412b053773066dfc9db5a81cd3b7c524632920ccd63044f7135d6c5078a34b11f60d637223cf7 SHA512 8094446117598ae75d365c87f7cde4935033cc01ec55698d381be58ba1cbb294e0e2858a99de41a1867fe8bb4c567d6da4029d978759713d04004e4df638008d
+EBUILD translate-toolkit-3.7.2.ebuild 2420 BLAKE2B 55272a0cf5f90152cdac723e3523cc4e06d9130c0b652f7e43655bcec6d92e4a12463544d0a613086713c41ec75a7c2f53924120794daf8d81ad98fe2a70368a SHA512 d0441e2c77159d6b0f75be7b2fc9c96920422e142b7cee1c494ae2dc3cbaf44956912d797731ad0267b1dfb6b05a8af1df72db285b8129e4d8228b979fa2df88
 MISC metadata.xml 756 BLAKE2B 06f64f258d362954f99f7e9eee241eb3dddc6b00b9069df2ad977d28b5cf06f9c8ee2246ee5958600b5ac86297968d7aaced6b6420dca4ed507c441c58c61ca9 SHA512 80374c40513ca450f97e3930929c1450e7438ea15830e60937952a6fccfd999675f2ca2056c5aa4e287ba256c6ec08a09d8f7adb8b2c5af8ca0cd595f34acd85
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.7.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.7.0.ebuild
deleted file mode 100644
index 3ceb8ef09006..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.7.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-MY_P=translate-${PV}
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="
-	https://github.com/translate/translate/
-	https://pypi.org/project/translate-toolkit/
-"
-SRC_URI="
-	https://github.com/translate/translate/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+html +ical +ini +subtitles +yaml"
-
-RDEPEND="
-	!dev-python/pydiff
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
-	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? ( dev-python/phply[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-bootstrap-theme
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-	)
-	local EPYTEST_IGNORE=(
-		# unpackaged fluent.*
-		translate/storage/test_fluent.py
-	)
-
-	if ! use ini; then
-		EPYTEST_IGNORE+=(
-			translate/convert/test_ini2po.py
-			translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		EPYTEST_IGNORE+=(
-			translate/storage/test_subtitles.py
-		)
-	fi
-
-	# translate/storage/test_mo.py needs 'pocompile'
-	distutils_install_for_testing
-	epytest
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-
-	python_optimize
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.7.1.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.7.1.ebuild
deleted file mode 100644
index 6de2eaa80e92..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.7.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-MY_P=translate-${PV}
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="
-	https://github.com/translate/translate/
-	https://pypi.org/project/translate-toolkit/
-"
-SRC_URI="
-	https://github.com/translate/translate/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+html +ical +ini +subtitles +yaml"
-
-RDEPEND="
-	!dev-python/pydiff
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
-	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? ( dev-python/phply[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-bootstrap-theme
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-	)
-	local EPYTEST_IGNORE=(
-		# unpackaged fluent.*
-		translate/storage/test_fluent.py
-	)
-
-	if ! use ini; then
-		EPYTEST_IGNORE+=(
-			translate/convert/test_ini2po.py
-			translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		EPYTEST_IGNORE+=(
-			translate/storage/test_subtitles.py
-		)
-	fi
-
-	# translate/storage/test_mo.py needs 'pocompile'
-	distutils_install_for_testing
-	epytest
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-
-	python_optimize
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.7.2.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.7.2.ebuild
index 7c5cbdaf61ca..7022e482cf3f 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.7.2.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.7.2.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 
 RDEPEND="
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index 8c99a663ee97..7cd2ec2b80fc 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,5 +1,3 @@
-DIST typing-extensions-4.2.0.gh.tar.gz 77169 BLAKE2B 3b7e91d0b410daf749d61213e8dc2bce069c05db7626a6c3a380fe1955ad97871f3c90782a8ba5114b11c42e0775558fd6fb1fd28a7cc0fbf2ec97480ef72298 SHA512 52e67eaeb3159e5effdcf180fc43d9881453c7efc00546335a8f31d5f7ab9859c2f89b29612861015ba490cdfd596720aa577630b424323256930b036b119776
 DIST typing_extensions-4.3.0.gh.tar.gz 47842 BLAKE2B 23a600dcded95a1109da46537bab49a6a478c77334d7c9effe65564bf236371c413a07220df3fa1de1bd0451e90961df908e097e7c7cb6d2534102369ce2590e SHA512 3c4a9073dc89e71b8027d535853d35725163961f7feeaba817e28f93b236bcae805d9b1f6e2be8e9fc3651c283b662935ba0352e5de25ff74df4dc18373e8f7a
-EBUILD typing-extensions-4.2.0.ebuild 800 BLAKE2B 3a6eaef06790c8545f8b3fd14bdf3687cab9eee3c6c58891bf0f560413e223fc2adc4bcb3dae2b3c68f661bf484ef8f8765026edbe3bd65947d85001f661af80 SHA512 3af6e1ca2970b3adafc8029245bc6c2c205c32f31f201158ebee9aa1913f00e791d0106b94f45f5737620936411df6245b7bcd16ed763e8d6ac80421e496bd6e
-EBUILD typing-extensions-4.3.0.ebuild 813 BLAKE2B 206e7767f8d97c7e48e19295860927ff9148e844ec149ed106c0f743666510bdab421fad73419185cbd0a31def3ce853a03dd9a24a3d3d8e5607142498cce156 SHA512 d75acb730e92287ec246f9e8c8ab7accd46d25a6ebf646308da90cc642e4998148daf0e4ebbcd526293d6ed3fffdb22bf9754fa7cfdca8ebf7c8d5a8c6eaa64e
+EBUILD typing-extensions-4.3.0.ebuild 805 BLAKE2B fe189765f34b25ecb1f6ca45096443c0c6279c2dbcf1fa29af2516164881667bb3f9f3cdbb256fb706a4c307a14260633f1d746fec6da27229686dd538b06768 SHA512 5b59105395456f4693e0ed804a59c32013a3c8cb11135f3a9b0acd2798b65288efd2a180fb09c7ec2e9fd62ce48c954f369899522f0d6b0d33eff7ad7d3c94c9
 MISC metadata.xml 409 BLAKE2B f2defedc04bc50fcdccb536be53f5148d2630bc235437d9c2ab32d579585e27c108f87d22cc9b458151e742d2f6c0788ae993fcbefe247295f2a572d8648ffaa SHA512 be8e74d9c73f2e4dfce9728cb06c3bc56ae35120e3388fc232da3f4cff17367775401805f63fecb74397ecc7ae8340d68dfa271cd06ed2fb03def8d155262d02
diff --git a/dev-python/typing-extensions/typing-extensions-4.2.0.ebuild b/dev-python/typing-extensions/typing-extensions-4.2.0.ebuild
deleted file mode 100644
index a1cf51297725..000000000000
--- a/dev-python/typing-extensions/typing-extensions-4.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=typing-${PV}
-DESCRIPTION="Backported and Experimental Type Hints for Python 3.7+"
-HOMEPAGE="
-	https://pypi.org/project/typing-extensions/
-	https://github.com/python/typing/
-"
-SRC_URI="
-	https://github.com/python/typing/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/typing_extensions
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-python_test() {
-	cd "${S}"/src || die
-	"${EPYTHON}" test_typing_extensions.py -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/typing-extensions/typing-extensions-4.3.0.ebuild b/dev-python/typing-extensions/typing-extensions-4.3.0.ebuild
index bffecf85e95f..00720a9bd39e 100644
--- a/dev-python/typing-extensions/typing-extensions-4.3.0.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-4.3.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 python_test() {
 	cd "${S}"/src || die
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index 12e422a48a33..f3a5cdd6118c 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,5 +1,3 @@
-DIST vcrpy-4.1.1.tar.gz 329508 BLAKE2B b6981150a8fd742301e0d7897d84855c741c97307bbb5c5751680f3d33d69d6333a18d714fcc14cb018f5dd6c02e840e1313136660c4459e2755d448fc0b07e9 SHA512 afa1904bff37bfd2d278ed49fa3982a357eb6bb113818b532044da0f11a9dd877cc152d7f0d81d88bdc0f870521b1241f6aecf959f668211904e3c6c7cea4ad8
 DIST vcrpy-4.2.0.gh.tar.gz 331096 BLAKE2B dccb9310da42c6f75d0d503cb64aa09876447098bff2ad6a1507a0e0907ce05a89d46ccc159e79f310e027fc8f3075b7474274ad39ca4778acbc6d2a8f633004 SHA512 61eeec585fc78be1ae6d4f9047123c9680611e436bb5980fb7c6b885e16b2ef9bd5ce921efff7e87a222b3662c7009dbf0a8df24cdb9849d09deb24957ba4889
-EBUILD vcrpy-4.1.1-r1.ebuild 1798 BLAKE2B 93f6511d7b8f36910b79d61fd68333e2c1b912d099c011e2eaa6b8bb33462b640f7b319ad3e110bf826892507e9413e0c9e364cc92f8ef70829562f47f423750 SHA512 2ac1af65fdd13d862898dde4771f7dc5ac1e3e9c1236e85c6be171c13dc54af9445a59a33cf8bdc6e5a84b290ac568630d3296b8791b1ae14185196232e33049
-EBUILD vcrpy-4.2.0.ebuild 1593 BLAKE2B 359d63051ec8151b5a0e02ae9fa1239741ee86e9aae3f8f1a86983493470f8346b1597a85999837254fde55c652eecc29f6ee38ef467d261db05240022487159 SHA512 a3951db7a796f14771f758f00f7f4e49cb408dffec886a8c9d44bcf9460e6c647646b1b202207b19ea7097b6c86993fe25d83a7f2d1401a3964d4ce4a99c3b0e
+EBUILD vcrpy-4.2.0.ebuild 1585 BLAKE2B 4329d7fa8facfd83c46263e1f0e8993204f36e5be316e9e960b5aaa82542fa72e0a176a5c8614ea5a410b58b916658c08ec779f369f2c63232dc4d484db98003 SHA512 68a34453060fde72b1dc7addf00560ec39b1593bee154a67c708b97011969f8485f9d2e104097b658d46efdee6f293d183dab16cd718ebf40686cb4eb509106d
 MISC metadata.xml 388 BLAKE2B fd31293bd6085e6a93816a1813a8c3a9d046ed3d932fba5b32b454a71e7535606ba92815699b7ca10fc837b07a5335df54d5fae8c860a7ea88c6ea72891d0620 SHA512 0360ac6f113035ffd1991d2a42000f290c9d0a3fa8c4dac9abfde0eecafd23e1ff9929d8ee521f83a924c523992fabc5cb4353079bf7c52dac9f906a31d4da55
diff --git a/dev-python/vcrpy/vcrpy-4.1.1-r1.ebuild b/dev-python/vcrpy/vcrpy-4.1.1-r1.ebuild
deleted file mode 100644
index e1d011d9d398..000000000000
--- a/dev-python/vcrpy/vcrpy-4.1.1-r1.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_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically mock your HTTP interactions to simplify and speed up testing"
-HOMEPAGE="
-	https://github.com/kevin1024/vcrpy/
-	https://pypi.org/project/vcrpy/
-"
-SRC_URI="
-	https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
-	dev-python/yarl[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# these tests require Internet
-		tests/integration/test_aiohttp.py
-		tests/integration/test_boto.py
-		tests/integration/test_httpx.py
-		tests/integration/test_wild.py::test_flickr_should_respond_with_200
-		tests/integration/test_wild.py::test_amazon_doctype
-		tests/unit/test_stubs.py::TestVCRConnection::testing_connect
-
-		# probably unhappy about ssl module being more strict now
-		'tests/integration/test_httplib2.py::test_effective_url[https]'
-		'tests/integration/test_requests.py::test_effective_url[https]'
-		'tests/integration/test_requests.py::test_redirects[https]'
-		'tests/integration/test_urllib2.py::test_effective_url[https]'
-		'tests/integration/test_urllib3.py::test_redirects[https]'
-	)
-
-	local -x REQUESTS_CA_BUNDLE=$("${EPYTHON}" -m pytest_httpbin.certs)
-	epytest
-}
diff --git a/dev-python/vcrpy/vcrpy-4.2.0.ebuild b/dev-python/vcrpy/vcrpy-4.2.0.ebuild
index 8f48fb71765f..d7b461c16f56 100644
--- a/dev-python/vcrpy/vcrpy-4.2.0.ebuild
+++ b/dev-python/vcrpy/vcrpy-4.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 330996afedaa..ec1b3ddf4f99 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -3,5 +3,5 @@ AUX wxpython-4.0.6-skip-broken-tests.patch 4113 BLAKE2B 920f1c0c6e1154de83c412ff
 AUX wxpython-4.0.7-ultimatelistctrl.patch 4121 BLAKE2B 0fdf74a0131c9d5c49dd867c3867ac212d26f4d877dc4f4e48680d90956c1027bbc776d19edd235d8f1e4b619d616c4ca1ab28b45a3b2dc79aa97a59c48adb2f SHA512 9d766d9724613e269215db81ecaad7d836b65c4d17f8b522bd688881bce1176241965d05539886da42755f0c7be65ef55c4ce340c21fddd512abb6577ece5482
 DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
 EBUILD wxpython-4.0.7-r1.ebuild 2311 BLAKE2B 563169aac0ee52d5270eaaceb298d19aca4c6ba00afd96a7a43a9474f21733aabfc91a4ce64c7d52f0ee57fa26b64b77cf2a8d556f08d2b226db9cd8191b11e8 SHA512 dc2659b721faa6f3c9d36cc05659eb6350efa9e7fd6c633be6c67487cca2cc93ab49bdf7a8f43a994d6873ae82a9c773c4f0d9724240a26e405403488977c8a4
-EBUILD wxpython-4.0.7-r2.ebuild 2370 BLAKE2B 67fcfa85c57f917bba174c34dc9a2572fa1c25f1029c493a4b38e66ec90b917c95df65226b7ec6830cfb046974e999f8488cf8ce5cca3a370ccbac0a877ef8d8 SHA512 1d19e718f80238a9b67cafc4db3c47f5604dcaa71d98f3391a5c6afd39a9c097f6ae7967bd863294cad14c0199dc91ecd992b8ee3e3a15de5a197680ef4c0361
+EBUILD wxpython-4.0.7-r2.ebuild 2365 BLAKE2B 19d5165e3ce024bae378121df739996cfab8b39167fac433eca9afd1953c16b90e6ea6137122880854023a11e40dcc06b3f6d2294e8583f27e0b13d4582b78f3 SHA512 916268029fd8f8a0e1a579123ee672fa46491951eaa7fee073286ba802f9b285a15c48314e9c275334c9413d3a2053afdb1607c4f0ce86f245c22ce2ffb53cc3
 MISC metadata.xml 491 BLAKE2B ffa0cccf66f484c856fb30249bd0ccc3b0da2f3ee8e3c3a0df1782bc58e4867ff99d9711f1784b44b439f2a8bcf297c1082b49a941823f046c7f2c7977a77629 SHA512 a2f5908a276a8f9c512cb59c8d17873398c91b21977371ab724e669f3b6c032d53510fbcd183a5dc340279fc522289e617b8c313c0d825ca70d0d2a5d74f8cfa
diff --git a/dev-python/wxpython/wxpython-4.0.7-r2.ebuild b/dev-python/wxpython/wxpython-4.0.7-r2.ebuild
index 2e17a2286297..97ea7c2d1819 100644
--- a/dev-python/wxpython/wxpython-4.0.7-r2.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
 
 LICENSE="wxWinLL-3"
 SLOT="4.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="test webkit"
 # Tests broken: #726812, #722716
 RESTRICT="test"
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index f83c99c28f8d..dbf2bfff8c36 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,3 +1,5 @@
 DIST yarl-1.7.2.gh.tar.gz 108115 BLAKE2B 7bd212b652a77ac29fde4c6565c48c4067f2a24db6bbf735107f3dfa5ee8b6ad2e5a5c3c6206e8dc7692e4cfd5c975d4304dd93280087574bddd73a337417c52 SHA512 bf69c5758f523259757ff84a8737e28931f46311f12f6e141329a5074d34a0cfb45795bf79cb7b78cb676ca7bc38042a2fbd946a5f41bf1d149ada50b88b31ae
+DIST yarl-1.8.1.gh.tar.gz 109912 BLAKE2B c7390b78abb5074dd29e96848a77fdb31f6224e99d2bcfd5a28a8bd08881f5ff82cf55b2f54c97324d005a0fb3823732a9ed6bd3f1d837e4ac2341b89e2adb30 SHA512 267523216832c2bc83d92a42e621ff519d427e20c1ee84ac657e13f696a2df2259c837486f192d87944f5ebb834beea60ace791eb4c9c632fd7e552eb5dadf1b
 EBUILD yarl-1.7.2-r3.ebuild 910 BLAKE2B 68d8fc7b158dd40cb8dd08f9a2b39544b17ade53772f742ddf951d29dfcb55daee99bada90676a797d8ace257092842d72cd3cb3abfab2fe99203cbf6d4b0a88 SHA512 ecf4dcc5136ed7fa3c2a3c937d61466993cfef4e0408086a253340deabe8f46e9cfe56bfc8cdce8560cf12ba84d9904515ec4d783ed85d49ac04daf7ac01ba2e
+EBUILD yarl-1.8.1.ebuild 918 BLAKE2B 72373c54cf93ea0df89c030684cc0975fcc9aa6c508f10e19ef08dd4acd404477bc6cd2cfe02f6b334ddead19683f6416750eb9ecda206093a29b9d39253af4f SHA512 12460e120e522e3abb3355d0331e63ecc9c93a15e82219efde14c2afde343678e418987adc90d9e5a9ebe759ab9aa26d7918f58bf50a630651bf6433d07a9054
 MISC metadata.xml 440 BLAKE2B 10fd0e37c9be76c5d1dd90b9fd1cb1e5161fc5a7d2b51bcb5658a8c187a67d5f9573241733c3f9570e9fb7767bf84b38a6f8b2c212596627bea4e1686b7eb41e SHA512 c9e340124ed93cb0d52a0ae5abd43c10528197893c3d5ab57a0eb7046ebae5b80119f7b033d6697110c4bc064c0a8581d904788f6969cb52a433064067898cbe
diff --git a/dev-python/yarl/yarl-1.8.1.ebuild b/dev-python/yarl/yarl-1.8.1.ebuild
new file mode 100644
index 000000000000..7ea5cc25c82f
--- /dev/null
+++ b/dev-python/yarl/yarl-1.8.1.ebuild
@@ -0,0 +1,45 @@
+# 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_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Yet another URL library"
+HOMEPAGE="
+	https://github.com/aio-libs/yarl/
+	https://pypi.org/project/yarl/
+"
+SRC_URI="
+	https://github.com/aio-libs/yarl/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/alabaster
+
+python_configure() {
+	> .install-cython || die
+	emake cythonize
+}
+
+python_test() {
+	cd tests || die
+	epytest --override-ini=addopts=
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-08-03 13:53:01 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-08-03 13:53:01 +0100
commit	4b4d352fc9761396c68812d8eccc63b7b14d6558 (patch)
tree	4f290d635d831599222130ba8ddbf1a726129426 /dev-python
parent	a2c1a301b2ea85c230b30ef69ff667f230a1bf88 (diff)