gentoo auto-resync : 28:01:2023 - 20:52:36

author: V3n3RiX <venerix@koprulu.sector> 2023-01-28 20:52:36 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-01-28 20:52:36 +0000
commit: bdf6e70da7a28f45617c02a251bb6b3844202bc5 (patch)
tree: cf66e5dcf53b2ee6842fd3ff4d24d52aa30cfebc /dev-python
parent: d414c993cafd9e31a370c4a5aae042c710df2419 (diff)
41 files changed, 514 insertions, 669 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 36c58de408f6..8edf093c024c 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt6-WebEngine/Manifest b/dev-python/PyQt6-WebEngine/Manifest
index 367a301ee6af..e80377dfe7cc 100644
--- a/dev-python/PyQt6-WebEngine/Manifest
+++ b/dev-python/PyQt6-WebEngine/Manifest
@@ -1,3 +1,3 @@
 DIST PyQt6_WebEngine-6.4.0.tar.gz 31180 BLAKE2B af7b10fa473bf0e5775319c47e8b8a7084321c09edc7a46ed89e771b8f0f44d5f4b59a47a9c902c3662296adbff4d514fa33c0b4071080b408c65167f64c77f8 SHA512 cbd549a91aa070aa81fdf60d836f8bdc1ec6b354868e1a0e39345f9072a8e60a019675e9983a1706ae0ac482a6f92c5beadb1ed4e4244b55f49df01d0e97e60c
-EBUILD PyQt6-WebEngine-6.4.0.ebuild 1662 BLAKE2B feeda61aebd0c5ba3537c1db4a834094e0f143cdff499d69bfc6e6c063fde45b60c93c29624d27aecee4d74785d551daff817dbd257217f6e83ca6a3a4d81ae5 SHA512 0aa4f07a0d115b71228c2aafeb5e302c358f531423466feb3942e148360526d7d96ded138a702eb59ffd11632d232564e647b8ff017f50f41f1cb4da0afb2b27
+EBUILD PyQt6-WebEngine-6.4.0.ebuild 1628 BLAKE2B 75b8b752cbc5341721be98c0e45bc35098429753a117cf89b9b4869a5cd4a11378361ec4ddc55eb411f0cdd3c2b99eef4b577087bf577fd4052d6bdcb75ba4df SHA512 2d7d4ee7622f21d47f850d52c1966fd1b65d0ac2d5ebf527d38f68cafd156bc14ae2dcb4d1c08897fd92ba9bab2fac9b490847d9439029b0ec71e6a8070832f5
 MISC metadata.xml 572 BLAKE2B d0c911bf7d8f4f33e30daabfafe3447367045dce444dda4d8600ea47a844842996989ee7c64ccee6ce77a033bdbd1e7c58136e16ddd5f76a7b5688681f791d2c SHA512 11a8b7ab3fe9fa8e8a7160658aac5b8148a60f30b49bcba92cb08eee6d8f5021e4d117632dcddab98c9a0ebbbecd256ce09fbbe43f05105f7429355f9120e42f
diff --git a/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.4.0.ebuild b/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.4.0.ebuild
index 38114d7e72a3..8abd9c96b89b 100644
--- a/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.4.0.ebuild
+++ b/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.4.0.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_PEP517=sip
 PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1 flag-o-matic multiprocessing qmake-utils
 
-QT_PV="6.3:6" # minimum tested qt version
+QT_PV="$(ver_cut 1-2):6"
 MY_P="${P/-/_}"
 
 DESCRIPTION="Python bindings for QtWebEngine"
