gentoo auto-resync : 19:12:2022 - 07:47:44

28 files changed, 644 insertions, 200 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ab5ac5c945c2..b97efa15fb39 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index e4409b229d27..a0181c92b131 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,3 +1,5 @@
+DIST autobahn-22.12.1.tar.gz 479515 BLAKE2B 37003c458b773b122716fd17e5245c3754e49e5c66601266870ce83fe4b7622553605d007902bd505897428231ce8347bf24548142dcb38631dc08f092be7eaf SHA512 10b3eec220a78b21aa393c9a721a9efb06b2623910ebb19dcf58c3966912cb9c5bbe5fc04d9f1072711a209a6a0168d7ba3a6147c1fc9a7db46bd528cc380dd0
 DIST autobahn-22.7.1.tar.gz 476789 BLAKE2B 4860a6ec1a2631986dd5d8e94069134e75650eedb67dce18dd4c1e8ad45bd76ca183b4dcbca6ef4474c25f6feb4a1407c9fed4c74f0751e9c0c7fbca2b013406 SHA512 ea2c4d61d3f0f8ef35a31b599bc432781536dccaa316cda474a61003b10df0ef6346615d16228848cc5acb24a4e5f4c50be1fe759daf35b629f636da55688137
+EBUILD autobahn-22.12.1.ebuild 3702 BLAKE2B ad3f63f475fc462f1d77b9bc5c1acd7a0285b6265fd5b99469c57f5d382aeaeebcee572a97b5248f1f2548918d63f35691add06adc57e6809857ce5f8ac5f3c9 SHA512 f70b4f7ba09f5b957f0ec76a304ee2551986b3857794881392c755965769fff7af9b2ea892de7ae76f328e846171310b5f14db2cdd4b2dca406f8ab1cb7201f4
 EBUILD autobahn-22.7.1.ebuild 3692 BLAKE2B 9884e00e724ccc1c30054413b4cb06c11463dd8803ed1d55f01d25cd1a3131b4cc1c603e0ee7f964858698d1d7482ba2dc7f0e9f847f7e94dc4df775d6077a7a SHA512 4f01fb707bd324f59229747635ad9c68fa3d2e3f7610fd8313eb60b886bbaad75a9cbe15703164aade5f943ceecc81c58fb693e6ff878579e71e6730286b35ae
 MISC metadata.xml 596 BLAKE2B 07cc4fbcb4c6fde6b1bb49a0a30fa8d2ef7ff4424397e29053a6ac89d87acd9fa7b1897c5381910d53f590192945a89a5b987fcdb9595e42f67f23333010a0ba SHA512 4d4cecf09593ec201711b13de1820e59f007f745b41611471ec737da4d679323787ac06a3a987cede9bf2c8dff71c9dbcb197e6a9c9109cf4d3a34d9247f9962
