Adding metadata

48 files changed, 1069 insertions, 63 deletions

diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 51964ef919f1..5e91551a440c 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,4 +1,5 @@
 DIST alembic-1.10.0.tar.gz 1146577 BLAKE2B 9063a62a10e3c8a2fc5c7b78d285d6526dd0a4b97775db7881e28667752ac9154a4867b7213ca9dde7df51c97317104cb66a8e42dde22d8678ac2da7b4e8994a SHA512 39deb7182660a4afbcfac4b32c1607ff7d97fe599fa99dc74c6dea41c26e298d3fa0618dbd7c3c8984264d54f6f2b00a0e9bde66dc1aa76a2a64eccc81e85a03
+DIST alembic-1.10.1.tar.gz 1147979 BLAKE2B 5fbcde2f86ad034e0d15825d02d8d1eddbea638953830f16ca9a4f54cb9ea7d1d2332651308c3437ad9bd5040e02749d940ae1d9da2fa3c6c2b8c50a13a4b8f1 SHA512 7b26752e8ac6236bf69d379b5852251c9508886a99e36730200dfe085b7d1af7157ef0b66c46c82ec97f22c10e5dbafa9ec135ead0656604401b4fa646ad2359
 DIST alembic-1.9.2.tar.gz 1136929 BLAKE2B 26c4ad3185bc274aa4321a0860dc357566625abb51c951f2d0151bfd109f0e0bf7a37075d07ad2f0975127bdd327579f2d9a700f3cc130fbdd1c6458127b2e50 SHA512 d878d48d140be68facdaf0ec25f8582c9e10a369b23e9ee035ae63f8f2ad52d50464c5b8e9c666307edd1a797b6a2c495e56fa890f7dc8f46b3d75a726905ded
 DIST alembic-1.9.3.tar.gz 1137492 BLAKE2B 17dbc5513b7e15daa51f623bfa90febf356caad8d13e215c6007fd0330e569ea4ffddd374c1ab9b7954e38a136c27d2e5d0ff5db026a6c2ad04d242b3cfdbe7f SHA512 dcbde51c26a81f88b102979aa000c17d0af065e96c51484c94c138fc08099e229deb06f5934d499058f25ef87eb5a5de765225fb890a76eb030d1ad6649e57a4
 DIST alembic-1.9.4.tar.gz 1139210 BLAKE2B 5b740803b6bf5b715e9572a91d87d5403d64e665647776d28511704fa17ed81825fe6f5cdab2cec77a0806abb02ef2a7acf5f9702ff87639b90e74d9e22a4b1a SHA512 76e6f86e789cecff78f8e86c34d22a70615158833bc24a26f38fe2d0d5ccd098920e0fe4cbebaadd2c9a4a2e63152720945645000d46a2b6b8b6696ce873f899
diff --git a/dev-python/alembic/alembic-1.10.1.ebuild b/dev-python/alembic/alembic-1.10.1.ebuild
new file mode 100644
index 000000000000..15a1a21d58a0
--- /dev/null
+++ b/dev-python/alembic/alembic-1.10.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="
+	https://github.com/sqlalchemy/alembic/
+	https://pypi.org/project/alembic/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/apispec/Manifest b/dev-python/apispec/Manifest
index f3bc3f739ff6..65cde9e42167 100644
--- a/dev-python/apispec/Manifest
+++ b/dev-python/apispec/Manifest
@@ -1,2 +1,3 @@
 DIST apispec-6.0.2.gh.tar.gz 72472 BLAKE2B 0ff39ad92648cd63487f8901dc918fc1c642ce677ef73d5a7c849cdafbf7c81ac3ec51224575cd83c060930c1b2ef0ebfb3e94e1fb30f040e4dc4aa2bd221936 SHA512 aa5e2cc41d5b3c4555da929819135df30192e6f6ff08518d62674495f0d28c14e51a0aa111b289e5f9d7205f821c1fd4e28b914899ea3e15b3e20f6052258117
 DIST apispec-6.1.0.gh.tar.gz 72570 BLAKE2B 524573d188c487c57bed25f735888623d3abb848a949920bfa7ef8737b33d5fa29670d90af47eedb8b6202ddd553d04c2809285151555159c81203989fe23a2c SHA512 95d24491992572304b5c5adbb2a50668d55cb60585e32c85f718f2c211eb15c35082146fd6c88b7d3d574b4fef8f49fdd3cfe714f15d80aa657f3b48f38a40ed
+DIST apispec-6.2.0.gh.tar.gz 72921 BLAKE2B 32a0f5c607277afb4db319183777e9cdba625f17942a983ccf8b67fead459783b4d88e8bbd71c24be421aa068fb6dd96c193806b287de3d63f3456ec840132d7 SHA512 432391b42dab9cb1172bd6959346dabf639dabec85540cd6f3c0f227cbc833a8424ae6b34e3d4d79f6bf41d3cf24464d1f5584204e143c3dc2d092029a2d2cf7
diff --git a/dev-python/apispec/apispec-6.2.0.ebuild b/dev-python/apispec/apispec-6.2.0.ebuild
new file mode 100644
index 000000000000..f6b27facf335
--- /dev/null
+++ b/dev-python/apispec/apispec-6.2.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A pluggable API specification generator"
+HOMEPAGE="
+	https://github.com/marshmallow-code/apispec/
+	https://pypi.org/project/apispec/
+"
+SRC_URI="
+	https://github.com/marshmallow-code/apispec/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/bottle[${PYTHON_USEDEP}]
+		>=dev-python/marshmallow-3.18.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx-issues \
+	dev-python/sphinx-rtd-theme
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires unpackaged prance
+		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
+		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index be405743faba..36717a35552b 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,2 +1,3 @@
 DIST argcomplete-2.0.0.tar.gz 54164 BLAKE2B 77da149b07d4019f8d6f3dda8fd9bbe9953c25b8461ab0746e1c2eb4d1bb51a9007c1f046ad9dc41dc5f8f248fbdf18ad7d921cf644fbc7580661084fd1427a1 SHA512 ef2a551e1372ecf3739006fe2c020e9f7ec53c5809680dcd3d9d552290565d8d09ba22bcc989f40644120a129b101f8e2e8ed34723e947a7d8d7884e9b502c31
 DIST argcomplete-2.0.5.tar.gz 54665 BLAKE2B 33b3c1d6ba4b6fe6ac959db050d4944411a3ef6e737b9ae16f70d1e2cdd6cea0c2534ac4f4edce63df3606a18b9d8e16831a14db655cdd9cb4c2ad3afed60c72 SHA512 6354f2f67a5d0ff35539c2c4fa5ab5b78d3e57648ee2436da7b3916044d568d8558316a3e2b34581c97540c4a9f2191869fb215f0020ce09416d7b31377252e5
