Adding metadata

47 files changed, 718 insertions, 62 deletions

diff --git a/dev-python/asgi-lifespan/Manifest b/dev-python/asgi-lifespan/Manifest
index 7c88d02dbb6e..04070edbf143 100644
--- a/dev-python/asgi-lifespan/Manifest
+++ b/dev-python/asgi-lifespan/Manifest
@@ -1,2 +1,2 @@
-DIST asgi-lifespan-1.0.1.gh.tar.gz 10745 BLAKE2B cebf0d8a152cae10c69764497624e384d878b4f98d8f8ca22648daee0315742503c0fa6c2f452f051d0f0c49b2fafea6b5f96660609b68395a2b441a1cd714ce SHA512 70acad39954749154461a9d6435d5ae78eb9aa22e7717303158780cde90f532f2c33656da7ccefab0edfc2916db92339969228b383c29be9832fe933fe1206b9
 DIST asgi-lifespan-2.0.0.gh.tar.gz 10067 BLAKE2B 66e4161f85b62aa065085db75d4c6c603b5e0b4888a89e880a3ce2e30c5ab5ba34544d4a137c7bcd913901ceb9b7422977cbb2ac3df0fe233907213d06710801 SHA512 2675bf756891229ef30ec9401777edaf0ed012aa1d8de5fdbaa76da01189fc2decf4d44463f74a04fcb17d46d1818ec410940649841aaed8f61c265659c69e86
+DIST asgi-lifespan-2.1.0.gh.tar.gz 10652 BLAKE2B 95a37be55b361741f8afe6c102b719e5b21582f642712988f342c93d848dcf164b53b7112c0f423b1f035a7eeb060867b68f177aead0bf398e7997043da8aeb3 SHA512 cd2be831a8ae7eac1545e87b43158dfe2fc52edf25538907edb6efe54eb7155ccac9f3972fdd10cff41974cd32fe312f7648a4757ee2ab40dc295f1a61875348
diff --git a/dev-python/asgi-lifespan/asgi-lifespan-1.0.1.ebuild b/dev-python/asgi-lifespan/asgi-lifespan-2.1.0.ebuild
index b110276b452f..5cde1b28cf94 100644
--- a/dev-python/asgi-lifespan/asgi-lifespan-1.0.1.ebuild
+++ b/dev-python/asgi-lifespan/asgi-lifespan-2.1.0.ebuild
@@ -21,6 +21,7 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="dev-python/sniffio[${PYTHON_USEDEP}]"
 BDEPEND="
 	test? (
+		dev-python/httpx[${PYTHON_USEDEP}]
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 		dev-python/pytest-trio[${PYTHON_USEDEP}]
 		dev-python/starlette[${PYTHON_USEDEP}]
@@ -28,18 +29,10 @@ BDEPEND="
 	)
 "
 
-EPYTEST_DESELECT=(
-	"tests/test_manager.py::test_lifespan_manager[asyncio-None-ValueError-None]"
-	"tests/test_manager.py::test_lifespan_manager[asyncio-ValueError-None-None]"
-	"tests/test_manager.py::test_lifespan_manager[asyncio-ValueError-ValueError-None]"
-	"tests/test_manager.py::test_lifespan_manager[trio-None-ValueError-None]"
-	"tests/test_manager.py::test_lifespan_manager[trio-ValueError-None-None]"
-	"tests/test_manager.py::test_lifespan_manager[trio-ValueError-ValueError-None]"
-)
-
 distutils_enable_tests pytest
 
