Adding metadata

26 files changed, 343 insertions, 383 deletions

diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 256c6f26c9a5..304d5e3aa12d 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,4 +2,5 @@ DIST boto3-1.26.11.gh.tar.gz 561018 BLAKE2B 3bd4ddd23d0752dcaad9795041658909f8df
 DIST boto3-1.26.16.gh.tar.gz 565753 BLAKE2B 7b30f4a3e15ca893cacca7ea58e18d654f3895e37b36e08e632b4da5a3e4b7225ad864daf60604b074973f90b38ca71afb3d28ed8f90172e78193ef9a1f626c0 SHA512 54d3a3bd551cd2018070144b956d5f5af8c84fb6c689647a39b42f03ea1f1fce3c1032d9c694851977aa498950011f28b7014d5e8c4091c2f771b2d2cb1c2714
 DIST boto3-1.26.18.gh.tar.gz 570818 BLAKE2B 2f77acbb6fa77c867cda0b1d7828c5aafdfc8b6e5d7cced4beda08f151c9ed889356ec32b4b0ad2724bffbaa20690f149caf69f89dfbf70761ca354893685cb7 SHA512 b67d62057c7c421eedbf8778c2bd10d9cad9a81678dfc68415cb5ca546182c418d1c8a6619d20be066d78891af7720ec29209fecd27628e1d456b04965edfb83
 DIST boto3-1.26.20.gh.tar.gz 572957 BLAKE2B 27286beaeabc0227376640fd3ee583656470ee324805ac716411a6c87fc2f301f6430c4f82e58c4a5371fe38a4cb3a6cebe32de39c0bae35f051fd340257c315 SHA512 4623e29b4396cd131e76ad44d24e32014e9f79642db471f64b5b06553ffbd0a0492883188e3658fe629e6af0a91b8274dbda3103a3ecf6d2dd6fe5b1a91b9503
+DIST boto3-1.26.21.gh.tar.gz 573776 BLAKE2B a608b875d052cb895cae4bc20924836284dd924bfc9939023d452fbb2af2ca32fe1503b32552d19cdde6a9347dce26991a70aa4a1b980fcb7f711ed246b8e63a SHA512 3fd3aba935950738c62d5c7d8249768c352a4106be0cac989d1f0635a45606022749b4d34cb3093d44b18501ff14c30545df76d7d1f9681886ff71ec62bff888
 DIST boto3-1.26.8.gh.tar.gz 557012 BLAKE2B 211bb7441acc8b1f901ebf5251288dc7c9073fa6e34f5a34426424ef064efb0fb3031deaf48ef336ec43bb015f95f618598da43d12ec83cbf814e1b4097b28a0 SHA512 738190cedfb0b85d3a1e9558b03e7f2fb14e43b152bc9627fd95c8ecc4a0ddc17f4c87ccb6129c1fbf5f47db9eea4dbc5c2cfbb69b903bc6f3ff417ef86b6f6b
diff --git a/dev-python/boto3/boto3-1.26.21.ebuild b/dev-python/boto3/boto3-1.26.21.ebuild
new file mode 100644
index 000000000000..3d7d652a3b69
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.21.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 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 e887120c903a..bb8fd71686fb 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,4 +2,5 @@ DIST botocore-1.29.11.gh.tar.gz 10660645 BLAKE2B 0d5f8a7e34f99947e1488b468699e68
 DIST botocore-1.29.16.gh.tar.gz 10709321 BLAKE2B d9a8590b1685351f1167962fa45f97906554dead7ec72487f390a78cf5e0cbca933e4e2d6d147af9beb43f05299a771cfb5f6d76e58d44397eeb6240e8856167 SHA512 247c9800a24141cf970f02ae3c6436027c86677f1a287f24be4d85292add874465851b8a963dc49dffe103b1088e5120db18dc58d93f04285715f0b4fe08258e
 DIST botocore-1.29.18.gh.tar.gz 10837962 BLAKE2B c1d32b31ba687427f6c88e53dd4908d966b83d3d5d087b64e5370b7294d568a09dfe08e72e89acf8402dbf887369c509d1c7fcf77c5156ef9029319878e7311c SHA512 2e8e7108e343028cf6ff30fd9f6b66b8b49a2b3013656ee3fc912c67052a42eca49d93a57e322248dfce7cfa765c6bf4b78f364a71b843536853bc4f413e1930
 DIST botocore-1.29.20.gh.tar.gz 10956292 BLAKE2B 3453a1051056f8f6bc870c66b66d81b4f68dca97068ebb0beed286f3534798483254a0a3390e9b2ce07d25a01b35e81ceccc9c5f8cfd5bf18147931a9048e242 SHA512 c99e1cb4f0f55715d88ec8fe6602fef60254cacd9e2c1b309bfa1b8dfdc5c979c60f558b08f953afcc0985859091f4fad5c21e1906c177eaa8bc2dcd8216a3aa
