gentoo auto-resync : 10:11:2022 - 21:28:32

29 files changed, 16 insertions, 616 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 76548919b617..d4b28a681f23 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index 3e3bb78a4f75..d94289ff80b8 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -61,5 +61,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST zeroize-1.5.7.crate 18861 BLAKE2B 5f203d91aae732b928e2acd02656a486f0f930b8daea96b927552f5790862489d83c7bd48b0c7c62a3273e7a04833a16149ce489847f17fbb037e88922d359a2 SHA512 e0688681bceba324d36ea4dc552791801dc93b5882d106b79dd317af99cb718b711899bfd09917a811d23096693448801e64f0651bd9eeae7895618821d88fa9
 EBUILD bcrypt-4.0.0.ebuild 1700 BLAKE2B 40bb112ef6e82a46b77af5c20b3f51c77206ab9dfcd3476dc09d4d0e7ac26f1f29510ac7d8bba445939600469e5d16d1c90f16d434206d6b7c1d99a40cd840a8 SHA512 2537e89d1f9e8e8380483440c84f32a4d1b057c2bb1767508ab784f6228b4d412666ce56c871f1ba0882b9098f7dbb0e4ff294b211d16d5824ad6963c1af2c3d
-EBUILD bcrypt-4.0.1.ebuild 1709 BLAKE2B 26c57ac3b37d2f5e45165f45140b9cb4d93c7d24facb44dd7f5a0911047659cc62bcc155cbc96cd34c5dba8ff5308d5370d513f8b147da89cbb020e80087d170 SHA512 b8b9ca46a0c194aeca1238fd070d35352ab23f930b99ace6a64662373de4d96ce83f7f26b08a29e4320390b9d64d7b4265583c885bbe350c996a13b3478c8e14
+EBUILD bcrypt-4.0.1.ebuild 1706 BLAKE2B c3353d43ea9fcada84c3cd39b3a99d305f82497a83d99981e3ec5c66b5792eb13586904d1b642b265ef195ff449c232ca73fe1eaae91e7198ddb21f1b675a181 SHA512 7874a335c63209d79e29c715d2a59da60350fd3c02d08c68052393def6790ad622fefbd083368d231308cc16209c60e657dd728a7b35ce9c6cdfddf7f28bf6ef
 MISC metadata.xml 486 BLAKE2B 874ef427438f2a2adc0529010628dd40505fd2597e267b8e51641d95b4c3bd8dab28d0fcd86c23f24c3abc866bd049d5e44438b282a5a13b023320491303a5b5 SHA512 de2e0a2a60b83a660a7c51315816a2762d9ebdb031656b8968da641d4e3897e4f5eb7a3432f828182f733ee4ffd17f11e8fb97d9a72f1a7eec56bb2f46978293
diff --git a/dev-python/bcrypt/bcrypt-4.0.1.ebuild b/dev-python/bcrypt/bcrypt-4.0.1.ebuild
index d3b62748844d..3392d086e3ae 100644
--- a/dev-python/bcrypt/bcrypt-4.0.1.ebuild
+++ b/dev-python/bcrypt/bcrypt-4.0.1.ebuild
@@ -74,7 +74,7 @@ SLOT="0"
 LICENSE="Apache-2.0"
 LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016"
 LICENSE+=" Unlicense"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	dev-python/setuptools-rust[${PYTHON_USEDEP}]
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 68be0bbc82dd..60274e0ec4e8 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -5,7 +5,6 @@ DIST llvm-project-15.0.3.src.tar.xz.sig 438 BLAKE2B e7e0614e144eb878f694c12e97cf
 DIST llvm-project-15.0.4.src.tar.xz 110936424 BLAKE2B a02b76ad161e352b4d3d84baffdada9c6a0e704de7a2c4017df4d4d05a9e9d02113791cd7d91c3edfa1f5bcb7ab95e1772d60f7061514928c6828600f41a8322 SHA512 9d5b664dd77c08130601636f9d6c006b257f369470ce823aa56d06698a9f0edfec42f2c90da934b9ad52c4d7960d9a024ea46dc9640275be6d191b1ba9869459
 DIST llvm-project-15.0.4.src.tar.xz.sig 566 BLAKE2B f1a7be65fcce932dc125ae2b498f68a14e68dad0d7a1e031343c52c5dafb7b123e346f3efa50a7693584361abf01efe9401b1b5781dee6b92dc1045e538e9b7b SHA512 35899ffbd13fc44cade54246a423450571cb4b62b8d706864daa3eef2377c48e24ef3113218e39e29de995b7f7fa307f9187552766576c9050fd924beb517f6e
 DIST llvm-project-1fb186198af5f183dde053c1396f899567755d64.tar.gz 170328817 BLAKE2B c79199044e8d636127d1d163ceea856c1bcb1d59c892e9c72869ab788b4feb23f8c28585ac761764b4e29b883c61e43be9341610a523d8b64471200bb3aecfaa SHA512 8b366dc70506ceb70a5584ad051e100fa1cc620388fc757536ef775d102b4baaac016d4f62dbc8b1d9dd00b587622a25d9da735196d336faf35d611145cf5fdc
-DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAKE2B d3a82a07f855b038071fc8eb3f41a88b4c220a577219985ecddeb9a535ea8b159dbad575699997d90a49db74c074b5f4354ad707e91d6934daaa7319e0d8ee9b SHA512 3f5525c7d893bdac701cff4cf82dafc31608920d788d9b7401654f320b2432528cf4ae8ef013182807b3dc0c5b758c71f1efeedb672dd47fdb8aa6f434dfb583
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD clang-python-13.0.1.ebuild 925 BLAKE2B 1dab0cbb672643072e7d824a262c81505d19e555f24f97f82156473affc2f5ba6fc34ec493ffeedbc82feb1245fc6a39126e1b81fcdc8f8b4ddd0b7fe108e4bb SHA512 11eaf5c7a484d756f01986eacce19c912666518892f3213ff42367c126c2d8474abf6608cca24e6250c64e7423464e7cb3e58c2b069c7febf4893b249f2ee304
 EBUILD clang-python-14.0.6.ebuild 956 BLAKE2B 491c8335c64484034663fd84ca2397e13afdd8cab6d3b4adfcc9317379e7a3620372ffe5996d4a0029a7d412f11a0d598f741a6893803ebadba85d330e49682a SHA512 4ef0d1ab2cbc3d277d4cced33fa87de7c3d43295a60a3b418ad4a95399e8de8c2e1e5c594681bf7ce1bfc465732d34b2db3a9e8636c0ed124ddf79c8ed7a5750