@@ -35,22 +35,19 @@ BDEPEND="
 src_prepare() {
 	default
 
-	# hack: qmake wants g++ (not clang), try to respect ${CHOST} #726112
+	# hack: qmake queries g++ directly for info (not building) and that doesn't
+	# work with clang, this is to make it at least respect CHOST (bug #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
-
-	# workaround until bug 863395 has something to offer
-	local qmake6=$(qt5_get_bindir)/qmake
-	qmake6=${qmake6//qt5/qt6}
+	append-cxxflags -std=c++17 # for old gcc / clang that use <17 (bug #892331)
 
 	DISTUTILS_ARGS=(
 		--jobs=$(makeopts_jobs)
-		--qmake="${qmake6}"
+		--qmake="$(type -P qmake6 || die)"
 		--qmake-setting="$(qt5_get_qmake_args)"
 		--verbose
 
diff --git a/dev-python/PyQt6-sip/Manifest b/dev-python/PyQt6-sip/Manifest
index dd7767b5e693..be37f32a53c1 100644
--- a/dev-python/PyQt6-sip/Manifest
+++ b/dev-python/PyQt6-sip/Manifest
@@ -1,3 +1,5 @@
 DIST PyQt6_sip-13.4.0.tar.gz 111209 BLAKE2B 963d3788d0996565696e82e6a9c197c197322f8b1637cead79a4af8cf8d3ed1b82423ff41e507204aeddc5f16fa0b96b7e7a49c6848ac7438bd98885f3ae4dc6 SHA512 e93a88fedbb965a7ea605a33820798352c340d5656b3ad60c40adc8dbd24fdd18deb67e706595e3cb96e41d1e17d4c837f1224a1c250f0179c6b60b1a5b0e6a2
+DIST PyQt6_sip-13.4.1.tar.gz 111256 BLAKE2B 548cf81a0a02183e2524bbbbc8e4c1e72fb91a744d7e23ecad531bd0f6d42fef4a2b893f84dd93c4f73ebc95eaef79e19744d1a9ceeb4fcd3497a2217d0f02af SHA512 267cdde9923e6f8522a7ecdbce4ee6c55f5733719b0326fd87ae91ec35c247176516b25a01a9addabe9391a6df10c67beab782fed8a83185a2cd5fdcd6fb4c50
 EBUILD PyQt6-sip-13.4.0.ebuild 458 BLAKE2B af3432090f0475a83eafc904a95f3f697b2f87051a27c3f5c1ae866498d68c4e74cb397e76c69471f90923ccd7d908b295edab86b17268e70d12f7262e67c31d SHA512 4eb249d7f5f1aa15f7fb45175b57135d5038a4cc78067b676163ee82f334a5131103d581762f5cd128140aa769eca9f9f096612afe41c193195cb6d75eba18d2
+EBUILD PyQt6-sip-13.4.1.ebuild 458 BLAKE2B af3432090f0475a83eafc904a95f3f697b2f87051a27c3f5c1ae866498d68c4e74cb397e76c69471f90923ccd7d908b295edab86b17268e70d12f7262e67c31d SHA512 4eb249d7f5f1aa15f7fb45175b57135d5038a4cc78067b676163ee82f334a5131103d581762f5cd128140aa769eca9f9f096612afe41c193195cb6d75eba18d2
 MISC metadata.xml 397 BLAKE2B e634d1d335e66f1999898912570f465e7f4e79f7e8aa60b9ad5e8038078ae65c93db31af3e25a7b879941b97704b81efe7e4ab8a698f710eecca914af733f4e7 SHA512 56fa4d44568faf5818bf66b2fef7c2e7cb5010de8c57c21c3c4c8550ab9da671af5afe71e83890e7432c73e5c299b46b6abf2fedbb519f408c21d395900fa490
diff --git a/dev-python/PyQt6-sip/PyQt6-sip-13.4.1.ebuild b/dev-python/PyQt6-sip/PyQt6-sip-13.4.1.ebuild
new file mode 100644
index 000000000000..58d7f3e359c4
--- /dev/null
+++ b/dev-python/PyQt6-sip/PyQt6-sip-13.4.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1
+
+MY_P="${P/-/_}"
+
+DESCRIPTION="sip module support for PyQt6"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-python/PyQt6/Manifest b/dev-python/PyQt6/Manifest
index 1468963cc695..634c3d81a2f4 100644
--- a/dev-python/PyQt6/Manifest
+++ b/dev-python/PyQt6/Manifest
@@ -1,3 +1,5 @@
 DIST PyQt6-6.4.0.tar.gz 1024037 BLAKE2B a55d2e33160b6bb713b5e32e6b3a3df942f373ce9c9697cad548325c35ee7ee73a57e93ebc8780480086b02d651fa848258f11f85bea0e54c61c8a0f99039c3d SHA512 836696cc708e140ff497fd915fac147265c58e5d44d54d7dcd1908bad54ed793b4c2c4f20b487d13c7a5f7eb6b2c47d7ab822d8ffc875657de7fd0f88ee6c53b
+DIST PyQt6-6.4.1.tar.gz 1025522 BLAKE2B 17a5f5f4dba5b06729d4a0f9b2964c5632be5bed1da67fe1a90a9d91ba63bc10a83012fc6e8ca5306238d1dc55a3d10ff08c84eed6b369d0c98ac7281e28d2b0 SHA512 860dea8878a81acdefee164f766ba850481b1f4258ebff95fc3cedcbcf15e832799cd2e62d3b2bf83a743879bcb7efdc70109229c83205b649357fdf918864cb
 EBUILD PyQt6-6.4.0.ebuild 4551 BLAKE2B 58f950635da473447a45c039abda4e7ff6303adfb9bc0743ce696cf8db37878220b9bbc9086d6560f2af1aa857c44f56c35ce9f2b471b6483ca80355a2abbe1c SHA512 c1efb60f2c8dc51f3771ff377a24917ca23093c504e507a0cca31489632b5c9922b637f67681ae3a90756389db9532b34a33949aeed7f2dfe7804828add947f3
+EBUILD PyQt6-6.4.1.ebuild 4500 BLAKE2B 4a2daeb29d55775047883c50cfa909f39fb81c1edddddd58d68cfb7c2241f94487f99e001c722c74d3db83c97ffa1b402238363b6be4a640ef5865f85ead75c2 SHA512 7312160a028b3c99bd84fc65fb0553c67f041b677821c0e9eedae0ccb02a42d075f8032021cbd8b97a5fe19a7671419b4a910b3c2c80151604a1e8d2ce717059
 MISC metadata.xml 1915 BLAKE2B b4ca171871165e02fbc54d7931a52da3a70415b4acf5f85b23459d6949c7a720b68fbddba1a5c22d4d8b90e16faa7f628cb088cc93eb9f1db05da15d33967b1b SHA512 32671e148db535c25b9bf1dd48f945d3ddd74e9df86014af2beb92dccb8d49289e778a1ba38c57cc61dabab88528057ab1aa57ee48b95b80aa1254b1c765772b
diff --git a/dev-python/PyQt6/PyQt6-6.4.1.ebuild b/dev-python/PyQt6/PyQt6-6.4.1.ebuild
new file mode 100644
index 000000000000..2e10cf119914
--- /dev/null
+++ b/dev-python/PyQt6/PyQt6-6.4.1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=sip
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1 flag-o-matic multiprocessing qmake-utils
+
+# 'can' work with older Qt depending on features, but keeping it simple
+QT_PV="$(ver_cut 1-2):6"
+
+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"
+# defaults match what is provided with qtbase by default (except testlib),
+# reduces the need to set flags but does increase build time a fair amount
+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 )"
+
+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 queries g++ directly for info (not building) and that doesn't
+	# work with clang, this is to make it at least respect CHOST (bug #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 old gcc / clang that use <17 (bug #892331)
+
+	pyqt-use_enable() {
+		local state=$(usex ${1} --enable= --disable=)
+		shift
+		echo ${*/#/${state}}
+	}
+
+	DISTUTILS_ARGS=(
+		--jobs=$(makeopts_jobs)
+		--qmake="$(type -P qmake6 || die)"
+		--qmake-setting="$(qt5_get_qmake_args)"
+		--verbose
+		--confirm-license
+
+		# TODO: enable more as new qt6 packages 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))
+		--disable=QtPdf #+QtPdfWidgets (QtPdf is disabled in qtwebengine:6)
+		$(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
+		$(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/fritzconnection/Manifest b/dev-python/fritzconnection/Manifest
index 44962ad57ccd..744a3ab09be7 100644
--- a/dev-python/fritzconnection/Manifest
+++ b/dev-python/fritzconnection/Manifest
@@ -1,3 +1,5 @@
 DIST fritzconnection-1.10.3.gh.tar.gz 146450 BLAKE2B 77c64d2963ed0bc1c1bf1d31fc42093d959588df5ea55956c2deb35c1569f76f1b89bb2f1273ad691285d21f168f5acdbb1326bcad4ed2e575d57b9a6187e839 SHA512 e54cf5ec4392c8bc0b6cbc19111819bd72125bf1eb341380686c0ac513c646dec16f8a243fdfbe22199c954cbf26c80ab30dbe93b5e02288bc25fcae28595305
+DIST fritzconnection-1.11.0.gh.tar.gz 147539 BLAKE2B def880bcf80bb99864bca942b86c86adcda878fb62b7c0e35db4a746310e5ec8ad00bc25f43acac23c0d5410dc8790875b8b0822aa6d944a0e1197379e015e22 SHA512 bb517a63616a961f9c2c701d44093024f0763c093f89b99d205fb1fd1492342b568b871ebaf699a69a9d56e724735b975c48e4abd1780726d10c13e075cf08f2
 EBUILD fritzconnection-1.10.3.ebuild 1118 BLAKE2B 7e079f717ab938b5f593d3e4eed5fb0d1f65d09c0af7d3a3d789f31376bd4cb8c9036795358f5776560b5cbe851e703718b73eeb3e60799bc3fe70e09917ea28 SHA512 98c23dfcec97c06f293d5a17f8f8e90c28099fee2b2851be1ef7330e27ecf3271fd899e32d23ec57baa38297837f5886dada79de5ffbae905abd207a69966731
+EBUILD fritzconnection-1.11.0.ebuild 1118 BLAKE2B 7e079f717ab938b5f593d3e4eed5fb0d1f65d09c0af7d3a3d789f31376bd4cb8c9036795358f5776560b5cbe851e703718b73eeb3e60799bc3fe70e09917ea28 SHA512 98c23dfcec97c06f293d5a17f8f8e90c28099fee2b2851be1ef7330e27ecf3271fd899e32d23ec57baa38297837f5886dada79de5ffbae905abd207a69966731
 MISC metadata.xml 469 BLAKE2B f180fca33d0ab2fc81dc87fd39db87cf8c8ff51777062968a3ace592c9ac63af311273fda2db88c6772204ae24c21b4f195d1b7bacbb3c23f677dc7e8e309f1d SHA512 9ab24725dc0bb5b0e40ce79520d19c0348b08c7d779b53064111aa53fefefadc164b6140310df0a367d460d2fbb46345bdb2b7b6a9cf1beba3bbab1f7d7e2697
diff --git a/dev-python/fritzconnection/fritzconnection-1.11.0.ebuild b/dev-python/fritzconnection/fritzconnection-1.11.0.ebuild
new file mode 100644
index 000000000000..c82f65f2406f
--- /dev/null
+++ b/dev-python/fritzconnection/fritzconnection-1.11.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Lib/tool to communicate with AVM FRITZ! devices using TR-064 protocol over UPnP"
+HOMEPAGE="
+	https://github.com/kbr/fritzconnection/
+	https://pypi.org/project/fritzconnection/
+"
+
+LICENSE="MIT"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/kbr/fritzconnection"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/kbr/fritzconnection/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+RDEPEND="
+	>=dev-python/requests-2.22[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# flaky (relies on time.sleep(0.01) magically being sufficient)
+	fritzconnection/tests/test_fritzmonitor.py::test_terminate_thread_on_failed_reconnection
+)
+
+src_prepare() {
+	# upstream is pinning for py3.6 compat x_x
+	sed -i -e 's:,<[0-9.]*::' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index 0f90cb2ad752..10cbba77654b 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,7 +1,9 @@
 AUX greenlet-2.0.1-gcc-13.patch 1458 BLAKE2B c99ef6da5a9d9a09ee02eb96eb04599db95c3fef22ad28c3d9066ceb54ef975c8dbfcbca48ade74be9601ca7111d8802d22543d986ac94ec2e7e6e8baafafeae SHA512 3cf43f496e24de66cbb788be6a529cd254cbc0721bd7e1a1b4b3e75d6bcef61b654e4d6f65c11f7e41590fa3b57477964eb263ca7bfa6849f01a936af3da1f37
 DIST greenlet-1.1.3.tar.gz 91624 BLAKE2B 88ba03f7a5acc7de2ab757a04667de9774ec8979b0f3d45131f8174a4ea9a608e359e4d8ce2f7e57c58ce4844e58a082d35d983fd583fc6f53ffa38363fb7863 SHA512 9ece4a4e758de963c96c7cbd33aec33fa11ddd3d46b8dc4194e14d534f8f68787df551cb1e3be57fc8a65fbd8d5daf8fee59567927f6f272535dd7c720baa4f4
 DIST greenlet-2.0.1.tar.gz 163824 BLAKE2B 4b06e3b95399f38dc529b06656dfee0347eb72cbce4ab62d4655d017457bf9df234d2767c1296705ba23b0d9f6476654327766efd329e48459c311600f33248a SHA512 3f4ccc761f64c7f10946d2fa965ef847e814ca1b6f57dc0df262cb6eed24148b44c6629770bf038656a9e3706e45553080844dfc841643604bd4776ca7ca03a2
+DIST greenlet-2.0.2.tar.gz 164980 BLAKE2B 1afa8390e96d7eeafd84a4323a4eb9e4b2cad50a3e6654b1609702a5a74dfb5dadc7a1ff81cc8e7718d0587728c2ec944069db8241f1aa0723d2f98e6911ddb6 SHA512 03d0b2764c52524c97930a7bd856a432360a96ddbe3d1f2352ec49750994e6811fd28378f83b96cac91520234d0a6e9e56232ff688c71ff57f6340d3d182635b
 EBUILD greenlet-1.1.3.ebuild 747 BLAKE2B 7b9b6ac190e1b8d9395d5ea3046c9faa42d0e4ac70ca6f484806d7c3a0c08a4c2cb4695bc5e6861c16108bdb6c1a56573dd3e2ae8c14048b0cd30c60f99c2c86 SHA512 8a5d22cde3504cabfd318cd7b65232e516e84076fb33cbc7e4e40915e768982a8d588f3770534b64ed0e12c311a6c0940600f0fbb04c5d0b87c382de6261fc9c
 EBUILD greenlet-2.0.1-r1.ebuild 800 BLAKE2B 880b2bf1220e428a0f4bfe7c2e1f7662c8da1ba5a02226aa88ba3c79f96a84dbd95291d841bf45c2291578d163cfe39466856581e5718bf24c91cedc3f847ebc SHA512 efa880f7a3663e30986d60efec273850756223bf3ebe63c3a24ba1a622fdf3216f423fa0f4823dbe3c91f35cfdd95928e3a5dd95c47ecee308473480c2515c48
 EBUILD greenlet-2.0.1.ebuild 752 BLAKE2B 44b12f599b30a7a9192d9902f9a9bb600987e07cc3594828a0699d3480c5757db69f9e2aac4cc9aeb4563c8470bd36d76a21991c768a9b9b244fdb220df44e46 SHA512 abf080585de3cd9ff73935a2ca2ed759ca8af7bf32c86ac7fec8382541dd2e7b14ecc2fa551cc689214c3df75494fcdfa9b70aac093c1c9f3260d8cf1456619b
+EBUILD greenlet-2.0.2.ebuild 893 BLAKE2B e7a9fd79d279646e5ddc2b0ee9f3266cad1f1797666f18d817c10edd8393450c7cfd14608cbfb255685a84a005f19cea157ca29cc7adbaebe90f396cee124044 SHA512 e04b4db02b8d8faa85a63c51adf00b0915682abc574f65aab75b93e1276e1eec2063a0f1904b0a01204ec5d04480715ab668fdf07c3cdff44610f6ce5c19e0ac
 MISC metadata.xml 388 BLAKE2B db0aba92c5c405fa5736f97c2db14319514e95296ad11aa9aac26e95bdb630961e2ae430cbfcdf2b72425c805b83556f3dda6983dde075be3cb0a3f7d0a45e8f SHA512 3b9003e181f15b46ddd5af3e4a6012f115ca42be0bf2f4e40c0fbb196231de8a5b1320d402de6d4105f61d7e4fd5d868131404796cea19a7547a53ee17c26ce1
diff --git a/dev-python/greenlet/greenlet-2.0.2.ebuild b/dev-python/greenlet/greenlet-2.0.2.ebuild
new file mode 100644
index 000000000000..d8251e3aed7e
--- /dev/null
+++ b/dev-python/greenlet/greenlet-2.0.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+# Note: greenlet is built-in in pypy
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Lightweight in-process concurrent programming"
+HOMEPAGE="
+	https://greenlet.readthedocs.io/en/latest/
+	https://github.com/python-greenlet/greenlet/
+	https://pypi.org/project/greenlet/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+distutils_enable_sphinx docs
+distutils_enable_tests unittest
+
+src_prepare() {
+	# patch cflag manipulations out
+	sed -i -e 's:global_flags[.]append.*:pass:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	eunittest greenlet.tests
+}
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index c7e93a186d99..66456086116d 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -6,6 +6,7 @@ DIST mkdocs-material-9.0.3.gh.tar.gz 10587701 BLAKE2B 35fce28b42346cc2ce208cd3ea
 DIST mkdocs-material-9.0.4.gh.tar.gz 10589697 BLAKE2B 4840b4eb98b1fd8ba80fbc2b2ac069abefc833d44dbeeb0d600c4bd4bf8f943dfd1e3fa1dc59fb5c3eab26b80c1912db54ca47ff066226c534b011dfc60d01d5 SHA512 f7d9baa23fa086d4f916ed52c94c80630102b4fadb6cd4885bd940b4783242539fcb406002ec3c44deacadca5a4f829af0febf66c180857ec01a5f7e241cee25
 DIST mkdocs-material-9.0.5.gh.tar.gz 10898510 BLAKE2B d5c6f10db280e6aa9dc1c1d761d831d6b872586c42c7ba0882a9a0a849919fc85da84c7ed46b8d77fd7f17d65cd0ffa967afb008643b76a8b51d36d5bbaa60d3 SHA512 530ce10a457b9f8726dcaad7e602b30338604fef644a885b7aa15f68107921b5a0be714a274771e96f7b9127eb386d926d412be71634283d7f803d56be1977d1
 DIST mkdocs-material-9.0.6.gh.tar.gz 10898851 BLAKE2B 332903d2acd90f5b979536ab518ca403f26762dcd9b1fc9220b079b400ac1c688556b98e83dc5da321bb6ac73e7ba475179225e88c48495bd85e0e8e81cb02ab SHA512 6a6e51cb3a56c660d1e66613b98db916d9db81108894c04e67cb0267ac79e25c8dccd1d5587814984b1c9a6b87b06bd9d796ac0f613eca69399f1d575dfb41d3
+DIST mkdocs-material-9.0.7.gh.tar.gz 10910584 BLAKE2B 0b7b4393e4db7b3c20718f231f46030463c4654317af5a9c1fd37347810eb4c1f1bfc307878d96511633fa3b1c51a2ed2c4bc43a7fd273fcdc0d14893c22e878 SHA512 560688e1d3888438d83daee611a1b05a6d693f1c63e7aa931d074531f7c53bdbad61ae03bf60f6f68ab9358959c78d65fe347637811d8a4120c8cefeb1ed9397
 EBUILD mkdocs-material-8.5.11.ebuild 1263 BLAKE2B 7323fb709d69a744fb72d1ab16e56b22b307b0965970fa36d12074a29f96329c721a8d91c6f9678071eace3ac0b339c46666c7d616f4228d8891924cc1c76847 SHA512 6750c93b730462cd2c2c2a4c8fccd0ec5586e43ec545f78feb8e782c5d910792f62c94644e60e686faebdba89874fd3129a6478f4bdf8a1ade122c6f58db0078
 EBUILD mkdocs-material-9.0.1.ebuild 1265 BLAKE2B 29df4d579f2a79841af5b1a6c762de5175e7b267b183028cf1548ac983a88edd7b4f34557c5ce1ba096db41e8c7c1780313ff02ac1541e03cb1e9aa9e3f49eb1 SHA512 7c5ebc27b3c5ab8cea5a0b573b78e4db6a1fb0b6602b8b67266acf93dc2009ca81039de8e25c1d71ecbbd9dfa3f1c9e1511bef08204b784136613f066c43bbd3
 EBUILD mkdocs-material-9.0.2.ebuild 1266 BLAKE2B 3d6af4b8f44d5bfe41377e09460c627a80b74c3b9fa8a9330d22676d75a7fb3717676026e4e57925b3e39c74e69e3d08447254cbdef6f30ee8f96bfb5a97c9f2 SHA512 4e943b433387b7275e399f573486b473b14c3238ee60fb077d3e9942606b491df513b4dfb50f4dc091149870a3b67f7ae09871b49e36d7f842e0a853a1855cb7
@@ -13,4 +14,5 @@ EBUILD mkdocs-material-9.0.3.ebuild 1266 BLAKE2B 3d6af4b8f44d5bfe41377e09460c627
 EBUILD mkdocs-material-9.0.4.ebuild 1273 BLAKE2B 00962df71a81ba3e3d705e3757e7789e782f78dbbd1b9d7f8ca0a365926970106672cfdb98c8e56d96fc9cb9beca599b5ed80685a76b738540f7e7661cc9c206 SHA512 90faf451432bf546477e0d0a25e2c31f47d78a5bf3e76e8b954fa4169f5bd3097448b086222ba5086204dd6177e091b402837f953f7c989f868a733fe07a0e04
 EBUILD mkdocs-material-9.0.5.ebuild 1273 BLAKE2B 00962df71a81ba3e3d705e3757e7789e782f78dbbd1b9d7f8ca0a365926970106672cfdb98c8e56d96fc9cb9beca599b5ed80685a76b738540f7e7661cc9c206 SHA512 90faf451432bf546477e0d0a25e2c31f47d78a5bf3e76e8b954fa4169f5bd3097448b086222ba5086204dd6177e091b402837f953f7c989f868a733fe07a0e04
 EBUILD mkdocs-material-9.0.6.ebuild 1273 BLAKE2B 00962df71a81ba3e3d705e3757e7789e782f78dbbd1b9d7f8ca0a365926970106672cfdb98c8e56d96fc9cb9beca599b5ed80685a76b738540f7e7661cc9c206 SHA512 90faf451432bf546477e0d0a25e2c31f47d78a5bf3e76e8b954fa4169f5bd3097448b086222ba5086204dd6177e091b402837f953f7c989f868a733fe07a0e04
+EBUILD mkdocs-material-9.0.7.ebuild 1273 BLAKE2B 00962df71a81ba3e3d705e3757e7789e782f78dbbd1b9d7f8ca0a365926970106672cfdb98c8e56d96fc9cb9beca599b5ed80685a76b738540f7e7661cc9c206 SHA512 90faf451432bf546477e0d0a25e2c31f47d78a5bf3e76e8b954fa4169f5bd3097448b086222ba5086204dd6177e091b402837f953f7c989f868a733fe07a0e04
 MISC metadata.xml 1037 BLAKE2B 6997d0f85e31152c58092081b697d8934c54f933e188082eb55e5e9f252f57274f673e1d8e5b657907da2d1658f969cd67bdb32bdc05324746f211b718f3a4b2 SHA512 ccd4f4aa6e6e780d0aff5894b260eedb602d29cc25427c202561525d27de4a31d1e13f59267d8d732d0e12f3ca0485996bca6ef2a114e96b030259899e8ad47c
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.0.7.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.0.7.ebuild
new file mode 100644
index 000000000000..ae30183c31b4
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-9.0.7.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material/
+	https://pypi.org/project/mkdocs-material/
+"
+SRC_URI="
+	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.9.1[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND="
+	>=dev-python/mkdocs-material-extensions-1.1.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	# simplify pyproject to remove extra deps for metadata
+	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
+)
+
+src_prepare() {
+	echo "__version__ = '${PV}'" > gentoo_version.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/poetry-core/Manifest b/dev-python/poetry-core/Manifest
index 753258023618..632818b85a99 100644
--- a/dev-python/poetry-core/Manifest
+++ b/dev-python/poetry-core/Manifest
@@ -1,3 +1,5 @@
 DIST poetry-core-1.4.0.gh.tar.gz 556575 BLAKE2B 6a0860f965bb7d554f1f13c46d76727b9a763dd3dc04a1d889ca894c30ad91e46931308981560fadf70348731f080322da9c9590248b7877e02eb81f4009e02a SHA512 31c9b42ae8e4ec5c4cec93604a5ea72642fb89717867d7f43fdf930835c7e1da97b0251870d86841c30b1bf0ee7b167fc6a8dcfe939beb5b40acd7e24dfaede7
+DIST poetry-core-1.5.0.gh.tar.gz 478924 BLAKE2B 54653b6a8dcac08ac732ccb8efd2ff0404e6e78e7e2f6981fca2aafc53144309372389cc11d2524470ff25b0fc3ade5039df850629fefe016b6e9860f09d3247 SHA512 18b62096f32b7e57abc296bd8e35d0802873563c83e19b0e6e5f9994edaa503e05b9a782a6612d28b8544e34efc92efe213dcd5b595ec1d217e678522df3ae31
 EBUILD poetry-core-1.4.0.ebuild 1625 BLAKE2B feca07705fd9b6cda44f94ee0024b7de25124317fc834f75ac416237d3a51ff09e05431971ad74ef3553fb973d396a8eaca25a4e3589162892a28703905d435e SHA512 7109537e69a5e171d1f8e751c308cde5026ba8b16404bf1831bb9cdcf3de234f4a4698a99020b3b42e7b5ee2f6dc07b1ef4c7a1b7b001d0eea4d769933349942
+EBUILD poetry-core-1.5.0.ebuild 1633 BLAKE2B 444294c5f987914d02453089094893f51046d303147d6be88831a852a7a840ff57dc44e5f7bbfa9bb081fbf5c5e5408b25e3fe50a06d422d72cfd084fbf6404b SHA512 69a2e406db8c0aaf543dbd1359c9554bbcf3c7d3cd70278cb9547be488c6e62bd9f9dacf41092497451ebd5878411b65d3baf27f4bba89db0fc2d5fa303f5d46
 MISC metadata.xml 382 BLAKE2B 82dfc3f146cf3b669fed67ab2e21694b00d5473fdf855cae9fb3a0481785b32c4cf1ed9743a5d64cd055c1cb544377f936a9ec26c9d1dec2cf5fbef6749f5587 SHA512 032fd4dca8f8138c2b527e517f041889e15600ccca876fc3c9e53050196186ad2a9346168bce9c4bae7ffd8a77ff4dd19cc2559fd1da1fd4c7c181056fd49a13
diff --git a/dev-python/poetry-core/poetry-core-1.5.0.ebuild b/dev-python/poetry-core/poetry-core-1.5.0.ebuild
new file mode 100644
index 000000000000..3662767312e7
--- /dev/null
+++ b/dev-python/poetry-core/poetry-core-1.5.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Poetry PEP 517 Build Backend"
+HOMEPAGE="
+	https://github.com/python-poetry/poetry-core/
+	https://pypi.org/project/poetry-core/
+"
+SRC_URI="
+	https://github.com/python-poetry/poetry-core/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# check inside src/poetry/core/_vendor/vendor.txt
+# (note that some are indirect deps)
+RDEPEND="
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lark[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/build[${PYTHON_USEDEP}]
+		dev-python/pep517[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# These "fail" bacause of glob file path resulting from newer versions
+	# in our tree than vendored. But those don't affect anything.
+	tests/masonry/builders/test_sdist.py::test_default_with_excluded_data
+	tests/masonry/builders/test_wheel.py::test_default_src_with_excluded_data
+)
+
+src_prepare() {
+	# remove vendoring of dependencies
+	rm -r src/poetry/core/_vendor || die
+	sed -e '/__vendor_site__/d' -i src/poetry/core/__init__.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# needed for migration from <1.1
+	distutils_write_namespace poetry
+	epytest
+}
diff --git a/dev-python/pooch/Manifest b/dev-python/pooch/Manifest
index f794ace9bf93..63b1c04cd5b5 100644
--- a/dev-python/pooch/Manifest
+++ b/dev-python/pooch/Manifest
@@ -1,3 +1,3 @@
 DIST pooch-1.6.0.tar.gz 52318 BLAKE2B c5cdf04a27a5754accee5a4522d5e6a51c4e71b7034cd570c6a2f30bc580ba9c15e0717be792e7cdd020ca745e6813a63681ce966ad61c0ed4aaa8b84829b920 SHA512 e1b6253b8879ef172bd6370139a7807355c7e1c03a1626ac46cb083b1f7d8beb5a8adb08c0828eb34e96a7164211d2dc7da214fd0176eb0606fe4ff47911257c
-EBUILD pooch-1.6.0.ebuild 1499 BLAKE2B c5836c1540e053689360dea719212202f2d5d9cd081d26a4ec058e99fb62a01c952e3db7eee716818ce3554987ef02d59e260ffa59681e5f29c6a0fe535a9b99 SHA512 382e02a9dc5a4dd2245246189e827f7487b56abbb7957d3437ed47ea396cdb63ec5f69841a3b8cbe89f85f91e70ef299720bc51e2594663f89457029bad5be24
+EBUILD pooch-1.6.0.ebuild 1495 BLAKE2B 0fadd08a86402702e04c0b33ddc02eac10fa29feafa7241a3524abaeb188b3df7108554f258a114265e60ec15499ed715a3cfaa87cd7bcc766b8fd9321ecb219 SHA512 17b912b302df458ad36d0fe4127a152fbd50c95c70b663276584fe5ecb653aa0a39092b1c6417cadc4370fa21f5d12d4bb107413710a57e7899736a0d7ed234c
 MISC metadata.xml 684 BLAKE2B b6cd1db5a31f316800c9c5e15e11c858bebc81b7c38ced227e7f54a5a0386462fa9a92bb8f177d9df0d3fea00775dced1e2eebbb1622fededdac87ce40db21e7 SHA512 a96adfa4b8996e2685f7d5ea8ab6936fcc795a3f517da8ec14e885c08b2ae1f6d950ea9314e8aa6a4b2a4b436a23d1e98a6d56b5ae0c633bffc4fbeaca4058a4
diff --git a/dev-python/pooch/pooch-1.6.0.ebuild b/dev-python/pooch/pooch-1.6.0.ebuild
index 6129c117f0e9..ef37165d57a1 100644
--- a/dev-python/pooch/pooch-1.6.0.ebuild
+++ b/dev-python/pooch/pooch-1.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index ec1bf08da84a..c6031d4b27d3 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,4 +1,6 @@
 AUX pycryptodome-3.10.1-system-libtomcrypt.patch 1729 BLAKE2B 57a2022ef17e0b86e98b085336f5ce815304e326a5a2bd5cc8ff5d33b6efba440505767517b79c2f0bba39ab33f04d7434a3f0ee529b880ff7552aee2805dab5 SHA512 d53677c0ad96f161f9aed14b8f353a8cc12c92f31de9733789f9c4151710376d33e974fd611b763de94c631796d7a57cd8787656e3c1e985696e20537b34760e
 DIST pycryptodome-3.16.0.gh.tar.gz 16548063 BLAKE2B 4adf1c3027fe593e9a01eb0ea3da1f81ddcedd731a284a3f98dd02f07ba9eaa80e906bbcea1432fe64f08f0857033cfdbe43acd415fb3081718a301fbbb5ca16 SHA512 945c5bda213a08ba12a0ace8e4bf76730461f8dfce94fa426a97dfab846234ea06e121b176ae823d0f7da9316de50aafde6507a2f17efec4d4a0629d4d68d870
+DIST pycryptodome-3.17.0.gh.tar.gz 16714317 BLAKE2B a7a96ba4d10078ba4d9bc02b384c982ad7307065fd6c9118def43bebc073eccdfc11a766742e5d0207e9cce32aca2fe3da51f8a59964de8c15db6808cc2aae03 SHA512 c0a0754c0dd1d8138e8dd27c034e3f3469237eb5f205d86d0c5e2377fd7672c6ed0df9717292a73d380daaabe88c3be80b575ca1149f4c70f08d82aed0d4b39c
 EBUILD pycryptodome-3.16.0.ebuild 1327 BLAKE2B f8e910124172090a4e1caf38f7b912c297a1c6091e928884b9793a9088c91a6b0aaef4f2d044260093a921cce6cba60847adb0578cbcde36e3232bcb9141c23a SHA512 f9ed74d7f5eee27f08c657e5dbba5284068e9699350b3c156125a5bed1d8c612fe5ec86e9fb71b9a42b376f88655c171802a437b95e8a3f00464c2624ffe4954
+EBUILD pycryptodome-3.17.0.ebuild 1334 BLAKE2B 74e1e6a5706928e23719c489a0920211472da8fb16ad5380a6df45184d9639f6cf4f23a008417c78bea1c75eb6c01fde3db3df5e2d06730d7dd844ab79c826fd SHA512 ad36035952a00a4847aeba0cffee2985295b8b64d29a8eee772bced8fb913db4f37ae5f8abad692fb7a25680edac22d652c0908735913e10d220c0ede222f7da
 MISC metadata.xml 386 BLAKE2B 1ec04c0cb752414f063177e637f1fc3e3c401db0c1f245cb33a3690e25597098b25fb2cd5f3ab99838a8bf8339906e2b23e325af5c7248fd880563c872c6fb60 SHA512 f19e2537c5a985389182860eaa45ae68a37ef1167c4b76b452513987fae6fcfb3534d102a079a003770372bbdb4f1997460c982b355f76d09f2387996e18091b
diff --git a/dev-python/pycryptodome/pycryptodome-3.17.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.17.0.ebuild
new file mode 100644
index 000000000000..0991832e809c
--- /dev/null
+++ b/dev-python/pycryptodome/pycryptodome-3.17.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A self-contained cryptographic library for Python"
+HOMEPAGE="
+	https://www.pycryptodome.org/
+	https://github.com/Legrandin/pycryptodome/
+	https://pypi.org/project/pycryptodome/
+"
+SRC_URI="
+	https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD-2 Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="
+	dev-libs/gmp:0=
+	>=dev-libs/libtomcrypt-1.18.2-r1:=
+"
+BDEPEND="
+	virtual/python-cffi[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	${BDEPEND}
+	!dev-python/pycrypto
+"
+
+PATCHES=(
+	"${FILESDIR}/pycryptodome-3.10.1-system-libtomcrypt.patch"
+)
+
+python_prepare_all() {
+	# make sure we're unbundling it correctly
+	rm -r src/libtom || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTHONPATH=${S}/test_vectors:${PYTHONPATH}
+	"${EPYTHON}" - <<-EOF || die
+		import sys
+		from Crypto import SelfTest
+		SelfTest.run(verbosity=2, stream=sys.stdout)
+	EOF
+}
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 83f2a61a786a..2e4cae6efb3c 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,5 +1,3 @@
-DIST Pygments-2.13.0.tar.gz 4324285 BLAKE2B 6edbce4827684baf61c571fe4d900fd8d1850c49ed9a2ec4bf674757b17efc3d933145f0ccb743d5f713887dff95abce58d38ceafb4d5b033d46afbf5645c6fe SHA512 d492acf112423fa997f35d6d3cae18b89bf11619c696879c6df49697dca933b6d54d7cb22907e06812e0a562f03e8ed5ccefde5247bc1c51cf2d3d69e7d65422
 DIST Pygments-2.14.0.tar.gz 4434562 BLAKE2B a3050bae96a8ae044f803e7964b5dede7a73b04f04f6af9d4b9e4d24e3ae0185138d0d68801ee5ac81cdaf74e50c7fea303913470c23182adb30ff2c08c332a8 SHA512 51416a8e2a8d0288cbbf6fd81e6870ffe9d999da255c43d0f870eb5cb4d01660416d136d39fad38b76c4bace3c3aa648fb306519e85e340545a87fc657aaeb15
-EBUILD pygments-2.13.0.ebuild 920 BLAKE2B fccfde952445c0d5a992f7d9ba9259510105fdd64f014a441a1ef72503c6d7bb4178df35a28b2046325ccd9f18342a7db3e491ee8b12f2310479e53bb240f09c SHA512 7edcaba7ff346f4a1869adfe2724e2b5afbf567a24a5e466f04240b08b83ed0e1a3bb18217f35e111fb12f80f540f1a9facd71a26d6ba1a6f327090260c2b4f2
-EBUILD pygments-2.14.0.ebuild 930 BLAKE2B d174650cbb11a2dbb8712487b8e6f9bf5937b119e27e4dd82fa08eeee1525deb8618a9f74a9042ab409d8af69f8b9d8db14b451ab007e87f9b06073e407d79cb SHA512 44f53c84130a0b59fb8613679ed15373e1d2557a0737935624fb26c1da95aa506c84adbd155bc39d163a958587f2d553ee118f61e8ad889769eca8d5aa81df44
+EBUILD pygments-2.14.0.ebuild 922 BLAKE2B 92831a3a75b905736fd926a6183919e048d86fb3b81de809c79e2566fb63ce21a7b13345fe48789530eceb67bc60f1cf28a4a8ac8fabec70f7d4bc517decd548 SHA512 5c8467744d2becb7abb9f04afba0adf815e854bdcf606d9d1ffebffcd84c4ea101da5881ea1c2586a8aa4015e8cda27196fbfc3728da1fd2ad8933e94eb86871
 MISC metadata.xml 618 BLAKE2B fbe7a30ff157e4e13592f96ef8a8b9be60ef2f8e72c08baa56dcca027dde82715b78b3b670ef29190d88dbb582f5cc5fdf9aa2547db5d714c666c28020b54def SHA512 860f398e047e516a8ea4d7fd4e900f1c8efed92422c304e305dc16df9e536ce7be7e06407f93caca0d47f6f929eaa66b2e56acd25105d4f232b841eaca381eb6
diff --git a/dev-python/pygments/pygments-2.13.0.ebuild b/dev-python/pygments/pygments-2.13.0.ebuild
deleted file mode 100644
index 43850c3e2bdc..000000000000
--- a/dev-python/pygments/pygments-2.13.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 bash-completion-r1
-
-MY_P=${P^}
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="
-	https://pygments.org/
-	https://github.com/pygments/pygments/
-	https://pypi.org/project/Pygments/
-"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/wcag-contrast-ratio[${PYTHON_USEDEP}]
-		virtual/ttf-fonts
-	)
-"
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-	newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pygments/pygments-2.14.0.ebuild b/dev-python/pygments/pygments-2.14.0.ebuild
index 687a6de7a06c..8cb3ab44f8a8 100644
--- a/dev-python/pygments/pygments-2.14.0.ebuild
+++ b/dev-python/pygments/pygments-2.14.0.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 04c1ce8f56cd..4afe355bb6a5 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,7 +1,3 @@
-DIST pymdown-extensions-9.9.1.gh.tar.gz 1017213 BLAKE2B ba445aa93f044a0df91f99c362bbef0dbdc15c4edfa18e938c8e55398c4b8844a1124d48c36789a7b190350701ce685c7b6a6c04bb220ad1255417ca1526b60c SHA512 082cb6ed83f48495a01269be613a77f6fce75e297c136d1b17edd07cbdd11e7ed148b6a3a8d90c8bcfe62ce89e260762e0bdccc7e68c53f233c68a3e00b21bc5
 DIST pymdown-extensions-9.9.2.gh.tar.gz 1017219 BLAKE2B d41f0863654c3d4aa6a947f5fef9d0029368e4a990f48a6997ecd1a0196a6b70198a698a22bfe536217bc001b4d21b69b2d5e3b479616825787648ef33ad1a9b SHA512 7f89f527f4d28ee31bf74dfd2343509592d287e1196e8a5045bbeaa5f2a038defc36e5b52ed53064f6cc797534032ed7a9e733070ff68db099e41614b07e417c
-DIST pymdown-extensions-9.9.gh.tar.gz 1013192 BLAKE2B 51b9baf40f8a40f3553529f0670a895d141b3b92c2b5a66b215e8551246c20ba7b96891714b2012a005056b1534d72bb0cc644cc719b230ae1f3bb03e2258203 SHA512 000ca793d891abdbeac3c9902c25d842d5ed2c209a0e32deb5cdab41f2019dc85e0be41abdbecc369b4def1291d30e4bf9a71e86d522f45d629423b4d42c6d8b
-EBUILD pymdown-extensions-9.9.1.ebuild 1335 BLAKE2B eb55f5f4bb69d78f3f56add722f70044d82747a4fe501d06e1f2b091a957a274d0b8e2916bf8123bc0b2f9f5e111ef7567c0e0840d29de4ce9199b31bf9de125 SHA512 f48c9c57a856194aa4b4e1927f68c4f6bf40b832189d8e7c4199330c91286d785ff3c171f74d1d6723b247480f4344ed8d81c4ade1dc38e8d6c25a0ed7fe16b6
-EBUILD pymdown-extensions-9.9.2.ebuild 1335 BLAKE2B eb55f5f4bb69d78f3f56add722f70044d82747a4fe501d06e1f2b091a957a274d0b8e2916bf8123bc0b2f9f5e111ef7567c0e0840d29de4ce9199b31bf9de125 SHA512 f48c9c57a856194aa4b4e1927f68c4f6bf40b832189d8e7c4199330c91286d785ff3c171f74d1d6723b247480f4344ed8d81c4ade1dc38e8d6c25a0ed7fe16b6
-EBUILD pymdown-extensions-9.9.ebuild 1315 BLAKE2B f88045948e60dee821648f066fb61ecb463364b36d236456a2b57b69484949ab7333b580b766d7a00d479688f0a843d66ed2b7046f9e747f1913bd506915aae5 SHA512 6d0697bae09c6cc0e1fe89266a307dc768b8f5981ff571f298e7c1ed4ff5644ddb9f9bd28a443b8bd5443c78da13b56e56dd355f26af0face9e953287586d63b
+EBUILD pymdown-extensions-9.9.2.ebuild 1333 BLAKE2B c679bfd7b9bfcea6bf72d2638d6fde45d0a0e9e43ad2927de10cd42f5cdb8fca0eaaee17f402613cf8862e6c0aa4d6b3846dfa3bd6a2bede9cd6ab5d7888d2f7 SHA512 c24289b7b48bddac5cbd99205bace74a1a413e8bf50ea8e64e96b715e8e4e374aca2684693c89cdb4e0017c8c079506aa802503590bb286910ebd820e3026178
 MISC metadata.xml 536 BLAKE2B f417ab2132b06eadbf1785654080084c4ef694f983e223ade83d5c77213e4443203a498a168efd68e4a3b1cccbe019c5b88716ac851719b9197deba9d2fd5411 SHA512 51304b48f9e296abea376be300053e041ea331f93e1ec7a2a3cdf10eea0ed6e9b8f04cdcbbed7920b46c60d5f6ce9337e3e25635516871d7b080eb54bfa16f57
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.9.1.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.9.1.ebuild
deleted file mode 100644
index 2fc24c94f031..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.9.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pymdown-lexers
-	dev-python/pyspelling
-"
-DOCS_INITIALIZE_GIT=1
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-SRC_URI="
-	https://github.com/facelessuser/pymdown-extensions/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile_all() {
-	default
-	# We need to do this manually instead of relying on docs_compile
-	# https://bytemeta.vip/repo/facelessuser/pymdown-extensions/issues/1446
-	# https://bugs.gentoo.org/859637
-	if use doc; then
-		python -m mkdocs build || die "Failed to make docs"
-		# Colliding files found by ecompress:
-		rm site/sitemap.xml.gz || die
-		HTML_DOCS=( "site/." )
-	fi
-}
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.9.2.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.9.2.ebuild
index 2fc24c94f031..baaaf849976c 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.9.2.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-9.9.2.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+KEYWORDS="amd64 ~ppc ~riscv x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.9.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.9.ebuild
deleted file mode 100644
index c5cc325a6531..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.9.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pymdown-lexers
-	dev-python/pyspelling
-"
-DOCS_INITIALIZE_GIT=1
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-SRC_URI="
-	https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile_all() {
-	default
-	# We need to do this manually instead of relying on docs_compile
-	# https://bytemeta.vip/repo/facelessuser/pymdown-extensions/issues/1446
-	# https://bugs.gentoo.org/859637
-	if use doc; then
-		python -m mkdocs build || die "Failed to make docs"
-		# Colliding files found by ecompress:
-		rm site/sitemap.xml.gz || die
-		HTML_DOCS=( "site/." )
-	fi
-}
diff --git a/dev-python/pyside2-tools/Manifest b/dev-python/pyside2-tools/Manifest
index 8811e92a1b21..3b4ab0bb975b 100644
--- a/dev-python/pyside2-tools/Manifest
+++ b/dev-python/pyside2-tools/Manifest
@@ -1,8 +1,6 @@
 AUX pyside2-tools-5.15.1-dont-install-tools.patch 1782 BLAKE2B a9a1c3cb8d1e6feabbc752bb4bf0af30b645736b9895fe96063dc4a9d5668866523e567f723693b17c6da4101d28713cfa6ad8adadb78e6bb99756d7c69244a2 SHA512 c8b17db89f42a52f4191dda953d7228eafcafd6afb6d7b70527cef090ffd1f073970010a817bede941de10b4e40e41d35fb99b74091baeea6d237c08eb7f225f
-DIST pyside-setup-opensource-src-5.15.6.tar.xz 3580388 BLAKE2B 8a3b15d073bcbb0c6734f500ca906e56387cb8fc4bfcfd996304d71b54edd5f4568976049519ed26aa718bee9e43f59a0c4ef53837d5a341219b991a8527a800 SHA512 99a0c1a05e722cbf33128cf25742e61b92e151fdc05b79db9bafe778e024a0c6fc2886ee3d0b923ff681c55916f5c0eea4197f174432587fd662fba4390b26f4
 DIST pyside-setup-opensource-src-5.15.7.tar.xz 3581144 BLAKE2B 95b5720a5273c96b00bdf86b36734970991a29cf0db1e6fb2c00d7e671fbc4459b4434abc91a8a47ec5d8ba694bcdae5b57a52448908fdca25c348f9ee2b6c81 SHA512 9c551b47581e4f2671c4378f1a2c0d9e565b08edee74244a7704a2c94eef1e1041d23f0e388c07bdd61067e986340907cf80f4527257a9a706f7f07c497834c6
 DIST pyside-setup-opensource-src-5.15.8.tar.xz 3582256 BLAKE2B eef6668c612c39eac4ea29db4eee0cc6eef72034babaa14525ca63cf6e02695df27bf8a6764110c4bcc77f55c7e9fb531074916a45d7ea324265e50d9a60d592 SHA512 78e19a8e8fa413bb784f16847d5774e4362409a2bd83567177b83f1391c37305d373155fb95ea569c6c483175e62a0d3f5d91a2fd5dae85d48c8047d242b9e22
-EBUILD pyside2-tools-5.15.6.ebuild 1654 BLAKE2B cc13386c1aa638361f3e17b71d9276fd5d4f03cb9750f5b30f9cbf17bad1db233add5acf57a390fc7594dc1fbcf966ff0413ad3500b83c0aabaeea5a0db9e073 SHA512 b081905c3d0b7655b57b2923550d92b7f61111bd051fcf80e03b85a6645dee051d69e22894353ad3e96700f1ce1e353b769133e29ef571b707707bbe37936590
-EBUILD pyside2-tools-5.15.7.ebuild 1654 BLAKE2B 171ee43cb5228b8b6c86d5f57b5a2fefee72e152ccdc4ea24f45aa2b9595540285f217aeaef764b055e8e4a258779897dbbfd5c50ad96cad3e5959595cde83b3 SHA512 c3a9ff5f33d1f81d1f574422cd004a73bd40d1aba09523fe4217ecbee826cef5f56ef2db7459d5aad523273bf21a08265c410b81f28dc9797a5bdb267e30bce6
+EBUILD pyside2-tools-5.15.7.ebuild 1653 BLAKE2B adbbbd888e4785543ae175f285f32b34a6d392b6d8f85ef9576968a700cb7284859e13f3b4b75e6e77a8544676ba0779870bab3c33f8ae9f66bad285dcb2a6f2 SHA512 6016c3ab4144ea89672e8981a337ea8a83f892ad5b713b6a79d2a08bf1137de240ad9193b8d1a07b9ccbfd83587f0304579e2fe308d158cea065f1700fb160dc
 EBUILD pyside2-tools-5.15.8.ebuild 1656 BLAKE2B 473740bc6392674185a1ce05176cd37d7a534a5ca4cf6418587d8297f0598c27ddcb823f774ca5ce1fa89cd393e7ebdce572596baa59275f250576da2b23689b SHA512 a3bac308f16fdcb61116aafdea5d74894e93cd62ffe041acbe2a2e7125dff3924f30579a54f45c94e8f0e20c1ba7f178583948d6e3d94fc5ce9b2a12ca23e7ca
 MISC metadata.xml 512 BLAKE2B e06bacf79750f6cc22b41ade8840a01636793100a85cc469c19af1b4273ef33adb3dec755947057a892e88de4ac68e665fa0ccb265457dd09a502964bd991749 SHA512 d201e34b2d73fb308c6b5f14b2d0d292b453b5ef05c820efe429fcfa7259b23f17bc015c08b8f938a2df75f5b654cc1357632a786abfb555479e3f172feee3fd
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.6.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.6.ebuild
deleted file mode 100644
index 50c6f5e04b3f..000000000000
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{9..11} )
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake python-r1
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="PySide development tools (pyside2-lupdate with support for Python)"
-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/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/pyside2-${PV}[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-# the tools conflict with tools from QT
-PATCHES=(
-	"${FILESDIR}/${PN}-5.15.1-dont-install-tools.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	python_copy_sources
-}
-
-src_configure() {
-	# The tests are only related to the tools that we don't install
-	local mycmakeargs=(
-		-DBUILD_TESTS=OFF
-	)
-
-	pyside-tools_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-		)
-		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure
-	}
-
-	python_foreach_impl pyside-tools_configure
-}
-
-src_compile() {
-	pyside-tools_compile() {
-		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_compile
-	}
-
-	python_foreach_impl pyside-tools_compile
-}
-
-src_install() {
-	pyside-tools_install() {
-		python_doexe "${BUILD_DIR}/pylupdate/pyside2-lupdate"
-	}
-
-	python_foreach_impl pyside-tools_install
-
-	doman pylupdate/pyside2-lupdate.1
-	einstalldocs
-}
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.7.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.7.ebuild
index 2f7089c3147a..bc841956419f 100644
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.7.ebuild
+++ b/dev-python/pyside2-tools/pyside2-tools-5.15.7.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}/sources/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest
index ffaa2d46bc88..ff9a05259306 100644
--- a/dev-python/pyside2/Manifest
+++ b/dev-python/pyside2/Manifest
@@ -1,10 +1,8 @@
 AUX pyside2-5.15.2-python310.patch 508 BLAKE2B bdfc33975d1dd0c9eb73d1bae3ec2aff8c1ab1eace10dbde18b467c451605ef5e8c278965043d3cf19dfa8dc80f3fe4bdc1caadd15119303c3e134e364ed5098 SHA512 69a8691d452472f3ae8a58eadd1c1d69cef186192f9fe8311ae65419c94a9efc0331e9446b97f688777f3d5c7ef5a0100bed2e4ce3956b2a4aacfad0b95c1c75
 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.6.tar.xz 3580388 BLAKE2B 8a3b15d073bcbb0c6734f500ca906e56387cb8fc4bfcfd996304d71b54edd5f4568976049519ed26aa718bee9e43f59a0c4ef53837d5a341219b991a8527a800 SHA512 99a0c1a05e722cbf33128cf25742e61b92e151fdc05b79db9bafe778e024a0c6fc2886ee3d0b923ff681c55916f5c0eea4197f174432587fd662fba4390b26f4
 DIST pyside-setup-opensource-src-5.15.7.tar.xz 3581144 BLAKE2B 95b5720a5273c96b00bdf86b36734970991a29cf0db1e6fb2c00d7e671fbc4459b4434abc91a8a47ec5d8ba694bcdae5b57a52448908fdca25c348f9ee2b6c81 SHA512 9c551b47581e4f2671c4378f1a2c0d9e565b08edee74244a7704a2c94eef1e1041d23f0e388c07bdd61067e986340907cf80f4527257a9a706f7f07c497834c6
 DIST pyside-setup-opensource-src-5.15.8.tar.xz 3582256 BLAKE2B eef6668c612c39eac4ea29db4eee0cc6eef72034babaa14525ca63cf6e02695df27bf8a6764110c4bcc77f55c7e9fb531074916a45d7ea324265e50d9a60d592 SHA512 78e19a8e8fa413bb784f16847d5774e4362409a2bd83567177b83f1391c37305d373155fb95ea569c6c483175e62a0d3f5d91a2fd5dae85d48c8047d242b9e22
-EBUILD pyside2-5.15.6.ebuild 9114 BLAKE2B e9ec3dc7eb0c4ac50bc6d99346303de14303d32835b0075cf6aa89e6d6cf78257553f01fa8dc8d58ec4f7bcdbe4ff5ccdf4c6f27fd3c01ee9f1b036ef3e446d2 SHA512 1c3b03eb304ce9f06313c0ea379787d4d34b4f4a464f8390dd1b5f00d259eea78c5ac81747d6ee62def695d36b5b27127cd2491b97b3a91100c57371a950664c
-EBUILD pyside2-5.15.7.ebuild 9268 BLAKE2B 472c30d8ae9fc627554d07ca25fb39c94763e6c83c776a096c7a096439e873549cd636a6a3e6a898924c827edfec1bd2270929dbe6cd5891edf94a3766ba826b SHA512 532239c61ad98c2ab1627d6d6c0631d0230c3536106373078737a940c76c32129d3d4180358d83484ddd9cafe13cb824037b6150c576a063ebf711a9e9bf15b1
+EBUILD pyside2-5.15.7.ebuild 9267 BLAKE2B 6066eb7e94f05e9a83d87c57f6489e23cfca153a7c6dd13f3ea08184a2de5d7d7e0cd6d62be95fde5304cd2ebdbe328d12ebc0375d03a697d26297a694857555 SHA512 612ef6cb7d183e52fe67f0d209bf12efc2b9182eaa46da58fcc9586b1d96c36403d1b457293516a54ffe16f837ed3ccb3b3e87fb7c95213de709910c34f16ddf
 EBUILD pyside2-5.15.8.ebuild 9270 BLAKE2B 6cc61284bc3d90f5dbbd9169bed68e82362d0b6f179f2ab9463d7be1b44c46b71851b3ab344c223c52d99a985097481f668cee4ac6ab01c76d8c081575e5548c SHA512 6659e07a2f28fb56bbbb71827d93f0bef5c83ded318a5687a8668a18517aa08f9f7ce1eb4d179bc2be8737e054b1615c9c3f098e060f2330449361aad10b8d96
 MISC metadata.xml 2255 BLAKE2B 00982d17109b327ce063f5ba53474603cc73ffb013268ec9f6b751a73792a790f56de285291e70ad12147c27ba97b516be1318df312483d67d72509f8e8d8655 SHA512 830f9510f5e141422cbbab356d34a34b631f948eea14bcc96badbef65ce10f56c648748edc4ddf06be77b1c597a7d12d4552bde122937eb4cda01b304a3193c7
diff --git a/dev-python/pyside2/pyside2-5.15.6.ebuild b/dev-python/pyside2/pyside2-5.15.6.ebuild
deleted file mode 100644
index 49525697e10e..000000000000
--- a/dev-python/pyside2/pyside2-5.15.6.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{9..11} )
-
-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.
-# Shall we allow essential modules to be disabled? They are:
-# (core), gui, widgets, printsupport, sql, network, testlib, concurrent,
-# x11extras (for X)
-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? ( gui widgets )
-	datavis? ( gui )
-	designer? ( widgets xml )
-	gles2-only? ( gui )
-	help? ( widgets )
-	location? ( positioning )
-	multimedia? ( gui network widgets )
-	printsupport? ( widgets )
-	qml? ( gui network )
-	quick? ( gui network qml widgets )
-	scripttools? ( gui script widgets )
-	speech? ( multimedia )
-	sql? ( widgets )
-	svg? ( widgets )
-	testlib? ( widgets )
-	webengine? (
-		network
-		widgets? ( gui 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[gles2-only=]
-	dev-qt/qtserialport:5
-	3d? ( >=dev-qt/qt3d-${QT_PV}[qml?,gles2-only=] )
-	charts? ( >=dev-qt/qtcharts-${QT_PV}[qml?] )
-	concurrent? ( >=dev-qt/qtconcurrent-${QT_PV} )
-	datavis? ( >=dev-qt/qtdatavis3d-${QT_PV}[qml?,gles2-only=] )
-	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?,gles2-only=,widgets?] )
-	network? ( >=dev-qt/qtnetwork-${QT_PV} )
-	positioning? ( >=dev-qt/qtpositioning-${QT_PV}[qml?] )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV}[gles2-only=] )
-	qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	quick? (
-		>=dev-qt/qtdeclarative-${QT_PV}[widgets?]
-		>=dev-qt/qtquickcontrols2-${QT_PV}[widgets?]
-	)
-	script? ( >=dev-qt/qtscript-${QT_PV}[scripttools?] )
-	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}[gles2-only=] )
-	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}/${PN}-5.15.2-python310.patch"
-	"${FILESDIR}/${PN}-5.15.2-python311.patch"
-	"${FILESDIR}/${PN}-5.15.2-python311-fixups.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_Qt5QuickControls2=$(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-${CMAKE_BUILD_TYPE,,}.cmake" || die
-}
diff --git a/dev-python/pyside2/pyside2-5.15.7.ebuild b/dev-python/pyside2/pyside2-5.15.7.ebuild
index 8d2fd38e0aaf..0ae91fd8534d 100644
--- a/dev-python/pyside2/pyside2-5.15.7.ebuild
+++ b/dev-python/pyside2/pyside2-5.15.7.ebuild
@@ -37,7 +37,7 @@ S="${WORKDIR}/${MY_P}/sources/pyside2"
 # x11extras (for X)
 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/pytest-localftpserver/Manifest b/dev-python/pytest-localftpserver/Manifest