+DIST botocore-1.29.21.gh.tar.gz 10994190 BLAKE2B 00a40dd701f659f63c0c0862e96922a341e8e13f2ede29c2153196810769f3c321ee66af5a4a9284ac999c5ff6bbd1b1484a1396fe97407726896b4d6860d1a1 SHA512 6743f2997221d9474f814e27ab1d6303062ed942e933619683c519a731883d1e5f06700f4730545e794cbc401ab8e20a19e08fdd06baf4cd7bac4e57bcd439c9
 DIST botocore-1.29.8.gh.tar.gz 10636661 BLAKE2B 3ebd9e5cb6cc1a9d4ddb877e806e0a845e6a19a4604b4489dbdb9a0f35251201de5d7062f3b0193db3e28f5170d8c3315fdc0b2bec7668a61880ff3e9305d3bc SHA512 c4a1a3993576bd0340de4eeb25e10650219e9d74c21f7e51e5298120bc92a8359143c38d5a991b940316fc5eac483e4e838298881a5c068fa91dc3ebf92a7f5a
diff --git a/dev-python/botocore/botocore-1.29.21.ebuild b/dev-python/botocore/botocore-1.29.21.ebuild
new file mode 100644
index 000000000000..40131f66e350
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.21.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 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/clang-python/Manifest b/dev-python/clang-python/Manifest
index c7036963f43c..75192372b790 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,11 +1,8 @@
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
-DIST llvm-project-15.0.3.src.tar.xz 112069972 BLAKE2B 3d29bab890467ba87fedcc4e76522f444e63e3dfbe546793f8e67821bcd403bad460ea176254c9e0b72d60ea56b8480e498a7f610477c1108732d178804c26cd SHA512 d378d417f01c56534f301cfe6cb4958d811c04ae22acaacc917e7e5f0380859d40ce19dffb265d046b70fff95dbc2e759f492e4d5af0ade52f21ebaa8da65856
-DIST llvm-project-15.0.3.src.tar.xz.sig 438 BLAKE2B e7e0614e144eb878f694c12e97cf42ff8476e47cb55e8f259eb2ec52e303463ad753771271512e89baf0137c1382b11cfa028c85324174ebcd054a124000f537 SHA512 41229bebdb0c2df9a5e3a4d6f02d39fac7dc91f21895a659523beab4fa3ef99ff06eff5e4386221369b6e2b6f8fe974d67b7d8496d5911ce484d09ae0db8b916
 DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6cc574a31c4abe038331b86206348ac3ce93a243add2be3a0bbfc2ec5ec3f3562a5b5efea745cb1943c9c9153bc7b0fcf4de22e SHA512 cf2a89ebb6bc9d7e3f1fd09531c84ac9927cdbe5ee13a6fcb8ce4d08e5a9d6d480ad982f62126b9c757beafa283b34f2ba1fbc56223c641e70da2be4627f59a6
 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
