19 files changed, 233 insertions, 293 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 1ad637e0cdb4..86472f1ede4e 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 1243dac4f746..53e000a71af8 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -4,7 +4,6 @@ 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-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz 172157522 BLAKE2B 3c201380e727f7db53d61ff7c411b85aef8b17f086bca0cf3e758284a92a9ced298584e6f92ac6a35f30231d59c916bb98d41a8939f9b1103996c9e09df32ec2 SHA512 dff559b1518bbf9c469a2f4624ba9e83d81df2f08223afc696fa7f3dc9fe1c0d4a17346db8946fb56806e12aa7cbddda8df05b032ffe29dafd8a66c630de0016
 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
@@ -13,6 +12,5 @@ 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_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_pre20221210.ebuild b/dev-python/clang-python/clang-python-16.0.0_pre20221210.ebuild
deleted file mode 100644
index 9b34adc8ac6f..000000000000
--- a/dev-python/clang-python/clang-python-16.0.0_pre20221210.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/doc8/Manifest b/dev-python/doc8/Manifest
index 12d139941425..70a6f86afb77 100644
--- a/dev-python/doc8/Manifest
+++ b/dev-python/doc8/Manifest
@@ -1,3 +1,5 @@
 DIST doc8-1.0.0.tar.gz 26058 BLAKE2B 0113a4738804a9ed0446ae26b18f0f7da9dd3c4a90c598e03c78d3124f5db42dbc38f1f17af05ef60cb645a8b18bcb20aeb2f5cc00c44814afd572d92b2d0301 SHA512 98ad904a994536de80d6e89a221e3d7159d5188a0f57d07961f646e0591f81790f06c624ef90c32e28ff89ecf9e39b2b052363995aaece6a4e30f643c37964b9
+DIST doc8-1.1.1.tar.gz 26514 BLAKE2B 847e34081f4e00698cbe3ca9b7325de2995c45bd02b2f443459050a2801a5b476222c345c4ba06463fc6ff489c3c59e5b6e7abbd7b98af740f09d5b04771a4b2 SHA512 7ec21c2483f7ebf2a7e1fef6677c6051ac253da6014354a968b8a107d8097f986b6b162850561fd6a103e93d157b2c849554aabe2484a49c4a3726c8e2083a89
 EBUILD doc8-1.0.0.ebuild 832 BLAKE2B b08861a20be43f2ff1164e4b0c74f58abdc30308de47d84d20d6f6ad845110f0e720731d1b18872b8889328b2ca619615258707db797daed6388d1dd2c0038b4 SHA512 3084ec1911d0852a2191e4a09aa13108f218aa441299eb7a9abc07427b951b4ddab069b1b51007dad4b44d5e3da899809bc3505ae876f0cbcf294403ea302868