@@ -13,6 +12,5 @@ EBUILD clang-python-15.0.3.ebuild 1166 BLAKE2B ed1aedc9342d2011eca73510f651e1c31
 EBUILD clang-python-15.0.4.9999.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
 EBUILD clang-python-15.0.4.ebuild 1168 BLAKE2B b393d5cbb5e01f46da90232e0dd5b265e01643a33085108fe6ada27b6407742814d6c61d37d23cbb93ed1cbe47bd2b4301d37d8e03ae5243e13fe0b92df4b492 SHA512 1337fb232189df580021eaa06c732bf5f2e5f59a506cc28e674913c048e81053d440eff05332510ecb4ab3596fb88ffae6d6eb9fecf9732424d83865b853c6c4
 EBUILD clang-python-16.0.0.9999.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
-EBUILD clang-python-16.0.0_pre20221023.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
 EBUILD clang-python-16.0.0_pre20221104.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_pre20221023.ebuild b/dev-python/clang-python/clang-python-16.0.0_pre20221023.ebuild
deleted file mode 100644
index 9b34adc8ac6f..000000000000
--- a/dev-python/clang-python/clang-python-16.0.0_pre20221023.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/distro/Manifest b/dev-python/distro/Manifest
index 53b46432b747..6214e3f66d58 100644
--- a/dev-python/distro/Manifest
+++ b/dev-python/distro/Manifest
@@ -1,5 +1,3 @@
-DIST distro-1.7.0.tar.gz 58164 BLAKE2B 22bbd2daf9cac589530eac9a58767db6b9e389b77719516f7386a9377b49ba4c9b696165701acc42366b760b9a632c70a2243a58c12a367fef2a0a770a4aea44 SHA512 14516ecab33ee8c57c35a8279eb515fd699031fabac7d8886092ea98696797d55503179870aeb513a85e1a66c7e69f2f60bb6ea9fc935be975cb5135e1917ecc
 DIST distro-1.8.0.tar.gz 59428 BLAKE2B d1b47dd801c4414a6bb21c544c62c306a1cf49b43f70974f7a0b4bcba64620047c7d06b6507ba262eba44d2f192f654646bb69241ed5bf6b761dc9d42e049e18 SHA512 027fe8bc50e263dc49451932774f32cea7900820b6e30cc80afcdc84374777ba733137fdd8d27fec76f66ce9c579bc172721e7ae0f43e72dffbc092126b26af2
-EBUILD distro-1.7.0.ebuild 604 BLAKE2B f6ea7544bbe89b785b12d3d5bd7ad1d753724fb9c3ecf8fe0838351cdb567a024424a1c6df11f563f55806ab87886e4615066308763f9a6e40d5921dbd56beda SHA512 735d94041569023a02fd97fd002cef38f647bd66e14f5a5f95f6e59db09aed82c34154c63774438e6a8bb85da5334d7b00a30c46b312b707ee66f18a43b0dc56
-EBUILD distro-1.8.0.ebuild 645 BLAKE2B 50b26eac28849e45072a75d4e825d11144e8bcbfaff1ed9faef4a83c4f78965e6f49bb984d08a9f7a9a9a5e64423bdaa7fa202cef096bc0a1c49a43d72735ce3 SHA512 007f317e2a311f0df854fde8899362be9c84e55977bc1376afd2f2d75f31032adf4725c75a82397bb9fae4482bc48fdd5e0d81efb80d7fca5e65a9f0e0033006
+EBUILD distro-1.8.0.ebuild 638 BLAKE2B 125798f215ea5fbac329061017ce807a53bad5f0dda3d6e8518d8cf80393f7ac9a67545d0e29eceb3b803a227924e562cf8cfdfc69c47fca428adecee0912bc5 SHA512 470e3397987d84504f45470397919a30baaaa4b1ed1d4b5261370d2a8d1d290265b338494359c028847b2d6565eb2281a4c09bce7bbda3e7efa50577585d99cb
 MISC metadata.xml 847 BLAKE2B 62f2559f30efb777b18c61efdd9c957ca1855ed90bd35c93d492225369f1b293120a3c765412b00c2efde0d2a96b6e924ffb8f5d5a2a0bf305f142d29f88a6a0 SHA512 af4a1c5373c4d2b324859e736632349214c33a6f256e2e69be4ad6a8bedf3c8adb670c187dbe16fd9a546d347639e61ac117bcf2918438f290dc8c5cdb13f89c
diff --git a/dev-python/distro/distro-1.7.0.ebuild b/dev-python/distro/distro-1.7.0.ebuild
deleted file mode 100644
index 74b41304a0fb..000000000000
--- a/dev-python/distro/distro-1.7.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Reliable machine-readable Linux distribution information for Python"
-HOMEPAGE="
-	https://distro.readthedocs.io/en/latest/
-	https://pypi.org/project/distro/
-	https://github.com/python-distro/distro/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
diff --git a/dev-python/distro/distro-1.8.0.ebuild b/dev-python/distro/distro-1.8.0.ebuild
index 450a7bea04af..ee34709be795 100644
--- a/dev-python/distro/distro-1.8.0.ebuild
+++ b/dev-python/distro/distro-1.8.0.ebuild
@@ -18,6 +18,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/lark/Manifest b/dev-python/lark/Manifest
index 81a1ff8d9aba..34fdc6318d01 100644
--- a/dev-python/lark/Manifest
+++ b/dev-python/lark/Manifest
@@ -2,6 +2,6 @@ DIST lark-1.1.2.tar.gz 243201 BLAKE2B 0f1b51b0276ad893f29d0afa6c3e18211b0b92832c
 DIST lark-1.1.3.tar.gz 245913 BLAKE2B 4c7b53d123aa7cdffcb16027921fced2f94dc0e5b9b816825f297629a9ff446758d9a700dc0f243f3d4c478fc992bbf5bfb38c51c2be3c8379df06b41044c624 SHA512 5359a29852554049ecee77a4151a2c64c5af72eccf5c2bb07926b0c131caac15cc51777c2df1d2c736e9e2b45d59543aa8a6d16ef2cb92ea7f8564c7ac06edb2
 DIST lark-1.1.4.tar.gz 246520 BLAKE2B 08073f89a3403d5e722b3af4d9226ea4ca890a7ad9978fb69f023f1219bb2d148533a68810188d3af35770cc36d29629a1c57a3fbab4098e9ec3d4e73f68ffe8 SHA512 32498f8c387320dce89ebab66e9eed49dc83b855060a8fb9459e6323d0d783ff7184ac997ff095fead09766c00f28c12ccbcd614effb8344ba49df51f7b5a566
 EBUILD lark-1.1.2.ebuild 1044 BLAKE2B 37651f4ac118748c27f1ba76db1cf0400957dcd8e348023295306f86b88c7e864dfebf80a273a0fbc515c6a536f9fa3d1010172df4682c35a7097254ec75b841 SHA512 e5b8c6d42e4af12bf07d2c6efe3d330f99da1f5cdac46a0ead309707f812489ef43a91cd54d61249e6c13cc21a4fff3352a0ea2987182af60b73f658801462df