-python_prepare_all() {
+src_prepare() {
+	distutils-r1_src_prepare
+
 	rm setup.cfg || die
-	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 4fba7201a3b3..e03df57a7036 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,6 +1,7 @@
 DIST boto3-1.26.100.gh.tar.gz 627269 BLAKE2B 1481e456b73794a4f371e5ac935d3d777c5315c1da39f8565631f62e05bd218e85409d5e5e095057af2c05c4bbcd9c1c5a56b4d1b8d2ef8e97ec567bfdd959a3 SHA512 45fdbb31c7e39ac1775e89755f88d426bdd17be002a13c1c517f2ec4b7ce1fcf0df7d1ff6c6d678fab5a7a1d656f9f609a6d4b3ab779464ea14a3e52eb7e4771
 DIST boto3-1.26.101.gh.tar.gz 627662 BLAKE2B 322a6e723851464409512e9d8dd17b5f2aa9717d97b8fc349c22e95db09bd8b8554631cd3afe52d31e34f4972ae0e5642762bf2ba13e8e5c5d56a05c3013c218 SHA512 7a1b9a089946dcb609a8c446b4c40f4f8861770b6592b6a11992573f7281a8fec0e3ae9d77abee542a88c588dfa23102110312d969f8aa63b3b0ffaf968a8e86
 DIST boto3-1.26.102.gh.tar.gz 627980 BLAKE2B d9dc7d2f62496f2e78427b7fd96f4a210afabb4a4a574a8860767c5bb48e68410cc9f2f2b64aa5e0e5337721d2f59edc7993ee32ea5e1aa5543533d3f1e18d52 SHA512 0988f113a519ffbd6c8a2238dc66a21d4aa87a7dda77d99a4343088b7ea03855f6da12712251502e54cf60ee0bbe066b3fbb30ad7aeb18d67ed9ca96035eb1cf
+DIST boto3-1.26.103.gh.tar.gz 629982 BLAKE2B 1b70ecf1bc7ec297f01dfd209597719eca2e9d3a8d2a772558696c8cf4df03df5d8f9ea6d6a34beeb8d0377dd0e8ee92ebf7e3fc82b5da59f4994e84321b9e93 SHA512 094a5edde02137d739c9d017f9331671b0b2b5701db9bcc3c7bcb5d42457b407811d70b8ef9b24cfa30229dda028d58e6bb45a043c18b5c765afa3204ce77244
 DIST boto3-1.26.89.gh.tar.gz 615718 BLAKE2B 3257e6efafaf139daf935385c252c10929be2a4277a8f0f192afc6dbd7cc32fa8f940a4e59ebbe25931c399dedb926a3c1848bd9cc0a7f0d377acb302eabe3b0 SHA512 02ee02b05023e9184f779ab8ff21afa6f7e56f7d2e883d021b2567676c5fc57cad6b475d55316a2017c2a837c41d2f5604824f440060e2f96804c5a61ccdd143
 DIST boto3-1.26.94.gh.tar.gz 617861 BLAKE2B 908b40868735038810cf75c903bbc8bad00a6ea8776b2a5a236683f18f2185971f8a13db5349086b1aef2c4d51361c8ebf30f2d671cea7f4101c9882a59b6acf SHA512 036278668afa33dfdaab9cc2e02c2c3e0596ec1c1b407767f22bc6a4cd87913f883f85430ff6a120c5e0fdd2194b70c911fe7a207bc26ed5fcd415f3754cde35
 DIST boto3-1.26.99.gh.tar.gz 625932 BLAKE2B 961a640995abdafbf2cd73f83ed5af0e1314cebbc5dc154771204e7c16532ad4a84aed08cbd7789af30de518bf2e8bd5204e9a540a2d3a08e75222c2eeb9a68a SHA512 ff726483a83a11a8c088905998af0a1a791e87503b39422811d82b3122275a24eb955636407422af7552908eee22d4c1369779a7798f09f958a8af5234c0c11d
diff --git a/dev-python/boto3/boto3-1.26.103.ebuild b/dev-python/boto3/boto3-1.26.103.ebuild
new file mode 100644
index 000000000000..2a4a7643203e
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.103.ebuild
@@ -0,0 +1,66 @@
+# 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..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 721ec064f82f..1bc5248559b8 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,6 +1,7 @@
 DIST botocore-1.29.100.gh.tar.gz 11306804 BLAKE2B 8ac9d592d2ea86bd600ca29c51999577e9c223fe951753052fd8d4c9a7d9f537f663491b2f31267e3ab0f082cc3b8ad49064017b268821e6d8c990e88046e144 SHA512 436b2cd40e3f7414b025463e2322fea834c1eae1243070f500dff7682a0dd049123b047a5d8183c58b001e4a793bbc81fa4a96afffff42b2d9f06c554fd261c0
 DIST botocore-1.29.101.gh.tar.gz 11311820 BLAKE2B 51be1b936b407a8d29912f6891c786826fc5a6be9caf386da56b697961613f4fe6506356f3c0b00da07386960abbde7e84c49e22142d1d401e481c8d4747d569 SHA512 1fb519861042b662d1d624223027f7a898d1975a07c6f2ad035547211bb7dad63cb07fcd6061cce75ab641801a7693313aafae7257067358d85fd43abbb82891
 DIST botocore-1.29.102.gh.tar.gz 11312537 BLAKE2B 6e5ac46612a692c72c7b9f3587d651a37422143dfae1fd25e999e255028e82a185dbd51ecf0a5de7d66a1ee715a6296d5d9c1f9474c210286b2df4e84946a3b8 SHA512 c0f0a69f81e1f2e57b3c048bae8e297e488f3e18bd2a443a6a6e56d49b97776c6b0fd7e613353eda3a7ee1f807ed717b639cc5fb685f83708f24de9d432f20fd
+DIST botocore-1.29.103.gh.tar.gz 11356652 BLAKE2B 4b583e094c1dce78257c7a21a1b1bb5fb5705af71f6fbd5215d34bc5dc745d47d19ec2ee4e667d9430f366385aaa45e4c2b139102c1c9de129b06ecb37338bda SHA512 a430fad7d729853d0ea405e772d482e6c9db60e6f580f51ddcec87816e13aa3f7ddded9bf8ce288c84c0e28f2b4b29922b1af9a0a8934123f17bc351a267a6c7
 DIST botocore-1.29.89.gh.tar.gz 11227280 BLAKE2B 41a1243972e591ea23fb2eebaa5b5fb9547bbd8ccd72fc907c487fd56ebf90d8120ceee472e34a29cd2b036926bc93bda33b564b1b7083e8984daf366eced1f8 SHA512 356298fd3be39957dd60e6268cfd2652998e62950b9060e0774c68e158506dcfea8188059b588c08f520617af38b91eb6b71c16b92f7a71f75f33cb73e7786cf
 DIST botocore-1.29.94.gh.tar.gz 11242930 BLAKE2B d6abdda0ad69bfa635c2cdccefff5c0feaa27fb1a307d5cacb140ded35c246a52ebbe5657a9317bdc1441939d2bd62d5829b2ecce01c05976f56737f92fc3f62 SHA512 23c1fb835d492f414a0a67ac03e50ea31f6343676c7e6e8649067b11e3213f84eb068562fe5bd9a49ead9e37381ab132ac820d98fa4af805b41eaf53b0f9cb1b
 DIST botocore-1.29.99.gh.tar.gz 11285143 BLAKE2B ba594544fb219cec77659cfa48fb6e3a8241b92c911d9983450648ce97652cad7654181637fed8373fe49e33524f63920128afd4ca9c00bce45603b1ab917648 SHA512 319d70412843149aa43c8d7faeff04122d96091081d30c2da0962fadb27104a24cc147fac2c95492aa407b2f8a25ebed9e7d149c29d5d38134d836581c801bdd
diff --git a/dev-python/botocore/botocore-1.29.103.ebuild b/dev-python/botocore/botocore-1.29.103.ebuild
new file mode 100644
index 000000000000..491b6bbc21f2
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.103.ebuild
@@ -0,0 +1,72 @@
+# 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..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cython/cython-0.29.33.ebuild b/dev-python/cython/cython-0.29.33.ebuild
index 064d02ded1b4..c7788161329a 100644
--- a/dev-python/cython/cython-0.29.33.ebuild
+++ b/dev-python/cython/cython-0.29.33.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/gemcall/Manifest b/dev-python/gemcall/Manifest
index 36fd2b34b9de..0fc276f7d2d7 100644
--- a/dev-python/gemcall/Manifest
+++ b/dev-python/gemcall/Manifest
@@ -1 +1 @@
-DIST gemcall-0.9.tar.gz 4741 BLAKE2B c7dcd6cf7260210382b3aebf5e87cbf5619f5038ebd6193b1deb2cb1a5f2b77f74cc327d5eef88f69dc775c9877e445eb1c7916b35584419d5d1123bc384a1fc SHA512 5c835538766a7c755163c751531bd33a776cc3f364f575dca4ffff3ab4ecfefb0cf49f8ffee5ea9ceb8300a8d7a19c943bcef3916f616c4f0a6875dcd6e431c4
+DIST gemcall-0.9.1.tar.gz 4758 BLAKE2B 7ad4bb54fa4cc62f365cd4fd4b5b0fbe3c3b500a9833bc765fc5813bee3e50442573ac28a22dc68d978061826868de589bc7601625c4f7ddd6dcde1e1b50b14f SHA512 e418a77e6896361b6f632e121d544ed5e7ce8ccd93c18dab51d7a2e6771f34031729c829d04193ecc1bafa70b7bb0de5a3a2d2e0856177be3fbb6b7c6c69022e
diff --git a/dev-python/gemcall/gemcall-0.9.ebuild b/dev-python/gemcall/gemcall-0.9.1.ebuild
index 727a528c6f61..eda99648af1b 100644
--- a/dev-python/gemcall/gemcall-0.9.ebuild
+++ b/dev-python/gemcall/gemcall-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index b2da61fa5be8..9cd8d6fb3db2 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,3 +1,4 @@
 DIST google-auth-2.16.2.tar.gz 221392 BLAKE2B 858ec2d01b7c8e573ddc310a17d634bd63032f469eb47b0fe5fd3c4bcdb5e3388380fba671958734e1b406ff19c9f8d5b70d8e25587e2e813e1300b27329dab4 SHA512 5686846fbd299e8d331a2132a1f2847febb68f06e460aed987ff12efa3a629c274f6b9dcae53b8b3d9075bb590e5e265eb11b9d6eb3861d4230f91f0bfea84f1
 DIST google-auth-2.16.3.tar.gz 221824 BLAKE2B 759b450936e7675b1c50ef574b8e9877d4b086a9e77b47958d56743fe140790359a79de026bc634752aa0eb631abc8a50da4804151071217af34fba588b72c01 SHA512 4010e19cb079baa32ad93f3ee6e9bc142b6edd331247251a14ee8ef9be166d81032cf10a6e000edc32d59e619021c4c9e500658288e4941a886d1d99e86ab68c
 DIST google-auth-2.17.0.tar.gz 222518 BLAKE2B 3f639cb000303c44508599e453385363ae70d01c5c359eb9c82d0882cb1669ab4b02b6acf5cb2bacaae5fdcebfe8244bd537836d58eb5f34ef66a933b50b7ff6 SHA512 2942f385febf8d2a3f3827e048646e01c06ac3c2880ebb06d5a6eaeeb3d258cbd5ba7d969c7aee00a74332b5ce9b43a9474daa9e2e1de72bfb5f97dfb8065b96
+DIST google-auth-2.17.1.tar.gz 222594 BLAKE2B edc7ee29741418ab0e37a7b24591942ef4a973f67308d41e8715ab809dc3549e3ea307863ec2667d57223b3cb88802d535291845fcef48271b0cbc086aef839a SHA512 ddb4c9a5f9d01e4218666e632cd1eb2e9e8c852f833015c6e6e736a713cabf7ede0b1314526428fd3edd8b71565fee6cd8199252ee8fa011ef54aa543d3764ce
diff --git a/dev-python/google-auth/google-auth-2.17.1.ebuild b/dev-python/google-auth/google-auth-2.17.1.ebuild
new file mode 100644
index 000000000000..5faba10d7363
--- /dev/null
+++ b/dev-python/google-auth/google-auth-2.17.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# these are compatibility tests with oauth2client
+	# disable them to unblock removal of that package
+	tests/test__oauth2client.py
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 0c3651b31101..f8a63aacacfd 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,2 +1,3 @@
 DIST ipython-8.10.0.tar.gz 5456256 BLAKE2B 8ca8781326396ffa1e8012bab3b539b857a68e212afd5b2b97bc2f0eac6ec1aee45c0743d745554ef24fabd24667c2d6cdb3927350ca61b747e02afa215c1519 SHA512 5cfcdd49120d9ffc11d2f18501826b2f7094a51c439ac23e507f1027989ece4104d739a1905feba41f899d22a66e1345333f46e0f55d18925f166906f4992cfe
 DIST ipython-8.11.0.tar.gz 5462176 BLAKE2B 6024c191f327d04f7a26f2f371b200e2e3f26029d84a3a53fc7421cb4751f0e29fb8741a2aa0447026b43cc1d9a7674a07e06c30578812cc33220c55df72c497 SHA512 9b07da3fed304f6739396883d0219386bb08d4860853b30f308c2e9b9017f48d1228dedb511c872b706881ee80dc7bf03f541720ffb816c35b66f6f53ac289a3
+DIST ipython-8.12.0.tar.gz 5465154 BLAKE2B 946d3e649dcf8eea3518ed68499cfcaa6caa7eac99aa21c05fcbb81338037151253ba84d8d942746600dad3883f6d0e8ba1e82e9932cdddc8e1e77a270573ebf SHA512 3e9a42a6fb34a46d32d1236eac99182a756db2ec7b57c77dbedff1e4b25bcf2ef37effe4e5575cda450a1cde77e3c0d24172dcf19d102110a1ac75b9cfe9272c
diff --git a/dev-python/ipython/ipython-8.12.0.ebuild b/dev-python/ipython/ipython-8.12.0.ebuild
new file mode 100644
index 000000000000..843655d0f08c
--- /dev/null
+++ b/dev-python/ipython/ipython-8.12.0.ebuild
@@ -0,0 +1,159 @@
+# 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} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 optfeature pypi virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="
+	https://ipython.org/
+	https://github.com/ipython/ipython/
+	https://pypi.org/project/ipython/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt-toolkit-3.0.38[${PYTHON_USEDEP}]
+	<dev-python/prompt-toolkit-3.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/stack_data[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.9)
+"
+
+BDEPEND="
+	test? (
+		app-text/dvipng[truetype]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+RDEPEND+="
+	nbconvert? (
+		dev-python/nbconvert[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+python_prepare_all() {
+	# Remove out of date insource files
+	#rm IPython/extensions/cythonmagic.py || die
+	#rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	# Rename the test directory to reduce sys.path pollution
+	# https://github.com/ipython/ipython/issues/12892
+	mv IPython/extensions/{,ipython_}tests || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
+	local EPYTEST_DESELECT=(
+		# TODO: looks to be a regression due to a newer dep
+		IPython/core/tests/test_oinspect.py::test_class_signature
+		IPython/core/tests/test_oinspect.py::test_render_signature_long
+		IPython/terminal/tests/test_shortcuts.py::test_modify_shortcut_with_filters
+	)
+	# nonfatal implied by virtx
+	nonfatal epytest || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "code formatting" dev-python/black
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.8.0.ebuild b/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.8.0.ebuild
index 96af61ae1156..79bce35109c0 100644
--- a/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.8.0.ebuild
+++ b/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.8.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 
 BDEPEND="
 	test? (
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild b/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild
index 3af37418dd27..51a983da1ffe 100644
--- a/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild
+++ b/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/jupyter-server[${PYTHON_USEDEP}]
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.6.1.ebuild b/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.6.1.ebuild
index 92f02cc2f6bf..85cb2adc86b3 100644
--- a/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.6.1.ebuild
+++ b/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.6.1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.8.0.ebuild b/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.8.0.ebuild
index 59b1f6aee89e..a34e9dfd7055 100644
--- a/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.8.0.ebuild
+++ b/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.8.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/jupyter-server/jupyter-server-2.4.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.4.0.ebuild
index 3bf169f3e4f7..2830bb9757fe 100644
--- a/dev-python/jupyter-server/jupyter-server-2.4.0.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.4.0.ebuild
@@ -43,7 +43,7 @@ BDEPEND="
 	test? (
 		dev-python/ipykernel[${PYTHON_USEDEP}]
 		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
index d751ca365de9..eadba4741f63 100644
--- a/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
@@ -43,7 +43,7 @@ BDEPEND="
 	test? (
 		dev-python/ipykernel[${PYTHON_USEDEP}]
 		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild b/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild
index 319ba230da10..a85a649ab7f3 100644
--- a/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
 	test? (
 		>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
 		>=dev-python/pytest-asyncio-0.18[${PYTHON_USEDEP}]
-		>=dev-python/pytest_jupyter-0.4.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-jupyter-0.4.1[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/jupyter_client/jupyter_client-8.1.0.ebuild b/dev-python/jupyter_client/jupyter_client-8.1.0.ebuild
index 3e4079be1230..12e3f6333cdb 100644
--- a/dev-python/jupyter_client/jupyter_client-8.1.0.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-8.1.0.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
 	test? (
 		>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
 		>=dev-python/pytest-asyncio-0.18[${PYTHON_USEDEP}]
-		>=dev-python/pytest_jupyter-0.4.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-jupyter-0.4.1[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild b/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
index 3a2a98453030..51bf742f026c 100644
--- a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
+++ b/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
@@ -26,7 +26,7 @@ BDEPEND="
 	dev-python/jupyter_packaging[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/jupyterlab-server/jupyterlab-server-2.20.0.ebuild b/dev-python/jupyterlab-server/jupyterlab-server-2.20.0.ebuild
index 2be148047212..f82d80fe1d62 100644
--- a/dev-python/jupyterlab-server/jupyterlab-server-2.20.0.ebuild
+++ b/dev-python/jupyterlab-server/jupyterlab-server-2.20.0.ebuild
@@ -41,7 +41,7 @@ BDEPEND="
 		>=dev-python/openapi-core-0.16.1[${PYTHON_USEDEP}]
 		<dev-python/openapi-spec-validator-0.6[${PYTHON_USEDEP}]
 		>=dev-python/openapi-spec-validator-0.5.1[${PYTHON_USEDEP}]
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab-server/jupyterlab-server-2.21.0.ebuild b/dev-python/jupyterlab-server/jupyterlab-server-2.21.0.ebuild
index 2be148047212..f82d80fe1d62 100644
--- a/dev-python/jupyterlab-server/jupyterlab-server-2.21.0.ebuild
+++ b/dev-python/jupyterlab-server/jupyterlab-server-2.21.0.ebuild
@@ -41,7 +41,7 @@ BDEPEND="
 		>=dev-python/openapi-core-0.16.1[${PYTHON_USEDEP}]
 		<dev-python/openapi-spec-validator-0.6[${PYTHON_USEDEP}]
 		>=dev-python/openapi-spec-validator-0.5.1[${PYTHON_USEDEP}]
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/jupyterlab-3.5.3.ebuild b/dev-python/jupyterlab/jupyterlab-3.5.3.ebuild
index 809b2a3930f6..4d002e920b30 100644
--- a/dev-python/jupyterlab/jupyterlab-3.5.3.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.5.3.ebuild
@@ -41,7 +41,7 @@ BDEPEND="
 		dev-python/openapi-core[${PYTHON_USEDEP}]
 		dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
 		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/jupyterlab-3.6.1-r1.ebuild b/dev-python/jupyterlab/jupyterlab-3.6.1-r1.ebuild
index 81d7c2c1cc15..a0ba48ce91f4 100644
--- a/dev-python/jupyterlab/jupyterlab-3.6.1-r1.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.6.1-r1.ebuild
@@ -43,7 +43,7 @@ BDEPEND="
 		dev-python/openapi-core[${PYTHON_USEDEP}]
 		dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
 		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/jupyterlab-3.6.2.ebuild b/dev-python/jupyterlab/jupyterlab-3.6.2.ebuild
index 7fa3d89cc6ae..8ba13cf52dba 100644
--- a/dev-python/jupyterlab/jupyterlab-3.6.2.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.6.2.ebuild
@@ -43,7 +43,7 @@ BDEPEND="
 		dev-python/openapi-core[${PYTHON_USEDEP}]
 		dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
 		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/libsass-python/libsass-python-0.22.0-r1.ebuild b/dev-python/libsass-python/libsass-python-0.22.0-r1.ebuild
index 00ca7838ced9..e5515ca76e21 100644
--- a/dev-python/libsass-python/libsass-python-0.22.0-r1.ebuild
+++ b/dev-python/libsass-python/libsass-python-0.22.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	>=dev-libs/libsass-3.6.5
diff --git a/dev-python/nbclassic/nbclassic-0.5.1.ebuild b/dev-python/nbclassic/nbclassic-0.5.1.ebuild
index 3f161c63feaf..f426f3f96692 100644
--- a/dev-python/nbclassic/nbclassic-0.5.1.ebuild
+++ b/dev-python/nbclassic/nbclassic-0.5.1.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
 # dev-python/nbval is missing impls
 BDEPEND="
 	test? (
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
diff --git a/dev-python/nbclassic/nbclassic-0.5.3-r1.ebuild b/dev-python/nbclassic/nbclassic-0.5.3-r1.ebuild
index 95b60c0c4223..8ffb8eb6cd66 100644
--- a/dev-python/nbclassic/nbclassic-0.5.3-r1.ebuild
+++ b/dev-python/nbclassic/nbclassic-0.5.3-r1.ebuild
@@ -44,7 +44,7 @@ PDEPEND="
 BDEPEND="
 	test? (
 		dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
diff --git a/dev-python/notebook_shim/notebook_shim-0.2.2-r1.ebuild b/dev-python/notebook_shim/notebook_shim-0.2.2-r1.ebuild
index 71ff6c61be1b..e09478f16c70 100644
--- a/dev-python/notebook_shim/notebook_shim-0.2.2-r1.ebuild
+++ b/dev-python/notebook_shim/notebook_shim-0.2.2-r1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index bbe1038cf224..87b44c3488c2 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -1,5 +1,7 @@
 DIST pydata-sphinx-theme-0.13.1.gh.tar.gz 3391663 BLAKE2B 411b3dfb81b84189da86b0d11bf983348ecc6cef25142616f997f6301bc7873360835ba87309c055df46800ba34c30cf0d82bc3fb2c1984214d0c3e02556d17b SHA512 c88db817891800ee3483f724770354ab8c02abb0e430537ecd29b2e4b566fbdccb0a461926858a20da2da98dff37c6f09fa3f29dc538ecc30abd87597a9c08c2
 DIST pydata-sphinx-theme-0.13.2.gh.tar.gz 3367549 BLAKE2B 29a219b865c3c8f9c7ab8acba50ded75585c240cb120d8cb21234fdb6c1126f6ddadc1582de5aeaf253a7ec7126a9395cc12dbead5f7b0c54a5727634d965aa2 SHA512 e26a8ed2791489f23df774e024bc04e2600b70228bf0db1cc69edd1fb4f615425e8e1f06ea849516fd7601bea23caecad3641a4547c78cd9b7e808a61aa79008
+DIST pydata-sphinx-theme-0.13.3.gh.tar.gz 3370023 BLAKE2B 3d5e05222cce5c92e0ffadbf91d3bfa575a809b06c23da800e845e5b4ec622a3bfba0f5a72cc0c969b1a074e765e611c2aeb3cef77842d51529537959a952cd5 SHA512 312308838a78bf66430660ee0d7484cf20004926446111e1e8bf89fc96b38f4b8345b96856705aaa56371b31c369066a043c53d263731ccb411e7e263fc3a96a
 DIST pydata-sphinx-theme-0.7.2.gh.tar.gz 2632129 BLAKE2B 2beb9fac60b5f6c863ee4c570b88c4331135d2c8a10d84599f97944002576424caae06d062104a58c7f329f85e046eaa820d03a4117396009084707d563608d7 SHA512 2f6cac080807eab04f1c4de2fdd1563de17f1214f79c094f69b5ff116bcc47f1b0e159d6c87412c8cbe7691b19eebb3b228ca8243d05c81bba94d0aacbdb3e5e
 DIST pydata_sphinx_theme-0.13.1-py3-none-any.whl 1624783 BLAKE2B 9ff997244b12320dccbec56866af4cf780a5341a5d75b7040de3623d15a2593561a6506f31be769b63bb72905e1e428e9fe0955988b2919732bdfe1dfba68062 SHA512 1f31d59b0041aa6302ea3d6a03d089adb7108e334813f2ceb576b04b5767a96ef4b3d6d3d3f4bc40c399932b193575a21f418dba2a1737a14ba90deead951457
 DIST pydata_sphinx_theme-0.13.2-py3-none-any.whl 1976897 BLAKE2B 3934bdee8210e3c384a284f402627a9d6716c3664a613a7de8ba3e05d143551d2fadbbce3929b837ce1af96019887fbc56d84129b75bb01922562f011dccee04 SHA512 9daed721a90411453cc150e80472fae592a477ce58dc815e60475c579ab62453953c300587cbd1fb8c830ad986cc49f3278f2d781c44a8c35463c1cd2e09bd0e
+DIST pydata_sphinx_theme-0.13.3-py3-none-any.whl 1979378 BLAKE2B 49f871167a73ee088aca87c49f728821a8df4b79015e543e84eee7ac85e2e8a81b3419cca0c8ad14197e44c2bb2b2533a9c7e9e29384d37956c5d814904cc2b7 SHA512 59ec688677cb6d150e4741e84bfd32914f139533118a297c6691b27ea56e2e85577593951a5b3daaf9d41c7de3cb8276c479b72b12c4e8921d7418c75dfe90ff
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.13.3.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.13.3.ebuild
new file mode 100644
index 000000000000..9dd24a4f6ad8
--- /dev/null
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.13.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Bootstrap-based Sphinx theme from the PyData community"
+HOMEPAGE="
+	https://github.com/pydata/pydata-sphinx-theme/
+	https://pypi.org/project/pydata-sphinx-theme/
+"
+SRC_URI="
+	https://github.com/pydata/pydata-sphinx-theme/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	$(pypi_wheel_url)
+"
+
+LICENSE="BSD-with-disclosure"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/accessible-pygments[${PYTHON_USEDEP}]
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-4.2[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	distutils_wheel_install "${BUILD_DIR}/install" \
+		"${DISTDIR}/$(pypi_wheel_name)"
+}
diff --git a/dev-python/pyodbc/Manifest b/dev-python/pyodbc/Manifest
index 261ffcc6bd8a..d705d9525afd 100644
--- a/dev-python/pyodbc/Manifest
+++ b/dev-python/pyodbc/Manifest
@@ -1 +1 @@
-DIST pyodbc-4.0.32.tar.gz 280035 BLAKE2B f8c3479dc3eb78502d9a1621475603db0c53d69a65b09437180bf7eab14a919507413bd1b6bd56c00a1ba45cb6f1a6a86bd1e8b0bfcbdaad4a56a042d3937fda SHA512 a282f9b83e6cbf874db8135f1088dea86544dda49a16e86f988302f1675ff16d33473fbef092c6c0acdae7de1df6c4528cb1ea5ce3db0e6df49a7c457fcb34f8
+DIST pyodbc-4.0.35.tar.gz 273300 BLAKE2B cda55c3f880f5b8e243090a8150095e323bce5a28006d6105d8fcf4724a1f4219314591a4e53fc38844607d7714dffa5a221cd89c08dd5725aec251ca1977a18 SHA512 63b5191f5b57379e4767f94ecc83f80c73a3d40e7479753ccd7ff5ca27961be526bbf5ec169f9ca17c2ef7bd521507898be9b95110e290c4c69e1974c4c053f2
diff --git a/dev-python/pyodbc/pyodbc-4.0.32.ebuild b/dev-python/pyodbc/pyodbc-4.0.32.ebuild
deleted file mode 100644
index ee7ab9b8bc33..000000000000
--- a/dev-python/pyodbc/pyodbc-4.0.32.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} ) # pypy3 https://github.com/mkleehammer/pyodbc/issues/915
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python ODBC library"
-HOMEPAGE="
-	https://github.com/mkleehammer/pyodbc
-	https://pypi.org/project/pyodbc/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="mssql"
-
-RDEPEND="
-	>=dev-db/unixODBC-2.3.0
-	mssql? ( >=dev-db/freetds-0.64[odbc] )
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test" # need running databases
diff --git a/dev-python/pyodbc/pyodbc-4.0.35.ebuild b/dev-python/pyodbc/pyodbc-4.0.35.ebuild
new file mode 100644
index 000000000000..d9dfe8c843bb
--- /dev/null
+++ b/dev-python/pyodbc/pyodbc-4.0.35.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# No pypy3 support: https://github.com/mkleehammer/pyodbc/issues/915
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit databases edo distutils-r1 optfeature pypi
+
+DESCRIPTION="Python ODBC library"
+HOMEPAGE="
+	https://pypi.org/project/pyodbc/
+	https://github.com/mkleehammer/pyodbc
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="mssql"
+
+RDEPEND=">=dev-db/unixODBC-2.3.0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		$(emysql --get-depend)
+		dev-db/myodbc:8.0
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	edo ${EPYTHON} tests3/run_tests.py -vv \
+		--mysql "DRIVER=/usr/$(get_libdir)/myodbc-8.0/libmyodbc8a.so;SERVER=localhost;PORT=44444;DATABASE=test"
+}
+
+src_test() {
+	emysql --start 44444
+	distutils-r1_src_test
+	emysql --stop
+}
+
+src_install() {
+	distutils-r1_src_install
+	rm /usr/pyodbc.pyi || die
+}
+
+pkg_postinst() {
+	optfeature "MS SQL Server support" dev-db/freetds-0.64[odbc]
+	optfeature "MySQL support" dev-db/myodbc
+	optfeature "PostgreSQL support" dev-db/psqlodbc
+}
diff --git a/dev-python/pytest_jupyter/Manifest b/dev-python/pytest-jupyter/Manifest
index 6baef7011d27..b02cd95089ac 100644
--- a/dev-python/pytest_jupyter/Manifest
+++ b/dev-python/pytest-jupyter/Manifest
@@ -1 +1,2 @@
 DIST pytest_jupyter-0.6.2.tar.gz 15174 BLAKE2B b6c536383ab1b8e375e4250b4922ac6372f850ee4993643122896092109d3f711f91ccc7b159b7330de18f7876df818dc01d31c05e3c18d97488255e063db4d4 SHA512 396f7a7c978097e6dee37ead92bb3c8cef2a8100a7cc85b0b1eab19e20bdaed3332391c17568a6a279ab6ddeea1fbb2fa8dafe24ba4500982ba52cfcda2b1052
+DIST pytest_jupyter-0.7.0.tar.gz 15507 BLAKE2B b4b580668083e46830d06908f484f221e511a9dc5b32285de25e8e83268a1cb4a110ab5bc92c4652033bd658332c6aef8560313e041d39ceeec6d7339c67b24d SHA512 5bd44d1cc927281823ab92f5e1dbb4fa66e917fb9ba098c63001bb9edf60d4eb7842d4178c1dce1772e156d871def2319d511187185fbfd81ee9128c7c23ea2a
diff --git a/dev-python/pytest_jupyter/metadata.xml b/dev-python/pytest-jupyter/metadata.xml
index f779b78a9efd..f779b78a9efd 100644
--- a/dev-python/pytest_jupyter/metadata.xml
+++ b/dev-python/pytest-jupyter/metadata.xml
diff --git a/dev-python/pytest_jupyter/pytest_jupyter-0.6.2.ebuild b/dev-python/pytest-jupyter/pytest-jupyter-0.6.2.ebuild
index a9ee8ffc0f7b..a9ee8ffc0f7b 100644
--- a/dev-python/pytest_jupyter/pytest_jupyter-0.6.2.ebuild
+++ b/dev-python/pytest-jupyter/pytest-jupyter-0.6.2.ebuild
diff --git a/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild b/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild
new file mode 100644
index 000000000000..ca2a639a868b
--- /dev/null
+++ b/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild
@@ -0,0 +1,34 @@
+# 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 pypi
+
+DESCRIPTION="Pytest plugin for testing Jupyter libraries and extensions"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter-server/pytest-jupyter/
+	https://pypi.org/project/pytest-jupyter/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/jupyter_client-7.4.0[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-1.21[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-5.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 6d006d7ca4de..1f80c50f5f83 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,2 +1,3 @@
 DIST stripe-5.2.0.tar.gz 267950 BLAKE2B b7312e4c7e56803fdd64507602df3527efcc964aa7bb6deae59d00df75c72c47cf179382ce6b90ffab5089e7fce9b2e03de0748a091b36dd25d93d8cf6b1d119 SHA512 e928487b690a2c7bce9013ba988ff5a1d9b0ef4b0be56852385925fd5fa4a1b9e655e05b7fa2728d38ed7834eebe621b883851e6a6db625f388866f32c9f8a15
 DIST stripe-5.3.0.tar.gz 268634 BLAKE2B b6b6ac44f64b2b7f02729840409ed7f432abd6924838445deaa010a98056175bc47504cb110d27f93c1c1a590d759903f6af2189da43076fd3b1242c8f4f2503 SHA512 2ae99b315f0d1059551b86106cd3eb46dfb60dcc31f65f4e3cbda8817461b0071add2ab68eeb885b4faa080043708ac9e673d8a1248bf1c6461c62e1adcafc80
+DIST stripe-5.4.0.tar.gz 268711 BLAKE2B 2417174ceed571a7b8483992ac15ef9d19a037e5745118c2eec3094f8e848ec49b384f62bd4a136ed046b695bd753efc6064109c30a50aca539a1085b1e056fe SHA512 55351171184672ab55f38ed483078dbbb85216bf80d07726d1bb8848d24ff829a3d464d543182afafedfcaabdb516a5868bc4ac7d16f64f2dc2dc7c1ab2e152a
diff --git a/dev-python/stripe/stripe-5.4.0.ebuild b/dev-python/stripe/stripe-5.4.0.ebuild
new file mode 100644
index 000000000000..fcc0c191909b
--- /dev/null
+++ b/dev-python/stripe/stripe-5.4.0.ebuild
@@ -0,0 +1,71 @@
+# 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} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Stripe python bindings"
+HOMEPAGE="
+	https://github.com/stripe/stripe-python/
+	https://pypi.org/project/stripe/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+"
+# please bump dev-util/stripe-mock dep to the latest version on every bump
+BDEPEND="
+	test? (
+		>=dev-util/stripe-mock-0.159.0
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		net-misc/curl
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
+
+python_test() {
+	epytest tests
+}
+
+src_test() {
+	local stripe_mock_port=12111
+	local stripe_mock_max_port=12121
+	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
+	# Try to start stripe-mock until we find a free port
+	while [[ ${stripe_mock_port} -le ${stripe_mock_max_port} ]]; do
+		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
+		stripe-mock --http-port "${stripe_mock_port}" &> "${stripe_mock_logfile}" &
+		local stripe_mock_pid=${!}
+		sleep 2
+		# Did stripe-mock start?
+		curl --fail -u "sk_test_123:" \
+			"http://127.0.0.1:${stripe_mock_port}/v1/customers" &> /dev/null
+		eend ${?} "Port ${stripe_mock_port} unavailable"
+		if [[ ${?} -eq 0 ]]; then
+			einfo "stripe-mock running on port ${stripe_mock_port}"
+			break
+		fi
+		(( stripe_mock_port++ ))
+	done
+	if [[ ${stripe_mock_port} -gt ${stripe_mock_max_port} ]]; then
+		eerror "Unable to start stripe-mock for tests"
+		die "Please see the logfile located at: ${stripe_mock_logfile}"
+	fi
+
+	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
+	distutils-r1_src_test
+
+	# Tear down stripe-mock
+	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
+}
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index a1885558c011..834629ce0de7 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -3,3 +3,4 @@ DIST trimesh-3.20.2.gh.tar.gz 12683352 BLAKE2B 3ed73e426fd72723d19b668aae790f44a
 DIST trimesh-3.21.0.gh.tar.gz 12688064 BLAKE2B 5ac8c4cd3f087b63ad6e224a693380a7f5cad5d1e09e2d21d91410f462d51833baf09ac7015c52fa85e475832122c0aa61e8bfa340d42fb08c9e9fb0e5d8dbdb SHA512 1805213b8fe19fa5716ad8da1c23d7e23d06e96de13a18f59907a62fdf5b67ad9fb7842a7f19b4a315444261f210bbb312f6b0bbf728ee015f9d489e2dce4f0a
 DIST trimesh-3.21.1.gh.tar.gz 12689151 BLAKE2B e0d04a6003656f096404ec8972907381f5950f7a6ac3864963fc9a52dc015ad42d39e88ced8d125f725333ddde722358ebac9f263fda0cd21d663af42318bd50 SHA512 08716a310db8cae86a725072a6626b3703ffac3532182ce22389cf85fcdf5853ad8f17cfd8c34afde0e6dc0f2125d910d130810c3cce8e8dcb1605737074a3e0
 DIST trimesh-3.21.2.gh.tar.gz 12691646 BLAKE2B 0ec2c1e9afb607984b92d339fa07dd8b92bf0ac50c56704c98ce3f6c35449794b595640d68c67dc2ce59f236545f5df72238aef21103fbc1f432bbe285332a46 SHA512 e9e692c6dd20c787c9262e148aaaffb81c8ef3decbeb16e3c008a585701e9e71c73487e8226b159e86d550019f297bb2163b3be3006dd08c2df932d3dcd0b403
+DIST trimesh-3.21.3.gh.tar.gz 12692861 BLAKE2B 8e3f9cc28b26371bc46b31c48c1e79345cb6f27755999bf99cc793f83706ab559cffb3788101995550e112b77617c0d112c06f636f0f4c3047b966f669b419b3 SHA512 ab72b8b61643152d5fdcf5326b1c8a6f8e54c4bbc0653fe8c1dd379ecfa8510ae542c85adde8200abcb863ec80dbeb9046d6d7d4ec5f1f9aadead8871841b948
diff --git a/dev-python/trimesh/trimesh-3.21.3.ebuild b/dev-python/trimesh/trimesh-3.21.3.ebuild
new file mode 100644
index 000000000000..50458139f318
--- /dev/null
+++ b/dev-python/trimesh/trimesh-3.21.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+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/networkx[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycollada[${PYTHON_USEDEP}]
+	dev-python/pyglet[${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
+
+python_test() {
+	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/xarray/xarray-2023.2.0.ebuild b/dev-python/xarray/xarray-2023.2.0.ebuild
index 56938797b914..0507beb6b97d 100644
--- a/dev-python/xarray/xarray-2023.2.0.ebuild
+++ b/dev-python/xarray/xarray-2023.2.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.22[${PYTHON_USEDEP}]
diff --git a/dev-python/yamlpath/Manifest b/dev-python/yamlpath/Manifest
index 03ad0cc241b7..110b75bf6bca 100644
--- a/dev-python/yamlpath/Manifest
+++ b/dev-python/yamlpath/Manifest
@@ -1 +1,2 @@
 DIST yamlpath-3.7.0.gh.tar.gz 224352 BLAKE2B 9a5483847fa765c3f06a4746b6c364ba66657f739383f0eeaac4f639bf44762bf1d3b7c468ec376d2d8d8bc6669daa60512f2202de6ec3407a5dd674d022f50e SHA512 d0ca007065f5efdc7c876d9596b37028881c4b3782f478f4dd87525cc6e316005bf23b930ea723bf524bc455c492c9eb07c50ccfc9333d9d794f110fa63dd268
+DIST yamlpath-3.8.0.gh.tar.gz 227377 BLAKE2B 9a722a6f637144a8085c7b71c8ac0c966d2ff7eda7b7136614db06406024c21cdbf6b30d3a5cc7b78ba8e268d406c0db15f15130098b680a1ce36a6eb8d31b9c SHA512 8a91c1519a7a93b099c77d2f850dc775c0ca8147d3ea4eb96408bb3f53a102301c6a9b6d1c5c47580a59f701e8316ff49e27d4643c21c8bc87fb337e6982e91f
diff --git a/dev-python/yamlpath/yamlpath-3.8.0.ebuild b/dev-python/yamlpath/yamlpath-3.8.0.ebuild
new file mode 100644
index 000000000000..1bbf67f1874e
--- /dev/null
+++ b/dev-python/yamlpath/yamlpath-3.8.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
+}