gentoo auto-resync : 17:03:2023 - 06:26:48

79 files changed, 1061 insertions, 77 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 55df0fd55e07..3031930b662b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index e865dae77389..051e2049dbf5 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -48,5 +48,5 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST zeroize-1.5.7.crate 18861 BLAKE2B 5f203d91aae732b928e2acd02656a486f0f930b8daea96b927552f5790862489d83c7bd48b0c7c62a3273e7a04833a16149ce489847f17fbb037e88922d359a2 SHA512 e0688681bceba324d36ea4dc552791801dc93b5882d106b79dd317af99cb718b711899bfd09917a811d23096693448801e64f0651bd9eeae7895618821d88fa9
-EBUILD bcrypt-4.0.1.ebuild 1702 BLAKE2B 5435813212ffe5beb0a0631af72734ba2286cb36bb45efcb3cef2486db178a18804e881f107e9680e8f841bfeabc8d78f88866c3de9c285bd81df1ac1d1f3971 SHA512 75c2f6ce4602ee447dce43aeaffdcae7dbe629e8b7a6985638ba609eca5305110919b5dc89ddfda606b6c6f70a6b74b08c693f84b7e671027fb41e37b54b59af
+EBUILD bcrypt-4.0.1.ebuild 1665 BLAKE2B 13e5f736fa1702f1939b05bb2077a474e6127c5c13e5b7803012235255df98678d1630e4411a88a696ace50f5362d2f61d68782931f7b15a302eadc68f72c143 SHA512 f3825786927bb26b2cfbdeb44dde38469b8e68eb7a8ee7eec9951e17521937ae6920f20570975e9eceb4d3e70451fe74e9a7fd2ac446ae3c0958d961b4089997
 MISC metadata.xml 486 BLAKE2B 874ef427438f2a2adc0529010628dd40505fd2597e267b8e51641d95b4c3bd8dab28d0fcd86c23f24c3abc866bd049d5e44438b282a5a13b023320491303a5b5 SHA512 de2e0a2a60b83a660a7c51315816a2762d9ebdb031656b8968da641d4e3897e4f5eb7a3432f828182f733ee4ffd17f11e8fb97d9a72f1a7eec56bb2f46978293
diff --git a/dev-python/bcrypt/bcrypt-4.0.1.ebuild b/dev-python/bcrypt/bcrypt-4.0.1.ebuild
index 0be9be39335e..f0f26c705a6c 100644
--- a/dev-python/bcrypt/bcrypt-4.0.1.ebuild
+++ b/dev-python/bcrypt/bcrypt-4.0.1.ebuild
@@ -58,15 +58,14 @@ CRATES="
 	zeroize-1.5.7
 "
 
-inherit cargo distutils-r1
+inherit cargo distutils-r1 pypi
 
 DESCRIPTION="Modern password hashing for software and servers"
 HOMEPAGE="
 	https://github.com/pyca/bcrypt/
 	https://pypi.org/project/bcrypt/
 "
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+SRC_URI+="
 	$(cargo_crate_uris)
 "
 
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index e86f5fc91cf1..416852671467 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -9,6 +9,7 @@ DIST boto3-1.26.89.gh.tar.gz 615718 BLAKE2B 3257e6efafaf139daf935385c252c10929be
 DIST boto3-1.26.90.gh.tar.gz 616132 BLAKE2B 1c6fb20ca08c75fce5bc192cd49c8540fb5a702790f5abcdcafd4ee803e4967e55c97a99214cfae57701e6f808501d48e3bf3b5c73e1737ca3f3909af2522d4d SHA512 da438af104c3362e366785da71b9892f45b2238d280c0c39df27572afc076d4535e73fe58aa7cc7fb565b92ed8423938ddb0f16e3a5ed641231e5efadb1bf0b5
 DIST boto3-1.26.91.gh.tar.gz 616798 BLAKE2B 51e61db07beeb39d8fc4be88818a13e259bc71fe25d1a52df10f7ffb364ca5d42509f4cda526fa1eb41e97bb6db1a453ab8865d8032b279523c3a994ca28bb7a SHA512 e1bde413d836ae5e3332e84a73c2f687b0d6800dcaed16ef24354f95a5e39995aeeeba3ca4a82158a7752e1cfd61fb6e39c301d9156b94e021ec0794463d1f90
 DIST boto3-1.26.92.gh.tar.gz 617090 BLAKE2B ce559b42c3d1e0d0d79444d7c86e9b6451c9419625bc54ffe816c662df886169e086f2389acfa3e9c634c292eda186758e14df492deb06d09e077e750c350150 SHA512 8ec2b0f5d9b605d9e62ccaad442b6caeef6d0ba1f8b65e5276c96d9624e14e934391cce83619f68dc57c8c46b41d187521fe30aae19b6159dc69888a26ead10f
+DIST boto3-1.26.93.gh.tar.gz 617542 BLAKE2B 08f045cdac7c977d9a575ca7f487314baf6f358e82b13ff3a2063d85ed23aa98c38445d444ce78730b01381fe04eb5bd5909868a5e01a529d2028c065294714b SHA512 9af0dad9189030bbd310b634af80b731799166d89c561d640308ae913c1f81f0ce50e1a0c303bff974006281be03125e454495936cca30db3cf33a4d95d66783
 EBUILD boto3-1.26.74.ebuild 1580 BLAKE2B 6c2b0aa540898e7461c165b8cb755ceec1cf0b94ba8cf4e2183bcd3a7a242b1e78f4c9a61bcb0c01230f625735a59ce3cd437098b19620d87c76fa022327af45 SHA512 f792df64912dbb7af89eac9c95518624a26c37387e16b96f46db928912c01ce20503cf8f9685de1b314ca7120e353c5fb26c900962f8c05e2c275b3bcd297555
 EBUILD boto3-1.26.79.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-1.26.84.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
@@ -20,5 +21,6 @@ EBUILD boto3-1.26.89.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef
 EBUILD boto3-1.26.90.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-1.26.91.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-1.26.92.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
+EBUILD boto3-1.26.93.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-9999.ebuild 1586 BLAKE2B 44b7d2804e4a484ed5fb864ca2c60348f4e4eb2265c1ba946adf27b31052dd9041f148c1ec935af0bdcabc66109ad3b479dac167613c679a2d9e42f689182734 SHA512 bf11d1114aaff8762b6162a7ba94223e2eb180868e8395aafd1f466c48683514a3ae755baac40d7e0e1afb26ab49e14d30f39266382661b01e8f7ec53d71f145
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.93.ebuild b/dev-python/boto3/boto3-1.26.93.ebuild
new file mode 100644
index 000000000000..9523f65d5fb9
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.93.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{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_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+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 81f076e75001..900e6f14cd9b 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -9,6 +9,7 @@ DIST botocore-1.29.89.gh.tar.gz 11227280 BLAKE2B 41a1243972e591ea23fb2eebaa5b5fb
 DIST botocore-1.29.90.gh.tar.gz 11234660 BLAKE2B 9472b843e9a36b59ffb8171a5148d07736690fef62a88a1853011b0fc6cfabe8588ea1e48b66696f1f9a5ade17c53261349249d20b704d91c1b8e0aac3528b12 SHA512 cdf20dbdac7146f2fb19ac8adce2d4b6605241cbfcbf15b5df7d7b8ccf1cf95f04e683de8bfc71322f2bdc467a15ada3502b19c43f0e5d1bd5c1a07996a1e731
 DIST botocore-1.29.91.gh.tar.gz 11238226 BLAKE2B b2bf854f37cc05f1c3bd873691bc0968f7bd2d7374479ce8b72ecbf168a7ba503b8e871212a8dd802e52a28f4913d70f2bfc42c19ebeff838466d7d5702640db SHA512 a1108a45f262716b955c7674e5098324727bcd17b130deed6cb7c88451a92f302272c55c767e7c1c6947be8f77eccece3eccc2ffb7d9da2f6649e21e87d9e5c6
 DIST botocore-1.29.92.gh.tar.gz 11238265 BLAKE2B 42afd2517fe251ba5d7f0d948fb7892d90809cc289681f47bceab76b6a29b10425e7e7967e9c2b267166f6cae949dfd3f4ac98824b843ea23d37fd6ff6f363ca SHA512 eb8b7e6daa759fecf387b3ca04acb43aa11fb3a614edaed4d4e55361d2270220bb3c30f06fdc736a3ee57c52cf07afb97471221ab2a2c9205c3033969b7673a6
+DIST botocore-1.29.93.gh.tar.gz 11239506 BLAKE2B 7a05d5c611cbeda21e62abbbe13ab18cceae2d8b28136fc8669b09e3ebdcad5e5e352b32e807af7f2f038b6d045f82cf1a9cb3ec854f37db1f3204725fd8971e SHA512 df4ba05c28323321eae25412b97eb9f48978563aad5a0c166515bac3193b0404ebe111565be3b1e42ea47439f749e339ce11cc21736d5403ffbbe689f6fd8da8
 EBUILD botocore-1.29.74.ebuild 1899 BLAKE2B 94938a1edb8da9279816e2302442deef5adc1edef43deb21369c8dfc62c569eb34d4198cf55dc6acdad0c718eba5ddce0040b6f269e866e6eff95bc36fd41be3 SHA512 a0d875a4dec85116eaae0a20182832dedeb84e6a8946093473b99a1746ed5ff8b49ef7e7a4ad5b70afdfbb1098fabc5ddbbc40b895c2b7e0559e3d10cd02e0bd
 EBUILD botocore-1.29.79.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-1.29.84.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
@@ -20,5 +21,6 @@ EBUILD botocore-1.29.89.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d1388
 EBUILD botocore-1.29.90.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-1.29.91.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-1.29.92.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
+EBUILD botocore-1.29.93.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-9999.ebuild 1808 BLAKE2B c88307d04e9daf86db23c54e39fb14931a6e60ab83593db191859652e67c90cfac45263f60c0211f81bfa10fe755b9023924713f2855324c929322d557b4ec17 SHA512 16e3144cef752302fa7ad350f5bb86301d41c0223f9ea41ed784083f2475d48efae095d82da95f93f77fadc86dea96b6aad1f1bce96bd926be01ef2d519fe230
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.93.ebuild b/dev-python/botocore/botocore-1.29.93.ebuild
new file mode 100644
index 000000000000..0f4daaa48e81
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.93.ebuild
@@ -0,0 +1,74 @@
+# 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_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+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/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 5ee900b3d4b5..6aea38021410 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -3,9 +3,11 @@ DIST cfn-lint-0.74.0.gh.tar.gz 3633749 BLAKE2B 68ba32c66a6cc4ddf1260523679565e70
 DIST cfn-lint-0.74.1.gh.tar.gz 3465800 BLAKE2B eb142f07f8a49fe52d7263ecbd359f6c31d89b8895ce97a816dfe2fd14fec4f82a8da708e0ed43734ae8c5184ba718da32dd517dae3068aac7ee8deeff230fbb SHA512 5b792919553292f40018d968bdb5049e07d95f7ee9e40dded439ed6ef3ab778b64d3b964d075e60c7b513f221e0e5b49fa0daa3a20135b765cdbfe3c495d2fc2
 DIST cfn-lint-0.74.2.gh.tar.gz 3455745 BLAKE2B 0ca6f9d6e13264180ae2948858acdc3deab0135bfa7ddd16711b49cf7cce651257c7ba26ae155bec091d69aecc33903bd4098f23207aec5d7d414b5b826c7ccf SHA512 9aa918232214f5f0e165bcf8b4e3e7c5aaad1703825befc5347000f7ad143630220fdf9369015d449be4abf593380510b405d04dfe27d6615602c4a725b06681
 DIST cfn-lint-0.74.3.gh.tar.gz 3456672 BLAKE2B 9cc68ddefda86ee26e900989e40c7ded067fecb35cf077d559ebcacd6838378028010630e340dd52f04750dcc12094fb800e8e48a4c9e0607645463d3ca55827 SHA512 aad2209fa16f717d20127b2cf47d9aba586b85ccd41caf3ad8a50a6894cc3402d929be4cf9f76530223a3d69d79d843ef0edf802e53984b5c34563cf766f8189
+DIST cfn-lint-0.75.0.gh.tar.gz 3457050 BLAKE2B 440b7e03cfc40bbea6a7a6f55c7bed854e73f4d2a7f7ff05e11dfa88d4824f17f488517cf735bc453076e1d77f13c110183dc44a39ebd539609d7aae2a2553af SHA512 9ee87ccaef5b39abdb14814eec3516ae94e532df53de3d3930540ec9ec474e0291971fa7a4a40ca70fe4b1a943a32c12d867e23ce97c7aa0e585bfe49ec03055
 EBUILD cfn-lint-0.73.2.ebuild 1520 BLAKE2B 9b7d54274c25c75cc8bbf5aca09082480268ff4e7d38c03218114bb60ad22c171687621a384c7cad5b39ede4e5d08b68528bdc0fbb96693216d2e4e057e9aaf2 SHA512 c68e1715af5dd9a6593e27a18787b75bb2ba3b10a55699d534a9d62b14d1169aa255714aee731d8ffe7f14f01c06e3fa80557138f1c9a408bd25f1f5c7fa128f
 EBUILD cfn-lint-0.74.0.ebuild 1522 BLAKE2B 02db0ae567e725776e140495637c85e783550923d1176cd5b80b18ca1f047c299a9818f688f3b14b9ca6962b27a3d82078788b81d18e439017ba12e56894ac32 SHA512 46c65084c8bfcb823aa738406d1008a9acf4a07f28169febe41e0a8b618f2720c59a26cd7ae9bc6d6e648cbb2acf89ce21c5d961ee8ebb628840b55575c7b271
 EBUILD cfn-lint-0.74.1.ebuild 1522 BLAKE2B 9b527ac1f8d5c063dfa69b7b886e4def7b7b6ac1821a1a6f1e1c4803f923d3cad9ef899f01dbeae42d411837387d371b35c37f2d1c8a2d876dd5ce54b3033418 SHA512 420770562e8694d3b5ec7a82a35e36daf585493e9a58b731e682921dd519035dbbc1c807054690f341463972a8edcd07b5ebde5271b4abfb516129d74af71e35
 EBUILD cfn-lint-0.74.2.ebuild 1522 BLAKE2B 9b527ac1f8d5c063dfa69b7b886e4def7b7b6ac1821a1a6f1e1c4803f923d3cad9ef899f01dbeae42d411837387d371b35c37f2d1c8a2d876dd5ce54b3033418 SHA512 420770562e8694d3b5ec7a82a35e36daf585493e9a58b731e682921dd519035dbbc1c807054690f341463972a8edcd07b5ebde5271b4abfb516129d74af71e35
 EBUILD cfn-lint-0.74.3.ebuild 1625 BLAKE2B 22541f210143e50b731ad2234f300f8175a3626288cb0d8358e6d690d81a56eac4c34521c5ea0468e6fef9a95e4c0bbbba1d8792c1e8490c4b787413730088e7 SHA512 4a2d0db8bc62e0041ee27fc776e3a75e7839333ff3c58affd65128a45e615ba2037d8b819972d584f67afcd18a5b85f2c4ff8c46b32676b6db70c81f6cd347ef
+EBUILD cfn-lint-0.75.0.ebuild 1625 BLAKE2B 22541f210143e50b731ad2234f300f8175a3626288cb0d8358e6d690d81a56eac4c34521c5ea0468e6fef9a95e4c0bbbba1d8792c1e8490c4b787413730088e7 SHA512 4a2d0db8bc62e0041ee27fc776e3a75e7839333ff3c58affd65128a45e615ba2037d8b819972d584f67afcd18a5b85f2c4ff8c46b32676b6db70c81f6cd347ef
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.75.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.75.0.ebuild
new file mode 100644
index 000000000000..8354055752aa
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.75.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_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+# pypi sdist is missing tests, as of 0.74.3
+# https://github.com/aws-cloudformation/cfn-lint/pull/2630
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.60.1[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	<dev-python/networkx-4[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	test/unit/module/test_template.py::TestTemplate::test_build_graph
+	# requires git repo
+	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+	# Internet
+	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/citeproc-py/Manifest b/dev-python/citeproc-py/Manifest
index e173c9bf4ef8..50c443c867d3 100644
--- a/dev-python/citeproc-py/Manifest
+++ b/dev-python/citeproc-py/Manifest
@@ -1,5 +1,5 @@
 AUX stop_test_from_accessing_git-0.6.0.patch 432 BLAKE2B c4b4696acf4619eb30ec3423743a0d3db76f4932c67afecca121f289fe2d144f0bf51e1c62847f09d083e741b4a586ca02adea8bde321edfe5ea3156c673d60b SHA512 79308abf6392436ce528e0a9713ee3d7af7345585e68510a7f5ecd8427e8f6c9a7bcebc7787935ae838e089c94a3f8b7cc472af99c735fb5c0f3626501c35f0e
 DIST citeproc-py-0.6.0.tar.gz 140624 BLAKE2B 169129c6be29a5a5c4678ccc2e2dd0b9ef58248ae66339ac32c6fab887058c7bbd2884d2ce959ce52287a622be4abded7e1ab06cae9c0952be47352671f951c4 SHA512 901a62c59189a652b589e4aa12e489f72f5ea40db1349fcdc0e4ffd6f5be8d364dccdc23cfab1a9003fbc672d75c5bdf06c74b9b5e1fcfb2c12e84df39fe1fb1
 DIST citeproc-py-test-suite-c3db429ab7c6b9b9ccaaa6d3c6bb9e503f0d7b11.tar.gz 990340 BLAKE2B acf02bec956765d0bea794a96ce7b86104c98aa4c0f8620dbfaeb7f16f37fe07e5b45883c04a1c639fad9098e3733339c90deaf8cdd794fadb8db1456972d16b SHA512 8653ea8968fa108c0814f43744f6e569a0a32cf4e82addec667f75a28b9c1fd9c7714c0c75a85e0d6f7f579e554494925ba4ab05e21e4dcb6b727d00b6a16df7
-EBUILD citeproc-py-0.6.0.ebuild 1134 BLAKE2B 981192773892e8428c4ab0b47aa4b965318fd372725f3f86c48292818b1a05943e24ca7d0cf5f0a3c7319e0c053da451bf49fd3e825e8cdbea358d28e1452b0c SHA512 ca946e31a33a8846da30889325da1e898dd62bc810178088e17dd3903ed90ae05f610ec396d289d83e9cbbb3713ec5fd38cfee975738caf465b10c1ae8ab25eb
+EBUILD citeproc-py-0.6.0.ebuild 1121 BLAKE2B 7a0647ede5ce76fd146147c843fe0d348b0a8c6fc53d0c9898274b1a8942150cbc297e92bcee58280783f217a93b716e7bc9e87fd2b6e9a2418e7d146bd7cf8f SHA512 2b6c315006c6be49d57b926bac4677c70f023d63516641840844d87c8f3c3d4c818d612cd0e8806676a9e4afc5bf7a53ea4f732f1644e4959c10e6aeaf7d4ef3
 MISC metadata.xml 382 BLAKE2B 2d84f4b9844043338b0eb9f737dfef0495445b91a66d4b4aed910e87d7742ff5889dcf55fb0beed2f09042ed44415f4587e34a011ce7e4ad424079da3a74fd4f SHA512 de145eb60b314cd6f502b9f9115b5b034f3b72f0d3209c8e368ffcff0f4105ce4a88511d6599d6472092761d6800508a911a0765937aeb9b8782b1621d9488e6
diff --git a/dev-python/citeproc-py/citeproc-py-0.6.0.ebuild b/dev-python/citeproc-py/citeproc-py-0.6.0.ebuild
index fc213ba3c5d8..b3938812ea05 100644
--- a/dev-python/citeproc-py/citeproc-py-0.6.0.ebuild
+++ b/dev-python/citeproc-py/citeproc-py-0.6.0.ebuild
@@ -3,20 +3,22 @@
 
 EAPI=8
 
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..10} )
 
 # Keep synced with tests/citeproc-test.py
 TEST_SUITE_COMMIT="c3db429ab7c6b9b9ccaaa6d3c6bb9e503f0d7b11"
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Yet another Python CSL Processor"
 HOMEPAGE="https://pypi.org/project/citeproc-py/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+SRC_URI+="
 	test? (
-		https://github.com/citation-style-language/test-suite/archive/${TEST_SUITE_COMMIT}.tar.gz -> ${PN}-test-suite-${TEST_SUITE_COMMIT}.tar.gz
-	)"
+		https://github.com/citation-style-language/test-suite/archive/${TEST_SUITE_COMMIT}.tar.gz
+			-> ${PN}-test-suite-${TEST_SUITE_COMMIT}.tar.gz
+	)
+"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 1123415c4b3e..3d473ee3e4df 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,5 +1,7 @@
 DIST coverage-7.1.0.tar.gz 809785 BLAKE2B 3720aee79ecfdd6aa652b5198bad4d6b5827a85f1d58986eec51bab1e72800dac28eb0ebbeb15d547ef03694ca1397bec47c37a9233dc34b2d3d2a6a22a48274 SHA512 80920b337391e47f1e631ba8a892792b6d2c72e753ddf403222c6ad527637699889f29cfee40721949e5eeb6e7977f319635c44d79f58e7e19676d1165dfdde2
 DIST coverage-7.2.1.tar.gz 812219 BLAKE2B bb6b482990b0620d7e264244a9e31ee44b37fe83436c1d7d016d20e36d9ecbea85a614a4142683757bb1284bfbe2a157fc4748b01c76b5495c5eca5834e9a848 SHA512 40a7f1d25c7100b8f2f4ba1f877c241f65e1f560cdad861dab05254a4e177de37615888441d47a6c2ebc525ad2b52b476da7111efe5583708f094dd3a1b39984