-EBUILD lark-1.1.3.ebuild 821 BLAKE2B 17242442e8a470c81e55ba5d321bdaf27b780e26d0056ee5bafe60f8c4c49453b72f625d3935d0965074b7c102563578c5bdcb7186f0366dc38ad7345ad19311 SHA512 f1010e4b05752055f6d793e17887e2adfac4849b91c5da366efe09a872f6458817e0ceb6f3d0be45bfcc4198d5122cfdb4a6cf9ceee70707faea774ed4470bcd
+EBUILD lark-1.1.3.ebuild 817 BLAKE2B 0f10270ee2275f9d79a8c0c6840b3f863c303f6ceee894a9a88a7a686220de4fa01d180ca79b920a88db9bba083a34860d4cd6a84100d7ecff21af8b37275409 SHA512 b14a7b548de40cd32d498e71e14361c89cff2a4416dcfcf1ffcee16dada031e6f8ad8149da442a183e43c6a53ee9a61798e875d23fca654925204ad37f0a3d80
 EBUILD lark-1.1.4.ebuild 1005 BLAKE2B c4d432174b37224592542a9572fedef407b10f3ecda1fe23a50e5de62634e52cee2e966335a37799566f5b62a67b43902ae72777910ab015091fa1aff0828733 SHA512 29ae2054e1cb3434313b8a0730e5f147b7b2948ac24ec84b04b93dbd0730c6f3cf6a489cb893ee549b09c23492c9e49bf916608e46a3161d34e4b594a652fdb9
 MISC metadata.xml 364 BLAKE2B 8a1409bfc4f242907355a931f5ca7308c96b424cc06cfbc82f281abbaea32a0aaa5257d04f4fbd6131e9056dc08ec2f5834d80608d68d5e9efd32314d0a5cd47 SHA512 ed2ecc7da195e14e5a8071f3c5d277ead1dbbb811c1b7b1163c53d0b5e01ab299a7547de82782c9211aeb8fb6d97d3cd6bc0c4f258c533e884c4e096e7ff20b1
diff --git a/dev-python/lark/lark-1.1.3.ebuild b/dev-python/lark/lark-1.1.3.ebuild
index 5308a11fb889..f17a2e7e881b 100644
--- a/dev-python/lark/lark-1.1.3.ebuild
+++ b/dev-python/lark/lark-1.1.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/lark/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 30f9bb673dca..a5ddf129bf76 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -5,7 +5,6 @@ DIST llvm-project-15.0.3.src.tar.xz.sig 438 BLAKE2B e7e0614e144eb878f694c12e97cf
 DIST llvm-project-15.0.4.src.tar.xz 110936424 BLAKE2B a02b76ad161e352b4d3d84baffdada9c6a0e704de7a2c4017df4d4d05a9e9d02113791cd7d91c3edfa1f5bcb7ab95e1772d60f7061514928c6828600f41a8322 SHA512 9d5b664dd77c08130601636f9d6c006b257f369470ce823aa56d06698a9f0edfec42f2c90da934b9ad52c4d7960d9a024ea46dc9640275be6d191b1ba9869459
 DIST llvm-project-15.0.4.src.tar.xz.sig 566 BLAKE2B f1a7be65fcce932dc125ae2b498f68a14e68dad0d7a1e031343c52c5dafb7b123e346f3efa50a7693584361abf01efe9401b1b5781dee6b92dc1045e538e9b7b SHA512 35899ffbd13fc44cade54246a423450571cb4b62b8d706864daa3eef2377c48e24ef3113218e39e29de995b7f7fa307f9187552766576c9050fd924beb517f6e
 DIST llvm-project-1fb186198af5f183dde053c1396f899567755d64.tar.gz 170328817 BLAKE2B c79199044e8d636127d1d163ceea856c1bcb1d59c892e9c72869ab788b4feb23f8c28585ac761764b4e29b883c61e43be9341610a523d8b64471200bb3aecfaa SHA512 8b366dc70506ceb70a5584ad051e100fa1cc620388fc757536ef775d102b4baaac016d4f62dbc8b1d9dd00b587622a25d9da735196d336faf35d611145cf5fdc
-DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAKE2B d3a82a07f855b038071fc8eb3f41a88b4c220a577219985ecddeb9a535ea8b159dbad575699997d90a49db74c074b5f4354ad707e91d6934daaa7319e0d8ee9b SHA512 3f5525c7d893bdac701cff4cf82dafc31608920d788d9b7401654f320b2432528cf4ae8ef013182807b3dc0c5b758c71f1efeedb672dd47fdb8aa6f434dfb583
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD lit-13.0.1.ebuild 907 BLAKE2B 786bc45254014c19e47997b263eba9245fc44459a6f12d46e69803fdf57c1b8f3d07d7e0354ea23ab17471771f57af8e792ca942b9f195462a26629d8d6bfb8b SHA512 ca254f8d0d3af0e01b24e73de8e15b77d687fd0f23a4848dd4e85522426e7dbdcd8ae77e25d8f88e637e390131fe78362ae7ba4ecd192a4c970cc3311b371dfa
 EBUILD lit-14.0.6.ebuild 914 BLAKE2B 80f1bb1010f71ff835aef8e87cc0bca5de0dd97e74debaee4e26d698e530468b755bc632884c11616a0ae082befa75a7b6c11043c70c3bb5679b0dae1c985d0a SHA512 77eafef2378be28fdcaa87f07fec8b1907f8c491b4a600b47d9f5970148f6684e6b4733ad6dafb753aa7a56ed1834b10ff30afc5995812c895749ea0c7294e47
@@ -13,6 +12,5 @@ EBUILD lit-15.0.3.ebuild 914 BLAKE2B 8425acc2d890bf889570c4d76703acfb3aab774d3db
 EBUILD lit-15.0.4.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 EBUILD lit-15.0.4.ebuild 920 BLAKE2B 44ddfc3adf60ca1c1a328ecda0d28b7fcbc416a0d472cdf31f978fa25beebec533686b71292a7b36be1654633026e029f04e2b496c06845e088bd9b416b1b6c0 SHA512 d4a2442ead255c0664f4a4946034632658d39dd36ccf3d88b5aaad7f7ebe25b0969dbfb368ad6a487c277f845c47a54f8f548df79db2da84bf3714883ec0fbea
 EBUILD lit-16.0.0.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