index 1eff1ad76923..262184b51791 100644
--- a/dev-python/pytest-localftpserver/Manifest
+++ b/dev-python/pytest-localftpserver/Manifest
@@ -1,3 +1,3 @@
 DIST pytest_localftpserver-1.1.4.tar.gz 44573 BLAKE2B 8c5bd0065d36d7c312944ce41747db141c90b7cbad134b6d3ce387cc9ef3f536882b27d1d0c23c67fb9e75546e62d0b1434faaa577c61f07a9915bf146b6a9e2 SHA512 67f7ca9d212f187f2e91d274523390438e07c52dc048b832e65012ef49d2843002806db1fbf2eba560bef671a0ef541bfb44f6b8226fe5d9d40acd08d53c4f48
-EBUILD pytest-localftpserver-1.1.4.ebuild 846 BLAKE2B 07bb2851add56055e3754890526631d87032d7e33cc991d0b52875a86207b41c284ff99271e2f81678c60761c7db06f233b43c91b792339d3dab2aefc844b76e SHA512 63dd9ffcb6e76e4234db815b2de55aadf691c6397ab35a3e3102c85bdad5458023f09bc4670c6ca38d1b3cf862ad81a35de2da13a92c8b268e946ab8b2db2e7a
+EBUILD pytest-localftpserver-1.1.4.ebuild 842 BLAKE2B 53b3b14384cdbd765fbda91e06590f697bcae19769b9320eae3f8ff3379f1a6ed8fed42350329c5ee90f058eb31720649e2f5532b98af4779a17b2388d537a84 SHA512 1c58e763786a864233a379d459a72ad6816fc1570410b571166049c3766ae6d451bfe3d9b4e6762e2f857cc5d30491a812687d96c072733197bfbc4cc755c619
 MISC metadata.xml 569 BLAKE2B 5a2afdbd9c95515e83ac146f95c1c1da36e556402c625151fb52bf067e58d4178111e8fb0457113cc292b0f480ccb9b1d4026f9bcb212db57711b4c08e3db658 SHA512 cdcf50653ca1020b258d9c38e524d6a27c9e287cdb286f36d568dd2fc1b07dad241df07d0fcc2466d341d11d3d0ade5ddb033b026eba744500cc2931da44064d
