gentoo auto-resync : 17:01:2023 - 07:14:19

48 files changed, 885 insertions, 310 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 799d96704adf..7183277284f6 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/Nuitka/Manifest b/dev-python/Nuitka/Manifest
index bdd65e29f074..6852060a0e4a 100644
--- a/dev-python/Nuitka/Manifest
+++ b/dev-python/Nuitka/Manifest
@@ -1,9 +1,5 @@
-DIST Nuitka-1.3.4.tar.gz 4028710 BLAKE2B 5cf02644524f612cd4403147323ce0e4d121efd91d8a9da3f55e81117e088337ce9d56f801691b52236bb17bb7ffc3987e98c8d23bad1c84b4bae61fae41b5cd SHA512 7c3562a264833ba2b5ed09a43d91113f59ece8a088480ac03517fe66b380d354faf465845fb7218d34f328114d8bdee92d4374651182f85f50593ce9294e8796
-DIST Nuitka-1.3.5.tar.gz 4019765 BLAKE2B dc169a318400e23021a2712f41c49e8d045352c2b6ab946a289d479ee3aeb887456cb0218e762ea091885ce4204d1c3d59e6d228a58b596a70387400e5f31c35 SHA512 edc603b3b38e68473d3002641e61d969cd1fe9626aaa45023c017b2c2ed288d61ee5e537e9b96ca53efc5e052e689df37849bb0b1da65d0b31d38152645ced25
-DIST Nuitka-1.3.6.tar.gz 4029420 BLAKE2B 2c4f9daeb8532287e0e1ff65bcb6da77a048ea4638b74c4f7fe86bcc2d2a2746357af264bf0659ce3a582f270dda049d750050482eb65c4582387ffcd788a9f5 SHA512 c8ec015b9cdf2a49b5cc31103ff14d47654c7df3f003fc045a6b41df11b48597975427cc38c5f03b7b2e9f57e7838ccbc2def168943069be4bafe28a2e1c921e
 DIST Nuitka-1.3.7.tar.gz 4029412 BLAKE2B daa123ff224d442bc5afe251cf2658945a8cf7ca2c173307da81a72cf915c7110958bb7650b9bc2d3ff98f6867530554125b37d3f1e30d5bd784f648e8da785d SHA512 afff1e77bdce22ce41ca0d9824392f2319ab7b9754d26a00f6001bab09402d8f8665a921077d4e08958e4508fb922c833e4c16d25a04da6925a84a96cee0a87c
-EBUILD Nuitka-1.3.4.ebuild 1191 BLAKE2B d09596501d4167392016199b9c9246ab0f57ceca5667340672d9cdca0d7ebe5288eef83e9485bffe607a8f8af1cea705809ab94ca730e1abe39929109b44f504 SHA512 edfd1f3c1abb7d0be5a943e92a4b0ac79f205d5df93a453c8922aad73d3df4489a0b1a4bb4ed11a1e77b493633231f156b6be6faa17629a6d5b1ba44295f05c5
-EBUILD Nuitka-1.3.5.ebuild 1191 BLAKE2B 11fe3e2a6dd185eb1a80fdc1b317d1b36d67780cc3f4c445ec882abab4285c68632ffb180a8bc676d60328736b77757f1348f28ad8b57435d037304d1b7f172a SHA512 afd8b49b1a3dcf541926d21ebf397a35c2e51b8f333ff774b89a86a6538541a330e8a142ffb88d52f3035b721bdcb9d8731dc3e9e1b5191b8cfaf0cbf26262a1
-EBUILD Nuitka-1.3.6.ebuild 1191 BLAKE2B 11fe3e2a6dd185eb1a80fdc1b317d1b36d67780cc3f4c445ec882abab4285c68632ffb180a8bc676d60328736b77757f1348f28ad8b57435d037304d1b7f172a SHA512 afd8b49b1a3dcf541926d21ebf397a35c2e51b8f333ff774b89a86a6538541a330e8a142ffb88d52f3035b721bdcb9d8731dc3e9e1b5191b8cfaf0cbf26262a1
+DIST Nuitka-1.3.8.tar.gz 4030106 BLAKE2B 5e762b2dde0d86f8dd78bee101ee3492468a628468c485d06759c2c1e6829f647e429122227425806c7063c5071968a73ce24865e957db67465726d42796070c SHA512 34f5b6e9f859ed194b5928bad3b6042fdccd9d798dfc0cbed9bcbb623a093ee700adbfd2887c1322703d69494a4ffae556c7cadb4b4b0178990867f3693bdd35
 EBUILD Nuitka-1.3.7.ebuild 1191 BLAKE2B 11fe3e2a6dd185eb1a80fdc1b317d1b36d67780cc3f4c445ec882abab4285c68632ffb180a8bc676d60328736b77757f1348f28ad8b57435d037304d1b7f172a SHA512 afd8b49b1a3dcf541926d21ebf397a35c2e51b8f333ff774b89a86a6538541a330e8a142ffb88d52f3035b721bdcb9d8731dc3e9e1b5191b8cfaf0cbf26262a1
+EBUILD Nuitka-1.3.8.ebuild 1191 BLAKE2B 11fe3e2a6dd185eb1a80fdc1b317d1b36d67780cc3f4c445ec882abab4285c68632ffb180a8bc676d60328736b77757f1348f28ad8b57435d037304d1b7f172a SHA512 afd8b49b1a3dcf541926d21ebf397a35c2e51b8f333ff774b89a86a6538541a330e8a142ffb88d52f3035b721bdcb9d8731dc3e9e1b5191b8cfaf0cbf26262a1
 MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9
diff --git a/dev-python/Nuitka/Nuitka-1.3.4.ebuild b/dev-python/Nuitka/Nuitka-1.3.4.ebuild
deleted file mode 100644
index 6ba48aa72091..000000000000
--- a/dev-python/Nuitka/Nuitka-1.3.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_10 )
-
-inherit distutils-r1 flag-o-matic optfeature
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="
-	https://www.nuitka.net/
-	https://github.com/Nuitka/Nuitka/
-	https://pypi.org/project/Nuitka/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-util/scons[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "nuitka/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	doman doc/nuitka3.1 doc/nuitka3-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/Nuitka/Nuitka-1.3.6.ebuild b/dev-python/Nuitka/Nuitka-1.3.6.ebuild
deleted file mode 100644
index 3ad289dde538..000000000000
--- a/dev-python/Nuitka/Nuitka-1.3.6.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=setuptools
-PYTHON_COMPAT=( python3_10 )
-
-inherit distutils-r1 flag-o-matic optfeature
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="
-	https://www.nuitka.net/
-	https://github.com/Nuitka/Nuitka/
-	https://pypi.org/project/Nuitka/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-util/scons[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "nuitka/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	doman doc/nuitka3.1 doc/nuitka3-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/Nuitka/Nuitka-1.3.5.ebuild b/dev-python/Nuitka/Nuitka-1.3.8.ebuild
index 3ad289dde538..3ad289dde538 100644
--- a/dev-python/Nuitka/Nuitka-1.3.5.ebuild
+++ b/dev-python/Nuitka/Nuitka-1.3.8.ebuild
diff --git a/dev-python/caldav/Manifest b/dev-python/caldav/Manifest
index 98a6f577c80f..6f8d6fd9ab9b 100644
--- a/dev-python/caldav/Manifest
+++ b/dev-python/caldav/Manifest
@@ -1,3 +1,5 @@
 DIST caldav-0.11.0.gh.tar.gz 126186 BLAKE2B 0d818ea5e76b88b3ea18f1fd878a297fa88ad9921d994a61d05c02aa80b73ac40bd8cb36810a050d8f6a87009911655b64a8a4ef09133cb751a225adacdd5575 SHA512 761753fa86e2ba9788030df1af482177bd01ee266a7fe8da744ac85eee95a74d1450e1afa0f64109b9c12aaedba0354d76da2ee9b27dec2771141fc453727d4f
+DIST caldav-1.0.1.gh.tar.gz 133071 BLAKE2B d7b9eb8015782bed5d32b7c34508cfcc1334d33cdfed99003cf45893b0a894d5a3187a2c98f886f97ffe8a64140a5a3826e1b3f57b58228a61d1ad4f9bf9f72a SHA512 ac816afd74f6fe34d82345a8b3a934fbe2c37af6a75cc8ef91cd87c8b8d147962ff05e701cd91480c1963d57967898129f923655d366820b689959b00f55659f
 EBUILD caldav-0.11.0.ebuild 1295 BLAKE2B 2ec17dd0724849ccb44ffbf34389c6503db72f8b4c059781e8dea14dd6affd4f6eeb56aadd795e720fb2537ef6489e6da1d17570ae2259acaa8046a44788d446 SHA512 7506ba748635ea11b80182adb6ed2c5c10693baf49fa7294cab2836f1b9c4c76565a45ffbd14b7d903e938d0b03cacd26c8f0055336660d758698234a79d3779
+EBUILD caldav-1.0.1.ebuild 1345 BLAKE2B 1fb820c1cb3691d568ff6e272cbd18c9e31dd3267b21ac4f695a0cee78d83a4da2e4e44b987408668a7100765e90a63d13e8f7eceddfcee232fc061cfe80a7f5 SHA512 1a3d4db29a029593e3bf6cd24c7441bbd0c72870c6433f5052c8697f9ab984bd651ed718b0531f46583182418f2d244c253823d955cd8821d4ac75dc763ea29b
 MISC metadata.xml 394 BLAKE2B f0b9c600418cbbc4c935d53b63f4e6c1235500984ed388ceb26c6e02fdb7200eec1464d8c4af17e6afdf3688479f0a0763e6e710f916c1c71dab2ca84df9509f SHA512 4f94039805c6cbfb97a667d555af39bcce7f10db8a7c61f3b8b48a903fcd52d3e30467c91c9ec13195be6dc3c4ccbfa088aeac390d5e1c64e9267527a8b77b6b