-DIST llvm-project-7b91798a5d3a8432b296778da4efe169012fb7b4.tar.gz 170989337 BLAKE2B 1ab79554a05f8d7a74c0b4bab319c30375475d3fd089764733744fde55c65eb38967cdb19e5b0211a1543549c2bfc3c0f3d43facb7e041f51988e8a65e4448f3 SHA512 4c4d3a748b967cbc75372d0db87ac48d32271a54047ddeeb028d565fa6b7004b2ab3abd82d8ff4621e50c9410fce28c3044550cc94aaf0f6e4f672498f47aba8
 DIST llvm-project-959c9cc7acf4d0aa433f2436e2a45b782e18022a.tar.gz 171575300 BLAKE2B 090d41a8913f8e061d297e66ca653d95e18b8da744464d7085d7a199c0a444753a82b6ff6503e142aec81be01b419323cdbe3709497738df74afa886d69fd63d SHA512 fc3b26e148ead7a07b4d1509909a42712a43b179da435b052c26a237b0d2ae88c3c8d76eaa93c415be1ed0f0b5fb55e0ad92f427a18d70bc9634a6e7d1b6a4d9
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
diff --git a/dev-python/clang-python/clang-python-15.0.3.ebuild b/dev-python/clang-python/clang-python-15.0.3.ebuild
deleted file mode 100644
index ffde05f54afd..000000000000
--- a/dev-python/clang-python/clang-python-15.0.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-DEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
-	# tests rely on results from a specific clang version, so override
-	# the search path
-	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/clang-python/clang-python-16.0.0_pre20221120.ebuild b/dev-python/clang-python/clang-python-16.0.0_pre20221120.ebuild
deleted file mode 100644
index f0edde68d67f..000000000000
--- a/dev-python/clang-python/clang-python-16.0.0_pre20221120.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-DEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
-	# tests rely on results from a specific clang version, so override
-	# the search path
-	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index e809653bd43a..63baa4fb791b 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,4 +1,5 @@
 DIST python-api-core-2.10.0.gh.tar.gz 180767 BLAKE2B 1f8d86fbd39c6bed927b2354c7e734ef2de563e2583bc4d9bff8121ae45b5538c67472a723e6c6990d1c5aa165ea83e3c1184fae2fd79ce2ea985aa89e057c7a SHA512 e4719eee37e04719d6ce7d0fe99e106ffdc8fba08f73d02f94b597f7c6fa4e57a0e28876b1c5baa2a9ce77220422f17d234b0d802d63238217a902fab65d546c
 DIST python-api-core-2.10.1.gh.tar.gz 181127 BLAKE2B 5f900c48ed367cbee03079efd78f16f9c07c2bf976757496fe9cee1ebbed5a9fe52e6c4f9f2a8ea6b7739e82c2efe44f294a3fb2586e19240855737431508f94 SHA512 f66188cc154d39483dc23e15d3d8100e5b6851cf44fa52d6e1917016d295b5de37132627ef9044905ab4e28f7b2f2e5131ce00ed50631d83c66fa192b106904e
 DIST python-api-core-2.10.2.gh.tar.gz 181173 BLAKE2B 181aa7ed47c64a231ee30e7719f3e3c271de14408466cbb41653e2eea4617058fcb60da31c77d98d33b0026352e6a3d5e61fabf03b480c596eb8aebfd5b8bab0 SHA512 4f2f98aad9638516e6e96ade137a1f6bf877c8a9d03537c11cf85e4550d19fe166ba1a2963d1dfde9931cea4e98d581d8f734644c3b623b78aedc4e2711e0aa8
+DIST python-api-core-2.11.0.gh.tar.gz 187535 BLAKE2B e8029b6344b572e1dcc8455b95f3ee63c8d3684f0c8807793e4e6ba2dd0179c939f183144085c2b94a29b8a1ae0e39aeffceb632988702806665ec39c51e3ce5 SHA512 798ff3970027d7ce60dcb62a88d395ebf00454f902fda4f272fc240b9ec104af112dd9de479fb6761990c48931c8ccd8c5223a1b2b5fa44823cabac862efdba8
 DIST python-api-core-2.8.2.gh.tar.gz 164586 BLAKE2B bd62b20d1be52f0a2227d1663ee37ce31d991e0773ed793a3999b70c74e03a28ac188cc331027def0055a5b80e93378d9ec5baa389c65e7d2f183b37233be5ac SHA512 5844339cee71103650c446f002dcb13a632086d96dec1ed04a0ad5e4d3a61cc2a8e048da3e6445a50a0c009b0d25729f02865d28484bfee2a3427c829537e350