diff --git a/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.4.ebuild b/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.4.ebuild
index fa5376406ab8..39da1701843b 100644
--- a/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.4.ebuild
+++ b/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="dev-python/pyftpdlib[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 0e5899e3093f..c996e8418954 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,5 +1,7 @@
 DIST rich-13.2.0.gh.tar.gz 15066145 BLAKE2B 1a767de5d3b872e07e74374d956b4a3d1b6916a98846f98208f8a2e14a1c12f18fe7d85919f0b2104228fd74d25e640d446fae416a70254f7241fa726fb82802 SHA512 a3df2d3bdb35d25cad867cafad726a081d7fcba45e0b4ea2ec9aa17c28fc4d2c22f4ba1c7e3ef16fea7137c052875632b8d774895082d40804dc929021c0a2ef
 DIST rich-13.3.0.gh.tar.gz 15055287 BLAKE2B bf314606d2da55d1c20d01083c21edc6f10590431152d360f1a5731fc543d47360faabd5141d3bf9b46793145a08bd79c971974ae85956df8821a33afa45bc50 SHA512 1ad28c6ea505ad4088ccab8a034b5ffa49f9ad59e7b60fe27dbcb8fec485f9f695d25dde83b102021c24ff149fdd9e981a1009bb82eb545250824436bd818d62