diff --git a/dev-python/caldav/caldav-1.0.1.ebuild b/dev-python/caldav/caldav-1.0.1.ebuild
new file mode 100644
index 000000000000..ebdd830441f3
--- /dev/null
+++ b/dev-python/caldav/caldav-1.0.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="CalDAV (RFC4791) client library for Python"
+HOMEPAGE="
+	https://github.com/python-caldav/caldav/
+	https://pypi.org/project/caldav/
+"
+SRC_URI="
+	https://github.com/python-caldav/caldav/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="|| ( GPL-3 Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/vobject[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/icalendar[${PYTHON_USEDEP}]
+		dev-python/tzlocal[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		www-apps/radicale[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO: needs unpackaged recurring_ical_events
+	tests/test_caldav.py::TestLocalRadicale::testTodoDatesearch
+	tests/test_caldav.py::TestLocalRadicale::testRecurringDateSearch
+	tests/test_caldav_unit.py::TestExpandRRule::testZero
+	tests/test_caldav_unit.py::TestExpandRRule::testOne
+	tests/test_caldav_unit.py::TestExpandRRule::testThree
+	tests/test_caldav_unit.py::TestExpandRRule::testSplit
+	tests/test_caldav_unit.py::TestExpandRRule::test241
+)
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index ba9f00172311..bf79e8e05f98 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,5 +1,7 @@
 DIST dulwich-0.20.46.tar.gz 426530 BLAKE2B 702564597a0367f454a396e4917d4fcd8b963d1847ddef688dccc7d7501f0073ae9a0ab422f31b8b0648210dafa953744ccf496b41fc75c7bea5090d75bf142c SHA512 4cc86afe90139d813d11ac2a8b96e84ca60ea28baab83a2af8da9a7cef2f3cdac647af858f5fc3806ae741a0b4fcf592d94f228adf8ab7b5b600be41f6acc356
 DIST dulwich-0.20.50.tar.gz 430389 BLAKE2B 1ea86fe00fa560311bdcff8c51904982a506fa670efb503f9103c5fb25036a792a87583fdf6435a6a6ec7bd6aaa2277c621359e1d99f55450c247fdc4be74e51 SHA512 506cc76f7deb8247b910fa4971e28eeda6ddd34703ac3c7a2f3b6525e6a9229bbec527b1965bebf7aa3da17b5adbd146916f247acacf9caf86d2494e60cc8626
+DIST dulwich-0.21.0.tar.gz 436570 BLAKE2B d63185fe6e900823f5b295454a41be4f8508aa4c1757599186a0daab6f9b44e0036485d16d9f3dd34e3d1d191987cb0191254cee844caadadf9e43d0a2de0645 SHA512 ff437cb8381d91183d2843397afed5c1b04db000a093d61b6cdb1d76821104260e9d8572a05cf10c8959b88b99ec8fbcd3ff3a3ae2f860ab6201773de32635b5
 EBUILD dulwich-0.20.46.ebuild 1519 BLAKE2B 3923d79ef9fd11e053880cc2fc2d2cf7fd4bd1065a6b4bfa32bc2a23a2d4fc7720683da730ff7ad06bf0dc898f257099dc5e9c566ecd2a782381b63ca27edb09 SHA512 7b0a06f109750e51e6842a702bbf2ed20f38b8d5da5ed2fe6baf9e9a04773cc5b43993da7ca12fbe37744c5f139caed351465f272099ccc7141328afa6afac48
 EBUILD dulwich-0.20.50.ebuild 1520 BLAKE2B 6854d2d710fc7aa94abf8bd56e40afe5aabd3b2926b9f5f716c25694c9581aac39c95be8dade9e1ca5d798f63b4fd59d6d201aeb1e4eb87a0dd4b2f475c5b674 SHA512 0068581235304cfa60bdf34e1c922efb310cebf0f3345b0a97927ece777d53564660bf70e25d4344178937c76ff60d8e6a269663e011e9f044b9d47f3c20bfe4
+EBUILD dulwich-0.21.0.ebuild 1523 BLAKE2B e5f55d7476f1c33a42f28e01e8c7470a46fea52cecbe9f72811db981fd7b9abd402637ca5a68a45bd8429aaaad32eae39737c829a4508b0c5045a726ca7de83b SHA512 5d4c37c0d517827b7cd7685b6d53e6f92d20832272e00e0c019172c09c8cfa8166b8a619c6b42d95f3d5b3d04bfb506e57a79baaa49ba97fd3d6b60be93e1bd5
 MISC metadata.xml 556 BLAKE2B 240554ff522160e9508bf6debadafcc44b5ccc4074dd4c9d3ce82358963084c60a1afae9fafee6ab1e6e5d898940ccb4d1b524cebff155e61bf6707c9396b647 SHA512 a7cdca224a01d5bd26bf4a5adb0273977ddff61f75cd02f5642132656fd0c6608114617efcb068d834f107804666cf4fb3725967e804b73d2ddcb67342dc30de
diff --git a/dev-python/dulwich/dulwich-0.21.0.ebuild b/dev-python/dulwich/dulwich-0.21.0.ebuild
new file mode 100644
index 000000000000..2949d3dcec07
--- /dev/null
+++ b/dev-python/dulwich/dulwich-0.21.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
+HOMEPAGE="
+	https://github.com/jelmer/dulwich/
+	https://pypi.org/project/dulwich/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+ Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		app-crypt/gpgme[python,${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/fastimport[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	# remove interference from the tests that do stuff like user.name
+	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
+		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
+	# Do not use make check which rebuilds the extension and uses -Werror,
+	# causing unexpected failures.
+	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite ||
+		die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index e83c7b6fc9f1..0d0134e687e5 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -2,8 +2,10 @@ DIST ipykernel-6.19.2.tar.gz 143367 BLAKE2B f6f38f5eed3a11951d303f49c58131d94730
 DIST ipykernel-6.19.3.tar.gz 143840 BLAKE2B 9736d1ae2a2ef3c807bcea78aafc4ca2e3813693bddf9eac82425aed78382c36d736d5b4351989d9fdf3343335c503fef92f76ebff5a313e5af222aa78a04a04 SHA512 5c37e60ee353e469c0d7fce20a66d8e71dc57120ace6d518ed98816280c794ffafe8e8226545d978fc822760b5874371eafcb20cb7195328e505073eb70b4f06
 DIST ipykernel-6.19.4.tar.gz 144072 BLAKE2B 25e2031a9198079488ef43b9c65e656be720ec8ac6648cb3eb65705be5c117d32c783776c0d8f5da466e745979ccb64573720146c0b41835ecb646bf25e7d4f8 SHA512 623a8cac7abfce0147a08fe55bf88772bfaf317431a608a99ae3e7058ebb120464d751a8b95633ccde5201b4cc2c1bde32dd823add96e5f2bb1ef20da19652dd
 DIST ipykernel-6.20.1.tar.gz 149147 BLAKE2B 9d05f1f43aa1a77dd63fac60fdd44d56dd03cc8b5025a99b29e04e30ca90ec5e6d541ab86c9fa1490b97b198e829058d14273823ad55321b1f8fe1b028d1bc62 SHA512 7a9b2ac79255e3049ee5847f5b424d2dff0a325e9f294b416d905907753c98751c70ff69ba496831eb98430532f438e5bd7edcb2c12b8b5c56f5b5c79b30c3d1
+DIST ipykernel-6.20.2.tar.gz 149263 BLAKE2B 38b3afdbe237ec2facb3af42311315a060f1dba845cb3f7ce10a3d5f68679804640b0dbda869395817a8612af2033f5936ff7f6f3b3b822f47ed512a3b8c0c4d SHA512 9c79c7fa175cd81a920e6b1f2159dda30ba9068437cb1d24b09d864ded36b439045e58f240daee1a46ae375f1990cf318cd8b2e2c02aa6d6e2004d90aff5225a
 EBUILD ipykernel-6.19.2.ebuild 2070 BLAKE2B 0d0c02013a91fa10d33adc52d02e9cb6cd6fd6bf7743819f006facdfc2987333f00ef398a6a2014281d0aa4ef68bb7eea0b951ac16b8e6a44d61f5f8087489bd SHA512 6acc488cbd2de2fa86c1918df92c0127f0e9464233b277c46f354746c30d76995c14067f1ec2100c16d2a5d3564338e7bbf43fe1d993417d1c5ea0d553b76484
 EBUILD ipykernel-6.19.3.ebuild 2078 BLAKE2B 4b476af380528f7f74cd6174a7d1a8b6c0d12eb1a0b6042c9bb5a466109efa893ac516d21a215499d3df3a3c357783985091d33c0bc09f0a45c9a8217513fc0b SHA512 3d1f48dcd8f31f85862b82f650f2c252aa8bc8ddb3202a23c6a6749e819432bd9e888333df6d34fd61f4a6ba39d0ac690017eac4901f555aec42a3abe50143cd
 EBUILD ipykernel-6.19.4.ebuild 2078 BLAKE2B 4b476af380528f7f74cd6174a7d1a8b6c0d12eb1a0b6042c9bb5a466109efa893ac516d21a215499d3df3a3c357783985091d33c0bc09f0a45c9a8217513fc0b SHA512 3d1f48dcd8f31f85862b82f650f2c252aa8bc8ddb3202a23c6a6749e819432bd9e888333df6d34fd61f4a6ba39d0ac690017eac4901f555aec42a3abe50143cd
 EBUILD ipykernel-6.20.1.ebuild 2208 BLAKE2B 0c01465ef85bb251b5f367e1f589ff947abd51a7e10b4e2dbf5db2396c0a8be23ee2ee1fe4015389a71ea469092080b330a5404523dc37c95df416fddec4f283 SHA512 0f662fc33c471ee808a45bc0e285cf8cff1f01f4e345f37a952c1e8e42f23379905a1bb529ff1cee531475e6035da37b60502b7db870f3c7cbed54af8d159ab7
+EBUILD ipykernel-6.20.2.ebuild 2208 BLAKE2B 0c01465ef85bb251b5f367e1f589ff947abd51a7e10b4e2dbf5db2396c0a8be23ee2ee1fe4015389a71ea469092080b330a5404523dc37c95df416fddec4f283 SHA512 0f662fc33c471ee808a45bc0e285cf8cff1f01f4e345f37a952c1e8e42f23379905a1bb529ff1cee531475e6035da37b60502b7db870f3c7cbed54af8d159ab7
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.20.2.ebuild b/dev-python/ipykernel/ipykernel-6.20.2.ebuild
new file mode 100644
index 000000000000..4b2d1c25e75a
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.20.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="
+	https://github.com/ipython/ipykernel/
+	https://pypi.org/project/ipykernel/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.4.0[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ipyparallel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Use python3 in kernel.json configuration, bug #784764
+	sed -i -e '/python3.[0-9]\+/s//python3/' \
+		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
+}
+
+src_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		ipykernel/tests/test_debugger.py::test_attach_debug
+		ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
+		ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
+		ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
+		ipykernel/tests/test_debugger.py::test_set_breakpoints
+		ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
+		# hangs?
+		ipykernel/tests/test_eventloop.py::test_tk_loop
+	)
+
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/jsonref/Manifest b/dev-python/jsonref/Manifest
index deba1ff31244..497f30b96188 100644
--- a/dev-python/jsonref/Manifest
+++ b/dev-python/jsonref/Manifest
@@ -1,3 +1,5 @@
 DIST jsonref-1.0.1.gh.tar.gz 20163 BLAKE2B c70dfc59059845cb7e3e6db2aaaf8f69b0030c124a2dc52ef5b11296e42d46635a7cb4608a276e093023c7450ca5bc342a6f112476cb6444df69d5a93cfcf306 SHA512 95602997cf4ed798ab8e55d38f0d81a5530ebd08546fd1f63bad6c8f4076d155d007317812f01f9bf6b2f15e30663bdf0a4e2cab96ebba87552ecb5c712364b9
+DIST jsonref-1.1.0.gh.tar.gz 20465 BLAKE2B 5dc790440133fc1c4fedcbfb9889f9647f62919e960a81fab141e92c9bfe2349a807c1f3be1ac819b6d39d1ab4134e9d9e61fbb1c34008bf1831c997abe030ab SHA512 6237d32d0547b11253d0bfe1dcf37230ce2c3f4c15ec643cfbef997ba6074ab881b20c08ce43f1d7c26993f1f06fe7d35aeb7fce98d2105bce2311d64e34ab71
 EBUILD jsonref-1.0.1.ebuild 554 BLAKE2B aab8b54dd3b900a409a976b6bcbd6173bdf57c337cb1842ca187ef2e5606907826ae89f407191c0f230d6570d18d6c81be53819edff3747b5e0e3a93ab03d655 SHA512 c303b1f3775c03bba7761ee40a812fa6fb03cb3dc90c831ae2188130813c1b368aeae48d5d0f63a8f7a0161a5d6012e6f7f615018633b21814a9e9b784f0207a
+EBUILD jsonref-1.1.0.ebuild 551 BLAKE2B 47837ec4aead36af4088c3cec1ffefb3d3faa38d7782ee8d6e8db50da24394b71532304394d5b7f473688b576202b164381943a57cfe6c4aca281cd91e1e4b0e SHA512 79f1d2f2a8cc750dea3ea670142e233b57759d4184bbe5d283546bec4f37223368f67a06b3c78a821661cac449dde9671e48bdf8b7e601f4479ff9a2ac5394ce
 MISC metadata.xml 797 BLAKE2B 4afca797d34cb036eefde373c1c02ac9619153670c8f3d9612b5687f248639942a51cb23e18119f61e3cb3dada9566113334662514a89bc6bb2de9ec9f49b4a4 SHA512 803607e8f9a7391f97aa104a4f3997023d341772eac6af0934bea84cbe45dfc1aff59928d8d45116ef52a4b86edc3ff3e28d3547b2f4ceaf37eeb7f2fde0ea7a
diff --git a/dev-python/jsonref/jsonref-1.1.0.ebuild b/dev-python/jsonref/jsonref-1.1.0.ebuild
new file mode 100644
index 000000000000..a571b0d43f76
--- /dev/null
+++ b/dev-python/jsonref/jsonref-1.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of JSON Reference for Python"
+HOMEPAGE="
+	https://github.com/gazpachoking/jsonref/
+	https://pypi.org/project/jsonref/
+"
+SRC_URI="
+	https://github.com/gazpachoking/jsonref/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests.py
+}
diff --git a/dev-python/markups/Manifest b/dev-python/markups/Manifest
index 84b42f3d45b5..d0158b5e251b 100644
--- a/dev-python/markups/Manifest
+++ b/dev-python/markups/Manifest
@@ -1,3 +1,5 @@
 DIST Markups-3.1.3.tar.gz 20868 BLAKE2B 9c6c55bba6a9e8e6dbeaba268014ab59762838fe1e65fd0551c90e0f83245643565cae099e0f5faa4801928c5c0966f5e5afa4ab2db04939f6c1062dc476f3ac SHA512 324c3c45063e192ebde0fcd10e868b2053fb2758076092b180e1d8eed965dd41b2ea252a081b750637454395c163a92145f68e2a6fd8eb3eded8927baf044484
+DIST Markups-4.0.0.tar.gz 22968 BLAKE2B a39fed89fd63785d0d4348a72c00c8e886726dfc5613b5b359606f8b0c42d2cdfbb5cf3bd1b6ec11621f924c3ac1dbc91db083682b4ba95a6f4baa97824bbd72 SHA512 5868b480debad480100ce632223aeca62ef22a6d9b2af6b4911d3477c94bcd99b88b5bc56f990d24d92de0d2665340e0fce37721f7979938ba947fab2c65900c
 EBUILD markups-3.1.3.ebuild 898 BLAKE2B 6c3b121d320564cb6ae8e0040f5540ec7da690b1d801bafd1fbe8af4cd15594e6828e312fd1fb72d88f2b140aa6d36cc766819d255292f4c9e669f344630533a SHA512 6c622cf160633291d81d2f1bf8dcdc854170210fe99db6e4b6117fb4228532824efafdb0044709c1d1e5e00c9a3a71dba5c3a6141def955265f91654524d52cc