diff --git a/dev-python/google-api-core/google-api-core-2.11.0.ebuild b/dev-python/google-api-core/google-api-core-2.11.0.ebuild
new file mode 100644
index 000000000000..1d8eece3dd88
--- /dev/null
+++ b/dev-python/google-api-core/google-api-core-2.11.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+MY_P=python-api-core-${PV}
+DESCRIPTION="Core Library for Google Client Libraries"
+HOMEPAGE="
+	https://github.com/googleapis/python-api-core/
+	https://pypi.org/project/google-api-core/
+	https://googleapis.dev/python/google-api-core/latest/index.html
+"
+SRC_URI="
+	https://github.com/googleapis/python-api-core/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/googleapis-common-protos-1.56.2[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.19.5[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/proto-plus[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# failing due to missing grpcio-status
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_unary_errors
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_raised
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_read
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_aiter
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_write
+	tests/unit/test_grpc_helpers.py::test_wrap_unary_errors
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_invocation
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_iterator_initialization
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_during_iteration
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+src_test() {
+	rm -r google || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	distutils_write_namespace google
+	epytest -p no:aiohttp -p no:trio tests
+}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 5695ad31f09e..a5df947c186b 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,2 +1,3 @@
 DIST google-auth-2.13.0.tar.gz 216209 BLAKE2B 4e88062d89ca9976e0d87a93012c8ca318f9068452fde365970aab1d6ab4985aad378a038e36e0a82aca4665a196c412287a84b58c831edc9483d02fa4ed2489 SHA512 253dd17466850b20212c8cbbeb29c35dbffb2f3205867c7fdf74e400e4f2f9bf3c9ca6ffc814e5c3e9c7cc918a6cc60e696bc98c5d969761101dee4109b7018e
 DIST google-auth-2.14.1.tar.gz 220079 BLAKE2B 7e0958bd0f83bb9e47e5ea191a6f90f221630c67638082fdafb2b925e44eb9c68f6b91e86ab8b7869edb70de21c3be44041ded6507c2819754b19b13bd342a0c SHA512 1aec6b7104d71f58d1bc76472b204261eb6fc3030d0ed5f523bb125a9169544bc6266a8ae4573fce28423b689f2efcf57aadafc6c21876824fc17b2a96bbed95