-EBUILD lit-16.0.0_pre20221023.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 EBUILD lit-16.0.0_pre20221104.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 MISC metadata.xml 340 BLAKE2B c9ca851e49b4ab48c015686e983ec988f60c34ed0af77abd7bc03d046002f79f74b9b463ecb97db89f2230c1593af7acdaf6651fc51fed4aa92a459d07aabf18 SHA512 3fe8262ce6b971364162fbdbac3b02bf02f0a64896c8a2564e2a2998bd6e6bc74463bf9104e3f4ffaa9f5c1a16c877fc864b8a4f056ca0022f741799bc00f217
diff --git a/dev-python/lit/lit-16.0.0_pre20221023.ebuild b/dev-python/lit/lit-16.0.0_pre20221023.ebuild
deleted file mode 100644
index 8ace6ca8b915..000000000000
--- a/dev-python/lit/lit-16.0.0_pre20221023.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/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index 6ce74da52cc1..25d0b11f69c8 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -1,5 +1,3 @@
-DIST numpydoc-1.4.0.gh.tar.gz 70041 BLAKE2B 34df315b65a034da1bd4742dbbaef77164eaf16c8e56b0b941c6084bf32c0e116d7b4d9795d936380ea4a92ee73b31d61540ff87ed9c129c193f4ead211b47f2 SHA512 24a267149cd696bac552433cf64353aed6f0a3040127ff7cabc42dc0a44e8d7e0cc99d903a6554249c888ef7198adead5aba20c67b0af2e7c738a391e9a9ef02
 DIST numpydoc-1.5.0.gh.tar.gz 71498 BLAKE2B 6f46d3b39ceecffe1a604d314bb0b2613219c92a951e3578333da8c0891e928564dd7501258d0270901b9923be7caf8af5d68ed4df7dd8f8e322a7503456fbf7 SHA512 e87535c74767946a71b3094b6591fcfb4d7e42acd505c28b3a5c00ea19c29bb21806c5cb655b5d3aca670d105654956d9b59c06d8be68cd51a1760b219c1c815
-EBUILD numpydoc-1.4.0.ebuild 1126 BLAKE2B c2abf4586495afd83cef04a417a094e197ff0b35724ecdfeaa4e8e070ebb94ff717a98a68cace2ba5ef6f986af247cd5299e2a4d4a9b2095b48133a0f2755a6d SHA512 f04602197aa5812e97005598c4975b1172f4f6ab62b684b446cbfbc45caa8eb39992d8b733687448d4fced5e46808b59238b70779e8fac9fa12d07d0fe5fcf7d
-EBUILD numpydoc-1.5.0.ebuild 1136 BLAKE2B 0137293bb3c778db0294c88ae3093492c5bdc5b2d004042bcc1e42cd62309a14ee817f24abffd5694cd6be315eea418af43956712adeb3ea461c8fc9398589b2 SHA512 ec3e8049c6b64bfa3f75b51d5c7c26367516820cfcffb3efbeda0c3ff222eb249ee014743518d31974c660d409dfa773510847a0432d691d57b45bf242c929a5
+EBUILD numpydoc-1.5.0.ebuild 1128 BLAKE2B b7ff7c2215a0f177001b8f9582637c78251015a24f84750019dceb39be0d59f99291738a3d5ee55f779423ffabfe4c91efd3590e7de9cc369c1a5a2b0d00f9bc SHA512 ba2d6ab03872f5688acf17b8c0cf94f4af3cec4d58a159650d98d030da472e05a368163c20b88bef0b6d97ae69f0ff6dc9824d7683f0c5344234d613a67c64dc
 MISC metadata.xml 403 BLAKE2B 437fdd3881a5ec60a83b3cb018e57c714a91030be9ab0032b8662e30b7bcd120ee3dd2015be561dd8a65a39833ef777e22f040a6e466c1b56a602a4ac33d4917 SHA512 833d00712cf7dfdc1080181301c03388a3c966436d2d9c9badb609cff66fa49035a6d001d60f205e1c2c49808eda7fad65abda8802f42f7ba36939b3691a8390
diff --git a/dev-python/numpydoc/numpydoc-1.4.0.ebuild b/dev-python/numpydoc/numpydoc-1.4.0.ebuild
deleted file mode 100644
index 86388e4b35fd..000000000000
--- a/dev-python/numpydoc/numpydoc-1.4.0.ebuild
+++ /dev/null
@@ -1,51 +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
-
-DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
-HOMEPAGE="
-	https://numpydoc.readthedocs.io/en/latest/
-	https://github.com/numpy/numpydoc/
-	https://pypi.org/project/numpydoc/
-"
-SRC_URI="
-	https://github.com/numpy/numpydoc/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/matplotlib-3.2.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov-report= --cov=numpydoc::' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# these require Internet (intersphinx)
-		numpydoc/tests/test_full.py::test_MyClass
-		numpydoc/tests/test_full.py::test_my_function
-	)
-	epytest --pyargs numpydoc
-}
diff --git a/dev-python/numpydoc/numpydoc-1.5.0.ebuild b/dev-python/numpydoc/numpydoc-1.5.0.ebuild
index e031076473c2..6b4a6e0d9159 100644
--- a/dev-python/numpydoc/numpydoc-1.5.0.ebuild
+++ b/dev-python/numpydoc/numpydoc-1.5.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
diff --git a/dev-python/patsy/Manifest b/dev-python/patsy/Manifest
index 87b4d1ce103e..bec1788c0409 100644
--- a/dev-python/patsy/Manifest
+++ b/dev-python/patsy/Manifest
@@ -1,6 +1,6 @@
 DIST patsy-0.5.2.tar.gz 397275 BLAKE2B 3aa5dc310729bd979c78004d5f1badb83b75b08d290cf8258191c87d61401f0b6ecd9490f1c4b932269e545c50a16694e44de9c076ca80648717c5f1af62fb69 SHA512 898df5536b0ff3a4d299e69c5f73a3d754cfbe78fe463fb4c4726cfd67d4e30c77cd3d7093131737207cb9f29c1374ab20a68ec5978007ea51878ec7c395f48d
 DIST patsy-0.5.3.tar.gz 397680 BLAKE2B 43696f9e95c124cab5bf907723596d8b2b15f0539fbd2b9c2a2fcc76591e935020929ba31fd5378114fe58d22a9931508d89edf21f24b00c916a6e78dc4ee58f SHA512 9a6ea2382287208013e02bab7cba9378311a8e18fe059593aa99090bb6191efa74badff011424a7f6b3c8ec72c1b8650637322b71617f23357bb4b38ac6a79a0
 EBUILD patsy-0.5.2.ebuild 643 BLAKE2B 178669501e3bc257c62e061463dd0e7157da8147b9551a35c1c5fd0779957bcef28525027f4c80c02ba164705b7de1838d7744aafe0facbe081d674cdd26af26 SHA512 5a5d675a8c17e6f1c2687a3e64baa55c6fed6e0d5b686e9be22398b5cbcfffa6da5191f7d689bf86a1f4097d3b32afa2c0ed7a17c2a9a0a5639d1c2ed9c09fd7