+DIST argcomplete-2.1.1.tar.gz 54042 BLAKE2B f4d1825306a17a873e3b3a9f23fea20ba29c4956ffc3228de4737b5be6280a3f29214a9e96bf5123220b2bd0b0fd88e77aa4d1487ef715af4e353fab0e2827a5 SHA512 3d37059713d953037421f2a3a2de1f3de7d2073423bce16187ffd47d24edbb72778ca2513ecb52c68ed6a3f89999da85770af36d07fded4ab1b41693a2ef2836
diff --git a/dev-python/argcomplete/argcomplete-2.1.1.ebuild b/dev-python/argcomplete/argcomplete-2.1.1.ebuild
new file mode 100644
index 000000000000..67eef1a1c772
--- /dev/null
+++ b/dev-python/argcomplete/argcomplete-2.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Bash tab completion for argparse"
+HOMEPAGE="
+	https://github.com/kislyuk/argcomplete/
+	https://pypi.org/project/argcomplete/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# pip is called as an external tool
+BDEPEND="
+	test? (
+		app-shells/fish
+		app-shells/tcsh
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pip-19
+	)
+"
+
+src_prepare() {
+	sed -i -e 's:timeout=5:timeout=30:' test/test.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" test/test.py -v || die
+}
diff --git a/dev-python/awxkit/Manifest b/dev-python/awxkit/Manifest
index 88d65b03fc6e..1f1ab27778bd 100644
--- a/dev-python/awxkit/Manifest
+++ b/dev-python/awxkit/Manifest
@@ -1,2 +1,3 @@
+DIST awx-21.13.0.gh.tar.gz 16221713 BLAKE2B 7e875efced94fb22d782deb9583fddfa13e10079a202298d0ca05af58048d4bf70480aacec7f0e3c408c9600fff126886cb6912bdadb3f48a33932c9debd2344 SHA512 90628347f71663d4e13fed2cc529b3bda858d07130b74593582e82e19b8c6e6049c9ad6cdd419e4efa4bd366771e993665ef4527f5de336edd5f020c9a93ca7a
 DIST awxkit-21.11.0.gh.tar.gz 16206681 BLAKE2B 738fae8028f4b576c36860002f802280263ec2731e91047b9f5f1a7aba28b5548b2a8add4659f9021c805a4bda0361e96c310c63b6bdf33c47705fbc222a3a5e SHA512 7c2e07f2951738bc04ce7cdc8c3e6fba3becaa70daa3de5c31fa931a7240b76001af791e819005b7c651c781e3b42c17850a79da059b2fc260efb8029f29033f
 DIST awxkit-21.12.0.gh.tar.gz 16218917 BLAKE2B 6e017bfb5707d6ec4107ec151311b133323c816da1aac1fe2441e639fcf22fe19e38f6c4dd81e29c63d5c7ff8f81ee62d6c4cfbc1500c0827e5b68b6e9f7187c SHA512 be1db2e5c51649910fa09659d2f1072f55c39a95f28c8a5ebd9490c43123ae90fbff242914c803e3882fa60ea07b39009dec9d27c56d005ab6333431e62a0576
diff --git a/dev-python/awxkit/awxkit-21.13.0.ebuild b/dev-python/awxkit/awxkit-21.13.0.ebuild
new file mode 100644
index 000000000000..9fe5e81c2c6d
--- /dev/null
+++ b/dev-python/awxkit/awxkit-21.13.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+MY_P=awx-${PV}
+DESCRIPTION="Command line interface for Ansible AWX"
+HOMEPAGE="
+	https://github.com/ansible/awx/
+	https://pypi.org/project/awxkit/
+"
+SRC_URI="
+	https://github.com/ansible/awx/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/awxkit"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+	printf '%s\n' "${PV}" > VERSION || die
+
+	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
+		-e "/'clean'/d" \
+		-i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 540ac98ef0ca..fdfc496ff23f 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,3 +1,4 @@
 DIST boto3-1.26.74.gh.tar.gz 602525 BLAKE2B 6d9b397864649ecd9b3f46bcee832c57cdce809545522f3beaf0d2eb98ca1f99e5fcab132f3389a4b2edcd585d9f6759de961b1f83f5912420629b6b03092c36 SHA512 eba11711dbd77988deb1695b954b6eb931b8ad49f96971e221415355de9bd2f3015b5a58be34a7378180f59500f9c15135192ccb97454141dbcaa664f0183627
 DIST boto3-1.26.79.gh.tar.gz 605312 BLAKE2B c36b86ab289be9c08a1ab43274a4f4db71cede08598b6f8092af8404bc9994e345b263b144ee3a1974ea276fce63c330d7ffa6335bb889bea32e380e9003a8c7 SHA512 cfc789296b904c0c3bd3999153067f4fb174b323f0fbd22e8f4a49aed98338e20fd238876e2f55f608f5d6b60b584e15d370400e8d0a8a00b0689e0867d00f05
 DIST boto3-1.26.84.gh.tar.gz 612921 BLAKE2B cf98272681299aa11454d65a6bf8bc6aa28244803e3d448f01425e62bb5dc01d93e0790ecaf6b2949ea1978130782f5ac282766c8fea94682e33b0cec65e2148 SHA512 d72117cb2f258fccf4a25e201a2dad8e13e8a80a03859edec2f27da01209185cbbb2f02a7924819214a612c6f6d3758ba0aba0047fab1cced3312d1662a7482b
+DIST boto3-1.26.85.gh.tar.gz 613010 BLAKE2B 724ebf1264717652b2d671f96f34b546b1cc5663844454bd3925c985f4624e21370d90b4408f7d0ea7de151f8e9e6bdf11089db1836cf46eacc1d7fc671ff342 SHA512 d4ae39fd0be03ebe73d0ce7ab1467c93997c5d11b4409e6832ca40e292f7a0c7151519c3784d634157534546b84e208c529b785e4bce35c09bcbb2bb4aa76389
diff --git a/dev-python/boto3/boto3-1.26.85.ebuild b/dev-python/boto3/boto3-1.26.85.ebuild
new file mode 100644
index 000000000000..9523f65d5fb9
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.85.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 2cc2eb57174d..b7339805f554 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,3 +1,4 @@
 DIST botocore-1.29.74.gh.tar.gz 11153254 BLAKE2B b3d3b75643cd5e3fac54a09e971daa23a043ba9f7ab773c2fd57dc15417c1b30c6f503515bad8734332bc40c4210e4ac09566c0742649c6ac3592e81ae9f8d79 SHA512 944ebbf1268fa9e8bb68ce5960da347613bcab585bf54c2fd6dbecb499088c1dc426357cde0a0f0d1780ecbc06acc33d8587f37c7f3d13577283b4549a353406
 DIST botocore-1.29.79.gh.tar.gz 11184048 BLAKE2B 062326a477fb27844ec47af28b77424863d6ff407dbcfd95bc9aa26d4009f503364f3d438997fe437b4830b8ef8c7bfb7e026313364bb3e9429cd3b7c2eae261 SHA512 260cf6a533e32c6f514774e5c5ef6830feb77058e1074e730d7fa05fb7067dac093f1a612ed11e02db116671ca9f7301ed29e1625f6e47724301d25b03eb3c30
 DIST botocore-1.29.84.gh.tar.gz 11220100 BLAKE2B 588efd08ec38eee7e319ea6e1d41af3f8d96c8e71fa090e5d3e8c836d60be957c47b556a9ce18684d53cb415446a360006714501dfbfc77204b2822247e7bf35 SHA512 cee6066735b324d550b736224ce4a4cff207cb7494d14e599ff9606b7a530d3887636054b3d0457269234d83ec0078950e03f916cd834cf910680e7ca650167b