+DIST google-auth-2.15.0.tar.gz 221698 BLAKE2B 73decb21ab51889d2f22a2dca9d01f8c7d77a37a5ba186e2fba05bfb7a56f0e5ea0f5c1396c0be527b03e9083e98995e96f0081973e97766fafc6a63946c0015 SHA512 4a564503195e4a96ac2a89bb208c37e434185439533913285ca03a3627f28e641a99224ae285ced84050fdc6073e075b1ba288e9a9c18d3e6adf70509b5ee68b
diff --git a/dev-python/google-auth/google-auth-2.15.0.ebuild b/dev-python/google-auth/google-auth-2.15.0.ebuild
new file mode 100644
index 000000000000..e1be3d9ce804
--- /dev/null
+++ b/dev-python/google-auth/google-auth-2.15.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# these are compatibility tests with oauth2client
+	# disable them to unblock removal of that package
+	tests/test__oauth2client.py
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/jsonpickle/jsonpickle-3.0.0.ebuild b/dev-python/jsonpickle/jsonpickle-3.0.0.ebuild
index 21764db41dcd..f91d7999d395 100644
--- a/dev-python/jsonpickle/jsonpickle-3.0.0.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-3.0.0.ebuild
@@ -23,6 +23,7 @@ BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/feedparser[${PYTHON_USEDEP}]
+		dev-python/gmpy[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pandas[${PYTHON_USEDEP}]
 		dev-python/simplejson[${PYTHON_USEDEP}]
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index 5473453c98d0..73d777533a01 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -1,3 +1,2 @@
-DIST libtmux-0.14.2.gh.tar.gz 234682 BLAKE2B e93b0a280c3cfdfab4c9a313d251d15665c530813f00aa78151efe62a6a566f2d8986afed015de4a8be80b48f31ac197e98d3efa592eb8895e8d9626ff34ef72 SHA512 1565529ecf555dac8f896146e2d802c0e5460458ea1da6ba5496d5d2c394f56cc8c5f7650c5d4aebd1750659bbdc529e439e60dff6a0ccef8806bb65305d2421
 DIST libtmux-0.15.10.gh.tar.gz 240378 BLAKE2B 81841a25b01bb26d2c612a14cd4518c48b12162d4aafa280fe0d6de269d149bddaffe72f4ce2c735e41b00cd2bfec19773d7cd3b9fd927c892f11f0cdf8e8a88 SHA512 8ee870c94bd3e3a9fffc19854f978d4faad747ea395e53c3576adc9cc2dcdd3cbdedeeb589a2dc11b0ac836931ffbdcea06a4a850b2ead163235dda2334defb5
 DIST libtmux-0.15.9.gh.tar.gz 239611 BLAKE2B 7a171c827fde0ddf3fa0191c00d4e22e5027d925781f7231497c09a038f16d3408ba894d4f8d71470a0d8dbb8f1fc387971d3c8ec94d9f03a3f0af0e2ac0c7c7 SHA512 e7599dece70188cd210de7a1e554d86ba12b8479757dd03903cf3e0608e8e9cf3d181e4c0afc7432d6977dece931707120399690932099ed7d07d847ac76655c
diff --git a/dev-python/libtmux/libtmux-0.14.2.ebuild b/dev-python/libtmux/libtmux-0.14.2.ebuild
deleted file mode 100644
index 3574b72fa96e..000000000000
--- a/dev-python/libtmux/libtmux-0.14.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="python api for tmux"
-HOMEPAGE="https://libtmux.git-pull.com/"
-SRC_URI="
-	https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	>=app-misc/tmux-3.0a
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/twine[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	libtmux/pane.py::libtmux.pane.Pane.send_keys
-)
-
-python_prepare_all() {
-	local issues="https://github.com/tmux-python/libtmux/issues/"
-	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
-	rm requirements/doc.txt || die
-
-	# increase timeouts for tests
-	sed -e 's/0.01/0.1/' -i tests/test_test.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index c7036963f43c..75192372b790 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,11 +1,8 @@
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
-DIST llvm-project-15.0.3.src.tar.xz 112069972 BLAKE2B 3d29bab890467ba87fedcc4e76522f444e63e3dfbe546793f8e67821bcd403bad460ea176254c9e0b72d60ea56b8480e498a7f610477c1108732d178804c26cd SHA512 d378d417f01c56534f301cfe6cb4958d811c04ae22acaacc917e7e5f0380859d40ce19dffb265d046b70fff95dbc2e759f492e4d5af0ade52f21ebaa8da65856
-DIST llvm-project-15.0.3.src.tar.xz.sig 438 BLAKE2B e7e0614e144eb878f694c12e97cf42ff8476e47cb55e8f259eb2ec52e303463ad753771271512e89baf0137c1382b11cfa028c85324174ebcd054a124000f537 SHA512 41229bebdb0c2df9a5e3a4d6f02d39fac7dc91f21895a659523beab4fa3ef99ff06eff5e4386221369b6e2b6f8fe974d67b7d8496d5911ce484d09ae0db8b916
 DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6cc574a31c4abe038331b86206348ac3ce93a243add2be3a0bbfc2ec5ec3f3562a5b5efea745cb1943c9c9153bc7b0fcf4de22e SHA512 cf2a89ebb6bc9d7e3f1fd09531c84ac9927cdbe5ee13a6fcb8ce4d08e5a9d6d480ad982f62126b9c757beafa283b34f2ba1fbc56223c641e70da2be4627f59a6
 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
-DIST llvm-project-7b91798a5d3a8432b296778da4efe169012fb7b4.tar.gz 170989337 BLAKE2B 1ab79554a05f8d7a74c0b4bab319c30375475d3fd089764733744fde55c65eb38967cdb19e5b0211a1543549c2bfc3c0f3d43facb7e041f51988e8a65e4448f3 SHA512 4c4d3a748b967cbc75372d0db87ac48d32271a54047ddeeb028d565fa6b7004b2ab3abd82d8ff4621e50c9410fce28c3044550cc94aaf0f6e4f672498f47aba8
 DIST llvm-project-959c9cc7acf4d0aa433f2436e2a45b782e18022a.tar.gz 171575300 BLAKE2B 090d41a8913f8e061d297e66ca653d95e18b8da744464d7085d7a199c0a444753a82b6ff6503e142aec81be01b419323cdbe3709497738df74afa886d69fd63d SHA512 fc3b26e148ead7a07b4d1509909a42712a43b179da435b052c26a237b0d2ae88c3c8d76eaa93c415be1ed0f0b5fb55e0ad92f427a18d70bc9634a6e7d1b6a4d9
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
diff --git a/dev-python/lit/lit-15.0.3.ebuild b/dev-python/lit/lit-15.0.3.ebuild
deleted file mode 100644
index 8d3d0632bae8..000000000000
--- a/dev-python/lit/lit-15.0.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm
-	)
-"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/lit/lit-16.0.0_pre20221120.ebuild b/dev-python/lit/lit-16.0.0_pre20221120.ebuild
deleted file mode 100644
index b8f7eadfb336..000000000000
--- a/dev-python/lit/lit-16.0.0_pre20221120.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm
-	)
-"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/metakernel/Manifest b/dev-python/metakernel/Manifest
index 49fad2eb68b0..3ad3a44cba37 100644
--- a/dev-python/metakernel/Manifest
+++ b/dev-python/metakernel/Manifest
@@ -1 +1,2 @@
 DIST metakernel-0.29.2.tar.gz 189938 BLAKE2B cbcce893865d82198a79c892b40c67809202e4d947a590fce52d2ca85bd919bac5556d0fb27b53a91a4e7f5b4409c48c84bcb6ae28c04aed159507bf1f65102c SHA512 d4ea32ea4f9b00cf223419f641f297a65737f8acb1774bd0dc209006a33ac0e41853da0d077492149fd3bd141de0e181a15df092618b2977899a68768c750ca9
