Adding metadata

147 files changed, 1413 insertions, 2529 deletions

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 0fa4465c840c..629ab0ed5441 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,2 +1,3 @@
 DIST QtPy-2.3.1.tar.gz 56260 BLAKE2B 1b8d76879cc1f07b3633e6b25887ac4621ee3a8e9ebbcaa1f1f8c4f3fbcdae37bd5d659717bf89227d4ed6b5126554b329813aaee0b6be333c0cdc931cfb8d43 SHA512 9c738ec07e18852b67c30962fbc0ca48479eccff2a9f2ee9f4817c4ead5a8068d54aced58d632977163f180a584a9b7b2b68ea25e0577b92a262fef8eb576041
 DIST QtPy-2.4.0.tar.gz 65007 BLAKE2B d2770608d807959aaa8b0201304be1f3f112f039f8febddf62bc7cd09a04ed53dd7fd89ee782fd3bd11c5f84c8d2a8c529242c2df01d34c27d87ac1f8873017f SHA512 54be0c9b15055f9c078ff8eebd88910d718833f3d9572567076b1fc0c22d3d5c12dc2a2d7fbedb9bc8636d575775e83cb08a554a0ee45a859297501a5711b716
+DIST QtPy-2.4.1.tar.gz 65492 BLAKE2B 3816e3836c171f75fc1877984b533602c8929a791b09a1f53b14687eae7a1067e47fcae3a198d798417521a1a81829168d3af94178b28d8a3bd2c28e7d9f7865 SHA512 cb7c65cfec5aba9bdc4942b95108ac0300eac5ca8f0c984e8ea789b77fded3a1817f591d43bc45e9aa4feb3cb3da64c0d42ae67f12121a807cf7c247e7612e7d
diff --git a/dev-python/QtPy/QtPy-2.4.1.ebuild b/dev-python/QtPy/QtPy-2.4.1.ebuild
new file mode 100644
index 000000000000..0c98479e289c
--- /dev/null
+++ b/dev-python/QtPy/QtPy-2.4.1.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 virtualx pypi
+
+DESCRIPTION="Abstraction layer on top of PyQt and PySide with additional custom QWidgets"
+HOMEPAGE="
+	https://github.com/spyder-ide/qtpy/
+	https://pypi.org/project/QtPy/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+
+_IUSE_QT_MODULES="
+	designer +gui help multimedia +network opengl positioning
+	printsupport qml quick sensors serialport speech +sql svg testlib
+	webchannel webengine websockets +widgets +xml
+"
+IUSE="+pyqt5 pyqt6 pyside2 pyside6 ${_IUSE_QT_MODULES}"
+unset _IUSE_QT_MODULES
+
+REQUIRED_USE="
+	|| ( pyqt5 pyqt6 pyside2 pyside6 )
+	python_targets_python3_12? ( !pyside2 )
+"
+
+# These flags are currently *not* common to the PySide2/6 and PyQt5/6 ebuilds
+# Disable them for now, please check periodically if this is still up to date.
+# 	bluetooth? ( pyqt5/6 and pyside6 only )
+# 	dbus? ( pyqt5/6 and pyside6 only )
+#
+# 	3d? ( pyside2/6 only )
+# 	charts? ( pyside2 only )
+# 	concurrent? ( pyside2 only )
+# 	datavis? ( pyside2 only )
+# 	scxml? ( pyside2/6 only )
+#
+#	x11extras? ( pyside2 and pyqt5 only )
+#	xmlpatterns? ( pyside2 and pyqt5 only )
+#
+# location? ( pyside2/6 and pyqt5 only)
+# nfc? ( pyqt6 and pyside6 only)
+# spatialaudio? ( pyqt6 and pyside6 only)
+# pdfium? ( pyqt6 and pyside6 only)
+
+# WARNING: the obvious solution of using || for PyQt5/pyside2 is not going
+# to work. The package only checks whether PyQt5/pyside2 is installed, it does
+# not verify whether they have the necessary modules (i.e. satisfy the USE dep).
+#
+# Webengine is a special case, because PyQt5 provides this in a separate package
+# while PySide2 ships it in the same package.
+#
+# declarative/qml/quick is a special case, because PyQt5 bundles the bindings
+# for qml and quick in one flag: declarative PySide2 does not.
+#
+# The PyQt5 ebuild currently enables xml support unconditionally, the flag is
+# added anyway with a (+) to make it future proof if the ebuild were to change
+# this behaviour in the future.
+#
+# The PySide2 ebuild currently enables opengl and serialport support
+# unconditionally, the flag is added anyway with a (+) to make it future proof
+# if the ebuild were to change this behaviour in the future.
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	pyqt5? (
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/PyQt5[designer?,gui?,help?,multimedia?,network?,opengl?]
+		dev-python/PyQt5[positioning?,printsupport?,sensors?,serialport?,speech?,sql?,svg?]
+		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?,xml(+)?]
+		qml? ( dev-python/PyQt5[declarative] )
+		quick? ( dev-python/PyQt5[declarative] )
+		webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
+	)
+	pyqt6? (
+		dev-python/PyQt6[${PYTHON_USEDEP}]
+		dev-python/PyQt6[designer?,gui?,help?,multimedia?,network?,opengl?]
+		dev-python/PyQt6[positioning?,printsupport?,qml?,quick?,sensors?,serialport?,sql?]
+		dev-python/PyQt6[speech?,svg?,testlib?,webchannel?,websockets?,widgets?,xml?]
+		webengine? ( dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets?,quick?] )
+
+	)
+	pyside2? (
+		$(python_gen_cond_dep '
+			dev-python/pyside2[${PYTHON_USEDEP}]
+			dev-python/pyside2[designer?,gui?,help?,multimedia?,network?,opengl(+)?]
+			dev-python/pyside2[positioning?,printsupport?,qml?,quick?,sensors?,serialport(+)?]
+			dev-python/pyside2[speech?,sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
+			dev-python/pyside2[widgets?,xml?]
+		' python3_{10..11})
+	)
+	pyside6? (
+		dev-python/pyside6[${PYTHON_USEDEP}]
+		dev-python/pyside6[designer?,gui?,help?,multimedia?,network?,opengl?]
+		dev-python/pyside6[positioning?,printsupport?,qml?,quick?,sensors(-)?,serialport?]
+		dev-python/pyside6[speech(-)?,sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
+		dev-python/pyside6[widgets?,xml?]
+	)
+"
+
+# The QtPy testsuite skips tests for bindings that are not installed, so here we
+# ensure that everything is available and all tests are run. Note that not
+# all flags are available in PyQt5/PySide2, so some tests are still skipped.
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-qt[${PYTHON_USEDEP}]
+		pyqt5? (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+			dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location]
+			dev-python/PyQt5[multimedia,network,opengl,positioning,printsupport]
+			dev-python/PyQt5[sensors,serialport,speech(-),sql,svg,testlib,webchannel]
+			dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
+			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		)
+		pyqt6? (
+			dev-python/PyQt6[${PYTHON_USEDEP}]
+			dev-python/PyQt6[dbus,designer,gui,help,multimedia,network,nfc,opengl]
+			dev-python/PyQt6[pdfium(-),positioning,printsupport,qml,quick,quick3d,serialport]
+			dev-python/PyQt6[sensors(-),spatialaudio(-),speech(-),sql,ssl,svg,testlib,webchannel]
+			dev-python/PyQt6[websockets,widgets,xml]
+			dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets,quick]
+		)
+		pyside2? (
+			$(python_gen_cond_dep '
+				dev-python/pyside2[${PYTHON_USEDEP}]
+				dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help]
+				dev-python/pyside2[location,multimedia,network,opengl(+)]
+				dev-python/pyside2[positioning,printsupport,qml,quick,scxml]
+				dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
+				dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
+				dev-python/pyside2[xml,xmlpatterns]
+			' python3_{10..11})
+		)
+		pyside6? (
+			dev-python/pyside6[${PYTHON_USEDEP}]
+			dev-python/pyside6[3d(-),bluetooth(-),concurrent,dbus,designer,gui,help]
+			dev-python/pyside6[location(-),multimedia,network,nfc(-),opengl,positioning,pdfium(-)]
+			dev-python/pyside6[printsupport,qml,quick,quick3d,scxml(-),sensors(-)]
+			dev-python/pyside6[serialport,spatialaudio(-),speech(-),sql,svg,testlib,webchannel]
+			dev-python/pyside6[webengine,websockets,widgets,xml]
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i -e 's:--cov=qtpy --cov-report=term-missing::' pytest.ini || die
+	# Disable Qt for Python implementations that are not selected
+	if ! use pyqt5; then
+		sed -i -e '/from PyQt5.QtCore import/,/)/c\ \ \ \ \ \ \ \ raise ImportError #/' qtpy/__init__.py || die
+	fi
+	if ! use pyqt6; then
+		sed -i -e '/from PyQt6.QtCore import/,/)/c\ \ \ \ \ \ \ \ raise ImportError #/' qtpy/__init__.py || die
+	fi
+	if ! use pyside2; then
+		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+		sed -i -e "s/from PySide2.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+	if ! use pyside6; then
+		sed -i -e "s/from PySide6 import/raise ImportError #/" qtpy/__init__.py || die
+		sed -i -e "s/from PySide6.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+}
+
+python_test() {
+	# Test for each enabled Qt4Python target.
+	# Deselect the other targets, their test fails if we specify QT_API
+	# or if we have disabled their corresponding inherit in __init__.py above
+	if use pyqt5; then
+		einfo "Testing with ${EPYTHON} and QT_API=PyQt5"
+		QT_API="pyqt5" virtx epytest \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide2] \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt6] \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide6]
+	fi
+	if use pyqt6; then
+		einfo "Testing with ${EPYTHON} and QT_API=PyQt6"
+		QT_API="pyqt6" virtx epytest \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide2] \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt5] \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide6] \
+			--deselect qtpy/tests/test_qtsensors.py::test_qtsensors
+			# Qt6Sensors not yet packaged and enabled in PyQt6 ebuild
+	fi
+	if use pyside2; then
+		einfo "Testing with ${EPYTHON} and QT_API=PySide2"
+		QT_API="pyside2" virtx epytest \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt5] \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt6] \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide6]
+	fi
+	if use pyside6; then
+		einfo "Testing with ${EPYTHON} and QT_API=PySide6"
+		QT_API="pyside6" virtx epytest \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide2] \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt5] \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt6] \
+			--deselect qtpy/tests/test_qtsensors.py::test_qtsensors
+			# Qt6Sensors not yet packaged and enabled in PySide6 ebuild
+	fi
+}
+
+pkg_postinst() {
+	elog "When multiple Qt4Python targets are enabled QtPy will default to"
+	elog "the first enabled target in this order: PyQt5 PySide2 PyQt6 PySide6."
+	elog "This can be overridden with the QT_API environment variable."
+}
diff --git a/dev-python/absl-py/Manifest b/dev-python/absl-py/Manifest
index 2cba98028e09..8f1f7c9f5e40 100644
--- a/dev-python/absl-py/Manifest
+++ b/dev-python/absl-py/Manifest
@@ -1,2 +1 @@
-DIST abseil-py-1.4.0.gh.tar.gz 228096 BLAKE2B c34e6319d69976631a4b674d4f23eb0a11705c69fc1ce740eb2b570c61cc3507634d73699eb023b94fe6042c2f49eba3ec134c9c08958aca904eea3bfb8f84e7 SHA512 45cbf6f90a14a3d6e07ee0a6407d4521cac8d15340885c6ae790180c255dfea54e862ee2d806c166a28b5ce238720a7e3af25d6ffe054820588d4a0f20e1f124
 DIST abseil-py-2.0.0.gh.tar.gz 232404 BLAKE2B fc3d02b2184f6ad45ff022d80068f6ec64ec4cbdbfb9735da1309a975f634880a2c969cba9ad7bdbeec2183c058c31e8198f9396d5f937858861e42a41c40432 SHA512 1f83ee07ce4bdeed2ebc775bdf809a9998f7afba2e0322bb4ce1fbf4af8c0e638161bbd72c9222c1ae1505577c181026d5baee1c9994d4858166d015a1ffab91
diff --git a/dev-python/absl-py/absl-py-1.4.0.ebuild b/dev-python/absl-py/absl-py-1.4.0.ebuild
deleted file mode 100644
index 1c40b2cdf53d..000000000000
--- a/dev-python/absl-py/absl-py-1.4.0.ebuild
+++ /dev/null
@@ -1,79 +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_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-MY_P=abseil-py-${PV}
-DESCRIPTION="Abseil Python Common Libraries"
-HOMEPAGE="
-	https://github.com/abseil/abseil-py/
-	https://pypi.org/project/absl-py/
-"
-SRC_URI="
-	https://github.com/abseil/abseil-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	# what a nightmare... well, we could have called bazel but that would
-	# even worse
-	local helpers=(
-		absl/flags/tests/argparse_flags_test_helper.py:absl/flags/tests/argparse_flags_test_helper
-		absl/logging/tests/logging_functional_test_helper.py:absl/logging/tests/logging_functional_test_helper
-		absl/testing/tests/absltest_fail_fast_test_helper.py:absl/testing/tests/absltest_fail_fast_test_helper
-		absl/testing/tests/absltest_filtering_test_helper.py:absl/testing/tests/absltest_filtering_test_helper
-		absl/testing/tests/absltest_randomization_testcase.py:absl/testing/tests/absltest_randomization_testcase
-		absl/testing/tests/absltest_sharding_test_helper.py:absl/testing/tests/absltest_sharding_test_helper
-		absl/testing/tests/absltest_test_helper.py:absl/testing/tests/absltest_test_helper
-		absl/testing/tests/xml_reporter_helper_test.py:absl/testing/tests/xml_reporter_helper_test
-		absl/tests/app_test_helper.py:absl/tests/app_test_helper_pure_python
-	)
-
-	local x
-	for x in "${helpers[@]}"; do
-		local script=${x%:*}
-		local sym=${x#*:}
-		sed -i -e "1i#!/usr/bin/env python" "${script}" || die
-		chmod +x "${script}" || die
-		ln -s "${script##*/}" "${sym}" || die
-	done
-
-	# i don't wanna know how these pass for upstream with wrong helper names
-	sed -i -e 's:\(app_test_helper\)\.py:\1_pure_python:' \
-		absl/tests/app_test.py || die
-	sed -i -e 's:\(logging_functional_test_helper\)\.py:\1:' \
-		absl/logging/tests/logging_functional_test.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTHONPATH=.
-	local fails=0
-	while read -r -d '' x; do
-		ebegin "${x}"
-		"${EPYTHON}" "${x}"
-		eend ${?} || : "$(( fails += 1 ))"
-	done < <(find -name '*_test.py' -print0)
-
-	[[ ${fails} -ne 0 ]] && die "${fails} tests failed on ${EPYTHON}"
-
-	# we actually need to clean this up manually before running the test
-	# suite again...
-	chmod -R u+rwX "${T}"/absl_testing || die
-	rm -rf "${T}"/absl_testing || die
-}
diff --git a/dev-python/apipkg/Manifest b/dev-python/apipkg/Manifest
index 640c76a9ff9d..94a2617631bc 100644
--- a/dev-python/apipkg/Manifest
+++ b/dev-python/apipkg/Manifest
@@ -1,2 +1 @@
-DIST apipkg-3.0.1.gh.tar.gz 14026 BLAKE2B da16bea557cf870c96d44a383232344d10cfbb682c483468e20755dd378c64e64d72b379901eb59ed0df590b5c3b577c882beb882377f7d759b181cf1b672b50 SHA512 89251f02a49b5191879bcf6e35c6a8755d6b29f1ca1c6061eab004385b11433ec86e2968ab23994c6a74515d6a673e445b3bcf8cbdd21b2ec644fcef0d19b419
 DIST apipkg-3.0.2.gh.tar.gz 14018 BLAKE2B 2c7734db09a9718353ba1e99fd0bb4320b9e4e2a9d509d7d93c65dbb6477be6cd71149023c3b8de3e4d5226d337d44065710fe9358ccfcc29d26c968ca84a778 SHA512 57bd819869d441bc00bcba36bb4308a98f9e36114ddfb44dbb9c3123aafb5972fbbce4d7cab8f0f82d789837679d5b3c62fbd2d03d870c53095782798d0c59b6
diff --git a/dev-python/apipkg/apipkg-3.0.1.ebuild b/dev-python/apipkg/apipkg-3.0.1.ebuild
deleted file mode 100644
index 332947c6030e..000000000000
--- a/dev-python/apipkg/apipkg-3.0.1.ebuild
+++ /dev/null
@@ -1,32 +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_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_/}
-DESCRIPTION="Namespace control and lazy-import mechanism"
-HOMEPAGE="
-	https://github.com/pytest-dev/apipkg/
-	https://pypi.org/project/apipkg/
-"
-SRC_URI="
-	https://github.com/pytest-dev/apipkg/archive/v${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"
-
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/argh/Manifest b/dev-python/argh/Manifest
index 02b7d78181e2..c21797e60428 100644
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@@ -1,2 +1,3 @@
 DIST argh-0.29.4.tar.gz 52694 BLAKE2B 6d2b75200ea7b570ac199139ba7bc92b5bfa41fa4e21d19eff17d8506c4a28c6043413a25679cab52f9d81b8bb9a1f35b77ffee3beaa98c43660ad9e5c6b8dfc SHA512 017346afb237429de1228f604a763f919528fd359edfabb7b5a5c3a48c5e5be5a5a385672d54299cd15e5bc82257d8c33816fbc463873ffb9b3c3a54b40fccfc
 DIST argh-0.30.0.tar.gz 59803 BLAKE2B 2e0a5d9dfbe5177ac434224b78b0575f4b2b4373abee8ba97cbb31617e855309ed152e83e84c03c3b5666705493011bc4a0c86396ed5891914e9af3436d9b058 SHA512 a16fa32cd1fdcd842335ebecdaefce48d248a0a6449b592a3e83dbeb02543123e36dc057f457d7bb097c1b4e118d11a800ecc40a3847e81533d8dcf1d292111d