+DIST rich-13.3.1.gh.tar.gz 15055408 BLAKE2B 79713ee232bc1c990c1432f7966cffd69b8ffef9ad8a562339d62b03fbab4620040c5ae1d735d3084d71f32581955f0ea5fad113ff992dcddb2dd0e20465484e SHA512 a3b5bef2183bbb888f0ef5a90b35fdb1ed7ef6103dfea01a5efa441ce8d1769b53d7888684e3b5cd76bcacf3768835d918d9fbb7801eab57c04d1412f129f6bb
 EBUILD rich-13.2.0.ebuild 1386 BLAKE2B 9304363e641c4490e8fe893ec8b3fbe9167eee0411e04922310d3743a8283587b5fac99b687898e31431873ba4bb108f3d24b7c71b8c44db02bc436755036c9c SHA512 e80dc615cc64f0528cbee4882b262a59ac3c7e584928f14b4914d7afb09be98f54ef56b7e68f1db24f7136b3c92be8c1fa9c668d6d2d30784e42f070e42bb1a5
 EBUILD rich-13.3.0.ebuild 1403 BLAKE2B ac19050432c53732f51c53a1e4faf6d0bbc7f2921fcecd11129b5159bcda9c11c7f25d3556da60d999da492c5bf49c3cda29645ebbf4fbc700ee3ab0daaa5578 SHA512 69ef77591541942924deb066e636f2072b5ec3018ac59a2be898d50892be5b5e6660eb827f93dd9ad84910da94f1d72cc5f21c0f3580ec052f492ffa80efea30