+DIST metakernel-0.29.3.tar.gz 189920 BLAKE2B 2004cdee9d633490a706cf3045253e5907554134501deba4c80a0d6e5e42f67dfc4f1a6e4918d13975579a93d37daa63252f61471791b28693634362519bb8c0 SHA512 c30e9cfde039599fb511ea61535f5f6d949e4c47033fd671397d5cc899002233c0df3218d5e0caa68ff0f37e5b3a3a85c03b9aa0fc8479a5dadb0ab91e7feb1a
diff --git a/dev-python/metakernel/metakernel-0.29.3.ebuild b/dev-python/metakernel/metakernel-0.29.3.ebuild
new file mode 100644
index 000000000000..d0bfe8f9facf
--- /dev/null
+++ b/dev-python/metakernel/metakernel-0.29.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Metakernel for Jupyter"
+HOMEPAGE="https://github.com/Calysto/metakernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ipykernel-5.5.6[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.9.2[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.18[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.8[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/jupyter_kernel_test[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.25.0-disable-brittle-tests.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index c11400729b7e..d72cac1d5e5c 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,4 +1,3 @@
-DIST pyglet-1.5.26.tar.gz 6534434 BLAKE2B a4366390f4ed92ed9e6c2d362fd8a009adf0e8a21ca00e1b9fead3cba99d192bb007413eca36892433f3bc4e2bf3258c550b2827262fc70e87b20566d46acb15 SHA512 819b2bbf71c9c632c1cefbb31e2a7186905c1475a1e978cd75dd6c019e5a53e6af79bceb57c68b61a3bb5692e04091c89c67b9168bb76ee19009c1ab719b8530
 DIST pyglet-1.5.27.gh.tar.gz 6532179 BLAKE2B f1dc668530a69e275860befe11f4c86003c5de2dadede706df7abac9eb6fb1729ea030c7053f0149926f3ffdd12985d9abea4afac65de3b6b7541fe871eda369 SHA512 98896dab06873cbf3cdd0d4015cb0b9e062cffb1110908bd422ecdc4f0e16943adc8a4986e7dbfdae4392e82ac115bad6f937896e166989ad2c4d73a0f45c8be
 DIST pyglet-2.0.0.gh.tar.gz 6201132 BLAKE2B e72436804688e9022f0efc7da7fac5eb31ed2d35632612149b52431167db98f1d2e8bc3824ef6bd69851a8bf609d5098ea5f5c77aa7bcf5a527457c62ed47586 SHA512 2dde724f0b5f284d0094109a7077464ac4ec76ea905c91ddc096032ac849ee9720ee36926e9f11969169906c7e45580789001dfc657edc2e737ad116c48c588a
 DIST pyglet-2.0.1.gh.tar.gz 6202313 BLAKE2B be77d8b1736a41ff97c91db2019716eb85be87c91847f1588ffa8c502224b127aa04b038a207890a7abd099f9a956cfa8836d25e50a913f3a8439edfc078942e SHA512 a8670a8845b1743347b1b8cac19ee62056b2ea819ba2e14e567bc2d42f4ff7d1dc2c10e782b1bd670aef69e78971dca8d740787065ef1c2923cb62a3570e7bec