+DIST argh-0.30.1.tar.gz 60275 BLAKE2B 24e80f51f2c2f76d605b4282045ffe98f274f3e4692a3dfc26e35aa32a97a79fdc78b795622a2cb593ed83657c1cb1ecef562b43f5b8dc3097f4909403aa98ce SHA512 a24bdc92180ebce217433842e223e958ef222dc81feba8ee22ba0b219b5c259f3d2e79f8ebdf7334b624f69c83814322aa1e768cc72f644c0b16fb2863910035
diff --git a/dev-python/argh/argh-0.30.1.ebuild b/dev-python/argh/argh-0.30.1.ebuild
new file mode 100644
index 000000000000..b39fbe43f5ea
--- /dev/null
+++ b/dev-python/argh/argh-0.30.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A simple argparse wrapper"
+HOMEPAGE="
+	https://pythonhosted.org/argh/
+	https://github.com/neithere/argh/
+	https://pypi.org/project/argh/
+"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+LICENSE="LGPL-3"
+
+BDEPEND="
+	test? (
+		dev-python/iocapture[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/astroid/astroid-2.15.8-r1.ebuild b/dev-python/astroid/astroid-2.15.8-r1.ebuild
index 346c0a6b6cfe..1dfa6c1509f9 100644
--- a/dev-python/astroid/astroid-2.15.8-r1.ebuild
+++ b/dev-python/astroid/astroid-2.15.8-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 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"
 
 # Version specified in pyproject.toml
 RDEPEND="
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index f174a93622e9..54caa5703e5f 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,3 +1,4 @@
 DIST serverless-application-model-1.76.0.gh.tar.gz 5114195 BLAKE2B 2d9eb5ea740c02ad3b6ca4024c6a5f6f87fe0a2703535eab5e69488fb30e2172ab3edd67ab4a668a9790040a0edc698c2ac4fc4c244c0b2f8037a5ce6e1175fb SHA512 97bc81cc41ecc5e1b5bc253e9ba0839598a09a49e564bfe06bd3460867412ce2551e1ad79640cf40641bdc9d09261bdd8bdb87d78c860f6c3d2b316fcee9c027
 DIST serverless-application-model-1.77.0.gh.tar.gz 5114799 BLAKE2B a5299e6a3dacca20304e3f93d84a96aa8013d435ecd62621e7fcc302c709ad86185cfa509925bebf379597186ed9fe82ac384f6314ecdc66826d8cd7df3f30c6 SHA512 961a1dcd1117b6d2c9b08c1e9b945d02ac19c9b41b91415264aadc9461fd62ece294a7da6e99ec128be685f6df605e8febf91469a1161bc94b12ae3976901f9e
 DIST serverless-application-model-1.78.0.gh.tar.gz 5115381 BLAKE2B bdb4c26a65b6740bed49ba2f830dce983f396e919b25450aa331208f63e69eb78001ce60284a6e70272c1ae1b68d110a1b865d990d100614c51e4235fbbbbb06 SHA512 36dd8e13f464d7f1502d49af2222e0716f13334f66c2f20d0423067696f2872386ae72859ac149e35a0c26df213c1bdbef8f727505a0f1a96527f7ee0e80939b
+DIST serverless-application-model-1.79.0.gh.tar.gz 5119260 BLAKE2B 2cf3db022fc483bc1575328a0ece762285632b7bcb18757aa1afdab77aab1d567a78b8bf9c3b79666e23f546b73406335323d8b5f0ed829fb40f338a769082df SHA512 285c2b5d1728e4758dce362690fad6d1508ad4c61402a0b67d775952cb1e8479ddbdd352b746cc9178d3074164f05ac0c73cfaac68775ae97749e3746efc1bb4
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.79.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.79.0.ebuild
new file mode 100644
index 000000000000..ec337b277ed2
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.79.0.ebuild
@@ -0,0 +1,62 @@
+# 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_{8,9,10,11,12} )
+
+inherit distutils-r1 multiprocessing
+
+MY_P=serverless-application-model-${PV}
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="
+	https://github.com/aws/serverless-application-model/
+	https://pypi.org/project/aws-sam-translator/
+"
+SRC_URI="
+	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/boto3-2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
+	<dev-python/pydantic-3[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
+	<dev-python/typing-extensions-5[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# so much noise...
+	sed -i -e '/log_cli/d' pytest.ini || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AWS_DEFAULT_REGION=us-east-1
+	epytest -o addopts= -o filterwarnings= \
+		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
+}
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 44b716301036..89bf53413632 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,4 +1,5 @@
 DIST black-23.10.0.tar.gz 595880 BLAKE2B 978f0334abd1085ae9d6b085510c938235fb4b94ac0ecc4f13754f36d3d3152d4c5075d0177c5492a50cc45e8feb4af8d8eb023516d2fe85c0c61fa4b1eb8fb4 SHA512 2d24a269e66e07473afb0eeb0e25472ed53b20a4dad3622319cafd2f90f2615b4eba39971269c75208c439bfc430ca9b4922e7cce6ec9bd28e648cd62b75aea4
+DIST black-23.10.1.tar.gz 597307 BLAKE2B 1f7522653e6eb537bd57826c8f4efc0520bab6a62b4ba5718fbd841bad046cd0a62edd5a87e8d5884e80b5882c712304e48f2af75770bd6b25e85dc7b262dc71 SHA512 493c46e01411ba6fc4ed81362dc056fb6171a9ec4d85142e5018e610b887b4ed674a09b6b0ede7cd53504904400adbf8b914b37cf0e73a0abaa2eef469a9ec02
 DIST black-23.7.0.tar.gz 586177 BLAKE2B 4bb50b6c7409a97aa277f1048c17101a1c91368b9269cf4c08d3052c036887d2ed6e5f1f2e044c14f41bf2d969d65183413c2a9810f12d96cbf09778c9b1310e SHA512 78d5e87bfef4dcaff007455e8c72dcd45f9374c09da6f4ba45ae7caa980005d1bc984c68fa44d4abf7969a376a4039546e7e8f537c3aa1331d213e13dcbe3941
 DIST black-23.9.0.tar.gz 588540 BLAKE2B f3c94acb1af6c4bf1ada948d4ea7b7cd243184b920fab7e741d9e5ee4a82e163e5570ca1451424ea379362ae1755907e4b5e63b517a4e420d6cbe9d69655a10f SHA512 4d1ae51353c7a0a4113796fcc10824228d5bd9a0f19474efc8c5e3a9b929433a586f058521fd1dae35301e9e33e6d231b0584f81514104ac5c787f8e55cb9fa8
 DIST black-23.9.1.tar.gz 589529 BLAKE2B 642e1bb7b83653d879b3cbf1e618472a3106c1d9c918cbb57e5f517a96a8838a501f0e49f0fa1822d87600b4a8cecaac8da2bc9f08d5bc4131a611a90099f60a SHA512 0732409800a131fee69fffa8e7be8c128d26f0f75038235ba6f8c7451901199eed4118a2cb640ec0a5e6b40238bf41991c4a0559534f3a9f13d29f118e5b4aaa
diff --git a/dev-python/black/black-23.10.1.ebuild b/dev-python/black/black-23.10.1.ebuild
new file mode 100644
index 000000000000..492cc6bcaffd
--- /dev/null
+++ b/dev-python/black/black-23.10.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 multiprocessing optfeature pypi
+
+DESCRIPTION="The uncompromising Python code formatter"
+HOMEPAGE="
+	https://black.readthedocs.io/en/stable/
+	https://github.com/psf/black/
+	https://pypi.org/project/black/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
+	>=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
+		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -n "$(makeopts_jobs)" --dist=worksteal
+}
+
+pkg_postinst() {
+	optfeature "blackd - HTTP API for black" \
+		"dev-python/aiohttp dev-python/aiohttp-cors"
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index def08df75028..c0ac3d3765d7 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,3 +1,4 @@
 DIST boto3-1.28.62.gh.tar.gz 712305 BLAKE2B 1d61f857143f9471a254e035cf532cab38699262b116ccc40e922005bf90ca64a33b7aa7f64df8b0641f58e250d9b6000977a50be10e5ebe93dcbf54148276b7 SHA512 f13d8f812caa650d877ecb3ae72a47ed6f93dfbfede62588266909917a1af6c8c446dbefd130d39f9a5dd156e1b9eca96a0ae084bfbadf926cdcfabfc255633c
 DIST boto3-1.28.63.gh.tar.gz 713769 BLAKE2B f2e300458934893bb6d2186e900c4ba9abbd51d2ffabdbcd3026394315653e64fdc486f3ed4e33b26bef160b00e75acea875278eab03b4eeb50b5ecc94d4c0fc SHA512 782c7bb48af31638899e8bcf8fc87f67ab793fe724392be90951ece61b165f55d1df47585bd5211d7ecf3c989e5316ff9db774c8f0f357d1afc2af3ca0e49879
 DIST boto3-1.28.68.gh.tar.gz 717553 BLAKE2B dd8ba562613456e30c0f8bfe2f3befa9601b091dacf1c19c6153ee98b81c74ed63ea1b54ce5cccfb5bcf0d67386d593276bcdd86ccb56083b54d5905042856cf SHA512 714ff8cbd52d8775bb1fc44792e21d4a93c951b9adc4ac09bacef4df2fabf0af7896edf19b6f3bd3cd9872efab1fe20f0cb07eaca51f688024a3a18515c5f371
+DIST boto3-1.28.69.gh.tar.gz 717978 BLAKE2B d7339e73fec81a8c8eb013b4136ab3961bb7c27cbf2b479abf12d814bb49f959dad91cc091b5ceabc01de9205b732b7df6c7fb7c37dfacc72a7d862f3e54a3f7 SHA512 2f6fa2192115367f8a899fe16308365509f543146c00be4e04c2aa323a188dedfe3e531b8d2a8b80fe9a143d101039a8a34babf5c3b1073f306f7946a45ec976
diff --git a/dev-python/boto3/boto3-1.28.69.ebuild b/dev-python/boto3/boto3-1.28.69.ebuild
new file mode 100644
index 000000000000..fc1e40c08394
--- /dev/null
+++ b/dev-python/boto3/boto3-1.28.69.ebuild
@@ -0,0 +1,68 @@
+# 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_{8,9,10,11,12} )
+
+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.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+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() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit} \
+		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 7b0e03a53409..9fd559335963 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,3 +1,4 @@
 DIST botocore-1.31.62.gh.tar.gz 11961556 BLAKE2B 315a1ba1543ba5b92c0a0394a4a21b124a9435e660daef43164cd61ce0b5924c6ba9fa82e41c32b4ae7f0e89783abbe107abf11c807e81a3cb2f883352935053 SHA512 ba13c945fe9308bcc053d459b8934ea358e734b3079620ceb4d4df8274426f349a0ff26190d45275ca05588d48c692338c2dbdbde5122fdda79556af64cfb6c8
 DIST botocore-1.31.63.gh.tar.gz 11975759 BLAKE2B 3e757c6303f3390d3d563187c47140042d09271b16022a7a633bf68dc7188d42ac5a73838d2ae0556c8eec63296bb3f3b3f1011889fa7c10d660654695cd70f1 SHA512 39f1b6cb5c61a55a6f01e41750f651baf16c6d66e0b9e30cff042f54d03c0e862ab91a8f918257df8da678b13e732c68e887b21aa00006778bafad5361f4edd2
 DIST botocore-1.31.68.gh.tar.gz 11989788 BLAKE2B d8d34511e3ef65f54e1b305cf60cdb98e43ed7f773da2d84abd2ba45277d0f244080dd9b86fb5ea75a1af3820f27e4255f5f78bf67415e18cff2be30cc625bd4 SHA512 7ec8bd1e2036f17dbaeec4b65e6100c0b5c163f3e05d7e4723f7f1bac75d561f1a2d76331021552cb08093c6e85858e6a76cb9846114adf9deacf97dd94135a0
+DIST botocore-1.31.69.gh.tar.gz 11993410 BLAKE2B 3bb478c0d0bb8add09f3659739000ca5df6a2aead9ae51a44adb1d409d700fd27005cf9a96bffd679a70058125396761c2d654a93009cf660d9b7864567eeb7c SHA512 334aa763eed79a479d8e8ca64eaf44919f3d9af7b637577e12eecc162c79235255ab6bd19ca9edd0698215fb11e198f38bf924db1590b6da3121ef5f7aa7f00e
diff --git a/dev-python/botocore/botocore-1.31.69.ebuild b/dev-python/botocore/botocore-1.31.69.ebuild
new file mode 100644
index 000000000000..9588357367ec
--- /dev/null
+++ b/dev-python/botocore/botocore-1.31.69.ebuild
@@ -0,0 +1,68 @@
+# 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_{8,9,10,11,12} )
+
+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_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
+	)
+
+	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index b6d6ee5ca36e..8187d8054c10 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -4,3 +4,4 @@ DIST cfn-lint-0.81.0.tar.gz 3688759 BLAKE2B 595429d5891b5a4b563645c2b3ba55e8c791
 DIST cfn-lint-0.82.0.tar.gz 3714744 BLAKE2B adaf9e7482983f6585d9ae83979d3066533eeb6192019b621e206d144fbbb0ae0bcb9f3f70602d41cc3958218130ecdbc54eeb7f54f645c729cef1eb31bd9aae SHA512 68c90bb34be029c635f0e1caede46560b011d92a149b701fb3e2aa5794462a9e28addd4489e9fde06df110684728a7dbb9c383a37d7510e076a30d5b7d653cd9
 DIST cfn-lint-0.82.1.tar.gz 3714778 BLAKE2B b06678e0046ffaf9d90245105303c37d8bdca2b5a3e77dac37969185483a4c60b43de418e75c76fd49f8418eddc2892bec91d0a4fac92831d8840f174f841e9f SHA512 6bbce9cb54db302298df811ca2ebbb7fffe01ad14e31808fb66b257c25606baab9948e31d4bb113e816510a16737a33be5a5e4effc6b6f30c56eb232f8f8ccf6
 DIST cfn-lint-0.82.2.tar.gz 3714901 BLAKE2B 76077d606ac645953f71fadf5b096e3a8e4a6e7c71b25af9647e0c155f40790ded2d96af93b959c00641475481758abc7af215cfe1004aeb05c90f3e85210bde SHA512 91f93ffcf39883dfe8bb8e15298bf9bfec4c952762b9fec162107ecf70f5a11c44baa1ea3121db9f710375b3ab5afe11dca7142251ba070835c80accf0e41d9d
+DIST cfn-lint-0.83.0.tar.gz 3647099 BLAKE2B e6d5b962d334724983f82edfe837f0251182d22eb4657bffc612f80950c66119573b9c622ed7d257386287a5f0c3905d198989c9ca437db7899b2cccc55c3b71 SHA512 51afa11f742c593cb72ac3b9537605b898496ee7a07fe62f706d3aa87de6369511b92000da01dd967866e5096746303a2d083759c99bdca63d2ef9c670c72ca4
diff --git a/dev-python/cfn-lint/cfn-lint-0.80.3.ebuild b/dev-python/cfn-lint/cfn-lint-0.80.3.ebuild
index df8889fe3744..b12f49765119 100644
--- a/dev-python/cfn-lint/cfn-lint-0.80.3.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.80.3.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.73.0[${PYTHON_USEDEP}]
 	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
 	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
 	dev-python/junit-xml[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-lint/cfn-lint-0.80.4.ebuild b/dev-python/cfn-lint/cfn-lint-0.80.4.ebuild
index 67e2b9fbb988..85f8b21ab073 100644
--- a/dev-python/cfn-lint/cfn-lint-0.80.4.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.80.4.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.73.0[${PYTHON_USEDEP}]
 	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
 	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
 	dev-python/junit-xml[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-lint/cfn-lint-0.81.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.81.0.ebuild
index ae6e9729e19d..9a1b87293100 100644
--- a/dev-python/cfn-lint/cfn-lint-0.81.0.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.81.0.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.75.0[${PYTHON_USEDEP}]
 	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
 	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
 	dev-python/junit-xml[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-lint/cfn-lint-0.82.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.82.0.ebuild
index ae6e9729e19d..9a1b87293100 100644
--- a/dev-python/cfn-lint/cfn-lint-0.82.0.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.82.0.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.75.0[${PYTHON_USEDEP}]
 	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
 	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
 	dev-python/junit-xml[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-lint/cfn-lint-0.82.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.82.1.ebuild
index ae6e9729e19d..9a1b87293100 100644
--- a/dev-python/cfn-lint/cfn-lint-0.82.1.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.82.1.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.75.0[${PYTHON_USEDEP}]
 	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
 	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
 	dev-python/junit-xml[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-lint/cfn-lint-0.82.2.ebuild b/dev-python/cfn-lint/cfn-lint-0.82.2.ebuild
index ae6e9729e19d..9a1b87293100 100644
--- a/dev-python/cfn-lint/cfn-lint-0.82.2.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.82.2.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.75.0[${PYTHON_USEDEP}]
 	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
 	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
 	dev-python/junit-xml[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-lint/cfn-lint-0.83.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.83.0.ebuild
new file mode 100644
index 000000000000..6943af47dd43
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.83.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.77.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	<dev-python/networkx-4[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/unit/module/test_template.py::TestTemplate::test_build_graph
+		# requires git repo
+		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+		# Internet
+		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
+		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
+		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
+	)
+
+	# from tox.ini
+	local -x AWS_DEFAULT_REGION=us-east-1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/cftime/Manifest b/dev-python/cftime/Manifest
index 85a5a1f0c0dc..764af2b9ea1e 100644
--- a/dev-python/cftime/Manifest
+++ b/dev-python/cftime/Manifest
@@ -1 +1,2 @@
 DIST cftime-1.6.2.tar.gz 52745 BLAKE2B f3e91585b40a981e1c752ec3f086a4611354e228592a1b581b05f003d68878245a8ab4fae332d9054c2a9e85ef921b9110a0f8473861bd3e4cc92c287259ad44 SHA512 d5135a55e5c9982247835e379bd35e4d8b47f0f70d08766f73223e0c40dc1875840c5cb40515e233196af1c10e992911325ff33a3c41efc3b8009e49de2a6e31
+DIST cftime-1.6.3.tar.gz 53256 BLAKE2B 8875c368e6811487960fb240ed5320ab1dcc24f3678e9663e67b7c49ab8cc1f12a0030670760fcd1a15938b57f3860d5c9c9b30a3e5a0e1755fcd0c7b8deaf5f SHA512 0bcb8dcf7a840e500d7cc0f784f960b4972803f353fcffbf36dc30b2169b6864aea1fd8cab2d60e7908a063db55f2cfa3639c51fea84692b2dfe2d83b954c0ae
diff --git a/dev-python/cftime/cftime-1.6.3.ebuild b/dev-python/cftime/cftime-1.6.3.ebuild
new file mode 100644
index 000000000000..bd6a14fd68fb
--- /dev/null
+++ b/dev-python/cftime/cftime-1.6.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Time-handling functionality from netcdf4-python"
+HOMEPAGE="
+	https://github.com/Unidata/cftime/
+	https://pypi.org/project/cftime/
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-python/numpy-1.26.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-python/cython-0.29.20[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dep
+	sed -e "/--cov/d" -i setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 70f67b5f345c..3837a30ff9f3 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -7,8 +7,8 @@ DIST base64-0.13.1.crate 61002 BLAKE2B 3b3a5b26e2ef18e9b4f1ede72b1bd160a14947518
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST cryptography-41.0.3.tar.gz 630139 BLAKE2B 148c01d3956a821edfcbba386287707f6e327d49669d163c00080f5208d65f340096a211825d6b5550036b00c5ccf9c84b137413454d68cae5374e9c10947c87 SHA512 84f79f72be3646c1e9a932ba8aba514471f6c0e50462a0bb3a927622ce67c7932e71d44e187db8928b05f04b803b958284f785c0dc297a0c9453846af1ac1aca
 DIST cryptography-41.0.4.tar.gz 630506 BLAKE2B 8d205ec707b0278f081c9d96d81d5bb2ac2554e0f73e97451c053da018ff7d0e0aaa2b1f043f2f67c0a93e7d0d02a130cdf3373ced21728268c7f882bd64fbd1 SHA512 0c0a025ed5e39195561e5a6374463ee2261448657ebb89e39e761a5b02c701a8f804c1f84733cf8376e44a46784b2cc41134952c329987a96ee85cb4532c75cd
+DIST cryptography-41.0.5.tar.gz 35947023 BLAKE2B f986143887cce841d7b4ec7cc916d72af375012ca26ab335796b18c6effdcc92479fc50cf56a4715e862646af4f0f07dbf766e373f21ba760f9bb80e93908899 SHA512 b647b4f5155437242d7a31d84bd1cdc83284d96d334a3d6169533d597540f525d3f1686bab3a5fe3cb64a4fa6ded5e5d19489dfff0e93d86c274f20e69ca07e9
 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
 DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
 DIST indoc-1.0.9.crate 13475 BLAKE2B a9696788574e56dd125c3371169fd59d6947d188f76e2669b21c0304692efd6709cd048920f7822e92c6a5620fb178e0e85c7776118cef8ccee0f58398e14abf SHA512 db8aef4a7bb606452dc8ed45aa29a255c7a135357a0bd586fb4429c5f56a1aa2ca9400d6fac39956aeb486a15d25cf5d1b9524967867f2c651d9d563e3e85be8
diff --git a/dev-python/cryptography/cryptography-41.0.3.ebuild b/dev-python/cryptography/cryptography-41.0.5.ebuild
index 7fe7455fe006..77981df6831f 100644
--- a/dev-python/cryptography/cryptography-41.0.3.ebuild
+++ b/dev-python/cryptography/cryptography-41.0.5.ebuild
@@ -6,62 +6,63 @@ CARGO_OPTIONAL=yes
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 PYTHON_REQ_USE="threads(+)"
 
+
+
 CRATES="
-	Inflector@0.11.4
-	aliasable@0.1.3
-	asn1@0.15.2
-	asn1_derive@0.15.2
-	autocfg@1.1.0
-	base64@0.13.1
-	bitflags@1.3.2
-	cc@1.0.79
-	cfg-if@1.0.0
-	foreign-types-shared@0.1.1
-	foreign-types@0.3.2
-	indoc@1.0.9
-	libc@0.2.144
-	lock_api@0.4.9
-	memoffset@0.8.0
-	once_cell@1.17.2
-	openssl-macros@0.1.1
-	openssl-sys@0.9.88
-	openssl@0.10.54
-	ouroboros@0.15.6
-	ouroboros_macro@0.15.6
-	parking_lot@0.12.1
-	parking_lot_core@0.9.7
-	pem@1.1.1
-	pkg-config@0.3.27
-	proc-macro-error-attr@1.0.4
-	proc-macro-error@1.0.4
-	proc-macro2@1.0.64
-	pyo3-build-config@0.18.3
-	pyo3-ffi@0.18.3
-	pyo3-macros-backend@0.18.3
-	pyo3-macros@0.18.3
-	pyo3@0.18.3
-	quote@1.0.28
-	redox_syscall@0.2.16
-	scopeguard@1.1.0
-	smallvec@1.10.0
-	syn@1.0.109
-	syn@2.0.18
-	target-lexicon@0.12.7
-	unicode-ident@1.0.9
-	unindent@0.1.11
-	vcpkg@0.2.15
-	version_check@0.9.4
-	windows-sys@0.45.0
-	windows-targets@0.42.2
-	windows_aarch64_gnullvm@0.42.2
-	windows_aarch64_msvc@0.42.2
-	windows_i686_gnu@0.42.2
-	windows_i686_msvc@0.42.2
-	windows_x86_64_gnu@0.42.2
-	windows_x86_64_gnullvm@0.42.2
-	windows_x86_64_msvc@0.42.2
+Inflector-0.11.4
+aliasable-0.1.3
+asn1-0.15.2
+asn1_derive-0.15.2
+autocfg-1.1.0
+base64-0.13.1
+bitflags-1.3.2
+cc-1.0.79
+cfg-if-1.0.0
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+indoc-1.0.9
+libc-0.2.144
+lock_api-0.4.9
+memoffset-0.8.0
+once_cell-1.17.2
+openssl-0.10.54
+openssl-macros-0.1.1
+openssl-sys-0.9.88
+ouroboros-0.15.6
+ouroboros_macro-0.15.6
+parking_lot-0.12.1
+parking_lot_core-0.9.7
+pem-1.1.1
+pkg-config-0.3.27
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+proc-macro2-1.0.64
+pyo3-0.18.3
+pyo3-build-config-0.18.3
+pyo3-ffi-0.18.3
+pyo3-macros-0.18.3
+pyo3-macros-backend-0.18.3
+quote-1.0.28
+redox_syscall-0.2.16
+scopeguard-1.1.0
+smallvec-1.10.0
+syn-1.0.109
+syn-2.0.18
+target-lexicon-0.12.7
+unicode-ident-1.0.9
+unindent-0.1.11
+vcpkg-0.2.15
+version_check-0.9.4
+windows-sys-0.45.0
+windows-targets-0.42.2
+windows_aarch64_gnullvm-0.42.2
+windows_aarch64_msvc-0.42.2
+windows_i686_gnu-0.42.2
+windows_i686_msvc-0.42.2
+windows_x86_64_gnu-0.42.2
+windows_x86_64_gnullvm-0.42.2
+windows_x86_64_msvc-0.42.2
 "
-
 inherit cargo distutils-r1 multiprocessing
 
 DESCRIPTION="Library providing cryptographic recipes and primitives"
diff --git a/dev-python/debugpy/debugpy-1.8.0.ebuild b/dev-python/debugpy/debugpy-1.8.0.ebuild
index 253674b7d554..4d2f9403c4d7 100644
--- a/dev-python/debugpy/debugpy-1.8.0.ebuild
+++ b/dev-python/debugpy/debugpy-1.8.0.ebuild
@@ -61,6 +61,15 @@ python_test() {
 	local EPYTEST_IGNORE=(
 		tests/tests/test_vendoring.py
 	)
+
+	case ${EPYTHON} in
+		python3.12)
+			EPYTEST_DESELECT+=(
+				tests/debugpy/test_flask.py
+			)
+			;;
+	esac
+
 	epytest -p timeout -p xdist -n "$(makeopts_jobs)" --dist=worksteal \
 		-k "not attach_pid"
 }
diff --git a/dev-python/fasteners/Manifest b/dev-python/fasteners/Manifest
index f00f6de966c0..5c4944fb5274 100644
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@@ -1,2 +1 @@
-DIST fasteners-0.18.gh.tar.gz 42343 BLAKE2B 702ca6a68733ed202ae0f8a2d9d430012c5786ef8d779903186815f9250ed7b2ccf781694aa57ef230009a470ef7c6bd0e83cc7bc9fcb809d2335542e799e3d6 SHA512 40928e93fa94ca9e67335d15acede73b70906885f8cc34262b00e2dfba9dfed8647f11490ab0df4c8fcfd94778362cfdc4bd0053063660b962202524dd5bda18
 DIST fasteners-0.19.gh.tar.gz 43188 BLAKE2B c30f4dc3da6605aa2552f58ae1071b51efefe2aea59ca8815fd50eebdbe7e826756cd9923485d6fb99dcc39196def485f4c1346a234bc7af09e2426c84b6a0d3 SHA512 47db216ff5bad5c669ca2d9be0ee09feba4a3d55ed0eac8d3623bd3d112b0b87fb9019f8785d035ec32ad9fa9e4ae7d1c92a576c97eec29acc82711d7e71a465
diff --git a/dev-python/fasteners/fasteners-0.18.ebuild b/dev-python/fasteners/fasteners-0.18.ebuild
deleted file mode 100644
index d917d8fcb777..000000000000
--- a/dev-python/fasteners/fasteners-0.18.ebuild
+++ /dev/null
@@ -1,31 +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_{8,9,10,11,12} )
-inherit distutils-r1
-
-DESCRIPTION="Python package that provides useful locks"
-HOMEPAGE="https://github.com/harlowja/fasteners/"
-SRC_URI="
-	https://github.com/harlowja/fasteners/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/diskcache[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	tests_eventlet/test_eventlet.py
-)
diff --git a/dev-python/fs/fs-2.4.16.ebuild b/dev-python/fs/fs-2.4.16.ebuild
index 021bef46a496..b1c9b12a2025 100644
--- a/dev-python/fs/fs-2.4.16.ebuild
+++ b/dev-python/fs/fs-2.4.16.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
 inherit distutils-r1 optfeature pypi
 
 DESCRIPTION="Filesystem abstraction layer"
@@ -23,6 +24,9 @@ RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-lang/python-3.12.0_p1
+	' python3_12)
 "
 # NB: we skip tests requiring pyftpdlib
 BDEPEND="
diff --git a/dev-python/hatch-jupyter-builder/hatch-jupyter-builder-0.8.3.ebuild b/dev-python/hatch-jupyter-builder/hatch-jupyter-builder-0.8.3.ebuild
index a6c03dac6a5d..e89a623c2663 100644
--- a/dev-python/hatch-jupyter-builder/hatch-jupyter-builder-0.8.3.ebuild
+++ b/dev-python/hatch-jupyter-builder/hatch-jupyter-builder-0.8.3.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/icalendar/Manifest b/dev-python/icalendar/Manifest
index 79f7ce605c83..5dbac91cbe89 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -1,4 +1 @@
 DIST icalendar-5.0.10.tar.gz 108657 BLAKE2B 99d5bd1c58f9413dcc5f0e2c2cabb6ed9bf29a24d3416aac7a56dc4e669012c9b7fab6a59cff2d93cea23b979492bda3a25834f79f97d9f3f562722085f1ab94 SHA512 0d03312d175a152a7c8bf6e574acb216e107eaeae197f2f10a904ce5ef40ecb156433e45ef5c8d3c1553842d1df0440363ed0f8d115337919139b7eae5b82796
-DIST icalendar-5.0.7.tar.gz 104099 BLAKE2B df45ee6b8c1ad5bfc558195e86e2456aae8f70613724ba16e74093e5454695d8d4ef2e0eb2e312dd2a94c3a12bc6e4febc21174e8380e249f2de906500a1cfc8 SHA512 c541e61d79b76123d119e51ee6d927795a7d675aded427a21bd38d0f069ea454e182a61ff86b96c7769c42560dfc20f7facb00dfe8a9cfa47da74b279d841b42
-DIST icalendar-5.0.8.tar.gz 106954 BLAKE2B 2e6d9cbae1a8feba40c33403e047386dcb8846fb7d8fd9e6b78d2b58ffeb4fb033438f240dd3fa3290f5edeb171a940dc2213cd5d758f59908eea1099807f52d SHA512 275884cf934d8a275dc75346b0518701f2160c43d479e91069f3cad4370b14d9cbc78bf0c1fea287df2da271ec2f71137cfd5ec202d8304df16cf474f7008b53
-DIST icalendar-5.0.9.tar.gz 107376 BLAKE2B 506ccdbccc0e9d3e755becfb811380b9fc7c9d401b5812d3c56170c27350311c3d5bd2809e3dd93c1e6e361ce46015f1916326bc306571b1139b9d7aac592eac SHA512 b70c1adbcaeebbd81ba8c4cf4db146d593131dd3ba7c995f3b2417bf871cca82042ec43eab127f158895070d4e17ebf46cb30aca0a33b8344665798c29fd2e27
diff --git a/dev-python/icalendar/icalendar-5.0.7.ebuild b/dev-python/icalendar/icalendar-5.0.7.ebuild
deleted file mode 100644
index 6779948aeeeb..000000000000
--- a/dev-python/icalendar/icalendar-5.0.7.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_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
-HOMEPAGE="
-	https://github.com/collective/icalendar/
-	https://pypi.org/project/icalendar/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# reset conf.py to not read version from an installed instance
-	sed -e "s:pkg_resources.get_distribution('icalendar').version:'${PV}':" \
-		-i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/icalendar/icalendar-5.0.8.ebuild b/dev-python/icalendar/icalendar-5.0.8.ebuild
deleted file mode 100644
index 9b4f104f4e91..000000000000
--- a/dev-python/icalendar/icalendar-5.0.8.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_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
-HOMEPAGE="
-	https://github.com/collective/icalendar/
-	https://pypi.org/project/icalendar/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# reset conf.py to not read version from an installed instance
-	sed -e "s:pkg_resources.get_distribution('icalendar').version:'${PV}':" \
-		-i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/icalendar/icalendar-5.0.9.ebuild b/dev-python/icalendar/icalendar-5.0.9.ebuild
deleted file mode 100644
index 9b4f104f4e91..000000000000
--- a/dev-python/icalendar/icalendar-5.0.9.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_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
-HOMEPAGE="
-	https://github.com/collective/icalendar/
-	https://pypi.org/project/icalendar/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# reset conf.py to not read version from an installed instance
-	sed -e "s:pkg_resources.get_distribution('icalendar').version:'${PV}':" \
-		-i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/ini2toml/Manifest b/dev-python/ini2toml/Manifest
index 552479755106..76a995c358de 100644
--- a/dev-python/ini2toml/Manifest
+++ b/dev-python/ini2toml/Manifest
@@ -1 +1,2 @@
 DIST ini2toml-0.12.tar.gz 101098 BLAKE2B 8e44600718318ce9c2ebaa5205864c1ca6ce87852a59496801578f32e223b9283d2f724acf004136743f87c8a081e58fd1176abe85288f8c463fc2520f708633 SHA512 c324a65fa20af880f2731b740dbf041ef7673d7ab817a9ee1947bf781d39bc000fcd8a725a546fc6af0dbecd0ec0534b2f9b83f3d8ab4afc0239d94acca06df5
+DIST ini2toml-0.13.tar.gz 102729 BLAKE2B 27094e0f329ce5d0da3ca1793b5b92e97eba5068225c55fcc9e0c61ead607967b8718976bfa13f76638c1b2bd8ee2a532b8eaf2023895f2ffdeacacd072fff9c SHA512 9700affeeb0434699e708fbeffb34e68f54882d7c5ada25cbdcdf47fed70bf8b5e8ff46503c19aa135079bc8770bdc48e991212b07b6409adf57d197a5ed998e
diff --git a/dev-python/ini2toml/ini2toml-0.13.ebuild b/dev-python/ini2toml/ini2toml-0.13.ebuild
new file mode 100644
index 000000000000..d166e68ad52b
--- /dev/null
+++ b/dev-python/ini2toml/ini2toml-0.13.ebuild
@@ -0,0 +1,46 @@
+# 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_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Automatically conversion of .ini/.cfg files to TOML equivalents"
+HOMEPAGE="
+	https://pypi.org/project/ini2toml/
+	https://github.com/abravalheri/ini2toml/
+"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-59.6[${PYTHON_USEDEP}]
+	>=dev-python/tomli-w-0.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/configupdater[${PYTHON_USEDEP}]
+		>=dev-python/pyproject-fmt-0.4.0[${PYTHON_USEDEP}]
+		dev-python/tomli[${PYTHON_USEDEP}]
+		dev-python/tomlkit[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# validate_pyproject is not packaged
+	tests/test_examples.py
+)
+
+src_prepare() {
+	sed -i -e 's:--cov ini2toml --cov-report term-missing::' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/ipyparallel/ipyparallel-8.6.1.ebuild b/dev-python/ipyparallel/ipyparallel-8.6.1.ebuild
index 3af81db5b53f..97aa8434a3d0 100644
--- a/dev-python/ipyparallel/ipyparallel-8.6.1.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-8.6.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-envs/Manifest b/dev-python/jaraco-envs/Manifest
index 140639959e89..0f747fe59cfb 100644
--- a/dev-python/jaraco-envs/Manifest
+++ b/dev-python/jaraco-envs/Manifest
@@ -1 +1,2 @@
 DIST jaraco.envs-2.4.0.tar.gz 7101 BLAKE2B 0858732706a71ac359b97c0a841c5370f35011968ee76364a06aa67231992bd04e200362d245c3fe8d035b7018be15bdc4117a76e86ac35bb0fff8958af9a0f6 SHA512 d4da2a3f8ec9add63a0b2f754523da5b6593d869537e38c33ea86e59105c4be0cea15546897d70b869cf81be709d9b3fa2cfa35bbefcb9ab32a373ea620553aa
+DIST jaraco.envs-2.6.0.tar.gz 8028 BLAKE2B af9eb47e4f0856a3c3d7ae028e6cebbfc74a6502a5442aa9518b7ab0f927dbc0dcd5e68240dc43868ccb505b0d75c7e9e0162d54620765559f5643f13019a0ba SHA512 8c1d4717f45b805ae3afa1308a60c0f6f03af2a0976f2fb52329d05114282c2f33085865c93e34065bfd978e52ed8bd65f9903ed8e3c7d8b23bf6a050a32bd08
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.6.0.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.6.0.ebuild
new file mode 100644
index 000000000000..efa3f8855940
--- /dev/null
+++ b/dev-python/jaraco-envs/jaraco-envs-2.6.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Classes for orchestrating Python (virtual) environments"
+HOMEPAGE="
+	https://github.com/jaraco/jaraco.envs/
+	https://pypi.org/project/jaraco.envs/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/path[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# optional runtime dep, not used by anything in ::gentoo
+	sed -i -e '/tox/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests
+}
diff --git a/dev-python/jc/Manifest b/dev-python/jc/Manifest
index 3be05819f97e..d72bf249ab37 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -1,2 +1,3 @@
 DIST jc-1.23.4.gh.tar.gz 12920166 BLAKE2B 3980f0564121362028c03fcdab653ef449bd6706eded19276cdcad7a5a18c819ae89fb5d82157af7add190203af2a9900d185aa54b0620357e6b639934bee0bf SHA512 e757e06e8eb740c85df03a92184fc285f35806365fffd4b8459e73fe54d7fcc4e476a4886daa713cd0fe1c5712aa867478a339eb208b55ef92e88945c4ae63a9
 DIST jc-1.23.5.gh.tar.gz 12938443 BLAKE2B 4234adb9eb402bc7f86abb47831b4803de71d1c193625ca20866d0cf53e9f7a70af2d8e1ec2b3a3414f2df7977a51e72dad95dc893e0e49f7d1e97a590f5a40b SHA512 595f50041b08c3b1e3d6dd65b4b0ed00e381860c87f3a79cf674f675f7c1aba56317b2cab8cac384cbbc6e36d1fa2144624e588fbb004c669d9998cf765c4ff8
+DIST jc-1.23.6.gh.tar.gz 12948974 BLAKE2B be4e0468a18859080e0d6536961a6c6cd8c43384c174437c12e6bcae1a0e323297c45b469bb8b5ab7ef02cb69f225a817effbccc48bb0c1ac934d11b227707cd SHA512 a79a289f9d30dc8827f1276e34dcd80af60800b5b4b4eb8d0c4bfbea4a996e932efe2242adad2e1b58cbfb4f1ff8a0bcc591df5c9d630226201d347d0d8d9c47
diff --git a/dev-python/jc/jc-1.23.6.ebuild b/dev-python/jc/jc-1.23.6.ebuild
new file mode 100644
index 000000000000..8fd1760d7307
--- /dev/null
+++ b/dev-python/jc/jc-1.23.6.ebuild
@@ -0,0 +1,32 @@
+# 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_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
+HOMEPAGE="
+	https://github.com/kellyjonbrazil/jc/
+	https://pypi.org/project/jc/
+"
+# no tests in sdist, as of 1.23.2
+SRC_URI="
+	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+RDEPEND="
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index fa28484ab59d..9841b6c96e9d 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -6,64 +6,44 @@ DIST csv-1.2.2.crate 887958 BLAKE2B f1a5c11e2bb721dc235ee59e02861125535cab2fba6b
 DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
 DIST getrandom-0.2.10.crate 34955 BLAKE2B 8e7b8554ae360484ceca2a05f834c2664b08f41cbc6c955663e1f8f22fb5750481518bf1c7b49f49223a99a66914ef013347b9186acc97a20249f3222a13f9d4 SHA512 82af9e0417bff9272ed0478be4ac90426405ce210014b21899c6b95fde1b16893bf46295388ff5f13fa712a04c99c46b770fab83f41a1343af1590a86ca8da3b
 DIST indoc-1.0.9.crate 13475 BLAKE2B a9696788574e56dd125c3371169fd59d6947d188f76e2669b21c0304692efd6709cd048920f7822e92c6a5620fb178e0e85c7776118cef8ccee0f58398e14abf SHA512 db8aef4a7bb606452dc8ed45aa29a255c7a135357a0bd586fb4429c5f56a1aa2ca9400d6fac39956aeb486a15d25cf5d1b9524967867f2c651d9d563e3e85be8
-DIST itoa-1.0.6.crate 10410 BLAKE2B 8b1dc9ae9d55a006bb2abe3b0282e5e77397814b692a87b9becdc2bb74deabf5db09e3d5a2f604964cbff046148025988a5d916480e0402b2b80646fbed32875 SHA512 e1fb82fe16e1248141d48de9e05e7abed0c6fef58f2ff8b77b52aca5f16f3600c46707ff4c7a0f0307047610f29775bda74948d6d1efceb74b37cdd22e1fcf31
 DIST itoa-1.0.9.crate 10492 BLAKE2B 0d5acef9ae72d3f4b5a387d231952e6025def69da81d38269b4882bc534be7acadc073e526fd8bebdca898a98b2c741735c541e0b6a35ed0f8f8799b906b65b1 SHA512 95f7906edb7d6a2690389167f8c4d01bc37827205bca87d527f2eb33722419ed2f2e8afaa559cc5a0a7e7fac76515c9c44c71c42b536aa34b0e2858c40946b6d
-DIST jellyfish-1.0.0.tar.gz 363065 BLAKE2B 318bc77d7ef12c0fbf02b78ed819f7281204b8aa08cc8ae5b531ae204335cb2cd8c3ff130a743b35341a0f70b63f7a3ad60f8b7009c33bbba2e42a0fbb2590e0 SHA512 744a29b52cdddc9d6e56ec78ead2216b604a0b2ce053c2896199357afd27073bc2c072aedc8479df96fc0e8319f3deef0a5126dc23816a365c234a5909f2b43a
 DIST jellyfish-1.0.1.tar.gz 363239 BLAKE2B a0ca4633e8f7356d9cbe14e7dfa5adcc6a037b2bc4aa3a946ca8c8d709aed0b1a6cb9f8c4c1bc258ea289fd4dc7b554c5078a28e6157badab16c4b384abfaf80 SHA512 12cf8ea56c42cd91fdf9199802af6e8f97bb9d6f44fd291c46e9d1a445d39e2eee1fce2677eeb22c9d27453a54e95d5a2c4fae011846ec16178b2c5a588a342e
-DIST libc-0.2.146.crate 684707 BLAKE2B 53091a46262389e327973185c26bf187beba392c45a92bfa424fc0976333d6c8afdac6527484032574086e32412a712bc2616468f7cb14e6bd0480ca2bef6da6 SHA512 4112c17cfda83041f33a7b616a365a0eb6603ba857fd7bedd64162021a6305c81da6ae8f37395732d7eea40d4fe648bae435ee0bf0b1a1a48400e6546d4d50b6
 DIST libc-0.2.148.crate 690988 BLAKE2B 41dd38cfff1431cd8184220745697d794a66f6badec750be3910ddc4a6ddcf964692b5b28a5a9714592c5579da26248092facb9407920330b55aaef38501420c SHA512 1dec9ec8f4c610c08f62bc2b45dd32f1e4528a045161d848b5c4f0382be1158a690f4d7760203d7d2347a80422671f43b07531871cf44990887eaaed35d924d4
 DIST lock_api-0.4.10.crate 26713 BLAKE2B 113adf8554c65e9782e8fd0360d0398567dfbfddb1fea4928cc152fbab98dbe086e42b81170f6f5c333d61dd3261e8a1ebfbaed786e6bf6378e6afde6d7f9e5c SHA512 ffe8cad8099bc382832181c1ff95e0935993491f247114604201be7d4ddf8402fd4db8fd6499c611f95fbce7d57dc3d3738eddfab31c52f50ab8709e549697db
-DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memchr-2.6.3.crate 94377 BLAKE2B 5f1603397d6703ddd9a1e68429cb6e9dae9021e14692c1e084f3b5c82d36645a1fa930c7a76b97df8e1919402fa7e1c621969ce85ce20c82b3087104afe18f25 SHA512 8d5e1425ea702a0950c95271dfd2e81610731496f77af0d683536b074a22922a7d7ec6da41577487d1d658e3b27257b7d1e142761b523e68760a2f5f24f049bc
 DIST memoffset-0.8.0.crate 8912 BLAKE2B 19ad3abed21fc39461b0382b15a8cc312378aba36f042b1e5335012115d31b350a4e3bc720f1eea300d7d19b9b317f75a28d4ccd78ff3b31defd9e4b3147899c SHA512 47adcae0848ff967035e10543ea599c7af9c5bad387023eb4dc77c9e8d875994ec8139b9941b3ecc4fc17214d80944a47a3be174a45b334661914a5a7382dfbe
 DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8
 DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
 DIST parking_lot_core-0.9.8.crate 32383 BLAKE2B 2f9666872894d1c85895437d1353f9e15be2bc8d004ffc8f0e5be95e9dd4b274797db3752eba1c0b5b6071c1b8a71e4857cae0b2aff1afdaa39e92e70be2e6fd SHA512 8d6dfdf661b0f7d0774cb9f61121f2daefd182ac8a2a0d24eab451febfbe1a664c815c163d34a7f3d15a54915a8e22e6c6cd10e89cb7d7598d48d81ad6a3c256
-DIST proc-macro2-1.0.60.crate 44160 BLAKE2B 3cca40d5ffa85607212ea8da63995b35b1d59bf077ad1f708bb08f20a3f3d477e934205008984bf2e947e6e53689192df1d437772c75148e122e0f1f4fe43455 SHA512 2a3d33d2e42e3b7edac7a099dcaf83c43ad47852217424c2bcf8ed5b894292975ef5a11df01ebb3479971e94d5b032b9d043c28bed476d6f7087fb9297fbaac0
 DIST proc-macro2-1.0.67.crate 43683 BLAKE2B a7f485d058ffb654c22ad01088756d8050780e559d86f96590e284c3babf1bb59ce347400c1681b296c6f58e2d42ed67d3e458483368399c22d7810685adcbc6 SHA512 3827f5f698aaecc168a03643e330e03aca7b0de98bd57dc97507c1bd53b6ec64752a1f4dee4c8a12ab02f410775a11f5ce7b0d36ec0e1fbbec197e3d7e199eab
 DIST pyo3-0.18.3.crate 420236 BLAKE2B bc00a825a67ed3590b31d3ea6bd77f6c4c927c0355d9d03ce64ca44e36ae3e29ab4d891bf2d94ca074b3bf858e077c516dc64e4620f875fe1e8fbffb5c9db1ec SHA512 39f044a19a42a5e2f46049431fbe3fe10c14d12a4741cc789b42de7cbf448bcbded7fe38a0f124d994ff9bcd3d95a19305dbfdc7462331fda3e6686cc4289be5
 DIST pyo3-build-config-0.18.3.crate 29137 BLAKE2B 5fa645b64f50a078f38cc10a27ed52bd7e7aadd8a069c05ec2963f0b7c869b94d29eddda97cc31d200cf749ab8e2cd9cd1ea00e75620287e9187745ae0e100a5 SHA512 7ccad5f245e84895e147389f05270f32d12f81aba46bcd0dc184b8d62af2ea579efc50383502efda40601c981c4dbcf911aa7d8192364caa2e177ad939062cdb
 DIST pyo3-ffi-0.18.3.crate 64474 BLAKE2B 32bedfb4c7d88e539e958af0dd48af311934a817282a01f860af7cd824fa1e3825c505463b78cda57541bea8ccbbedacdc0f67bef686e6775fab3787c26c6d2c SHA512 55240c7824ad1e5c69e05a31ec03e2064290c89c4c98f06c3ebc38c311a10b1690571c977a103790ddcc9623ac42fbf525fb028e910baedb9acafe39fd6e4a82
 DIST pyo3-macros-0.18.3.crate 7175 BLAKE2B 424cda4d0d75c7d4df6aeab0a475fc744039c9a663215c633e62762083930eb6736348f431b6f00d11a093961433fb13fb4c9da8a18268d1904e933157255646 SHA512 2b643ec3451267e836076bd79d110826fa0a2407955543c8a6a46b0dd16c477eb3ad919d51b7beca90eca2938a59577b32e1e67169df67429fac4cfaae5bf5ab
 DIST pyo3-macros-backend-0.18.3.crate 48922 BLAKE2B 4937f6d9459c6651f85fd520e4783c051f28932192d02aba5711fbf0294ed617f5b0b35ebbac74f3e6048a3fd3b75028518ebadf1277eefaa501015a91269c77 SHA512 1e607e4925486e1a48748ef3163666910a06f9a4f4a2fd7eb6a6af87ea37b5b7edb9d3ab4958e6fe907a55c5f4bcb702a251d836dc3b57c4ab1c5d9248b8cd35
-DIST quote-1.0.28.crate 28382 BLAKE2B 9fb16c3bb2a7fec3d8138ffec1f58277061f4a643c9051e1f6525f9e347ed9de41a3797eb3140a6dd828526eb4114c1f7ca562151dc933f338d64b175ed35d9f SHA512 846d718153f78cbae6dc714caa9413a5d5964bcc5e032f5c6c5356c62c33bf22635955ebdff0dede69ba1c9657387e65d61de7c537f6f56f8060721dfa52d735
 DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c
 DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde
-DIST ryu-1.0.13.crate 46823 BLAKE2B c6d661cbff5e7b273da5a6bb704bb1910b897c55d854b05bd417f53853a832791afc351e5a5aeaa94ba99a8fe64c8a930221c52a8784519728da748371a4ae04 SHA512 25f60216d91e68cb47695ce4e966fae674d5b3e4b0cf33e740248c1605fdcf0c963acd278a485c5b4bb0a1c1144002e73173592222af4989df7a4ba402508c13
 DIST ryu-1.0.15.crate 46906 BLAKE2B 6d6949e43aaa27fba0ec6002fa11ba859af8d867f87c90d88413267186abbf6302b817985bca3d577ab3fab2e319e11756f144473a16330dfd8fc7b604cdc4b3 SHA512 4655b5647f919082a9b84b889539ae7fb23a1201057cf280efe79c58cb5f040864efb7812cda5021bf6d34838a15d173ac8bdb0fb9fa2dba85173d3efa5a826b
-DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
-DIST serde-1.0.164.crate 77057 BLAKE2B a3c9c7deaa841a559ec901eed72a768e0718a77683897a84149dc8211f3e6f8f016e6b86e5b3c7c3c3d512486dd7fdda2860f69e7d9e600fff6ca6da8870bfd4 SHA512 17376fad0d3f0fc696d713c0eec81fc4a83992f6f9dfbed7c3e700e7ca8a3241abd46d4c11303d26a5fe049ddaf3308c2e76b650cc7350e03a1e34002700552a
 DIST serde-1.0.188.crate 76230 BLAKE2B 81e92adf17e3f2ce73c82e3069b8fd656211cfeb6755abd338b74d52f748f5bba6690abf5c83ea2a126fbd6187bc587b539f0ebcf621e928085876f28fbb9513 SHA512 7d42ce834bcd1034f8ccbcd6646cc93f8e189e344f29f4d7b0ab148ba11ce7848d0ab986dce7a0245fcd6893243f5768f7bc0ca9c24c75c53585ecc899d312d2
 DIST serde_derive-1.0.188.crate 55563 BLAKE2B 3b24044915a704d9d8a2cae6e6547ecffea7ee3fd4260ddb2bf7fa38b23fd7fc597b61ac28bf65b9f0d45e18ffd6bc7596f5a3d602cc79835697fb3f5440242f SHA512 fa9132a319f7829e6afad65289031be99255466d76270875d9d81f82f63e53592eaef5452d0df38da92e9d0b6f2b37e91026635fff4bf597b0ae662b71b5eff0
-DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae
 DIST smallvec-1.11.0.crate 34680 BLAKE2B e54d56f6bbffbfa7ce5fe5f04e325b2e5cf19d290e4be278bc00a136e26284625b9c18c7c2b10b7fb8fad0ea7e3770f3cdbcfbaa913f5ac08d0a2f8b4e0de188 SHA512 41bfbecbc2c244497568a41724d65791ec3fd6d8057813d521367cca316c09c2b28fb3973826236b01c1f5d2f905d8d22b0c3c47f957a9ff5d7685591f15ccd7
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
 DIST syn-2.0.37.crate 243250 BLAKE2B b81750ed52bf75bf944542c373a88f5a54421c230c86f23d0ed3e5680d85bb454251bf43e0ad7bd3e2464e6df579550cca1e17e8b044ba62a27a25f3940ff20b SHA512 5cc8f2a17f891477a9b2078580bcb4c5dec0b540fdc4d2c0b8dd51972c734ff4519e891166c1c5f6d35b73bfb564ac747836f7487481a2ea26fb7d8405835023
 DIST target-lexicon-0.12.11.crate 24594 BLAKE2B cf06720caecb5b5758f05c6375fa600da9260aac04017458060406a042dc578d51a2c5b6f189345d45dacea42ba01fbe46853d07f70d7b37cba17d87aa101f9a SHA512 f38701a8e9dd17b7db591b1b4c82c3b75d317e003262bb7b09b9cabd3afab5ab79c02a7dd524910b6941ada3a8f1378ea9e199b2b5938f8f01ee75bb0eae8718
-DIST target-lexicon-0.12.8.crate 24518 BLAKE2B c76d50d34e5da9431982ee446cb2f586db61182f928a25d862021b6fc32afa9ef8eccf51624c3b63442b90a4c0d8042ceb30d00122cfcc142f69a91ffdea222a SHA512 613af05fb80fe8967eef7b640d6b1a33eac5e6f3e70e1b26043b0f5e5b1356b4509b4d4daf0474c8d24d019c5e1d4ef8f950e092bebc14174930ebb60c6e151a
 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
 DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
-DIST unicode-ident-1.0.9.crate 41978 BLAKE2B 4e78cefb4e7d7f173f1826a5ab6c8ffde386fea67cf3227bd22e6a6e65d3348dc53c9438e6bde9af06fb5e04b0beac866209d2426e7f04cd10b2435db85df7e3 SHA512 4d8cffe699c6f15ee82ab5f5a73421a6bb8b1a476237aefefa6e932c45c30683a4fb015f138bce99d7cb27a27fb7972909c828e77daef091da84ec162315625a
 DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c
 DIST unicode-segmentation-1.10.1.crate 98416 BLAKE2B 4c391ad34c5f8a00096ce89793b15212555f2d8a367f3ae78f26a36c5897b69f3efcd280a1bd3eb3f61c87b8a26061804b1cd56e1c1500cbcd62e8bc74520014 SHA512 e96224bba73fe9a167bbf226bb13fe5bea085765a90f7232cb20b42f3c584242b7291aeba1eb8edbe2ae40e5bee2f4714f434324f79316b22e8437c77a50e86b
 DIST unindent-0.1.11.crate 7700 BLAKE2B d4d1dde410c4194acb51f74f374cf11fa872e49fad8f5f24b596d72476403e5e312fedf7b0bcb1027384d53c8de565368d63c30eaf70a6e6cd958b82e5288ca3 SHA512 f800d6c37fe72477908c91457a738a73d2b8085bb5ae303d6d954405d6ccd98833b5da16a12c3ad1ab75d32a68dedc706dfaacc0fcbb95571dd829cdc03a356a
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
-DIST windows-targets-0.48.0.crate 7466 BLAKE2B 4ef6d89ad5b1acf26a1a24348122b86d3943bd95935499bc9032fbc7aa01c04999c723df7fecb4989854cb6b7cceffe141537dfb05a9eaf3902c4cb490533116 SHA512 1d2a29602a1e0846c8577ec9167c5f9972091998a5df449d67b13ad918bf37680e7f97247baf5e3010c166d0b3182418c2925470998b92893ee9469939b91e22
 DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709
-DIST windows_aarch64_gnullvm-0.48.0.crate 366543 BLAKE2B 9b10f65089fe6da3ff38a1061783f635644ae84f567f891eaced280af68f7ff3919b34289e8850aa34554bb0346903273ff0a7fa743ca8794c2d23a9f1b0185f SHA512 80c5aa74c5669f7acff3882a8e7575f15e8d7cc58c11a1cb731ff423eb9cc9ba43cc6b80e52803c0d44e6a9001655ba87de6f43a9fe858da6d6e3a5c983a2711
 DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996
-DIST windows_aarch64_msvc-0.48.0.crate 671479 BLAKE2B 0c80f210437628e1d878d1d14e884fea532c7539b3030aa76d46f27d02372c715c6e33d7efdbbd770666472b44a66c30711a33d819ede9cdcd51c96355802d45 SHA512 617e47a7202f1db4dbd3ecea509682135ccd85e3a458c0331b9bc7aa1d84e5756b59c881cb098d5c6d4c951248d13c8253a8e8a50938e1997bd19ceba77262df
 DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff
-DIST windows_i686_gnu-0.48.0.crate 741490 BLAKE2B 5a4a584f8d8ee5bbd2d4c5b6749a66f2d43fc9e4ef90faab2227709b270f0d46fc26578c029edd96877c71309316ddb32d91c39f46d88f9a484c614f866e3dbe SHA512 15149fdd48b61b6d993acd392dbd353d0280d984ea88745217e4207937174bb90cdd9701f69ff0fe06a842f03607cbb57937d20d79ab577181e605a8a8fadc68
 DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a
-DIST windows_i686_msvc-0.48.0.crate 730056 BLAKE2B 4e4ad6ed94948145199c2ed50fc65e4af08455a0fd058bb0f763d481f30b029f99a2b8dbac087b29e762500a19270f6683baf62ba99d141eb002a5b0b5c8ea05 SHA512 11a50800e709712dbea907275bc0faa46d2eb2969118445ed5b932d9c5957a09592a5b26a40e554c1f5fd56c6d074a07637e6f88eedd2224e1001e62df7b469b
 DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e
-DIST windows_x86_64_gnu-0.48.0.crate 703595 BLAKE2B b227efb78a99c43d0538cceadada3fa1840df29adc665787fdcf845b73e77d782da8a9f9aa602e1da61401b550d0107176feb6c397c922a6240b38cc8f04a180 SHA512 38eff1164fb37dbd2bbe53404b20cba92de84cbbd5e4eb9ad60d51fb43d6fdb8b87a1488e2c88ebd4b3ff3b708f93fdc05df4b14a285d3ff11c33ff0d9828602
 DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74
-DIST windows_x86_64_gnullvm-0.48.0.crate 366536 BLAKE2B 295dc3aef18c604d1579978045f4058b1a315083a8ab842bddf5800ec3460b1530ad88c3464acab712a229290aca235810de8a3b6a253859a354d9fa97277e58 SHA512 8d82fad4c8445030844708aa026a62f1ca43362b8e15f14b0d226c7e9cda04ffa0715087b6a025dbb738e8891de24fcc4a2df071a532917cf03c4a46f934f396
 DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
-DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b7d9efeed5553df67bd2bd6f30f1668a645186e4824f9ef556a5abc84ace10b1b437b6325bbda6df5a64ce880d7dcb743ac786 SHA512 6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
diff --git a/dev-python/jellyfish/jellyfish-1.0.0.ebuild b/dev-python/jellyfish/jellyfish-1.0.0.ebuild
deleted file mode 100644
index 620e3095fdb3..000000000000
--- a/dev-python/jellyfish/jellyfish-1.0.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-CRATES="
-	ahash@0.8.3
-	autocfg@1.1.0
-	bitflags@1.3.2
-	cfg-if@1.0.0
-	csv-core@0.1.10
-	csv@1.2.2
-	getrandom@0.2.10
-	indoc@1.0.9
-	itoa@1.0.6
-	libc@0.2.146
-	lock_api@0.4.10
-	memchr@2.5.0
-	memoffset@0.8.0
-	once_cell@1.18.0
-	parking_lot@0.12.1
-	parking_lot_core@0.9.8
-	proc-macro2@1.0.60
-	pyo3-build-config@0.18.3
-	pyo3-ffi@0.18.3
-	pyo3-macros-backend@0.18.3
-	pyo3-macros@0.18.3
-	pyo3@0.18.3
-	quote@1.0.28
-	redox_syscall@0.3.5
-	ryu@1.0.13
-	scopeguard@1.1.0
-	serde@1.0.164
-	smallvec@1.10.0
-	syn@1.0.109
-	target-lexicon@0.12.8
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	unicode-ident@1.0.9
-	unicode-normalization@0.1.22
-	unicode-segmentation@1.10.1
-	unindent@0.1.11
-	version_check@0.9.4
-	wasi@0.11.0+wasi-snapshot-preview1
-	windows-targets@0.48.0
-	windows_aarch64_gnullvm@0.48.0
-	windows_aarch64_msvc@0.48.0
-	windows_i686_gnu@0.48.0
-	windows_i686_msvc@0.48.0
-	windows_x86_64_gnu@0.48.0
-	windows_x86_64_gnullvm@0.48.0
-	windows_x86_64_msvc@0.48.0
-"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Python module for doing approximate and phonetic matching of strings"
-HOMEPAGE="
-	https://github.com/jamesturk/jellyfish/
-	https://pypi.org/project/jellyfish/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
-"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/jellyfish/_rustyfish.*.so"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jschema_to_python/Manifest b/dev-python/jschema-to-python/Manifest
index da7796f56a79..da7796f56a79 100644
--- a/dev-python/jschema_to_python/Manifest
+++ b/dev-python/jschema-to-python/Manifest
diff --git a/dev-python/jschema_to_python/jschema_to_python-1.2.3-r1.ebuild b/dev-python/jschema-to-python/jschema-to-python-1.2.3-r1.ebuild
index 6341963f77ea..492938d91f98 100644
--- a/dev-python/jschema_to_python/jschema_to_python-1.2.3-r1.ebuild
+++ b/dev-python/jschema-to-python/jschema-to-python-1.2.3-r1.ebuild
@@ -5,12 +5,14 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 DISTUTILS_USE_PEP517=setuptools
+
 inherit distutils-r1 pypi
 
 DESCRIPTION="Generate source code for Python classes from a JSON schema"
 HOMEPAGE="
 	https://pypi.org/project/jschema-to-python/
-	https://github.com/microsoft/jschema-to-python/"
+	https://github.com/microsoft/jschema-to-python/
+"
 
 LICENSE="MIT"
 SLOT="0"
@@ -19,8 +21,10 @@ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
 	dev-python/jsonpickle[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]"
+	dev-python/pbr[${PYTHON_USEDEP}]
+"
 BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]"
+	dev-python/pbr[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/jschema_to_python/metadata.xml b/dev-python/jschema-to-python/metadata.xml
index a0d4c5913ba0..a0d4c5913ba0 100644
--- a/dev-python/jschema_to_python/metadata.xml
+++ b/dev-python/jschema-to-python/metadata.xml
diff --git a/dev-python/jsonpickle/jsonpickle-3.0.2.ebuild b/dev-python/jsonpickle/jsonpickle-3.0.2.ebuild
index c8f90a491f74..8c2d48fe7c84 100644
--- a/dev-python/jsonpickle/jsonpickle-3.0.2.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-3.0.2.ebuild
@@ -26,12 +26,14 @@ BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/feedparser[${PYTHON_USEDEP}]
-		dev-python/gmpy[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
 		dev-python/simplejson[${PYTHON_USEDEP}]
 		dev-python/sqlalchemy[${PYTHON_USEDEP}]
 		dev-python/ujson[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/gmpy[${PYTHON_USEDEP}]
+			dev-python/pandas[${PYTHON_USEDEP}]
+		' python3_{10..11})
 	)
 "
 
@@ -53,6 +55,14 @@ python_test() {
 		# unpackaged bson dependency
 		tests/bson_test.py
 	)
+
+	if ! has_version "dev-python/gmpy[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=( jsonpickle/ext/gmpy.py )
+	fi
+	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=( jsonpickle/ext/pandas.py )
+	fi
+
 	epytest
 }
 
diff --git a/dev-python/jupyter-events/Manifest b/dev-python/jupyter-events/Manifest
index 415d36b3cb99..619bd4fbd503 100644
--- a/dev-python/jupyter-events/Manifest
+++ b/dev-python/jupyter-events/Manifest
@@ -1,4 +1,2 @@
-DIST jupyter_events-0.5.0.tar.gz 55838 BLAKE2B a3ac815a28d2592a10394569726b76de75cb3baab0bab4c1f276da33375ba93d6bfed71fbfaca404a238b7af58ebd7e75dd7fdf6c8717141517c2f790eeb9514 SHA512 49c21f0d5dce18b137f73911b0272919a56c972561deceb228558ea369f2091ce219ac335eec002b22ca1465b2622330fb3d8973d142df4b76e350345cb6249a
-DIST jupyter_events-0.6.3.tar.gz 59393 BLAKE2B 0f747cc099e8b0e30024b7fa61007d4449fad1be3b4807021df28668969dca18087634606d6f2c453da81da9c107576133e13ec373cf34362d0182320e84e809 SHA512 a9b9c180f7b4759a3d2c99421947a837020149ec1a91ad0cd06971d7ae99ad1050652f01f78c9478ce3fd3f1a1ab6b579e90c279fcee0771546f3c346becd61f
 DIST jupyter_events-0.7.0.tar.gz 59717 BLAKE2B 80ff725f4a39495ef7bf447d3bf1dcd3d7c28875c16f082788d948efec8498f01d74bb59b771537e22be7c57c0e75dd9bba70e7802262d676b531318a18d93cb SHA512 ce5ddabc4f540bfa6808319b783ad8ffcb908bc26e7435293bda4ed88221126284dfda1aafc165c8a13bdd6056ec0477915b008f4788bc19730718d4a9e3f162
 DIST jupyter_events-0.8.0.tar.gz 60373 BLAKE2B dc58ae9a561f7ffd81758b116d5cb93e6ee5d4bdc5ee3d067103aefbe66e01e1809e7194617f541abec84efdd81b4311024b2b50f863bad62127218eafdfbd31 SHA512 9b43e1f0f5e390455fac52971f41695a7c0d853ac4a84493e31efdd61a183e4a41c7824f963b89ee369cac8945d6258857b864315bbafe8be15145eee7075afd
diff --git a/dev-python/jupyter-events/jupyter-events-0.5.0.ebuild b/dev-python/jupyter-events/jupyter-events-0.5.0.ebuild
deleted file mode 100644
index bb8e485437ae..000000000000
--- a/dev-python/jupyter-events/jupyter-events-0.5.0.ebuild
+++ /dev/null
@@ -1,40 +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_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Jupyter Event System library"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/jupyter_events/
-	https://pypi.org/project/jupyter-events/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-
-# jsonschema[format-nongpl] deps are always on in our ebuild
-RDEPEND="
-	>=dev-python/jsonschema-4.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-json-logger-2.0.4[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/rich[${PYTHON_USEDEP}]
-	)
-"
-
-# TODO: package jupyterlite-sphinx
-# distutils_enable_sphinx docs
-distutils_enable_tests pytest
diff --git a/dev-python/jupyter-events/jupyter-events-0.6.3.ebuild b/dev-python/jupyter-events/jupyter-events-0.6.3.ebuild
deleted file mode 100644
index 70d21e546bc8..000000000000
--- a/dev-python/jupyter-events/jupyter-events-0.6.3.ebuild
+++ /dev/null
@@ -1,40 +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_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Jupyter Event System library"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/jupyter_events/
-	https://pypi.org/project/jupyter-events/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# jsonschema[format-nongpl] deps are always on in our ebuild
-RDEPEND="
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-json-logger-2.0.4[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/rich[${PYTHON_USEDEP}]
-	)
-"
-
-# TODO: package jupyterlite-sphinx
-# distutils_enable_sphinx docs
-distutils_enable_tests pytest
diff --git a/dev-python/jupyter-lsp/jupyter-lsp-2.2.0.ebuild b/dev-python/jupyter-lsp/jupyter-lsp-2.2.0.ebuild
index a6d78818ae01..c5faabcbdd17 100644
--- a/dev-python/jupyter-lsp/jupyter-lsp-2.2.0.ebuild
+++ b/dev-python/jupyter-lsp/jupyter-lsp-2.2.0.ebuild
@@ -24,31 +24,6 @@ RDEPEND="
 	>=dev-python/jupyter-server-1.1.2[${PYTHON_USEDEP}]
 "
 
-EPYTEST_DESELECT=(
-	# Not packaged
-	jupyter_lsp/tests/test_detect.py::test_r_package_detection
-	"jupyter_lsp/tests/test_listener.py::test_listeners[bash-language-server]"
-	"jupyter_lsp/tests/test_listener.py::test_listeners[dockerfile-language-server-nodejs]"
-	"jupyter_lsp/tests/test_listener.py::test_listeners[pylsp]"
-	"jupyter_lsp/tests/test_listener.py::test_listeners[sql-language-server]"
-	"jupyter_lsp/tests/test_listener.py::test_listeners[typescript-language-server]"
-	"jupyter_lsp/tests/test_listener.py::test_listeners[unified-language-server]"
-	"jupyter_lsp/tests/test_listener.py::test_listeners[vscode-css-languageserver-bin]"
-	"jupyter_lsp/tests/test_listener.py::test_listeners[vscode-html-languageserver-bin]"
-	"jupyter_lsp/tests/test_listener.py::test_listeners[vscode-json-languageserver-bin]"
-	"jupyter_lsp/tests/test_listener.py::test_listeners[yaml-language-server]"
-	"jupyter_lsp/tests/test_session.py::test_start_known[bash-language-server]"
-	"jupyter_lsp/tests/test_session.py::test_start_known[dockerfile-language-server-nodejs]"
-	"jupyter_lsp/tests/test_session.py::test_start_known[pylsp]"
-	"jupyter_lsp/tests/test_session.py::test_start_known[sql-language-server]"
-	"jupyter_lsp/tests/test_session.py::test_start_known[typescript-language-server]"
-	"jupyter_lsp/tests/test_session.py::test_start_known[unified-language-server]"
-	"jupyter_lsp/tests/test_session.py::test_start_known[vscode-css-languageserver-bin]"
-	"jupyter_lsp/tests/test_session.py::test_start_known[vscode-html-languageserver-bin]"
-	"jupyter_lsp/tests/test_session.py::test_start_known[vscode-json-languageserver-bin]"
-	"jupyter_lsp/tests/test_session.py::test_start_known[yaml-language-server]"
-)
-
 distutils_enable_tests pytest
 
 python_prepare_all() {
@@ -58,6 +33,43 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Not packaged
+		jupyter_lsp/tests/test_detect.py::test_r_package_detection
+		"jupyter_lsp/tests/test_listener.py::test_listeners[bash-language-server]"
+		"jupyter_lsp/tests/test_listener.py::test_listeners[dockerfile-language-server-nodejs]"
+		"jupyter_lsp/tests/test_listener.py::test_listeners[pylsp]"
+		"jupyter_lsp/tests/test_listener.py::test_listeners[sql-language-server]"
+		"jupyter_lsp/tests/test_listener.py::test_listeners[typescript-language-server]"
+		"jupyter_lsp/tests/test_listener.py::test_listeners[unified-language-server]"
+		"jupyter_lsp/tests/test_listener.py::test_listeners[vscode-css-languageserver-bin]"
+		"jupyter_lsp/tests/test_listener.py::test_listeners[vscode-html-languageserver-bin]"
+		"jupyter_lsp/tests/test_listener.py::test_listeners[vscode-json-languageserver-bin]"
+		"jupyter_lsp/tests/test_listener.py::test_listeners[yaml-language-server]"
+		"jupyter_lsp/tests/test_session.py::test_start_known[bash-language-server]"
+		"jupyter_lsp/tests/test_session.py::test_start_known[dockerfile-language-server-nodejs]"
+		"jupyter_lsp/tests/test_session.py::test_start_known[pylsp]"
+		"jupyter_lsp/tests/test_session.py::test_start_known[sql-language-server]"
+		"jupyter_lsp/tests/test_session.py::test_start_known[typescript-language-server]"
+		"jupyter_lsp/tests/test_session.py::test_start_known[unified-language-server]"
+		"jupyter_lsp/tests/test_session.py::test_start_known[vscode-css-languageserver-bin]"
+		"jupyter_lsp/tests/test_session.py::test_start_known[vscode-html-languageserver-bin]"
+		"jupyter_lsp/tests/test_session.py::test_start_known[vscode-json-languageserver-bin]"
+		"jupyter_lsp/tests/test_session.py::test_start_known[yaml-language-server]"
+	)
+
+	case ${EPYTHON} in
+		python3.12)
+			EPYTEST_DESELECT+=(
+				jupyter_lsp/tests/test_session.py::test_start_unknown
+			)
+			;;
+	esac
+
+	epytest
+}
+
 python_install_all() {
 	distutils-r1_python_install_all
 	mv "${ED}/usr/etc" "${ED}/etc" || die
diff --git a/dev-python/jupyter-server-mathjax/jupyter-server-mathjax-0.2.6.ebuild b/dev-python/jupyter-server-mathjax/jupyter-server-mathjax-0.2.6.ebuild
index 598b6d6a7b45..3816de74b98a 100644
--- a/dev-python/jupyter-server-mathjax/jupyter-server-mathjax-0.2.6.ebuild
+++ b/dev-python/jupyter-server-mathjax/jupyter-server-mathjax-0.2.6.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 
 inherit distutils-r1 pypi
 
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jupyter-server-1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild b/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild
index 78fb3c9baa99..bf2c5a5eb557 100644
--- a/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild
+++ b/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/terminado[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
index 8aab768bb4f2..b529ecfd465e 100644
--- a/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter-server/jupyter-server-2.8.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.8.0.ebuild
index e8b964b28e44..2e97204a4ead 100644
--- a/dev-python/jupyter-server/jupyter-server-2.8.0.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.8.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab-server/jupyterlab-server-2.25.0.ebuild b/dev-python/jupyterlab-server/jupyterlab-server-2.25.0.ebuild
index bbf02863bf3f..1673c960eadc 100644
--- a/dev-python/jupyterlab-server/jupyterlab-server-2.25.0.ebuild
+++ b/dev-python/jupyterlab-server/jupyterlab-server-2.25.0.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/jupyterlab/jupyterlab-4.0.7.ebuild b/dev-python/jupyterlab/jupyterlab-4.0.7.ebuild
index ade3634bd36a..5eb97854b550 100644
--- a/dev-python/jupyterlab/jupyterlab-4.0.7.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-4.0.7.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 
 inherit distutils-r1 pypi xdg
 
diff --git a/dev-python/keystoneauth1/Manifest b/dev-python/keystoneauth1/Manifest
index dd80febc7c5b..d4fbd09d6211 100644
--- a/dev-python/keystoneauth1/Manifest
+++ b/dev-python/keystoneauth1/Manifest
@@ -1,2 +1 @@
-DIST keystoneauth1-5.2.1.tar.gz 273214 BLAKE2B 1edeaf982dbdf9c4c0d3ba15762a37104bd355bc5de848d05bbc1d51b914875f8ff47be3777f57e03b10a0ad837f29c1ad8df8666a4839a51688afd6894706be SHA512 912833a84cc47e13db851cfd34e6d4e74d3f3594f15c5e5a94c318d7a720145cc226a85921a7aed6e1385b4b260fc3f966a1d558d5165af3bc39ed87e2a148ba
 DIST keystoneauth1-5.3.0.tar.gz 274216 BLAKE2B 873a0bde2507b4b4b2bfc748d77b1c0b8be321c51cff0376020e84a63cebd030b118c90765302ce8cd51467f5c615a9b289480a1105f4d7a4a86e96fe44f7089 SHA512 91a9f9359926932a2e78a9164f8a1f2d08da306cc83f011f9a19535795b6a7faa3af0673665444532893325a2fe752f1d6a18e04b84ea1b3db8c9d1647b4f3cb
diff --git a/dev-python/keystoneauth1/keystoneauth1-5.2.1.ebuild b/dev-python/keystoneauth1/keystoneauth1-5.2.1.ebuild
deleted file mode 100644
index cabc5bf46b37..000000000000
--- a/dev-python/keystoneauth1/keystoneauth1-5.2.1.ebuild
+++ /dev/null
@@ -1,61 +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_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud"
-HOMEPAGE="
-	https://opendev.org/openstack/keystoneauth/
-	https://github.com/openstack/keystoneauth/
-	https://pypi.org/project/keystoneauth1/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/betamax-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-		>=dev-python/requests-kerberos-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# relies on specific test runner name
-	sed -i -e 's:run\.py:unittest_or_fail.py:' \
-		keystoneauth1/tests/unit/test_session.py || die
-	# remove the test that requires hacking
-	rm keystoneauth1/tests/unit/test_hacking_checks.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	eunittest -b
-}
diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest
index a11d7c268c91..e9da2ac43cac 100644
--- a/dev-python/langdetect/Manifest
+++ b/dev-python/langdetect/Manifest
@@ -1 +1,3 @@
 DIST langdetect-1.0.9.tar.gz 981474 BLAKE2B ea8a9c3f16a2987c080742473bff4f2c1503f53fb3c2b40b0b1d6212bb6133ea22dce7864ffcfb8968c3a46b157d45cb3e2cf6f84bdbed0266cc716a853b032c SHA512 7558d674c47b080c79e43a00a25d2c7f77188cf60bea2cecb3bebb803d75e1aa42b43c74bd26ea1b541f4cb927421908882cbec01a91f0913984217e71ccc8db
+EBUILD langdetect-1.0.9.ebuild 493 BLAKE2B 0df8bce19bc80f79f8e76bcef5a4c2caf333365fe0cb9a3c076b7858bceded5a3e58921474f866a2709dd657b7ed330c1ec4a7f9d7bab0fcf1bc92d77cabc32d SHA512 ea2a1adcb133ac5fc951ba1aa90ef1ce3dfcc424e59727591763d4875aa044a74188be2d15fd89c6b2e83ed6ea04ec3d9851ed584ae79d2c2c127bde7d994b48
+MISC metadata.xml 457 BLAKE2B 630128a3e982b6d60cc7b9f74c79fcb5ee47a71a02c73a50af9da8cedb6fad8e20a7f74b881e5b25c6483b92c9edbd56552cd38b2d9cbfa8b3eb4530facea969 SHA512 674f4f5cd809c6c77bc14e0f5687fa972bef14bdfa0b3343c5d66b7163eef1906eb87d060c8288732f825de71dce291ad0b841a5f2f0dd230f957b5687e45d45
diff --git a/dev-python/langdetect/metadata.xml b/dev-python/langdetect/metadata.xml
index 736a1167c898..020e07f2a3dd 100644
--- a/dev-python/langdetect/metadata.xml
+++ b/dev-python/langdetect/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- 
- <origin>gentoo-guru-overlay</origin>
+ <maintainer type="person">
+  <email>marcin.deranek@slonko.net</email>
+  <name>Marcin Deranek</name>
+ </maintainer>
+ <upstream>
+  <bugs-to>https://github.com/Mimino666/langdetect/issues</bugs-to>
+ </upstream>
+ <origin>slonko-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 5b3170b008f3..54606413979b 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,2 +1,2 @@
-DIST M2Crypto-0.38.0.tar.gz 1241269 BLAKE2B 95433090e08ff72cd2b0779491dc38b89eca159b26812e763b5b8973e3d27249a96d5a2c983b59f414184f64beb8e455dc26979310378db89dd2081741d4d17d SHA512 b1e24e3101ce0dd9f17be4cabeddc2ec0f1228b270d74ef2fb38bae8807c5025b031d0743185f06370786a3dd5c3f42129720534dcff07ea4de3c727613f8d20
 DIST m2crypto-0.39.0.tar.gz 1250692 BLAKE2B 4c9edb767f7f80e9d58d23955d3cdd17e93c4a8aa9a9a0e3f220e7ec7ed845ec3ac7e916e275ad25c4d082cf78478b1adb3fb526d2b8024faf78575192b07809 SHA512 78ef9f6a6c21a460ae6debbc8a07b855d9f1fd5199bfe562dd2542ab50c69eeaf2691c0e8342bb47f0e565082672ff55c4f248285257a6f464629b52ff5d4bde
+DIST m2crypto-0.40.0.tar.gz 1168113 BLAKE2B 3c73db46495d43d953c089c51d97fab7c251c516524d4cc5ac137ed2cfb3613e0769be6c81bdc6391bc29e1737d7eb4425ffbecfe9b2bc17ca2a183c38cd7e93 SHA512 1520771be7b38e1a4c0f2c17732374123f0f007c4b9c7b6794aa1b0fdb5c57a43918d5ac03542e6a960213aa43cbe27227deef5e5224d3d79b6e2630a394e801
diff --git a/dev-python/m2crypto/files/m2crypto-0.37.1-openssl-fixes.patch b/dev-python/m2crypto/files/m2crypto-0.37.1-openssl-fixes.patch
deleted file mode 100644
index c249f7adbb80..000000000000
--- a/dev-python/m2crypto/files/m2crypto-0.37.1-openssl-fixes.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 73fbd1e646f6bbf202d4418bae80eb9941fbf552 Mon Sep 17 00:00:00 2001
-From: Casey Deccio <casey@deccio.net>
-Date: Fri, 8 Jan 2021 12:43:09 -0700
-Subject: [PATCH] Allow verify_cb_* to be called with ok=True
-
-With https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58
-OpenSSL allowed verificaton to continue on UNABLE_TO_VERIFY_LEAF_SIGNATURE
----
- tests/test_ssl.py | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_ssl.py b/tests/test_ssl.py
-index 92b6942..7a3271a 100644
---- a/tests/test_ssl.py
-+++ b/tests/test_ssl.py
-@@ -59,8 +59,13 @@ def allocate_srv_port():
- 
- 
- def verify_cb_new_function(ok, store):
--    assert not ok
-     err = store.get_error()
-+    # If err is X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE, then instead of
-+    # aborting, this callback is called to retrieve additional error
-+    # information.  In this case, ok might not be False.
-+    # See https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58
-+    if err != m2.X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE:
-+        assert not ok
-     assert err in [m2.X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT,
-                    m2.X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY,
-                    m2.X509_V_ERR_CERT_UNTRUSTED,
-@@ -618,7 +623,12 @@ class MiscSSLClientTestCase(BaseSSLClientTestCase):
- 
-     def verify_cb_old(self, ctx_ptr, x509_ptr, err, depth, ok):
-         try:
--            self.assertFalse(ok)
-+            # If err is X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE, then instead of
-+            # aborting, this callback is called to retrieve additional error
-+            # information.  In this case, ok might not be False.
-+            # See https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58
-+            if err != m2.X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE:
-+                self.assertFalse(ok)
-             self.assertIn(err,
-                           [m2.X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT,
-                            m2.X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY,
--- 
-2.31.1
-
-From d06eaa88a5f491827733f32027c46de3557fbd05 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
-Date: Fri, 19 Feb 2021 15:53:02 +0100
-Subject: [PATCH] Use of RSA_SSLV23_PADDING has been deprecated.
-
-Fixes #293.
----
- tests/test_rsa.py | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/tests/test_rsa.py b/tests/test_rsa.py
-index 3de5016..7299785 100644
---- a/tests/test_rsa.py
-+++ b/tests/test_rsa.py
-@@ -124,11 +124,6 @@ class RSATestCase(unittest.TestCase):
-             ptxt = priv.private_decrypt(ctxt, p)
-             self.assertEqual(ptxt, self.data)
- 
--        # sslv23_padding
--        ctxt = priv.public_encrypt(self.data, RSA.sslv23_padding)
--        res = priv.private_decrypt(ctxt, RSA.sslv23_padding)
--        self.assertEqual(res, self.data)
--
-         # no_padding
-         with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'):
-             priv.public_encrypt(self.data, RSA.no_padding)
--- 
-2.31.1
-
diff --git a/dev-python/m2crypto/files/m2crypto-libressl-0.31.0.patch b/dev-python/m2crypto/files/m2crypto-libressl-0.31.0.patch
deleted file mode 100644
index 10ed142b33e4..000000000000
--- a/dev-python/m2crypto/files/m2crypto-libressl-0.31.0.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-From fa56170c7adf5f124a48cf1074390adfc697272c Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan.strogin@gmail.com>
-Date: Wed, 9 Jan 2019 10:15:08 +0200
-Subject: [PATCH] Fix compilation with LibreSSL
-
----
- SWIG/_bio.i           |  8 +++++---
- SWIG/_evp.i           |  2 +-
- SWIG/_lib.i           |  2 +-
- SWIG/_lib11_compat.i  |  5 ++++-
- SWIG/_m2crypto_wrap.c | 11 ++++++++---
- SWIG/_ssl.i           |  4 ++--
- SWIG/_threads.i       | 10 +++++-----
- 7 files changed, 26 insertions(+), 16 deletions(-)
-
-diff --git a/SWIG/_bio.i b/SWIG/_bio.i
-index e85a275..8eada82 100644
---- a/SWIG/_bio.i
-+++ b/SWIG/_bio.i
-@@ -293,7 +293,7 @@ int bio_should_write(BIO* a) {
- }
- 
- /* Macros for things not defined before 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- static BIO_METHOD *
- BIO_meth_new( int type, const char *name )
- {
-@@ -325,11 +325,13 @@ BIO_meth_free( BIO_METHOD *meth )
- #define BIO_set_shutdown(b, x) (b)->shutdown = x
- #define BIO_get_shutdown(b) (b)->shutdown
- #define BIO_set_init(b, x)    b->init = x
--#define BIO_get_init(b) (b)->init
- #define BIO_set_data(b, x)    b->ptr = x
- #define BIO_clear_flags(b, x)    b->flags &= ~(x)
- #define BIO_get_data(b)    b->ptr
- #endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#define BIO_get_init(b) (b)->init
-+#endif
- 
- /* implment custom BIO_s_pyfd */
- 
-@@ -515,7 +517,7 @@ static long pyfd_ctrl(BIO *b, int cmd, long num, void *ptr) {
- }
- 
- void pyfd_init(void) {
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
-     methods_fdp = BIO_meth_new(
-         BIO_get_new_index()|BIO_TYPE_DESCRIPTOR|BIO_TYPE_SOURCE_SINK,
-         "python file descriptor");
-diff --git a/SWIG/_evp.i b/SWIG/_evp.i
-index d04e806..6fa9b38 100644
---- a/SWIG/_evp.i
-+++ b/SWIG/_evp.i
-@@ -19,7 +19,7 @@ Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved.
- #include <openssl/rsa.h>
- #include <openssl/opensslv.h>
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- 
- HMAC_CTX *HMAC_CTX_new(void) {
-     HMAC_CTX *ret = PyMem_Malloc(sizeof(HMAC_CTX));
-diff --git a/SWIG/_lib.i b/SWIG/_lib.i
-index c84b800..807d5f6 100644
---- a/SWIG/_lib.i
-+++ b/SWIG/_lib.i
-@@ -512,7 +512,7 @@ int passphrase_callback(char *buf, int num, int v, void *arg) {
- %inline %{
- 
- void lib_init() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-     SSLeay_add_all_algorithms();
-     ERR_load_ERR_strings();
- #endif
-diff --git a/SWIG/_lib11_compat.i b/SWIG/_lib11_compat.i
-index 1ec42dd..4234004 100644
---- a/SWIG/_lib11_compat.i
-+++ b/SWIG/_lib11_compat.i
-@@ -8,7 +8,7 @@
-  */
- 
- %{
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- #include <string.h>
- #include <openssl/engine.h>
-@@ -24,6 +24,9 @@ static void *CRYPTO_zalloc(size_t num, const char *file, int line)
-       return ret;
- }
- 
-+#endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-+
- #include <openssl/bn.h>
- 
- #ifndef BN_F_BN_GENCB_NEW
-diff --git a/SWIG/_m2crypto_wrap.c b/SWIG/_m2crypto_wrap.c
-index 0f07702..f168822 100644
---- a/SWIG/_m2crypto_wrap.c
-+++ b/SWIG/_m2crypto_wrap.c
-@@ -3838,7 +3838,7 @@ void threading_cleanup(void) {
- #include <ceval.h>
- 
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- #include <string.h>
- #include <openssl/engine.h>
-@@ -3854,6 +3854,9 @@ static void *CRYPTO_zalloc(size_t num, const char *file, int line)
-       return ret;
- }
- 
-+#endif
-+#ifdef OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-+
- #include <openssl/bn.h>
- 
- #ifndef BN_F_BN_GENCB_NEW
-@@ -5315,7 +5318,7 @@ int bio_should_write(BIO* a) {
- }
- 
- /* Macros for things not defined before 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- static BIO_METHOD *
- BIO_meth_new( int type, const char *name )
- {
-@@ -5347,11 +5350,13 @@ BIO_meth_free( BIO_METHOD *meth )
- #define BIO_set_shutdown(b, x) (b)->shutdown = x
- #define BIO_get_shutdown(b) (b)->shutdown
- #define BIO_set_init(b, x)    b->init = x
--#define BIO_get_init(b) (b)->init
- #define BIO_set_data(b, x)    b->ptr = x
- #define BIO_clear_flags(b, x)    b->flags &= ~(x)
- #define BIO_get_data(b)    b->ptr
- #endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#define BIO_get_init(b) (b)->init
-+#endif
- 
- /* implment custom BIO_s_pyfd */
- 
-diff --git a/SWIG/_ssl.i b/SWIG/_ssl.i
-index 7257656..40b0582 100644
---- a/SWIG/_ssl.i
-+++ b/SWIG/_ssl.i
-@@ -27,7 +27,7 @@ typedef unsigned __int64 uint64_t;
- #endif
- %}
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100005L
-+#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100005L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
- %include <openssl/safestack.h>
- #endif
- 
-@@ -261,7 +261,7 @@ void ssl_init(PyObject *ssl_err, PyObject *ssl_timeout_err) {
- }
- 
- const SSL_METHOD *tlsv1_method(void) {
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
-     PyErr_WarnEx(PyExc_DeprecationWarning,
-                  "Function TLSv1_method has been deprecated.", 1);
- #endif
-diff --git a/SWIG/_threads.i b/SWIG/_threads.i
-index 69adb9f..fd2285a 100644
---- a/SWIG/_threads.i
-+++ b/SWIG/_threads.i
-@@ -5,7 +5,7 @@
- #include <pythread.h>
- #include <openssl/crypto.h>
- 
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
- #define CRYPTO_num_locks()      (CRYPTO_NUM_LOCKS)
- static PyThread_type_lock lock_cs[CRYPTO_num_locks()];
- static long lock_count[CRYPTO_num_locks()];
-@@ -13,7 +13,7 @@ static int thread_mode = 0;
- #endif
- 
- void threading_locking_callback(int mode, int type, const char *file, int line) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
-         if (mode & CRYPTO_LOCK) {
-                 PyThread_acquire_lock(lock_cs[type], WAIT_LOCK);
-                 lock_count[type]++;
-@@ -25,7 +25,7 @@ void threading_locking_callback(int mode, int type, const char *file, int line)
- }
- 
- unsigned long threading_id_callback(void) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
-     return (unsigned long)PyThread_get_thread_ident();
- #else
-     return (unsigned long)0;
-@@ -35,7 +35,7 @@ unsigned long threading_id_callback(void) {
- 
- %inline %{
- void threading_init(void) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
-     int i;
-     if (!thread_mode) {
-         for (i=0; i<CRYPTO_num_locks(); i++) {
-@@ -50,7 +50,7 @@ void threading_init(void) {
- }
- 
- void threading_cleanup(void) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
-     int i;
-     if (thread_mode) {
-         CRYPTO_set_locking_callback(NULL);
--- 
-2.20.1
-
diff --git a/dev-python/m2crypto/files/m2crypto-libressl-0.38.0.patch b/dev-python/m2crypto/files/m2crypto-libressl-0.38.0.patch
deleted file mode 100644
index 26a234a3daee..000000000000
--- a/dev-python/m2crypto/files/m2crypto-libressl-0.38.0.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-From fa56170c7adf5f124a48cf1074390adfc697272c Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan.strogin@gmail.com>
-Date: Wed, 9 Jan 2019 10:15:08 +0200
-Subject: [PATCH] Fix compilation with LibreSSL
-
----
- SWIG/_bio.i           |  8 +++++---
- SWIG/_evp.i           |  2 +-
- SWIG/_lib.i           |  2 +-
- SWIG/_lib11_compat.i  |  5 ++++-
- SWIG/_m2crypto_wrap.c | 11 ++++++++---
- SWIG/_ssl.i           |  4 ++--
- SWIG/_threads.i       | 10 +++++-----
- 7 files changed, 26 insertions(+), 16 deletions(-)
-
-diff --git a/src/SWIG/_bio.i b/src/SWIG/_bio.i
-index e85a275..8eada82 100644
---- a/src/SWIG/_bio.i
-+++ b/src/SWIG/_bio.i
-@@ -293,7 +293,7 @@ int bio_should_write(BIO* a) {
- }
- 
- /* Macros for things not defined before 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- static BIO_METHOD *
- BIO_meth_new( int type, const char *name )
- {
-@@ -325,11 +325,13 @@ BIO_meth_free( BIO_METHOD *meth )
- #define BIO_set_shutdown(b, x) (b)->shutdown = x
- #define BIO_get_shutdown(b) (b)->shutdown
- #define BIO_set_init(b, x)    b->init = x
--#define BIO_get_init(b) (b)->init
- #define BIO_set_data(b, x)    b->ptr = x
- #define BIO_clear_flags(b, x)    b->flags &= ~(x)
- #define BIO_get_data(b)    b->ptr
- #endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#define BIO_get_init(b) (b)->init
-+#endif
- 
- /* implment custom BIO_s_pyfd */
- 
-@@ -515,7 +517,7 @@ static long pyfd_ctrl(BIO *b, int cmd, long num, void *ptr) {
- }
- 
- void pyfd_init(void) {
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
-     methods_fdp = BIO_meth_new(
-         BIO_get_new_index()|BIO_TYPE_DESCRIPTOR|BIO_TYPE_SOURCE_SINK,
-         "python file descriptor");
-diff --git a/src/SWIG/_evp.i b/src/SWIG/_evp.i
-index d04e806..6fa9b38 100644
---- a/src/SWIG/_evp.i
-+++ b/src/SWIG/_evp.i
-@@ -19,7 +19,7 @@ Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved.
- #include <openssl/rsa.h>
- #include <openssl/opensslv.h>
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- 
- HMAC_CTX *HMAC_CTX_new(void) {
-     HMAC_CTX *ret = PyMem_Malloc(sizeof(HMAC_CTX));
-diff --git a/src/SWIG/_lib.i b/src/SWIG/_lib.i
-index c84b800..807d5f6 100644
---- a/src/SWIG/_lib.i
-+++ b/src/SWIG/_lib.i
-@@ -512,7 +512,7 @@ int passphrase_callback(char *buf, int num, int v, void *arg) {
- %inline %{
- 
- void lib_init() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-     SSLeay_add_all_algorithms();
-     ERR_load_ERR_strings();
- #endif
-diff --git a/src/SWIG/_lib11_compat.i b/src/SWIG/_lib11_compat.i
-index 1ec42dd..4234004 100644
---- a/src/SWIG/_lib11_compat.i
-+++ b/src/SWIG/_lib11_compat.i
-@@ -8,7 +8,7 @@
-  */
- 
- %{
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- #include <string.h>
- #include <openssl/engine.h>
-@@ -24,6 +24,9 @@ static void *CRYPTO_zalloc(size_t num, const char *file, int line)
-       return ret;
- }
- 
-+#endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-+
- #include <openssl/bn.h>
- 
- #ifndef BN_F_BN_GENCB_NEW
-diff --git a/src/SWIG/_m2crypto_wrap.c b/src/SWIG/_m2crypto_wrap.c
-index 0f07702..f168822 100644
---- a/src/SWIG/_m2crypto_wrap.c
-+++ b/src/SWIG/_m2crypto_wrap.c
-@@ -3838,7 +3838,7 @@ void threading_cleanup(void) {
- #include <ceval.h>
- 
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- #include <string.h>
- #include <openssl/engine.h>
-@@ -3854,6 +3854,9 @@ static void *CRYPTO_zalloc(size_t num, const char *file, int line)
-       return ret;
- }
- 
-+#endif
-+#ifdef OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-+
- #include <openssl/bn.h>
- 
- #ifndef BN_F_BN_GENCB_NEW
-@@ -5315,7 +5318,7 @@ int bio_should_write(BIO* a) {
- }
- 
- /* Macros for things not defined before 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- static BIO_METHOD *
- BIO_meth_new( int type, const char *name )
- {
-@@ -5347,11 +5350,13 @@ BIO_meth_free( BIO_METHOD *meth )
- #define BIO_set_shutdown(b, x) (b)->shutdown = x
- #define BIO_get_shutdown(b) (b)->shutdown
- #define BIO_set_init(b, x)    b->init = x
--#define BIO_get_init(b) (b)->init
- #define BIO_set_data(b, x)    b->ptr = x
- #define BIO_clear_flags(b, x)    b->flags &= ~(x)
- #define BIO_get_data(b)    b->ptr
- #endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#define BIO_get_init(b) (b)->init
-+#endif
- 
- /* implment custom BIO_s_pyfd */
- 
-diff --git a/src/SWIG/_ssl.i b/src/SWIG/_ssl.i
-index 7257656..40b0582 100644
---- a/src/SWIG/_ssl.i
-+++ b/src/SWIG/_ssl.i
-@@ -27,7 +27,7 @@ typedef unsigned __int64 uint64_t;
- #endif
- %}
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100005L
-+#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100005L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
- %include <openssl/safestack.h>
- #endif
- 
-@@ -261,7 +261,7 @@ void ssl_init(PyObject *ssl_err, PyObject *ssl_timeout_err) {
- }
- 
- const SSL_METHOD *tlsv1_method(void) {
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
-     PyErr_WarnEx(PyExc_DeprecationWarning,
-                  "Function TLSv1_method has been deprecated.", 1);
- #endif
-diff --git a/src/SWIG/_threads.i b/src/SWIG/_threads.i
-index 69adb9f..fd2285a 100644
---- a/src/SWIG/_threads.i
-+++ b/src/SWIG/_threads.i
-@@ -5,7 +5,7 @@
- #include <pythread.h>
- #include <openssl/crypto.h>
- 
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
- #define CRYPTO_num_locks()      (CRYPTO_NUM_LOCKS)
- static PyThread_type_lock lock_cs[CRYPTO_num_locks()];
- static long lock_count[CRYPTO_num_locks()];
-@@ -13,7 +13,7 @@ static int thread_mode = 0;
- #endif
- 
- void threading_locking_callback(int mode, int type, const char *file, int line) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
-         if (mode & CRYPTO_LOCK) {
-                 PyThread_acquire_lock(lock_cs[type], WAIT_LOCK);
-                 lock_count[type]++;
-@@ -25,7 +25,7 @@ void threading_locking_callback(int mode, int type, const char *file, int line)
- }
- 
- unsigned long threading_id_callback(void) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
-     return (unsigned long)PyThread_get_thread_ident();
- #else
-     return (unsigned long)0;
-@@ -35,7 +35,7 @@ unsigned long threading_id_callback(void) {
- 
- %inline %{
- void threading_init(void) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
-     int i;
-     if (!thread_mode) {
-         for (i=0; i<CRYPTO_num_locks(); i++) {
-@@ -50,7 +50,7 @@ void threading_init(void) {
- }
- 
- void threading_cleanup(void) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
-     int i;
-     if (thread_mode) {
-         CRYPTO_set_locking_callback(NULL);
--- 
-2.20.1
-
diff --git a/dev-python/m2crypto/m2crypto-0.38.0-r2.ebuild b/dev-python/m2crypto/m2crypto-0.40.0.ebuild
index ec6e120c959a..caf38959b059 100644
--- a/dev-python/m2crypto/m2crypto-0.38.0-r2.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Liguros Authors
+# Copyright 2021-2023 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
@@ -7,11 +7,9 @@ PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs
 
-MY_PN="M2Crypto"
 DESCRIPTION="A Python crypto and SSL toolkit"
 HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
+SRC_URI="https://gitlab.com/m2crypto/m2crypto/-/archive/${PV}/m2crypto-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/matplotlib/matplotlib-3.8.0.ebuild b/dev-python/matplotlib/matplotlib-3.8.0.ebuild
index 4f1dd4ca6e0e..bed6d6b6b7b8 100644
--- a/dev-python/matplotlib/matplotlib-3.8.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.8.0.ebuild
@@ -83,7 +83,7 @@ RDEPEND="
 	wxwidgets? (
 		$(python_gen_cond_dep '
 			dev-python/wxpython:*[${PYTHON_USEDEP}]
-		' python3_{8..10})
+		' python3_{10..11})
 	)
 "
 
@@ -249,11 +249,20 @@ python_test() {
 		tests/test_backends_interactive.py::test_webagg
 	)
 
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# https://github.com/matplotlib/matplotlib/issues/23384
-		"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtagg', 'QT_API': 'PyQt5'}]"
-		"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtcairo', 'QT_API': 'PyQt5'}]"
-	)
+	case ${EPYTHON} in
+		python3.11)
+			EPYTEST_DESELECT+=(
+				# https://github.com/matplotlib/matplotlib/issues/23384
+				"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtagg', 'QT_API': 'PyQt5'}]"
+				"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtcairo', 'QT_API': 'PyQt5'}]"
+			)
+			;;
+		python3.12)
+			EPYTEST_DESELECT+=(
+				tests/test_constrainedlayout.py::test_compressed1
+			)
+			;;
+	esac
 
 	case "${ABI}" in
 		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86)
diff --git a/dev-python/nbval/nbval-0.10.0-r1.ebuild b/dev-python/nbval/nbval-0.10.0-r1.ebuild
index 0effba7fd163..f0e49d208abf 100644
--- a/dev-python/nbval/nbval-0.10.0-r1.ebuild
+++ b/dev-python/nbval/nbval-0.10.0-r1.ebuild
@@ -3,12 +3,16 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
 inherit distutils-r1 pypi
 
 DESCRIPTION="A pytest plugin to validate Jupyter notebooks"
-HOMEPAGE="https://github.com/computationalmodelling/nbval"
+HOMEPAGE="
+	https://github.com/computationalmodelling/nbval/
+	https://pypi.org/project/nbval/
+"
 
 LICENSE="BSD"
 SLOT="0"
@@ -23,20 +27,15 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/nbdime[${PYTHON_USEDEP}]
-		dev-python/sympy[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/sympy[${PYTHON_USEDEP}]
+		' python3_{10..11})
 	)
 	doc? (
 		virtual/pandoc
 	)
 "
 
-EPYTEST_IGNORE=(
-	# Mocker not packaged
-	tests/test_nbdime_reporter.py
-
-	tests/test_coverage.py
-)
-
 distutils_enable_tests pytest
 distutils_enable_sphinx docs/source \
 	dev-python/sphinx-rtd-theme \
@@ -45,5 +44,20 @@ distutils_enable_sphinx docs/source \
 	dev-python/matplotlib
 
 python_test() {
+	local EPYTEST_IGNORE=(
+		# Mocker not packaged
+		tests/test_nbdime_reporter.py
+
+		tests/test_coverage.py
+	)
+	local EPYTEST_DESELECT=()
+
+	if ! has_version "dev-python/sympy[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			"tests/test_unit_tests_in_notebooks.py::test_print[${S}/tests/ipynb-test-samples/test-latex-pass-failsbutignoreoutput.ipynb]"
+			"tests/test_unit_tests_in_notebooks.py::test_print[${S}/tests/ipynb-test-samples/test-latex-pass-correctouput.ipynb]"
+		)
+	fi
+
 	PYTHONPATH=. epytest # 895258
 }
diff --git a/dev-python/netaddr/Manifest b/dev-python/netaddr/Manifest
index 5aeb0b0cea1b..14adb6b6a5b5 100644
--- a/dev-python/netaddr/Manifest
+++ b/dev-python/netaddr/Manifest
@@ -1,2 +1 @@
-DIST netaddr-0.8.0.tar.gz 1959055 BLAKE2B c0a361c100490c17203aad14eb14a3e09c63f5a6ce2f4b7e85bc57942329ac4603a1d4b3a09a9ab964a775dfb50a8746f6dd4a05d2f9bba01674624a7d7b46c1 SHA512 0b518ef240b81af425a5aaa6f087b10dece3f352c0c67cde8553ac00daa9d1890637c05d16740e2c23b30ae068c1b4c409ca8291e02093699fafd638701b9069
 DIST netaddr-0.9.0.tar.gz 2196428 BLAKE2B 279aea0816abfcf1efb70ac5b8593cfdea0551fd9a0cb0bf49e3247d5681c884d19aff83ab40df0e41b6549c20b66fbaba8508f0b442e0d72405c46a98365c0f SHA512 250b00a930f7180e1b4e18cb90de579733ffea9cd4ac93a3b7d2f7796b30c6b49d70da4b05ed522ebc9389600f4db8ecaed9345f7d0076632d0beae41e11c3ae
diff --git a/dev-python/netaddr/netaddr-0.8.0-r1.ebuild b/dev-python/netaddr/netaddr-0.8.0-r1.ebuild
deleted file mode 100644
index 34ae257154fa..000000000000
--- a/dev-python/netaddr/netaddr-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,37 +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_{8,9,10,11,12} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Network address representation and manipulation library"
-HOMEPAGE="
-	https://github.com/netaddr/netaddr/
-	https://pypi.org/project/netaddr/
-	https://netaddr.readthedocs.io/
-"
-SRC_URI="
-	https://github.com/netaddr/netaddr/archive/${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-src_prepare() {
-	# Disable coverage (requires additional plugins)
-	sed -i 's/^addopts = .*//' pytest.ini || die
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	optfeature "CLI support" dev-python/ipython
-}
diff --git a/dev-python/notebook-shim/notebook-shim-0.2.3.ebuild b/dev-python/notebook-shim/notebook-shim-0.2.3.ebuild
index 785c41969dfc..cb728de15a6c 100644
--- a/dev-python/notebook-shim/notebook-shim-0.2.3.ebuild
+++ b/dev-python/notebook-shim/notebook-shim-0.2.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
diff --git a/dev-python/orjson/orjson-3.9.9.ebuild b/dev-python/orjson/orjson-3.9.9.ebuild
index 063156f04004..99cf37335cf1 100644
--- a/dev-python/orjson/orjson-3.9.9.ebuild
+++ b/dev-python/orjson/orjson-3.9.9.ebuild
@@ -1,8 +1,6 @@
 # Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Autogenerated by pycargoebuild 0.6.1
-
 EAPI=8
 
 DISTUTILS_EXT=1
@@ -83,3 +81,8 @@ BDEPEND="
 QA_FLAGS_IGNORED=".*"
 
 distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -s
+}
diff --git a/dev-python/overrides/overrides-7.4.0.ebuild b/dev-python/overrides/overrides-7.4.0.ebuild
index 779babaf0169..df282f42d993 100644
--- a/dev-python/overrides/overrides-7.4.0.ebuild
+++ b/dev-python/overrides/overrides-7.4.0.ebuild
@@ -16,6 +16,20 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+
+	case ${EPYTHON} in
+		python3.12)
+			EPYTEST_DESELECT+=(
+				tests/test_enforce__py38.py::EnforceTests::test_enforcing_when_incompatible
+			)
+			;;
+	esac
+
+	epytest
+}
diff --git a/dev-python/pandocfilters/pandocfilters-1.5.0.ebuild b/dev-python/pandocfilters/pandocfilters-1.5.0.ebuild
index 010fecfe3754..6e73cc6b1e45 100644
--- a/dev-python/pandocfilters/pandocfilters-1.5.0.ebuild
+++ b/dev-python/pandocfilters/pandocfilters-1.5.0.ebuild
@@ -5,10 +5,14 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
 inherit distutils-r1 pypi
 
 DESCRIPTION="Utilities for writing pandoc filters in python"
-HOMEPAGE="https://github.com/jgm/pandocfilters"
+HOMEPAGE="
+	https://github.com/jgm/pandocfilters/
+	https://pypi.org/project/pandocfilters/
+"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/pendulum/pendulum-2.1.2-r2.ebuild b/dev-python/pendulum/pendulum-2.1.2-r2.ebuild
index 62e0a02b6890..b4c5ad6da3a1 100644
--- a/dev-python/pendulum/pendulum-2.1.2-r2.ebuild
+++ b/dev-python/pendulum/pendulum-2.1.2-r2.ebuild
@@ -39,4 +39,10 @@ BDEPEND="
 	)
 "
 
+EPYTEST_DESELECT=(
+	# sigh
+	tests/datetime/test_behavior.py::test_proper_dst
+	tests/tz/test_timezone.py::test_dst
+)
+
 distutils_enable_tests pytest
diff --git a/dev-python/psycopg/psycopg-3.1.9.ebuild b/dev-python/psycopg/psycopg-3.1.9.ebuild
index c70137e21ce8..22e5ffda4236 100644
--- a/dev-python/psycopg/psycopg-3.1.9.ebuild
+++ b/dev-python/psycopg/psycopg-3.1.9.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${P}/psycopg
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DEPEND="
 	>=dev-db/postgresql-8.1:*
diff --git a/dev-python/pydantic-core/Manifest b/dev-python/pydantic-core/Manifest
index cea1b3947845..5780e8549178 100644
--- a/dev-python/pydantic-core/Manifest
+++ b/dev-python/pydantic-core/Manifest
@@ -32,11 +32,9 @@ DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ec
 DIST parking_lot_core-0.9.8.crate 32383 BLAKE2B 2f9666872894d1c85895437d1353f9e15be2bc8d004ffc8f0e5be95e9dd4b274797db3752eba1c0b5b6071c1b8a71e4857cae0b2aff1afdaa39e92e70be2e6fd SHA512 8d6dfdf661b0f7d0774cb9f61121f2daefd182ac8a2a0d24eab451febfbe1a664c815c163d34a7f3d15a54915a8e22e6c6cd10e89cb7d7598d48d81ad6a3c256
 DIST percent-encoding-2.3.0.crate 10196 BLAKE2B 155bb1aaf0db4d22179bbe24b2d312f3d507876436e8ce76dfb59775282c1136a6c2bf5672f4b6bc274e4535acc9e50497c3e20b77aa2490512755c9cc9e6c41 SHA512 54ba129b0f3b43627707be994a281cdb69d5a7bdbc91dfeaa0226cf2834adeff7d2597dca5d11dd48b5731e831acf1284497b251abfebc0618761f98fe3c01cd
 DIST proc-macro2-1.0.64.crate 44848 BLAKE2B 4422122d9299eff3bfbb4507c4a117fef7c0906cab5a680933d482b7f9b49480bcb9c8172b412e70bf87dd0737b8532e90c310bf083f144292cc72190059ba3b SHA512 884fd14ff23c19420692e35a38f88bb6a766a09da105759cd958c315b9360a2c49cfe61ceaa3122307d44040195ec9dffb12b6d0ce224fbac5d3701621a12b04
-DIST pydantic_core-2.10.0.tar.gz 347291 BLAKE2B 3a437ca92a7decca36669854da7f89acb8086f247c2613aec45d73a5ff68505d0036297279ba030c3568a84470a6b0e345745f28b8a874fa489c12bae1db4c1e SHA512 ae621a2a98c1c661978880400bac25826508b0703048f3db9e7559b4f16dedd87114f4da561916ca5d9c0ae06b8bdbd5b80f8373c29deb4f2798f1338a6d9c10
 DIST pydantic_core-2.10.1.tar.gz 347316 BLAKE2B 782daaae0781da0abfa48056a9eebc8610737b719335f013f9573e3fa886f89af99390c5e9fa2ceeb46169392b480446a59acf0f182ab083b8f5dc8d62b090ee SHA512 c07d838268bbaa53e8a49afe18733532ac3f43005a5d4e4dee3a1cd23fa94af91d6471f9f2c146cc317cb8d14385b4aa7af404fdbbae7b4538f0cefffac7cf58
 DIST pydantic_core-2.11.0.tar.gz 351430 BLAKE2B 6471e17df66f7e6134724bfe6d697869c936a3a5603bef08286fe86a4039fa155cbb65c9255b827f9c974321394caca62634b811cac01bdb622d31438a5c719c SHA512 f66ad263f3b0608064173fc15cd7595c7a1ce8b53419280d00435acaba989411bf403667be246ec5da1b3e4f6cf97d413eec8ce810a648d332b2042ea2e51661
 DIST pydantic_core-2.6.3.tar.gz 337231 BLAKE2B 942a12228ad46d4b5365c781f8f7be28266c54e29bf5ab21e49ef31d25319d065c2f5f0bdc2ccca77888d38cfdea90fb2b415a0c203d8ae62825fb3ef618e1fb SHA512 5123fb55b002bc857ec03239163a5517709ea84430ac7b92d2027bdfbdba278d37caaa0d017d89af8e5306296667d7eb500bfc536a769d99c662b3fbb3835b63
-DIST pydantic_core-2.9.0.tar.gz 345661 BLAKE2B 27e37046490162115be5a193ce914ce16f04ecb71744ed9368944b030d1f03f52ce5c21d0d350f87e2b595661f90990d56cac755382451e46ba6c1824e354086 SHA512 ad399a5a47dfe739b225370ccc0c35df6122bcf6cd0527b21657a89048da7c6134b03c2ba290c9e749a049eef8aafa7f25db44acdd3d4334f5cb02da2e0e957d
 DIST pyo3-0.19.2.crate 418228 BLAKE2B ee018b33383fada78cd22643aea9231a8c8a2f19d1eb297f40eec9206c5220f322fff4c926d939a93a24ac6d231a207ebb25afcc0709191151c7ed9af7465efa SHA512 58698183e0f2f0507f8f765bf3e90185c933e78d62f0a9be65c4b1ce8eea19a98fe0341abe7c58cafdacb63a012ec417876dccb7be6facc1360fcb22796fcaf9
 DIST pyo3-0.20.0.crate 431766 BLAKE2B 104bc21ce2c6931753ca0c7b2d91693f454c964260ca3c4628a899fc8e7edbe4238db913ed7356f3beff154d88a60a17c0e252b655768e75483e1d9d9b86f40b SHA512 85d9533c75f905752c62f6a4898582ae48daf085e287b44949c47260301205a5f00477927877ce46300d2801d22fbc04a958c058a37eb28374c834fff27feca1
 DIST pyo3-build-config-0.19.2.crate 29206 BLAKE2B 5b1cd80d643e448cf8f1d28a514333526061c178121b9a0dcb5bff6082f402ecfd166536d94d42065f6dc1f108a73f12bbb78eedf9ea053a6aa2e9c80ac00ddf SHA512 ccc73061ec1989258921c5b5800689170635fa5503d74a4ac458baef903dd31efa41995d238783f1e099ece1f66d0a0e95c4fcb4b772b9f653dbb20e838b4e28
diff --git a/dev-python/pydantic-core/pydantic-core-2.10.0.ebuild b/dev-python/pydantic-core/pydantic-core-2.10.0.ebuild
deleted file mode 100644
index 04b2aa8b6015..000000000000
--- a/dev-python/pydantic-core/pydantic-core-2.10.0.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=maturin
-# pypy3 is waiting for new pyo3 release
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-CRATES="
-	ahash@0.8.3
-	aho-corasick@1.0.2
-	autocfg@1.1.0
-	base64@0.21.4
-	bitflags@1.3.2
-	cc@1.0.79
-	cfg-if@1.0.0
-	enum_dispatch@0.3.12
-	equivalent@1.0.1
-	form_urlencoded@1.2.0
-	getrandom@0.2.10
-	hashbrown@0.14.0
-	heck@0.4.1
-	idna@0.4.0
-	indexmap@2.0.0
-	indoc@1.0.9
-	itoa@1.0.8
-	libc@0.2.147
-	lock_api@0.4.10
-	memchr@2.6.3
-	memoffset@0.9.0
-	num-bigint@0.4.4
-	num-integer@0.1.45
-	num-traits@0.2.16
-	once_cell@1.18.0
-	parking_lot@0.12.1
-	parking_lot_core@0.9.8
-	percent-encoding@2.3.0
-	proc-macro2@1.0.64
-	pyo3-build-config@0.19.2
-	pyo3-ffi@0.19.2
-	pyo3-macros-backend@0.19.2
-	pyo3-macros@0.19.2
-	pyo3@0.19.2
-	python3-dll-a@0.2.9
-	quote@1.0.29
-	redox_syscall@0.3.5
-	regex-automata@0.3.8
-	regex-syntax@0.7.5
-	regex@1.9.5
-	rustversion@1.0.13
-	ryu@1.0.14
-	scopeguard@1.1.0
-	serde@1.0.188
-	serde_derive@1.0.188
-	serde_json@1.0.107
-	smallvec@1.11.0
-	speedate@0.12.0
-	strum@0.25.0
-	strum_macros@0.25.2
-	syn@1.0.109
-	syn@2.0.28
-	target-lexicon@0.12.9
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	unicode-bidi@0.3.13
-	unicode-ident@1.0.10
-	unicode-normalization@0.1.22
-	unindent@0.1.11
-	url@2.4.1
-	uuid@1.4.1
-	version_check@0.9.4
-	wasi@0.11.0+wasi-snapshot-preview1
-	windows-targets@0.48.1
-	windows_aarch64_gnullvm@0.48.0
-	windows_aarch64_msvc@0.48.0
-	windows_i686_gnu@0.48.0
-	windows_i686_msvc@0.48.0
-	windows_x86_64_gnu@0.48.0
-	windows_x86_64_gnullvm@0.48.0
-	windows_x86_64_msvc@0.48.0
-"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Core validation logic for pydantic written in Rust"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic-core/
-	https://pypi.org/project/pydantic-core/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=virtual/rust-1.70.0
-	test? (
-		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-6.63.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pydantic-1.10.4[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2022.7.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/pydantic_core/_pydantic_core.*.so"
-
-src_prepare() {
-	sed -i -e '/--benchmark/d' pyproject.toml || die
-	sed -i -e '/^strip/d' Cargo.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		tests/benchmarks
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	rm -rf pydantic_core || die
-	epytest -p pytest_mock -p timeout
-}
diff --git a/dev-python/pydantic-core/pydantic-core-2.9.0.ebuild b/dev-python/pydantic-core/pydantic-core-2.9.0.ebuild
deleted file mode 100644
index 04b2aa8b6015..000000000000
--- a/dev-python/pydantic-core/pydantic-core-2.9.0.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=maturin
-# pypy3 is waiting for new pyo3 release
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-CRATES="
-	ahash@0.8.3
-	aho-corasick@1.0.2
-	autocfg@1.1.0
-	base64@0.21.4
-	bitflags@1.3.2
-	cc@1.0.79
-	cfg-if@1.0.0
-	enum_dispatch@0.3.12
-	equivalent@1.0.1
-	form_urlencoded@1.2.0
-	getrandom@0.2.10
-	hashbrown@0.14.0
-	heck@0.4.1
-	idna@0.4.0
-	indexmap@2.0.0
-	indoc@1.0.9
-	itoa@1.0.8
-	libc@0.2.147
-	lock_api@0.4.10
-	memchr@2.6.3
-	memoffset@0.9.0
-	num-bigint@0.4.4
-	num-integer@0.1.45
-	num-traits@0.2.16
-	once_cell@1.18.0
-	parking_lot@0.12.1
-	parking_lot_core@0.9.8
-	percent-encoding@2.3.0
-	proc-macro2@1.0.64
-	pyo3-build-config@0.19.2
-	pyo3-ffi@0.19.2
-	pyo3-macros-backend@0.19.2
-	pyo3-macros@0.19.2
-	pyo3@0.19.2
-	python3-dll-a@0.2.9
-	quote@1.0.29
-	redox_syscall@0.3.5
-	regex-automata@0.3.8
-	regex-syntax@0.7.5
-	regex@1.9.5
-	rustversion@1.0.13
-	ryu@1.0.14
-	scopeguard@1.1.0
-	serde@1.0.188
-	serde_derive@1.0.188
-	serde_json@1.0.107
-	smallvec@1.11.0
-	speedate@0.12.0
-	strum@0.25.0
-	strum_macros@0.25.2
-	syn@1.0.109
-	syn@2.0.28
-	target-lexicon@0.12.9
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	unicode-bidi@0.3.13
-	unicode-ident@1.0.10
-	unicode-normalization@0.1.22
-	unindent@0.1.11
-	url@2.4.1
-	uuid@1.4.1
-	version_check@0.9.4
-	wasi@0.11.0+wasi-snapshot-preview1
-	windows-targets@0.48.1
-	windows_aarch64_gnullvm@0.48.0
-	windows_aarch64_msvc@0.48.0
-	windows_i686_gnu@0.48.0
-	windows_i686_msvc@0.48.0
-	windows_x86_64_gnu@0.48.0
-	windows_x86_64_gnullvm@0.48.0
-	windows_x86_64_msvc@0.48.0
-"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Core validation logic for pydantic written in Rust"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic-core/
-	https://pypi.org/project/pydantic-core/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=virtual/rust-1.70.0
-	test? (
-		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-6.63.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pydantic-1.10.4[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2022.7.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/pydantic_core/_pydantic_core.*.so"
-
-src_prepare() {
-	sed -i -e '/--benchmark/d' pyproject.toml || die
-	sed -i -e '/^strip/d' Cargo.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		tests/benchmarks
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	rm -rf pydantic_core || die
-	epytest -p pytest_mock -p timeout
-}
diff --git a/dev-python/pydantic/pydantic-1.10.13.ebuild b/dev-python/pydantic/pydantic-1.10.13.ebuild
index ff7ac36d7411..18ea3d3ddcaa 100644
--- a/dev-python/pydantic/pydantic-1.10.13.ebuild
+++ b/dev-python/pydantic/pydantic-1.10.13.ebuild
@@ -23,7 +23,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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="native-extensions"
 
 RDEPEND="
diff --git a/dev-python/pydevd/pydevd-2.10.0.ebuild b/dev-python/pydevd/pydevd-2.10.0.ebuild
index ecab4882df3e..5b6e788a5f06 100644
--- a/dev-python/pydevd/pydevd-2.10.0.ebuild
+++ b/dev-python/pydevd/pydevd-2.10.0.ebuild
@@ -105,6 +105,18 @@ python_test() {
 		tests_python/test_debugger_json.py::test_pandas
 	)
 
+	case ${EPYTHON} in
+		python3.12)
+			EPYTEST_DESELECT+=(
+				tests_python/test_debugger_json.py::test_case_stop_async_iteration_exception
+				'tests_python/test_debugger.py::test_case_handled_and_unhandled_exception_generator[False-_debugger_case_unhandled_exceptions_listcomp.py]'
+				'tests_python/test_debugger_json.py::test_case_unhandled_exception_generator[_debugger_case_unhandled_exceptions_listcomp.py]'
+				tests_python/test_debugger.py::test_case_13
+				tests_python/test_debugger_json.py::test_function_breakpoints_async
+			)
+			;;
+	esac
+
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	# this is only used to compare against getpid() to detect that xdist
 	# is being used
diff --git a/dev-python/pytest-check/Manifest b/dev-python/pytest-check/Manifest
index 9a205cadbaad..eb9ff80c7918 100644
--- a/dev-python/pytest-check/Manifest
+++ b/dev-python/pytest-check/Manifest
@@ -1,2 +1 @@
-DIST pytest_check-2.2.1.tar.gz 29128 BLAKE2B 758d2f04a5a500367ecca9a95afe21c03e7a52f319403d4bc0af14d27b96b335e5db42ee312217b0788eceab25048266ac135cfeb7d8214908ed5c13ded33b33 SHA512 04843219a1d49385ccac9b60707a6dd595258664b61a0bf31e666502a222d16b7130c8c0ae65ebd6431d58e2e08d90db3ad016dc4591dab7e3c3502296ceff44
 DIST pytest_check-2.2.2.tar.gz 26353 BLAKE2B 90e95aaddfb3f595b7f0ac7fe8f75cc0dbe173dfcd30aa888cebca9e61ddd67a1a25bb5e152151c86c7bd6144f6875622c8c3a53c3453281b94f2e74a4b465e5 SHA512 27f6df34450db762fb6656b255d34bf6656bacefc68cdd050e100dcf53df1406c6983a509c7b7cc3cc37664c06d3798254a350ba9c0ebcf9095cb7aa1bd11557
diff --git a/dev-python/pytest-check/pytest-check-2.2.1.ebuild b/dev-python/pytest-check/pytest-check-2.2.1.ebuild
deleted file mode 100644
index 9f647cf7ae6b..000000000000
--- a/dev-python/pytest-check/pytest-check-2.2.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="pytest plugin that allows multiple failures per test"
-HOMEPAGE="
-	https://github.com/okken/pytest-check/
-	https://pypi.org/project/pytest-check/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-env/Manifest b/dev-python/pytest-env/Manifest
index dd0811bfabb3..320e0b022b84 100644
--- a/dev-python/pytest-env/Manifest
+++ b/dev-python/pytest-env/Manifest
@@ -1 +1,2 @@
 DIST pytest_env-1.0.1.tar.gz 7565 BLAKE2B 26aa1c6a5d44bbe40266bbb62ca62c687dd1d85aed821c271f301ff27a97fdc753d2cdf5feba8b223b33b5b05bf39c55c3df0f1f8f7aae77335f2052a65df6c0 SHA512 422aaa78e25fad7b447f06358b772cacf22d5441ae0aaac22863877424f44703c1329813b068d901d4f2fb9df21bb08a5e4082504b76102d02dd15087d527a01
+DIST pytest_env-1.1.0.tar.gz 8640 BLAKE2B 384b438c6a5da2ddeac0be1a601b74eca77abbe5b5100322f9f161f5e68119980370aa1c8f8160ca9db53628209742afabd981678784e2c42a1f527344c39558 SHA512 12fb8d1093f9d9e89a2bb543428086cba04a322a4d443960d3ab33f270a3aa8f98585c334091d90febe3a5f4d4d66111dd5a8a5a7322185af10cae3eae14bfde
diff --git a/dev-python/pytest-env/pytest-env-1.1.0.ebuild b/dev-python/pytest-env/pytest-env-1.1.0.ebuild
new file mode 100644
index 000000000000..051ff6dd53b2
--- /dev/null
+++ b/dev-python/pytest-env/pytest-env-1.1.0.ebuild
@@ -0,0 +1,39 @@
+# 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_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="pytest plugin that allows you to add environment variables"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-env/
+	https://pypi.org/project/pytest-env/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-7.4.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	>=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index 75533c49cb34..323df10db75a 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1,2 +1 @@
-DIST pytest_httpx-0.25.0.tar.gz 31681 BLAKE2B 6ebeda25278ef2f80705d8cafdf3acb745feb4594aa966efc2c4bd258ccee312a3a11a89e0dff2ae789bc1dbc5dce3b8ccd74b23144ba7fa2ff9fef8ac13557f SHA512 a2513b5d75f281fae12e8e06151eaa52e35defa67aeca1f5ea146ecf3735897c0d440d11af8dbfb31a2be8ff9ea5d86962060c78b8d3ea1d83c0c870611a2a5f
 DIST pytest_httpx-0.26.0.tar.gz 33490 BLAKE2B 27c267374a575aff2ecbaec4855b733318568d73368a103f93606cc8833be4d4e664418e2f4b67df2d39a8830dd32d75d3a00656e58824b6beb18c4cc0bf3a14 SHA512 b671984714e8958361a773ef5e3f7430736b01556c6af58aac4ca740a679b5c2e316e2d041e1594cc16e7e13cee9692f57dcbbf374ca15924685250f73cc7853
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.25.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.25.0.ebuild
deleted file mode 100644
index 871b6b988d1d..000000000000
--- a/dev-python/pytest-httpx/pytest-httpx-0.25.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Send responses to HTTPX using pytest"
-HOMEPAGE="
-	https://colin-b.github.io/pytest_httpx/
-	https://github.com/Colin-b/pytest_httpx/
-	https://pypi.org/project/pytest-httpx/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	=dev-python/httpx-0.25*[${PYTHON_USEDEP}]
-	<dev-python/pytest-8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild b/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild
index 11c7960d9c80..068465ce61ca 100644
--- a/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild
+++ b/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jupyter-client-7.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc25.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc25.ebuild
index 16446e17a722..e5d1dad26884 100644
--- a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc25.ebuild
+++ b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc25.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${PN}-${PV//_/}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-tornado/Manifest b/dev-python/pytest-tornado/Manifest
index cbdd05280393..ed0f90e9a774 100644
--- a/dev-python/pytest-tornado/Manifest
+++ b/dev-python/pytest-tornado/Manifest
@@ -1 +1,2 @@
+DIST pytest-tornado-0.8.1.gh.tar.gz 12616 BLAKE2B 0e9668056c5f6dafd242f311825f830fe1e6428f4c38d030bb0a119f8ae54d511debdb4f839adcfa0881d6ecc79e4889dbed80121cd7a3d4bfb75dd901cb234e SHA512 e655ee9e28461c68b6cc642dbbb203a31154305a603951641e795c605f55970243bb9f7a8858a44bf70faba3d647bea6cf1525f2f9655a968cabbea43beec3d6
 DIST pytest-tornado-0.8.1.tar.gz 12616 BLAKE2B 0e9668056c5f6dafd242f311825f830fe1e6428f4c38d030bb0a119f8ae54d511debdb4f839adcfa0881d6ecc79e4889dbed80121cd7a3d4bfb75dd901cb234e SHA512 e655ee9e28461c68b6cc642dbbb203a31154305a603951641e795c605f55970243bb9f7a8858a44bf70faba3d647bea6cf1525f2f9655a968cabbea43beec3d6
diff --git a/dev-python/pytest-tornado/pytest-tornado-0.8.1-r1.ebuild b/dev-python/pytest-tornado/pytest-tornado-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..63870b4e24e8
--- /dev/null
+++ b/dev-python/pytest-tornado/pytest-tornado-0.8.1-r1.ebuild
@@ -0,0 +1,30 @@
+# 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_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Fixtures and markers to simplify testing of asynchronous tornado applications"
+HOMEPAGE="
+	https://github.com/eugeniy/pytest-tornado/
+	https://pypi.org/project/pytest-tornado/
+"
+SRC_URI="
+	https://github.com/eugeniy/pytest-tornado/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
+	>=dev-python/tornado-5[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-tornasync/Manifest b/dev-python/pytest-tornasync/Manifest
index 591d86f01ace..e6a8a660ad90 100644
--- a/dev-python/pytest-tornasync/Manifest
+++ b/dev-python/pytest-tornasync/Manifest
@@ -1 +1,2 @@
+DIST pytest-tornasync-0.6.0.post2.gh.tar.gz 6157 BLAKE2B 315526ebfe1801ccb10258c0258a83f16efdc28b2b2dcdeece94423a0230506fc08ef176655e35c7aed007fad40501d6a1b0ad20728dfc58faddaad003fb1182 SHA512 fe21bc724b0bcc192f0ca7628302cda0b8122e1b5aedd4f7a0818bc757f45c1d4f76b2aecc35396349df7fc5b43c1278a5a06af44c2b29d8bf1e691164324231
 DIST pytest-tornasync-0.6.0.post2.tar.gz 6201 BLAKE2B 6b6a2f941e649fb33373ef39b9d848d68a8af0f5e0d1a5e4496a9160e8e63ea108832437e87382c8203bb2c75673fad37b4ebd76157913199eb1661cd0216591 SHA512 2e258913b17a5442d18928833ee7e9771b6dbd148dbf251a7661432a54d4b9f9f3a7c396134eb544c0e3ce0af48c99d2d632399ac6ebdcf148187a7a523f4974
diff --git a/dev-python/pytest-tornasync/metadata.xml b/dev-python/pytest-tornasync/metadata.xml
index edbf614f1086..f779b78a9efd 100644
--- a/dev-python/pytest-tornasync/metadata.xml
+++ b/dev-python/pytest-tornasync/metadata.xml
@@ -5,6 +5,10 @@
   <email>sci@gentoo.org</email>
   <name>Gentoo Science Project</name>
  </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
  
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/pytest-tornasync/pytest-tornasync-0.6.0_p2-r1.ebuild b/dev-python/pytest-tornasync/pytest-tornasync-0.6.0_p2-r1.ebuild
new file mode 100644
index 000000000000..3cf1cad138d2
--- /dev/null
+++ b/dev-python/pytest-tornasync/pytest-tornasync-0.6.0_p2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+MY_P=${PN}-${PV/_p/.post}
+DESCRIPTION="Pytest plugin for testing Python 3.5+ Tornado code"
+HOMEPAGE="
+	https://github.com/eukaryote/pytest-tornasync/
+	https://pypi.org/project/pytest-tornasync/
+"
+SRC_URI="
+	https://github.com/eukaryote/pytest-tornasync/archive/${PV/_p/.post}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
+	>=dev-python/tornado-5.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Do not install the license file
+	sed -i -e '/LICENSE/d' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_tornasync.plugin
+}
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.23.0.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.23.0.ebuild
index c4d84e6bd77a..4d59901f93cf 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.23.0.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.23.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/python-json-logger/python-json-logger-2.0.7.ebuild b/dev-python/python-json-logger/python-json-logger-2.0.7.ebuild
index b9c3262a082f..516a333a492e 100644
--- a/dev-python/python-json-logger/python-json-logger-2.0.7.ebuild
+++ b/dev-python/python-json-logger/python-json-logger-2.0.7.ebuild
@@ -19,4 +19,20 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
-distutils_enable_tests unittest
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	case ${EPYTHON} in
+		python3.12)
+			EPYTEST_DESELECT+=(
+				tests/test_jsonlogger.py::TestJsonLogger::test_custom_object_serialization
+				tests/test_jsonlogger.py::TestJsonLogger::test_percentage_format
+				tests/test_jsonlogger.py::TestJsonLogger::test_rename_reserved_attrs
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest
index 30cc52f78555..aaf6b8fdadef 100644
--- a/dev-python/pythran/Manifest
+++ b/dev-python/pythran/Manifest
@@ -1,3 +1,2 @@
-DIST pythran-0.12.2.gh.tar.gz 3631092 BLAKE2B 5c7c9aadd1351fbfd1368b2957ad5952338aaf41bc124caad4243538f325599d50eeda12383a41e2bff0245ab2ecda3a27254d98d3e09f929d3d28856d556cd3 SHA512 2f83a2cda04dbdf55dcb6f5f1f43e9bb39668fa9f568ed39760a360f59f65b1e7e1f313d26efcb530fad34e69cc8dfb5aa38747943daa8d06d00b2610a1a7be5
 DIST pythran-0.13.1.gh.tar.gz 3639196 BLAKE2B 8aba73c68542d69dd2287d7081226161ecade9e49fe6ea69d034f9116becbc148614212cbcff0056291809d2994caf43ee374393939e44635c6bed69220b29b8 SHA512 2497fa49d78ff64e577816f4b48bd424c03f04b7605c92d359f0f8514aaa67b30b7e68248db475c215deafaf7e55f7b4b74ab37c9dbef2a27e813878bf350e77
 DIST pythran-0.14.0.gh.tar.gz 3642431 BLAKE2B cd5eeca0c52b0c3d17862b38c176b435a63a1f399e66979b8ac2682625cd0b0e074265e79bfdb6e57db989633954266132752e9b50c601ff43ae5c17c3e34bf5 SHA512 2a485c00b015abafc9ded28bfea8d8a7ae3ce87b5b654c318d5514fe12fd9374b599c05e3c4a2ff911fbae84df2efaa3cec2019c91e82ac1f36e0cc5ddeb2d8e
diff --git a/dev-python/pythran/pythran-0.12.2.ebuild b/dev-python/pythran/pythran-0.12.2.ebuild
deleted file mode 100644
index da7bddcc4389..000000000000
--- a/dev-python/pythran/pythran-0.12.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{8,9,10,11,12} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1 multiprocessing
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Ahead of Time compiler for numeric kernels"
-HOMEPAGE="
-	https://pypi.org/project/pythran/
-	https://github.com/serge-sans-paille/pythran/
-"
-SRC_URI="
-	https://github.com/serge-sans-paille/pythran/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	dev-libs/boost
-	=dev-python/beniget-0.4*[${PYTHON_USEDEP}]
-	<dev-python/gast-0.5.4[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/ply-3.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/ipython[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		virtual/cblas
-		!!dev-python/setuptools-declarative-requirements
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	# TODO: package xsimd then set no_xsimd = True
-	cat >> setup.cfg <<-EOF
-		[build_py]
-		no_boost = True
-	EOF
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		pythran/tests/test_xdoc.py::TestDoctest::test_cli
-		pythran/tests/test_xdoc.py::TestDoctest::test_toolchain
-	)
-
-	local -x COLUMNS=80
-	epytest -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/pythran/pythran-0.13.1.ebuild b/dev-python/pythran/pythran-0.13.1.ebuild
index 2a87582f6bf3..fc681a4b4780 100644
--- a/dev-python/pythran/pythran-0.13.1.ebuild
+++ b/dev-python/pythran/pythran-0.13.1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-libs/boost
diff --git a/dev-python/requests-cache/requests-cache-1.1.0.ebuild b/dev-python/requests-cache/requests-cache-1.1.0.ebuild
index 07795ed5041f..3ac77ee8d524 100644
--- a/dev-python/requests-cache/requests-cache-1.1.0.ebuild
+++ b/dev-python/requests-cache/requests-cache-1.1.0.ebuild
@@ -61,6 +61,16 @@ python_test() {
 		tests/integration/test_upgrade.py::test_version_upgrade
 	)
 
+	case ${EPYTHON} in
+		python3.12)
+			# https://github.com/requests-cache/requests-cache/issues/845
+			EPYTEST_DESELECT+=(
+				tests/integration/test_memory.py::TestMemoryCache::test_response_no_duplicate_read
+				tests/integration/test_sqlite.py::TestSQLiteCache::test_concurrency
+			)
+			;;
+	esac
+
 	local -x USE_PYTEST_HTTPBIN=true
 	epytest
 }
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.76.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.76.ebuild
index fe2067ba88ee..9371bf3d5738 100644
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.76.ebuild
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.76.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pyudev[${PYTHON_USEDEP}]
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index a975db8ea5ec..8ad155f98ee2 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -5,3 +5,4 @@ DIST ruamel.yaml-0.17.35.tar.xz 191432 BLAKE2B 7fe4a44aeebe4e82202277139056f4046
 DIST ruamel.yaml-0.17.36.tar.xz 193148 BLAKE2B 20c7389b29a34a917049c1ef1081ac7d349608435b2bdea03a390a6db979feefe1a1926db73bdee4cff100c605fa594c65ee23c64a0db45ce8230745d10945da SHA512 dce0cefec0b89cfb48d2124e2f18d4dbd9d67cca1af2cb556c308548f25dba932b129e62d3b5b666bfbed52838e0e16e3e4ae549689155b6314667d565b7bae2
 DIST ruamel.yaml-0.17.39.tar.xz 192916 BLAKE2B 23553af89c3083837a54805097c2c59eb2bff96e200acd12fcc646bf346eab20d87f58e6c9553598615a750d408dc855886fe4251ba128e3325cecb953f18275 SHA512 ee534cff9a6b72b617faf3fb4044bff0ae2d3c29508ef8df948774db45d39c8f80362f7ed8c8091319718a221b9d462838d521d97603d9cb18c38a008ebec8e5
 DIST ruamel.yaml-0.17.40.tar.xz 193424 BLAKE2B 80405ef0c85af476ef0e996b1da5aba1a116e8c181d18f40fb4fd86093a512c09cf0da30d52d85946c524e86e10379cb11154cb08a7ea7b054ba9379996de4f4 SHA512 848af49430b9c028a6676a159915c66e29f4290374ba0863e4fd87527f3178bb303a80f4ba97139fc8cbcd01f7f7782a4b3112325237a39659e227afda61fcb8
+DIST ruamel.yaml-0.18.0.tar.xz 194448 BLAKE2B 5a8c0e1a8cdfcec743d7e9084d7a2df54b79fbca174a7d46629d64a4cea33bc15ec320813b6f4206fb04de8383e34b73a2c615f3e10afebe600f3c0bc02f5639 SHA512 99c84d7c8b66cd3db5a030b81449b0790df54912af1c01dfbae575f495b22c662f4a7187ba41554802bd760782a70554c6359fcc640a12b2f85b37755d4af32d
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.18.0.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.18.0.ebuild
new file mode 100644
index 000000000000..36154d7811ad
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.18.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_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1
+
+MY_P="${P/-/.}"
+DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
+HOMEPAGE="
+	https://pypi.org/project/ruamel.yaml/
+	https://sourceforge.net/projects/ruamel-yaml/
+"
+# PyPI tarballs do not include tests
+SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]
+	!dev-python/namespace-ruamel
+"
+BDEPEND="
+	test? (
+		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		_test/test_deprecation.py::test_collections_deprecation
+	)
+	local EPYTEST_IGNORE=(
+		# Old PyYAML tests from lib/ require special set-up and are
+		# invoked indirectly via test_z_olddata, tell pytest itself
+		# to leave the subdir alone.
+		_test/lib/
+	)
+
+	# this is needed to keep the tests working while
+	# dev-python/namespace-ruamel is still installed
+	distutils_write_namespace ruamel
+	epytest
+}
diff --git a/dev-python/setuptools-scm/Manifest b/dev-python/setuptools-scm/Manifest
index 1aabe119937b..2d12f5b27640 100644
--- a/dev-python/setuptools-scm/Manifest
+++ b/dev-python/setuptools-scm/Manifest
@@ -1,5 +1,2 @@
-DIST setuptools-scm-8.0.1.tar.gz 71827 BLAKE2B 4011879490a02f5bb8b4fa0292ee696010cca9cb5c322854f2c342b4c02a86f7a31535c3fe7b4e6eab4fb77c90a469714227c1487ee7e1c1d4de3a4db1137b6b SHA512 05c087cbcb8bf2f03d68cf91e5545c25dea85d61d16c26194ade42a5e78a573f1adc4265897998d4b151834e994b3aa32e02a1eb2fa103a4cd1f3c8e3b78d8d4
-DIST setuptools-scm-8.0.2.tar.gz 72614 BLAKE2B 80dedf269f504a632f6b8c8ceafc28948e359825b926ac851219171db4015856aaebde8c0e8ee81dc807bb1b25010d686a039063922046dc4d72beacf14914c6 SHA512 1a636f452cbe61fc1bc6fca49032e7d12b80fe5d8931f292cfa295d6787fb9273fd7f3887f3f74d60c1da19f4e2f676d038fd860c0410838225cad95e6375f9b
-DIST setuptools-scm-8.0.3.tar.gz 72824 BLAKE2B f45b3bf67cc259e18fbd3a155d10967cf7c6a9df69d6bff7cc452236da3c3e1d0205ff7f5523c5bfdcbdbf5056e00f06c21dc1178edf14b386a0b89e95c947c1 SHA512 7002da1abdabbf617fb92b94aa04f6fe90aa5cbe26ae7ff8a9df0c53b35e8d13e6294ed38373d081ccafe375b376d52e72d5c7a031dbfb356aa0ee3221641096
 DIST setuptools-scm-8.0.4.tar.gz 74280 BLAKE2B 317f4955365b6b7d21ddecc846b0158a72537692b70b5f2092183bd93af119875054d775628659b113dec3bdb94575485b6f1e58760f1580b143dc3b0882cb57 SHA512 1b584f20dfad115f379a97de9e96bb3b36ab00986381748c2f395facd26ce01a6556ccfbabeb8f0cf9ce8720b26ce3a00040dba02cc689701ccf1d31f13277da
 DIST setuptools_scm-7.1.0.tar.gz 71904 BLAKE2B be5ae215dadcc290290762b732434258409ecc2d71cdf1332ffe73431effae7cbc33e052a718efd952be79350171ed3e468492fc719bc08750dc23364fb0ee9d SHA512 bd7260672c213db6b8c5842dbb6ac69e69ce040777865c935033971f65d905bd8e6b54e174190a924e452c302e69d4c1de231cbc8f603176ba013a739840dad3
diff --git a/dev-python/setuptools-scm/setuptools-scm-8.0.1.ebuild b/dev-python/setuptools-scm/setuptools-scm-8.0.1.ebuild
deleted file mode 100644
index de2310137aab..000000000000
--- a/dev-python/setuptools-scm/setuptools-scm-8.0.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Manage versions by scm tags via setuptools"
-HOMEPAGE="
-	https://github.com/pypa/setuptools_scm/
-	https://pypi.org/project/setuptools-scm/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-# there's an optional dep on rich for cute logs
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.10)
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-vcs/git
-		!sparc? (
-			dev-vcs/mercurial
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# the usual nondescript gpg-agent failure
-		testing/test_git.py::test_git_getdate_signed_commit
-
-		# fetching from the Internet
-		testing/test_regressions.py::test_pip_download
-	)
-
-	if has_version dev-python/nose; then
-		EPYTEST_DESELECT+=(
-			# https://bugs.gentoo.org/892639
-			testing/test_integration.py::test_pyproject_support
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/setuptools-scm/setuptools-scm-8.0.2.ebuild b/dev-python/setuptools-scm/setuptools-scm-8.0.2.ebuild
deleted file mode 100644
index de2310137aab..000000000000
--- a/dev-python/setuptools-scm/setuptools-scm-8.0.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Manage versions by scm tags via setuptools"
-HOMEPAGE="
-	https://github.com/pypa/setuptools_scm/
-	https://pypi.org/project/setuptools-scm/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-# there's an optional dep on rich for cute logs
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.10)
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-vcs/git
-		!sparc? (
-			dev-vcs/mercurial
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# the usual nondescript gpg-agent failure
-		testing/test_git.py::test_git_getdate_signed_commit
-
-		# fetching from the Internet
-		testing/test_regressions.py::test_pip_download
-	)
-
-	if has_version dev-python/nose; then
-		EPYTEST_DESELECT+=(
-			# https://bugs.gentoo.org/892639
-			testing/test_integration.py::test_pyproject_support
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/setuptools-scm/setuptools-scm-8.0.3.ebuild b/dev-python/setuptools-scm/setuptools-scm-8.0.3.ebuild
deleted file mode 100644
index b23a0e8c6a8a..000000000000
--- a/dev-python/setuptools-scm/setuptools-scm-8.0.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Manage versions by scm tags via setuptools"
-HOMEPAGE="
-	https://github.com/pypa/setuptools_scm/
-	https://pypi.org/project/setuptools-scm/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-# there's an optional dep on rich for cute logs
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.10)
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-vcs/git
-		!sparc? (
-			dev-vcs/mercurial
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# the usual nondescript gpg-agent failure
-		testing/test_git.py::test_git_getdate_signed_commit
-
-		# fetching from the Internet
-		testing/test_regressions.py::test_pip_download
-
-		# calls flake8, unpredictable
-		testing/test_functions.py::test_dump_version_flake8
-	)
-
-	if has_version dev-python/nose; then
-		EPYTEST_DESELECT+=(
-			# https://bugs.gentoo.org/892639
-			testing/test_integration.py::test_pyproject_support
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/shellingham/Manifest b/dev-python/shellingham/Manifest
index 5f50acd7f2ce..f9fd372a8472 100644
--- a/dev-python/shellingham/Manifest
+++ b/dev-python/shellingham/Manifest
@@ -1 +1,2 @@
 DIST shellingham-1.5.1.gh.tar.gz 21429 BLAKE2B 19a3258836616e8da2510d1d3af1d9bba5731494e10c5f20a9a50b153b0a9e5892005f9bab0ad5938731457db072acccd3071614ff854ae5ffe13ea406cd10f3 SHA512 764419bb1bf9ac223210b1b01abdb15ff276eb1651d91f0e0ee423ec475100d781149fcf98a43bac5ebb22761a4b775bc669c6e9722d25870dbde50568622242
+DIST shellingham-1.5.4.gh.tar.gz 24276 BLAKE2B 9db0fd5b223fb8c184d9f011dddb1de0873c2084457a88cd97244137bdc5fef398cd649569cfc37b9fc57bf3f76b11643c236bdd5144a31d157884adc30dc8bb SHA512 5a56156add14a5ec9cb55ccf0a268f6c64a3e2fec90301ea31f499131560fa537ca3b3544f18944efac451fa21826114a2bbf3b54140d294d94e7ae890964800
diff --git a/dev-python/shellingham/shellingham-1.5.4.ebuild b/dev-python/shellingham/shellingham-1.5.4.ebuild
new file mode 100644
index 000000000000..4b2c7cbb4a96
--- /dev/null
+++ b/dev-python/shellingham/shellingham-1.5.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Tool to Detect Surrounding Shell"
+HOMEPAGE="
+	https://github.com/sarugaku/shellingham/
+	https://pypi.org/project/shellingham/
+"
+# Missing tests in PYPI distribution so we use the GH package
+SRC_URI="
+	https://github.com/sarugaku/shellingham/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinx-pytest/Manifest b/dev-python/sphinx-pytest/Manifest
index 4cef5880778a..e42b71406198 100644
--- a/dev-python/sphinx-pytest/Manifest
+++ b/dev-python/sphinx-pytest/Manifest
@@ -1,2 +1 @@
-DIST sphinx-pytest-0.1.1.gh.tar.gz 6744 BLAKE2B f196a9fff7a63d1b7664f334c01f38fc44f5611be012092dad077f27bb2ddf03f2ebb7ebcbf7132a9b8c8b17166673945e9b92e88f285c4c95c4c2a696285cbc SHA512 f3210f8b2413171cc37a38fc66b8be0cd32db1a0aebb979dc9057a861711481fde6b86b7c9548166f906d9483762b864759fb4f7ba5069cda4d9fc12c1e2975c
 DIST sphinx-pytest-0.2.0.gh.tar.gz 6935 BLAKE2B a18755669865512ee5ecec46abebf654705efb64165306126144af9df056a829efc5c818abad2477e86edb3da2cb1bf4aadc4e8807cf3c289e29fffa249bbfbf SHA512 dfcbe36c74bf01ff45895893faa11a643b667d277e5f5011978c5cd1404f79d614c6603cf8756ef3e5fec278ea01c6e289cb825725e4e218f75a7bcb12e11bbb
diff --git a/dev-python/sphinx-pytest/sphinx-pytest-0.1.1.ebuild b/dev-python/sphinx-pytest/sphinx-pytest-0.1.1.ebuild
deleted file mode 100644
index 5e0882f2841f..000000000000
--- a/dev-python/sphinx-pytest/sphinx-pytest-0.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Helpful pytest fixtures for Sphinx extensions"
-HOMEPAGE="
-	https://github.com/sphinx-extensions2/sphinx-pytest/
-	https://pypi.org/project/sphinx_pytest/
-"
-SRC_URI="
-	https://github.com/sphinx-extensions2/sphinx-pytest/archive/v${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"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinxygen/Manifest b/dev-python/sphinxygen/Manifest
new file mode 100644
index 000000000000..060ce35000a2
--- /dev/null
+++ b/dev-python/sphinxygen/Manifest
@@ -0,0 +1 @@
+DIST sphinxygen-1.0.4.tar.gz 13732 BLAKE2B 1b2f957bcacea9acf287263c4054199759bbe19f3d90fa85a143c5e85a2e383837936d72c6c1e57257d2d586722cfccab7fd38083ae6709553e5e6400273d549 SHA512 3094e3f9c5c50bf4e6a8332acf7147fa8b5e0a32c3dc49bf9786b6684e7e60b08971c52c46d4413ab23cd0b4bcd1cf02c924cdad51b7e1da29c1e747880c6f96
diff --git a/dev-python/sphinxygen/metadata.xml b/dev-python/sphinxygen/metadata.xml
new file mode 100644
index 000000000000..208a592e1fd8
--- /dev/null
+++ b/dev-python/sphinxygen/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>sound@gentoo.org</email>
+  <name>Sound</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/sphinxygen/sphinxygen-1.0.4.ebuild b/dev-python/sphinxygen/sphinxygen-1.0.4.ebuild
new file mode 100644
index 000000000000..8f1cadb4d2b9
--- /dev/null
+++ b/dev-python/sphinxygen/sphinxygen-1.0.4.ebuild
@@ -0,0 +1,21 @@
+# 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_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python module/script that generates Sphinx markup to describe a C API"
+HOMEPAGE="
+	https://gitlab.com/drobilla/sphinxygen
+	https://pypi.org/project/sphinxygen/
+"
+
+SLOT="0"
+LICENSE="ISC"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index e481b9296725..5209f24d0580 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,5 +1,4 @@
 DIST SQLAlchemy-1.4.49.tar.gz 8536601 BLAKE2B 2133723380b157a76f4af6103a2c68099f78d7a49ad90793d682bd6015d61a06a72ba6f02922111b60716e311ddc2f6067153f7b4b1f80329775e0d6f27a0d92 SHA512 268751b09aebd9da10fd57b4b987fa57f3c61d18d5104bb308e405aa034c74e7d5441abd94368857fbe11b8d15bb5315634f64f3b1252e7318d24107ba1fe3ff
-DIST SQLAlchemy-2.0.19.tar.gz 9425046 BLAKE2B 258e273a1c9ec5584293d08b0cc9de8ab4076e61bbae2b914950d38e4627591e1c57250f5c28625e5d84d3db360992952a22644992ed5244d36d616f20487fc5 SHA512 d82834f4f55c2298ff16401f34326845360c58e6ba6a2e22cda92219c0fb40938d404315027f4e9f392bc57fe45808ea192f99b747e073a40a9713f8d498b22a
 DIST SQLAlchemy-2.0.20.tar.gz 9437690 BLAKE2B d0be093ec796f42868352339f70e64a1a0fbd4e96315ab91b370df79882138763228bc365dceaec736f7dce1d7c6991c7d20ca7dbccb766aec78b7039004dad2 SHA512 3bc463465248f28948a1004a3c18a5dbc02af81b18b4f89155aca6a03ab582010318c3d177c3b5c4caabd49945b426d7e0f23c482aefc75eb1a7252b57241e53
 DIST SQLAlchemy-2.0.21.tar.gz 9454220 BLAKE2B 67009f20349280b36c9b5664d5dc0c76ae35e5e2d8929cc8f848e862e4689dd695db5fc7fb10c1548a59f0a7f892f7573d969cdd4a6d400c89c23b35a5be3a31 SHA512 5fb0e3711445c6aa95d6facac098a05f0d20f9dacc4e9abe12057e0def7cfe07c73c2b43f1b8c7868e67e20e76f0b1da19eba10de87394db22d1d9a28ae23715
 DIST SQLAlchemy-2.0.22.tar.gz 9456107 BLAKE2B c4c5efd096c03550ce8f2adb944b97861a1f383f2c73dd096f4698428f88f80dba66bc22d209488c9ae3b0438ee6190377a36cc828ff411f99165cc41becc949 SHA512 76db680d80939235c17f2fbfe8f7dbc822a9299d52ab261ec76481e76de7bed80dbd4b5f9c7ed1d7c2d1b0651d035a47a8990691a128fd999a6a29c7c45b5459
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.19.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.19.ebuild
deleted file mode 100644
index 384c21be3f63..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.19.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 optfeature pypi
-
-MY_PN="SQLAlchemy"
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/greenlet/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		test/ext/mypy/test_mypy_plugin_py3k.py
-		test/typing/test_mypy.py
-		# hardcode call counts specific to Python versions
-		test/aaa_profiling
-	)
-	local EPYTEST_DESELECT=(
-		# warning tests are unreliable
-		test/base/test_warnings.py
-		# TODO
-		test/orm/test_versioning.py::ServerVersioningTest_sqlite+pysqlite_3_40_1::test_sql_expr_w_mods_bump
-		test/sql/test_resultset.py::CursorResultTest_sqlite+pysqlite_3_41_0::test_pickle_rows_other_process
-	)
-	local sqlite_version=$(sqlite3 --version | cut -d' ' -f1)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
-		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_multi_elem_varg
-		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_one_elem_varg
-		test/engine/test_pool.py::QueuePoolTest::test_recycle_pool_no_race
-		test/engine/test_processors.py::PyDateProcessorTest::test_date_invalid_string
-		test/engine/test_processors.py::PyDateProcessorTest::test_datetime_invalid_string
-		test/engine/test_processors.py::PyDateProcessorTest::test_time_invalid_string
-		"test/dialect/test_sqlite.py::TestTypes_sqlite+pysqlite_${sqlite_version//./_}::test_cant_parse_datetime_message"
-		"test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_${sqlite_version//./_}"::test_{delete,insert,update}_single
-		test/base/test_utils.py::ImmutableDictTest::test_pep584
-	)
-	[[ ${EPYTHON} == python3.12 ]] && EPYTEST_DESELECT+=(
-		# see https://github.com/sqlalchemy/sqlalchemy/issues/9819
-		test/base/test_result.py::ResultTupleTest::test_slices_arent_in_mappings
-	)
-	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[has_terminate-is_asyncio]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[not_has_terminate-is_asyncio]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True]"
-		)
-	fi
-
-	# upstream's test suite is horribly hacky; it relies on disabling
-	# the warnings plugin and turning warnings into errors;  this also
-	# means that any DeprecationWarnings from third-party plugins cause
-	# everything to explode
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=
-	# upstream automagically depends on xdist when it is importable
-	# note that we can't use xdist because it causes nodes to randomly
-	# crash on init
-	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
-		PYTEST_PLUGINS+=xdist.plugin
-	fi
-	epytest
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "asyncio support" dev-python/greenlet
-	optfeature "MySQL support" \
-		dev-python/mysqlclient \
-		dev-python/pymysql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.20.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.20.ebuild
index 5e82641c8a52..2af8770dbed2 100644
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.20.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.20.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.22.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.22.ebuild
index e41b5ee664bf..010f34af39d0 100644
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.22.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.22.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/tavern/Manifest b/dev-python/tavern/Manifest
index 9b12da6a78ea..e0b05f1bdc22 100644
--- a/dev-python/tavern/Manifest
+++ b/dev-python/tavern/Manifest
@@ -1,3 +1,2 @@
-DIST tavern-2.2.0.gh.tar.gz 213603 BLAKE2B 3a192424817d641da7428e27d49c553f9554fb740c9b0cde0d8e693fc204deb15d6f08f8bb60d961278f26b9f7c17bffb68cc7136cc9cc496eb74dd845ec5158 SHA512 731e479f3fe69cdaa28e391512207edde1084f3844da9c77ee7c917096422a009a4beeed9c135b773550c181f698d41ac83b013b111535e527f90569e16a00b4
 DIST tavern-2.3.0.gh.tar.gz 211676 BLAKE2B 80506d846036c7a68bf27c30e734a92983eadaff07e68a101e120a6284be750bc195817f1686cdaabe8dfe906720e5b41d22098db8f91e911438a60a2cbdd5db SHA512 2c1292cd047195b6e2059514f517b29caebeac3af370b298938cbbc8b5bc861dd818c3e45e25a65fa1acbbae96f36aa2d024edcee49b0086d459f3d41d4052ed
 DIST tavern-2.5.0.gh.tar.gz 217343 BLAKE2B bcb9d7f753b14351cd98e12e9d392f9effa716651f8686d053dc72080a2b738b02f78665f2bb07012b4c6ec7b39a661dfdc74a0272c036718cc13e2d731b4cee SHA512 9d957f815b57ba01d9707c1a3e8f715f062194efd0b24d82ebb99aec4bb83965e31a6538f3ff7748d3acd52b32cd38a097a4d36fe71faf1703dbf70ff0454111
diff --git a/dev-python/tavern/tavern-2.2.0.ebuild b/dev-python/tavern/tavern-2.2.0.ebuild
deleted file mode 100644
index 1c31d03e37f7..000000000000
--- a/dev-python/tavern/tavern-2.2.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool, library, and Pytest plugin for testing RESTful APIs"
-HOMEPAGE="
-	https://github.com/taverntesting/tavern/
-	https://pypi.org/project/tavern/
-"
-SRC_URI="
-	https://github.com/taverntesting/tavern/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/paho-mqtt[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/pykwalify[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/python-box[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/stevedore[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/colorlog[${PYTHON_USEDEP}]
-		dev-python/Faker[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# strip unnecessary pins, upstream doesn't update them a lot
-	sed -i -E -e 's:,?<=?[0-9.]+::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest -p tavern
-}
diff --git a/dev-python/time-machine/time-machine-2.13.0.ebuild b/dev-python/time-machine/time-machine-2.13.0.ebuild
index c59c5e91c548..462ebbf785db 100644
--- a/dev-python/time-machine/time-machine-2.13.0.ebuild
+++ b/dev-python/time-machine/time-machine-2.13.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/trove-classifiers/Manifest b/dev-python/trove-classifiers/Manifest
index 3641cbaa3544..d761f3de3801 100644
--- a/dev-python/trove-classifiers/Manifest
+++ b/dev-python/trove-classifiers/Manifest
@@ -1,4 +1,2 @@
-DIST trove-classifiers-2023.10.17.tar.gz 15858 BLAKE2B d190e4b5ca962fddecfe3d486be479d063897d09049f52a9e5e36c4b28857e5a8f34f71659d3f07377565673f3011e8f77459c1083883838b51a11dc594fb2d5 SHA512 ca6f2d23f24f000589a236d4304ed0faab8449d95b7f3ac091f168e04b2b2f6fbe586a48a38952034f40153e667b9c9b61710a0e9b19e8fa54f95db1c7008dad
 DIST trove-classifiers-2023.10.18.tar.gz 15862 BLAKE2B 9d634e0b9674c1b9e249999c1722217fae5ca9d8aec348706859a73f599b62a003d5ff3344e361930b9182bcf4153bd5fb40ee93a53e50b1df0430b1fec4bb7c SHA512 6f8449411b8fc82ed798901701a72f3051bb46c189ee95276dcb77a2ee9b26a61c4304b03be20f7e2bc6dc5f8db1021bf02575cadd021fe43f96fd73540bae99
-DIST trove-classifiers-2023.8.7.tar.gz 15856 BLAKE2B b20befe256e51704b4974ba7b3bcae88ff2ae1f1281da145f16a77963a75b3d2a58aa5914d622e8687a0e08915ae92783c4782a90390b53a0f346d829dce8cd3 SHA512 d414f5e71abf0eef3593c9509c93b4d3dbbf0b8f6ffacc85acd43be9e0f31d924757868e86bb069d9f0475731c811229ffc827568fe957fef850e71a0a5119fa
 DIST trove-classifiers-2023.9.19.tar.gz 15865 BLAKE2B 2a84af01c16a728f708775dce6c3b4da564072cdcb6cdb6fea8014ee27744a657d8dc10663eca9fe4f9c9dec6faaa2684b10fe08d827ab52d6a61f16b557b40f SHA512 09979aacca745459f075cce85c483113955e0d218079132478596f350b7d7788d1a734dc82364194df9b31e4c109a806c50db4bb122b1f5bf747d9e7a0616143
diff --git a/dev-python/trove-classifiers/trove-classifiers-2023.10.17.ebuild b/dev-python/trove-classifiers/trove-classifiers-2023.10.17.ebuild
deleted file mode 100644
index 729db4e896ab..000000000000
--- a/dev-python/trove-classifiers/trove-classifiers-2023.10.17.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
-HOMEPAGE="
-	https://github.com/pypa/trove-classifiers/
-	https://pypi.org/project/trove-classifiers/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-BDEPEND="
-	dev-python/calver[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest
-	"${EPYTHON}" -m tests.lib || die
-}
diff --git a/dev-python/trove-classifiers/trove-classifiers-2023.8.7.ebuild b/dev-python/trove-classifiers/trove-classifiers-2023.8.7.ebuild
deleted file mode 100644
index b0f85f87963e..000000000000
--- a/dev-python/trove-classifiers/trove-classifiers-2023.8.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
-HOMEPAGE="
-	https://github.com/pypa/trove-classifiers/
-	https://pypi.org/project/trove-classifiers/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-BDEPEND="
-	dev-python/calver[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest
-	"${EPYTHON}" -m tests.lib || die
-}
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index 1e3a04957ab5..5039e1b1cbf9 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,2 +1 @@
-DIST typing_extensions-4.7.1.gh.tar.gz 84841 BLAKE2B 9b49b37c90b90775995d9d77b6b480eeab51b71a9af9474c0f43db021106ff02d0e4e882be04c114477ff2b386037c286e9de2d9cd2394bd4e1459ce7c6e1951 SHA512 948f6c5c9597f6cf7d77987d1a5dad9f15b4303f9d156de3d97abda0c55567b2649eb6df7ac36a07f9d6306103d81fd00a38b04b3b5c521ff2f8f153f9219fb1
 DIST typing_extensions-4.8.0.gh.tar.gz 83807 BLAKE2B 4b160b79117dfeb83e911ff8c2b91a97512a70c1c5a2a87d6d2bcab7f5604efdb192c3c4eb5cfd7c102744c786e014dafc6346e5c544ec4f995d5810c83f8e73 SHA512 1e82f49d837c3fbead7d0867db667f97be2836f1f98bcde7315eb8c5455e605659fe7759ccf86fcbb2373789d9dab500a3b2a75bbcaf9216521c6b8c2796090a
diff --git a/dev-python/typing-extensions/typing-extensions-4.7.1.ebuild b/dev-python/typing-extensions/typing-extensions-4.7.1.ebuild
deleted file mode 100644
index d8d6078f80dc..000000000000
--- a/dev-python/typing-extensions/typing-extensions-4.7.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="Backported and Experimental Type Hints for Python 3.7+"
-HOMEPAGE="
-	https://pypi.org/project/typing-extensions/
-	https://github.com/python/typing_extensions/
-"
-SRC_URI="
-	https://github.com/python/typing_extensions/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-distutils_enable_tests unittest
-
-python_test() {
-	cd src || die
-	eunittest
-}
diff --git a/dev-python/unrardll/Manifest b/dev-python/unrardll/Manifest
new file mode 100644
index 000000000000..692799ecadae
--- /dev/null
+++ b/dev-python/unrardll/Manifest
@@ -0,0 +1 @@
+DIST unrardll-0.1.7.tar.gz 10780032 BLAKE2B 92f852ed9cbc02d4c48093dbd5a7f64f4bc279a7b3a3018247a832a61c263b3be19ec5ea94ffdc78c85bd2737647cc3eb231ae9d0953da1de5f23002e7e6ffdc SHA512 23da519c37e52e5cc032d119d1b723c0f4b4ec2c8a08b8ec24a193395d5530780c65a1c20f69aa58f6976ea5e7481c11b92a472cfbce8c477af14673be2189fc
diff --git a/dev-python/unrardll/metadata.xml b/dev-python/unrardll/metadata.xml
new file mode 100644
index 000000000000..d16225b9afdf
--- /dev/null
+++ b/dev-python/unrardll/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>eschwartz93@gmail.com</email>
+  <name>Eli Schwartz</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/unrardll/unrardll-0.1.7.ebuild b/dev-python/unrardll/unrardll-0.1.7.ebuild
new file mode 100644
index 000000000000..fe5df93f2f20
--- /dev/null
+++ b/dev-python/unrardll/unrardll-0.1.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python wrapper for the UnRAR DLL"
+HOMEPAGE="
+	https://github.com/kovidgoyal/unrardll
+	https://pypi.org/project/unrardll/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# The version constraint is needed to resolve https://bugs.gentoo.org/916036
+# and guarantee the headers are findable.
+DEPEND=">=app-arch/unrar-6.2.12-r1:="
+RDEPEND="${DEPEND}"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	default
+	# https://github.com/kovidgoyal/unrardll/pull/5
+	mv test/basic.py test/test_basic.py || die
+}
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 951612e28ea6..d618c2a37e71 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,7 +1,4 @@
-DIST urllib3-1.26.16.tar.gz 303733 BLAKE2B 94c0cfb8696b15ff7aed25927ba584d0d67b150953586ca4d74ddc8f1d0a95ca447a482cf7d0f95728fad1e7e51a610e29c3e342ebe68e65a86789308544ea51 SHA512 caa58af5bf49644459a9074be659511b56c5d66802153c72ba2ba2eb9c0aafd56b4cd8f8588964ee7d2a9b16a5e114d62298ab1e128710260ed86f1e315b5571
 DIST urllib3-1.26.17.tar.gz 305031 BLAKE2B 616b183168a78737988428efa52516586b66cab067d6a257af544c67922156e1e769fbbdd65c8f1ba606f02faa5918e4bafe8c1b27105b8e3f5fe644260d093d SHA512 f26c54def8564981f241a94c915c660d26a52d5437a1e1f4b8ebb6d6cd9de834a31b5816306c2cf2cadc2af00a1633bee97c8bbefa5a45b8e732f7566b4c0327
 DIST urllib3-1.26.18.tar.gz 305687 BLAKE2B f2f673761a8d80eee715a8726ba36ab6b09800fd4a4f03f27438553c36072e2abb5ff26cff71dcf30fd114f4d28c4ad9907533965b83c8a0581d3d4661904b70 SHA512 c89e93a032bf6b11375c06ef7c5abc1868f93e7655cfdca09e9bd939ad415d206ea159fe151ecd2e5f725e0e18a831c7a5382ad01dbc32264154fc8af7aec156
-DIST urllib3-2.0.4.tar.gz 281517 BLAKE2B 58635787069b6d8e83394ddacca2c70824c03190efb4e0838b9b80d8e8c1499fa0143e1d38ece4e2a7f9b34d6b50f9805050bf85707d98eb171307ff35f8b215 SHA512 64d55714d871716730af5a691fc222722cffc13b0603ecae597e5f4cfd82297beede2b08cedc030b2419bd446f51c4c6e54f466ad96c71dd0848abbf806b4db4
-DIST urllib3-2.0.5.tar.gz 281697 BLAKE2B 7ae1cc90243cd2069767d4a3f7ca3b96d9e6270f38b363ba2c2cfddeb293cc75782740524bdf91d64bd08dcf1dc44cb9fe6ec2b501d34bdf4c69d893c794382a SHA512 dead3fcda9637c6142b577f051f25578249f7513d3d2bdf4ed880b7a063ff7ee2e946e72b91355328b12205600abc487252ca025f3946408093df46134d9fc12
 DIST urllib3-2.0.6.tar.gz 281846 BLAKE2B 3af632a77f07d5c686e6412b06d67df5c62517239431ead7d0c7e7bbb5efe06c298db0afda1a84fb314f3e3936edd16aef693ac316a923f67232abf8789b6201 SHA512 872a5899ad4486b45fe7a327f029beb5f7d3dd8447b58b861922b32bd15f1cff68d12136f262c2d2d3740047976bc6cff16a54590c1eab19949149e7dae2956a
 DIST urllib3-2.0.7.tar.gz 282546 BLAKE2B d4fbb9e1d0b6d1f3c3d71efc3fc479c7b1c49f87ca849c387701fb0c8b4124082de6d83d958c8b2afc225a84b80e7665df857e7b0918ba50e4ad1431f8facc4d SHA512 ca21dd330cfc7f53e6f00a92be1df1d24acbe61b6ca31c52a272dccd6f50d1bb797eece9132860adc84c21a9bebc3030a12816081451fcb8384c11a6cd2d1e8b
diff --git a/dev-python/urllib3/urllib3-1.26.16.ebuild b/dev-python/urllib3/urllib3-1.26.16.ebuild
deleted file mode 100644
index 9f55cd6e6fd1..000000000000
--- a/dev-python/urllib3/urllib3-1.26.16.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="
-	https://github.com/urllib3/urllib3/
-	https://pypi.org/project/urllib3/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="brotli test"
-RESTRICT="!test? ( test )"
-
-# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
-# dependencies. Do not add them to RDEPEND. They should be unnecessary with
-# modern versions of python (>= 3.2).
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
-			>=dev-python/tornado-4.2.1[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-		" "${PYTHON_TESTED[@]}")
-	)
-"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unbundle urllib3
-	rm src/urllib3/packages/six.py || die
-	find -name '*.py' -exec sed -i \
-		-e 's:\([.]*\|urllib3\.\)\?packages\.six:six:g' \
-		-e 's:from \([.]*\|urllib3\.\)\?packages import six:import six:g' \
-		{} + || die
-}
-
-python_test() {
-	local -x CI=1
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# unstable (relies on warning count)
-		test/with_dummyserver/test_proxy_poolmanager.py::TestHTTPProxyManager::test_proxy_verified_warning
-	)
-	has "${EPYTHON}" python3.{8..10} && EPYTEST_DESELECT+=(
-		test/contrib/test_pyopenssl.py::TestPyOpenSSLHelpers::test_get_subj_alt_name
-	)
-
-	epytest
-}
diff --git a/dev-python/urllib3/urllib3-2.0.4.ebuild b/dev-python/urllib3/urllib3-2.0.4.ebuild
deleted file mode 100644
index 4c5f9c13ebdd..000000000000
--- a/dev-python/urllib3/urllib3-2.0.4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_TESTED=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="
-	https://github.com/urllib3/urllib3/
-	https://pypi.org/project/urllib3/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="brotli test zstd"
-RESTRICT="!test? ( test )"
-
-# [secure] extra is deprecated and slated for removal, we don't need it:
-# https://github.com/urllib3/urllib3/issues/2680
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	brotli? ( >=dev-python/brotlicffi-0.8.0[${PYTHON_USEDEP}] )
-	zstd? ( >=dev-python/zstandard-0.18.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/freezegun[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			>=dev-python/tornado-4.2.1[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=dev-python/zstandard-0.18.0[\${PYTHON_USEDEP}]
-		" "${PYTHON_TESTED[@]}")
-	)
-"
-
-src_prepare() {
-	# upstream considers 0.5 s to be "long" for a timeout
-	# we get tons of test failures on *fast* systems because of that
-	sed -i -e '/LONG_TIMEOUT/s:0.5:5:' test/__init__.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x CI=1
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# take forever
-		test/contrib/test_pyopenssl.py::TestSocketSSL::test_requesting_large_resources_via_ssl
-		test/with_dummyserver/test_socketlevel.py::TestSSL::test_requesting_large_resources_via_ssl
-		# stupid test, next bump please verify if they fixed it
-		test/test_poolmanager.py::TestPoolManager::test_deprecated_no_scheme
-		# fails with newer secure SSL configuration, which removes TLS 1.1
-		test/contrib/test_pyopenssl.py::TestHTTPS_TLSv1::test_verify_none_and_good_fingerprint
-		test/contrib/test_pyopenssl.py::TestHTTPS_TLSv1_1::test_verify_none_and_good_fingerprint
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1::test_verify_none_and_good_fingerprint
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_1::test_verify_none_and_good_fingerprint
-		# TODO: timeouts
-		test/contrib/test_pyopenssl.py::TestSocketClosing::test_timeout_errors_cause_retries
-		test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
-		# warnings, sigh
-		test/with_dummyserver/test_connectionpool.py::TestConnectionPool::test_request_chunked_is_deprecated
-	)
-
-	# plugins make tests slower, and more fragile
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/urllib3/urllib3-2.0.5.ebuild b/dev-python/urllib3/urllib3-2.0.5.ebuild
deleted file mode 100644
index 88d8aae10ff1..000000000000
--- a/dev-python/urllib3/urllib3-2.0.5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_TESTED=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="
-	https://github.com/urllib3/urllib3/
-	https://pypi.org/project/urllib3/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="brotli test zstd"
-RESTRICT="!test? ( test )"
-
-# [secure] extra is deprecated and slated for removal, we don't need it:
-# https://github.com/urllib3/urllib3/issues/2680
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	brotli? ( >=dev-python/brotlicffi-0.8.0[${PYTHON_USEDEP}] )
-	zstd? ( >=dev-python/zstandard-0.18.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/freezegun[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-rerunfailures[\${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[\${PYTHON_USEDEP}]
-			>=dev-python/tornado-4.2.1[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=dev-python/zstandard-0.18.0[\${PYTHON_USEDEP}]
-		" "${PYTHON_TESTED[@]}")
-	)
-"
-
-src_prepare() {
-	# upstream considers 0.5 s to be "long" for a timeout
-	# we get tons of test failures on *fast* systems because of that
-	sed -i -e '/LONG_TIMEOUT/s:0.5:5:' test/__init__.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x CI=1
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# take forever
-		test/contrib/test_pyopenssl.py::TestSocketSSL::test_requesting_large_resources_via_ssl
-		test/with_dummyserver/test_socketlevel.py::TestSSL::test_requesting_large_resources_via_ssl
-		# stupid test, next bump please verify if they fixed it
-		test/test_poolmanager.py::TestPoolManager::test_deprecated_no_scheme
-		# fails with newer secure SSL configuration, which removes TLS 1.1
-		test/contrib/test_pyopenssl.py::TestHTTPS_TLSv1::test_verify_none_and_good_fingerprint
-		test/contrib/test_pyopenssl.py::TestHTTPS_TLSv1_1::test_verify_none_and_good_fingerprint
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1::test_verify_none_and_good_fingerprint
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_1::test_verify_none_and_good_fingerprint
-		# TODO: timeouts
-		test/contrib/test_pyopenssl.py::TestSocketClosing::test_timeout_errors_cause_retries
-		test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
-		# warnings, sigh
-		test/with_dummyserver/test_connectionpool.py::TestConnectionPool::test_request_chunked_is_deprecated
-	)
-
-	# plugins make tests slower, and more fragile
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# some tests are very fragile to timing
-	epytest -p rerunfailures --reruns=10 --reruns-delay=2 \
-		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/versioningit/Manifest b/dev-python/versioningit/Manifest
index fb7650d8fb03..6e764479922b 100644
--- a/dev-python/versioningit/Manifest
+++ b/dev-python/versioningit/Manifest
@@ -1,2 +1 @@
-DIST versioningit-2.2.0.tar.gz 742936 BLAKE2B 05bfebce378947a9196b4bd90495dc8f89fa9b79b99e5a4423ff39df77f0353125ba5f2deec1e685feacb6fbb8ee896fd1f18155b985f803be4d21e885689128 SHA512 9169bd04c29937a5d913dfa4951affe9d01f21f513fb6f704bdd65f44c91dd47c366169fd50aecc938992cb32b6cac835359b1dc9a6b431b8b5371125564791e
 DIST versioningit-2.2.1.tar.gz 743942 BLAKE2B f0f84b2323cdeac79144d842bbebfc196aecb35752da4dc0e343a709fc539eba50f33079dc652e95dc06bda8ddb761b5a68179b50f533434aafd7d4b1263af63 SHA512 9ec8d4cf26392fd3bfd29d5c3e573a6af8e6a42c6aff1d0f9dbf68a17b667c55859d64d91d5715bf232f4eea22a6f300cbfc6da2be8364186c23b5023fa0e6ad
diff --git a/dev-python/versioningit/versioningit-2.2.0.ebuild b/dev-python/versioningit/versioningit-2.2.0.ebuild
deleted file mode 100644
index 96ce4dc4b9c9..000000000000
--- a/dev-python/versioningit/versioningit-2.2.0.ebuild
+++ /dev/null
@@ -1,48 +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_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A setuptools plugin for versioning based on git tags"
-HOMEPAGE="
-	https://github.com/jwodder/versioningit/
-	https://pypi.org/project/versioningit/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/packaging-17.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		<dev-python/tomli-3[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/pydantic[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# Tries to do wheel/pip installs
-	test/test_end2end.py
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e '/-cov/d' tox.ini || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest -p no:pytest-describe
-}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index c5ca87dc38e0..cad89d4371a4 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1 +1,2 @@
 DIST virtualenv-20.24.5.tar.gz 7119883 BLAKE2B bc4a0e81feeac8975f259b329f223a286be41af11c9a8f27b68b6a42611668942ba18b691a848195609e47695e3104602d6563cabb930d7fed9f07cc57d2468e SHA512 f77961ed26c3e7314f26c0c18d41ab843572b0a1d157eb7b5e51f955a289da8ecf633d2ad9c936b9292e5b06e4ce9f5b11a100681fbb63dd1fb9fc9bef37f4c4
+DIST virtualenv-20.24.6.tar.gz 7140367 BLAKE2B 7a98219cc7933431720e3105b9e94efe7622ecf769ae7a8a9be45253e6cbd0978a653e341586936428bbe271c25a90aa93aebdc423b0eeafad67dd0394fbea5a SHA512 cd09d05490b22c26220b48566e6df860cc135d142e9a390f85ed920a26f4ca2c0ca129b0b190fb9cb46ed0e2711231aa5966ae73ceabc1e3fa7812b63fc5c53b
diff --git a/dev-python/virtualenv/virtualenv-20.24.6.ebuild b/dev-python/virtualenv/virtualenv-20.24.6.ebuild
new file mode 100644
index 000000000000..3d3df905adc2
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.24.6.ebuild
@@ -0,0 +1,115 @@
+# 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_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 multiprocessing pypi
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	<dev-python/distlib-1[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
+	<dev-python/filelock-4[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
+	<dev-python/platformdirs-4[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}]
+"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
+		' pypy3)
+		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/time-machine[${PYTHON_USEDEP}]
+		' 'python3*')
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# workaround test failures due to warnings from setuptools-scm, sigh
+	echo '[tool.setuptools_scm]' >> pyproject.toml || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+		# tests failing without python2 installed
+		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
+		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+	[[ ${EPYTHON} == python3.1[12] ]] && EPYTEST_DESELECT+=(
+		# TODO
+		tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
+	)
+	[[ ${EPYTHON} == python3.12 ]] && EPYTEST_DESELECT+=(
+		tests/unit/create/via_global_ref/test_build_c_ext.py
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x TZ=UTC
+	local plugins=( -p flaky -p pytest_mock )
+	if [[ ${EPYTHON} == pypy3 ]]; then
+		plugins+=( -p freezegun )
+	else
+		plugins+=( -p time_machine )
+	fi
+	epytest "${plugins[@]}" -p xdist -n "$(makeopts_jobs)" --dist=worksteal
+}
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 87c01ce0e341..b8d9b05d06e6 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,2 +1 @@
-DIST xmlschema-2.3.1.tar.gz 494834 BLAKE2B 2438a57f0b07aa5b0f9871bd6a4f64a90a7946ef3deb89b8e12736c52f185a3f4406ff5e894cd7b330600f82e55f6470a32769ed06e4ce85e914dc9808d5091c SHA512 6a08db7cc8f719f2b6d2b8c8478aa35b4fae72bd3c595a2ac9d39c6be6f75a3cdbf696f9e7424d3122d618a4bffc6bfddd5600daa8e0a64db5474fe95659c706
 DIST xmlschema-2.5.0.tar.gz 539358 BLAKE2B 3d70b01f325ed1b4b61b1baaf1d7d29fd9748984f229d78bc645fef331d2cfb6f6d6e52200295ced0e03513e105ebfb8f30937c51e0883ee5d67866346cddb02 SHA512 d859be35d057d8bb1cea85c0f90525ae26f78f09ba2a111414f429eb2afd8633cb59ec0d701bba5bd1d086efb7ae51c2c470882cbfb932caa51c8b8d1ecbfbcb
diff --git a/dev-python/xmlschema/xmlschema-2.3.1.ebuild b/dev-python/xmlschema/xmlschema-2.3.1.ebuild
deleted file mode 100644
index b14f1736aede..000000000000
--- a/dev-python/xmlschema/xmlschema-2.3.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="
-	https://github.com/sissaschool/xmlschema/
-	https://pypi.org/project/xmlschema/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/elementpath-5[${PYTHON_USEDEP}]
-	>=dev-python/elementpath-4.1.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/yapf/Manifest b/dev-python/yapf/Manifest
index 82d2860fe7c1..9798bd2314b6 100644
--- a/dev-python/yapf/Manifest
+++ b/dev-python/yapf/Manifest
@@ -1,2 +1 @@
-DIST yapf-0.40.1.gh.tar.gz 226063 BLAKE2B 57dd62e32d06312a5a8964fb7822cd87321ae1548be67a1824f5d6efd90e86c629452faf71722a1dfc8f70052f63020ab88d55501c140f33660368c56cce2ea4 SHA512 7d44ea8976c93db850f0a139535962e166b4e488e47761720747686061ad7d7d3bbb2771f2e1519b7db8af630f64b7bcf71143faa56d448c9d098c2d151bffeb
 DIST yapf-0.40.2.gh.tar.gz 229593 BLAKE2B a3e614eb10577af5a627f7ddd916eee5792c02cdda3dfab7008cfec91a4ad8588be8ee6cbdb82fb5967dba21ed2760dcf2d4d99783749ec5df025bd189111fd5 SHA512 be71b622efde162d64e5143c2a27de254a3791c229046309a083fa0df00afb4170cf0427c4402d3c621ca2120210ba15aa6d124ef7b8790c4b72705f5c5342e3
diff --git a/dev-python/yapf/yapf-0.40.1.ebuild b/dev-python/yapf/yapf-0.40.1.ebuild
deleted file mode 100644
index 61874a571ce1..000000000000
--- a/dev-python/yapf/yapf-0.40.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2018-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="A formatter for Python files"
-HOMEPAGE="
-	https://github.com/google/yapf/
-	https://pypi.org/project/yapf/
-"
-SRC_URI="
-	https://github.com/google/yapf/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/importlib-metadata-6.6.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v -p '*_test.py' ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index d90746c7ebb7..6942cb4dbabf 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,2 +1 @@
-DIST zipp-3.16.2.tar.gz 20002 BLAKE2B abc9b9b2c801f50856e6ad761ff2be81729a475e221716b63c8e017ae87b5f712e43547ba1a42911533f9ad88d02e805768e5bcba397b3f7355d0a8cdcbaab0a SHA512 cb7f19638b2bc2bb1c38241078836c4e484b8f1fae8232073da25967f01e449eb8a6c870d2afde285ea9ae319785a9e4b7cb0e5edc2d0f4690f3ce27c359be93
 DIST zipp-3.17.0.tar.gz 20367 BLAKE2B d1b21b7692e77a019769cd0ab93c850a409bc1eea22e2e6eb0ecaf0c14b5c42a11110b272ee73afb111675f15dfab32aceae6515c05fd4e0c4749352e4be3c90 SHA512 efd100add7e8face19a6163d07b5efbef6f896d1f3ed2dbdd443ed7e523428bd779d1f05dfe806d4d2bbe10c17c21136f2a0b6f0cbe6000dd8a6abb86dede725
diff --git a/dev-python/zipp/zipp-3.16.2.ebuild b/dev-python/zipp/zipp-3.16.2.ebuild
deleted file mode 100644
index 832c30d7c743..000000000000
--- a/dev-python/zipp/zipp-3.16.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE="
-	https://github.com/jaraco/zipp/
-	https://pypi.org/project/zipp/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-# big_o is only used in test_complexity, that we ignore
-BDEPEND="
-	test? (
-		dev-python/jaraco-functools[${PYTHON_USEDEP}]
-		dev-python/jaraco-itertools[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# performance tests are flaky by design
-	tests/test_complexity.py
-)
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "zipp"
-		version = "${PV}"
-		description = "Backport of pathlib-compatible object wrapper for zip files"
-	EOF
-}