-EBUILD patsy-0.5.3-r1.ebuild 668 BLAKE2B 9cd2a6ce36351ae831dbac62a7ba872c18bfacb117f0cb04642c7fa5b24a9c5773bd2841586013856f7974526dac6b50cc5391dffe6cc8e56bf6aa7199603238 SHA512 9a0ddec23ad61f163d9f3cea857758478cd3382fd8f31674171a9ac29116e3f4eff1a289d9701816790852f658489984c6df4b952181781d8f9e232db4d9836a
+EBUILD patsy-0.5.3-r1.ebuild 665 BLAKE2B a5a56282df9fd8708d095afa1574815687146f8bdd9545544d9508e976a676daf40ce090d3f8a23e3e76e43d1d28e34401826a984ad92823b73426dd5a27fb36 SHA512 060ba5db6d445edc94593eb474961274a9cd7c851253a7e83a7e5b939d7147aa26804d9bbad6fa678886ffb4b9097ebc7a5ccf4f4390ad61b987c3fc8ba4e758
 EBUILD patsy-0.5.3.ebuild 649 BLAKE2B 5b6a69a576c29112c8421da889e31c04a9c7cee36eb42820761bcf750c6f2d2130a291df1bd25d935820bca0851683fcf040fe1438c77b79020d377c9697da3f SHA512 880aba647c2f8a51e64b624974b745ae30d168762065451ce97a61eefaabefc7414fcd72a9694a6d3e6cbceb528a2648bc69c5bc0aacf8f22e61b05ade6a7d41
 MISC metadata.xml 732 BLAKE2B cf0e18d97605d69bae87a3553b89d551c03b908ec5a41da2ca11490cce6abd9aa6533d9155b7c19e3e12e5996aa8d5c3ea1f4cfb15e6c70916a4e2119fa54399 SHA512 f68d1e8645fee5af27d72062cc36b3700bff6c9f9eb6cb38a3b6c085211fb1b8502257d5d09edbd858e10ff4ef9f6661c577e336c3881e3c88e54d0db889a2b4
diff --git a/dev-python/patsy/patsy-0.5.3-r1.ebuild b/dev-python/patsy/patsy-0.5.3-r1.ebuild
index 5bc24b1a5b23..3e611de39162 100644
--- a/dev-python/patsy/patsy-0.5.3-r1.ebuild
+++ b/dev-python/patsy/patsy-0.5.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 15c71c492458..c28251118ede 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,6 +1,4 @@
-DIST pypy3.9-gentoo-patches-7.3.9_p8.tar.xz 15660 BLAKE2B 0d2d2c6e4795b7a30eb1e0e6ccd617cff347c318de46794fc677f8200bf95d1f6c79c180b9e0deff4af60f55f9f3c962dc415f30dc75815d4889290574a64967 SHA512 426acc3345f4629106ace49fbce6256002ae4178d2e24ab9bb44d804adc31990bc6a6873d0e4a55a54c807910fa859b9b0759e7a691fed210ccb4c5c1b650851
 DIST pypy3.9-gentoo-patches-7.3.9_p9.tar.xz 16508 BLAKE2B 30e61ebccb4949c5da6f1837df0e4474eda99c2b2262994b41ce9a5de58b543562010a28d20abb4d1c53c866d668c717802afd617efbcca142610a67cf1a48da SHA512 20d72fe0b7592f6f326faf8f989dacc4c6204203b270f033ff528bc845e68ea2092fa0a16176e91e882d028f549e6622c609e1566d3bc018b34178de76c48992
 DIST pypy3.9-v7.3.9-src.tar.bz2 26976726 BLAKE2B bf1ed21c575901abac020120aaff07ab57f1404713211b19cbd1eb4d6ffc675b7933be8c6fffc2b69ab467963d6598534cd5aa90c02feddad596611d2a6b6581 SHA512 83f8a6a2da351c190d2d224242cbc35e35529c7a8e8d842eaf5c945cbce2e172b02a340f32af3d49df8d5288370d794d5bc95fc12dd4a13d817c925abf06198a
-EBUILD pypy3-7.3.9_p8.ebuild 5762 BLAKE2B 3aee68d655c6d2ab2f69dd8873e5793d341c2f8cb48a8251358c0be5787cc5d9cfc2f22a80e32c10323c58b3e44b4428a6b110e94336bd6a873b6dc7ebb022de SHA512 bf2cf7581bd27d0f2e3fcc6008e26c2fcbac4f6c8de18a628dfc06cfd5e16c1fb3d16c0da1272f073186742ec8e3329d0c4dd1ec4dc27eb85c61f182fa542375
 EBUILD pypy3-7.3.9_p9.ebuild 5730 BLAKE2B d9d2ae7ede9d548494c0d4f14d150e28a9ad921d82fa1d0ea39289a6e8090f66c7d72de5539cd3f5f8ad30a3b7a918e42c664e1426618fc611bc5193172082f8 SHA512 ae32e79948584725dfcf36df6098d9f17402f187f26dc1c6dbeaac50134907880776cc8ad48efb2222a8eeb22f7c8516b2d2e10c6c27cb05386c09416285a8be
 MISC metadata.xml 531 BLAKE2B 0f727c7ced9fb24ba0dc0b41d51c177b3711de33b838bf46cfdde5d8b751de9694873c13fe8153747f2cb533c078c54f004ee84b1c3c57b6f8d62128ffb9dba2 SHA512 331b66647a58047ded4bcf1529e3ca16b21cbb37afa82d8be0a4b6ad605e17bf3f1478fad1ea3b9c970bdf5162cb41e6adcb029a261fcbf894e807998b9219f6