diff --git a/dev-python/pyglet/pyglet-1.5.26.ebuild b/dev-python/pyglet/pyglet-1.5.26.ebuild
deleted file mode 100644
index a2ed115b9760..000000000000
--- a/dev-python/pyglet/pyglet-1.5.26.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="Cross-platform windowing and multimedia library for Python"
-HOMEPAGE="
-	https://pyglet.org/
-	https://github.com/pyglet/pyglet/
-	https://pypi.org/project/pyglet/
-"
-SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="examples image +sound"
-
-BDEPEND="
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		media-libs/fontconfig
-	)
-"
-RDEPEND="
-	virtual/glu
-	virtual/opengl
-	image? ( || (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		x11-libs/gtk+:2
-	) )
-	sound? ( || (
-		media-libs/openal
-		media-sound/pulseaudio
-	) )
-"
-#	ffmpeg? ( media-libs/avbin-bin )
-
-DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	xdg_environment_reset
-
-	local EPYTEST_DESELECT=(
-		# lacking device/server permissions
-		tests/unit/media/test_listener.py::test_openal_listener
-		tests/unit/media/test_listener.py::test_pulse_listener
-	)
-
-	# Specify path to avoid running interactive tests
-	# We could add in integration tests, but they're slow
-	nonfatal epytest tests/unit || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index ac0558fbdd12..84510f4c51eb 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,2 +1 @@
-DIST websockets-10.3.gh.tar.gz 304375 BLAKE2B db6075304613ff74ad5928a0c57e90a7d418ac0b9532adba4c6a17b3c3f1982cc94db8ac4c0da5f65343a915f3b2e7ccedce4e6d5d4960cb72fc93c3db6e041c SHA512 75a11dd7605808954c5f59decda5b115db73de96ed4023d8d7ee3c9966551a9ded2d771f76b086c76f49b0787f19349dadcd9010eb5fea8eeddf3d9bba1c6cbb
 DIST websockets-10.4.gh.tar.gz 309611 BLAKE2B f3a739368ff9d78fef79324af59d1e77b3fb654b8b1a847373a29f19b11ae9266b9a938d235ee27d12b59d9b4cf29825fc7298ff2f35e5b260df2c7a41a1bd78 SHA512 087b1920ff26e21b8d3b80b53249d44b841fc45a4992df1ad725112404f724a41aaa2d759a2bd521dfe337459f8bf0d2ae048c423489f527c68f6825f928b582