+EBUILD rich-13.3.1.ebuild 1403 BLAKE2B ac19050432c53732f51c53a1e4faf6d0bbc7f2921fcecd11129b5159bcda9c11c7f25d3556da60d999da492c5bf49c3cda29645ebbf4fbc700ee3ab0daaa5578 SHA512 69ef77591541942924deb066e636f2072b5ec3018ac59a2be898d50892be5b5e6660eb827f93dd9ad84910da94f1d72cc5f21c0f3580ec052f492ffa80efea30
 MISC metadata.xml 387 BLAKE2B 049491e034ba233f33c76dc5e3f1b887ba5d2da9d65b09bda51a7cf4eb30a9c66f3ddf714f52407a73e51da78523084064bccd4fc687e0bc0fc2b32dbb4c513b SHA512 448ce879331748e3166f670981a27ee5c3ef20b51af442ccc684cb6514c0d6a0d4e433a8bc1ddb3bdf68c734bac013c1ba04d38adf90644b062231ab1c1d2c0b
diff --git a/dev-python/rich/rich-13.3.1.ebuild b/dev-python/rich/rich-13.3.1.ebuild
new file mode 100644
index 000000000000..55b97b52578e
--- /dev/null
+++ b/dev-python/rich/rich-13.3.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
+HOMEPAGE="
+	https://github.com/Textualize/rich/
+	https://pypi.org/project/rich/
+"
+SRC_URI="
+	https://github.com/Textualize/rich/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	<dev-python/markdown-it-py-3[${PYTHON_USEDEP}]
+	>=dev-python/markdown-it-py-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.14.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x COLUMNS=80
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
+		tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39
+		# pygments?
+		tests/test_syntax.py::test_python_render_simple_indent_guides
+		tests/test_syntax.py::test_python_render_line_range_indent_guides
+	)
+	epytest -p no:pytest-qt
+}
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index eeedc8bf8131..4eb0616a976f 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -5,7 +5,7 @@ DIST scipy-1.9.3.tar.gz 42075414 BLAKE2B f19e829d26a5673cccb69bce43a9142637f42a9
 DIST scipy-html-1.10.0.zip 65656379 BLAKE2B 4a4f1e428bc2355f32be05e35634e5aaccb0938f170ee247931a892cf7ab59b3a9ab952060e98936e153bed752c29c01ed34eba02188b3514de7607285c01d08 SHA512 3bda526f209905355b3f87ba1529b9f45c3580ce7d9b80a63931871dab1542347f243c9f688854cb67d575e9a645ec89105775accdc746fc290113f28978b73b
 DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d26b8e86c1558e427a715093f5a29ced3847ab6ecfe88ce1017664f36ac3e9fa9bbf72ede7e0fd3812b5f41fe933 SHA512 95153dc1f404aa64898a700c94c0deea3ca842c3152167d0987edabcf4a8eba16b6c8e6bc38a6775a849dc621e6a21434baf53d1669b1865fa5049cffa4387ac
 DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728