+DIST botocore-1.29.85.gh.tar.gz 11218800 BLAKE2B 801e86c9ce18e77b2e4c6c004ed1015369bf8b86ca3dca990865856e979a88dc37e9ce51d8bcab86375f152f44f2727ac1d1ced00fac6da1ba4eac348096ebb2 SHA512 5424e26ddab6b441bfdda1195aad4beb4d01fd976d8640a7707e3e8bc52347816937deff9d7f3ab4aba1704d192738eb5c26a46825efba854dcde7bfdc25a4dd
diff --git a/dev-python/botocore/botocore-1.29.85.ebuild b/dev-python/botocore/botocore-1.29.85.ebuild
new file mode 100644
index 000000000000..0f4daaa48e81
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.85.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 31382d0b340c..4ad036b97b3e 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,2 +1,3 @@
 DIST cfn-lint-0.73.2.gh.tar.gz 3343513 BLAKE2B 48ec085ec1d4c6fcee57d44915b65760481cd753805de3817c63aa093480aef15c81583cfa5f61f62407002c0d82cb9f36f146afffcc6f30dc0043f4f6fa991b SHA512 f85909cefb0882d4b36c26542c9ec65af520797e25b849bdbeb2e7e18b4f1675f0ede1b7cb19c529d8d393345ed48d98cc67e7e5d752790c3d9829bd6d69c052
 DIST cfn-lint-0.74.0.gh.tar.gz 3633749 BLAKE2B 68ba32c66a6cc4ddf1260523679565e7074e159c1d63b8e408a40426e0c3e7ec60159075b8dc91bb40d2fbdb8fb5a5fd55c0f70d02c165900a64a0d032285492 SHA512 635621995b74068ec2be9fcda0b710ab975e8aea428317d254fd6e93b2602071b985a6d80c12321b8245c2569b84b6c7c46e4cacfd59f0d0e21926ad6782e2f0
+DIST cfn-lint-0.74.1.gh.tar.gz 3465800 BLAKE2B eb142f07f8a49fe52d7263ecbd359f6c31d89b8895ce97a816dfe2fd14fec4f82a8da708e0ed43734ae8c5184ba718da32dd517dae3068aac7ee8deeff230fbb SHA512 5b792919553292f40018d968bdb5049e07d95f7ee9e40dded439ed6ef3ab778b64d3b964d075e60c7b513f221e0e5b49fa0daa3a20135b765cdbfe3c495d2fc2
diff --git a/dev-python/cfn-lint/cfn-lint-0.74.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.74.1.ebuild
new file mode 100644
index 000000000000..926923d7f09f
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.74.1.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_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+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/chameleon/Manifest b/dev-python/chameleon/Manifest
index ad31781f8c9f..a612c311ebab 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1 +1,2 @@
 DIST chameleon-3.10.2.gh.tar.gz 137228 BLAKE2B a25aa7fc4b9b77afb5f108d515f06c24a01cc52da1630b7db7bc86571ca5635b276ddf5ec800cb9f9ed26f88c1e5bcae89a3b92c391d61814bd104e24ec3f6c9 SHA512 a00de545812d25fbaab86a0252b81d47a7e6a6460c6874ab536e6e65a4b56301cd54a31c390c4503453bd4e04863f83e3eec381f69e87b8bb7046943e0a24493
