Adding metadata

56 files changed, 1058 insertions, 300 deletions

diff --git a/dev-python/Nuitka/Manifest b/dev-python/Nuitka/Manifest
index 98b798700bfb..042360365712 100644
--- a/dev-python/Nuitka/Manifest
+++ b/dev-python/Nuitka/Manifest
@@ -1,4 +1,2 @@
-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
+DIST Nuitka-1.3.8.tar.gz 4030106 BLAKE2B 5e762b2dde0d86f8dd78bee101ee3492468a628468c485d06759c2c1e6829f647e429122227425806c7063c5071968a73ce24865e957db67465726d42796070c SHA512 34f5b6e9f859ed194b5928bad3b6042fdccd9d798dfc0cbed9bcbb623a093ee700adbfd2887c1322703d69494a4ffae556c7cadb4b4b0178990867f3693bdd35
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 d55f2985424f..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_{7,8,9,10,11} )
-
-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 643e80898bd5..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_{7,8,9,10,11} )
-
-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 643e80898bd5..643e80898bd5 100644
--- a/dev-python/Nuitka/Nuitka-1.3.5.ebuild
+++ b/dev-python/Nuitka/Nuitka-1.3.8.ebuild
diff --git a/dev-python/OutputCheck/OutputCheck-0.4.2.ebuild b/dev-python/OutputCheck/OutputCheck-0.4.2-r1.ebuild
index 48d9b091dc9b..d81da52f8128 100644
--- a/dev-python/OutputCheck/OutputCheck-0.4.2.ebuild
+++ b/dev-python/OutputCheck/OutputCheck-0.4.2-r1.ebuild
@@ -20,6 +20,8 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( dev-python/lit[${PYTHON_USEDEP}] )"
 