diff --git a/dev-python/pypy3/pypy3-7.3.9_p8.ebuild b/dev-python/pypy3/pypy3-7.3.9_p8.ebuild
deleted file mode 100644
index 9da05e3e37f9..000000000000
--- a/dev-python/pypy3/pypy3-7.3.9_p8.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python2_7 )
-inherit pax-utils python-any-r1 toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-MY_P=pypy3.9-v${PYPY_PV/_rc/rc}
-PATCHSET="pypy3.9-gentoo-patches-${PV/_rc/rc}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.9) language"
-HOMEPAGE="
-	https://www.pypy.org/
-	https://foss.heptapod.net/pypy/pypy/
-"
-SRC_URI="
-	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
-SLOT="0/pypy39-pp73-336"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+ensurepip gdbm +jit ncurses sqlite test tk"
-# many tests are failing upstream
-# see https://buildbot.pypy.org/summary?branch=py3.9
-RESTRICT="test"
-
-RDEPEND="
-	|| (
-		>=dev-python/pypy3-exe-${PYPY_PV}_p3:3.9-${PYPY_PV}[bzip2(+),ncurses?]
-		>=dev-python/pypy3-exe-bin-${PYPY_PV}_p3:3.9-${PYPY_PV}
-	)
-	dev-lang/python-exec[python_targets_pypy3(-)]
-	dev-libs/openssl:0=
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy3-bin-7.3.0:0
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		${PYTHON_DEPS}
-		!!dev-python/pytest-forked
-	)
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	mkdir bin || die
-	# switch to the layout expected for cffi module builds
-	mkdir include/pypy3.9 || die
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/bin/pypy3.9-c-${PYPY_PV} pypy3.9-c || die
-	cp -p "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/* include/pypy3.9/ || die
-	# (not installed by pypy-exe)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/pypy3.9/ || die
-	mv pypy/module/cpyext/parse/*.h include/pypy3.9/ || die
-	pax-mark m pypy3.9-c
-
-	# verify the subslot
-	local soabi=$(
-		./pypy3.9-c - <<-EOF
-			import importlib.util
-			import sysconfig
-			soabi = sysconfig.get_config_var("SOABI")
-			magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
-			print(f"{soabi}-{magic}")
-		EOF
-	)
-	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
-
-	# Add epython.py to the distribution
-	echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3.9-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
-		import lib2to3.pygram
-		import lib2to3.patcomp
-		lib2to3.patcomp.PatternCompiler()
-	EOF
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-	# (NB: we build CFFI modules first to avoid error log when importing
-	# build_cffi_imports).
-	cffi_targets=( pypy_util blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma posixshmem )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3.9-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Verify that CFFI module list is up-to-date
-	local expected_cksum=63d4659f
-	local local_cksum=$(
-		../pypy3.9-c - <<-EOF
-			import binascii
-			import json
-			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
-			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
-		EOF
-	)
-	if [[ ${local_cksum} != ${expected_cksum} ]]; then
-		die "Please verify cffi_targets and update checksum to ${local_cksum}"
-	fi
-
-	# Cleanup temporary objects
-	find -name "*_cffi.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x COLUMNS=80
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	# (--deselect for failing doctests)
-	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3.9-c -vv lib-python || die
-}
-
-src_install() {
-	einfo "Installing PyPy ..."
-	dodir /usr/bin
-	dosym pypy3.9-c-${PYPY_PV} /usr/bin/pypy3.9
-	dosym pypy3.9 /usr/bin/pypy3
-	insinto /usr/lib/pypy3.9
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r lib-python/3/. lib_pypy/.
-	insinto /usr/include
-	doins -r include/pypy3.9
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy3.9/${x##*/}"
-	done
-
-	dodoc README.rst
-
-	local dest=/usr/lib/pypy3.9
-	rm -r "${ED}${dest}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${ED}${dest}"/ensurepip || die
-	fi
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/sqlite3 \
-			"${ED}${dest}"/_sqlite3* \
-			"${ED}${dest}"/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/{idlelib,tkinter} \
-			"${ED}${dest}"/_tkinter \
-			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}/usr/bin/pypy3.9-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}/usr/bin/pypy3.9-c-${PYPY_PV}" "${PYTHON}" || die
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index 7451fc3cbd82..398c78670bce 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1,7 +1,3 @@
-DIST sphinxcontrib-spelling-7.6.0.tar.gz 56329 BLAKE2B e26a3fcb39edf622b20bce0d79d1ce2d2a13e4dd8bdef0bb5cc31108a8ee42afd728975fd65e840c91bc6c6510a57904ebc478b458a52a96031bf44f1cbfa8b6 SHA512 102202eb73767ffface2aa5555c8ee2658bcd3c1eb7f3a925e8713e2f233d1bcf0eb307fed6c264c4e4e6503c30d83a3025b0c39ef608451d2fe86664aeb48c5
-DIST sphinxcontrib-spelling-7.6.1.tar.gz 56828 BLAKE2B 4b059262af6048a037378a48b8f0232d1846365e83069830a877a79296a8004070418199574ee34c3c7cdc644273b0316cbfe45978ff979b91764fd523a408e4 SHA512 504719cf565d27f61e0b30c76129afba7513cb0b974deb9adc40762ea51f62c414844d61d69ab4cc19c95c01d8684097803ba0a8f74c79b3be983ce085ae1e06
 DIST sphinxcontrib-spelling-7.6.2.tar.gz 57029 BLAKE2B 0e4cbdb167afbb5e2b60e8bae7e3b3ca8993e32495e5005e3889e8e34199f76deca8e1414e7a702b20a1c2600b9cc56781fa358a707eb1949e2491fe400aff70 SHA512 ab320b442727770ee86e1007bfda62799eb82e851a4dff48613be1bb597148255a0067d99ec4b6de912f1c46f466c691cab175bef98af501a166974946c1e8ae