-EBUILD scipy-1.10.0.ebuild 2793 BLAKE2B bd84ea9e8f7b7a1bd7031e4e269c05c11aac6c6df1c28c0620f4fe7d45474eef777e9839d0ce1eb371ab087c1745cb06954c1a6d76ce9e645b5e54f49d71f914 SHA512 493b11075b6df0b10e6791f904b9f3ce20b0371785efc18367c8609bf0b390944b0f3cbb160b6141dfa82d4be92b5e156c78cbd88c4b70f341a8801627f9836f
+EBUILD scipy-1.10.0.ebuild 2789 BLAKE2B 6b124a6b86b1e8d2581b2614f4c7d62c1de12a8c20e41ee758da74464fd8921db31baf66c93e7fc6fc57e175d3a73dec133aae99959c96222a0673c19f7d9c3c SHA512 4d6b0a20ccf73df7f39fe29c461d21606580bcf3404fe049cd6fa1876de35307ad34c0b75439e8eb4941c68161fdd101031ec3297d22b6cc8db32bfde32c70ad
 EBUILD scipy-1.9.2.ebuild 2354 BLAKE2B a4eaa4602214ab99912c0c7fd022ec6a28f15e1da3ee726d9b58b5ff9f89f2646778db383e42d3739dee738add3c701968292745146d9ecb92cf69419207abc3 SHA512 5656b4e55bfb9023138673028cad35fccb4c4e1eb6ae8c6547b2995cf3cbda04e5574c20d64d7293b7b2012aa8fb0ea647a112aa2f9058e120fb10c25c815a02
 EBUILD scipy-1.9.3.ebuild 2439 BLAKE2B ee856e2faa6a1089fd2c92c73022131c9449f9732303a3ccf1e7842adb3388caf0921047ed3cf2baa8458c703e5629220b7d5322f035d9e8db4a12af050fbacd SHA512 1d4d6e3d8926fecbbf0edfdd4f3554717c3bd2796906d83367b87cf68f867dba2a3c51acd1d6c672fbf1e3480cf4155568d6c9646dbd6a6ac6a86bb6bb5e16c5
 MISC metadata.xml 1054 BLAKE2B 490b13e1a307b1990f692d43f3bdc2bbe92e8dad809a24c9223358028eeff2e0387043383e7616df3d010d6bf669337c4c7cf57587181c2c77d93e2ef6e3b8e4 SHA512 379160f7146a8e7dbbfb7243e39f76e12399e47cf0eab632fc3e1598f5fa4482151b769d16c6f026192ac16b8fefdd363427b14decf66c7e1f6e1630444abdf7