+PATCHES=( "${FILESDIR}"/${P}-Driver.patch )
+
 src_prepare() {
 	distutils-r1_src_prepare
 
@@ -33,5 +35,5 @@ src_prepare() {
 }
 
 python_test() {
-	lit "${S}"/tests || die "running test with ${EPYTHON} failed"
+	lit --verbose "${S}"/tests || die "running test with ${EPYTHON} failed"
 }
diff --git a/dev-python/OutputCheck/files/OutputCheck-0.4.2-Driver.patch b/dev-python/OutputCheck/files/OutputCheck-0.4.2-Driver.patch
new file mode 100644
index 000000000000..9812bd728e0c
--- /dev/null
+++ b/dev-python/OutputCheck/files/OutputCheck-0.4.2-Driver.patch
@@ -0,0 +1,11 @@
+--- a/OutputCheck/Driver.py
++++ b/OutputCheck/Driver.py
+@@ -34,7 +34,7 @@ ExitCode = enum('SUCCESS',
+ 
+ def main(args):
+     parser = argparse.ArgumentParser(description=__doc__)
+-    parser.add_argument('check_file', type=argparse.FileType('rU'), help='File containing check commands')
++    parser.add_argument('check_file', type=argparse.FileType('r'), help='File containing check commands')
+     parser.add_argument('--file-to-check=', type=argparse.FileType('r'), default='-', help='File to check (default %(default)s)')
+     parser.add_argument('--check-prefix=', default='CHECK', help='Prefix to use from check_file')
+     parser.add_argument("-l","--log-level",type=str, default="INFO", choices=['debug','info','warning','error'])
diff --git a/dev-python/caldav/Manifest b/dev-python/caldav/Manifest
index 57b442cb12f9..f8b656f33b77 100644
--- a/dev-python/caldav/Manifest
+++ b/dev-python/caldav/Manifest
@@ -1 +1,2 @@
 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
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..5e8a60ebd348
--- /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_{7,8,9,10,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/dnspython/dnspython-2.3.0.ebuild b/dev-python/dnspython/dnspython-2.3.0.ebuild
index 75a0b924de43..a9f814d302ef 100644
--- a/dev-python/dnspython/dnspython-2.3.0.ebuild
+++ b/dev-python/dnspython/dnspython-2.3.0.ebuild
@@ -30,6 +30,11 @@ RDEPEND="
 	)
 	<dev-python/idna-4.0[${PYTHON_USEDEP}]
 "
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index ee7d775e744c..54b34f9cdab3 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,2 +1,3 @@
 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
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..92fa21794e03
--- /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_{7,8,9,10,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 77ad105e235e..4f2199629495 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -2,3 +2,4 @@ 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
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..9aa95659846d
--- /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_{7,8,9,10,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 654d4e9d7109..2b0397fa705d 100644
--- a/dev-python/jsonref/Manifest
+++ b/dev-python/jsonref/Manifest
@@ -1 +1,2 @@
 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
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..0728dccf3094
--- /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_{7,8,9,10,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 d0782d812b3b..441e4d57af80 100644
--- a/dev-python/markups/Manifest
+++ b/dev-python/markups/Manifest
@@ -1 +1,2 @@
 DIST Markups-3.1.3.tar.gz 20868 BLAKE2B 9c6c55bba6a9e8e6dbeaba268014ab59762838fe1e65fd0551c90e0f83245643565cae099e0f5faa4801928c5c0966f5e5afa4ab2db04939f6c1062dc476f3ac SHA512 324c3c45063e192ebde0fcd10e868b2053fb2758076092b180e1d8eed965dd41b2ea252a081b750637454395c163a92145f68e2a6fd8eb3eded8927baf044484
+DIST Markups-4.0.0.tar.gz 22968 BLAKE2B a39fed89fd63785d0d4348a72c00c8e886726dfc5613b5b359606f8b0c42d2cdfbb5cf3bd1b6ec11621f924c3ac1dbc91db083682b4ba95a6f4baa97824bbd72 SHA512 5868b480debad480100ce632223aeca62ef22a6d9b2af6b4911d3477c94bcd99b88b5bc56f990d24d92de0d2665340e0fce37721f7979938ba947fab2c65900c
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..a48e4f57aaf8
--- /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_{7,8,9,10,11} )
+
+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/matplotlib-3.6.1.ebuild b/dev-python/matplotlib/matplotlib-3.6.1.ebuild
index b215d104bc58..08f44728ba5e 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 38ed859b644f..af964431da36 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 4b8fe931f56e..4ec460111dd2 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 a384ef08bf19..285ebe10b4be 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,2 +1,3 @@
 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
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..6222371013cf
--- /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_{7,8,9,10,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 11f061375f0a..e5cf8f2f9b97 100644
--- a/dev-python/openapi-spec-validator/Manifest
+++ b/dev-python/openapi-spec-validator/Manifest
@@ -1,2 +1,3 @@
 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
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..be69c53a8823
--- /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=( python3_{7,8,9,10,11} pypy3 )
+
+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 32ceddb74fd3..d0753acdb6b3 100644
--- a/dev-python/pgzero/Manifest
+++ b/dev-python/pgzero/Manifest
@@ -1 +1 @@
-DIST pgzero-1.2.1.tar.gz 2503205 BLAKE2B 616129da20cc5db67bfe826816bd454a76016d80a155296bbbe8e6febbb48aa2070fac1701b22ce7a522597f85b2e272151828f9dfbac367e33e3e0b35e9d260 SHA512 7988d114f6c037fe5ef4690ded878c63f73589e56fb7f79fa3604a7b4bc8433d75aabb80229159921a3dd6af4e3fe6740520a33f2a6b29aba034a63e6e154c33
+DIST pgzero-1.2.1.gh.tar.gz 2503205 BLAKE2B 616129da20cc5db67bfe826816bd454a76016d80a155296bbbe8e6febbb48aa2070fac1701b22ce7a522597f85b2e272151828f9dfbac367e33e3e0b35e9d260 SHA512 7988d114f6c037fe5ef4690ded878c63f73589e56fb7f79fa3604a7b4bc8433d75aabb80229159921a3dd6af4e3fe6740520a33f2a6b29aba034a63e6e154c33
diff --git a/dev-python/pgzero/pgzero-1.2.1-r1.ebuild b/dev-python/pgzero/pgzero-1.2.1-r2.ebuild
index daeb35904fa4..fbf69ca2ba70 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
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,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/pikepdf-6.2.6.ebuild b/dev-python/pikepdf/pikepdf-6.2.6.ebuild
index 0aa0c754f3ac..02effcd775bd 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 4e43f05163cd..1d01e604d9f0 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 4e43f05163cd..1d01e604d9f0 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/platformdirs/platformdirs-2.6.2-r1.ebuild b/dev-python/platformdirs/platformdirs-2.6.2-r1.ebuild
new file mode 100644
index 000000000000..a6f6eb63d4ec
--- /dev/null
+++ b/dev-python/platformdirs/platformdirs-2.6.2-r1.ebuild
@@ -0,0 +1,53 @@
+# 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_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
+HOMEPAGE="
+	https://pypi.org/project/platformdirs/
+	https://github.com/platformdirs/platformdirs/
+"
+SRC_URI="
+	https://github.com/platformdirs/platformdirs/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/appdirs[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	grep -q 'build-backend = "hatchling' 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 = "${PN}"
+		version = "${PV}"
+		description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".'
+	EOF
+	# sigh
+	cat > src/platformdirs/version.py <<-EOF || die
+		__version__ = version = '${PV}'
+		__version_tuple__ = version_tuple = (${PV//./, })
+	EOF
+}
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 0e6f53898cdf..580f911b655b 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -2,4 +2,5 @@ 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
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..a131d4e6eb6d
--- /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_{7,8,9,10,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/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 cb7239f695f1..083a0d4881ab 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..6b055f713aa2
--- /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_{7,8,9,10,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/python3-xapp/python3-xapp-2.2.2.ebuild b/dev-python/python3-xapp/python3-xapp-2.2.2.ebuild
index ae1155b1e6ab..93dd78cee927 100644
--- a/dev-python/python3-xapp/python3-xapp-2.2.2.ebuild
+++ b/dev-python/python3-xapp/python3-xapp-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/python3-xapp/python3-xapp-2.4.0.ebuild b/dev-python/python3-xapp/python3-xapp-2.4.0.ebuild
index bca414e8e32b..a3a80b456d98 100644
--- a/dev-python/python3-xapp/python3-xapp-2.4.0.ebuild
+++ b/dev-python/python3-xapp/python3-xapp-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest
index 6a4843bc3deb..f24fa715283b 100644
--- a/dev-python/pythran/Manifest
+++ b/dev-python/pythran/Manifest
@@ -1,2 +1,3 @@
 DIST pythran-0.11.0.gh.tar.gz 3582011 BLAKE2B 532afe9edd84d2699254bcad330dc03fcda4defce73997ec9feecf1a9e0c8f4fd407a5c4ebae7e10f96463a43453137953dc3e4df010ae7fb63d540d41b79f53 SHA512 bd703148f26a0511f5a21e691e62f4e9b7bf5a92548f8ac837b2d24135917b71b052941180c9801f29c457018eb57e5f5107a509d6815d8dd8ddab1b8626b1a1
 DIST pythran-0.12.0.gh.tar.gz 3589256 BLAKE2B 5eeba4b7d73e56cc2b696098edb085e11d406485960614b50426e3df7c425ad22537ae72a2931a9ec318ab23153660da543ec1890f03379981eee10a34b82cea SHA512 8f698cb2efc8e53005a6a18b81b9119796d56e638c4634d3a9268bc8d4ac340c7ff1a26212f17210ad7200eb8a3e0f9dd20702d9d9c51f24a76dadc7d0877693
+DIST pythran-0.12.1.gh.tar.gz 3631063 BLAKE2B c680639a88cd63398f88ee6f5325da288c06549bfef2ee649e27dd92114a2690f54fb3da730c4eb30ff9b7ef297c219bafa5f7f7153b7710d348859a04716e84 SHA512 05c4e1d03de3eebccbb915e13c70a36de293152aece58066f2d91d483d3ac920d61c7a76adcb2337f60e637734451775f0fc61341b0ef9fc4f074a752e39de9d
diff --git a/dev-python/pythran/pythran-0.12.1.ebuild b/dev-python/pythran/pythran-0.12.1.ebuild
new file mode 100644
index 000000000000..9eef62b169ca
--- /dev/null
+++ b/dev-python/pythran/pythran-0.12.1.ebuild
@@ -0,0 +1,67 @@
+# 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_{7,8,9,10,11} )
+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*[${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/rope/Manifest b/dev-python/rope/Manifest
index 45edde1fdb44..909c11037da5 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1 +1,2 @@
 DIST rope-1.6.0.tar.gz 289325 BLAKE2B fc7fc37a93f6d011f7e5eab5d2a28e3eab1767839cba4bce2b665c7972d6485eb3693e5977abfd36025415bc898fb4985affb7ac757c8457840a5de3946df77d SHA512 f610eb71c20533907aeea86c3ec5101401cf8136aba4221b2d64db3b0db16d4d7d1ec081c6d4929d6534ed51d4c01761af8d2ffddb6b69b4a9cc4921d240d745
+DIST rope-1.7.0.tar.gz 295362 BLAKE2B a81d6600441cf9dfe12be0a15113988ac8ec3dcd00c593085b9d749001b0785a5bceedc0fa8bbaeaaeb0142d623a432ef7d6e24874fab7a37179f131a26e6a6c SHA512 13cc3a2041c58c142892d1c9e5105ecdaa672e012364a5d4ccf82dbf5110fe0b6f0362b3a0309e9e6b72ab1d267dfc58eae8f3af3a8756f0356a6aff06c09abd
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..a2f2abe76cce
--- /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_{7,8,9,10,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/setuptools/setuptools-66.0.0.ebuild b/dev-python/setuptools/setuptools-66.0.0.ebuild
index f3dd56dcc5a6..11f6a1b1fed3 100644
--- a/dev-python/setuptools/setuptools-66.0.0.ebuild
+++ b/dev-python/setuptools/setuptools-66.0.0.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
 	<dev-python/packaging-22[${PYTHON_USEDEP}]
 	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6.2[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
 	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index 26f927568269..c031084284cd 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -3,3 +3,4 @@ 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
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..ab78fb3f4777
--- /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_{7,8,9,10,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/tasklib/tasklib-2.5.1.ebuild b/dev-python/tasklib/tasklib-2.5.1.ebuild
index e7e454b70a5a..f7ce521f74da 100644
--- a/dev-python/tasklib/tasklib-2.5.1.ebuild
+++ b/dev-python/tasklib/tasklib-2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/tavern/Manifest b/dev-python/tavern/Manifest
index 554c938b5efa..363c298e9b18 100644
--- a/dev-python/tavern/Manifest
+++ b/dev-python/tavern/Manifest
@@ -1,2 +1,3 @@
 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
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..04dda81e4d2a
--- /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_{7,8,9,10,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 096e8029774b..6b1a31881060 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,6 +1,4 @@
 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
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 3c8f0d97d606..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_{7,8,9,10,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 1249cfa05f27..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_{7,8,9,10,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 49cec2e60351..49cec2e60351 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 6dcb1d3b673c..1ee596e22fed 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,2 +1,3 @@
 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
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..e253f20ca2f8
--- /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_{7,8,9,10,11} )
+
+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
+}
diff --git a/dev-python/yamlpath/Manifest b/dev-python/yamlpath/Manifest
index 9aacfa8f9ca7..a1716d054ec1 100644
--- a/dev-python/yamlpath/Manifest
+++ b/dev-python/yamlpath/Manifest
@@ -1 +1,2 @@
 DIST yamlpath-3.6.9.gh.tar.gz 220753 BLAKE2B 8110cfccc7376b17bf0248e7a1b4b09962e7180629c3dc0ca5e9106d64a4ce0f3ff3c5aa626ed388ba13d412fb3d0b08d4d8a659c0322a249c28cad5283e133b SHA512 8a7802b890a32423c85f24fc39d7d614a87f30f72ca0e77621ba10eb69fed4bb3c8fa70f687ab30eab1f08036c14a03b4a007332246a5cdf5b15ea47b7280bd4
+DIST yamlpath-3.7.0.gh.tar.gz 224352 BLAKE2B 9a5483847fa765c3f06a4746b6c364ba66657f739383f0eeaac4f639bf44762bf1d3b7c468ec376d2d8d8bc6669daa60512f2202de6ec3407a5dd674d022f50e SHA512 d0ca007065f5efdc7c876d9596b37028881c4b3782f478f4dd87525cc6e316005bf23b930ea723bf524bc455c492c9eb07c50ccfc9333d9d794f110fa63dd268
diff --git a/dev-python/yamlpath/yamlpath-3.7.0.ebuild b/dev-python/yamlpath/yamlpath-3.7.0.ebuild
new file mode 100644
index 000000000000..1bbf67f1874e
--- /dev/null
+++ b/dev-python/yamlpath/yamlpath-3.7.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line processors for YAML/JSON/Compatible data"
+HOMEPAGE="
+	https://github.com/wwkimball/yamlpath/
+	https://github.com/wwkimball/yamlpath/wiki
+"
+SRC_URI="
+	https://github.com/wwkimball/yamlpath/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e '/ruamel\.yaml/d' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+
+	if ! has_version "dev-ruby/hiera-eyaml"; then
+		EPYTEST_DESELECT+=(
+			tests/test_commands_eyaml_rotate_keys.py
+			tests/test_commands_yaml_merge.py::Test_commands_yaml_merge::test_yaml_syntax_error
+			tests/test_commands_yaml_paths.py::Test_yaml_paths::test_search_encrypted_values
+		)
+	fi
+
+	epytest
+}