diff --git a/dev-python/websockets/files/websockets-10.3-py311.patch b/dev-python/websockets/files/websockets-10.3-py311.patch
deleted file mode 100644
index d15eb2d32f81..000000000000
--- a/dev-python/websockets/files/websockets-10.3-py311.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/tests/legacy/test_client_server.py b/tests/legacy/test_client_server.py
-index f9de70c..05070c8 100644
---- a/tests/legacy/test_client_server.py
-+++ b/tests/legacy/test_client_server.py
-@@ -426,6 +426,10 @@ class CommonClientServerTests:
-                 self.used_for_read = True
-                 return super().recv(*args, **kwargs)
- 
-+            def recv_into(self, *args, **kwargs):
-+                self.used_for_read = True
-+                return super().recv_into(*args, **kwargs)
-+
-             def send(self, *args, **kwargs):
-                 self.used_for_write = True
-                 return super().send(*args, **kwargs)
-@@ -1299,6 +1303,8 @@ class ClientServerOriginTests(ClientServerTestsMixin, AsyncioTestCase):
-         self.assertEqual(self.loop.run_until_complete(self.client.recv()), "Hello!")
- 
- 
-+@unittest.skipIf(sys.version_info[:2] >= (3, 11),
-+                 "asyncio.coroutine has been removed in Python 3.11")
- class YieldFromTests(ClientServerTestsMixin, AsyncioTestCase):
-     @with_server()
-     def test_client(self):
diff --git a/dev-python/websockets/websockets-10.3.ebuild b/dev-python/websockets/websockets-10.3.ebuild
deleted file mode 100644
index 6fc4061572f8..000000000000
--- a/dev-python/websockets/websockets-10.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for building WebSocket servers and clients in Python"
-HOMEPAGE="
-	https://websockets.readthedocs.io/
-	https://github.com/aaugustin/websockets/
-	https://pypi.org/project/websockets/
-"
-SRC_URI="
-	https://github.com/aaugustin/websockets/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/${P}-py311.patch"
-)
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# very fragile to speed
-		tests/legacy/test_protocol.py::ServerTests::test_local_close_receive_close_frame_timeout
-	)
-
-	epytest tests
-}
diff --git a/dev-python/wurlitzer/Manifest b/dev-python/wurlitzer/Manifest
index 6e56a56b9cf2..b6d117b0e673 100644
--- a/dev-python/wurlitzer/Manifest
+++ b/dev-python/wurlitzer/Manifest
@@ -1 +1,2 @@
 DIST wurlitzer-3.0.2.tar.gz 9846 BLAKE2B fe3223d1305891b60b9b3c361e05047d227f5682c63a47135b0d3e95bc373918266ec4cc141c947ff68795da12a8ea0c3c9c7e7a6ea31de8af22766b3354bbca SHA512 b0398699a15910511726053d32aa883fba249df9e7de393d645e4ac927d6ee9950fb459d27129d2806e39494245250b23ddf41acd349af514056dba1739cb1c8
+DIST wurlitzer-3.0.3.tar.gz 10171 BLAKE2B bf0ab15aaf0b693df64e0e9db38309ad1dad117aa97c1f380021ca81153eaf08ef742a97cf7451e72cc3473a2824fe142d8d8cd7ea1b28a367ed5761527c8d6a SHA512 6914ca77af8540bd949b74dfffe58b6ff9de603474e42e973b712f91a11dc906d7753f769932d26106c0543e98f42929741ed4de9ae14601eeadbd0dc5bfca35
diff --git a/dev-python/wurlitzer/wurlitzer-3.0.3.ebuild b/dev-python/wurlitzer/wurlitzer-3.0.3.ebuild
new file mode 100644
index 000000000000..342461e8b69d
--- /dev/null
+++ b/dev-python/wurlitzer/wurlitzer-3.0.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+inherit distutils-r1
+
+DESCRIPTION="Capture C-level stdout/stderr in Python"
+HOMEPAGE="
+	https://github.com/minrk/wurlitzer/
+	https://pypi.org/project/wurlitzer/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest test.py
+}