+DIST coverage-7.2.2.tar.gz 812407 BLAKE2B 901ed01eb8411e01c3386dcecccf975f4ac0e46c14fd2c6086bcf83647ff7e26deccb3926f173a207ef2851c0f8c5f99874659a1ba2e16f85b6eb9a1ac23142c SHA512 7d2ba6540ca42c3a72b65343348a64c58156bac915434249fd8740a6727ebf034590f62a5557f6b2f76e67ed1adc2a153ce61eee71f3bc903538c440e080e3e7
 EBUILD coverage-7.1.0.ebuild 1879 BLAKE2B b23b76f71ed197fada5e15ea5987f5e352f016ef1744e664b76acf52b9424721d0ef30291ded16faf1bb41b19011edd3649210ff383579eae9baeeaa263fbdb8 SHA512 0c80cc5065ed1b2d1881a522bfc9690ecf86b3c2121cb5bd0307a78341b7974fdd737d576f2aac98488ae7c67641a255c3017f5ed655867101be28a07e78c6e8
 EBUILD coverage-7.2.1.ebuild 1840 BLAKE2B f07c3f549bed3742ea7e32db73a74937a58721a70602d437089b523134e4174cb65d52f3e6261aa531d55271da979422933e358b96208ef36786773998ed4966 SHA512 f6656da1a9bf31d979174c8e69afdea17fe1eb545809829943037b778999f82dc5a2bac23f81977b230e3430111c79aec2324577bdd494f788388b0330670157
+EBUILD coverage-7.2.2.ebuild 1840 BLAKE2B f07c3f549bed3742ea7e32db73a74937a58721a70602d437089b523134e4174cb65d52f3e6261aa531d55271da979422933e358b96208ef36786773998ed4966 SHA512 f6656da1a9bf31d979174c8e69afdea17fe1eb545809829943037b778999f82dc5a2bac23f81977b230e3430111c79aec2324577bdd494f788388b0330670157
 MISC metadata.xml 771 BLAKE2B 38e9680d0851f70050aad987714a9dd2f95178b0bc3d794dc08726c0618d1ea98be32a413ac397f4b222e8a5d8fdc747b7f1677bcfe842bac4080537e85a03a9 SHA512 8c44c40348fe5d416d8b4016fe22cc9ae0b94fbaf181deb79aa737f87271992521b710c1208d0eeb7ef92d96fc8a7daac1ec6feb1ae081a80f13327b5b094064