-MISC metadata.xml 447 BLAKE2B 8be26ccdf9fd1e34e05eccee3abb8182d95438b7eb0f6dda03757e1d4a0f2b1c34861f81b9e8bbbb6634f141dc7867ecdf83022b05df6abe322716d78eafc9a4 SHA512 824cb036e31a498764941d78ebd744d2edaa2cd7a3282dbd5f2c16cbcb0adab12a80b0200528c40e01fc6dde851d1abed5b3d5fc2b27577a02cdfad5fa90663d
+EBUILD doc8-1.1.1.ebuild 841 BLAKE2B b911e77fe8773c10e4613d162da01a8a6d258e0ea21b9ca66bc2477d8cf2ad1b5bdf1952c15d598deb2b5fa2e4896acee4431192b8bcc701b48edb11784d3236 SHA512 e41c12fa62f4dd9f15d3d1ae5e3d4ee9b3e041e8390851c03d799908e957d7cf2738c3278335e05768d9473b253581549a72a482c1e200b3cd7ab196d0b9461a
+MISC metadata.xml 497 BLAKE2B 6e5c2f8a487d967892a471d045fcb0acfb2c4681375c352837820237110cfc8ea193c395730552cadeb09ca66316e91e99785aae821a184c619b32d7d8908b47 SHA512 a626b4ecc4cb4cdd2e0a095a2a26a3d0346e4c47608188fd6138517631d99a0f4c2e5ae8be453ac709dd43c2e4acc79b0ec7f37dd6e00125ebe23c99697658d0
diff --git a/dev-python/doc8/doc8-1.1.1.ebuild b/dev-python/doc8/doc8-1.1.1.ebuild
new file mode 100644
index 000000000000..f8c054851484
--- /dev/null
+++ b/dev-python/doc8/doc8-1.1.1.ebuild
@@ -0,0 +1,34 @@
+# 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="Style checker for Sphinx (or other) RST documentation"
+HOMEPAGE="
+	https://pypi.org/project/doc8/
+	https://github.com/PyCQA/doc8/
+"
+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/docutils-0.21[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/restructuredtext-lint-0.7[${PYTHON_USEDEP}]
+	dev-python/stevedore[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+"
+# setuptools_scm_git_archive is not actually needed here
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/doc8/metadata.xml b/dev-python/doc8/metadata.xml
index 408cd2180853..3f2228a46d56 100644
--- a/dev-python/doc8/metadata.xml
+++ b/dev-python/doc8/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
+		<remote-id type="github">PyCQA/doc8</remote-id>
 		<remote-id type="pypi">doc8</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 743628a76cbe..613429ac0c6b 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -3,9 +3,11 @@ DIST fakeredis-py-2.0.0.gh.tar.gz 112218 BLAKE2B 9bbbf76e6fe00a42d25c1688654906a
 DIST fakeredis-py-2.1.0.gh.tar.gz 128595 BLAKE2B f0b2e8ed9ec4156702f4e65e683f40cf79e1fde12ac70b16388ba65e9e49c8f4c92ade6f02195cc3755768fb2858d7e4f8970f54fa728c9fb32ac8cc2f68fa4f SHA512 584a2a36185674d0fadedcc6018286c3edc8c36de730ac1cf09abcbe3b0cacf8dd0e4c964a7a0a053509dce0063f48ce13f122d230fbec9965af54c77b277ea5
 DIST fakeredis-py-2.2.0.gh.tar.gz 128817 BLAKE2B 8666427966e6a93cd33f521fbc38ecb9bb99e1c1a23506437d48bc6113f272aa89a465dc794b5130ef6dfa584f75f159fce0e3b6a50e5cb89b3bfe43ebcd89cd SHA512 857033a6362a6088cec715571d74a9aa1eb3eb8356ed904b10831540ce5be62d798a211d52fb3d8effab253e50fdb3f2a530d39bd722d8be357426f53fb41fe7
 DIST fakeredis-py-2.3.0.gh.tar.gz 130529 BLAKE2B 71faffa3953e40075cb7cae3b664eb81bd20715c28766678d21449de768c4e621703ceb7053e36f19a0c6561ea9b83097392886e0da306460c9ca75a0a99c3d5 SHA512 b0a07d04cd95abe69c658f67943afa5c07e6fa43a6e467762061e3c112aa9961f550f9fa5dccfe6f0fd5fb941253840c6cd7e76bce5f256bfb1a400e05252651
+DIST fakeredis-py-2.4.0.gh.tar.gz 132163 BLAKE2B fc3858eb364c63d776c81d715cbfb218dc0e763d568c97b0d1dafb0716aaf87e928f9b81bd49d28fcc235f4285277446945595d42ff1d440e5c8491b78abb6c3 SHA512 5fba3e84d0506b52e1561f750e045b6227ea21387ddb3a89b8a61e9698fc0e9ec80c4a7048d9426fb0d8e9f2acd808e7e07fcb11d14d6852d9b057fec86d6e6a
 EBUILD fakeredis-1.10.1.ebuild 2000 BLAKE2B 339ce6cb90e8428fc6e9bfe9b6e8748a454584dfce88518ef4692ef6f1dd5b1109a294c73f3586e1fe5650d746a4debad0b468cbe1465b52cd8dfc310c2b1df1 SHA512 930598092f30e9a84752012377742a8a6926fcc9f41dd360f8345af4853653809e4a9ff8f52c0ad7d6f1c4e0035757c5782905cd25a16e8412503f0c0d7dfdef
 EBUILD fakeredis-2.0.0.ebuild 2004 BLAKE2B f869cd6250a3913369e7bb3796ad47218c58f1d357ef7390f420fb79f9041dc90880e812b1ca0485485e74944e692e32d5b62bd81d29516f3a28d1d176a101d9 SHA512 692ea0c3c24f19cbbdeaa538626a1de4cafc65197769f815bfc9bc7fd44dbe38ddaf1f5844637df13df73682a19f698aaecb1b695fc7c2c7a71e23353e37e99b
 EBUILD fakeredis-2.1.0.ebuild 2004 BLAKE2B f869cd6250a3913369e7bb3796ad47218c58f1d357ef7390f420fb79f9041dc90880e812b1ca0485485e74944e692e32d5b62bd81d29516f3a28d1d176a101d9 SHA512 692ea0c3c24f19cbbdeaa538626a1de4cafc65197769f815bfc9bc7fd44dbe38ddaf1f5844637df13df73682a19f698aaecb1b695fc7c2c7a71e23353e37e99b
 EBUILD fakeredis-2.2.0.ebuild 2004 BLAKE2B f869cd6250a3913369e7bb3796ad47218c58f1d357ef7390f420fb79f9041dc90880e812b1ca0485485e74944e692e32d5b62bd81d29516f3a28d1d176a101d9 SHA512 692ea0c3c24f19cbbdeaa538626a1de4cafc65197769f815bfc9bc7fd44dbe38ddaf1f5844637df13df73682a19f698aaecb1b695fc7c2c7a71e23353e37e99b
 EBUILD fakeredis-2.3.0.ebuild 2084 BLAKE2B 055f7bc849ec4a58b6c7022824ea373f8fc919ca98682c3f5866b43a722798f9a1c7b21356a8d977ed102b51338fd6e5a3d715770ef1fe21e1134aa9b9e22c10 SHA512 523298b98b5b7a6be8bb2ffb9fb19a0a492205dc14574d1356a48e1d74c7e90c99d524b5ac0eaa6e34a8dd52f186091f2fe59667c28638b038e04c4a201b382b
+EBUILD fakeredis-2.4.0.ebuild 2084 BLAKE2B 055f7bc849ec4a58b6c7022824ea373f8fc919ca98682c3f5866b43a722798f9a1c7b21356a8d977ed102b51338fd6e5a3d715770ef1fe21e1134aa9b9e22c10 SHA512 523298b98b5b7a6be8bb2ffb9fb19a0a492205dc14574d1356a48e1d74c7e90c99d524b5ac0eaa6e34a8dd52f186091f2fe59667c28638b038e04c4a201b382b
 MISC metadata.xml 373 BLAKE2B 1de33db59658e6190cd0346be58208cae6c9143a52f49dc289e68aaa0d860b5bd68dfb54f2e0b005f60a67f5caa430e2ce94fc69e64bd27e1bbebb07ad29e602 SHA512 24bfcf4919363fef45c182b6de66221e580ee0e9e99ce46e91b767655dc0b6f8a9fa6c3512ba84d1040698c43a0b6a853ad8d63c1ee5fbc00a1d192defb24db5
diff --git a/dev-python/fakeredis/fakeredis-2.4.0.ebuild b/dev-python/fakeredis/fakeredis-2.4.0.ebuild
new file mode 100644
index 000000000000..731d97e0a6f5
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-2.4.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=fakeredis-py-${PV}
+DESCRIPTION="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+	https://github.com/cunla/fakeredis-py/
+	https://pypi.org/project/fakeredis/
+"
+SRC_URI="
+	https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
+	<dev-python/redis-py-4.5[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin redis
+	sed -i -e '/redis/s:<[0-9.]*:*:' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# also lupa
+		test/test_aioredis2.py::test_failed_script_error
+		# TODO
+		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
+		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
+		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
+	)
+	local EPYTEST_IGNORE=(
+		# these tests fail a lot...
+		test/test_hypothesis.py
+	)
+	local args=(
+		# tests requiring lupa (lua support)
+		-k 'not test_eval and not test_lua and not test_script'
+	)
+	epytest "${args[@]}"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/flaky/Manifest b/dev-python/flaky/Manifest
index d30cef8c6b92..46c2a73680d3 100644
--- a/dev-python/flaky/Manifest
+++ b/dev-python/flaky/Manifest
@@ -1,3 +1,4 @@
 DIST flaky-3.7.0.tar.gz 29591 BLAKE2B 747fbda71055bba937abf3e7b97691c1f4b222f085069d1815d5a9eba669464d2ed5d6dcf1842ae82f1970de5cd5e3aea5b12476bfa2d9282549ad0cc62901e9 SHA512 b399f6e1323d6ca341803ac6f1eb318bf24dc37182d0b49b89bb81b9466dd36271ad6dbb9f48ea6fa4760ee631f1482bb6f49c64f4d4520c40634089c1b64f9a
 EBUILD flaky-3.7.0-r2.ebuild 1479 BLAKE2B 30a25d9b52fb9b2f2cbcafa29ca36ef6d5c662950470a455c2ead011b8992404900bfee84438cfdcdc30a466bdbcae381ea0ee99d49ed31619473ebb06a22eff SHA512 9c57dc6148c02b85f1ff4aca73d5ab293418eaf10a11d88ee3283ee35b24fe4bc6fbd4c0dbf991f97d04dbd3d8286d9a93bc7e5f8aa6e6e4a37272885bdd6893
+EBUILD flaky-3.7.0-r3.ebuild 1157 BLAKE2B 645090baf387db011cb7d35037f45ad85d1ad811729459574a779496bf50a512ad479a925beb5abf2fdd5d9ec2cdab28bccc017628c115e574de5104976f3ee8 SHA512 19c9b738f1f5b27de30afec7caeb239e0a0a097294d65a4d53e6c11c7e7715a0a3c2d111b3f1a6a40c18903d9677791037fabbaf3077ae2054075b9f79440bc2
 MISC metadata.xml 395 BLAKE2B 06158c93157879bd7b181e833d84ea33a315103214cfaa54a092f965900f05f705183b74738543ac6bb83beb62de562a59ef43b734a74c9f3d0d5d677e8e00d1 SHA512 2d237ebccf03db7fc42fac5370f1046834646bdfc5755e2298e9cac131363e47e496d9d0f0d00ad914764bcbc2deaee8b7182ae3c32e18f95766351da50028aa
diff --git a/dev-python/flaky/flaky-3.7.0-r3.ebuild b/dev-python/flaky/flaky-3.7.0-r3.ebuild
new file mode 100644
index 000000000000..608bfc37ec70
--- /dev/null
+++ b/dev-python/flaky/flaky-3.7.0-r3.ebuild
@@ -0,0 +1,41 @@
+# 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="Plugin for pytest that automatically reruns flaky tests"
+HOMEPAGE="
+	https://github.com/box/flaky/
+	https://pypi.org/project/flaky/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-python/genty[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	rm flaky/flaky_nose_plugin.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest -k 'example and not options' --doctest-modules test/test_pytest/ || die
+	epytest -p no:flaky test/test_pytest/test_flaky_pytest_plugin.py || die
+	epytest --force-flaky --max-runs 2 test/test_pytest/test_pytest_options_example.py || die
+}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index e938ed5894b3..a09ec7e233c0 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -4,7 +4,6 @@ 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-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz 172157522 BLAKE2B 3c201380e727f7db53d61ff7c411b85aef8b17f086bca0cf3e758284a92a9ced298584e6f92ac6a35f30231d59c916bb98d41a8939f9b1103996c9e09df32ec2 SHA512 dff559b1518bbf9c469a2f4624ba9e83d81df2f08223afc696fa7f3dc9fe1c0d4a17346db8946fb56806e12aa7cbddda8df05b032ffe29dafd8a66c630de0016
 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
@@ -13,6 +12,5 @@ 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_pre20221210.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_pre20221210.ebuild b/dev-python/lit/lit-16.0.0_pre20221210.ebuild
deleted file mode 100644
index 8ace6ca8b915..000000000000
--- a/dev-python/lit/lit-16.0.0_pre20221210.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/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index a9c76bcf44fc..ebb6f438781d 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,3 +1,5 @@
 DIST pallets-sphinx-themes-2.0.2.tar.gz 20655 BLAKE2B a5e2d3a02a5996df6e648b8cf9943260d6e0e475108921493300c7d9437837cc66e83b489ad335596c39eac29f3a6e23b7b4abc3cf1fe3bbb018fd874b44aefd SHA512 a37b0f4fe38c098c0508988faa54ed8b2e1ad9ba41f95f862734cf38fd093e2b7c42d408fc10e529aca810f4cc37d16e6d707ed9affa433adfcb481006cd4577
+DIST pallets-sphinx-themes-2.0.3.gh.tar.gz 20835 BLAKE2B 72cea4f0dd6e6b6e862f187c492b892a6646f4db4b57031ae9c3dbac0aca7fe14df0637d6aa41a6e26bfe493839cd20064f2310c628823a70940e4a57e49ffd2 SHA512 a7c84effe85eb56001dab8b326d0160442aa63397d9ae2d0dff9ec85352ee3896a0cd1423b09b99d764290602ec67e0dc3f4b4aaad186a274d5cd74827c525ce
 EBUILD pallets-sphinx-themes-2.0.2.ebuild 614 BLAKE2B 428a798a768a5368b0a93cdc7ea794bda79f09b5a68de1699f7c64dded51aca72407673e66759500cc20b53a1ed833770a2cb6e222aacee7878d53d3e6e5536f SHA512 4c68f518ab7b858c7a5ef3c6fd1e89983555d2486d68227804ad8a61e40a020d76723b79f174ef9fdab60a9f4c5bc3b7cf7518d41587e26fbd67911149842acf
+EBUILD pallets-sphinx-themes-2.0.3.ebuild 733 BLAKE2B 8854e32b449a95c502da24ac7ceb3644db7bcee5509dc20c4b2e4ae82b8b413e4eac2db2d9860ecdaa7b36c31852acd1b835e3b1bb9d1da5e0369dc036d4c478 SHA512 65b183d0e39a27feb00c2e3df9dd5be1616425750891916f7f87c2f4968eb762d57bcc2bf3a431f7798137f9235c124344b857c28203f6c807740d2249c98195
 MISC metadata.xml 418 BLAKE2B dd644619949598d5675c600fbc5c740dc9882042bd04c8ead4b81de2ebc2f3a3e88d79d1e4cbd710b953cae7b116b1cb09012af913914db5a652a1ba2b5f4970 SHA512 537261ae9194a004752e90e3b4972763f9e22c27d18a7655f4ca4005d2999402b46ca7408d0811e44d3b0a12cb6cac506508c89ae5edd245f15bda13da91f216
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.3.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.3.ebuild
new file mode 100644
index 000000000000..b76a4785ce48
--- /dev/null
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.3.ebuild
@@ -0,0 +1,29 @@
+# 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="Sphinx themes for Pallets and related projects"
+HOMEPAGE="
+	https://github.com/pallets/pallets-sphinx-themes/
+	https://pypi.org/project/Pallets-Sphinx-Themes/
+"
+SRC_URI="
+	https://github.com/pallets/pallets-sphinx-themes/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pytest-plus/Manifest b/dev-python/pytest-plus/Manifest
index 757c625ce195..3c952ae41d07 100644
--- a/dev-python/pytest-plus/Manifest
+++ b/dev-python/pytest-plus/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-plus-0.2.tar.gz 8210 BLAKE2B b8a28e72cfb4e10daa021528de9b5df2e9eb0bc4e911557c7c14a0825284787e94992132c0b74881867a41b55a67785c60b9b87a1594ad33fb57ebac8de391a6 SHA512 e16a03433cb6eb30b6881bec99482bc65cb7d1fa3d0db855befe666c0645d4b5ec02debde9dec4322ed0a0b77d3ac3f1cabda0cf98f375ffd68dc29fb55f5139
+DIST pytest-plus-0.4.0.tar.gz 9987 BLAKE2B 11b8f17630601f52ebae11b7a660c8d97b4c9f1699096a376c162952a03b9f1b580ead6ac0b040b15c267eec1123bffe07d128eb00aec7414e996275ebc4c4e3 SHA512 4f4258853280cac8e03c0477763fd588d2b3cf11e7746d2b8e7d3cf5774b845412bc8779d74d232e4b3473470c39753dc788ac09faf8e8b7c9fee22d7164bab7
 EBUILD pytest-plus-0.2-r1.ebuild 659 BLAKE2B 72dba59fa2acfe4ba2f9bd61f4b7a7831646caf5fd6762bf880e32c3ec5973b02df2b447a0075a3bef5488ea906cd1a4b69c5efee99da2b11106d628954f0ee0 SHA512 178cf869c7adaf5c55672298352bc67d73cf5b8a775a87d7b4235e5eacb8231df05f75920686cea155a2c49d48551010a129f9a814096657927df5fae02e46a4
+EBUILD pytest-plus-0.4.0.ebuild 617 BLAKE2B 0f0c3ef330caf0699347df60c96408c402de42d2053e034c3bee48ead690908b3e31ea89a7cadb28690320ae921eafc7e49adaef0595cf7c388a9da35d8c720d SHA512 9409b3b71d8298687d113fbedee505fd793334c87c885c35d4fb54e7de0b71838fa3e5d786e3e84256adc7025cbbb876badf71defa845543b03be17252ae4f6a
 MISC metadata.xml 406 BLAKE2B ae1b1a2c28f45b4dd7f752125161396de88cf2ed3881f37f72dc7938cd2ea6485c995d0409c6fbaebeb7b1d4cf59736496549702d7a9d825a2ee5eb1e6a65fdf SHA512 33668115e05810055fa79f5d74c5d3b6eca5bb53e0108a257cb57bb496ebd0292c1dd3f5b33feee58c20c2c381a926c870f9576355171a91106c21fea41d6ab3
diff --git a/dev-python/pytest-plus/pytest-plus-0.4.0.ebuild b/dev-python/pytest-plus/pytest-plus-0.4.0.ebuild
new file mode 100644
index 000000000000..04fa7dc378ba
--- /dev/null
+++ b/dev-python/pytest-plus/pytest-plus-0.4.0.ebuild
@@ -0,0 +1,29 @@
+# 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="PyTest Plus Plugin - extends pytest functionality"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-plus/
+	https://pypi.org/project/pytest-plus/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=dev-python/pytest-6.0.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 5edaafe28313..086131ee74f2 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,11 +1,9 @@
 AUX scipy-1.9.9999-meson-options-lapack.patch 1013 BLAKE2B 04cb7b3bc281ef06fe4360f31ea6befe91134bc68ce2a981df704f52814487503d35100bf7fd429d854d0716eaac20f5d55aadad02a4d48eeed8ad55955232b6 SHA512 6d8f6e4c6399f5e8a641a87168b1e2abd31b69a23f90582cba5d8d22d46de0c89d7b0719a25f3cf4e6cd9f81c9ebe0c94d1ba8b6c6b0209020491603b1f548aa
-DIST scipy-1.8.1.tar.gz 38196215 BLAKE2B 180ae646adba2031a4bf99cd4feefe652b8e340110b3b2872e61aa1083054aadf369c7e3b3e3fd8fb71fcd831c95841d2dadd1c71e35e5f7d95800e5551173f0 SHA512 f6fc71c209991fe82baa4b10d8ade0deb1057f6f5942a91dfb7ae45f3eb78a4535efa2861badf5e2d37239fa99dbd99de760aa7e4854b95991ade0263004e7ea
 DIST scipy-1.9.2.tar.gz 42068300 BLAKE2B 0962115990a12339d8b87eabbee02d52a52e57259fbe2e74884fa2f08d66d8b7505f84561f643b539603bc8bf4ef3bf73c3d908453fbb0c99f732c3a81f8a328 SHA512 5f8667aa66aa0b5fad689d960f742874ce09f830bfd5aa241917526f153fbc09c7f709bc84113f83283fcbb8a47113eb215478d9c3473f76d8f7dbf0989429a2
 DIST scipy-1.9.3.tar.gz 42075414 BLAKE2B f19e829d26a5673cccb69bce43a9142637f42a9ec462a3fd2ea44b62564cff6fb27a4deaccc59e0e738cc0c997b0a7de948bf9f2db6fa7896323405a072e0111 SHA512 119f9a5e1ce3b4268ba38a0eb82dff78837593d9a5c5e464663925a4b3b1de060201fe568236e19ed0996a045754333c580e181c4cdec2cc707e57060f59364e
 DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d26b8e86c1558e427a715093f5a29ced3847ab6ecfe88ce1017664f36ac3e9fa9bbf72ede7e0fd3812b5f41fe933 SHA512 95153dc1f404aa64898a700c94c0deea3ca842c3152167d0987edabcf4a8eba16b6c8e6bc38a6775a849dc621e6a21434baf53d1669b1865fa5049cffa4387ac
 DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728
-EBUILD scipy-1.8.1.ebuild 5275 BLAKE2B 0b2f1bb8c37c253aae87941aa9cb15352d82ff5bc34089ae7cf93cad7d264b0ceaecd7f8f0ff02670d24282a61032eaa52bf16de03e1d25d8a18fbfe7d63c981 SHA512 d7ed5f3bc61e27f898937387f88cd934147149ba40ccc01b160571db97074ccba2eb68510899bb4ee70083e47cf3e2c5c6e53435f56933cc5652e9b21a231763
 EBUILD scipy-1.9.2.ebuild 2354 BLAKE2B c013d3f8f9ddf0ba89246c9af4d4285f06b6aefdafb3c988924c93b3f70e97486c352933a6855e0b33d2d62dca49a6a58a0202b590f0b32f7834894a4e97db55 SHA512 dc72624aefd000730f8b8837e0ee7f4b56f57905e211c5eff186d3b9b21d891f8eda4484235edaccbf2505bbb02e25d5945b49f51265dedc9b4fe6ec0fc18b0f
 EBUILD scipy-1.9.3.ebuild 2439 BLAKE2B cfe98bc6faa372817b90889b0c6f96aceb7f5c1df7822b9aee2f74470b8e2615dbc6369844188ffae9ad3c0ec264178a054d708713c84ccabc1f226fb410a901 SHA512 b3d5e11e9e85ad1c76211a26733b8eeb32b307c1bb5473f130ab1f8a6d615115eed4b11e708f10613ef012f9567f421f2b569b7e8bf66d48b2f18a42e00e661b
 EBUILD scipy-1.9.9999.ebuild 2430 BLAKE2B f21f758cfdf268fdf4f58d7e4b856b0c348372e61d7875cd36f08720be587cd07c15ad539726bb4035a98d7a6eac399d2e5eeac925f11e23805bc015eaa81ef2 SHA512 4881d7658c22fed8b7b15d417e12e24e0389637ed5378dee5128aca4647788cc2450dc084fbece5666a629c6136e1a117070e71ecbe1b0b96a0e1ad3902fe8e4
-MISC metadata.xml 1148 BLAKE2B bd532eb47b00da1ff18e9bb5be287ef32136412fd7542e92a522c9d3d9d9663d2312b74fd2fc6d4239e4fc581c8e881ac6e682fcfd14b0debb08210237878398 SHA512 a913d7013caece759f2fd36f8814589a512e7650afca19edf444694b1fceeeda02f0bffb4ced81a46a376b2d6d54b292257a236549418aecf20d99e70715babb
+MISC metadata.xml 1054 BLAKE2B 490b13e1a307b1990f692d43f3bdc2bbe92e8dad809a24c9223358028eeff2e0387043383e7616df3d010d6bf669337c4c7cf57587181c2c77d93e2ef6e3b8e4 SHA512 379160f7146a8e7dbbfb7243e39f76e12399e47cf0eab632fc3e1598f5fa4482151b769d16c6f026192ac16b8fefdd363427b14decf66c7e1f6e1630444abdf7
diff --git a/dev-python/scipy/metadata.xml b/dev-python/scipy/metadata.xml
index 727696087804..3d6d78db5ad1 100644
--- a/dev-python/scipy/metadata.xml
+++ b/dev-python/scipy/metadata.xml
@@ -19,7 +19,6 @@
 	</longdescription>
 	<use>
 		<flag name="pythran">Use <pkg>dev-python/pythran</pkg> to accelerate runtime</flag>
-		<flag name="sparse">Adds support for sparse solving with <pkg>sci-libs/umfpack</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">scipy/scipy</remote-id>
diff --git a/dev-python/scipy/scipy-1.8.1.ebuild b/dev-python/scipy/scipy-1.8.1.ebuild
deleted file mode 100644
index df38fbcc3ec2..000000000000
--- a/dev-python/scipy/scipy-1.8.1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_IN_SOURCE_BUILD=1
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
-
-# Upstream is often behind with doc updates
-DOC_PV=1.8.1
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="
-	https://scipy.org/
-	https://github.com/scipy/scipy/
-	https://pypi.org/project/scipy/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 -hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="doc +pythran sparse"
-
-DEPEND="
-	>=dev-python/numpy-1.17.3[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack:0=
-	virtual/cblas
-	virtual/lapack
-	sparse? ( sci-libs/umfpack:0= )"
-RDEPEND="${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-lang/swig
-	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	pythran? ( dev-python/pythran[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use sparse && unset UMFPACK
-
-	# the missing symbols are in -lpythonX.Y, but since the version can
-	# differ, we just introduce the same scaryness as on Linux/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-
-	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
-	# hack to force F77 to be FC until bug #278772 is fixed
-	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
-	export F90="${FC}"
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-	append-fflags -fPIC
-
-	local libdir="${EPREFIX}"/usr/$(get_libdir)
-	cat >> site.cfg <<-EOF || die
-		[blas]
-		include_dirs = $(pc_incdir cblas)
-		library_dirs = $(pc_libdir cblas blas):${libdir}
-		blas_libs = $(pc_libs cblas blas)
-		[lapack]
-		library_dirs = $(pc_libdir lapack):${libdir}
-		lapack_libs = $(pc_libs lapack)
-	EOF
-	cat >> setup.cfg <<-EOF || die
-		[options]
-		zip_safe = False
-	EOF
-
-	# TODO
-	sed -e "s:== 'levy_stable':in ('levy_stable', 'crystalball', 'ncf'):" \
-		-i scipy/stats/tests/test_continuous_basic.py || die
-
-	# Skip known-failing test. Broken on all versions in Gentoo for years.
-	# bug #743295
-	sed -e 's:test_bisplev_integer_overflow:_&:' \
-			-i scipy/interpolate/tests/test_fitpack.py || die
-
-	# Skip a few 32-bit related failures
-	if use x86 ; then
-		# TODO: Tidy this up and switch to epytest
-		sed -i -e 's:test_nd_axis_m1:_&:' \
-			-e 's:test_nd_axis_0:_&:' \
-			-e 's:test_maxiter_worsening:_&:' \
-			-e 's:test_pdist_jensenshannon_iris:_&:' \
-			-e 's:test_align_vectors_single_vector:_&:' \
-			scipy/signal/tests/test_spectral.py \
-			scipy/spatial/tests/test_distance.py \
-			scipy/spatial/transform/tests/test_rotation.py || die
-	fi
-
-	if has_version ">=sci-libs/lapack-3.10"; then
-		sed -e 's:test_sort(:_&:' \
-			-i scipy/linalg/tests/test_decomp.py || die
-		sed -e 's:test_solve_discrete_are:_&:' \
-			-i scipy/linalg/tests/test_solvers.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	export SCIPY_USE_PYTHRAN=$(usex pythran 1 0)
-
-	# bug 721860
-	test-flag-FC -fallow-argument-mismatch &&
-		append-fflags -fallow-argument-mismatch
-}
-
-python_compile() {
-	# FIXME: parallel python building fails, bug #614464
-	export ORIGINAL_MAKEOPTS="${MAKEOPTS}"
-	export MAKEOPTS=-j1
-
-	${EPYTHON} tools/cythonize.py || die
-	distutils-r1_python_compile \
-		${SCIPY_FCONFIG}
-}
-
-python_test() {
-	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
-
-	# Let's try using pytest again with xdist to speed things up.
-	# Note that using pytest is required to avoid dying b/c of a
-	# deprecation warning with distutils in Python 3.01.
-	epytest -n "$(makeopts_jobs "${ORIGINAL_MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
-	use doc && \
-		local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-	python_optimize
-}
-
-pkg_postinst() {
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer. Example:"
-	elog "    echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}