+EBUILD markups-4.0.0.ebuild 933 BLAKE2B ce69b0a95a598c295f1b0f2a386b4608a9b34a430c94fa02a5c0945cd7adf3b97b313c9d8e7b88a5664f420b187e74cfc2264fee530b07924bbdb2da5f8616e1 SHA512 80f8909dabbea0cda7280a7b004e40f644f8328e576be550f005d98f0928c3a2bf8653554e89872b65ef42d79e14b08e102363bfabdd28117fa7831465cb1fa3
 MISC metadata.xml 412 BLAKE2B c303b47980b9edf901fb851aad81d526511d15d3ad5cc96ccbf77c6530a3072c32884ff5a108366327cb676d8b3a0585b91ec3c02118ff71c77860306fe44749 SHA512 576bc6802afd05c967db43c2f349825543494bc883d449fa109ecb29ef38fceaa1e822a47cd8bba7319cefad35855a534e98037585a8443797f7e3553be2669f
diff --git a/dev-python/markups/markups-4.0.0.ebuild b/dev-python/markups/markups-4.0.0.ebuild
new file mode 100644
index 000000000000..ebc63113662d
--- /dev/null
+++ b/dev-python/markups/markups-4.0.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
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit distutils-r1
+
+MY_P=${P^}
+DESCRIPTION="A wrapper around various text markups"
+HOMEPAGE="
+	https://pymarkups.readthedocs.io/en/latest/
+	https://github.com/retext-project/pymarkups
+	https://pypi.org/project/Markups/
+"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/python-markdown-math[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		app-text/pytextile[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pymdown-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 939eb09bbb51..f556f37c6213 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -9,7 +9,7 @@ DIST matplotlib-3.6.1.tar.gz 35826557 BLAKE2B b30710436a773298dcdf233e592656d981
 DIST matplotlib-3.6.2.tar.gz 35843927 BLAKE2B 22b933b2ca2bfb156ee1592f522da6e7566f279fd6c7ef2d2f5aeb8697fc04085b57ba6bb5f7948572b3e671687b74d6ba9f7def2728b6224fbc98b121281a3c SHA512 51b84a4328a85f674cb44728955fca8bb5b8b702c788158b8bcfc13a44206a5a658ac12ed8f9a5f6ec53ef543395fab4f3871f91013ba1432f3e2b848c36976f
 DIST matplotlib-3.6.3.tar.gz 35868590 BLAKE2B aa511e7d82c41ff2b5622b23847c2e94ed5d400be74eddcdab12ddba8d25bcc1b778c5fb2a29935bca71b76cbf4213088286c9a6a3d085e06036069909ccc1e7 SHA512 844ca90bcc9953d3d1289a6d471180a3dadb49c75eb59858bbbfb67d4b1292b83b86b366f22ab12d9e97c980376d48b86e745607ec4e812a3010c6fec01398dc
 EBUILD matplotlib-3.5.3.ebuild 7442 BLAKE2B e42cc0566d97b7276ca5e8054ebb1b2491bf1461979952f5e91449cc7a817589ddf6e6e009b40d3a8222c5942f3e3f97e759ac46b9e801246b20f5720883a1cd SHA512 7d968fa3a722ac7c58d434f410ef34f78be9bf91d9997d66903cbbe0a54ea7ded3a0f63ffb4f12f0ac7e0245a104dba27bcfb3d7ba13fa5d83862c0cc28d3f07
-EBUILD matplotlib-3.6.1.ebuild 7340 BLAKE2B 3ad2226d0fabed8d01bfcf4c2e8ca06f2fa0156288a7f0f44008c774b809a23d06882f1977a8f5506b3afa4ec2e5942716b9c03e2780966cd2d19bedf7dd36f8 SHA512 a5839a268e5cc0212725b06a40e519b3af9311b8201bf3158827f657e86c94da910398c8486c10fe6f4b7649c43d78e4a87423645a635b8eb90ed89972acc59e
-EBUILD matplotlib-3.6.2.ebuild 7428 BLAKE2B aa3853a03dd6aa34092c59b21ab927af0c66be2cfecf1d5086ec044d4a2edae9b0cca2526a048b097351d64da06f8ef57004ecef12ec745c27cc8d2b582bec16 SHA512 139c0075eddc804bab3e1c33cfbbeeab0211df4a097deac0df58047dea19c0a86ecc5f0ef90653869d8138445dcbd3ae0eaca31eda2518b598309fb05ad5b219
-EBUILD matplotlib-3.6.3.ebuild 7473 BLAKE2B 98e4f8abb42d12a19b75d7ef049d0a18c23667af1a88e82b5fe81b939e40bc847b750b375fa3e6d66b46acfd2c7ce154728f3c88626e617911c221b3a9c11ee0 SHA512 f206a57e6ed9451f147ef8d4abfa525f25451eb0f3ad731aed0a9fab6b92698fd81ea2560e4ee5125fecb0a89da0b0b45668474d200dfec11a3fc74b097d83e0
+EBUILD matplotlib-3.6.1.ebuild 7283 BLAKE2B 7108da160823c3db5fbaa9b76d7b279779e12ad15b38b7c1b4498daa57fc7db832b93b39a567bc73191e150adfa1452f088734450f79551a66968f2c79dd101b SHA512 b54a6cefdb656c86614c28d49fa138b9572f98997fdf31e2f60f6fdf896c33fb6e6496656aeafd02333af376deedc674e2dc4252fc34e4609adf7d3a7a747d15
+EBUILD matplotlib-3.6.2.ebuild 7371 BLAKE2B 023d7d18d5ee1533addff0884dfc24531ebdf4d472032847f1005d24f7a405bfa7985334a7016775ece90b04f439cc0d037f826616feb026a558d5f104917524 SHA512 f95f793f356b50ff82d05e7c4f716976748c3025f53f410b57bbf1db719fbce68ac8f19877db66beabf70ba2ab2f7af50dc9fb656dbf250c8db01eb38050d7c8
+EBUILD matplotlib-3.6.3.ebuild 7416 BLAKE2B cee197261033a5246892cc58f502e8701e7c4faea655e3c8f1ab1bf25437be00d721c8c78682f50d9fa87658110f0732a1d5353dc099fce20a6716eed8fb06fc SHA512 5956d4f3f09aec5c50dbc485700f2b9596289a6ca24c0cc6b8c89f1b2410f5b785115a36487763a709d737b2e90daa2e3b903f717a4269254cc9e5788c91d999
 MISC metadata.xml 1074 BLAKE2B 1d7dce116e09939378872c2eaf5153948b7e934626110eb4899d0dfc2781429522328f1c4efd2c40f829da64e19bed8f9fbd1b8907a6e74a5fd54587c1d29e5b SHA512 e344bfc813e09c24a8edfa9c062eb2a6c44535559370f508a27a2de20c6ab92aeb48bc8daf9c357178e513eb2474a33782e4098c0f3bcbb84b11f7388ef1a704