-EBUILD sphinxcontrib-spelling-7.6.0.ebuild 1026 BLAKE2B 63fb36f0d5e11274574acfad2a86be588f95ee6d270fb761390ac6d676688ab9f4b6c93bfc0239d47c0e9ac14f559ad4f403907d62af71daa92927f902a4db24 SHA512 34903f8138bcd4cf5c85de0a112d4210e3a4c2cfd3bfd61a91571ced19d43997f5c17750656d6b775f6f6356e36765a09b21ad5e97b642ab1142939ea4f9e8cf
-EBUILD sphinxcontrib-spelling-7.6.1.ebuild 1033 BLAKE2B cb0f2310e25fe207a31b8889d842341efd0683a699f0a959f9f1a5962a52a6d658ffd56936951c1e540a8f0eccd6a7c3cb0e42c916303365fa26c9b32d152ec2 SHA512 140bbb72d466bd6766fd004bd537bdb18981f145e310c05b0ec318d735a4f557bf5061fab31d3ffb49031e7027f6bb4e5610a7f1bfdb6203ea9e619c15fe013d
-EBUILD sphinxcontrib-spelling-7.6.2.ebuild 1033 BLAKE2B cb0f2310e25fe207a31b8889d842341efd0683a699f0a959f9f1a5962a52a6d658ffd56936951c1e540a8f0eccd6a7c3cb0e42c916303365fa26c9b32d152ec2 SHA512 140bbb72d466bd6766fd004bd537bdb18981f145e310c05b0ec318d735a4f557bf5061fab31d3ffb49031e7027f6bb4e5610a7f1bfdb6203ea9e619c15fe013d
+EBUILD sphinxcontrib-spelling-7.6.2.ebuild 1026 BLAKE2B 63fb36f0d5e11274574acfad2a86be588f95ee6d270fb761390ac6d676688ab9f4b6c93bfc0239d47c0e9ac14f559ad4f403907d62af71daa92927f902a4db24 SHA512 34903f8138bcd4cf5c85de0a112d4210e3a4c2cfd3bfd61a91571ced19d43997f5c17750656d6b775f6f6356e36765a09b21ad5e97b642ab1142939ea4f9e8cf
 MISC metadata.xml 451 BLAKE2B fa659ac4949e98ca8c5a11a9b72ecba8a69ca94d95f8ab5f07c0d43d9684cd1cd21dbd63f42928a9920001904a6f75aa5663a3d924b02910c78b7894f6011722 SHA512 fead100dcd4c1d85e29260a60178e1b866ceb1f944c73fffcc051e2cfb1e96cc2e61bcf94379c0dcf84bed1349abaceb86ca9a89f2b1a8ddd384c14997d1a159
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.6.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.6.0.ebuild
deleted file mode 100644
index 2384e4dd356d..000000000000
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.6.0.ebuild
+++ /dev/null
@@ -1,49 +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
-
-DESCRIPTION="Sphinx spelling extension"
-HOMEPAGE="
-	https://github.com/sphinx-contrib/spelling/
-	https://pypi.org/project/sphinxcontrib-spelling/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		app-dicts/myspell-en
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires the git repo
-	tests/test_filter.py::test_contributors
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	rm -rf sphinxcontrib || die
-	epytest tests
-}
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.6.1.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.6.1.ebuild
deleted file mode 100644
index 834977197c58..000000000000
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.6.1.ebuild
+++ /dev/null
@@ -1,49 +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
-
-DESCRIPTION="Sphinx spelling extension"
-HOMEPAGE="
-	https://github.com/sphinx-contrib/spelling/
-	https://pypi.org/project/sphinxcontrib-spelling/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		app-dicts/myspell-en
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires the git repo
-	tests/test_filter.py::test_contributors
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	rm -rf sphinxcontrib || die
-	epytest tests
-}
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.6.2.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.6.2.ebuild
index 834977197c58..2384e4dd356d 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.6.2.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.6.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pyenchant[${PYTHON_USEDEP}]
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index 0cdc574773c0..80efe41594d4 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,7 +1,3 @@
 DIST zipp-3.10.0.tar.gz 15564 BLAKE2B 145374d6e2e251f588e198a0fd400542b34ff26de4e1240dd30710dc33e884ccde91ca1cc168d5f421aa4e04341c76cfb10fbf176c830ade237be39a886267ab SHA512 2e64b05eb0123eb3c3c87fbfe2da26721eb9e24142a43e794d04e5f86ab5fe4cf3e0e3e3497bfc9631ab61dd64226829772493f26e091a66148ddbdc5dfd8e51
-DIST zipp-3.8.1.tar.gz 14189 BLAKE2B 768d25dab70ee1ddbb3adb829b68515631772e2e25a7617d58bf863c01d1900e22cd4001bf31b9eae3829a63cba77df070132e7932b9b4242bb8be3579a1546d SHA512 05639feb20c7e8d3480ce17a52115a85bb2f0706ee0c1b15589b7556bb914ef30a1a34fa743217694b753bb5e72095c90fab7dfee85f2dbf461347322acb4d2e
-DIST zipp-3.9.0.tar.gz 15118 BLAKE2B 04cfd994179ea2f09e792c3b95726262ec5f9e4b04bebb2541066bc914c39c93fda74cd597a53456afabdfa7ef90c1477cfc7c392bf59d3b31959c1d299dcaec SHA512 eaff85ab7e0775bc091b4e32281397bd8fa92d1644b368593f18a04c1a408937351606ad9cc2831cd3bce61ca59b05e7622e5d14282bc28299943ef5dd9012f9
-EBUILD zipp-3.10.0.ebuild 1552 BLAKE2B 8f9dadf7c363a39c0cb92a76001f5fd5c5d81e1e9caceed1b815a30935449c1917abac739c6bc8cd7fecebd54552b1e78c03f58e1361570a60851a8fe7da3224 SHA512 76c9a505a55dc2159d2096943e341aa36aabab767f92d91b6f3b87a1b70aa20c9af3381164170fcf4ee25e734fe0eb602ba263f1debaaf1f0dacf3205ecd20ef
-EBUILD zipp-3.8.1.ebuild 1438 BLAKE2B d6857903252a23d0d802fc48c13dc5392feaaebf46f754ef1ce8ab608c3ad999feddce0338bc03aacfe9f19598f22062efb2e43ccaf50cb1e6554f59b37998f3 SHA512 a078ba1974f2339ca3e79f879bfd641f4b09a07fb83dea1a10bd24a63d51d9861d03a2d53d4c516dfb421d9dbecd82edfeccd0f900088dabfe6000e29195d8ad
-EBUILD zipp-3.9.0.ebuild 1540 BLAKE2B b94fa5841874452b445692c35d18c48248c048f5876d881844ad9d7de3c7a7b08de666898dbfbe9576426e410a75ad4c559ff54282f1f568e0266baacce76e76 SHA512 e3c3fd177350fffc52e2cd89d649834f1a214eca39ffc2890e724ff2a4e8b72f7426bc9f79bcfcab593f217708636ae9e11308d831c3288d68c93617005210e6
+EBUILD zipp-3.10.0.ebuild 1544 BLAKE2B c0c07b4972de564f9556ab16b5597b6cb531cf950631ba8c65c91a44ff7adbf7121d3f82db20cb3858961755b0c824252f13b7241bb4b36f0e624cd6521b9bad SHA512 d54bf69f4432945b3b0781b8d3dbc7ea01a9f4d152cb8afcbd30c7e7b595af809fa7cb6295a23347a87b470def8e238153c9e414a483a6726f68abab7c37ce58
 MISC metadata.xml 548 BLAKE2B 0bcd7b95c50e9e14ada6f3f02145bec64ee365beacf3447659276c1a5454355714f83fd2dc81a035a56d11ba1eb989f32bc0209a540b28fb72c3126d4d45a5fa SHA512 f214f6711b3197a44ec5c03b418aab3c9b907e0b3a297cb1c4e2ac3a499acefeb4de411443495db9678cbfd75460f89c9c40a57fc1bc404acbab844223a129d2