diff --git a/dev-python/autobahn/autobahn-22.12.1.ebuild b/dev-python/autobahn/autobahn-22.12.1.ebuild
new file mode 100644
index 000000000000..a8fcd07d0687
--- /dev/null
+++ b/dev-python/autobahn/autobahn-22.12.1.ebuild
@@ -0,0 +1,118 @@
+# 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_{8..11} )
+
+inherit distutils-r1 optfeature
+
+MY_P=${PN}-$(ver_rs 3 -)
+
+DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
+HOMEPAGE="
+	https://crossbar.io/autobahn/
+	https://github.com/crossbario/autobahn-python/
+	https://pypi.org/project/autobahn/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="test xbr"
+RESTRICT="!test? ( test )"
+
+# The order of deps is based on their appearance in setup.py
+# All extra deps should be included in test and in optfeature
+RDEPEND="
+	>=dev-python/zope-interface-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/txaio-21.2.1[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/wsaccel-0.6.3[${PYTHON_USEDEP}]
+		>=dev-python/snappy-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/ujson-4.0.2[${PYTHON_USEDEP}]
+		>=dev-python/cbor2-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/py-ubjson-0.16.1[${PYTHON_USEDEP}]
+		>=dev-python/flatbuffers-22.12.06[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-20.0.1[${PYTHON_USEDEP}]
+		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.4[${PYTHON_USEDEP}]
+		>=dev-python/cffi-1.14.5[${PYTHON_USEDEP}]
+		>=dev-python/argon2-cffi-20.1.0[${PYTHON_USEDEP}]
+		>=dev-python/passlib-1.7.4[${PYTHON_USEDEP}]
+
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	if use xbr ; then
+		eerror "***************"
+		eerror "Required xbr dependencies are incomplete in Gentoo."
+		eerror "So this functionality will not yet work"
+		eerror "Please file a bug if this feature is needed"
+		eerror "***************"
+	else
+		# remove xbr components
+		export AUTOBAHN_STRIP_XBR="True"
+	fi
+
+	# avoid useless rust dependency
+	sed -i -e '/cryptography/s:>=3.4.6::' setup.py || die
+
+	# remove twisted plugin cache regen in setup.py
+	# to fix tinderbox sandbox issue
+	sed -e '/import/s:reactor:__importmustfail__:' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	rm -rf autobahn || die
+
+	einfo "Testing all, cryptosign using twisted"
+	local -x USE_TWISTED=true
+	"${EPYTHON}" -m twisted.trial autobahn || die "Tests failed with ${EPYTHON}"
+	unset USE_TWISTED
+
+	einfo "RE-testing cryptosign and component_aio using asyncio"
+	local -x USE_ASYNCIO=true
+	epytest --pyargs autobahn.wamp.test.test_wamp_{cryptosign,component_aio}
+	unset USE_ASYNCIO
+
+	rm -f twisted/plugins/dropin.cache || die
+}
+
+pkg_postinst() {
+	optfeature "C-based WebSocket acceleration" "dev-python/wsaccel"
+	optfeature "non-standard WebSocket compression support" "dev-python/snappy"
+	optfeature "accelerated WAMP serialization support" \
+		"dev-python/msgpack dev-python/ujson dev-python/cbor2 dev-python/flatbuffers dev-python/py-ubjson"
+	optfeature "TLS transport encryption" \
+		"dev-python/pyopenssl dev-python/pynacl dev-python/pytrie dev-python/qrcode dev-python/service_identity"
+	optfeature "WAMP-SCRAM authentication" \
+		"dev-python/cffi dev-python/argon2-cffi dev-python/passlib"
+	optfeature "native SIMD acceleration" "dev-python/cffi"
+
+	python_foreach_impl twisted-regen-cache
+}
+
+pkg_postrm() {
+	python_foreach_impl twisted-regen-cache
+}
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index d18142f9cbe7..2c6e7091692e 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,3 +1,5 @@
 DIST bitarray-2.6.0.tar.gz 102780 BLAKE2B aaabaa2e59f54970087224a569e793705d8753901b0fc93e9a40a0ae2466940768e8f547fe25b32c0194893bf5baa77851bcf1608d3f18d9b1d5c11f70579dec SHA512 c4deeee54af884dc9200ffe80a7788db64478383f1210ab7e3aa2adf94809d2e38ae817bf11611f49373b12ebfe23cbe5287786da08475cf9761fd8345c554d7
+DIST bitarray-2.6.1.tar.gz 103605 BLAKE2B 3946f66330378010251465fc839dcf73f345f0993c3ddb99f53bb7aadc8616bacdb2dea3b48bedb3cf22145f4bf13b7f5a49d9e96f8371c0d0fcdbf967e18732 SHA512 3ed53e6d98c12b5dc2b6bd9d444846a5ca36d94402462e009da431cd39b06571df9d2de3c4c4c3f3ab883c42b6254edb5e1bb41b4374e33b7df46e0cc1720e3f
 EBUILD bitarray-2.6.0.ebuild 571 BLAKE2B 402619c838f7e57a9a210b3b5eb6b265f2448b0480136f039368cc06a61266282aacbc9cdeaa225e792fed3d9516b60e66f2fe202af974c2fc881d7c33624fd9 SHA512 2099c86f8dd2084594ef049313a270d721d9ff9073d8c28b5695dd860b1ca0cd1f893e425b54d20bd18e32020e8d1e69c1083a938b5b5659e3e653c3049ff515
+EBUILD bitarray-2.6.1.ebuild 573 BLAKE2B b1a8b6d1b82b586f3c793aa8b0a0efea85be12fae579e265082c0a7fa77dd2e726a0bb06b9f534d4708e41fe8a0fd2a522550e5ec84027c2512a6a7359e31bb6 SHA512 144467a43cab10b1104df66713f4e254c7116598c7c7785d55202c0cc43bd17eafe9e62d8285fe5dd8eddbf5ef40ea5b1be703af3e97405da771a8344d488ba2
 MISC metadata.xml 1207 BLAKE2B 67a57c61a71655fcd94e7025fe4d30792b6921a40f151d827f4c936dbc96c2b81afd2f2a302cfbf15356a591be941268561545d7ac7bc0cdb19e3f87a03e4b4b SHA512 5069c6622d7840c402007c420169e679da08db020952f798fd4299d6f1b324ce8cead3ca2a9072b96d8d852d5630827833eb27d39a190153e8da46ac9f386b90
diff --git a/dev-python/bitarray/bitarray-2.6.1.ebuild b/dev-python/bitarray/bitarray-2.6.1.ebuild
new file mode 100644
index 000000000000..aa55ad485325
--- /dev/null
+++ b/dev-python/bitarray/bitarray-2.6.1.ebuild
@@ -0,0 +1,24 @@
+# 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_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Efficient arrays of booleans -- C extension"
+HOMEPAGE="
+	https://github.com/ilanschnell/bitarray/
+	https://pypi.org/project/bitarray/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 032e9b20208b..1243dac4f746 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -4,9 +4,7 @@ DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6
 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-959c9cc7acf4d0aa433f2436e2a45b782e18022a.tar.gz 171575300 BLAKE2B 090d41a8913f8e061d297e66ca653d95e18b8da744464d7085d7a199c0a444753a82b6ff6503e142aec81be01b419323cdbe3709497738df74afa886d69fd63d SHA512 fc3b26e148ead7a07b4d1509909a42712a43b179da435b052c26a237b0d2ae88c3c8d76eaa93c415be1ed0f0b5fb55e0ad92f427a18d70bc9634a6e7d1b6a4d9
 DIST llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz 172157522 BLAKE2B 3c201380e727f7db53d61ff7c411b85aef8b17f086bca0cf3e758284a92a9ced298584e6f92ac6a35f30231d59c916bb98d41a8939f9b1103996c9e09df32ec2 SHA512 dff559b1518bbf9c469a2f4624ba9e83d81df2f08223afc696fa7f3dc9fe1c0d4a17346db8946fb56806e12aa7cbddda8df05b032ffe29dafd8a66c630de0016
-DIST llvm-project-e99edb92356b5ba078b5bc4d5846770414586a1d.tar.gz 171822327 BLAKE2B cdaa704c9f238f34751b92df92f8a767b1204f868dfd8a6f1eb3eeacaaf9c4b63c55a7c0534af124fddb65cf80263f72b79190696c8077e2990984a84a040f2a SHA512 37f45a56d6086df60c9832b75da3b2d78b8ec0fe094f07d41695f0565e4de0c13e460b1fef495864f07300d41f5b32769f0862b0fa5d53c0db9a0ccec1a09072
 DIST llvm-project-fb792ebaf2114ad11d673cf891ae560e2e604711.tar.gz 174312496 BLAKE2B dd7f30b911ef5049e9e2bff7b2768e31b48b1f4c7acaf159f535fe3deb5aa6630fdf7857c83fffcda1119a38a52101490d2b6cb41cb295bb7dd85cde0445b7ee SHA512 bef15e7d82a2faf8be24f784d3d34ff9b21c8f17256879587ea5471011a32a1eb885e1b020da55aa096f2e0b5fe4bcf9fe8f0f5b5d34f5f386c48899c68fb7d1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD clang-python-13.0.1.ebuild 925 BLAKE2B 1dab0cbb672643072e7d824a262c81505d19e555f24f97f82156473affc2f5ba6fc34ec493ffeedbc82feb1245fc6a39126e1b81fcdc8f8b4ddd0b7fe108e4bb SHA512 11eaf5c7a484d756f01986eacce19c912666518892f3213ff42367c126c2d8474abf6608cca24e6250c64e7423464e7cb3e58c2b069c7febf4893b249f2ee304
@@ -15,8 +13,6 @@ EBUILD clang-python-15.0.5.ebuild 1166 BLAKE2B ed1aedc9342d2011eca73510f651e1c31
 EBUILD clang-python-15.0.6.9999.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
 EBUILD clang-python-15.0.6.ebuild 1166 BLAKE2B ed1aedc9342d2011eca73510f651e1c314018fa23a5ec58cef95098f70f979fe0ba7c6f0880bec50905f084a0d9a7091428ae930683aeac4204c9999a4b3f690 SHA512 7ad0811bedb1938316a95528bae46f20c9e00051a41ed545173de4f36975247ce1a5b1f648655acd0bf3474377a8a32f8c1d573e036afc503cc6a30e24dbd0e1
 EBUILD clang-python-16.0.0.9999.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
-EBUILD clang-python-16.0.0_pre20221126.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
-EBUILD clang-python-16.0.0_pre20221205.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
 EBUILD clang-python-16.0.0_pre20221210.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
 EBUILD clang-python-16.0.0_pre20221217.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-python/clang-python/clang-python-16.0.0_pre20221126.ebuild b/dev-python/clang-python/clang-python-16.0.0_pre20221126.ebuild
deleted file mode 100644
index 9b34adc8ac6f..000000000000
--- a/dev-python/clang-python/clang-python-16.0.0_pre20221126.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_{8..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/clang-python/clang-python-16.0.0_pre20221205.ebuild b/dev-python/clang-python/clang-python-16.0.0_pre20221205.ebuild
deleted file mode 100644
index 9b34adc8ac6f..000000000000
--- a/dev-python/clang-python/clang-python-16.0.0_pre20221205.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_{8..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/coverage/Manifest b/dev-python/coverage/Manifest
index fc47e0922ef3..0a6684757939 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,3 +1,5 @@
 DIST coverage-6.5.0.tar.gz 775224 BLAKE2B 1ff7db1c72856553717d07d5a13443c210a3d85b3ce1f1eee802b986f71e3c13ac9df6bbca498fbeaa961ee33baab29c5e38f0c0e7b21c378830dfe85d797798 SHA512 4f2ec0bf69a83471a2b5a73b6a2212372ee6e32ccc4c72e0d33eef915939152f3213ab60e1a22ce2b72791e706c2223b0c81c87b95bbfadd1e828fa1a9fff120
+DIST coverage-7.0.0.tar.gz 780514 BLAKE2B 2d7e0190bacd5ef6db35e3c6ab5114571ce394a9d6dd5e7d3497e4eff9dc3abee1aa11babc057e6b276133e5e19dd7b2e1d4149f5fb73cdaf8d2a6a7df005d7b SHA512 258c1c2dd8af1e7b64fcce2042594230a245046c73e3e67b0b0b1e82180e200a37983b766bd72fdc23a6e5ff12416541e69a26beec845598c25b293c4ee1cece
 EBUILD coverage-6.5.0-r1.ebuild 1879 BLAKE2B b6988614ec609ed02c0adb8faca1c2c77ec581a9fa514ea848cc615d2a771e90031d83168fdccf2b02cd156f9031bf990ea867127bc54817a442977c0a916930 SHA512 9ea2255d4ab0b45832c694adfc456342adec446d13056e095434eed08efadeaa6708e6cc5af53eb231dbf126b7a98f13143ea086b90501aedafb3f675479ea30
+EBUILD coverage-7.0.0.ebuild 1887 BLAKE2B c42061e654f62985d632de8e02fb39b1e67b8610fc005e0772bfd2e650f104695fc8dd59a4f66e37df3e5a63167cd90c6ae2cf7cfd657cf791be063b399a0636 SHA512 363d29518513828e3b07c72dafe1c89341e9b772b1505875b9e2534c1af12d1a41818b870c5e1f43dc39259942c2a9a519a51769c08493f2e451202a63be5d02
 MISC metadata.xml 771 BLAKE2B 38e9680d0851f70050aad987714a9dd2f95178b0bc3d794dc08726c0618d1ea98be32a413ac397f4b222e8a5d8fdc747b7f1677bcfe842bac4080537e85a03a9 SHA512 8c44c40348fe5d416d8b4016fe22cc9ae0b94fbaf181deb79aa737f87271992521b710c1208d0eeb7ef92d96fc8a7daac1ec6feb1ae081a80f13327b5b094064
diff --git a/dev-python/coverage/coverage-7.0.0.ebuild b/dev-python/coverage/coverage-7.0.0.ebuild
new file mode 100644
index 000000000000..ffeda11b21d4
--- /dev/null
+++ b/dev-python/coverage/coverage-7.0.0.ebuild
@@ -0,0 +1,78 @@
+# 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_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="
+	https://coverage.readthedocs.io/en/latest/
+	https://github.com/nedbat/coveragepy/
+	https://pypi.org/project/coverage/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{8..10})
+"
+BDEPEND="
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/^addopts/s:-q -n auto::' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+test_tracer() {
+	local -x COVERAGE_TEST_TRACER=${1}
+	einfo "  Testing with the ${COVERAGE_TEST_TRACER} tracer ..."
+	epytest tests
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# pip these days insists on fetching build deps from Internet
+		tests/test_venv.py
+	)
+
+	"${EPYTHON}" igor.py zip_mods || die
+
+	local -x COVERAGE_TESTING=True
+	# TODO: figure out why they can't be imported inside test env
+	local -x COVERAGE_NO_CONTRACTS=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=_hypothesis_pytestplugin,flaky.flaky_pytest_plugin,xdist.plugin
+
+	local prev_opt=$(shopt -p nullglob)
+	shopt -s nullglob
+	local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
+	${prev_opt}
+
+	if [[ -n ${c_ext} ]]; then
+		cp "${c_ext}" \
+			coverage/ || die
+		test_tracer c
+		rm coverage/*.so || die
+	else
+		test_tracer py
+	fi
+}
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index ac2bd7f2cfdc..cf1f705fe203 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -2,7 +2,9 @@ AUX gmpy-2.1.0_beta5-test-input.patch 436 BLAKE2B c0cea44d17b1a44470c13893500dba
 DIST gmpy2-2.1.2.tar.gz 258445 BLAKE2B 5fd89478bb7c48c317a7af74fd872e5a9c1141f8f23c110aba7298d1a325caa13e24f1a2e601d6b3c6f6af30d60505f9161a03def16df59dddabe611fb600ef4 SHA512 abfeb0d8a155235e3aa797ca7b34ab6947f0714273e9d381167a9f6273bad34689e1985c139080b146e072b5bfbb4fa2b937566a14f4b94cc09ed21b3f2082b7
 DIST gmpy2-2.1.3.tar.gz 261520 BLAKE2B 4480522da105638521e99a4477285ace5178e6ebd2da2144eba9168da49b8f9ff627030dd2ddb6cc4431bf306c1e48d3ef2b23e193d48315e7e70575ddcc124c SHA512 6759ab52ee9c7abd5a95633d8f42399eb92430b0b2110a7e2db4850d9136f2b41c553a44e5e8c6eb7d44aa68318fd04d43f57b7a8a8af60b5d70140e8d2e2a6f
 DIST gmpy2-2.1.4.tar.gz 261649 BLAKE2B 7ddb02522d8f401f17dd664586623fa7fc2da448948515aac49b02a4ac46ca4f3ab74ab87594bf2c0ab3862832293c1a6f271e5a6afeeb0845890bc0b9ee27e8 SHA512 a71ddcd70b33a83a81a88c893337844dc1e4cfd058ff2236d53568f81c654079489e17c19f22a63fb08670c7254821d92778d9b9c33415467b6ed4634ff598cb
+DIST gmpy2-2.1.5.tar.gz 261709 BLAKE2B 50958868866fadc49c97534780fa491fadfaaea902f3fd4bd51f4e76a94602a6d030a1ee6685aac742e25b5fbe4865e1419307f7215c8fb553b166761d63607a SHA512 92e16359ee1df63faaeae4a3cbefe8cdbbc576d8eda377f08d59f12b70dfe9337a299686e85d1efee6c2f5b41fc4583643fecc68ea38a500c7f876c56fc169e7
 EBUILD gmpy-2.1.2-r1.ebuild 1002 BLAKE2B 3b8d45c21d609863c26eba5c89c9812e81a4af24f860995419e1c9a4c2e326e286f4e597da4cd9b6ad66f8bc09864433b4dc3bdfa098a2564bea3d1e190c91ac SHA512 883b5b0bd6bad4035e881f98159dbd07d32416c468b40f3c5a612017e46f357ee0ddf63c3f3fe39ac82980a3d639b866e8b3c170b8bc217840b7b28e659f16ec
 EBUILD gmpy-2.1.3.ebuild 885 BLAKE2B a024ea490d14e4b211024e764428dc43be9f3c0fa47240459d6e5456c37fa81f2d618f69b569e37014eba405b48081213858756285773f1365d8a2d0be35bc93 SHA512 34f75d0f08f8c5eba5712852c482f5e2c67458f9260c6339d9d7c0815328ef515b364eaed0d8a743e7bdfd94340532b176c83178af06a2e8244abb33a07aaeff
 EBUILD gmpy-2.1.4.ebuild 885 BLAKE2B a024ea490d14e4b211024e764428dc43be9f3c0fa47240459d6e5456c37fa81f2d618f69b569e37014eba405b48081213858756285773f1365d8a2d0be35bc93 SHA512 34f75d0f08f8c5eba5712852c482f5e2c67458f9260c6339d9d7c0815328ef515b364eaed0d8a743e7bdfd94340532b176c83178af06a2e8244abb33a07aaeff
+EBUILD gmpy-2.1.5.ebuild 885 BLAKE2B a024ea490d14e4b211024e764428dc43be9f3c0fa47240459d6e5456c37fa81f2d618f69b569e37014eba405b48081213858756285773f1365d8a2d0be35bc93 SHA512 34f75d0f08f8c5eba5712852c482f5e2c67458f9260c6339d9d7c0815328ef515b364eaed0d8a743e7bdfd94340532b176c83178af06a2e8244abb33a07aaeff
 MISC metadata.xml 687 BLAKE2B 9cf9e1c3dad11819000600a2ce28b5f140101cfa37553df7bf07edeb8513d7b8d80b15d561e37ca960a23d3470fc7f83608f9163d46b54fe7c41782302c53963 SHA512 eb1aacdf09d56ac73a1ce37d4562987c900f658bc517ccb6bd34cafefdf9a790d0e0d4318f70b57d68c5ec0c2832d0960b2bd619002fe690f484cd2702b77f79
diff --git a/dev-python/gmpy/gmpy-2.1.5.ebuild b/dev-python/gmpy/gmpy-2.1.5.ebuild
new file mode 100644
index 000000000000..708409ffeb6a
--- /dev/null
+++ b/dev-python/gmpy/gmpy-2.1.5.ebuild
@@ -0,0 +1,40 @@
+# 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_{8..11} )
+
+inherit distutils-r1
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python bindings for GMP, MPC, MPFR and MPIR libraries"
+HOMEPAGE="
+	https://github.com/aleaxit/gmpy/
+	https://pypi.org/project/gmpy2/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-3+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+DEPEND="
+	>=dev-libs/mpc-1.0.2:=
+	>=dev-libs/mpfr-3.1.2:=
+	dev-libs/gmp:0=
+"
+RDEPEND="
+	${DEPEND}
+"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	cd test || die
+	"${EPYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/huawei-lte-api/Manifest b/dev-python/huawei-lte-api/Manifest
index cc78d18d1a9b..7fd820587583 100644
--- a/dev-python/huawei-lte-api/Manifest
+++ b/dev-python/huawei-lte-api/Manifest
@@ -1,3 +1,5 @@
 DIST huawei-lte-api-1.6.7.gh.tar.gz 34677 BLAKE2B 289f9aefbf0c9491dcaa3a0afc120a70d578092e4bcf1ae66d30cff528dfa8231dbfc60c4660d8862b82801429b61bb97f584319e49307cbd44051cbf1c80239 SHA512 184c3e05e5d1b3b19ebdd3caaceb79fecbe8ed7f2337d7d4b0dc392f6e6ca8f45f663c8d6056d8660e8167f357d329015fd13b521093ae92b0a9a6b04c42e352
+DIST huawei-lte-api-1.6.9.gh.tar.gz 35605 BLAKE2B e81e3769fdd6307ae69cb0ff59bbe5e6c8e1cfe2a9629c683859c0ff0dfb9d44376f0d0cb33c40f7ed0211ca7ea4f990d8f471a154605475db2f126ec9bcf080 SHA512 224236356f899e8d621e87320e58faef7a4a313105d1938ba3fdc0fbe9f8e2b1135eac62aca39cd2f7c677e1aaa822821677adbbd18df4f00b7cf475c986a1f8
 EBUILD huawei-lte-api-1.6.7.ebuild 872 BLAKE2B bfbe5cba45ef654091a5bcb8d3dd672b0b81864d3747a3e5e41a2ff4a2f32b957729c9e8217bd6f55ed3007b43bf7c72dc116474434adba9a1504660bdf64106 SHA512 8fd9fd2c890214f14a9fb9c01f911ba46730996529678fb7136711980821b3d9e7aaee951381484cedb0370fb3bf8306903d59210283e0582bdd61b50e099a8b
+EBUILD huawei-lte-api-1.6.9.ebuild 872 BLAKE2B bfbe5cba45ef654091a5bcb8d3dd672b0b81864d3747a3e5e41a2ff4a2f32b957729c9e8217bd6f55ed3007b43bf7c72dc116474434adba9a1504660bdf64106 SHA512 8fd9fd2c890214f14a9fb9c01f911ba46730996529678fb7136711980821b3d9e7aaee951381484cedb0370fb3bf8306903d59210283e0582bdd61b50e099a8b
 MISC metadata.xml 487 BLAKE2B a4aa976286ea3cc4e02227109277faa4506f73a4b7f6c47ef9a318ae5d1c3fe61cc6eeb50ab99c0b10e5edb4ae02101d8e4d6267e7dc8f20520e9259b1d17fd2 SHA512 2ea5ccd73098a9c4d074340c9d6eb433bdaf4530d8fdb899f2a9632c097d2021d9162aa92fb9ffb54eaad2f41050d0323ddc68d0d29ec2f13060e5fe9e26f74d
diff --git a/dev-python/huawei-lte-api/huawei-lte-api-1.6.9.ebuild b/dev-python/huawei-lte-api/huawei-lte-api-1.6.9.ebuild
new file mode 100644
index 000000000000..5b62e249fda3
--- /dev/null
+++ b/dev-python/huawei-lte-api/huawei-lte-api-1.6.9.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="API For huawei LAN/WAN LTE Modems"
+HOMEPAGE="
+	https://github.com/Salamek/huawei-lte-api/
+	https://pypi.org/project/huawei-lte-api/
+"
+SRC_URI="
+	https://github.com/Salamek/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# make cryptodome-friendly
+	sed -i -e 's:pycryptodomex:pycryptodome:' setup.py || die
+	find -name '*.py' -exec \
+		sed -i -e 's:Cryptodome:Crypto:g' {} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 0c1363f8c786..d85a4556c12a 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,6 +1,8 @@
 AUX imageio-2.22.0-block-download.patch 1211 BLAKE2B c01e3fd7db7463bc11bf331384a21becfc3160d4880a2fd09e47bf0927d97e46787097f50a489b83c2626078b60a0cf8a0d896040981e78c107f1783c8e84c26 SHA512 170261b9fb07ccb7f7a7e058335326df1f72c8d098076bf6ca048a7ca6bac95ddb512b9e41740c385430bc25613249455203addd59931af4e70298e772303964
 DIST imageio-2.22.4.gh.tar.gz 395090 BLAKE2B 8980516e26c3a8d128937046582b796264616922f10c5a347ec9b718c773666fe431b2426abbf1de2c99a27cfdc1d7747727c23b2dd665ae88e405746966896e SHA512 38339e7da4ae238cf91aae4ec500899edf7547e80029941550ea73c6b0ba926eac21f4a234833ce52078426c660409558935b72775f3131a390f913fefdb0df1
+DIST imageio-2.23.0.gh.tar.gz 395916 BLAKE2B 2ca40f70dfc3f79084933a22ab2f841ecee0c5f0768dd73ea264a366853cc582111e677fb1521f74f3b2ff516f0ab51de013e8e013dafbe5cf0386faf21b75f5 SHA512 dcdea9fb245495b0882630f18bd5503c4e36fa3f3b50dc58712a8a246424855cd0f280e026889eb8a6a4f7d833792f87d373f645e59ff39fb81514ada79f4248
 DIST imageio-chelsea.png 221294 BLAKE2B 58537d7a1678fa5be4cc899e5bacd925bfc180eb4ae691330a53749a49ff544e979609b529ed27e5c1fc9efe4bc050ca1ce49b777f4016fb1d66affd926ef9d3 SHA512 48470cdb843eed4dfa6673811c09c5aac9869ee23dd36be0c6b653d9f108d61d21b148c2a4435aaa6604887ba030e5bbc5e35d378da876366445dfc2d0ba4e27
 DIST imageio-cockatoo.mp4 728751 BLAKE2B 45b22cd517c1cb7c0cd12f8865facaca6a847047aea716e49633cf2b1dc13826f94787c8a8f9dd5f48c6a896f5d37794c0058da1bde9e1469f196916476dbfa2 SHA512 e9cb7c25de8019c59ba4090cf10ab29f2b5d62ada37a877081ca07d2ecfe010036222ae843b41bbcc843130d97fa5e14421de252639e9481df1d1c27b19add49
 EBUILD imageio-2.22.4.ebuild 2070 BLAKE2B 1608c4f7ed3fe43bb4e78b6a36fc788b0f89fba2701929112a3274530156be3989e859d77f85216b3987d447fac049b9ec034ee41ffe12e34507a530ce38369f SHA512 c2832a6ae9c5bec8e6816c4b0de4c64a83a5e6a2eaed072622d226b9d762c9db478c9fe7ebf0c35ca005eb009b10c64473d1a33d0b04c6f1f3f5e00ca88bb08b
+EBUILD imageio-2.23.0.ebuild 2070 BLAKE2B 1608c4f7ed3fe43bb4e78b6a36fc788b0f89fba2701929112a3274530156be3989e859d77f85216b3987d447fac049b9ec034ee41ffe12e34507a530ce38369f SHA512 c2832a6ae9c5bec8e6816c4b0de4c64a83a5e6a2eaed072622d226b9d762c9db478c9fe7ebf0c35ca005eb009b10c64473d1a33d0b04c6f1f3f5e00ca88bb08b
 MISC metadata.xml 959 BLAKE2B 284b4b8fdf53cc63b6d46d1afd03abf322f8a91ad5feac3828c30198a9e0baa1514f34b91385dbc00830b306e4f78eac5d2bf4be8e377fe98cfb7e5c8db896be SHA512 0a72e91831dec56af50fa96fc6ed74b19fdc15e68255d19fb09c542eea85cfcdaa5a382608add10a63d3e421783225829d20d9b31c26883f7640b6214f2c20e3
diff --git a/dev-python/imageio/imageio-2.23.0.ebuild b/dev-python/imageio/imageio-2.23.0.ebuild
new file mode 100644
index 000000000000..bd86d3699c16
--- /dev/null
+++ b/dev-python/imageio/imageio-2.23.0.ebuild
@@ -0,0 +1,82 @@
+# 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_{8..11} )
+
+inherit distutils-r1
+
+BIN_COMMIT=224074bca448815e421a59266864c23041531a42
+DESCRIPTION="Python library for reading and writing image data"
+HOMEPAGE="
+	https://imageio.readthedocs.io/en/stable/
+	https://github.com/imageio/imageio/
+	https://pypi.org/project/imageio/
+"
+SRC_URI="
+	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/chelsea.png
+			-> ${PN}-chelsea.png
+		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/cockatoo.mp4
+			-> ${PN}-cockatoo.mp4
+	)
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# over 50% of tests rely on Internet
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
+	media-libs/freeimage
+"
+# requests for fsspec[github]
+BDEPEND="
+	test? (
+		dev-python/fsspec[${PYTHON_USEDEP}]
+		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/tifffile[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		# block silently downloading vulnerable libraries from the Internet
+		"${FILESDIR}"/imageio-2.22.0-block-download.patch
+	)
+
+	if use test; then
+		mkdir -p "${HOME}"/.imageio/images || die
+		local i
+		for i in chelsea.png cockatoo.mp4; do
+			cp "${DISTDIR}/${PN}-${i}" "${HOME}/.imageio/images/${i}" || die
+		done
+	fi
+
+	distutils-r1_src_prepare
+}
+
+EPYTEST_DESELECT=(
+	# Fails because of system installed freeimage
+	tests/test_core.py::test_findlib2
+	# Tries to download ffmpeg binary ?!
+	tests/test_ffmpeg.py::test_get_exe_installed
+	# blocked by our patch
+	tests/test_core.py::test_fetching
+	tests/test_core.py::test_request
+	# known broken
+	# https://github.com/imageio/imageio/issues/890
+	tests/test_freeimage.py::test_exr_write
+)
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index ab5f18c809c8..0ef989bad42a 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,7 +1,9 @@
 DIST importlib_metadata-4.13.0.tar.gz 50445 BLAKE2B 0f52430bdcf63275d16d330fd2ec6a85926ab75cc2c14d0e996dc29a1258ba71e12253dd36f776f280c68cfc0d68058ce52d246fef5eccd9c3b7e5ea9bab5441 SHA512 68deb9b017d89df05b613c564bfaafd9024f9a6b1b14973bb75c0756f29911c6a2516a87b4fad60cb15b66bca79a275163fb8db2cfbd088ab952633de056d1e1
 DIST importlib_metadata-5.0.0.tar.gz 48756 BLAKE2B 87642575d0df14a22bb3b81f68dd6504166fea1148d70b1f2689945d336f9a75257872f8953e0f86008a349ff3500b357dac7d1c381d92e88bdeab37d7392042 SHA512 29efd04c819bf2e6579f5b0ca0cf63c907e162d028244a743929c7c04989a29b84003824aaf2f2bec33867268b3106048380bd18789c790ca2d1cd89a9f678ef
 DIST importlib_metadata-5.1.0.tar.gz 49216 BLAKE2B 6f44926a1c98e21d4ddabe1885d37385f4b8888c35733bf87a00286bb001f403d8c733b3d355da0361bafc65d3176c7d20e46104067e66373c3777156289638b SHA512 9e3d42771f4fcbe334c1b4044415e91abd677f99adbe704fb7cd006659376052642c16b3890458ec9a700b34f75541318060e9563353659d33b4f16ed790ecc1
+DIST importlib_metadata-5.2.0.tar.gz 49561 BLAKE2B 8841818eea459abd9ec8b7741418482b25e8c0d9bf94f34a60f3decd79a9753be2b8be24f58aad6d03bff75e22474642730c4a58911ec4b2c962d3098a9150d2 SHA512 9168af203b60751e5a28c14bdb327c9471f0f4d712f3ac9f8e69cbf3d3c6d999aa15ae7b16c036e47ec6802ca155d75c204e90caf8776a197562b514a36bbb0f
 EBUILD importlib_metadata-4.13.0.ebuild 1488 BLAKE2B 16a21675ed83d39af765d032a32c2761b64e6e0f83282b8fa957e9ca4dfb4e51428ecb1b9ac0c2fd3470546b853b120bd7f5fa69908a5670845eb2a559b3731d SHA512 a0a9b7a61ca7c9002531562c1c783f4ac41774b14e5c91ae251a59b06ca3fa5de23fa6de42f6cff6c8c99aad3953dff7eaea304ad1c639caa6e6e98665bd7540
 EBUILD importlib_metadata-5.0.0.ebuild 1538 BLAKE2B 3d57d5e1714c8189162b180d102a76363264e8e30e1d6a48af4b73963f9ceb971dbfea8233718acb825ce469ebe7078204a030ff925f38172420b4d6c553e3e5 SHA512 214f05f60a537a645ac2b42644c1fd17f11657a073496d2b207125155faa438db3e33981d60c50322d7807f2a9de563164e685db808c60c09182efe9eb1be683
 EBUILD importlib_metadata-5.1.0.ebuild 1546 BLAKE2B 3d5b72541b2aafc21f0c872ff3e96f5b65aecd4b679f72b2194d5fe255aaa555dff7966888e085c51a58eb6c748a6db9e32f24411e43858fd15b1bcb812a757a SHA512 c9f3b1de5dc6c4de27568425ec16a6e8fff5b32db2b4823270a125806fd23d4a9c3b0876c1581c6b5dbf26ae55a4cc9e53c4a07c53499363139f9bf42dbd56ab
+EBUILD importlib_metadata-5.2.0.ebuild 1546 BLAKE2B 3d5b72541b2aafc21f0c872ff3e96f5b65aecd4b679f72b2194d5fe255aaa555dff7966888e085c51a58eb6c748a6db9e32f24411e43858fd15b1bcb812a757a SHA512 c9f3b1de5dc6c4de27568425ec16a6e8fff5b32db2b4823270a125806fd23d4a9c3b0876c1581c6b5dbf26ae55a4cc9e53c4a07c53499363139f9bf42dbd56ab
 MISC metadata.xml 646 BLAKE2B c3f9ff98b5090d22a37a5a5b36b6c8523b4d1ee804c05c880bffe6a45ee482023d4c037b49332bfa93cb60cc5892d1178b486cf1d2e0d4c44d7da8d292e406d5 SHA512 e558c5ae62e98685a43bfafbff6fc5d5339965a9bf8c6bf0bd8cd5b542c94ae6ecaf0a04e5210b211a32abb65b37c5db6af64dc7d74ae79ec31075fcc659c9f4
diff --git a/dev-python/importlib_metadata/importlib_metadata-5.2.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-5.2.0.ebuild
new file mode 100644
index 000000000000..b3a5bf4e5463
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-5.2.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=flit
+# NB: this package extends beyond built-in importlib stuff in py3.8+
+# new entry_point API not yet included in cpython release
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="
+	https://github.com/python/importlib_metadata/
+	https://pypi.org/project/importlib-metadata/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/importlib_resources[${PYTHON_USEDEP}]
+		' 3.8)
+	)
+"
+
+distutils_enable_tests unittest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "importlib_metadata"
+		version = "${PV}"
+		description = "Read metadata from Python packages"
+	EOF
+}
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 2356b0069ae7..8cb1e8dc268d 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,3 +1,5 @@
 DIST keyring-23.11.0.gh.tar.gz 47229 BLAKE2B cb5f4a771bc94db058d5783e6bcfc84a29359d8445f55a38b125fe5e751a7e13ce54533fcdf7ab47b50f5fb37a20858c4113ad7ec683b2123f136a7059763bff SHA512 8f200455229ef944729bab557845b2e4220fdd5146d3610105c907fe14ae4358ce85fab0c63c2a0598968871fc01e8b564c8e4d436930f3d39f11e93ae0b209c
+DIST keyring-23.13.1.gh.tar.gz 49199 BLAKE2B 46ac7cb3237c7e0a061e9c4c30dba02d9a9c92d377f3db1b79b1c9bc4c5b8b866ffbda8354bbe5848a9db4c6834aec1c0b36f75d5c540ccc29ab71bd6adf30f4 SHA512 b0fc17157536178bba3a8f27f152a1cba497bc9ba2fc73d29ac9d8e61a2be51bdb0dea100eef9ab59979a9b0f8c8d15ca222e5fdc2c7d06d202955b18f21bf24
 EBUILD keyring-23.11.0.ebuild 1254 BLAKE2B 6375ef3949537a871d41c46cba32e066ed2c07d76428aaed6532e66a901404f7d6ed8af066ae51d785a419069d049e1d3e83d2968c980579fbeb8bb27a0ca8c8 SHA512 f37a641a4a20b182160b922a544cc896d82c87e3f7b14e586389f2d8a3044b8a010ce7a5a4a9c00ca2d59878a85fd4004532dc7cd7883a127a5c179d01cab21d
+EBUILD keyring-23.13.1.ebuild 1327 BLAKE2B 1508fa071e6891359320c976ef8a6ab55b2a98c7ed245972292c35dcf678fc29f150345d413a933ed2f64276743488bc1c68211f22f59ead0cce450bc21897a6 SHA512 2849e517371271a6117a3a1694b950a2294edec29fbad64920efac42e1fa6c587b5888357561051dae1ce4222acb8be424e82bf6d6489f6b1664896c1e9051e6
 MISC metadata.xml 611 BLAKE2B 7f938075d992467e01da200f0c859e9bc6a6128296151b3529b2168b68364605bd7dbadf69f7820d459d5db6950908e0b0acb09a636f1fc45862093df6d08334 SHA512 a0ad1729c53b18fedf227053648b04541f5adcf56bfaa73218e214f8c2409ebe2574a5917442c5218084b38da34691b6566f2c65390ef6487985a123f62f9efb
diff --git a/dev-python/keyring/keyring-23.13.1.ebuild b/dev-python/keyring/keyring-23.13.1.ebuild
new file mode 100644
index 000000000000..d7372edce760
--- /dev/null
+++ b/dev-python/keyring/keyring-23.13.1.ebuild
@@ -0,0 +1,55 @@
+# 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_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides access to the system keyring service"
+HOMEPAGE="
+	https://github.com/jaraco/keyring/
+	https://pypi.org/project/keyring/
+"
+SRC_URI="
+	https://github.com/jaraco/keyring/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
+	dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	>=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.11.4[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10 3.11)
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources
+	' 3.8)
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+EPYTEST_DESELECT=(
+	# this test fails if importlib-metadata returns more than one
+	# entry, i.e. when keyring is installed already
+	tests/test_packaging.py::test_entry_point
+)
+
+EPYTEST_IGNORE=(
+	# apparently does not unlock the keyring properly
+	tests/backends/test_libsecret.py
+	# hangs
+	tests/backends/test_kwallet.py
+)
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 63f7bc1901f7..e938ed5894b3 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -4,9 +4,7 @@ DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6
 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-959c9cc7acf4d0aa433f2436e2a45b782e18022a.tar.gz 171575300 BLAKE2B 090d41a8913f8e061d297e66ca653d95e18b8da744464d7085d7a199c0a444753a82b6ff6503e142aec81be01b419323cdbe3709497738df74afa886d69fd63d SHA512 fc3b26e148ead7a07b4d1509909a42712a43b179da435b052c26a237b0d2ae88c3c8d76eaa93c415be1ed0f0b5fb55e0ad92f427a18d70bc9634a6e7d1b6a4d9
 DIST llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz 172157522 BLAKE2B 3c201380e727f7db53d61ff7c411b85aef8b17f086bca0cf3e758284a92a9ced298584e6f92ac6a35f30231d59c916bb98d41a8939f9b1103996c9e09df32ec2 SHA512 dff559b1518bbf9c469a2f4624ba9e83d81df2f08223afc696fa7f3dc9fe1c0d4a17346db8946fb56806e12aa7cbddda8df05b032ffe29dafd8a66c630de0016
-DIST llvm-project-e99edb92356b5ba078b5bc4d5846770414586a1d.tar.gz 171822327 BLAKE2B cdaa704c9f238f34751b92df92f8a767b1204f868dfd8a6f1eb3eeacaaf9c4b63c55a7c0534af124fddb65cf80263f72b79190696c8077e2990984a84a040f2a SHA512 37f45a56d6086df60c9832b75da3b2d78b8ec0fe094f07d41695f0565e4de0c13e460b1fef495864f07300d41f5b32769f0862b0fa5d53c0db9a0ccec1a09072
 DIST llvm-project-fb792ebaf2114ad11d673cf891ae560e2e604711.tar.gz 174312496 BLAKE2B dd7f30b911ef5049e9e2bff7b2768e31b48b1f4c7acaf159f535fe3deb5aa6630fdf7857c83fffcda1119a38a52101490d2b6cb41cb295bb7dd85cde0445b7ee SHA512 bef15e7d82a2faf8be24f784d3d34ff9b21c8f17256879587ea5471011a32a1eb885e1b020da55aa096f2e0b5fe4bcf9fe8f0f5b5d34f5f386c48899c68fb7d1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD lit-13.0.1.ebuild 907 BLAKE2B 786bc45254014c19e47997b263eba9245fc44459a6f12d46e69803fdf57c1b8f3d07d7e0354ea23ab17471771f57af8e792ca942b9f195462a26629d8d6bfb8b SHA512 ca254f8d0d3af0e01b24e73de8e15b77d687fd0f23a4848dd4e85522426e7dbdcd8ae77e25d8f88e637e390131fe78362ae7ba4ecd192a4c970cc3311b371dfa
@@ -15,8 +13,6 @@ EBUILD lit-15.0.5.ebuild 914 BLAKE2B 8425acc2d890bf889570c4d76703acfb3aab774d3db
 EBUILD lit-15.0.6.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 EBUILD lit-15.0.6.ebuild 918 BLAKE2B efcbc64c9ec2eda4134030f16996d89445557678d6e74f2975971a46f4f9cba3a9c5d64a24fc7f664c0c71e233f233f9e22419508c0e051d66dde3135ff33a3e SHA512 4c7a0f8ad156d4384c566a1df9abc9c1d728897ec109ddf99dde82b6da2074e7198ab6700ce96d3ff0041d7f9f463ceda33072f29ae4a979805db435a5937457
 EBUILD lit-16.0.0.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
-EBUILD lit-16.0.0_pre20221126.ebuild 877 BLAKE2B 644acadc79bda6b0fa4b170075a1b97e047e8b9c41e58362894105821fc47e64b78ce0403b9b5eb24925524919186b3fda5266017594a7268520ad85ebc06838 SHA512 f9f52d6475bbd9c2ffcc8bbec22dc5d0b93a01434a7f1016ef0eea117c224f914109dc0e64f939d2602fd1a67de8d9dafb9d000aca2265a674ec126081b06042
-EBUILD lit-16.0.0_pre20221205.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 EBUILD lit-16.0.0_pre20221210.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
-EBUILD lit-16.0.0_pre20221217.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
+EBUILD lit-16.0.0_pre20221217.ebuild 877 BLAKE2B 644acadc79bda6b0fa4b170075a1b97e047e8b9c41e58362894105821fc47e64b78ce0403b9b5eb24925524919186b3fda5266017594a7268520ad85ebc06838 SHA512 f9f52d6475bbd9c2ffcc8bbec22dc5d0b93a01434a7f1016ef0eea117c224f914109dc0e64f939d2602fd1a67de8d9dafb9d000aca2265a674ec126081b06042
 MISC metadata.xml 340 BLAKE2B c9ca851e49b4ab48c015686e983ec988f60c34ed0af77abd7bc03d046002f79f74b9b463ecb97db89f2230c1593af7acdaf6651fc51fed4aa92a459d07aabf18 SHA512 3fe8262ce6b971364162fbdbac3b02bf02f0a64896c8a2564e2a2998bd6e6bc74463bf9104e3f4ffaa9f5c1a16c877fc864b8a4f056ca0022f741799bc00f217
diff --git a/dev-python/lit/lit-16.0.0_pre20221126.ebuild b/dev-python/lit/lit-16.0.0_pre20221126.ebuild
deleted file mode 100644
index 1d6b58b9d291..000000000000
--- a/dev-python/lit/lit-16.0.0_pre20221126.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_{8..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="~loong"
-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_pre20221205.ebuild b/dev-python/lit/lit-16.0.0_pre20221205.ebuild
deleted file mode 100644
index 8ace6ca8b915..000000000000
--- a/dev-python/lit/lit-16.0.0_pre20221205.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_{8..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/lit/lit-16.0.0_pre20221217.ebuild b/dev-python/lit/lit-16.0.0_pre20221217.ebuild
index 8ace6ca8b915..1d6b58b9d291 100644
--- a/dev-python/lit/lit-16.0.0_pre20221217.ebuild
+++ b/dev-python/lit/lit-16.0.0_pre20221217.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~loong"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyspnego/Manifest b/dev-python/pyspnego/Manifest
index a6f8218763cc..ff4286b61268 100644
--- a/dev-python/pyspnego/Manifest
+++ b/dev-python/pyspnego/Manifest
@@ -1,3 +1,5 @@
 DIST pyspnego-0.6.3.tar.gz 200723 BLAKE2B d8a56681ab76d2d131f078af4cbb686636802bb3d4ffa87d2656d7ee5f3f685936bca3cd03d6801a144d9950c877f0f5717f3f9bb430c5223c89bbcc81eadf38 SHA512 a9a3bf898a77748b5caf2010fef0969397d3b9c9e2e12c7ec6cc8649b476dcaed310259c009a09c33517488ddc15b2daf63b6cf074071e0a6b922a2dbe2e6f60
+DIST pyspnego-0.7.0.tar.gz 219295 BLAKE2B 43a31b468ac52750858c74c676c29611f5294d64efe3b0b4ac31acbd0d3c8fb346fea0c396de98908ea7d03040e0d4b5e3e2adacc911413bfafad8e295fd3bb3 SHA512 0c3eeab267bc43fbc3836d2a804e25304ed245ae3f0bf7926cdfd1edd4815c6f25580c655218857ea117e63b13e0ea3e343614580096151d4d720ff6c79ab844
 EBUILD pyspnego-0.6.3.ebuild 959 BLAKE2B 0e327cdd2fb3d9e16f09f374bf0002b3395a009cf558b2935841781f2e778677802acf9d3176345a8b445b2ebd617c4307d72b7f53dcadddb7c01347125718aa SHA512 99ce279a54ff8dc4ff6eaadcf0850de1e91d764d6dcf5da30024168d27fd4dc50db7f70f7e222ba0b56fcd7ae74c7be0ee355dca68975fd42035ab979922ca4b
+EBUILD pyspnego-0.7.0.ebuild 962 BLAKE2B 4485e98511dc8b04baf037b35d29bb09f498161a2ad0754737ae15f7791eac27efae62ed8d1049038726f296c284acfe138b27ad8a24f050acebfdc3c1739170 SHA512 c9f62764d03e6baeb4ed3d01a7f1d816a017cf81f270fa36f4e3b6eb1bbdeee2f9e0f78328f344dbda2a252df979f732b904d060b4805de285607d412f74601a
 MISC metadata.xml 445 BLAKE2B 2d30af32987aa7118331cb4c199b44069f6a6efc62d73eab62a31b29308848b7f7e56e026327af6c2197ee31c05fbe1885524bba7b6a84cdc0d97cc58c5fb43b SHA512 c7bbe6f161ce61409f6865f998fb4c8bd77c39011f5bbd148379912e31805773a41451163517cb7ebef99a57d6abe8f13dcdc568408ce182c0def6adf35afc9c
diff --git a/dev-python/pyspnego/pyspnego-0.7.0.ebuild b/dev-python/pyspnego/pyspnego-0.7.0.ebuild
new file mode 100644
index 000000000000..372520083949
--- /dev/null
+++ b/dev-python/pyspnego/pyspnego-0.7.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Library to handle SPNEGO and CredSSP authentication"
+HOMEPAGE="
+	https://github.com/jborean93/pyspnego/
+	https://pypi.org/project/pyspnego/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/gssapi[${PYTHON_USEDEP}]
+		>=dev-python/krb5-0.3.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "Kerberos authentication" "dev-python/gssapi >=dev-python/krb5-0.3.0"
+	optfeature "YAML output support" "dev-python/ruamel-yaml"
+}
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index d4a61e2ac0d1..b7753e97d7ad 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -2,8 +2,10 @@ DIST tox-3.27.1.gh.tar.gz 309006 BLAKE2B fa8aaa9cd5b03e54c166bb6b748290420b91498
 DIST tox-3.28.0.gh.tar.gz 309472 BLAKE2B 9896411426f6aebb3efa468c01696ecc5f17ec3e67825672d0efc74c1b1468bc8b8d9c14b6177c181750ba4b9a5e77d616068dd83e21f5641acfc8e2a271cc1f SHA512 64816754e6800661bb564c5c7d21c4139522d540a04fafe3c4591d596072d48d1cbe0ee2abee9c8faf3d5007774f5371431b5a7a8f49912bc879c7b168aab2ca
 DIST tox-4.0.12.gh.tar.gz 282817 BLAKE2B 7237f33086c9e0147457bf46db47f6b4e6fcaf33929d0950e439e04950119e3199c3d41c4f6856935bb4cd27f613a9c925f4e366a61f22067d5837f1f5f2307c SHA512 7ffc0ed622c59df8ab0b1692dc774ab8efa1753dd4f872e0baaca213b4da29b9c3718b63eb3f655802a23d6493c61e3d3e003d192d73bb536f0da16411db2685
 DIST tox-4.0.13.gh.tar.gz 283017 BLAKE2B 2bf55f1514cbc1806404f4106b2af701f28698da0fd9789a71d582612b7eeb2356d15b26a9dd0e663b19cdcb90e975138c15cd80ee5f10c261a8b203bef0d830 SHA512 a08139b490ab2e967cb9fdb9ffb290fa1dcce3102d41b07fdfd566f9d270873d6371229dacae5e00a4816bf37eb7cca12bae0948e5b4e6c1879e96b444070d4b
+DIST tox-4.0.14.gh.tar.gz 283154 BLAKE2B 8701f25b00152c283503f082765e28b46f2c01b01bc86129dee6b28fd623bb2ae2c2726401b69e278edbc4fffbaad672aa02504870a1c05ec965a819dc812933 SHA512 3ed0a80b438ac11804b56f6b55a504c0246b0a8cfa9bb4fa8246758bd942ac0b0b5c203e89069303faa47a2dcd009ea81ef9f8e3e38e6d9a30dd4f05c0b79510
 EBUILD tox-3.27.1.ebuild 1916 BLAKE2B ab2496317d588c05936d57132d1c759c9a14f18c10fb50d6188b7bee5bd20de9f06b5d8945a908cbf021f4b7036ba6d23dcf19aad63af9d6cd6bf6baa598ad32 SHA512 b038f9976de8af46ac663faa169a06fad1bd28ef61738679fd70faa5e655c0c85ed3a8e4efddee2dd2aff8cc3fe9f5ec133311d122c6bab15c487a5a074a6c11
 EBUILD tox-3.28.0.ebuild 1924 BLAKE2B d2a5ac59691e8ad704bb64840925d192df827d533c2b17bafa31b95da83a235c28109e911f78e294b12924a99114adad5bbe44cbba67fe8d2d584c9839a70d59 SHA512 aa919c8b15403b9992a772bf0296f4cae2bef39c4ded509f732a13869504f7af15cf43f26c9f401e31794c481a5e1dc4e91c18e65c31a4e159d7b9a2cb1c99ea
 EBUILD tox-4.0.12.ebuild 2398 BLAKE2B a8a4d53f19e306c32fe542fb0ebb132bcbfe29c54a96f6f090b1beec6c85763ea04d77ab592a7fe20214724295e1a5d4c0740d99644d513dc9f7a311f4c3c5dc SHA512 be8ec59aad967e10ae4c3b03313c6f3ea2bf4491084517875130e737836e3a66c9e7acf29de522cb3ae7b4d445910334d64e070a53db15b8f761e7b3b886aa06
 EBUILD tox-4.0.13.ebuild 2398 BLAKE2B a8a4d53f19e306c32fe542fb0ebb132bcbfe29c54a96f6f090b1beec6c85763ea04d77ab592a7fe20214724295e1a5d4c0740d99644d513dc9f7a311f4c3c5dc SHA512 be8ec59aad967e10ae4c3b03313c6f3ea2bf4491084517875130e737836e3a66c9e7acf29de522cb3ae7b4d445910334d64e070a53db15b8f761e7b3b886aa06
+EBUILD tox-4.0.14.ebuild 2398 BLAKE2B a8a4d53f19e306c32fe542fb0ebb132bcbfe29c54a96f6f090b1beec6c85763ea04d77ab592a7fe20214724295e1a5d4c0740d99644d513dc9f7a311f4c3c5dc SHA512 be8ec59aad967e10ae4c3b03313c6f3ea2bf4491084517875130e737836e3a66c9e7acf29de522cb3ae7b4d445910334d64e070a53db15b8f761e7b3b886aa06
 MISC metadata.xml 382 BLAKE2B 7c0704c5c187ce4a7972fe0372b23c5537a81a8d62fd83436d9558a61761f10764adb5a4d5f6795f0dd1fe905afa604c0be77fe1d48d291847f6ae65dc1b032c SHA512 9d0ced4df9352a81034a50d5766a01534ae8fa889985d99cc9e2a8d0889e31c6c11550677d9a5a74e2aab57c320192ce3a42708a6d23b0419ee34a6054398344
diff --git a/dev-python/tox/tox-4.0.14.ebuild b/dev-python/tox/tox-4.0.14.ebuild
new file mode 100644
index 000000000000..ed83ca51ba13
--- /dev/null
+++ b/dev-python/tox/tox-4.0.14.ebuild
@@ -0,0 +1,91 @@
+# 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_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P/_}
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="
+	https://tox.readthedocs.io/
+	https://github.com/tox-dev/tox/
+	https://pypi.org/project/tox/
+"
+SRC_URI="
+	https://github.com/tox-dev/tox/archive/${PV/_}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/cachetools-5.2[${PYTHON_USEDEP}]
+	>=dev-python/chardet-5.1[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3.8.2[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.6[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
+	>=dev-python/pyproject-api-1.2.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	>=dev-python/virtualenv-20.17.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/hatch-vcs-0.2.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/build[${PYTHON_USEDEP}]
+		>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/flaky-3.7[${PYTHON_USEDEP}]
+		>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-3.1[${PYTHON_USEDEP}]
+		>=dev-python/re-assert-1.1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/time-machine-2.8.2[${PYTHON_USEDEP}]
+		' 'python*')
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+src_prepare() {
+	# the minimal bounds in tox are entirely meaningless and new packaging
+	# breaks setuptools
+	sed -i -e '/packaging/s:>=22::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# devpi_process is not packaged, and has lots of dependencies
+	cat > "${T}"/devpi_process.py <<-EOF || die
+		def IndexServer(*args, **kwargs): raise NotImplementedError()
+	EOF
+
+	local -x PYTHONPATH=${T}:${PYTHONPATH}
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
+	)
+	local EPYTEST_IGNORE=(
+		# requires devpi*
+		tests/test_provision.py
+	)
+	if ! has_version "dev-python/time_machine[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=(
+			tests/util/test_spinner.py
+		)
+	fi
+
+	epytest
+}