diff --git a/dev-python/coverage/coverage-7.2.2.ebuild b/dev-python/coverage/coverage-7.2.2.ebuild
new file mode 100644
index 000000000000..b83e4bdd6609
--- /dev/null
+++ b/dev-python/coverage/coverage-7.2.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="
+	https://coverage.readthedocs.io/en/latest/
+	https://github.com/nedbat/coveragepy/
+	https://pypi.org/project/coverage/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{8..10})
+"
+BDEPEND="
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/^addopts/s:-q -n auto::' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+test_tracer() {
+	local -x COVERAGE_TEST_TRACER=${1}
+	einfo "  Testing with the ${COVERAGE_TEST_TRACER} tracer ..."
+	epytest tests
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# pip these days insists on fetching build deps from Internet
+		tests/test_venv.py
+	)
+
+	"${EPYTHON}" igor.py zip_mods || die
+
+	local -x COVERAGE_TESTING=True
+	# TODO: figure out why they can't be imported inside test env
+	local -x COVERAGE_NO_CONTRACTS=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=_hypothesis_pytestplugin,flaky.flaky_pytest_plugin,xdist.plugin
+
+	local prev_opt=$(shopt -p nullglob)
+	shopt -s nullglob
+	local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
+	${prev_opt}
+
+	if [[ -n ${c_ext} ]]; then
+		cp "${c_ext}" \
+			coverage/ || die
+		test_tracer c
+		rm coverage/*.so || die
+	else
+		test_tracer py
+	fi
+}
diff --git a/dev-python/dbfread/Manifest b/dev-python/dbfread/Manifest
index 4e9bd227137b..ecc64d68f44a 100644
--- a/dev-python/dbfread/Manifest
+++ b/dev-python/dbfread/Manifest
@@ -1,4 +1,4 @@
 DIST dbfread-2.0.7-src.tar.gz 33045 BLAKE2B 96798f00aba4c30e7e83b468f368ca6730a7e095c9fec5bf5515ac6a152022adbf5339cd9e68e85f4eccac211ed4e307b9abf22249ef6420d722fa213210d7d7 SHA512 cf591fa5800e5471025175a4bbbb54cb26dc2a83bf328776e4386860370d9421edd9edd62cb9e3d463794d526c561a0f4744bb67b5e376edd471dc95100bc2c7
 DIST dbfread-2.0.7.tar.gz 33212 BLAKE2B 03c9a0d93b13c7573b5bcec6c5af1ac43bd00ead2b3e83638f45344b2344062e86d764b095e699afdaea2405176ee15122c975a2f72b25bd167f5faaaf33043b SHA512 86c3a29e351b985984be67401a6dfe3e39cd92451a122788ade83d65313dde37a3706ce36c4365bd36ba1df62ee057b625f1e0f077aa4a248c7456258189f548
-EBUILD dbfread-2.0.7-r1.ebuild 766 BLAKE2B 78978138a2f41de5b09ee8c800e5b087dda0b21642b6963fead447d5bdc1589b20f50e3690334585ecd19d2a08e89e1cdadbc6730021adb2ae28dea5c4f67120 SHA512 ca98906dd23adac683b54ffccbef6f287bac0feeb2c7481fc3ac84788e702f3fac68f04de5cb1fedb2efc87db8fbcdc0946935cd18ab9965c57217cf92bac34c
+EBUILD dbfread-2.0.7-r1.ebuild 738 BLAKE2B 550e2cd123981d15e09d82dd04681ad3a3f736d5223e812a218a1753a92702e44fc92763dfafd2dbe1decea966e0de6043f734deef9261e7533c13d95708618e SHA512 51e77df7222ea282f3136e2ba8e75ba01d957ea3a1b8ecd5f05c89718255e5dfaff136bdfd9ebb0c56066eb61da635f01fee1ce5fe9b25059deec87287f1727a
 MISC metadata.xml 476 BLAKE2B c296f538a4e52849b37574df1131e638ce48fc1b61b1af7d00e8988a786359642bfb49c471c9c47dbcc9b2239865827dba5316e89bb0fbfd3a0adb5d40812b27 SHA512 92c85633ee6274ae0a5e36b2a90deac20d56b2e49a4e1bcec016a079d6b21f4b9b8c9dfc2fdad9809703de126384023fcf547da8f64894b2205c45a139588181
diff --git a/dev-python/dbfread/dbfread-2.0.7-r1.ebuild b/dev-python/dbfread/dbfread-2.0.7-r1.ebuild
index 0239c3505ed4..0bd2f60bfd50 100644
--- a/dev-python/dbfread/dbfread-2.0.7-r1.ebuild
+++ b/dev-python/dbfread/dbfread-2.0.7-r1.ebuild
@@ -6,12 +6,16 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Read DBF Files with Python"
 HOMEPAGE="https://github.com/olemb/dbfread https://pypi.org/project/dbfread/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	test? ( https://github.com/olemb/dbfread/archive/refs/tags/${PV}.tar.gz -> ${P}-src.tar.gz )"
+SRC_URI+="
+	test? (
+		https://github.com/olemb/dbfread/archive/refs/tags/${PV}.tar.gz
+			-> ${P}-src.tar.gz
+	)
+"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/enzyme/Manifest b/dev-python/enzyme/Manifest
index 08d2fe18b109..6e65bb68c2e5 100644
--- a/dev-python/enzyme/Manifest
+++ b/dev-python/enzyme/Manifest
@@ -1,4 +1,4 @@
 DIST enzyme-0.4.1.tar.gz 47953 BLAKE2B e81faf1c0b3316511706c2a31f56cdc2230fbce468017134692f1892439c4aa043c5537b78fd267b83d84a1811e2c015aa37d724813da5864f14ae04a9fd961a SHA512 62a85c076a7eb320249a507dcc9dd26572e3a9b9643e0a960ed114a80c75213e6e5028a726fbcdd0c2c46c53af980a69828a54a66af9a17af3210273376395b3
 DIST matroska_test_w1_1.zip 184550509 BLAKE2B f111725aa08267661942072c2d4ac019d3d322c4e933aad10afb3aa6f69bb3469114c4400d161e53d8a7618b818b22465177460003804a7ac3e69fa4f4db000d SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f
-EBUILD enzyme-0.4.1-r3.ebuild 988 BLAKE2B 21d3fd9de87edfefb6c63622bb0bafaf5ff1ca4e84b89445cf2bc645c666fddce5d1bed9970f9a23f54e10354d4dde4265b15b77f91b215ea470b87951c53ba9 SHA512 fdc68cfa54e30d16eb5e88d082f263614d0edb9b6aa74962b6a81a80a9282cb07d166ff40889b75fe91a114577d238451a718bb04693e3ecd4ef4542813101ff
+EBUILD enzyme-0.4.1-r3.ebuild 951 BLAKE2B d860f46e91380aeee0f69f4b26acaa4431f72645325ceaee2185838162ab60f31120b8dfb0c61afb64e41ed53823b0751f4c19028168086d5b5383ffed496e8b SHA512 fe093973239eb351cbc3e5252e38e5bba96886fda2ae7503591f74f95645a6066cf16bb7a171bb11b721ab5117d1e26f6fda4b1ae1a3835c0f569c355b73d70f
 MISC metadata.xml 367 BLAKE2B 4b9abc5ee78a58063b098996c637fe06c986298c01db8b868deaa3d6c3bbeac182818fb195897fa20498d3b362d3e9f5dbe5257724d75db596eb7c8cff4112a4 SHA512 468c7f140ed1f8a8d26ff9c2d30ce7715e31934486be010de6b8065f4bf9b2f43d4c563ee4130dc9b94d39b28ebb1a1f4a168d66c918661308be209652c2aade
diff --git a/dev-python/enzyme/enzyme-0.4.1-r3.ebuild b/dev-python/enzyme/enzyme-0.4.1-r3.ebuild
index 2f63adf040e5..532cb307588f 100644
--- a/dev-python/enzyme/enzyme-0.4.1-r3.ebuild
+++ b/dev-python/enzyme/enzyme-0.4.1-r3.ebuild
@@ -7,12 +7,11 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE='xml(+)'
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python video metadata parser"
 HOMEPAGE="https://github.com/Diaoul/enzyme https://pypi.org/project/enzyme/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+SRC_URI+="
 	test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
 "
 
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 1644bd49d550..47f8d9d87118 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,5 +1,7 @@
 DIST fonttools-4.38.0.gh.tar.gz 3603281 BLAKE2B 8ec558c35cc10b32760eb199dce7c40934210db9ba8c9b0ad7a8cd2ca206260d2d73769bd1ff4cb597dd46cd50a42d733c967199120366e22abc5ee2b81e0919 SHA512 438694e7a4c19ee63ab504763793c0219d96fdc58095fe55a4f44726e96a3ec8ae63066aa47a341a059c7a2c9893b9bbbdfc8ab4d75c177cbd90986debc31431
 DIST fonttools-4.39.0.gh.tar.gz 3673934 BLAKE2B 468f8798b06593f69b4130f06d52134b9c86a414ba534a352e15bb16d787e11a6b692d406e545aa137d5d132aa33684f44e98a520ce13fe6c8e4dcf81fc64e69 SHA512 f9613651082ae8fb0dd3fba66549f90001d8cb3c71785f9e5b692513984d26d63d027dfb67e1dbe1a22c6e8c393e6ed21af1bfcd5b2f766c8534577cbd211616
+DIST fonttools-4.39.2.gh.tar.gz 3694973 BLAKE2B 1a752fe62f5f2e1092e8df8f16a6a9cbb0a6f121bab1d910a2db9bc8a404f749d746aa85b82fd51d3fc1e0aa225b0515d0c3a7d0d25860a7d09afdab8c878c0e SHA512 27d892e2949355ed7762ad969e9fcb950029a82e63cba10e99b5dfc209ab055b46942de740d0ec1dda6bb2461f64565d6a4678c4d89a4d4fe3f37221a863d69e
 EBUILD fonttools-4.38.0.ebuild 1554 BLAKE2B f471c0c66b420bdb147bbaf8b33d3df00b4773c7b585503e44350f03c1dc6439c5572146f39869dce51d53148cc65218384a1fbd28855066c6e13bbaedb27782 SHA512 8e202db0ae5e85e34469f59b601628089cc296c244b2ed5ebdddc48b2df2c5a586e57b387fbf5c073b220c751b083058d7560c3516153bdf6765392a13cdca72
 EBUILD fonttools-4.39.0.ebuild 1562 BLAKE2B 32d0c71bb8690ec85453b61098663eac1c855cf8e18be7611641ab7c5389b1f03885affd309e1bd79d62ed18367845ae40e348160394f9df1ef92acd71a6dd58 SHA512 91c717e491081d557634e2d62be7b31b038c49203350fb055cff72d921425f5f17b2927e2c175a33b9629526c4707c687748654f8b63b20aa9e8e77136b4f0a3
+EBUILD fonttools-4.39.2.ebuild 1562 BLAKE2B 32d0c71bb8690ec85453b61098663eac1c855cf8e18be7611641ab7c5389b1f03885affd309e1bd79d62ed18367845ae40e348160394f9df1ef92acd71a6dd58 SHA512 91c717e491081d557634e2d62be7b31b038c49203350fb055cff72d921425f5f17b2927e2c175a33b9629526c4707c687748654f8b63b20aa9e8e77136b4f0a3
 MISC metadata.xml 372 BLAKE2B 950ec78bf127250847c6513c22a5108b251afdb000d361068edf9d00d64a5baf6925ba4058bb889724febb28d92abc044c29af5936a48d8e8951b12314b64357 SHA512 03e76e28959bab83fe41c3ee4b55692ced9b1360e73e38a6e8f6e5c06fd1185dcbe0214aea2edff18d248abf252c1877d0d2c2b78b8e088e606c09c34e93e7ac
diff --git a/dev-python/fonttools/fonttools-4.39.2.ebuild b/dev-python/fonttools/fonttools-4.39.2.ebuild
new file mode 100644
index 000000000000..8ca55aca7585
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.39.2.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_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="
+	https://github.com/fonttools/fonttools/
+	https://pypi.org/project/fonttools/
+"
+SRC_URI="
+	https://github.com/fonttools/fonttools/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	export FONTTOOLS_WITH_CYTHON=1
+}
+
+src_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	epytest Tests fontTools || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index e98564fc2f21..720d6a585c27 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -1,3 +1,5 @@
 DIST httpcore-0.16.3.gh.tar.gz 79132 BLAKE2B c06d55ce1390085db6c15d3e96160cfb037a935d1298304856defd1778783ad1954924a48653ce165dae9cde18abec157aa72865f57e97d91a564d1b823c863c SHA512 d889da0a3fee4f190ecc3981b8af34fa9b285d00f4ad92158a085c65f3ad8fa5a97a8c711bd51f8b9518b9d2c90ecd457dee1a3d7bbf853715473f4707cc421a
+DIST httpcore-0.17.0.gh.tar.gz 82103 BLAKE2B a12d2843cd19f98d86868802fbb5af37f7223e6cbdb64ec4a36bda93237543d940cc7e71647ffbee67de57b46900a9496f2d3019d9bf0ac4cb74f5d13232708d SHA512 4bec9830df75b35a470e745955058e86cb4cc59c0eacef8d67d76be91c9297009f9af2bf745bf553607a60ff5fd2eaee5b8a497bb8b48ba3daffa08e80188ef4
 EBUILD httpcore-0.16.3.ebuild 1167 BLAKE2B dd75bce8acf054670193fa690ea907bde019f17b47b9453cdc915157cce23e2e5f2216ebf9a2c1d97bfacfadc60c8fe4e3917380d48de52f2b4498d0823aa163 SHA512 e57084ca2901ae4dcba6ad4f11bcd9ad7071e7dfab3bc4398d493a8c34a45b298f02d26f916197262a1af5ed4fa5ee58531d6295cbfb0a880c67a30bb2c4bd3e
+EBUILD httpcore-0.17.0.ebuild 1175 BLAKE2B ce5f56f450d1fbfecdc4f1c0e719887372d9aae192344feae54b0e272c27af8bf5682a1dbce2041c5744593ed8574f168c58dbb443df9fbfc4f5981aab525a31 SHA512 09cfeec359819b178c64e902d7ba1d4e9c0c592eb7cb833f0eb5660df3aa1f4cfe7544e9b09a655f7dccaa48359057428876cd17e2824cb53ee27d1dda290042
 MISC metadata.xml 454 BLAKE2B f8a48d9ab81e5f74623dd0c8490e5de5cc711fda7f4614932e7ac6caa80bd23436037ddf9327d6bddc3d39c8b601b4ee74a85c0a10bacb20514cbf8278e34d1f SHA512 af962141bd55f51b27e0d4b61bcf7d5426e816df4f8c65be257d8fddd597664afe04e78ebe7e11caaebf06ae4fe17b88f568dc440403865ba6b8e3b47d796aa6
diff --git a/dev-python/httpcore/httpcore-0.17.0.ebuild b/dev-python/httpcore/httpcore-0.17.0.ebuild
new file mode 100644
index 000000000000..f5a9e34828ce
--- /dev/null
+++ b/dev-python/httpcore/httpcore-0.17.0.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=setuptools
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="A minimal low-level HTTP client"
+HOMEPAGE="
+	https://www.encode.io/httpcore/
+	https://github.com/encode/httpcore/
+	https://pypi.org/project/httpcore/
+"
+SRC_URI="
+	https://github.com/encode/httpcore/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	<dev-python/anyio-5[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	<dev-python/h11-0.15[${PYTHON_USEDEP}]
+	<dev-python/h2-5[${PYTHON_USEDEP}]
+	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-trio[${PYTHON_USEDEP}]
+		dev-python/socksio[${PYTHON_USEDEP}]
+		dev-python/trio[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "SOCKS support" dev-python/socksio
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 11011d64f17c..8b0ed2bafc6b 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -2,8 +2,10 @@ DIST hypothesis-6.68.0.gh.tar.gz 9350032 BLAKE2B c122455b7f941eaba8b37b7c4bd4760
 DIST hypothesis-6.68.1.gh.tar.gz 9350091 BLAKE2B 5d6d6912b20d3badca440b668838f456239653c393d8f148ba5dd16227e078586167f0d7ff0adbdca0efe2a81ff27e0307d97b63492658dc28c9abd7c7691551 SHA512 6dbaefa411f7945081158b7d730dc1893dfe02ec4b45f7bdd645f6f2198d39b3f4313d1e18dbe9a82d13e36df5bc541f1b31539128f9de5480b82b916bd74c0c
 DIST hypothesis-6.68.2.gh.tar.gz 9350253 BLAKE2B 5f98aac845a2f4e1dd9f54809d3e7e1b201bdecdec1c5c9cff10a37851af7d8d9e8cb643c1a9b0545672862b3639a17aed5f4197653d48d3114edd0105668307 SHA512 c3507f99376af924e375c51e0d56d4e444204d2ebe147d813a3f33a69594f83493c499714567b127556ea620df7bde58f4a1ba662bb182907e5e0d14cf13ee81
 DIST hypothesis-6.69.0.gh.tar.gz 9350681 BLAKE2B e28bca5be08809d7f10723186957ab72a650d93403fc0c5ed91b329ca3c68b084a69aba093e8dc7fdc742316287dc585b7b8794403e0b3fa29adfc7bf2d76ee7 SHA512 b6a263a10f78841706f6fa58a237f2f1e7ef5efd4d859e0fb79bae0ad3eff86774bc0cb7bb581af89605f80514a08386b5f501a6154bcc5ae1f56e7eb2ba61b4
+DIST hypothesis-6.70.0.gh.tar.gz 9351669 BLAKE2B 04e6739a1e6cf5907486c5fc6e09d17996831fe7967df4a24e6fb3c3ab992ef0c1ade9f250a1776eed4d6880893db1e8f284df60465a81a9f14f4aa64b0b0fc9 SHA512 6fb15addd86f8737b5a99a5c4ae5f2899133772e25426cc8a9bd086ddc0246b8fd323a10213df45d5b13c0740df19597a2b7ee7566611d5d01e6897954ac0f4c
 EBUILD hypothesis-6.68.0.ebuild 2132 BLAKE2B be04a23a6cc71d17c7585c98d1df3e8bf9a32c84897a5328fba61561c756d8bbcbfdcf778debfa99d3555f430f697720a1bcf083e3422d55116f5649e901ae44 SHA512 61d1b1390b920c328bbafd1b80c7f1c934f5483972bfaba692ed95cd5478bbaa62bc65438665037b6bc10b0050477c02597f2fdc9536963d6769f23cdcd5f721
 EBUILD hypothesis-6.68.1.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 EBUILD hypothesis-6.68.2.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 EBUILD hypothesis-6.69.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
+EBUILD hypothesis-6.70.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
diff --git a/dev-python/hypothesis/hypothesis-6.70.0.ebuild b/dev-python/hypothesis/hypothesis-6.70.0.ebuild
new file mode 100644
index 000000000000..c793a8a143d2
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.70.0.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
+CLI_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index 85f90ba5caf7..cc68e197ec85 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -2,8 +2,10 @@ DIST identify-2.5.17.gh.tar.gz 101448 BLAKE2B d9319bbbe67f8c2c7a0ed8b7db8efc64f7
 DIST identify-2.5.18.gh.tar.gz 101457 BLAKE2B 4575b4084dc28678275704f44a02d171d79a02f015e6d2267545b18c4288b55609cc64af2f9eca866bc2d164ed534cac59d69915e23fd3100cb680fcb08ceae0 SHA512 c7c6998340b77ddb13c88df8dbcc9b72efb68bf3cbf8a7ab2b81a4bda1180d04d4bdd9db360b7203235e2ebd252852de2c806b73e6a7236786bffbd3f4d4a672
 DIST identify-2.5.19.gh.tar.gz 101475 BLAKE2B 12302ccfaeebd38cca84a530775e5acb2a6b9ef8a741a8d924c09a15f0d410058354e3725df31683a8d20f01767fe78745f60efba6f553b728bce089b463a9d5 SHA512 d188080a83cb26c45108d676dd47498c2a10caa4af02cae3c11950ebd3c1c9478c5e730b68d6a02297c6e563dbb9df41dd324627c6e5f28f60b337e439f7e3c7
 DIST identify-2.5.20.gh.tar.gz 101473 BLAKE2B eaf6994d7b2f8e0449b84fcb6eca14210b3a123ad48709cf9e7bc9557b116dc9fbb5103566b60bfda1a19f6428b8432b2ad6099c471b1f86b898d46dc2c0b4f1 SHA512 00905b2937766c3885b9a604cc55e6201ffcea486cfd553217659652d97632ed11cd12512ecbe2ddd3394e836fbab5ec439a55257dcccd6ed3a2f148df5ca92b
+DIST identify-2.5.21.gh.tar.gz 101486 BLAKE2B 9c70c401d37afa8689d39bc4df38ca2006ecb2f78d427c0e213319074c5d0ec8a3865fafcde70ab903e641ada100ef4207196fea78bda9e60f3aa8c9e345c30d SHA512 6760eb53e99e52f51d24499b240450e0f1d8e4faf0190a6c7768246bc2ec527bfd0b081113058be4ad7646212f8b4043479e83edf6021d36d483f3af672a4010
 EBUILD identify-2.5.17.ebuild 588 BLAKE2B 9c287b22e56d3d592e12009f8f200ef5771765d70f403323aa9ca54480f9d64fd16acafca460c7e30faf84409c105302d825fe0dcd66cc573a5c9ae877ee2038 SHA512 1458fffe14402c083921244f208ad0b8b5b168b96554a5ff33ac60c248307581bfa1df5e05ced73bb677d6d96279ef948d1e9b50d761e3d4e8c95d165091f4b6
 EBUILD identify-2.5.18.ebuild 590 BLAKE2B a3479081b0216a2dfa2f63275db0f7298fb3494dba0d460a01ec3ce36178ad6171f86a104ec7c1db018b7c858f5f9743b1d418007a313934330234c97aeb0d5b SHA512 d53d3e06b9d4c509c8c9f16aaead348b09c744c5f1d81cdfa565c32e7e011bd7bb25e937187f6266a7dd21f554137f7a4bd24190623071b8b2b9e05f385bd1d4
 EBUILD identify-2.5.19.ebuild 590 BLAKE2B a3479081b0216a2dfa2f63275db0f7298fb3494dba0d460a01ec3ce36178ad6171f86a104ec7c1db018b7c858f5f9743b1d418007a313934330234c97aeb0d5b SHA512 d53d3e06b9d4c509c8c9f16aaead348b09c744c5f1d81cdfa565c32e7e011bd7bb25e937187f6266a7dd21f554137f7a4bd24190623071b8b2b9e05f385bd1d4
 EBUILD identify-2.5.20.ebuild 590 BLAKE2B a3479081b0216a2dfa2f63275db0f7298fb3494dba0d460a01ec3ce36178ad6171f86a104ec7c1db018b7c858f5f9743b1d418007a313934330234c97aeb0d5b SHA512 d53d3e06b9d4c509c8c9f16aaead348b09c744c5f1d81cdfa565c32e7e011bd7bb25e937187f6266a7dd21f554137f7a4bd24190623071b8b2b9e05f385bd1d4
+EBUILD identify-2.5.21.ebuild 590 BLAKE2B a3479081b0216a2dfa2f63275db0f7298fb3494dba0d460a01ec3ce36178ad6171f86a104ec7c1db018b7c858f5f9743b1d418007a313934330234c97aeb0d5b SHA512 d53d3e06b9d4c509c8c9f16aaead348b09c744c5f1d81cdfa565c32e7e011bd7bb25e937187f6266a7dd21f554137f7a4bd24190623071b8b2b9e05f385bd1d4
 MISC metadata.xml 501 BLAKE2B da95534590927f7290f78f47e30484e3349c9058048c15522e7346a74d9a2c96141a18897b10b230adf966d3c237217ef1d2dcfe59814ccfffd58ab4c38c1ebf SHA512 8d78245bbd2e14016eb70f1d8f8d6129e6b265084f7da95bd915f01ce5af94f86bd69c33c1514195de70d0f834332d9ca968a18afb59a7016c8cb58681d04d24
diff --git a/dev-python/identify/identify-2.5.21.ebuild b/dev-python/identify/identify-2.5.21.ebuild
new file mode 100644
index 000000000000..a0d521fdd551
--- /dev/null
+++ b/dev-python/identify/identify-2.5.21.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=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="File identification library for Python"
+HOMEPAGE="
+	https://github.com/pre-commit/identify/
+	https://pypi.org/project/identify/
+"
+SRC_URI="
+	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/ukkonen[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
index 57f31edcc78d..bf70e9174aac 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -1,5 +1,5 @@
 AUX ipyparallel-7.1.0-test-timeouts.patch 2067 BLAKE2B 577b33b730f110775dbd61fe02d06834fe3c4eb3c730d6df16730bbc877402e9f4756b74691bb977c3892ff981d374a4d1b439bf2b682e76c496ce8502f26583 SHA512 2d0f9fb4966be06299b40cd2ad974b4f94cfedea84fcee38b900ce4596b15cd3963068fc374aa1c0e54765b92d68c5233965fd2d3696bba5474da24917d1f009
 AUX ipyparallel-8.3.0-additional-test-timeouts.patch 1707 BLAKE2B c3dc45f6b05fa7abf551d3b8a950e078a42a709a74d8fe8c45b88ab6afb7996f822550eadf46c54da18cb7596e25cc7ffc84b46e033803a665e323273669e0fe SHA512 9b7581e02571e498155a73ac573b8a994ed414f462cfdedc5a96d9d30dbdb7c44f9c1827f86232f2a0dc273f34901a46aa40a8822ebb11a74e0890660f2f77f4
 DIST ipyparallel-8.4.1.tar.gz 6843301 BLAKE2B 1ca0056cfa6827f5eb145584ea634d224119a485f1139964988b07bcd164fe392bb032794098bccdf67b31f74030e62e917c0a451809e0d14fae323308b2b0ab SHA512 640489b3920b91e1b2f83def00a06e8ec45c61bd7ebe33a3e4a30560e2b0acdbe0a98a685d868dd7bce4c65920d378ab69efca75cf0ae7f164ee792c870a297e
-EBUILD ipyparallel-8.4.1.ebuild 2742 BLAKE2B dde2face4f62797b69b6d04b466a367aa2ab2b554e8a60137244ae22577baeb5fcab14c9cc52aa3e3e8ead19e7260512d36bfd7fa962bc65b997e1ba32801f45 SHA512 e328cb6409ec4e477e7704458311203047150914dca941a4af9f8e2eef96ce5da9b9db96b93e01e27943770344e47f06723775dbefabbf1028ae084c2d3509de
+EBUILD ipyparallel-8.4.1.ebuild 2742 BLAKE2B 68fca9dbd99d5b434cf78c84b6aae9d56ff888dc2ba1a257bd71f7e77f1ef5d4121d9177f044fbb04006518e8fe4401b0c74a247a5d352da0490bac81358c2c3 SHA512 8d7803091f00e6c5a6ad16cc241f939132234adac10f698968e0956fb830b828ac1254f67ab2c8865719d875d97fb59b0617a37f54e6783c5d66d216e0348c3e
 MISC metadata.xml 531 BLAKE2B 92dd755dd3036f653f24eda893979487b8d5bbf3c369f3f10c3fc2e69ad6aef03cb6eca295bcb8c6f89f0838780c20132bfd2a33bb38b56b227e97258447c2e0 SHA512 fcd131d18b012d1511468777dd72e07ed28a514419923911082229c0256b9003d9afe2048b6c339cb5c94307026b52bc4e9b6781d45660178d18385d71af8f21
diff --git a/dev-python/ipyparallel/ipyparallel-8.4.1.ebuild b/dev-python/ipyparallel/ipyparallel-8.4.1.ebuild
index f34f5b06a4bd..3edb9fe27d67 100644
--- a/dev-python/ipyparallel/ipyparallel-8.4.1.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-8.4.1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/traitlets-4.3[${PYTHON_USEDEP}]
 	>=dev-python/ipython-4[${PYTHON_USEDEP}]
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/jupyter_server[${PYTHON_USEDEP}]
+	dev-python/jupyter-server[${PYTHON_USEDEP}]
 	>=dev-python/ipykernel-4.4[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jq/Manifest b/dev-python/jq/Manifest
index da48145b0f16..623421748c7b 100644
--- a/dev-python/jq/Manifest
+++ b/dev-python/jq/Manifest
@@ -1,3 +1,5 @@
 DIST jq.py-1.4.0.gh.tar.gz 2648402 BLAKE2B 5efc35fd9ee52e5c1c87ac46d980d1557121eedb14beb5d534987d81a37b05c5c765ef69cecf65141d7c451623d05d378bdcf9a6e48667c07a9f52e7d0317bbf SHA512 8acd9c4094e0e6f5ffd43303432347448e8cb160f2c33250a386afc75eac53134b15142da3f344b0ea3eac4df838ffa322771580a27349299f32a2c525e09555
+DIST jq.py-1.4.1.gh.tar.gz 2648592 BLAKE2B b1413a07ba03f61d3b2e8cfa3f2c646408e24139f76fb9637d23968d953fa78f82b1dd04c355d5a6e6c6761095a4814d8cfd1f012382ca810ad5a44e007c7878 SHA512 03924793e8cab8041b4b2ecb8ef45bafdf31f14b4502170358ddecc027ead7cc17eda37fc04743eeef073e29144d2f7e6c4428e2a92f1bb8aa859100dce4521b
 EBUILD jq-1.4.0.ebuild 747 BLAKE2B fa210bac9cb288cb10aa870efaca27636423ebd1699ee142b4a581e0460757822bf3175c7741a1cd4875fd9cd273d2719c631f50c99f7525c8381095445c2df0 SHA512 e316c1e53010dc894c6eee06ec21f1761971beca489d143eb01c34a0f7ca366a0db87c5e6a2c855dd2ab7f591fdfa7d123951e1e963457b9b6f0d1d9e7775b0c
+EBUILD jq-1.4.1.ebuild 749 BLAKE2B a86ce1606071a321f0dd160b9ed165681d05d2408634fcb96b74a5206edc3558735fe883e4d64c41c7e8be62741b4d8c26c05453ae42e1f41fc6862129488892 SHA512 54a4adc6c7946b362d9e950354093d47aee27ea4bf6724b833dec81ea32f53bf1bf3b1f9b0da9b2bd24273b1d9941aaf911ee1938529d8706c5112bf343a0f71
 MISC metadata.xml 367 BLAKE2B b17eb2d9c460774d98ba18faf8a09d1c9c711433d0dfcff08df4f769411db66fdb2241d12ebc706664cdef98d9dbeb290614446112f53ecede571f77aa085174 SHA512 399b63613673deaef747fd380d6bdc086a4e4b57c5509b15fd6e031ea613ccf59641c95064fc7dbbf61f8d879fe03faf7e8298e4e8792a8a0b7a2bb3225e77c9
diff --git a/dev-python/jq/jq-1.4.1.ebuild b/dev-python/jq/jq-1.4.1.ebuild
new file mode 100644
index 000000000000..417b5256add9
--- /dev/null
+++ b/dev-python/jq/jq-1.4.1.ebuild
@@ -0,0 +1,37 @@
+# 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_{9..11} )
+
+inherit distutils-r1
+
+MY_P="jq.py-${PV}"
+DESCRIPTION="Python bindings for jq"
+HOMEPAGE="
+	https://github.com/mwilliamson/jq.py/
+	https://pypi.org/project/jq/
+"
+SRC_URI="
+	https://github.com/mwilliamson/jq.py/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	# Cython compilation isn't part of setup.py, so do it manually
+	"${EPYTHON}" -m cython -3 jq.pyx -o jq.c || die
+	distutils-r1_python_compile
+}
diff --git a/dev-python/jupyter-lsp/Manifest b/dev-python/jupyter-lsp/Manifest
index 324ce3cf5f74..b9487e453aa2 100644
--- a/dev-python/jupyter-lsp/Manifest
+++ b/dev-python/jupyter-lsp/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter-lsp-1.5.1.tar.gz 35907 BLAKE2B bc69791253bfcf40188fe2bae24a2681ce17835f5eb1d2640edf93a69285b33d426bffdf09c66308e6f79e33c4778e539fc2a7ed056fe64758e82acc6374b4cf SHA512 585c7b3b7ea87fd9d3ad27e3e4473f3bce56ad41d3b028173e2fcad4b0d2db5b1c0c89cd8c976c3f8b4d30ae7a63018dc1e19d4527b56eafe21ec0b5e89a538b
-EBUILD jupyter-lsp-1.5.1.ebuild 1099 BLAKE2B 31d21f89349712a84547696e13bc90c3720d5374d040d4595341066bf1748791aab0f08e9cf41486840d064174675fa44c6d5458170491bd9714eb2add6f332b SHA512 08b30aa1b8d798e966413f0be163b38ea4f1d86a9b2bd75c9c8e0da766aded57faa5ae51d583d2eab255faaef95289945ac5ce68ba661313f0fb1544162d7f11
+EBUILD jupyter-lsp-1.5.1.ebuild 1099 BLAKE2B b615c9736984f19f6d5503381373a0bd032de0e0887775e42ec327922d0d0ce3593a5ffcacc9f79fbec9fc79a5879f93e4db21bcead6a05c5484737ce1524059 SHA512 4b055192a80d6397b462220c6de26fc81259249bc22638a4783761bf0040dce330522ffa56ee786c37fba221ce55dc7f76823f9eb7cc302275b2956105740567
 MISC metadata.xml 417 BLAKE2B 37e0faca144a5da718475df6e957d9664fa5a757735bf65985dba486180dce37621cf3c34cadef4dbefbdb5698192b601a8e0bb1c77f71ba5550e65e47cc5e9c SHA512 6b61ffc68a46993386baa1c1b95850edbfbdb8d4fa40c4111aaf4edbb7d8d4f8ed21960ee01e69e2a8b986f66c6ec4ff938392d7849e204936f05d62ce7e8531
diff --git a/dev-python/jupyter-lsp/jupyter-lsp-1.5.1.ebuild b/dev-python/jupyter-lsp/jupyter-lsp-1.5.1.ebuild
index 735722091cfd..11dd9c072091 100644
--- a/dev-python/jupyter-lsp/jupyter-lsp-1.5.1.ebuild
+++ b/dev-python/jupyter-lsp/jupyter-lsp-1.5.1.ebuild
@@ -21,7 +21,7 @@ RESTRICT="test"
 
 RDEPEND="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_server-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-1.1.2[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/jupyter-server-fileid/Manifest b/dev-python/jupyter-server-fileid/Manifest
index 42fd7e661397..6546872654bb 100644
--- a/dev-python/jupyter-server-fileid/Manifest
+++ b/dev-python/jupyter-server-fileid/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_server_fileid-0.8.0.tar.gz 51420 BLAKE2B 0f927734c45d36f67f61b0f7f32f3e5b42b0d9b9107cc8dc762f6d7e34014c976a5036058170bfb2d95188f0d3994524e3198a721f3cec75eff3b1e031c2a133 SHA512 780c4aaedbf979630792c04fdae1d79f6aab6b11e9cacf06003d4801c64701d64e0417d90a64c544f0dd05461032605812ffabb183396a2bdb8fc6563efff796
-EBUILD jupyter-server-fileid-0.8.0.ebuild 793 BLAKE2B e57d86c5452cfefc0cee7a5a49cc2fe7784a44b75a37e828ae077332a7a5ef2d915e04f8edb8af61e257be8d325341e8ba93b4c1deba8fcb25d96f17c77bcbf0 SHA512 ebd102fb7e0152f86bb876a2d50ccb41c8cf36ff69b145c05c04c10f549026e521548a8ee1b406426daaa36aa074fe044983ca314362ffcdbe1b5ea889e05789
+EBUILD jupyter-server-fileid-0.8.0.ebuild 793 BLAKE2B f42fb34860c28ac1b3a074c5c476485305c12d4072fd1e4ca3fb038ff33ea3748ac7d73ce356ef6396834231e2e89f4a551382c544e0148f57a2ccdae6d1dfef SHA512 72ef37b9315aadd585dd01cbad137fd127e0b35d0447f7f1fc98e6bed90a85d18d9156f1e482e9d2fbd52495fc8cb6d918fa5c11c85bca214fca5ebdc27a9a3d
 MISC metadata.xml 451 BLAKE2B 501da442ec086270995b029cd90bb3bcdecfe6a0dc7ba0f60d6cf505930d34a56da918e593702bd8597b8ea14f91fb5c23f18a2cf0a6987d8320bfd1391be763 SHA512 379e0af3faff9baa29d49cb8069d87b7024695aa3c6bb4c8f7f063b8046ad806ff775a3deb0d31ba910f57240403f6881f703f2935bb2c63c23d2275d7179208
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 158c58539de2..8655bfad84b2 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
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="
-	dev-python/jupyter_server[${PYTHON_USEDEP}]
+	dev-python/jupyter-server[${PYTHON_USEDEP}]
 	~dev-python/jupyter_events-0.5.0[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/jupyter-server-proxy/Manifest b/dev-python/jupyter-server-proxy/Manifest
index 6128a0b455e7..8f0116cf69d0 100644
--- a/dev-python/jupyter-server-proxy/Manifest
+++ b/dev-python/jupyter-server-proxy/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter-server-proxy-3.2.2.tar.gz 121353 BLAKE2B 4f7c8af14a149f13272ea2802e830b38a5167f1de80dab21e1d175cb96ba3b908bd268f6dbb02cfd4fb8991ffb3315c044405925358904f82b26d55f74f97dbe SHA512 320765a8a8b1c6f213bd9c8cf514aac44f40ce93fb27fa890d8c6a9ae158f92f1b3a7119b47067db1c4f38925815f647559b3c618a9a85553cdbf7d2dc0a3872
-EBUILD jupyter-server-proxy-3.2.2.ebuild 802 BLAKE2B 89c834ed089ff4e7be3afa762e9eb9c76f8a9b82c979bd2902d7bbcd1d3e3ad8f01c3b5f84f7ed3183ad7dbaaa81e5ed8bc988b2596aa4b21d14b5c6f8c18e0b SHA512 bf2b09e25f6ec49e7f504494c2e87f58a70a782e262f52e1fd36270667670562a7f41ac8720b5074dabf53633598f1109dd4bb112d4c1755cbccbdbf0aa04745
+EBUILD jupyter-server-proxy-3.2.2.ebuild 802 BLAKE2B 98e8cc44f4b70a6280a3627fbcc8effe8b33c729976dde2533118eada28dcfbb2bc1a17f720a14e4a3297b057bedb1ce036558823a99e6debcbc75a8224f0040 SHA512 a76a0fbaae97be024d12e1ad59009a2fb368b9ae0863c30b4f8135ad72fb1f6e1559061ec1d3d3ba1c6082395af12fdff561d67ca13b7bed0c21b112e2b5f13b
 MISC metadata.xml 432 BLAKE2B 971dba91e8277c9ac0d7a9ca3c42d8c550bb072442021c9e0a9d8ff7cdb8f5f61cecf995a249451a9c95ccc5ee53108c2093de1fb6f5021a79238b35caf4b15d SHA512 3989d322d8b9165a6e2463c970176b71eb6c924b9baa489019ee84ba4826f5d522ba715947da72d3dfa7cf19b3124c550acb26f53d5e00f9473aacd8d8b4fdc8
diff --git a/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.2.ebuild b/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.2.ebuild
index b7d96bbda0a0..4b1aef499b80 100644
--- a/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.2.ebuild
+++ b/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.2.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/aiohttp[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_server-1.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-1.0[${PYTHON_USEDEP}]
 	>=dev-python/simpervisor-0.4[${PYTHON_USEDEP}]
 "
 BDEPEND="dev-python/jupyter_packaging[${PYTHON_USEDEP}]"
diff --git a/dev-python/jupyter-server-terminals/Manifest b/dev-python/jupyter-server-terminals/Manifest
index 76fcbb15b1d3..e7743f60a9e8 100644
--- a/dev-python/jupyter-server-terminals/Manifest
+++ b/dev-python/jupyter-server-terminals/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_server_terminals-0.4.4.tar.gz 29850 BLAKE2B 064876d7a10e7ff66da83e07d562abe53d609caeb27bcd7b7181d10c06af4406ee048b45b73092c8f3b0c10df40494eca1edb5234030154c63ea6a330f85a115 SHA512 5b1a6a9cfd550108be7f6664eac5ab7581d75e78a7dfc9825af2346b0d9b19f05543dcce010dafb9554c0782bf8e7929bf0ef96bdf2db392ab9b9ec1a3633fdd
-EBUILD jupyter-server-terminals-0.4.4.ebuild 1033 BLAKE2B 1ece08f0adf9c5ed7b11d70b0eb74b1168868bc8e646ecdc632b1803b71d1fa8f07ea2d4e4cb31008e9701d1c222611d116a00dfb888811824b4c4790f8e1e67 SHA512 690b77fb7fc5d8072acf866f0fb9e8dd9534b0ee9ed14102b214652c17e893f7888ad999dca8411f0c76558998449124d768ade70f1598b57f46cfaf7b8b502e
+EBUILD jupyter-server-terminals-0.4.4.ebuild 1033 BLAKE2B dd49c3616d40a30f99627fd5561bec312ff2931b62094bac7293d3ef44753d592af77f5321bde143e1f0276e6c20f8ec3c2dfc8e760e6d23146055aa911a6681 SHA512 079746158c32a76cfbfcf134c242118f98dddb5c7df434e08c05258c236c44ef81e559a328494189c07f0ecb34deeae527022ba7d83079fc1555c69c7417dc04
 MISC metadata.xml 457 BLAKE2B 6667133607998f468774a24e818962e037f937805af2578f0b759be79421abdd389cba957d79c8d7d4039f1dc6698ca1d1e08bcada91d4aa503bac21c041df9e SHA512 9ae0f7f3ab2bba3aeab9eecaac56995cba07f4c55551351a290b25550d6a4516432a73616a850ac7e7bede45a458ed8bec7dccbde7322015239062efee4b4e40
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 22012eed678d..0ffaf8a0fa56 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
@@ -25,7 +25,7 @@ RDEPEND="
 
 BDEPEND="
 	test? (
-		dev-python/jupyter_server[${PYTHON_USEDEP}]
+		dev-python/jupyter-server[${PYTHON_USEDEP}]
 		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/jupyter_server/Manifest b/dev-python/jupyter-server/Manifest
index c307c768b9b6..9cfb6f80f3b7 100644
--- a/dev-python/jupyter_server/Manifest
+++ b/dev-python/jupyter-server/Manifest
@@ -1,4 +1,4 @@
-AUX jupyter_server-2.0.1-skip-npm.patch 698 BLAKE2B f037094e4ba041f112e6b2b08693186c9414fee1dbb9a25be94bc7ec75be09888c2b147329ef9c4b2bdcefd54c44cbadfb658983f97537e5b277eb0fc9ae4cc4 SHA512 d20cfdc71c1c58a7c3126db80d30d34ec8f188f6b5da82accd9e02c91cb14ce750123be443d0c85b18357ae1d22117912c4605e0ee74d9dbf226c739faa17297
+AUX jupyter-server-2.0.1-skip-npm.patch 698 BLAKE2B f037094e4ba041f112e6b2b08693186c9414fee1dbb9a25be94bc7ec75be09888c2b147329ef9c4b2bdcefd54c44cbadfb658983f97537e5b277eb0fc9ae4cc4 SHA512 d20cfdc71c1c58a7c3126db80d30d34ec8f188f6b5da82accd9e02c91cb14ce750123be443d0c85b18357ae1d22117912c4605e0ee74d9dbf226c739faa17297
 DIST jupyter_server-2.4.0.tar.gz 693740 BLAKE2B c50a06f1ebe1479c126c2a10ac7f58f012f97f8d565f1705b5d8080ff854a387a6bbcba65785652988a1adc3575009ea0b68e48b7cda8bbd89b5208e1a6d0612 SHA512 c5ceb6caa37c6d8bb5b3026f450bdfc92c37cb5a350541fa35764eeb33007918b2aa55b41108703477efe68f7d5e4f4ba3fea51cd203f3f3c0b74ba3bed6e1c5
-EBUILD jupyter_server-2.4.0.ebuild 2174 BLAKE2B 9cbcaf2add99a7aca330a9137c5942bdc260f4b8f969f5da9be8fcc5bc071e2e3d50a0637b844ea6914b2092cb6489d6b2118f42a251fd2ad26e4f652422a6fe SHA512 e3763fb6fc8c5dc5c3e9786400950ea9260c2caf584f38abbf9c09b70d49bbdde4036660a6db12bbc6e5b559e780eb1621fe498fb5378a8605c4f0b72efeaa77
+EBUILD jupyter-server-2.4.0.ebuild 2174 BLAKE2B 9cbcaf2add99a7aca330a9137c5942bdc260f4b8f969f5da9be8fcc5bc071e2e3d50a0637b844ea6914b2092cb6489d6b2118f42a251fd2ad26e4f652422a6fe SHA512 e3763fb6fc8c5dc5c3e9786400950ea9260c2caf584f38abbf9c09b70d49bbdde4036660a6db12bbc6e5b559e780eb1621fe498fb5378a8605c4f0b72efeaa77
 MISC metadata.xml 544 BLAKE2B ec5a0aea1d2ad6ce0e59972d2ef4ce62c03877d464dfdc34bcb94a7d01304c63761c6bc30ed973bba1f4100e25f70541bed4eea858deb44f359d0e373ae1ade0 SHA512 ffe7deb7349ce99890b902a225b73913185bfa860237dea8c1a508a6a5e84bbb74ca7a5c43253c9986f97fb3fd1e9f2bb63ca60f73953fcc851359df8adb5fbd
diff --git a/dev-python/jupyter_server/files/jupyter_server-2.0.1-skip-npm.patch b/dev-python/jupyter-server/files/jupyter-server-2.0.1-skip-npm.patch
index f7b484e020b6..f7b484e020b6 100644
--- a/dev-python/jupyter_server/files/jupyter_server-2.0.1-skip-npm.patch
+++ b/dev-python/jupyter-server/files/jupyter-server-2.0.1-skip-npm.patch
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 933e62cbd6cb..933e62cbd6cb 100644
--- a/dev-python/jupyter_server/jupyter_server-2.4.0.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.4.0.ebuild
diff --git a/dev-python/jupyter_server/metadata.xml b/dev-python/jupyter-server/metadata.xml
index 7e3ab0d6de84..7e3ab0d6de84 100644
--- a/dev-python/jupyter_server/metadata.xml
+++ b/dev-python/jupyter-server/metadata.xml
diff --git a/dev-python/jupyter/Manifest b/dev-python/jupyter/Manifest
index 3359f1cfcc86..a8d2a9c99257 100644
--- a/dev-python/jupyter/Manifest
+++ b/dev-python/jupyter/Manifest
@@ -1,4 +1,4 @@
 DIST jupyter-1.0.0-file-colision.patch 1727 BLAKE2B 59bf5e567e6da9e9f3d84178942993072e1697c1c4c06e06d606dce7bdc76d296d10c30cdef2865bce7b4c26136a1b0a2860f009f1530c1815b48b3300401501 SHA512 a6b4cc6b91bb9941f029963cc3e3b7f415192f64788a34dde7828d450497987f92c25655c5ca183a7408fb1fb439917ba0f0a1ef1db3fe3bec1fc46d9ad2cf4d
 DIST jupyter-1.0.0.tar.gz 12916 BLAKE2B 36476eaf0119613ba6d9f153aab1658f43951dc3879cb6a9e90d8fba14cc1247305e18fda2251127faac4e68867efd3ef57129675bbe89a17a6469255efcade2 SHA512 1f0bc83f7a127c98ccf4b3868814116aa272ea5d0baac52d7a022305af7e2da28ca2b90fa3554ff085d8df3eb6d8b8cde80bf02b8e66064c59900b926d73c520
-EBUILD jupyter-1.0.0-r4.ebuild 953 BLAKE2B f4a3c10c42f13aaa97344c78d347a2f49380569ad43ce3a1d858c5f499c681940defa5957ef77ac2c97780f5d58dca513fc6f04c8679621a4160e8667c76f44a SHA512 727f2ffb61bd7e00b1212fa03c2080b1d461778ecf567b27fdbad9aad03f5c8f8d94c841fbe4dcd247ffccc11742ce36d79b9efaaf5be0d36ea168b7a435891a
+EBUILD jupyter-1.0.0-r4.ebuild 917 BLAKE2B 685a79beac5e5fc3543f26e1b1ce7af6ad1c035f096b8df5ebaf3d3c739b33389a87e2b7e53540b8840fac4f5228f16f237c3f97abb95910aac9c8c117fa993c SHA512 f3bdd97b16476cf932f6189039de5ff9f53e9da99c0f7fa1494980a7a54ed3657472250eabc416c605569bc7435e7d56beca9f2a1c7cf4e7e01849093e98a2c6
 MISC metadata.xml 391 BLAKE2B af2c9f38e30fca600dbd7c482a5d3c10e11463e5359e59630126d2848dc776bff78c79deeba97e1d8a4074f5aa597acc1b29a1bf5007e213657a4e428d07e36d SHA512 090a9c06ac5e0a451769e99a92db93cc6880cfe76bc485d09c60f2f6870723c4c91f898ac6d28a1c9691b7e9a0e98568368ec3b7ecf2e51decef7728fd79d40d
diff --git a/dev-python/jupyter/jupyter-1.0.0-r4.ebuild b/dev-python/jupyter/jupyter-1.0.0-r4.ebuild
index c08d2cc1df5f..9f1b69fc86c0 100644
--- a/dev-python/jupyter/jupyter-1.0.0-r4.ebuild
+++ b/dev-python/jupyter/jupyter-1.0.0-r4.ebuild
@@ -6,14 +6,14 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Jupyter metapackage. Install all the Jupyter components in one go"
 HOMEPAGE="https://jupyter.org"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://patch-diff.githubusercontent.com/raw/jupyter/jupyter/pull/198.patch -> ${P}-file-colision.patch
-	"
+SRC_URI+="
+	https://patch-diff.githubusercontent.com/raw/jupyter/jupyter/pull/198.patch
+		-> ${P}-file-colision.patch
+"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index 9fd89e2f71cb..0dd55c3512a5 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -1,5 +1,7 @@
 DIST jupyter_core-5.1.5.tar.gz 82838 BLAKE2B 33e9f569bfcf66e679611b00fd99f272b845685d7132f616141143ab0b894b54cb499c6da2112ccd760a00e5313c742830943e77ac6b40277db371b6002b6220 SHA512 2fc9150de96e7a084aa9bf334a71e342f0ab1946943e25a66a4760097fa662290a732ac30356c8ddb595fc05414edb1d9c06ac5eaf41099aaccb695d6a9357a6
 DIST jupyter_core-5.2.0.tar.gz 83861 BLAKE2B 97a96201199640963e9ebedf1b8ecffb66d6153e40a77cbe1d615ad9a5b60d3c7deb5c5965bdf7f8001db4967af30f39e576570160229201cc9a5b585c37abcf SHA512 7e4e6bbc338876fd213ae1a8028066f1f33010bb0196e26d6c6d7b872b60612d38d9d32b3d2ee4155f86dabf3b89e8282fef268d1dcd6fd740fd2fd3f0bd0bc2
+DIST jupyter_core-5.3.0.tar.gz 83909 BLAKE2B c0e5418770a4d3527e825bcd63cb9371855f544f19493b82f49db892fc92e91fd257b07b45d7cf20760f9ac9205346b3ec533491baf45f225764e6d310524bb8 SHA512 2c63f59a9618ee01d200e233cf85d586d88976c8d545235be224f9c64a54eb3a70e8b47220cc29b8ad3c102cc6c8754c8ccff2a771899986f322def5f539e072
 EBUILD jupyter_core-5.1.5.ebuild 936 BLAKE2B 5db09257fae364b81e6d13ea2acc445ba836abff8af30c4809958cf519697cf3aeeaa9700cbc7ae7b5e9702105ca44cd7891ee760969a0dedc0dd25aa133ccbd SHA512 7298269f7d721b51404e1d8fe953237ecaffc3b5b469099f39fc3910b229ff545c56d1e5abbbff44f41d559d54662a5a9bad1b5143c62a85c061bee2195bb350
 EBUILD jupyter_core-5.2.0.ebuild 897 BLAKE2B a9267149a31a3ef3d94373ac54cc21ee42fcb96595fb210c6f9641f06bac5a86ae73922a014ae0dbabd3f7e38980f755843dec8726affb15a62f4559e12edeca SHA512 4bb133a472230f56cde79333bb92f86e3ff76f64399c9ea052721aeb1b0973f359010607e55ab57dcb4fcd4612ccdc683e3c714e240a40faef01cfb177ec0797
+EBUILD jupyter_core-5.3.0.ebuild 897 BLAKE2B a9267149a31a3ef3d94373ac54cc21ee42fcb96595fb210c6f9641f06bac5a86ae73922a014ae0dbabd3f7e38980f755843dec8726affb15a62f4559e12edeca SHA512 4bb133a472230f56cde79333bb92f86e3ff76f64399c9ea052721aeb1b0973f359010607e55ab57dcb4fcd4612ccdc683e3c714e240a40faef01cfb177ec0797
 MISC metadata.xml 759 BLAKE2B 4ef6a95640943d1b082bb65ae17515300089c6d78c0aa81410f4c7e57e1447787ad15373f314f8ea5c980459f4e5f74ee54edace2eb9421991e2425793040adc SHA512 d9769460a005d11961ebabc81636065aec545166820e923ab7abd58782e0832592a58611ccb4485164ef7c1c646812e8f608fafb9639525663732dec730542f5
diff --git a/dev-python/jupyter_core/jupyter_core-5.3.0.ebuild b/dev-python/jupyter_core/jupyter_core-5.3.0.ebuild
new file mode 100644
index 000000000000..2ad7b2b33eb2
--- /dev/null
+++ b/dev-python/jupyter_core/jupyter_core-5.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Core common functionality of Jupyter projects"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/jupyter_core/
+	https://pypi.org/project/jupyter-core/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/platformdirs-2.5[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/myst-parser \
+	dev-python/sphinx-autodoc-typehints \
+	dev-python/sphinxcontrib-github-alt \
+	dev-python/sphinxcontrib-spelling \
+	dev-python/traitlets
+distutils_enable_tests pytest
diff --git a/dev-python/jupyter_server_mathjax/Manifest b/dev-python/jupyter_server_mathjax/Manifest
index 44aaf82ae4ee..e03f4cac2482 100644
--- a/dev-python/jupyter_server_mathjax/Manifest
+++ b/dev-python/jupyter_server_mathjax/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_server_mathjax-0.2.6.tar.gz 2648665 BLAKE2B 079108842d1c62b58c12e5466736508a4002fcc977acdbb1ea0c35205f685f53b985038af7df1d58ab188eadf6be85c59cc3eed4012a92d4353d5b77424935ea SHA512 a87a73471c470a60fae67d3a2dc7e163c39fc2ce62b357fd6eaa030ffcf63b44106ef35377795e58c5f89a847648c7fedfcace68ad9aef8efa45e71a2fd1a79c
-EBUILD jupyter_server_mathjax-0.2.6.ebuild 1032 BLAKE2B 7cefd8466d18e0d23f7eefb600e10a979b12440061287cb58d65d8e9cff40c87680407456d30e95f723362f530d35b2a214662b91039c0963e39a31cb65ff948 SHA512 3a12805f2db51f7eb99fd01d8e4edbb521ccd281fb923bca9f8ef4810bb7d24228d00036a9be90ca3e6d46789c502acfe954341cc5f979ea5ec529c9e676be4b
+EBUILD jupyter_server_mathjax-0.2.6.ebuild 1032 BLAKE2B 08e4666f8ae74026c017fbc83af4a844aea1350089753c3770a0ce748d07730f57cc7e2151b3c4a335c035dda737fe2a11d37b8e4478a5e6708d27e7f74772ce SHA512 8af1a071dd7cc5551adcbf1b02f97fad4551f61c14fbe871b8804a8f78a81f3c68cb2098d49cd412c786ab18a2234834ffb56872c39c643b46f9b76ecca743f4
 MISC metadata.xml 453 BLAKE2B 7a4ebaf263ff85d75f9ceac762692040bac146e147e7d01f5464132f3c518f2141c884cc0c447388e863651929727fe1524971925bcee7fad92aa5d33febf90e SHA512 399c94bc19b4144701f44638ea0fde80c366750131c8952a9c8c5f8554275e8ff0be72c3ad08335facb3719c0f8b9c9027ab2f60b3897e5e9791eb3ab95daa17
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 45d15870b159..8104b01ca469 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
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
-	>=dev-python/jupyter_server-1.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-1.1[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	dev-python/jupyter_packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab-server/Manifest b/dev-python/jupyterlab-server/Manifest
index 1b007245a8b4..ea1ed166f874 100644
--- a/dev-python/jupyterlab-server/Manifest
+++ b/dev-python/jupyterlab-server/Manifest
@@ -1,3 +1,3 @@
 DIST jupyterlab_server-2.20.0.tar.gz 70481 BLAKE2B 188b8a9bd2bfc5a27ce6f8488d7768484fd71ae8bb93f28c8a49f63b1aef13551c55d7e18531830df26617883f6b780a491d3522a0dcb3ecddcc433cfb35f97b SHA512 7d9a86f56686344ffc1ad11a9fc7c736a2ac0e6b8c31f8b6d8e35e5fd982454b2362073038dfc2ed3a4f03ef53e2afcaa33fc2c956b63e44c3d1ae6efa1f9251
-EBUILD jupyterlab-server-2.20.0.ebuild 1966 BLAKE2B 04a8980c5de59b110523b01d140ed2722e99502c2fc31b2c8beece116d8883fb9dc9827022302b425a153692d3e7fa10a1074142af324420e6d61ba2cb8382c5 SHA512 768c7006fd1b9dfd637d1a063f4def42a6fad50e34393f7c2ed6928f0c06cbd6c548d99fe2ffafc62aca9987e2a821b3e7f12f134f71a956fcb937f2e81ec4d9
+EBUILD jupyterlab-server-2.20.0.ebuild 1966 BLAKE2B 3296c95a2c01a9c2b140b5d5df7cf866f0b6f4fd65bdcdce75aee8bd6e9cb29f1742f40bb44e194bb70cf6940ca3eff42fa4f64ccb47126d79c4be251326d8e8 SHA512 ff0e2342db875c67fcfc248c0d5522c23f6ea005f814d96378a6abd9304806bfaa217267f25345add25f6eec5c3c7a56231b92e300705c1da9fa2bde95640204
 MISC metadata.xml 426 BLAKE2B 98083ff6255b6c5b4ebe7eb67f4e9716f52397646df275cce4cae2f78b0fbb5dda8d6240e1546b4bac6f13ef3f3f1e6f176b2062e066070d595e5cd93c02708e SHA512 9755e74547fb74a4720c9b755449d913dbfd949bad920ecd3903df91182236ad46712c358b3db8180ddf478a6cc6c2a57c6d1a939a9911ffc7ccb39672f5868e
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 6280fed7052a..c3e034e2e133 100644
--- a/dev-python/jupyterlab-server/jupyterlab-server-2.20.0.ebuild
+++ b/dev-python/jupyterlab-server/jupyterlab-server-2.20.0.ebuild
@@ -26,8 +26,8 @@ RDEPEND="
 	>=dev-python/jsonschema-3.0.1[${PYTHON_USEDEP}]
 	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.28[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_server-1.21[${PYTHON_USEDEP}]
-	<dev-python/jupyter_server-3[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-1.21[${PYTHON_USEDEP}]
+	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		>=dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}]
 	' 3.8 3.9)
@@ -36,7 +36,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/jupyter_server[${PYTHON_USEDEP}]
+		dev-python/jupyter-server[${PYTHON_USEDEP}]
 		<dev-python/openapi-core-0.17[${PYTHON_USEDEP}]
 		>=dev-python/openapi-core-0.16.1[${PYTHON_USEDEP}]
 		<dev-python/openapi-spec-validator-0.6[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index 52e25a98e911..ad0f3e5bd7bd 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,5 +1,5 @@
 DIST jupyterlab-3.5.3.tar.gz 17114007 BLAKE2B 70d32721a2579331dd4e3481f7241f5e2c5aad6dac851f213de0ac1fc3b76667bea496bca5ea13ee562e9678d51ac45df91c5901d8d3b7dc839977d3d842e67d SHA512 fdacd34ab629da2b5c2eb23f11ba4d44d5b27872e1736850319bcabbe635d31cfa2891c1c5991b152a5c1d94221e3766a20fc91033f556d8e508374bc46d5fe2
 DIST jupyterlab-3.6.1.tar.gz 16845937 BLAKE2B 41c50a9ddefc0ec97c70843e15107d3e3cebfadea2ec148e4536407b0f1b202c2aeace794b02c7cb666c316434da614c1bfebab5e5fc7e654f62677bac6e1eb3 SHA512 9dc63162955c13721c97d620a60116cd75bf10eca9c8eab08ae35749bf2dfec84c55759a361ca1abab34c44d63eded95748cfea589aff98907045b483d778413
-EBUILD jupyterlab-3.5.3.ebuild 2574 BLAKE2B 2288f4b4d621c0abb7b83e1de224b6b6a3829602fb48f98f7220d224eb40e10008b1a1e22ae9a15be51826d77d9ea04de9f6f1210e6d8b5a15a29500a4289ca0 SHA512 98e1064fa51bf1eb45f49a982964331d80aa43de5689b77cb83abf2c8a34bc14aa802f5f887db3ca05836fff409ea43db7303477b4934d3e827224728f1d82e9
-EBUILD jupyterlab-3.6.1-r1.ebuild 2747 BLAKE2B e1e8a9c140f344b993bf9fbb2929dc6df5626c4268e25005ac7e49787fce113aa080dfe8173161b56dcf63ff767f3492fb9b478b7c5f3cf71c887d6260116500 SHA512 60cce838e8c3003110b83b85f09544644219fa5cd51d7f00c718e9847cc604d21f105d77a5e0ad258071d6e6b7f469ee973657fd68052d5e9e2b4207affa91bf
+EBUILD jupyterlab-3.5.3.ebuild 2574 BLAKE2B eb478fdb0b5180dbb7efe3572bc2287fbb1b68ee2bf22380be4b7de88086f56aeeea7a9f8d5a2d62d52c45a7259bf495bdd69ef9a5184f65b05995d52838c772 SHA512 563417179f88b2bd8a27a715ed0da7dc3b8c5bbbd7bfad7279c26b57f10e8e2082de58f73d1b312b69f05c3e55846fad4f3f14ab589105189533871c327e298b
+EBUILD jupyterlab-3.6.1-r1.ebuild 2747 BLAKE2B 813c9c866a457d54f51928b156f0cbb42b9529062683642af4005d7bb07909d163e3f7c9eb335a7e036fe2cd17218d73c68b93266545dfdc5f35d0cc0617fe8e SHA512 83a2a4912f292162e6cddbd6e095af0ddd88d91daf7f38cd669f197817d0972da469d7d3d27c89d64fae724c847b26b25c5b74e816e211ae261106a460a54ca2
 MISC metadata.xml 412 BLAKE2B f0b40e19f8ba9dc116f0e4a882cabab6376f22d1eaeb3eac58ecff465ee2aff3564ddbf55e4ffb8971807a39945109a164037a954419671a274d3ac558b102ea SHA512 b6149a03585ca04bc3bf6f3ea6055e8e1fcb620a771359d150df7c22ee16bf09f57c8037df2161021fac0c194be0ac5ec79a31f0511d785e0c5b1ca96d817e42
diff --git a/dev-python/jupyterlab/jupyterlab-3.5.3.ebuild b/dev-python/jupyterlab/jupyterlab-3.5.3.ebuild
index 731711541db9..fa0cb6278dbd 100644
--- a/dev-python/jupyterlab/jupyterlab-3.5.3.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.5.3.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/jupyter_core[${PYTHON_USEDEP}]
 	>=dev-python/jupyterlab-server-2.10[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_server-1.16[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-1.16[${PYTHON_USEDEP}]
 	>=dev-python/nbclassic-0.2[${PYTHON_USEDEP}]
 	<dev-python/notebook-7[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.1[${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 160ab32e12f9..5e59bd01e1ac 100644
--- a/dev-python/jupyterlab/jupyterlab-3.6.1-r1.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.6.1-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/jupyter_core[${PYTHON_USEDEP}]
 	>=dev-python/jupyterlab-server-2.19[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_server-1.16[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-1.16[${PYTHON_USEDEP}]
 	~dev-python/jupyter_ydoc-0.2.2[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-server-ydoc-0.6.0[${PYTHON_USEDEP}]
 	<dev-python/jupyter-server-ydoc-0.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nbclassic/Manifest b/dev-python/nbclassic/Manifest
index 0037bba8f934..073a651367b0 100644
--- a/dev-python/nbclassic/Manifest
+++ b/dev-python/nbclassic/Manifest
@@ -1,5 +1,5 @@
 DIST nbclassic-0.5.1.tar.gz 20178622 BLAKE2B 1ff79c9af218011c697016ecef149f42e683607eebb8e199ef75957d9d3127858ce8f443aeedb60844e3277b4c8cd4959d123658a5103ab2112fec469ef01a96 SHA512 1dabc27ad115d1961e7881e7a51653449cae291c74aea222bbf92d49cb7bc9657ae1f1d9a81eafbd70bc0cafd57b75cd2c76bebf91aabc5fdd9eede534f1cec9
 DIST nbclassic-0.5.3.tar.gz 20199979 BLAKE2B aa509bbd2bab51b94f475e81b7e1c5661370e850680df8f64c86d76ff2aed7a84a0e6c00f36a695ef7f84cdc731fb7613107abc96fb13a3127ded6689d6e81a1 SHA512 07e26d4cb30e3388420ced182a31a050419f4a872256efca6684e4af0e08ec8bf7f6f14f127fe1391457ad5fc792377a1a7bafc0fa1a92eec455454c6321a9ec
-EBUILD nbclassic-0.5.1.ebuild 2340 BLAKE2B 3c0703556e35e86a9461a51b8169690cb9126a94d475f8c9dc8bdf88cac95ebc86b2766dea7423cd6b5dc68752cc9e2b6dab9fde76983f170b62c2479e3374af SHA512 8a73f4c1c4f54dd9b77e3b877c17d528948af8302c12a97507bf7eb387caa19aa94937e224ba7cc1eaac1ceb220b2dee967cbd26b929d1e18c28a494a6514d37
+EBUILD nbclassic-0.5.1.ebuild 2340 BLAKE2B ca95be529e3827effd5b02d7d91f12a8aec6c794e9b115b021949aa4c11dfc7b605e43665ee29153001a96358402824eafcba3dc41da8a3d9e0e5b1757b2fdb2 SHA512 1e81fdba2be812e76dd892eb197bda5b95a5983e9b33a17ed3403bc61d97647b1e8c9de5cb03da4ef6bc574d814726b5e71b3667f344a51f2491125486a85b59
 EBUILD nbclassic-0.5.3.ebuild 2148 BLAKE2B f6bdfafab59122bf7f3df696b96ed76337fa52b61de7ee47b3780fabedb38b4021fbd4d5326f182e8de866ef0f792c69164cd161833902add7c3609857c4ed65 SHA512 5e550b1824ccfa6c9681c0eb3f4150913dfb393a274ec2ab145e71e54507165cd2ccff9a5699c7098793c5389b6db4915bfb01c3cb792f05433b6d2df20ef571
 MISC metadata.xml 407 BLAKE2B 8be751d3f2e0e1e2952c39cd1846285ebb994d833022767dde609294ee9f98044b1189934e7d27c3134b1f06c95705687491dbf52739bdd0bc17f06cfdff53cf SHA512 6cc07376da4e55e5df153fdb0f43371ed415bed6db1bce2f67dd113d1e0f1994974dd6bee746021efb2d8c36ca2ca534109227c541d38b37b652a68b9642f2cb
diff --git a/dev-python/nbclassic/nbclassic-0.5.1.ebuild b/dev-python/nbclassic/nbclassic-0.5.1.ebuild
index 2c509b9da24e..a4185a8bd357 100644
--- a/dev-python/nbclassic/nbclassic-0.5.1.ebuild
+++ b/dev-python/nbclassic/nbclassic-0.5.1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_server-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-1.17.0[${PYTHON_USEDEP}]
 	>=dev-python/nbconvert-5[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 4cea5011aa45..ce7662c45e75 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,5 +1,5 @@
 DIST nbdime-3.1.1-jupyter_server2.patch 9483 BLAKE2B 767f7c848a5d840c1ac26d42f4074888163fd0bf63b774e9f79c5b7738f7f43453e35c93bdbad9cb10bb52315d67e1de6207b3463bbb885a6d095ada2bfae7ef SHA512 306764a2dd8770ee5041f5ebe076c3de5da9444166de3b77c7a6c37ef1a13c57f1adecf11e99a6f812930b133ae4ec7229de61f8a789804de77abd518f2e08b4
 DIST nbdime-3.1.1-py3.11.patch 873 BLAKE2B cc7e7a2cb7a95eb4280d1ee64b4563691c099e0c9d0613283dcbdf6cdebabc78f5c8f181006fb7176df43950ec86be880620e0381dffcf5614f8c05b78f7c4dd SHA512 e26054c7ed2c8201e3e6b6d4e18c80f3b5a3a9a21d201f2ba1f68cc2dcd0e6c4bc2d82c57cd07400f0ee6ce8a52e9a5c8e77000cd7912d3ca6b2ea53b80909fe
 DIST nbdime-3.1.1.tar.gz 7723671 BLAKE2B 2a8f0e7281e1830d6ab15bcc25c1be69e37b575e4ecde1f61f5d697be8cf556c7e3bfdf11375f47808aa812bebbbaf4bfacaa121c17fefb9cc8a80ba9ca08d1c SHA512 268c2c3f8c45dd4a55a632d55a817ee4a4283c5411b73915bb514a9b546ebcdebd7481e93a1e7ba66c30bcdc70932ba7af83de454d3d0ab9d2cfa24bc19c8d9f
-EBUILD nbdime-3.1.1-r2.ebuild 2893 BLAKE2B a511ed6dd1cf5677787e816fecd01c112e2e3d289aa201035b6d2da8a36a8813d8c48b4f231b9d0135289fef27204c5f303e884faa8e081f0b6ecf27d4175604 SHA512 90f49d4330b59f9bdbf048c03b9f6570dc829271019c2d03a711fbd95e8051aa25bd9bcf6ccb637baf49c2b793b3a955cc58999dc2dd0c2f8dca042804b9e2ee
-MISC metadata.xml 514 BLAKE2B c3062055cb710079162f879e3a7ca9cc1009946eba2e3d09f5cdfeb9f3bccbc12a9c6fe86d84f80d88b07eb17d03b55f8d1c6770b97c7a760015e4466e6fa531 SHA512 069589261da9b38841c363712255d55e2203c55af94ce62c3640a90139b6d260d2f1ba6475b9c0264b8c4530207cdb17983ebb2f67565fef9fce891603c1d3a3
+EBUILD nbdime-3.1.1-r2.ebuild 2893 BLAKE2B 40241ff6a07f1fc0135ed5514ed11891707934e5623a9ece5ad672728eea62ada8e7a4ab8498d0fb53144b1603856f3729cdba2cce04663b7d01b810fdc152e4 SHA512 85e320e43b651427f8ccdd8729253310c8b63d598ca69d80350235eb5212d548ff0a6dbfd153a8e9c65ba1c68a1dbea728662c2ef18875c38071c52f56ed88de
+MISC metadata.xml 414 BLAKE2B 9951da7227d2b6628d68aeef19d236a17e9011c62f6318ff274f7979b0db4e7e84be7dfcaecb32c82069a761a743efe6c8b27cfbac421274c39e417cdcaaebf7 SHA512 7fe4193e5844adc4d403c8673acf55bd9c7322c484374072239dbb266e0312bdd9e7b18e0f338e45e602003c89f1cbf50090ae9fca2e38833e17d41dfe4e131e
diff --git a/dev-python/nbdime/metadata.xml b/dev-python/nbdime/metadata.xml
index 80ee16961952..214c6442b3d9 100644
--- a/dev-python/nbdime/metadata.xml
+++ b/dev-python/nbdime/metadata.xml
@@ -10,9 +10,4 @@
     <remote-id type="pypi">nbdime</remote-id>
   </upstream>
   <stabilize-allarches/>
-  <use>
-    <flag name="webtools">
-      Install web-based diff and merge tools.
-    </flag>
-</use>
 </pkgmetadata>
diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index 6097f2e1933f..3836d40936da 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
 	dev-python/GitPython[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jupyter_server[${PYTHON_USEDEP}]
+	dev-python/jupyter-server[${PYTHON_USEDEP}]
 	dev-python/jupyter_server_mathjax[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/notebook_shim/Manifest b/dev-python/notebook_shim/Manifest
index 822ce55d5316..088a0c860a49 100644
--- a/dev-python/notebook_shim/Manifest
+++ b/dev-python/notebook_shim/Manifest
@@ -1,3 +1,3 @@
 DIST notebook_shim-0.2.2.tar.gz 12947 BLAKE2B 5a04944be3f8de7bd7b1c10f59d73869b7aed670c3afebf79e7780d5992f9af2929529498604c1a5c0d164467681ffa0e8924e1c9a7945e52ae353bdb710c7bc SHA512 42cf9153495e4ab8230ef560d36381a5aa1d9bbd583ed140e04e9850f4a82bab06ecf36e45b88595e8686d8122c9a52eee8133a7f1b622d75d326ebf36519d30
-EBUILD notebook_shim-0.2.2-r1.ebuild 891 BLAKE2B 2175aade928d30657067142fc846d1933b42dc8e382cd200b52a7013fef826978e64288e781c9e1b991f8c12f08250824afecfd5123ac90c5090dbf2567f9058 SHA512 680449a7969c55cf009e22f761124c393e0f21c456c35414b7675a213a7015c04c4c01cbcea742a965f1400cf32087ee38247065dbf8b75fa7b41dd515247492
+EBUILD notebook_shim-0.2.2-r1.ebuild 891 BLAKE2B a6957b41b6db0e2e503c8b290d37804d484ee75ba24083f85426c3fa3801a620227ccb6a54bbe26d693e2313304ed7efe4d3b83156d3a38064b178a7f86895e6 SHA512 b74de9d69b1e2e52c405fd5ec2235b933c7859d8e157f5a44302ddbcd8ea7bcacfc6e9398b77910bca38f0108d97a223e30b3c34449052fb6d545ce5d89f0386
 MISC metadata.xml 535 BLAKE2B 074e2bbcdd15078aaba2c65641a16ca7ce27e0c412d48f2a48a4cd80459a948abc478baa28b3e7417dde2bf13717040dc083711b114d61dfd2a7f7aaac1295ca SHA512 9ff7408848878f74eb9f10ec5aded639a749635851385b6679a72112c253a7427f65ac3e3c41f21f9e8551a439a7c00c4e28a5d70b3529ab9e687a5d0e7abeb9
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 4a81b5767bd0..295e344b23a2 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
@@ -19,8 +19,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~riscv ~x86"
 
 RDEPEND="
-	<dev-python/jupyter_server-3[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_server-1.8[${PYTHON_USEDEP}]
+	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-1.8[${PYTHON_USEDEP}]
 "
 
 BDEPEND="
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 236e9a580de8..bd14772a22a0 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -1,4 +1,4 @@
 DIST psutil-5.9.3-tests-r1.patch.xz 3648 BLAKE2B df56e3b11da307fdd4441284d1a7928c928b36c512ef05d313ac71e76545eabaca1f6a1ea9dab301c86005ef4c9af9622e0d1c6d7be858b92b0dce9d6031440d SHA512 0d8b35fe76b1caf1265ab4ecf182c92b71714be9612418c945f39c58f384979ed36e47bdf11b11a8cf2fc3925fed60abadf4f3eaea083f6bcd6d2cddb81fb5f9
 DIST psutil-5.9.4.tar.gz 485825 BLAKE2B ce5257e653876fc0c4bb005c964f677c0b4010f853cc7b8ff3451aa1efd7fde6b7e5d2150fb936cd38b667d5c167f180d5cae0792bdf50a8aa2e528795ed9897 SHA512 ff8d6213b153b5a3428e4f65ddbc41cb1f37caae4acab02760632107d95a50a74d3ee563f0cb2d623b37cdddd16425d2084e7f841e4a46af8988a7676f6975e6
-EBUILD psutil-5.9.4.ebuild 1247 BLAKE2B 1c81d4a8ff004589b9e6e5df209e0a9b9f6015ba0512ebd4249b1113fcb3f328860cca0036bd3ee2990edfde16542e8e72c180c39fedf57f5cc41e5cabd6e275 SHA512 9a24625e1dd656e8cac18366dea173dc333ec91c04653935c67ff7cf9c2ea8918d0902ae101356549aaa4f182c983199647fe0c9b4a2f3b421be0ba02bbd99f0
+EBUILD psutil-5.9.4.ebuild 1210 BLAKE2B 8fc5f64b77ab7f704ac33f64bfd67d2fd411a07b526ede09e120f81e855edb7b7e868d84ff72d58a504ee48a16e5c5721c4b4b4a22846037d03db79229ba0096 SHA512 0486ef275acf2b495546f735ffb44858464915f340964b9189e8a57088db8a2eca9558a5d109569331c6195cebdbf8fd6875d2914befc5cde65fac4c395dce06
 MISC metadata.xml 378 BLAKE2B 235c056a427ab18383c401143074ec62b91d471087c34e2bd48d5192c6221e089e32170d18cd0d69d51eb2bb02fb8a0efe59245af9224b284557812b32c341b5 SHA512 96492308dac753fb176e4810efa71757e66413d16589e52a942b02c91256b48f9873b53a698006923aef12aa7d1539d6fd7aa07632c073b6a92cc8920f6ce6c0
diff --git a/dev-python/psutil/psutil-5.9.4.ebuild b/dev-python/psutil/psutil-5.9.4.ebuild
index 5749b3e71a80..20768f8cc00a 100644
--- a/dev-python/psutil/psutil-5.9.4.ebuild
+++ b/dev-python/psutil/psutil-5.9.4.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 TEST_PATCH=psutil-5.9.3-tests-r1.patch
 DESCRIPTION="Retrieve information on running processes and system utilization"
@@ -14,8 +14,7 @@ HOMEPAGE="
 	https://github.com/giampaolo/psutil/
 	https://pypi.org/project/psutil/
 "
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+SRC_URI+="
 	https://dev.gentoo.org/~mgorny/dist/${TEST_PATCH}.xz
 "
 
diff --git a/dev-python/pyacoustid/Manifest b/dev-python/pyacoustid/Manifest
index e4931894ce16..2dee883c3e3c 100644
--- a/dev-python/pyacoustid/Manifest
+++ b/dev-python/pyacoustid/Manifest
@@ -1,5 +1,5 @@
 DIST pyacoustid-1.2.2.tar.gz 15869 BLAKE2B 01f327dd640819dd799f48b32e859fe39dccda3fd62714bf324c8219cf7053b36f1399793523634e9d4f3c6405bed5050abb34bdf53c72ff0ee22708fb57225a SHA512 5bcb3f017c3013eb8fc9e335540a1f5e6a52fc2fefa53d5ef246ba16e4ff615dd1d1cf08b5c80b1a38b149e0fa7dc0b15e4890dcc3f5478ef874b4ec22cf0813
 DIST pyacoustid-test.mp3 4507187 BLAKE2B 54494d9f23481f9d1ee77b136ac3e1790e9fb78c782159ad1793dbebf18f694e13f6413a8259bae84c789f73ea8241e590dbd7e30ccb7377b2afa946335da19b SHA512 faa582640e759322d4bd58d85f4aa7d3ef88fd90aa3c67c1390ba6d4c3213278c11fb60c8d6c87a25e82dffcc54986caa4f0e463acfbcd90993166577e5226d8
-EBUILD pyacoustid-1.2.2-r1.ebuild 1187 BLAKE2B 336c5082dc81bd0110080e9e11b8984c187d12203d94b323cae571163f2c0d4c5a6eabdf366fb23b35d516e22734ff0da29b3d6153265ec52d09f72d5fbce340 SHA512 542dfa358ee1480260b1e01edf934f248b24047ec667c8fea321e59c30f74892f0c188a95d545536d32d0816acd2c224982a079ca21439ebd8f7a824e771ac7d
+EBUILD pyacoustid-1.2.2-r1.ebuild 1150 BLAKE2B 30cf2a920f82234f7b1a8289d66389f376e6bdea6caaba46eb05b0f87fe5bd2a72a5455e0c1cd4ef3d8c9b9baef6f1f257d43ef088578a08e5641155a36236cd SHA512 31d7375ff2789e8c7ac0458f1cd186ca9b07517fdaf5cdace5a383d351dde32aa41336f0d4ad5fac35c53257a5d8f307ee72c8cdc57fb9048809d271e971f74e
 EBUILD pyacoustid-1.2.2.ebuild 724 BLAKE2B a13a1d39173b49d6c4da9e67317c1679b214de2fae15f4e53c9262ba5dcbbd80434f3e44371b53902f8c33c4a2daa63b4edaa359873e93521338f49928860bc0 SHA512 87cf32244c3f9892dfbcaf5bd5bb0ec4b11c7d20f575ccf3791c80692952219c30eaa4968a7075bc0e58523d810de6e1486ba88687ddab45300be375f4e6c10c
 MISC metadata.xml 714 BLAKE2B bc0db30cff6644da34b7944bec3d60b47f394ac854d547fcbbf3ee4d2719edc4cb781a42b3ab266fb7dfb5762679daaa0e382fd0fa8c2cffdd35af4cc55633be SHA512 6b6063bfe7d64d8a053c0e5c1609d8011e8aeeb265a895db88154e246761027ec2ba5fd582fb08b64e5ee09b3a238030415613df9267620936a718b76d6d1692
diff --git a/dev-python/pyacoustid/pyacoustid-1.2.2-r1.ebuild b/dev-python/pyacoustid/pyacoustid-1.2.2-r1.ebuild
index 0b0c3a8fd45f..b77542b9ba82 100644
--- a/dev-python/pyacoustid/pyacoustid-1.2.2-r1.ebuild
+++ b/dev-python/pyacoustid/pyacoustid-1.2.2-r1.ebuild
@@ -5,12 +5,11 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python bindings for Chromaprint and the AcoustID web service"
 HOMEPAGE="https://pypi.org/project/pyacoustid/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+SRC_URI+="
 	test? (
 		https://s3.wasabisys.com/blocsonic/releases/maxblocs/bsmx0198/01-Follow_192kb.mp3
 			-> ${PN}-test.mp3
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index 98795534c2c5..84b29fc61c88 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,3 +1,5 @@
 DIST pybind11-2.10.3.gh.tar.gz 740214 BLAKE2B 967b93cbf7d1f8faad25db9a4d3e84fd33b48429cdf527c167e65faad5c01df83a5634021cf99f07adf443855d9f6bb076f0cc67b0e6555e189b794a845b533a SHA512 3894400f04cd08e2dbb14b3d696339f0364434f1d6f8bb057338ac88157ec7491b2df1e1e46ebd5abccdcd5775c5e9238de6404f0db87f64f5a1802db3a5b18c
+DIST pybind11-2.10.4.gh.tar.gz 740622 BLAKE2B 7b2d86e8262581b2cc6dd720b83336206e242ef8ca99b257b01a11141ed8b127d7f35d7d573bc763dd36f2fe8c8ac91766089deb63a76e9c10029c34eec2d6d3 SHA512 7970defbb6d057a44468ed707c80bfa6ef8c9578528fbc084b03aeea20a52dbd681581f82d55ff90af11ee89693379bd79e2ab6603239ba05b0aa8da29dd93c7
 EBUILD pybind11-2.10.3.ebuild 1237 BLAKE2B 17590abe071c68edf93fb630c7e10c770edae992d1bac7177c4b5258a55db4f0371f518c021ad383b21d9becace91bfb288dfbd0cb60fc40ae2ea8ca22ed7b2a SHA512 47664fc3cae4088de5228e08f39c87df059f85f9f0651d4db726cc49bce961a3c44f1b3d57531b9964489c0cdfdd4d94fa1aeea1893e759438c132e814ebda9f
+EBUILD pybind11-2.10.4.ebuild 1288 BLAKE2B 2d4c4f2e46e1524705c8ed249bed0fab8c618c7839df234bc6a58db89ceeb2a45aa90ca3cc6a446427a4042dfdf29633392639872056705b4606b7335d031cdd SHA512 24f565a85c013a920ba3232e5cdb20ed86c6489ab101cf681c5d7833ec1c6211c754da2ac32f1e047e381d8a2e0e738697cb1a5f4206c63dcc2f3267d6b8638d
 MISC metadata.xml 475 BLAKE2B faf317a1197850acb0d16546a303bd50ee1bfe6fc3aaf592e6c147c6612fd20b809f1c911d79ca9a356cfa0c4166d2b155fcbd593f8b55e0d7dd75ff6444073b SHA512 5779adcc9f25c15fd999aa6c91d3144fc14535270e57925bfb8ac67f45448c144a142af2ea9a321ec6ffbf568713f663cef85a0be3d4a056e58b1782a5fc9a41
diff --git a/dev-python/pybind11/pybind11-2.10.4.ebuild b/dev-python/pybind11/pybind11-2.10.4.ebuild
new file mode 100644
index 000000000000..79dfba9034e7
--- /dev/null
+++ b/dev-python/pybind11/pybind11-2.10.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit cmake distutils-r1
+
+DESCRIPTION="AST-based Python refactoring library"
+HOMEPAGE="
+	https://pybind11.readthedocs.io/en/stable/
+	https://github.com/pybind/pybind11/
+	https://pypi.org/project/pybind11/
+"
+SRC_URI="
+	https://github.com/pybind/pybind11/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-cpp/eigen:3
+"
+BDEPEND="
+	test? (
+		>=dev-cpp/catch-2.13.5
+		dev-libs/boost
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	export PYBIND11_USE_CMAKE=1
+	cmake_src_prepare
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	local mycmakeargs=(
+		# disable forced lto
+		-DPYBIND11_LTO_CXX_FLAGS=
+		-DPYBIND11_INSTALL=ON
+		-DPYBIND11_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Compilation only does anything for tests
+	use test && cmake_src_compile
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	cmake_build check
+}
+
+python_install() {
+	distutils-r1_python_install
+	cmake_src_install
+}
diff --git a/dev-python/pytest_jupyter/Manifest b/dev-python/pytest_jupyter/Manifest
index 615d6eae4c28..4eaa0ef31e01 100644
--- a/dev-python/pytest_jupyter/Manifest
+++ b/dev-python/pytest_jupyter/Manifest
@@ -1,3 +1,3 @@
 DIST pytest_jupyter-0.6.2.tar.gz 15174 BLAKE2B b6c536383ab1b8e375e4250b4922ac6372f850ee4993643122896092109d3f711f91ccc7b159b7330de18f7876df818dc01d31c05e3c18d97488255e063db4d4 SHA512 396f7a7c978097e6dee37ead92bb3c8cef2a8100a7cc85b0b1eab19e20bdaed3332391c17568a6a279ab6ddeea1fbb2fa8dafe24ba4500982ba52cfcda2b1052
-EBUILD pytest_jupyter-0.6.2.ebuild 723 BLAKE2B 1b1f1f309c7b807367687f0f3e6f3ff076c0c6c98b2df0e26b39530bf82c5304380181e29510f508d9f55ba562629f158cba879d403f007387cbb780f2428274 SHA512 e056acb833f9d56d8a5632249f1e36474970750cbe1dd82fd9a14e4d81057affb3f1c4c2097aee6361265634982b7464cdfdfa5bceaace4f76c45dc7c35c0e13
+EBUILD pytest_jupyter-0.6.2.ebuild 723 BLAKE2B f2404d1548ecfd860f3aa56fb375ed5bdcbef6896e892ff92f56284dcb1550b5e29faba02b26ccfa1cf893acc643eede70532290bb5911cc6b67d6f235918135 SHA512 68edc9e745c4af900b0cb76847f01d8f68f255b5e0f1ac89c381a3b4aee8329d2c120a8f85813f5e17a2d35e79bb9a4c52c3f7a4f5cb4f4f56f0049bfafd9222
 MISC metadata.xml 544 BLAKE2B 2774989bbb5ea75c4254ec2c9f3daf04a48bdec28698d62afd2471abb4031273bea581c09151efa643fc691a3fda2e1a4211dca66882fe2c5a24d7a6bef7c1a1 SHA512 e3751515a8baf2b422cb680870adbe9393d37ecf2e8b01212bcfa7d0b62ca368c34a9140945e1af4d7c7f0c5443b996ac7cbd4394833aa13b4e937b05bfe0e6b
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 366dba65b9fd..d19d19f131bd 100644
--- a/dev-python/pytest_jupyter/pytest_jupyter-0.6.2.ebuild
+++ b/dev-python/pytest_jupyter/pytest_jupyter-0.6.2.ebuild
@@ -18,7 +18,7 @@ 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/jupyter-server-1.21[${PYTHON_USEDEP}]
 	>=dev-python/nbformat-5.3[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest
index 78cae061d787..d4a32d18381c 100644
--- a/dev-python/python-engineio/Manifest
+++ b/dev-python/python-engineio/Manifest
@@ -1,3 +1,5 @@
 DIST python-engineio-4.3.4.gh.tar.gz 300665 BLAKE2B 78488fb7deb54136a255b1027e52e1869e7d09b38769d3dd144b26146ac8db58091238c3f1cfa81d4c29af4d1bd8bb998559756053e53f6c7876c2866da31575 SHA512 427f224ae24d939d55316931cd087676741195d578415224de291f9871b535fdd02b835ac32a65d73be0428c8c4be0414faefca06a4964b1fe34e2ac91b02694
+DIST python-engineio-4.4.0.gh.tar.gz 309353 BLAKE2B 4cf40802fddcce2e53e205bdbe73bdf0ec822e15581fe4a9939b8d05c3eb6ba82a99d089d4708169b197aa79e5b5f14001ff86f72025fc6d96c99ed6d73fe620 SHA512 b7995aaf2583ec58ac87f048608653ade3846dd103616ee90b3dc12cc7e27c7d37959cd3e1ebf6e138395ff6fad8cd011407b6660258715e513bf72c8a3e1f6f
 EBUILD python-engineio-4.3.4.ebuild 1340 BLAKE2B c25afdae70cb78c7f5bd394d372baad930a60be6874cd33f9f80ad6d1d07cc4197078322259b4f455d1d148f194ddd1eec6d2efaaa42f86c55322355c0e5e972 SHA512 8ec674f0e58693425abf2c75acf8bf8d3cb3cd59b846b145f7c8700ce7340ab865e141c4c322155fa0ddcb003334a484f84409adf63701cb100157e98d834ff6
+EBUILD python-engineio-4.4.0.ebuild 1340 BLAKE2B c25afdae70cb78c7f5bd394d372baad930a60be6874cd33f9f80ad6d1d07cc4197078322259b4f455d1d148f194ddd1eec6d2efaaa42f86c55322355c0e5e972 SHA512 8ec674f0e58693425abf2c75acf8bf8d3cb3cd59b846b145f7c8700ce7340ab865e141c4c322155fa0ddcb003334a484f84409adf63701cb100157e98d834ff6
 MISC metadata.xml 518 BLAKE2B 7325d24cc26b1a3b4e2dec04159cdd4ebcceaf0384fccbee11205f9c000b1e9f84f97c742a6181dbad419e2527c6f874bc3f89760daa6b6dd2feb9b1f874b515 SHA512 40fe9ac96224019d28206f75ae6249c75dbcb759918c03826af4f8a394586bd5df445ef475cd009e8af93ea5c7424abebbbfd65ac2e2eb7bdd9e8a29f2dcb34f
diff --git a/dev-python/python-engineio/python-engineio-4.4.0.ebuild b/dev-python/python-engineio/python-engineio-4.4.0.ebuild
new file mode 100644
index 000000000000..75393f34860c
--- /dev/null
+++ b/dev-python/python-engineio/python-engineio-4.4.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the Engine.IO realtime server"
+HOMEPAGE="
+	https://python-engineio.readthedocs.io/
+	https://github.com/miguelgrinberg/python-engineio/
+	https://pypi.org/project/python-engineio/"
+SRC_URI="
+	https://github.com/miguelgrinberg/python-engineio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+"
+# Can use eventlet, werkzeug, or gevent, but no tests for werkzeug
+BDEPEND="
+	test? (
+		dev-python/tornado[${PYTHON_USEDEP}]
+		dev-python/websockets[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/alabaster
+
+EPYTEST_IGNORE=(
+	# eventlet is masked for removal
+	tests/common/test_async_eventlet.py
+)
+
+EPYTEST_DESELECT=(
+	# also eventlet
+	tests/common/test_server.py::TestServer::test_async_mode_eventlet
+	tests/common/test_server.py::TestServer::test_connect
+	tests/common/test_server.py::TestServer::test_service_task_started
+	tests/common/test_server.py::TestServer::test_upgrades
+)
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index 7eb38e629c1e..de6d689510f8 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,3 +1,5 @@
 DIST rdflib-6.2.0.gh.tar.gz 4886953 BLAKE2B 74044b0cbaf6c1ba6f2a43347112118dcf92b5237afdd49782ca6d637df092379ff2d81eaec254ad0bf25057f8c0cd44c82a35a89d4ce7b21c8e222de9aef16a SHA512 8177c50e9c2d48859a061dfee24c3560b8f979bc306b3d940a9251ec130e3a324bbad474f4fa7ced5e11522d3bd4e13931461bf106f31177fd972806968d8245
+DIST rdflib-6.3.0.gh.tar.gz 4980436 BLAKE2B 07f86418a0d598f59e4912057f4e11183bc0ad66a4cc5d7a83df6abce325f708a4920303afcbcdc97fb19b39199725a6410552704011e0f154815b7692724d88 SHA512 b8fd7d43f22779175e4d29f6256f070cb58f694fbfc9d068932c992ac732c687668ef68defbb6fa49f55f0b11d3b8f65b3a9d94aa8693ad9b8ab7c670625d06c
 EBUILD rdflib-6.2.0.ebuild 3894 BLAKE2B 618b0af2994e9e452192775dd0ab346ed251ce512bda2af4f71efb9f5eee7ccb98b914e633c8633ac8a9a38dfaedeb096b72432345c60e806472b88d2b464eab SHA512 7725825a4669462d6b43ae457b76507815ba3e681002ea67e64f97b7aa1dded9c401752e6751536547d260dcdb57039a0041f8d0df92311b9abf5fabaf7334e7
+EBUILD rdflib-6.3.0.ebuild 3432 BLAKE2B de63f480756bb81ff16a91eb3c53ec0c603cb4f26d0f1bda30f71e91c134c5dc683da8af7a84dd590b6e6907b57611178bea5059c6e713ed0d048dfe2b72ac59 SHA512 ca6a07603244d710a1dba2fdb47bba800a3d809265ec7fb1685653c4e42a6deecfb0e4a51878ba9c6725a6bf2c091ce0ad21b974093626cab328f5f5123ee807
 MISC metadata.xml 400 BLAKE2B eea3d3a69375a70a1c4a93cebf48169032f9d7cc6ba5df0422bad8c0f4e1caa10721a42b66cfb0dad2ab85aff38f826a0790b4d2dbac90be16e88ecf507d9025 SHA512 d8b94c9c8c037f40db80a44d235ada552851c3b979f496462e19a909eb2b46f606c23458b20869060b596969015616d065b2df0f5b24d2b3d7224afa6089e8e7
diff --git a/dev-python/rdflib/rdflib-6.3.0.ebuild b/dev-python/rdflib/rdflib-6.3.0.ebuild
new file mode 100644
index 000000000000..2535757a8ef0
--- /dev/null
+++ b/dev-python/rdflib/rdflib-6.3.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite?,threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="RDF library containing a triple store and parser/serializer"
+HOMEPAGE="
+	https://github.com/RDFLib/rdflib/
+	https://pypi.org/project/rdflib/
+"
+SRC_URI="
+	https://github.com/RDFLib/rdflib/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples sqlite"
+
+RDEPEND="
+	<dev-python/isodate-1[${PYTHON_USEDEP}]
+	>=dev-python/isodate-0.6.0[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	<dev-python/pyparsing-4[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# doctests require internet
+	sed -i -e '/doctest-modules/d' pyproject.toml || die
+
+	# we disable pytest-cov
+	sed -i -e 's@, no_cover: None@@' test/test_misc/test_plugins.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		"test/test_examples.py::test_example[sparqlstore_example.py]"
+		test/test_sparql/test_service.py
+		"test/jsonld/test_onedotone.py::test_suite[https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tc034-do_test_parser-https://w3c.github.io/json-ld-api/tests/-toRdf-c034-toRdf/c034-in.jsonld-toRdf/c034-out.nq-False-options66]"
+		"test/jsonld/test_onedotone.py::test_suite[https://w3c.github.io/json-ld-api/tests/toRdf-manifest#te126-do_test_parser-https://w3c.github.io/json-ld-api/tests/-toRdf-e126-toRdf/e126-in.jsonld-toRdf/e126-out.nq-False-options167]"
+		"test/jsonld/test_onedotone.py::test_suite[https://w3c.github.io/json-ld-api/tests/toRdf-manifest#te127-do_test_parser-https://w3c.github.io/json-ld-api/tests/-toRdf-e127-toRdf/e127-in.jsonld-toRdf/e127-out.nq-False-options168]"
+		"test/jsonld/test_onedotone.py::test_suite[https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tso05-do_test_parser-https://w3c.github.io/json-ld-api/tests/-toRdf-so05-toRdf/so05-in.jsonld-toRdf/so05-out.nq-False-options253]"
+		"test/jsonld/test_onedotone.py::test_suite[https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tso08-do_test_parser-https://w3c.github.io/json-ld-api/tests/-toRdf-so08-toRdf/so08-in.jsonld-toRdf/so08-out.nq-False-options254]"
+		"test/jsonld/test_onedotone.py::test_suite[https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tso09-do_test_parser-https://w3c.github.io/json-ld-api/tests/-toRdf-so09-toRdf/so09-in.jsonld-toRdf/so09-out.nq-False-options255]"
+		"test/jsonld/test_onedotone.py::test_suite[https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tso11-do_test_parser-https://w3c.github.io/json-ld-api/tests/-toRdf-so11-toRdf/so11-in.jsonld-toRdf/so11-out.nq-False-options256]"
+		test/test_extras/test_infixowl/test_basic.py::test_infix_owl_example1
+		test/test_extras/test_infixowl/test_context.py::test_context
+		test/test_graph/test_graph.py::test_guess_format_for_parse
+	)
+	local EPYTEST_IGNORE=(
+		# Uses network
+		test/test_so_69984830.py
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+
+	epytest
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 8d780386d350..d09e009ccd2a 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -2,5 +2,5 @@ AUX reportlab-3.6.11-correct-srclen-type-in-gstate__aapixbuf.patch 1502 BLAKE2B
 AUX reportlab-3.6.9-paths.patch 996 BLAKE2B a003ce69d7aff12e04fac914d44a0af58555da9858d96f23be26455836ee1105d76136cdfbe52b888f9779f1b8463fda9a04587b3ef045c8354d840f3f92caac SHA512 f71ebfdb07c87a7bd39a5578355a2a800654204e38f722106dcfbe848332eb1ef6ce8b6ffebe08fd0a07214c0fcfade69e0eee1f47b1055c877efc64e70e0bfc
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.6.12.tar.gz 4519536 BLAKE2B 106e0ede2b3c039152ae5a39e0aa5b3bf0239789ba08630f751260b75305973bff13730e3f7419340514a4f0174223dddf522cd9408b8dd04fbe39b84979b152 SHA512 99e6ab1cf27cc9e661b3bfd8c71290d94189db6de5e71b2429cccd48bfee5659d5fb46dfc5709e6616877b48bc17241c74282e0d2ecddda2ead16df4c1b6818f
-EBUILD reportlab-3.6.12.ebuild 1314 BLAKE2B 133ed9f9b02753b9c3aa3943c7277011d23ca17adc2e2e1f26491b55015760e9d8405da33e4e1ab21bebc58ee7911ffdb01ab3f3407b03ae1ed94c1ba4203089 SHA512 7ee078571b5b1a59c1f444bc9745ab5e924f04b44a6ed830d82585a698d7bbb35ee1d042746efd3d0a1646177b31982b873620922f0609271c769e86afc3ec32
+EBUILD reportlab-3.6.12.ebuild 1278 BLAKE2B 40ad71cb4fbc09fd06a13f7404be0b9bc3f6a207c2a1ddea0a7a0091f962b0ccd2c7bac52c134bfd2697a669834711f6841b19719cf992c551416a82fbd4b268 SHA512 78f949c2b6412f75a1b1d68547f00ade92205da6b54b68fa12aa5a90bf6cfb85139ace7c2434a403d5e0a9c53f2083a84cd5f6c590efd0daecaa5ae7a905e709
 MISC metadata.xml 1974 BLAKE2B bfccbbc451ae8cc0a7eae60e9b6134e01a8eb9be40506c51b2b8fc23845daaf4bf6e0c97d854b5e58f1ede8ee32a97280f526949e772e06288f0a237bd32baf6 SHA512 0c46c2bb1021b7b098446fb4005b524104f3a28e0a8a497c0f60e3f89668e9198eb57be2d2b01aef36896a519244ba32ebd1a63f3840161390fc901dac6d9daf
diff --git a/dev-python/reportlab/reportlab-3.6.12.ebuild b/dev-python/reportlab/reportlab-3.6.12.ebuild
index bc6c31b37a71..88abb16d03fb 100644
--- a/dev-python/reportlab/reportlab-3.6.12.ebuild
+++ b/dev-python/reportlab/reportlab-3.6.12.ebuild
@@ -6,15 +6,14 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Tools for generating printable PDF documents from any data source"
 HOMEPAGE="
 	https://www.reportlab.com/
 	https://pypi.org/project/reportlab/
 "
-SRC_URI="
-	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+SRC_URI+="
 	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
 "
 
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 630ee180bf7e..b1a74bf34a95 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,3 +1,5 @@
 DIST sentry-python-1.16.0.gh.tar.gz 325763 BLAKE2B e53f6051a74065950c4f1ce9010a87071b4a715990643cb7e955411ffb784fabc7ca6f2ade3cc6c66eb0718c6fc4993c6035763a0937b8a1cd66289f3f026806 SHA512 7f46f6c66b0e4f97e7f64a0eba9c396fbb9ab95607ba8ecb4880bb117c4f3fff7881a6787ea814981bdfabd84ea2b172c878821877403852661e746b6fe666bb
+DIST sentry-python-1.17.0.gh.tar.gz 332229 BLAKE2B 5c94f80d8cbe9582fe03e948c74e37024c4d6fce4f6293bdb755ada0651c5a898db23826d23ed7e31845b7426c3f6a52014e0f4226b9810f13222a700e063f91 SHA512 e3f0b9287f703e36f55bb96f31a76638b99fc66f4cf6898ddcddeb57a5ee27a3d782815c9dae9cd1177ff7f5c606e62b7807adada1f841294f3b6d7449d950e1
 EBUILD sentry-sdk-1.16.0.ebuild 3636 BLAKE2B 0a1659ddd0bc2f95875637270b637cda32fe557ac7471fed9b8c2518f0c51de97a542190d35d719d5fd13eebde63074fe6965d56e1100762b4cae16eddd26806 SHA512 c0de06866e1fe7b4594ff77ba3aa3291e9c8c7309aa2572a5c4dd4f799d42c85f7b7983f61fb74a0c443723bc4104482831465300b13cfa3d9af7b3ae8206ae8
+EBUILD sentry-sdk-1.17.0.ebuild 3640 BLAKE2B c3bd23007576bb9673782ef7ad4af56936c72f8b3c73e01bc86ce4436404066103532b0b358f82ae5b5058c9ec3c6e5b998eb54ca8245482a4aa819ebe2e2f0c SHA512 e0faee205c88e10a6abbf9eea5aea0d62d49031693a9a0aaed8fdbe9e5a075d719be897547fd3ac8ae296752030bb223cf8874958291a42421ab464273a9fedc
 MISC metadata.xml 510 BLAKE2B e00011699ac2cc83f1923e1f6fa813ede7eab8c57f9ce9d9fca04e721b089db1c5f2bdffaa7b9856f56b433abd9189125e07ffd3f329e4fa8d098e28a4f2d7bd SHA512 bafb77a102d94fe050cb526b298fb8cfd56775cb4d07eda280f6356fbec6fbe5df5c9ebd459d9d4457cd027c2e0d7c349e053fa6070b52f0d2989f6ec600b87d
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.17.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.17.0.ebuild
new file mode 100644
index 000000000000..f02570ff1556
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-1.17.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+MY_P=sentry-python-${PV}
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="
+	https://sentry.io/
+	https://github.com/getsentry/sentry-python/
+	https://pypi.org/project/sentry-sdk/
+"
+SRC_URI="
+	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# tests require Internet access
+	tests/integrations/httpx/test_httpx.py
+	tests/integrations/requests/test_requests.py
+	tests/integrations/stdlib/test_httplib.py
+	tests/integrations/flask/test_flask.py
+	tests/integrations/django/test_basic.py
+	# wtf is it supposed to do?!
+	tests/integrations/gcp/test_gcp.py
+	# broken by rq-1.10.1 (optional dep)
+	tests/integrations/rq/test_rq.py
+	# fastapi is not packaged
+	tests/integrations/asgi/test_fastapi.py
+	# TODO
+	tests/integrations/bottle
+	# TODO: causes breakage in other tests
+	tests/integrations/starlette
+	# TODO
+	tests/integrations/tornado
+	# requires mockupdb
+	tests/integrations/pymongo
+)
+
+EPYTEST_DESELECT=(
+	# hangs
+	'tests/test_transport.py::test_transport_works'
+	# TODO
+	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+	tests/test_client.py::test_databag_depth_stripping
+	tests/test_client.py::test_databag_string_stripping
+	tests/test_client.py::test_databag_breadth_stripping
+	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
+	tests/integrations/asgi/test_asgi.py::test_websocket
+	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
+	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
+	# incompatible version?
+	tests/integrations/falcon/test_falcon.py
+	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
+	# test_circular_references: apparently fragile
+	'tests/integrations/threading/test_threading.py::test_circular_references'
+	# test for new feature, fails with IndexError
+	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
+	# TODO
+	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
+	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
+	tests/test_profiler.py::test_sample_buffer
+	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
+	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
+	tests/test_profiler.py::test_thread_scheduler_single_background_thread
+	# broken with py3.11, *shrug*
+	tests/test_profiler.py::test_extract_stack_with_max_depth
+	# TODO
+	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
+)
diff --git a/dev-python/sgmllib3k/Manifest b/dev-python/sgmllib3k/Manifest
index 8d7e25288252..9f34d3ef4887 100644
--- a/dev-python/sgmllib3k/Manifest
+++ b/dev-python/sgmllib3k/Manifest
@@ -1,4 +1,4 @@
 DIST sgmllib3k-1.0.0.tar.gz 5750 BLAKE2B 188ac3c55245ff431e1ad7981f706f1a8fce3e9f3aaf844252c02da1189e5b9c7d29b76d803cbbcfc157fbb1ec7f36245186693472b95ed1634a2989185308ae SHA512 f9238afb831356f66b1c3e55975e0ea88007ffe1469b8b4e325e704d1915eb0ab120f5f9e98f36eeb4bf6204a1938d8a4d5a424f0cc054b141ac94adc8ef8ca9
 DIST test_sgmllib.py.gz 3769 BLAKE2B 026a843eaeb698d87e0137453b7f82763dee9a1ca446fc2c2fa9af8324297176749b041dfc2fc4c1954d743d9cfb7e773a189d99f22f7dc55ea1de486da80dd4 SHA512 722b79aa8b38626540bc331f9edb36919a8fb2561c5526be19509a58901aa1e2582e312fc2ace09cae54cb62577f266fcb10a1d98ab10685e2c79a17fea2f124
-EBUILD sgmllib3k-1.0.0-r1.ebuild 727 BLAKE2B 2515b59cc200c08c026a74f8ab72c62375c94076cb3bfff5ad922c4de7d74272ce861557cf0a60e762e7977e0f20c9bc35b71ba4c5f6d56d4068587eebcf0908 SHA512 21788e650ead8af116b259d14ccc5ec6a36b7467cfc2752a713b9d154146dfbecbfa8294436df445bfb5420230c1fbee61da7668237dd6334ef7f155fa293176
+EBUILD sgmllib3k-1.0.0-r1.ebuild 691 BLAKE2B c6b4c103b67aff8655d550b6133c4e3f35533ac92cc71334e3b94e5ac1ff8080980ea779f2bb3e6dacc0789961a279a613b0a7e96b8719c64d44574bad619b35 SHA512 6eeec57b3d81ea5cdfb0d6d0b0f71c9a4d86c4426ffb2cbc3e8bdd3c52cfb029f65d40dab432d32106c4e1346a2bcaf21876d22b60c46727dc656f43db96f72b
 MISC metadata.xml 337 BLAKE2B c95ed9109d2ab27ccbe5311e23f4617d19c2b7489b805500d8bd2c8dff99d8a74054d3e2b0a455f12cd616673071d308ca404e6734fe1bf4b16893d1a2bee577 SHA512 05cbda57d5634c30f963382afc29ce0f7e761bb7e9f48d11457c5d10fea14d9df3bca07bcea75d02430b421fc5d87b6c083c2feddd7f46d9d841f6e403d1d0f9
diff --git a/dev-python/sgmllib3k/sgmllib3k-1.0.0-r1.ebuild b/dev-python/sgmllib3k/sgmllib3k-1.0.0-r1.ebuild
index 95accf819567..7f4987ead1b0 100644
--- a/dev-python/sgmllib3k/sgmllib3k-1.0.0-r1.ebuild
+++ b/dev-python/sgmllib3k/sgmllib3k-1.0.0-r1.ebuild
@@ -6,14 +6,13 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Py3k port of sgmllib"
 HOMEPAGE="
 	https://pypi.org/project/sgmllib3k/
 "
-SRC_URI="
-	mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
+SRC_URI+="
 	test? (
 		https://dev.gentoo.org/~arthurzam/distfiles/dev-python/${PN}/test_sgmllib.py.gz
 	)
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index 8e647a3cfb3c..22df39d931c9 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,7 +1,9 @@
 DIST uvicorn-0.19.0.gh.tar.gz 713679 BLAKE2B ee83cd7d318b0e54bd2dc240b5bfe3874ef41933ba7e2376e8dd3bdce90387b3d253c02c16ef28bbb54435b2e666309769cd057fe703d4be498f3c0ef19532c0 SHA512 d030a0c5e61b5bec985fa1640a74bf5da1dfa1a48d0b3f758096eaff2e3bf1d1b3bee1c3a024f5960cafbf928e9ee94e285a8c24404e1c4b6b6aa29f0d4cb15a
 DIST uvicorn-0.20.0.gh.tar.gz 716073 BLAKE2B 7f1cf4808e985199d39e54e3563119cef1fe3af31361ad05a91278d32bc6f0dd741ad87f6073fbb720e9d9d4119fc8389b4e2feaaede665d8f68c56d56b37a17 SHA512 fa089da78dd7ce3cc02d83405e7db401e6055e947b80bf4abb0e3a4dce6575d97761f3bd6fcc253f3338caad5f797fc4f01bd40d833514d9cc0bcd0f072ad793
 DIST uvicorn-0.21.0.gh.tar.gz 717952 BLAKE2B 116153af13360f228032889feb63c4a652f298690fa0dc235e6ccead8e75a01bf3949e76b3eca4db0b8a6f1a4752127fd06b14c2cd83c88c5b247cba5c68eea8 SHA512 054355cbf09449d54255aebcfb43b77c9d8178d91d16a710e3d7213922908f2c107809116b635319fca2d3c12a738c9c6fbcd0e318a208f6a068075b9f997a2c
+DIST uvicorn-0.21.1.gh.tar.gz 717974 BLAKE2B ac4e1ec6a2533e364fe2ad7cd52558ad70b82e3c739756f33123d08737cc406ba879f50f7fa1cba875d0f0a284da5467e4ca15139558462401fb6a7938a17f61 SHA512 9f8dfe42df5d7f3923609e177def66d68fac24e3016fc1c6fead489320c2e5eaf7816a43e242f4426e670ce16f200db41679ac6ebd29a000ba76ca72b9ccec76
 EBUILD uvicorn-0.19.0.ebuild 1672 BLAKE2B 717bc23c0b3438239ace5ff0443182dc3fcb603d89a529bc3a9df583b7e4f62bed5237a72fec94950cdc4c9431502439f9125b924f2edfa0a186c6aa0a636d68 SHA512 225856fc376629ae96d34fadc56bba68b3ea3d675bcc675407053c38e0da307b77f4d800b7935b7ce553817fcb17f62780da5fc7064ae0257e0e4119431f8bbc
 EBUILD uvicorn-0.20.0.ebuild 1891 BLAKE2B 1b2b60d41b47f64023e304adea33540f1edb3fb2df92d995a0f7562380bf61437dfd180238489e517ef6417b5e1ca7d61f16567acf893da73a7756b017a63bf2 SHA512 3db6763fa4720bd705053721a2f65be0387858a8db71f6e122ec7613037ad1e948521828738fb21d258b648eb0f34442c283d85645aab3e4185bc710d53d2593
 EBUILD uvicorn-0.21.0.ebuild 1897 BLAKE2B f3fd7b2f58004b54644f50023c61c1a2baa3f6014e99ebdc6791a91df76bf378b364782422e205055d1e781cb206750792445aaa5113adc754224a1e8a562bf4 SHA512 a1e17fcce3ccc3fcb7bc3395b88065865f05a8b6d9e3f3b5fc1d88e8953c1d9fc0c7b512e6554e0fef4ceecb118c48654a99681e1461cb879d199e567895594f
+EBUILD uvicorn-0.21.1.ebuild 1990 BLAKE2B c16c38e880f56df8f4d4665ae3b03ac3f882ce9fcc5216f2df4939cb2ddb8924f2fb991f7f4e95a862029c2937eff7e9c75f59d9df9399a2841a3a9cacbff8bc SHA512 49d0376d05b9ae6189800ca25aea9ddd8e2a7494f26d67c1078a27f9eed12ff48fe4d555a3731d114bbe27296550cb32e62d637acf396d25d9ae1e804d05880c
 MISC metadata.xml 451 BLAKE2B af9be617c95128297e3455b503e198e13c373244094f6aa9c80837945c3f9f023f1874efa28d4ffa8b241feb9a4e8c7f3d3534e96966733bd5593bffb90904a5 SHA512 4d76bab5c20f7cad81fa56a28c9be07bf2c2ebc412fc647f073215d437a2550eca247b8419df71d04200d0fdf545520684db0b6f4953e73848f69a4f4ad6931e
diff --git a/dev-python/uvicorn/uvicorn-0.21.1.ebuild b/dev-python/uvicorn/uvicorn-0.21.1.ebuild
new file mode 100644
index 000000000000..547dd5ff1113
--- /dev/null
+++ b/dev-python/uvicorn/uvicorn-0.21.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Lightning-fast ASGI server implementation"
+HOMEPAGE="
+	https://www.uvicorn.org/
+	https://github.com/encode/uvicorn/
+	https://pypi.org/project/uvicorn/
+"
+# as of 0.21.0, no tests in sdist
+SRC_URI="
+	https://github.com/encode/uvicorn/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/a2wsgi[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/httpx[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/python-dotenv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		>=dev-python/websockets-10.4[${PYTHON_USEDEP}]
+		dev-python/wsproto[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# too long path for unix socket
+		tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
+		# need unpackaged httptools
+		"tests/middleware/test_logging.py::test_trace_logging_on_http_protocol[httptools]"
+		tests/protocols/test_http.py::test_fragmentation
+		# TODO
+		tests/protocols/test_websocket.py::test_connection_lost_before_handshake_complete
+	)
+	if [[ ${EPYTHON} == pypy3 ]]; then
+		# TODO
+		EPYTEST_DESELECT+=(
+			tests/middleware/test_logging.py::test_running_log_using_fd
+		)
+	fi
+
+	local EPYTEST_IGNORE=()
+	# love from Rust world
+	if ! has_version "dev-python/watchfiles[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=(
+			tests/supervisors/test_reload.py
+		)
+	fi
+
+	epytest
+}
+
+pkg_postinst() {
+	optfeature "auto reload on file changes" dev-python/watchfiles
+}