diff --git a/dev-python/zipp/zipp-3.10.0.ebuild b/dev-python/zipp/zipp-3.10.0.ebuild
index 652dbc5d71c5..c75defb1e1b8 100644
--- a/dev-python/zipp/zipp-3.10.0.ebuild
+++ b/dev-python/zipp/zipp-3.10.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/zipp/zipp-3.8.1.ebuild b/dev-python/zipp/zipp-3.8.1.ebuild
deleted file mode 100644
index 893e60caacaf..000000000000
--- a/dev-python/zipp/zipp-3.8.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE="https://github.com/jaraco/zipp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	test? (
-		dev-python/jaraco-itertools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# speed tests are flaky by design
-	test_zipp.py::TestPath::test_implied_dirs_performance
-)
-
-src_prepare() {
-	# dep of disabled test
-	sed -i -e '/func_timeout/d' test_zipp.py || die
-	distutils-r1_src_prepare
-}
-
-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 = "zipp"
-		version = "${PV}"
-		description = "Backport of pathlib-compatible object wrapper for zip files"
-	EOF
-}
diff --git a/dev-python/zipp/zipp-3.9.0.ebuild b/dev-python/zipp/zipp-3.9.0.ebuild
deleted file mode 100644
index 5bc2dd93a491..000000000000
--- a/dev-python/zipp/zipp-3.9.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE="https://github.com/jaraco/zipp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	test? (
-		dev-python/jaraco-functools[${PYTHON_USEDEP}]
-		dev-python/jaraco-itertools[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# speed tests are flaky by design
-	test_zipp.py::TestPath::test_implied_dirs_performance
-)
-
-src_prepare() {
-	# dep of disabled test
-	sed -i -e '/func_timeout/d' test_zipp.py || die
-	distutils-r1_src_prepare
-}
-
-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 = "zipp"
-		version = "${PV}"
-		description = "Backport of pathlib-compatible object wrapper for zip files"
-	EOF
-}
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index c662a64016cd..91b054d4f8fa 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -3,6 +3,6 @@ DIST zope.interface-5.4.0.tar.gz 249329 BLAKE2B 3a35ce6ff2a9984ed865cfb3bc3371e8
 DIST zope.interface-5.5.0.tar.gz 253292 BLAKE2B 2c3e48aeff7124a50b834792774596bd3ed793146be7335a0b3abbaf0e1861d84668421b9098cf4f8986d17f8f148a7b30b929ea73b5d344e5d63d44270b2a99 SHA512 ab74a55a90c17b1aed55f1d6e24365321ebbca5943557be7731af99d7436f18f4d0a4c53c0c26c29c0379ce72ef0c2babccaa9cad5aec843bc533ff19fdbe6d9
 DIST zope.interface-5.5.1.tar.gz 300064 BLAKE2B a40de949efc269e3b942eaa6bd5006afc253487149ef22fd1d070eb15535ad755a34cd3e3ab053652cbd1117aef92fe79e8de683491c8e8eaa41e4da8b9b12bd SHA512 e5d73a78a8d9960cf8f24a7603175b0ebe0f2a3695536cdcecb5f78a6ee118aaa8fdf26c70d08a9d17f70e9b89024c260c732e2f9c9153ab960f3175fc10b9df
 EBUILD zope-interface-5.4.0-r2.ebuild 1272 BLAKE2B e8c6f9ce1a645d2b8e349bfcc98b93b324f6bc3346db0901f85db16159d819e53cce0a4a6b02b28b404cfe99e53ee0a002698da4e2c4cc7ca4a18045aae34a62 SHA512 cba7ae17d9a8cfda3b1479d58b3d0e2e5eaa7f513020f005be58bb1333b2c8fcdf3496de742eba0560201f0421b02a1eaa256ebca128b3321b865bcb3587407b
-EBUILD zope-interface-5.5.0.ebuild 1285 BLAKE2B 620d6434cf5f6c692eb5b4cab8f7b6de32a231c445b99793a43d632c9cfbdf4a6f5d7c070be0b08327ef91a3217e5734ca55eb5277e458781b01882b4bcaf6b1 SHA512 63de36431f314f9bad48a1a3ecb1ce2e965a663c7dfe8bb0b5dc42ec48f95f4c1c89e8a2e1d5bb09e4148ea9356587e80a99fe16558901ad6ef0da662807dcea
+EBUILD zope-interface-5.5.0.ebuild 1282 BLAKE2B cb0281d2784f7e35c00d68df496532ec119a3b26b25384daaac15807a780ac384b6cbfc1921edc372272584cff753f619fe7ffc164018da017a60242e0747778 SHA512 fad0897bdd3a245be8da16eb2720d53375e728d3b5025093f16e5ffaabcc7fb56377cf8a65fc0b37d689674fa2bcd979c3f7b519d922feb2742d92c42b1a1e4e
 EBUILD zope-interface-5.5.1.ebuild 1285 BLAKE2B 494bd885a8482163486f792389daddf7399f33c341740346cc5a26c6ed641a3e115f709d2103ff1b2de65055cb73202230590f9392d4b3dc92642e0f0dfdd7b7 SHA512 d4c853a2fb8372720ab87925d35885b47112d687e65ca96ec0e10a229414260872f60747ea10aa66ad1684a587266ef6106a9637ca0c81867625bc9f805e2d81
 MISC metadata.xml 387 BLAKE2B 1d5e2a8f2fcd2c8fcb423f8a123d2d17a0456cd4003489358abd8baf74d3ea9ddfa04af94b9ef67b329520b5ee9bc3084343e824f3fbf7420f14372d43581dbc SHA512 258f0bd291cd42f6374bd331c3b906f149ff455dd264716eefc63487710d95f8b388ecb34be5733dbd7a0e185f449cc18fce04b46521a2d19fd9766e7dc0ed82
diff --git a/dev-python/zope-interface/zope-interface-5.5.0.ebuild b/dev-python/zope-interface/zope-interface-5.5.0.ebuild
index 999bbf97e6c0..9b8cc65cd440 100644
--- a/dev-python/zope-interface/zope-interface-5.5.0.ebuild
+++ b/dev-python/zope-interface/zope-interface-5.5.0.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="ZPL"
 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"
+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/namespace-zope