+DIST chameleon-4.0.0.gh.tar.gz 138574 BLAKE2B 70f8f4c330779058f94869d3c7d792af0a4a07b993dded928d3efaa8139736d1735a049dec1f43d807a125e162dd03c4ce2a1a0432c9450d6130501de1ab05d2 SHA512 817abf47696f48360ab40b3c774b1ff5be3389c918f719fe6be36f402b2e347871f0329168cb239c7e63f996d23b70181bf1a727df656f839c3c5d9bc35449b9
diff --git a/dev-python/chameleon/chameleon-4.0.0.ebuild b/dev-python/chameleon/chameleon-4.0.0.ebuild
new file mode 100644
index 000000000000..c6e184229321
--- /dev/null
+++ b/dev-python/chameleon/chameleon-4.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast HTML/XML template compiler for Python"
+HOMEPAGE="
+	https://github.com/malthe/chameleon/
+	https://pypi.org/project/Chameleon/
+"
+SRC_URI="
+	https://github.com/malthe/chameleon/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests unittest
+
+src_test() {
+	cd src || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index 8693fc39866f..1e28fcd30796 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1 +1,2 @@
 DIST django-otp-1.1.4.gh.tar.gz 75551 BLAKE2B 95f1e181542f595c5ce4059e037d47720899eac566af5d93414a64829bccbd054096bcbe1b5624e975483e45fccc88f62888c21fbb630e533be1eed9be1c0d84 SHA512 6bf6fbb6fe274bb8cd5de1ae31fad2bcb019332d3b10faffcffcd1f68a1160dffc2093eaadfd684c91372522e0132198df00da9e8cd0249124fd7020d63b91c3
+DIST django-otp-1.1.5.gh.tar.gz 75725 BLAKE2B 8277166593be01db71dfdf3184b602d6224a411522b63b115211232473823fb811ae9a827c29245b105f1c88ea2b91ec823dfa9f7aa7a9badace33fb6e8efd50 SHA512 ab762ae6272fc1ff174bb923bc6196bc6f7cdfc2c0c022015302bd3be31a1b171800310bbb1fde5e109ac73a827f06ab4e3aae32f47bb5a494e22c0f620dd339
diff --git a/dev-python/django-otp/django-otp-1.1.5.ebuild b/dev-python/django-otp/django-otp-1.1.5.ebuild
new file mode 100644
index 000000000000..98b36cbaaa91
--- /dev/null
+++ b/dev-python/django-otp/django-otp-1.1.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django framework adding two-factor authentication using one-time passwords"
+HOMEPAGE="
+	https://github.com/django-otp/django-otp/
+	https://pypi.org/project/django-otp/
+"
+SRC_URI="
+	https://github.com/django-otp/django-otp/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/qrcode[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+"
+
+python_test() {
+	local -x PYTHONPATH=test:${PYTHONPATH}
+	local -x DJANGO_SETTINGS_MODULE=test_project.settings
+	"${EPYTHON}" -m django test -v 2 django_otp ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 76c427c4e6e1..946a4d399caf 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1 +1,2 @@
 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
diff --git a/dev-python/fonttools/files/fonttools-4.38.0-pypy3.patch b/dev-python/fonttools/files/fonttools-4.38.0-pypy3.patch
deleted file mode 100644
index 4a85cde3891e..000000000000
--- a/dev-python/fonttools/files/fonttools-4.38.0-pypy3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-url: https://github.com/fonttools/fonttools/issues/2996
-
-commit ca9d98d94c3ba98db934f0d1e3a77134171f2262
-Author: Jérôme Carretero <cJ-gentoo@zougloub.eu>
-Date:   Fri Feb 17 19:24:46 2023 -0500
-
-    Fixup pypy3 compatibility
-
-diff --git a/Lib/fontTools/misc/macCreatorType.py b/Lib/fontTools/misc/macCreatorType.py
-index 6b191054b..f680f238d 100644
---- a/Lib/fontTools/misc/macCreatorType.py
-+++ b/Lib/fontTools/misc/macCreatorType.py
-@@ -24,7 +24,7 @@ def getMacCreatorAndType(path):
- 	"""
- 	if xattr is not None:
- 		try:
--			finderInfo = xattr.getxattr(path, 'com.apple.FinderInfo')
-+			finderInfo = xattr.getxattr(str(path), 'com.apple.FinderInfo')
- 		except (KeyError, IOError):
- 			pass
- 		else:
-diff --git a/Lib/fontTools/subset/svg.py b/Lib/fontTools/subset/svg.py
-index 4ed2cbd20..4a8823928 100644
---- a/Lib/fontTools/subset/svg.py
-+++ b/Lib/fontTools/subset/svg.py
-@@ -77,7 +77,7 @@ def iter_referenced_ids(tree: etree.Element) -> Iterator[str]:
- 
-         attrs = el.attrib
-         if "style" in attrs:
--            attrs = {**attrs, **parse_css_declarations(el.attrib["style"])}
-+            attrs = {**dict(attrs), **dict(parse_css_declarations(el.attrib["style"]))}
-         for attr in ("fill", "clip-path"):
-             if attr in attrs:
-                 value = attrs[attr]
diff --git a/dev-python/fonttools/fonttools-4.38.0-r1.ebuild b/dev-python/fonttools/fonttools-4.39.0.ebuild
index 86caeab956b1..23353db9bf05 100644
--- a/dev-python/fonttools/fonttools-4.38.0-r1.ebuild
+++ b/dev-python/fonttools/fonttools-4.39.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1 virtualx
@@ -34,10 +34,6 @@ BDEPEND="
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}/fonttools-4.38.0-pypy3.patch"
-)
-
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/dev-python/hvac/Manifest b/dev-python/hvac/Manifest
index 3fb991294562..46c6d2634779 100644
--- a/dev-python/hvac/Manifest
+++ b/dev-python/hvac/Manifest
@@ -1 +1,2 @@
 DIST hvac-1.0.2.gh.tar.gz 309384 BLAKE2B bb492de18a6041b9a478554c1f750540195f8476f74ccf1c9eac3ca04812dfa9c653263b523d0b34efdf1e4cfffebb64ca110023c840abcc97ec7b5534a7d1b1 SHA512 e0f81682be5308a418c2246b03573f0001b9e619e1dc6435b9c9bb608e496a6406b862e28c337afe56cd2d2432d9a0240af5529841d3d6b1b60b662b9b56b668
+DIST hvac-1.1.0.gh.tar.gz 317118 BLAKE2B ee4ffa2945cd39b5eeeca7206e14957ec4a22dc05cac118a22b240ebd18a54bf7187562f2b3795e2cb1e3ccc32bd3318b57d3f9faff32c995fcbc32babcc5607 SHA512 b9201aaaabbc3f6831951022152be0a05f486a021728a543ca32f88efcb1f29e9d62c0a20afcafbb0e9354a6c1d44ad64b5b0685daf7070cb8b618156b9454c7
diff --git a/dev-python/hvac/hvac-1.1.0.ebuild b/dev-python/hvac/hvac-1.1.0.ebuild
new file mode 100644
index 000000000000..91dde046d2ad
--- /dev/null
+++ b/dev-python/hvac/hvac-1.1.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=poetry
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="HashiCorp Vault API client"
+HOMEPAGE="
+	https://github.com/hvac/hvac/
+	https://pypi.org/project/hvac/
+"
+SRC_URI="
+	https://github.com/hvac/hvac/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	>=dev-python/pyhcl-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/jwcrypto[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/semantic_version[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# ldap_test is not packaged.
+	tests/integration_tests/api/auth_methods/test_ldap.py
+	# https://github.com/lepture/authlib is not packaged.
+	tests/integration_tests/api/auth_methods/test_oidc.py
+)
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 6f81a67f7a4f..ad0a4d1b9668 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,2 +1,3 @@
 DIST ipykernel-6.20.2.tar.gz 149263 BLAKE2B 38b3afdbe237ec2facb3af42311315a060f1dba845cb3f7ce10a3d5f68679804640b0dbda869395817a8612af2033f5936ff7f6f3b3b822f47ed512a3b8c0c4d SHA512 9c79c7fa175cd81a920e6b1f2159dda30ba9068437cb1d24b09d864ded36b439045e58f240daee1a46ae375f1990cf318cd8b2e2c02aa6d6e2004d90aff5225a
 DIST ipykernel-6.21.2.tar.gz 150365 BLAKE2B e1bc29018459738a3358af2d4225397028013c1ef9ceb571cb225fafb1a1570c349759caf723e03c6a67a9c354c83d178ae777f7ea4222f5c2ed35e41e22638d SHA512 e4d3aa102d83f9c9b16f392c5b37d55a9cd987ca6a58ce1c4b59d282ec945dcc8803539bf54d7b3bb71c11058fc20a3947fd875bebc5efa5f629015b544fe819
+DIST ipykernel-6.21.3.tar.gz 150659 BLAKE2B 1fd0f0994b0065c662611bf629a4a755a2285b66f9d1e60bcc46fc84a445c7af6b882e09be2c4d26e8ca524a4ccda8534d04e357ec575a8fc034f0f4a437b750 SHA512 68e7bbae60e07805590e00acb186b14ef3c21426db9c49d04b93cb38083a7c5c20b177b72743674224741d8ca946604e8ae733f26d11738b7d99fabdee642064
diff --git a/dev-python/ipykernel/ipykernel-6.21.3.ebuild b/dev-python/ipykernel/ipykernel-6.21.3.ebuild
new file mode 100644
index 000000000000..9d295ac36111
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.21.3.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=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi virtualx
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="
+	https://github.com/ipython/ipykernel/
+	https://pypi.org/project/ipykernel/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/debugpy-1.6.5[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-8[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.12[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-20[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.4.0[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ipyparallel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Use python3 in kernel.json configuration, bug #784764
+	sed -i -e '/python3.[0-9]\+/s//python3/' \
+		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
+}
+
+src_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		ipykernel/tests/test_debugger.py::test_attach_debug
+		ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
+		ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
+		ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
+		ipykernel/tests/test_debugger.py::test_set_breakpoints
+		ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
+		ipykernel/tests/test_debugger.py::test_copy_to_globals
+		# hangs?
+		ipykernel/tests/test_eventloop.py::test_tk_loop
+	)
+
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/jupyter_server_ydoc/Manifest b/dev-python/jupyter-server-ydoc/Manifest
index 1fa4299ea975..1f1734d31d02 100644
--- a/dev-python/jupyter_server_ydoc/Manifest
+++ b/dev-python/jupyter-server-ydoc/Manifest
@@ -1,2 +1,3 @@
 DIST jupyter_server_ydoc-0.6.1.tar.gz 25122 BLAKE2B c8543bc620ff8cefa5b7f1f1bd3d889301a96997607122184cf514ab6d02c50cada7c81844c6d4d2919caaaea9de8a4b5863c024b151d45b1450f1b6c351ccdf SHA512 7c0c79de866d6a794f24ac7dbbfaecaf2a0d447c9f81690d2de82bf86372337669389397672d737b441f37b34364fee16df0bb680d23980f7da931d13c3a0c85
 DIST jupyter_server_ydoc-0.7.0.tar.gz 25422 BLAKE2B d67a59c5ce17a1af4f88bdef07ae95b876d4c34dad0528d6b7aead3650f7178d42d4fd64956df89157242077fa87063f585ae8539688978b836a62000179eebd SHA512 38d3397533a00e1f5f414bb3567dd660bf7b732d8d6fb0beaa6ccec85c4ed0cf8022c4ba3fdb68a38482ee13f0c9f0f8d193a8317f8e3e1cea685601aa210cc9
+DIST jupyter_server_ydoc-0.8.0.tar.gz 25769 BLAKE2B 72f9082b4c459474910e795ab94da0482f073923f89610a1ecea2663ecc94adec3979bd353bba45388a31ca1bf5918e061a7b660f37cefa34a4e09217c2e9443 SHA512 a09b099257943e30187c9b66d53a922b4b197f62af648d7177abca2c60f0538f4ef8a6dc330b2019f79848b0c8bd93645b8cf9eb657334282f4317cee93ab571
diff --git a/dev-python/jupyter_server_ydoc/jupyter_server_ydoc-0.6.1.ebuild b/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.6.1.ebuild
index 92f02cc2f6bf..92f02cc2f6bf 100644
--- a/dev-python/jupyter_server_ydoc/jupyter_server_ydoc-0.6.1.ebuild
+++ b/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.6.1.ebuild
diff --git a/dev-python/jupyter_server_ydoc/jupyter_server_ydoc-0.7.0.ebuild b/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.7.0.ebuild
index 76ceacbca1cb..59b1f6aee89e 100644
--- a/dev-python/jupyter_server_ydoc/jupyter_server_ydoc-0.7.0.ebuild
+++ b/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.7.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=hatchling
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A Jupyter Server Extension Providing Y Documents"
 HOMEPAGE="
@@ -14,7 +14,6 @@ HOMEPAGE="
 	https://github.com/jupyter-server/jupyter_server_ydoc/
 	https://pypi.org/project/jupyter-server-ydoc/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.8.0.ebuild b/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.8.0.ebuild
new file mode 100644
index 000000000000..59b1f6aee89e
--- /dev/null
+++ b/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.8.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A Jupyter Server Extension Providing Y Documents"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter-server/jupyter_server_ydoc/
+	https://pypi.org/project/jupyter-server-ydoc/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/jupyter_ydoc[${PYTHON_USEDEP}]
+	dev-python/ypy-websocket[${PYTHON_USEDEP}]
+	dev-python/jupyter-server-fileid[${PYTHON_USEDEP}]
+
+"
+BDEPEND="
+	test? (
+		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
diff --git a/dev-python/jupyter_server_ydoc/metadata.xml b/dev-python/jupyter-server-ydoc/metadata.xml
index edbf614f1086..edbf614f1086 100644
--- a/dev-python/jupyter_server_ydoc/metadata.xml
+++ b/dev-python/jupyter-server-ydoc/metadata.xml
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index e6f58bca072d..de41d7a7ca00 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -1,3 +1,4 @@
 DIST jupyter_console-6.5.1.tar.gz 35754 BLAKE2B 1b3e189e8a057b0f57e6a1c1409797aff9b6584edd96975c5b91a7c5d55d8601e44a3f9e0218413351d67d7175a7f6c86c3734e14ba881f6ab25ea9f1748576d SHA512 3fbd97b1ab05596ac56ba8f6038af787698197b5148f7e33a79ad5cdcc9a78c80c2534e3e2c298aeb92ce880686731b9ba206d7d0094ad67d7cd4996c02e2327
 DIST jupyter_console-6.6.1.tar.gz 34188 BLAKE2B c502fb86152010906d552a8d7141f52d8aab56e5df0389d93c3e4881acf3cc9b73d80c5d0a8193e7b179079a7310c68ae54ce2205b68a5f7538b9de33d54eb66 SHA512 dc30b9f0fd8c121e17fe9f9352c2ff4945795b11db74a13fe943bf4424bc0ddaa7745ad12477c7a37c51bedc6c1ce29b72803cf2e1bf82b5d8d124fed0a2e4c8
 DIST jupyter_console-6.6.2.tar.gz 34270 BLAKE2B 860d3b8d5f6292c4198aaaeec4e41d4e0764e48b374c9754c06aa45d0da56a60dc74a71a8db2243e5704647fa080dbfc86112bbb5467b414b82fd9168b056ab4 SHA512 4a7508ff9ae4d1c31644588f0a594f86c2183a0799b737d6b892eeebc4892193681e3e2eb54e8a8a5ba496120722602fce87802df78015a49adc76485edb9947
+DIST jupyter_console-6.6.3.tar.gz 34363 BLAKE2B fd5875f608bec0528f7751b7cb146bff3f5c6caeb531a360eb5dd6164c44b3a4a84d1371756f42c256fbada7572176172894a01bc5b7cca835f12a390815ff5a SHA512 fc896dfc783648127690458712e90eced9578629dd55e3bfc9e15319ffa919c118c78d7872f0274455c3996fa9321bccdfa204b94b45a2de733b7703894c9034
diff --git a/dev-python/jupyter_console/jupyter_console-6.6.3.ebuild b/dev-python/jupyter_console/jupyter_console-6.6.3.ebuild
new file mode 100644
index 000000000000..8364c94edb33
--- /dev/null
+++ b/dev-python/jupyter_console/jupyter_console-6.6.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/jupyter_console/
+	https://pypi.org/project/jupyter-console/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
+	dev-python/ipython[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/prompt-toolkit-3.0.30[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.4[${PYTHON_USEDEP}]
+"
+# util-linux provides script(1)
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		sys-apps/util-linux
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jupyterlab_server/Manifest b/dev-python/jupyterlab-server/Manifest
index ac441b956356..4a919968f631 100644
--- a/dev-python/jupyterlab_server/Manifest
+++ b/dev-python/jupyterlab-server/Manifest
@@ -1 +1,2 @@
 DIST jupyterlab_server-2.19.0.tar.gz 69979 BLAKE2B f44eea3aa2a19c0f2e548b33e1677a8daf4b6098bfb682f3ebae816d38c6cd24769aea35053f2a9e656e5b2bba2a032d4bd75ba976d30238fa4d27c9a1a69867 SHA512 058a1663ca1d6663be9de1243b178637a61e2ff156ca00163d9f30301d8527ca26235f1d3183bc2b48b6b4b82dbea595a4c7f0a989736b603851f5d78f8da078
+DIST jupyterlab_server-2.20.0.tar.gz 70481 BLAKE2B 188b8a9bd2bfc5a27ce6f8488d7768484fd71ae8bb93f28c8a49f63b1aef13551c55d7e18531830df26617883f6b780a491d3522a0dcb3ecddcc433cfb35f97b SHA512 7d9a86f56686344ffc1ad11a9fc7c736a2ac0e6b8c31f8b6d8e35e5fd982454b2362073038dfc2ed3a4f03ef53e2afcaa33fc2c956b63e44c3d1ae6efa1f9251
diff --git a/dev-python/jupyterlab_server/jupyterlab_server-2.19.0.ebuild b/dev-python/jupyterlab-server/jupyterlab-server-2.19.0.ebuild
index 7e493b80810c..7e493b80810c 100644
--- a/dev-python/jupyterlab_server/jupyterlab_server-2.19.0.ebuild
+++ b/dev-python/jupyterlab-server/jupyterlab-server-2.19.0.ebuild
diff --git a/dev-python/jupyterlab-server/jupyterlab-server-2.20.0.ebuild b/dev-python/jupyterlab-server/jupyterlab-server-2.20.0.ebuild
new file mode 100644
index 000000000000..15219ac76946
--- /dev/null
+++ b/dev-python/jupyterlab-server/jupyterlab-server-2.20.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=hatchling
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Server components for JupyterLab and JupyterLab like applications"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyterlab/jupyterlab_server/
+	https://pypi.org/project/jupyterlab-server/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/Babel-2.10[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+	>=dev-python/json5-0.9.0[${PYTHON_USEDEP}]
+	>=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}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${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}]
+		>=dev-python/openapi-spec-validator-0.5.1[${PYTHON_USEDEP}]
+		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+# TODO: package autodoc_traits
+#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme dev-python/myst-parser
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		tests/test_translation_api.py
+	)
+
+	EPYTEST_DESELECT=(
+		# Fails if terminal not available
+		tests/test_labapp.py::test_page_config
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_tornasync.plugin
+}
diff --git a/dev-python/jupyterlab_server/metadata.xml b/dev-python/jupyterlab-server/metadata.xml
index edbf614f1086..edbf614f1086 100644
--- a/dev-python/jupyterlab_server/metadata.xml
+++ b/dev-python/jupyterlab-server/metadata.xml
diff --git a/dev-python/jupyterlab/jupyterlab-3.5.3.ebuild b/dev-python/jupyterlab/jupyterlab-3.5.3.ebuild
index 30f782a93c72..ccc5df62e0e5 100644
--- a/dev-python/jupyterlab/jupyterlab-3.5.3.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.5.3.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-python/ipython[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab_server-2.10[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab-server-2.10[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_server-1.16[${PYTHON_USEDEP}]
 	>=dev-python/nbclassic-0.2[${PYTHON_USEDEP}]
 	<dev-python/notebook-7[${PYTHON_USEDEP}]
@@ -38,7 +38,6 @@ BDEPEND="
 	test? (
 		dev-python/check-manifest[${PYTHON_USEDEP}]
 		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/jupyterlab_server[${PYTHON_USEDEP}]
 		dev-python/openapi-core[${PYTHON_USEDEP}]
 		dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
 		dev-python/pytest-console-scripts[${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 9ad2df1aaae2..71ae042f2318 100644
--- a/dev-python/jupyterlab/jupyterlab-3.6.1-r1.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.6.1-r1.ebuild
@@ -23,11 +23,11 @@ RDEPEND="
 	dev-python/ipython[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab_server-2.19[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab-server-2.19[${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}]
+	>=dev-python/jupyter-server-ydoc-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/jupyter-server-ydoc-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/nbclassic-0.2[${PYTHON_USEDEP}]
 	<dev-python/notebook-7[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
@@ -40,7 +40,6 @@ BDEPEND="
 	test? (
 		dev-python/check-manifest[${PYTHON_USEDEP}]
 		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/jupyterlab_server[${PYTHON_USEDEP}]
 		dev-python/openapi-core[${PYTHON_USEDEP}]
 		dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
 		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index f4eb7787245c..1d342815da61 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,2 +1,3 @@
 DIST pylint-2.16.2.gh.tar.gz 1382056 BLAKE2B 35c4c07fb750c884d62c9ec563e5133654b9ecef41d320976214a1cae25cd28f1681dcc3053cc358276cfc3cc76df770fbb2f7691e387bb07b6ff803f4a21d0b SHA512 36a76fa7a5ae9c4fead66a0964dd40963c51db8225ec112b0557d04ddf2f89ea9649e390c005ccc35341b2ac5f69f6ccf17652d08cba223fdcd36ccf433659bb
 DIST pylint-2.16.3.gh.tar.gz 1382318 BLAKE2B 67e2e7b6facde79268267e44081e1b71e391654b959e39c0d3893e1d6ffd0a79423d3c9663e0aeaadd4321669e17799af4351bcbd2cbd51518ec5f1b4db940ab SHA512 3918c15bbf94de7a4150652dc1fc8cc2929255470198d52bcbfe1205017192e748a852aa0174bf864165ce5e9eac70e4f1a23ca3275fea3f584216c32b224b61
+DIST pylint-2.16.4.gh.tar.gz 1382902 BLAKE2B 515078d2677e4374041de563ec2a98cf877848a0f1042c26f331a21335e030e15a3d6ba4eb539c18cc3835fc9505270c540b9c64f61c037759171deec41f5f10 SHA512 144a7b048340c65082f02f34d511e0066019ac08d28eb5f8c114086b66a471355631355b24f291916fa2e6b9db8e0e69a4649ad9ce036bbf2418fd6a73089fc5
diff --git a/dev-python/pylint/pylint-2.16.4.ebuild b/dev-python/pylint/pylint-2.16.4.ebuild
new file mode 100644
index 000000000000..3ce07cad21fe
--- /dev/null
+++ b/dev-python/pylint/pylint-2.16.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="
+	https://pypi.org/project/pylint/
+	https://github.com/PyCQA/pylint/
+"
+SRC_URI="
+	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="examples"
+
+# Make sure to check https://github.com/PyCQA/pylint/blob/main/pyproject.toml#L34 on bumps
+# Adjust dep bounds!
+RDEPEND="
+	<dev-python/astroid-2.16[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/dill-0.3.6[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	<dev-python/isort-6[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/tomlkit-0.10.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+BDEPEND="
+	test? (
+		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	rm -rf pylint || die
+
+	local EPYTEST_DESELECT=(
+		# TODO
+		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
+		'tests/test_functional.py::test_functional[dataclass_with_field]'
+		'tests/test_functional.py::test_functional[no_name_in_module]'
+		'tests/test_functional.py::test_functional[shadowed_import]'
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
+		tests/config/pylint_config/test_run_pylint_config.py::test_invocation_of_pylint_config
+
+		# apparently fragile, needs unpickleable plugin
+		tests/test_check_parallel.py::TestCheckParallelFramework::test_linter_with_unpickleable_plugins_is_pickleable
+	)
+	local EPYTEST_IGNORE=(
+		# No need to run the benchmarks
+		tests/benchmark/test_baseline_benchmarks.py
+	)
+	epytest
+}
+
+python_install_all() {
+	if use examples ; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pypdf/Manifest b/dev-python/pypdf/Manifest
index 0c4ead2a4c43..2e163b75b80a 100644
--- a/dev-python/pypdf/Manifest
+++ b/dev-python/pypdf/Manifest
@@ -2,4 +2,6 @@ DIST pypdf-3.3.0.gh.tar.gz 6803536 BLAKE2B ff70995882581c816fbf7410232c68e964963
 DIST pypdf-3.4.0.gh.tar.gz 6931831 BLAKE2B 037ac998cc1e3d078281b64183197678a80345731f6d4691b00f9e546eb61eaa34c4d7f4b704191c887975517da73359983f1b7405776e99257f79b1604dafc0 SHA512 9bee70a039c42533b600f1e95e28a4889d7df212bae18deca7d88501008d3a3e2b4d7fe36134e947cb14b0acc650126688c358ce2b662917a4c6df46241db1ab
 DIST pypdf-3.4.1.gh.tar.gz 6930245 BLAKE2B 9e8a5a1ebe95b64c9274ce6b0ea252d65f41d4b6791d6c6acf87f810794892337aed13ddc9b77f05a404fe94b3d9c2444f2a06c4feea9661204e71684bbbbfd5 SHA512 e2e3fa74bc6e96afc5999429e7603dd3ab8e6443b6259e456bc6d90cb2d7a15a484b226e218478c1e92cfd7fe23c93247f212568c6fcd51d80afde32b83460ba
 DIST pypdf-3.5.0.gh.tar.gz 7181507 BLAKE2B 8f5c129613ed12a9eaa90cf0e6fa189b0fc5bf109f26b8cc35ff1550e916b0635715359b2ece9c3c0243095c2e802474e99fe4c59d16b0f75b4375fb2ce07e5d SHA512 a8a0fad3fd08d88738088a06df4f1cbf419571e9e817c6097ce8bdcf7b1dd32f478ac712879cabceb7034f4e9a421f887ff117a1812782eadb670c8043aff86c
+DIST pypdf-3.5.1.gh.tar.gz 7183874 BLAKE2B 29ce7d052f0c466e72974ec051e149c2383136cc0097e2e104c4c1e5c37836f7908b25bfaa32e5fd85082f860b06ad88adbfbb5bbff95bc7a735e127b26d7964 SHA512 4f28cc0822f472087f096b4b2ee553b87e458009b29c43d41bbba53de9862292c78f4b31a860d4c783a6af4f92fdf32612bab7a42190373d9d9ceae39080bb35
 DIST pypdf-sample-files-0fe84b30ed33ff3daa9293e44349b8618f135699.gh.tar.gz 9027166 BLAKE2B 912bb9fbd632bd0ad2cc2e865a1e6870ad7064aa2cf4d6f96217f63ac685e9a511f0bb20c22d48ae970a2eb171b27a0fa680fa42892425531f69735840cf741b SHA512 07a71a3566dabcea5dc8a549949d0f0c0f9483d5d9f85851d6e4e702dd374b348469a80e5300d18983e560ee9a44d0639b55eb338023b9ebbdb26c6f8c455e07
+DIST pypdf-sample-files-fb7a080b35b3553bd10221282beeda7847959e83.gh.tar.gz 9027029 BLAKE2B 8f8797263b86f08efd9708d5812000efd08708abf66a0e95f50f5a147102e555dd7f8c465ae73cae842d86efdb52cabba5f8962626f56cb1b98409bfa108e150 SHA512 3a9cdab964a14cf6b14d80d917441a4e5effe2b7647163b666781ecabd189624dbbe5039111f6b1d753ff73e013665a1b86d87ca7806580fda58ec5810f88e94
diff --git a/dev-python/pypdf/pypdf-3.5.1.ebuild b/dev-python/pypdf/pypdf-3.5.1.ebuild
new file mode 100644
index 000000000000..688053dcdece
--- /dev/null
+++ b/dev-python/pypdf/pypdf-3.5.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+SAMPLE_COMMIT=fb7a080b35b3553bd10221282beeda7847959e83
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/pypdf/
+	https://github.com/py-pdf/pypdf/
+"
+SRC_URI="
+	https://github.com/py-pdf/pypdf/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
+			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
+	)
+"
+S=${WORKDIR}/pypdf-${PV}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# rely on -Werror
+	tests/test_utils.py::test_deprecate_no_replacement
+	tests/test_workflows.py::test_orientations
+)
+
+src_unpack() {
+	default
+	if use test; then
+		mv "sample-files-${SAMPLE_COMMIT}"/* "${S}"/sample-files/ || die
+	fi
+}
+
+python_test() {
+	epytest -o addopts= -m "not enable_socket"
+}
diff --git a/dev-python/python-memcached/Manifest b/dev-python/python-memcached/Manifest
index ad992bd85f4b..0cf6825f7023 100644
--- a/dev-python/python-memcached/Manifest
+++ b/dev-python/python-memcached/Manifest
@@ -1 +1,2 @@
 DIST python-memcached-1.59-gh.tar.gz 32334 BLAKE2B de8d18ba887b03e4737b554cc4b0074a4f16745e26a8b3631a747c45019e1da83612677dc3e98f97d76e851320c61baafbd0a29231a826c14b7d3bf3e477f29e SHA512 d7ff45a329f2a9bf97fdc7c0268c2c67046c3501270fcf03578b955c2da35904d7bdecd4239924d390797ddff8f4cc69fc5743f4d4f663cdb9f2f8c7e8159512
+DIST python-memcached-1.59.gh.tar.gz 32334 BLAKE2B de8d18ba887b03e4737b554cc4b0074a4f16745e26a8b3631a747c45019e1da83612677dc3e98f97d76e851320c61baafbd0a29231a826c14b7d3bf3e477f29e SHA512 d7ff45a329f2a9bf97fdc7c0268c2c67046c3501270fcf03578b955c2da35904d7bdecd4239924d390797ddff8f4cc69fc5743f4d4f663cdb9f2f8c7e8159512
diff --git a/dev-python/python-memcached/metadata.xml b/dev-python/python-memcached/metadata.xml
index b8315c1b2cc5..fcddaf8e3cfb 100644
--- a/dev-python/python-memcached/metadata.xml
+++ b/dev-python/python-memcached/metadata.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>robbat2@gentoo.org</email>
-  <name>Robin H. Johnson</name>
- </maintainer>
  <maintainer type="project">
   <email>python@gentoo.org</email>
   <name>Python</name>
  </maintainer>
- <longdescription lang="en">
-		This is a Python based API (implemented in 100% python) for communicating with
-		the memcached distributed memory object cache daemon.
-	</longdescription>
  <upstream>
   <bugs-to>https://github.com/linsomniac/python-memcached/issues</bugs-to>
  </upstream>
diff --git a/dev-python/python-memcached/python-memcached-1.59-r1.ebuild b/dev-python/python-memcached/python-memcached-1.59-r1.ebuild
index 6cc5bc969d0f..d5451702abbc 100644
--- a/dev-python/python-memcached/python-memcached-1.59-r1.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.59-r1.ebuild
@@ -27,23 +27,23 @@ BDEPEND="
 	)
 "
 
-distutils_enable_tests nose
+distutils_enable_tests unittest
 
 python_test() {
 	local pidfile="${TMPDIR}/memcached.pid"
 
-	memcached -d -P "$pidfile" || die "failed to start memcached"
+	memcached -d -P "${pidfile}" || die "failed to start memcached"
 
-	nosetests -v || die "Tests fail with ${EPYTHON}"
+	eunittest || die "Tests fail with ${EPYTHON}"
 
-	kill "$(<"$pidfile")" || die "failed to kill memcached"
+	kill "$(<"${pidfile}")" || die "failed to kill memcached"
 	local elapsed=0
-	while [[ -f "$pidfile" ]]; do
-		if [[ $elapsed -ge 30 ]]; then
-			kill -KILL "$(<"$pidfile")" || die "failed to kill -KILL memcached"
+	while [[ -f ${pidfile} ]]; do
+		if [[ $(( elapsed++ )) -ge 30 ]]; then
+			kill -KILL "$(<"${pidfile}")" ||
+				die "failed to kill -KILL memcached"
 			die "memcached failed to stop after 30 seconds"
 		fi
 		sleep 1
-		let elapsed++
 	done
 }
diff --git a/dev-python/python-memcached/python-memcached-1.59-r2.ebuild b/dev-python/python-memcached/python-memcached-1.59-r2.ebuild
new file mode 100644
index 000000000000..371543cd5661
--- /dev/null
+++ b/dev-python/python-memcached/python-memcached-1.59-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python memcached client"
+HOMEPAGE="
+	https://github.com/linsomniac/python-memcached/
+	https://pypi.org/project/python-memcached/
+"
+SRC_URI="
+	https://github.com/linsomniac/python-memcached/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="PSF-2.4"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		net-misc/memcached
+	)
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	local pidfile="${TMPDIR}/memcached.pid"
+
+	memcached -d -P "${pidfile}" || die "failed to start memcached"
+
+	eunittest || die "Tests fail with ${EPYTHON}"
+
+	kill "$(<"${pidfile}")" || die "failed to kill memcached"
+	local elapsed=0
+	while [[ -f ${pidfile} ]]; do
+		if [[ $(( elapsed++ )) -ge 30 ]]; then
+			kill -KILL "$(<"${pidfile}")" ||
+				die "failed to kill -KILL memcached"
+			die "memcached failed to stop after 30 seconds"
+		fi
+		sleep 1
+	done
+}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index dae1773b702e..f40fc43770a8 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,3 +1,4 @@
 DIST SQLAlchemy-1.4.46.tar.gz 8544238 BLAKE2B 8ef4aae61bee3c9c54b953a9ba34074d8cac0d54d8ae3389f40fa99f57755b2ee0a8a7826e0835fada2d82b96559d974172c9d9781ec746c79006f59d7a5bba0 SHA512 1977c6125e9f45a45b7941c1e0164866bd5ea72839e619d4e259db9a5370fe2b4f191257f3c9ddb28b5c22617a71d359620601c54d9273c38b3281a6c2f5ff03
 DIST SQLAlchemy-2.0.3.tar.gz 9229747 BLAKE2B b70116a8f9f24ed2b41aa7ebbe8a004371f3aa2e81487bce307157eec8032f134313091455245fe631818a1e6373e3144671f314991408f14b0f0f5f87335290 SHA512 8bf0fa6d95f26fd137690f75e335cf741b8fd19a5a30424e22bb85b79893cbbdc15e206d3f069f202200eb54254df868c4a6d3e74adc1a19e8ce8f92cc407098
 DIST SQLAlchemy-2.0.4.tar.gz 9250723 BLAKE2B c3cec648a527e7beb349b2bbb6924a4e794a1fe4d1563ba7573afdc28ed24fce149c5b3c08fa419e85713b68080b2a805e1999e312f59ed7fae55f9aee6a966e SHA512 098004c594ff00a47a66850b0661f673e4d7a6f168fce72ca37a65ecfe04b3d291b9a6fb9393f7671c9a7c5c128ab6ba2035d18cef28736df1207e689cd8c412
+DIST SQLAlchemy-2.0.5.tar.gz 9285821 BLAKE2B e0af62e05801a30d915ff4a852dc30ab61b8d5ddc632cddef549bb2d548f5a2c4056519c9ddcf690587736d415973bde9042b6cd022f874e1dc3c143ef0a6add SHA512 642f6665ca8a3aa2c30bc9e14f8e65f9baa0a678f88637e784ee8606cece92d876f8d2e639dfd462261f0c790c2f0851e3490b4c84dbaa21028df93f354b68a4
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.5.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.5.ebuild
new file mode 100644
index 000000000000..e4eb2ffc8b90
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.5.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature pypi
+
+MY_PN="SQLAlchemy"
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="
+	https://www.sqlalchemy.org/
+	https://pypi.org/project/SQLAlchemy/
+	https://github.com/sqlalchemy/sqlalchemy/
+"
+SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+RDEPEND="
+	>=dev-python/typing-extensions-4.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# hardcode call counts specific to Python versions
+	test/aaa_profiling
+)
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		test/ext/mypy/test_mypy_plugin_py3k.py
+
+	)
+	local EPYTEST_DESELECT=(
+		# warning tests are unreliable
+		test/base/test_warnings.py
+		# TODO
+		test/orm/test_versioning.py::ServerVersioningTest_sqlite+pysqlite_3_40_1::test_sql_expr_w_mods_bump
+		test/sql/test_resultset.py::CursorResultTest_sqlite+pysqlite_3_41_0::test_pickle_rows_other_process
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_multi_elem_varg
+		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_one_elem_varg
+		test/engine/test_processors.py::PyDateProcessorTest::test_date_invalid_string
+		test/engine/test_processors.py::PyDateProcessorTest::test_datetime_invalid_string
+		test/engine/test_processors.py::PyDateProcessorTest::test_time_invalid_string
+		test/dialect/test_sqlite.py::TestTypes_sqlite+pysqlite_3_40_1::test_cant_parse_datetime_message
+		test/dialect/test_sqlite.py::TestTypes_sqlite+pysqlite_3_41_0::test_cant_parse_datetime_message
+		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_40_1::test_delete_single
+		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_40_1::test_insert_single
+		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_40_1::test_update_single
+		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_41_0::test_delete_single
+		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_41_0::test_insert_single
+		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_41_0::test_update_single
+		test/base/test_utils.py::ImmutableDictTest::test_pep584
+	)
+	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
+		)
+	fi
+
+	# upstream's test suite is horribly hacky; it relies on disabling
+	# the warnings plugin and turning warnings into errors;  this also
+	# means that any DeprecationWarnings from third-party plugins cause
+	# everything to explode
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=
+	# upstream automagically depends on xdist when it is importable
+	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+		PYTEST_PLUGINS+=xdist.plugin
+	fi
+	epytest
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "asyncio support" dev-python/greenlet
+	optfeature "MySQL support" \
+		dev-python/mysqlclient \
+		dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "postgresql support" dev-python/psycopg:2
+}