diff --git a/dev-python/scipy/scipy-1.10.0.ebuild b/dev-python/scipy/scipy-1.10.0.ebuild
index 7b1d4ea364a6..bf013408674e 100644
--- a/dev-python/scipy/scipy-1.10.0.ebuild
+++ b/dev-python/scipy/scipy-1.10.0.ebuild
@@ -38,7 +38,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 arm ~arm64 -hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+		KEYWORDS="amd64 arm arm64 -hppa ~ppc ppc64 ~riscv ~sparc x86"
 	fi
 fi
 
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index cbf786872c0c..64ad7a7ff2c0 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -4,10 +4,8 @@ AUX shiboken2-5.15.5-python311-2.patch 2056 BLAKE2B c93be29e31b0fa6ce28a29de0dc4
 AUX shiboken2-5.15.5-python311-3.patch 2363 BLAKE2B 84521be2008dda0fc9398dac2c6e235d0d976c3219f7ecf50f28938a7cce6952ec41795c2c86d0f71ccd94210661dc22a471adb2f879a133e11a3148923fd708 SHA512 540ff5afbfebcc00f20c43993f67458013f4655c06505fdf23bc26085bd2c621863dd9c28be1a20dca299113aee828974f853b145818fdb11d59fc12d0bb8c14
 AUX shiboken2-5.15.6-fix-pyside2-compile.patch 422 BLAKE2B bdb66c4ef26fccf4b9f4bc4586fb7ffdd8dfed80bf6315a70c86882f98250e42235ff27265b6c3a4e65e8dd7b233b61201a33808985ffb50e929bc8b5deb864f SHA512 4f608eb93fb72f81a9327699b14d4451261831f5079fac12aa88ce17ac30fc846bd9b461b8f6a4780727507b388f675a116f55ef1c240ced33d941315af4d21c
 AUX shiboken2-5.15.8-py-limited-api.patch 527 BLAKE2B a27886393ff917dbf3b1318d44d998e574e87ce79dbcc694dedb2dc9da7c173c87b40eb8d6296d2f1f7d6bd3ccffa2e5ae9a11e97a2f4e436d4902b2a447513c SHA512 579b88892e05b2e313f14adebaf62e399fd3f9981955e15a762196ca405b0dccc254edfd941727f777ea97709272475c8df239991d2aa7491e200c61dd66a583
-DIST pyside-setup-opensource-src-5.15.6.tar.xz 3580388 BLAKE2B 8a3b15d073bcbb0c6734f500ca906e56387cb8fc4bfcfd996304d71b54edd5f4568976049519ed26aa718bee9e43f59a0c4ef53837d5a341219b991a8527a800 SHA512 99a0c1a05e722cbf33128cf25742e61b92e151fdc05b79db9bafe778e024a0c6fc2886ee3d0b923ff681c55916f5c0eea4197f174432587fd662fba4390b26f4
 DIST pyside-setup-opensource-src-5.15.7.tar.xz 3581144 BLAKE2B 95b5720a5273c96b00bdf86b36734970991a29cf0db1e6fb2c00d7e671fbc4459b4434abc91a8a47ec5d8ba694bcdae5b57a52448908fdca25c348f9ee2b6c81 SHA512 9c551b47581e4f2671c4378f1a2c0d9e565b08edee74244a7704a2c94eef1e1041d23f0e388c07bdd61067e986340907cf80f4527257a9a706f7f07c497834c6
 DIST pyside-setup-opensource-src-5.15.8.tar.xz 3582256 BLAKE2B eef6668c612c39eac4ea29db4eee0cc6eef72034babaa14525ca63cf6e02695df27bf8a6764110c4bcc77f55c7e9fb531074916a45d7ea324265e50d9a60d592 SHA512 78e19a8e8fa413bb784f16847d5774e4362409a2bd83567177b83f1391c37305d373155fb95ea569c6c483175e62a0d3f5d91a2fd5dae85d48c8047d242b9e22
-EBUILD shiboken2-5.15.6.ebuild 6693 BLAKE2B a0e4edb74c672a5bbfec82df08df9b19700895bb6d844c9a71a6f1683d0414c8bae705310a9642f6704d8bd68547f7b64e5ab61452c48f2a9a400e6e2b30bd56 SHA512 871dd56986d803c46820ea5537469fcbaea696c66faeaf50dda216fa83f37dab3c70a18cb4bffdb3c67c41519712712fd5a262115d880f7d96c6129998157745
-EBUILD shiboken2-5.15.7.ebuild 6691 BLAKE2B 745cb283730ef6c973703f75a7d25569ee6a729a0f0ee1ddde8a64e1714c2abaeb2443db588554685c8df52b3e321b05399ccb0dd48e133f3faf011eb1c48874 SHA512 6536bcc1f0210a8b163d65eb74e9e04dccccccae241799928b5fe281282619ce73056ac0eabad9b958e24c7eb4fa6ac34c82be8ed04a553559d7a04274aef30c
+EBUILD shiboken2-5.15.7.ebuild 6690 BLAKE2B f9e0e9abf8bfeea66d9a9575b165c1622a5594899c7ae8e7d5a7aab4529616e59bcab140dc66f5d959bf3048e913150dfca47a403ed30b7b3e9e47d6994ebac6 SHA512 9f0d279062ee045426cd34c84e526bcf02d0daeaa12a0fae27876f683844097bb1dc03e785c6193812ab1e9cf217a8998c024d5d1918c94fd111ec1543241ba5
 EBUILD shiboken2-5.15.8.ebuild 6742 BLAKE2B 2ce7b18aa89621328e2f9fd34218a02438946e8ca8c07f7c85bbaabacc0d8e52244a0f6b075083d47374947035affcca7a2a94a88482ccc22faea339d536bfd1 SHA512 b505352ac4334326d0c17874f5f1b9b14861c7c6e78f208b63f94b11a3053bb8e9b06ec5360e4a7d69e9ac0c13203bb4d8d07724a899970f6f96942b1f2fb0b2
 MISC metadata.xml 730 BLAKE2B 803b825adb9fcd4379b1e3fba57d6b1916a81ced12f3b3c7d3ddcd68a0c03e85fcf31d5b07a70deebe073f267fe93a0529f7ffb4b1a9508a2223894883044f3b SHA512 5a462077fee2bd3ac87ab79274be0a718fd9b273fca4946d2d2734cefdf5817e6b4dc478a828b3bc783c63e64a62a6662b482d61eefe57386c15f9703a57fb24
diff --git a/dev-python/shiboken2/shiboken2-5.15.6.ebuild b/dev-python/shiboken2/shiboken2-5.15.6.ebuild
deleted file mode 100644
index d0a1dd9d695e..000000000000
--- a/dev-python/shiboken2/shiboken2-5.15.6.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 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
-PYTHON_COMPAT=( python3_{9..11} )
-
-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.
-LLVM_MAX_SLOT=15
-RDEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtcore-${QT_PV}
-	<sys-devel/clang-16:=
-	<sys-devel/clang-runtime-16:=
-	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}"/${PN}-5.15.5-python311-1.patch
-	"${FILESDIR}"/${PN}-5.15.5-python311-2.patch
-	"${FILESDIR}"/${PN}-5.15.5-python311-3.patch
-	"${FILESDIR}"/${PN}-5.15.6-fix-pyside2-compile.patch
-	"${FILESDIR}"/${PN}-5.15.5-add-numpy-1.23-compatibility.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 "${LLVM_MAX_SLOT}")"
-		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-${CMAKE_BUILD_TYPE,,}.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.7.ebuild b/dev-python/shiboken2/shiboken2-5.15.7.ebuild
index 172bb540a315..ce1269accfbc 100644
--- a/dev-python/shiboken2/shiboken2-5.15.7.ebuild
+++ b/dev-python/shiboken2/shiboken2-5.15.7.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}"
author	V3n3RiX <venerix@koprulu.sector>	2023-01-28 20:52:36 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-01-28 20:52:36 +0000
commit	bdf6e70da7a28f45617c02a251bb6b3844202bc5 (patch)
tree	cf66e5dcf53b2ee6842fd3ff4d24d52aa30cfebc /dev-python
parent	d414c993cafd9e31a370c4a5aae042c710df2419 (diff)