diff --git a/dev-python/matplotlib/matplotlib-3.6.1.ebuild b/dev-python/matplotlib/matplotlib-3.6.1.ebuild
index 6e86bc9fc1cc..e5501461c469 100644
--- a/dev-python/matplotlib/matplotlib-3.6.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.6.1.ebuild
@@ -89,7 +89,6 @@ RDEPEND="
 BDEPEND="
 	${RDEPEND}
 	>=dev-python/setuptools_scm-7[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? (
 		>=app-text/dvipng-1.15-r1
diff --git a/dev-python/matplotlib/matplotlib-3.6.2.ebuild b/dev-python/matplotlib/matplotlib-3.6.2.ebuild
index a76be90fbe26..d8abecd0d250 100644
--- a/dev-python/matplotlib/matplotlib-3.6.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.6.2.ebuild
@@ -89,7 +89,6 @@ RDEPEND="
 BDEPEND="
 	${RDEPEND}
 	>=dev-python/setuptools_scm-7[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? (
 		>=app-text/dvipng-1.15-r1
diff --git a/dev-python/matplotlib/matplotlib-3.6.3.ebuild b/dev-python/matplotlib/matplotlib-3.6.3.ebuild
index 1d42e6402a03..da2cb549942e 100644
--- a/dev-python/matplotlib/matplotlib-3.6.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.6.3.ebuild
@@ -89,7 +89,6 @@ RDEPEND="
 BDEPEND="
 	${RDEPEND}
 	>=dev-python/setuptools_scm-7[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? (
 		>=app-text/dvipng-1.15-r1
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index c0a9b75ffbf1..83929234affa 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,5 +1,7 @@
 DIST nbconvert-7.1.0.tar.gz 816516 BLAKE2B c24766716212247dee90ca91a5dbcc65ae2d47b566029eb04e14e65ef94e16f6d7700ea4cc820584bc3b498553196bb5600151a30378ec82f91bf4dde68a5e77 SHA512 5d6e1c09637765e171336528219669a9279a68f3845cb0503b79129b50550f7b5a08526a30de67da6ca132ee5d911743c5afd46773598d6045f3007167f93d5b
 DIST nbconvert-7.2.7.tar.gz 867872 BLAKE2B a1f209f3249b22af3153449f16c84500523dfb3efa914ae214021e5ea9174d49a3f71a860d9ccbb375f2651ee2c2a2a6834a1d2558a579dc1bd63f80172d85bc SHA512 4abf4f13a0e210a8a0338200f1dbc3e6d4d71c8565440aa08d443352e01986dada455e1b894171da1e9fa9b226ba0ea267e7fce70fca1256fc92dfe53a47de6c
+DIST nbconvert-7.2.8.tar.gz 870182 BLAKE2B c6a415a93ed07ded10e318ea30918c7470df9b0ef9e7c51eceb7ee6c75c8c735ae32a459b0166d0c93ad1ec2c468ff9b0a6e4d3e86614ca1355cd8cd58423dad SHA512 e745fccf5524c46638d3c09dfafb21fb9b7e014c43ec0227f9c0e65df9892fcc06071637c17d6a2a5e5749881121a94daed29b66dd8fa27aa31568940320d22f
 EBUILD nbconvert-7.1.0.ebuild 2769 BLAKE2B 210f25ad97d2b7374a24b1d0b38a0f828cba1b34f51755b49c3f7b4f5f57b41eb7815c3367515c5bc41f758ffb3aa88d82d5a5eef026418edcb82cfe9e6a8ef5 SHA512 f9f8fcb0adaab44cad989fa1a8f551adcd4273a95c29ce2361bebfc50676b658b6b15610d47c10cd5a5cbc7a10a85027dfad2a509b073e87e5e7ecd5de2fb62e
 EBUILD nbconvert-7.2.7.ebuild 2780 BLAKE2B a638aa7a20738acc09fc0c8c4e47e494e79763b64ade49a03ef527882155d97e60054a27818877dfe144b5774cf6b799eab43eef7a5277171108ce74c332f8fb SHA512 59678c3273f460668b81e2b132bee1f71e6b6f940febe14e5461a0fc23ea7a2a5516bd67e84d4e33ca5850872a58e3fad0ff209e7f066b031b8935158b3a6dfd
+EBUILD nbconvert-7.2.8.ebuild 2780 BLAKE2B a638aa7a20738acc09fc0c8c4e47e494e79763b64ade49a03ef527882155d97e60054a27818877dfe144b5774cf6b799eab43eef7a5277171108ce74c332f8fb SHA512 59678c3273f460668b81e2b132bee1f71e6b6f940febe14e5461a0fc23ea7a2a5516bd67e84d4e33ca5850872a58e3fad0ff209e7f066b031b8935158b3a6dfd
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/nbconvert-7.2.8.ebuild b/dev-python/nbconvert/nbconvert-7.2.8.ebuild
new file mode 100644
index 000000000000..d7f2948d80c4
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-7.2.8.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Converting Jupyter Notebooks"
+HOMEPAGE="
+	https://nbconvert.readthedocs.io/
+	https://github.com/jupyter/nbconvert/
+	https://pypi.org/project/nbconvert/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/bleach[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.7[${PYTHON_USEDEP}]
+	dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
+	>=dev-python/mistune-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/nbclient-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-5.1[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4.1[${PYTHON_USEDEP}]
+	dev-python/tinycss2[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/notebook[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		>=dev-python/ipywidgets-7[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	mkdir -p share/templates/classic/static || die
+	# tries to refetch stuff even if it's already present
+	sed -e 's:css = .*:raise PermissionError("You shall not fetch!"):' \
+		-i hatch_build.py || die
+	distutils-r1_src_prepare
+}
+
+python_configure() {
+	local src=$(
+		"${EPYTHON}" -c "import notebook as m; print(*m.__path__)" || die
+	)
+	cp "${src}/static/style/style.min.css" \
+		share/templates/classic/static/style.css || die
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Missing pyppeteer for now
+		# TODO: Doesn't skip?
+		nbconvert/exporters/tests/test_webpdf.py
+		# Needs pyppeteer too
+		'nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
+		# TODO
+		nbconvert/exporters/tests/test_qtpng.py::TestQtPNGExporter::test_export
+		nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_convert_full_qualified_name
+		nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_post_processor
+	)
+
+	nonfatal epytest --pyargs nbconvert || die
+}
+
+pkg_postinst() {
+	if ! has_version app-text/pandoc ; then
+		einfo "Pandoc is required for converting to formats other than Python,"
+		einfo "HTML, and Markdown. If you need this functionality, install"
+		einfo "app-text/pandoc."
+	fi
+}
diff --git a/dev-python/openapi-spec-validator/Manifest b/dev-python/openapi-spec-validator/Manifest
index 0df3f0527354..58a9ab292b94 100644
--- a/dev-python/openapi-spec-validator/Manifest
+++ b/dev-python/openapi-spec-validator/Manifest
@@ -1,6 +1,8 @@
 AUX openapi-spec-validator-0.5.0-std-importlib.patch 1451 BLAKE2B ed6a94863f92e5eef2b443826239ccd110b1caacc559465edb0bada4028c38164e9fbfd1a4585211f5384b76866f25dcf55f229ce3582fe377ed2d7f1e711745 SHA512 2d1550cbd8364f26d62e709567fd08e5a134b5ab69ec88fd2f00c928f878c811ef850ce4ed01ac79abe583c84403de912c9845c3ccd264707b403fe1c9ee0544
 DIST openapi-spec-validator-0.4.0.gh.tar.gz 46051 BLAKE2B 43a1458ab1801700261f750e49d45b0cb4d02f1c17a16943b5232836061e0e1466fc973343bbd4bf7a8669b682bd6761cb905fdfb3b80c0b9720253cc2d5a926 SHA512 d2eaf22c75e72eb5061a916eb37b13179a5ba65eb8a00ec42e81c6b4168239bc8613388f2d77ce35113d260385b175280d8863a3deedf18ea5aa93a79f058419
 DIST openapi-spec-validator-0.5.1.gh.tar.gz 39539 BLAKE2B 66adbed2c85527f89e510d5cbc11ccf05f23546191e2677a1c34f7545d2e975dda37f1c53e988e37cf526663053ac0176567137273e3be9156b24deda89db6c1 SHA512 b70a2f926d889fec9d4fd26c51e1fbbeb5e75f13449d2d0205b1b7edb12ab2ba49e4cac69426f782ca3a4430c79a6de8f66b4aad2fc552bcfcf7005e866522ff
+DIST openapi-spec-validator-0.5.2.gh.tar.gz 39743 BLAKE2B 92a4c4503add68c2683f4229f7b68b7cf98d38f36f3c03835b03be5e2a1092ebbb46a9f8d09bfb9e3cf7059a2a72ff01b81742986d479c2713dc6ef783718e00 SHA512 68f7d507a239c555575e2edb3bab576fd1fede9bcebde48c57361e3e764c9c19c4dc0d63e650851c2f6e7f2dd7f4efcdcd028842e259aa9e341823cd052a6e20
 EBUILD openapi-spec-validator-0.4.0.ebuild 1508 BLAKE2B 42b175e0f90f61a90ee0ae951b929681eda31fe0656f958e75261306cea966afc02c63402e87c994498bb68ff23281f5bd212ceb22bad4141ac01fd70ef8a3c4 SHA512 91ee5a08e49123712c00d75c8d26af2e385c3ce11b9b49227e6f671652bd962944f3c7058324c9658b877db9bad1b4bae6d933d401e8d2a80aaa59ce77db3309
 EBUILD openapi-spec-validator-0.5.1.ebuild 2012 BLAKE2B dbc22961b84ecf0eeeca9c6181d13b8155ef652d59d38a78c0d297795401bfb8507eda89cf9c7e0b8c0623c6a2fa75905ad80fdf217798ffddc0591a07d9f8b5 SHA512 768af811a17d3d52255aef2d7d23d978f80356f8d4b3eb664ec7cf84b9873275d085d9528c698ec986ef6bd4d801ea6a6ed3c3be5eb2aeb0097e41724f508b8d
+EBUILD openapi-spec-validator-0.5.2.ebuild 1821 BLAKE2B ae8e47b9b5f3c3b791feddc94429fa0d4c09d94f7c25d2f3c6d0ea188cbb115eef07d6b9d449bf8db4ddc8971a9156eaedc62ed7f01942617f9589367a654ba4 SHA512 78a0f0588110e9e862432fe26580412d3527680f8a2201298a121a356968fbe28f63df9220be25f8f078218b78bef246172b6938fdcd2ef717fcfe538bad95d0
 MISC metadata.xml 372 BLAKE2B 6b08d5f1a63e2ddf4c0f1ab8479a18109231211c82a2a1178a9e1d0775ad0fd5811580c3b2175137ec135b6c8d8ad0e0d728d79da98c092fd87fc604c7cc8a4f SHA512 4fe628abc1481b9dd5874dd5efaaefa5f1adf24e2e58183d2ca75677680077a443702887bb21c67049df998052dc6afae590ac9197b6edb87cc10c126ae22345
diff --git a/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.2.ebuild b/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.2.ebuild
new file mode 100644
index 000000000000..5951fb69acfe
--- /dev/null
+++ b/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0 spec validator"
+HOMEPAGE="
+	https://github.com/p1c2u/openapi-spec-validator/
+	https://pypi.org/project/openapi-spec-validator/
+"
+SRC_URI="
+	https://github.com/p1c2u/openapi-spec-validator/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-spec-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/lazy-object-proxy-1.7.1[${PYTHON_USEDEP}]
+	<dev-python/openapi-schema-validator-0.5[${PYTHON_USEDEP}]
+	>=dev-python/openapi-schema-validator-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Internet
+	tests/integration/test_shortcuts.py::TestPetstoreV2Example
+	tests/integration/test_shortcuts.py::TestApiV2WithExampe
+	tests/integration/test_shortcuts.py::TestPetstoreV2ExpandedExample
+	tests/integration/test_shortcuts.py::TestPetstoreExample
+	tests/integration/test_shortcuts.py::TestRemoteValidatev2SpecUrl
+	tests/integration/test_shortcuts.py::TestRemoteValidatev30SpecUrl
+	tests/integration/test_shortcuts.py::TestApiWithExample
+	tests/integration/test_shortcuts.py::TestPetstoreExpandedExample
+	tests/integration/test_validate.py::TestPetstoreExample
+	tests/integration/test_validate.py::TestApiWithExample
+	tests/integration/test_validate.py::TestPetstoreExpandedExample
+	tests/integration/validation/test_validators.py
+)
+
+src_prepare() {
+	sed -i -e '/--cov/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pgzero/Manifest b/dev-python/pgzero/Manifest
index c993b1a9aa13..e3a34dcd62e8 100644
--- a/dev-python/pgzero/Manifest
+++ b/dev-python/pgzero/Manifest
@@ -1,3 +1,3 @@
-DIST pgzero-1.2.1.tar.gz 2503205 BLAKE2B 616129da20cc5db67bfe826816bd454a76016d80a155296bbbe8e6febbb48aa2070fac1701b22ce7a522597f85b2e272151828f9dfbac367e33e3e0b35e9d260 SHA512 7988d114f6c037fe5ef4690ded878c63f73589e56fb7f79fa3604a7b4bc8433d75aabb80229159921a3dd6af4e3fe6740520a33f2a6b29aba034a63e6e154c33
-EBUILD pgzero-1.2.1-r1.ebuild 839 BLAKE2B 9d94d606efa957637055539ba349218b9b5d71020d86a7e426d50f51d061dc5167e77386276894998d968c235da73ee057abbeb06122e8d9a8e634b200e20256 SHA512 7a3556196cff1714c40f2a9f622bf33982f2c0ad96a9be6df178d8b027aa4fc43c21d143b3dcb96526c8e81624b19d05c012661326dd1b83be22cf892982215b
+DIST pgzero-1.2.1.gh.tar.gz 2503205 BLAKE2B 616129da20cc5db67bfe826816bd454a76016d80a155296bbbe8e6febbb48aa2070fac1701b22ce7a522597f85b2e272151828f9dfbac367e33e3e0b35e9d260 SHA512 7988d114f6c037fe5ef4690ded878c63f73589e56fb7f79fa3604a7b4bc8433d75aabb80229159921a3dd6af4e3fe6740520a33f2a6b29aba034a63e6e154c33
+EBUILD pgzero-1.2.1-r2.ebuild 873 BLAKE2B fc1d4d9103291526c91830d062e3d67e12337ea7c842b5d1bf04670fa3e28748244dd67ec21cf554e4b9abf688d06ee47c531b82c25292c1a5ce10d53738a26b SHA512 f732bab4de90fa08953d0e6e0990d1ba60c9d4b12ea034af8029537f03850597ebb03f042daad65308336dfd6fdb174de53620ce285addb3e38a0986ebcfabca
 MISC metadata.xml 373 BLAKE2B 283390d9823aff5b03d6338acbe36718260ffcb64b0d46d1ac81e764b90c445d25daec60939a21b95aa769cf5b8f6a50971a625dcbae896dfa3f1094a7d50cb2 SHA512 7852f071fa301d7973072e7fe8c27c154567e75a66cb5f35d056f5b23a1fb7f259540b98e2e76ccd1114224e3121190944fa3762cc7888684c70c856230e4460
diff --git a/dev-python/pgzero/pgzero-1.2.1-r1.ebuild b/dev-python/pgzero/pgzero-1.2.1-r2.ebuild
index c4ba9229ee28..8b2903c837aa 100644
--- a/dev-python/pgzero/pgzero-1.2.1-r1.ebuild
+++ b/dev-python/pgzero/pgzero-1.2.1-r2.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
-
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
 MY_PV="${PV/_p/.post}"
@@ -12,7 +12,7 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="A zero-boilerplate games programming framework based on Pygame"
 HOMEPAGE="https://pygame-zero.readthedocs.io/"
-SRC_URI="https://github.com/lordmauve/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="https://github.com/lordmauve/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.gh.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3"
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 986761cb4b78..dfdc31a568bf 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,7 +1,7 @@
 DIST pikepdf-6.2.6.gh.tar.gz 2905945 BLAKE2B 3ab7e80ca43c7395994333a47f3ef667b69228cc80c5e03d3264c9dbefaafcd7d367030a90f7836904f141ce497967024264939a50dd59a0ab92e0beca607697 SHA512 a395e6b53792ecbd604424be67ccefd66d4a0a73dc1f22c86ee763e97a2f940d607494d5a0c5172867196932ffa0efac44427dddb277b754fe39e28f41f1fae5
 DIST pikepdf-6.2.7.gh.tar.gz 2906211 BLAKE2B bfc3d8e707b952e214fda3e31ecb0cb44266f41de63f2daea7e13dc944ed8d9d2438ead7a0b6a8f18b6295f52621311f94849b060459d082e75eef0c71713148 SHA512 4cfab0729c0f87bd52f58b9f23af8a4ddd34029b1259e4e2c67a73abfda3b5bd2e8de25962ed70a5497609398453e4f1ea6642e3b01245cb2c70bc09b5ac55f8
 DIST pikepdf-6.2.8.gh.tar.gz 2906054 BLAKE2B 7b639741112857dbf784da7245f905e76664b200f4f832b6a2e8bbf7ab3e48e7f3a5dba1ae00bba72a5797e7e7bce0f1cea6777114ccf9a9b39d352a754edaeb SHA512 d27d8dcd80aa6a553ea6fb3c404bbe7752b2d1a7fb7a8e0315707f24243ff3fcdf58f273dc283e117a0124bfa724f7384004340f20d9f322cf08a5e0366b0225
-EBUILD pikepdf-6.2.6.ebuild 1664 BLAKE2B 130fad8a11df110f8318531caca3b4617d503f72f9b58d17040cbe5e4bd41047cf9e6ea0613d9c1d21aab8e7ec60eb90e36648d42ed0a1445a2ce4a5af1f89bb SHA512 9c30d218a14737d398e4f2923d92af8a78ecc6161dd319e35c5ea1d842063d0256be71ceee53b7ce3fd579ec238dad4b958b2858c4e3d8976f6f1fa8f84bab02
-EBUILD pikepdf-6.2.7.ebuild 1668 BLAKE2B 035ea560f3c4349d394a0bd4ffd98368a413b34f4a3d876c91d4848a5c943dc8a06f754d2dbbbcb49437f70be725d5f6789e4b426b038dd6409767df0fc2d094 SHA512 f6efef2bb7476aa1572e4cb9a06723010bef29373554ec9733cb6870cb9fc44d3449fa7e12e15389d1f15c25af15f66d2f0257619b07a3654f8c9679f286f961
-EBUILD pikepdf-6.2.8.ebuild 1668 BLAKE2B 035ea560f3c4349d394a0bd4ffd98368a413b34f4a3d876c91d4848a5c943dc8a06f754d2dbbbcb49437f70be725d5f6789e4b426b038dd6409767df0fc2d094 SHA512 f6efef2bb7476aa1572e4cb9a06723010bef29373554ec9733cb6870cb9fc44d3449fa7e12e15389d1f15c25af15f66d2f0257619b07a3654f8c9679f286f961
+EBUILD pikepdf-6.2.6.ebuild 1607 BLAKE2B 92e6ac52cf35242199acaabb4e12698be2ebe9c49ce0f9dc30755a74667c1546dd1bfae5d5fea084d4bc1175dcf5d859f1d7f51097fc930867b0530bf02c7868 SHA512 bb41d2eb4da7f92a90e7a0f8a959336bf66623b6f4493b19fe0a372b0c3138f258c95807e06473f8310027136f3bfd1d6be5f038885d5581d2346af565ecf685
+EBUILD pikepdf-6.2.7.ebuild 1611 BLAKE2B edf22a90167ea2dd54d8030ae451f95e5d24745528afe0340ab6d348af65e155d7a8b1fd8d7258926f6b20a956e04b2b49bbf12fc8e2f5d26f03e8c1437750b6 SHA512 28afe4b977b06826974b969f5837a46198eadae27ca30e05ad7d8065cbeb44373f4f97170e22dc97e308691fe3f237538dc1997885056b3c7b6e4d1fe80a979e
+EBUILD pikepdf-6.2.8.ebuild 1611 BLAKE2B edf22a90167ea2dd54d8030ae451f95e5d24745528afe0340ab6d348af65e155d7a8b1fd8d7258926f6b20a956e04b2b49bbf12fc8e2f5d26f03e8c1437750b6 SHA512 28afe4b977b06826974b969f5837a46198eadae27ca30e05ad7d8065cbeb44373f4f97170e22dc97e308691fe3f237538dc1997885056b3c7b6e4d1fe80a979e
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-6.2.6.ebuild b/dev-python/pikepdf/pikepdf-6.2.6.ebuild
index 47707520e931..e4ee7a01eadd 100644
--- a/dev-python/pikepdf/pikepdf-6.2.6.ebuild
+++ b/dev-python/pikepdf/pikepdf-6.2.6.ebuild
@@ -38,7 +38,6 @@ RDEPEND="
 BDEPEND="
 	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/tomli[${PYTHON_USEDEP}]
 	' 3.8 3.9 3.10)
diff --git a/dev-python/pikepdf/pikepdf-6.2.7.ebuild b/dev-python/pikepdf/pikepdf-6.2.7.ebuild
index 051a4747dece..fae6bc7738cb 100644
--- a/dev-python/pikepdf/pikepdf-6.2.7.ebuild
+++ b/dev-python/pikepdf/pikepdf-6.2.7.ebuild
@@ -38,7 +38,6 @@ RDEPEND="
 BDEPEND="
 	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/tomli[${PYTHON_USEDEP}]
 	' 3.8 3.9 3.10)
diff --git a/dev-python/pikepdf/pikepdf-6.2.8.ebuild b/dev-python/pikepdf/pikepdf-6.2.8.ebuild
index 051a4747dece..fae6bc7738cb 100644
--- a/dev-python/pikepdf/pikepdf-6.2.8.ebuild
+++ b/dev-python/pikepdf/pikepdf-6.2.8.ebuild
@@ -38,7 +38,6 @@ RDEPEND="
 BDEPEND="
 	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/tomli[${PYTHON_USEDEP}]
 	' 3.8 3.9 3.10)
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 7cc494202167..0490ecceb5ff 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -2,10 +2,12 @@ DIST psycopg-3.1.4.gh.tar.gz 469317 BLAKE2B a6df49a5adefbeb310602473e950ef77f0c6
 DIST psycopg-3.1.5.gh.tar.gz 478528 BLAKE2B f0e6d1970b81875481bf0939d750d585f9ce4be1ccf838d1884a54d366614ec1ca76756b455d28b559ef4f49696eda68fa3b42f8c0cc18d9ce9fd1ce21029830 SHA512 006a9a6b7d34ed6f0411c33001334b9e9d29c8d1fe5e9e3b940d5664cc5c06ce10bc278ee1906a96073843ca2f8effaada8789aa390de97e543e19cc452546d1
 DIST psycopg-3.1.6.gh.tar.gz 478611 BLAKE2B d947344d033e034a94545bcbdcb27b5f903bbf344ce11f52de2b2e514892d2dfd87e3b26f130736c8c3798654c2d59d4f00c1093ce09f777b442d40eef8633c2 SHA512 2dc77cc90692fb92715add1dcbd9b82f10b811e7cf6782fa9d0cb7d076cf699be6d81ecb73d5b4b2772c08fb8070782956eb97b0fc4f0169c5bddb9b7df7a0ad
 DIST psycopg-3.1.7.gh.tar.gz 480599 BLAKE2B 85badb2f7058000deec8f3eac023907c24f4de073150a536f5a8a646a74dfea7ccc429a9ada049f3a6285b508992c06a8e0d0ea826a3613145b238410190431f SHA512 a3be0074e38953bf2b08ac6892d3a7a98bb9ef3e5ab1183d65e7d2aa14c5b148b625dc1da1d830bb6b9cd17d6726b9348fa32415413ed48bba6dd6bd31521432
+DIST psycopg-3.1.8.gh.tar.gz 483283 BLAKE2B 29141637c359b5ff8988753ee4e492b0aaf82bfc6445e0c5e1d9ef18f59f09ab071ce9a6183f2d864b62e85a109b24afbdd96248c00c8bb5c01357b06648ebba SHA512 4424305debc7b055fcd19b27714df46d54f8ae38452d8d5a3276df70a6c27e0094081020fdf2c34c73275cb058054414ac80843bb3e6a841bb3556ce39c76287
 DIST psycopg2-2.9.4.tar.gz 384017 BLAKE2B 4bc0afcc890c8a257c1ccd5c6e4e5301857a80f8b1428aa46c1473c9e18f5d2914a2e592c13336b06106217bb334d9b0321835bdd123f1627cbeb29dedf97bf7 SHA512 259088e42e0ab0d8a1a0ccf04f5e560f32c6179b4a0a0059e91bcf269baa8f4b0f1f949c332c640a2438c927a29b2c144078a861f8e18ba9c764da7c93c73b8d
 EBUILD psycopg-2.9.4.ebuild 1341 BLAKE2B 6a422b4497aee64da6252e8d0710d5e522ce3294f43c67ef57d2f7fe722f0f33bb00870c0a618e86c1cf1ed5badfe121deef8fa50362ebfae6c7a9046f591520 SHA512 c139345f5ee192352040818900da6eca57a8505602f9397af87e2994b49037b613a0d563f55a0fe25c216b7c8ebcd3cf5cbd3791958b9027788d6fcd9443f6f6
 EBUILD psycopg-3.1.4.ebuild 1725 BLAKE2B 307bfbf1da1566c1d31ab70a153485292c8ef5046f29652f5a11da20f66e901867947b1511983af74110a48e149608e11e6aa3d617c6f8f56867dfab6817cf74 SHA512 e3ce4117bbc0060f94a104088a0d407744b04f77e8a37613e765139c5054b1fd3dde1a8f823fc04e8a41511c5cc2cc821d81ebc6bac338688d387a922648bd71
 EBUILD psycopg-3.1.5-r1.ebuild 1689 BLAKE2B 3f6edd76888c3eaf7a4f81a4480ed7858e5bc6ce6e317de3f959ce15212a71e47a412a6c53ac1cd3e4c0175fe0e548dc9ab04a4147d752bf19d7547df85f8116 SHA512 25be89b45205c765a52d04222c2997d69893dd271c9f0e60bb0c2dfab716a637893d122ce51b104f4da00824c491d30612e7887ac59c07be401488d2fbaf0b4a
 EBUILD psycopg-3.1.6.ebuild 1794 BLAKE2B 7ecfd191b88d9acb11f6c0b95c50863fd728f21e559700d45c86feeb23c847cefd1960ea7ee1b42fd5fb722c943a74a6b4eb2d2c56d9b9a4bfa5761796c64be1 SHA512 a751c9cbccfc953ac5cb520b38e279bc13506a60f5cdfab4cfc4a8a1e06dfdd6f44387f318131a062530bcffb38f41fca6db74468042464c8064c77c9a287b03
 EBUILD psycopg-3.1.7.ebuild 1789 BLAKE2B d270d836c2f374926440aff2835cb23263275c77b935ea7a2cc3eefdfedbd5a81a275fe7fc7b1cabde746b272c02aeb4ae4a7643535bd5e70194655d767dd23a SHA512 d319d2f8eeb7426a79eaa65abfe4202aadca775a97a1058697c06c1e5f9681ce92c02e7796e263c4e21bf751c3d8eaf7c8a0a3c43fb6156e8e263be5c844b51b
+EBUILD psycopg-3.1.8.ebuild 1794 BLAKE2B 7ecfd191b88d9acb11f6c0b95c50863fd728f21e559700d45c86feeb23c847cefd1960ea7ee1b42fd5fb722c943a74a6b4eb2d2c56d9b9a4bfa5761796c64be1 SHA512 a751c9cbccfc953ac5cb520b38e279bc13506a60f5cdfab4cfc4a8a1e06dfdd6f44387f318131a062530bcffb38f41fca6db74468042464c8064c77c9a287b03
 MISC metadata.xml 426 BLAKE2B a573dbbef89ba2c3c7e7aa11e87005879fa823daa8d7e2080ce82dab7196429769b5e2ed0c4ffb363443469dfa47524d900fae75c4d7c8c9da901389e746838f SHA512 e3059428d8c00113696bfd232b2ad3fd4efccc304a31ff45801f30bb07c03acd58aafcab187fd85e4d89eff4db6c18a1395744eb1fd5cf8f11e43aca0f4e60cc
diff --git a/dev-python/psycopg/psycopg-3.1.8.ebuild b/dev-python/psycopg/psycopg-3.1.8.ebuild
new file mode 100644
index 000000000000..6353cc7eda22
--- /dev/null
+++ b/dev-python/psycopg/psycopg-3.1.8.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="
+	https://www.psycopg.org/psycopg3/
+	https://github.com/psycopg/psycopg/
+	https://pypi.org/project/psycopg/
+"
+SRC_URI="
+	https://github.com/psycopg/psycopg/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+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 ~x86-solaris"
+
+DEPEND="
+	>=dev-db/postgresql-8.1:*
+"
+RDEPEND="
+	${DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/backports-zoneinfo-0.2.0[${PYTHON_USEDEP}]
+	' 3.8)
+	>=dev-python/typing-extensions-4.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-db/postgresql-8.1[server]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/dnspython[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# tests are lurking in top-level directory
+	cd .. || die
+
+	initdb -D "${T}"/pgsql || die
+	# TODO: random port
+	pg_ctl -w -D "${T}"/pgsql start \
+		-o "-h '' -k '${T}'" || die
+	createdb -h "${T}" test || die
+
+	local -x PSYCOPG_TEST_DSN="host=${T} dbname=test"
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# tests for the psycopg_pool package
+		tests/pool
+		# some broken mypy magic
+		tests/test_module.py::test_version
+		tests/test_module.py::test_version_c
+		tests/test_typing.py
+		tests/crdb/test_typing.py
+		# TODO, relying on undefined ordering in Python?
+		tests/test_dns_srv.py::test_srv
+	)
+
+	# leak tests seem to be brittle
+	epytest -p no:django -k "not leak"
+}
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 4468afa05a5f..d90d894bb87e 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,3 +1,6 @@
+AUX pygame-2.1.2-cython_only.patch 1142 BLAKE2B fd4f8eb6be984aead9cf3988d9f1c820db1b62a17919e7af52c8a7ab03264b13a04f8cd77affc1822c351fd48533fbda6cb53a82ec8869cf924c036a8ba928f9 SHA512 943b22a97313b12344d94f3832e66763b3249925da5de6a9d2ccc4dc405a9dd81b5c53c2f26da7ad406a1928aa6e270a5db8c454c26708a78412956136b844f4
+AUX pygame-2.1.2-libsdl2-2.26-tests.patch 889 BLAKE2B b676d4f591041858492df2cbe087aa051b7ba3dd9d0480d9afdc878412fa6613131f8ab8f78c055f0cdf014627ba42dc9c4118798c81a8365f457225af231282 SHA512 8577b3f39828d65db0b08ed3c59d15a6de26d0f0f1bb085137c4a5a97aa0498cb9572292bca87ae2162316a001f8d9ddf5834626dc0af8162194ae483091d68c
 DIST pygame-2.1.2.gh.tar.gz 6100415 BLAKE2B 4b81c2f0abc2c2c4732ddb8f8e6d4bffa5169e3d3ee2d9ea2798d294623a9c70e2ff004825030606285124ef1347177b46adc676db450785e8420de45f37db34 SHA512 531cb0371853def7a3ddb8eb0110fbd58acaf1b2351d7518402c9a960baca705bb34da879015e7a6cd5f2f8af98c57e7bc732021a8f62ed9f90cacf068c9c2d6
-EBUILD pygame-2.1.2-r1.ebuild 1953 BLAKE2B 64cb201bf159781d42ea3d33c27da4115f1b60f0423cbe9f69e71563da82a8744f64df97c274a1b3098d9f5fe2407a9135545674c96cc1881fa3fd529ff8a03c SHA512 eadc9f7116db3a906a078495f19179ed1f4421e4cb858dc8ed035a79b604a5c9d51aa634995607cdaa5713b6fa779c785ba3908b5ac6649bc540a42a6d00edbd
+EBUILD pygame-2.1.2-r1.ebuild 2011 BLAKE2B 3d721d8ce7918067e94e2afb583e66d8f8d567b1d01d2b9827f1df5bf3e13e5ccf938bab043982f8d7ab379f36956153fd6ff65fdcb541f7fb2793bb8f83595b SHA512 489fbd4bac984cccb0be03dff55123228dde3002348273c176262eba6350300f5c27234bb60cd0723658ff1ef7964531e3533b8a3f75d2a496016c1752b05de6
+EBUILD pygame-2.1.2-r2.ebuild 2160 BLAKE2B 96703df47d5eb493374e376583afb9151081d8bbc2104c025bc43a1644bf86628af71f1d89dd547985a9f8c33f9f599d5876f3bb7f7e34ff426df620fd6e5fc9 SHA512 1e39d45d730b724cc4e446e1466215c730a47520cfa0a42b6274dcc5e5ab8970a84642df7885ba29ef835b7342309d017b10337278307a6bd0edcca49b337cd1
 MISC metadata.xml 462 BLAKE2B 398db1c050bbf14a65ac770e980ca91269277ecb00d94457502532ef7c407145cc2438ead46d370d1195331fd3d2f9602ecbb381c9f178240d031d1c665a9324 SHA512 2e95b731a4cb49372e6af00bb059bd179dc167aaac07f412c51970cf27b0fdddda616fb59bbbd62101c1b6f272cc0263123e334df01ebf6d1697ef8b55b62fef
diff --git a/dev-python/pygame/files/pygame-2.1.2-cython_only.patch b/dev-python/pygame/files/pygame-2.1.2-cython_only.patch
new file mode 100644
index 000000000000..4fb935dcf668
--- /dev/null
+++ b/dev-python/pygame/files/pygame-2.1.2-cython_only.patch
@@ -0,0 +1,36 @@
+Backport to ease running cythonize, DISTUTILS_ARGS=(cython) resulted in
+reconfigure attempts that failed without PORTMIDI* being exported.
+
+https://github.com/pygame/pygame/commit/4eeffc049cf
+From: Ankith <46915066+ankith26@users.noreply.github.com>
+Date: Fri, 3 Jun 2022 21:27:57 +0530
+Subject: [PATCH] Add cython_only option to setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -209,7 +209,16 @@ def consume_arg(name):
+     cflags += '-mfpu=neon'
+     os.environ['CFLAGS'] = cflags
+ 
++compile_cython = False
++cython_only = False
+ if consume_arg('cython'):
++    compile_cython = True
++
++if consume_arg('cython_only'):
++    compile_cython = True
++    cython_only = True
++
++if compile_cython:
+     # compile .pyx files
+     # So you can `setup.py cython` or `setup.py cython install`
+     try:
+@@ -280,6 +289,9 @@ def consume_arg(name):
+     for i, kwargs in enumerate(queue):
+         kwargs['progress'] = f'[{i + 1}/{count}] '
+         cythonize_one(**kwargs)
++    
++    if cython_only:
++        sys.exit(0)
+ 
+ no_compilation = any(x in ['lint', 'format', 'docs'] for x in sys.argv)
+ AUTO_CONFIG = not os.path.isfile('Setup') and not no_compilation
diff --git a/dev-python/pygame/files/pygame-2.1.2-libsdl2-2.26-tests.patch b/dev-python/pygame/files/pygame-2.1.2-libsdl2-2.26-tests.patch
new file mode 100644
index 000000000000..e231d1bf6d85
--- /dev/null
+++ b/dev-python/pygame/files/pygame-2.1.2-libsdl2-2.26-tests.patch
@@ -0,0 +1,17 @@
+https://github.com/pygame/pygame/commit/420c1a7341
+From: Starbuck5 <46412508+Starbuck5@users.noreply.github.com>
+Date: Sat, 19 Nov 2022 21:17:32 -0800
+Subject: [PATCH] Adjust surface masks to create a proper 24 bit Surface
+
+The SDL 2.26.0 pre-release rejects a 24 bit Surface created with this mask, which is the right call, as it needs 32 bits of space. Older SDL went ahead and created a 32 bit surface anyway, which it probably shouldn't have.
+--- a/test/surface_test.py
++++ b/test/surface_test.py
+@@ -2023,7 +2023,7 @@ def test_get_losses(self):
+             mask8 = (224, 28, 3, 0)
+             mask15 = (31744, 992, 31, 0)
+             mask16 = (63488, 2016, 31, 0)
+-            mask24 = (4278190080, 16711680, 65280, 0)
++            mask24 = (16711680, 65280, 255, 0)
+             mask32 = (4278190080, 16711680, 65280, 255)
+ 
+             # Surfaces with standard depths and masks
diff --git a/dev-python/pygame/pygame-2.1.2-r1.ebuild b/dev-python/pygame/pygame-2.1.2-r1.ebuild
index bf858b684edb..c7b3c066375a 100644
--- a/dev-python/pygame/pygame-2.1.2-r1.ebuild
+++ b/dev-python/pygame/pygame-2.1.2-r1.ebuild
@@ -45,6 +45,10 @@ BDEPEND="
 		sys-apps/util-linux
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-libsdl2-2.26-tests.patch
+)
+
 src_prepare() {
 	if ! use midi; then
 		rm test/midi_test.py || die
diff --git a/dev-python/pygame/pygame-2.1.2-r2.ebuild b/dev-python/pygame/pygame-2.1.2-r2.ebuild
new file mode 100644
index 000000000000..c6f10a469b75
--- /dev/null
+++ b/dev-python/pygame/pygame-2.1.2-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for SDL multimedia library"
+HOMEPAGE="https://www.pygame.org/"
+SRC_URI="
+	https://github.com/pygame/pygame/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples midi opengl test X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/freetype
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/sdl2-image
+	media-libs/sdl2-mixer
+	media-libs/sdl2-ttf
+	midi? ( media-libs/portmidi )
+	X? ( media-libs/libsdl2[opengl?,threads,video,X] )
+	!X? ( media-libs/libsdl2[threads] )"
+DEPEND="
+	${RDEPEND}
+	test? (
+		media-libs/sdl2-image[gif,jpeg,png,tiff,webp]
+		media-libs/sdl2-mixer[mp3,vorbis,wav]
+	)"
+# fontconfig used for fc-list
+RDEPEND+="
+	media-libs/fontconfig"
+# util-linux provides script
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		media-libs/fontconfig
+		sys-apps/util-linux
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-libsdl2-2.26-tests.patch
+	"${FILESDIR}"/${P}-cython_only.patch
+)
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	if ! use midi; then
+		rm test/midi_test.py || die
+	fi
+}
+
+python_configure() {
+	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
+		"${EPYTHON}" "${S}"/buildconfig/config.py -auto || die
+
+	# Disable automagic dependency on PortMidi.
+	if ! use midi; then
+		sed -e "s:^pypm :#&:" -i Setup || die
+	fi
+}
+
+python_configure_all() {
+	find src_c/cython -name '*.pyx' -exec touch {} + || die
+	"${EPYTHON}" setup.py cython_only || die
+}
+
+python_test() {
+	local -x PYTHONPATH=${BUILD_DIR}/install/lib
+	local -x SDL_VIDEODRIVER=dummy
+	local -x SDL_AUDIODRIVER=disk
+	script -eqc "${EPYTHON} -m pygame.tests -v" || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Bug #497720
+	rm -fr "${D}$(python_get_sitedir)"/pygame/{docs,examples,tests}/ || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index eaced481eaaa..adb5f34e3952 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,3 +1,5 @@
 DIST rope-1.6.0.tar.gz 289325 BLAKE2B fc7fc37a93f6d011f7e5eab5d2a28e3eab1767839cba4bce2b665c7972d6485eb3693e5977abfd36025415bc898fb4985affb7ac757c8457840a5de3946df77d SHA512 f610eb71c20533907aeea86c3ec5101401cf8136aba4221b2d64db3b0db16d4d7d1ec081c6d4929d6534ed51d4c01761af8d2ffddb6b69b4a9cc4921d240d745
+DIST rope-1.7.0.tar.gz 295362 BLAKE2B a81d6600441cf9dfe12be0a15113988ac8ec3dcd00c593085b9d749001b0785a5bceedc0fa8bbaeaaeb0142d623a432ef7d6e24874fab7a37179f131a26e6a6c SHA512 13cc3a2041c58c142892d1c9e5105ecdaa672e012364a5d4ccf82dbf5110fe0b6f0362b3a0309e9e6b72ab1d267dfc58eae8f3af3a8756f0356a6aff06c09abd
 EBUILD rope-1.6.0.ebuild 934 BLAKE2B 0d52baba8975ce17d01b82461d3301c81e33e296bad57f8526aa4cdf4847aef36c9e7e463b7d069d1a7029fe7c6d1c2bc7713981bcc7b97683eee69261ba4a45 SHA512 928868be85b2608b84479c5c4a4879d857310b263ac708629a7e93d75968dd4349016569ace3e8dd27c46d179f1a17341057990f36113b471bde75dcbd006da3
+EBUILD rope-1.7.0.ebuild 936 BLAKE2B 1700bce1ea6304ef383aaf14cfd32e871ff29cd9c8af756c4b149cdade74bd1443f57044192c3b5b852d172891a77da11a8d83e580d79ce8220ac8f5c2fc954f SHA512 8603262b600681d813270fcdf688c7c949d6aea0e96f8063d475575cb5cd730f90b3de43e41b65cdd48f26570cb51f7e2e68f4f064ae338bf62d7c9a2778ba29
 MISC metadata.xml 452 BLAKE2B 6bee424d801bad8728f10ec3a1618e3a48776a7b0af2a04efafd07e6ae5ac8e0b88253ebc35e457c791e820f8c3b1dabde73aabbfd3636cac5e169e8aca75aa7 SHA512 4f88e1157e4838f321b6f208ba6b89fbf2b7a72ea6e038cdd6cf3e9e211c2788dda137e3adf76072c1d52026c554750193d9938054670dd995a91db24ea8da76
diff --git a/dev-python/rope/rope-1.7.0.ebuild b/dev-python/rope/rope-1.7.0.ebuild
new file mode 100644
index 000000000000..827ea89bc22c
--- /dev/null
+++ b/dev-python/rope/rope-1.7.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
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python refactoring library"
+HOMEPAGE="
+	https://pypi.org/project/rope/
+	https://github.com/python-rope/rope/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/pytoolconfig-1.2.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/build[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# our venv style confuses this comparison
+	ropetest/contrib/autoimport/utilstest.py::test_get_package_source_typing
+	ropetest/contrib/autoimport/utilstest.py::test_get_package_tuple_typing
+	ropetest/contrib/autoimport/utilstest.py::test_get_package_tuple_compiled
+)
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index f8c9c49081d5..599792385296 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -3,9 +3,11 @@ DIST sphinx-autodoc-typehints-1.20.0.gh.tar.gz 27988 BLAKE2B 00dca24835ecaef8a2e
 DIST sphinx-autodoc-typehints-1.20.1.gh.tar.gz 28374 BLAKE2B 87891c5ee6b1fa76b12fd09a77c7de3e739cf95b76d0e3dd215feb585d9b07e883998c8e1a1a493230add7e8362278c750a0412d8e3d5102698e8e91e8042a4b SHA512 f8194c823c496c62dc6fa2d46595e39ec5da8f6661ceb3fc553a81f0a33604c00f3a4d742132326dca19c62cd32e7898fcfe89af862dfbc663b940bd4f9808a9
 DIST sphinx-autodoc-typehints-1.20.2.gh.tar.gz 28393 BLAKE2B 1ca6ab1e49d57b49d8fc1bfa73cc6e9eccdbb3c1eff6edaea5dd3253c729f7553659b97bc96ae88d5151ba8da87c0c4f225fac471e13995bd5596554ec4423a5 SHA512 0a17586e83567e51fbc9c96383d3f81a4ab6ebb0ec6e6471b00f7e0d70454e11f21f49d58e46e683c48688540de96627cff7496ccf16d130d2a9c7466c8a5193
 DIST sphinx-autodoc-typehints-1.21.0.gh.tar.gz 29465 BLAKE2B 64d13fbc720d3415448fe9983c8e5e5aa668df819717528b5a3b11147c285b44530f47754ff0d42d5b3c44a9fdf92d18614de698b40de4a5c4c9fd5995466e9e SHA512 8cba898f5ec07243718e37b6ff04e45d27ec73037dbb58ab8b2db0d1ba062e4208b4b1f9c053c0fe4b591a939ce44dd323f1e83ea01655c9ededd6a24be8aac3
+DIST sphinx-autodoc-typehints-1.21.1.gh.tar.gz 29643 BLAKE2B 59d7bbbb0ac94a93ca8be4fded034c89516d3271c096dbb7875966958c7a48c3d838f50bf03786b7ca8ea326b1566c991b559be7a6d37bdbb58946a89c1927f7 SHA512 29deee5960f40e55706a36af9e0a9d92c2eec9d2485c1b1fafef7efa8c86ffa3ccd910a836f25705f5e4d7f79291dcf5f4b3169799986155d20d4829ee7deda0
 EBUILD sphinx-autodoc-typehints-1.19.5.ebuild 1070 BLAKE2B 1e9b614c298423d6f665752e38546eaa88a10b6cecb41b8c39ade924b2d3932ba8d1f16eec79700ba6e44e721a03072b836c0021a7182683368bd874d4cdcb0f SHA512 52d550c33e9fce85a0c64d4ea047d070e514a418ba2afcac83dee25680c3381861872e22ee04322fb8299ccdfe78dc238c30e4ded7560811e894239ee4037fee
 EBUILD sphinx-autodoc-typehints-1.20.0.ebuild 1077 BLAKE2B 1bcd18256ee7f484eb75885bb74cca7359fa37aac7cc7b92ec688fd73bc537e7cc94113fe070f108dc4ebfbbb743f74dd364c501a370d83bd33632fa7173531a SHA512 388f023a41877bee9f040768287f042943233f90688b5935a8d27e93573724b7a23fc5c901f1d9955049365a33d949b57a7743575c8fdcb4558d72ebe507707c
 EBUILD sphinx-autodoc-typehints-1.20.1.ebuild 1077 BLAKE2B 1bcd18256ee7f484eb75885bb74cca7359fa37aac7cc7b92ec688fd73bc537e7cc94113fe070f108dc4ebfbbb743f74dd364c501a370d83bd33632fa7173531a SHA512 388f023a41877bee9f040768287f042943233f90688b5935a8d27e93573724b7a23fc5c901f1d9955049365a33d949b57a7743575c8fdcb4558d72ebe507707c
 EBUILD sphinx-autodoc-typehints-1.20.2.ebuild 1077 BLAKE2B 1bcd18256ee7f484eb75885bb74cca7359fa37aac7cc7b92ec688fd73bc537e7cc94113fe070f108dc4ebfbbb743f74dd364c501a370d83bd33632fa7173531a SHA512 388f023a41877bee9f040768287f042943233f90688b5935a8d27e93573724b7a23fc5c901f1d9955049365a33d949b57a7743575c8fdcb4558d72ebe507707c
 EBUILD sphinx-autodoc-typehints-1.21.0.ebuild 1077 BLAKE2B 1bcd18256ee7f484eb75885bb74cca7359fa37aac7cc7b92ec688fd73bc537e7cc94113fe070f108dc4ebfbbb743f74dd364c501a370d83bd33632fa7173531a SHA512 388f023a41877bee9f040768287f042943233f90688b5935a8d27e93573724b7a23fc5c901f1d9955049365a33d949b57a7743575c8fdcb4558d72ebe507707c
+EBUILD sphinx-autodoc-typehints-1.21.1.ebuild 1077 BLAKE2B 585d1b842a0454ca3fb03d916821e783c1dfe0b1a373304514c6fd59c16a6d4dc2fe5186103919b224d8f850efa5a72cecdbf965bb3f29682b7508d96840bd5b SHA512 c320e6dc62748f5b0ec481499f21dd1194f34c826093793be5ceb63ed7424010610e0bd807aac79603b08660304ef93b1d44c345dba7e663ce6e6af30d9e1fdf
 MISC metadata.xml 807 BLAKE2B 368714db91017473456e0854b7e2024ac6d24b4ba3d5ae2a44697546c4f96185a44ecc9da8dc816d9661f5815d7d31751d2d87d599c748d06db3f1dde32a141c SHA512 04882668dfa68354aa8ee5860db11963153fb29d9c26b3367fcef63da4ebbccf049909946e73fd06250bf784dcb783b1bc70fb29b9aaa1fcb19be9fcf470ebbe
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.21.1.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.21.1.ebuild
new file mode 100644
index 000000000000..395c86133d9e
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.21.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Type hints support for the Sphinx autodoc extension"
+HOMEPAGE="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/
+	https://pypi.org/project/sphinx-autodoc-typehints/
+"
+SRC_URI="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/sphinx-5.2.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nptyping-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/sphobjinv-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/typing-extensions-4.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# this package is addicted to Internet
+	tests/test_sphinx_autodoc_typehints.py::test_format_annotation
+)
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/tavern/Manifest b/dev-python/tavern/Manifest
index 325d9c085bfe..ac12878a74f2 100644
--- a/dev-python/tavern/Manifest
+++ b/dev-python/tavern/Manifest
@@ -1,5 +1,7 @@
 DIST tavern-1.24.1.gh.tar.gz 163938 BLAKE2B 661160fe203e5117452e23178a74279a982cb3e4b4cdb84df074d5cd8481796cb9a05b2c5d42b225c6a2d2cf34283166d59a3242ff5df76a457d89c6acf60576 SHA512 9a9f7e46172a62a0dbf0c42aa0521d0fbde644f05a650dd768a32b3c8652bb17209b8073519830e52b2865bbe646825e650cce251184b85f0a5343cfd2ceb1c3
 DIST tavern-2.0.0.gh.tar.gz 207901 BLAKE2B 8b5c68a16361afcf3ff5936e0d7e3d706da5052422e2c7a6aef97c8dcdfc370c8d0236bf40c9b03e12120f06279d4af39d321964214ddc0e2db7bf4e91c389b3 SHA512 aed751dccc26317c35d96b29e0b3ed6bc5d4f4bd70261c296dfd5573a83cb9b10e022a247eb9df72a2879f2d324098233b6fbae8847472052eb1536f457f7592
+DIST tavern-2.0.1.gh.tar.gz 208510 BLAKE2B a1b6f19d188437758690eced663556e9e3a5cfc8cedf4e04baba0478efd9507faa5dce2c6f308b2ce6e806617a5e75a8a1b2e60d9afe804b2294ca772ffbc7e9 SHA512 72025db6efa7d41f7dfe80ffc83033e12941ac3a9c4b71170647e571f6ce5022c84c0976d7d50fdfe38da06a4b516e334eed2334e016cfb013613fcc05eeaa9e
 EBUILD tavern-1.24.1.ebuild 994 BLAKE2B c785d88049b539d1e0553c9d536c100f638f25d03cd0fc63695fa9e872a1d994a574b16267678e4452a6621b22783bc6e5ce974afc59d8b01fcf2bf866d41631 SHA512 bbd79a9810c12965eea3fb7d38182d6e217555655f299ffc600a692553e220aca1a48400bb2bbab49c63ac91e3847216f29a88d833093f2902395ad60cfd2108
 EBUILD tavern-2.0.0-r1.ebuild 1243 BLAKE2B a22e5436d2a698b885494ee937e34ead2e2af67f81ec1ff197b5eb5c24b00cfc7b41c253c5788ce4ef8f5fddbbe19c1f1b18261383c74655fce8695e11f5904e SHA512 81c39dd44ad5358a8250f3a2f1dd8cbd81f981cab9264bbec5c011763d82c4c741ccd96578ae4eabed4b3de6925187cfc6b357bd5c6c1fb37ead5ef5afba38df
+EBUILD tavern-2.0.1.ebuild 1193 BLAKE2B dd6f9d769230fd9ecd4c3ea6423e74c03be6f7eb0a2f211c5994fa8d90c1538a3b66e964e96172535da4cb0cd2ad9790ce491b7765f731d69d58333e364f2da3 SHA512 a9e2e512981667387ebc9a30c4c658a235fc2b4fcfe722a501fe9a84e87a23ef8b606fe31218aabc9bb54057f68295db7c0814f7bbf89204adc6a57cb887f289
 MISC metadata.xml 722 BLAKE2B 0ed7dd19f49aae7940de52b0df249979458b3950422e1089886929499d7a92d16a3a6e101b52313569900af6aec4e26388ae6d0673d5b1acef1e1615ed87d34a SHA512 3c30524ee5129700db664b5dab8635463ee17d4a45295583d79755c1f5b1dbba9ac611fcec3e9584028bfe96cf913f4f4b9d8da67a0e8ff6cde1ebedbf57c15a
diff --git a/dev-python/tavern/tavern-2.0.1.ebuild b/dev-python/tavern/tavern-2.0.1.ebuild
new file mode 100644
index 000000000000..8c27233e3771
--- /dev/null
+++ b/dev-python/tavern/tavern-2.0.1.ebuild
@@ -0,0 +1,50 @@
+# 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_{9..11} )
+
+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
+}
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 6c936d9746fd..178e0ed9a999 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,13 +1,9 @@
 DIST tox-3.27.1.gh.tar.gz 309006 BLAKE2B fa8aaa9cd5b03e54c166bb6b748290420b91498b26d2d124d9f88a64806b9ac0578c1886845b25aa024907f6a782c45609fa6c7657d9e1f538b59c2d9f0f4e14 SHA512 5f568bc6c53f871aae91928681dd6f2419b876a8e6ca925e65abae845b548ee3d00513741882875bbbacb78bf64935228d98213f940d3da8c3f788b73f177b79
 DIST tox-3.28.0.gh.tar.gz 309472 BLAKE2B 9896411426f6aebb3efa468c01696ecc5f17ec3e67825672d0efc74c1b1468bc8b8d9c14b6177c181750ba4b9a5e77d616068dd83e21f5641acfc8e2a271cc1f SHA512 64816754e6800661bb564c5c7d21c4139522d540a04fafe3c4591d596072d48d1cbe0ee2abee9c8faf3d5007774f5371431b5a7a8f49912bc879c7b168aab2ca
-DIST tox-4.2.6.gh.tar.gz 290939 BLAKE2B ea505ef8a852c17dbae1489b91939f38d8a7bfca45a73cb259f2206928dc88294933ad4e420d148379e429f1dc2924e41028e6d5624aea4dcf170473344583ce SHA512 21efd8418a96f1570e33d4e903e4233eedb4ac6592b9df44dfe686414b00bb4fb1fb9bfe948e301e708e31adae609ecc37e9485d4b2d3b879de66da071c90e51
-DIST tox-4.2.7.gh.tar.gz 291533 BLAKE2B 0ed8deb01b3859dbcf37c6a0ed255254994060f195e7d58eefabcaa85b69dd60bd35391c962b2a5476b305787d409d01c9ce71125da418d12f2b3b08604b557e SHA512 2049e797d97b5202969d1d9812d92987ae3f6d47ce1fe09432fefc0912bdd8141abcf63acbd654b899fcfae9282a60f0950c445b224494b6c03f5631dcdb9d41
-DIST tox-4.2.8.gh.tar.gz 291662 BLAKE2B 5a92bb3fd0659717b020a77658b2337e8ab153242136a0a6a700fea63e142cd263cda8ee58d9b78b98e9ba4cb1138573bacc48d7cf488123eff743528e1a4b6d SHA512 1a332dacc2096dcee021182db1014ff9a0b7f32a573d3ab508eed94a4f60773919c6350e1cab3ea0df79bd2274bb76da422e2d75e99853a67c276db02ba3232e
 DIST tox-4.3.0.gh.tar.gz 296472 BLAKE2B 695efd31fef5f9aeb1bce71d95e913c38b9cb0dce0bcd955d85b492142088b89b59ab2a09754189959488042c1dfc6e476b17ebcb72a1b6ce2e9add8b764d6d0 SHA512 4ec09f4b43d7be8784af7821d1fbb2c7c705b84386b2496dffcbaf9f2943d1e5f00743f214e26839ce64635b9091b43b5747c51f4aaebc0ac27b08f8d5b31921
+DIST tox-4.3.3.gh.tar.gz 298207 BLAKE2B a8de90b5fad31452f3d70e3776a0478e7d7ffbe2a30852d7a1598ee07eac2ca43c291b25bd89c75a16b5266885f67be2d2ac535478905d0a3a276f227ffd62da SHA512 1f357cf52b28cb32d2619b2a3763ca582f39fac53b734cad465d44e28f2321f86387183478a30305bb2ea94140d2a6dcc39092fd0b87bb42ce25d128be58d122
 EBUILD tox-3.27.1.ebuild 1916 BLAKE2B bc1acd79c969c87cc3a6ca2058d2acd56e89672c033cb670a58906a41e321e94813a25a844bbcdc09781795611384ece6c80b1ce8a8dcc980b775213f27ee165 SHA512 0a756d8535e8eb1daf6b82ed541d18d7e5dbf608a9739580e708506ffb9ad1b138211a1efe700bd4ecc7939c0150750fb0f0cc13f2db0d145fd8d943b7ecc1ce
 EBUILD tox-3.28.0.ebuild 1924 BLAKE2B d27fac51564bfd401e1f3ef72815f99154e9db445e904ca082001745ece0b49b66c4a7b8449489a403ee7afe1543d837d832fb85512630eb0e1c9ed9363136fb SHA512 bad2e65dcde026fdb46244d9ffde5618b1dc9df0b938290239e6f6d7fb042045a9c53c8aaea40c0428d5de503311d4647fc12de66b0b8b1a4e75ada405caeac7
-EBUILD tox-4.2.6.ebuild 2282 BLAKE2B 6b1b42461f448f265714f56dc0abafdc806ee734afe3ae6de40c8783b4d6c8393eeec5ce4d44764fce5fa071c0842cca69a1b8bc676a17a1071c22cca6d1d2e6 SHA512 f7c375c97fc4dd6c7bf65f14560c225a3524d946ab95f47b845dae4387c94587bbd777ffeb29cbe4c08a78bc6f924e9e62e401244a809dcce0705594b9b4f43f
-EBUILD tox-4.2.7.ebuild 2287 BLAKE2B 97b91f6e4298098b3cd9d065db0c80e1d89a4b50642a13d0d7fda47ad91e1e574b4b462876fab869f0ac6fa7527206bebfa0cd0ac53fbd1e98f7c75dbda4716e SHA512 fecf3c6a7f1cbccb3a9a033628a92248a503359525426eb231012adabdff371aaaf449d5408f6f24aadc6b164d3d0cabcfed582935ff7c3235182dc1df5c530d
-EBUILD tox-4.2.8.ebuild 2294 BLAKE2B 615dce9d0eb8538cbe2ac54a9beb8f042d8494aead56ce45ee852928294af5e02febf2c902c24c61029f13c750439d619d6e447e62324e1f2c4625a40bc07663 SHA512 78b12f3a57afec6e68480ac7e85573e203d64835fed314bd8bab59c3b21e6ef12a815349fae8a6c27bce77a4508fba0c00da01e321715040dce4bedc28727c2e
 EBUILD tox-4.3.0.ebuild 2294 BLAKE2B 615dce9d0eb8538cbe2ac54a9beb8f042d8494aead56ce45ee852928294af5e02febf2c902c24c61029f13c750439d619d6e447e62324e1f2c4625a40bc07663 SHA512 78b12f3a57afec6e68480ac7e85573e203d64835fed314bd8bab59c3b21e6ef12a815349fae8a6c27bce77a4508fba0c00da01e321715040dce4bedc28727c2e
+EBUILD tox-4.3.3.ebuild 2294 BLAKE2B 615dce9d0eb8538cbe2ac54a9beb8f042d8494aead56ce45ee852928294af5e02febf2c902c24c61029f13c750439d619d6e447e62324e1f2c4625a40bc07663 SHA512 78b12f3a57afec6e68480ac7e85573e203d64835fed314bd8bab59c3b21e6ef12a815349fae8a6c27bce77a4508fba0c00da01e321715040dce4bedc28727c2e
 MISC metadata.xml 382 BLAKE2B 7c0704c5c187ce4a7972fe0372b23c5537a81a8d62fd83436d9558a61761f10764adb5a4d5f6795f0dd1fe905afa604c0be77fe1d48d291847f6ae65dc1b032c SHA512 9d0ced4df9352a81034a50d5766a01534ae8fa889985d99cc9e2a8d0889e31c6c11550677d9a5a74e2aab57c320192ce3a42708a6d23b0419ee34a6054398344
diff --git a/dev-python/tox/tox-4.2.6.ebuild b/dev-python/tox/tox-4.2.6.ebuild
deleted file mode 100644
index b2324d151bc2..000000000000
--- a/dev-python/tox/tox-4.2.6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="
-	https://tox.readthedocs.io/
-	https://github.com/tox-dev/tox/
-	https://pypi.org/project/tox/
-"
-SRC_URI="
-	https://github.com/tox-dev/tox/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv"
-
-RDEPEND="
-	>=dev-python/cachetools-5.2[${PYTHON_USEDEP}]
-	>=dev-python/chardet-5.1[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.8.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-api-1.2.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	>=dev-python/virtualenv-20.17.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/flaky-3.7[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-3.1[${PYTHON_USEDEP}]
-		>=dev-python/re-assert-1.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/time-machine-2.8.2[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-src_prepare() {
-	# the minimal bounds in tox are entirely meaningless and new packaging
-	# breaks setuptools
-	sed -i -e '/packaging/s:>=22::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# devpi_process is not packaged, and has lots of dependencies
-	cat > "${T}"/devpi_process.py <<-EOF || die
-		def IndexServer(*args, **kwargs): raise NotImplementedError()
-	EOF
-
-	local -x PYTHONPATH=${T}:${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-	)
-	local EPYTEST_IGNORE=(
-		# requires devpi*
-		tests/test_provision.py
-	)
-
-	epytest
-}
diff --git a/dev-python/tox/tox-4.2.7.ebuild b/dev-python/tox/tox-4.2.7.ebuild
deleted file mode 100644
index 19462294a2b4..000000000000
--- a/dev-python/tox/tox-4.2.7.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="
-	https://tox.readthedocs.io/
-	https://github.com/tox-dev/tox/
-	https://pypi.org/project/tox/
-"
-SRC_URI="
-	https://github.com/tox-dev/tox/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv"
-
-RDEPEND="
-	>=dev-python/cachetools-5.2.1[${PYTHON_USEDEP}]
-	>=dev-python/chardet-5.1[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.8.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-api-1.4[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	>=dev-python/virtualenv-20.17.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/flaky-3.7[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-3.1[${PYTHON_USEDEP}]
-		>=dev-python/re-assert-1.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/time-machine-2.8.2[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-src_prepare() {
-	# the minimal bounds in tox are entirely meaningless and new packaging
-	# breaks setuptools
-	sed -i -e '/packaging/s:>=[0-9]\+::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# devpi_process is not packaged, and has lots of dependencies
-	cat > "${T}"/devpi_process.py <<-EOF || die
-		def IndexServer(*args, **kwargs): raise NotImplementedError()
-	EOF
-
-	local -x PYTHONPATH=${T}:${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-	)
-	local EPYTEST_IGNORE=(
-		# requires devpi*
-		tests/test_provision.py
-	)
-
-	epytest
-}
diff --git a/dev-python/tox/tox-4.2.8.ebuild b/dev-python/tox/tox-4.3.3.ebuild
index 287d0a04be39..287d0a04be39 100644
--- a/dev-python/tox/tox-4.2.8.ebuild
+++ b/dev-python/tox/tox-4.3.3.ebuild
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 8f085f71a176..edb7abf22861 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,5 +1,7 @@
 DIST trimesh-3.17.1.gh.tar.gz 12653345 BLAKE2B df286132ca01e1a7e8c226b7c98ffa0682b9bf2e225c4114c88395611d1a65a02be4395940ad04b67ae3b6909664b46e18e9fd018d892c86f8f5a4fcfe532210 SHA512 8cbf0bedd21c0867c5aa307e9bb8b4e4caff2aabee89cfadfa11513293304caa4b6a5ecce21064b7fa157a2453b58d401eb6010d0ea32bbd5a99c3075f38b826
 DIST trimesh-3.18.0.gh.tar.gz 12656666 BLAKE2B e183ab1b5ff904b54a7801aaf9e6a3ac24a277107dae03dd37be7a37c56835ac99b617af1c12ea4119c39c3c064d8d1e783ce6effa51ebc0bc65103e688ad363 SHA512 309e1c5dd17a2d1875254a732d96708b98635cbd17ceea80c5386d6ea4675f943e1760f7a4383e9c24ec5711d30ea0732883a691952da1d1079a81a87fcca6cc
+DIST trimesh-3.18.1.gh.tar.gz 12657109 BLAKE2B 8e5370193e7d47f1dc2d7d43c356df1a56c2b4b8af6f47ac6aa889b04a3b950ec507b5cc0fe6f99f874cf66111aa72773025ba3821013466bb34baced3a361ca SHA512 72936c0fc6f89ffa35b80928dc5abac8ca4fac023f5be1d4adec6d020f3da6ee2c7a97efb0cecf58faad94ef6f33949533ac789affcecee07696ca0188fd47f0
 EBUILD trimesh-3.17.1.ebuild 2217 BLAKE2B c230c692f86f17a22476b07c9f53932898002623f262883eaea2bb0fc6eadbf8a13df593aff9fb10081aaed92c6140c70608d92688cd4848b868611d69c6f936 SHA512 720f8b517b3ee4339d66f1e47c787b34fa52036673a458de0ca71ceb5a02dae0f3fe46c3e859d3864891becd88fc7dec69b7e8bd58044737bdef5646ed5832b2
 EBUILD trimesh-3.18.0.ebuild 2218 BLAKE2B f49a7af8e9d99bf1885d340362bcfb9a198f8c3936c1b56717c68480826b6e7e51275a07dd247b896bef7c6360abae9a8a29dbe22825a4358718272c15f152f2 SHA512 d23a9b851923023216afc68fd53c41fbc82fb37729fa0f6491e111ca61f999fe0255ef209bc76411fe099516b87bebf174c426021f102ff24f13aa556ba616c0
+EBUILD trimesh-3.18.1.ebuild 2218 BLAKE2B f49a7af8e9d99bf1885d340362bcfb9a198f8c3936c1b56717c68480826b6e7e51275a07dd247b896bef7c6360abae9a8a29dbe22825a4358718272c15f152f2 SHA512 d23a9b851923023216afc68fd53c41fbc82fb37729fa0f6491e111ca61f999fe0255ef209bc76411fe099516b87bebf174c426021f102ff24f13aa556ba616c0
 MISC metadata.xml 495 BLAKE2B b8b403f7bfbac53ed234c2ba50324041502a28465d70e9406867f05741e0313845307491fcfd85f05e2993b21daf14117a4b6863b45422fd4c62c6e28902e3ff SHA512 3deec8ab4b513536a7fe182be8f1b96e06fd06b2480d3e516c2b3462cc26fcbdeb1d165b4d0297465e93c0cce584ab40a8f905b81a59dcb4040a39655028783d
diff --git a/dev-python/trimesh/trimesh-3.18.1.ebuild b/dev-python/trimesh/trimesh-3.18.1.ebuild
new file mode 100644
index 000000000000..982d211c51f1
--- /dev/null
+++ b/dev-python/trimesh/trimesh-3.18.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="Python library for loading and using triangular meshes"
+HOMEPAGE="
+	https://trimsh.org/
+	https://github.com/mikedh/trimesh/
+	https://pypi.org/project/trimesh/
+"
+SRC_URI="
+	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycollada[${PYTHON_USEDEP}]
+	<dev-python/pyglet-2[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
+	dev-python/svg-path[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/xxhash[${PYTHON_USEDEP}]
+	sci-libs/rtree[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/mapbox_earcut[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove pyinstrument from tests, as only used for profiling
+	sed -e '/pyinstrument/d' -i tests/{regression,corpus,generic}.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# does profiling with pyinstrument
+		tests/test_scenegraph.py::GraphTests::test_shortest_path
+	)
+	epytest -n "$(makeopts_jobs)"
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} functionality can be extended by installing the following packages:"
+	optfeature "making GUI applications with 3D stuff" dev-python/glooey
+	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
+	optfeature "loading a number of additional mesh formats" dev-python/meshio
+	optfeature "figuring out how much memory we have" dev-python/psutil
+	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
+}