gentoo auto-resync : 26:08:2023 - 15:57:31

author: V3n3RiX <venerix@koprulu.sector> 2023-08-26 15:57:31 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-08-26 15:57:31 +0100
commit: f6fd15e0418aea97c7ee77672468561cdac302e5 (patch)
tree: 6c13cdea083ccb5c111b15d7344bd8c0b4e61b73
parent: f3471ff11210507b38c09f0e57df1bd601f629a5 (diff)
285 files changed, 2988 insertions, 7744 deletions
diff --git a/Manifest b/Manifest
index c04c549a5eee..0d13bfc8124f 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29294 BLAKE2B b41e2c718c00b43567b48e6c31bf987b27fe00a2f1b4c8ce911edb7845d883368ddc50a24f8e120731577862ddcae42e59b51d54bd5605e30274e37862dfaeaa SHA512 81309274c3c567b2960d2976242823815fc7cc79ba8b6473f8441b34103a077033509dd6357d1e3c0832a37cc6e6dae9cf9ea8d3af9982961d67b72d70972d31
-TIMESTAMP 2023-08-26T08:09:57Z
+MANIFEST Manifest.files.gz 29311 BLAKE2B 80239dee9f3d4a778b23933d60ef2501e5e9311bd05a5531b65e73d3ba8fa7b967cdc4c2acfd3b200379efa9ad5da131ebed465bc4f94955396745edab8c4c8a SHA512 886948d8e12ca358198392467d1dc5c704715edb274d8bed95cba4604bbd820be4e1a0c477f37f0f4e7d278769bffb8d5ab07a07968e976ea5aac32ed1463849
+TIMESTAMP 2023-08-26T14:09:56Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTps1VfFIAAAAAALgAo
+iQKSBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTqB7RfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBQ8g//QQQY1Bmcoz9cS8gynCKWXzUaaYfGYo4dZvSvNgmMwQKMQh6HGgFKbf0X
-YlAaprlh68FsBXj3bGFLpl/EK/q2VSxsiWuda9sMxzopO81+EB7d+nWHb5s2XWyC
-uR+gqMlsGBF22INaavwnFWRz3sOiUWk+5fLyavsRHTu2rGJeY8Fb35rJi3Z1FHez
-oHXdIIUpO8cCRnpM/resqMhxaxRTThQnkWuXTDTYNGvIPT4owuuGcqjyw+NbLl/Z
-DIf1NlMk2Wa+oFf7OyFEKvH8Tmhj5QkB2S+QN7Mp4NEf4VR1tLuC+3R+JG4Bi/e/
-YelLxhuAnJxhcxEYMsLSuC7vWugjYV9CQ1XGC885RoUajj4gq04nxBdLrLsT1rOf
-S7G1uHCrwB4hKkHaIV5tXLh91Mm0PmYi+wJqmhIMgOwsPI+KilIxOoCYF5KHUabq
-PYjzA7vcIOpEc5v52jmAbgelySUPGx5EnQSwsQPTirXfWut+rk2iscJsQfF/XmFN
-jTLag9aCgiiTNtR47XjklqcjolPEL2dVOoABCG42WyvjDw4qE1uh6eFsgRCILkvV
-WfCSG/u6ZvcFVo93NA/pFrgLZb96YUj3+H1tG/pAPy6WyHYQEekhm5yk11tL+2lR
-dy9WFMN6aDEUFrQ4YOnY5HEGRoqbdct10qcQL90CZ892895hJlo=
-=7l9A
+klBEPg/3e9tu1Oz/XIm3ipRuK5RR8ASOrTpwXtd4rFoXrgcCkOKqvNSdVLi022Qz
+IpABxEcytMmWdxTKbegCASb27TnAIjKKGB3ToFs7m8YshNfKeK2FKKAHuXyGKvB4
+df/RpQ3c8vIBN+GQhoKm5SNJ4sdWtgxYFhGAIct0Wr3Fjyao8Gkx2NbBe5xBR+hx
+X/io6CR09d0cKGaGdjiQWMWbyTJhEmNEP0qJ6qUDPrU+TPjwqh3UbZVxA2o3F9J2
+O7WwtGSZ481ZhrFdtUid2VLxFETAqiDov9BNBkyBFjrsx09EUo4rDXShY10aLoo/
+0EYLY+bBCBFzWl4lTf04HHNR7VxCwu83VeukE3taeh/qODaWkN/mj2suiDSuRcz6
+z9Jl7Z6TczZRsUjUIhzTsuGZyBTzqpUrHSv/ixh/L1N+AF8OxTpXvY2I0Uve0UbR
+dQIKgh6Dacda9FDyRA0F5rqFmAxVbHsjSMiZxPFQgfLlOKxb0TUa1WMBcPpNuDlj
+fJF5b0Agt3+H04n2imdXLMMlS53OhWf0WRLxiVSTg+70whw4ETMetP2h91KnG1R1
+mHF/+NAXYJCLEpQRIWpj3GFJQ93yF9K0zL4Fkpo+utQz5SatSCfmlE4wlWexW5UH
+kW7BPe95TSeW6ncs90Wo7sJc0oM3J2gMLvytyKbP9DqyfR+TTQ==
+=n5pZ
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 519a7ea4ec7a..acb4a597d41c 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 920d460bb0fe..fe50819ecb6a 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/cpulimit/Manifest b/app-admin/cpulimit/Manifest
index cfe586cab771..e74cff4bea36 100644
--- a/app-admin/cpulimit/Manifest
+++ b/app-admin/cpulimit/Manifest
@@ -1,7 +1,5 @@
 AUX cpulimit-2.8-inline-func.patch 454 BLAKE2B 282733b42c9e1ec1e7d39e28b4830912be9b636734086e78a32e5c8490fb906f9e88ac4edec3891d926e7a8f8227f0384811f1849c228fab39a620cafaec3e8b SHA512 727d548964e4ce3d81131ed113067666c4c6dc21306e9698efb6d7b6f2aceb6079a09ddbe6c6f9c10b40593dc6f769850bf2d9df6aac0bd3b8a4a3fa6c42d873
 AUX cpulimit-2.8-makefile.patch 599 BLAKE2B 2b0f138ee0a30ce8a1e84b15c949c4c7176703968da326801672d98851b1ad4185ce5b6c9a6259a67e0de57b0b29b95fe96daf6e354b6c73cdf9b78fd5689ca2 SHA512 2d25fdbfa47f37d98592b1197f3877de6bbbbd40b975fa18163aa2d23ec32d13efe311736df0c68a8510219423d4673ef6e123a932300ae79d476efa119a0dca
-DIST cpulimit-2.4.tar.gz 24669 BLAKE2B e0fe0d6766e76e6e2a68dcdc553039400233daabbb14ce4a9dae46a7b694d2ecd660f4c1d13f417a74b12365c719780c732a03bd91c6384d1e7118d0fce521fb SHA512 008dc3fbdcbd8afd875a2a1ce03d609db595c6e110803140c676d3713ea60f4877a1bb8e7aa0e8b669dce31522ad81e2703f616341a0f4cbc69a6b01865b66d0
 DIST cpulimit-2.8.tar.gz 24860 BLAKE2B 6d4002d2cbc46da9ce102da77b701e6a99c2e7d16e2e7989baa1e07ef335b126a8c717c4779d121aee1e580ebf057a16b4f83c1bc6a29c904a7532debc4c490a SHA512 aeb121739a5dc9f94c6ddb0905ed05eb7d146c9d0e71c34ba46aad798bda2c30b7ccc548338b4c468f9885f09d97a4565c00199c8df6af74dc9b6f23940c540e
-EBUILD cpulimit-2.4.ebuild 644 BLAKE2B 2a8f0740196e5f4b2486febb25cdda806117545ccddd4d76590eed987e17a895231175494c8f14f5f869985ea4d48e3ebf24b64296bafcf8c55d9d753d0f2554 SHA512 d934fc8ef4724f7ede84ead40c651c1b9949e86c4a74e53a232cdb61d59e8f4ca7f25977200668e4818c4605ec745cf38268db2a26ad7200c4f8cd7fc0459d75
-EBUILD cpulimit-2.8.ebuild 581 BLAKE2B d8bba75f04b8b34576499503a855722728d338184771cd9115ad74aa2b2da0199d85d4f35ff69482a81666085d8cffd6394dd72d315eb38027a8af8a7217e624 SHA512 7a66da07280fb82ade795ddb55062099e0ee41f325759d3ce6ffaffca6b764b3d855f03cab2508891212f1be02596a7d744da761cdd478c11b093260b28ba800
+EBUILD cpulimit-2.8.ebuild 579 BLAKE2B 77c015a89d3e79ae92f935cd5f76a7eb32a898a7594218a375e068916501b72434e414a3ac3d6021bdee12f471e7b33aa4490df9c61b65e100d698f2f7300f86 SHA512 ae3074f47e6423406d8ecb8dd383919db88a99bbdc05f2d3e377551092471df4cd0574b673391aab58c77a5aa0ccdb9650ce38858f7723f555453b2b80df1862
 MISC metadata.xml 329 BLAKE2B 3c7197920abb098e532aaac28dfa0e349df9ab7e9400cd6cfb2db6eb581c58de452a9e3dbd6c7b04bd440671e33bec907c89595d145526a17b3f847125f8c14e SHA512 fa471be33c6e8c68b924432381fdbbc4821179d92a71377458c50e36f41b4147dc7f95eb2ac49c23a61646720f2702551adce8cfa5dd6acd8ce5b96993860215
diff --git a/app-admin/cpulimit/cpulimit-2.4.ebuild b/app-admin/cpulimit/cpulimit-2.4.ebuild
deleted file mode 100644
index 13e5d1a86317..000000000000
--- a/app-admin/cpulimit/cpulimit-2.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Limits the CPU usage of a process"
-HOMEPAGE="http://cpulimit.sourceforge.net"
-SRC_URI="mirror://sourceforge/limitcpu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	tc-export CC
-	# set correct VERSION
-	#sed -i -e "/^#define VERSION/s@[[:digit:]\.]\+\$@${PV}@" cpulimit.c \
-	#	|| die 'sed on VERSION string failed'
-
-	default
-}
-
-src_install() {
-	local DOCS=( CHANGELOG README )
-	dosbin ${PN}
-	doman ${PN}.1
-	einstalldocs
-}
diff --git a/app-admin/cpulimit/cpulimit-2.8.ebuild b/app-admin/cpulimit/cpulimit-2.8.ebuild
index a3d5dc9d8201..713b9c1decb1 100644
--- a/app-admin/cpulimit/cpulimit-2.8.ebuild
+++ b/app-admin/cpulimit/cpulimit-2.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/limitcpu/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+KEYWORDS="amd64 ~ppc ~riscv x86"
 
 PATCHES=(
 	"${FILESDIR}/${P}-makefile.patch"
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 740c35cda382..e9852e93f140 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/python-docs/Manifest b/app-doc/python-docs/Manifest
index 245543c41b25..c4e9f24f92dd 100644
--- a/app-doc/python-docs/Manifest
+++ b/app-doc/python-docs/Manifest
@@ -1,19 +1,11 @@
 DIST python-2.7.18-docs-html.tar.bz2 4634932 BLAKE2B c48e2dede15d8186231acf65709641e0844c42e924262d6ee21a55e515aaf4d023bf394681bab780ab83998de9f409685e2d5870506810432145acc6422eff9d SHA512 db39390577ec86f13c9b6b57c01cba36fe9fd89092a773dc94f1a6a19d912759d097c4d80e765d3657b572abc731c1da9e7b4cd4c38065cd444606b906744abe
-DIST python-3.10.12-docs-html.tar.bz2 7433462 BLAKE2B 8078af52a2ee8c2f308a30a2ceed2241080fa790c9e581809c85a5abb399522ae90b1126612b4cc1ce46d049e91b8d79d05e29337d55473c491dad1a2b80be5c SHA512 e6b02bdce8c96fa168f0faa2435773496ddf761072c93c2944870bafc0ddb49afea5fad73cf6000119bc01435fa558a19f70e5abebe1a51e7c9547911aa336fb
 DIST python-3.10.13-docs-html.tar.bz2 7429989 BLAKE2B 7ddd11dbc4012cebf2f5980653b761ee35b986b75d96d582800f84e4c371aee4b82fcc2001c744e7f14991e766b0930a9ef4cb46869544e0aa403e513c4bd418 SHA512 be2cb6a2ece7849b1c259e9d86b7cf5e2a91c30a976b155c4055fc229d35a1762a90321a6227e890b6d5be51ab3377b9059b9662eed683933ec676fc2dc5f9a9
-DIST python-3.11.4-docs-html.tar.bz2 7831799 BLAKE2B 81245e6f47f9179ac8fcf8c1e8a2d6f28c2f7924984d541af71684b4a00896ab38280150a04b8ed051a62ee957cd7613fe28ba79c23624b9bf00d1e7587d7e6c SHA512 b00fa45da239d804e12dcfd5f248b0feb060c2c6e7003913ba6b29a5d198e439dd59ac779c0e4417ccfa90f3654dd3233804974f47efda4fb5891fbe1c6a9f6f
 DIST python-3.11.5-docs-html.tar.bz2 7861520 BLAKE2B ed43fba98f8446b758c1d81ccd4af297232499b666045d6b9b4190d33871e0fbb4e6e166783d54e923b02694a49bdfd791664c7bcab1392ab86254c45d9fe81d SHA512 911a70145aa919687982b9fb34fc0cedafcf654cf3f1e6908a6077d27718aedabc923ea49648d453584f7a7171138e19c1a99f32cb8d41731e5d9c50dc30df2d
-DIST python-3.8.17-docs-html.tar.bz2 6737444 BLAKE2B f6f9a4da13837ecede50eb4d2074b1c6d2be616449f81712e3c551d61d56ac0e314aca84dbcae7d07e89d6f316bec5a6d0797fa0b0f8bf98632ff3c0b6ffad06 SHA512 ab29fc066df0edcaf40dab079cf8fcaa68b895da053ce9cf3d8d776510d804ccfb17ba04e5464ed5edaeb938aaac8aa51bba67c7c3dff80f65cc67bd2d902a1a
 DIST python-3.8.18-docs-html.tar.bz2 6729312 BLAKE2B 431b8d5029d09fc2f54fdc998799298ccb6571a68c735320c95469a81e62bc7c2a9ec0ec11caa9886ad6a2d643b8d715e6866c398ec153d101b16efb85cda656 SHA512 80bdbec04355644f4b114e74da3334b4980d783a52ac8c999ede72f39b6137d94f1aaca248a386cfa02d778a10bdd7919ad82932f0aa000b16c102c8cee67e52
-DIST python-3.9.17-docs-html.tar.bz2 7021842 BLAKE2B 7a5e3426ea47929289078f9fd2c4fc6b833ba172701ebe9d85f6f821d28bc0bbde1cf88fc99807cc9f7031039c10f451280baf3892040b28ad4733c1e53995fb SHA512 900b82f558b08058390d52b18aa2bcee4a8e74fa9555e36fc924c822506c80f002e90d51b1e6263c0dde612937b6d419e76952288ad923ffcca8562c927a8e76
 DIST python-3.9.18-docs-html.tar.bz2 7023072 BLAKE2B 92273a711cc8c2a35104f7c35bdca50ee0e9794c72aa14e9c4e613298dd6f2ecebbe977a35f1520a8585f1ea3112e8ea8e477c0e3503b025b6cec875fe40033e SHA512 d123266c72db81703c386dc0d436243a36996c39cde382939cebea31ff7a0c049470daa27efc34a3a0d55310bc6fe489ba01572ca961f67ba7a098038f2cb5af
 EBUILD python-docs-2.7.18.ebuild 627 BLAKE2B 5e44a7966eb23113adf482d53f128930255316f9e9ae7d9e9e6fad37cdcbab6fdc105a98cc3f6eb82647e8022fd0a074f9b207823d3616c9e08602f1cc524692 SHA512 6af9153b2d6a7a1573a114c9ce2e8fc2afd801405a38d60cb70312f0adfe50684c5e05c1382ab4215ae99ae94c21ababcd6d40e16e0fb1e6819282100d1fb0da
-EBUILD python-docs-3.10.12.ebuild 627 BLAKE2B 5e44a7966eb23113adf482d53f128930255316f9e9ae7d9e9e6fad37cdcbab6fdc105a98cc3f6eb82647e8022fd0a074f9b207823d3616c9e08602f1cc524692 SHA512 6af9153b2d6a7a1573a114c9ce2e8fc2afd801405a38d60cb70312f0adfe50684c5e05c1382ab4215ae99ae94c21ababcd6d40e16e0fb1e6819282100d1fb0da
-EBUILD python-docs-3.10.13.ebuild 635 BLAKE2B 1fc0f16e350547451331c1e6c22c98b14d844191e6f673f3e5f76201b5ab2bb4969201b0903459e5af2fba6ddf81f6e9b63d19d98a7d1a801bb29db6e988994e SHA512 a00c6816470eaa17405cbfec2fc0582490c4945d14753ec99fcfafc152e96a04f6b7955201630cedc8f9221ae0bbcf938ec79c63c015ae152da04ed015a3d670
-EBUILD python-docs-3.11.4.ebuild 627 BLAKE2B 5e44a7966eb23113adf482d53f128930255316f9e9ae7d9e9e6fad37cdcbab6fdc105a98cc3f6eb82647e8022fd0a074f9b207823d3616c9e08602f1cc524692 SHA512 6af9153b2d6a7a1573a114c9ce2e8fc2afd801405a38d60cb70312f0adfe50684c5e05c1382ab4215ae99ae94c21ababcd6d40e16e0fb1e6819282100d1fb0da
-EBUILD python-docs-3.11.5.ebuild 635 BLAKE2B 1fc0f16e350547451331c1e6c22c98b14d844191e6f673f3e5f76201b5ab2bb4969201b0903459e5af2fba6ddf81f6e9b63d19d98a7d1a801bb29db6e988994e SHA512 a00c6816470eaa17405cbfec2fc0582490c4945d14753ec99fcfafc152e96a04f6b7955201630cedc8f9221ae0bbcf938ec79c63c015ae152da04ed015a3d670
-EBUILD python-docs-3.8.17.ebuild 627 BLAKE2B 5e44a7966eb23113adf482d53f128930255316f9e9ae7d9e9e6fad37cdcbab6fdc105a98cc3f6eb82647e8022fd0a074f9b207823d3616c9e08602f1cc524692 SHA512 6af9153b2d6a7a1573a114c9ce2e8fc2afd801405a38d60cb70312f0adfe50684c5e05c1382ab4215ae99ae94c21ababcd6d40e16e0fb1e6819282100d1fb0da
-EBUILD python-docs-3.8.18.ebuild 635 BLAKE2B 1fc0f16e350547451331c1e6c22c98b14d844191e6f673f3e5f76201b5ab2bb4969201b0903459e5af2fba6ddf81f6e9b63d19d98a7d1a801bb29db6e988994e SHA512 a00c6816470eaa17405cbfec2fc0582490c4945d14753ec99fcfafc152e96a04f6b7955201630cedc8f9221ae0bbcf938ec79c63c015ae152da04ed015a3d670
-EBUILD python-docs-3.9.17.ebuild 627 BLAKE2B 5e44a7966eb23113adf482d53f128930255316f9e9ae7d9e9e6fad37cdcbab6fdc105a98cc3f6eb82647e8022fd0a074f9b207823d3616c9e08602f1cc524692 SHA512 6af9153b2d6a7a1573a114c9ce2e8fc2afd801405a38d60cb70312f0adfe50684c5e05c1382ab4215ae99ae94c21ababcd6d40e16e0fb1e6819282100d1fb0da
-EBUILD python-docs-3.9.18.ebuild 635 BLAKE2B 1fc0f16e350547451331c1e6c22c98b14d844191e6f673f3e5f76201b5ab2bb4969201b0903459e5af2fba6ddf81f6e9b63d19d98a7d1a801bb29db6e988994e SHA512 a00c6816470eaa17405cbfec2fc0582490c4945d14753ec99fcfafc152e96a04f6b7955201630cedc8f9221ae0bbcf938ec79c63c015ae152da04ed015a3d670
+EBUILD python-docs-3.10.13.ebuild 627 BLAKE2B 5e44a7966eb23113adf482d53f128930255316f9e9ae7d9e9e6fad37cdcbab6fdc105a98cc3f6eb82647e8022fd0a074f9b207823d3616c9e08602f1cc524692 SHA512 6af9153b2d6a7a1573a114c9ce2e8fc2afd801405a38d60cb70312f0adfe50684c5e05c1382ab4215ae99ae94c21ababcd6d40e16e0fb1e6819282100d1fb0da
+EBUILD python-docs-3.11.5.ebuild 627 BLAKE2B 5e44a7966eb23113adf482d53f128930255316f9e9ae7d9e9e6fad37cdcbab6fdc105a98cc3f6eb82647e8022fd0a074f9b207823d3616c9e08602f1cc524692 SHA512 6af9153b2d6a7a1573a114c9ce2e8fc2afd801405a38d60cb70312f0adfe50684c5e05c1382ab4215ae99ae94c21ababcd6d40e16e0fb1e6819282100d1fb0da
+EBUILD python-docs-3.8.18.ebuild 627 BLAKE2B 5e44a7966eb23113adf482d53f128930255316f9e9ae7d9e9e6fad37cdcbab6fdc105a98cc3f6eb82647e8022fd0a074f9b207823d3616c9e08602f1cc524692 SHA512 6af9153b2d6a7a1573a114c9ce2e8fc2afd801405a38d60cb70312f0adfe50684c5e05c1382ab4215ae99ae94c21ababcd6d40e16e0fb1e6819282100d1fb0da
+EBUILD python-docs-3.9.18.ebuild 627 BLAKE2B 5e44a7966eb23113adf482d53f128930255316f9e9ae7d9e9e6fad37cdcbab6fdc105a98cc3f6eb82647e8022fd0a074f9b207823d3616c9e08602f1cc524692 SHA512 6af9153b2d6a7a1573a114c9ce2e8fc2afd801405a38d60cb70312f0adfe50684c5e05c1382ab4215ae99ae94c21ababcd6d40e16e0fb1e6819282100d1fb0da
 MISC metadata.xml 265 BLAKE2B 369a57fab1283b596588a82815bfe567fe7617b5c0cb17e97f6694beefdd1e932b0d9ffc1fcb23c6ef05b33d97b3c1d1bb3960618ffdf4924c4ebad262794282 SHA512 a682dac348f2d95b986749f4d33e5702c1e8f66cf2ff7a32a5c2a8d388ddbfde2919d97345028c2007415368d395c7cf657184be89f7def27c949f1af5c30170
diff --git a/app-doc/python-docs/python-docs-3.10.12.ebuild b/app-doc/python-docs/python-docs-3.10.12.ebuild
deleted file mode 100644
index e0ae576a6a47..000000000000
--- a/app-doc/python-docs/python-docs-3.10.12.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/app-doc/python-docs/python-docs-3.10.13.ebuild b/app-doc/python-docs/python-docs-3.10.13.ebuild
index 2ab918028481..e0ae576a6a47 100644
--- a/app-doc/python-docs/python-docs-3.10.13.ebuild
+++ b/app-doc/python-docs/python-docs-3.10.13.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/app-doc/python-docs/python-docs-3.11.4.ebuild b/app-doc/python-docs/python-docs-3.11.4.ebuild
deleted file mode 100644
index e0ae576a6a47..000000000000
--- a/app-doc/python-docs/python-docs-3.11.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/app-doc/python-docs/python-docs-3.11.5.ebuild b/app-doc/python-docs/python-docs-3.11.5.ebuild
index 2ab918028481..e0ae576a6a47 100644
--- a/app-doc/python-docs/python-docs-3.11.5.ebuild
+++ b/app-doc/python-docs/python-docs-3.11.5.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/app-doc/python-docs/python-docs-3.8.17.ebuild b/app-doc/python-docs/python-docs-3.8.17.ebuild
deleted file mode 100644
index e0ae576a6a47..000000000000
--- a/app-doc/python-docs/python-docs-3.8.17.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/app-doc/python-docs/python-docs-3.8.18.ebuild b/app-doc/python-docs/python-docs-3.8.18.ebuild
index 2ab918028481..e0ae576a6a47 100644
--- a/app-doc/python-docs/python-docs-3.8.18.ebuild
+++ b/app-doc/python-docs/python-docs-3.8.18.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/app-doc/python-docs/python-docs-3.9.17.ebuild b/app-doc/python-docs/python-docs-3.9.17.ebuild
deleted file mode 100644
index e0ae576a6a47..000000000000
--- a/app-doc/python-docs/python-docs-3.9.17.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/app-doc/python-docs/python-docs-3.9.18.ebuild b/app-doc/python-docs/python-docs-3.9.18.ebuild
index 2ab918028481..e0ae576a6a47 100644
--- a/app-doc/python-docs/python-docs-3.9.18.ebuild
+++ b/app-doc/python-docs/python-docs-3.9.18.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 0e5241202443..ab24610922d8 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 3b6c175f71af..2a7ef8e83205 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -25,6 +25,7 @@ DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4
 DIST virtualbox-patches-7.0.10_pre20230615.tar.bz2 2253 BLAKE2B 27b422acc2ae85c4324d6f4471db80c9f680b1c4a00223c38b9e3fb31709b05163a1bd53408cffeabdef295e856aa8b01b86e0fecf5d80ace376ea1bd4fc9504 SHA512 c2177f46048f09b6be9ac2c35b43d74f67350b052411cc64adf6c0b3d284055eef79f960f1384a3aaeee7d25f8c19ea8f936ee2623a2251d1d28f85ed3469c22
 DIST virtualbox-patches-7.0.8.tar.bz2 2733 BLAKE2B 044dfe02a5bd5e757091318b394b0e5918677b5bbce9caef4a18d4d8df54821559f0df6ffbdd6f52d4934bc4018e9c9d908571c5d3d8804fd3b0f22a7a1aed84 SHA512 93a06aa3f9508d3a8743ca8494a958159b5bc3fd7a0a08ff23414d05c4f31084cf0f1c82a3866e222c83e6996ba004546f0bd33c6eb9a90eec8e548b8b3f2fbf
 EBUILD virtualbox-6.1.46.ebuild 18887 BLAKE2B aed99c4c6f459b4f05e70f21f8e4a83d423bd18f49cb4b3776fd4352c49980a1addbc4388676bb5e9f6821943227f869b1c32b3e253e36be095f34de769bc91c SHA512 ddf75c7aeaaaa640703625aaaa803e6ae96857aaf6cb31fe8e0ed7f722c6403d7230836fdfa6a929b08e465f5665b1f76e79ac9c2d332c9f6796637fbf27fe6b
+EBUILD virtualbox-7.0.10-r1.ebuild 21396 BLAKE2B 9cb43a866dcda587db1564cbd204d8f14650ac964700294692211d5333a60800bb5b3e6423ec1162339e2d6cdbe8b8c744df811d730387dd064236c9dd07ae7b SHA512 654a39d5591f4e773f6d146e0530c39c03dadae1cc25d18037b08e5c751165876288567d19cfab387b199319bfd86a34f74f09070a4726930c4fdbe5d4a17ca2
 EBUILD virtualbox-7.0.10.ebuild 20658 BLAKE2B c59f66e1c81d6f522b738aaf3d1f50192cc1e992c08c5eb60a654664325088e97d70db867cb61aa0c6bcc046d8a79f4db7731ca861c5cc84983cb144c3515f77 SHA512 cb1293093cdcab9d9d51602b624cd46d122974e4314a20da021d33175a4a27d2434052c2baffce2780b15a109acdb90989ead907ba2828e0ecfc38a244f27e8c
-EBUILD virtualbox-9999.ebuild 21353 BLAKE2B 8e4333fda64fb1818b38126e39c49da8542cac4c4a033e99a1580c21540710e75818de63151aec9d436ac2a40b7da86a1069b4374be147eda6556d6608a21f13 SHA512 98fadee33deef13ceab5becd9539412da5505567dd550850872c6fb8f6da43d7b113308562dae6c849a8f13910aed28e535eff523c15b55be22ba8ef6c2db37b
+EBUILD virtualbox-9999.ebuild 22091 BLAKE2B 6be241a4c494c238becbef6e2ea9d07d6e4cff45603ca818641b55e523610af2ba4004f5ad3c2f06c5dc7160f2a14144097e8b2b515bcc02149b6439ecd6e34b SHA512 3e7880917632224dc2f77e7b764f497fc385e9a88c0e1d7e3abc90f6eda82d59d1305f06146977cdec2451188b96f27a9b7fbc420897a7ecc66c7a7da83999b0
 MISC metadata.xml 870 BLAKE2B 26f9370557a12c17465e7ca2d63902a2ce5b2d65fbdf40f3b890bd89aca28a1816424caf579f71b762876e8e91b292c5ecbcbad985e9da1e1472e66a2eaf6965 SHA512 eb2e9114dc343062e9afd3b933a5d355be790febb4a18f741347072d305b7d63ed40a6a3b9d11b91eb8602d5d2d4f5cf6c2ebde278fb0d0df48a5c5647374e33
diff --git a/app-emulation/virtualbox/virtualbox-7.0.10-r1.ebuild b/app-emulation/virtualbox/virtualbox-7.0.10-r1.ebuild
new file mode 100644
index 000000000000..d663f08829a9
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-7.0.10-r1.ebuild
@@ -0,0 +1,753 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# To add a new Python here:
+# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
+#    Do NOT skip this part. It'll end up silently not-building the Python extension
+#    or otherwise misbehaving if you do.
+#
+# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
+#
+#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
+#  Python versions as upstream tends to lag. Upstream may have patches on their
+#  trunk branch but not release branch.
+#
+#  See bug #785835, bug #856121.
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils \
+	python-single-r1 tmpfiles toolchain-funcs udev xdg
+
+MY_PN="VirtualBox"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="
+	https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.8.tar.bz2
+	gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-help-${PV}.tar.xz ) )
+"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc"
+
+unset WATCOM #856769
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	acct-group/vboxusers
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libtpms
+	dev-libs/libxml2
+	dev-libs/openssl:0=
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	net-misc/curl
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qthelp:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtxml:5
+		x11-libs/libX11
+		x11-libs/libXt
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	lvm? ( sys-fs/lvm2 )
+	opengl? (
+		media-libs/libglvnd[X]
+		media-libs/vulkan-loader
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	pam? ( sys-libs/pam )
+	sdl? (
+		media-libs/libsdl2[X,video]
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXt
+	)
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] )
+	vde? ( net-misc/vde )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+"
+# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
+# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
+# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
+# based on *DEPEND doesn't work for BDEPEND at least right now.
+#
+# There's a comment in Config.kmk about it
+# ("With Java 11 wsimport was removed, usually part of a separate install now.")
+# but it needs more investigation.
+#
+# See bug #878299 to track this issue.
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-libs/libxslt-1.1.19
+	virtual/libcrypt:=
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	gui? (
+		x11-base/xorg-proto
+		x11-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXmu
+		x11-libs/libXrandr
+	)
+	java? ( virtual/jdk:1.8 )
+	opengl? (
+		x11-base/xorg-proto
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+		x11-libs/libXmu
+		x11-libs/libXrandr
+		virtual/glu
+	)
+	sdl? ( x11-libs/libXinerama )
+	pulseaudio? ( media-libs/libpulse )
+	udev? ( >=virtual/udev-171 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	gui? ( x11-libs/libxcb:= )
+	java? ( virtual/jre:1.8 )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/tar-1.34-r2
+	>=dev-lang/yasm-0.6.2
+	dev-libs/libIDL
+	dev-util/glslang
+	>=dev-util/kbuild-0.1.9998.3592
+	sys-apps/which
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		app-text/docbook-xsl-ns-stylesheets
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+		dev-qt/qthelp:5
+	)
+	gui? ( dev-qt/linguist-tools:5 )
+	nls? ( dev-qt/linguist-tools:5 )
+	java? ( virtual/jdk:1.8 )
+"
+
+QA_FLAGS_IGNORED="
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
+"
+
+QA_TEXTRELS="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+"
+
+QA_EXECSTACK="
+	usr/lib64/virtualbox/iPxeBaseBin
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
+"
+
+QA_WX_LOAD="
+	usr/lib64/virtualbox/iPxeBaseBin
+"
+
+QA_PRESTRIPPED="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365
+
+	# This patch is needed to avoid automagic detection based on a hardcoded
+	# list of Pythons in configure. It's necessary but not sufficient
+	# (see the rest of the ebuild's logic for the remainder) to handle
+	# proper Python selection.
+	"${FILESDIR}"/${PN}-6.1.34-r3-python.patch
+
+	# 865361
+	"${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch
+
+	"${FILESDIR}"/${PN}-7.0.0-fix-compilation-clang.patch
+	"${FILESDIR}"/${PN}-7.0.10-python.patch
+	"${FILESDIR}"/${PN}-7.0.6-gcc-13.patch
+	"${FILESDIR}"/${PN}-7.0.8-mtune-keep-size.patch
+	"${FILESDIR}"/${PN}-7.0.6-fix-libxml2.patch
+
+	# Downloaded patchset
+	"${WORKDIR}"/virtualbox-patches-7.0.8/patches
+)
+
+pkg_pretend() {
+	if ! use gui; then
+		einfo "No USE=\"gui\" selected, this build will not include any Qt frontend."
+	fi
+
+	if ! use opengl; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+	if ! use nls && use gui; then
+		einfo "USE=\"gui\" also selects USE=\"nls\".  This build"
+		einfo "will have NLS support."
+	fi
+
+	# 749273
+	local d=${ROOT}
+	for i in usr "$(get_libdir)"; do
+		d="${d}/$i"
+		if [[ "$(stat -L -c "%g %u" "${d}")" != "0 0" ]]; then
+			die "${d} should be owned by root, VirtualBox will not start otherwise"
+		fi
+	done
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Only add nopie patch when we're on hardened
+	if gcc-specs-pie; then
+		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
+	fi
+
+	# Remove shipped binaries (kBuild, yasm) and tools, see bug #232775
+	rm -r kBuild/bin || die
+	# Remove everything in tools except kBuildUnits
+	find tools -mindepth 1 -maxdepth 1 -name kBuildUnits -prune -o -exec rm -r {} \+ || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	if ! use pch; then
+		# bug #753323
+		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
+			>> LocalConfig.kmk || die
+	fi
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam; then
+		einfo "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+		echo -e "\nIPRT_WITHOUT_PAM=1" >> LocalConfig.kmk || die
+	fi
+
+	# add correct java path
+	if use java; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	#856811 #864274
+	# cannot filter out only one flag, some combinations of these flags produce buggy executables
+	for i in abm avx avx2 bmi bmi2 fma fma4 popcnt; do
+		append-cflags $(test-flags-CC -mno-$i)
+		append-cxxflags $(test-flags-CXX -mno-$i)
+	done
+
+	# bug #843437
+	cat >> LocalConfig.kmk <<-EOF || die
+		CXXFLAGS=${CXXFLAGS}
+		CFLAGS=${CFLAGS}
+	EOF
+
+	if use sdl; then
+		sed -i 's/sdl-config/sdl2-config/' configure || die
+		echo -e "\nVBOX_WITH_VBOXSDL=1" >> LocalConfig.kmk || die
+	fi
+
+	#443830
+	echo -e "\nVBOX_WITH_VBOX_IMG=1" >> LocalConfig.kmk || die
+
+	if tc-is-clang; then
+		# clang assembler chokes on comments starting with /
+		sed -i -e '/^\//d' src/libs/xpcom18a4/nsprpub/pr/src/md/unix/os_Linux_x86_64.s || die
+
+		# clang does not support this extension
+		eapply "${FILESDIR}"/${PN}-7.0.8-disable-rebuild-iPxeBiosBin.patch
+	fi
+
+	# fix doc generation
+	echo -e "\nVBOX_PATH_DOCBOOK=/usr/share/sgml/docbook/xsl-ns-stylesheets" >> LocalConfig.kmk || die
+	# replace xhtml names with numeric equivalents
+	find doc/manual -name \*.xml -exec sed -i \
+		-e 's/&nbsp;/\&#160;/g' \
+		-e 's/&ndash;/\&#8211;/g' \
+		-e 's/&larr;/\&#8592;/g' \
+		-e 's/&rarr;/\&#8594;/g' \
+		-e 's/&harr;/\&#8596;/g' {} \+ || die
+
+	# fix help path #891879
+	echo -e "\nVBOX_PATH_PACKAGE_DOCS=/usr/share/doc/${PF}" >> LocalConfig.kmk || die
+
+	# 489208
+	# Cannot patch the whole text, many translations.  Use sed instead to replace the command
+	find src/VBox/Frontends/VirtualBox/nls -name \*.ts -exec sed -i \
+		's/&apos;[^&]*\(vboxdrv setup\|vboxconfig\)&apos;/\&apos;emerge -1 virtualbox-modules\&apos;/' {} \+ || die
+	sed -i "s:'/sbin/vboxconfig':'emerge -1 virtualbox-modules':" \
+		src/VBox/Frontends/VirtualBox/src/main.cpp \
+		src/VBox/VMM/VMMR3/VM.cpp || die
+
+	# 890561
+	echo -e "\nVBOX_GTAR=gtar" >> LocalConfig.kmk || die
+
+	if ! use nls && ! use gui; then
+		cat >> LocalConfig.kmk <<-EOF || die
+			VBOX_WITH_NLS :=
+			VBOX_WITH_MAIN_NLS :=
+			VBOX_WITH_PUEL_NLS :=
+			VBOX_WITH_VBOXMANAGE_NLS :=
+		EOF
+	fi
+}
+
+src_configure() {
+	tc-ld-disable-gold # bug #488176
+
+	tc-export AR CC CXX LD RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+
+		--disable-kmods
+
+		$(usev !alsa --disable-alsa)
+		$(usev !dbus --disable-dbus)
+		$(usev debug --build-debug)
+		$(usev !doc --disable-docs)
+		$(usev !java --disable-java)
+		$(usev !lvm --disable-devmapper)
+		$(usev !pulseaudio --disable-pulse)
+		$(usev !python --disable-python)
+		$(usev vboxwebsrv --enable-webservice)
+		$(usev vde --enable-vde)
+		$(usev vnc --enable-vnc)
+	)
+
+	if use gui || use sdl || use opengl; then
+		myconf+=(
+			$(usev !opengl --disable-opengl)
+			$(usev !gui --disable-qt)
+			$(usev !sdl --disable-sdl)
+		)
+	else
+		myconf+=(
+			--build-headless
+		)
+	fi
+
+	if use amd64 && ! has_multilib_profile; then
+		myconf+=( --disable-vmmraw )
+	fi
+
+	# not an autoconf script
+	edo ./configure "${myconf[@]}"
+
+	# Force usage of chosen Python implementation
+	# bug #856121, bug #785835
+	sed -i \
+		-e '/VBOX_WITH_PYTHON.*=/d' \
+		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
+		-e '/VBOX_LIB_PYTHON.*=/d' \
+		AutoConfig.kmk || die
+
+	cat >> AutoConfig.kmk <<-EOF || die
+		VBOX_WITH_PYTHON=$(usev python 1)
+		VBOX_PATH_PYTHON_INC=$(python_get_includedir)
+		VBOX_LIB_PYTHON=$(python_get_library_path)
+	EOF
+
+	if use python; then
+		local mangled_python="${EPYTHON#python}"
+		mangled_python="${mangled_python/.}"
+
+		# Stub out the script which defines what the Makefile ends up
+		# building for. gen_python_deps.py gets called by the Makefile
+		# with some args and it spits out a bunch of paths for a hardcoded
+		# list of Pythons. We just override it with what we're actually using.
+		# This minimises the amount of patching we have to do for new Pythons.
+		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
+			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
+			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
+			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
+			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
+		EOF
+
+		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
+	fi
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_WITH_VBOXIMGMOUNT=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+
+		TOOL_YASM_AS=yasm
+	)
+
+	if use amd64 && has_multilib_profile; then
+		myemakeargs+=(
+			CC32="$(tc-getCC) -m32"
+			CXX32="$(tc-getCXX) -m32"
+
+			TOOL_GCC32_CC="$(tc-getCC) -m32"
+			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
+			TOOL_GCC32_LD="$(tc-getCC) -m32"
+			TOOL_GCC32_AS="$(tc-getCC) -m32"
+			TOOL_GCC32_AR="$(tc-getAR)"
+			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
+
+			TOOL_GXX32_CC="$(tc-getCC) -m32"
+			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
+			TOOL_GXX32_LD="$(tc-getCXX) -m32"
+			TOOL_GXX32_AS="$(tc-getCXX) -m32"
+			TOOL_GXX32_AR="$(tc-getAR)"
+			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
+		)
+	fi
+
+	MAKE="kmk" emake "${myemakeargs[@]}" all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload,XPCOMIPCD} \
+		vboximg-mount vbox-img *so *r0; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	for each in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${each} 0644
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} \
+		VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
+	dosym ${vbox_inst_path}/vbox-img /usr/bin/vbox-img
+
+	if use pam; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	# environment variables used during SDK binding installation
+	echo "VBOX_SDK_PATH=${vbox_inst_path}/sdk" >> "${T}/90virtualbox"
+	echo "VBOX_INSTALL_PATH=${vbox_inst_path}" >> "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if use sdl; then
+		vbox_inst VBoxSDL 4750
+		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+	fi
+
+	if use gui; then
+		vbox_inst VirtualBox
+		vbox_inst VirtualBoxVM 4750
+		for each in VirtualBox{,VM} ; do
+			pax-mark -m "${ED}"${vbox_inst_path}/${each}
+		done
+
+		if use opengl; then
+			vbox_inst VBoxTestOGL
+			pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
+		fi
+
+		for each in virtualbox{,vm} VirtualBox{,VM} ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		insinto /usr/share/${PN}
+		doins -r nls
+		doins -r UnattendedTemplates
+
+		domenu ${PN}.desktop
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]]; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java; then
+			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev; then
+		local udevdir="$(get_udevdir)"
+		local udev_file="VBoxCreateUSBNode.sh"
+		local rules_file="10-virtualbox.rules"
+
+		insinto ${udevdir}
+		doins ${udev_file}
+		fowners root:vboxusers ${udevdir}/${udev_file}
+		fperms 0750 ${udevdir}/${udev_file}
+
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
+			> "${T}"/${rules_file} || die
+		doins "${T}"/${rules_file}
+	fi
+
+	if use vboxwebsrv; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	# Remove dead symlinks (bug #715338)
+	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
+
+	# Fix version string in extensions or else they don't get accepted
+	# by the virtualbox host process (see bug #438930)
+	find ExtensionPacks -type f -name "ExtPack.xml" -exec sed -i '/Version/s@_Gentoo@@' {} \+ || die
+
+	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
+
+	if use vnc; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/VNC
+	fi
+
+	if use dtrace; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
+	fi
+
+	if use doc; then
+		dodoc UserManual.pdf UserManual.q{ch,hc}
+		docompress -x /usr/share/doc/${PF}
+	elif use gui; then
+		dodoc "${WORKDIR}"/${PN}-help-${PV}/UserManual.q{ch,hc}
+		docompress -x /usr/share/doc/${PF}
+	fi
+
+	if use python; then
+		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython3.so"
+		if [[ ! -x "${python_path_ext}" ]]; then
+			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
+			eerror "but none were installed. This may happen if support for a Python target"
+			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
+			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
+		fi
+
+		# 378871
+		local installer_dir="${ED}/usr/$(get_libdir)/virtualbox/sdk/installer"
+		pushd "${installer_dir}" &> /dev/null || die
+		sed -e "s;%VBOX_INSTALL_PATH%;${vbox_inst_path};" \
+			-e "s;%VBOX_SDK_PATH%;${vbox_inst_path}/sdk;" \
+			-i vboxapi/__init__.py || die
+		# insert shebang, the files come without one
+		find vboxapi -name \*.py -exec sed -e "1 i\#! ${PYTHON}" -i {} \+ || die
+		python_domodule vboxapi
+		popd &> /dev/null || die
+		python_doscript vboxshell.py
+
+		# do not install the installer
+		rm -r "${installer_dir}" || die
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use udev; then
+		udev_reload
+		udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process virtualbox-vboxusb.conf
+
+	if use gui; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "https://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+
+	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
+	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
+	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
+
+	if ! use udev; then
+		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	use udev && udev_reload
+}
diff --git a/app-emulation/virtualbox/virtualbox-9999.ebuild b/app-emulation/virtualbox/virtualbox-9999.ebuild
index 3479b65025f4..9048fa58d8a6 100644
--- a/app-emulation/virtualbox/virtualbox-9999.ebuild
+++ b/app-emulation/virtualbox/virtualbox-9999.ebuild
@@ -24,7 +24,7 @@ EAPI=8
 #  trunk branch but not release branch.
 #
 #  See bug #785835, bug #856121.
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit desktop edo flag-o-matic java-pkg-opt-2 linux-mod-r1 multilib optfeature pax-utils \
 	python-single-r1 subversion tmpfiles toolchain-funcs udev xdg
@@ -598,7 +598,10 @@ src_install() {
 	fi
 
 	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	echo "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	# environment variables used during SDK binding installation
+	echo "VBOX_SDK_PATH=${vbox_inst_path}/sdk" >> "${T}/90virtualbox"
+	echo "VBOX_INSTALL_PATH=${vbox_inst_path}" >> "${T}/90virtualbox"
 	doenvd "${T}/90virtualbox"
 
 	if use sdl; then
@@ -719,6 +722,21 @@ src_install() {
 			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
 			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
 		fi
+
+		# 378871
+		local installer_dir="${ED}/usr/$(get_libdir)/virtualbox/sdk/installer"
+		pushd "${installer_dir}" &> /dev/null || die
+		sed -e "s;%VBOX_INSTALL_PATH%;${vbox_inst_path};" \
+			-e "s;%VBOX_SDK_PATH%;${vbox_inst_path}/sdk;" \
+			-i vboxapi/__init__.py || die
+		# insert shebang, the files come without one
+		find vboxapi -name \*.py -exec sed -e "1 i\#! ${PYTHON}" -i {} \+ || die
+		python_domodule vboxapi
+		popd &> /dev/null || die
+		python_doscript vboxshell.py
+
+		# do not install the installer
+		rm -r "${installer_dir}" || die
 	fi
 
 	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 04119d468ef6..f4870207d8de 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/rkhunter/Manifest b/app-forensics/rkhunter/Manifest
index 030049b05721..632a590e04a9 100644
--- a/app-forensics/rkhunter/Manifest
+++ b/app-forensics/rkhunter/Manifest
@@ -4,6 +4,5 @@ AUX rkhunter-1.4.cron 4002 BLAKE2B 4effc65dbff981fc90370dfae3c5e6b7d6d6f60e5aabc
 AUX rkhunter.bash-completion 2499 BLAKE2B 5cc845f3780e5b92acb84aad8141147b87245d554770282b91ba04771d7d8e727691872bdee129f25c7dd1a1440944e4b6959b9981c9c73683f1fddd479b225c SHA512 8fba540f5425169810b8baaf2e801638e3286aa93a69d4a96f5916e3bc9b632edaef6b509b8ca58f8047a7c7d4bb4bf348ad7923e855edce3dd0432725a944e7
 DIST rkhunter-1.4.6-grep-3.8.patch.xz 7232 BLAKE2B a4be08fbe2094f531b0b71fe30dca3e3fb54f9be566f578b4008c7139737cee8d19aca20beb1369bbd877faa270f4ea43c195042b1431eeb34817f0d9063c100 SHA512 c5d21da2fbd8bffa282c716acc2550268fd5f436791635481b79986b1fa1dc631d6551f735344ff7bebbb835748b0e3a508949fb9a45bc4f76a4650732920230
 DIST rkhunter-1.4.6.tar.gz 302137 BLAKE2B 89c61386b57f743f4205f8c826eaa8a9dc9a0d413ac47efb26b6f93d8d642f619f35b7a4c021521b662547c02a16071b8980d158cfb9e081a64870558dbaeff0 SHA512 c51a21b6b66ed1f73a19d8ce04eaba35999eefcb666acc824989c3bf53ac56d24a33ac4fec290be942e33fe24674406b371eafff73f7e697b9e03ec031b37216
-EBUILD rkhunter-1.4.6-r1.ebuild 1423 BLAKE2B 07eec07d18fa16f59355243ba41428a15dc749de47404796d37b0716431d063b2d194d378f730ae6fcedabb3db099d393c503fd04b2ef66cdcbc23c499e3c4a5 SHA512 ce184831dce744e1b93a564f6ef26d5579cb58a222ab6f6c2afa8d535f6828b8c2a8854245ce5cd2d29811e9f6f2cbc735f202e40a26d4d45be7ced357c10d6d
-EBUILD rkhunter-1.4.6-r2.ebuild 1558 BLAKE2B ab8c90f41b5a491861be43c50e9391fe665e331290053e6686609c2d721a71558e328e6febaeff491cc8a76cdd55d21a067cc884c8412b7fcd02c39b99d85160 SHA512 a2e4529882d2077be262b671e876139bde062358a74498c3e566438c68bfad955feb8f57db50baee882b614d7367f7912a4231a13d5d47d78bc3e8236d13f613
+EBUILD rkhunter-1.4.6-r2.ebuild 1555 BLAKE2B bd86ec9a9bcadc8dc6f608a130889493c14d784574fe117841ead6459f68b2e12c205559fd9e3d5c54e25866768776c1a2b2822abe4a7d9b66da234718d1c961 SHA512 1f7feabd098787b900017c6b77cd759803a76737a5c8ebb5ea9edbec682e5002ff6fc0d22b36c348207f662faa94bfec3768fb3e469f55e85f1ef6adf2de7933
 MISC metadata.xml 246 BLAKE2B 71f95ea599de237367403827e76d52e998bba4eb792ff480bd82ba30fb410ba21d1cd9354d2b74a786c0a07364db79126e35def1c76152001bda50051174a672 SHA512 25ba413deaa84fe7bd1129f82e8ef9de9e335a8ec5d1d42a29164a40dddc2d0e06e9762160af686044488c163aff60c6ad9843b6df1e551df8446c138f86e6ae
diff --git a/app-forensics/rkhunter/rkhunter-1.4.6-r1.ebuild b/app-forensics/rkhunter/rkhunter-1.4.6-r1.ebuild
deleted file mode 100644
index 7036144838c6..000000000000
--- a/app-forensics/rkhunter/rkhunter-1.4.6-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-DESCRIPTION="Rootkit Hunter scans for known and unknown rootkits, backdoors, and sniffers"
-HOMEPAGE="https://rkhunter.sf.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~mips ppc x86"
-IUSE=""
-
-RDEPEND="
-	app-shells/bash
-	dev-lang/perl
-	sys-process/lsof[rpc]
-"
-
-S="${WORKDIR}/${P}/files"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.6-conf.patch"
-	"${FILESDIR}/${PN}-1.4.6-no-insecure-web.patch"
-)
-
-src_install() {
-	# rkhunter requires to be root
-	dosbin ${PN}
-
-	insinto /etc
-	doins ${PN}.conf
-
-	exeinto /usr/lib/${PN}/scripts
-	doexe *.pl
-
-	insinto /var/lib/${PN}/db
-	doins *.dat
-
-	insinto /var/lib/${PN}/db/i18n
-	doins i18n/*
-
-	doman ${PN}.8
-	dodoc ACKNOWLEDGMENTS CHANGELOG FAQ README
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/${PN}-1.4.cron" ${PN}
-
-	newbashcomp "${FILESDIR}/${PN}.bash-completion" ${PN}
-}
-
-pkg_postinst() {
-	elog "A cron script has been installed to /etc/cron.daily/rkhunter."
-	elog "To enable it, edit /etc/cron.daily/rkhunter and follow the"
-	elog "directions."
-	elog "If you want ${PN} to send mail, you will need to install"
-	elog "virtual/mailx or alter the EMAIL_CMD variable in the"
-	elog "cron script and possibly the MAIL_CMD variable in the"
-	elog "${PN}.conf file to use another mail client."
-}
diff --git a/app-forensics/rkhunter/rkhunter-1.4.6-r2.ebuild b/app-forensics/rkhunter/rkhunter-1.4.6-r2.ebuild
index e9ae0125172b..8cb7e9e6f30a 100644
--- a/app-forensics/rkhunter/rkhunter-1.4.6-r2.ebuild
+++ b/app-forensics/rkhunter/rkhunter-1.4.6-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-grep-3.8
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~mips ppc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 04ee4428cc6d..887add0142bf 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/nabi/Manifest b/app-i18n/nabi/Manifest
index 7cece93e0522..289804d73a52 100644
--- a/app-i18n/nabi/Manifest
+++ b/app-i18n/nabi/Manifest
@@ -1,6 +1,4 @@
 AUX xinput-nabi 140 BLAKE2B 20aecc9cabb55c5848d1c853d7d41ba39447ef7b01c7c874dd0a17ab1b515310d5c20a8a52499d88be84efec5486ec229625235611d2723c6c5e66e6d1e8519a SHA512 53321a39f5ebfb96986ae225f3c3b47344885d4c07271a6b7defd9f2164564651bbdd6e58676e443806f15f51ef7588aea59a6c3ef52678b7f9f1b5f3edcc4d8
-DIST nabi-1.0.0.tar.gz 868761 BLAKE2B 125028a4a3a6c51edfeee45de42868c5c0397d8545fdaaffc8a305282ea7d8af102487ad86016e1d6e7275cf7e8a5cd0111bd7f8b9c38470021b94585c1cbf1d SHA512 cd093fc54fc4a40eaa85f9973999b9fe2e37344c1004b56fe9a2102bb0747294ba2af76aca2be234ce4fe07a5e8175d1bab7423dd2cee92ab88af865cd856005
 DIST nabi-1.0.1.tar.gz 927009 BLAKE2B b53e3131e2998499f4004c07272bd1715905fbf26c8e524299bc1a4a80d8cada6d6368f372619893f5edec3b5c1595afe4c25756f171df88a2b805644c9d115b SHA512 8113b31df792ff1b31b1e063671a30e21c312e27627c0e15d9de872bb644eeaea4ebb65ef399dea2d75563d81941990f59adbe1e4c584026e02dcdafe389e9c1
-EBUILD nabi-1.0.0.ebuild 1047 BLAKE2B e408069d489b94260cdea18300ddb621b4b454cebafd3411fb570c54fd32df521971a82ff5de940c37f223081723e2511adacf51df1a87226c45df462dafe1b2 SHA512 b4c7cdcf858835a07ac19f497b0794f739309bbebc54cbffaa2ae6c9de8392f5a87eed7e71dd36fe0ef870e285837fde7ee6f8399e0e37266f092f879d27d8eb
 EBUILD nabi-1.0.1.ebuild 1111 BLAKE2B 1847ca92643131bf1b06718114f5b01a76533cebda796565b2af337913b10de30bec381299988083eacfdc530a3ac07a27d70e422474641370338d137ba1d72b SHA512 84cb9d4413d0ddcbfaf2a1b0522f16f09461a437d0cb0ad4d6394e6cdc64d22837b142f3ec2c07ddfd1e455481875d5faf4a53b39de3ef6cc23b8360c88cc3fe
 MISC metadata.xml 363 BLAKE2B 28c9b8543b9b6219f8ee6e082983115bcaf272cdcb8a368a1fc4782cabf5f619ae4846f8c4caaca32f3573bd52b426a52f6f8e71fd6131919e44f60cd1c70c53 SHA512 44e6e3ac0ab3c9ecc80365d3f5efecb3616b50b435a9daad63f9cde2eeeb485a48cbb890ba3d2e482397ab4af7fa318c8ea0606d76340d3d102e480b4856e4ba
diff --git a/app-i18n/nabi/nabi-1.0.0.ebuild b/app-i18n/nabi/nabi-1.0.0.ebuild
deleted file mode 100644
index 25b5d86829ac..000000000000
--- a/app-i18n/nabi/nabi-1.0.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Simple Hanguk X Input Method"
-HOMEPAGE="https://github.com/libhangul/nabi"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug nls"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND=">=app-i18n/libhangul-0.1
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-DOCS=( AUTHORS ChangeLog.0 NEWS README TODO )
-
-src_configure() {
-	local myconf=()
-	# Broken configure: --disable-debug also enables debug
-	use debug && myconf+=( --enable-debug )
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /etc/X11/xinit/xinput.d
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" "${FILESDIR}"/xinput-${PN} | newins - ${PN}.conf
-}
-
-pkg_postinst() {
-	elog "You MUST add environment variable..."
-	elog
-	elog "export XMODIFIERS=\"@im=nabi\""
-	elog
-}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e3fac9aece54..dbb6c634f8dc 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index c1a124e51ddd..c5ea2cf4c14e 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1,10 +1,10 @@
 AUX fastfetch-2.0.0-dont-fetch-yyjson.patch 843 BLAKE2B dc37cb21096ea415fa806265081f33fc48e735fe29b7ff5b742368aac6218bc9345145a81394d2936ca23c0e7fee05dd50a32ca3feb7182c3e11b8a833a6017d SHA512 c3a41cd0ed3b33b9ebc3bc9876c7db6ae9c71b8dfac7e92259a09372d059fcb032c6a34c10791758583b810de0f6db21c1ba8426e3611ae67ee97836329109cf
 DIST fastfetch-1.12.2.tar.gz 538194 BLAKE2B bc6badbc7f690dacbe1408479286a0d42ec687526f776ff4d2ec7b0eb767032e5781cbbe37778f4dc03a5d386979a9ae2aab84c466be997b82d9a9a6c81ea78f SHA512 a82a7c7ae365335c20d659a82215cf320c4c6b07ff127c4dad322a0a01f7ec57e34d229f4953108daadcd0d243c84f8504a3b4367df5e255e5a06e685fd6739a
-DIST fastfetch-2.0.3.tar.gz 771351 BLAKE2B 7a17792dc9cce97de6d1363f5b5a224fbbf11e968ba7d2d2f9e226df319c01a2338d373e5ea3439c77e79b0b5dc490aab4f2fca0f4bba7276de750d9a6513807 SHA512 7a944b80feb46ab8151ffbc90482412eb6321aa3e19cf9531102f665e035ef1e1fe9d66655c61721991c0c50af2d51d48973299885b31cef44ee0631d42d4d49
 DIST fastfetch-2.0.4.tar.gz 771440 BLAKE2B 496a6ccf0b121c3a27f3919b82207e517bec0554bc2e16ba114650d1f5fa9f8141b6f2eee5385fe4a21df1f5c2d3da49db5263f294279a0f05d3aa951bd14469 SHA512 8912cd3b469b5bfcfe51b68229957c0ec09f32f6223e0230a9b9625d1a72ad3a55ff0b538e6ea5cf43acae31e20ea58e6499136051674585fbd2a3d7f428fef6
+DIST fastfetch-2.0.5.tar.gz 772840 BLAKE2B f8eb5a662455ac1599eea5b6486ea2208487b363464c23a94ca9f1c19e275ab81f3b033789527bb7137b8379f74b52a313e593c9a4dd590acafb5a2af77e383b SHA512 91c506407538f1e59c38ade63d7112be9d1040e5b322d578698e3e35e857d7f473a13805760548a49b0e0757a93c54339b6a9b09a3675e0d7e86f1527b9b2cde
 EBUILD fastfetch-0.1.9999.ebuild 2964 BLAKE2B 273947170f50ecb9629efdf10027a7b6af5c98329470f97f7078e0082f8b128e9bf428c4d82b8df52a09d3b96fdc88d8c1bff79719838effaac43aacb32f7b00 SHA512 ead9d649523d9ec049bea90516a04f1fb2fc43618e4592f8faa8e0b309ac783e798baf0ccafc89ddd4a3cb23338f2544df65be4ca41f590048f53fc2d78d1028
 EBUILD fastfetch-0.2.9999.ebuild 2884 BLAKE2B cb3aba85dbd4ea7a8086d6bfd35ac053a6893f17cbbc8b916fa514f575c7407a0e68359b09d66243d52b4276d1d67f584eb41c46066542d5548610f4bc27b285 SHA512 40707f326072cff867587a0ba82f26ebd203920a3d2b4d9668f26ca9c0d4152a05555c2e6975fd1ecffa8ab8fea8a8cc4f975bf02a9113de781fd51969e3e5d8
 EBUILD fastfetch-1.12.2.ebuild 2838 BLAKE2B 1185a5c20a06bf6e6112f4cc8942eb10ff403f7db2a4edabc1264db19448cfd992da044619b767751bd3d25d1759a6e6a8440aa529e058226adfec8cbfc400b8 SHA512 47b8b945db6391ba18a7fd93c0a9c6d53ccf1d0ede37538dbcb5ed95975f3691bd3f87492860e5e61727aa020ba42acd18ef4e27ffa9b21dfaae10fea9e94752
-EBUILD fastfetch-2.0.3.ebuild 2930 BLAKE2B 191e9b4f8d03c1177434400513c120e9aa9bdec4eb49574cfda81c7d2e496665641e2e399d7a1b3b6e25368e4a2e74a5b64bca564aeb05e4ab96f24ddb976194 SHA512 edb5106bbc12ee018798c00affb5b72464091094439efc08377ef9686a3a88076df9f3744b2dfdb9d42f771c93205d57c06b4025fdb6f14c4d27ae885eda7b7e
 EBUILD fastfetch-2.0.4.ebuild 2930 BLAKE2B 191e9b4f8d03c1177434400513c120e9aa9bdec4eb49574cfda81c7d2e496665641e2e399d7a1b3b6e25368e4a2e74a5b64bca564aeb05e4ab96f24ddb976194 SHA512 edb5106bbc12ee018798c00affb5b72464091094439efc08377ef9686a3a88076df9f3744b2dfdb9d42f771c93205d57c06b4025fdb6f14c4d27ae885eda7b7e
+EBUILD fastfetch-2.0.5.ebuild 2930 BLAKE2B 191e9b4f8d03c1177434400513c120e9aa9bdec4eb49574cfda81c7d2e496665641e2e399d7a1b3b6e25368e4a2e74a5b64bca564aeb05e4ab96f24ddb976194 SHA512 edb5106bbc12ee018798c00affb5b72464091094439efc08377ef9686a3a88076df9f3744b2dfdb9d42f771c93205d57c06b4025fdb6f14c4d27ae885eda7b7e
 MISC metadata.xml 1159 BLAKE2B 967449a1aa6e5baae193e105181c750b35eba83ab0a9586e6ce461e158e59a1184f67d765e19ea3a4f0602b7be17f777fb2d30d11d123dae26163f7fc9440d57 SHA512 595cf9a0b99e97fcb4396807473545c4f59cb129013dfe0adc6885c60d7ea47e72cf4aef1df01f7bd8328ec6e89918980a2ecc69700923f099b1a7e573a83731
diff --git a/app-misc/fastfetch/fastfetch-2.0.3.ebuild b/app-misc/fastfetch/fastfetch-2.0.5.ebuild
index 1123fe0aba3a..1123fe0aba3a 100644
--- a/app-misc/fastfetch/fastfetch-2.0.3.ebuild
+++ b/app-misc/fastfetch/fastfetch-2.0.5.ebuild
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index c76c0144138d..6f86df51e4f0 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/ccsh/Manifest b/app-shells/ccsh/Manifest
index 0feca9c5ec93..d8e1d48d294f 100644
--- a/app-shells/ccsh/Manifest
+++ b/app-shells/ccsh/Manifest
@@ -1,4 +1,3 @@
 DIST ccsh-0.0.4.tar.gz 11625 BLAKE2B c8cdc2dc01381f7e2c03292fb2212efce4637ea963aca53041d57045253b617213bca805942a88062d1aac961232b299de084fad43d18f9f7dcf3922a04fb792 SHA512 114c471870a23682ebc6bf1967bb82af55eb8a56abcb3472492d08a39906d9a6476adb619f2b9a6097c4ccf75f9ea266d297e50de39a277aea4eadea15cc06ba
-EBUILD ccsh-0.0.4-r4.ebuild 543 BLAKE2B 947fcf38cdff93dcd5c59cf6d39419a9214a2b537dfd4f2a6040afebec4b8112e84e87077e0e1ef382f7af9d74fde54872c6460ff91ed4ab49b94aa71be7b629 SHA512 d385ac4bb08cf6b8ed450e2b301273ba1fd407403a72a5202e0cc5128af59cc8b08594817dffc5c9047accc82dbc1d8b73ca177bc9912c8ef997dc44e114e90f
-EBUILD ccsh-0.0.4-r5.ebuild 537 BLAKE2B bb8728d3f445a0dbb3f4e8b028e9c824d1a51c8928595e71dd8dbe6882564dd4beab20eb0d9e0c9968b0bbd3d2697a0fb77e68fea02c0727dc6f25a32c49ef55 SHA512 71dcf0266a44a6eaa3c2188b0c3574eb62280f747ef28a8cc2097051e2ba42e62501d217bc39a7633e1d2392c6d5bb7b841ceb41412cb19224d7f9d8bf7cd526
+EBUILD ccsh-0.0.4-r5.ebuild 533 BLAKE2B 33ae2a2c31955fc55e566393604c35a0a6617127def0ebb821da699257b373ea00a0d54e0211dff7387a103889f52a1461739d6bfbc0fb318764e7e8701b242f SHA512 fc4b3191fc83a23e0b0624d9004c9e793443c00e9a51c4a38f71addca6c0364d29c6cb162a45139fb57367f23067cda83f3f7d1f6fdc1469fe2a9f3f342db71d
 MISC metadata.xml 242 BLAKE2B d3f00a454c71c76550a570d9b93e506e4af1cd47da59bda4a88ab95b6c252c317e51b8de7a80316a6ad7cc3371a9dbba6603d0d5385102d36480832e05437e80 SHA512 f3cc7499369a76a9cf98fc769721a53c0bd4f8a630bea83ff0fd4123cc9fb7588520683e8531e97e30f49fbd296b478263341d35a17e3379e7c823c74aaa98d4
diff --git a/app-shells/ccsh/ccsh-0.0.4-r4.ebuild b/app-shells/ccsh/ccsh-0.0.4-r4.ebuild
deleted file mode 100644
index aa40d26b0182..000000000000
--- a/app-shells/ccsh/ccsh-0.0.4-r4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="UNIX Shell for people already familiar with the C language"
-HOMEPAGE="http://ccsh.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ccsh/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86"
-IUSE=""
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
-}
-
-src_install() {
-	exeinto /bin
-	doexe "${PN}"
-	newman "${PN}.man" "${PN}.1"
-	dodoc ChangeLog README TODO
-}
diff --git a/app-shells/ccsh/ccsh-0.0.4-r5.ebuild b/app-shells/ccsh/ccsh-0.0.4-r5.ebuild
index c8b2106df52f..92438f82af20 100644
--- a/app-shells/ccsh/ccsh-0.0.4-r5.ebuild
+++ b/app-shells/ccsh/ccsh-0.0.4-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ccsh/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86"
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 75ad19185cf6..6bc453901b69 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 1825b82895df..e2b4d9565a31 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -12,5 +12,5 @@ EBUILD qpdf-11.1.1-r1.ebuild 1850 BLAKE2B 5e52d82411d166b3d1959f72a5ba9672473ce5
 EBUILD qpdf-11.2.0-r1.ebuild 1850 BLAKE2B 574271ba3fc5b19da071d62a32357a108de174f0c26ea93d91d81b35e6d1928c685cd9da8edc4499d090d2080f96f8ffd12f82eb748f7223c940b3986e66faa3 SHA512 b53654535d13f84095569a40fa36785228a8c2447815ab6a7a3ee3b0ebb480200bafe25a7bccb160a719a45c28ff12c36fceb7a7384af55ec4304a7e817aad28
 EBUILD qpdf-11.3.0.ebuild 1850 BLAKE2B 574271ba3fc5b19da071d62a32357a108de174f0c26ea93d91d81b35e6d1928c685cd9da8edc4499d090d2080f96f8ffd12f82eb748f7223c940b3986e66faa3 SHA512 b53654535d13f84095569a40fa36785228a8c2447815ab6a7a3ee3b0ebb480200bafe25a7bccb160a719a45c28ff12c36fceb7a7384af55ec4304a7e817aad28
 EBUILD qpdf-11.4.0.ebuild 1858 BLAKE2B 93f474844536a0e75fec9a5e9d3cd3fc6b8c02cbdf8b6c99165554dd8c6c01de8f0e1abf2e2bb7f0fefc2c4d48fa4db69f7bff27a1d92e2325437e9a9fc6f1d9 SHA512 0a2cb5e0e92357711027e14ffa5791a5d99e7f4a2ed70dbe702e52c180c81259300740fcb947e09867f9e20828781199527a8359dcd4d532ab4ab83aab5888e8
-EBUILD qpdf-11.5.0.ebuild 1816 BLAKE2B 4a368865ef9976181e18ae2565db1d4fa18c4e9f96201b0b5886065540c907a40e1280e7731a9211a0aa38763f2fd0310db29e347fe52baf03757097cbf6aafe SHA512 954d9643cebd190e332c8d8fa8eb7a1ce19a675e8b16ec415386b11a5c9a64337bfe7809c288c1f83b4ad15bdb8f9ac48c93e56b060132378c23a646b719764e
+EBUILD qpdf-11.5.0.ebuild 1815 BLAKE2B bdbb5f1e63f8dcf2d18279231fbd6ed1045576ba63e71f0b5147d8f0c0de04add76f241439f9a5ee60ff2f23cf28638eedc3ecce2e41b450539693771c4422ce SHA512 1d293b365a2b64fdd653de98a21f49f86aca5f6c0f454597c759b7df817d04a8d706fa1301af755303bc432384caad8a9025592efc73fa41979f96493f76834a
 MISC metadata.xml 444 BLAKE2B 1febc86d8f85aff5ec02d910550aca3bde66111c3e7364b264db3fca10020ea9bc2887dc8283217e2cb8d05ba46c176a92993e0d418528cbe590771dccc49d90 SHA512 dde5e34ef0d6c65df8a2ca8d630182413800f4c10f4b9860ed752623b6f4864dd4969c757e06b2689c8c5da3377bfcc28ec223e531432add083cd4a68211ea1c
diff --git a/app-text/qpdf/qpdf-11.5.0.ebuild b/app-text/qpdf/qpdf-11.5.0.ebuild
index 1dd936316a82..4ef101073a33 100644
--- a/app-text/qpdf/qpdf-11.5.0.ebuild
+++ b/app-text/qpdf/qpdf-11.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" doc? ( https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}-doc
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # Subslot for libqpdf soname version (just represent via major version)
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples gnutls ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index ba33cbeed371..d1644ef297df 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/breakpts/Manifest b/app-vim/breakpts/Manifest
index f7b7a1faaaf0..ddace30d8063 100644
--- a/app-vim/breakpts/Manifest
+++ b/app-vim/breakpts/Manifest
@@ -1,5 +1,3 @@
-DIST breakpts-4.0.tar.bz2 17349 BLAKE2B c7ad9eed8fb13537c940e6868f5e4e5dd812a6b7f7c26c4617e3c24905b6e2a817dc91990b613b700e793dd763a6841f85dd7f9cc42fb9f5afc25c3609f909fc SHA512 a480bf32cd3e756ac25849b1d5fd20521bd8c965454bb94c33810c9d1d4464762a731d08dcae858c59853a6cf41ab3cb6cddeda440c8b041cc8ec192ab2bd2fd
 DIST breakpts-4.0.zip 20124 BLAKE2B 2ea7568af5407d57c4d4b505c69d625056d62e8f5bd25bf5ca13918e3ffbc0f83de2aedb0abc3468215a650308ed8b592a618c0b50c24dd8ad3f931ef5d2ff8b SHA512 3e7f148896a10abd30a16d903c14460668ee48d078ae3c3b6ff663dab53d32199d8cf9cd3a56164a32d0be2684e64a882e917f3f632318ce85db5eb07e29754d
-EBUILD breakpts-4.0-r1.ebuild 681 BLAKE2B 5671fde59eb738dae846a860f0af3bcb6b76215f8c658ec6ba8594d7c1155030faaf59d29d1b02b67468803a5015d28286136b21fcda4bccc8aa4d8c36aa81d1 SHA512 cec0b57a54c643e6ed84c6802c0a63c3744a270c317dc29d976bdba8b6826adbcb0fc0df3cd07b7bedd1a87be930d759db3439c90902dfb166b550383035e6c6
 EBUILD breakpts-4.0-r2.ebuild 797 BLAKE2B b56dae8f1bd26390129af9562edb9dbd6d7d2da17072fbb33297f2c53c8059e18b1830b0f4a5923286028d59e995ae8ae59e07ae2fd9d62b90361e790e2da51b SHA512 b251e8d910274082c0780a2b66159a9d14afa4d0ec7153174df9e806652a442c1371ffa58532b00211772ea22f81fe2f729871937ef93d03f823dfb3c17e9a86
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/breakpts/breakpts-4.0-r1.ebuild b/app-vim/breakpts/breakpts-4.0-r1.ebuild
deleted file mode 100644
index 9b5cdef8cfb1..000000000000
--- a/app-vim/breakpts/breakpts-4.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: sets vim breakpoints visually"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=618"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc sparc x86"
-IUSE=""
-
-RDEPEND="
-	|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
-	>=app-vim/multvals-3.6.1
-	>=app-vim/genutils-1.13
-	>=app-vim/foldutil-1.6"
-
-VIM_PLUGIN_HELPTEXT=\
-"This plugin allows breakpoints to be set and cleared visually. To start,
-use :BreakPts, move to the required function and press <CR>. Breakpoints
-can then be added using :BPToggle or <F9>."
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 43e52242bca5..bab01036c425 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/arduino-listserialportsc/Manifest b/dev-embedded/arduino-listserialportsc/Manifest
index 002b01bfc534..07e7f52b9e5c 100644
--- a/dev-embedded/arduino-listserialportsc/Manifest
+++ b/dev-embedded/arduino-listserialportsc/Manifest
@@ -1,4 +1,3 @@
 DIST arduino-listserialportsc-1.4.0.tar.gz 5448 BLAKE2B a1b5256c9e9ece7ec4de8b1481b6e20769fe07fd94b73d099922074ff20d251896d992aba1e3680dc7e667ff2897fec05812a07273efe097cf5387a5f0207554 SHA512 0e8bbf1e49fa8705a6d3c28b44043f8d13589b7ebdac245db79ed3826bf56028778fdf721af3cf756cc8ea19e7a2f7e5f19421a105211cf0cd35041ec718c2bb
-EBUILD arduino-listserialportsc-1.4.0-r1.ebuild 1202 BLAKE2B 9fa864e08b2e75f9d5ed358ecb172621c464beb2e405628cfbf1295b20c844fcf1b4c4bc0931e779246f7fa42696e170fa9af85fe21f8aaa15afc608f735a399 SHA512 1f5769ef246cc0bb61e5e1367f1aa360cc6a268f08d1961adf2a73a3c1e220ef11cab1e67f3b178508da5ee7af9d699fd5f92010a690a9ac6459829d16592fe8
-EBUILD arduino-listserialportsc-1.4.0.ebuild 1136 BLAKE2B e76ce89b9f70c3f3129505b6e97eafda7b14a259b5e48159225d348f902cab6a12e56b6b96250c2690e9d0a5d6f435cb7fe2bfffbd07f92af9eff4df549e34ca SHA512 abe176ec64f63d2e367dfc0bfc42dab05323943ea4e3bee3d7bb4af1096d45cee632782ca6e165441b3d67de8465637bec7a1baa59a62b63a3e5893964201321
+EBUILD arduino-listserialportsc-1.4.0-r1.ebuild 1200 BLAKE2B 362f8dc350c967eab220a56e35b2819c73bf26de6d28140a5ea527f2524c45b2e022cd9ecfa97f3f96b99324378a932daeda6774e7abe6cc46b74dfbc565f13b SHA512 afeb36b15e55e330722f505e1787fe591785b029a1b5930897cdb60ced9fc35b32242f0547accc12b5d4b2c05f57ef9f4e5f2060dadacffb69f34e8bdbe80e14
 MISC metadata.xml 341 BLAKE2B 7ba73735132b5d9ec9e1cb2bfca7917173e4887fe6e55c15a4e2ebfa5442b38fc76e12353b57ac8409aea6309f14b4f4d86afb54c7f3ffd715aceb2bcee81441 SHA512 cda280eb54d6011a1c375655924178ab3ee6e6f065dc3f114f2176894ebb149cf7bfae27fe89efe465df5373dfdf1dd86e591c7e148d89f8162d63bc30e168bd
diff --git a/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0-r1.ebuild b/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0-r1.ebuild
index 959da3412357..78222b7860f6 100644
--- a/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0-r1.ebuild
+++ b/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/listSerialPortsC-${PV}"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEPEND=">=dev-libs/libserialport-0.1.1"
 DEPEND="${COMMON_DEPEND}
diff --git a/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0.ebuild b/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0.ebuild
deleted file mode 100644
index b9a28eb7e8cd..000000000000
--- a/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2 toolchain-funcs
-
-DESCRIPTION="Arduino helper library to list serial ports"
-HOMEPAGE="https://github.com/arduino/listSerialPortsC"
-SRC_URI="https://github.com/arduino/listSerialPortsC/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=dev-libs/libserialport-0.1.1"
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.8"
-
-S="${WORKDIR}/listSerialPortsC-${PV}"
-
-src_compile() {
-	$(tc-getCC) -O2 -Wall ${CPPFLAGS} ${CFLAGS} -c -o main.o main.c || die
-
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} main.o -lserialport -o listSerialC || die
-
-	$(tc-getCC) \
-		-O2 -Wall ${CPPFLAGS} ${CFLAGS} -fPIC \
-		-I$(java-config-2 -o)/include \
-		-I$(java-config-2 -o)/include/linux \
-		-o jnilib.o -c jnilib.c || die
-
-	$(tc-getCC) \
-		${CFLAGS} ${LDFLAGS} \
-		-shared -Wl,-soname,liblistSerialsj.so \
-		jnilib.o -lserialport -o liblistSerialsj.so.${PV} || die
-}
-
-src_install() {
-	dobin listSerialC
-	dolib liblistSerialsj.so.${PV}
-	dosym liblistSerialsj.so.${PV} /usr/$(get_libdir)/liblistSerialsj.so
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 4d62cd44a218..57aa44a4b73a 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 173febc7be01..76458785d1bd 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -26,7 +26,7 @@ EBUILD php-7.4.33-r6.ebuild 21502 BLAKE2B e8e5f58105088783b8ed435f4705ecb3891ad8
 EBUILD php-8.0.25.ebuild 21880 BLAKE2B 966f8b33f46767a4456686cd788f0b3c1b8fd4049f2022b1136a8530ef3a5021efb393db45de6ce60aa77ba029c384858838e576a6d2799808246fbc2645730f SHA512 2ba7d167b4075b89e6aac2feb387103ae3fca4dc0be4d6791d23995f4eeb1ca65941664374c52e48b07a8815ccdc7bf1c79b9f2da910bbae8c7c3c373b856ab5
 EBUILD php-8.0.28.ebuild 21883 BLAKE2B b0c23c162b11e652a57ec6218a26b6792baf81190168a6ac6c279d682bfa4a7a36b02598d063f9fd69f503bf463a97660b7c6ccdcfe637dc8a24cf097909f459 SHA512 2c8326ec110c74729a8daad7cfcb1a3c58d86ef741d6164e9248d68519dde26739e5c2c1bef89819fa641ed4c07f7566dfced4361ece573789a5752a3b9d9136
 EBUILD php-8.0.29.ebuild 21850 BLAKE2B 30c89684d086d2562a7b6d16c6c72c9f18ebe4a2e0b96b922c4a86292e845f34ed8047568593c9a078eb3800eedfc90b56725fc13b8a8f9cb66683d98e9c8923 SHA512 342dc912db1e7117044faabf265853fd265178dee671a23e9fa00d3cf49a5350d15fa02156a19f964230a5b0e961c415173087e5bb161cf4606c1b01687d8c9a
-EBUILD php-8.0.30.ebuild 21962 BLAKE2B a1e8b6be6e55450bb5a087897352d77c50cbf5f02c0cb4a8da2a472c0aa6cf78490dd139a43571808a5cd7a2d8228eb279486ac29dafb00a11334d1725c2ea13 SHA512 51d8ca7fb640f74a5773e7e1bc4ad555a9a7f2add79a813d1c73901110e78047e9333161918fd95e9d2844558a42470d829ea60c6f26e747587affcd9bdc538f
+EBUILD php-8.0.30.ebuild 21961 BLAKE2B 29703856249d9edf5ee7066fcaab23ab9d7f5e26fdb8e15b8ba9a5124a92ebb0a6c4486bf2d5d20181f7e93f2d3abcc1d2388c231bb683d36897082839d743e0 SHA512 e7a3721dee3990db45590528048dfac38e2dc463d196a425b2e1f34563dc2b5b8eaf08d174989bd10d4de57382ff944d8048a254dd18e0b31990d28470ec4221
 EBUILD php-8.1.12.ebuild 21815 BLAKE2B c1610ff5a4e439954b228744cd0223a4205dd1b53e6cff7a48535db414b6d20d307ba1b31c96ea6ab60b2ed1f811eb612c80e245b49acdf9659a6f8b2bb94b08 SHA512 73b766c5dec9b7231f1149b279b47e8621e527bbce2e1606bafdf1e6cd3f647ca30b2fcd16e1d9c3160c4a50c464fdeefbd05e1102f9debe7b79abd68fbceb4d
 EBUILD php-8.1.16.ebuild 21818 BLAKE2B 1782dc5c71cef2ac3ca067f4d53fcf64e61850044384dfe9bc0e64a025ab1dcf328a455b2aadbd17dd8c92cc65029337598763e3644f488122cde39a913d3343 SHA512 2215fb5851cfd28ffff620ffe86b0d924f61e9a24ff724fa019be7c788fb7de3c53f23489d21553fd81670887cd463b959f9f9857a53cc872e72f70478e330d9
 EBUILD php-8.1.20-r1.ebuild 21912 BLAKE2B 09c455238617b57c66b9913e85226293f0d6714d5f0831ce352d6dde4b81eba3a48fc5b547aad2cff5638f1ac2c2ca36db2293e9943c77e3f2d029b0ff50a43a SHA512 d76af211f86309094ff21e5e98ff755de96b2eb9c6a1c14fd915385a81f823a1842dd25ef6bd11de094dd62eb8ba0a9d0d5a1960527542af8946fb01911dd749
diff --git a/dev-lang/php/php-8.0.30.ebuild b/dev-lang/php/php-8.0.30.ebuild
index 8cdaf1ceb1d1..e6186d2f2624 100644
--- a/dev-lang/php/php-8.0.30.ebuild
+++ b/dev-lang/php/php-8.0.30.ebuild
@@ -20,7 +20,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 32707f82a8d2..1ade9fd8ef63 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -2,62 +2,30 @@ AUX pydoc.conf 169 BLAKE2B ce40bb3d5f858bd7a8d9ef5bf215a8ab592568a724f0e08aea219
 AUX pydoc.init 600 BLAKE2B fb8775a6663483e5112ec283627610b746020d88494e772b92bb718a9493a52606e565c6c2fa4917a5cb963f166283d09883bd26903f2f3ced6c240d4e292a7f SHA512 9e71ad53486b6882a8441b24225c602195ee33d29dd1b60df27febbc6b752e79929be356152a489f893dcfb11f9c066b999787bc27a8ac61062c86e67a69e87a
 DIST Python-2.7.18.tar.xz 12854736 BLAKE2B 060a621c91dd8e3d321aec99d44c17aa67381998256a1a002d316b38288349884d5960de35c49352d03129ed0bae599e641ec2225898158ebce50a7a2fd74d2c SHA512 a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c
 DIST Python-2.7.18.tar.xz.asc 833 BLAKE2B 1d98770e46171971fb99994508d238c01d2755281d2f94353314014d9e83e0ec5f0b3e3950ea1fdf5fce9ba6b8f55312355845c2a3fc4291c27ee56fe6215448 SHA512 c2a5f5a52f47dec52460ad3275758d4e5de6e7075c3def4353c988d74d563a39b42cae2d5eb24e2a23a6247cef69100f91620b11a49c2359fbf99b203c9cbda8
-DIST Python-3.10.12.tar.xz 19654836 BLAKE2B f7a3e27b437003915e4ebeeba82d1cc0c9de169f6e4bfe8d957e910141767668f3f1dd19374c212dba09325465f859244b955f3ffd3d0e6e879cc31bb4229ed6 SHA512 5ea018e71bfe7872e02eaf8aef56d5583c0880e4ce5fbbdf8ea76da20c2e94ac6a3ba8badb4b7d1bc21853402a3b63541b04181737417b1626e786b696595cf5
-DIST Python-3.10.12.tar.xz.asc 833 BLAKE2B a0278118ce8e1806a68838e77f2448570e41791d968e23f27940e48ba996a21dbe3766e670180ec0f78d32d89aa7574a95e5232aa9173f2c58886069a76a4cca SHA512 d5f1c98d8509e078bf7d7205f9fe25d028178fb7940cff406761c14a2689a82425f6bfe9b58b2aa6e9d4fee53626fb56658e56bd54028245de827dc5ebc1d7d8
 DIST Python-3.10.13.tar.xz 19663088 BLAKE2B d9a8edf89d0ccd665fd5ed444a144af240e078fcab1876fea8b44586c23651a08cf5833fc54c39e8471fd9e66ea0ded11fcaa5d215bc025acaf4504a15c5846d SHA512 7579772e501486b2b07f78142082dee1e99c7643640098860ac0cf2ca87daf7588b0c00b1db1960146b37f56a6ed98fd08297c25c9a19b612cf6e6a258984da8
 DIST Python-3.10.13.tar.xz.asc 833 BLAKE2B b00222b30a6701e77c11c6019e2240be7cf42f2b4e558c03f7a058664d242a00665fbc52fdf03106e84c75f49b51b705d8acd1f381d1f41ada67c4647652ef4c SHA512 3083e66f8d26128302dc77a0c6ba3bfefc4229928a1bbd06460f2fec2421188bd30d493e3bce138cde1fed1df206e1dda04912b9f43a0b81229f1e69135e3a7f
-DIST Python-3.11.4.tar.xz 19954828 BLAKE2B b423aa1838702f555160b41cd90d752180250381af9222d714f0545281e8577e14d7771dc2e1217d877ba31e85590da8adcc50b5019faaecdd775cd09b313d47 SHA512 7eb14fecbf60824d10c22a9057584c3a142c2866f4af6caa2525c10c8bcb24e6e7afb32a44a0e118df0a2b2543d578c3b422ffd4a5fa317dfe6ea371cc7ee1ee
-DIST Python-3.11.4.tar.xz.asc 833 BLAKE2B 0384dfbda5f897e749d8fca21773c599d1910ce1188f3c2dbf9632c9a79347644e1354e0ec6fc182c387b9cd6c66b8c224e5bfd8237877786918414f8d49f5f7 SHA512 8ee82bf116b2cc7407e260eccf53e7fee4d7497165d0b9c3e59931c73f3b419bc0299b459eee9544a6e51e323ff0a6aa07827efd89f9c320b54556feeea04a78
 DIST Python-3.11.5.tar.xz 20053580 BLAKE2B 3b85f2d9d32787b0500abeec4211032bb147bd991f1a865ff3d13350f6beddef8051ebdda21e130cbf094e6546b31ae43d827840735ce245f462feea6868e0b2 SHA512 93fa640bedcea449060caac8aa691aa315a19f172fd9f0422183d17749c3512d4ecac60e7599f9ef14e3cdb3c8b4b060e484c9061b1e7ee8d958200d6041e408
 DIST Python-3.11.5.tar.xz.asc 833 BLAKE2B e3c277f30203b5a0253aa1a41b8754bce7c00b54f0563e2d178c8fd264925a1b308ed84a875faeeae18405c419341ee286ea4ddaff93ce1e59b896daaf805e6e SHA512 5a8e1b1cabe89de03c050d581bbd3ec917d93ec943b2e8241db05c245809cf80294022c4cfc1bea3b90aa0570176109aac90455057256c025e2596aa136375fc
-DIST Python-3.12.0b3.tar.xz 20220780 BLAKE2B 78deb1efe3642bd11265fdb810d8e40d6d816ebadd55872bfa7de313956865d4370631449a7f0db7ca95f38643598753aaf94c9a02d44f9a2707f45bba41f77f SHA512 2d83285ea09445da25204285937366b20793b12223f5a0979276633213773d14de6dbb6a311629b755962804d8521b30cf9fe032f447608b6df7af721a18ba0c
-DIST Python-3.12.0b3.tar.xz.asc 963 BLAKE2B fad39386d4f8a6a1103e0cef431ba171fd5e6af75b097684717f68046683bf967981d1aee0e17f7dc7f97578e686565f817e39de11b309c4e8d64949fff396aa SHA512 ab0d91f3c2fc001fe924f71182526d543a3c9e65238954bb954c58d03171a6cb3640a15570d2d7b889c6251fd876790121cd36bcc29a901f53d17f5f4f8f6f4e
 DIST Python-3.12.0b4.tar.xz 20244176 BLAKE2B 6f1d199fcce07b5ca4fbf5a24b382aac2af793c6f43346708d984b20422a2f9ac4e6bc352e3c008e7815083e06c4b69e36c1a3ea94a8e3c398a1d2188595a0f5 SHA512 942a47d12c51e13939c815de908e766b818e4862c536153ae94b8032b5263b0cc23bda9a75fe60f48ee400a4ce405e2583da684847623cf552c20efcbc663469
 DIST Python-3.12.0b4.tar.xz.asc 963 BLAKE2B 3ed0c47bd892791325598f20578bca72d8ffce9421c80d35c12b2a0d23611dfc329a2016f332950910990fcd9bd55e90753f547ca8a54dde039618b43c71a6b4 SHA512 ab2684cc4044bf39c8064ec7d41dc2d04f01c9bccf5404ec1fffbce89a3a831b4d7dac3613ef892988a16839aeb13cbc03a085fae5c086ee19d3bfb925dff6c0
 DIST Python-3.12.0rc1.tar.xz 20285264 BLAKE2B 2cbf77e9405426c58714506c14281a941b4006219215d990f79672719eaa4f26c7b6356a1096400aae84d682c5a9622dfd8ea90dc635312efba6cd8c730d3f37 SHA512 67c38317e34aa1c4ced831cf50f74de21f9e40ce708397be3682d0c1012c3e0b2617d77525dc6c3246725dfc11b5448792adc0ef2e3741e818776bc5fba0c50d
 DIST Python-3.12.0rc1.tar.xz.asc 963 BLAKE2B 852298edf878c891e53e317d21a31a5fbd6876aa958aae715a77c0bd27a508844964ad69280d15d59428375a14a8f97c24ce9ef64ab101020bd541d5125e8676 SHA512 319ce9c5d935dcbb5ea12468c5127b4541c1b8af443aef210bdd26030fc3eee062639601fd72e70428cc18179fafb33ad2527a0c262650c4da678544fd06d0b9
-DIST Python-3.8.17.tar.xz 20696584 BLAKE2B 07be197f7d753775b039ca200864e6d40cbb0115538604d0b214a5404beecd38e3ef416c1941f7871e2e92913d09faba48745bb9df141cf8e5ca77c7de6f0a24 SHA512 bc7e02acfebba86e4394f02195993500fac9347a52c7b49727eb0cdda38786ae917234272872d75effaddb042810d9682ef5627b0cc199f8aa0d5d3e315ddc0e
-DIST Python-3.8.17.tar.xz.asc 833 BLAKE2B c1eb893e8005c59c918528d676f06679182cf45ae256f9929d2daf56577dd2dcb3aff264e9ca47b605ecba2a1c00fabf282c59a231e67cec2324c33c6b3ca7f6 SHA512 bb017e2b17a3ca8ed568d2589285a87365bcca6a677e06fab5184d03e251ace6276117a160f59201e6a1c597e32d79ee109ffc7083266e6e2105b7afaaac3876
 DIST Python-3.8.18.tar.xz 20696952 BLAKE2B 45be712aeef8bb3ba04aa2bd7d0282aa5f817327749c620ede18ee307fcb432540db9062a8186b08b49467515c74f01eb6fa739f366cca76dfadedcb22858429 SHA512 0be1d85cafade25e99b8277ba51d7b9b3a3d2dbbcc52fd0d1c633c47982e5dd87fd7a0ca180a78d7801d79a8ecafa79bd9d501d544cd7b6da53ea409daa70adf
 DIST Python-3.8.18.tar.xz.asc 833 BLAKE2B bc4e989748d53c6be7040e78d9f1852227c6a76f4c63a68824f5139defd51d1ea7988df01f961ff5c77382e156ef45fead2bb97bddbb38b208ddfa9c709e4f34 SHA512 99a0fd74fe19144819fd9522836474e10c1593787eb464694bdc6224b2d4a9331e31d2ecafc35c2bbb9bf67f20186295b28f9374c1fdcd05ac13f5f400219489
-DIST Python-3.9.17.tar.xz 19647312 BLAKE2B eae9d1c0b9a6cd9ce84af75e58899bcd127163c90434d2bc879047706adb087721aa5ac9425e6906e6238296b2695ea0304a2b93288627cee3560ee85f450062 SHA512 994d92346e563a4635411808744eac8207c68e6fc9c1db1c2eb4103dad8553aaad4a8116e38c61f28cb17905a12cc46dccdde985e1c45882bf1815081b88b6be
-DIST Python-3.9.17.tar.xz.asc 833 BLAKE2B ff3dc342e89149b89b060d0bd8d2a147cc901bc64c1e97d3c21ca8ff2165cd4959ca76ae1df9dbc76039b43d75e8108382ad2d8954e4ae892d174f6eb3aaeb44 SHA512 948196f104539b2e05b17fb5ef2387be392c515222213def7ab6f5b0f490d60e472e8df2dc6ec1df1d293a34d8c26a761412c93aabbdefd3390ee8bdef95a5d8
 DIST Python-3.9.18.tar.xz 19673928 BLAKE2B 97da9bedaf29101e5df82199ac3ee12f1da74d5cc89de21ff1510c3f6d34d7f9194489e79855f1ab3c6f26768738e784cb7231c1a692fa746edd21d35558bc4e SHA512 aab155aca757d298394eddb91ff9a8f239665bd46feb495c6b6f735bbcb7489c05c858cc4cd08f1575c24f293b33492d763e9a140d92f0b2b0cc81a165a677c7
 DIST Python-3.9.18.tar.xz.asc 833 BLAKE2B b2160eedf7a7529c379ede5cd626f2d1e36db65bad8c8968adbc2940e597bf0e66f4872078c6543c69aed9b7f38b41d922fdc1cb8046738c1d8566a3f48da7d3 SHA512 dff9a86df2b0774b68e7c762bacf05e2482dbb218301acfdc9128fc600bbc51c97a3a44f6b7cee87bd4e153bcb4a0af3c98109560d0c7861b7508edc9ae05ea1
 DIST python-gentoo-patches-2.7.18_p16.tar.xz 35448 BLAKE2B 0139c0944f62f9cdd236f6a8557e0ed19704c7d72869af1cb7d8bd3e646a746cd4a0201e1b44232a5e78ef49f254db20b0d0271bf744fbfd4fe0f1e99b8f3e6c SHA512 810be590d0e06fab4b2165e6852ca49662f09dcd7e20b47a29f613ad7653252c8dfac3f0eb228d77c8a914efa7c08788b2fbd552a4b47504f5fd0ec17450c48f
-DIST python-gentoo-patches-3.10.12.tar.xz 13980 BLAKE2B 8ca0e652b73634d9fa52fbdd5f224a68ca7f0d6798079e4e5dfa41a3619e9b387166c49551ec77fb2ee035680e1681c129d6db4f82531fe94f56aa46bc1c78e3 SHA512 e41f81afcbf0948a66bc3550225f69a48797eca7461e516ed5259584e4651fe81973c8e76ca4f4a32ef78247306ad33c7a85faea69797f3e090010a1dceff13f
 DIST python-gentoo-patches-3.10.13.tar.xz 13996 BLAKE2B 0123a18c8c39397ac03b1be1d243d8ae4da9f62888f409157bc1781285c9c6cd3d9ec23f1ae7ff0e0591b3dd2934ee366b3eb235e7cc6663afc9d617c4fd42f2 SHA512 ddfc830d2ced508a64e202a6082930f53edb48411c19cc9f364b29977ecd5a4f052d0ce953bbfb7fdf26072acb2836e0b7d5ce55f941955f2039551fa1f48edd
-DIST python-gentoo-patches-3.11.4.tar.xz 7108 BLAKE2B 185bc558a24bead21719d543319a47b36fcd6bdd22a5dcb11ad794a381b2bc51c28f5ea03ca1ad3359e3f96c081c10b08285e4354daf85a0535bfd2123d40d16 SHA512 19ca9fa9071cab3938008af515a65def75ed5cff7152dcab5895b29fc1ba87044a1027540a1cc63231c4e77a8b67fe931bf39adf3d642a648e7da970a0cecd3c
 DIST python-gentoo-patches-3.11.5.tar.xz 7124 BLAKE2B 04e19b0cce37794622d211fb7758988e734eca7298be59169fff81f8ec98f9c2454be3bba0944e681efcdca0810b74b4a07993965d89cdc0261cbc61862cd6f1 SHA512 3e137ab2b7ff4aaa41e4c760a7340d86cc3fb226c47985bd0f0bb8a4ef4fc157e1442e69995e585db15f04f95a734a19d80534a89067981ea314ef5be042b02e
-DIST python-gentoo-patches-3.12.0b3.tar.xz 4656 BLAKE2B b7ae4023c1aea6f3fe9f98bc1a974cfd79769dae104fb1dd88cf778f89b6a7d30f68093abc5211e746548e46ed06044beb7458b2ed3b0d67b5a48f00bc960683 SHA512 8d7fbb6ecf65770c6900dccff34c668a79efa3a86d55be50edaa3f583b50be9b4a7e628a41fa9efc92ad61ed9be8e04f1b324e68240fcfdaaad67b7a077ef928
-DIST python-gentoo-patches-3.12.0b4.tar.xz 4660 BLAKE2B 50c8b2d80b33f26a274a80884a071568ec0c79fa9312da544d5a748a5bd38d245de4f6919d8fc482e9f81c0c6686ef7d02f0b311e861d20be32846ccc875be72 SHA512 7cddf24248ee24c06b9bd765b2445b8bcf08e2f244cd9a9e1515d7207059e27efe818e0da088dc6f3b7fa882858836443484e13cdaabbbe0afe7a7db8c2dffce
-DIST python-gentoo-patches-3.12.0b4_p1.tar.xz 7772 BLAKE2B 54bc9fa2a39d36e83b4fca11c5f1b19df96777a1abc18a1dbd894d83e1504971e52e861225af44201d0d2c1740559c6fde0a52fe4d97111a5c1acf61efc4b47d SHA512 8bc7d81255f6b8f6b7d6be84af0a778bbb51126154c0ff2f0f5bb1a5ebdaf1055a4e012bbf239a1bbd0c5ca7d98fe8257731d1cf916ba55c10fddd5e75f6f33b
 DIST python-gentoo-patches-3.12.0b4_p2.tar.xz 8132 BLAKE2B 4c1df7c8e1dda483724d8c3bb8ab7a7739fcdee16eaf1a2a5aeedb6011c13769ee9f2d0b1cf849df12aaf3230c0771b16533496539e1a0fab633e38699c8a75f SHA512 9051311d1e31163d13b8d2b1981d700ad2cf297b30f8d2867df8fe535fdb7da11efcb6fef8a201a76ff05aa8ae91c3679eeee72a729dc7249714796f6af2be9f
-DIST python-gentoo-patches-3.12.0rc1.tar.xz 5040 BLAKE2B c03e9cc0f5ef0a68ab5d74764a30b8ab336b2b0feb105124fcb6f1ba660db7c27deab412f91b0980b072dcbe6bca06b8f2f9fd11aa11e95196d936fc8ba75bbc SHA512 bc8d67ccff73e3841c9fb591f5b1b4db7156cea0bde4edc2de605d6e921b5998c6f67bf7f1be505bcd50bc55b8f844be2b011720b5a93b04e7bf60df38bd5373
-DIST python-gentoo-patches-3.12.0rc1_p1.tar.xz 5812 BLAKE2B 41a33aadac1bb563ec55f12794fc48061ef01d2bada0e9f06287410cd235286ed04c6fddb78bbec1d8a9fa54c46861198e03b4d995e715a5e739ac2c915e0941 SHA512 82e45ab804e7e269805b760dc5dae3803a9983765718b975ec2029c82ca45d6cfbd9ba330cf09149ed24cd808a37fb021b0c6a8324b855dce0a92ff01ef42391
-DIST python-gentoo-patches-3.12.0rc1_p3.tar.xz 262260 BLAKE2B dc8198ff18c13475106dfc52432673dd742238d8b960fef1681dd2eb42ffe8589f1b0a123c24f2722d547b884f4ac053aeb8b3d919dc875211a34b57afe59caa SHA512 3605ee3d756f8d8cd4b8585352e38ef3383195a2b41f02b6d6b8fd6cdd2ed470e997b1d72d085fdce73618afb68aff666792858a2a6b64e1d58e280f94b454d8
-DIST python-gentoo-patches-3.12.0rc1_p4.tar.xz 329324 BLAKE2B c060350ab675c9b6ccba51fd7dc32cdd03223623fa24d008f7ae688a3a046153668bb8c39f787e53cd02836fc350e4a30d9711105b2ef89f227005a38a5ebf23 SHA512 d22983090f480c80a02a8bb62abeff369b59afadbf8894145be5139470e6c92a5a52cc212ac4d84a7fdbd05876853e967df3a0e4f7a1bb0a4897b4533ae0758b
 DIST python-gentoo-patches-3.12.0rc1_p5.tar.xz 348764 BLAKE2B 8f71d6172ca4e557c195f4226d548f10b888842a110824db6c73613016d5b1c900545a2a3331519cc35cd9cc740fba3970737f40cdb64bd4d48e23a2be9e8be6 SHA512 e05f6e51a0689f0b5bdc745518742aebc3ae9fe145cb82c5e43a1a048df0ea4f11711ac4850726f807a73e232f76cfdc09c62d513ad0007acea7d5d5420c8569
-DIST python-gentoo-patches-3.8.17.tar.xz 32424 BLAKE2B d992f6b1c971583000086175d07198d367e4504dea8829b35742a3daf2279ba1fbade8c37f00018bda97fa9080d1d40087c236486bbcd369c2d1c850de47a976 SHA512 d309da6805a72742cf8d1bb170a777edd7b7aa936d6e9967e96bed4427285180cd9935f202f899f3aa54632a31a5a94c5b7c20a343b1a714d8aa5fc6f8e9f371
 DIST python-gentoo-patches-3.8.18.tar.xz 32424 BLAKE2B 2e0b6e1c8e3df666934ba283214ca1577b01140dea00513f6420b0255650002e4bc4cb142076620227cd430bc2547123fd392883285886e543ef72ca466f8ea6 SHA512 b005f1054b726fc8c82a50b006309de64fb7858fe5c22cc7b160687d059a7859ec9388706b74a0e6c1f42301bed071dc639eb8cfae0d7c5eef2f565c63cc2d29
-DIST python-gentoo-patches-3.9.17.tar.xz 25048 BLAKE2B da19105dfa2fda7b422ac368f85c97d7541be74a6f9b9170a19ceac901e026ab39baef83c610172ecba1f70cce6e2832e956c2e4c87387b0e21c79c2c633b116 SHA512 ce9d3c62c675bceccaac21fd467c54322a55a1c8af9be3a6dcfd7a892c03b39b38dc35ba570e3dd9fc984a5f3eeabb3cc564ba2d7f935dbf6df829264cb32b2f
 DIST python-gentoo-patches-3.9.18.tar.xz 25044 BLAKE2B 1d9ace5c5a0f1c15bc23595cc51d64b4c2b416552cdaaa960c3e34360aba3e7029a06e2a077212c68fa7aee4fd20f649a3b0926bd4ebb10e529e8350ab051e63 SHA512 bc180c3346dfae60a7db221d114146ee83409bc42092171eb05c83de528bf5f0e5654d1441f40ba839d0a98e866a5b43452fb7a72047c837497620a12097b8f5
 EBUILD python-2.7.18_p16-r1.ebuild 8603 BLAKE2B 13c654aad809e8f999fa36e63f4a4eec5c2804644fab92c6f1a5c8ef75b20bde8509c34358e32350d7ddcbf8a309b9c5c008a9f9ab83c7d208434bd7efab0467 SHA512 88de339a316876a5a71560842cd879ba96b522f7dc4e409e6a22109639a538cb38abdc1a3d6c8ef468476841d1fe6014327197e8e2b0dd2d357ecde34bf8993a
-EBUILD python-3.10.12.ebuild 14061 BLAKE2B 53cbacdaca9dd0c42126aa275dd62ca5454339ae5fea06112885d1b176617975625e14dacc02ee6bb0c9d0c2541d34f4a54bd724be45fed243f373977e6aaa17 SHA512 336ee041317b478d888ef80f8600ad3fdc388233cd738e82fc1b512ed60a4a2116db50a4c033b7f3a0c57ccb74c1d325f385ef05e9f1873f44660aaf7c001148
-EBUILD python-3.10.13.ebuild 14062 BLAKE2B adee9e4ba797f10becb9cc9a8f9f514e6fad88809b45d844f117d02e165c765b2c695578d3a6e7637a4f57edade1db25239d26ea4e52ddd89e665d70f41d496a SHA512 246e9efb7a6f17098595de3054c24913582bb1d611c37f8cca794bd3c9393c07aa2cad3dbe05689d7ef29bb8adfdb1c8c66605563f55dcf14b4b83c910d370f9
-EBUILD python-3.11.4.ebuild 14960 BLAKE2B 5c91cffce5e98dd4ab172e95e80f1bfea08a96fd4b0773f38aa9097932b380892b4e806713454f957d50c8b193771186495df72b275ab62fa95449daf4708f45 SHA512 55f4da61955b2a54f797f2935b9f8eb77a40efb74596710b0836667674fd80e82525497e1081ffac6d395b29da0e389dcece62a5f0bc1acff8ee6ab877dbb0e9
-EBUILD python-3.11.5.ebuild 14961 BLAKE2B 52760367242c47570280c11fdb7e82c78a81c6a0ccb04a66cf616e2f7e95032dc4cab42ebb3406386587ef0bc9edf5f18443dfd84842628fd9678258a7294da0 SHA512 a02eb1b595d52cd1192051fd1b30f0e2c65dd6d3186802d35e7bdb68830a84e02be595be62b392d0743354fec1e3e76de48f904eba7b4b69d8c41a08f4839765
-EBUILD python-3.12.0_beta3.ebuild 14859 BLAKE2B f081d3dce5fb9d78161783e5afd5bc880957217e6790b5fdfde1f19d8c61f2ce0c6c264cb464f3e5cf764e4aab7c95a7ce90e31c90e72cd0fc1eecbec927fb14 SHA512 80af81666cb1fd77d38346d251944fb5f4bee04ca367c147fc98ec51893202ed6899d4e7974279013d41d070b5be8538a1ac0179760eca5fecb49e9159b020ad
-EBUILD python-3.12.0_beta4.ebuild 14859 BLAKE2B f081d3dce5fb9d78161783e5afd5bc880957217e6790b5fdfde1f19d8c61f2ce0c6c264cb464f3e5cf764e4aab7c95a7ce90e31c90e72cd0fc1eecbec927fb14 SHA512 80af81666cb1fd77d38346d251944fb5f4bee04ca367c147fc98ec51893202ed6899d4e7974279013d41d070b5be8538a1ac0179760eca5fecb49e9159b020ad
-EBUILD python-3.12.0_beta4_p1.ebuild 14859 BLAKE2B f081d3dce5fb9d78161783e5afd5bc880957217e6790b5fdfde1f19d8c61f2ce0c6c264cb464f3e5cf764e4aab7c95a7ce90e31c90e72cd0fc1eecbec927fb14 SHA512 80af81666cb1fd77d38346d251944fb5f4bee04ca367c147fc98ec51893202ed6899d4e7974279013d41d070b5be8538a1ac0179760eca5fecb49e9159b020ad
+EBUILD python-3.10.13.ebuild 14061 BLAKE2B 53cbacdaca9dd0c42126aa275dd62ca5454339ae5fea06112885d1b176617975625e14dacc02ee6bb0c9d0c2541d34f4a54bd724be45fed243f373977e6aaa17 SHA512 336ee041317b478d888ef80f8600ad3fdc388233cd738e82fc1b512ed60a4a2116db50a4c033b7f3a0c57ccb74c1d325f385ef05e9f1873f44660aaf7c001148
+EBUILD python-3.11.5.ebuild 14960 BLAKE2B 5c91cffce5e98dd4ab172e95e80f1bfea08a96fd4b0773f38aa9097932b380892b4e806713454f957d50c8b193771186495df72b275ab62fa95449daf4708f45 SHA512 55f4da61955b2a54f797f2935b9f8eb77a40efb74596710b0836667674fd80e82525497e1081ffac6d395b29da0e389dcece62a5f0bc1acff8ee6ab877dbb0e9
 EBUILD python-3.12.0_beta4_p2.ebuild 14859 BLAKE2B f081d3dce5fb9d78161783e5afd5bc880957217e6790b5fdfde1f19d8c61f2ce0c6c264cb464f3e5cf764e4aab7c95a7ce90e31c90e72cd0fc1eecbec927fb14 SHA512 80af81666cb1fd77d38346d251944fb5f4bee04ca367c147fc98ec51893202ed6899d4e7974279013d41d070b5be8538a1ac0179760eca5fecb49e9159b020ad
-EBUILD python-3.12.0_rc1.ebuild 14858 BLAKE2B d53c6f1bca3adfbe6ef8043e30dd1b0610ba9ff7d63ddfe8d119a2a95c687e5e7879f9a4a150129a1623670e1b763ba9897a84d847cef61e4d7db532128d9e6f SHA512 fdbbc73705e21c3cd88bfd9ed959655ec188e1ab4ec25ed1e4f1e67b8ad3b136a8606f1fa09c54485dd4b13724eac517e073f692849e2de9290bcacb837cf8b3
-EBUILD python-3.12.0_rc1_p1.ebuild 14858 BLAKE2B d53c6f1bca3adfbe6ef8043e30dd1b0610ba9ff7d63ddfe8d119a2a95c687e5e7879f9a4a150129a1623670e1b763ba9897a84d847cef61e4d7db532128d9e6f SHA512 fdbbc73705e21c3cd88bfd9ed959655ec188e1ab4ec25ed1e4f1e67b8ad3b136a8606f1fa09c54485dd4b13724eac517e073f692849e2de9290bcacb837cf8b3
-EBUILD python-3.12.0_rc1_p3.ebuild 14858 BLAKE2B d53c6f1bca3adfbe6ef8043e30dd1b0610ba9ff7d63ddfe8d119a2a95c687e5e7879f9a4a150129a1623670e1b763ba9897a84d847cef61e4d7db532128d9e6f SHA512 fdbbc73705e21c3cd88bfd9ed959655ec188e1ab4ec25ed1e4f1e67b8ad3b136a8606f1fa09c54485dd4b13724eac517e073f692849e2de9290bcacb837cf8b3
-EBUILD python-3.12.0_rc1_p4.ebuild 14858 BLAKE2B d53c6f1bca3adfbe6ef8043e30dd1b0610ba9ff7d63ddfe8d119a2a95c687e5e7879f9a4a150129a1623670e1b763ba9897a84d847cef61e4d7db532128d9e6f SHA512 fdbbc73705e21c3cd88bfd9ed959655ec188e1ab4ec25ed1e4f1e67b8ad3b136a8606f1fa09c54485dd4b13724eac517e073f692849e2de9290bcacb837cf8b3
 EBUILD python-3.12.0_rc1_p5.ebuild 14858 BLAKE2B d53c6f1bca3adfbe6ef8043e30dd1b0610ba9ff7d63ddfe8d119a2a95c687e5e7879f9a4a150129a1623670e1b763ba9897a84d847cef61e4d7db532128d9e6f SHA512 fdbbc73705e21c3cd88bfd9ed959655ec188e1ab4ec25ed1e4f1e67b8ad3b136a8606f1fa09c54485dd4b13724eac517e073f692849e2de9290bcacb837cf8b3
-EBUILD python-3.8.17.ebuild 12186 BLAKE2B 3a3f7f0701c0b4124fbcdd9caae9156a11108584bad90ed3051f9798ca5726af39c4002d4468d388256be6bd4d8e6967481e600fdacd0f2571c749a622fc3cbb SHA512 c8d1027498d66751af4d842445db10e29c55c3e5ce1dffa1d6487244e1c98ad19eb9188a31165756e5d3adc1d6d334535ebd784db29e468b2eaa2244fc563ffa
 EBUILD python-3.8.18.ebuild 12186 BLAKE2B 3a3f7f0701c0b4124fbcdd9caae9156a11108584bad90ed3051f9798ca5726af39c4002d4468d388256be6bd4d8e6967481e600fdacd0f2571c749a622fc3cbb SHA512 c8d1027498d66751af4d842445db10e29c55c3e5ce1dffa1d6487244e1c98ad19eb9188a31165756e5d3adc1d6d334535ebd784db29e468b2eaa2244fc563ffa
-EBUILD python-3.9.17.ebuild 13687 BLAKE2B ebd310d7f38daafe117b0174bc25f738e170aec49ec0cbf522f4f4ee2ab91ac80ce20c5eac2c5c6e853a5fcc004b2719c96d60a6704d50fc7f405334e9ad68b3 SHA512 f281ac933df35e3be51efd88008fa3312d88e692aac05a25241f5a1d5e862f485676dac6ba5b44269e710a445e14c9463ccfdf3330766a36a5abf1bcaa1e9c67
 EBUILD python-3.9.18.ebuild 13687 BLAKE2B ebd310d7f38daafe117b0174bc25f738e170aec49ec0cbf522f4f4ee2ab91ac80ce20c5eac2c5c6e853a5fcc004b2719c96d60a6704d50fc7f405334e9ad68b3 SHA512 f281ac933df35e3be51efd88008fa3312d88e692aac05a25241f5a1d5e862f485676dac6ba5b44269e710a445e14c9463ccfdf3330766a36a5abf1bcaa1e9c67
 MISC metadata.xml 1436 BLAKE2B fd5ebcef153bc74aae02f8930dba67736ce44b1dd23418448e7d5bd22391845f5edf0ba8cdf3f43af9254c68734b95fbac9ee891f09c4584c9272ac4233eede6 SHA512 124a1e743cef7236f7936aa843d3aae739a420b1b6173f02c2ef787745616891142724446320d887aeecb95fac09e3620a9666e8e3e32085d79019fe71ff7da5
diff --git a/dev-lang/python/python-3.10.12.ebuild b/dev-lang/python/python-3.10.12.ebuild
deleted file mode 100644
index 41648fc12055..000000000000
--- a/dev-lang/python/python-3.10.12.ebuild
+++ /dev/null
@@ -1,498 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
-inherit prefix python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm libedit lto
-	+ncurses pgo +readline +sqlite +ssl test tk valgrind +xml
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-lang/python-exec[python_targets_python3_10(-)]
-	dev-libs/libffi:=
-	dev-python/gentoo-common
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	valgrind? ( dev-util/valgrind )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	sys-devel/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-python )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# https://bugs.gentoo.org/850151
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs)
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-	local disable
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			-u-network
-
-			# We use a timeout because of how often we've had hang issues
-			# here. It also matches the default upstream PROFILE_TASK.
-			--timeout 1200
-
-			-x test_gdb
-			-x test_dtrace
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-
-			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
-			# bug #900429
-			-x test_tools
-		)
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with debug assertions)
-		$(use_with lto)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-		$(use_with valgrind)
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	if tc-is-cross-compiler ; then
-		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-		# propagated to sysconfig for built extensions
-		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
-		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
-		local -x CFLAGS= LDFLAGS=
-
-		# We need to build our own Python on CBUILD first, and feed it in.
-		# bug #847910 and bug #864911.
-		local myeconfargs_cbuild=(
-			"${myeconfargs[@]}"
-
-			--libdir="${cbuild_libdir:2}"
-
-			# Avoid needing to load the right libpython.so.
-			--disable-shared
-
-			# As minimal as possible for the mini CBUILD Python
-			# we build just for cross.
-			--without-lto
-			--disable-optimizations
-		)
-
-		# Point the imminent CHOST build to the Python we just
-		# built for CBUILD.
-		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
-
-		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
-		# libdir correctly for cross.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
-			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-		# Avoid as many dependencies as possible for the cross build.
-		cat >> Makefile <<-EOF || die
-			MODULE_NIS=disabled
-			MODULE__DBM=disabled
-			MODULE__GDBM=disabled
-			MODULE__DBM=disabled
-			MODULE__SQLITE3=disabled
-			MODULE__HASHLIB=disabled
-			MODULE__SSL=disabled
-			MODULE__CURSES=disabled
-			MODULE__CURSES_PANEL=disabled
-			MODULE_READLINE=disabled
-			MODULE__TKINTER=disabled
-			MODULE_PYEXPAT=disabled
-			MODULE_ZLIB=disabled
-		EOF
-
-		# Unfortunately, we do have to build this immediately, and
-		# not in src_compile, because CHOST configure for Python
-		# will check the existence of the Python it was pointed to
-		# immediately.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
-		popd &> /dev/null || die
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	hprefixify setup.py
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	# Prevent using distutils bundled by setuptools.
-	# https://bugs.gentoo.org/823728
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-
-		addpredict "/usr/lib/python${PYVER}/site-packages"
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	local test_opts=(
-		-u-network
-		-j "$(makeopts_jobs)"
-
-		# fails
-		-x test_gdb
-	)
-
-	if use sparc ; then
-		# bug #788022
-		test_opts+=(
-			-x test_multiprocessing_fork
-			-x test_multiprocessing_forkserver
-		)
-	fi
-
-	# workaround docutils breaking tests
-	cat > Lib/docutils.py <<-EOF || die
-		raise ImportError("Thou shalt not import!")
-	EOF
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	# workaround https://bugs.gentoo.org/775416
-	addwrite "/usr/lib/python${PYVER}/site-packages"
-
-	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	rm Lib/docutils.py || die
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${libdir}"/ensurepip || die
-	fi
-	if ! use sqlite; then
-		rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-	fi
-
-	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.10.13.ebuild b/dev-lang/python/python-3.10.13.ebuild
index f7d3f6f8dc29..41648fc12055 100644
--- a/dev-lang/python/python-3.10.13.ebuild
+++ b/dev-lang/python/python-3.10.13.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-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"
 IUSE="
 	bluetooth build debug +ensurepip examples gdbm libedit lto
 	+ncurses pgo +readline +sqlite +ssl test tk valgrind +xml
diff --git a/dev-lang/python/python-3.11.4.ebuild b/dev-lang/python/python-3.11.4.ebuild
deleted file mode 100644
index 6ebc482a9a54..000000000000
--- a/dev-lang/python/python-3.11.4.ebuild
+++ /dev/null
@@ -1,527 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
-inherit prefix python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm libedit lto
-	+ncurses pgo +readline +sqlite +ssl test tk valgrind
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-crypt/libb2
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	dev-python/gentoo-common
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
-	valgrind? ( dev-util/valgrind )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	sys-devel/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-python )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-if [[ ${PV} != *_alpha* ]]; then
-	RDEPEND+="
-		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
-	"
-fi
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# https://bugs.gentoo.org/850151
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs)
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			-u-network
-
-			# We use a timeout because of how often we've had hang issues
-			# here. It also matches the default upstream PROFILE_TASK.
-			--timeout 1200
-
-			-x test_gdb
-			-x test_dtrace
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-
-			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
-			# bug #900429
-			-x test_tools
-		)
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-		--with-platlibdir=lib
-		--with-pkg-config=yes
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with debug assertions)
-		$(use_with lto)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-		$(use_with valgrind)
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	if tc-is-cross-compiler ; then
-		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-		# propagated to sysconfig for built extensions
-		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
-		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
-		local -x CFLAGS= LDFLAGS=
-
-		# We need to build our own Python on CBUILD first, and feed it in.
-		# bug #847910
-		local myeconfargs_cbuild=(
-			"${myeconfargs[@]}"
-
-			--libdir="${cbuild_libdir:2}"
-
-			# Avoid needing to load the right libpython.so.
-			--disable-shared
-
-			# As minimal as possible for the mini CBUILD Python
-			# we build just for cross to satisfy --with-build-python.
-			--without-lto
-			--without-readline
-			--disable-optimizations
-		)
-
-		myeconfargs+=(
-			# Point the imminent CHOST build to the Python we just
-			# built for CBUILD.
-			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
-		)
-
-		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
-		# libdir correctly for cross.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
-			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-		# Avoid as many dependencies as possible for the cross build.
-		cat >> Makefile <<-EOF || die
-			MODULE_NIS_STATE=disabled
-			MODULE__DBM_STATE=disabled
-			MODULE__GDBM_STATE=disabled
-			MODULE__DBM_STATE=disabled
-			MODULE__SQLITE3_STATE=disabled
-			MODULE__HASHLIB_STATE=disabled
-			MODULE__SSL_STATE=disabled
-			MODULE__CURSES_STATE=disabled
-			MODULE__CURSES_PANEL_STATE=disabled
-			MODULE_READLINE_STATE=disabled
-			MODULE__TKINTER_STATE=disabled
-			MODULE_PYEXPAT_STATE=disabled
-			MODULE_ZLIB_STATE=disabled
-		EOF
-
-		# Unfortunately, we do have to build this immediately, and
-		# not in src_compile, because CHOST configure for Python
-		# will check the existence of the --with-build-python value
-		# immediately.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
-		popd &> /dev/null || die
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	hprefixify setup.py
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# force-disable modules we don't want built
-	local disable_modules=( NIS )
-	use gdbm || disable_modules+=( _GDBM _DBM )
-	use sqlite || disable_modules+=( _SQLITE3 )
-	use ssl || disable_modules+=( _HASHLIB _SSL )
-	use ncurses || disable_modules+=( _CURSES _CURSES_PANEL )
-	use readline || disable_modules+=( READLINE )
-	use tk || disable_modules+=( _TKINTER )
-
-	local mod
-	for mod in "${disable_modules[@]}"; do
-		echo "MODULE_${mod}_STATE=disabled"
-	done >> Makefile || die
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	# Prevent using distutils bundled by setuptools.
-	# https://bugs.gentoo.org/823728
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-	export PYTHONSTRICTEXTENSIONBUILD=1
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-
-		addpredict "/usr/lib/python${PYVER}/site-packages"
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# this just happens to skip test_support.test_freeze that is broken
-	# without bundled expat
-	# TODO: get a proper skip for it upstream
-	local -x LOGNAME=buildbot
-
-	local test_opts=(
-		-u-network
-		-j "$(makeopts_jobs)"
-
-		# fails
-		-x test_gdb
-	)
-
-	if use sparc ; then
-		# bug #788022
-		test_opts+=(
-			-x test_multiprocessing_fork
-			-x test_multiprocessing_forkserver
-		)
-	fi
-
-	# workaround docutils breaking tests
-	cat > Lib/docutils.py <<-EOF || die
-		raise ImportError("Thou shalt not import!")
-	EOF
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	# workaround https://bugs.gentoo.org/775416
-	addwrite "/usr/lib/python${PYVER}/site-packages"
-
-	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	rm Lib/docutils.py || die
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	# -j1 hack for now for bug #843458
-	emake -j1 DESTDIR="${D}" altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${libdir}"/ensurepip || die
-	fi
-	if ! use sqlite; then
-		rm -r "${libdir}/"sqlite3 || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-	fi
-
-	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 3.11.0_beta4-r2; then
-			ewarn "Python 3.11.0b4 has changed its module ABI.  The .pyc files"
-			ewarn "installed previously are no longer valid and will be regenerated"
-			ewarn "(or ignored) on the next import.  This may cause sandbox failures"
-			ewarn "when installing some packages and checksum mismatches when removing"
-			ewarn "old versions.  To actively prevent this, rebuild all packages"
-			ewarn "installing Python 3.11 modules, e.g. using:"
-			ewarn
-			ewarn "  emerge -1v /usr/lib/python3.11/site-packages"
-		fi
-	done
-}
diff --git a/dev-lang/python/python-3.11.5.ebuild b/dev-lang/python/python-3.11.5.ebuild
index 2ca72557b5a6..6ebc482a9a54 100644
--- a/dev-lang/python/python-3.11.5.ebuild
+++ b/dev-lang/python/python-3.11.5.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-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"
 IUSE="
 	bluetooth build debug +ensurepip examples gdbm libedit lto
 	+ncurses pgo +readline +sqlite +ssl test tk valgrind
diff --git a/dev-lang/python/python-3.12.0_beta3.ebuild b/dev-lang/python/python-3.12.0_beta3.ebuild
deleted file mode 100644
index 8c769c87e1b7..000000000000
--- a/dev-lang/python/python-3.12.0_beta3.ebuild
+++ /dev/null
@@ -1,526 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
-inherit python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_beta/b}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm libedit lto
-	+ncurses pgo +readline +sqlite +ssl test tk valgrind
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-crypt/libb2
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	dev-python/gentoo-common
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-pip )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? (
-		app-arch/xz-utils[extra-filters(+)]
-		dev-python/ensurepip-pip
-		dev-python/ensurepip-setuptools
-		dev-python/ensurepip-wheel
-	)
-	valgrind? ( dev-util/valgrind )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	sys-devel/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-if [[ ${PV} != *_alpha* ]]; then
-	RDEPEND+="
-		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
-	"
-fi
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	# TODO: Makefile has annoying deps on expat headers
-	#rm -r Modules/expat || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			-u-network
-
-			# We use a timeout because of how often we've had hang issues
-			# here. It also matches the default upstream PROFILE_TASK.
-			--timeout 1200
-
-			-x test_gdb
-			-x test_dtrace
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-
-			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
-			# bug #900429
-			-x test_tools
-		)
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-platlibdir=lib
-		--with-pkg-config=yes
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with debug assertions)
-		$(use_with lto)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-		$(use_with valgrind)
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	if tc-is-cross-compiler ; then
-		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-		# propagated to sysconfig for built extensions
-		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
-		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
-		local -x CFLAGS= LDFLAGS=
-
-		# We need to build our own Python on CBUILD first, and feed it in.
-		# bug #847910
-		local myeconfargs_cbuild=(
-			"${myeconfargs[@]}"
-
-			--libdir="${cbuild_libdir:2}"
-
-			# Avoid needing to load the right libpython.so.
-			--disable-shared
-
-			# As minimal as possible for the mini CBUILD Python
-			# we build just for cross to satisfy --with-build-python.
-			--without-lto
-			--without-readline
-			--disable-optimizations
-		)
-
-		myeconfargs+=(
-			# Point the imminent CHOST build to the Python we just
-			# built for CBUILD.
-			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
-		)
-
-		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
-		# libdir correctly for cross.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
-			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-		# Avoid as many dependencies as possible for the cross build.
-		cat >> Makefile <<-EOF || die
-			MODULE_NIS_STATE=disabled
-			MODULE__DBM_STATE=disabled
-			MODULE__GDBM_STATE=disabled
-			MODULE__DBM_STATE=disabled
-			MODULE__SQLITE3_STATE=disabled
-			MODULE__HASHLIB_STATE=disabled
-			MODULE__SSL_STATE=disabled
-			MODULE__CURSES_STATE=disabled
-			MODULE__CURSES_PANEL_STATE=disabled
-			MODULE_READLINE_STATE=disabled
-			MODULE__TKINTER_STATE=disabled
-			MODULE_PYEXPAT_STATE=disabled
-			MODULE_ZLIB_STATE=disabled
-		EOF
-
-		# Unfortunately, we do have to build this immediately, and
-		# not in src_compile, because CHOST configure for Python
-		# will check the existence of the --with-build-python value
-		# immediately.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
-		popd &> /dev/null || die
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# force-disable modules we don't want built
-	local disable_modules=( NIS )
-	use gdbm || disable_modules+=( _GDBM _DBM )
-	use sqlite || disable_modules+=( _SQLITE3 )
-	use ssl || disable_modules+=( _HASHLIB _SSL )
-	use ncurses || disable_modules+=( _CURSES _CURSES_PANEL )
-	use readline || disable_modules+=( READLINE )
-	use tk || disable_modules+=( _TKINTER )
-
-	local mod
-	for mod in "${disable_modules[@]}"; do
-		echo "MODULE_${mod}_STATE=disabled"
-	done >> Makefile || die
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	export PYTHONSTRICTEXTENSIONBUILD=1
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-
-		addpredict "/usr/lib/python${PYVER}/site-packages"
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# this just happens to skip test_support.test_freeze that is broken
-	# without bundled expat
-	# TODO: get a proper skip for it upstream
-	local -x LOGNAME=buildbot
-
-	local test_opts=(
-		-u-network
-		-j "$(makeopts_jobs)"
-
-		# fails
-		-x test_gdb
-	)
-
-	if use sparc ; then
-		# bug #788022
-		test_opts+=(
-			-x test_multiprocessing_fork
-			-x test_multiprocessing_forkserver
-		)
-	fi
-
-	# workaround docutils breaking tests
-	cat > Lib/docutils.py <<-EOF || die
-		raise ImportError("Thou shalt not import!")
-	EOF
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	# workaround https://bugs.gentoo.org/775416
-	addwrite "/usr/lib/python${PYVER}/site-packages"
-
-	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	rm Lib/docutils.py || die
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	# the Makefile rules are broken
-	# https://github.com/python/cpython/issues/100221
-	mkdir -p "${libdir}"/lib-dynload || die
-
-	# -j1 hack for now for bug #843458
-	emake -j1 DESTDIR="${D}" altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${libdir}"/ensurepip || die
-	fi
-	if ! use sqlite; then
-		rm -r "${libdir}/"sqlite3 || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-	fi
-
-	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 3.11.0_beta4-r2; then
-			ewarn "Python 3.11.0b4 has changed its module ABI.  The .pyc files"
-			ewarn "installed previously are no longer valid and will be regenerated"
-			ewarn "(or ignored) on the next import.  This may cause sandbox failures"
-			ewarn "when installing some packages and checksum mismatches when removing"
-			ewarn "old versions.  To actively prevent this, rebuild all packages"
-			ewarn "installing Python 3.11 modules, e.g. using:"
-			ewarn
-			ewarn "  emerge -1v /usr/lib/python3.11/site-packages"
-		fi
-	done
-}
diff --git a/dev-lang/python/python-3.12.0_beta4.ebuild b/dev-lang/python/python-3.12.0_beta4.ebuild
deleted file mode 100644
index 8c769c87e1b7..000000000000
--- a/dev-lang/python/python-3.12.0_beta4.ebuild
+++ /dev/null
@@ -1,526 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
-inherit python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_beta/b}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm libedit lto
-	+ncurses pgo +readline +sqlite +ssl test tk valgrind
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-crypt/libb2
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	dev-python/gentoo-common
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-pip )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? (
-		app-arch/xz-utils[extra-filters(+)]
-		dev-python/ensurepip-pip
-		dev-python/ensurepip-setuptools
-		dev-python/ensurepip-wheel
-	)
-	valgrind? ( dev-util/valgrind )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	sys-devel/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-if [[ ${PV} != *_alpha* ]]; then
-	RDEPEND+="
-		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
-	"
-fi
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	# TODO: Makefile has annoying deps on expat headers
-	#rm -r Modules/expat || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			-u-network
-
-			# We use a timeout because of how often we've had hang issues
-			# here. It also matches the default upstream PROFILE_TASK.
-			--timeout 1200
-
-			-x test_gdb
-			-x test_dtrace
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-
-			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
-			# bug #900429
-			-x test_tools
-		)
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-platlibdir=lib
-		--with-pkg-config=yes
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with debug assertions)
-		$(use_with lto)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-		$(use_with valgrind)
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	if tc-is-cross-compiler ; then
-		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-		# propagated to sysconfig for built extensions
-		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
-		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
-		local -x CFLAGS= LDFLAGS=
-
-		# We need to build our own Python on CBUILD first, and feed it in.
-		# bug #847910
-		local myeconfargs_cbuild=(
-			"${myeconfargs[@]}"
-
-			--libdir="${cbuild_libdir:2}"
-
-			# Avoid needing to load the right libpython.so.
-			--disable-shared
-
-			# As minimal as possible for the mini CBUILD Python
-			# we build just for cross to satisfy --with-build-python.
-			--without-lto
-			--without-readline
-			--disable-optimizations
-		)
-
-		myeconfargs+=(
-			# Point the imminent CHOST build to the Python we just
-			# built for CBUILD.
-			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
-		)
-
-		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
-		# libdir correctly for cross.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
-			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-		# Avoid as many dependencies as possible for the cross build.
-		cat >> Makefile <<-EOF || die
-			MODULE_NIS_STATE=disabled
-			MODULE__DBM_STATE=disabled
-			MODULE__GDBM_STATE=disabled
-			MODULE__DBM_STATE=disabled
-			MODULE__SQLITE3_STATE=disabled
-			MODULE__HASHLIB_STATE=disabled
-			MODULE__SSL_STATE=disabled
-			MODULE__CURSES_STATE=disabled
-			MODULE__CURSES_PANEL_STATE=disabled
-			MODULE_READLINE_STATE=disabled
-			MODULE__TKINTER_STATE=disabled
-			MODULE_PYEXPAT_STATE=disabled
-			MODULE_ZLIB_STATE=disabled
-		EOF
-
-		# Unfortunately, we do have to build this immediately, and
-		# not in src_compile, because CHOST configure for Python
-		# will check the existence of the --with-build-python value
-		# immediately.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
-		popd &> /dev/null || die
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# force-disable modules we don't want built
-	local disable_modules=( NIS )
-	use gdbm || disable_modules+=( _GDBM _DBM )
-	use sqlite || disable_modules+=( _SQLITE3 )
-	use ssl || disable_modules+=( _HASHLIB _SSL )
-	use ncurses || disable_modules+=( _CURSES _CURSES_PANEL )
-	use readline || disable_modules+=( READLINE )
-	use tk || disable_modules+=( _TKINTER )
-
-	local mod
-	for mod in "${disable_modules[@]}"; do
-		echo "MODULE_${mod}_STATE=disabled"
-	done >> Makefile || die
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	export PYTHONSTRICTEXTENSIONBUILD=1
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-
-		addpredict "/usr/lib/python${PYVER}/site-packages"
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# this just happens to skip test_support.test_freeze that is broken
-	# without bundled expat
-	# TODO: get a proper skip for it upstream
-	local -x LOGNAME=buildbot
-
-	local test_opts=(
-		-u-network
-		-j "$(makeopts_jobs)"
-
-		# fails
-		-x test_gdb
-	)
-
-	if use sparc ; then
-		# bug #788022
-		test_opts+=(
-			-x test_multiprocessing_fork
-			-x test_multiprocessing_forkserver
-		)
-	fi
-
-	# workaround docutils breaking tests
-	cat > Lib/docutils.py <<-EOF || die
-		raise ImportError("Thou shalt not import!")
-	EOF
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	# workaround https://bugs.gentoo.org/775416
-	addwrite "/usr/lib/python${PYVER}/site-packages"
-
-	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	rm Lib/docutils.py || die
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	# the Makefile rules are broken
-	# https://github.com/python/cpython/issues/100221
-	mkdir -p "${libdir}"/lib-dynload || die
-
-	# -j1 hack for now for bug #843458
-	emake -j1 DESTDIR="${D}" altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${libdir}"/ensurepip || die
-	fi
-	if ! use sqlite; then
-		rm -r "${libdir}/"sqlite3 || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-	fi
-
-	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 3.11.0_beta4-r2; then
-			ewarn "Python 3.11.0b4 has changed its module ABI.  The .pyc files"
-			ewarn "installed previously are no longer valid and will be regenerated"
-			ewarn "(or ignored) on the next import.  This may cause sandbox failures"
-			ewarn "when installing some packages and checksum mismatches when removing"
-			ewarn "old versions.  To actively prevent this, rebuild all packages"
-			ewarn "installing Python 3.11 modules, e.g. using:"
-			ewarn
-			ewarn "  emerge -1v /usr/lib/python3.11/site-packages"
-		fi
-	done
-}
diff --git a/dev-lang/python/python-3.12.0_beta4_p1.ebuild b/dev-lang/python/python-3.12.0_beta4_p1.ebuild
deleted file mode 100644
index 8c769c87e1b7..000000000000
--- a/dev-lang/python/python-3.12.0_beta4_p1.ebuild
+++ /dev/null
@@ -1,526 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
-inherit python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_beta/b}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm libedit lto
-	+ncurses pgo +readline +sqlite +ssl test tk valgrind
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-crypt/libb2
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	dev-python/gentoo-common
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-pip )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? (
-		app-arch/xz-utils[extra-filters(+)]
-		dev-python/ensurepip-pip
-		dev-python/ensurepip-setuptools
-		dev-python/ensurepip-wheel
-	)
-	valgrind? ( dev-util/valgrind )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	sys-devel/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-if [[ ${PV} != *_alpha* ]]; then
-	RDEPEND+="
-		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
-	"
-fi
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	# TODO: Makefile has annoying deps on expat headers
-	#rm -r Modules/expat || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			-u-network
-
-			# We use a timeout because of how often we've had hang issues
-			# here. It also matches the default upstream PROFILE_TASK.
-			--timeout 1200
-
-			-x test_gdb
-			-x test_dtrace
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-
-			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
-			# bug #900429
-			-x test_tools
-		)
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-platlibdir=lib
-		--with-pkg-config=yes
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with debug assertions)
-		$(use_with lto)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-		$(use_with valgrind)
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	if tc-is-cross-compiler ; then
-		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-		# propagated to sysconfig for built extensions
-		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
-		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
-		local -x CFLAGS= LDFLAGS=
-
-		# We need to build our own Python on CBUILD first, and feed it in.
-		# bug #847910
-		local myeconfargs_cbuild=(
-			"${myeconfargs[@]}"
-
-			--libdir="${cbuild_libdir:2}"
-
-			# Avoid needing to load the right libpython.so.
-			--disable-shared
-
-			# As minimal as possible for the mini CBUILD Python
-			# we build just for cross to satisfy --with-build-python.
-			--without-lto
-			--without-readline
-			--disable-optimizations
-		)
-
-		myeconfargs+=(
-			# Point the imminent CHOST build to the Python we just
-			# built for CBUILD.
-			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
-		)
-
-		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
-		# libdir correctly for cross.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
-			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-		# Avoid as many dependencies as possible for the cross build.
-		cat >> Makefile <<-EOF || die
-			MODULE_NIS_STATE=disabled
-			MODULE__DBM_STATE=disabled
-			MODULE__GDBM_STATE=disabled
-			MODULE__DBM_STATE=disabled
-			MODULE__SQLITE3_STATE=disabled
-			MODULE__HASHLIB_STATE=disabled
-			MODULE__SSL_STATE=disabled
-			MODULE__CURSES_STATE=disabled
-			MODULE__CURSES_PANEL_STATE=disabled
-			MODULE_READLINE_STATE=disabled
-			MODULE__TKINTER_STATE=disabled
-			MODULE_PYEXPAT_STATE=disabled
-			MODULE_ZLIB_STATE=disabled
-		EOF
-
-		# Unfortunately, we do have to build this immediately, and
-		# not in src_compile, because CHOST configure for Python
-		# will check the existence of the --with-build-python value
-		# immediately.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
-		popd &> /dev/null || die
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# force-disable modules we don't want built
-	local disable_modules=( NIS )
-	use gdbm || disable_modules+=( _GDBM _DBM )
-	use sqlite || disable_modules+=( _SQLITE3 )
-	use ssl || disable_modules+=( _HASHLIB _SSL )
-	use ncurses || disable_modules+=( _CURSES _CURSES_PANEL )
-	use readline || disable_modules+=( READLINE )
-	use tk || disable_modules+=( _TKINTER )
-
-	local mod
-	for mod in "${disable_modules[@]}"; do
-		echo "MODULE_${mod}_STATE=disabled"
-	done >> Makefile || die
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	export PYTHONSTRICTEXTENSIONBUILD=1
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-
-		addpredict "/usr/lib/python${PYVER}/site-packages"
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# this just happens to skip test_support.test_freeze that is broken
-	# without bundled expat
-	# TODO: get a proper skip for it upstream
-	local -x LOGNAME=buildbot
-
-	local test_opts=(
-		-u-network
-		-j "$(makeopts_jobs)"
-
-		# fails
-		-x test_gdb
-	)
-
-	if use sparc ; then
-		# bug #788022
-		test_opts+=(
-			-x test_multiprocessing_fork
-			-x test_multiprocessing_forkserver
-		)
-	fi
-
-	# workaround docutils breaking tests
-	cat > Lib/docutils.py <<-EOF || die
-		raise ImportError("Thou shalt not import!")
-	EOF
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	# workaround https://bugs.gentoo.org/775416
-	addwrite "/usr/lib/python${PYVER}/site-packages"
-
-	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	rm Lib/docutils.py || die
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	# the Makefile rules are broken
-	# https://github.com/python/cpython/issues/100221
-	mkdir -p "${libdir}"/lib-dynload || die
-
-	# -j1 hack for now for bug #843458
-	emake -j1 DESTDIR="${D}" altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${libdir}"/ensurepip || die
-	fi
-	if ! use sqlite; then
-		rm -r "${libdir}/"sqlite3 || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-	fi
-
-	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 3.11.0_beta4-r2; then
-			ewarn "Python 3.11.0b4 has changed its module ABI.  The .pyc files"
-			ewarn "installed previously are no longer valid and will be regenerated"
-			ewarn "(or ignored) on the next import.  This may cause sandbox failures"
-			ewarn "when installing some packages and checksum mismatches when removing"
-			ewarn "old versions.  To actively prevent this, rebuild all packages"
-			ewarn "installing Python 3.11 modules, e.g. using:"
-			ewarn
-			ewarn "  emerge -1v /usr/lib/python3.11/site-packages"
-		fi
-	done
-}
diff --git a/dev-lang/python/python-3.12.0_rc1.ebuild b/dev-lang/python/python-3.12.0_rc1.ebuild
deleted file mode 100644
index d3a193505529..000000000000
--- a/dev-lang/python/python-3.12.0_rc1.ebuild
+++ /dev/null
@@ -1,526 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
-inherit python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm libedit lto
-	+ncurses pgo +readline +sqlite +ssl test tk valgrind
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-crypt/libb2
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	dev-python/gentoo-common
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-pip )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? (
-		app-arch/xz-utils[extra-filters(+)]
-		dev-python/ensurepip-pip
-		dev-python/ensurepip-setuptools
-		dev-python/ensurepip-wheel
-	)
-	valgrind? ( dev-util/valgrind )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	sys-devel/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-if [[ ${PV} != *_alpha* ]]; then
-	RDEPEND+="
-		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
-	"
-fi
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	# TODO: Makefile has annoying deps on expat headers
-	#rm -r Modules/expat || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			-u-network
-
-			# We use a timeout because of how often we've had hang issues
-			# here. It also matches the default upstream PROFILE_TASK.
-			--timeout 1200
-
-			-x test_gdb
-			-x test_dtrace
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-
-			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
-			# bug #900429
-			-x test_tools
-		)
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-platlibdir=lib
-		--with-pkg-config=yes
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with debug assertions)
-		$(use_with lto)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-		$(use_with valgrind)
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	if tc-is-cross-compiler ; then
-		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-		# propagated to sysconfig for built extensions
-		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
-		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
-		local -x CFLAGS= LDFLAGS=
-
-		# We need to build our own Python on CBUILD first, and feed it in.
-		# bug #847910
-		local myeconfargs_cbuild=(
-			"${myeconfargs[@]}"
-
-			--libdir="${cbuild_libdir:2}"
-
-			# Avoid needing to load the right libpython.so.
-			--disable-shared
-
-			# As minimal as possible for the mini CBUILD Python
-			# we build just for cross to satisfy --with-build-python.
-			--without-lto
-			--without-readline
-			--disable-optimizations
-		)
-
-		myeconfargs+=(
-			# Point the imminent CHOST build to the Python we just
-			# built for CBUILD.
-			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
-		)
-
-		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
-		# libdir correctly for cross.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
-			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-		# Avoid as many dependencies as possible for the cross build.
-		cat >> Makefile <<-EOF || die
-			MODULE_NIS_STATE=disabled
-			MODULE__DBM_STATE=disabled
-			MODULE__GDBM_STATE=disabled
-			MODULE__DBM_STATE=disabled
-			MODULE__SQLITE3_STATE=disabled
-			MODULE__HASHLIB_STATE=disabled
-			MODULE__SSL_STATE=disabled
-			MODULE__CURSES_STATE=disabled
-			MODULE__CURSES_PANEL_STATE=disabled
-			MODULE_READLINE_STATE=disabled
-			MODULE__TKINTER_STATE=disabled
-			MODULE_PYEXPAT_STATE=disabled
-			MODULE_ZLIB_STATE=disabled
-		EOF
-
-		# Unfortunately, we do have to build this immediately, and
-		# not in src_compile, because CHOST configure for Python
-		# will check the existence of the --with-build-python value
-		# immediately.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
-		popd &> /dev/null || die
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# force-disable modules we don't want built
-	local disable_modules=( NIS )
-	use gdbm || disable_modules+=( _GDBM _DBM )
-	use sqlite || disable_modules+=( _SQLITE3 )
-	use ssl || disable_modules+=( _HASHLIB _SSL )
-	use ncurses || disable_modules+=( _CURSES _CURSES_PANEL )
-	use readline || disable_modules+=( READLINE )
-	use tk || disable_modules+=( _TKINTER )
-
-	local mod
-	for mod in "${disable_modules[@]}"; do
-		echo "MODULE_${mod}_STATE=disabled"
-	done >> Makefile || die
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	export PYTHONSTRICTEXTENSIONBUILD=1
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-
-		addpredict "/usr/lib/python${PYVER}/site-packages"
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# this just happens to skip test_support.test_freeze that is broken
-	# without bundled expat
-	# TODO: get a proper skip for it upstream
-	local -x LOGNAME=buildbot
-
-	local test_opts=(
-		-u-network
-		-j "$(makeopts_jobs)"
-
-		# fails
-		-x test_gdb
-	)
-
-	if use sparc ; then
-		# bug #788022
-		test_opts+=(
-			-x test_multiprocessing_fork
-			-x test_multiprocessing_forkserver
-		)
-	fi
-
-	# workaround docutils breaking tests
-	cat > Lib/docutils.py <<-EOF || die
-		raise ImportError("Thou shalt not import!")
-	EOF
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	# workaround https://bugs.gentoo.org/775416
-	addwrite "/usr/lib/python${PYVER}/site-packages"
-
-	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	rm Lib/docutils.py || die
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	# the Makefile rules are broken
-	# https://github.com/python/cpython/issues/100221
-	mkdir -p "${libdir}"/lib-dynload || die
-
-	# -j1 hack for now for bug #843458
-	emake -j1 DESTDIR="${D}" altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${libdir}"/ensurepip || die
-	fi
-	if ! use sqlite; then
-		rm -r "${libdir}/"sqlite3 || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-	fi
-
-	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 3.11.0_beta4-r2; then
-			ewarn "Python 3.11.0b4 has changed its module ABI.  The .pyc files"
-			ewarn "installed previously are no longer valid and will be regenerated"
-			ewarn "(or ignored) on the next import.  This may cause sandbox failures"
-			ewarn "when installing some packages and checksum mismatches when removing"
-			ewarn "old versions.  To actively prevent this, rebuild all packages"
-			ewarn "installing Python 3.11 modules, e.g. using:"
-			ewarn
-			ewarn "  emerge -1v /usr/lib/python3.11/site-packages"
-		fi
-	done
-}
diff --git a/dev-lang/python/python-3.12.0_rc1_p1.ebuild b/dev-lang/python/python-3.12.0_rc1_p1.ebuild
deleted file mode 100644
index d3a193505529..000000000000
--- a/dev-lang/python/python-3.12.0_rc1_p1.ebuild
+++ /dev/null
@@ -1,526 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
-inherit python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm libedit lto
-	+ncurses pgo +readline +sqlite +ssl test tk valgrind
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-crypt/libb2
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	dev-python/gentoo-common
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-pip )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? (
-		app-arch/xz-utils[extra-filters(+)]
-		dev-python/ensurepip-pip
-		dev-python/ensurepip-setuptools
-		dev-python/ensurepip-wheel
-	)
-	valgrind? ( dev-util/valgrind )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	sys-devel/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-if [[ ${PV} != *_alpha* ]]; then
-	RDEPEND+="
-		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
-	"
-fi
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	# TODO: Makefile has annoying deps on expat headers
-	#rm -r Modules/expat || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			-u-network
-
-			# We use a timeout because of how often we've had hang issues
-			# here. It also matches the default upstream PROFILE_TASK.
-			--timeout 1200
-
-			-x test_gdb
-			-x test_dtrace
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-
-			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
-			# bug #900429
-			-x test_tools
-		)
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-platlibdir=lib
-		--with-pkg-config=yes
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with debug assertions)
-		$(use_with lto)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-		$(use_with valgrind)
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	if tc-is-cross-compiler ; then
-		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-		# propagated to sysconfig for built extensions
-		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
-		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
-		local -x CFLAGS= LDFLAGS=
-
-		# We need to build our own Python on CBUILD first, and feed it in.
-		# bug #847910
-		local myeconfargs_cbuild=(
-			"${myeconfargs[@]}"
-
-			--libdir="${cbuild_libdir:2}"
-
-			# Avoid needing to load the right libpython.so.
-			--disable-shared
-
-			# As minimal as possible for the mini CBUILD Python
-			# we build just for cross to satisfy --with-build-python.
-			--without-lto
-			--without-readline
-			--disable-optimizations
-		)
-
-		myeconfargs+=(
-			# Point the imminent CHOST build to the Python we just
-			# built for CBUILD.
-			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
-		)
-
-		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
-		# libdir correctly for cross.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
-			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-		# Avoid as many dependencies as possible for the cross build.
-		cat >> Makefile <<-EOF || die
-			MODULE_NIS_STATE=disabled
-			MODULE__DBM_STATE=disabled
-			MODULE__GDBM_STATE=disabled
-			MODULE__DBM_STATE=disabled
-			MODULE__SQLITE3_STATE=disabled
-			MODULE__HASHLIB_STATE=disabled
-			MODULE__SSL_STATE=disabled
-			MODULE__CURSES_STATE=disabled
-			MODULE__CURSES_PANEL_STATE=disabled
-			MODULE_READLINE_STATE=disabled
-			MODULE__TKINTER_STATE=disabled
-			MODULE_PYEXPAT_STATE=disabled
-			MODULE_ZLIB_STATE=disabled
-		EOF
-
-		# Unfortunately, we do have to build this immediately, and
-		# not in src_compile, because CHOST configure for Python
-		# will check the existence of the --with-build-python value
-		# immediately.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
-		popd &> /dev/null || die
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# force-disable modules we don't want built
-	local disable_modules=( NIS )
-	use gdbm || disable_modules+=( _GDBM _DBM )
-	use sqlite || disable_modules+=( _SQLITE3 )
-	use ssl || disable_modules+=( _HASHLIB _SSL )
-	use ncurses || disable_modules+=( _CURSES _CURSES_PANEL )
-	use readline || disable_modules+=( READLINE )
-	use tk || disable_modules+=( _TKINTER )
-
-	local mod
-	for mod in "${disable_modules[@]}"; do
-		echo "MODULE_${mod}_STATE=disabled"
-	done >> Makefile || die
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	export PYTHONSTRICTEXTENSIONBUILD=1
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-
-		addpredict "/usr/lib/python${PYVER}/site-packages"
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# this just happens to skip test_support.test_freeze that is broken
-	# without bundled expat
-	# TODO: get a proper skip for it upstream
-	local -x LOGNAME=buildbot
-
-	local test_opts=(
-		-u-network
-		-j "$(makeopts_jobs)"
-
-		# fails
-		-x test_gdb
-	)
-
-	if use sparc ; then
-		# bug #788022
-		test_opts+=(
-			-x test_multiprocessing_fork
-			-x test_multiprocessing_forkserver
-		)
-	fi
-
-	# workaround docutils breaking tests
-	cat > Lib/docutils.py <<-EOF || die
-		raise ImportError("Thou shalt not import!")
-	EOF
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	# workaround https://bugs.gentoo.org/775416
-	addwrite "/usr/lib/python${PYVER}/site-packages"
-
-	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	rm Lib/docutils.py || die
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	# the Makefile rules are broken
-	# https://github.com/python/cpython/issues/100221
-	mkdir -p "${libdir}"/lib-dynload || die
-
-	# -j1 hack for now for bug #843458
-	emake -j1 DESTDIR="${D}" altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${libdir}"/ensurepip || die
-	fi
-	if ! use sqlite; then
-		rm -r "${libdir}/"sqlite3 || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-	fi
-
-	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 3.11.0_beta4-r2; then
-			ewarn "Python 3.11.0b4 has changed its module ABI.  The .pyc files"
-			ewarn "installed previously are no longer valid and will be regenerated"
-			ewarn "(or ignored) on the next import.  This may cause sandbox failures"
-			ewarn "when installing some packages and checksum mismatches when removing"
-			ewarn "old versions.  To actively prevent this, rebuild all packages"
-			ewarn "installing Python 3.11 modules, e.g. using:"
-			ewarn
-			ewarn "  emerge -1v /usr/lib/python3.11/site-packages"
-		fi
-	done
-}
diff --git a/dev-lang/python/python-3.12.0_rc1_p3.ebuild b/dev-lang/python/python-3.12.0_rc1_p3.ebuild
deleted file mode 100644
index d3a193505529..000000000000
--- a/dev-lang/python/python-3.12.0_rc1_p3.ebuild
+++ /dev/null
@@ -1,526 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
-inherit python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm libedit lto
-	+ncurses pgo +readline +sqlite +ssl test tk valgrind
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-crypt/libb2
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	dev-python/gentoo-common
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-pip )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? (
-		app-arch/xz-utils[extra-filters(+)]
-		dev-python/ensurepip-pip
-		dev-python/ensurepip-setuptools
-		dev-python/ensurepip-wheel
-	)
-	valgrind? ( dev-util/valgrind )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	sys-devel/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-if [[ ${PV} != *_alpha* ]]; then
-	RDEPEND+="
-		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
-	"
-fi
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	# TODO: Makefile has annoying deps on expat headers
-	#rm -r Modules/expat || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			-u-network
-
-			# We use a timeout because of how often we've had hang issues
-			# here. It also matches the default upstream PROFILE_TASK.
-			--timeout 1200
-
-			-x test_gdb
-			-x test_dtrace
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-
-			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
-			# bug #900429
-			-x test_tools
-		)
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-platlibdir=lib
-		--with-pkg-config=yes
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with debug assertions)
-		$(use_with lto)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-		$(use_with valgrind)
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	if tc-is-cross-compiler ; then
-		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-		# propagated to sysconfig for built extensions
-		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
-		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
-		local -x CFLAGS= LDFLAGS=
-
-		# We need to build our own Python on CBUILD first, and feed it in.
-		# bug #847910
-		local myeconfargs_cbuild=(
-			"${myeconfargs[@]}"
-
-			--libdir="${cbuild_libdir:2}"
-
-			# Avoid needing to load the right libpython.so.
-			--disable-shared
-
-			# As minimal as possible for the mini CBUILD Python
-			# we build just for cross to satisfy --with-build-python.
-			--without-lto
-			--without-readline
-			--disable-optimizations
-		)
-
-		myeconfargs+=(
-			# Point the imminent CHOST build to the Python we just
-			# built for CBUILD.
-			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
-		)
-
-		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
-		# libdir correctly for cross.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
-			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-		# Avoid as many dependencies as possible for the cross build.
-		cat >> Makefile <<-EOF || die
-			MODULE_NIS_STATE=disabled
-			MODULE__DBM_STATE=disabled
-			MODULE__GDBM_STATE=disabled
-			MODULE__DBM_STATE=disabled
-			MODULE__SQLITE3_STATE=disabled
-			MODULE__HASHLIB_STATE=disabled
-			MODULE__SSL_STATE=disabled
-			MODULE__CURSES_STATE=disabled
-			MODULE__CURSES_PANEL_STATE=disabled
-			MODULE_READLINE_STATE=disabled
-			MODULE__TKINTER_STATE=disabled
-			MODULE_PYEXPAT_STATE=disabled
-			MODULE_ZLIB_STATE=disabled
-		EOF
-
-		# Unfortunately, we do have to build this immediately, and
-		# not in src_compile, because CHOST configure for Python
-		# will check the existence of the --with-build-python value
-		# immediately.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
-		popd &> /dev/null || die
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# force-disable modules we don't want built
-	local disable_modules=( NIS )
-	use gdbm || disable_modules+=( _GDBM _DBM )
-	use sqlite || disable_modules+=( _SQLITE3 )
-	use ssl || disable_modules+=( _HASHLIB _SSL )
-	use ncurses || disable_modules+=( _CURSES _CURSES_PANEL )
-	use readline || disable_modules+=( READLINE )
-	use tk || disable_modules+=( _TKINTER )
-
-	local mod
-	for mod in "${disable_modules[@]}"; do
-		echo "MODULE_${mod}_STATE=disabled"
-	done >> Makefile || die
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	export PYTHONSTRICTEXTENSIONBUILD=1
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-
-		addpredict "/usr/lib/python${PYVER}/site-packages"
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# this just happens to skip test_support.test_freeze that is broken
-	# without bundled expat
-	# TODO: get a proper skip for it upstream
-	local -x LOGNAME=buildbot
-
-	local test_opts=(
-		-u-network
-		-j "$(makeopts_jobs)"
-
-		# fails
-		-x test_gdb
-	)
-
-	if use sparc ; then
-		# bug #788022
-		test_opts+=(
-			-x test_multiprocessing_fork
-			-x test_multiprocessing_forkserver
-		)
-	fi
-
-	# workaround docutils breaking tests
-	cat > Lib/docutils.py <<-EOF || die
-		raise ImportError("Thou shalt not import!")
-	EOF
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	# workaround https://bugs.gentoo.org/775416
-	addwrite "/usr/lib/python${PYVER}/site-packages"
-
-	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	rm Lib/docutils.py || die
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	# the Makefile rules are broken
-	# https://github.com/python/cpython/issues/100221
-	mkdir -p "${libdir}"/lib-dynload || die
-
-	# -j1 hack for now for bug #843458
-	emake -j1 DESTDIR="${D}" altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${libdir}"/ensurepip || die
-	fi
-	if ! use sqlite; then
-		rm -r "${libdir}/"sqlite3 || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-	fi
-
-	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 3.11.0_beta4-r2; then
-			ewarn "Python 3.11.0b4 has changed its module ABI.  The .pyc files"
-			ewarn "installed previously are no longer valid and will be regenerated"
-			ewarn "(or ignored) on the next import.  This may cause sandbox failures"
-			ewarn "when installing some packages and checksum mismatches when removing"
-			ewarn "old versions.  To actively prevent this, rebuild all packages"
-			ewarn "installing Python 3.11 modules, e.g. using:"
-			ewarn
-			ewarn "  emerge -1v /usr/lib/python3.11/site-packages"
-		fi
-	done
-}
diff --git a/dev-lang/python/python-3.12.0_rc1_p4.ebuild b/dev-lang/python/python-3.12.0_rc1_p4.ebuild
deleted file mode 100644
index d3a193505529..000000000000
--- a/dev-lang/python/python-3.12.0_rc1_p4.ebuild
+++ /dev/null
@@ -1,526 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
-inherit python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm libedit lto
-	+ncurses pgo +readline +sqlite +ssl test tk valgrind
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-crypt/libb2
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	dev-python/gentoo-common
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-pip )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? (
-		app-arch/xz-utils[extra-filters(+)]
-		dev-python/ensurepip-pip
-		dev-python/ensurepip-setuptools
-		dev-python/ensurepip-wheel
-	)
-	valgrind? ( dev-util/valgrind )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	sys-devel/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-if [[ ${PV} != *_alpha* ]]; then
-	RDEPEND+="
-		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
-	"
-fi
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	# TODO: Makefile has annoying deps on expat headers
-	#rm -r Modules/expat || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			-u-network
-
-			# We use a timeout because of how often we've had hang issues
-			# here. It also matches the default upstream PROFILE_TASK.
-			--timeout 1200
-
-			-x test_gdb
-			-x test_dtrace
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-
-			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
-			# bug #900429
-			-x test_tools
-		)
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-platlibdir=lib
-		--with-pkg-config=yes
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with debug assertions)
-		$(use_with lto)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-		$(use_with valgrind)
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	if tc-is-cross-compiler ; then
-		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-		# propagated to sysconfig for built extensions
-		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
-		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
-		local -x CFLAGS= LDFLAGS=
-
-		# We need to build our own Python on CBUILD first, and feed it in.
-		# bug #847910
-		local myeconfargs_cbuild=(
-			"${myeconfargs[@]}"
-
-			--libdir="${cbuild_libdir:2}"
-
-			# Avoid needing to load the right libpython.so.
-			--disable-shared
-
-			# As minimal as possible for the mini CBUILD Python
-			# we build just for cross to satisfy --with-build-python.
-			--without-lto
-			--without-readline
-			--disable-optimizations
-		)
-
-		myeconfargs+=(
-			# Point the imminent CHOST build to the Python we just
-			# built for CBUILD.
-			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
-		)
-
-		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
-		# libdir correctly for cross.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
-			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-		# Avoid as many dependencies as possible for the cross build.
-		cat >> Makefile <<-EOF || die
-			MODULE_NIS_STATE=disabled
-			MODULE__DBM_STATE=disabled
-			MODULE__GDBM_STATE=disabled
-			MODULE__DBM_STATE=disabled
-			MODULE__SQLITE3_STATE=disabled
-			MODULE__HASHLIB_STATE=disabled
-			MODULE__SSL_STATE=disabled
-			MODULE__CURSES_STATE=disabled
-			MODULE__CURSES_PANEL_STATE=disabled
-			MODULE_READLINE_STATE=disabled
-			MODULE__TKINTER_STATE=disabled
-			MODULE_PYEXPAT_STATE=disabled
-			MODULE_ZLIB_STATE=disabled
-		EOF
-
-		# Unfortunately, we do have to build this immediately, and
-		# not in src_compile, because CHOST configure for Python
-		# will check the existence of the --with-build-python value
-		# immediately.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
-		popd &> /dev/null || die
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# force-disable modules we don't want built
-	local disable_modules=( NIS )
-	use gdbm || disable_modules+=( _GDBM _DBM )
-	use sqlite || disable_modules+=( _SQLITE3 )
-	use ssl || disable_modules+=( _HASHLIB _SSL )
-	use ncurses || disable_modules+=( _CURSES _CURSES_PANEL )
-	use readline || disable_modules+=( READLINE )
-	use tk || disable_modules+=( _TKINTER )
-
-	local mod
-	for mod in "${disable_modules[@]}"; do
-		echo "MODULE_${mod}_STATE=disabled"
-	done >> Makefile || die
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	export PYTHONSTRICTEXTENSIONBUILD=1
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-
-		addpredict "/usr/lib/python${PYVER}/site-packages"
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# this just happens to skip test_support.test_freeze that is broken
-	# without bundled expat
-	# TODO: get a proper skip for it upstream
-	local -x LOGNAME=buildbot
-
-	local test_opts=(
-		-u-network
-		-j "$(makeopts_jobs)"
-
-		# fails
-		-x test_gdb
-	)
-
-	if use sparc ; then
-		# bug #788022
-		test_opts+=(
-			-x test_multiprocessing_fork
-			-x test_multiprocessing_forkserver
-		)
-	fi
-
-	# workaround docutils breaking tests
-	cat > Lib/docutils.py <<-EOF || die
-		raise ImportError("Thou shalt not import!")
-	EOF
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	# workaround https://bugs.gentoo.org/775416
-	addwrite "/usr/lib/python${PYVER}/site-packages"
-
-	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	rm Lib/docutils.py || die
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	# the Makefile rules are broken
-	# https://github.com/python/cpython/issues/100221
-	mkdir -p "${libdir}"/lib-dynload || die
-
-	# -j1 hack for now for bug #843458
-	emake -j1 DESTDIR="${D}" altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${libdir}"/ensurepip || die
-	fi
-	if ! use sqlite; then
-		rm -r "${libdir}/"sqlite3 || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-	fi
-
-	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 3.11.0_beta4-r2; then
-			ewarn "Python 3.11.0b4 has changed its module ABI.  The .pyc files"
-			ewarn "installed previously are no longer valid and will be regenerated"
-			ewarn "(or ignored) on the next import.  This may cause sandbox failures"
-			ewarn "when installing some packages and checksum mismatches when removing"
-			ewarn "old versions.  To actively prevent this, rebuild all packages"
-			ewarn "installing Python 3.11 modules, e.g. using:"
-			ewarn
-			ewarn "  emerge -1v /usr/lib/python3.11/site-packages"
-		fi
-	done
-}
diff --git a/dev-lang/python/python-3.8.17.ebuild b/dev-lang/python/python-3.8.17.ebuild
deleted file mode 100644
index 7be0059133b5..000000000000
--- a/dev-lang/python/python-3.8.17.ebuild
+++ /dev/null
@@ -1,428 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic multiprocessing pax-utils
-inherit prefix python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm lto +ncurses pgo
-	+readline +sqlite +ssl test tk valgrind wininst +xml
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
-	valgrind? ( dev-util/valgrind )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	sys-devel/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-python )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-QA_PKGCONFIG_VERSION=${PYVER}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# https://bugs.gentoo.org/850151
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs)
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	if ! use wininst; then
-		rm Lib/distutils/command/wininst*.exe || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-	local disable
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	append-flags -fwrapv
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with debug assertions)
-		$(use_with valgrind)
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	if tc-is-cross-compiler ; then
-		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-		# propagated to sysconfig for built extensions
-		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
-		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
-		local -x CFLAGS= LDFLAGS=
-
-		# We need to build our own Python on CBUILD first, and feed it in.
-		# bug #847910 and bug #864911.
-		local myeconfargs_cbuild=(
-			"${myeconfargs[@]}"
-
-			--libdir="${cbuild_libdir:2}"
-
-			# Avoid needing to load the right libpython.so.
-			--disable-shared
-
-			# As minimal as possible for the mini CBUILD Python
-			# we build just for cross.
-			--without-lto
-			--disable-optimizations
-		)
-
-		# Point the imminent CHOST build to the Python we just
-		# built for CBUILD.
-		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
-
-		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
-		# libdir correctly for cross.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
-			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-		# Avoid as many dependencies as possible for the cross build.
-		cat >> Makefile <<-EOF || die
-			MODULE_NIS=disabled
-			MODULE__DBM=disabled
-			MODULE__GDBM=disabled
-			MODULE__DBM=disabled
-			MODULE__SQLITE3=disabled
-			MODULE__HASHLIB=disabled
-			MODULE__SSL=disabled
-			MODULE__CURSES=disabled
-			MODULE__CURSES_PANEL=disabled
-			MODULE_READLINE=disabled
-			MODULE__TKINTER=disabled
-			MODULE_PYEXPAT=disabled
-			MODULE_ZLIB=disabled
-		EOF
-
-		# Unfortunately, we do have to build this immediately, and
-		# not in src_compile, because CHOST configure for Python
-		# will check the existence of the Python it was pointed to
-		# immediately.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
-		popd &> /dev/null || die
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	hprefixify setup.py
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	# Prevent using distutils bundled by setuptools.
-	# https://bugs.gentoo.org/823728
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	local test_opts=(
-		-u-network
-		-j "$(makeopts_jobs)"
-
-		# fails
-		-x test_gdb
-	)
-
-	if use sparc ; then
-		# bug #788022
-		test_opts+=(
-			-x test_multiprocessing_fork
-			-x test_multiprocessing_forkserver
-		)
-	fi
-
-	# workaround docutils breaking tests
-	cat > Lib/docutils.py <<-EOF || die
-		raise ImportError("Thou shalt not import!")
-	EOF
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	rm Lib/docutils.py || die
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${libdir}"/ensurepip || die
-	fi
-	if ! use sqlite; then
-		rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-	fi
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.9.17.ebuild b/dev-lang/python/python-3.9.17.ebuild
deleted file mode 100644
index ef4bf0a3c3fd..000000000000
--- a/dev-lang/python/python-3.9.17.ebuild
+++ /dev/null
@@ -1,488 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
-inherit prefix python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm lto +ncurses pgo
-	+readline +sqlite +ssl test tk valgrind +xml
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	dev-python/gentoo-common
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
-	valgrind? ( dev-util/valgrind )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	sys-devel/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-python )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# https://bugs.gentoo.org/850151
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs)
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-	local disable
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			-x test_gdb
-			-x test_dtrace
-			-u-network
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-
-			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
-			# bug #900429
-			-x test_tools
-		)
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with debug assertions)
-		$(use_with lto)
-		$(use_enable pgo optimizations)
-		$(use_with valgrind)
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	if tc-is-cross-compiler ; then
-		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-		# propagated to sysconfig for built extensions
-		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
-		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
-		local -x CFLAGS= LDFLAGS=
-
-		# We need to build our own Python on CBUILD first, and feed it in.
-		# bug #847910 and bug #864911.
-		local myeconfargs_cbuild=(
-			"${myeconfargs[@]}"
-
-			--libdir="${cbuild_libdir:2}"
-
-			# Avoid needing to load the right libpython.so.
-			--disable-shared
-
-			# As minimal as possible for the mini CBUILD Python
-			# we build just for cross.
-			--without-lto
-			--disable-optimizations
-		)
-
-		# Point the imminent CHOST build to the Python we just
-		# built for CBUILD.
-		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
-
-		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
-		# libdir correctly for cross.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
-			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-		# Avoid as many dependencies as possible for the cross build.
-		cat >> Makefile <<-EOF || die
-			MODULE_NIS=disabled
-			MODULE__DBM=disabled
-			MODULE__GDBM=disabled
-			MODULE__DBM=disabled
-			MODULE__SQLITE3=disabled
-			MODULE__HASHLIB=disabled
-			MODULE__SSL=disabled
-			MODULE__CURSES=disabled
-			MODULE__CURSES_PANEL=disabled
-			MODULE_READLINE=disabled
-			MODULE__TKINTER=disabled
-			MODULE_PYEXPAT=disabled
-			MODULE_ZLIB=disabled
-		EOF
-
-		# Unfortunately, we do have to build this immediately, and
-		# not in src_compile, because CHOST configure for Python
-		# will check the existence of the Python it was pointed to
-		# immediately.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
-		popd &> /dev/null || die
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	hprefixify setup.py
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	# Prevent using distutils bundled by setuptools.
-	# https://bugs.gentoo.org/823728
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-
-		addpredict "/usr/lib/python${PYVER}/site-packages"
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	local test_opts=(
-		-u-network
-		-j "$(makeopts_jobs)"
-
-		# fails
-		-x test_gdb
-	)
-
-	if use sparc ; then
-		# bug #788022
-		test_opts+=(
-			-x test_multiprocessing_fork
-			-x test_multiprocessing_forkserver
-		)
-	fi
-
-	# workaround docutils breaking tests
-	cat > Lib/docutils.py <<-EOF || die
-		raise ImportError("Thou shalt not import!")
-	EOF
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	rm Lib/docutils.py || die
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${libdir}"/ensurepip || die
-	fi
-	if ! use sqlite; then
-		rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-	fi
-
-	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 6c614c570124..4054cfa00d44 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 3d6f0aa240ba..5b6e9cb1643f 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -1,5 +1,6 @@
 AUX 50xerces-c 43 BLAKE2B 8ebb0cf0aa79e028271751f981c9b0818af24bf3640a5109ecca19b39b9a67b88fc1d5ddfce5203b1c226f80ca8e1b6cc06897f3ce8eee11eb1bd923c702b8ce SHA512 030808e28a2095ecc143e4b5add8577eceb599e43eca6a59ed874d64a042b263245116e539791dca697f74e9336b23561321b16417e42d5b56c5b21597e1c3eb
+AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 737 BLAKE2B e0bdf1021d574b20f29793a757772b9229610ed7f7abf81f13f841c765f05a70e90286f58a904653a05c33274a193408a09b71cf733dbc7ed9c5b19e9c0f4e31 SHA512 8825f9387d7900c2486ecc0d196a3df67333fe27ae9ca83683a56ea57b79248d3da62f5a553664e2d348fb9ad05b651566eada56d26157b471e76b95a81df9a8
 DIST xerces-c-3.2.4.tar.xz 4260560 BLAKE2B 5d9fed1e9a461f8b348f3259216c5181bd03d2b5d8790cad88621d601065d0d79f8766ae70ed0aa7afe05005e2bcaf37a88da25b17f0e028bf074a31cea5fe71 SHA512 4d58d25b59b4528ad1f2d60681ddd6d2a4dba945613cee9ce978605f006da03703ea85a1bd89f781eeb3ad4dbdadf485a310f29d4c07036b0322f0755f87fddf
-EBUILD xerces-c-3.2.4.ebuild 2767 BLAKE2B 30de0974c3e594e7c7e4da25a679d8f11a681a52d5d46fdfcb970c64cd18fce4406d1e7fe6e0f54ca6b975fe6fc4a1c6dd63b0fbe7181da1f7cb951f0ae2aa1c SHA512 831efcdfd284e40b46a42aa1fcab470183fcac1db9bcbf70836289939f04d5fd2e49380bd1e380f104a059a9a26b5223a0569ab48fdd6285dd85ba6eda09dcea
-EBUILD xerces-c-9999.ebuild 2774 BLAKE2B 24ba776119a45cde34513f7c50960670a2b3d68fd347bc55e18a77aeb281b7b60f1f6c901636783d32bf7b5a2e2343c5acd060acccf087e647de1b00768c3cf6 SHA512 a527bafc30dc2448f6e084590165bcc54a0f8ee9d8002e4958db2cf0c84ef481a46c4c91d5aa33956c1b2713f560b38aa15ae3883e469ee08a97219f9cc84ed2
+EBUILD xerces-c-3.2.4-r2.ebuild 2829 BLAKE2B 6e6639f71d0945462f22670d022c2f72a815f19bc9020de5966681c2f699972f8416d26ba5e1e901e7f551236f1db759b9a74036e1a8820c3b2005d056809d6d SHA512 5536ce6ffef882ae679540980af51b37828321fd01a9c8b1d3698db62faf9d321f9d1cc494dd3ff392ff465c59f0b71e2335e23e046418eb1e6389ada73f18aa
+EBUILD xerces-c-9999.ebuild 2836 BLAKE2B 0a9fc4b1e8148c1c298559ae94d3b91bdeb985fd08b3d218c3cddf6e7fac6d1d9e4342f063dc4cb2b4a66f0461f9fa2d5166531fbbbedabdb951e80afb9dd90c SHA512 9d91d6626b872e28b13502c1708bdb6f1ce578214e1f7066272242592c1e110ff99224ca2ffa40a23e9c6202e66611201ee51922a70946666e623e4de4eaad2c
 MISC metadata.xml 639 BLAKE2B 478311dd96d2a5938161f66cbcd3e0bbdb51bc5680c2bc9aaddcfef3921d356bb568fcf3047d181d54f3cf2560b547dcca3e964e064506c8bfccad9291c6d0da SHA512 8c8fd2d5a525000a06fb08b0cd20c4aefd6c9fb6554e7e8586bfc7a58be2884a629417035e0863950246bf12b756466c0453e2768a31678da002d029dceacb73
diff --git a/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2163.patch b/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2163.patch
new file mode 100644
index 000000000000..50db010bf5ee
--- /dev/null
+++ b/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2163.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/673548
+https://bugs.gentoo.org/738140
+https://bugs.gentoo.org/913045
+
+https://issues.apache.org/jira/browse/XERCESC-2163
+https://github.com/apache/xerces-c/pull/7
+
+From db7a8b0cd2a163de1e3ef8c950cf9e708b0b5f98 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Wed, 2 Jan 2019 15:01:21 -0500
+Subject: [PATCH] build: Install XercesMessages_en_US.cat to
+ /usr/share/xerces-c/msg
+
+Fixes XERCESC-2163
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1198,7 +1198,7 @@ if(XERCES_USE_MSGLOADER_ICONV)
+ 
+   install(
+     FILES "${RESTARGET}"
+-    DESTINATION "${CMAKE_INSTALL_PREFIX}/msg"
++    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/xerces-c/msg"
+     COMPONENT "runtime")
+ endif()
+ 
diff --git a/dev-libs/xerces-c/xerces-c-3.2.4.ebuild b/dev-libs/xerces-c/xerces-c-3.2.4-r2.ebuild
index f1046bbeb48f..c48e8dc9931c 100644
--- a/dev-libs/xerces-c/xerces-c-3.2.4.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.4-r2.ebuild
@@ -33,6 +33,8 @@ BDEPEND="
 
 DOCS=( CREDITS KEYS NOTICE README )
 
+PATCHES=( "${FILESDIR}"/${PN}-3.2.2-fix-XERCESC-2163.patch )
+
 pkg_setup() {
 	export ICUROOT="${EPREFIX}/usr"
 
diff --git a/dev-libs/xerces-c/xerces-c-9999.ebuild b/dev-libs/xerces-c/xerces-c-9999.ebuild
index 0fdc2749c78a..4b24ee3df5d8 100644
--- a/dev-libs/xerces-c/xerces-c-9999.ebuild
+++ b/dev-libs/xerces-c/xerces-c-9999.ebuild
@@ -33,6 +33,8 @@ BDEPEND="
 
 DOCS=( CREDITS KEYS NOTICE README )
 
+PATCHES=( "${FILESDIR}"/${PN}-3.2.2-fix-XERCESC-2163.patch )
+
 pkg_setup() {
 	export ICUROOT="${EPREFIX}/usr"
 
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d725597468d2..334b7b42e52d 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/griffe/Manifest b/dev-python/griffe/Manifest
index a7c50515f7c1..07b9444be573 100644
--- a/dev-python/griffe/Manifest
+++ b/dev-python/griffe/Manifest
@@ -1,5 +1,7 @@
 DIST griffe-0.34.0.gh.tar.gz 181554 BLAKE2B 67d9a453cbd4388e7eefce9613b58667fff184b235e06743ba0a997a961b320f00a62505b06d7dde8f068e206e0ba9424e4da7969c0bedeeded80a85f981f824 SHA512 92fd93e49f4c52f9e819cca853f5c950a66d782f0161da41e11ae2a64e09a6bc2319481c8410a220c844b1ed44a96860d3e1bd152512b9ff5d6ec0fe11f36752
 DIST griffe-0.35.0.gh.tar.gz 184348 BLAKE2B eafd03d55091c960ae8686e0e1113ca266b1f980a00ebb12e252e54105dd10f56f1cb76de9fdba0ceefe2c8b7190f3aa1fe3557cac162e96b8ee408ce682f47d SHA512 9308c215232775e1355c7470006f611f1ec413cd7f24300fbc9a4b1b15108d4d20fb31e1be0ddd3b28d84862eb0409d0481a5744899a6db9ea9574987c37d86a
+DIST griffe-0.35.1.gh.tar.gz 184480 BLAKE2B 9c2ba347d34ea428d56fe1bcd43b31d1518b2ac55082282ff66432837138fe26f1a61dc001c2c19e3400642b712b9ebea0987e541c0a1178653a6020bca0cf91 SHA512 e6d4b1fd670853eff5e74e2969d6e14e20809c7b859e2a8ec326855848807e066679ea09da6de04819a0f3ea79aa21bf6101c3e06b82bcb15dda6a3da5b8e4d9
 EBUILD griffe-0.34.0.ebuild 958 BLAKE2B 10c44ac7ea571eac3359a86c6f614a0281c08af4600e92757877ffe96cdd38f1080f5677143487429b436e913399b26d02917961a9d300f9cd97446b7e8ca15f SHA512 03f908068ab85bff169f4e2dff0a3750cb78f9ad9837a706cd8acb6c6a72d4cf57ecc35de39367320c8cf4b816f0abbba043ce457919985cdfc10acb3d536756
 EBUILD griffe-0.35.0.ebuild 958 BLAKE2B 10c44ac7ea571eac3359a86c6f614a0281c08af4600e92757877ffe96cdd38f1080f5677143487429b436e913399b26d02917961a9d300f9cd97446b7e8ca15f SHA512 03f908068ab85bff169f4e2dff0a3750cb78f9ad9837a706cd8acb6c6a72d4cf57ecc35de39367320c8cf4b816f0abbba043ce457919985cdfc10acb3d536756
+EBUILD griffe-0.35.1.ebuild 958 BLAKE2B 10c44ac7ea571eac3359a86c6f614a0281c08af4600e92757877ffe96cdd38f1080f5677143487429b436e913399b26d02917961a9d300f9cd97446b7e8ca15f SHA512 03f908068ab85bff169f4e2dff0a3750cb78f9ad9837a706cd8acb6c6a72d4cf57ecc35de39367320c8cf4b816f0abbba043ce457919985cdfc10acb3d536756
 MISC metadata.xml 398 BLAKE2B eb35dbbdd7d3482404991416d9e06e3e87f88a96cc91d481b5a2f53eb732172116b4cfefa1a65f9ba8db44e2b10ed0fd6e4031b7d17382e9e931d1a2eedb322e SHA512 833aac5d52c2584143d67b7ad325e9538cee17d454410b3c4708ad9b47f58d3b2c0875d735b149603bb36ae124d24343b2e456a6db5e5f806da2e13f32c108cc
diff --git a/dev-python/griffe/griffe-0.35.1.ebuild b/dev-python/griffe/griffe-0.35.1.ebuild
new file mode 100644
index 000000000000..c8d57610c9ff
--- /dev/null
+++ b/dev-python/griffe/griffe-0.35.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm-backend
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Signature generator for Python programs"
+HOMEPAGE="
+	https://mkdocstrings.github.io/griffe/
+	https://github.com/mkdocstrings/griffe/
+	https://pypi.org/project/griffe/
+"
+# Tests need files absent from the PyPI tarballs
+SRC_URI="
+	https://github.com/mkdocstrings/griffe/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-2.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export PDM_BUILD_SCM_VERSION=${PV}
+
+EPYTEST_DESELECT=(
+	# fragile to installed packages
+	# (failed on PySide2 for me)
+	tests/test_stdlib.py::test_fuzzing_on_stdlib
+)
diff --git a/dev-python/pypdf/Manifest b/dev-python/pypdf/Manifest
index e186a277b741..436e94b5f6a2 100644
--- a/dev-python/pypdf/Manifest
+++ b/dev-python/pypdf/Manifest
@@ -1,6 +1,8 @@
 DIST pypdf-3.15.1.gh.tar.gz 7679588 BLAKE2B 9148d17be47fc653bba26fc39ca58f503eba7fd561ef67be034f6ce18318069a1e981e46d6a23ff18dd20a9ddbd38ff056a17e63e71b253d851d3c3934057c74 SHA512 93a4c5c573f8db73df4dd113e4d502bb183c2548a556686848dabf46078721e583c0283f6148c268d6e502e25402fab7b5e40d3eb9c60ab4db19827f183636e5
 DIST pypdf-3.15.2.gh.tar.gz 7679823 BLAKE2B c53e51adaa2d789b56f0871ef9937e01eb91074dd30afece840a17c8b789686ff88942345764e7451b4ad1af21405f9e18d96f03cb8cdfbbe34ef786fcd85fac SHA512 804ff4c57e626b10827167a91aaa82e9acc46aea48b1a961ea50fff526c3fc012aa231f2ea269bd715a9f5294b684f8338d34356f738dd45f512228019a63633
+DIST pypdf-3.15.3.gh.tar.gz 7682634 BLAKE2B c0b4046152fecaaddab28e6c8220d001bb47cf958464f2e4c6507dd089810ad61ccbbf0922d592d190f3effc88ed0c0cf3331e634616e985aedc4a026d5e4f52 SHA512 8fc82cc204a807ab308b21c8665162710fd9a3fb58fd8177fe559b801247ad8a8c949ce58d2879b6b64c040d137eb6731a76b533308b30e556a59bd33ae6b12e
 DIST pypdf-sample-files-935652968f76a41b4fa51afd05498e7dd7314c5e.gh.tar.gz 11187445 BLAKE2B e9332009a49249fdaa8b6c29258b11dfcf3627a5550ea7402cf0288bb4b0537136b039e6f4aefb03574076d1fc0af6100effc0d36510f035d9e63836ad52c4d7 SHA512 8d525aa323e5b45f71130459faa9686ec4ae04bc594895a64f1a5b6d027f866c48aca78602ad526000a11b547cc77068d1ac5e733d3e3a99df0e257c02fbb9e7
 EBUILD pypdf-3.15.1.ebuild 1209 BLAKE2B 47f9252a0f11ea387f3224731964f0048586a0d8cf7a3cbbbbe48deb003d696d003e21c49426b91dd1a3b986ee0dcbae024a721718a3aa5153e2c23ecc9a71a6 SHA512 d49aa95a85075163fd7ac00713007a2c31c2ffe3d3fac4e43c681b6c29dc4a174ae8e0b1e3a2ddcd92d7afdcdec8cbab0a7b645607790179ffa46ae5e9ee49e0
 EBUILD pypdf-3.15.2.ebuild 1211 BLAKE2B d79a894ae3fe363caa1812922a8fc1c1d2282b62f5b3e383ba156c92209d5836eb9eb3bb524f5d16f57d98864af9e94feeac0443bdacaf856104c158672468fd SHA512 14feab4e5c42d1fc977c9fc7ca9cd9488d3c08f21b775ae7b4ec9127d85fc641eaf99614409cb6550fda1012200c3bd9ca5cef2702f025aa3af65acc63b236ed
+EBUILD pypdf-3.15.3.ebuild 1211 BLAKE2B d79a894ae3fe363caa1812922a8fc1c1d2282b62f5b3e383ba156c92209d5836eb9eb3bb524f5d16f57d98864af9e94feeac0443bdacaf856104c158672468fd SHA512 14feab4e5c42d1fc977c9fc7ca9cd9488d3c08f21b775ae7b4ec9127d85fc641eaf99614409cb6550fda1012200c3bd9ca5cef2702f025aa3af65acc63b236ed
 MISC metadata.xml 373 BLAKE2B a829b7048eb3a95caeb1be83b6172603df6a031d40995294f2687bf3c3cb70e66fafb9ba8339d9979fc85f5936b9552963a8fcd072a20661fa78f3aa3c4b89c0 SHA512 775ac2de487f11fba1ea8d283b42b9ef56e42cd95ea11f50a06b099420e69c0567f65c506b14891ac641da90ea05ca70da4f8a3e4a028cf41bdbc823021dccfe
diff --git a/dev-python/pypdf/pypdf-3.15.3.ebuild b/dev-python/pypdf/pypdf-3.15.3.ebuild
new file mode 100644
index 000000000000..bd9de5c7eff6
--- /dev/null
+++ b/dev-python/pypdf/pypdf-3.15.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+SAMPLE_COMMIT=935652968f76a41b4fa51afd05498e7dd7314c5e
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/pypdf/
+	https://github.com/py-pdf/pypdf/
+"
+SRC_URI="
+	https://github.com/py-pdf/pypdf/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
+			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
+	)
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		>=dev-python/pillow-8.0.0[jpeg,jpeg2k,tiff,${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# rely on -Werror
+	tests/test_utils.py::test_deprecate_no_replacement
+	tests/test_workflows.py::test_orientations
+	# TODO: requires fpdf
+	tests/test_page.py::test_compression
+)
+
+src_unpack() {
+	default
+	if use test; then
+		mv "sample-files-${SAMPLE_COMMIT}"/* "${S}"/sample-files/ || die
+	fi
+}
+
+python_test() {
+	epytest -o addopts= -m "not enable_socket"
+}
diff --git a/dev-python/pypy3_10/Manifest b/dev-python/pypy3_10/Manifest
index d1b36f28e900..4d8a2ac1f718 100644
--- a/dev-python/pypy3_10/Manifest
+++ b/dev-python/pypy3_10/Manifest
@@ -1,10 +1,4 @@
-DIST pypy3.10-gentoo-patches-7.3.12_p1.tar.xz 4844 BLAKE2B 9540d41cbea05ef2239c94088fbd357efccfee2d269385308255c457efb5cb9ca5c3cead53fd08c38238ac66fec9f4bc1ea0507db3e2398de32342d387a3caee SHA512 b6442feab24f0acb903d60edd2a1996e51efbb4ceb5e7f547c3405bbe0c6fb8de6f74556aa5704ae1676b03fdb5ea3d64bb8dc4848d439704e5232366f38428d
-DIST pypy3.10-gentoo-patches-7.3.12_p3.tar.xz 7640 BLAKE2B 9352b6eb65c69311e8b629afc2567ab5f4b31b0aeda78539fde40f86465ee8ee76b354e78c567a532ac7804da417e5af343edc78a754780cfb970ee2c98c925f SHA512 740a14d6f5faa9a4cc0ec982c1425be56b2330450f2f6f4d667766cd1560d3d2aa5741d5ecfc7c94eaea9ae68029727cd7449f534a4ad84d26ca332605c08f6d
-DIST pypy3.10-gentoo-patches-7.3.12_p4.tar.xz 8132 BLAKE2B 9b43ba8db8d527e36a2075ad3d8a03e4a71aaff80df1930d44a5e8e23ecd1e3d95a397f4763e7c08d939303e03ced407a8c6eacf1f20333cb83f6f5fd7df2e70 SHA512 f29ffcc256205532b2dc28f8078dfdb15fe712ca857c49197b2e5a3c59774584c72a50fab9f1ad4332485df76a74ec76572daa83c1512fe01e7f2ea8254a00f7
 DIST pypy3.10-gentoo-patches-7.3.12_p5.tar.xz 15404 BLAKE2B d9aa579b82f6bfafc3bdbd1f818d9cc85e3d33e6e72ec8dd65486e6239184dbd6720af1819493016c03e0898dec0c4f4fe361ef4ecdc63a365bc37a9452f1d2a SHA512 a705dd608d2a0027979d20301ec23aebc4a1ff20a826f2572fbdd702b079303797926e3908fd2afd7d4b0d165ffc1f4988a1c5181dd0f8ce7a7a2cc725630e23
 DIST pypy3.10-v7.3.12-src.tar.bz2 23009064 BLAKE2B ad45d90de9ae51803ebcfa202763889f92f7e5c2939331433a496e53ca67dd6eeaf9c61e16cb648945409dff3c6dd6b8a2a01dfe1bed6cd6a9df98f112bff181 SHA512 080520c7de267e17a2823f06cd0a15c108a2c32fc296d6e24782050eb546fa74852d948ede2c381dba110774121b20efc3a07b553acd0ac0db4a844dfc09069e
-EBUILD pypy3_10-7.3.12_p1.ebuild 6027 BLAKE2B 9f9310a65a17ed5cf3cb74c4158ab922a6a3b582b582ccf354f771491ebb28c632cf71744fcc2a783ba153438b11faadf5f48f1fbba44a01d0da433b728491cf SHA512 638cc9f939341d93489fcce30acec54ef8a03b3af0c6418bd6ef353e901270cba10cc9c36268042fb331b8e1dfb94b49e1ef544b5719e954b0146064e1573c86
-EBUILD pypy3_10-7.3.12_p3.ebuild 6029 BLAKE2B 3e45315cb8f22bf5304ee3a75c672a72f85824023ef6c9c7bbd6354ce7484abe142e2cf79a4291876c1e1e20df95d6571021d2655913ff0ffe771ca7d31ce2cf SHA512 416cbc568f2d0d9acdd9efd39843a6e451fdc8a11448b527eb1a6a700a06f745e7815122226fded2ea0837bd988b1c4786ba7bc5ef8a60ec8e01244b14d8ce4e
-EBUILD pypy3_10-7.3.12_p4.ebuild 6029 BLAKE2B 3e45315cb8f22bf5304ee3a75c672a72f85824023ef6c9c7bbd6354ce7484abe142e2cf79a4291876c1e1e20df95d6571021d2655913ff0ffe771ca7d31ce2cf SHA512 416cbc568f2d0d9acdd9efd39843a6e451fdc8a11448b527eb1a6a700a06f745e7815122226fded2ea0837bd988b1c4786ba7bc5ef8a60ec8e01244b14d8ce4e
 EBUILD pypy3_10-7.3.12_p5.ebuild 6027 BLAKE2B 9f9310a65a17ed5cf3cb74c4158ab922a6a3b582b582ccf354f771491ebb28c632cf71744fcc2a783ba153438b11faadf5f48f1fbba44a01d0da433b728491cf SHA512 638cc9f939341d93489fcce30acec54ef8a03b3af0c6418bd6ef353e901270cba10cc9c36268042fb331b8e1dfb94b49e1ef544b5719e954b0146064e1573c86
 MISC metadata.xml 531 BLAKE2B 0f727c7ced9fb24ba0dc0b41d51c177b3711de33b838bf46cfdde5d8b751de9694873c13fe8153747f2cb533c078c54f004ee84b1c3c57b6f8d62128ffb9dba2 SHA512 331b66647a58047ded4bcf1529e3ca16b21cbb37afa82d8be0a4b6ad605e17bf3f1478fad1ea3b9c970bdf5162cb41e6adcb029a261fcbf894e807998b9219f6
diff --git a/dev-python/pypy3_10/pypy3_10-7.3.12_p1.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.12_p1.ebuild
deleted file mode 100644
index 943c947b9dca..000000000000
--- a/dev-python/pypy3_10/pypy3_10-7.3.12_p1.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pax-utils python-utils-r1 toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-PYVER=3.10
-MY_P="pypy${PYVER}-v${PYPY_PV/_}"
-PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_rc/rc}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) 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/pypy310-pp73-384"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+ensurepip gdbm +jit ncurses sqlite tk"
-# many tests are failing upstream
-# see https://buildbot.pypy.org/summary?branch=py${PYVER}
-RESTRICT="test"
-
-RDEPEND="
-	|| (
-		>=dev-python/${PN}-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?]
-		>=dev-python/${PN}-exe-bin-${PYPY_PV}:${PYPY_PV}
-	)
-	dev-lang/python-exec[python_targets_pypy3(-)]
-	dev-libs/openssl:0=
-	dev-python/gentoo-common
-	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-7.3.12_rc1
-"
-DEPEND="
-	${RDEPEND}
-"
-
-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/pypy${PYVER} || die
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/bin/pypy${PYVER}-c-${PYPY_PV} pypy${PYVER}-c || die
-	cp -p "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/* include/pypy${PYVER}/ || die
-	# (not installed by pypy-exe)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/pypy${PYVER}/ || die
-	mv pypy/module/cpyext/parse/*.h include/pypy${PYVER}/ || die
-	pax-mark m pypy${PYVER}-c
-
-	# verify the subslot
-	local soabi=$(
-		./pypy${PYVER}-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 sysconfig data
-	local host_gnu_type=$(sh pypy/tool/release/config.guess)
-	local overrides=(
-		HOST_GNU_TYPE "${host_gnu_type:-unknown}"
-		INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}"
-		LIBDIR "${EPREFIX}/usr/$(get_libdir)"
-		TZPATH "${EPREFIX}/usr/share/zoneinfo"
-		WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
-	)
-	./pypy${PYVER}-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die
-	local outdir
-	outdir=$(<pybuilddir.txt) || die
-	cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy${PYVER}-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 lib_pypy/pypy_tools/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
-		testmultiphase
-	)
-	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
-		../pypy${PYVER}-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=$(
-		../pypy${PYVER}-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_install() {
-	einfo "Installing PyPy ..."
-	dodir /usr/bin
-	dosym pypy${PYVER}-c-${PYPY_PV} /usr/bin/pypy${PYVER}
-	insinto /usr/lib/pypy${PYVER}
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r lib-python/3/. lib_pypy/.
-	insinto /usr/include
-	doins -r include/pypy${PYVER}
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy${PYVER}/${x##*/}"
-	done
-
-	dodoc README.rst
-
-	local dest=/usr/lib/pypy${PYVER}
-	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
-	dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
-
-	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}/usr/bin/pypy${PYVER}-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/pypy3_10/pypy3_10-7.3.12_p3.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.12_p3.ebuild
deleted file mode 100644
index c3cd1b2bb121..000000000000
--- a/dev-python/pypy3_10/pypy3_10-7.3.12_p3.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pax-utils python-utils-r1 toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-PYVER=3.10
-MY_P="pypy${PYVER}-v${PYPY_PV/_}"
-PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_rc/rc}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) 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/pypy310-pp73-384"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+ensurepip gdbm +jit ncurses sqlite tk"
-# many tests are failing upstream
-# see https://buildbot.pypy.org/summary?branch=py${PYVER}
-RESTRICT="test"
-
-RDEPEND="
-	|| (
-		>=dev-python/${PN}-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?]
-		>=dev-python/${PN}-exe-bin-${PYPY_PV}:${PYPY_PV}
-	)
-	dev-lang/python-exec[python_targets_pypy3(-)]
-	dev-libs/openssl:0=
-	dev-python/gentoo-common
-	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-7.3.12_rc1
-"
-DEPEND="
-	${RDEPEND}
-"
-
-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/pypy${PYVER} || die
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/bin/pypy${PYVER}-c-${PYPY_PV} pypy${PYVER}-c || die
-	cp -p "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/* include/pypy${PYVER}/ || die
-	# (not installed by pypy-exe)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/pypy${PYVER}/ || die
-	mv pypy/module/cpyext/parse/*.h include/pypy${PYVER}/ || die
-	pax-mark m pypy${PYVER}-c
-
-	# verify the subslot
-	local soabi=$(
-		./pypy${PYVER}-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 sysconfig data
-	local host_gnu_type=$(sh pypy/tool/release/config.guess)
-	local overrides=(
-		HOST_GNU_TYPE "${host_gnu_type:-unknown}"
-		INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}"
-		LIBDIR "${EPREFIX}/usr/$(get_libdir)"
-		TZPATH "${EPREFIX}/usr/share/zoneinfo"
-		WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
-	)
-	./pypy${PYVER}-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die
-	local outdir
-	outdir=$(<pybuilddir.txt) || die
-	cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy${PYVER}-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 lib_pypy/pypy_tools/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
-		testmultiphase
-	)
-	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
-		../pypy${PYVER}-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=$(
-		../pypy${PYVER}-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_install() {
-	einfo "Installing PyPy ..."
-	dodir /usr/bin
-	dosym pypy${PYVER}-c-${PYPY_PV} /usr/bin/pypy${PYVER}
-	insinto /usr/lib/pypy${PYVER}
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r lib-python/3/. lib_pypy/.
-	insinto /usr/include
-	doins -r include/pypy${PYVER}
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy${PYVER}/${x##*/}"
-	done
-
-	dodoc README.rst
-
-	local dest=/usr/lib/pypy${PYVER}
-	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
-	dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
-
-	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}/usr/bin/pypy${PYVER}-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/pypy3_10/pypy3_10-7.3.12_p4.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.12_p4.ebuild
deleted file mode 100644
index c3cd1b2bb121..000000000000
--- a/dev-python/pypy3_10/pypy3_10-7.3.12_p4.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pax-utils python-utils-r1 toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-PYVER=3.10
-MY_P="pypy${PYVER}-v${PYPY_PV/_}"
-PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_rc/rc}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) 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/pypy310-pp73-384"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+ensurepip gdbm +jit ncurses sqlite tk"
-# many tests are failing upstream
-# see https://buildbot.pypy.org/summary?branch=py${PYVER}
-RESTRICT="test"
-
-RDEPEND="
-	|| (
-		>=dev-python/${PN}-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?]
-		>=dev-python/${PN}-exe-bin-${PYPY_PV}:${PYPY_PV}
-	)
-	dev-lang/python-exec[python_targets_pypy3(-)]
-	dev-libs/openssl:0=
-	dev-python/gentoo-common
-	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-7.3.12_rc1
-"
-DEPEND="
-	${RDEPEND}
-"
-
-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/pypy${PYVER} || die
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/bin/pypy${PYVER}-c-${PYPY_PV} pypy${PYVER}-c || die
-	cp -p "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/* include/pypy${PYVER}/ || die
-	# (not installed by pypy-exe)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/pypy${PYVER}/ || die
-	mv pypy/module/cpyext/parse/*.h include/pypy${PYVER}/ || die
-	pax-mark m pypy${PYVER}-c
-
-	# verify the subslot
-	local soabi=$(
-		./pypy${PYVER}-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 sysconfig data
-	local host_gnu_type=$(sh pypy/tool/release/config.guess)
-	local overrides=(
-		HOST_GNU_TYPE "${host_gnu_type:-unknown}"
-		INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}"
-		LIBDIR "${EPREFIX}/usr/$(get_libdir)"
-		TZPATH "${EPREFIX}/usr/share/zoneinfo"
-		WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
-	)
-	./pypy${PYVER}-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die
-	local outdir
-	outdir=$(<pybuilddir.txt) || die
-	cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy${PYVER}-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 lib_pypy/pypy_tools/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
-		testmultiphase
-	)
-	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
-		../pypy${PYVER}-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=$(
-		../pypy${PYVER}-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_install() {
-	einfo "Installing PyPy ..."
-	dodir /usr/bin
-	dosym pypy${PYVER}-c-${PYPY_PV} /usr/bin/pypy${PYVER}
-	insinto /usr/lib/pypy${PYVER}
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r lib-python/3/. lib_pypy/.
-	insinto /usr/include
-	doins -r include/pypy${PYVER}
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy${PYVER}/${x##*/}"
-	done
-
-	dodoc README.rst
-
-	local dest=/usr/lib/pypy${PYVER}
-	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
-	dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
-
-	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}/usr/bin/pypy${PYVER}-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/pypy3_9/Manifest b/dev-python/pypy3_9/Manifest
index 47b03d56b430..59e636ff27e6 100644
--- a/dev-python/pypy3_9/Manifest
+++ b/dev-python/pypy3_9/Manifest
@@ -1,6 +1,4 @@
-DIST pypy3.9-gentoo-patches-7.3.12_p1.tar.xz 8552 BLAKE2B 99a7bcc52fcaaec1853162b4f65dc2688b2a90e6ede202a6e6a18ceb8ff16fd479781891305479a1c6a7f889cb9a3fb6f5f081d1318231f420cc98f10976b0aa SHA512 2047626612be66a617f073076f4d0b5821ba2d01e955c10df7c97caa53aae67f30fcf6088e3d532c97e805a0be223be2cab16a355970757557100080e5fc658d
 DIST pypy3.9-gentoo-patches-7.3.12_p2.tar.xz 14832 BLAKE2B e142221967f501dea771c8e02b7e57f704945b9c2a4fa7f84d2a702f911cc798ffafafc88bbe04ef89a71d218d28ad98b4cbee9fe822e81199d55c9891292967 SHA512 2e3a1a972775a89e9cf42d8177f607fe4aa4f245261dd9e3e8256697ddaf5271a2aa3d73bdb62e93de9c62fa4e6969d517e812507e865947fd1b649ec0f1d426
 DIST pypy3.9-v7.3.12-src.tar.bz2 23528145 BLAKE2B 28cc42b10d6a84c441af673e1a0dc6d19e09daa1da9249a7fec39a9aaccbe5010a3586068ae0b10cd402b72e5acc58998469d5c99019caa41399951c2a221e26 SHA512 8e819a1ec3f3ce7fc5f901fb554660288a57e2a4834a3da35c1a57faf88ef4129240628a58334d2e0c2b1dda412da5d85ec943abe8046c0ce5d0cd0a0f7fc42a
-EBUILD pypy3_9-7.3.12_p1.ebuild 6026 BLAKE2B f81b5ab91eb3472e35832085637bc34b3051e397691c24f5ea48ed47f92d301cc67561352e0fb106a0eca43a44b11424672a378f2021257cfb5a940caec32a82 SHA512 1a4ee02044e077db4c4bc9a9845c362c932c6766bfad0498745d7f7834c6b9a8ff9087c291a42580c824bd3910164f83979c627707175ff646105caea8352231
 EBUILD pypy3_9-7.3.12_p2.ebuild 6026 BLAKE2B f81b5ab91eb3472e35832085637bc34b3051e397691c24f5ea48ed47f92d301cc67561352e0fb106a0eca43a44b11424672a378f2021257cfb5a940caec32a82 SHA512 1a4ee02044e077db4c4bc9a9845c362c932c6766bfad0498745d7f7834c6b9a8ff9087c291a42580c824bd3910164f83979c627707175ff646105caea8352231
 MISC metadata.xml 531 BLAKE2B 0f727c7ced9fb24ba0dc0b41d51c177b3711de33b838bf46cfdde5d8b751de9694873c13fe8153747f2cb533c078c54f004ee84b1c3c57b6f8d62128ffb9dba2 SHA512 331b66647a58047ded4bcf1529e3ca16b21cbb37afa82d8be0a4b6ad605e17bf3f1478fad1ea3b9c970bdf5162cb41e6adcb029a261fcbf894e807998b9219f6
diff --git a/dev-python/pypy3_9/pypy3_9-7.3.12_p1.ebuild b/dev-python/pypy3_9/pypy3_9-7.3.12_p1.ebuild
deleted file mode 100644
index 1c6eec918ff3..000000000000
--- a/dev-python/pypy3_9/pypy3_9-7.3.12_p1.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pax-utils python-utils-r1 toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-PYVER=3.9
-MY_P="pypy${PYVER}-v${PYPY_PV/_}"
-PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_rc/rc}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) 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 tk"
-# many tests are failing upstream
-# see https://buildbot.pypy.org/summary?branch=py${PYVER}
-RESTRICT="test"
-
-RDEPEND="
-	|| (
-		>=dev-python/${PN}-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?]
-		>=dev-python/${PN}-exe-bin-${PYPY_PV}:${PYPY_PV}
-	)
-	dev-lang/python-exec[python_targets_pypy3(-)]
-	dev-libs/openssl:0=
-	dev-python/gentoo-common
-	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-7.3.12_rc
-"
-DEPEND="
-	${RDEPEND}
-"
-
-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/pypy${PYVER} || die
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/bin/pypy${PYVER}-c-${PYPY_PV} pypy${PYVER}-c || die
-	cp -p "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/* include/pypy${PYVER}/ || die
-	# (not installed by pypy-exe)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/pypy${PYVER}/ || die
-	mv pypy/module/cpyext/parse/*.h include/pypy${PYVER}/ || die
-	pax-mark m pypy${PYVER}-c
-
-	# verify the subslot
-	local soabi=$(
-		./pypy${PYVER}-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 sysconfig data
-	local host_gnu_type=$(sh pypy/tool/release/config.guess)
-	local overrides=(
-		HOST_GNU_TYPE "${host_gnu_type:-unknown}"
-		INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}"
-		LIBDIR "${EPREFIX}/usr/$(get_libdir)"
-		TZPATH "${EPREFIX}/usr/share/zoneinfo"
-		WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
-	)
-	./pypy${PYVER}-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die
-	local outdir
-	outdir=$(<pybuilddir.txt) || die
-	cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy${PYVER}-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 lib_pypy/pypy_tools/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
-		testmultiphase
-	)
-	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
-		../pypy${PYVER}-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=$(
-		../pypy${PYVER}-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_install() {
-	einfo "Installing PyPy ..."
-	dodir /usr/bin
-	dosym pypy${PYVER}-c-${PYPY_PV} /usr/bin/pypy${PYVER}
-	insinto /usr/lib/pypy${PYVER}
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r lib-python/3/. lib_pypy/.
-	insinto /usr/include
-	doins -r include/pypy${PYVER}
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy${PYVER}/${x##*/}"
-	done
-
-	dodoc README.rst
-
-	local dest=/usr/lib/pypy${PYVER}
-	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
-	dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
-
-	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}/usr/bin/pypy${PYVER}-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-qt/Manifest.gz b/dev-qt/Manifest.gz
index a9e2182988aa..ffd653ee4f62 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index cb4112f2393d..b1722d44cf3e 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -3,9 +3,12 @@ AUX qtwebengine-5.15.10_p20230623-ffmpeg-binutils-2.41.patch 2319 BLAKE2B dad3b5
 AUX qtwebengine-5.15.2-enable-ppc64.patch 1249 BLAKE2B b8b9957bbf848ee8b19e4a7d43f1bfb8c2e63e691f2f0c4b10ef5367bc71b12fb6d161767f7669825e423c08af83e70ff744dd08facf92281c431de90a36847e SHA512 8e29e4e3c2085e5bba9c5a6ce7b366814767bb421132474cae413bba81217a70aec941b09a63d1f914c1e6b9e417b108df236d0b9d39e0df4b4d74111ddcda47
 AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf56c52af3a3bd5ff5bcfd525c67bf2e5d960904a9f3b53e1fa18f0e0df380c0cf84f17914fb313a028e26efaefe6ab5057f0d9a9cf2f6f0fd SHA512 6dc3864064d6084e70d4696fda744701c293ee62e9c9088e3247988ffb8085f30c632e94ac19aef715cbd211b21dfcb98691d5809e21cffd9f04bbb8b04cf0da
 DIST qtwebengine-5.15.10_p20230623.tar.xz 299264220 BLAKE2B 93afb88f79a6675dc58123831d0555a60d28428b93d32e185c21eb25401dfeeeee727ca20fc0ba3bda4ff2a298950e081a2eadcaeea095261941fe0d56b0d668 SHA512 9027899474d9d9dec5a5ca1e80e49404a0df2e23fe1666a437c07e99cbbbf787afd619eccf3d901545ed0a865c5fb439dce64f8339cbeb09213a0d4404456543
+DIST qtwebengine-5.15.10_p20230815-patchset.tar.xz 44880 BLAKE2B 6179ca4ad69f922cfa8ab8528bd571a326b3340f810f05782d808d67b6310de079d84ca6f769bd532f0fe375a702f0d348e02cfbf6b3f2d5c30ac668e1005bef SHA512 a323bdd8afeb41a97febf587bb0994a937c78ed470e077a2b482dca7e04bc4eb9cf75b2d2707236574d6586189ff3d27e42f437930dedd85b47a77e18ffc8fa3
+DIST qtwebengine-5.15.10_p20230815.tar.xz 299275336 BLAKE2B 9c64f09d982086d51af7d4134f174db9c23162bc3317ea4f19e44d91a52ad63aff56bacc7ae64a2bf693d900ef3ef5231c7333eb56237123799066055fc49450 SHA512 4e6abd825d124fddc63bc8ff92e94940b829289277aa17423403c6ce168c12fff1d52b604ae127c1a0fdbca852e3795482acefbe6e506a3059c0d32bec45a709
 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 DIST qtwebengine-5.15.8_p20230313-patchset.tar.xz 45904 BLAKE2B 9f58b9808fd445a06e6a2cd6d5f7bc9782bd6de13138fdebc9e81bd9f69e7ae673a71bd3ed6b011a47e84cc64b5b703a7cfc8d5f740eaaa663da1db8ef9ef05b SHA512 21b0b853358260fa1bdc96c97c5b2af7007c744d10abeebf9f0e708a0cd7dece583d86c0554a4e327a0d615bb403b0d328acaa6622b50d7a8059bc0802edbcec
 DIST qtwebengine-everywhere-src-6.5.2.tar.xz 412356700 BLAKE2B a48a513cffbf140aab08d748bc7826e841b7e1a87d113abbd0d8e7df5b9eb1ff2a44b89ae341c161eae26fd004699a1392f811252eb25aa13e0ce8e08f6be0a1 SHA512 f5791002495ebfa9912477f39a96d28bd4f4329f636f6b2055f1b811503b3c394c3ddd7baed5643f78f1905b1e8f860b4202b5d8e4afe5791e5450b9f46eac12
 EBUILD qtwebengine-5.15.10_p20230623.ebuild 8524 BLAKE2B cce6249550a5574ab7763c042117186201da9c006982eb99efc1da72d1d339e90f9c6e9a60371a25d314f3372234e9d976d2cd292d0abcc08a4442a699a95495 SHA512 95138584a3644d86b9835288446dd2d01997379f894a38f101bbf899e853235600c9c80b571ed8380a15d179cb72fb0b68324e83b1b230847325ff476fa992e3
+EBUILD qtwebengine-5.15.10_p20230815.ebuild 8258 BLAKE2B 766d6ad760f73e66d9a7f0ee52c3916e14b7f640e26784abf0866b039aecbf809c9e21a00b13d030311fa1ab91360aacd837e1257474800732a5598c3910c646 SHA512 c2d9534d452db6f53238faa05f6b454c4daeb6fcf683997d5095f4a9b777248e8d7f67ba4203a4b26457782817b887ca0cce36fb8d14f887e1b9772e78173140
 EBUILD qtwebengine-6.5.2.ebuild 7525 BLAKE2B 36efc69a7d3bcb37cb0e1988a8f5181cb60e2df177fc12237b518e1a40a3a29eecb0e2968efa02eb22e066bf22af64a86e23c63eeb63709b9188d2eb3109e0c6 SHA512 1e67b3a05f3ea6f40c5595b00273e1c7d6df9cd65244ed7a47ec0c3e287dfda3b06edf41e2a520d7f1705c0def4f0a1c8fae2d0a0f5e2725cf993d9d01fc37e3
 MISC metadata.xml 1152 BLAKE2B 2975a3fabc6464a6207a6b1a9da943baa16bc9a3b77a987cffeb6ea7c8791c5d09171b74825e6f218612144d862de1f2865c60fb6c4c187a1c5f6940112117e9 SHA512 aa3ed598b19be8adceb5a9b90bbc5d5d2521aa1a742210f536d11cf0466204ac3dc373ccee5a9a6cf523827589d17022ca2b54c8e142e6bb3b2afcfc98fa242d
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230815.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230815.ebuild
new file mode 100644
index 000000000000..d77b298fdba3
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230815.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PATCHSET="${P}-patchset"
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
+
+DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
+HOMEPAGE="https://www.qt.io/"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	if [[ ${PV} == ${QT5_PV}_p* ]]; then
+		SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
+		S="${WORKDIR}/${P}"
+		QT5_BUILD_DIR="${S}_build"
+	fi
+else
+	EGIT_BRANCH="5.15"
+	EGIT_REPO_URI=(
+		"https://code.qt.io/qt/${QT5_MODULE}.git"
+		"https://github.com/qt/${QT5_MODULE}.git"
+	)
+	inherit git-r3
+fi
+
+# ppc64 patchset based on https://github.com/chromium-ppc64le releases
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz
+	ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )"
+
+IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-icu widgets"
+REQUIRED_USE="designer? ( widgets )"
+
+RDEPEND="
+	app-arch/snappy:=
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/expat
+	dev-libs/libevent:=
+	dev-libs/libxml2[icu]
+	dev-libs/libxslt
+	dev-libs/re2:=
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtdeclarative-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*
+	=dev-qt/qtnetwork-${QT5_PV}*
+	=dev-qt/qtprintsupport-${QT5_PV}*
+	=dev-qt/qtwebchannel-${QT5_PV}*[qml]
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/harfbuzz:=
+	media-libs/lcms:2
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	>=media-libs/libvpx-1.5:=[svc(+)]
+	media-libs/libwebp:=
+	media-libs/opus
+	sys-apps/dbus
+	sys-apps/pciutils
+	sys-libs/zlib[minizip]
+	virtual/libudev
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	alsa? ( media-libs/alsa-lib )
+	designer? ( =dev-qt/designer-${QT5_PV}* )
+	geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* )
+	kerberos? ( virtual/krb5 )
+	pulseaudio? ( media-libs/libpulse )
+	screencast? ( media-video/pipewire:= )
+	system-icu? ( >=dev-libs/icu-69.1:= )
+	widgets? (
+		=dev-qt/qtdeclarative-${QT5_PV}*[widgets]
+		=dev-qt/qtwidgets-${QT5_PV}*
+	)
+"
+DEPEND="${RDEPEND}
+	media-libs/libglvnd
+"
+BDEPEND="${PYTHON_DEPS}
+	dev-util/gperf
+	dev-util/ninja
+	dev-util/re2c
+	net-libs/nodejs[ssl]
+	sys-devel/bison
+	sys-devel/flex
+	ppc64? ( >=dev-util/gn-0.1807 )
+"
+
+PATCHES=( "${WORKDIR}/${PATCHSET}" )
+
+qtwebengine_check-reqs() {
+	# bug #307861
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
+		ewarn "You may experience really long compilation times and/or increased memory usage."
+		ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
+	fi
+	eshopts_pop
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# (check-reqs added for bug #570534)
+	#
+	# Estimate the amount of RAM required
+	# Multiplier is *10 because Bash doesn't do floating point maths.
+	# Let's crudely assume ~2GB per compiler job for GCC.
+	local multiplier=20
+
+	# And call it ~1.5GB for Clang.
+	if tc-is-clang ; then
+		multiplier=15
+	fi
+
+	local CHECKREQS_DISK_BUILD="7G"
+	local CHECKREQS_DISK_USR="150M"
+	if ! has "distcc" ${FEATURES} ; then
+		# bug #830661
+		# Not super realistic to come up with good estimates for distcc right now
+		local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
+	fi
+
+	check-reqs_${EBUILD_PHASE_FUNC}
+}
+
+pkg_pretend() {
+	qtwebengine_check-reqs
+}
+
+pkg_setup() {
+	qtwebengine_check-reqs
+	python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	case ${QT5_BUILD_TYPE} in
+		live)    git-r3_src_unpack ;&
+		release) default ;;
+	esac
+}
+
+src_prepare() {
+	if [[ ${PV} == ${QT5_PV}_p* ]]; then
+		# This is made from git, and for some reason will fail w/o .git directories.
+		mkdir -p .git src/3rdparty/chromium/.git || die
+	fi
+	# We need to make sure this integrates well into Qt 5.15.3 installation.
+	# Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
+	# See also: https://www.qt.io/blog/building-qt-webengine-against-other-qt-versions
+	sed -E "/^MODULE_VERSION/s/5\.15\.[0-9]+/${QT5_PV}/" -i .qmake.conf || die
+
+	# QTBUG-88657 - jumbo-build could still make trouble
+	if ! use jumbo-build; then
+		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
+			src/buildtools/config/common.pri || die
+	fi
+
+	# bug 620444 - ensure local headers are used
+	find "${S}" -type f -name "*.pr[fio]" | \
+		xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
+
+	if use system-icu; then
+		# Sanity check to ensure that bundled copy of ICU is not used.
+		# Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
+		# src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
+		# If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
+		# shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
+		# src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
+		local file
+		while read file; do
+			echo "#error This file should not be used!" > "${file}" || die
+		done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
+	fi
+
+	# src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++`
+	if tc-is-clang ; then
+		if has_version 'sys-devel/clang[default-libcxx(-)]' || has_version 'sys-devel/clang-common[default-libcxx(-)]' ; then
+			eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
+		fi
+	fi
+
+	qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
+	qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
+
+	qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
+
+	qt_use_disable_mod widgets widgets src/src.pro
+
+	qt5-build_src_prepare
+
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	if use ppc64; then
+		einfo "Patching for ppc64le and generating build files"
+		eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch"
+		pushd src/3rdparty/chromium > /dev/null || die
+		eapply -p0 "${WORKDIR}/${PN}-ppc64le"
+		popd > /dev/null || die
+		pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
+		mkdir -vp source/config/linux/ppc64 || die
+		mkdir -p source/libvpx/test || die
+		touch source/libvpx/test/test.mk || die
+		# clang-format is used to re-format sources
+		# but we'd rather make it a no-op than introduce a clang dependency
+		# https://bugs.gentoo.org/849458
+		clang-format() { : ; }
+		export -f clang-format || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+	fi
+}
+
+src_configure() {
+	export NINJA_PATH=/usr/bin/ninja
+	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs "${MAKEOPTS}" 999) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+
+	local myqmakeargs=(
+		--
+		-no-build-qtpdf
+		-printing-and-pdf
+		-system-opus
+		-system-webp
+		$(qt_use alsa)
+		$(qt_use !bindist proprietary-codecs)
+		$(qt_use geolocation webengine-geolocation)
+		$(qt_use kerberos webengine-kerberos)
+		$(qt_use pulseaudio)
+		$(usex screencast -webengine-webrtc-pipewire '')
+		-qt-ffmpeg # bug 831487
+		$(qt_use system-icu webengine-icu)
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+
+	# bug 601472
+	if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
+		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+	fi
+}
+
+pkg_preinst() {
+	elog "This version of Qt WebEngine is based on Chromium version 87.0.4280.144,"
+	elog "with additional security fixes from newer versions. Extensive as it is, the"
+	elog "list of backports is impossible to evaluate, but always bound to be behind"
+	elog "Chromium's release schedule."
+	elog "In addition, various online services may deny service based on an outdated"
+	elog "user agent version (and/or other checks). Google is already known to do so."
+	elog
+	elog "tldr: Your web browsing experience will be compromised."
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 7d3292291f2a..0d28fa5a24a8 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 6a2f86aaed31..aa7f0436216f 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -3,6 +3,7 @@ DIST bundler-2.3.26.gem 411648 BLAKE2B 5ea0ff86e0e09bf0466e4bb21502a13519515f312
 DIST bundler-2.3.8.gem 403968 BLAKE2B 80640d5032034be0511762c60832c85c65b7b97397eca49d2bc35977a85625104477606abd6d8b286dd4697906a5d97076cac30f7ab58f45b258ba1e637bbc2c SHA512 e04bc9762135bdab7eb70bde4f21289375b7ea9bee795775dc614f31a6f145a5406396dbc638bdac778ac7c39d60c953e5ba38376b8bc72e7a8cfd1c40b25585
 DIST bundler-2.4.1.gem 408576 BLAKE2B 8bd574023dfdffa9ab02b4a0f86c922cf3c8bbcebee3b9ad77b9eba748a81219f8fbccb3eac667922e7dc23f73212e9f42f04eae6ee99b1869ab40537365e8f2 SHA512 244cf923838c9e2001fae5533df66457953d93943fc9a2c587a1d36b1aec3385a7cd50680bd0fe14e8abb2dc11b11a8636a1e1c0d36847c24080f63edfe8b1f5
 DIST bundler-2.4.15.gem 412672 BLAKE2B 3c73e082fa8a007cc626fd00093bf69ddf63ea00aba137594e1112db0900f2c7688d85dc3f22c7b569b1b3abb8977f3e6f850719b4bced12db9cd7959a376dba SHA512 0f2ea2a0ba113295dea5e42383d49a30fd580376088d81642796e6bec48e38b2f56115c052079a97040c5f2a89ff7e2a5cccfa5aab1e3053cad411b47e6ccaed
+DIST bundler-2.4.19.gem 413184 BLAKE2B 34607b2fdf1c7cb36982fa7c7bbd5c6f5b7c227c525cb9abae2c1099d401818d91ba233c7d3d4e42c59e97b357065f03a1e8fa4c814e0b4cd95ac4e043984015 SHA512 ff4a7541c8110a18223df4586f636a70fe301843d80444fc4954e9ca7018da0f7a62980a0abd5d91e26f5222b224f8afc3dc51fc12e03559d77496ee1aee1296
 DIST bundler-2.4.3.gem 409088 BLAKE2B df6991e9f4ef80899ac691d7a0ece268980bda7497482b207eba8e5e0f957fbc7b06f11755932f527d80ed199e79292b1a720a06f80b38d95685a4e6f2316e27 SHA512 a232c40656d05031b39390c72ae71596618e87d92cf86f1db45d75993ff8cb0625fef8055540ef14a8179211bdf17804028468c568e261d3dd43c0a5405ed4bf
 DIST bundler-2.4.6.gem 409600 BLAKE2B 5470a85b7ee0a88c13795516ee317eaf227ad49023f05dbbea1bbe0b2b4f2bb93fab85101128662845d8a2ad567bec04e5238e3a2d3b81c89aea81f18d552d4e SHA512 194d432a12bde41d7bdff5aefd187b539f4ab3932d6774f171147e4da907dc77f2ff56580c53151d5fdb77de2138b668f856e410cd63b1cda2fb996074771f35
 EBUILD bundler-2.2.33-r1.ebuild 852 BLAKE2B 0004ae0dbf3c4b64b80ffe314ceab1e04c58f03460a2f8f09fc49d3647af33dd585ae1162f4ca2bac4474f2c1f0acaeb78d9c565a9c6d03e2fd4d5a5db2a3ee4 SHA512 fbe9676d6d44b66f6c917e9d203bbb344737078363f6d8b36111adcac08e5214dc25093e6eb9e8ce74d619e1c38b1340a2a9454f7a7709b0bd558fe5473713b7
@@ -11,6 +12,7 @@ EBUILD bundler-2.3.8-r1.ebuild 867 BLAKE2B 48e021d4197e1eb7bf5d368250359b60e3aff
 EBUILD bundler-2.3.8.ebuild 875 BLAKE2B 0467bbbf78fd37086d141fe6fffbb62de371cdafafc4deaff028c6c6a701ad28c6f6c68370e409c6d0a968e016e341b8ef77f768b38b90e103bd065e7583a341 SHA512 5daf5876d748d10978ad42b6338d002ba10b4b2732413f5b693e127ed7e39cc34eafc3fa269d6b0263a47f52296c9df7d5d92549adb57916c11f474959a3a969
 EBUILD bundler-2.4.1.ebuild 836 BLAKE2B 0172ce5f4e936ac659c9c113da946c0bfa629fbfddfa9ce1a0615e7bf0dc6d9a1717aa2aa35fb441e489c50d608812734fdc415d332f205dfb11226462a74782 SHA512 b4b55df2a1da362d84206c9b0c104943975b21c1b4926f303fc3d06dc42b37c6c406ed8f3392b3ab5fd04d42d93f68a20e9f453909c5d70fd9b1407cc6ad72f7
 EBUILD bundler-2.4.15.ebuild 849 BLAKE2B 4eaa66b9e38ef1cae446a0d891e00e3bc5ad03105097c0e1bba3e6c9bca6784897e8d51c6b8dc6ec23b1e50a8303de290956d66db1e650d9ba34ebd5e2960646 SHA512 6e797942bb181493d0da010b28af8badaee02f6bf781ea2087357e4196499628d9d68168e05b7565f52e662b3800a1a3a752bb58c352834ef2beb14aa9ef7682
+EBUILD bundler-2.4.19.ebuild 842 BLAKE2B 5df1d85828e78dabbaa61da8a5f5eb37b214e68471ac101dd173f7c34000b4607c14820cecf347b7e6c1c9e766185a262426107376fd44bfe5c2e9f5ec90834e SHA512 912985b00851543ea488577284801c94d445ecba9d4df3a5b5627b8d41ff4f58a6f44bfc8f678fe52136a42600cd8da5a9b11f3cbd50b1963fb12f50dbdd749a
 EBUILD bundler-2.4.3.ebuild 836 BLAKE2B 0172ce5f4e936ac659c9c113da946c0bfa629fbfddfa9ce1a0615e7bf0dc6d9a1717aa2aa35fb441e489c50d608812734fdc415d332f205dfb11226462a74782 SHA512 b4b55df2a1da362d84206c9b0c104943975b21c1b4926f303fc3d06dc42b37c6c406ed8f3392b3ab5fd04d42d93f68a20e9f453909c5d70fd9b1407cc6ad72f7
 EBUILD bundler-2.4.6.ebuild 856 BLAKE2B 1b25da0a68b31ae591ee87e19e7f80563622be9655c2a0e0ecb613cb7bb68902be5d36e9e5cddef23ec31e660b641091c5d32e2e37773c329ae875329f035974 SHA512 fb701e97343e63e7bc85c6bcdfb664d74978c220cfb48c0f67deba9c3d5bf4c4166bdb907456ee7d47ebaef51d092c93d5dd92d2f63a4e7a5368e89d650eb3e2
 MISC metadata.xml 344 BLAKE2B 9acc02101b03bc23988fd3bbb4a71e887a2b257f7182bf5e91d09035fdf9f293a66174d766cc6ac11b7323d951bc3d2f95dcca623fa37d450357a5ce96017d32 SHA512 f776a0c273ea490041bfecbd5235ebcfc3450ceac69ec4abcfddd2115b2bf4f714a648abd30075aafcf1d3a10936a375ca14f11b8d04af2e874ce9917c12afc7
diff --git a/dev-ruby/bundler/bundler-2.4.19.ebuild b/dev-ruby/bundler/bundler-2.4.19.ebuild
new file mode 100644
index 000000000000..cbaa392ed78b
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.4.19.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/rubygems/rubygems"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git"
diff --git a/dev-ruby/http-accept/Manifest b/dev-ruby/http-accept/Manifest
index b3d066be6dea..d2eb70fb5f3b 100644
--- a/dev-ruby/http-accept/Manifest
+++ b/dev-ruby/http-accept/Manifest
@@ -1,6 +1,6 @@
 DIST http-accept-1.7.0.tar.gz 12289 BLAKE2B 5eda9bd29e2dd2b52c8f2589adf57872a80aaf93c37d28b1668dc24fc1e2fa81d00ec12766dd558691dbf3e6560bba013f456a659ead47fffd77b1565c186a7f SHA512 3502bfbd07f6bb0164843c728cd5ef27adfd675317fd60372539180de212d02d6d446cff8eb081d1cbe5a19b30d5759a55b22bc63736cea83254595bd691522f
 DIST http-accept-2.2.0.tar.gz 14174 BLAKE2B b6fd0c065a1d9c798ebee8a2f82aa45738cf98721d42d9806614fd98c8ce5d571ce06ad3292e81a972e484f55c75c0e99c5ad54f138323b180bb9292f87b3049 SHA512 341b09b3f8ba132ba9394c904bbe7c95a91fe0b39b080ae96d8228b8474f2d7de6edf4d9dce0b16783ac12aa375b0cda99be67290656f3348219f52d66b7f120
-EBUILD http-accept-1.7.0-r1.ebuild 639 BLAKE2B a87f043061f388dd93177615aef37add141cd68d2a4acd1c0d045542a405d324a2acc306d3619e533d70c081a686103fe67ad2280eefc4caa1d631f0171f2574 SHA512 a42d4864ce93c51b25e6a6118237791ccfc4c768f29a7a8adbfe6a79147122ec1460a1f6388cafaf63ceb4599e38851f282e611244f77d01bfbc9e9a0c34062d
+EBUILD http-accept-1.7.0-r1.ebuild 649 BLAKE2B b3e73a72e39984e6fd4f9547d959c4ed798abcb092aa5fc0e4efe52ed43721c68e1f162b5683b17df55bd27f656c0a5b072da71218c5350b894b8485c0bec918 SHA512 10da0678d3cc805dd79d8a9b45d4ddcb5ac8666282f05477684cd2868acd7a1423c3143362adf6b8921058ab8e03bcef8427445279dfe7c8647ba4875be8a109
 EBUILD http-accept-1.7.0.ebuild 498 BLAKE2B f20de69d321d4f2e8c0c6480e9b98e674456e4526671ff09e36b1faadd4bf4d01f2758ca93e55ceea38e70ce6a9e0c4f12a501b3cea23f90a68b0a97fdb9f10f SHA512 46d224c218174951c10e989c38e8e22a78153192a3e6c2890e945468c6cd891fe0e18f21167f4e4e6fc8533164e86d77eba0b1b4b82b4766699044ea9ec7288b
-EBUILD http-accept-2.2.0.ebuild 736 BLAKE2B 4208049429c13f581f3d050d19c60b944998890a9f2c1971d37ceebb0dd0abb74875b19f32db37121fbb71e5039db5dd2ffec0dd2a9cfea97e113874500da305 SHA512 9c5ea3507c486f66b690fca70cbdededf6c3cef116ba0c1d7a56ae09a6f5a4ff246ea1cadd11115330b1c05c2e1c05a63e97a8993186f8caa23dcc8e1b59a9b9
+EBUILD http-accept-2.2.0.ebuild 746 BLAKE2B f68a66e0dfa05a665c9b899d9fda708ff79fdffcb9030edc0b435da6e5166c9323e5a72f68981210c3ef0de5b0c5eb88d8be69aa5b2fed8a76df7df6e5412457 SHA512 29d0de6f7a69c738e41b3475134c5f7e6b7676c2eaf8a44fc1340d21f3f666cc05b25c79f1aae93c72675377fae08f0b0510c277806cfe7fc146032b882bd6cc
 MISC metadata.xml 347 BLAKE2B 94d85022fee1a9bba34d8d2e184cb2169dd91c680c15f1d6032d6989c22b8ec5bfc4e84c6b36452ba9fbe78f420d62bdb547fbe98e736f5830ca94126ae7a4eb SHA512 0efdea66a1d6d83efd16aba20e1dd0634bff7cc6bd5570d27a4e101a5307fb358a954b4b70253e08698afefcdff81455e2a3e3bb2f9054992354dd3a863c00ef
diff --git a/dev-ruby/http-accept/http-accept-1.7.0-r1.ebuild b/dev-ruby/http-accept/http-accept-1.7.0-r1.ebuild
index 6a3f74f7422c..3aed1d8587be 100644
--- a/dev-ruby/http-accept/http-accept-1.7.0-r1.ebuild
+++ b/dev-ruby/http-accept/http-accept-1.7.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/socketry/http-accept/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 ~arm64 ~ppc ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/http-accept/http-accept-2.2.0.ebuild b/dev-ruby/http-accept/http-accept-2.2.0.ebuild
index 9cb68d6126b5..ae6a8daf0fed 100644
--- a/dev-ruby/http-accept/http-accept-2.2.0.ebuild
+++ b/dev-ruby/http-accept/http-accept-2.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/socketry/http-accept/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 ~arm64 ~ppc ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/netrc/Manifest b/dev-ruby/netrc/Manifest
index 8bb61556afba..50800348ecc4 100644
--- a/dev-ruby/netrc/Manifest
+++ b/dev-ruby/netrc/Manifest
@@ -1,3 +1,3 @@
 DIST netrc-0.11.0.gem 10752 BLAKE2B 40f78989c7b58b726c1f83ea7032eace74c11776b006a2f5fc9459134224cad6129b370d6da4bcdef540d75504da6d5ca5a1d6bab9c1ab8a2620b22c3933be20 SHA512 7f0df3f79d92b891d40a49e9b893ca7131077195cf15453b155e37e68e29f8cd3810ba791a06338058262c8cb8fed56c87c295e450c133b428b3398eb99e683a
-EBUILD netrc-0.11.0-r2.ebuild 738 BLAKE2B 4bfdfda73d7dfc19356b825ca6c3573f5e9bfe417502a57071ebfcaf3ce646e6efb642fd2adf394244f5b6f797046916fb0b1ff8353cd931ab7952ec1031cf1c SHA512 03b1c7ae6a242945fa04d40abf5d627d2d134b4cd053e75432c3ed040f25e790a9df8eb55566ff9706d9f4339fb09753faf214f9c76f6313aff01e1ec6e2a8d2
+EBUILD netrc-0.11.0-r2.ebuild 743 BLAKE2B be664283d2337238383465c00feec17a4acdb129d657e029840a0c356f49428aee8b7eef5b7d9ee8958272c5eaab056dcd27ac3b5b004e45038190501db82276 SHA512 35d3de7ddade199951cd001d4d02fed7b5f3e10e67668ac8714d81a99a8401b4d66c430b8a0031e10945bbf89ff1a5e28c72613b4f04b5f256f47ce63aa331fa
 MISC metadata.xml 388 BLAKE2B a02bd97fc07f286ee3932834aefbeec734ed356b3b76a436ceb96d79068cebe681bb9811629ab7d61f2cfc81894b1ec2cbaa40bd0d3c1de02fb7ab48fc5da327 SHA512 170ddf5b8f74de9e0d3d715bdbc44bec7c3e6ea301beec5f286a38fcad2619cc21e1538712f96724fbb42c2aacc301ee54617ad5fbde02c3aa9634217a29abb9
diff --git a/dev-ruby/netrc/netrc-0.11.0-r2.ebuild b/dev-ruby/netrc/netrc-0.11.0-r2.ebuild
index d33251cd1390..fdc7107fb2a8 100644
--- a/dev-ruby/netrc/netrc-0.11.0-r2.ebuild
+++ b/dev-ruby/netrc/netrc-0.11.0-r2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="This library reads and writes .netrc files"
 HOMEPAGE="https://github.com/heroku/netrc"
 LICENSE="MIT"
 
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/oauth/Manifest b/dev-ruby/oauth/Manifest
index ff524e0e112a..35e84ac5cbd4 100644
--- a/dev-ruby/oauth/Manifest
+++ b/dev-ruby/oauth/Manifest
@@ -1,6 +1,6 @@
 DIST oauth-0.5.14.tar.gz 68764 BLAKE2B 19c7f463d5fcba62a609355834ba93adf1efa05b2ce25fc5d9d3623da15d35a7cb54eff9201bb4f373a66629781f5937326430a7a1c9c615929bcc5bae099a67 SHA512 646ed55a602e9e7b8e8d59532c89929305abeeda6b38fc38bdf1d5e400deec7f5884d988bcbb9e3537eb3a0921dacb73cb5238af27e9885aff95b67196f62c99
 DIST oauth-0.6.2.tar.gz 81702 BLAKE2B 2775c0711beb9f3612844ae07ff59953d4db72c0f9a797c6eac49132a021a48481a13f4b1428b2037b0a04b83b5d79e621cccd4a794fe3a339a1ceb468f0b165 SHA512 22f4f734daa42339bbaed1d1d449a4591ef4404aaf8cf1753ba705735a176f6142853b2c4f5e8ff3afa3e9899163af1c5598685664326d58a5b529d94b65441f
 EBUILD oauth-0.5.14.ebuild 1302 BLAKE2B a0c37ea85360a0849f423faa66e5fcfcd33c8860f815724398bcf01c733b5457530d45ad479fddb43859687bf5f36a5b8d3eeb267db11463ffd41a543dbb789c SHA512 54a70e14f6465120482c8a947f2b23029455bbada34ccf9c5db8a011396d23a2ddd5c7f0b65dbe07620f145f0816a26016b12fd95b0a2ffcd8a2692756e1d418
-EBUILD oauth-0.6.2-r1.ebuild 1440 BLAKE2B 53acbbdfff7e8a1767626315df4072bfad442bea2fa8564d26f111b4e19e8d7bbfa7a3662e9cc1eb2fa61d9a8809864c4bbbffd12dc93477fff4147cd898c797 SHA512 9b410813ee8c09b73a68574d7484e4f2f78427ac1ae314b83c4e26b22e559d31ad2bbcfcad0ecefec2b25347a628cc8da7b1abf94f63b79ba4c9fdc76e25c9fc
+EBUILD oauth-0.6.2-r1.ebuild 1450 BLAKE2B 46097b63e42b83c3fad483b025519f4fb1db2c3399e443aacb49e376badc86c6e57519dde27a2ca535eb415d94ba2a4bb543127746fd6796ca9a22943e00fdf2 SHA512 210e6e13342d1fa31098d7ad4d62ad7f8c1c82cdf3d68960c06453e420757cefed96e3ee20eb39e4b9079eed0d4c3e9152f99b7e035bad602b4babf3fca5791d
 EBUILD oauth-0.6.2.ebuild 1403 BLAKE2B fab3d199a16196709c01ec40d9ec6e0c7a1821d3dade0dba1c9c28ad08acd380e0ff3ae20f3f7bb6a0902f51c42866609446ebab949c4d973b03a23272d3e868 SHA512 54f54853fa0a5b2fd61083f0199b4b46ba14c73c3b9e6cfc04aaa2ab8631c16d549e52a221d70d772f14dcb5c9b7685678c338858f47f5c0b7b20e0ac182c9f3
 MISC metadata.xml 336 BLAKE2B ab0fbd6793480301de481d3d1cfe9b26bfd24573f43d742c154fb4ddf4d0550663acd415dda46dbace5005085a40714fe3fdd9a84b147154c8ed3fdc47d59c02 SHA512 b99860f6b76b68cad2e0bde7a8c8d7156e4806dbed1f11f4579dfd8a89c372f7963d90b273a2ca3abbae82072aa91fba475b051b9dfaa7c557e4f36cbb5c85a6
diff --git a/dev-ruby/oauth/oauth-0.6.2-r1.ebuild b/dev-ruby/oauth/oauth-0.6.2-r1.ebuild
index 29b7d4397a7d..84466604d31a 100644
--- a/dev-ruby/oauth/oauth-0.6.2-r1.ebuild
+++ b/dev-ruby/oauth/oauth-0.6.2-r1.ebuild
@@ -18,7 +18,7 @@ RUBY_S="${PN}-ruby-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/rest-client/Manifest b/dev-ruby/rest-client/Manifest
index 6d7f042ffe06..5baad9d4e9f0 100644
--- a/dev-ruby/rest-client/Manifest
+++ b/dev-ruby/rest-client/Manifest
@@ -1,3 +1,3 @@
 DIST rest-client-2.1.0.gem 147456 BLAKE2B 602e3cea1bdb117ad8b783d30741f699b18085fd6dd4f0d26a8a8f3b658bc6f807357a7412eaae312566f1b4d5ee7e311f51d5fd4a8eb9063e8552335b019a2e SHA512 fe5d44409dfe607566b4c0324441d9a3981776699027bfbc92283b1cd425f204211fc872593cb0784e0ca7a5e061e98793540eedfeb1891d9a8afd53a5ce01de
-EBUILD rest-client-2.1.0-r1.ebuild 1238 BLAKE2B 81e1e1532ee8d9f7574d27a4384e07d708a8613637c5efe483b5ad69db5b0d78a2b9c0e1c4be0011793578ae6caf5eeb071db19a7e4373c53b558ecb7f71522a SHA512 68fb173c7ed658ca58ebaa77623c07df87437910258ba13d7ef7ed6875590dc05e1412f7b7b12b64a5ff5a0ada0d1163f6567a6c6368860868c8e741d74ba560
+EBUILD rest-client-2.1.0-r1.ebuild 1248 BLAKE2B d28bf42f6c13bc9c25ffc0f0c8535347cd1c43bf77a2bf3fa6d6d353b0dbbaabc2825f9fbc75f3ccd0b74d9c1c2f07cb7f308bd400abf7e5a3e83ab51b43c3dd SHA512 6b0445f95b628d8ab1d837e0530456c4ca993caea20fbf3e61ec6dda27bce980baa7e701d515f2268cef6b7b4e9d25ed5bcec268dfc5c527f68a95c583ec590e
 MISC metadata.xml 350 BLAKE2B 0f9bc9df0eb60fb95afbfbe988a68f7f13c2bf30e12a2c0a50e752a55b60e4453782ffe56570c8bd413502a376f03b1d18652514a4048389e66f6e383e21ecdc SHA512 1088d5d495489ccc952b2a3edc4db6b5a96b237be2b06ba31775744c4d088fe16c17bea4fd933bfabd1a84cf6b68a1d7419389cb0cc94f86d3f493108a6ac3c8
diff --git a/dev-ruby/rest-client/rest-client-2.1.0-r1.ebuild b/dev-ruby/rest-client/rest-client-2.1.0-r1.ebuild
index 20f6c12c5218..f8909dbf533f 100644
--- a/dev-ruby/rest-client/rest-client-2.1.0-r1.ebuild
+++ b/dev-ruby/rest-client/rest-client-2.1.0-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rest-client/rest-client"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 ~arm64 ~ppc ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/webmock:3 )"
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index f539189890ed..80f8c847a17d 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -6,11 +6,13 @@ AUX init.d-gem_server2 505 BLAKE2B ea5807a1c8ffdaa61bf37315c71d910bbf2bf4b0b4c62
 DIST rubygems-3.3.26.tar.gz 12995476 BLAKE2B c06400d263f64ee988781b49628eebde2b78b5c3cdf3796fe5e1ce5891cb0b41b5e50313293afc72c9b278ab00415b91a862f4245107c63e8eedb9904a5d33e2 SHA512 5aad9f6f0f7187d7d3f2a77ceb50b4b293290dc2e83fb55654c8fdf8e222568d40ef0c64d603ae2ff0db39e7a39ee89ec3c48bb102d434637145863881851086
 DIST rubygems-3.4.1.tar.gz 12999634 BLAKE2B 019364e3abd3b12f2a37b08a8d32546cd002c47653a4cdd4e06d8605010dcfcbf3f82f2d375c6bd51a8f1b462b624cefb85932c075b965d5038c26d6079de261 SHA512 2183f7d6ab914c47c02b53cafa6f39845986e4b38713d320402b98f0f0926dbbd957ef11c00b4fbe8f6c9985a1a5d9f551b2df9d47f00c389026e373dbd6f6ed
 DIST rubygems-3.4.15.tar.gz 15033712 BLAKE2B 01fa4160549d49dbb0fd9e8c2c3c570e837cdb0d074a0ba484bb37ae8b7a19f853387dacb980615f63e4be9ab080e3b8fb9b429da97b6ffe98ea33178efdf2e6 SHA512 37aec02ac91427d3b44b3914308a4262d2c9b2c603b6fdd986ce0858175642290b2588a85540f555d0b5f5342960469337609546c2329d312280bb0accd6c932
+DIST rubygems-3.4.19.tar.gz 15037850 BLAKE2B adf618f326fa83a8eb7febb9872a71f2bf78048dfa7c4db07343c9813ba5d858c86bcd6e54df1a559e60e458ba8d73d2a7ac82ee5e0cbde6e9d8b45c12793d4c SHA512 8d0bc225ef01d3cc5e3ad12a1bf0bbb3923349bb9b79b76a9ac58bb8dcf79666a478a871d19919adc15f1aa2599efde5d3938c61801579277117b569e7007656
 DIST rubygems-3.4.3.tar.gz 15002575 BLAKE2B be8dfb7233754e0ef9147eab1c64d363c38de5a6c296087a193b801c9fa1a12d2a21d7b3b01360f53a30caa6815b3bcdf3d14ecd19ac19dfd2e88115526b5a97 SHA512 7f3907b6ab8f001bd856c2b25b71c5ec32b21b2b5fa16ba369e3108c44698712ac3f5ace430554a4b15dc0adef2d87fa41bffa03dcd01f524fe8bbd80de9807b
 DIST rubygems-3.4.6.tar.gz 15011157 BLAKE2B a06178a1d5dbd8231493dce9d075451062edaa6b4affee6892d60c727e30ef4b7ff7933baf4ae49fedaa684f9898325ed1313648dac318bd62e9c733de374926 SHA512 d1c23b534f2254ff4dec564098f7eba83462eb9348da59a84de01fc4053ef3be02b2852af4542447de89a36d835f68634606040672d2a2f987c5670b9f373fe9
 EBUILD rubygems-3.3.26.ebuild 3398 BLAKE2B 4f24f1d10d22c56199c80976d17b3863c492df0dc9d9504015c680fcc60e01ddf9bb1d41a0debe7a9c092e15351b5b4acb7c3a3768337621f581e6906faa048a SHA512 75ff92f2448834fd246956efcd50708252eabe3d0dc14e15b891e8622b9a902b5e7bdbf69d76a052b974dd6757e38693d6abcb6a402bc03d35a5a1616256db64
 EBUILD rubygems-3.4.1.ebuild 3406 BLAKE2B 990a85be42eddaee7d1f22c68224d8304cb7550bfea311fd085777a6875dda3af4355d207a5b89aa06416f922a085f2ef654025cf56bf300ac5de1f59b48a892 SHA512 2ab1bddf701eb4bdd1e81fcf604139b959f287968c11342031d14908653ae5515ea51bec67672e0dce88ca9ae9ab3a9bfb2080fe1da1f1e9f4c4e4d4f6c30455
 EBUILD rubygems-3.4.15.ebuild 3561 BLAKE2B 888400f9367d8a9661a2f66f432bd690f7a3205cbfdddad722a3fcc40510e12d050b89a00abbae6004d05eabbea28e9c730e89ef93f26459c05951752e010adb SHA512 0aec0a7d956ffff8aadd116b1837e086b17c8a46d1c4238de74446bd075b8dc33385f64de6d0c4b04188a5046c447afa78f66071aa4868515b891d062c64c9a5
+EBUILD rubygems-3.4.19.ebuild 3549 BLAKE2B 8eefc262330781766ab500a34bf3c396d39b1c6f042a4975469018a2a75c63c71bd0faf366b19113eabe207dc0d4bec6db687b27736d5fdb1836d01cbf1b2213 SHA512 5c6969e33714a62f610b40906f1dce877ca356c5fa5ee785ab1e9ba310309d7e2ea8b83322bceca2bdc3a4c64a630603adc4203db8a33412fdc31a155259ecba
 EBUILD rubygems-3.4.3.ebuild 3406 BLAKE2B 990a85be42eddaee7d1f22c68224d8304cb7550bfea311fd085777a6875dda3af4355d207a5b89aa06416f922a085f2ef654025cf56bf300ac5de1f59b48a892 SHA512 2ab1bddf701eb4bdd1e81fcf604139b959f287968c11342031d14908653ae5515ea51bec67672e0dce88ca9ae9ab3a9bfb2080fe1da1f1e9f4c4e4d4f6c30455
 EBUILD rubygems-3.4.6.ebuild 3419 BLAKE2B ddc293424602b865b6949c16bfc5540d9da755618429aa99c61a378bb6154370544704929bd82d4e4f09a86007a3692a0b72e74cab5605890ed871a428f3bc8a SHA512 9fe20194b85ed948d6e999d67601374f14b5b39147e1310068aa8c5787fccd2e046c7e5594da9709f226712ceb41e8663ab09f76eacac21421cf8bd8b18f78b4
 MISC metadata.xml 432 BLAKE2B c63e6f07840e2764fda3c1270275351adef92a243292b67181cc06a0fdbb76ee02e64069149c082d33d75f9407ced54156423b023fc1eb34a800282f0aead9ca SHA512 67ce708fa9f5532770b83481d4b33bb1e21be994dd7c5342c4abcd084b5cbfe544ee692e25a468e99e22174fe685312a3f42bb80f01120fcfe138046fb0a54b8
diff --git a/dev-ruby/rubygems/rubygems-3.4.19.ebuild b/dev-ruby/rubygems/rubygems-3.4.19.ebuild
new file mode 100644
index 000000000000..781d823d66ce
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.4.19.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="|| ( Ruby MIT )"
+
+SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_depend "virtual/ruby-ssl"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/json
+		dev-ruby/minitest:5
+		dev-ruby/rake
+		dev-ruby/rdoc
+		dev-ruby/webrick
+	)"
+
+all_ruby_prepare() {
+	# Remove unpackaged automatiek from Rakefile which stops it from working
+	sed -i -e '/automatiek/ s:^:#:' -e '/Automatiek/,/^end/ s:^:#:' Rakefile || die
+
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults-5.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	sed -e '/test_initialize_\(path_with_defaults\|regexp_path_separator\)/aomit "gentoo"' \
+		-i test/rubygems/test_gem_path_support.rb || die
+	# Avoid test that won't work as json is also installed as plain ruby code
+	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/aomit "gentoo"' test/rubygems/test_require.rb || die
+
+	# Avoid test that requires additional utility scripts
+	rm -f test/test_changelog_generator.rb || die
+
+	# Avoid tests that require a network connection (for crates.io or other downloads)
+	rm -f test/rubygems/test_gem_ext_cargo_builder.rb || die
+	sed -e '/test_gem_exec_gem_uninstall/aomit "requires network"' \
+		-i test/rubygems/test_gem_commands_exec_command.rb || die
+
+	# Update manifest after changing files to avoid a test failure
+	if use test; then
+		rake update_manifest || die
+	fi
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' exe/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { require _1 }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+	newbin exe/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
+}
+
+all_ruby_install() {
+	dodoc CHANGELOG.md README.md
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(30|31|...)"
+	ewarn
+}
diff --git a/dev-ruby/snaky_hash/Manifest b/dev-ruby/snaky_hash/Manifest
index de057df337fd..92a91980b8f5 100644
--- a/dev-ruby/snaky_hash/Manifest
+++ b/dev-ruby/snaky_hash/Manifest
@@ -1,3 +1,3 @@
 DIST snaky_hash-2.0.1.tar.bz2 15275 BLAKE2B 77a7ee4bb4194b991a54e359c53a5a6ab45134026185e976c197737746e20842cff6ecf526d773711ed403cb80a50593429038a6194cd4360cbc7907336335a3 SHA512 8d618410106fcab5b986de5047db8bd6e4192b3ee27926107428e82aba905a66203c0cb1dd83de50b89aeffe0e29e93ae0c36b175d7751b8f68249c8014061d5
-EBUILD snaky_hash-2.0.1.ebuild 897 BLAKE2B d04ed5cebccc817cbfd1561b4e77cfe88275d1ffad03ebaa8736a390367d89d8e1db7310029439f16703f0d2b397981243623455123f715f6c0944bb8d77e904 SHA512 dd857c9b08ec3ec88c7354708f45a69e6d2f5e92651f814434b38b14e9eaf480cfb2d6e20c04a5fd9e7509fbe053617e42bb252535595a5594a4e04e97c03142
+EBUILD snaky_hash-2.0.1.ebuild 907 BLAKE2B 739e07e79fdb86ef83785e1af927525b2fa410d48423ab486559940c9cbd8c63eb0c4db758c5fcad965348905532cbf9c60526c7c14c51233efc0acab5b32ac0 SHA512 643231db9891fa218aa5e716e53d3709f320ad1b38f30fd06c2821e176a7b2b29a4bf8288fb8d0de5a328a3dec8d8734cd45153b547ffca7deba438cffa8009d
 MISC metadata.xml 346 BLAKE2B 303bbd4380d125fb7e651059fe84e244b380a899c8a2b0b25266c3319048e28f136032c9a35dbc0e0674dfa2683d659fa5e30fdfcf8cb5d4526125bf3f7c3862 SHA512 c0c7f5ae3566ed4b982b3bda86436900df48ed93350f1482c03dc1e6bdd80e46f0699dbebdaf56808002f2391fe546d55b8d03ad44add829f0f84fb0ab2a52fe
diff --git a/dev-ruby/snaky_hash/snaky_hash-2.0.1.ebuild b/dev-ruby/snaky_hash/snaky_hash-2.0.1.ebuild
index 26b1db17da94..34882129dcfd 100644
--- a/dev-ruby/snaky_hash/snaky_hash-2.0.1.ebuild
+++ b/dev-ruby/snaky_hash/snaky_hash-2.0.1.ebuild
@@ -19,7 +19,7 @@ IUSE=""
 SLOT="1"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
 
 ruby_add_rdepend "
 	dev-ruby/hashie:*
diff --git a/dev-ruby/twitter-text/Manifest b/dev-ruby/twitter-text/Manifest
index 71dbf4c820b4..30ec9c18cba8 100644
--- a/dev-ruby/twitter-text/Manifest
+++ b/dev-ruby/twitter-text/Manifest
@@ -1,5 +1,4 @@
 AUX twitter-text-3.1.0-frozen-string.patch 3372 BLAKE2B 2c6eb1fcb05561a8bed4114f8b86547532f53c4b2981e14387518ccc7daa69ff0ddbdabeb892cb125c97420a74e8c121f5241b500803ba6a8ef27e6c6d297c1f SHA512 153e0eb1d41e43517ea9604aaebcea40ab814c168654c76276a94833d393250ae10a3be54b83ee839660c37645df25f4144a124e4942aa34b5fd8471ef065320
 DIST twitter-text-3.1.0.gem 59392 BLAKE2B 91f906db8d4cc17086b7bc421f1730646756aec9e041166e18d816da4b680282f312743c52e412e6595d7565c2c7faf0dd18fea815f3bbc53afa675a33ac3c66 SHA512 b0d5a876bd9c1d4788378ebd5029bed51db6a0c3a7cd2c97433eab3ec3655d7bc427c3873364a368c0a10216871c7373e762cfd57c4bdd69800adc95869aa03a
-EBUILD twitter-text-3.1.0-r1.ebuild 764 BLAKE2B 2dfec253926218b078c80181b76eecc17976c71ae9a0ad3201f266c53a3bf6947602ba2649f303ff1a9e2fbdc0aea61f3b6b67bdd3eb63c0476c12a5ec691418 SHA512 8ba16393e43e0d641f0ba19532eda2aad6bdf1fabdbbff545b785cc0a43f9f9a749b132fb5369c7d5c4744f75e4dcdef14054f33c384feee4d13a467d98c4059
 EBUILD twitter-text-3.1.0-r2.ebuild 757 BLAKE2B 45090726ff03deac8844f9f7ed7402ded4c4bc798c38579d6ce771fe4e870fcfe57c7009ace00d567301d97dda2e4b6e9ea53a9fd8e011032fbb36dad391a93a SHA512 993658ac47756e17ac0dad6baadeaebe4d5022a4ee3fba9b4f5ce30116623205a41d97300f4b09e313bdbbe3e4e55d08838750795c0bab7898195e6e417b4dda
 MISC metadata.xml 347 BLAKE2B f4d210a46945a96bb9f519ecfadddb07ce5d9761be0591eeecd68497b1a5ffa1d6d1645e2c10da6d69ecd08875cf6d8ab2cbe047f78454dff5ff0eeb6dd39344 SHA512 f912b1e9ee80be32d46ca2350f3f0e47c97ce9a3e0bc5b860886c6067a57fa8366f89ce20dc3eeba6e4137f8adfbd5d70f7cc9c396eadca89de56ed6fc0363ca
diff --git a/dev-ruby/twitter-text/twitter-text-3.1.0-r1.ebuild b/dev-ruby/twitter-text/twitter-text-3.1.0-r1.ebuild
deleted file mode 100644
index bf9b100b8fcd..000000000000
--- a/dev-ruby/twitter-text/twitter-text-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="config"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Text handling for Twitter"
-HOMEPAGE="https://github.com/twitter/twitter-text"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~riscv"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/idn-ruby
-	=dev-ruby/unf-0.1*
-"
-
-ruby_add_bdepend "test? ( >=dev-ruby/nokogiri-1.8.0 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.1.0-frozen-string.patch"
-)
-
-all_ruby_prepare() {
-	#sed -i -e 's/2.14.0/2.14/' twitter-text.gemspec || die
-	sed -i -e '/simplecov/,/end/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/version_gem/Manifest b/dev-ruby/version_gem/Manifest
index cb18d2266050..b4dd1e255cce 100644
--- a/dev-ruby/version_gem/Manifest
+++ b/dev-ruby/version_gem/Manifest
@@ -1,3 +1,3 @@
 DIST version_gem-1.1.3.tar.bz2 24554 BLAKE2B 419851cb5fcc5391449b28785aecc1c4e145bed4eafb443cdcd284d3b19d0911307afd226e43a829f34784a2fe7ece5e7e00502bfa5a9b0bb7eb49d0b6dcebf4 SHA512 77e90c6c2a52495ad9096fb83a10492f5b9bda35160287e15898351204ead174677021bde58f5dc7cd8f02f1d599736b3c3b7aba291f73e44edece10c61646e4
-EBUILD version_gem-1.1.3.ebuild 905 BLAKE2B 580ed50cd1dc7ec6193c5d40a1a2595e1ef2ffa7eef23deb5a537bb16e158e9e3f77d300406130162b6f78aee0d6a0a4306a1e079e5f9f2acbf695f584efa67e SHA512 b22e0a5fc58a790ab2415fd75e4c6fdebb8796e975e946c0928d00d2a30f691ddb81a7735e0e7f835e299dee8f26894808011956820f4cd067c22be4e0abdc67
+EBUILD version_gem-1.1.3.ebuild 915 BLAKE2B da4860553f385a82848882264892b530c2a8b8bcd569bbac856039cb9afb116314b25bd3a6129011fab06784e4c3f92498c3532fc215ea5a890832a8bbb62377 SHA512 f082e3aab29651ec77f8f82fb89deb5e987537f14d8775ee6387e678495a8702e951dda8a49048d8d01d72d3e5a97d4764ec8b1c3811c24e858d9f8e74e18ea5
 MISC metadata.xml 337 BLAKE2B 6b8f52ce757099053fbd9bf52f2a6caad31a3931b1bfadef4b9015819b4b42fea2ef0809dd1776e82a56579bcabb0adcb1c20dde895bd6cc0bfabae929eccb49 SHA512 9dcbe6f537b05341c59dfcb698898d08db81b85e5942b522a7f62bb7499e0ecf412a7068d1abddba8f89f0a23325949b32c16d6411dda377740ad6d61098707f
diff --git a/dev-ruby/version_gem/version_gem-1.1.3.ebuild b/dev-ruby/version_gem/version_gem-1.1.3.ebuild
index f6a773fb4e2d..fa85a8b3ac6c 100644
--- a/dev-ruby/version_gem/version_gem-1.1.3.ebuild
+++ b/dev-ruby/version_gem/version_gem-1.1.3.ebuild
@@ -19,7 +19,7 @@ RUBY_S="version_gem-v${PV}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/vlad/Manifest b/dev-ruby/vlad/Manifest
index 3869e28c91d9..52036480dfd0 100644
--- a/dev-ruby/vlad/Manifest
+++ b/dev-ruby/vlad/Manifest
@@ -1,4 +1,3 @@
 DIST vlad-2.7.1.gem 29184 BLAKE2B eb35f357d87daaf2903ca880139ac41c1725419fb6f0e3d00e1a31fd24697373c8d4869e31d17e6dc88ce31ecad1a0747ee2ec08a31871b4c44b32dce28424bc SHA512 520ef393fdf63daa348015306003cdd3bd9b8f162b44b31d78c170d1ece466b804226b030640a180a8538c6908c77d80dcfc13078ce295a6c59f1f5b9df9ef13
 EBUILD vlad-2.7.1-r1.ebuild 675 BLAKE2B fc739914cb827d4b1653beeb629daa9fd0c72c5deda83c11fa5539b59e4499cda917752c0359a9308a133bcb8b9f27157ba12b05815392ed044bad945a594242 SHA512 c1ff15d8b2d48f26a5d491c8f79315e63d6a826b2fc07c6fbe387b5e223f793220b6875dd2a7a9f308a5500267abd552ada41083c00ecc4dc5e79c8e8ab615c1
-EBUILD vlad-2.7.1.ebuild 682 BLAKE2B dbd84453794e7a81c3ef8854150f271ea3271a76cbb93a236d526ead9e0214ac26a83cc1d22cd06fe1139c081a7ae8efa866c47754519872e1369003288fe52d SHA512 0357a595e96a330c50bd8b78e2db3ae33b5a03a600fa25e3a4ae525a6bbcaf413f038178ef478177bd8180bf39ee7f5d39a9809920f2e7babb892e4bbd047085
 MISC metadata.xml 331 BLAKE2B 661624a43915d8fcccf94036b2085e1cf5b45d3a8fded8338e67b5002f06e4efe6b8e26313dcec8a63c69b5fcf79d655401f77f3da527369e890e66e48d7c07e SHA512 e8a7f5a1bc506da374286f878db036c3faa9716f88cd9b73c88d585a98a35fa051749e93555b5bd8a6c2073f3ae77707358c4129d2f4061ee459e563c529fafb
diff --git a/dev-ruby/vlad/vlad-2.7.1.ebuild b/dev-ruby/vlad/vlad-2.7.1.ebuild
deleted file mode 100644
index e3b6319c8944..000000000000
--- a/dev-ruby/vlad/vlad-2.7.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="considerations.txt History.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pragmatic application deployment automation, without mercy"
-HOMEPAGE="https://github.com/seattlerb/vlad"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend ">=dev-ruby/hoe-3.13
-	test? ( >=dev-ruby/minitest-5.7 )"
-ruby_add_rdepend ">=dev-ruby/rake-remote_task-2.3"
-
-all_ruby_prepare() {
-	# Keep Isolate from managing the dependencies.
-	sed -i -e '/isolate/ s:^:#:' -e '/rubyforge/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/webrobots/Manifest b/dev-ruby/webrobots/Manifest
index 8a339e04c4ae..f68395ab2137 100644
--- a/dev-ruby/webrobots/Manifest
+++ b/dev-ruby/webrobots/Manifest
@@ -1,4 +1,3 @@
 DIST webrobots-0.1.2.gem 24064 BLAKE2B e77c7b83b16faa7c6d65f6133a5e2231a4e270d8463251c2e6a91a5bd1f11af431d4bca4f11bf40e2e84829c1b8256a39d048a371ce4a062af6bba9dafe25c49 SHA512 8b2a27a1758e613bced16b59a2b1708f468921388882d7ea483c7b6cbb5173fa24032f4db271734820225c5e90d3f30d07c5fb682d0d807c637f535ef7256097
-EBUILD webrobots-0.1.2-r2.ebuild 903 BLAKE2B 4c30f353b93baca4b3a9c43a0830f292b79375eeb11a048f7fda21b1473e9f7cd19f5b4da67eb53ff191f6e40b05c4f448e68ed4521394e29e236252760df366 SHA512 92b106ce3e87ce8bded5d95182a5407b86ee77b812932da03e5d68bbd0f631be0c08c98361e56c48f337b978181ba50724d5d95d68f2ecaf3fef1386acdbc7a2
 EBUILD webrobots-0.1.2-r3.ebuild 896 BLAKE2B 4dd5137b1d895c53666ba0c7f06a58224b19ad1315325218670ea1b40d51bfc8ea61e5cb30a217f946f16a8a69f268dbcb24431095fbd4561283d49a6206301c SHA512 24ebf0bf514e8af5b8dc4b4c57e02551acdfb6e1b38174e4152ae90f40fc6d7097210014d893a4c2334f5e39b7eafa4245e38cef5d8f0c823228e7d16dac65ca
 MISC metadata.xml 381 BLAKE2B 1a1d8501cf1cdacc97dbbe35fca3b6db2babe2119025f7a07262d60158b148efe17535489bdf86707006f91e240c86af41e39827bdd0ca8a73e04cb0d18d9846 SHA512 61829d93d167a9a051155dc27f89a2d5c0ac0f7c0e88f47ee9a892a98dc9b0c90b4b695246f6de904b116f97f43e35cef836776ecb6cac9566e1c855ed71025d
diff --git a/dev-ruby/webrobots/webrobots-0.1.2-r2.ebuild b/dev-ruby/webrobots/webrobots-0.1.2-r2.ebuild
deleted file mode 100644
index a3a16106e5e1..000000000000
--- a/dev-ruby/webrobots/webrobots-0.1.2-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library to help write robots.txt compliant web robots"
-HOMEPAGE="https://github.com/knu/webrobots"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.4.4"
-
-ruby_add_bdepend "test? ( dev-ruby/shoulda dev-ruby/test-unit:2 dev-ruby/webmock dev-ruby/vcr )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/d' Rakefile test/helper.rb || die
-
-	# Avoid tests for live websites requirering a network connection.
-	sed -i -e '/robots.txt in the real world/,/^  end/ s:^:#:' test/test_webrobots.rb || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib test/test_*.rb
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 35b15428fca5..55977946d82c 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 4eebad437eea..2ce940e7af3a 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -38,7 +38,7 @@ DIST cmake-3.27.4-SHA-256.txt 1646 BLAKE2B 42c905f7550e0140ca28f334dc4cd8b244f57
 DIST cmake-3.27.4-SHA-256.txt.asc 833 BLAKE2B 983a89f1637596ebf72e5456a488293bd2dcc21ade8738051279ce43d18244573b912acb7bbe3ff5d52e4b5b52f2bb23784a0750c84997d311d925dd3a608c11 SHA512 f99f606f9907581c3f121b4e0d99ec54a439be35012ca94d4762ae95764c01ef5aeda848dd9c460e340a284e9c3d59fd97315006bfd259863551ae6764af2e4e
 DIST cmake-3.27.4.tar.gz 10980052 BLAKE2B 29991e736c3ed901d30f656742f236e78854fbc13b543f02b08348733e2d4fbc5ef2e4b32f5d2a641c0a1eeacd091db6cc71643f000e9c5505718d999897457c SHA512 fc04b041f5c73b0a969ba09251e00e20f33e7a76460630d60e95ce08086c6b41b82315bd8782c19070b5f12a4290858825687f816b69ad5df8101053b4a2b48a
 EBUILD cmake-3.26.4-r3.ebuild 8804 BLAKE2B fdb48b62ba66d6aa0f162bded4ef491f9476a6289ca61804eb18f328d8bafffbbb10f0134dfc8d10fb54032d3703444244d3ea7a62069505b2ee600a9b957e3b SHA512 faef92a7b8f1822c1df936e5bf89f533eb33d192dca09e140e157b6d4d8589ab73bb49189de998e91f53c4180e4c014e38b4d64bc5865a0c2d1e47dfc70a477d
-EBUILD cmake-3.26.5-r2.ebuild 8806 BLAKE2B 86a7455c2b30d72e619829259131bc0df90d47dd17404c291a7d603f998413745e4fce635ee4199ad529a974f3bc35144c958ddf0ae5c32e5d6b55e8080478d7 SHA512 3e91d7deb1b64b4853924222a46e9d29c5b158b574f985b70034d489acfa8897e2a8a7dee09162f144c8e889390d473fb1e8a0e20539d915f928ebe91d62b685
+EBUILD cmake-3.26.5-r2.ebuild 8805 BLAKE2B 1da0302fa4bd402e226a898ba1f43daf22ca6ad6d9f29850c57729448b9c83f6f39866e2f07f043849306bcf4568a85203c3b35be915428b712238d639aff5cf SHA512 ddb5480a9deba4eeaba8ee57d5a712887525544b720908ce5a5c3dfb5eb49c347b86f6f08d4cb85d2dc9cfad161761092c59900dee875ad07666ef0bb821da4a
 EBUILD cmake-3.27.0-r1.ebuild 8849 BLAKE2B ed6173861ae15105593bf630c3607deb052ebd0438730bc57c35ac9570b45a22553141e5740c15c3ca0ff36d8aeb19d382cb9233ed126ceb063f3220adf2391b SHA512 892305cbff5371e828df8b794e2937abebc5623f03d15c28d90bd128efb6225997135d581005aa23392867b1ec5c230c627d1082ec192c7e536633d15682440d
 EBUILD cmake-3.27.1-r1.ebuild 8850 BLAKE2B ed2824ad05508ae192ad1fe569a6d7687f969203681a8fdbe4c11ba0098bd962f46c3e5b5a9a3d7190666db0ee144778d451da9d0ca05e1f96937cae6e0ec5e5 SHA512 d2b68386b06ba232bb340d46c1e9159b314fa4027eaa3efb151db22211148dc608a70fdc4b3690fb1030c9538b929697abb42015e30f2aa1f8d1271c936a2840
 EBUILD cmake-3.27.2.ebuild 8850 BLAKE2B ed2824ad05508ae192ad1fe569a6d7687f969203681a8fdbe4c11ba0098bd962f46c3e5b5a9a3d7190666db0ee144778d451da9d0ca05e1f96937cae6e0ec5e5 SHA512 d2b68386b06ba232bb340d46c1e9159b314fa4027eaa3efb151db22211148dc608a70fdc4b3690fb1030c9538b929697abb42015e30f2aa1f8d1271c936a2840
diff --git a/dev-util/cmake/cmake-3.26.5-r2.ebuild b/dev-util/cmake/cmake-3.26.5-r2.ebuild
index 918bd3c6db72..0f86727af214 100644
--- a/dev-util/cmake/cmake-3.26.5-r2.ebuild
+++ b/dev-util/cmake/cmake-3.26.5-r2.ebuild
@@ -48,7 +48,7 @@ else
 			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
 		)"
 
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
 	fi
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index c0f6dcc8bb18..d36ce1a0f144 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/lolcat/Manifest b/games-misc/lolcat/Manifest
index dfc19d1ac31e..558ef7979919 100644
--- a/games-misc/lolcat/Manifest
+++ b/games-misc/lolcat/Manifest
@@ -1,4 +1,3 @@
 DIST lolcat-100.0.1.gem 121344 BLAKE2B 0105987695990c93e2676babd238f10b586c8f742d40d35281cdf131b1db8ec019cd9c9c2cf1e6d8c248a9e9d2a7d5194aecc5b2fe09d04a11c7358b7d63bb61 SHA512 b257d264f8059e6722eaa66125b990414a77e8d67b47472a8e974418408bcf5fbc0a7c7f1e42517660280202ee2d669c3d3850d546356bd2f5e2e84e61af33ff
-EBUILD lolcat-100.0.1-r1.ebuild 699 BLAKE2B dac78bf9ff06211af3d4560fbcbc979aad3e0c17e13ac2c102f5dc0d246162c478cdfbd09794131989ac12fc440e641cf0441d8bac652ff0f541dcc29fcf5e7f SHA512 d0bbc267725f93ea9e1e6487345184d46116ef8275bb317efafd1b9387cccba8b91899b9ff593f2f18bdbe591223191f4c19946d85f0e337fe9006b3e89ef597
 EBUILD lolcat-100.0.1-r2.ebuild 692 BLAKE2B 85b58b73422427016fdbda4fd010d9172e861a358ddf9c1ef351ceb74153739f28493300e63c0adc91a727042f57a1d7d48a61e52e9f6001dd207063b17b7938 SHA512 19722d3b5ecabd0903142c79eb8f4cbb7407b0c127b00ae06b8e7bc3c21a217fa49d465410bb7760cdeeb1a098122cc0b06f622d9dab5bcf12992827dbcd1293
 MISC metadata.xml 334 BLAKE2B 5a9eb97ff47cfb52ab6eeb149b29a4898929e8bd4d9eeea4d1fbfc6e93e0d7e29b28f1e83f70cb734aa9cdbd6cc4f1ce30024e5b46f05d31c7232e120f702228 SHA512 67fc345a154ea731b69b9eff553e679a264e3707126b5f9753f48948c3a7821f2523c11b3f685296546b9b81b0fc75b265aecc287ca4a222c09c45a3d75b8db7
diff --git a/games-misc/lolcat/lolcat-100.0.1-r1.ebuild b/games-misc/lolcat/lolcat-100.0.1-r1.ebuild
deleted file mode 100644
index c6d1d0dba2b6..000000000000
--- a/games-misc/lolcat/lolcat-100.0.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="lolcat.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rainbows and unicorns!"
-HOMEPAGE="https://github.com/busyloop/lolcat"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-ruby_add_rdepend "
-	dev-ruby/optimist:3
-	>=dev-ruby/paint-2.1:0"
-
-all_ruby_prepare() {
-	sed -e '/manpages/ s:^:#:' \
-		-e 's/git ls-files --/echo/' \
-		-e 's/git ls-files/find/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_install() {
-	doman man/lolcat.6
-	ruby_fakegem_binwrapper lolcat
-}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 79ef9cfb1a5e..b9c3f3ca9d2a 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index f118ce0c2294..53e8c01bf690 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,5 +1,5 @@
 DIST kleopatra-23.04.3.tar.xz 2621348 BLAKE2B 27c3fc90d34ad98c499a92498efe6081fcb939052e360dc5fd7a28762aa8695a75f9158e1aa5ba3099fcee00cf46e23f4db53f5a75eec425c757f7f920ccac69 SHA512 54b13af480ccf70ea028300fb07cd2080c7807939fc1afc53dbd335423768a6b700fd8e7224980abe3cfaf61fb8bf451c90a1e8ec85150d6eb9633769bf179c4
 DIST kleopatra-23.08.0.tar.xz 2678288 BLAKE2B 939866c63c3e2dde41d3089c80321993dcad048efc57200e8b78c73f6b1bab30163542e29d32c3f7a605c8860bcde4d6f57552f4461995c68d153f14dbaee55b SHA512 8e775dce32b27cb2d76aef8ac17b6bf5636f24754e792dab3c5b243f1e448bd66c1540d540f8018adaeb8c2b9c23f2b96ff0297cc6943fd9e15940f8496d31ad
 EBUILD kleopatra-23.04.3.ebuild 1769 BLAKE2B e3312106d8f471caa9549f34afaaaa806b6b903c767366ceaba0098ca5fe50095367ad6010c0d63bcb56934817bd29deab1941e5319745470db25fac2d10772e SHA512 59ec19f722675ccadf397f9edc49dc4b0e04a934258949e27ab91c5a93d3377fd5dcea8a9cac102d3d46b02e2177dd7aa6b11939d3c9ed451080e914125ebe82
-EBUILD kleopatra-23.08.0.ebuild 1842 BLAKE2B e3773fae165e55cc016dc4f8eed44e4570b2bc67b39c022560bfc8014cbc6bb5a34ceeb1a8a4a3b976da680f337226eba0db6716a46777e3b2ad160cb4fd9fae SHA512 28cfc2cd7f6f0f2631c32f587443b252b7a7a24979271efdae9ca5d78f6c4f0c895d6269edf46586a62c65c14b5b3a28e895eba093a4b09b1227b8635c8ad6f1
+EBUILD kleopatra-23.08.0.ebuild 1833 BLAKE2B 7f9ae58bb8979d157fc31682ec26044bcc0d5993c65edeea6929c650c9dce8966f9a70c402478439e90972f374db79a3d0b5ef34cfb038cd311ecc88372d6998 SHA512 09f632f5b112eeaceb7bc923b213c823b6b6a61c50ef2a81385e312066fb36b1588963a9403ae4dd89761f4d645842b6794e07024ca7acfcfde129b25bfe47ef
 MISC metadata.xml 421 BLAKE2B 2d59a8c375d953a93b35184503bffd26005b4ce8e5408ffc0e1f6dd5283d031d2ed2d6bd7036d380391499ce50d4dda3fde3432e6f4f0106145beac01641c87e SHA512 df430c37f0b8c4f78b9490bdaa784bbb676d9f4e103d5a016b3f46492dde84bc7763597864c42e7be1d4c070951f49cfd0dcda10e90cf0fe20d7b212eb07db16
diff --git a/kde-apps/kleopatra/kleopatra-23.08.0.ebuild b/kde-apps/kleopatra/kleopatra-23.08.0.ebuild
index ae7a49727963..77183f19dc7e 100644
--- a/kde-apps/kleopatra/kleopatra-23.08.0.ebuild
+++ b/kde-apps/kleopatra/kleopatra-23.08.0.ebuild
@@ -60,9 +60,9 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
+		$(cmake_use_find_package pim KPim5AkonadiMime)
 		$(cmake_use_find_package pim KPim5IdentityManagement)
 		$(cmake_use_find_package pim KPim5MailTransport)
-		$(cmake_use_find_package pim KPim5MailTransportAkonadi)
 	)
 	ecm_src_configure
 }
diff --git a/kde-apps/yakuake/Manifest b/kde-apps/yakuake/Manifest
index 55271ba63b54..8fbef77d6bc7 100644
--- a/kde-apps/yakuake/Manifest
+++ b/kde-apps/yakuake/Manifest
@@ -1,5 +1,6 @@
+AUX yakuake-23.08.0-cmake.patch 803 BLAKE2B f6b0d13e6bfac744e1a853da0fac4d688d9c56ac2f8c5c52855fd52c1353c59958fc938abe31e1a519bffcd094695a237dbe5c0310d3f81a3ea4be47bc0f3322 SHA512 a2863be25e1f3170c0f02dd1b4e6fac3100c791ec30b97a025dc849ff35ec405bee3a192ee25894770ed395c09ad284076c41e57666d3b0d8ef304b550d8e181
 DIST yakuake-23.04.3.tar.xz 428664 BLAKE2B 3dd43f9d2b93faad5ed2c1ae01ef84d70d9d0f344441e62675ad510c8af85035bfca37749885b107354115e172a63c781b1017ff3eb6aa9224fc355a0fe9b707 SHA512 2d9cd878d593733a8e84900079b367eb7bf28102d2c60be6e461082853bcb5cf7be0745b19c21e6678a6c5675047ce4fe86e9f1085f0b8996547a195e60f3741
 DIST yakuake-23.08.0.tar.xz 428848 BLAKE2B efc269254a38338315778cad987ba7176252fcb7c6de187593bc5c0a69c94b289d5acbc93ad38ed1820b31f79cae80418813566bfd81508cd0f7d7e2be02b259 SHA512 940d60482d6b69c65ff13c746b80786440be156dac135be6fc322112998dc382ca5c7b4526f14dbaa8d2d834f3b0e88d0183e2d40ced83087ccc578e079343e0
 EBUILD yakuake-23.04.3.ebuild 1586 BLAKE2B 0e68c3c3723e7b9dff3201466849094979bcfac2be697a58b93b4a25a76b182d4a57207b79852f08392cd9562fbf3e19290cfdc9d22d9b01fdc108b8f3759e9d SHA512 6cd7d6667647439f6246d5845c08abdf0046968ab2c88a471fefce3c909087a9bc2b1f33e4355a15174d0abf8bd258c6e92d9dbe09103605b053265a05923304
-EBUILD yakuake-23.08.0.ebuild 1589 BLAKE2B 4d692ee9627982bd9b17669362b73dc2631138af390ab4fef6a675e2168cf3eefbbff883bc17eab60b891df026d5748b40adc05b47f19ca7c39096723c117cfb SHA512 abf54c4f87276582d583825e4264fda1942f42dc2d8355d47bc9faab1023d8730931229d3324f1a3e33ba367e342914366759a4dfb430f3f6424dc1a74fa990e
+EBUILD yakuake-23.08.0.ebuild 1633 BLAKE2B 46af1cc0a9ecacd27eb1a8868404ddc13c4b987bff266386427947ce00e8e415e24010868a60a461455808531199bf13b3333c008a3afe961a0ed61d74e22ae1 SHA512 6d516e0626c3c2fec014f32474e6e2cec060d506e87b2534b3093be152f90f71501bdbd75be373c9f8462f2194d48eadbda7c9fd8ca7d00b227ee061f32fde41
 MISC metadata.xml 730 BLAKE2B a366bbedfe3a0b4257147f664f48130ff318a003433134d63e4bd076b9ee43169f28798e0c8da2e13804446abc2b80b1c5327c7468a1f8d6e8243c44c3c72c60 SHA512 7594648f5354d0660fa1063c52fb99af6955b0f3de5603a7c9eca3d1a24db24315990efa13f85680e56d63f77bedfde01f5728271594be794bd896fcf0f01f56
diff --git a/kde-apps/yakuake/files/yakuake-23.08.0-cmake.patch b/kde-apps/yakuake/files/yakuake-23.08.0-cmake.patch
new file mode 100644
index 000000000000..808aa488d0da
--- /dev/null
+++ b/kde-apps/yakuake/files/yakuake-23.08.0-cmake.patch
@@ -0,0 +1,28 @@
+From 0d0a3639b1c1e33aa49e979879e29064808a0a96 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 26 Aug 2023 12:49:24 +0200
+Subject: [PATCH] Fix broken HAVE_KWAYLAND assignment
+
+Fixes up commit 3e58132f2315b99d0d8c8c233a8183079356506a
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2d143f9..bfdcd12 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -80,7 +80,7 @@ if(NOT APPLE)
+     endif()
+ 
+     find_package(KF${KF_MAJOR_VERSION}Wayland ${KF_MIN_VERSION} CONFIG)
+-    set(HAVE_KWAYLAND KF${KF_MAJOR_VERSION}Wayland_FOUND)
++    set(HAVE_KWAYLAND ${KF${KF_MAJOR_VERSION}Wayland_FOUND})
+ endif()
+ 
+ add_subdirectory(app)
+-- 
+2.42.0
+
diff --git a/kde-apps/yakuake/yakuake-23.08.0.ebuild b/kde-apps/yakuake/yakuake-23.08.0.ebuild
index e26baa415e5c..dde091307229 100644
--- a/kde-apps/yakuake/yakuake-23.08.0.ebuild
+++ b/kde-apps/yakuake/yakuake-23.08.0.ebuild
@@ -47,6 +47,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package absolute-position KF5Wayland)
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 2c8112db10e1..9900e3aca861 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index cd7bdacc398f..8ac1f2a01ad9 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,5 +1,5 @@
-AUX digikam-8.1.0-cmake.patch 5948 BLAKE2B c1fde60bf77039a4d4a974a9112237e014b27cbbdae0348965dcff97377e5a4929dc04a6c12e71e38534554e0bf55ef5cdd0e4a1c099996ca237f7dc3acb44f3 SHA512 65bbba111168809a6afea5c001b2af6cab8a04f9547abcec8adcd535d4631b28e274e0a93279519f7fef5b92aec1019e09973ec92e27d55a4292b7557ddcd4df
+AUX digikam-8.1.0-cmake.patch 6067 BLAKE2B fbb3c441dd0214417fda0650997300bc9a53cab10c58fa29d3f0d5bf331b877a126a9d2577a230ff397355610dfa7f7a6a689e625c371b60448674ba8ca05c35 SHA512 2b042cd0264e521d9b353a05a1aac0a78e1b9b4f4f00aa58d68f2f4fd3940cc17bfb5025ac730c71b96d59cd4abae4f816c552ac0cd58aec3a7f9dc9b1de7415
 AUX digikam-8.1.0-fix-config-for-scaling-high-res-icons.patch 1613 BLAKE2B 774c24f498c37ccc9a3eca7165734b870861f38b7d196f3b7ad75eef4340854be3c20988fc043b6e7c3a6ac53bf7529834f28daf8fabed9d8692dbd60016e65f SHA512 31197b360de14d858379cfd2a937a0a2a21e16b60ad7a82aafa3fb67ddeb2a3e9ecdf190fa4bec1a97bb912c44ed594104b1a5df40f1c317ea1b0e9f8e76cae3
 DIST digiKam-8.1.0.tar.xz 35712348 BLAKE2B 0feaa66ec27b0c2a9e776f26c02987554e8653cda29ca1982182ec1a0f70783808cd2e269dcee1f2b65e6e29ba3bc483a2284a6a485c0b7cc46ae80dd2f87069 SHA512 cbf5a776b4138f4f05d074721324b046dfa07ddc01259f569ae46c46a6d5b0b00824ef0962a09041081703348e4defecf15cff800b2c6cf5e04a0e7e963a3ef4
-EBUILD digikam-8.1.0-r1.ebuild 4336 BLAKE2B 061ea80c923e46f72b296805b3772a585c5574880f622a6e8dd419fc1e3c819eb069127b67e355ef0fc472bb18f23e6dc69ec8c3ed4ccd53b0cf94edac1e85c8 SHA512 028b4cd48bfd08f5f919794eb8216a063d6f3ddbf0e87024a0ca0afb840bf532548d54f5378465b2a48ac79519d736314475eee8c1bcc64d93ecd717c37c3414
+EBUILD digikam-8.1.0-r1.ebuild 4707 BLAKE2B 9328b7de79fedf579e7b40fa561dd3300843b1646207aa57c96ebb5124932f073a7ff81f2793e5690ce9d8b7a6efa8816e485e7c47ee3604239721c16e022175 SHA512 2d15904f13e3e861740fd044da8d1c9938c33027c7d63429746383e5bb6278fefc1d75b9f7d62cb1951e93d132129b604c6e7c6975ab0838304794e308ea32c2
 MISC metadata.xml 955 BLAKE2B 49eb64d1179383122e4fe65b2edc22929b46dba0fdb44cbd6230b33268143a9c7d4dc56a7414029864bce0a06c60c56476abc0264f151fad356020b5998b79e3 SHA512 dbe088987df5f09a8d166a293423f006eb97ab57fd0415871dc30a1a066e33a7e9e4c13a5608dd69dd96b06082bac5c216c7d9506ca60d326ab10ade96b6af39
diff --git a/media-gfx/digikam/digikam-8.1.0-r1.ebuild b/media-gfx/digikam/digikam-8.1.0-r1.ebuild
index 3eebbe374fb0..1480188f76bc 100644
--- a/media-gfx/digikam/digikam-8.1.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-8.1.0-r1.ebuild
@@ -122,6 +122,18 @@ pkg_setup() {
 	ecm_pkg_setup
 }
 
+src_prepare() {
+	ecm_src_prepare
+	if has_version ">=kde-apps/akonadi-contacts-23.08.0"; then
+		sed -e "/KF5[:]*Akonadi/s/KF5/KPim5/" \
+			-i core/CMakeLists.txt \
+				core/utilities/extrasupport/CMakeLists.txt \
+				core/utilities/extrasupport/addressbook/CMakeLists.txt \
+				core/app/DigikamCoreTarget.cmake \
+				core/cmake/rules/RulesKDEFramework.cmake || die
+	fi
+}
+
 # FIXME: Unbundle libraw (libs/rawengine/libraw)
 src_configure() {
 	local mycmakeargs=(
diff --git a/media-gfx/digikam/files/digikam-8.1.0-cmake.patch b/media-gfx/digikam/files/digikam-8.1.0-cmake.patch
index 16c1ffa5c37d..8e1f71e661a1 100644
--- a/media-gfx/digikam/files/digikam-8.1.0-cmake.patch
+++ b/media-gfx/digikam/files/digikam-8.1.0-cmake.patch
@@ -1,20 +1,20 @@
-From 05b6e81bd4ceca8d6166aa0a000919cde2bfde3e Mon Sep 17 00:00:00 2001
+From 5171575601ebc553cb747a2757caf63b433820b3 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
 Date: Sun, 17 Feb 2019 23:51:03 +0100
 Subject: [PATCH] Un-break optional Qt/KF5 detection
 
 And if we enable an option, make the necessary libraries REQUIRED.
 ---
- core/cmake/rules/RulesKDEFramework.cmake | 34 +++-----------
+ core/cmake/rules/RulesKDEFramework.cmake | 41 +++--------------
  core/cmake/rules/RulesQtFramework.cmake  | 58 +++++-------------------
  core/cmake/rules/RulesX11.cmake          |  7 +--
- 3 files changed, 18 insertions(+), 81 deletions(-)
+ 3 files changed, 19 insertions(+), 87 deletions(-)
 
 diff --git a/core/cmake/rules/RulesKDEFramework.cmake b/core/cmake/rules/RulesKDEFramework.cmake
-index 610033425c..2d8acc7956 100644
+index 610033425c..3ea9b1351d 100644
 --- a/core/cmake/rules/RulesKDEFramework.cmake
 +++ b/core/cmake/rules/RulesKDEFramework.cmake
-@@ -26,19 +26,15 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET
+@@ -26,35 +26,20 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET
  )
  
  if(ENABLE_KFILEMETADATASUPPORT)
@@ -30,16 +30,17 @@ index 610033425c..2d8acc7956 100644
  
  
  if(ENABLE_AKONADICONTACTSUPPORT)
- 
+-
 -    find_package(KF5 ${AKONADI_MIN_VERSION} QUIET
 -                                            OPTIONAL_COMPONENTS
-+    find_package(KF5 ${AKONADI_MIN_VERSION} REQUIRED
-+                                            COMPONENTS
-                                             Akonadi
-                                             AkonadiContact      # For KDE Mail Contacts support.
-                                             Contacts            # API for contacts/address book data.
-@@ -46,15 +42,9 @@ if(ENABLE_AKONADICONTACTSUPPORT)
- 
+-                                            Akonadi
+-                                            AkonadiContact      # For KDE Mail Contacts support.
+-                                            Contacts            # API for contacts/address book data.
+-    )
+-
++    find_package(KF5Akonadi ${AKONADI_MIN_VERSION} REQUIRED)
++    find_package(KF5AkonadiContact ${AKONADI_MIN_VERSION} REQUIRED) # For KDE Mail Contacts support.
++    find_package(KF5Contacts ${AKONADI_MIN_VERSION} REQUIRED)       # API for contacts/address book data.
  endif()
  
 -find_package(KF5 ${KSANE_MIN_VERSION} QUIET
@@ -56,7 +57,7 @@ index 610033425c..2d8acc7956 100644
  
  if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
  
-@@ -62,18 +52,6 @@ if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
+@@ -62,18 +47,6 @@ if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
  
  endif()
  
@@ -175,5 +176,5 @@ index d7659eed34..9c145970b2 100644
  
      set(HAVE_X11 TRUE)
 -- 
-2.41.0
+2.42.0
 
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 947fdcf44c8e..a53ee3610cba 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/ladspa-sdk/Manifest b/media-libs/ladspa-sdk/Manifest
index c2a90b6a312a..47d072901387 100644
--- a/media-libs/ladspa-sdk/Manifest
+++ b/media-libs/ladspa-sdk/Manifest
@@ -1,5 +1,5 @@
 AUX ladspa-sdk-1.17-properbuild.patch 3984 BLAKE2B 12a65c1118a070a4f408cf4ec9ffaf8331fd7beb9625503a5bbcad2ab937508333e64b8ba0418fd8db0bcbfe03bf29befbbbd290ad9af2b890f5ee1ee9c20061 SHA512 05c40e4a60716a0f3a2ce98fe268179cdb37dbeac59bc85314155484bacc469691fb7db397e40ba0f078ec38be7ec9f1c4d36ebe561869491c8b7710c74e6ed1
 DIST ladspa_sdk_1.17.tgz 71052 BLAKE2B cfb80e8ced314d5cc62fcb7f0b82e58f572503f2a732b2bb8a58343e8f69e417c0b0a2919bbb40629567fb331bf60a7f0c6f186db47e5b2651725b039526cdbb SHA512 37f94aa52b5a2f8709528989dea289eb01342f3bcb9e85d0f4829ddd9d90b2934a113db11100f09375a50f6612122b78156fec916f2c78a22406253d5cb394c7
 EBUILD ladspa-sdk-1.17-r1.ebuild 1240 BLAKE2B 39487805ebc1fca7981e6a4c2258313c537e03585a677cfab8c445fbf7504071075f532353a88bba4424d346fff2f17b9ce3d11e73df83a50c2b50d19cdb3f9d SHA512 637a39f5d5199ad2746cca7962c94910e20072caaac58a51ed6314fa1d9c034acd23253042f7ffaf74467eac0ab34effcad17a3b4b506abbe562afea51c9dd7a
-EBUILD ladspa-sdk-1.17-r2.ebuild 1312 BLAKE2B 626826c308aee56be883ee63868bc071f4c335b7018fdfffb7209939f8b028acde46a3c45666ca0a04f2070f539f6957b277b4f03f0d0b0395fb980f0f5eb2b9 SHA512 462832cf575113812bfd3be72d70543f285af7f5253e3732a1363fc005297345f44720929b706591e21387a861525f7b2fbe1751d2961c77c1dcbd7e72af1b35
+EBUILD ladspa-sdk-1.17-r2.ebuild 1305 BLAKE2B 8c5ed59cacf5050e7ca31638e13510ee0466c8e7a6139d2b53576dd836e74c9c30c3f021587b596b1489a4d0bb8e7197f390cead4d3eb2edc1381da9ddd6234a SHA512 63ad6098527d55f6a8873b475c30a8dfd4804b325d5eb4290ac99554bb8726bed06fac2d9aee3e22c70cb9f28e24c0da86b9d577ca06e99758dee5a88bc9a256
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.17-r2.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.17-r2.ebuild
index d7af263402c3..de3827660c11 100644
--- a/media-libs/ladspa-sdk/ladspa-sdk-1.17-r2.ebuild
+++ b/media-libs/ladspa-sdk/ladspa-sdk-1.17-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.ladspa.org/download/${MY_P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="media-libs/libsndfile[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index cffa17ea6aef..bd1730a55887 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 97ad086e06a7..d9f8b949aa23 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -3,6 +3,6 @@ DIST picard-2.9.1.tar.gz 5270234 BLAKE2B 51c84c9c344f5f9486e57caa2e47626329042f9
 DIST picard-2.9.tar.gz 6360770 BLAKE2B d843cbb249f79a7817f0d5a62f7f851a3acc9943c93e0130fa487c385d1dda3b14a51b7070212a4562553c39ac54e8b743391a28c3e916ceb11e5070f3801985 SHA512 837f70b239acc0d2846be79fb225e5bc7a3b7c3d2e928c34bd01730b6049809a58c274a4e49c5cc42f253f5c113c19b331ac1489427f8dbb3c31515d2511e4dc
 EBUILD picard-2.8.5.ebuild 1455 BLAKE2B 3118ef882d633efff0ca57a101a388942f6298a6dac68f54adbbfba407abfac88d7c4143f5ef2d8df80ccf0f3c2971a8ca2b4c9159f962dda277894cb5577422 SHA512 7e0d173950e5135d78a38bddb45e5bb8b37da68fb7106fa7b6b858e4f6366b61549931fb5f601dada1bf3232524c3e28d907741aae83a5c38d810907ba21eb53
 EBUILD picard-2.9.1.ebuild 1469 BLAKE2B e19ac8acc115beb25339c3a8b3fc9f94f872793cfe20e9c0c6761a594b4cf61fbda6067fb42039c271f2eb5966d69e78f9fc116a247b539acf59e7711ccb93fc SHA512 371b372e3c33dcd5f11626f4d6a71c45acdabcd3108917843c86fe38690375bdb1ffbf18114e325b34336e2afdeff3af946a8783de91b47d045a5cdc458499c0
-EBUILD picard-2.9.ebuild 1473 BLAKE2B 06bbdba27917e573d6c895daffe8369a4825f69bc7f32ce9b22a7095093a8ada647eae12d36852d4f25d75f29fdec98e33795980b6132253d55ec70a33fba3be SHA512 9b44d937b0c0639ab41c97fe601587d729e93ddbde5e9a1e3049bca2e627e7f4966c8085dbe3f3a40d830d39f0f9826d82a5d2efee2ba5e3791b4637f2ddef67
+EBUILD picard-2.9.ebuild 1471 BLAKE2B c80c011bb0e467748e26a64309a7c314c961f848f22d85376f9a4863184650963214fa64b11ac7f665eab953a5c4278d4d8656ff4de589a6029b19533826ede1 SHA512 0dee9f466695e6f38900aa477da836b0cdaf30b8086056b4a3eff91afbfc9368b7b4dbba91be1e5ad11aa2ca995990df3d4366ba4211c553e1734a44d12cbc4f
 EBUILD picard-9999.ebuild 1469 BLAKE2B e19ac8acc115beb25339c3a8b3fc9f94f872793cfe20e9c0c6761a594b4cf61fbda6067fb42039c271f2eb5966d69e78f9fc116a247b539acf59e7711ccb93fc SHA512 371b372e3c33dcd5f11626f4d6a71c45acdabcd3108917843c86fe38690375bdb1ffbf18114e325b34336e2afdeff3af946a8783de91b47d045a5cdc458499c0
 MISC metadata.xml 740 BLAKE2B cc09a7bf012e0b85ff55531ace5d8b187cd68fdae7d274cb640a7ae446296c2ac70bb599955d6ab2570b3eb879c28cad0cf2e70fe7339c2c0c58fd8b0dcdcac7 SHA512 321188fd4887593a3683b2c507673baa9e2faf2b46b0158338a67e72dbf5267b93c1e358ceadeacd707d6a6bb234a4fae8ef681779463c4ab5bd3b79dbd47c43
diff --git a/media-sound/picard/picard-2.9.ebuild b/media-sound/picard/picard-2.9.ebuild
index f60c4d17aa12..7f4ca4261326 100644
--- a/media-sound/picard/picard-2.9.ebuild
+++ b/media-sound/picard/picard-2.9.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S="${WORKDIR}/${PN}-release-${PV}"
 fi
 
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index da891620c07c..63c2eb5a2713 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/bluray_info/Manifest b/media-video/bluray_info/Manifest
index f36cc3b50205..523d0beb3638 100644
--- a/media-video/bluray_info/Manifest
+++ b/media-video/bluray_info/Manifest
@@ -1,5 +1,3 @@
 DIST bluray_info-1.10.tar.gz 279446 BLAKE2B 651d729380649c1d6846d1897d5f3403c575e481f6206f3303607f80e334adda7b436c485de03a90f309676612dbb45839aced24be4ac8e1306b6466e58869e9 SHA512 fae7866155862fac1766b4dfdd587e0f40e562ca39d6bd19999732fb86203105ed7d350433e815636e2d8823de18e5805e425bd05c39070c5dc1792c8db060b6
-DIST bluray_info-1.3.tar.gz 188192 BLAKE2B f88020721f7295b9bdd46687cd436c6a5bf38efc1fafc1bdfddda41a7c1a14fbee02a93b69b38a1703f089c9ad4a3576c9f750283a94ec2de09841bc1ae679cb SHA512 cf14733bd3b3fe9ebdace130c880fd695f0a60533a4b397f339789b2b11a15515f8ad24e87ccb428e73b74826ddaa5c2df0c1c9bf7907bdc5b1824f73d22c1ed
 EBUILD bluray_info-1.10.ebuild 557 BLAKE2B a6b7362b66b7fb9a2bbdaea6633bda689f7e2e4284951bce1f21287c3c4be1ffe612ad52330e323210747022d7e781f8eada5761357eb8f0f7d5dff7e1d3abc7 SHA512 bb80e72a0a5a0c8c6a8685fab260eab0b4beaecaa444c2fcabb1358c561b55a4e4b5bdc34e8fae7923e0f09575d41832e70698cf8974528f460033f721b48c50
-EBUILD bluray_info-1.3.ebuild 396 BLAKE2B 8d4af62ca5f6c951b07a76f095efcb857071dd55d3078970f2e63e950f78f8d0a3c1472edeb56b4c456c66da23b4390254687de7964751d2b01f5825b5fcba8c SHA512 b7d8e775d0eeb099ba8d0b1597b99dc387b5044577b647900b9b029aee363d58aff51452ef18b1e2716d855808ee0dbc866b57d4dfeb3fa3ef96eefb06d8472e
 MISC metadata.xml 464 BLAKE2B cafd6ca6107d4afa0e0c618e1d0b0ac95a87c56e7b6093873d4a8e86c4dea996ebeed04ddefb0dd7d6086cffd9e6152d54e9799d92c1165f5955a065a4d98e23 SHA512 2b376fc488665b6f0692d1ae5ba0b9a865cd1dff1e213cbbb24d5979d9792c1a2c4c5ab161f567865582a41285a461febe53cc4b7aaa694920224e1ff057ecef
diff --git a/media-video/bluray_info/bluray_info-1.3.ebuild b/media-video/bluray_info/bluray_info-1.3.ebuild
deleted file mode 100644
index 7d6aef069eb6..000000000000
--- a/media-video/bluray_info/bluray_info-1.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Blu-ray disc tools: bluray_info, bluray_copy"
-HOMEPAGE="https://github.com/beandog/bluray_info"
-SRC_URI="mirror://sourceforge/bluray-info/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-libs/libbluray-1.0.0"
-RDEPEND="${DEPEND}"
diff --git a/media-video/rovclock/Manifest b/media-video/rovclock/Manifest
index facc29cf68bf..1095a2b66e2a 100644
--- a/media-video/rovclock/Manifest
+++ b/media-video/rovclock/Manifest
@@ -1,5 +1,4 @@
 AUX rovclock-0.6e-ldflags.patch 279 BLAKE2B 2d0f8bb6b69a401af7f1cb28b016787a2c58305a4d9daf522b45f066cf8c5166e42031cfa686eaeeec050cca4cf70d8374d933ef221b3808206d11efe92f319f SHA512 19fd4e6ca973ba1067bc68d4b6719259b88e49b3ea59270095827518ea2da688750d932c2af3319231b007a80ed3bd268bc5ff22bd942e5249b40bd4f8f9718a
 DIST rovclock-0.6e.tar.bz2 29648 BLAKE2B 149fa6d972282a067d8bb58bf9b9030f094a7f5133eba7139e702a6f44df955522c908fe21e45f8a514938d8b23056ddfd5131f9f63950bfd36aa9e4f249c866 SHA512 b6db578d305e6110287a0881a3a8b16bb76e662380698493c704e84705de7a6da608843c1056d6f84e7275f9f5159c0436a580beb72f795b571a5d4784123e7a
-EBUILD rovclock-0.6e-r1.ebuild 528 BLAKE2B 81bb2207332bbfba00f444ca1876e981f82f8554bac56a3c21596020ef006669c391243adbb9652be6b9306fef95bca9ea488daeec1115d5d29bc2ad5104e560 SHA512 c9b655c3b28cdcf69a4abfaf251add50e6d386cf731a58adc5838d3fd9751f3777e11ac6818abb7df1a1a6e9d1759a1ca50b4e41ea80c514a9fd5de0beab1154
-EBUILD rovclock-0.6e-r2.ebuild 489 BLAKE2B ba66c755f015b350f7535df986ce0339b1306f92aac4b8cd05dec766db531dda36f4fc8af7e1effc107b01c115e783272795ee8d7d582aa4419a7e2003294153 SHA512 952c4a573d345f17f21f2519868120789844b5ed225c8590915908d2f8494a123bc576281bcde326964e2c391c110e1021492a7807703f5ffd4b56b68dec5f9b
+EBUILD rovclock-0.6e-r2.ebuild 487 BLAKE2B 6379867054681c222fad2c7228f27a57a634885d4e25d4f73b8a5cda2e76369c2aa38260511922731b4cb2c965eee20699034b9f1d998c30eba2ed940363784a SHA512 af20e6cb9c78d94a4eabb939ce2439141795d92542e70be1058c5724bf1ee807b4abf27f7ce683504369f80e5fcc7da201102608d1b4eaa591e23b3abc4b06a0
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/media-video/rovclock/rovclock-0.6e-r1.ebuild b/media-video/rovclock/rovclock-0.6e-r1.ebuild
deleted file mode 100644
index aea8f6f2c553..000000000000
--- a/media-video/rovclock/rovclock-0.6e-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Overclocking utility for ATI Radeon cards"
-HOMEPAGE="http://www.hasw.net/linux/"
-SRC_URI="http://www.hasw.net/linux/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-ldflags.patch
-	default
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dosbin rovclock
-	dodoc ChangeLog README
-}
diff --git a/media-video/rovclock/rovclock-0.6e-r2.ebuild b/media-video/rovclock/rovclock-0.6e-r2.ebuild
index 713e97c98fae..84034d717d5e 100644
--- a/media-video/rovclock/rovclock-0.6e-r2.ebuild
+++ b/media-video/rovclock/rovclock-0.6e-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.hasw.net/linux/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index edecc98441be..4bfdd1c0ee12 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 4a35c3746030..6fe4cea83a30 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 26 Aug 2023 08:09:54 +0000
+Sat, 26 Aug 2023 14:09:52 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index cafccb060f9c..7698fadeed3b 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546284 BLAKE2B ffce95d14dec8e0ecb1658575f411350a797650e5376e656bbe5d1c11b4e05372611ac4ca5de41270e2e69dfa9461b99f212aa044d6509bb082c7f94d92006b8 SHA512 c90fc6416d62b1b09cbafd89df9a8523e7e9eec12dd28fd39f81776bc9076c1e64fdb0203c709c330d323ea0c05daf6d59e5c469948b4d49cc6d59443f29557a
-TIMESTAMP 2023-08-26T08:09:57Z
+TIMESTAMP 2023-08-26T14:09:55Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTps1VfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTqB7NfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCjlA//YqFfrqRvmKBi/I7CAPXe7jnvP7KF4bUFJXI14ixNdew6yHQleziTAG54
-/mQz2B6DU3kVoV13S9Gm1FP6+4dF2ZCb0IFH08HFLIa8Hj0f5YBTfr7cLCaXt7aC
-iv4j2QDBHxpj+U1TxwBoG7vxxruBShClA6M/QQl0y8BYM8soS8A+jEOjPwlPJDWB
-wlHYobIL8ApkTwc2miJrs09NjlbYQDk33f72RGeUCuyqR/opqE/Kq3disYDitYiV
-D4PoIBa91CiePCXRkEtJ3thnquQVd3QqIK/EfdPflMVFuuCr24lELic8ugRfq/ny
-d5j3NYAI9hCvbA5yvkrFHhtLCuJ6/cTNPvLYdNvUvdLUZas3HhG6x+/6sC0HrCBP
-ww9zVY26IzW5188qyjPUm3uBkCPWbBWJTR+uY5OA2GZxmpaDV7DcJQjAbcS2VXDG
-3ci+Co3AF4tVQtHjO+DVEg+Z5UldwRqkEeasXSYRhXAd3yc1SQg6DG+qyrQU5Gok
-wXkdzrAWmivZYpO4UNkMqmlpFQQVb9AX2Ahg7S9oQbP4EYsc7Oc0ZCqTReMZsdwS
-wKUdWK+JFXNiTP9OHuUCJxfoS0KzDkx11zJI7fwaqFFMNWbU3MbGXJeb+Whg1x36
-KExcs97WVIWmVgaP0Cj3nc5T+kGexI86lukz2OeljqkxcYu3N10=
-=8mu8
+klCetA//ShqXK4NkHzobRtgHJIuNflrmiKeRIsol7Cif3F9FG0LQhqb5lo6VHUJt
+RdxUgtUI6xqqWhnP3WXsLYVE9Pi2LD4+BH84Z+cQhqh3CTb8kEGSVoLuzFsHArhd
+h0Mal7xpSZeHhTMC4ncB9Agkj5jQ66A1DCQFGVxzmv05OqAtuRIBjz6DuwABaOaO
+iVjoaa4U78dGCPW/o9Fa99LBcxn9GAhxf0Q8pe/hlUERJF6IMtTCZG76K+AUHlNp
+iOWCukVPhMioc0HzVnfeFndjPwLrCZL5kfKeCiR6llgCSs297glnO/3dSrQxCHLN
+p0cuTEGfBiel3sZTykQAR5tSnnFewcsSq6/xopr3tBRSBMSXFUjjGSQEb5Q6C32j
+PohG/PyvLNd6qma31ZBG1Jq+Buc0L3nmWvOka2Gn0neHmOlMEma2J1L0UkNvbDw6
+DJM361rDGHsa1Gk0HWnMvjQTtJI+dESR2lGXI8T23FLoyjpMqWIYynYfGAtsgIEg
+2/AzXl5LGXUfRri85tGCxsIf615+PS31LqmcgxMhDqzdCb0xa8q51byWLyUOs1Bl
+9iaxSO+Z1tQu+0ousP18MirDXkh/eUaLlqWjV5aiFohg9g/3HjjF5uOKgXcKnRoG
+zHgAKo6FWPBUiRq0HgcCWcilY7WZ/yDYdIzoQ/vl19SRVmjfddY=
+=/se9
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 4a35c3746030..6fe4cea83a30 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 26 Aug 2023 08:09:54 +0000
+Sat, 26 Aug 2023 14:09:52 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 85806442aa43..d420373637cf 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 0beb8520155f..b43687eb4efd 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/cpulimit-2.4 b/metadata/md5-cache/app-admin/cpulimit-2.4
deleted file mode 100644
index fa3e36d2ca12..000000000000
--- a/metadata/md5-cache/app-admin/cpulimit-2.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Limits the CPU usage of a process
-EAPI=6
-HOMEPAGE=http://cpulimit.sourceforge.net
-INHERIT=toolchain-funcs
-KEYWORDS=amd64 ~ppc ~riscv x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/limitcpu/cpulimit-2.4.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=644b023f7aa68829e84a9c77268b2533
diff --git a/metadata/md5-cache/app-admin/cpulimit-2.8 b/metadata/md5-cache/app-admin/cpulimit-2.8
index 69b72810e64b..0299eaa6494e 100644
--- a/metadata/md5-cache/app-admin/cpulimit-2.8
+++ b/metadata/md5-cache/app-admin/cpulimit-2.8
@@ -3,9 +3,9 @@ DESCRIPTION=Limits the CPU usage of a process
 EAPI=8
 HOMEPAGE=https://cpulimit.sourceforge.net
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~ppc ~riscv ~x86
+KEYWORDS=amd64 ~ppc ~riscv x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/limitcpu/cpulimit-2.8.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=05caf5f2ff32c7cd6ac78c70645ffa7b
+_md5_=04e6cdd2172851d44bc508f7a481c91b
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 9a7016573750..c58ad39eae4a 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
diff --git a/metadata/md5-cache/app-doc/python-docs-3.10.12 b/metadata/md5-cache/app-doc/python-docs-3.10.12
deleted file mode 100644
index f129a71ea881..000000000000
--- a/metadata/md5-cache/app-doc/python-docs-3.10.12
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=HTML documentation for Python
-EAPI=7
-HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=PSF-2
-SLOT=3.10
-SRC_URI=https://www.python.org/ftp/python/doc/3.10.12/python-3.10.12-docs-html.tar.bz2
-_md5_=15a7d7da15df0ba5eba3ac072daa73bc
diff --git a/metadata/md5-cache/app-doc/python-docs-3.10.13 b/metadata/md5-cache/app-doc/python-docs-3.10.13
index 7030f815b2cb..b6e7263e5ca7 100644
--- a/metadata/md5-cache/app-doc/python-docs-3.10.13
+++ b/metadata/md5-cache/app-doc/python-docs-3.10.13
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=7
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=PSF-2
 SLOT=3.10
 SRC_URI=https://www.python.org/ftp/python/doc/3.10.13/python-3.10.13-docs-html.tar.bz2
-_md5_=b1da8159f2ed9a9bd142a6d306d6e98c
+_md5_=15a7d7da15df0ba5eba3ac072daa73bc
diff --git a/metadata/md5-cache/app-doc/python-docs-3.11.4 b/metadata/md5-cache/app-doc/python-docs-3.11.4
deleted file mode 100644
index 7f6a8d86625e..000000000000
--- a/metadata/md5-cache/app-doc/python-docs-3.11.4
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=HTML documentation for Python
-EAPI=7
-HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=PSF-2
-SLOT=3.11
-SRC_URI=https://www.python.org/ftp/python/doc/3.11.4/python-3.11.4-docs-html.tar.bz2
-_md5_=15a7d7da15df0ba5eba3ac072daa73bc
diff --git a/metadata/md5-cache/app-doc/python-docs-3.11.5 b/metadata/md5-cache/app-doc/python-docs-3.11.5
index 62dea8b1ba63..cd0442d39cf6 100644
--- a/metadata/md5-cache/app-doc/python-docs-3.11.5
+++ b/metadata/md5-cache/app-doc/python-docs-3.11.5
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=7
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=PSF-2
 SLOT=3.11
 SRC_URI=https://www.python.org/ftp/python/doc/3.11.5/python-3.11.5-docs-html.tar.bz2
-_md5_=b1da8159f2ed9a9bd142a6d306d6e98c
+_md5_=15a7d7da15df0ba5eba3ac072daa73bc
diff --git a/metadata/md5-cache/app-doc/python-docs-3.8.17 b/metadata/md5-cache/app-doc/python-docs-3.8.17
deleted file mode 100644
index 3fd9a94112f3..000000000000
--- a/metadata/md5-cache/app-doc/python-docs-3.8.17
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=HTML documentation for Python
-EAPI=7
-HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=PSF-2
-SLOT=3.8
-SRC_URI=https://www.python.org/ftp/python/doc/3.8.17/python-3.8.17-docs-html.tar.bz2
-_md5_=15a7d7da15df0ba5eba3ac072daa73bc
diff --git a/metadata/md5-cache/app-doc/python-docs-3.8.18 b/metadata/md5-cache/app-doc/python-docs-3.8.18
index ff19c9076c60..34dcd86397e3 100644
--- a/metadata/md5-cache/app-doc/python-docs-3.8.18
+++ b/metadata/md5-cache/app-doc/python-docs-3.8.18
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=7
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=PSF-2
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/doc/3.8.18/python-3.8.18-docs-html.tar.bz2
-_md5_=b1da8159f2ed9a9bd142a6d306d6e98c
+_md5_=15a7d7da15df0ba5eba3ac072daa73bc
diff --git a/metadata/md5-cache/app-doc/python-docs-3.9.17 b/metadata/md5-cache/app-doc/python-docs-3.9.17
deleted file mode 100644
index b558b4826b64..000000000000
--- a/metadata/md5-cache/app-doc/python-docs-3.9.17
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=HTML documentation for Python
-EAPI=7
-HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=PSF-2
-SLOT=3.9
-SRC_URI=https://www.python.org/ftp/python/doc/3.9.17/python-3.9.17-docs-html.tar.bz2
-_md5_=15a7d7da15df0ba5eba3ac072daa73bc
diff --git a/metadata/md5-cache/app-doc/python-docs-3.9.18 b/metadata/md5-cache/app-doc/python-docs-3.9.18
index 38d2e971d779..8edf4e481c22 100644
--- a/metadata/md5-cache/app-doc/python-docs-3.9.18
+++ b/metadata/md5-cache/app-doc/python-docs-3.9.18
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=7
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=PSF-2
 SLOT=3.9
 SRC_URI=https://www.python.org/ftp/python/doc/3.9.18/python-3.9.18-docs-html.tar.bz2
-_md5_=b1da8159f2ed9a9bd142a6d306d6e98c
+_md5_=15a7d7da15df0ba5eba3ac072daa73bc
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 60ada120f577..07cf9c53350c 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/virtualbox-7.0.10-r1 b/metadata/md5-cache/app-emulation/virtualbox-7.0.10-r1
new file mode 100644
index 000000000000..cf57b0983712
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-7.0.10-r1
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) >=app-arch/tar-1.34-r2 >=dev-lang/yasm-0.6.2 dev-libs/libIDL dev-util/glslang >=dev-util/kbuild-0.1.9998.3592 sys-apps/which sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 app-text/docbook-xsl-ns-stylesheets dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra dev-qt/qthelp:5 ) gui? ( dev-qt/linguist-tools:5 ) nls? ( dev-qt/linguist-tools:5 ) java? ( virtual/jdk:1.8 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-7.0.10 dev-libs/libtpms dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl2[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-libs/libxslt-1.1.19 virtual/libcrypt:= alsa? ( >=media-libs/alsa-lib-1.0.13 ) gui? ( x11-base/xorg-proto x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr ) java? ( virtual/jdk:1.8 ) opengl? ( x11-base/xorg-proto x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr virtual/glu ) sdl? ( x11-libs/libXinerama ) pulseaudio? ( media-libs/libpulse ) udev? ( >=virtual/udev-171 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
+IUSE=alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc java python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64
+LICENSE=GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-7.0.10 dev-libs/libtpms dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl2[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) gui? ( x11-libs/libxcb:= ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0/7.0
+SRC_URI=https://download.virtualbox.org/virtualbox/7.0.10/VirtualBox-7.0.10.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.8.tar.bz2 gui? ( !doc? ( https://dev.gentoo.org/~ceamac/app-emulation/virtualbox/virtualbox-help-7.0.10.tar.xz ) )
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	862d337d98edb576796827be2c6b11ca	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b6b4ce6aecaa5b8eb63028c7f7e1509b
diff --git a/metadata/md5-cache/app-emulation/virtualbox-9999 b/metadata/md5-cache/app-emulation/virtualbox-9999
index fb69b5bde352..f8ed97555215 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-9999
+++ b/metadata/md5-cache/app-emulation/virtualbox-9999
@@ -1,17 +1,17 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) app-arch/makeself >=app-arch/tar-1.34-r2 >=dev-lang/yasm-0.6.2 dev-libs/libIDL dev-util/glslang >=dev-util/kbuild-0.1.9998.3592 sys-apps/which sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 app-text/docbook-xsl-ns-stylesheets dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra dev-qt/qthelp:5 ) gui? ( dev-qt/linguist-tools:5 ) nls? ( dev-qt/linguist-tools:5 ) java? ( virtual/jdk:1.8 ) sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig ) dev-vcs/subversion[http(+)] net-misc/rsync virtual/pkgconfig
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) app-arch/makeself >=app-arch/tar-1.34-r2 >=dev-lang/yasm-0.6.2 dev-libs/libIDL dev-util/glslang >=dev-util/kbuild-0.1.9998.3592 sys-apps/which sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 app-text/docbook-xsl-ns-stylesheets dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra dev-qt/qthelp:5 ) gui? ( dev-qt/linguist-tools:5 ) nls? ( dev-qt/linguist-tools:5 ) java? ( virtual/jdk:1.8 ) sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig ) dev-vcs/subversion[http(+)] net-misc/rsync virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) acct-group/vboxusers dev-libs/libtpms dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl2[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-libs/libxslt-1.1.19 virtual/libcrypt:= alsa? ( >=media-libs/alsa-lib-1.0.13 ) gui? ( x11-base/xorg-proto x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr ) java? ( virtual/jdk:1.8 ) opengl? ( x11-base/xorg-proto x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr virtual/glu ) sdl? ( x11-libs/libXinerama ) pulseaudio? ( media-libs/libpulse ) udev? ( >=virtual/udev-171 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/linux-sources
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) acct-group/vboxusers dev-libs/libtpms dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl2[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-libs/libxslt-1.1.19 virtual/libcrypt:= alsa? ( >=media-libs/alsa-lib-1.0.13 ) gui? ( x11-base/xorg-proto x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr ) java? ( virtual/jdk:1.8 ) opengl? ( x11-base/xorg-proto x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr virtual/glu ) sdl? ( x11-libs/libXinerama ) pulseaudio? ( media-libs/libpulse ) udev? ( >=virtual/udev-171 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/linux-sources
 DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
 EAPI=8
 HOMEPAGE=https://www.virtualbox.org/
 IDEPEND=sys-apps/kmod[tools] dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=desktop edo flag-o-matic java-pkg-opt-2 linux-mod-r1 multilib optfeature pax-utils python-single-r1 subversion tmpfiles toolchain-funcs udev xdg
-IUSE=alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc java dist-kernel modules-sign +strip python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+IUSE=alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc java dist-kernel modules-sign +strip python_single_target_python3_10 python_single_target_python3_11
 LICENSE=GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )
 PROPERTIES=live
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) acct-group/vboxusers dev-libs/libtpms dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl2[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) gui? ( x11-libs/libxcb:= ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 ) sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) virtual/tmpfiles
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) acct-group/vboxusers dev-libs/libtpms dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl2[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) gui? ( x11-libs/libxcb:= ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 ) sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) virtual/tmpfiles
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0/9999
 SRC_URI=https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.10_pre20230615.tar.bz2 gui? ( !doc? ( https://dev.gentoo.org/~ceamac/app-emulation/virtualbox/virtualbox-help-7.0.8.tar.xz ) )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	subversion	44c6a1cae0381c100a526e3b348622cd	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	862d337d98edb576796827be2c6b11ca	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ada28f40b774f7aa3dff3b820438545a
+_md5_=84a22502a4fce168f1cf5daa8fa70bfc
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 06e3672fe0a9..56c2355db678 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/rkhunter-1.4.6-r1 b/metadata/md5-cache/app-forensics/rkhunter-1.4.6-r1
deleted file mode 100644
index 2ecc6ab9c269..000000000000
--- a/metadata/md5-cache/app-forensics/rkhunter-1.4.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Rootkit Hunter scans for known and unknown rootkits, backdoors, and sniffers
-EAPI=6
-HOMEPAGE=https://rkhunter.sf.net/
-INHERIT=bash-completion-r1
-KEYWORDS=~alpha amd64 ~arm ~mips ppc x86
-LICENSE=GPL-2+
-RDEPEND=app-shells/bash dev-lang/perl sys-process/lsof[rpc]
-SLOT=0
-SRC_URI=mirror://sourceforge/rkhunter/rkhunter-1.4.6.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=e81e21efca448a62c28cdfa271d98189
diff --git a/metadata/md5-cache/app-forensics/rkhunter-1.4.6-r2 b/metadata/md5-cache/app-forensics/rkhunter-1.4.6-r2
index 7eefc86178a7..10a06d14bd72 100644
--- a/metadata/md5-cache/app-forensics/rkhunter-1.4.6-r2
+++ b/metadata/md5-cache/app-forensics/rkhunter-1.4.6-r2
@@ -3,10 +3,10 @@ DESCRIPTION=Rootkit Hunter scans for known and unknown rootkits, backdoors, and
 EAPI=8
 HOMEPAGE=https://rkhunter.sf.net/
 INHERIT=bash-completion-r1
-KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~x86
+KEYWORDS=~alpha amd64 ~arm ~mips ppc x86
 LICENSE=GPL-2+
 RDEPEND=app-shells/bash dev-lang/perl sys-process/lsof[rpc]
 SLOT=0
 SRC_URI=mirror://sourceforge/rkhunter/rkhunter-1.4.6.tar.gz https://dev.gentoo.org/~sam/distfiles/app-forensics/rkhunter/rkhunter-1.4.6-grep-3.8.patch.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=bc6ee6a615543495759967e242e56170
+_md5_=48ef58680a4282104d63d5bc21fd9a14
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 7cb72bda1bc6..549d9c49dc28 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/nabi-1.0.0 b/metadata/md5-cache/app-i18n/nabi-1.0.0
deleted file mode 100644
index 1a2a220185f3..000000000000
--- a/metadata/md5-cache/app-i18n/nabi-1.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=>=app-i18n/libhangul-0.1 dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 virtual/libintl virtual/pkgconfig sys-devel/gettext
-DESCRIPTION=Simple Hanguk X Input Method
-EAPI=6
-HOMEPAGE=https://github.com/libhangul/nabi
-IUSE=debug nls
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-i18n/libhangul-0.1 dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 virtual/libintl
-SLOT=0
-SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/nabi/nabi-1.0.0.tar.gz
-_md5_=96d5afda3ab575e1f58786a167267e56
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index f05df0a925cf..f490d9830f98 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/fastfetch-2.0.3 b/metadata/md5-cache/app-misc/fastfetch-2.0.5
index 94e235e92079..5be818bc5c16 100644
--- a/metadata/md5-cache/app-misc/fastfetch-2.0.3
+++ b/metadata/md5-cache/app-misc/fastfetch-2.0.5
@@ -11,6 +11,6 @@ LICENSE=MIT
 RDEPEND=dev-libs/yyjson sys-libs/zlib X? ( x11-libs/libX11 ) chafa? ( media-gfx/chafa ) dbus? ( sys-apps/dbus ) ddcutil? ( app-misc/ddcutil:= ) gnome? ( dev-libs/glib gnome-base/dconf ) imagemagick? ( media-gfx/imagemagick:= ) networkmanager? ( net-misc/networkmanager ) opencl? ( virtual/opencl ) opengl? ( media-libs/libglvnd[X] ) osmesa? ( media-libs/mesa[osmesa] ) pci? ( sys-apps/pciutils ) pulseaudio? ( media-libs/libpulse ) sqlite? ( dev-db/sqlite:3 ) vulkan? ( media-libs/vulkan-loader ) wayland? ( dev-libs/wayland ) xcb? ( x11-libs/libxcb ) xfce? ( xfce-base/xfconf ) xrandr? ( x11-libs/libXrandr )
 REQUIRED_USE=xrandr? ( X ) chafa? ( imagemagick )
 SLOT=0
-SRC_URI=https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/2.0.3.tar.gz -> fastfetch-2.0.3.tar.gz
+SRC_URI=https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/2.0.5.tar.gz -> fastfetch-2.0.5.tar.gz
 _eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=002c6f1c3470476108d6e363f994beb2
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 92ca0a8887bd..a297ef9a7b42 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/ccsh-0.0.4-r4 b/metadata/md5-cache/app-shells/ccsh-0.0.4-r4
deleted file mode 100644
index d0323aa960a9..000000000000
--- a/metadata/md5-cache/app-shells/ccsh-0.0.4-r4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=UNIX Shell for people already familiar with the C language
-EAPI=6
-HOMEPAGE=http://ccsh.sourceforge.net/
-INHERIT=toolchain-funcs
-KEYWORDS=amd64 ppc ~ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/ccsh/ccsh-0.0.4.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=acfb72aeaf6be141d9a5f0c713a242c0
diff --git a/metadata/md5-cache/app-shells/ccsh-0.0.4-r5 b/metadata/md5-cache/app-shells/ccsh-0.0.4-r5
index 67a73fda93f8..d6661ef53358 100644
--- a/metadata/md5-cache/app-shells/ccsh-0.0.4-r5
+++ b/metadata/md5-cache/app-shells/ccsh-0.0.4-r5
@@ -3,9 +3,9 @@ DESCRIPTION=UNIX Shell for people already familiar with the C language
 EAPI=8
 HOMEPAGE=https://ccsh.sourceforge.net/
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/ccsh/ccsh-0.0.4.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=5b4b3c95e7b68a1e3ae6aa02367fa675
+_md5_=f98f08ac173f07aeefb953ce380d9100
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 8b7fd422afc5..15a51b7785c6 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/qpdf-11.5.0 b/metadata/md5-cache/app-text/qpdf-11.5.0
index 327468b7805d..669478459f6c 100644
--- a/metadata/md5-cache/app-text/qpdf-11.5.0
+++ b/metadata/md5-cache/app-text/qpdf-11.5.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://qpdf.sourceforge.net/
 INHERIT=cmake bash-completion-r1
 IUSE=doc examples gnutls ssl test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Apache-2.0 Artistic-2 )
 RDEPEND=media-libs/libjpeg-turbo:= sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) )
 RESTRICT=!test? ( test )
 SLOT=0/11
 SRC_URI=https://github.com/qpdf/qpdf/releases/download/v11.5.0/qpdf-11.5.0.tar.gz doc? ( https://github.com/qpdf/qpdf/releases/download/v11.5.0/qpdf-11.5.0-doc.zip )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e2578e17ec1d5044ed6cd2d2a4a06f33
+_md5_=bb774e16a40b677929da1f2e754374c7
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index f1f2a27d371b..93a01809047e 100644
--- a/metadata/md5-cache/app-vim/Manifest.gz
+++ b/metadata/md5-cache/app-vim/Manifest.gz
diff --git a/metadata/md5-cache/app-vim/breakpts-4.0-r1 b/metadata/md5-cache/app-vim/breakpts-4.0-r1
deleted file mode 100644
index 391cf1f07266..000000000000
--- a/metadata/md5-cache/app-vim/breakpts-4.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: sets vim breakpoints visually
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=618
-INHERIT=vim-plugin
-KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 ) >=app-vim/multvals-3.6.1 >=app-vim/genutils-1.13 >=app-vim/foldutil-1.6 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/breakpts-4.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/breakpts-4.0.tar.bz2
-_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=459d8fbd967d3dd31b57747cae2c47d8
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index fb5a81b920f4..00d6ea4453cf 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/arduino-listserialportsc-1.4.0 b/metadata/md5-cache/dev-embedded/arduino-listserialportsc-1.4.0
deleted file mode 100644
index 082f19274e93..000000000000
--- a/metadata/md5-cache/dev-embedded/arduino-listserialportsc-1.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=dev-libs/libserialport-0.1.1 >=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Arduino helper library to list serial ports
-EAPI=6
-HOMEPAGE=https://github.com/arduino/listSerialPortsC
-INHERIT=java-pkg-2 toolchain-funcs
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3
-RDEPEND=>=dev-libs/libserialport-0.1.1 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://github.com/arduino/listSerialPortsC/archive/1.4.0.tar.gz -> arduino-listserialportsc-1.4.0.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	8f942ebdcf04334697649d4a0bf65a32	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	862d337d98edb576796827be2c6b11ca	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4f54190814ba94ae580fa0baab45ce51
diff --git a/metadata/md5-cache/dev-embedded/arduino-listserialportsc-1.4.0-r1 b/metadata/md5-cache/dev-embedded/arduino-listserialportsc-1.4.0-r1
index ce7a7023f9fb..09c121a59ff3 100644
--- a/metadata/md5-cache/dev-embedded/arduino-listserialportsc-1.4.0-r1
+++ b/metadata/md5-cache/dev-embedded/arduino-listserialportsc-1.4.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Arduino helper library to list serial ports
 EAPI=8
 HOMEPAGE=https://github.com/arduino/listSerialPortsC
 INHERIT=java-pkg-2 toolchain-funcs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-libs/libserialport-0.1.1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/arduino/listSerialPortsC/archive/1.4.0.tar.gz -> arduino-listserialportsc-1.4.0.tar.gz
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=2ab355f9cc316f8a0071d608a2d1030e
+_md5_=6b904b616f39ce42b1c248beff623ae1
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 5fa19ba0efa2..41e087c3e683 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/php-8.0.30 b/metadata/md5-cache/dev-lang/php-8.0.30
index 5e71b046f9a4..b0c54eee83f4 100644
--- a/metadata/md5-cache/dev-lang/php-8.0.30
+++ b/metadata/md5-cache/dev-lang/php-8.0.30
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.php.net/
 INHERIT=flag-o-matic systemd autotools
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] virtual/libcrypt:= fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= <dev-libs/openssl-3.0 ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://www.php.net/distributions/php-8.0.30.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=0a422211a90d6f1354ff266010f4a9b1
+_md5_=757087ec73c4ecf7be836cb7ba1817b9
diff --git a/metadata/md5-cache/dev-lang/python-3.10.12 b/metadata/md5-cache/dev-lang/python-3.10.12
deleted file mode 100644
index ac0026235329..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.10.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_10(-)] dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) valgrind? ( dev-util/valgrind ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
-INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils prefix python-utils-r1 toolchain-funcs verify-sig
-IUSE=bluetooth build debug +ensurepip examples gdbm libedit lto +ncurses pgo +readline +sqlite +ssl test tk valgrind +xml verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_10(-)] dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.10
-SRC_URI=https://www.python.org/ftp/python/3.10.12/Python-3.10.12.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.12.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.12/Python-3.10.12.tar.xz.asc )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=184d0ba3a5ba0bf623a203ba0819c35e
diff --git a/metadata/md5-cache/dev-lang/python-3.10.13 b/metadata/md5-cache/dev-lang/python-3.10.13
index 0defa34e7c72..21b089a94345 100644
--- a/metadata/md5-cache/dev-lang/python-3.10.13
+++ b/metadata/md5-cache/dev-lang/python-3.10.13
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
 INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils prefix python-utils-r1 toolchain-funcs verify-sig
 IUSE=bluetooth build debug +ensurepip examples gdbm libedit lto +ncurses pgo +readline +sqlite +ssl test tk valgrind +xml verify-sig
-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
 LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_10(-)] dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.10
 SRC_URI=https://www.python.org/ftp/python/3.10.13/Python-3.10.13.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.13.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.13/Python-3.10.13.tar.xz.asc )
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=747bbda2ce0404f5117264f14ace5176
+_md5_=184d0ba3a5ba0bf623a203ba0819c35e
diff --git a/metadata/md5-cache/dev-lang/python-3.11.4 b/metadata/md5-cache/dev-lang/python-3.11.4
deleted file mode 100644
index 9eb287f65807..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.11.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) valgrind? ( dev-util/valgrind )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
-INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils prefix python-utils-r1 toolchain-funcs verify-sig
-IUSE=bluetooth build debug +ensurepip examples gdbm libedit lto +ncurses pgo +readline +sqlite +ssl test tk valgrind verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !build? ( app-misc/mime-types ) dev-lang/python-exec[python_targets_python3_11(-)]
-RESTRICT=!test? ( test )
-SLOT=3.11
-SRC_URI=https://www.python.org/ftp/python/3.11.4/Python-3.11.4.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.11.4.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.11.4/Python-3.11.4.tar.xz.asc )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=19b170af618190878ae6e0c3524a1d81
diff --git a/metadata/md5-cache/dev-lang/python-3.11.5 b/metadata/md5-cache/dev-lang/python-3.11.5
index c5d3e13b2d7b..fc9335f449c6 100644
--- a/metadata/md5-cache/dev-lang/python-3.11.5
+++ b/metadata/md5-cache/dev-lang/python-3.11.5
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
 INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils prefix python-utils-r1 toolchain-funcs verify-sig
 IUSE=bluetooth build debug +ensurepip examples gdbm libedit lto +ncurses pgo +readline +sqlite +ssl test tk valgrind verify-sig
-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
 LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !build? ( app-misc/mime-types ) dev-lang/python-exec[python_targets_python3_11(-)]
 RESTRICT=!test? ( test )
 SLOT=3.11
 SRC_URI=https://www.python.org/ftp/python/3.11.5/Python-3.11.5.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.11.5.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.11.5/Python-3.11.5.tar.xz.asc )
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=035ca2424376f557c91ed3e44a1ea1ee
+_md5_=19b170af618190878ae6e0c3524a1d81
diff --git a/metadata/md5-cache/dev-lang/python-3.12.0_beta3 b/metadata/md5-cache/dev-lang/python-3.12.0_beta3
deleted file mode 100644
index 53bbb55d58bd..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.12.0_beta3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] dev-python/ensurepip-pip dev-python/ensurepip-setuptools dev-python/ensurepip-wheel ) valgrind? ( dev-util/valgrind )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
-INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
-IUSE=bluetooth build debug +ensurepip examples gdbm libedit lto +ncurses pgo +readline +sqlite +ssl test tk valgrind verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !build? ( app-misc/mime-types ) dev-lang/python-exec[python_targets_python3_12(-)]
-RESTRICT=!test? ( test )
-SLOT=3.12
-SRC_URI=https://www.python.org/ftp/python/3.12.0/Python-3.12.0b3.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.12.0b3.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.12.0/Python-3.12.0b3.tar.xz.asc )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=7ddd39cd21c18c5158a0a400a0421752
diff --git a/metadata/md5-cache/dev-lang/python-3.12.0_beta4 b/metadata/md5-cache/dev-lang/python-3.12.0_beta4
deleted file mode 100644
index 7163bd619c08..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.12.0_beta4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] dev-python/ensurepip-pip dev-python/ensurepip-setuptools dev-python/ensurepip-wheel ) valgrind? ( dev-util/valgrind )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
-INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
-IUSE=bluetooth build debug +ensurepip examples gdbm libedit lto +ncurses pgo +readline +sqlite +ssl test tk valgrind verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !build? ( app-misc/mime-types ) dev-lang/python-exec[python_targets_python3_12(-)]
-RESTRICT=!test? ( test )
-SLOT=3.12
-SRC_URI=https://www.python.org/ftp/python/3.12.0/Python-3.12.0b4.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.12.0b4.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.12.0/Python-3.12.0b4.tar.xz.asc )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=7ddd39cd21c18c5158a0a400a0421752
diff --git a/metadata/md5-cache/dev-lang/python-3.12.0_beta4_p1 b/metadata/md5-cache/dev-lang/python-3.12.0_beta4_p1
deleted file mode 100644
index 53e3982ae515..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.12.0_beta4_p1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] dev-python/ensurepip-pip dev-python/ensurepip-setuptools dev-python/ensurepip-wheel ) valgrind? ( dev-util/valgrind )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
-INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
-IUSE=bluetooth build debug +ensurepip examples gdbm libedit lto +ncurses pgo +readline +sqlite +ssl test tk valgrind verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !build? ( app-misc/mime-types ) dev-lang/python-exec[python_targets_python3_12(-)]
-RESTRICT=!test? ( test )
-SLOT=3.12
-SRC_URI=https://www.python.org/ftp/python/3.12.0/Python-3.12.0b4.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.12.0b4_p1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.12.0/Python-3.12.0b4.tar.xz.asc )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=7ddd39cd21c18c5158a0a400a0421752
diff --git a/metadata/md5-cache/dev-lang/python-3.12.0_rc1 b/metadata/md5-cache/dev-lang/python-3.12.0_rc1
deleted file mode 100644
index b0030de6054b..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.12.0_rc1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] dev-python/ensurepip-pip dev-python/ensurepip-setuptools dev-python/ensurepip-wheel ) valgrind? ( dev-util/valgrind )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=8
-HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
-INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
-IUSE=bluetooth build debug +ensurepip examples gdbm libedit lto +ncurses pgo +readline +sqlite +ssl test tk valgrind verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !build? ( app-misc/mime-types ) dev-lang/python-exec[python_targets_python3_12(-)]
-RESTRICT=!test? ( test )
-SLOT=3.12
-SRC_URI=https://www.python.org/ftp/python/3.12.0/Python-3.12.0rc1.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.12.0rc1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.12.0/Python-3.12.0rc1.tar.xz.asc )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=1d3019d19fe3da3f14b8ff22fa7a5f4b
diff --git a/metadata/md5-cache/dev-lang/python-3.12.0_rc1_p1 b/metadata/md5-cache/dev-lang/python-3.12.0_rc1_p1
deleted file mode 100644
index 65918422ca7c..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.12.0_rc1_p1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] dev-python/ensurepip-pip dev-python/ensurepip-setuptools dev-python/ensurepip-wheel ) valgrind? ( dev-util/valgrind )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=8
-HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
-INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
-IUSE=bluetooth build debug +ensurepip examples gdbm libedit lto +ncurses pgo +readline +sqlite +ssl test tk valgrind verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !build? ( app-misc/mime-types ) dev-lang/python-exec[python_targets_python3_12(-)]
-RESTRICT=!test? ( test )
-SLOT=3.12
-SRC_URI=https://www.python.org/ftp/python/3.12.0/Python-3.12.0rc1.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.12.0rc1_p1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.12.0/Python-3.12.0rc1.tar.xz.asc )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=1d3019d19fe3da3f14b8ff22fa7a5f4b
diff --git a/metadata/md5-cache/dev-lang/python-3.12.0_rc1_p3 b/metadata/md5-cache/dev-lang/python-3.12.0_rc1_p3
deleted file mode 100644
index d8d88923fb92..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.12.0_rc1_p3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] dev-python/ensurepip-pip dev-python/ensurepip-setuptools dev-python/ensurepip-wheel ) valgrind? ( dev-util/valgrind )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=8
-HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
-INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
-IUSE=bluetooth build debug +ensurepip examples gdbm libedit lto +ncurses pgo +readline +sqlite +ssl test tk valgrind verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !build? ( app-misc/mime-types ) dev-lang/python-exec[python_targets_python3_12(-)]
-RESTRICT=!test? ( test )
-SLOT=3.12
-SRC_URI=https://www.python.org/ftp/python/3.12.0/Python-3.12.0rc1.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.12.0rc1_p3.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.12.0/Python-3.12.0rc1.tar.xz.asc )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=1d3019d19fe3da3f14b8ff22fa7a5f4b
diff --git a/metadata/md5-cache/dev-lang/python-3.12.0_rc1_p4 b/metadata/md5-cache/dev-lang/python-3.12.0_rc1_p4
deleted file mode 100644
index d2477ad328ce..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.12.0_rc1_p4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] dev-python/ensurepip-pip dev-python/ensurepip-setuptools dev-python/ensurepip-wheel ) valgrind? ( dev-util/valgrind )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=8
-HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
-INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
-IUSE=bluetooth build debug +ensurepip examples gdbm libedit lto +ncurses pgo +readline +sqlite +ssl test tk valgrind verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !build? ( app-misc/mime-types ) dev-lang/python-exec[python_targets_python3_12(-)]
-RESTRICT=!test? ( test )
-SLOT=3.12
-SRC_URI=https://www.python.org/ftp/python/3.12.0/Python-3.12.0rc1.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.12.0rc1_p4.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.12.0/Python-3.12.0rc1.tar.xz.asc )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=1d3019d19fe3da3f14b8ff22fa7a5f4b
diff --git a/metadata/md5-cache/dev-lang/python-3.8.17 b/metadata/md5-cache/dev-lang/python-3.8.17
deleted file mode 100644
index cff8d9648331..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.8.17
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) valgrind? ( dev-util/valgrind )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
-INHERIT=autotools flag-o-matic multiprocessing pax-utils prefix python-utils-r1 toolchain-funcs verify-sig
-IUSE=bluetooth build debug +ensurepip examples gdbm lto +ncurses pgo +readline +sqlite +ssl test tk valgrind wininst +xml verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.8
-SRC_URI=https://www.python.org/ftp/python/3.8.17/Python-3.8.17.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.17.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.17/Python-3.8.17.tar.xz.asc )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=7741c039d899e2c9a8144ebd98b336b1
diff --git a/metadata/md5-cache/dev-lang/python-3.9.17 b/metadata/md5-cache/dev-lang/python-3.9.17
deleted file mode 100644
index f2a805b8f603..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.9.17
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) valgrind? ( dev-util/valgrind )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
-INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils prefix python-utils-r1 toolchain-funcs verify-sig
-IUSE=bluetooth build debug +ensurepip examples gdbm lto +ncurses pgo +readline +sqlite +ssl test tk valgrind +xml verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.9
-SRC_URI=https://www.python.org/ftp/python/3.9.17/Python-3.9.17.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.17.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.17/Python-3.9.17.tar.xz.asc )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=ebf848cd6d3510fcc7b05f7c6f2de654
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index df67ad71083a..8bbe584c118f 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/xerces-c-3.2.4 b/metadata/md5-cache/dev-libs/xerces-c-3.2.4-r2
index f884e2a08796..b8b0fe8ba794 100644
--- a/metadata/md5-cache/dev-libs/xerces-c-3.2.4
+++ b/metadata/md5-cache/dev-libs/xerces-c-3.2.4-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/xerces/c/3/sources/xerces-c-3.2.4.tar.xz
 _eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=98f0fe4dbe178a5e5ba792eb8d98f3fe
+_md5_=a27b0a490b72dcdd04473fa6324ae751
diff --git a/metadata/md5-cache/dev-libs/xerces-c-9999 b/metadata/md5-cache/dev-libs/xerces-c-9999
index b6ff25b80c56..bc079a2bd5bd 100644
--- a/metadata/md5-cache/dev-libs/xerces-c-9999
+++ b/metadata/md5-cache/dev-libs/xerces-c-9999
@@ -12,4 +12,4 @@ RDEPEND=curl? ( net-misc/curl ) icu? ( dev-libs/icu:0= ) virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	prefix	eab3c99d77fe00506c109c8a736186f7	subversion	44c6a1cae0381c100a526e3b348622cd	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ad2c7a4f2e05112d6ee3c9c945f61c9e
+_md5_=a7cbd486a6c693856d79432bc78021f6
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 41dc81a57396..f24d719769ce 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/griffe-0.35.1 b/metadata/md5-cache/dev-python/griffe-0.35.1
new file mode 100644
index 000000000000..28595d50a77d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/griffe-0.35.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/jsonschema-4.17.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-xdist-2.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/colorama-0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pdm-backend-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Signature generator for Python programs
+EAPI=8
+HOMEPAGE=https://mkdocstrings.github.io/griffe/ https://github.com/mkdocstrings/griffe/ https://pypi.org/project/griffe/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~riscv
+LICENSE=ISC
+RDEPEND=>=dev-python/colorama-0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mkdocstrings/griffe/archive/0.35.1.tar.gz -> griffe-0.35.1.gh.tar.gz
+_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=1d9b44507355271ecd18b770f7be3a9b
diff --git a/metadata/md5-cache/dev-python/pypdf-3.15.3 b/metadata/md5-cache/dev-python/pypdf-3.15.3
new file mode 100644
index 000000000000..1dd2144b6439
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypdf-3.15.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-8.0.0[jpeg,jpeg2k,tiff,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Python library to work with PDF files
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pypdf/ https://github.com/py-pdf/pypdf/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/py-pdf/pypdf/archive/3.15.3.tar.gz -> pypdf-3.15.3.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/935652968f76a41b4fa51afd05498e7dd7314c5e.tar.gz -> pypdf-sample-files-935652968f76a41b4fa51afd05498e7dd7314c5e.gh.tar.gz )
+_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=aa7d8df25ed4ef98fce825b65f0cba8d
diff --git a/metadata/md5-cache/dev-python/pypy3_10-7.3.12_p1 b/metadata/md5-cache/dev-python/pypy3_10-7.3.12_p1
deleted file mode 100644
index db8d1c7a77f5..000000000000
--- a/metadata/md5-cache/dev-python/pypy3_10-7.3.12_p1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( >=dev-python/pypy3_10-exe-7.3.12:7.3.12[bzip2(+),ncurses?] >=dev-python/pypy3_10-exe-bin-7.3.12:7.3.12 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= dev-python/gentoo-common 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-7.3.12_rc1
-DESCRIPTION=A fast, compliant alternative implementation of the Python (3.10) language
-EAPI=8
-HOMEPAGE=https://www.pypy.org/ https://foss.heptapod.net/pypy/pypy/
-INHERIT=pax-utils python-utils-r1 toolchain-funcs
-IUSE=+ensurepip gdbm +jit ncurses sqlite tk
-KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=|| ( >=dev-python/pypy3_10-exe-7.3.12:7.3.12[bzip2(+),ncurses?] >=dev-python/pypy3_10-exe-bin-7.3.12:7.3.12 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= dev-python/gentoo-common 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-7.3.12_rc1
-RESTRICT=test
-SLOT=0/pypy310-pp73-384
-SRC_URI=https://buildbot.pypy.org/pypy/pypy3.10-v7.3.12-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.10-gentoo-patches-7.3.12_p1.tar.xz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=5fcebae85aa98734d8a61d0048ae8bfb
diff --git a/metadata/md5-cache/dev-python/pypy3_10-7.3.12_p3 b/metadata/md5-cache/dev-python/pypy3_10-7.3.12_p3
deleted file mode 100644
index ab143712df57..000000000000
--- a/metadata/md5-cache/dev-python/pypy3_10-7.3.12_p3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( >=dev-python/pypy3_10-exe-7.3.12:7.3.12[bzip2(+),ncurses?] >=dev-python/pypy3_10-exe-bin-7.3.12:7.3.12 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= dev-python/gentoo-common 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-7.3.12_rc1
-DESCRIPTION=A fast, compliant alternative implementation of the Python (3.10) language
-EAPI=8
-HOMEPAGE=https://www.pypy.org/ https://foss.heptapod.net/pypy/pypy/
-INHERIT=pax-utils python-utils-r1 toolchain-funcs
-IUSE=+ensurepip gdbm +jit ncurses sqlite tk
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=|| ( >=dev-python/pypy3_10-exe-7.3.12:7.3.12[bzip2(+),ncurses?] >=dev-python/pypy3_10-exe-bin-7.3.12:7.3.12 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= dev-python/gentoo-common 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-7.3.12_rc1
-RESTRICT=test
-SLOT=0/pypy310-pp73-384
-SRC_URI=https://buildbot.pypy.org/pypy/pypy3.10-v7.3.12-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.10-gentoo-patches-7.3.12_p3.tar.xz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=f425ad81271cb5dcf2a97000da1bc695
diff --git a/metadata/md5-cache/dev-python/pypy3_10-7.3.12_p4 b/metadata/md5-cache/dev-python/pypy3_10-7.3.12_p4
deleted file mode 100644
index 2814cc0cffc5..000000000000
--- a/metadata/md5-cache/dev-python/pypy3_10-7.3.12_p4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( >=dev-python/pypy3_10-exe-7.3.12:7.3.12[bzip2(+),ncurses?] >=dev-python/pypy3_10-exe-bin-7.3.12:7.3.12 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= dev-python/gentoo-common 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-7.3.12_rc1
-DESCRIPTION=A fast, compliant alternative implementation of the Python (3.10) language
-EAPI=8
-HOMEPAGE=https://www.pypy.org/ https://foss.heptapod.net/pypy/pypy/
-INHERIT=pax-utils python-utils-r1 toolchain-funcs
-IUSE=+ensurepip gdbm +jit ncurses sqlite tk
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=|| ( >=dev-python/pypy3_10-exe-7.3.12:7.3.12[bzip2(+),ncurses?] >=dev-python/pypy3_10-exe-bin-7.3.12:7.3.12 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= dev-python/gentoo-common 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-7.3.12_rc1
-RESTRICT=test
-SLOT=0/pypy310-pp73-384
-SRC_URI=https://buildbot.pypy.org/pypy/pypy3.10-v7.3.12-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.10-gentoo-patches-7.3.12_p4.tar.xz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=f425ad81271cb5dcf2a97000da1bc695
diff --git a/metadata/md5-cache/dev-python/pypy3_9-7.3.12_p1 b/metadata/md5-cache/dev-python/pypy3_9-7.3.12_p1
deleted file mode 100644
index 845fb47ab686..000000000000
--- a/metadata/md5-cache/dev-python/pypy3_9-7.3.12_p1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( >=dev-python/pypy3_9-exe-7.3.12:7.3.12[bzip2(+),ncurses?] >=dev-python/pypy3_9-exe-bin-7.3.12:7.3.12 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= dev-python/gentoo-common 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-7.3.12_rc
-DESCRIPTION=A fast, compliant alternative implementation of the Python (3.9) language
-EAPI=8
-HOMEPAGE=https://www.pypy.org/ https://foss.heptapod.net/pypy/pypy/
-INHERIT=pax-utils python-utils-r1 toolchain-funcs
-IUSE=+ensurepip gdbm +jit ncurses sqlite tk
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=|| ( >=dev-python/pypy3_9-exe-7.3.12:7.3.12[bzip2(+),ncurses?] >=dev-python/pypy3_9-exe-bin-7.3.12:7.3.12 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= dev-python/gentoo-common 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-7.3.12_rc
-RESTRICT=test
-SLOT=0/pypy39-pp73-336
-SRC_URI=https://buildbot.pypy.org/pypy/pypy3.9-v7.3.12-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.9-gentoo-patches-7.3.12_p1.tar.xz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=3293bcfef1e19f187687eed2ae155dd2
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 4c560c1092e9..270d4b7192be 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.15.10_p20230815 b/metadata/md5-cache/dev-qt/qtwebengine-5.15.10_p20230815
new file mode 100644
index 000000000000..2ba51154c0b4
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.15.10_p20230815
@@ -0,0 +1,17 @@
+BDEPEND=|| ( dev-lang/python:3.11[xml(+)] dev-lang/python:3.10[xml(+)] ) dev-util/gperf dev-util/ninja dev-util/re2c net-libs/nodejs[ssl] sys-devel/bison sys-devel/flex ppc64? ( >=dev-util/gn-0.1807 ) dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= =dev-qt/qtcore-5.15.10* =dev-qt/qtdeclarative-5.15.10* =dev-qt/qtgui-5.15.10* =dev-qt/qtnetwork-5.15.10* =dev-qt/qtprintsupport-5.15.10* =dev-qt/qtwebchannel-5.15.10*[qml] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc(+)] media-libs/libwebp:= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( =dev-qt/designer-5.15.10* ) geolocation? ( =dev-qt/qtpositioning-5.15.10* ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse ) screencast? ( media-video/pipewire:= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( =dev-qt/qtdeclarative-5.15.10*[widgets] =dev-qt/qtwidgets-5.15.10* ) media-libs/libglvnd test? ( =dev-qt/qttest-5.15.10* )
+DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
+IUSE=alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-icu widgets debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= =dev-qt/qtcore-5.15.10* =dev-qt/qtdeclarative-5.15.10* =dev-qt/qtgui-5.15.10* =dev-qt/qtnetwork-5.15.10* =dev-qt/qtprintsupport-5.15.10* =dev-qt/qtwebchannel-5.15.10*[qml] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc(+)] media-libs/libwebp:= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( =dev-qt/designer-5.15.10* ) geolocation? ( =dev-qt/qtpositioning-5.15.10* ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse ) screencast? ( media-video/pipewire:= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( =dev-qt/qtdeclarative-5.15.10*[widgets] =dev-qt/qtwidgets-5.15.10* )
+REQUIRED_USE=designer? ( widgets )
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.10_p20230815.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.10_p20230815-patchset.tar.xz ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz )
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	862d337d98edb576796827be2c6b11ca	virtualx	817571665ee28575da44ee08135089e5
+_md5_=56e596212fee9a8db63538f77345d5e5
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index ba431284ad53..dc706689180d 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.4.19 b/metadata/md5-cache/dev-ruby/bundler-2.4.19
new file mode 100644
index 000000000000..6a71e790cd7c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/bundler-2.4.19
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=An easy way to vendor gem dependencies
+EAPI=8
+HOMEPAGE=https://github.com/rubygems/rubygems
+INHERIT=ruby-fakegem
+IUSE=doc test test ruby_targets_ruby31 ruby_targets_ruby32 doc test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) dev-vcs/git ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://rubygems.org/gems/bundler-2.4.19.gem
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=0843fb13a581b11fd33d17d54ce16ad5
diff --git a/metadata/md5-cache/dev-ruby/http-accept-1.7.0-r1 b/metadata/md5-cache/dev-ruby/http-accept-1.7.0-r1
index ae8e4153eaa2..5935b2ca9174 100644
--- a/metadata/md5-cache/dev-ruby/http-accept-1.7.0-r1
+++ b/metadata/md5-cache/dev-ruby/http-accept-1.7.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/socketry/http-accept
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=amd64 ~arm64
+KEYWORDS=amd64 ~arm64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/socketry/http-accept/archive/v1.7.0.tar.gz -> http-accept-1.7.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=b3e9bba6b811b74565a0918b807dad89
+_md5_=224eb66f4f088803da8c28aa75fa0bc9
diff --git a/metadata/md5-cache/dev-ruby/http-accept-2.2.0 b/metadata/md5-cache/dev-ruby/http-accept-2.2.0
index 08b62a9831ff..f8a89b7ca258 100644
--- a/metadata/md5-cache/dev-ruby/http-accept-2.2.0
+++ b/metadata/md5-cache/dev-ruby/http-accept-2.2.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/socketry/http-accept
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=amd64 ~arm64
+KEYWORDS=amd64 ~arm64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/socketry/http-accept/archive/v2.2.0.tar.gz -> http-accept-2.2.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=12c2ceed7af476129e45892041545c65
+_md5_=c1a9460819a1f8501d5bcc0b103d66e3
diff --git a/metadata/md5-cache/dev-ruby/netrc-0.11.0-r2 b/metadata/md5-cache/dev-ruby/netrc-0.11.0-r2
index 77370abd9a81..6e7b8f97b7bf 100644
--- a/metadata/md5-cache/dev-ruby/netrc-0.11.0-r2
+++ b/metadata/md5-cache/dev-ruby/netrc-0.11.0-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/heroku/netrc
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/netrc-0.11.0.gem
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=556e2ab3b0f2fda4caa54fa0264fac29
+_md5_=fb1ef1bcd06124a9384eb98569f1c58d
diff --git a/metadata/md5-cache/dev-ruby/oauth-0.6.2-r1 b/metadata/md5-cache/dev-ruby/oauth-0.6.2-r1
index 33959e375e88..781b04a53588 100644
--- a/metadata/md5-cache/dev-ruby/oauth-0.6.2-r1
+++ b/metadata/md5-cache/dev-ruby/oauth-0.6.2-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/oauth-xx/oauth-ruby
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby30? ( dev-ruby/snaky_hash:1[ruby_targets_ruby30(-)] >=dev-ruby/version_gem-1.1:1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/snaky_hash:1[ruby_targets_ruby31(-)] >=dev-ruby/version_gem-1.1:1[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/snaky_hash:1[ruby_targets_ruby32(-)] >=dev-ruby/version_gem-1.1:1[ruby_targets_ruby32(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/oauth-xx/oauth-ruby/archive/v0.6.2.tar.gz -> oauth-0.6.2.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=78a78e1909d6ba4f453cd4d6cdd1b24d
+_md5_=f1596fe1566e5bf0b3011e25a0655f99
diff --git a/metadata/md5-cache/dev-ruby/rest-client-2.1.0-r1 b/metadata/md5-cache/dev-ruby/rest-client-2.1.0-r1
index af3a342a37e0..9d3b6ed61145 100644
--- a/metadata/md5-cache/dev-ruby/rest-client-2.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/rest-client-2.1.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rest-client/rest-client
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=amd64 ~arm64
+KEYWORDS=amd64 ~arm64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby30? ( >=dev-ruby/http-accept-1.7.0:1[ruby_targets_ruby30(-)] >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby30(-)] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby30(-)] <dev-ruby/mime-types-4:*[ruby_targets_ruby30(-)] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/http-accept-1.7.0:1[ruby_targets_ruby31(-)] >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby31(-)] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby31(-)] <dev-ruby/mime-types-4:*[ruby_targets_ruby31(-)] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/http-accept-1.7.0:1[ruby_targets_ruby32(-)] >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby32(-)] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby32(-)] <dev-ruby/mime-types-4:*[ruby_targets_ruby32(-)] >=dev-ruby/netrc-0.8:0[ruby_targets_ruby32(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rest-client-2.1.0.gem
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=33cf97e9a872aadfa3f089ae4915ea6d
+_md5_=be8bebdc3a7cbc5f1d8fe780bb9dc999
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.4.19 b/metadata/md5-cache/dev-ruby/rubygems-3.4.19
new file mode 100644
index 000000000000..4063f9eccf5b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.4.19
@@ -0,0 +1,18 @@
+BDEPEND=ruby_targets_ruby31? ( test? ( dev-ruby/json[ruby_targets_ruby31(-)] dev-ruby/minitest:5[ruby_targets_ruby31(-)] dev-ruby/rake[ruby_targets_ruby31(-)] dev-ruby/rdoc[ruby_targets_ruby31(-)] dev-ruby/webrick[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/json[ruby_targets_ruby32(-)] dev-ruby/minitest:5[ruby_targets_ruby32(-)] dev-ruby/rake[ruby_targets_ruby32(-)] dev-ruby/rdoc[ruby_targets_ruby32(-)] dev-ruby/webrick[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/ruby-ssl[ruby_targets_ruby32(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 )
+DESCRIPTION=Centralized Ruby extension management system
+EAPI=8
+HOMEPAGE=https://rubygems.org/
+INHERIT=ruby-ng prefix
+IUSE=server test ruby_targets_ruby31 ruby_targets_ruby32
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=|| ( Ruby MIT )
+PDEPEND=server? ( =dev-ruby/builder-3* )
+RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/rubygems/rubygems/archive/v3.4.19.tar.gz -> rubygems-3.4.19.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=09fb477b17e601b1df9de54bdeac484e
diff --git a/metadata/md5-cache/dev-ruby/snaky_hash-2.0.1 b/metadata/md5-cache/dev-ruby/snaky_hash-2.0.1
index cf71e180d66a..8959903deea7 100644
--- a/metadata/md5-cache/dev-ruby/snaky_hash-2.0.1
+++ b/metadata/md5-cache/dev-ruby/snaky_hash-2.0.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/oauth-xx/snaky_hash
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~riscv
+KEYWORDS=~amd64 ~ppc ~riscv ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby30? ( dev-ruby/hashie:*[ruby_targets_ruby30(-)] >=dev-ruby/version_gem-1.1.1:1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/hashie:*[ruby_targets_ruby31(-)] >=dev-ruby/version_gem-1.1.1:1[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/hashie:*[ruby_targets_ruby32(-)] >=dev-ruby/version_gem-1.1.1:1[ruby_targets_ruby32(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://gitlab.com/oauth-xx/snaky_hash/-/archive/v2.0.1/snaky_hash-v2.0.1.tar.bz2 -> snaky_hash-2.0.1.tar.bz2
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=16ab7a040a3097b945fcf605baa84914
+_md5_=582389f8f6f66efa923bae0063bbecfd
diff --git a/metadata/md5-cache/dev-ruby/twitter-text-3.1.0-r1 b/metadata/md5-cache/dev-ruby/twitter-text-3.1.0-r1
deleted file mode 100644
index 1a69e345218a..000000000000
--- a/metadata/md5-cache/dev-ruby/twitter-text-3.1.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby30? ( dev-ruby/idn-ruby[ruby_targets_ruby30(-)] =dev-ruby/unf-0.1*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/idn-ruby[ruby_targets_ruby31(-)] =dev-ruby/unf-0.1*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/nokogiri-1.8.0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/nokogiri-1.8.0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=Text handling for Twitter
-EAPI=7
-HOMEPAGE=https://github.com/twitter/twitter-text
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~riscv
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( dev-ruby/idn-ruby[ruby_targets_ruby30(-)] =dev-ruby/unf-0.1*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/idn-ruby[ruby_targets_ruby31(-)] =dev-ruby/unf-0.1*[ruby_targets_ruby31(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=3.1
-SRC_URI=https://rubygems.org/gems/twitter-text-3.1.0.gem
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=b5b719ac9c49b91f00ccf52697d77b08
diff --git a/metadata/md5-cache/dev-ruby/version_gem-1.1.3 b/metadata/md5-cache/dev-ruby/version_gem-1.1.3
index 988196dcaeac..848d7177d1d9 100644
--- a/metadata/md5-cache/dev-ruby/version_gem-1.1.3
+++ b/metadata/md5-cache/dev-ruby/version_gem-1.1.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/oauth-xx/version_gem
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~riscv
+KEYWORDS=~amd64 ~ppc ~riscv ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://gitlab.com/oauth-xx/version_gem/-/archive/v1.1.3/version_gem-v1.1.3.tar.bz2 -> version_gem-1.1.3.tar.bz2
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=bf113eec33ab4698673ec30da4a76d20
+_md5_=e77e8feb72f42a18d21d28b656d52d98
diff --git a/metadata/md5-cache/dev-ruby/vlad-2.7.1 b/metadata/md5-cache/dev-ruby/vlad-2.7.1
deleted file mode 100644
index 401fd5b547cc..000000000000
--- a/metadata/md5-cache/dev-ruby/vlad-2.7.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby30? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby30(-)] test? ( >=dev-ruby/minitest-5.7[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby31(-)] test? ( >=dev-ruby/minitest-5.7[ruby_targets_ruby31(-)] ) ) test? ( ruby_targets_ruby30? ( >=dev-ruby/rake-remote_task-2.3[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/rake-remote_task-2.3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=Pragmatic application deployment automation, without mercy
-EAPI=7
-HOMEPAGE=https://github.com/seattlerb/vlad
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( >=dev-ruby/rake-remote_task-2.3[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/rake-remote_task-2.3[ruby_targets_ruby31(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/vlad-2.7.1.gem
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=190200078f4be99d7a483e5be0637830
diff --git a/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r2 b/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r2
deleted file mode 100644
index 0df45ecc2c3b..000000000000
--- a/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby30? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/shoulda[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] dev-ruby/webmock[ruby_targets_ruby30(-)] dev-ruby/vcr[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/shoulda[ruby_targets_ruby31(-)] dev-ruby/test-unit:2[ruby_targets_ruby31(-)] dev-ruby/webmock[ruby_targets_ruby31(-)] dev-ruby/vcr[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=A library to help write robots.txt compliant web robots
-EAPI=7
-HOMEPAGE=https://github.com/knu/webrobots
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby30? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby31(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/webrobots-0.1.2.gem
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=906df4a9e550260a1bab1d4281fed8d0
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 197389c76385..1e4ad94aa12d 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/cmake-3.26.5-r2 b/metadata/md5-cache/dev-util/cmake-3.26.5-r2
index 9b14b2cdc1cf..93db35a81abf 100644
--- a/metadata/md5-cache/dev-util/cmake-3.26.5-r2
+++ b/metadata/md5-cache/dev-util/cmake-3.26.5-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://cmake.org/
 INHERIT=bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing toolchain-funcs virtualx xdg-utils verify-sig
 IUSE=doc emacs ncurses qt5 test test verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash:0= >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.26/cmake-3.26.5.tar.gz !doc? ( https://dev.gentoo.org/~sam/distfiles/dev-util/cmake/cmake-3.26.4-docs.tar.xz ) verify-sig? ( https://github.com/Kitware/CMake/releases/download/v3.26.5/cmake-3.26.5-SHA-256.txt https://github.com/Kitware/CMake/releases/download/v3.26.5/cmake-3.26.5-SHA-256.txt.asc )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	ea305d3be967deed8faa5c9e94f9aee4	elisp-common	d65d4003126dec852c1a5a534c52d2f9	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=852f7e46b915a553bc026ef48e0a226b
+_md5_=375816056cdff181467c217b6d0e95eb
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 67f2e4d50aeb..a44fe1a1daea 100644
--- a/metadata/md5-cache/games-misc/Manifest.gz
+++ b/metadata/md5-cache/games-misc/Manifest.gz
diff --git a/metadata/md5-cache/games-misc/lolcat-100.0.1-r1 b/metadata/md5-cache/games-misc/lolcat-100.0.1-r1
deleted file mode 100644
index d70cf58cd4df..000000000000
--- a/metadata/md5-cache/games-misc/lolcat-100.0.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby30? ( dev-ruby/optimist:3[ruby_targets_ruby30(-)] >=dev-ruby/paint-2.1:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/optimist:3[ruby_targets_ruby31(-)] >=dev-ruby/paint-2.1:0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=Rainbows and unicorns!
-EAPI=7
-HOMEPAGE=https://github.com/busyloop/lolcat
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=ruby_targets_ruby30? ( dev-ruby/optimist:3[ruby_targets_ruby30(-)] >=dev-ruby/paint-2.1:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/optimist:3[ruby_targets_ruby31(-)] >=dev-ruby/paint-2.1:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/lolcat-100.0.1.gem
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=d3b9a92bafec8c1612689e627ba16e64
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index a337acb815aa..6805f62b05ba 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/kleopatra-23.08.0 b/metadata/md5-cache/kde-apps/kleopatra-23.08.0
index b45dbd86d436..d79fc6473beb 100644
--- a/metadata/md5-cache/kde-apps/kleopatra-23.08.0
+++ b/metadata/md5-cache/kde-apps/kleopatra-23.08.0
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/23.08.0/src/kleopatra-23.08.0.tar.xz
 _eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	ecm	582ef00537aa518e5a8ca3aa66bd9dc0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gear.kde.org	46a3a684cf1499799618bf7194102e69	kde.org	411cb92019a6e2aa174d06896084bf57	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=42b3d05edda09ca8270da09de30dd7af
+_md5_=c5227ed5339fba81e4c43d220d4cabff
diff --git a/metadata/md5-cache/kde-apps/yakuake-23.08.0 b/metadata/md5-cache/kde-apps/yakuake-23.08.0
index 549f1ed215e1..1509e56efd0c 100644
--- a/metadata/md5-cache/kde-apps/yakuake-23.08.0
+++ b/metadata/md5-cache/kde-apps/yakuake-23.08.0
@@ -13,4 +13,4 @@ RDEPEND=>=dev-qt/qtdbus-5.15.9:5 >=dev-qt/qtgui-5.15.9:5 >=dev-qt/qtsvg-5.15.9:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/23.08.0/src/yakuake-23.08.0.tar.xz
 _eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	ecm	582ef00537aa518e5a8ca3aa66bd9dc0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gear.kde.org	46a3a684cf1499799618bf7194102e69	kde.org	411cb92019a6e2aa174d06896084bf57	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=68a0a163901b393e17ccdae3fd4435aa
+_md5_=327a88a7bc1b946d58c51ad356570e49
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 59fb9243ffbc..657adbf8ad1c 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/digikam-8.1.0-r1 b/metadata/md5-cache/media-gfx/digikam-8.1.0-r1
index a270250e4a7b..a649400d968d 100644
--- a/metadata/md5-cache/media-gfx/digikam-8.1.0-r1
+++ b/metadata/md5-cache/media-gfx/digikam-8.1.0-r1
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/digikam/8.1.0/digiKam-8.1.0.tar.xz
 _eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	ecm	582ef00537aa518e5a8ca3aa66bd9dc0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	kde.org	411cb92019a6e2aa174d06896084bf57	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=cbfc519603732c7a20a5f5eef4399729
+_md5_=d47fccbfcac01ca9562741c4924f6bf1
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 6733af064f21..2939d3810464 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/ladspa-sdk-1.17-r2 b/metadata/md5-cache/media-libs/ladspa-sdk-1.17-r2
index 34916839c6e0..5bc97d2bfd5c 100644
--- a/metadata/md5-cache/media-libs/ladspa-sdk-1.17-r2
+++ b/metadata/md5-cache/media-libs/ladspa-sdk-1.17-r2
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.ladspa.org/
 INHERIT=flag-o-matic toolchain-funcs portability multilib-minimal
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.ladspa.org/download/ladspa_sdk_1.17.tgz
 _eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	portability	a74d533f258f1f435be71312558c12f9	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=36173b4e1bf74f4d7d80dc8f46fc7e44
+_md5_=6db281523c668e35e7c8045f11170767
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 98e209a34007..c47d4a4dcfdb 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/picard-2.9 b/metadata/md5-cache/media-sound/picard-2.9
index 5b0047178bc2..638488db5a73 100644
--- a/metadata/md5-cache/media-sound/picard-2.9
+++ b/metadata/md5-cache/media-sound/picard-2.9
@@ -7,7 +7,7 @@ HOMEPAGE=https://picard.musicbrainz.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=distutils-r1 xdg
 IUSE=discid fingerprints nls test python_single_target_python3_10 python_single_target_python3_11 debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_10? ( dev-python/fasteners[python_targets_python3_10(-)] dev-python/pyjwt[python_targets_python3_10(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_10(-)] dev-python/python-dateutil[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] media-libs/mutagen[python_targets_python3_10(-)] discid? ( dev-python/python-discid[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/fasteners[python_targets_python3_11(-)] dev-python/pyjwt[python_targets_python3_11(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_11(-)] dev-python/python-dateutil[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] media-libs/mutagen[python_targets_python3_11(-)] discid? ( dev-python/python-discid[python_targets_python3_11(-)] ) ) fingerprints? ( media-libs/chromaprint[tools] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://musicbrainz.osuosl.org/pub/musicbrainz/picard/picard-2.9.tar.gz
 _eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7cbe5a13cc94dae34962df110c691f9d
+_md5_=c5524b073d0d29a8d6711d2e3115d2cd
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 737b78682c3a..64271ed36765 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/bluray_info-1.3 b/metadata/md5-cache/media-video/bluray_info-1.3
deleted file mode 100644
index 1981a6874abb..000000000000
--- a/metadata/md5-cache/media-video/bluray_info-1.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=media-libs/libbluray-1.0.0
-DESCRIPTION=Blu-ray disc tools: bluray_info, bluray_copy
-EAPI=6
-HOMEPAGE=https://github.com/beandog/bluray_info
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libbluray-1.0.0
-SLOT=0
-SRC_URI=mirror://sourceforge/bluray-info/bluray_info-1.3.tar.gz
-_md5_=b352260b63348a46b3fa9d0db10876ea
diff --git a/metadata/md5-cache/media-video/rovclock-0.6e-r1 b/metadata/md5-cache/media-video/rovclock-0.6e-r1
deleted file mode 100644
index eb87128e839c..000000000000
--- a/metadata/md5-cache/media-video/rovclock-0.6e-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Overclocking utility for ATI Radeon cards
-EAPI=6
-HOMEPAGE=http://www.hasw.net/linux/
-INHERIT=toolchain-funcs
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=http://www.hasw.net/linux/rovclock-0.6e.tar.bz2
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=9f30b9880c8a661c1c866762e94a4b8b
diff --git a/metadata/md5-cache/media-video/rovclock-0.6e-r2 b/metadata/md5-cache/media-video/rovclock-0.6e-r2
index 127e7b2da224..5021777017bc 100644
--- a/metadata/md5-cache/media-video/rovclock-0.6e-r2
+++ b/metadata/md5-cache/media-video/rovclock-0.6e-r2
@@ -3,9 +3,9 @@ DESCRIPTION=Overclocking utility for ATI Radeon cards
 EAPI=8
 HOMEPAGE=http://www.hasw.net/linux/
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://www.hasw.net/linux/rovclock-0.6e.tar.bz2
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=f9fa1d069e7a85716f6cf5a8976f70dd
+_md5_=88b05d49b91f28b382e84c2e4536ef44
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index afc26af0da5a..3367f6d17998 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/neochat-23.08.0 b/metadata/md5-cache/net-im/neochat-23.08.0-r1
index dcf7fd3c03d8..f18dd3b4f8fc 100644
--- a/metadata/md5-cache/net-im/neochat-23.08.0
+++ b/metadata/md5-cache/net-im/neochat-23.08.0-r1
@@ -9,9 +9,9 @@ INHERIT=ecm gear.kde.org
 IUSE=debug +handbook test
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-3+ handbook? ( CC-BY-SA-4.0 )
-RDEPEND=app-text/cmark:= >=dev-libs/kirigami-addons-0.7.2:5 dev-libs/qcoro5 dev-libs/qtkeychain:=[qt5(+)] >=dev-qt/qtdeclarative-5.15.9:5 >=dev-qt/qtgui-5.15.9:5 >=dev-qt/qtmultimedia-5.15.9:5 >=dev-qt/qtnetwork-5.15.9:5 >=dev-qt/qtquickcontrols2-5.15.9:5 >=dev-qt/qtsvg-5.15.9:5 >=dev-qt/qtwidgets-5.15.9:5 >=kde-frameworks/kconfig-5.106.0:5 >=kde-frameworks/kconfigwidgets-5.106.0:5 >=kde-frameworks/kcoreaddons-5.106.0:5 >=kde-frameworks/kdbusaddons-5.106.0:5 >=kde-frameworks/ki18n-5.106.0:5 >=kde-frameworks/kio-5.106.0:5 >=kde-frameworks/kirigami-5.106.0:5 >=kde-frameworks/kitemmodels-5.106.0:5[qml] >=kde-frameworks/knotifications-5.106.0:5[qml] >=kde-frameworks/kwindowsystem-5.106.0:5 >=kde-frameworks/qqc2-desktop-style-5.106.0:5 >=kde-frameworks/sonnet-5.106.0:5[qml] media-libs/kquickimageeditor:5 >=net-libs/libquotient-0.6:= >=dev-qt/qtgraphicaleffects-5.15.9:5 >=dev-qt/qtmultimedia-5.15.9:5[qml] >=kde-frameworks/kquickcharts-5.106.0:5 >=kde-frameworks/purpose-5.106.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=app-text/cmark:= >=dev-libs/kirigami-addons-0.7.2:5 dev-libs/qcoro5 dev-libs/qtkeychain:=[qt5(+)] >=dev-qt/qtdeclarative-5.15.9:5 >=dev-qt/qtgui-5.15.9:5 >=dev-qt/qtmultimedia-5.15.9:5 >=dev-qt/qtnetwork-5.15.9:5 >=dev-qt/qtquickcontrols2-5.15.9:5 >=dev-qt/qtsvg-5.15.9:5 >=dev-qt/qtwidgets-5.15.9:5 >=kde-frameworks/kconfig-5.106.0:5 >=kde-frameworks/kconfigwidgets-5.106.0:5 >=kde-frameworks/kcoreaddons-5.106.0:5 >=kde-frameworks/kdbusaddons-5.106.0:5 >=kde-frameworks/ki18n-5.106.0:5 >=kde-frameworks/kio-5.106.0:5 >=kde-frameworks/kirigami-5.106.0:5 >=kde-frameworks/kitemmodels-5.106.0:5[qml] >=kde-frameworks/knotifications-5.106.0:5[qml] >=kde-frameworks/kwindowsystem-5.106.0:5 >=kde-frameworks/qqc2-desktop-style-5.106.0:5 >=kde-frameworks/sonnet-5.106.0:5[qml] media-libs/kquickimageeditor:5 >=net-libs/libquotient-0.6:= >=dev-qt/qtgraphicaleffects-5.15.9:5 >=dev-qt/qtlocation-5.15.9:5 >=dev-qt/qtmultimedia-5.15.9:5[qml] >=dev-qt/qtpositioning-5.15.9:5[qml] >=kde-frameworks/kquickcharts-5.106.0:5 >=kde-frameworks/purpose-5.106.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://kde/stable/release-service/23.08.0/src/neochat-23.08.0.tar.xz
 _eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	ecm	582ef00537aa518e5a8ca3aa66bd9dc0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gear.kde.org	46a3a684cf1499799618bf7194102e69	kde.org	411cb92019a6e2aa174d06896084bf57	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fbbb0086da40b1228b6a17086c4186f8
+_md5_=08050fe7e7f1fda1ed77f2e30b28cd97
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 721cc35b68c6..de9f4dc68881 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/cups-filters-1.28.17-r2 b/metadata/md5-cache/net-print/cups-filters-1.28.17-r2
index 5900431a6836..f2616fa77756 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.28.17-r2
+++ b/metadata/md5-cache/net-print/cups-filters-1.28.17-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
 INHERIT=perl-module systemd flag-o-matic
 IUSE=dbus exif +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT GPL-2
 RDEPEND=>=app-text/poppler-0.32[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib exif? ( media-libs/libexif ) dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( media-libs/libjpeg-turbo:= ) ldap? ( net-nds/openldap:= ) pdf? ( app-text/mupdf:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:= ) zeroconf? ( net-dns/avahi[dbus] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenPrinting/cups-filters/releases/download/1.28.17/cups-filters-1.28.17.tar.xz https://www.openprinting.org/download/cups-filters/cups-filters-1.28.17.tar.xz
 _eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	dd4003d3308d7cad2b2d4e2b8298ffb2	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=866169c78e9c7f19e07eea6e41816514
+_md5_=7d2092bd3b99b4985be2f31adddf3847
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 4e694cbd0d64..5d079a17f18e 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/wpa_supplicant-2.10-r3 b/metadata/md5-cache/net-wireless/wpa_supplicant-2.10-r3
new file mode 100644
index 000000000000..a1ee03796518
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/wpa_supplicant-2.10-r3
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=dev-libs/openssl-1.0.2k:= dbus? ( sys-apps/dbus ) kernel_linux? ( >=dev-libs/libnl-3.2:3 eap-sim? ( sys-apps/pcsc-lite ) ) !kernel_linux? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= )
+DESCRIPTION=IEEE 802.1X/WPA supplicant for secure wireless transfers
+EAPI=8
+HOMEPAGE=https://w1.fi/wpa_supplicant/
+INHERIT=desktop linux-info qmake-utils readme.gentoo-r1 systemd toolchain-funcs
+IUSE=ap broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls tkip uncommon-eap-types wep wimax wps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 BSD )
+RDEPEND=>=dev-libs/openssl-1.0.2k:= dbus? ( sys-apps/dbus ) kernel_linux? ( >=dev-libs/libnl-3.2:3 eap-sim? ( sys-apps/pcsc-lite ) ) !kernel_linux? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= ) selinux? ( sec-policy/selinux-networkmanager ) kernel_linux? ( net-wireless/wireless-regdb )
+REQUIRED_USE=macsec? ( !privsep ) privsep? ( !macsec ) broadcom-sta? ( !fils !mesh !mbo )
+SLOT=0
+SRC_URI=https://w1.fi/releases/wpa_supplicant-2.10.tar.gz
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=e58ea46f3bcbe27bea4381ae3cfb32cd
diff --git a/metadata/md5-cache/net-wireless/wpa_supplicant-9999 b/metadata/md5-cache/net-wireless/wpa_supplicant-9999
index a234a76aa996..b80b77a17dd2 100644
--- a/metadata/md5-cache/net-wireless/wpa_supplicant-9999
+++ b/metadata/md5-cache/net-wireless/wpa_supplicant-9999
@@ -12,4 +12,4 @@ RDEPEND=>=dev-libs/openssl-1.0.2k:= dbus? ( sys-apps/dbus ) kernel_linux? ( >=de
 REQUIRED_USE=macsec? ( !privsep ) privsep? ( !macsec ) broadcom-sta? ( !fils !mesh !mbo )
 SLOT=0
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	git-r3	2358a7b20091609e24bd3a83b3ac5991	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=64581542dffd11ba21276c788f7e5d6a
+_md5_=af4be5ff0c3f886e4214455c761d6023
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index e2bc9c225481..8b11c3ade7e6 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.13 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.13
new file mode 100644
index 000000000000..33773890bffe
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.13
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by tomcat.apache.org
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/download-90.cgi
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=public-domain
+SLOT=10.1.13
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-10/v10.1.13/KEYS -> openpgp-keys-apache-tomcat-10.1.13-KEYS.asc
+_md5_=5659f38b8facd7a3fd4b97428d033703
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.93 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.93
new file mode 100644
index 000000000000..8d33bcfa9b3a
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.93
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by tomcat.apache.org
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/download-80.cgi
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=public-domain
+SLOT=8.5.93
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-8/v8.5.93/KEYS -> openpgp-keys-apache-tomcat-8.5.93-KEYS.asc
+_md5_=b711da39319582bfa9895d14c40940f0
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.80 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.80
new file mode 100644
index 000000000000..a8ba29c3f507
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.80
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by tomcat.apache.org
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/download-90.cgi
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=public-domain
+SLOT=9.0.80
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-9/v9.0.80/KEYS -> openpgp-keys-apache-tomcat-9.0.80-KEYS.asc
+_md5_=5659f38b8facd7a3fd4b97428d033703
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 40a1e47641e2..4fefefad8724 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/ckbcomp-1.164 b/metadata/md5-cache/sys-apps/ckbcomp-1.164
deleted file mode 100644
index 3a438ea4c61b..000000000000
--- a/metadata/md5-cache/sys-apps/ckbcomp-1.164
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Compile an XKB keymap for loadkeys
-EAPI=6
-HOMEPAGE=https://anonscm.debian.org/cgit/d-i/console-setup.git
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl:* sys-apps/kbd x11-misc/xkeyboard-config
-SLOT=0
-SRC_URI=https://anonscm.debian.org/cgit/d-i/console-setup.git/snapshot/e327df26fa9dbdf363b778ada91e83967f4bd500.tar.gz -> ckbcomp-1.164.tar.gz
-_md5_=3443bd40c573019828d431742ccbff5a
diff --git a/metadata/md5-cache/sys-apps/inxi-3.3.29.1 b/metadata/md5-cache/sys-apps/inxi-3.3.29.1
new file mode 100644
index 000000000000..4dd07028977e
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/inxi-3.3.29.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=The CLI inxi collects and prints hardware and system information
+EAPI=8
+HOMEPAGE=https://github.com/smxi/inxi
+IUSE=bluetooth hddtemp opengl
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-lang/perl sys-apps/pciutils sys-apps/usbutils bluetooth? ( net-wireless/bluez ) hddtemp? ( app-admin/hddtemp ) opengl? ( x11-apps/mesa-progs )
+SLOT=0
+SRC_URI=https://github.com/smxi/inxi/archive/3.3.29-1.tar.gz -> inxi-3.3.29.1.tar.gz
+_md5_=da0c0eb795dd9a5c7a4a96845cfb6fc1
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index a0e3260689a8..59dd366f04ad 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/tomcat-10.1.13 b/metadata/md5-cache/www-servers/tomcat-10.1.13
new file mode 100644
index 000000000000..bda89659a298
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-10.1.13
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.13:10.1.13 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core >=virtual/jdk-11:* test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
+IUSE=extra-webapps doc source test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=10.1
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.13/src/apache-tomcat-10.1.13-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.4.0/biz.aQute.bnd-6.4.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.13/src/apache-tomcat-10.1.13-src.tar.gz.asc )
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
+_md5_=e21920aa39c2735923348a5dc26184ac
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.93 b/metadata/md5-cache/www-servers/tomcat-8.5.93
new file mode 100644
index 000000000000..97e7d736f6ed
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.93
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-8.5.93:8.5.93 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.15 app-admin/pwgen dev-java/ant-core >=virtual/jdk-1.8:* doc? ( dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 ) test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
+IUSE=extra-webapps doc source test verify-sig
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.15 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=8.5
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.93/src/apache-tomcat-8.5.93-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.93/src/apache-tomcat-8.5.93-src.tar.gz.asc )
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
+_md5_=accc51daae38666dc1dbe7efcd4e706c
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.80 b/metadata/md5-cache/www-servers/tomcat-9.0.80
new file mode 100644
index 000000000000..f6a1c01c7845
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.80
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.80:9.0.80 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.15 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core >=virtual/jdk-1.8:* test? ( dev-java/ant-junit dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
+IUSE=extra-webapps doc source test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=9
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.80/src/apache-tomcat-9.0.80-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.4.0/biz.aQute.bnd-6.4.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.80/src/apache-tomcat-9.0.80-src.tar.gz.asc )
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
+_md5_=936d470410965ceaf1b98cfab49f7d30
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index d49fc8060d14..4ffb9a567a9b 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/xkblayout-state-0_p20180118 b/metadata/md5-cache/x11-misc/xkblayout-state-0_p20180118
deleted file mode 100644
index b58df0d859b3..000000000000
--- a/metadata/md5-cache/x11-misc/xkblayout-state-0_p20180118
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11
-DESCRIPTION=Small program to get/set the current XKB layout
-EAPI=6
-HOMEPAGE=https://github.com/nonpop/xkblayout-state
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=https://github.com/nonpop/xkblayout-state/archive/45b752b130e077d5b1437d40b0a459e062aafa13.tar.gz -> xkblayout-state-0_p20180118.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=1d5a74e1dd4b69081804ec0723e35f55
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 08fda604a2fc..6128bcbf20ba 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-08-26T08:09:57Z
+TIMESTAMP 2023-08-26T14:09:55Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTps1VfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTqB7NfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBhCRAAidVfC8CVOVFhtEy4qHLZJ7FYhvVrbHjq6hHGnrdcBntU1NpkaNV83a0U
-lmBiVOze9mZa5aXaEkGiLF7CttGGK9O3SCkQPV1Fl78T+SHSCQfghGeb7V/7N416
-BSM4iElSSUN28L93h+BDOJ0X+7T70zKRWBlW7ypUsoZeykwN7ahCkz2hQmg+nT2+
-xSMxV7cy0NDc0Cs1ZkFLA0isTk92G9gOoKM8B7i6MtjoUjclfCaws/t1sAUmbgLq
-opZAf3mP6XypZZWU+B0LoDdDxwg+W7bLrWjJYnrsRZzSKnzCB8jrR4TSId7+4JTy
-Bh6Qj3bhimbii93gdwBv9e9mBkzgfDDVzSUOSwiB03iWmue1dsm/ISshSQ8TWgcD
-CkO7A6wmSUPr3TW+gdy3RdxzCkGusIA7Y7+9ULguF3o4QmpEKczfAT829bEfXZP8
-F2RqImuhWV7x3hfBJKnTvuSH4Xb3HxEdKUztoDbiw0ioKaAx9++mAWATbaXXR3d9
-jbwlg9Uz8S8eRglk5y9pF8sgJ/OqzhJUHcfHoNBOTQLkx2k1V8hplNnFUGd+VXsR
-Ge9UCX+mKWzk9xcaKqmNrWuWjsWrKbaQtrPFVKlpPaGRXyMnfU+sAjR3YKDy/uSi
-YLRxRvPVFSIqJewXpO9yCffevVFsNNH0V7BFY7DBMauzCnZKG7w=
-=LcRl
+klAeKxAAiHoqdlY0w2JeTQR30tqGOF/orr1Z0P7HcM+1yOvssLN0mnpBtEp/uDVq
+ixrnaKfVSu10tL3Q4tRNLnlYXlwRE8y02WWKU8XBrGEO0u/iYYDhMYs32cxKRFqy
+dcsYi/AIOI0h/ZLzLLMFWGwPKuIeXSnsLcTKnizbAMxcsZdoYJAvaZpKwNLEPttO
+MSfOkDiRvHDUiYsGFIXUekUCCdD6BR9FYYvQ7zLwMbmcZ+PvfrIGADd3qQKlapAU
+DyNraf00VgWdJUpC6yUUR7KjD+WUhLcdQ5wCfCPEW/m+kQIldSEbgrvnq6XwMO98
+IeNRrXfyjrkprSc+voka9FCcA0BWW74IpyijrwgCzA3gRYW4G6+3yokbhBwMBmso
+mTI49VDJchaBpVCO6R81Ok3zweLDgIBh2BQhGhfDSx3wpUlCieRsVF9GbWpY+oEE
+4pOpp3CyvNzT5BFJsscp90VJMPAYy19c3Iafq9R4ovESX9wQUvjMYhlxEolbvbqH
+5Y1glNCNRGw9UBqKu8W1LWRmOzD9hPNLuZFQeil7GafZv4RkqnR0z1kELXE/QjxG
+PYDbkHmkbmcQhrvqUMmZ0eHrsy/0woafQJiNB9pj/X405Ps23xhJQeWB2ryx12di
+PmiF5GQmojXGhN5Y+1PnZj8RUocqYbuniiFo4cT/s3zFGQCSOys=
+=nQRm
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 4a35c3746030..6fe4cea83a30 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 26 Aug 2023 08:09:54 +0000
+Sat, 26 Aug 2023 14:09:52 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index f1c06deccd17..8e4f97fbe383 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Aug 26 08:09:54 AM UTC 2023
+Sat Aug 26 02:09:52 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 14dec270a0ed..a22f2b944d7e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 26 Aug 2023 08:15:01 +0000
+Sat, 26 Aug 2023 14:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index e79c69f63ae1..caf973393247 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-ad66a657e95a0b1d90068fa4bc454dd8229b3b9d 1693034596 2023-08-26T07:23:16+00:00
+9f01ac612d2180ff68dbf7a4a89d4909340d0ee9 1693058652 2023-08-26T14:04:12+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 8f88a9ebb207..c33db8dfc027 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1693037401 Sat 26 Aug 2023 08:10:01 AM UTC
+1693059001 Sat 26 Aug 2023 02:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 4a35c3746030..6fe4cea83a30 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 26 Aug 2023 08:09:54 +0000
+Sat, 26 Aug 2023 14:09:52 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index e79b7f8d9162..d2cae36f1477 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/neochat/Manifest b/net-im/neochat/Manifest
index d5ef8c7b84e6..7b4f3077b560 100644
--- a/net-im/neochat/Manifest
+++ b/net-im/neochat/Manifest
@@ -3,5 +3,5 @@ AUX neochat-23.04.3-libquotient-0.8-2.patch 1869 BLAKE2B 65494927c84aef3883ebd24
 DIST neochat-23.04.3.tar.xz 570776 BLAKE2B 7d5a9d724ecefc6f64a18629b24c80ef16f1e650ef3e8ae793590c44865d057d6f2905c199337dccf53c551fb4e00a8322238060731e2a3433e5e9e146acef67 SHA512 9e453c3bab98a45fe1d1d7139b574ff25e6d7a78749b38966eec17fa67ff366eea955aa82cde0743135c8ac35ca218a761abced055743545db760d67849e3a96
 DIST neochat-23.08.0.tar.xz 777516 BLAKE2B 49f7cb96613463686bc76506781615ebffd4a73381671c8900ca1d2209bfbbdf0a6117c9bb3e5f52d4013de9bd286d48f51fc28a6850c4195868a52a222d3871 SHA512 1890e2bace916d91e453d015075b30eabd6fac2fbe37d0fc2521d0e54107f05c00f6c43a5472c7097715effa270434f37833b670e817d377fa795aeb41e71008
 EBUILD neochat-23.04.3.ebuild 1529 BLAKE2B 070abfba51e60da2fbb4e65b33c97306821bf3b8528931c3b09f607630875c817da6674e9167bc7630c7a8b291d98a0021ba09ff47f9a99976d8af67bfc0ba14 SHA512 bace8610da2c140d48c8f4ea78f55edf85446a8e66c2e9647be09a34af7912ce1441d8b4e0a84992696fb4ca94011f1b9353ebb67c792d0ae764eb020dd21a3e
-EBUILD neochat-23.08.0.ebuild 1514 BLAKE2B 59bb769c4f80640fff562a8ef1c89995cab1388da3eb4aa4ea9c11c46b616f6f82d94e762eb1d945429a88e31bd2186eb4f921c1c45c90d5de7c616759e39e5d SHA512 d291a6acbffcccf9b2b27cef5b35ef2151a187bdc04425e4ea56744a456bc4b2330c4be54ebfcc453deee6201ee7c35fdbd80ed2b1c2d9ee6be5e6a47b68cc2f
+EBUILD neochat-23.08.0-r1.ebuild 1586 BLAKE2B 43b84e58e921e40725fb8a201b4251cb23758e26c6b1f0f6a6ff9e64d60faaa3ea63adfd37a8e53a809c0885855db32069e64e8b5ccefedd961780a6abc38fbc SHA512 4582d1efba2c930bae5ce208d3a59f17dd1ca2afe75285dda96a79dcad24f675b7bc9d9d3ae3d9d8633252ffc6e35d472dfa4bec2ec76440b87cbb6105dbead9
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-im/neochat/neochat-23.08.0.ebuild b/net-im/neochat/neochat-23.08.0-r1.ebuild
index 278bc5274da2..7b33ed1f6289 100644
--- a/net-im/neochat/neochat-23.08.0.ebuild
+++ b/net-im/neochat/neochat-23.08.0-r1.ebuild
@@ -45,7 +45,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtlocation-${QTMIN}:5
 	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
+	>=dev-qt/qtpositioning-${QTMIN}:5[qml]
 	>=kde-frameworks/kquickcharts-${KFMIN}:5
 	>=kde-frameworks/purpose-${KFMIN}:5
 "
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 899b4ed52c00..818ec3caf1dd 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 481b1c4c5276..e0fba3ec9851 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -2,6 +2,6 @@ AUX cups-browsed.init.d-r2 150 BLAKE2B c2098766ae08b38dead0a5bab2e30e1728ab93aa9
 AUX cups-filters-1.28.17-CVE-2023-24805.patch 7284 BLAKE2B fb7a6ec5a872381e2319a836e2bbb7f31d3635fd5fd38b44db28616cd18d0332d2ca8af36028a8ba8b0f405f144065779bffb15c1f07dbb6ee6118e01583185a SHA512 108282a8414591187789d87d8da22d261fda0e2cb0dae2e6fcbde320cee0b6fb79c2f616947ee297a58237f3c630b593d4f5b668cf8df2d5cb5c755cb0470211
 AUX cups-filters-1.28.17-c++17.patch 1066 BLAKE2B 149001a37c5799210a7cbc6c79ab1b87917f937c4f9d61c1955d18588e0b6c27e17430613f4c35e50cabf485ad381bc8e1f4c6f8a4afa14a7e9ab5e1f9acf291 SHA512 f78038c6e173490a9096ae1c7e22476e33187317738db680c43333738c7dad29d441d7c78ed2d8adc389444ef5c4694002e403f5e54855216d4000ac791752b0
 DIST cups-filters-1.28.17.tar.xz 1516052 BLAKE2B 87258391901d55d9e59b06d54603d014e54d224a373529bd70fcd38cded9dc96c88ca73bcea63d7633c065caea3f9e3274cd450aec5f1bd90130d9a88c0d3421 SHA512 320544a48206165581adafb28dbef58f39c66bebd3641be3d180a692605349d9e6af6d464044db9f7bda17a67f4a079370d8cc880cd7873d684b2209882deb35
-EBUILD cups-filters-1.28.17-r2.ebuild 3673 BLAKE2B a5783571a23ef96d66c968244ab270ea67ed5ab0a896662860914e0bf1c79cffd143404f200ba033b0093cd662dad2d07c075bea1d17601385a42ce47bef6598 SHA512 81e47016724c8d25b99b9915c75af370c30281da6a140a171b3698dda4f78d5cf89a37e5698004e9147f44c169ef343f66cdefeba5cefb78bb5ed7d4525b56dd
+EBUILD cups-filters-1.28.17-r2.ebuild 3672 BLAKE2B d52324c5021068f7b5f118c3bc1c6639bf3c93a8eba02102d999b3346fae6de385c67999e4bb4f145dd62ba6c20e52ae5db6fe6fe1b6711e5693b39248ea85e7 SHA512 7ca881f23c825a8163943c1a0478e2123ea1103f8e1448d11fae4044c43db7daade85679d06bfa9a041638dc7570d1d502aedd6eed1dc2780686e11c9073eaa8
 EBUILD cups-filters-1.28.17.ebuild 3657 BLAKE2B ab7d43196ae1fa0c19f945cd5cd5858b9fd956270f8fb02fedc514c451ed6beb8be5181dbcda7a5038aef863eaf7b88b1f5d18744c014c7b09383c17e2dba61b SHA512 a511251105363682cbc5caf7699ca1fe3930f972212eb8342c398e224eaa898a5fe122fcd5ab1f2aafa3339e3fd0637542a44c2881621a791c04e164055e6cec
 MISC metadata.xml 513 BLAKE2B b265a1645fe0da46a309086d9495564020ea15b7546237dc040589cba2e5d79540860301f8f72484081b726066414ad0414963b7c7c2ce3f08af898502c32521 SHA512 b9234992f05d59bffafb31f3d035e554389f250d8f3b951bb507e300f7cd3a6806406df60b1cae038ab330b3513934ec1250dcf0c9bfdba1bb033e6545727597
diff --git a/net-print/cups-filters/cups-filters-1.28.17-r2.ebuild b/net-print/cups-filters/cups-filters-1.28.17-r2.ebuild
index cc5a18a6de3d..603580ac67b3 100644
--- a/net-print/cups-filters/cups-filters-1.28.17-r2.ebuild
+++ b/net-print/cups-filters/cups-filters-1.28.17-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 LICENSE="MIT GPL-2"
 SLOT="0"
 IUSE="dbus exif +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RESTRICT="!test? ( test )"
 
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 12e67a5bf5c4..45c8f3a5b303 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 20c6ca112df6..eafb88fe8241 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,4 +1,6 @@
 AUX wpa_cli.sh 1284 BLAKE2B 50757aa432bf714923d0ff5e2e8357bf3126c82dcfebbc2c342325ad97e3ca95a15ea138f9a55e5a7b9ac86cb2518c173e7d5186d5feb3e57ac762a71b11ef85 SHA512 250372231eda6f7228fcf76b13fc1b95637d0d9dec96b7bef820bfa1af1496f218909f521daf2ddb2ca81d0ebb3162500f833575b64d8d2b4820c247499e1c56
+AUX wpa_supplicant-2.10-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch 2386 BLAKE2B cd4db56d476e4bde8d4343c6d2f20bad644d9794184f55313c3d5a9ea04392b0173791335476cadc3bafec8d588e29be971e573b27fd975280a059f0bf22c63c SHA512 d1f7e17dd1f6e9974825f26e549c194a450190191320251e5158432d88795a502ff4d06014af43c75338c9c7b0540f13f1fdf1173bec78ce78e681388bbd04d0
+AUX wpa_supplicant-2.10-allow-legacy-renegotiation.patch 1172 BLAKE2B 90af7a43418babd981d6d092c77852ff515b187ce05a3dce6497710582ddefa5d3103ddbf1f0e2481fa102cfb9d28e775646601f139ad61633f3cfc74554dbdc SHA512 afbb89ef8248b8e32a4f537092f8255f3c17fa6281811c25cfc6dec6bae69a4fda9e65a69dae2034a4d3e8e29ecf67b867604c80fd9726cb8f26a059c3bfe8a0
 AUX wpa_supplicant-2.6-do-not-call-dbus-functions-with-NULL-path.patch 486 BLAKE2B 877e15a45851331a1499cf8bc96fd514d88b6b270f54d52760e46cc7edbcc4b74a48a0271f0c93b546bb659203c56fdfba63b231757c21ca8ee6ade98406ac2e SHA512 dac56bc505a51167042ebe548f0e81a20a5578f753af9bb7ec3335a542d799c6e8739681ef7c8f7747a9bc954f8aa6f1a147250eacba17fd7fff80c4e53638ed
 AUX wpa_supplicant-conf.d 291 BLAKE2B 348e7d21fe01d2fdd2117adf22444557fa3d401f649489afd1636105cdddc29d58d45659c5368cc177f919ce94a7e2b5a9ed3fe8ddccd1fba3d059d270bae1a8 SHA512 6bbb9d4f6132b3d4e20cd65f27245ccadd60712ef5794261499f882057a930a393297e491d8147e04e30c0a53645af0eb3514332587118c19b5594f23f1d62ad
 AUX wpa_supplicant-init.d 1250 BLAKE2B 159ebbd5a3552cbd8fdd6d48984c3a511e77cf1e140f56fc1d3e6b16454351a270e566dd7fc4717b92251193bdf59a77f57fc3fdd1d53b067f2e5253796c041b SHA512 f7439937a11d7a91eee98ab9e16a4853ce8e27395970007ae60ca9a8b1852fadc4a37ee0bf81d7e4806c545f70b139f26942ed1630db070abe8fe8e5ce752403
@@ -6,5 +8,6 @@ AUX wpa_supplicant.conf 183 BLAKE2B ea25d56f366783548b8d4bc14615d89d1c9cff1e6535
 DIST wpa_supplicant-2.10.tar.gz 3511622 BLAKE2B 7f6045e5dcf24f7ccf1ea75c99541f9d68fadaea858a6ca11a95c997de14e33b3aa89138e748664579b5a4ea493d247cf6613da3c5fae49a4dbb5cd58dace752 SHA512 021c2a48f45d39c1dc6557730be5debaee071bc0ff82a271638beee6e32314e353e49d39e2f0dc8dff6e094dcc7008cfe1c32d0c7a34a1a345a12a3f1c1e11a1
 EBUILD wpa_supplicant-2.10-r1.ebuild 13515 BLAKE2B 71a0a18099f6e233e0a73d50266b36839ab4608782712e31aeb326961b01e29f3f5ffddd699ce1cc205ca5bfddf5456f1ce2376fb1c4dc9fc5054607ab9f04bf SHA512 d669c9b3cfa9b2914e54ac70ad068a3959c282b5d64372d72036f2d88afaee4580ed9905bdd89202e072e86e1f7cce1382435496c7b7d1b44c5b5de222169a93
 EBUILD wpa_supplicant-2.10-r2.ebuild 12514 BLAKE2B 43059454cffd29b4ffde61630b5bfd3c93d7c8f83035f9a0e53af65d9082cbb9eb2122884de1f61933ca11c28600639b0c5e2820db60ddd54c1d00fe21dfe67e SHA512 458c449bf9259bbfd0e68070595e817a9b8261680d46c9216f5ab8c7ea19bc1f6834b084e29c6c4de589ea38dc7521aaee45d50404d2350129fb42a82c407de7
-EBUILD wpa_supplicant-9999.ebuild 12514 BLAKE2B 43059454cffd29b4ffde61630b5bfd3c93d7c8f83035f9a0e53af65d9082cbb9eb2122884de1f61933ca11c28600639b0c5e2820db60ddd54c1d00fe21dfe67e SHA512 458c449bf9259bbfd0e68070595e817a9b8261680d46c9216f5ab8c7ea19bc1f6834b084e29c6c4de589ea38dc7521aaee45d50404d2350129fb42a82c407de7
+EBUILD wpa_supplicant-2.10-r3.ebuild 12675 BLAKE2B 8a68ced13efab858cb891cc4c07964bfa51058699dae870773a7a4d6412bce3ad800a819b13bbe241b384a76239aac56b7bef444c59e7ac427e0980079da085c SHA512 463b23a283a232fd6efd4d1d27dab37d6cb2d13a07b2d3859bc5af01370e9bda5deb16ca310f37dd4b3dde56860abe73aea58f4dbecb9a903b9589986cc41082
+EBUILD wpa_supplicant-9999.ebuild 12597 BLAKE2B 83a4c416930a1a302a4bff751135a762eba1c022d9124cb844ab622a8fb79e2864ab6c221aa3a601eb05aeb158d3a4ddbdd7954300061bc812b027c2e4cd44b1 SHA512 d234545752a2179843632fda855b8f55eb2a999ec4c707adb0f01c739e6bf553f86afe37e99a9169ec7371187739edfa518328571a36216fc0bb7cedaba6560e
 MISC metadata.xml 2009 BLAKE2B 1325c2f5c246bd9c4760b31d5a3cd65519aada177f10fb8df4cbb591dce85e69dcf2033cad88be8e96205721d6c0523e061af0dc281afcea3b625815fb1716fe SHA512 91a69ae5aeebcc5dc5f3f121d007ba6efc61d8025023e0dcad030918af83294622ae72e93db70c835da8ae2ab77de3aab29c7e4ad890471243992b1db490376c
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch
new file mode 100644
index 000000000000..18f879c9f39f
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch
@@ -0,0 +1,57 @@
+From: Jouni Malinen <j@w1.fi>
+Date: Sun, 22 May 2022 17:01:35 +0300
+Subject: OpenSSL: Drop security level to 0 with OpenSSL 3.0 when using TLS 1.0/1.1
+
+Commit 9afb68b03976 ("OpenSSL: Allow systemwide secpolicy overrides for
+TLS version") with commit 58bbcfa31b18 ("OpenSSL: Update security level
+drop for TLS 1.0/1.1 with OpenSSL 3.0") allow this workaround to be
+enabled with an explicit network configuration parameter. However, the
+default settings are still allowing TLS 1.0 and 1.1 to be negotiated
+just to see them fail immediately when using OpenSSL 3.0. This is not
+exactly helpful especially when the OpenSSL error message for this
+particular case is "internal error" which does not really say anything
+about the reason for the error.
+
+It is is a bit inconvenient to update the security policy for this
+particular issue based on the negotiated TLS version since that happens
+in the middle of processing for the first message from the server.
+However, this can be done by using the debug callback for printing out
+the received TLS messages during processing.
+
+Drop the OpenSSL security level to 0 if that is the only option to
+continue the TLS negotiation, i.e., when TLS 1.0/1.1 are still allowed
+in wpa_supplicant default configuration and OpenSSL 3.0 with the
+constraint on MD5-SHA1 use.
+
+Signed-off-by: Jouni Malinen <j@w1.fi>
+
+Bug-Debian: https://bugs.debian.org/1011121
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1958267
+Origin: upstream, commit:bc99366f9b960150aa2e369048bbc2218c1d414e
+---
+ src/crypto/tls_openssl.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
+index 6602ac64f591..78621d926dab 100644
+--- a/src/crypto/tls_openssl.c
++++ b/src/crypto/tls_openssl.c
+@@ -1557,6 +1557,15 @@ static void tls_msg_cb(int write_p, int version, int content_type,
+ 	struct tls_connection *conn = arg;
+ 	const u8 *pos = buf;
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++	if ((SSL_version(ssl) == TLS1_VERSION ||
++	     SSL_version(ssl) == TLS1_1_VERSION) &&
++	    SSL_get_security_level(ssl) > 0) {
++		wpa_printf(MSG_DEBUG,
++			   "OpenSSL: Drop security level to 0 to allow TLS 1.0/1.1 use of MD5-SHA1 signature algorithm");
++		SSL_set_security_level(ssl, 0);
++	}
++#endif /* OpenSSL version >= 3.0 */
+ 	if (write_p == 2) {
+ 		wpa_printf(MSG_DEBUG,
+ 			   "OpenSSL: session ver=0x%x content_type=%d",
+-- 
+2.39.0
+
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-allow-legacy-renegotiation.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-allow-legacy-renegotiation.patch
new file mode 100644
index 000000000000..574973fe6fe5
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-allow-legacy-renegotiation.patch
@@ -0,0 +1,30 @@
+From: James Ralston <ralston@pobox.com>
+Date: Sun, 1 May 2022 16:15:23 -0700
+Subject: Allow legacy renegotiation to fix PEAP issues with some servers
+
+Upstream: http://lists.infradead.org/pipermail/hostap/2022-May/040511.html
+---
+ src/crypto/tls_openssl.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
+index 273e5cb..ad3aa1a 100644
+--- a/src/crypto/tls_openssl.c
++++ b/src/crypto/tls_openssl.c
+@@ -1056,6 +1056,16 @@ void * tls_init(const struct tls_config *conf)
+ 	SSL_CTX_set_options(ssl, SSL_OP_NO_SSLv2);
+ 	SSL_CTX_set_options(ssl, SSL_OP_NO_SSLv3);
+ 
++	/* Many enterprise PEAP server implementations (e.g. used in large
++	 corporations and universities) do not support RFC5746 secure
++	 renegotiation, and starting with OpenSSL 3.0,
++	 SSL_OP_LEGACY_SERVER_CONNECT is no longer set as part of SSL_OP_ALL.
++	 So until we implement a way to request SSL_OP_LEGACY_SERVER_CONNECT
++	 only in EAP peer mode, just set SSL_OP_LEGACY_SERVER_CONNECT
++	 globally. */
++
++	SSL_CTX_set_options(ssl, SSL_OP_LEGACY_SERVER_CONNECT);
++
+ 	SSL_CTX_set_mode(ssl, SSL_MODE_AUTO_RETRY);
+ 
+ #ifdef SSL_MODE_NO_AUTO_CHAIN
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
new file mode 100644
index 000000000000..d04e2429d769
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
@@ -0,0 +1,487 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop linux-info qmake-utils readme.gentoo-r1 systemd toolchain-funcs
+
+DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
+HOMEPAGE="https://w1.fi/wpa_supplicant/"
+LICENSE="|| ( GPL-2 BSD )"
+
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://w1.fi/hostap.git"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	SRC_URI="https://w1.fi/releases/${P}.tar.gz"
+fi
+
+SLOT="0"
+IUSE="ap broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls tkip uncommon-eap-types wep wimax wps"
+
+# CONFIG_PRIVSEP=y does not have sufficient support for the new driver
+# interface functions used for MACsec, so this combination cannot be used
+# at least for now. bug #684442
+REQUIRED_USE="
+	macsec? ( !privsep )
+	privsep? ( !macsec )
+	broadcom-sta? ( !fils !mesh !mbo )
+"
+
+DEPEND="
+	>=dev-libs/openssl-1.0.2k:=
+	dbus? ( sys-apps/dbus )
+	kernel_linux? (
+		>=dev-libs/libnl-3.2:3
+		eap-sim? ( sys-apps/pcsc-lite )
+	)
+	!kernel_linux? ( net-libs/libpcap )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)
+	readline? (
+		sys-libs/ncurses:0=
+		sys-libs/readline:0=
+	)
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-networkmanager )
+	kernel_linux? (
+		net-wireless/wireless-regdb
+	)
+"
+BDEPEND="virtual/pkgconfig"
+
+DOC_CONTENTS="
+	If this is a clean installation of wpa_supplicant, you
+	have to create a configuration file named
+	${EROOT}/etc/wpa_supplicant/wpa_supplicant.conf
+	An example configuration file is available for reference in
+	${EROOT}/usr/share/doc/${PF}/
+"
+
+S="${WORKDIR}/${P}/${PN}"
+
+Kconfig_style_config() {
+		#param 1 is CONFIG_* item
+		#param 2 is what to set it = to, defaulting in y
+		CONFIG_PARAM="${CONFIG_HEADER:-CONFIG_}$1"
+		setting="${2:-y}"
+
+		if [ ! $setting = n ]; then
+			#first remove any leading "# " if $2 is not n
+			sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo "Kconfig_style_config error uncommenting $CONFIG_PARAM"
+			#set item = $setting (defaulting to y)
+			if ! sed -i "/^$CONFIG_PARAM\>/s/=.*/=$setting/" .config; then
+				echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting"
+			fi
+			if [ -z "$( grep ^$CONFIG_PARAM= .config )" ] ; then
+				echo "$CONFIG_PARAM=$setting" >>.config
+			fi
+		else
+			#ensure item commented out
+			if ! sed -i "/^$CONFIG_PARAM\>/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config; then
+				echo "Kconfig_style_config error commenting $CONFIG_PARAM"
+			fi
+		fi
+}
+
+src_prepare() {
+	default
+
+	# net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
+	sed -i \
+		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
+		../src/l2_packet/l2_packet_freebsd.c || die
+
+	# Change configuration to match Gentoo locations (bug #143750)
+	sed -i \
+		-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
+		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
+		wpa_supplicant.conf || die
+
+	# systemd entries to D-Bus service files (bug #372877)
+	echo 'SystemdService=wpa_supplicant.service' \
+		| tee -a dbus/*.service >/dev/null || die
+
+	cd "${WORKDIR}/${P}" || die
+
+	if use wimax; then
+		# generate-libeap-peer.patch comes before
+		# fix-undefined-reference-to-random_get_bytes.patch
+		eapply "${FILESDIR}/${P}-generate-libeap-peer.patch"
+
+		# multilib-strict fix (bug #373685)
+		sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile || die
+	fi
+
+	# bug (320097)
+	eapply "${FILESDIR}/${PN}-2.6-do-not-call-dbus-functions-with-NULL-path.patch"
+
+	# bug (912315)
+	eapply "${FILESDIR}/${PN}-2.10-allow-legacy-renegotiation.patch"
+	eapply "${FILESDIR}/${P}-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch"
+
+	# bug (640492)
+	sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
+}
+
+src_configure() {
+	# Toolchain setup
+	tc-export CC PKG_CONFIG
+
+	cp defconfig .config || die
+
+	# Basic setup
+	Kconfig_style_config CTRL_IFACE
+	Kconfig_style_config MATCH_IFACE
+	Kconfig_style_config BACKEND file
+	Kconfig_style_config IBSS_RSN
+	Kconfig_style_config IEEE80211W
+	Kconfig_style_config IEEE80211R
+	Kconfig_style_config HT_OVERRIDES
+	Kconfig_style_config VHT_OVERRIDES
+	Kconfig_style_config OCV
+	Kconfig_style_config TLSV11
+	Kconfig_style_config TLSV12
+	Kconfig_style_config GETRANDOM
+
+	# Basic authentication methods
+	# NOTE: we don't set GPSK or SAKE as they conflict
+	# with the below options
+	Kconfig_style_config EAP_GTC
+	Kconfig_style_config EAP_MD5
+	Kconfig_style_config EAP_OTP
+	Kconfig_style_config EAP_PAX
+	Kconfig_style_config EAP_PSK
+	Kconfig_style_config EAP_TLV
+	Kconfig_style_config EAP_EXE
+	Kconfig_style_config IEEE8021X_EAPOL
+	Kconfig_style_config PKCS12
+	Kconfig_style_config PEERKEY
+	Kconfig_style_config EAP_LEAP
+	Kconfig_style_config EAP_MSCHAPV2
+	Kconfig_style_config EAP_PEAP
+	Kconfig_style_config EAP_TEAP
+	Kconfig_style_config EAP_TLS
+	Kconfig_style_config EAP_TTLS
+
+	# Enabling background scanning.
+	Kconfig_style_config BGSCAN_SIMPLE
+	Kconfig_style_config BGSCAN_LEARN
+
+	if use dbus ; then
+		Kconfig_style_config CTRL_IFACE_DBUS
+		Kconfig_style_config CTRL_IFACE_DBUS_NEW
+		Kconfig_style_config CTRL_IFACE_DBUS_INTRO
+	else
+		Kconfig_style_config CTRL_IFACE_DBUS n
+		Kconfig_style_config CTRL_IFACE_DBUS_NEW n
+		Kconfig_style_config CTRL_IFACE_DBUS_INTRO n
+	fi
+
+	if use eapol-test ; then
+		Kconfig_style_config EAPOL_TEST
+	fi
+
+	# Enable support for writing debug info to a log file and syslog.
+	Kconfig_style_config DEBUG_FILE
+	Kconfig_style_config DEBUG_SYSLOG
+
+	if use hs2-0 ; then
+		Kconfig_style_config INTERWORKING
+		Kconfig_style_config HS20
+	fi
+
+	if use mbo ; then
+		Kconfig_style_config MBO
+	else
+		Kconfig_style_config MBO n
+	fi
+
+	if use uncommon-eap-types; then
+		Kconfig_style_config EAP_GPSK
+		Kconfig_style_config EAP_SAKE
+		Kconfig_style_config EAP_GPSK_SHA256
+		Kconfig_style_config EAP_IKEV2
+		Kconfig_style_config EAP_EKE
+	fi
+
+	if use eap-sim ; then
+		# Smart card authentication
+		Kconfig_style_config EAP_SIM
+		Kconfig_style_config EAP_AKA
+		Kconfig_style_config EAP_AKA_PRIME
+		Kconfig_style_config PCSC
+	fi
+
+	if use fasteap ; then
+		Kconfig_style_config EAP_FAST
+	fi
+
+	if use readline ; then
+		# readline/history support for wpa_cli
+		Kconfig_style_config READLINE
+	else
+		#internal line edit mode for wpa_cli
+		Kconfig_style_config WPA_CLI_EDIT
+	fi
+
+	Kconfig_style_config TLS openssl
+	Kconfig_style_config FST
+
+	Kconfig_style_config EAP_PWD
+	if use fils; then
+		Kconfig_style_config FILS
+		Kconfig_style_config FILS_SK_PFS
+	fi
+	if use mesh; then
+		Kconfig_style_config MESH
+	else
+		Kconfig_style_config MESH n
+	fi
+	# WPA3
+	Kconfig_style_config OWE
+	Kconfig_style_config SAE
+	Kconfig_style_config DPP
+	Kconfig_style_config DPP2
+	Kconfig_style_config SUITEB192
+	Kconfig_style_config SUITEB
+
+	if use wep ; then
+		Kconfig_style_config WEP
+	else
+		Kconfig_style_config WEP n
+	fi
+
+	# Watch out, reversed logic
+	if use tkip ; then
+		Kconfig_style_config NO_TKIP n
+	else
+		Kconfig_style_config NO_TKIP
+	fi
+
+	if use smartcard ; then
+		Kconfig_style_config SMARTCARD
+	else
+		Kconfig_style_config SMARTCARD n
+	fi
+
+	if use tdls ; then
+		Kconfig_style_config TDLS
+	fi
+
+	if use kernel_linux ; then
+		# Linux specific drivers
+		Kconfig_style_config DRIVER_ATMEL
+		Kconfig_style_config DRIVER_HOSTAP
+		Kconfig_style_config DRIVER_IPW
+		Kconfig_style_config DRIVER_NL80211
+		Kconfig_style_config DRIVER_RALINK
+		Kconfig_style_config DRIVER_WEXT
+		Kconfig_style_config DRIVER_WIRED
+
+		if use macsec ; then
+			#requires something, no idea what
+			#Kconfig_style_config DRIVER_MACSEC_QCA
+			Kconfig_style_config DRIVER_MACSEC_LINUX
+			Kconfig_style_config MACSEC
+		else
+			# bug #831369 and bug #684442
+			Kconfig_style_config DRIVER_MACSEC_LINUX n
+			Kconfig_style_config MACSEC n
+		fi
+
+		if use ps3 ; then
+			Kconfig_style_config DRIVER_PS3
+		fi
+	fi
+
+	# Wi-Fi Protected Setup (WPS)
+	if use wps ; then
+		Kconfig_style_config WPS
+		Kconfig_style_config WPS2
+		# USB Flash Drive
+		Kconfig_style_config WPS_UFD
+		# External Registrar
+		Kconfig_style_config WPS_ER
+		# Universal Plug'n'Play
+		Kconfig_style_config WPS_UPNP
+		# Near Field Communication
+		Kconfig_style_config WPS_NFC
+	else
+		Kconfig_style_config WPS n
+		Kconfig_style_config WPS2 n
+		Kconfig_style_config WPS_UFD n
+		Kconfig_style_config WPS_ER n
+		Kconfig_style_config WPS_UPNP n
+		Kconfig_style_config WPS_NFC n
+	fi
+
+	# Wi-Fi Direct (WiDi)
+	if use p2p ; then
+		Kconfig_style_config P2P
+		Kconfig_style_config WIFI_DISPLAY
+	else
+		Kconfig_style_config P2P n
+		Kconfig_style_config WIFI_DISPLAY n
+	fi
+
+	# Access Point Mode
+	if use ap ; then
+		Kconfig_style_config AP
+	else
+		Kconfig_style_config AP n
+	fi
+
+	# Enable essentials for AP/P2P
+	if use ap || use p2p ; then
+		# Enabling HT support (802.11n)
+		Kconfig_style_config IEEE80211N
+
+		# Enabling VHT support (802.11ac)
+		Kconfig_style_config IEEE80211AC
+	fi
+
+	# Enable mitigation against certain attacks against TKIP
+	Kconfig_style_config DELAYED_MIC_ERROR_REPORT
+
+	if use privsep ; then
+		Kconfig_style_config PRIVSEP
+	fi
+
+	if use kernel_linux ; then
+		Kconfig_style_config LIBNL32
+	fi
+
+	if use qt5 ; then
+		pushd "${S}"/wpa_gui-qt4 > /dev/null || die
+		eqmake5 wpa_gui.pro
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	einfo "Building wpa_supplicant"
+	emake V=1 BINDIR=/usr/sbin
+
+	if use wimax; then
+		emake -C ../src/eap_peer clean
+		emake -C ../src/eap_peer
+	fi
+
+	if use qt5; then
+		einfo "Building wpa_gui"
+		emake -C "${S}"/wpa_gui-qt4
+	fi
+
+	if use eapol-test ; then
+		emake eapol_test
+	fi
+}
+
+src_install() {
+	dosbin wpa_supplicant
+	use privsep && dosbin wpa_priv
+	dobin wpa_cli wpa_passphrase
+
+	# baselayout-1 compat
+	if has_version "<sys-apps/baselayout-2.0.0"; then
+		dodir /sbin
+		dosym ../usr/sbin/wpa_supplicant /sbin/wpa_supplicant
+		dodir /bin
+		dosym ../usr/bin/wpa_cli /bin/wpa_cli
+	fi
+
+	if has_version ">=sys-apps/openrc-0.5.0"; then
+		newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
+		newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
+	fi
+
+	exeinto /etc/wpa_supplicant/
+	newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh
+
+	readme.gentoo_create_doc
+	dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
+		wpa_supplicant.conf
+
+	newdoc .config build-config
+
+	if [ "${PV}" != "9999" ]; then
+		doman doc/docbook/*.{5,8}
+	fi
+
+	if use qt5 ; then
+		into /usr
+		dobin wpa_gui-qt4/wpa_gui
+		doicon wpa_gui-qt4/icons/wpa_gui.svg
+		domenu wpa_gui-qt4/wpa_gui.desktop
+	else
+		rm "${ED}"/usr/share/man/man8/wpa_gui.8
+	fi
+
+	use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install
+
+	if use dbus ; then
+		pushd "${S}"/dbus > /dev/null || die
+		insinto /etc/dbus-1/system.d
+		newins dbus-wpa_supplicant.conf wpa_supplicant.conf
+		insinto /usr/share/dbus-1/system-services
+		doins fi.w1.wpa_supplicant1.service
+		popd > /dev/null || die
+
+		# This unit relies on dbus support, bug 538600.
+		systemd_dounit systemd/wpa_supplicant.service
+	fi
+
+	if use eapol-test ; then
+		dobin eapol_test
+	fi
+
+	systemd_dounit "systemd/wpa_supplicant@.service"
+	systemd_dounit "systemd/wpa_supplicant-nl80211@.service"
+	systemd_dounit "systemd/wpa_supplicant-wired@.service"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}"/etc/wpa_supplicant.conf ]] ; then
+		echo
+		ewarn "WARNING: your old configuration file ${EROOT}/etc/wpa_supplicant.conf"
+		ewarn "needs to be moved to ${EROOT}/etc/wpa_supplicant/wpa_supplicant.conf"
+	fi
+	if ! use wep; then
+		einfo "WARNING: You are building with WEP support disabled, which is recommended since"
+		einfo "this protocol is deprecated and insecure.  If you still need to connect to"
+		einfo "WEP-enabled networks, you may turn this flag back on.  With this flag off,"
+		einfo "WEP-enabled networks will not even show up as available."
+		einfo "If your network is missing you may wish to USE=wep"
+	fi
+	if ! use tkip; then
+		ewarn "WARNING: You are building with TKIP support disabled, which is recommended since"
+		ewarn "this protocol is deprecated and insecure.  If you still need to connect to"
+		ewarn "TKIP-enabled networks, you may turn this flag back on.  With this flag off,"
+		ewarn "TKIP-enabled networks, including mixed mode TKIP/AES-CCMP will not even show up"
+		ewarn "as available.  If your network is missing you may wish to USE=tkip"
+	fi
+
+	# Mea culpa, feel free to remove that after some time --mgorny.
+	local fn
+	for fn in wpa_supplicant{,@wlan0}.service; do
+		if [[ -e "${EROOT}"/etc/systemd/system/network.target.wants/${fn} ]]
+		then
+			ebegin "Moving ${fn} to multi-user.target"
+			mv "${EROOT}"/etc/systemd/system/network.target.wants/${fn} \
+				"${EROOT}"/etc/systemd/system/multi-user.target.wants/ || die
+			eend ${?} \
+				"Please try to re-enable ${fn}"
+		fi
+	done
+
+	systemd_reenable wpa_supplicant.service
+}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
index 656297bfa793..8c93c31c2554 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
@@ -122,6 +122,9 @@ src_prepare() {
 	# bug (320097)
 	eapply "${FILESDIR}/${PN}-2.6-do-not-call-dbus-functions-with-NULL-path.patch"
 
+	# bug (912315)
+	eapply "${FILESDIR}/${PN}-2.10-allow-legacy-renegotiation.patch"
+
 	# bug (640492)
 	sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
 }
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 385181847996..5de1aece55c0 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 930bd88e8c55..4044e9e6879f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,23 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2023-08-26)
+# 'AttributeError: NoneType object has no attribute cname' regression
+# See bug #913062, https://github.com/cython/cython/issues/5643, and
+# https://github.com/cython/cython/issues/5644.
+=dev-python/cython-3.0.1
+
+# Hans de Graaff <graaff@gentoo.org> (2023-08-26)
+# Does not compile with Ruby 3.2. Last release 10 years ago. No activity
+# upstream since. No reverse dependencies. Masked for removal on
+# 2023-09-26.
+dev-ruby/state_machine
+
+# Hans de Graaff <graaff@gentoo.org> (2023-08-26)
+# The totori.dip.jp website is no longer available. Last release in
+# 2015. No reverse dependencies. Masked for removal on 2023-09-26.
+dev-ruby/totoridipjp
+
 # Michael Orlitzky <mjo@gentoo.org> (2023-08-23)
 # Incompatible with perl-5.38 and no fix forthcoming (bug 909570).
 # Removal sometime after 2023-09-23.
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index b6dc4dd47fb5..3b0f926b3621 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-apache-tomcat/Manifest b/sec-keys/openpgp-keys-apache-tomcat/Manifest
index 0b91f35da9ad..3ff5453c48e7 100644
--- a/sec-keys/openpgp-keys-apache-tomcat/Manifest
+++ b/sec-keys/openpgp-keys-apache-tomcat/Manifest
@@ -1,13 +1,19 @@
 DIST openpgp-keys-apache-tomcat-10.1.11-KEYS.asc 35947 BLAKE2B 034e64f5db48a3b6536e330d539c8254b6eaf13ea9b4cf0b7c29ac14b7a49d221e93cd6971606c10520194452f3a34ed71ee919bc0f6b0f3a143776106ae8d0f SHA512 46f193aaead52c1807ac719977e5583daa0fd2a96db4f0041b72f1150deaa456d3c72a2856218ffba31ec9ffd0804a2b97f7646f0d67aa1404819ebe79555c3d
 DIST openpgp-keys-apache-tomcat-10.1.12-KEYS.asc 35947 BLAKE2B 034e64f5db48a3b6536e330d539c8254b6eaf13ea9b4cf0b7c29ac14b7a49d221e93cd6971606c10520194452f3a34ed71ee919bc0f6b0f3a143776106ae8d0f SHA512 46f193aaead52c1807ac719977e5583daa0fd2a96db4f0041b72f1150deaa456d3c72a2856218ffba31ec9ffd0804a2b97f7646f0d67aa1404819ebe79555c3d
+DIST openpgp-keys-apache-tomcat-10.1.13-KEYS.asc 35947 BLAKE2B 034e64f5db48a3b6536e330d539c8254b6eaf13ea9b4cf0b7c29ac14b7a49d221e93cd6971606c10520194452f3a34ed71ee919bc0f6b0f3a143776106ae8d0f SHA512 46f193aaead52c1807ac719977e5583daa0fd2a96db4f0041b72f1150deaa456d3c72a2856218ffba31ec9ffd0804a2b97f7646f0d67aa1404819ebe79555c3d
 DIST openpgp-keys-apache-tomcat-8.5.91-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
 DIST openpgp-keys-apache-tomcat-8.5.92-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
+DIST openpgp-keys-apache-tomcat-8.5.93-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
 DIST openpgp-keys-apache-tomcat-9.0.78-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
 DIST openpgp-keys-apache-tomcat-9.0.79-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
+DIST openpgp-keys-apache-tomcat-9.0.80-KEYS.asc 14245 BLAKE2B 95314b83bea302f61504a469cc64305361cf10f404db0524885928533fe6dd950fb052690c37920a2c18ba5e521bf8cd3309b17701cc762413a88c922e4301e7 SHA512 d1b45c80ec4a707ac6842a10957f19d136098a8e95710708dcea182ca49b61dc53af794529f79680d290539aac19b8a3bd7b353da8cbb680096e3b99f94122a0
 EBUILD openpgp-keys-apache-tomcat-10.1.11.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 EBUILD openpgp-keys-apache-tomcat-10.1.12.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
+EBUILD openpgp-keys-apache-tomcat-10.1.13.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 EBUILD openpgp-keys-apache-tomcat-8.5.91.ebuild 562 BLAKE2B 1fc6086cfa3bea924ab3684009e458d3f6eb177e01758a103ea6d1b907d085ac21844395996fef395d15da44c5c5936c3f85485c2fb73d7823b892ccf19e9634 SHA512 b4124756d967edea63bad9bde86c85feb1a10f37b5cff7d7c4290968bd2b77bfc608901b5b69b8365af1a18a274e2e3f05596709838f2fe063e6a39c08020215
 EBUILD openpgp-keys-apache-tomcat-8.5.92.ebuild 562 BLAKE2B 1fc6086cfa3bea924ab3684009e458d3f6eb177e01758a103ea6d1b907d085ac21844395996fef395d15da44c5c5936c3f85485c2fb73d7823b892ccf19e9634 SHA512 b4124756d967edea63bad9bde86c85feb1a10f37b5cff7d7c4290968bd2b77bfc608901b5b69b8365af1a18a274e2e3f05596709838f2fe063e6a39c08020215
+EBUILD openpgp-keys-apache-tomcat-8.5.93.ebuild 562 BLAKE2B 1fc6086cfa3bea924ab3684009e458d3f6eb177e01758a103ea6d1b907d085ac21844395996fef395d15da44c5c5936c3f85485c2fb73d7823b892ccf19e9634 SHA512 b4124756d967edea63bad9bde86c85feb1a10f37b5cff7d7c4290968bd2b77bfc608901b5b69b8365af1a18a274e2e3f05596709838f2fe063e6a39c08020215
 EBUILD openpgp-keys-apache-tomcat-9.0.78.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 EBUILD openpgp-keys-apache-tomcat-9.0.79.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
+EBUILD openpgp-keys-apache-tomcat-9.0.80.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.13.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.13.ebuild
new file mode 100644
index 000000000000..81b3505e76ec
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.13.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
+HOMEPAGE="https://tomcat.apache.org/download-90.cgi"
+SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.93.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.93.ebuild
new file mode 100644
index 000000000000..f17ae55806f2
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.93.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
+HOMEPAGE="https://tomcat.apache.org/download-80.cgi"
+SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.80.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.80.ebuild
new file mode 100644
index 000000000000..81b3505e76ec
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.80.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
+HOMEPAGE="https://tomcat.apache.org/download-90.cgi"
+SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 847db5592cba..b6ba047fbbf7 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/ckbcomp/Manifest b/sys-apps/ckbcomp/Manifest
index 78891bc510d0..3b81831859f9 100644
--- a/sys-apps/ckbcomp/Manifest
+++ b/sys-apps/ckbcomp/Manifest
@@ -1,5 +1,3 @@
-DIST ckbcomp-1.164.tar.gz 3044072 BLAKE2B 74abf0c971a188fbbacd77e9eadad84ec29cbb2cde4c968402b83c0a5cd47ba5432f03dab4ed6bd8f8ae6b0ed8ebb4dcd51b8eddffd3b5d77de445740d5d576f SHA512 b2a71c7c34ff677f555bdb76bc329ae06740c4d0fa5516356dcd833fc9f97c0c560b26b4497fd7e3e0a60acb975a461a75ecc765c3f0fa1250f8b2e0f01c4e40
 DIST console-setup-1.217.tar.gz 3273430 BLAKE2B cf48a8dbd250f3ee0e1093b3dc0b13d9b23a13e456f7c0c60d4d8764bc1ed41bc6f0da57d4f0e5642fdceca9a26d02e5b986df019644d238bab0c91028958aed SHA512 20b148e3ffa1a57509e1bdab091ae36df04f363c7ca54e1decc15c14325df85b3d100e4b9a1e5884c18d47d45066b029bd450c9588f3103c03ad102d348869ad
-EBUILD ckbcomp-1.164.ebuild 735 BLAKE2B 731fa1402d6f5b47327dc1c7870f7e78ad5320fcb0ad47d117eff17339cd2238e678d3f835462034698ed81fac3dea3b236c05ca021a0616a803d4a1aea6c03f SHA512 66cc0fdc76f10b5b955267a3b75974ce60eaf852759af24a25c36fb77c1c084572814109382cc6f4d11a9f483505226847557e3b1c8c838729494aee38ac10ee
 EBUILD ckbcomp-1.217.ebuild 680 BLAKE2B 6f8c305028e5583cdeb526a8a88a07e48fd08b3b404cee4f7bc07aac9b08996fc2958dbbaa53384721e883015f6e4a1de9a3da2c8488d1d633504cf30cbdf804 SHA512 9e5b02cb52c50ba4788428c9f114a125c4912fb3e006c994530a5f90906dcef1d8285bdfb1d472fe227b121dbc79b3c6f2748e18c193b1f8dbcd9450d5d95dd0
 MISC metadata.xml 171 BLAKE2B 589206ffd9c243712f27e366177e5448ebcf58bf71e2e0f49a3f0c5292e1341ccd68238b36065d2349be51ef530c8ee2634a260f077826c6ebcc0f7e665e98d9 SHA512 67c15eac3c1637b76d429a0c96476ce57a9c38a608e7ae0829489d4802e9f3b5effdeb375b4a7ba19a5c794b3d990c8f09fabbac2462b1aa08f3c72651f0c8f8
diff --git a/sys-apps/ckbcomp/ckbcomp-1.164.ebuild b/sys-apps/ckbcomp/ckbcomp-1.164.ebuild
deleted file mode 100644
index e40e5fc54cdc..000000000000
--- a/sys-apps/ckbcomp/ckbcomp-1.164.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Compile an XKB keymap for loadkeys"
-HOMEPAGE="https://anonscm.debian.org/cgit/d-i/console-setup.git"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anonscm.debian.org/git/d-i/console-setup.git"
-else
-	COMMIT_ID=e327df26fa9dbdf363b778ada91e83967f4bd500
-	SRC_URI="https://anonscm.debian.org/cgit/d-i/console-setup.git/snapshot/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${COMMIT_ID}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=""
-RDEPEND="
-	dev-lang/perl:*
-	sys-apps/kbd
-	x11-misc/xkeyboard-config"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dobin Keyboard/ckbcomp
-}
diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
index d14d9160a7b9..341d3c20fd77 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -1,5 +1,7 @@
 DIST inxi-3.3.27.1.tar.gz 614167 BLAKE2B 1a312255340bfe361eb10dd725cc9fb1421d8dfda34ee944347278e4a293cbcb51d1e2b7aa00f26c16286b90f26d3e0f91f68fb4beeb112ecd8f7a3bc86680ff SHA512 f21285d709d8dc7ce393a6c3b43b5ebabb8ef2c55adf43f00935b728a28f502bbcbd8c1482249e872e4623430f01b4e8cf51f0a6790d56fb12147fa125152575
 DIST inxi-3.3.28.1.tar.gz 624472 BLAKE2B 3d8ac9c21a7531e694e5de3a764906a69ef0c869f1bb4b7b5e5d0b42a74240a141c97401dfe78a85da27e7489d708fbfc4eb568adaab5270388aebd108f29e1a SHA512 6360193cc1f7a71c7329352311fac625e6c80e37c2bd783a78a534ec9712afd7df17b445c652d97415f6162512ede34b32958311b1c5086e899a2aded7a8efd9
+DIST inxi-3.3.29.1.tar.gz 630296 BLAKE2B 176b20b113b3339f27d2ec16681d652e8ccaefed80c220078fa4e625ad7191cd6ebc9ada049197a858475e5c656b5f74f599ca202e1e47d6682e4cd9049eb763 SHA512 09b5a7553ccfd42a3c2e58d4718c487f84bf22df76710a6c42a2a4dd08343279f1d2523652a476ed475c5e019ad5aa02c0886bc40d57de407c9489054f812b5c
 EBUILD inxi-3.3.27.1.ebuild 849 BLAKE2B 249ed83ef6ad2b4bc351742d2fcb91073fbd6ba6c0c260b4d81dce6a26ab1c9bc87a34e07fc3a86c20cac78dd12687bd01a57cf446aa6e04792f9114cfa87152 SHA512 91a021a98be47dacb43dc05bdb30b66d26ff093085c86b4399ab6dd883f6b93db873d4f6d3b57c3897e74a85949ab1caf9d43b30a62df7f49c43b48f55e31ad0
 EBUILD inxi-3.3.28.1.ebuild 854 BLAKE2B 77e8ded042ff977389b564d539f54f8867821857ff43315521890ef30c819737cf4992909d848a9c194f105041ec67bd5d8e3911a0046e4ada824d4daae1285c SHA512 b0c9b27ed8385cfbc7dd164f4ae259bf56a548869af9218b0901fb30b728a28bbe8a494b41b1e58804f7412366a97957b2d2c1775628bbd0b0d7ba125f3c7f48
+EBUILD inxi-3.3.29.1.ebuild 854 BLAKE2B 77e8ded042ff977389b564d539f54f8867821857ff43315521890ef30c819737cf4992909d848a9c194f105041ec67bd5d8e3911a0046e4ada824d4daae1285c SHA512 b0c9b27ed8385cfbc7dd164f4ae259bf56a548869af9218b0901fb30b728a28bbe8a494b41b1e58804f7412366a97957b2d2c1775628bbd0b0d7ba125f3c7f48
 MISC metadata.xml 613 BLAKE2B f444aa0759120064814cacf0fcba57059d87b1c014d78eea52304fb3afb9da9b905e30c1cf1399bfbc0d66442e3d892eb2657543014b905f2bf9a943dc8480d9 SHA512 cbe6e76cb003bb77134398aa1db5a24c47de826eb1f17b07e2cee647b9d58948596c2f4588c7c834332c096ce8b782799f07ed4f47a7b252e85e402324ba76bb
diff --git a/sys-apps/inxi/inxi-3.3.29.1.ebuild b/sys-apps/inxi/inxi-3.3.29.1.ebuild
new file mode 100644
index 000000000000..1b3918e6aebe
--- /dev/null
+++ b/sys-apps/inxi/inxi-3.3.29.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV=$(ver_rs 3 '-')
+# 2.3.56 was the last version with no tagged release.
+# It was also the last Bash based release. Later versions are Perl based
+
+DESCRIPTION="The CLI inxi collects and prints hardware and system information"
+HOMEPAGE="https://github.com/smxi/inxi"
+SRC_URI="https://github.com/smxi/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="bluetooth hddtemp opengl"
+
+RDEPEND="dev-lang/perl
+	sys-apps/pciutils
+	sys-apps/usbutils
+	bluetooth? ( net-wireless/bluez )
+	hddtemp? ( app-admin/hddtemp )
+	opengl? ( x11-apps/mesa-progs )
+	"
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc README.txt
+}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 9db6b9565a6f..11b3c27c4f30 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 5a96a21b3c4d..d039635c7d43 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -10,19 +10,28 @@ DIST apache-tomcat-10.1.11-src.tar.gz 6118924 BLAKE2B 0e97bafe7a0451c34d16f2c3ae
 DIST apache-tomcat-10.1.11-src.tar.gz.asc 849 BLAKE2B 6427668fe4f93b1de322bafbefb9ef6ac47baca8d8cc56bddb267a35bd280792ce096971a032eacb04c0322d68c21af32b681d9ef9ba006c78dde489247429d0 SHA512 6895f874bf1265b2cab94594ff542d0b9760afaa70f1486b882b25593878470ab8a4d399cf5320bec9ae9d18f2a881f59072f0909345ddeb42d549ded460f791
 DIST apache-tomcat-10.1.12-src.tar.gz 6122423 BLAKE2B 6de2189e415aba38168ebf09493e96d5906a72e77cbb5af358144e510e6de9fcb342db83c64ac6827ec8e03ab7402e24648b3cfb1a5385153a85dec71d2c55a9 SHA512 f383a4f401c21cb1acd93b6446fd915ba41da9a67c2538d7177a90238adc3294d260f29ef2ebb72e300cb93b4a7a42090e1c3b478b5deea344eb3d19992a9fd7
 DIST apache-tomcat-10.1.12-src.tar.gz.asc 849 BLAKE2B 8f1f5cb35a24fe22999b0ba68b50e1fe4118b3a645d3c991c55161448356d505d6b953e40d70b4fd5e17d20e63f873d04388f315b96eb4fdc2025d1ed7b897a0 SHA512 1f3cbdf57e289013111726f14f868dad69f9c24faf375497408560e8b46ccf131a79095f097378ea2cdfcc802120a65d7a36e655ce62361bdb7511cb9cfa3c70
+DIST apache-tomcat-10.1.13-src.tar.gz 6123612 BLAKE2B 0ce1519ec19f7b69808653856474a0011fc76a46c903ecaf97085d91c3fe31676e3064c68600cd4222dd53e0033d24cbb11f82226b8dd086f88a88e910b3f6cd SHA512 e44e2dba618f70d9a39e976cc07d33fc9cbead2169e24d6ea2051c8db20601f63ee7bc657245869450c82cf0ceb272501066b77ae45265d19b7964f5ed0e85b1
+DIST apache-tomcat-10.1.13-src.tar.gz.asc 890 BLAKE2B 75ccd687749749e04ed479c57ed6d6f69b9dd6ccf0c215a7c08c15a18967a7c4529ab3d5a013954a6a13072c49d8a039763d3a73a6f0e472213d632877d4d6d7 SHA512 223efe5c1972b9f455ac76895ca7774fa17c1d80e14331342dc538229c12bea83e8c3f838be03a748f291ecf80dc99c72896f25aafccac868f42eb830c4add7f
 DIST apache-tomcat-8.5.91-src.tar.gz 6098592 BLAKE2B 026fb19cb938986401e95f5441c5a775c73bf31b5ca23c8be54d30a710fd9a5badd0ed9360598883ed641056594c3f471c21c834f79af3cdb4a879bb54402399 SHA512 f3a69630e3cd144c74ea3edce68f8e39bc67e734bf02822caf7c6e59a2e4db404a5c0bdf40a22614b6dd85bac3dc5821e6b74c56a1147655f602cdf39fb651f5
 DIST apache-tomcat-8.5.91-src.tar.gz.asc 849 BLAKE2B 9f5f347692101a93dedf7014dc9d5351dfee5b956247edeec87c29b33548ff9c78c55a6e426aac40626a616ffaa73dd7f01ee5a384d080845f86b13c92f1cd63 SHA512 3d4bce771c7f044338eaad0d7d959c360396be67e989938a5595dfc42d1f7cfe451fc00de9197cd1a20ac2fc50f8b7ad93ecee07fe50c097fdeabf8ae1b8bf3d
 DIST apache-tomcat-8.5.92-src.tar.gz 6104937 BLAKE2B 32027d52506b13bba1826cb966cbc431e39c3da9b0362467bdbed5be1ae6be35928b691cc806bae761297c323f3c3dfec6ca1d6041aecaad3d2ffaf0cd4a216e SHA512 d2f502c1cfe22a17ae4ec4007f7c3296d81210dd21628bf6e38707376670a1fcd4323d55ccda5d9bdd76d58b0829dd04a2956f3d99b01ca6731cf4d87db3963b
 DIST apache-tomcat-8.5.92-src.tar.gz.asc 849 BLAKE2B 90b66f037ffdaf8823ea29841a339c537ab71d6012318cb576e04d61f185a91e8a1313f9ba800445bdecda3769079364dc871d84740af6c12b4ed983678d24e1 SHA512 88ee2f4ded06597b13785096f4ef10b6784a2f6879889a3a517db29dc2461d39dd80306a1cd394d98f58bdca41d31bee639701cea17de8b0092d59f4de2ec01d
+DIST apache-tomcat-8.5.93-src.tar.gz 6106306 BLAKE2B ca9a05902b492696ca89db5017dd5c042a28c95b4138477049cd8ce2ded91c7814f2326c67718b83fd5e962c57666a1b2ab41d9b928c7d890ced9afbb13d9ce6 SHA512 655752367585e7aa4af7b9b1392edb2c6e40dbda739aa459d81929ab0376648b8731baa469acaa8886bc3c859f8c8485f6826e86f59c3ac2bc1d876d17c2ce9b
+DIST apache-tomcat-8.5.93-src.tar.gz.asc 890 BLAKE2B b3f64af8af6652657f76ff216e003a647bb278a8f5770babdc74f904a02bf21f91810d74d64efbbfc547282c39a14b72542dd97fad50630061207c75cd0b234e SHA512 7b3afd083bc353680df40daac2053a52afa0bd38a902f6acd54bfd27bd274597fd40206c7b8a053223dfaf344b02b416071f662c928e3d43715f4a4f106fad79
 DIST apache-tomcat-9.0.78-src.tar.gz 6266960 BLAKE2B 15bf31c4d4445d0f7b8f53ea23aedefaa0e5635c3dce7e6bc35d11f7bba0e8f5b00263c680287c0b0a4743317dbf8191c1759fbe1f899e1aa157d488c037276d SHA512 220bf46004c4cbad536a7040c979651ee49a13994cf83045369c1bfdc0a96c0172ddc8fd24ab76c9526591c50033d915dbd258939b24d22d660050dcb5abcad4
 DIST apache-tomcat-9.0.78-src.tar.gz.asc 833 BLAKE2B 2ee91e558dc0478b519a252e3c4b7101d5c96f5e95b06e29bc2be69b4f9828f35392633f870e1cbe45cd5f9215642d961e73be2ab501af287c64af7f8d370c15 SHA512 175c8c43f19ba82d658ac8a7c3496a335edfa7eafc12cf552ea40b8c6c1cd353d9af930091fc6a5069d75473ebebfac2a101e09925fb18119ed563945cf680c2
 DIST apache-tomcat-9.0.79-src.tar.gz 6272073 BLAKE2B d33c127660045e6b24f73b695042aff51a5ffb811d3c2ea97acf1f2c82f6a948710728b707d684f6ec91e787c7f6cb7d9c13c37afc0f96c0f23bda7fa605bd19 SHA512 dae963c0ab473810de750483a71e9ff6ecf762133d0b9ea2e14ec134a03de70eb9b04d3efbb61aad84e43ed930fcb4e07a53288cac11917b2e0c359f433e0dbe
 DIST apache-tomcat-9.0.79-src.tar.gz.asc 833 BLAKE2B e551a1b4e2b05020ab0122c6efb945036f83563e28c00fa015b0fe0ecdfbc5977dfcbcd9902b4a065e9ba9262d9351cc1cfdb25d0dbeb0207f2078e39095cc6e SHA512 92089b97a64d06bcc799d6927a657d30e4387a2025ae81c99d04dfa1647e34b6f492c4ad09a24dffd1a0045261bd3e933ef0f47365e749b93c367f735cbbd9a7
+DIST apache-tomcat-9.0.80-src.tar.gz 6272358 BLAKE2B 025e704d44e5c7576b1f96f01ab375e29771da2bb8539c88aa374afadfb15072070b2021766d8ed3b67a77b9d43782dd480f5d8ec4842bf942c5ed6e4f59dd72 SHA512 a2fb298c1fd2615e1a69371b5f84eb569e897faad3cbe17e3626460f5ce311085c120dd3f62c255fde87e6517915365ab52ada613776d45185b8e53624935114
+DIST apache-tomcat-9.0.80-src.tar.gz.asc 890 BLAKE2B c4620b61c1902c3a908aedffec22e215c72c43dc6844a32bc5de9ac13f39b5e09da7898150f6ec4f1af250d8c366280976f424e603a9a7d56f5fdfdbd773ab00 SHA512 019cbe91b7a6b34bbeaee3117b9fe620749845025d7a699179a1dd6acb9cb9169e5af506bbe515ddf0c66726832bb4c8cf9c0c5870f3f151879706309bab754f
 DIST biz.aQute.bnd-6.4.0.jar 16303123 BLAKE2B 73cdeb9e63c04b41db26f91efc3b01fdfd7c8796d6b1f556c77f90bcdbe048f374b5164b885689f3e62ca45b8ca8b97fce70e1fa13d807d2f76869155c8ba7f5 SHA512 b113177f97894b0ed5cfbc38f96c995d6425e981ec8c7b27d99044793ff77dd2450367ad9ee977f443fba349fe1d68fc26f3aaa737eba0a402abcf29716b2e85
 EBUILD tomcat-10.1.11.ebuild 5432 BLAKE2B d8468c032a279c8b1bd7f95d41c25a4c4e06e1a413b1ffecf32dc6fda76f4e91122b3f9e2426e4523d2f653430199c17fe503092c1e3b4269c1a527deb16f177 SHA512 9f907a70800df7da6be008ee8d4e8beb02e7c4f6595dbdec25aeac3298fce28143e71472b90278d36f4bb4704bab351d55274e9445884910b00ebb2ffbd8d83c
 EBUILD tomcat-10.1.12.ebuild 5433 BLAKE2B aad79da428d6e624a93caf667c73b32e4a6d1482f1d782f80f80bb587a3902ee213836d40e1554eabda89b7f6fdd1bd11b4ad615cabf9c81eb5000b6c8bc2e37 SHA512 f62f86394de987790a1a070bf3856d05615f2f593726e3db82d70991d021bbcc168d345572637fb65211dbb3543b525d6ce30f8712e69048c49adaa41744adb3
+EBUILD tomcat-10.1.13.ebuild 5433 BLAKE2B aad79da428d6e624a93caf667c73b32e4a6d1482f1d782f80f80bb587a3902ee213836d40e1554eabda89b7f6fdd1bd11b4ad615cabf9c81eb5000b6c8bc2e37 SHA512 f62f86394de987790a1a070bf3856d05615f2f593726e3db82d70991d021bbcc168d345572637fb65211dbb3543b525d6ce30f8712e69048c49adaa41744adb3
 EBUILD tomcat-8.5.91.ebuild 4636 BLAKE2B 16d14d1b7ad61614010e6d3eb5cbf25f9545b8737d30422ad3ba140e40a686ae31ae091fc481f4d8835fd1cd71f44b9930c6cf41a561ba5121156088d6693f69 SHA512 9729f7813e53c57908b37d71d113df349880f1993ba6814f7470599960cfda8188d662d532c000338ed091ec3bf6bee7f5a4ae267cc7cd1cd232e800a0ff4bdb
 EBUILD tomcat-8.5.92.ebuild 4637 BLAKE2B 91241d2fb01b2f5b91d859870f86732b1793568278551f52311179ee553ac46eb5adf67ab3ac04badc3b8315129da77e1e64145cf888a8f98e7223ae11334e29 SHA512 dc0c128616263c1d2066053cac073c92db1573a093e6585b0b42c580a7768c670df07b03a9da1b01bf6fd76e1b1d24af981e586aece6a7e966f019d0fa9cf570
+EBUILD tomcat-8.5.93.ebuild 4637 BLAKE2B 91241d2fb01b2f5b91d859870f86732b1793568278551f52311179ee553ac46eb5adf67ab3ac04badc3b8315129da77e1e64145cf888a8f98e7223ae11334e29 SHA512 dc0c128616263c1d2066053cac073c92db1573a093e6585b0b42c580a7768c670df07b03a9da1b01bf6fd76e1b1d24af981e586aece6a7e966f019d0fa9cf570
 EBUILD tomcat-9.0.78.ebuild 5281 BLAKE2B 1a23d6095043a3ce77410fa6e0d5e9aa4663502f504e5ba890e4c130f5f797b2e273c863e90c68c536616b378ea05fe44c0ecb509b0a6f3f8875638db93e23a2 SHA512 c90de086e2a96275379dc815de77f79dd1300ce5f98543865539c305ca15dc83844ced874501a9ba9ba53048302aa921b7bd4c643ad5061af72433e6858403ef
 EBUILD tomcat-9.0.79.ebuild 5282 BLAKE2B 4a2c928dfda87f667f4defa440d202f210a81c4ab361d62ecb22b40a24c0e825c5495de7ab15839e107c34a6ee7ace6b0a2a880c89f481ce83bcf81d791627e1 SHA512 4ebef803641515b9326443f3798478a0db830d30c4fa87d7c89d6776a0f4ced7368b20bd2e512b1bb967b64f16e7007c79201ab5358219cc57f997e3759e77e2
+EBUILD tomcat-9.0.80.ebuild 5282 BLAKE2B 4a2c928dfda87f667f4defa440d202f210a81c4ab361d62ecb22b40a24c0e825c5495de7ab15839e107c34a6ee7ace6b0a2a880c89f481ce83bcf81d791627e1 SHA512 4ebef803641515b9326443f3798478a0db830d30c4fa87d7c89d6776a0f4ced7368b20bd2e512b1bb967b64f16e7007c79201ab5358219cc57f997e3759e77e2
 MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9
diff --git a/www-servers/tomcat/tomcat-10.1.13.ebuild b/www-servers/tomcat/tomcat-10.1.13.ebuild
new file mode 100644
index 000000000000..6320540b940d
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.1.13.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix verify-sig
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar
+# See bugs #203080 and #676116
+BND_VERSION="6.4.0"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="10.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.26"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/jax-rpc-api:0
+	>=dev-java/jakartaee-migration-1.0.5:0
+	dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-11:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	dev-java/ant-core
+	>=virtual/jdk-11:*
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+PATCHES=( "${FILESDIR}/${PN}-10.1.6-build.xml.patch" )
+
+S=${WORKDIR}/${MY_P}
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BND_JAR="${BND_HOME}/${BND}"
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+	fi
+
+	unpack ${MY_P}.tar.gz
+
+	mkdir -p "${BND_HOME}" || die "Failed to create dir"
+	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+	java-ant-2_src_configure
+
+	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only jax-rpc-api)"
+	LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
+	einfo "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "Please note that since version 10 the primary package for all implemented APIs"
+	ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
+	ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/www-servers/tomcat/tomcat-8.5.93.ebuild b/www-servers/tomcat/tomcat-8.5.93.ebuild
new file mode 100644
index 000000000000..ec49ff58bef9
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.93.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix verify-sig
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="8.5"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.15"
+
+# we don't use ~ for el and jsp because the same implementation
+# is also present in tomcat 9 and it would be impossible to install
+# both tomcat 8.5 and 9 at the same time
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-1.8:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	dev-java/ant-core
+	>=virtual/jdk-1.8:*
+	doc? (
+		dev-java/jax-rpc-api:0
+		dev-java/wsdl4j:0
+	)
+	test? (
+		>=dev-java/ant-junit-1.9:0
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+PATCHES=( "${FILESDIR}/${PN}-8.5.86-build.xml.patch" )
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only jax-rpc-api):$(java-pkg_getjars --build-only wsdl4j)"
+	LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
+	einfo "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/www-servers/tomcat/tomcat-9.0.80.ebuild b/www-servers/tomcat/tomcat-9.0.80.ebuild
new file mode 100644
index 000000000000..d3185bf4ed18
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.80.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix verify-sig
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar
+# See bugs #203080 and #676116
+BND_VERSION="6.4.0"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="9"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+# though it could work with 4.22 and upstream uses 4.20,
+# we still use 4.15 because 4.20+ is currently built with java 11
+# and it would force Tomcat to use at least java 11 too
+ECJ_SLOT="4.15"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/jax-rpc-api:0
+	dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-1.8:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	dev-java/ant-core
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/ant-junit
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
+	"${FILESDIR}/${PN}-9.0.72-build.xml.patch"
+)
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BND_JAR="${BND_HOME}/${BND}"
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+	fi
+
+	unpack ${MY_P}.tar.gz
+
+	mkdir -p "${BND_HOME}" || die "Failed to create dir"
+	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+	java-ant-2_src_configure
+
+	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only jax-rpc-api)"
+	LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
+	einfo "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 395a5e5cf4ad..aee720979fd9 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/xkblayout-state/Manifest b/x11-misc/xkblayout-state/Manifest
index e6fdf2e00467..d7ed62d5ffca 100644
--- a/x11-misc/xkblayout-state/Manifest
+++ b/x11-misc/xkblayout-state/Manifest
@@ -1,5 +1,3 @@
-DIST xkblayout-state-0_p20180118.tar.gz 6853 BLAKE2B 1a8b3a9c89d9647bb8b9f6a2261f2e06f44f408823939268d60364fe532b9501e3c36d8f66cc1160f0b5432874d48046f848159842d09135a6cb4af658a8b248 SHA512 7618e920f8044324b7f4eb58d4e22ce076056d2d911cd950e6a862303c4b37f31f5919fec69c63173a7ff181d51849def4f6a78a407baf3012232f2f423bed00
 DIST xkblayout-state-0_p20211106.tar.gz 7617 BLAKE2B 523a861c7cf79e2fc77ced1c411d54771f3ed4ed236ac89d8c89996a26e6fe4bf0d12f75ade9d9bebb1de9e233dcd6ca838dbf297df6f411caff0a27e47df5b5 SHA512 85d785ed767d1c29cd1710bc07894ebc94a18018afa211202929c82ac10e7efb06e5ce29d8de507cbd4c931d650e3c04e1452f63dad17a99a379e55761dbc15b
-EBUILD xkblayout-state-0_p20180118.ebuild 693 BLAKE2B 05bcd084358d60c63b837a3653db9409beab580c15102a000c34d18fd64fc0cc09796b3e30e29003fb2d4e703754686a1a0c70510398cfc2733b6b66ff67ad98 SHA512 33d818427eaad82ee738b75366606435d5b5c9cd3867ad58b3a81d2b6c17bdf3550f7c3931eb1dd4734187ea9b7b6b619a920dfc4726a3291376f8297a6a5283
 EBUILD xkblayout-state-0_p20211106.ebuild 684 BLAKE2B 03868c2dccb88138e12da8147272ddf606a4d7c7f37351a11a6c743979c57525920ce898bce4a678070fde844f4ea490cd7026f0599a060b08f4e94011734564 SHA512 e9ab5225d41e4c3b44b3eb4d0f2b61416d86060450ab603e8e578a056e6b2ceeb7ff0ae96516b8b8427762fce595e8571295bc3db3f127d3c38d08faddd07d83
 MISC metadata.xml 255 BLAKE2B f1b1d7bc82e71304358a9255115e8dbf44a9923b077064e0ac7541cfa3a30308a7528fa805e49323809b788df42c8eca8ccba7410e0d78f71042e622e7a25f57 SHA512 270a732022fde19232c2cfcde7147ec1173971a14aae1e2404c3340834a5c8005193cc60ce6cfd731563bdca0d88c1ad43ca0c477d6c0d0637a7fe77f06335b3
diff --git a/x11-misc/xkblayout-state/xkblayout-state-0_p20180118.ebuild b/x11-misc/xkblayout-state/xkblayout-state-0_p20180118.ebuild
deleted file mode 100644
index e3ae97e16f45..000000000000
--- a/x11-misc/xkblayout-state/xkblayout-state-0_p20180118.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-# Commit Date: 18 Jan 2018
-EGIT_COMMIT="45b752b130e077d5b1437d40b0a459e062aafa13"
-
-DESCRIPTION="Small program to get/set the current XKB layout"
-HOMEPAGE="https://github.com/nonpop/xkblayout-state"
-SRC_URI="https://github.com/nonpop/xkblayout-state/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	emake CXX="$(tc-getCXX)"
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install
-}
author	V3n3RiX <venerix@koprulu.sector>	2023-08-26 15:57:31 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-08-26 15:57:31 +0100
commit	f6fd15e0418aea97c7ee77672468561cdac302e5 (patch)
tree	6c13cdea083ccb5c111b15d7344bd8c0b4e61b73
parent	f3471ff11210507b38c09f0e57df1bd601f629a5 (diff)