gentoo auto-resync : 03:12:2022 - 21:00:43

author: V3n3RiX <venerix@koprulu.sector> 2022-12-03 21:00:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-12-03 21:00:44 +0000
commit: 9bf71d942b8f2e9c367ac95320da8d0d0593e19f (patch)
tree: e324566752ad7ba1f0411723c7144174a49018ea
parent: 529abfa74a08ae5099db9780bcdf8250aa52ecb6 (diff)
367 files changed, 601 insertions, 5823 deletions
diff --git a/Manifest b/Manifest
index c7ef56cf83d8..10f63a49e956 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29751 BLAKE2B 6587ec86b33ea41f1d909a31be23e7982aa86401c8e0e13c389edc6cafbcf85fe08fa26c861a2410f2121b9ffb792d84b38ab22789174333f4f59ac3f5a3b444 SHA512 ce80d3d087195bd70d94b482b5e544e055e55591f3bc37c36d6040d193393e9f077dc38294b0c6c664b5aea96fe4590c3db0d37e92cdb5b4b5914dec5f0b41bd
-TIMESTAMP 2022-12-03T14:09:37Z
+MANIFEST Manifest.files.gz 29752 BLAKE2B 6de1c5634c4a31c7ba6e00ce3860d7f152f52d4bb2dcac5c2d2c658bc5152c592c5f139b2be1c27725e57266af42f75488b9788d8e9d721ecab7a91b11f670ad SHA512 a21cdbbfb143565d824d029297a091c2c574b77031c098ed218157bc7fe1b3b3100961030618631efb4eb7c8d2fe7e64d9dc2892f8946ae5ca9c5810fdfce307
+TIMESTAMP 2022-12-03T20:09:42Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOLWKFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOLrQZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAmQw//UcYjFhMWCf2uJaJRe7wckVdGJ5F8JvDBo+tknmWOt8hjAsCEuM9iFen9
-qnmTPrggFR1GWj/GDND7LA5zOgsrVuwpfbNvDE7CLeQk1SRHEQ34bQdnLxWsfcsQ
-YfLumuwN5a2dE3KLHGH48qrtthiusIJJctlOlOqFT9qZngqD6Xzbj/AGueqKHvcC
-p3OQ7V5Mvx2xyJPWNTlBoLfvqWzb8YOKkQNtIXK6KZjzaOjtkLcrDmOBM3HFKrGG
-Gzvi1Lfyj/x93tbd9wLHwYiY4HolDvX9n5wVq4hK4GL/2fU7PBujsBSnGDLIljlT
-n3b9UTr3XXU3PAR/fXj36u0amNHW8sHUaiKJPzGAhEVP282dTUaufupQruZuB0tX
-Wy1LQgZjVKV6UiyiONr+X7gmycA62+5QBDTQXKKKUmf/HbMOaJA81Bb1KHYImTT2
-vnQIVTqwC74xNOCa8mBtwR4A00TSUJh0SlYRMx+OgpXFplfearjVJ3M+D7ILFFpc
-d3FtLCocDNix7j6LHnRsjva3jQIQeph30R+I3mwCkn82Z9Np3obnJGatqvT0Dei5
-TUaaOOdxS87Wa5gAgz+EgkAwZ+i2GJhCSiUuaoXhPD2D30eZd+GycfwKGdx/qkeW
-sEiky/vfnjbztcjk5MdW2+OWT5DUjUg17CdhpnRmmz5v8jKxuck=
-=kxwK
+klBkmg/+IM0bYAxgvR/b/BHzuKsyJyz5B7evKU2m0l1xA+AT1I+uc3vPgQe0TPlL
+4Xb3gW8nSDpFz9meeycwDHjdP4ZlfuR7fpvAk0GN8jsKfryMQwQ3t+Ne7gpff55d
+/+UXAxWld9255w1q/tYylEWQx1/+B3V4OJhdH/Ivs5ZmjRI0Kn5q18f5/kBSRy2m
+7DLk7NsYU3kRSPNSVHng/7SBIpFIqen5K1RPaAbT1bir7WuGHdCl/uJ2rSqfSiJD
+MNgY1ZxqktEbka/S3bGT1mzw2P501c8BdVqc8L3KzlEu1b6yqbsTCOdcg/4w1CdZ
+74nTG5G5//+ONVR/2DA9iSyPer5F4kNXPhg9FN3pfq+s6WHybRHGDOYFG5e17beN
+5rxvpLZU8LHSFmyOH5RFnoWDQMuGjvZKFdkIyOXkgS8TvMNHBHySpQ580GyJlVJz
+7WOk8PXr3kwY1MVhuBI3Ccyh9p1AvK7VdGetSLqMQ2rtnGnlERLxgDlwIihKmuCx
+RYdsbnvZayQoMnMQDgJXn2iON7ipS2+WB+QsK0D0cp3sFm/4eXa8KGBcch6xc54G
+DRXPGTn7Yh8JtDEVqU6q6TDwbr7APIQmkxFKz5J0wSxr8EBB9Q5j98S2qRaJsK/q
+GV7wCDVeSiVSPZfOaXM+Ps+WO1EDSl4zUjLcLhcHKHS96XtSkw4=
+=YCH4
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 6c042b3b4e93..fb45377068d9 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 701e4e6614fa..7925923fd552 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index c3f2291b9a39..9a65bfdef2e0 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,36 +1,24 @@
-DIST emacs-18.59-patches-14.tar.xz 33760 BLAKE2B 9235d720e1218e9b1912c6968ba22e0971e3cc8ef1b3ea5023f1970499874c145fb03f883d37455ebdc83a0a3091f054f42fc63f1d5f75ca9ba5f4f66364e6d1 SHA512 74cc19cce1b65c01f5d2f7c1aa674e3923f68e52a61108d4140c41c7fac90d32833fc457eccbe4fb551e0453d1c01f12fcf760fda394a5c34668675c52a24459
 DIST emacs-18.59-patches-15.tar.xz 34104 BLAKE2B 9d14004d5188ec0ffe11099ae1beb431adfe159d220fc1b6f1d0be67da19b88911b66a206386beee9498bdcaa48e40a185755734cad2d60927c79bc8ddf0fa7d SHA512 c82cd8e81acf63addd137716a60191b916ee9ac9f8176661be1e8dd0f347f63f8ca8bf9d4d225141499dcbf4c20444eb6526cc3a3912a2d4136fb2bd295e2c26
 DIST emacs-18.59.tar.gz 2962652 BLAKE2B d617636daff41e672af2dcda26ec24b2495cf0a3e6373561ee26a2a922b7252c074dd6b79289d771853a4720c60f084f5726b904bf65989718173232ac874b0b SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33
 DIST emacs-23.4-patches-23.tar.xz 19932 BLAKE2B 941d939d1a66af162016eb7f4a34a3a6d19736ecbd06e2499ccb0bf8806b2b3583de324308698b00d0b47a3d0b8a046e5d5dcb2d681c2bba90ec40b58b4e9855 SHA512 83e2cef7ebe07fc69806d01946c6e96fa0e92b363e9c6531992593eeb29413518217fef05bba48729356af7d1326c3667748185aad971a625daccb803b2bfe58
 DIST emacs-23.4.tar.bz2 38646508 BLAKE2B 33dac5d27a63b7aab6b4053964a0ecf7f7939c7aea5af15103f2da7bd34fbb18dba7a1bf44cc4fcc2e3fb1439cdf7085d8dfc4b0005f5485748996e75ca6872d SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296
 DIST emacs-24.5-patches-5.tar.xz 14796 BLAKE2B 3e097f9cdf96a8b0255ce69770f79259ac9bdddbf5aa77c381973e4348d0900ee6dc6ed4af26021811afbb14eff84bc2a370bc8e803d112476554d03b074ce66 SHA512 fe9f9c19ff760e61dcbf1828d4e9e2806c141b47372bdd736be8237183660a28e2ef86a97034d060e244ff81540a2503a1b47655ef84222fddacb3a87f0f34ae
 DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677
-DIST emacs-25.3-patches-3.tar.xz 2828 BLAKE2B 9a367a545d889d2edf0ee95edb856a7367ec6c10ae6c6fe6b2b452f548184a2a721eb72c448f303a639d5210366c11cf64af33fa322496ff1fd6f7a7e995a154 SHA512 fd65b768be3e3b7b6e280324ff5dd9f790a1279775defea370be5a2555fd64c134c004723e0722331e32117901281dfa2ca2ba42ee4fb33037a3eb83617e222b
 DIST emacs-25.3-patches-4.tar.xz 5164 BLAKE2B 30ef1e7ac6ee9a702678899cb27ea9c321eb0711d55917118ec99ea9e060e79bae179172d0a2dda5821c19902f6e0813e17ac71c198cd814c265838f96883b87 SHA512 ea487de3bb792386510c23c295441438c2fc4eae085fe9d41e5e16181fd4265c1d205b360ce977070a43343feeafac5b9392ea39414f2b170d7051f89ed58502
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
-DIST emacs-26.3-patches-2.tar.xz 1780 BLAKE2B f5dc9d041ea8a07549a817a2b18f84c8a75dce1d53e8de7c6751d48e71e27ee5a3626688252e079917b50473d6b3963f191383050799d199223cdd594be24dbe SHA512 33c91a138e2c9ba3146e66dc03cf05a4baef48019b1ca5c487a56b15f561bf208d58b0f2dc7d250682b86437dce1ce5b050887c4a5ef44194c46fbb7a7346d16
 DIST emacs-26.3-patches-3.tar.xz 4160 BLAKE2B ae6fac12a2d2d35c31c895f1be9104b54c283cf4385d21e0ccd3825a3349d60495e441a5fa9f535d4b3d4c60da530ee036a475643cb11862f2a6e1bb44dc7deb SHA512 1edfdbbe6a97ffcdb17facc90336dd6f8d3d397bc95cf06fa170a4ca68e653226de8a5c2001d8dc3d3a0144d50421f2208c6fa3a816123ef952cb25df4aace49
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
-DIST emacs-27.2-patches-3.tar.xz 7776 BLAKE2B c03947780518ebf86994b1af20cc24377094c55c783e3cbb0230da5ecb4c92613c4e6d599cefe51b297cc117e3a832c6b34365cc983da0630a9ca6f39b58d10e SHA512 a72af0dd47989b5e4ceecc48d8dfd1a362cdda17070a6a5a9c53c0448a7bceed3b27efd0dd78a0cbe3eb503015b1475cd52fc01c5aca10a52ad30635f385b190
 DIST emacs-27.2-patches-4.tar.xz 10104 BLAKE2B c4a6651744583ed6d85a8f2f27f86999b6cea76229feb6423679f9b9da88e5ac2606fdb6933b4a5c2ada31ac760f3921721a0fd84912a81b8727c0eef84984ae SHA512 fd16fa75e2453c6d3562ff3e98cebc24960774fdc8f0e72ae838376cec090308934e11be8df98fc7a100e14125cb096f23bcb29955e7c809090105ddc51495d6
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
-DIST emacs-28.1-patches-1.tar.xz 960 BLAKE2B a717923a1b022ff4dafaa27a7198a287b7d5ea5765cef9b719e17c622796707dce855d12d634f836aa1196557e7f780b884027ccc4467fb56d48d710fdd2b82e SHA512 67a393891c3834855b05d4722026bce9da6e68cc15143a7887884e8aba4f78d8daca7d3796b25c68e23f19c300a036db9b91961c50aff901e5d9da448c9c72e9
-DIST emacs-28.1.tar.xz 47699512 BLAKE2B 42a12bec2dc74f4838ae79b5589fb7439ff415d8ddd34f2ff7a8c503f909ddd4144ad35ae19c758d8627cfa9ed29276b326c5bec3853a77cd179e9fb17d22ad7 SHA512 c146ff7086aba49fa6c18adf4e485a59eb4c6525fddb9d385034446830b8bb0ac9e6fb76e7b6d94a9fddc41643415f36acad57a1ae16a841c97f61bc211459d9
 DIST emacs-28.2-patches-1.tar.xz 3404 BLAKE2B af0ea87f8406b3fe646bc32fea5866c1c7bdeeb5bb5ef733a361cf31f96b72b0dc6a7afb9a166f6182b7835cadd7b0b25f61a79abed241788f35a74d5937513f SHA512 02f9f574d2d06750ddf5218aaf3c725f954020bde94492264a9ad1d3294b24866f89d296b126ed26390f0597afb55daad944c31dde2bfedc6ea1ab769ea11c7d
 DIST emacs-28.2.tar.xz 47722600 BLAKE2B a7e4990658b5e7306510f8dded93aaf0b82cdd9306df8b786526d038c3249ef9579287075f2235eb01a71ae1699db555254f137b86ab2d2305b45895053df552 SHA512 a7cec7e3e82367815a1442f69af54102dbfc434069810a9dec5938a6660cb8b076e6f1fb0bfff9695b15603dbbe05eb9c7dfd92e90cf40fc4d1e5746bce83bd8
-EBUILD emacs-18.59-r14.ebuild 4426 BLAKE2B 836c0e10eb9bee637d215bc13d695a631ba495728b5c8da1a2b6a29e31f17be8de4bb0aebe6401fecaee8488da0d5302b898b1a8b528eb18a0ebb46b3ed04e43 SHA512 4540d9bb492309c983c75c2cfb2f3aad2653252303d7d25c5d59723f43b9ece3ee43a216e3775c86f75714b29d2387371aab734c94cbe59d29cde64e077f27cf
-EBUILD emacs-18.59-r15.ebuild 4393 BLAKE2B 61f236197106e33b402c6b2ee3cdcc2106f78f79cadcc323eca6418458d5badda8574834b0df587f98efa202506fdcc402e6ffc74aa6715193670120aa47dfcd SHA512 607549e010380f66df31377e9f3ec69875091386a9447fdc34a50611f4b5d2cffa67a36769bd21b6904df1b722f96075ddc177b77eefb5d1f9572d42c7b54415
+EBUILD emacs-18.59-r15.ebuild 4392 BLAKE2B a2d1b7dba97a50ebeb7e70f8112aa6e9b67ea0f49e2ea03351aac0d73e57d8750f40d76dccbe37c85c47911a1c0c11d7405760df26ad49113e345f838d0e4d9f SHA512 27ae9452912e9d7f5e21b9ad3fbb79d4b40d92eaad0f952ac7500423b2ebf907eb1654218ce760b93a31f18fa17d216f5fb7757a03fb2dcc65f4b8682b6300cc
 EBUILD emacs-23.4-r21.ebuild 11040 BLAKE2B 5743514f4e5be8649ed1b2a8bafaa873876c71e5035632f61bc4ef808e540edf144af1277c355bbb215f922be7dd7ac843af34a42f6b6109aaecb2ef2027a6dd SHA512 049dfb3eff159a1cfe6e62e4ecbe04df614b5cbb79b9a8619bb9793e08191754270e36295124e6fa6fe79832c2d20e55138d42080d5cf7fc4dce5bbd8ad6fe54
 EBUILD emacs-24.5-r11.ebuild 10781 BLAKE2B 436f02959a1aa71165682f8e133dc0d7964cf7742b3d3a15906ac0f702e6ba42a3828d5b3beec1e84e4c5b9c74316e421bb6fe2392df9680b85efb23868b88f1 SHA512 61ef707e3d26d4d303754bc854834e915f09956ec2f9cfbf0f4916faf4a12f1922f0581c5f1baa93c5fa4ac6acbffe494f0e8d6ef8f0a904b9aa5d546a5f4d9e
-EBUILD emacs-25.3-r12.ebuild 11094 BLAKE2B d174ff409e79d7bf62496e6170cfbfe6a77adc758259f5915ad2df371a3e137b9536521e0c5236b0b092ade6edd738ed1c6b7e9da136dd6a5cbabeeb3cf9e85d SHA512 0bb304e75fd06e9f9a1f8a875a4e0739619b7d675e22b1fb0da8e9bf3739702051669d9a9dc8d50a1e2b8e86f8cf595f890b0c45d9f2c8d6cb43b5b51663cf48
-EBUILD emacs-25.3-r13.ebuild 11095 BLAKE2B d2f3bd6d9ecb6b5357a8532196aa797341f5304bd344d4cc59740bb01ee8d0d51eac31c462d06709da97c069dd0e3510e80ebf24611f278dcd67bb724ac544a9 SHA512 ecd685afd7a914abd857315e0c5ebd24c377d3c4e591ca86177abde988ef7812a27188bb2b8bcc303e19a3b9327f1d7c50cb0cc997ccb805e0495a3cb475d15b
-EBUILD emacs-26.3-r8.ebuild 11782 BLAKE2B 7e69c63814c08694b72da62b4976c6e7cc3053d1dadef410eaaf4dece87b526fd024039b020d4f61743922146eb09127abbefc66d5c2e3c9042c2ee75bc73813 SHA512 3dcdccc4c0e919fdaba4cd246a0c0c4bb7512fc5ee20d9293d29222a5b312c860041fa6a0fa69625fe910c9a3cd47942b010380d93d4a07639f8b19fa4419303
-EBUILD emacs-26.3-r9.ebuild 11784 BLAKE2B 58b9a510a6e9d6b681bf06de7b97ccac6944f1deddb5d0c44127e276a8710d6efe5b7c3c9633476556807b9fc52af3827269efee1f4e5dd00f8c8abb4ad50db9 SHA512 651ee1b68d6caf3f1b956c8c372ac835118007b6b6087f9e759abf927641ef41fe06cc2a2320911fb3d66f2ba617c3c60125b07eac4bafe799ac37d28b881919
-EBUILD emacs-27.2-r6.ebuild 14313 BLAKE2B ab1798c47805676f82f07833872d4dea0a5bd7a011123d441039f3b215e135c925ada47b37e49c8a05cf9457a13002b65a467ab25e3d326420a4181f05451ab6 SHA512 708fb51c46a94e40b7ced175ac7dfc3bba55d877bebf0d937151a4fd9a9b239e2f81372b5001375832eeac57eac9bf9cc54e0c5c8f54eacec54c4cc8d7e65d5f
-EBUILD emacs-27.2-r7.ebuild 14315 BLAKE2B 821a407db7aa71079aead65d3307ffac1f4c676f80cec68a9e58fc2e27ee3477e6b99f7421ffa7a0af5dc8badd52efc303e01e1bc9eb22d48aa4ae2b6a542843 SHA512 b1a99cbca009396cfc38c3b55b95d7329339b87fe9751f976f9aaefb8e3b9e0da6cb7e99a4cdfcc5fd4a5378ccdef9816ddbaf994cf29ea7d3cc376ceef0b52e
-EBUILD emacs-28.1-r2.ebuild 14929 BLAKE2B af1a7d0560b7ff6643f20f4d4f2e5ce9a1a25b21c9cefec9a884bc362f76efa5624785a69cae91bd2bd42c94659fd43b16a9771c9190ac730678c9f26d991592 SHA512 aaeba27e9eb6b5de5c28525609a8e05e08fc755ad7a14c39fab36324ae433561711dd671db65f0b20036fa37a61c703e2ed938009c5acb4f8c638f8785db00f3
-EBUILD emacs-28.1-r3.ebuild 15014 BLAKE2B a3101a3515f1a65d53e627f98bae37ae5bdad146385e1972fe42cd2e4d027cc24e3bf7127fa660a590fc0f67c42b384dd10d03f122849c1b07f9d78831ecd026 SHA512 d3afb32c3098919e892921a1a7311e79fede41ee588e5d8edd9695931a42ef81cbf39e55bba28e043bc645b1ad4d52de32c2704e9cef5b1e174b4ceb4b1aa3d2
-EBUILD emacs-28.2-r2.ebuild 16760 BLAKE2B bbc5efc0335ef346227fca86daa88fdd5e486a7368196fa116e347d48ba22d651136a35e736df5e4ad06e0b5c2f09aaa3ee1657e2dcb3e35f1c20107dd350ace SHA512 b03239ef7ce8f3e27f0ed4c6a393f7d07e23bc48ba527cc7334fa369947eb122dc947d30ee4054f8fb45a0b4ef94630459cf4edefd6b9bc3b8611b0eed6c2275
+EBUILD emacs-25.3-r13.ebuild 11093 BLAKE2B 3d8e96a709f41e9dd118cad732e9420bad5d3bfe65d04b488cfb9d975308b7b7c6bc04eeffa7f7a13ef567ae505e75ee3c48fc17df70912ee1e838ed90942c8f SHA512 dd475fb7e5df275a4a9150dba2f769f4faa83f92d2338c9a842e48bb9176754176462ad7383b98a823ca09f1e03678a123525989b00d0ef072818ec4bf7c1720
+EBUILD emacs-26.3-r9.ebuild 11782 BLAKE2B 9a7304010f00da0322e8e9674865e084019239f4aaa9064108a262010ead6a87b47987c5c2c5818660e74bf5ee8d574642a72b6f039c84a0d11cbbcd167e08cc SHA512 b6b1e5d07c910f5a6e4c545f890fcebd90a7b563c1de8ca067f3b4b244c8fa1d5580008bace4dfea388cd5ca50a0b21cedcfabd5eaf086f0fa0512072c769ed6
+EBUILD emacs-27.2-r7.ebuild 14313 BLAKE2B 32d56bccb56a32e1d497baa4404fa3c08d39c4e480d19c7c7bd5b947e5d10ae701537ff57dc6f98f55b3987dd028f504601d3076b1774cba34e5c35b4624fcfe SHA512 86de0f3461b3ee8de9f5c8cdb14089ac67b726a7307a4bcab5b55be8e51d6535d1d9c5054ab4f510dedfb52f93dc48597c9f16e9633e987121d76306ade5e7a3
+EBUILD emacs-28.2-r2.ebuild 16758 BLAKE2B cfaaffad9aeabc579472b4d390f9541848f4b39df4fd0fb34204abc92e9a09c4518225320c9d0232637a1774d3aab8c79f3582da4e4cfac396ff652cd2a6404f SHA512 b02bbe0a7267f44f25f32f2a069f4d3c685ac25dee8c8d78bd095091bfef1a0cfd9646855d1950e0309d22e41015eba960de8d36a61a2f8992d975119758510c
 EBUILD emacs-29.0.9999-r1.ebuild 18192 BLAKE2B af9feb741daf980b1337fad8e784818d9af12b06fec9a67093d6b8f2ff511de9bb7d11420fd932908afd82f66f76e676aebb645231c5df918786e6f0142b9a7a SHA512 b5c5830f6dd1cb60fffb731a4c5a5bb88f6344e92864cad4eac0ba076bcea0d37532c2472f34732c75c88e1fb5b7e00f6e909e5f9a58f7ce65aa842c29e9e03f
 EBUILD emacs-30.0.9999.ebuild 18190 BLAKE2B 3211fec409a7f811c0b30aa2a22e18e319be31557c31691c0320706450a80fe4f898a915ff47c1c0393f9c1cfaf975e3247bd9205b6c9bae45a59d04ec7f050e SHA512 b46dce463e7a5eabe59b299313475239b25d50798d5ed417169092e5446a6e53079dcb213a80af6e1ccdbef4e35d765c20ad0ef33d6e46091362ddfe687ec460
 MISC metadata.xml 3360 BLAKE2B dff967a79d9c9c964e2badf2427d996be01f8e95aff50da48ce980d6803bd4fd6766139f66968a127dda883e3997988488a4d085d575d0c14c88aedc465e17fc SHA512 37315a414b4c95312f674277df34fc030ff630d6c8c63c8e61a06bb817d7aa44c16520824d5b51b7140fbc20c7e16bc86e93f33a700b4b790457894665b508c8
diff --git a/app-editors/emacs/emacs-18.59-r14.ebuild b/app-editors/emacs/emacs-18.59-r14.ebuild
deleted file mode 100644
index 1cbf3f94a44c..000000000000
--- a/app-editors/emacs/emacs-18.59-r14.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs flag-o-matic multilib
-
-DESCRIPTION="The extensible self-documenting text editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-14.tar.xz"
-
-LICENSE="GPL-1+ GPL-2+ BSD HPND"
-SLOT="18"
-KEYWORDS="amd64 x86"
-IUSE="abi_x86_x32 gui"
-
-RDEPEND="sys-libs/ncurses:0=
-	amd64? (
-		abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] )
-		!abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] )
-	)
-	gui? ( x11-libs/libX11 )"
-
-DEPEND="${RDEPEND}
-	gui? (
-		x11-base/xorg-proto
-		x11-misc/xbitmaps
-	)"
-
-BDEPEND="virtual/pkgconfig"
-
-IDEPEND="app-eselect/eselect-emacs"
-
-RDEPEND+=" ${IDEPEND}"
-
-PATCHES=("${WORKDIR}/patch")
-
-src_prepare() {
-	default
-
-	# Do not use the sandbox, or the dumped Emacs will be twice as large
-	sed -i -e 's:\./temacs.*dump:SANDBOX_ON=0 LD_PRELOAD= env &:' \
-		src/ymakefile || die
-}
-
-src_configure() {
-	# autoconf? What's autoconf? We are living in 1992. ;-)
-	local arch
-	case ${ARCH} in
-		amd64)
-			if use abi_x86_x32; then
-				arch=x86-x32
-				multilib_toolchain_setup x32
-			else
-				arch=intel386
-				multilib_toolchain_setup x86
-			fi
-			;;
-		x86) arch=intel386 ;;
-		*) die "Architecture ${ARCH} not yet supported" ;;
-	esac
-	local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/"
-	use gui && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
-	sed -e "${cmd}" src/config.h-dist >src/config.h || die
-
-	cat <<-END >src/paths.h
-		#define PATH_LOADSEARCH "/usr/share/emacs/${PV}/lisp"
-		#define PATH_EXEC "/usr/share/emacs/${PV}/etc"
-		#define PATH_LOCK "/var/lib/emacs/lock/"
-		#define PATH_SUPERLOCK "/var/lib/emacs/lock/!!!SuperLock!!!"
-	END
-
-	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
-		-e "s:-lncurses:$("$(tc-getPKG_CONFIG)" --libs ncurses):" \
-		src/s-linux.h || die
-
-	# -O3 and -finline-functions cause segmentation faults at run time.
-	# -Wno-implicit and -Wno-return-type will quieten newer versions of GCC;
-	# feel free to submit a patch adding all those missing prototypes.
-	strip-flags
-	filter-flags -finline-functions -fpie
-	append-flags -fno-strict-aliasing -Wno-implicit -Wno-return-type
-	append-ldflags $(test-flags -no-pie)	#639562
-	replace-flags -O[3-9] -O2
-}
-
-src_compile() {
-	addpredict /var/lib/emacs/lock		#nowarn
-	emake --jobs=1 \
-		CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
-		LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	local basedir="/usr/share/emacs/${PV}" i
-
-	dodir ${basedir}
-	dodir /usr/share/man/man1
-	emake --jobs=1 \
-		LIBDIR="${D}"${basedir} \
-		BINDIR="${D}"/usr/bin \
-		MANDIR="${D}"/usr/share/man/man1 \
-		install
-
-	rmdir "${D}"${basedir}/lock || die
-	find "${D}"${basedir} -type f \( -name "*.c" -o -name ChangeLog \
-		-o -name COPYING ! -path "*/etc/COPYING" \) -exec rm "{}" + || die
-	fperms -R go-w ${basedir}
-
-	# remove duplicate DOC file
-	rm "${D}"${basedir}/etc/DOC || die
-
-	# move executables to the correct place
-	mv "${D}"/usr/bin/emacs{,-${SLOT}} || die
-	for i in etags ctags emacsclient; do
-		mv "${D}"/usr/bin/${i}{,-emacs-${SLOT}} || die
-		rm "${D}"${basedir}/etc/${i} || die
-	done
-
-	dodir /usr/libexec/emacs/${PV}
-	for i in wakeup digest-doc sorted-doc movemail cvtmail fakemail \
-		yow env server
-	do
-		mv "${D}"${basedir}/etc/${i} "${D}"/usr/libexec/emacs/${PV}/${i} || die
-		dosym -r /usr/libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
-	done
-	for i in test-distrib make-docfile; do
-		rm "${D}"${basedir}/etc/${i} || die
-	done
-
-	# move man page
-	mv "${D}"/usr/share/man/man1/emacs{,-${SLOT}}.1 || die
-
-	# move Info files
-	dodir /usr/share/info
-	mv "${D}"${basedir}/info "${D}"/usr/share/info/emacs-${SLOT} || die
-	dosym -r /usr/share/info/emacs-${SLOT} ${basedir}/info
-	docompress -x /usr/share/info
-
-	# move Info dir to avoid collisions with the dir file generated by portage
-	mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} || die
-	touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir
-
-	dodir /var/lib/emacs
-	diropts -m0777
-	keepdir /var/lib/emacs/lock
-
-	dodoc README PROBLEMS
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d "${D}"/usr/share/info ]]; then
-		mv "${D}"/usr/share/info/emacs-${SLOT}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-18.59-r15.ebuild b/app-editors/emacs/emacs-18.59-r15.ebuild
index 901f117036e1..6822620a67f8 100644
--- a/app-editors/emacs/emacs-18.59-r15.ebuild
+++ b/app-editors/emacs/emacs-18.59-r15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz
 
 LICENSE="GPL-1+ GPL-2+ BSD HPND"
 SLOT="18"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="abi_x86_x32 gui"
 
 RDEPEND="sys-libs/ncurses:0=
diff --git a/app-editors/emacs/emacs-25.3-r12.ebuild b/app-editors/emacs/emacs-25.3-r12.ebuild
deleted file mode 100644
index 1eddf47cccfc..000000000000
--- a/app-editors/emacs/emacs-25.3-r12.ebuild
+++ /dev/null
@@ -1,355 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-3.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="25"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
-
-RDEPEND="acct-group/mail
-	app-emacs/emacs-common[games?,gui(-)?]
-	net-libs/liblockfile
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	zlib? ( sys-libs/zlib )
-	gui? ( !aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( media-libs/libjpeg-turbo:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18[X] )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? ( x11-libs/gtk+:3 )
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-IDEPEND="app-eselect/eselect-emacs"
-
-RDEPEND+=" ${IDEPEND}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-PATCHES=("${WORKDIR}/patch")
-
-src_prepare() {
-	default
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	AT_M4DIR=m4 eautoreconf
-	touch src/stamp-h.in || die
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	# Don't trigger a floating point exception for NaNs on alpha
-	use alpha && append-flags -mieee
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if ! use gui; then
-		einfo "Configuring to build without window system support"
-		myconf+=" --without-x --without-ns"
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --with-x --without-ns"
-		myconf+=" --without-gconf"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
-				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=" --with-x-toolkit=gtk3"
-			myconf+=" --without-xwidgets"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser=":gamestat" \
-		--without-compress-install \
-		--without-hesiod \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with gpm) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-		|| die "moving emacs man page failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# movemail must be setgid mail
-	fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
-	rm -rf "${ED}"/var || die
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use gui && use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from a previous major version of Emacs, then
-		it is strongly recommended that you use app-admin/emacs-updater
-		to rebuild all byte-compiled elisp files of the installed Emacs
-		packages."
-	if use gui; then
-		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-			machine would satisfy basic Emacs requirements under X11.
-			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-			for how to enable anti-aliased fonts."
-		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
-			symlink it into /Applications by yourself."
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-25.3-r13.ebuild b/app-editors/emacs/emacs-25.3-r13.ebuild
index ec5e7f41e854..98822dd53849 100644
--- a/app-editors/emacs/emacs-25.3-r13.ebuild
+++ b/app-editors/emacs/emacs-25.3-r13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
 
 RDEPEND="acct-group/mail
diff --git a/app-editors/emacs/emacs-26.3-r8.ebuild b/app-editors/emacs/emacs-26.3-r8.ebuild
deleted file mode 100644
index 2fb7abc2ff8c..000000000000
--- a/app-editors/emacs/emacs-26.3-r8.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common flag-o-matic readme.gentoo-r1
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="26"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
-
-RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	kerberos? ( virtual/krb5 )
-	lcms? ( media-libs/lcms:2 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( acct-group/mail net-libs/liblockfile )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	gui? ( !aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( media-libs/libjpeg-turbo:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18[X] )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			x11-libs/gtk+:3
-			xwidgets? (
-				net-libs/webkit-gtk:4=
-				x11-libs/libXcomposite
-			)
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-IDEPEND="app-eselect/eselect-emacs"
-
-RDEPEND+=" ${IDEPEND}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-PATCHES=("${WORKDIR}/patch")
-
-src_prepare() {
-	default
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	#AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if ! use gui; then
-		einfo "Configuring to build without window system support"
-		myconf+=" --without-x --without-ns"
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --with-x --without-ns"
-		myconf+=" --without-gconf"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
-				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		! use gtk && use xwidgets && ewarn \
-			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--without-compress-install \
-		--without-hesiod \
-		--without-pop \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with games gameuser ":gamestat") \
-		$(use_with gpm) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with lcms lcms2) \
-		$(use_with libxml2 xml2) \
-		$(use_with mailutils) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with systemd libsystemd) \
-		$(use_with threads) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# movemail must be setgid mail
-	if ! use mailutils; then
-		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fi
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{applications,icons} || die
-	rm -rf "${ED}/usr/$(get_libdir)" || die
-	rm -rf "${ED}"/var || die
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
-
-	if use systemd; then
-		insinto /usr/lib/systemd/user
-		sed -e "/^##/d" \
-			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
-			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
-		assert
-	fi
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use gui && use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from a previous major version of Emacs, then
-		it is strongly recommended that you use app-admin/emacs-updater
-		to rebuild all byte-compiled elisp files of the installed Emacs
-		packages."
-	if use gui; then
-		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-			machine would satisfy basic Emacs requirements under X11.
-			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-			for how to enable anti-aliased fonts."
-		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
-			symlink it into /Applications by yourself."
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-26.3-r9.ebuild b/app-editors/emacs/emacs-26.3-r9.ebuild
index 16fd69923249..33bc30b44e2f 100644
--- a/app-editors/emacs/emacs-26.3-r9.ebuild
+++ b/app-editors/emacs/emacs-26.3-r9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
 
 RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
diff --git a/app-editors/emacs/emacs-27.2-r6.ebuild b/app-editors/emacs/emacs-27.2-r6.ebuild
deleted file mode 100644
index 2a821b28ff6b..000000000000
--- a/app-editors/emacs/emacs-27.2-r6.ebuild
+++ /dev/null
@@ -1,438 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common readme.gentoo-r1 toolchain-funcs #autotools
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
-	EGIT_BRANCH="emacs-27"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-	SLOT="${PV%%.*}-vcs"
-else
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	# PV can be in any of the following formats:
-	# 27.1                 released version (slot 27)
-	# 27.1_rc1             upstream release candidate (27)
-	# 27.0.9999            live ebuild (slot 27-vcs)
-	# 27.0.90              upstream prerelease snapshot (27-vcs)
-	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
-	if [[ ${PV} == *_pre* ]]; then
-		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-		S="${WORKDIR}/emacs"
-	elif [[ ${PV//[0-9]} != "." ]]; then
-		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
-	fi
-	# Patchset from proj/emacs-patches.git
-	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-3.tar.xz"
-	PATCHES=("${WORKDIR}/patch")
-	SLOT="${PV%%.*}"
-	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
-RESTRICT="test"
-
-RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gmp? ( dev-libs/gmp:0= )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	json? ( dev-libs/jansson:= )
-	kerberos? ( virtual/krb5 )
-	lcms? ( media-libs/lcms:2 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( acct-group/mail net-libs/liblockfile )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	gui? ( !aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( media-libs/libjpeg-turbo:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18[X] )
-			harfbuzz? ( media-libs/harfbuzz:0= )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			x11-libs/gtk+:3
-			xwidgets? (
-				net-libs/webkit-gtk:4=
-				x11-libs/libXcomposite
-			)
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="sys-apps/texinfo
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-IDEPEND="app-eselect/eselect-emacs"
-
-RDEPEND+=" ${IDEPEND}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	default
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	#AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if ! use gui; then
-		einfo "Configuring to build without window system support"
-		myconf+=" --without-x --without-ns"
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --with-x --without-ns"
-		myconf+=" --without-gconf"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with harfbuzz)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
-				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		! use gtk && use xwidgets && ewarn \
-			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-	fi
-
-	if tc-is-cross-compiler; then
-		# Configure a CBUILD directory when cross-compiling to make tools
-		mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
-		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
-		popd >/dev/null || die
-		# Don't try to execute the binary for dumping during the build
-		myconf+=" --with-dumping=none"
-	elif use m68k; then
-		# Workaround for https://debbugs.gnu.org/44531
-		myconf+=" --with-dumping=unexec"
-	else
-		myconf+=" --with-dumping=pdumper"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--without-compress-install \
-		--without-hesiod \
-		--without-pop \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		--with-pdumper \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with games gameuser ":gamestat") \
-		$(use_with gmp libgmp) \
-		$(use_with gpm) \
-		$(use_with json) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with lcms lcms2) \
-		$(use_with libxml2 xml2) \
-		$(use_with mailutils) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with systemd libsystemd) \
-		$(use_with threads) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# Build native tools for compiling lisp etc.
-		emake -C "${S}-build" src
-		emake lib	   # Cross-compile dependencies first for timestamps
-		# Save native build tools in the cross-directory
-		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
-		# Specify the native Emacs to compile lisp
-		emake -C lisp all EMACS="${S}-build/src/emacs"
-	fi
-
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# movemail must be setgid mail
-	if ! use mailutils; then
-		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fi
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{applications,icons} || die
-	rm -rf "${ED}/usr/$(get_libdir)" || die
-	rm -rf "${ED}"/var || die
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
-
-	if use systemd; then
-		insinto /usr/lib/systemd/user
-		sed -e "/^##/d" \
-			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
-			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
-		assert
-	fi
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use gui && use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from a previous major version of Emacs, then
-		it is strongly recommended that you use app-admin/emacs-updater
-		to rebuild all byte-compiled elisp files of the installed Emacs
-		packages."
-	if use gui; then
-		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-			machine would satisfy basic Emacs requirements under X11.
-			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-			for how to enable anti-aliased fonts."
-		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
-			symlink it into /Applications by yourself."
-	fi
-	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
-		a portable dump file due to being cross-compiled.
-		To create this file at run time, execute the following command:
-		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
-		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-27.2-r7.ebuild b/app-editors/emacs/emacs-27.2-r7.ebuild
index ae2e2726a14e..738359132ca8 100644
--- a/app-editors/emacs/emacs-27.2-r7.ebuild
+++ b/app-editors/emacs/emacs-27.2-r7.ebuild
@@ -36,7 +36,7 @@ else
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
diff --git a/app-editors/emacs/emacs-28.1-r2.ebuild b/app-editors/emacs/emacs-28.1-r2.ebuild
deleted file mode 100644
index bbe2619c100f..000000000000
--- a/app-editors/emacs/emacs-28.1-r2.ebuild
+++ /dev/null
@@ -1,452 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
-	EGIT_BRANCH="emacs-28"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-	SLOT="${PV%%.*}-vcs"
-else
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	# PV can be in any of the following formats:
-	# 27.1                 released version (slot 27)
-	# 27.1_rc1             upstream release candidate (27)
-	# 27.0.9999            live ebuild (slot 27-vcs)
-	# 27.0.90              upstream prerelease snapshot (27-vcs)
-	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
-	if [[ ${PV} == *_pre* ]]; then
-		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-		S="${WORKDIR}/emacs"
-	elif [[ ${PV//[0-9]} != "." ]]; then
-		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
-	fi
-	# Patchset from proj/emacs-patches.git
-	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"
-	PATCHES=("${WORKDIR}/patch")
-	SLOT="${PV%%.*}"
-	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
-RESTRICT="test"
-
-RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gmp? ( dev-libs/gmp:0= )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	jit? ( sys-devel/gcc:=[jit(-)] )
-	json? ( dev-libs/jansson:= )
-	kerberos? ( virtual/krb5 )
-	lcms? ( media-libs/lcms:2 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( acct-group/mail net-libs/liblockfile )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	gui? ( !aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( media-libs/libjpeg-turbo:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18[X] )
-			harfbuzz? ( media-libs/harfbuzz:0= )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			x11-libs/gtk+:3
-			xwidgets? (
-				net-libs/webkit-gtk:4=
-				x11-libs/libXcomposite
-			)
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="sys-apps/texinfo
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-IDEPEND="app-eselect/eselect-emacs"
-
-RDEPEND+=" ${IDEPEND}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	if use jit; then
-		# These files ignore LDFLAGS. We assign the variable here, because
-		# for live ebuilds FULL_VERSION doesn't exist in global scope
-		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
-
-		# gccjit doesn't play well with ccache or distcc #801580
-		# For now, work around the problem with an explicit LIBRARY_PATH
-		has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \
-			&& export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
-				| sed -n '/^libraries:/{s:^[^/]*::;p}')
-	fi
-
-	default
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if ! use gui; then
-		einfo "Configuring to build without window system support"
-		myconf+=" --without-x --without-ns"
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --with-x --without-ns"
-		myconf+=" --without-gconf"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with harfbuzz)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
-				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		! use gtk && use xwidgets && ewarn \
-			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-	fi
-
-	if tc-is-cross-compiler; then
-		# Configure a CBUILD directory when cross-compiling to make tools
-		mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
-		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
-		popd >/dev/null || die
-		# Don't try to execute the binary for dumping during the build
-		myconf+=" --with-dumping=none"
-	elif use m68k; then
-		# Workaround for https://debbugs.gnu.org/44531
-		myconf+=" --with-dumping=unexec"
-	else
-		myconf+=" --with-dumping=pdumper"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--without-compress-install \
-		--without-hesiod \
-		--without-pop \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		--with-pdumper \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with games gameuser ":gamestat") \
-		$(use_with gmp libgmp) \
-		$(use_with gpm) \
-		$(use_with jit native-compilation) \
-		$(use_with json) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with lcms lcms2) \
-		$(use_with libxml2 xml2) \
-		$(use_with mailutils) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with systemd libsystemd) \
-		$(use_with threads) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# Build native tools for compiling lisp etc.
-		emake -C "${S}-build" src
-		emake lib	   # Cross-compile dependencies first for timestamps
-		# Save native build tools in the cross-directory
-		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
-		# Specify the native Emacs to compile lisp
-		emake -C lisp all EMACS="${S}-build/src/emacs"
-	fi
-
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# movemail must be setgid mail
-	if ! use mailutils; then
-		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fi
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{applications,icons} || die
-	rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
-	rm -rf "${ED}"/var || die
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
-
-	if use systemd; then
-		insinto /usr/lib/systemd/user
-		sed -e "/^##/d" \
-			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
-			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
-		assert
-	fi
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use gui && use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from a previous major version of Emacs, then
-		it is strongly recommended that you use app-admin/emacs-updater
-		to rebuild all byte-compiled elisp files of the installed Emacs
-		packages."
-	if use gui; then
-		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-			machine would satisfy basic Emacs requirements under X11.
-			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-			for how to enable anti-aliased fonts."
-		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
-			symlink it into /Applications by yourself."
-	fi
-	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
-		a portable dump file due to being cross-compiled.
-		To create this file at run time, execute the following command:
-		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
-		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-28.1-r3.ebuild b/app-editors/emacs/emacs-28.1-r3.ebuild
deleted file mode 100644
index 89f070f0e1bf..000000000000
--- a/app-editors/emacs/emacs-28.1-r3.ebuild
+++ /dev/null
@@ -1,455 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
-	EGIT_BRANCH="emacs-28"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-	SLOT="${PV%%.*}-vcs"
-else
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	# PV can be in any of the following formats:
-	# 27.1                 released version (slot 27)
-	# 27.1_rc1             upstream release candidate (27)
-	# 27.0.9999            live ebuild (slot 27-vcs)
-	# 27.0.90              upstream prerelease snapshot (27-vcs)
-	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
-	if [[ ${PV} == *_pre* ]]; then
-		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-		S="${WORKDIR}/emacs"
-	elif [[ ${PV//[0-9]} != "." ]]; then
-		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
-	fi
-	# Patchset from proj/emacs-patches.git
-	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"
-	PATCHES=("${WORKDIR}/patch")
-	SLOT="${PV%%.*}"
-	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
-RESTRICT="test"
-
-RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gmp? ( dev-libs/gmp:0= )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	jit? ( sys-devel/gcc:=[jit(-)] )
-	json? ( dev-libs/jansson:= )
-	kerberos? ( virtual/krb5 )
-	lcms? ( media-libs/lcms:2 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( acct-group/mail net-libs/liblockfile )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	gui? ( !aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( media-libs/libjpeg-turbo:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18[X] )
-			harfbuzz? ( media-libs/harfbuzz:0= )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			x11-libs/gtk+:3
-			xwidgets? (
-				net-libs/webkit-gtk:4=
-				x11-libs/libXcomposite
-			)
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="sys-apps/texinfo
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-IDEPEND="app-eselect/eselect-emacs"
-
-RDEPEND+=" ${IDEPEND}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	if use jit; then
-		export NATIVE_FULL_AOT=1
-		find lisp -type f -name "*.elc" -delete || die
-
-		# These files ignore LDFLAGS. We assign the variable here, because
-		# for live ebuilds FULL_VERSION doesn't exist in global scope
-		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
-
-		# gccjit doesn't play well with ccache or distcc #801580
-		# For now, work around the problem with an explicit LIBRARY_PATH
-		has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \
-			&& export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
-				| sed -n '/^libraries:/{s:^[^/]*::;p}')
-	fi
-
-	default
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if ! use gui; then
-		einfo "Configuring to build without window system support"
-		myconf+=" --without-x --without-ns"
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --with-x --without-ns"
-		myconf+=" --without-gconf"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with harfbuzz)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
-				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		! use gtk && use xwidgets && ewarn \
-			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-	fi
-
-	if tc-is-cross-compiler; then
-		# Configure a CBUILD directory when cross-compiling to make tools
-		mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
-		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
-		popd >/dev/null || die
-		# Don't try to execute the binary for dumping during the build
-		myconf+=" --with-dumping=none"
-	elif use m68k; then
-		# Workaround for https://debbugs.gnu.org/44531
-		myconf+=" --with-dumping=unexec"
-	else
-		myconf+=" --with-dumping=pdumper"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--without-compress-install \
-		--without-hesiod \
-		--without-pop \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		--with-pdumper \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with games gameuser ":gamestat") \
-		$(use_with gmp libgmp) \
-		$(use_with gpm) \
-		$(use_with jit native-compilation) \
-		$(use_with json) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with lcms lcms2) \
-		$(use_with libxml2 xml2) \
-		$(use_with mailutils) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with systemd libsystemd) \
-		$(use_with threads) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# Build native tools for compiling lisp etc.
-		emake -C "${S}-build" src
-		emake lib	   # Cross-compile dependencies first for timestamps
-		# Save native build tools in the cross-directory
-		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
-		# Specify the native Emacs to compile lisp
-		emake -C lisp all EMACS="${S}-build/src/emacs"
-	fi
-
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# movemail must be setgid mail
-	if ! use mailutils; then
-		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fi
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{applications,icons} || die
-	rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
-	rm -rf "${ED}"/var || die
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
-
-	if use systemd; then
-		insinto /usr/lib/systemd/user
-		sed -e "/^##/d" \
-			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
-			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
-		assert
-	fi
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use gui && use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from a previous major version of Emacs, then
-		it is strongly recommended that you use app-admin/emacs-updater
-		to rebuild all byte-compiled elisp files of the installed Emacs
-		packages."
-	if use gui; then
-		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-			machine would satisfy basic Emacs requirements under X11.
-			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-			for how to enable anti-aliased fonts."
-		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
-			symlink it into /Applications by yourself."
-	fi
-	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
-		a portable dump file due to being cross-compiled.
-		To create this file at run time, execute the following command:
-		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
-		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-28.2-r2.ebuild b/app-editors/emacs/emacs-28.2-r2.ebuild
index 1142c84aa77c..7609ad2263f3 100644
--- a/app-editors/emacs/emacs-28.2-r2.ebuild
+++ b/app-editors/emacs/emacs-28.2-r2.ebuild
@@ -36,7 +36,7 @@ else
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 5e4f7f75a8bc..36a360c48b0b 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
index a5eded8c2a42..48411744f8fa 100644
--- a/app-eselect/eselect-wine/Manifest
+++ b/app-eselect/eselect-wine/Manifest
@@ -2,5 +2,5 @@ AUX eselect-wine-1.2.2-proton.patch 160 BLAKE2B 6385b15daf83e1ee1cd8fa3a16fcf075
 DIST eselect-wine-1.2.2.tar.gz 4712 BLAKE2B 6ce92654cf2a5197c18bc84f8db52a11f198f81f0a8116f1986e74a1795ad475d22ff5a7cb9e9e31ce8ca813059b33cfbc52763110238cb378b15bebeb4b4271 SHA512 39f4d91461f72aeb07292dc7479c5cb7fc080b843bac57dec85c43d8751227e6953d32d52d4a14387d398b73120a32b79370d686c823f230dfd1d8b32ac8113a
 DIST eselect-wine-2.0.1.tar.bz2 7391 BLAKE2B 646b4f07988448c70d2bdb0057b4b5e4a36fbd8f6dd1475cb131c26b4d10afb1a274c53aba0f705497f840f45b53fda4307882c588b69bcf5e8754ad153ea4de SHA512 a90da162bfd80a9f2f9a688e765152e1b03f5d27742f67a8485546cb663547f2f6eea302e857454e3cf00632967b8d83e9578f6be36171178f7e78aa3adf3838
 EBUILD eselect-wine-1.2.2-r1.ebuild 1282 BLAKE2B 3eeba89fe219b352d6b0ce155910aaa4aa36a831e0cb40650c8ffe5b5f26e1cacd3a9661f8c91be7c751e9e76554180eb69d0fd0a176f0a7b251998ecb2f3880 SHA512 13e7d32212515398ac9d00488a10d2b51568135dbb5bcae18c52706a373c08ce5c11196d8703d28ef94e4b74aa1a50d5d758ffb177950de29e5d4a0c59906479
-EBUILD eselect-wine-2.0.1-r2.ebuild 3170 BLAKE2B faea326c9bc2759fe1c9ec6a628fc5acdabe742759e8f8b35fdb20130de5c91241089b33573502397b123abe2ef670653c28f7127bb80a6925aff7fc6fb1e155 SHA512 5194fa5922ac6f2cf5a4ea46bb983cd28e1afd273c20c8220ad844f823a7680ff4c6812dd78e1c6618d8ea957a9894ad2716a5479f5c0f2ac3cb5f1f74edf3d8
+EBUILD eselect-wine-2.0.1-r2.ebuild 3166 BLAKE2B fd69dbee9588c89c70843057a720e876bdb058bf928286c257630a64e40f8ae38619daf0ee6b2385c2312b3417ce56d0627079de4edcfc4819e6b7e4532a9a75 SHA512 caa6d45e30b0cac18631a2b291c70d25b6615dc1250cb3922e8e48cde15054e9d00265b096d81b54d9c048468390d2034c7f9eb58895b8b06ba24ff6a33d62e8
 MISC metadata.xml 437 BLAKE2B 12267faf17cdfcc193362bd3c4de8da9f0ed84c7fcc61ffa8192f0019d676c41458d69fd1d4dfd8caf9bd85ce8ec1a8b63426b31bb1651b3410af48fd861b574 SHA512 6b0a56e42e4de7b8c8ca7704a723a2ef01c650368d54683500221f15eebcbb438da6891f39fd91c3e834d9d22b57f0ac8ea51666766a2b904795e5dbfbc75e8b
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.1-r2.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.1-r2.ebuild
index 6c0f23f8bccb..87e5f10d2eaf 100644
--- a/app-eselect/eselect-wine/eselect-wine-2.0.1-r2.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.1-r2.ebuild
@@ -39,8 +39,7 @@ src_install() {
 
 	newenvd - 95${PN} <<-EOF
 		PATH="${EPREFIX}/etc/eselect/wine/bin"
-		MANPATH="${EPREFIX}/etc/eselect/wine/share/man"\
-		$(usev xdg "
+		MANPATH="${EPREFIX}/etc/eselect/wine/share/man"$(usev xdg "
 		XDG_DATA_DIRS=\"${EPREFIX}/etc/eselect/wine/share\"")
 	EOF
 
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index dcdab8c1a7fc..c6d311ee34b7 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index 0d227e8ec989..206c2fbcff2b 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -1,6 +1,3 @@
-DIST portpeek-3.2.2.tar.gz 13550 BLAKE2B 4d0ba85d270699ebb7ca770d1fb3959d3f82135f3d75a65ec35f154ab6d46a9a51b9a2603940d16ed0f7f789f6ab628ef0a1536c2a2cf877b8e19e758e55568e SHA512 9362419f41ccc437ca8d90c0196044b2b17c683f3f2474c6f0bf484209a20fa8af1f17d69a0553038691190bdd410df0bbde51c016e2da944c6772651e99d7a5
 DIST portpeek-3.2.3.tar.gz 13583 BLAKE2B 23aa397b3f8a1d5d0e4a0ec2a3e1eac86fe4c73fc8675d3799056e70ed3807da26ffa0ab1ea7682a442d1a851c15c5bba1e66cd212390980975e8070abadc98e SHA512 32a8ad4411452a29d57e042e37014ab8b84edb15ee9df2d250171f4c14923f0e881b6e131cd5163fdcbbdc9915b82e0580bca382011861569984ca61e3d3d608
-EBUILD portpeek-3.2.2-r1.ebuild 725 BLAKE2B a71586679ec5b36f1109d06e0a49e77974dce75fce7179370b7854451265349f051ebae807a8d9246f770fb1043cd70afd4bf8e5560b709c6d24f08513a15c21 SHA512 93e3edd3c0523dc4e0d7f10ef9767c90a4a67ef1bf715ae3f91aa75ac822a0d134e4f7e19354aa430a96fc1126fe20bd9c7500df4a56baa11f8d8c387b7170ca
-EBUILD portpeek-3.2.2.ebuild 713 BLAKE2B 2b828901d833471ae3cf9c960ae8696e8130f03985359a612fa284a185eb726ab81f560c54ad578d1ad8cfe6c2e8deaa44906d188fce979298fe74ec896f49c4 SHA512 ffcaa643a8a9bb0ad84e90697bc1d8d9d143949387e834784e922cf041c8cce38e804785c771c3fa0410595ac6eda3f00307226c8f4c07c881235748d688890f
-EBUILD portpeek-3.2.3.ebuild 731 BLAKE2B 2404374856d0e3a99a8542296a5bdc66af5ce28ae81562a8fdb1bf47ca164275864271d9fda6733d57d4180b5203072d92c6fe68e45a6814166da87d8f214c45 SHA512 4da8ee3140596393c1b4a4be4d14d1f188de12c3fb5f49c22e838573e3045f4a37f212a6b09f5ebcb676bbeaee2b05c5fe80aa86dd7dbb86c1253d30258f1ab5
+EBUILD portpeek-3.2.3.ebuild 725 BLAKE2B b06680eb00fa763802a0462374c7416edc12bd5b828a02183cacfb0731b54c2512404719b81c04edbfbed19b3b429c50853c38192b1317fae67144e7b8643b10 SHA512 a1bac5358e0120848942b195417433ca3c83a3b4a5471248fdfdf18edf8f365ebe8c1f10dcce97d19f05bca42b8f32ef698862fe0566d0ead0387a3c0d32c8a9
 MISC metadata.xml 333 BLAKE2B 8f862f87d0f6cb53dcbcda433a03202c648723f7b965798173fa1caaf8cb2d9d6801283b65c8a1184685e47c7cddd76e927facb3f9b014325bd5c88a2d69664f SHA512 1e16d124fe120663bb0ecb7995b6be4dc65f5d164bff681029fc6f82113926aaa875a97dcdb6f9231e170b416c6bd3e19a935aa5dfebb01969b169e7b9c89f10
diff --git a/app-portage/portpeek/portpeek-3.2.2-r1.ebuild b/app-portage/portpeek/portpeek-3.2.2-r1.ebuild
deleted file mode 100644
index 459e51243625..000000000000
--- a/app-portage/portpeek/portpeek-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PYTHON_COMPAT=( python3_{8,9,10,11} )
-
-inherit python-r1
-
-DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
-HOMEPAGE="https://github.com/mpagano/portpeek"
-SRC_URI="https://github.com/mpagano/portpeek/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=app-portage/gentoolkit-0.6.1-r1
-	|| (
-		>=sys-apps/portage-3.0.31[${PYTHON_USEDEP}]
-	)"
-
-src_install() {
-	python_foreach_impl python_doscript ${PN}
-	doman *.[0-9]
-}
diff --git a/app-portage/portpeek/portpeek-3.2.2.ebuild b/app-portage/portpeek/portpeek-3.2.2.ebuild
deleted file mode 100644
index 4a0eb9876d69..000000000000
--- a/app-portage/portpeek/portpeek-3.2.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit python-r1
-
-DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
-HOMEPAGE="https://github.com/mpagano/portpeek"
-SRC_URI="https://github.com/mpagano/portpeek/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc sparc x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=app-portage/gentoolkit-0.5.1
-	|| (
-		>=sys-apps/portage-3.0.20[${PYTHON_USEDEP}]
-	)"
-
-src_install() {
-	python_foreach_impl python_doscript ${PN}
-	doman *.[0-9]
-}
diff --git a/app-portage/portpeek/portpeek-3.2.3.ebuild b/app-portage/portpeek/portpeek-3.2.3.ebuild
index bbf1b82a3946..8218b481d5de 100644
--- a/app-portage/portpeek/portpeek-3.2.3.ebuild
+++ b/app-portage/portpeek/portpeek-3.2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mpagano/portpeek/releases/download/v${PV}/${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc sparc x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-portage/pycargoebuild/Manifest b/app-portage/pycargoebuild/Manifest
index 4b1e52ef9052..aabea4d70805 100644
--- a/app-portage/pycargoebuild/Manifest
+++ b/app-portage/pycargoebuild/Manifest
@@ -1,3 +1,5 @@
 DIST pycargoebuild-0.5.1.gh.tar.gz 17587 BLAKE2B f5c35acc43cfcc1a844f9bf0f01b72ca62ff07531dba8911e9a4ec672586760c9fee93ae9b9a9cb4becd4702d2caabc8f1a02a4b702356708ec4cf3f1780b577 SHA512 eb35ddc93a34fd0a857f28166a5e1cdb64f3e9b13f8182fde79292e93f30d6218eec2f0f2933c763c37f398b09952550e208a3914fb47d8d2b6a755ae003a983
+DIST pycargoebuild-0.5.2.gh.tar.gz 18304 BLAKE2B f9150ee2532b9683be9c504397f6c396956aefd285784ff156aaec5d8ab7cb9bb71643271463dd237c357dd6d061fe67cc5dd2470085cf1faf79b4c62d839135 SHA512 56099598a6b97929029e7cb8f3d67c81d187b2a9811e78de384ab37ec28aec8649bfe61ca987ace82fc18925d77ba19c7c6e89d8537f37ea65bb0127566a6c2f
 EBUILD pycargoebuild-0.5.1.ebuild 669 BLAKE2B b3b235c2092de874c3462eed84b0d3caee455480353d75d20981dde7f5437c896e62bd85a7e808f6d0db7a1442bf9327ff176dd5c1bd76637f188174a37bcc36 SHA512 e4708d2ce1672e0b9a62a561df9728e59634c75e10431674b2fcb0e078faf5edb338b5b3a527af4e41800d520d8ce5efc3072d5eedb24914da947fd802c84c65
+EBUILD pycargoebuild-0.5.2.ebuild 669 BLAKE2B b3b235c2092de874c3462eed84b0d3caee455480353d75d20981dde7f5437c896e62bd85a7e808f6d0db7a1442bf9327ff176dd5c1bd76637f188174a37bcc36 SHA512 e4708d2ce1672e0b9a62a561df9728e59634c75e10431674b2fcb0e078faf5edb338b5b3a527af4e41800d520d8ce5efc3072d5eedb24914da947fd802c84c65
 MISC metadata.xml 384 BLAKE2B a5c91cf81989cb7f2ff504cd9931e89cb85a2b17721818efbc436d13e68d673c4f384839c67eeec8fe24c1a78b112c3fe37ee1722d2d28f44c5a075ec8fe18ba SHA512 76ffa916e9630225aadb9a0d2073087fcb848b782f6e44c28c354533c5329ed337e609666ee7eba90ef1191be2a34e968d3bc06556cfafce32a43a22100cc6f0
diff --git a/app-portage/pycargoebuild/pycargoebuild-0.5.2.ebuild b/app-portage/pycargoebuild/pycargoebuild-0.5.2.ebuild
new file mode 100644
index 000000000000..ddee9ac385b4
--- /dev/null
+++ b/app-portage/pycargoebuild/pycargoebuild-0.5.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A generator for Rust/Cargo ebuilds written in Python"
+HOMEPAGE="
+	https://github.com/projg2/pycargoebuild/
+	https://pypi.org/project/pycargoebuild/
+"
+SRC_URI="
+	https://github.com/projg2/pycargoebuild/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/license-expression[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 183d36a24d12..028ebca3c65d 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index 52cbc939e7a8..5fc974f1881a 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -5,5 +5,5 @@ AUX mysql-connector-c-8.0.27-res_n.patch 1635 BLAKE2B f75811958a6415bf45aa571a8d
 DIST mysql-boost-8.0.27.tar.gz 292184025 BLAKE2B 177209f3c62b0326ca9d021c751a701dec84c1b15c946ab0a68b1b4cf0620468eb3a1df77a918284007a0fde1aaa6a9767d0baed57936612813ef583df51c35e SHA512 6ef2426c0bee46bdf8e2fa5cb159d5ae19f0bed4f7c9bea9b33e0dd922b568c3c68ca063dcbcd7ea6904aaea31877c10064ea10b4bc63fb40d9f31778e3a7891
 DIST mysql-boost-8.0.31.tar.gz 334504577 BLAKE2B 0506472c732351a1055be9bbd81212e95280ae464af95cb5b579777dd8fad4634b099fa2830c3095066daf8c586f1d8cd2316e7268fb0d2577dd706c595c9102 SHA512 87b1678de8c2fd640fd6f3ae58266ea63fe240578330e3296d0e5fc209bbe9b0c22996214b6ca4cce8c0d9cc2f9897f4e6723d835b33fc4342983c82929c3d96
 EBUILD mysql-connector-c-8.0.27-r1.ebuild 3243 BLAKE2B e0cd9a95e8b9760309df66c35e3c22f21bed920288e91ec466cba438cbdddd9721fd37068720fc1b6155f820aa0c759cff7a06cb27aa90f97e4d6eda82d2294b SHA512 29d9d9a14042f9c18ce6bdb4e30c0bf31932f734965b001cc7dadc6d55d9fb06b78be61f5c29c5dce0242102d4c1bbd375a7c030d081c9c983b68185caf8bf7b
-EBUILD mysql-connector-c-8.0.31.ebuild 3187 BLAKE2B 96fb3a9d32de32397551a67bb529ef9456cf4c8dc2dd7aeb6bc2ff29879061827438bf5e079ef3c69625ac10c149d52c3c9f9cd27d50b8fe1923607ee574712c SHA512 57a6db606f8902e8e8be1f4d42e6c68b4067fb2ca4a5248dfdb734e3b0f127aac64abcfd3d0f1fe79db3f76ee83d1570acec0e00f38df3e05d8ec1895a76341f
+EBUILD mysql-connector-c-8.0.31.ebuild 3186 BLAKE2B cf1cb299c233d1ce01d4d475e8b19ede26acfb66d0bef2b8129dc7925d1c4a54b9928d9ee8a341e2d91db650336f7086eeb5f083e5362159293f461ce1bcd599 SHA512 f36916f1b19f251ed2e98474e413f728d3e2d6da33f2d2a9429782f26e32973ef8d24942a07c3890c76c1a65d7dce0f3e55f6defe9ad2ba10fcc91a2cb44ef08
 MISC metadata.xml 240 BLAKE2B cc93ae4da8408b221c296e092d9db6ae3879754ade669d81c1218d53a5f007c6b7717bda6f92dbb0af38ff9b5e45f44e91503b12d3603d9955ec7d5a2a67399b SHA512 0f41c32ce3d736e061302252f14913d7425bc97e19d0c2f3b80c50637ab3521aa6cfc67f82e5f70f91174cddb36bb5622837dc18fd9db3bf75eb860359aade27
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.31.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.31.ebuild
index 558c28565a99..9f647fd95a88 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.31.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.31.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz"
-	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"
 
 	S="${WORKDIR}/mysql-${PV}"
 fi
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 4763eb761135..f07e3baddd6e 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index af656fc76a82..1e170f627be3 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -1,5 +1,5 @@
 DIST u-boot-2022.07.tar.bz2 18087759 BLAKE2B bb78c7ccd56f12ebc622fb73d29cbf0a5db9d421133b191a6591845b4842b111145d2df649bae69011284bd468b8219ee0df20b61660ea4ec52006a93e14f09d SHA512 e1b3621dafac876c644ffb3d24b6e2380f5a78454c420a5b17d174e3f0b57731a95cfbff28ae7d0af4493f4bbf8d21e7f9236d61bb2414ed12295332b3d557b6
 DIST u-boot-2022.10.tar.bz2 18365430 BLAKE2B 42aa7a6f131735888939982e579de4342e3909e064ab896b0df6f1ff56c20ed6cb11d25286da7c052a5f67dcef6fa7a746944d8df6dd504586f5a71502d157e1 SHA512 95bc1f915a3349f6045e59f46d8514485ca0de1d62303f7026b8e59f3ac539b9545895e0dd736ed7b26f28239db31672ecad2accc3fd99356a55269697039147
 EBUILD u-boot-tools-2022.07.ebuild 1561 BLAKE2B b7e6e1bd690440c0af7085fa7055eff9823a8aafe179dd6b4412c93988a2abe04f52f152fe3eb2d8aa6f2feac311892e61c84d106db90645d2b6d1e082167a86 SHA512 3e9a1d07ad0767d96042ed5e4b7145ac5f1264de2d5a748c8a22052fb941a162a4d968e08ab848fbc0d13c4eec955118d0f07d5c08ce80c70f5ce16d61a3edb6
-EBUILD u-boot-tools-2022.10.ebuild 1563 BLAKE2B 9055902fce4895d388cfb1a23ca39caaa8bf86c237fe93ebd3afb2a0aeeab9132f643a170f89b7f56ed3fa660bc284daf250e406c0f9a60fe5f5f34fa7c0e5a0 SHA512 d23d73055c1271ed38cc1866a0c2a95b10cbd50b99c52c6dcfe754b2c73e45f72358c6e0995ee765ef3cd7bcb5a0efdf263b1626a73f79a64c6c756c256f3b17
+EBUILD u-boot-tools-2022.10.ebuild 1562 BLAKE2B 22d55ad2f76a0b67a21760c864ca8d1918facc612e4c184855988e1ae6269ed3beaac1c62ee340ffbe58cae081d4e79078d207f954c5bf66ffe962fa0a76b5fe SHA512 ed63252d4edb2abc9d8ad5ae2fa7cab93b5fce64336604e4f191d14c29afa1ba721c9f3cd43cc3da056b7903fa57954b10bf4bf204d69f234d61bf515aabcd2a
 MISC metadata.xml 451 BLAKE2B 8634c7b8cd333dadddeb3622fbe298d19b5a470b85743717fb972e310869ee2a897110a9fd7b5781de016ba9a8c9baf7c6b5ed89279e98f086a4d326cdcce807 SHA512 981503c1d3a7dd42ca141b00a29fac43eb379603140767f0e0de94f54fd4180b498cebea56692c017ab7dbf9a2afdfb222edc5942c58429490456c064b5fa41d
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2022.10.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2022.10.ebuild
index b3d367d17b72..1d495eee2e0b 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2022.10.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2022.10.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="envtools"
 
 RDEPEND="dev-libs/openssl:="
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 40da23f4e26f..e1b6cc5fd7ef 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/felix-main/Manifest b/dev-java/felix-main/Manifest
index bc2aed7b47a1..5083ff2fac9f 100644
--- a/dev-java/felix-main/Manifest
+++ b/dev-java/felix-main/Manifest
@@ -1,3 +1,3 @@
 DIST felix-main-7.0.5.tar.gz 255198 BLAKE2B 289e2305b15c28f985bee1d8687db6ecb5098a2086da6fd32a7db8572f83a1ac37e49deeb89d657d48b943a626d400caccd8185ced565e8c65aa558395aeef05 SHA512 e06f6c330a73100a739575e92a6f0af263a98643bbd6fd6661e799c2a11c8c9d9589f1f5b8802799ffcae7007e8362c629055fa8b25a50a4fa736ed2ba2955b0
-EBUILD felix-main-7.0.5-r1.ebuild 2248 BLAKE2B 5aacb59647c0f799733e4e4aa6441091d11c4d3cc683688bb7cb989b3ee104256cc2a0f97a8fc1487a15f51c8273baaba5fca39690e035247ac0722bbcb71e5a SHA512 28ed5aca4a8d3252ffeb6f8c2b68ddd50f30b2082fd6bfa05f18dcb50de686cfd0724556b660d56930dd1dee233aa3a2989bcda4a12254eba25be7ea736535f6
+EBUILD felix-main-7.0.5-r1.ebuild 2252 BLAKE2B e4831a0bbe74081db3d5d1de98e235e229a446b5cd8bbbc29b1053c5d75c2cbad58df3af90e2bcf77b5dbb564e763a8838b27d69e1a1ebf0334dcc8b85b37770 SHA512 f816117f1ee1e8203a8c9e621d23afedb5c05d405f9d70d1352dfc5b9c6a020dc917ff5b1614ac56ee5d16effba0106d5f1d088d563df0477f0500ea7a98f217
 MISC metadata.xml 594 BLAKE2B 9ec3f78cd94f82740e506f44a6494d8e60894f09cd655b022886978c41bcf73a01628c9f1850a39a78bb96ed9dc57c04e7e1f6f5193b91bd8f23f1706899ef84 SHA512 1d8fab624036e9eda29d385fd042a0ca6b130dfa943c63c09e2a161ee039c695f215da1fe6135b59ece4a0fec06399dff2f80d0a12ab690805fd718d90cc05f2
diff --git a/dev-java/felix-main/felix-main-7.0.5-r1.ebuild b/dev-java/felix-main/felix-main-7.0.5-r1.ebuild
index 57db6f06bc22..60e9162ace4a 100644
--- a/dev-java/felix-main/felix-main-7.0.5-r1.ebuild
+++ b/dev-java/felix-main/felix-main-7.0.5-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/greenmail/Manifest b/dev-java/greenmail/Manifest
index d23ab8185fdb..ab393a798e9a 100644
--- a/dev-java/greenmail/Manifest
+++ b/dev-java/greenmail/Manifest
@@ -1,3 +1,3 @@
 DIST greenmail-2.0.0_alpha2.tar.gz 969798 BLAKE2B 0e1b00ccc96fac26d453cff5f49937bebc7b62e58ad33c9c287e7edb15de2884620ea52c94e00f5ddb9dc6e8853ed36101c4f7f294d48044d78a2a747146952e SHA512 925762f834d797e5136412520d45e9ce56c7b946f9cf1b7e90b674b12405a426bdceb068c7b459b1d4321d04ed68ff5dfd2d32ea6d5f17e848189596cc9acb17
-EBUILD greenmail-2.0.0_alpha2.ebuild 1838 BLAKE2B 12487b65dc736055eee42dfdb549513c3668fd69038748fc5bc32d05222c391349ead6dba8f404c5eb8b039d8b56cc9d0a458ccad3177c1103ecc5fc22b14c09 SHA512 7843e1484034e1f51ddb9cf1f1ecae173c2062a00629540ef212808a7b0b6af27c116c0e4d133a522f6bf47aeb20de5e6d6adc2e4232f937042761c12b054137
+EBUILD greenmail-2.0.0_alpha2.ebuild 1842 BLAKE2B 2761f18ba3a22f9d78017435846d7355bce6cd32fb2014c1d9352877d5388cdd37856ccdb47858190567e9b398fd7cac867697a5bc6b823ddd8efaf7f583f57f SHA512 fe84f73908719611898d69b4af54b1163a51d9c4de6cf6fb5b51e1fe3fc61741c4e2d9f154f80d42c11d2d7620967136b83a6e55ac93652dbc514ce8c296179a
 MISC metadata.xml 311 BLAKE2B 5ac66bbc1ab39c2c144199584900de8485abc400bd49471961ea2d104284c36e15572bbe97ad2c9b7647c3e07320c1a292516f996fb2381ef1403e4719a69e73 SHA512 dff768a4970226540c20d2abe00b744458e29795f575d0526224d614931f2b789cd01f4bcb11edd7f08ea1230e21caacfc77186e4ba0624db8059e50229a88fc
diff --git a/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild b/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild
index 7f4684b7fd89..564a6c9ca56d 100644
--- a/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild
+++ b/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/greenmail-mail-test/greenmail/archive/release-${PV/_
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jakarta-mail/Manifest b/dev-java/jakarta-mail/Manifest
index a75450b0901c..5cd287f30245 100644
--- a/dev-java/jakarta-mail/Manifest
+++ b/dev-java/jakarta-mail/Manifest
@@ -1,3 +1,3 @@
 DIST jakarta-mail-2.0.1.tar.gz 1799232 BLAKE2B 91c8109dee5b1dd5d245df44b905435e59c4f7a888711edf19431bd3e7627d5ba4dbc34e3bd8458507c77c5fb6ed50843f45b2e8b01b7369b660055d8c99739d SHA512 42e9f82cda788b4cf73c06c8c2798a3f886fe714e4f8f4cb0356643b05acd756d46ff382333d2a9e4aaa4ed0dd5d01bc354f7e442c78be9f59cca25d4c23a3ec
-EBUILD jakarta-mail-2.0.1.ebuild 1988 BLAKE2B 80123c2234a004ae5a63a797eceffdd508f1a56cc322ed11831aca37e50a95ae179bce5beddb4de4f695238837357982cbdd65c7a64b6f27796020325eb74c72 SHA512 17d370f8b7c82af8603b03cc5b71a9a039f8163e61f2c9c8e54c2265661aed5dde5536f899c783287714f32562c67e2011f91a2c3b3e95760832b527dd356a83
+EBUILD jakarta-mail-2.0.1.ebuild 1992 BLAKE2B ff7a2e29a3be83a21d1955500f54419e45d024585c2a5e9be554ed442e9c1a2dc7f6cd296598c455af7c7f6d15a89dff6aeac2eeb8952940c304c85bd3b64b20 SHA512 23ad8254cf87528b927ed1d39edc81d27b450cc87dbf693d7dc1876d10564dd603ee4407a6d20ea0fae35ac1b74ce8c76af08bd4641580c34d765e2b73f3852f
 MISC metadata.xml 300 BLAKE2B 59a5cc3d098097693ee38e1552293270505f8d82025e096a6d1c331045451d5782ccc8819a2034a88a89f4490318becb96f10186766db32afad98c1546c956dc SHA512 2d1560717ededf180302c9348d112971e6d24c8745aae17f1ec59c3676ae41bb7fe396bbb57f5c88ef52bd0f7e161aefc22b9d2d5fd006ffc9873dbf42cb2df5
diff --git a/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild b/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild
index 3335992b15cd..2fcf73b3a66e 100644
--- a/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild
+++ b/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jakartaee/mail-api/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jakarta-servlet-api/Manifest b/dev-java/jakarta-servlet-api/Manifest
index 3af0398607b9..e4ad281213da 100644
--- a/dev-java/jakarta-servlet-api/Manifest
+++ b/dev-java/jakarta-servlet-api/Manifest
@@ -1,5 +1,5 @@
 DIST jakarta-servlet-api-4.0.4-RELEASE.tar.gz 188270 BLAKE2B 6c5db208603333abb9aa31726e60d489c5f860e3b6ad61e691d65e8b99909a8139f7677cec52d2a74ed9e8445ea2f0f510875ca32a2e512a09183245a9822889 SHA512 9cd613f8c33f5d415b06f70543eee926c81e87a14d03b837998a6c4db11ce5fb9c2b97f796f2936a63f2a6dc7847d7a97aec7a804b80234cd52e4bfdca9920a9
 DIST jakarta-servlet-api-6.0.0-RELEASE.tar.gz 634690 BLAKE2B e48375f6a0b74950a2c50d73f2d50f7c79db96e22d5c845380bff670948cd1a1d1ea98eaf93e7fa02887e94010c8573382ba3f6fb52a8fca6fa98e5915c307f6 SHA512 65285bce3e8b5143eb33d548549ff5653c6c90f55e7a19e8fdb4a7799842d3430cfe0cebe54f7a7d253d9da4c2b6d4d7a08b35846636c11a2ca814b8311cecc7
 EBUILD jakarta-servlet-api-4.0.4.ebuild 935 BLAKE2B 5007e96b0617853577ea6159caa7e587e9316568f5ea620c8366d27c9dbe74b280b646d8b60c2ad9dd37b1ff37556d9c2a5c49f74d918d0d0ec58ad243e2f3ff SHA512 cab6ebbea0966a0be1f785efd65e2af6ff8b80a602101877f8551be26ea945f20208d820743a8be59fc83aff4c84e12d03516cf2dea79b2de9d8e207b0ddf03c
-EBUILD jakarta-servlet-api-6.0.0.ebuild 1275 BLAKE2B c19c344a97153cf4bc5790fd606d22e60d1469d281134159b06a1c138f60f59c5c41776235c6c8cbc921b44ffebd252604c9c8590df8563272a4f6c4ebbeef77 SHA512 663a93796e2cc15ac4e116abac681f93a7a9206bbd2b9251f299d8fcdebe44d2c717346c7a5cebc2998b2307f0817910161c6d24abc23b25eb6f32d2a13f3fa4
+EBUILD jakarta-servlet-api-6.0.0.ebuild 1279 BLAKE2B 2c550b35ce1ae34d29cae494b2499c3f09ba0cef413f81254bdf6a9f026dd12c91d1df3b0ff1f78814e15082c8a557ab62b2f5993a5cc586fe75caeafc1d2566 SHA512 fff2c7ebd8a3e7dd2ce8058ecec2271eae2c888ac09b7b4b1ea061ed9c789307a5d1c69925d52319975ca92d773da04c28d9953489485c0fac0a8a2426b09490
 MISC metadata.xml 332 BLAKE2B b9a06fe2a5573bde0da5b4f0d11a4cdf8c26738b67ac575014c01ed7fadfbc057a63fe2de907942a83d12afe8335933edbf671460b33939969bbb8d2657ffd81 SHA512 4c044f785c3a41116e24cc56b46b8e74327e4fbe29b11a25e1004e18d815023d073465658bb9467afbf80f8490e29815e1e52ce3d5ccde250ae48f0edbf0d380
diff --git a/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild b/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild
index 18f4251527ea..7fbf152908ae 100644
--- a/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild
+++ b/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jakartaee/servlet/archive/${PV}-RELEASE.tar.gz -> ${
 
 LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="6"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-11:*"
diff --git a/dev-java/logback-classic/Manifest b/dev-java/logback-classic/Manifest
index 2e2473772604..dc8ed417d6c7 100644
--- a/dev-java/logback-classic/Manifest
+++ b/dev-java/logback-classic/Manifest
@@ -1,5 +1,3 @@
-DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084
 DIST logback-1.4.1.tar.gz 760510 BLAKE2B a01aab8b499059669e22a2ab51522b01765bb2802008058bf3ca1a9ddafa06d2827d4129e76dc6f91e960dea2e419087dbcbc6fbced6b560295cda7089ce4a12 SHA512 4e8b0cb7cd7f950d7b6a859bc40cc8a3ddc41e2c7ab1567dc29780f4f05a14fdf34dd569928e1425886226e45979d85587ddf5e1e61665929718336451a0802c
-EBUILD logback-classic-1.2.11-r1.ebuild 3257 BLAKE2B d3b412b78a91e56ccc5b91746d6a604fa1450fa6edd04535b75e558e1d25681f4d774485c50ace1848c3cdfab66dd954fb826ccdcf367b2ebf6a87cc789e7ec4 SHA512 0c0f1066c28106101e806eb2564b00f93f7ab15228ec2eb8499e7306347908d63a38cbd76ef804174b29dfd16777c762fd5da5286cd26dd9c3b659918223b3f5
-EBUILD logback-classic-1.4.1.ebuild 4491 BLAKE2B 1e4fac469c556619ff47e216f9cbd18320f17ca5a2ec5fdf39e2cabe6d79ea0fb2e8da6971eb3b8b351fb7afe60a90fe34a3b3f5c35f94db0d33c1423608370e SHA512 8a3c4bdf8b6a15cd80ccad613c93398202fafe22f8db4ab782531c8a1aa70a4f7fc182817d19d8b9ebef70fab2bab701b7bac8664ffc3fa672a1eccb4e37ccc4
+EBUILD logback-classic-1.4.1.ebuild 4495 BLAKE2B 23c85bdf5ad91857ba524590134c7cd82cc85808f544048100f446ee459b1fd8378842642b6d993e8b42a568943904cfcd2b715f2bfffdd18928f8faac2f0942 SHA512 721e9a3d1ee371f9623ae97bd00ae52547bcd582d5aa45aa49fa5df6ecdd0c756a46af0942d8223cda599bd5b8910e1a24a8a8bddb3e0b000c273a31131f26cd
 MISC metadata.xml 413 BLAKE2B 3ae8c9f27dadfe978d070866e0c0368b89b8532f2aa6fbd3e3fab9e057320e1c6b5c2bc7367cc191e189acaa88384a0b86741d674d1cd711d4dd5ee8a29c9662 SHA512 7c2739ff8e878766487804fabcb39cda969c81e47af7fd51ffebfcb85dbdec10b7eef85b1d9c873561456e1592f6cdb8f82fbb4233abee1f43f323a1c10f9ba2
diff --git a/dev-java/logback-classic/logback-classic-1.2.11-r1.ebuild b/dev-java/logback-classic/logback-classic-1.2.11-r1.ebuild
deleted file mode 100644
index 10c52f8637b1..000000000000
--- a/dev-java/logback-classic/logback-classic-1.2.11-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/qos-ch/logback/archive/v_1.2.11.tar.gz --slot 0 --keywords "~amd64" --ebuild logback-classic-1.2.11.ebuild
-
-EAPI=8
-
-# No tests, too many dependencies missing
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="ch.qos.logback:logback-classic:1.2.11"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="logback-classic module"
-HOMEPAGE="https://logback.qos.ch"
-SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${PV}.tar.gz"
-
-LICENSE="EPL-1.0 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# ch.qos.logback:logback-core:1.2.11 -> >=dev-java/logback-core-1.2.11:0
-# javax.mail:mail:1.4 -> !!!groupId-not-found!!!
-# javax.servlet:javax.servlet-api:3.1.0 -> !!!groupId-not-found!!!
-# org.codehaus.janino:janino:3.0.6 -> >=dev-java/janino-3.1.6:0
-# org.slf4j:slf4j-api:1.7.32 -> >=dev-java/slf4j-api-1.7.32:0
-
-CP_DEPEND="
-	dev-java/janino:0
-	dev-java/javax-mail:0
-	~dev-java/logback-core-${PV}:0
-	dev-java/reflections:0
-	dev-java/slf4j-api:1
-	java-virtuals/servlet-api:3.1
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? ch.qos.cal10n.plugins:maven-cal10n-plugin:0.8.1 -> !!!groupId-not-found!!!
-# test? ch.qos.logback:logback-core:1.2.11 -> >=dev-java/logback-core-1.2.11:0
-# test? com.icegreen:greenmail:1.3 -> !!!groupId-not-found!!!
-# test? dom4j:dom4j:1.6.1 -> !!!groupId-not-found!!!
-# test? junit:junit:4.10 -> >=dev-java/junit-4.13.2:4
-# test? log4j:log4j:1.2.17 -> >=dev-java/log4j-1.2.17:0
-# test? org.apache.felix:org.apache.felix.main:2.0.2 -> !!!groupId-not-found!!!
-# test? org.assertj:assertj-core:1.7.1 -> >=dev-java/assertj-core-2.3.0:2
-# test? org.mockito:mockito-core:2.7.9 -> >=dev-java/mockito-4.4.0:4
-# test? org.slf4j:integration:1.7.32 -> !!!artifactId-not-found!!!
-# test? org.slf4j:jul-to-slf4j:1.7.32 -> !!!artifactId-not-found!!!
-# test? org.slf4j:log4j-over-slf4j:1.7.32 -> !!!artifactId-not-found!!!
-# test? org.slf4j:slf4j-api:1.7.32 -> >=dev-java/slf4j-api-1.7.32:0
-# test? org.slf4j:slf4j-ext:1.7.32 -> >=dev-java/slf4j-ext-1.7.36:0
-# test? org.subethamail:subethasmtp:2.1.0 -> !!!groupId-not-found!!!
-
-# Restricting to jdk:1.8
-# src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java:20: error: cannot find symbol
-# import sun.reflect.Reflection;
-#                   ^
-# https://jira.qos.ch/browse/LOGBACK-1343
-DEPEND="
-	virtual/jdk:1.8
-	${CP_DEPEND}"
-#	test? (
-#		dev-java/dom4j:1
-#		dev-java/assertj-core:2
-#		dev-java/log4j-12-api:2
-#		dev-java/logback-core:0
-#		dev-java/mockito:4
-#		dev-java/slf4j-api:0
-#		dev-java/slf4j-ext:0
-#	)
-# "
-
-RDEPEND="
-	virtual/jre:1.8
-	${CP_DEPEND}"
-
-DOCS=( ../README.md )
-
-S="${WORKDIR}/logback-v_${PV}/logback-classic"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="dom4j-1,logback-core,junit-4,log4j,assertj-core-2,mockito-4,slf4j-api,slf4j-ext"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/logback-classic/logback-classic-1.4.1.ebuild b/dev-java/logback-classic/logback-classic-1.4.1.ebuild
index 5538d5f55cf6..3c1d932f9dc1 100644
--- a/dev-java/logback-classic/logback-classic-1.4.1.ebuild
+++ b/dev-java/logback-classic/logback-classic-1.4.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${P
 
 LICENSE="EPL-1.0 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: ${PN}/pom.xml
diff --git a/dev-java/logback-core/Manifest b/dev-java/logback-core/Manifest
index 5bad74e39807..857efef90ece 100644
--- a/dev-java/logback-core/Manifest
+++ b/dev-java/logback-core/Manifest
@@ -1,6 +1,3 @@
-AUX logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch 799 BLAKE2B 5ed73567f9ef6f6fb08c1f9d6fff43e71a22760a31bddcc454a75c62d26b50bad46510f6c748c019ab90e69e6e6007ee3de2507104f956b4c24b658716a6b6ed SHA512 5214fab891a28e02b6748a307e1741207c16dbf0f9fbfcef86f1303c2ab15714348a1f1750965ee928ed422ffa7261f0bc7340756805ba196fe86dce66039ae5
-DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084
 DIST logback-1.4.1.tar.gz 760510 BLAKE2B a01aab8b499059669e22a2ab51522b01765bb2802008058bf3ca1a9ddafa06d2827d4129e76dc6f91e960dea2e419087dbcbc6fbced6b560295cda7089ce4a12 SHA512 4e8b0cb7cd7f950d7b6a859bc40cc8a3ddc41e2c7ab1567dc29780f4f05a14fdf34dd569928e1425886226e45979d85587ddf5e1e61665929718336451a0802c
-EBUILD logback-core-1.2.11-r1.ebuild 3482 BLAKE2B 40590d0ec60cf62a6a4c64e34c68c84077a0917d18aa944dcdb835b97a585d2fc6cc30e80bf8966fb2e046baa1d4172b02576e8d610edf58f1e75a0dbee7e9ae SHA512 8e6a348b53c6b2ae9230dd8958b68f57e8a3dc7f05903f75b0c407c6b700b2e437ac925ef515d35963b33f99d5c1f0ecf576a745cc65ff456a096277276b08f4
-EBUILD logback-core-1.4.1.ebuild 3013 BLAKE2B c05094f75ee198e2a4e19882a707b919d5a2e78448c859b45acb26a321fa95e11f8244879b45d383143c27beb1bc01b42b7397be5cd840b66354f9b9378915d6 SHA512 51be51fb44fd04061c1e73d2101674d31f6ba0de907c9362079f8793f7c0ad1b9027b4790eaa8b0d689176751244e5a17328913975dc42a3d42dd673247e8b3e
+EBUILD logback-core-1.4.1.ebuild 3017 BLAKE2B 789e32d9835ecfc57a299208a24e64d0a02c9af6e41b5ac59ce934eb0207a3eedaa9e9fe3ade07167b920143c52070aae5f14d99ca717de2c93af9d84583cea4 SHA512 244315ad5ebb4f1d854fe41212d875f628b0045a6ded5bd91d9657e2817e92310e67a66f74883f0831f717ba2513cd5280e4349dd033ddd3d2fa5366619b7209
 MISC metadata.xml 413 BLAKE2B 3ae8c9f27dadfe978d070866e0c0368b89b8532f2aa6fbd3e3fab9e057320e1c6b5c2bc7367cc191e189acaa88384a0b86741d674d1cd711d4dd5ee8a29c9662 SHA512 7c2739ff8e878766487804fabcb39cda969c81e47af7fd51ffebfcb85dbdec10b7eef85b1d9c873561456e1592f6cdb8f82fbb4233abee1f43f323a1c10f9ba2
diff --git a/dev-java/logback-core/files/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch b/dev-java/logback-core/files/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch
deleted file mode 100644
index 9423f26e9a1a..000000000000
--- a/dev-java/logback-core/files/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/test/java/ch/qos/logback/core/AsyncAppenderBaseTest.java
-+++ b/src/test/java/ch/qos/logback/core/AsyncAppenderBaseTest.java
-@@ -18,6 +18,7 @@
- import static org.junit.Assert.assertTrue;
- 
- import org.junit.Before;
-+import org.junit.Ignore;
- import org.junit.Test;
- 
- import ch.qos.logback.core.helpers.NOPAppender;
-@@ -281,10 +282,13 @@ public void verifyInterruptionFlagWhenStopping_NOT_INTERUPPTED() {
-     }
-     
-     
-+    // In JDK non started threads can be interrupted
-+    @Ignore
-     @Test
-     public void verifyInterruptionOfWorkerIsSwallowed() {
-         asyncAppenderBase.addAppender(delayingListAppender);
-         asyncAppenderBase.start();
-+        Thread.yield();
-         asyncAppenderBase.stop();
-         assertFalse(asyncAppenderBase.worker.isInterrupted());
-     }
diff --git a/dev-java/logback-core/logback-core-1.2.11-r1.ebuild b/dev-java/logback-core/logback-core-1.2.11-r1.ebuild
deleted file mode 100644
index db5f39ce5ef6..000000000000
--- a/dev-java/logback-core/logback-core-1.2.11-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/qos-ch/logback/archive/v_1.2.11.tar.gz --slot 0 --keywords "~amd64" --ebuild logback-core-1.2.11.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="ch.qos.logback:logback-core:1.2.11"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="logback-core module"
-HOMEPAGE="https://logback.qos.ch"
-SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${PV}.tar.gz"
-
-LICENSE="EPL-1.0 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# javax.mail:mail:1.4 -> !!!groupId-not-found!!!
-# javax.servlet:javax.servlet-api:3.1.0 -> !!!groupId-not-found!!!
-# org.codehaus.janino:janino:3.0.6 -> >=dev-java/janino-3.1.6:0
-# org.fusesource.jansi:jansi:1.9 -> >=dev-java/jansi-1.13:0
-
-CP_DEPEND="
-	dev-java/jakarta-servlet-api:4
-	dev-java/janino:0
-	dev-java/jansi:0
-	dev-java/javax-mail:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? joda-time:joda-time:2.9.2 -> >=dev-java/joda-time-2.10.10:0
-# test? junit:junit:4.10 -> >=dev-java/junit-4.13.2:4
-# test? org.assertj:assertj-core:1.7.1 -> >=dev-java/assertj-core-2.3.0:2
-# test? org.mockito:mockito-core:2.7.9 -> >=dev-java/mockito-4.4.0:4
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-	test? (
-		dev-java/assertj-core:3
-		dev-java/joda-time:0
-		dev-java/mockito:4
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-DOCS=( ../README.md )
-
-S="${WORKDIR}/logback-v_${PV}/logback-core"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="joda-time,junit-4,assertj-core-3,mockito-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_prepare() {
-	default
-	sed \
-		-e 's:org.mockito.Matchers:org.mockito.ArgumentMatchers:' \
-		-i 'src/test/java/ch/qos/logback/core/net/AbstractSocketAppenderIntegrationTest.java' || die
-
-	# Ignore test failing under Java 16
-	# See https://github.com/qos-ch/logback/commit/d6a8200cea6d960bf6832b9b95aed64e87474afb
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if [[ "${vm_version}" -ge "17" ]] ; then
-		eapply "${FILESDIR}/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch"
-	fi
-}
-
-src_test() {
-	# 67,73 logback-core/pom.xml
-	# <excludes>
-	#   <exclude>**/All*Test.java</exclude>
-	#   <exclude>**/PackageTest.java</exclude>
-	#   <!-- ConsoleAppenderTest redirects System.out which is not well tolerated by Maven -->
-	#   <exclude>**/ConsoleAppenderTest.java</exclude>
-	#   <!--<exclude>**/TimeBasedRollingTest.java</exclude>-->
-	# </excludes>
-	pushd src/test/java || die
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			-name "*Test.java" \
-			! -wholename "**/All*Test.java" \
-			! -wholename "**/PackageTest.java" \
-			! -name "AbstractAppenderTest.java" \
-			! -name "AbstractPatternLayoutBaseTest.java" \
-			! -name "AbstractSocketAppenderIntegrationTest.java" \
-			)
-		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	popd
-
-	# accessible: module java.base does not "opens java.lang" to unnamed module @42bb2aee
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if [[ "${vm_version}" -ge "17" ]] ; then
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
-	fi
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/logback-core/logback-core-1.4.1.ebuild b/dev-java/logback-core/logback-core-1.4.1.ebuild
index 7a73216f0f41..ab06f67e0f2f 100644
--- a/dev-java/logback-core/logback-core-1.4.1.ebuild
+++ b/dev-java/logback-core/logback-core-1.4.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${P
 
 LICENSE="EPL-1.0 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: ${PN}/pom.xml
diff --git a/dev-java/slf4j-api/Manifest b/dev-java/slf4j-api/Manifest
index 760d54107f63..f6ed26bd6d19 100644
--- a/dev-java/slf4j-api/Manifest
+++ b/dev-java/slf4j-api/Manifest
@@ -1,5 +1,3 @@
-DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0
 DIST slf4j-2.0.3.tar.gz 1435478 BLAKE2B fec1a47882d3bbf508f4faed9cbf9448a23e9749c6c41f241c7e80654e0ce55211cec9228fcf0e666c997a4f24c5b96ad57dc076910e7f05704b02d0cf7db709 SHA512 0fb295f7942c2af8aebe2ecf544ef8326b8cc88de397ee6b37a10249b38150a506f62dcec614eee13519a299b30c6d2481dec3ea235d4b3e6a5241d12639bca6
-EBUILD slf4j-api-1.7.36-r1.ebuild 1447 BLAKE2B c98a974f8b80dd9c1f202c3ccfc4be9186fdc67f62ff5410e28f4752e208875682ec25a5d9f7b81c3dcf0456b7833df2f17477173f0acb02ccdf817c4d305a73 SHA512 31546f48158c501ae3acb3a6fdad166d0e585ba2dfb493cb16a50e1060e062ab863570d1f9faab7b6dcfb3ff83f0789a70b79be378b4706e65eb31bba1468dd2
 EBUILD slf4j-api-2.0.3.ebuild 1143 BLAKE2B 9efb53125e882873ecc2b8dd6c02082ed43705b47ad436616416ae205ca93ed278e87de8c67aa8d922789cf2c2158859e02103a6a588d939d7a8aa37bd196402 SHA512 fa52b1b7337b7b8bb8afeb65a80dd6db3c78f9e565f4d1b455b3de5feffa26c9317ba4c5bca1f34c0254cbb22aac3a2caf974f1c1f6fb7e8b50cff41a4c553f1
 MISC metadata.xml 369 BLAKE2B 9192191ce858eb2aae3d3600cf8214bcff21f386895b1a554c688d2e0e5d2632daec9e853afee31383819df09915f29bd6a5458aa888672c77a2c683258d1b94 SHA512 80db3e0ebb417b64355f1d8c72de25dceda46fe80d5614e255b6e59c0d5751207e9ade961dbe1f065e3cf162ca402e67d2b8ce597e0a4253a7eedfc27d35ae00
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.36-r1.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.36-r1.ebuild
deleted file mode 100644
index cf71aac2aaed..000000000000
--- a/dev-java/slf4j-api/slf4j-api-1.7.36-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/qos-ch/slf4j/archive/v_1.7.36.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild slf4j-api-1.7.36.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.slf4j:slf4j-api:1.7.36"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The slf4j API"
-HOMEPAGE="https://www.slf4j.org"
-SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-BDEPEND="app-arch/zip"
-
-DOCS=( LICENSE.txt ../README.md )
-
-S="${WORKDIR}/slf4j-v_${PV}/${PN}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-JAVA_TEST_EXCLUDES=(
-	# java.lang.InstantiationException - not run by upstream anyway
-	"org.slf4j.helpers.MultithreadedInitializationTest"
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-
-	# remove org/slf4j/impl/ from the jar file
-	zip -d ${PN}.jar org/slf4j/impl/\* || die "Failed to remove impl files"
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index aec0e0308a26..47ff1dbd10ab 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index eab415fadedb..7e4561ba4b59 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -21,5 +21,5 @@ DIST erlang_doc_man_25.1.tar.gz 1714586 BLAKE2B b37b03f60d662d02018515de5ca16b38
 EBUILD erlang-24.3.4.2.ebuild 4783 BLAKE2B db44c0614d88101ffc13edb07ca6b2dd7c119b0ddb0c099b18ad37fd751596fbeb5f982712e8cd69e9a2cb000f5d3aded0197d4fab8d512ca4d4d9349a9de4e6 SHA512 e2cc06e3c2e11d874b135a4c2dcc2dcd84592d32964f22a68ce25dd45b7a36143e691c39e350227ce284b5964cb6f00b961c08f30916e540338e5f12801fb7bd
 EBUILD erlang-25.0.4-r1.ebuild 5017 BLAKE2B 0c78785a21f4e4e59a2718443f923b5a28bfa624bb4b1d041c7e02619e6f5f9fece80a211a5d3624de17c914732d60860bc87a4284631226b5342a266a465ab9 SHA512 926fa60cad6aa995bd316f60be1e3303793531cd3cd16328142be94ce1c2cd65ba30020febeec9d67a5f249355db122f31e6bc0a687c0a8a61193762b24a8bb1
 EBUILD erlang-25.1.1-r1.ebuild 4979 BLAKE2B 499d8465709c320d2dadb8d353853d3d5c1ce9c9626e500162a2716bbd742ad415e67b58441e95bf990e4eee572fccb833159d9e211cf830a7847b97aa0762cd SHA512 6ccadee9a1644526f67bdb2365ef9c2c17a3ff43260883276545a879e4fa291e21a21149db05e629eae2bcc9a003a109fa73d1c45727d522da577bc042ee5164
-EBUILD erlang-25.1.2-r1.ebuild 5096 BLAKE2B 966bb4887d7f7dc976052f0736b18453326d8b119c2ea45c5c0efc7d401826a02787fddb37c823c7b2f40b470b2150be142ccac72cc3c306693c5b60aae1d633 SHA512 7c798913c9bc6413cb4eb2d2adcaa9fe6023c1acdf65e7c62ac7fd9b334487c892730626573218fa2db8873df68f8888d6bcabf85a7821ff63ca86fb0ccb8de3
+EBUILD erlang-25.1.2-r1.ebuild 5094 BLAKE2B cf29f00b1e74bee34bdb3763adbb6c3f6da6065c912cbd05413f4c3148b24aedc7f697325a293ce66909894c5a6c3779de5e5bc7b75dc2d0248058b3d1c57f60 SHA512 e7c86f242b29a6757b4eaaeceabd61b37e181cc1bec4cd77546619b10cf682359f575f1051c470ffd9158c72f5960dedb0e30738e0492758e107ad7aa603cbf0
 MISC metadata.xml 749 BLAKE2B 32f06b2fa8579a65cdf259a76df093da6e8d5c27497f8167d8288947076a11960606ad23567bb4984d6b24270965dbd7563b8c9ae08f8f69a8968ac102f32a8e SHA512 4dc1b01adfab93b5ea99876cbd7a4a9a39e66f6417b7e84a9341dab91f3d63fa903b69e4d827a656a709d4308f32ee0bd4a9594b87b3d3d05543249c847ca3c0
diff --git a/dev-lang/erlang/erlang-25.1.2-r1.ebuild b/dev-lang/erlang/erlang-25.1.2-r1.ebuild
index 7c7535e10d28..3f91fc88f1df 100644
--- a/dev-lang/erlang/erlang-25.1.2-r1.ebuild
+++ b/dev-lang/erlang/erlang-25.1.2-r1.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 9b2ea1680ba3..5c31322f239a 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -15,17 +15,10 @@ AUX 3.1/001-socksocket-fix.patch 457 BLAKE2B cf3e15858481cdaa48be2cb3685bed663d9
 AUX 3.1/010-default-gem-location.patch 715 BLAKE2B 1a3b0a3479210f6bafe89bfea4580ebcf44bb5c42b72a244dee9fa53371c095d6c8ff39feb58296518779b5841647ed89732bed33c542ad24d5b93ba97097cd6 SHA512 e0d0ebfc6de8dfb81cee309f0d1b7a9ccf64617ea16ad6d8d3ea715b29fb7b3bb6d962072503eee7125ffc1e5ba53035453e887935e681de3d35df279d7c0dc8
 AUX 3.1/011-default-gem-location.patch 689 BLAKE2B 754bb18d8d028e763cc4e91e5a0a543beee807d0dd9d68e3bef52beafd2a28896372e20e5b9ee9fd6556323f7369f30a0c65d676e5de869bb81f978b6f7e655b SHA512 71e9ec7e0e6353cc4b973ed6dbe3c12c7784173705dc17a2e772f653aa592f2252749955f7957aa7526071eceb927711ef9055430ed3671025e35f57898ca754
 AUX 3.1/901-musl-stacksize.patch 945 BLAKE2B 7187ee4c73fb4a9ec00b32a02a176863d88437abae60c20955f28baf939aa76daee7d8accfa5b35c8ae857c25b243d57d719e7542a20439b1eb5952b319fa383 SHA512 5db3e96891498aee8f97f0c5ffe0633c6554b8d8a4975fd73f838ebac1ceea248d18aa4262c2b865b7ca15e9d293d482f7323565ed6ae47ed632cb8a044976e6
-DIST ruby-2.7.6.tar.xz 12084408 BLAKE2B 4b40e66aeeca3884983fffcf31c4713eb4fcdd62232e795dc5a0c03236c3c05200068902c0cb987455297bec2bcfc2a9a24f2841d18a480c7d09b86318daab3f SHA512 e86410b59d5917786fe43b00fd75dedd0e7f84611286b9274c542d2e562088fcee6bcc6c2596c30ccf793280d2bac6bfbb2619ef0513b3ca31f10f88684c7b1f
 DIST ruby-2.7.7.tar.xz 12101804 BLAKE2B 35f53835259217e344bde7fa3e2fe18e24c3e56eed2ca6dffb7385f38def401e6115944189138b280df5bbb0f5ff2e98f88260165f6e1802c60bd24cc6366397 SHA512 a19be3f0dfce040fe79f439e606f179d6750d2cc6e7b64fd65933edd487f5995573f7d0730beec9d3edadf942f8e9216f01ab3fff189d6cbe9d46a9add3e2683
-DIST ruby-3.0.4.tar.xz 15830368 BLAKE2B 3d1f2e6329269febbd02ac8a68aafd57d5ca858c816a81e754adfc9aa2990274d190672447244520fe9fbf9a1d337d17c845a97800f964e2046b2ef9eef733ee SHA512 53bf7dd403b0c68af9691882ad8ed7422c8d1f496627428fb4c3caf0b0313715524b744c5f453aced2d49e16e55f3f45b46b9a77aa3097dbfcae7caa0208194b
 DIST ruby-3.0.5.tar.xz 15880196 BLAKE2B 581aa202f6b1b5c72bb18d486c4f74ec87a6c2dd38166c4841b75dba891aabd72c3889b158134b04763cddb22c0f60015f4d21c5130077053e1fcb13e28a8024 SHA512 1c69d18210a2156f7696c678a8d54bf05c4dc49a1401c1ecc5760b1c23fb6ac14053873a225564664d6a327cda274ce72f47d112a6ad8d378f978de4e507e9a0
-DIST ruby-3.1.2.tar.xz 15101588 BLAKE2B 3f06d432f023d65c4808379140c18a922ad6c6443cf7f4b5ed3d44d2e0b7e19cbf0064b5214b46f3c5335f4e61ff473943fd565082ef0b645558b83e89dd0533 SHA512 4a74e9efc6ea4b3eff4fec7534eb1fff4794d021531defc2e9937e53c6668db8ecdc0fff2bc23d5e6602d0df344a2caa85b31c5414309541e3d5313ec82b6e21
 DIST ruby-3.1.3.tar.xz 15300224 BLAKE2B f3ef9031c2902bf5d624dce0a4584724e7a9099fb8b33b86a99026c37f4b91f23ff35c23a3cd7715bf739e6c539cc3612b5a750d00cbacf8e4ebcc70bbc85f41 SHA512 4b0fd334ae56132ba98b8a69adad54bdcf7f7aeabd5eba5b0f0399a3868e2054f9026ca1b1cb2dbb197a9e9b0610b263481949c0623a62071546bc5adff8ca69
-EBUILD ruby-2.7.6.ebuild 7913 BLAKE2B 8330eaa1563f2880730eee59532de22372aad9bc8c7ea94ee489869100875890316306ee5edc268acc105be2a54b2fdb0a456364290e69bd5b046acfbb189012 SHA512 224412dcc37ec8368907190e14ac3dfe16f5636b442d92f029b55a1cfdffa036828c279e8da9af61ccbd3c218e138068e35e3cc2d2614424c15395281a2cad9a
 EBUILD ruby-2.7.7.ebuild 7919 BLAKE2B 1e6c1c39b7213fac6b657a059b9648e46bb3535e142335aba846ee323a39d4c1ec55dbab65e418670fe6207f33b8e0f1db72ceac56468acc27664aafa092de34 SHA512 7050b5d05734f0b588877c33b1b531d8d50d060234f12c29d5a209ab8dbd440bfc223f038002aac30837dc2f76d8774e18b661dbef53efb3ee8b0b4dc8e8fcb5
-EBUILD ruby-3.0.4.ebuild 7768 BLAKE2B b20ea1f1c0cbc583a41587f7c32e83def9a50045cc6bf6607a0ef6f90b6712d0bc242abb5ad15a152b3b6b037d3038c38006e34b4b6d777959ec84250ccae6fa SHA512 9ae32072ad97f3fe39a98bcd6ec249a6d1be97e8104b8482dd3d56c53b945c154cac4b67012938fb9b87352e984c510cd48c9e0ed602577c90881b3fb845ec2f
 EBUILD ruby-3.0.5.ebuild 7774 BLAKE2B 7ccf3d999e50ee855c60969763c057dbe9354b090fe9928dddd322b6189f526b2e94504f9fd6b0f352f3dca039fd74fec3770f1777ce7f7ae9ec0e41e798907d SHA512 b10709b08711b5f3292813f60d0fca56fbf1d66e1893312e77812759ee056ec8fe5883d94d57b103947d518e0ec392e02bddb8370cf6508366f8293715a2ef62
-EBUILD ruby-3.1.2-r1.ebuild 7386 BLAKE2B a9d1ddefbfb87658518a66a49cbd69b3f17907c65997468489356510733f51a8e02b560303e0581dcfdecd6ccf0c2b4ac57c21b4b69505d151bc15c9f1d508ee SHA512 ada276970c6f78ccb8085f8c2b898bc38170b62efb32f3fa024b8852f60bd3f723c4d3c9c0b6cd1b6877486f91372a6880c38ee01aea2cf3bafdc0abe85d6553
-EBUILD ruby-3.1.2.ebuild 7716 BLAKE2B bbdc7631efe895a8eb09c8bd6d0e04fab70a98e372e8fb0118f5af69a7202df4235481312bfd335034642f18cea15af20cef230bed5ec0fb133801263828006f SHA512 bf97f0af405bfa386fb35b596663d2b75641d175902eaf2d93230561c4e2da1d6fc02c8bc9b9c12c963dbed2125de836eb9bb51b3107b69c28e792a4c6de610c
 EBUILD ruby-3.1.3.ebuild 7518 BLAKE2B b2ed93e5681dad89f143af813c75e515d96c0c698f21a6a19a7ed959d5eb165352f6d87dc7a76395f9bbd43f8d17995c4f3511a37b8afa397a7b67f051a66d6e SHA512 b45cd6530aebf890663d1481fb0354363de0e7ca8a04b575d14e643b40b68eaf4d47d9c372165860ec49382d3ea9b6b078567c92b29042d75c69679e35615c0d
 MISC metadata.xml 602 BLAKE2B a6e6786b21d135c4a952d48d7430a1ad545d1ae45687e83eae3164818a20b7322aac330a8b125247f1772411564a799451a3a94f5375986277dbaf824970992d SHA512 3af744c835dfeefe931af01c2b50e721ac2ba82f65ab06160aa4b63a5c2eb6543c0954902f9eee80e86cbcd727d496c2de9a9a8ebfd1cd0af9e995c6f6ab8cd8
diff --git a/dev-lang/ruby/ruby-2.7.6.ebuild b/dev-lang/ruby/ruby-2.7.6.ebuild
deleted file mode 100644
index 94b3749a7ecd..000000000000
--- a/dev-lang/ruby/ruby-2.7.6.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm:= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	systemtap? ( dev-util/systemtap )
-	tk? (
-		dev-lang/tcl:0=[threads]
-		dev-lang/tk:0=[threads]
-	)
-	dev-libs/libyaml
-	dev-libs/libffi:=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/libcrypt:=
-	>=app-eselect/eselect-ruby-20191222
-"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/minitest-5.13.0[ruby_targets_ruby27]
-	>=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby27]
-	>=dev-ruby/power_assert-1.1.7[ruby_targets_ruby27]
-	>=dev-ruby/rake-13.0.1[ruby_targets_ruby27]
-	>=dev-ruby/test-unit-3.3.4[ruby_targets_ruby27]
-	>=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby27]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby27]
-	>=dev-ruby/bundler-2.1.4[ruby_targets_ruby27]
-	>=dev-ruby/did_you_mean-1.3.1[ruby_targets_ruby27]
-	>=dev-ruby/json-2.0.2[ruby_targets_ruby27]
-	rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby27] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	eapply "${FILESDIR}"/2.7/{003,010}*.patch
-
-	if use elibc_musl ; then
-		eapply "${FILESDIR}"/2.7/{900,901}-musl-*.patch
-	fi
-
-	# Reset time on patched gem_prelude.rb to avoid the need for a base
-	# ruby during bootstrapping, bug 787137
-	touch -t 202001010000 gem_prelude.rb || die
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700.
-	rm -fr gems/* || die
-	# Don't install CLI tools since they will clash with the gem
-	rm -f bin/{racc,racc2y,y2racc} || die
-	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
-
-	einfo "Removing bundled libraries..."
-	rm -fr ext/fiddle/libffi-3.2.1 || die
-
-	if use prefix ; then
-		# Fix hardcoded SHELL var in mkmf library
-		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
-
-		if [[ ${CHOST} == *darwin* ]] ; then
-			# avoid symlink loop on Darwin (?!)
-			sed -i \
-				-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
-				configure.ac || die
-
-			# make ar/libtool hack for Darwin work
-			sed -i \
-				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
-				configure.ac || die
-
-			# disable using security framework (GCC barfs on those headers)
-			sed -i \
-				-e 's/MAC_OS_X_VERSION_MIN_REQUIRED/_DISABLED_/' \
-				random.c || die
-		fi
-	fi
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local modules= myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use tk ; then
-		modules="${modules},tk"
-	fi
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--with-readline-dir="${EPREFIX}"/usr \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_with jemalloc jemalloc) \
-		$(use_enable jit jit-support ) \
-		$(use_enable socks5 socks) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs install-static-library) \
-		$(use_with static-libs static-linked-ext) \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no
-
-	# Makefile is broken because it lacks -ldl
-	rm -rf ext/-test-/popen_deadlock || die
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
-}
-
-src_test() {
-	emake -j1 V=1 test
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	einfo "Removing default gems before installation"
-	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-
-	if [[ ${CHOST} == *darwin* ]] ; then
-		DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
-		export DYLD_LIBRARY_PATH
-	fi
-
-	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	# Create directory for the default gems
-	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
-	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
-
-	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
-
-	# Remove installed rubygems and rdoc copy
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
-	fi
-
-	if use examples; then
-		dodoc -r sample
-	fi
-
-	dodoc ChangeLog NEWS doc/NEWS* README*
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(23|24|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-3.0.4.ebuild b/dev-lang/ruby/ruby-3.0.4.ebuild
deleted file mode 100644
index d580d6d5147b..000000000000
--- a/dev-lang/ruby/ruby-3.0.4.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm:= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	systemtap? ( dev-util/systemtap )
-	tk? (
-		dev-lang/tcl:0=[threads]
-		dev-lang/tk:0=[threads]
-	)
-	dev-libs/libyaml
-	dev-libs/libffi:=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/libcrypt:=
-	>=app-eselect/eselect-ruby-20201225
-"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/minitest-5.14.2[ruby_targets_ruby30]
-	>=dev-ruby/power_assert-1.2.0[ruby_targets_ruby30]
-	>=dev-ruby/rake-13.0.3[ruby_targets_ruby30]
-	>=dev-ruby/rbs-1.0.0[ruby_targets_ruby30]
-	>=dev-ruby/rexml-3.2.4[ruby_targets_ruby30]
-	>=dev-ruby/rss-0.2.9[ruby_targets_ruby30]
-	>=dev-ruby/test-unit-3.3.7[ruby_targets_ruby30]
-	>=dev-ruby/typeprof-0.11.0[ruby_targets_ruby30]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby30]
-	>=dev-ruby/bundler-2.2.15[ruby_targets_ruby30]
-	>=dev-ruby/did_you_mean-1.5.0[ruby_targets_ruby30]
-	>=dev-ruby/json-2.5.1[ruby_targets_ruby30]
-	rdoc? ( >=dev-ruby/rdoc-6.3.0[ruby_targets_ruby30] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
-
-	if use elibc_musl ; then
-		eapply "${FILESDIR}"/3.0/900-musl-*.patch
-		eapply "${FILESDIR}"/3.0/901-musl-*.patch
-	fi
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700.
-	rm -fr gems/* || die
-	touch gems/bundled_gems || die
-	# Don't install CLI tools since they will clash with the gem
-	rm -f bin/{racc,racc2y,y2racc} || die
-	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
-
-	einfo "Removing bundled libraries..."
-	rm -fr ext/fiddle/libffi-3.2.1 || die
-
-	if use prefix ; then
-		# Fix hardcoded SHELL var in mkmf library
-		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
-
-		if [[ ${CHOST} == *darwin* ]] ; then
-			# avoid symlink loop on Darwin (?!)
-			sed -i \
-				-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
-				configure.ac || die
-
-			# make ar/libtool hack for Darwin work
-			sed -i \
-				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
-				configure.ac || die
-		fi
-	fi
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local modules= myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use tk ; then
-		modules="${modules},tk"
-	fi
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--with-readline-dir="${EPREFIX}"/usr \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_with jemalloc jemalloc) \
-		$(use_enable jit jit-support ) \
-		$(use_enable socks5 socks) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs install-static-library) \
-		$(use_with static-libs static-linked-ext) \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no
-
-	# Makefile is broken because it lacks -ldl
-	rm -rf ext/-test-/popen_deadlock || die
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
-}
-
-src_test() {
-	emake -j1 V=1 test
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	einfo "Removing default gems before installation"
-	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-
-	if [[ ${CHOST} == *darwin* ]] ; then
-		DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
-		export DYLD_LIBRARY_PATH
-	fi
-
-	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	# Create directory for the default gems
-	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
-	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
-
-	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
-
-	# Remove installed rubygems and rdoc copy
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
-	fi
-
-	if use examples; then
-		dodoc -r sample
-	fi
-
-	dodoc ChangeLog NEWS.md doc/NEWS* README*
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(23|24|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-3.1.2-r1.ebuild b/dev-lang/ruby/ruby-3.1.2-r1.ebuild
deleted file mode 100644
index 58c5cbb1c2bd..000000000000
--- a/dev-lang/ruby/ruby-3.1.2-r1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic
-
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc socks5 +ssl static-libs systemtap tk xemacs"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm:= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	systemtap? ( dev-util/systemtap )
-	tk? (
-		dev-lang/tcl:0=[threads]
-		dev-lang/tk:0=[threads]
-	)
-	dev-libs/libyaml
-	dev-libs/libffi:=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/libcrypt:=
-	>=app-eselect/eselect-ruby-20201225
-"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/minitest-5.15.0[ruby_targets_ruby31]
-	>=dev-ruby/power_assert-2.0.1[ruby_targets_ruby31]
-	>=dev-ruby/rake-13.0.6[ruby_targets_ruby31]
-	>=dev-ruby/rbs-2.1.0[ruby_targets_ruby31]
-	>=dev-ruby/rexml-3.2.5[ruby_targets_ruby31]
-	>=dev-ruby/rss-0.2.9[ruby_targets_ruby31]
-	>=dev-ruby/test-unit-3.5.3[ruby_targets_ruby31]
-	>=dev-ruby/typeprof-0.12.2[ruby_targets_ruby31]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby31]
-	>=dev-ruby/bundler-2.3.3[ruby_targets_ruby31]
-	>=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby31]
-	>=dev-ruby/json-2.6.1[ruby_targets_ruby31]
-	rdoc? ( >=dev-ruby/rdoc-6.3.3[ruby_targets_ruby31] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
-
-	if use elibc_musl ; then
-		eapply "${FILESDIR}"/3.1/901-musl-*.patch
-	fi
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700.
-	rm -fr gems/* || die
-	touch gems/bundled_gems || die
-	# Don't install CLI tools since they will clash with the gem
-	rm -f bin/{racc,racc2y,y2racc} || die
-	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
-
-	einfo "Removing bundled libraries..."
-	rm -fr ext/fiddle/libffi-3.2.1 || die
-
-	# Remove tests that are known to fail or require a network connection
-	rm -f test/ruby/test_process.rb test/rubygems/test_gem{,_path_support}.rb || die
-	rm -f test/rinda/test_rinda.rb test/socket/test_tcp.rb test/fiber/test_address_resolve.rb spec/ruby/library/socket/tcpsocket/{initialize,open}_spec.rb|| die
-
-	if use prefix ; then
-		# Fix hardcoded SHELL var in mkmf library
-		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
-
-		if [[ ${CHOST} == *darwin* ]] ; then
-			# avoid symlink loop on Darwin (?!)
-			sed -i \
-				-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
-				configure.ac || die
-
-			# make ar/libtool hack for Darwin work
-			sed -i \
-				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
-				configure.ac || die
-		fi
-	fi
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local modules="win32,win32ole" myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use tk ; then
-		modules="${modules},tk"
-	fi
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--with-readline-dir="${EPREFIX}"/usr \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_with jemalloc jemalloc) \
-		$(use_enable jit jit-support ) \
-		$(use_enable socks5 socks) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs install-static-library) \
-		$(use_with static-libs static-linked-ext) \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no
-
-	# Makefile is broken because it lacks -ldl
-	rm -rf ext/-test-/popen_deadlock || die
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
-}
-
-src_test() {
-	emake V=1 check
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	einfo "Removing default gems before installation"
-	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-
-	if [[ ${CHOST} == *darwin* ]] ; then
-		DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
-		export DYLD_LIBRARY_PATH
-	fi
-
-	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	# Create directory for the default gems
-	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
-	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
-
-	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
-
-	# Remove installed rubygems and rdoc copy
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
-	fi
-
-	if use examples; then
-		dodoc -r sample
-	fi
-
-	dodoc ChangeLog NEWS.md doc/NEWS* README*
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(23|24|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-3.1.2.ebuild b/dev-lang/ruby/ruby-3.1.2.ebuild
deleted file mode 100644
index df0d23d2bc16..000000000000
--- a/dev-lang/ruby/ruby-3.1.2.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic
-
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm:= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	systemtap? ( dev-util/systemtap )
-	tk? (
-		dev-lang/tcl:0=[threads]
-		dev-lang/tk:0=[threads]
-	)
-	dev-libs/libyaml
-	dev-libs/libffi:=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/libcrypt:=
-	>=app-eselect/eselect-ruby-20201225
-"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/minitest-5.15.0[ruby_targets_ruby31]
-	>=dev-ruby/power_assert-2.0.1[ruby_targets_ruby31]
-	>=dev-ruby/rake-13.0.6[ruby_targets_ruby31]
-	>=dev-ruby/rbs-2.1.0[ruby_targets_ruby31]
-	>=dev-ruby/rexml-3.2.5[ruby_targets_ruby31]
-	>=dev-ruby/rss-0.2.9[ruby_targets_ruby31]
-	>=dev-ruby/test-unit-3.5.3[ruby_targets_ruby31]
-	>=dev-ruby/typeprof-0.12.2[ruby_targets_ruby31]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby31]
-	>=dev-ruby/bundler-2.3.3[ruby_targets_ruby31]
-	>=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby31]
-	>=dev-ruby/json-2.6.1[ruby_targets_ruby31]
-	rdoc? ( >=dev-ruby/rdoc-6.3.3[ruby_targets_ruby31] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
-
-	if use elibc_musl ; then
-		eapply "${FILESDIR}"/3.1/901-musl-*.patch
-	fi
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700.
-	rm -fr gems/* || die
-	touch gems/bundled_gems || die
-	# Don't install CLI tools since they will clash with the gem
-	rm -f bin/{racc,racc2y,y2racc} || die
-	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
-
-	einfo "Removing bundled libraries..."
-	rm -fr ext/fiddle/libffi-3.2.1 || die
-
-	if use prefix ; then
-		# Fix hardcoded SHELL var in mkmf library
-		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
-
-		if [[ ${CHOST} == *darwin* ]] ; then
-			# avoid symlink loop on Darwin (?!)
-			sed -i \
-				-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
-				configure.ac || die
-
-			# make ar/libtool hack for Darwin work
-			sed -i \
-				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
-				configure.ac || die
-		fi
-	fi
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local modules= myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use tk ; then
-		modules="${modules},tk"
-	fi
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--with-readline-dir="${EPREFIX}"/usr \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_with jemalloc jemalloc) \
-		$(use_enable jit jit-support ) \
-		$(use_enable socks5 socks) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs install-static-library) \
-		$(use_with static-libs static-linked-ext) \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no
-
-	# Makefile is broken because it lacks -ldl
-	rm -rf ext/-test-/popen_deadlock || die
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
-}
-
-src_test() {
-	emake -j1 V=1 test
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	einfo "Removing default gems before installation"
-	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-
-	if [[ ${CHOST} == *darwin* ]] ; then
-		DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
-		export DYLD_LIBRARY_PATH
-	fi
-
-	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	# Create directory for the default gems
-	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
-	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
-
-	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
-
-	# Remove installed rubygems and rdoc copy
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
-	fi
-
-	if use examples; then
-		dodoc -r sample
-	fi
-
-	dodoc ChangeLog NEWS.md doc/NEWS* README*
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(23|24|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 00d835fa49cb..94d2d272971e 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -67,5 +67,5 @@ DIST rust-1.65.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 054f1b773518a9
 DIST rust-src-1.64.0.tar.xz 2437612 BLAKE2B 9bd5cb64c4ac98ffe60f15bf62517f3ba214ec788d939a27135bca4b770a7a760299ffa43090846e9a83c734a6b2d97102e51f9760f655cb596bda91214012a0 SHA512 a1867ea7a36f669fcde149578dceb8bc7503435d9c740594cd6181e0ea0e4be9d3c8b79f755c0f457bdbc3200149cd94eba17922d00610c5ff6be5fe1f8bd862
 DIST rust-src-1.65.0.tar.xz 2488012 BLAKE2B d48f5591e72e14084f2fb0d66c1365f1648060d514af23c0498e02adfd7223b1a79bd1f512859b058f9cabc4b88b9230d15960df7c30762a5263d1785b877a68 SHA512 247f822a9c2f16d1de29d1cf6fa7ff393b7c7fe01da66a7c0b4add6259d72403922b8b1bd1b511ed8a9cc0b2c12ff574945aa7fc76c731fba620b466bcdc2eac
 EBUILD rust-bin-1.64.0-r1.ebuild 6874 BLAKE2B 712d0b0046332418063598f64fc8bd0c024397e27d846e3c11aebdae6c4d29d7fc3da892b64d2d5fdc31f319b19fb380dfb5f96718cdd3cf7da6c4ee8add2fa6 SHA512 1418917f21689335fdd10249a4c7703b4271d89a103b2fd4762a28a98935944daf2e0f9da9456c8e16ab11c123d34d82cd3d0893393d2492f6e076b5ddf453ab
-EBUILD rust-bin-1.65.0.ebuild 6731 BLAKE2B 7b99f342ca789758847d407d1c90176d50260505bdcfc9b49b27b636e0765b375e48d9c8230fe919b095c84b1889ec6e4c68cb52f290a33c002242ffb7f196cf SHA512 263d90323d4feb1526eb32ec7b51e8d02d55b8f68db16bc286e99a6fab1fccf484c210ff96a23bc13a6b0709c07161918aec28cb733bedea0c5c37341c0ff736
+EBUILD rust-bin-1.65.0.ebuild 6730 BLAKE2B 0f0bf58c8401dbcc858d22585a57e96988e3ee5d9dab120b4e9f955c630aa61d12e15b9deba0f4edf62a1e6c4dc869980081fa21537b014fb9cc897c3881858b SHA512 ec04fa1da0481714bf7b9d43f175f456d01eae4d70f0d914f6911bb7b809c3c133df0b614243a0f1bb0c0c2fa8345b0b6d19e269b5017cbd36252c85fdb4a176
 MISC metadata.xml 696 BLAKE2B d6c2665e1859a18e6b1bf7c04a0de5adda80e34b759994e158a137219e314ed0e4890a8a7f680e1b7bfb940c04e3c0b49eb3518f2fc08dcc9e19cd5fb867d02e SHA512 b93c2ab79c454d8897948e810150cb2512ca606083a2aa2135425a69ac7b7077f64e3d86f8f8b13734640a05e668a870d70003d6dc9fd3d151ca7ffcf2fb3c44
diff --git a/dev-lang/rust-bin/rust-bin-1.65.0.ebuild b/dev-lang/rust-bin/rust-bin-1.65.0.ebuild
index 2622c2b69c23..a6d5802e3a9c 100644
--- a/dev-lang/rust-bin/rust-bin-1.65.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.65.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt"
 
 DEPEND=""
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 7206406ad68d..67e9e0e0b4db 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -71,5 +71,5 @@ DIST rustc-1.64.0-src.tar.xz.asc 801 BLAKE2B 69f7bd7600d99794859c6fad4b44f0e9886
 DIST rustc-1.65.0-src.tar.xz 139674928 BLAKE2B a218263fb67e306b153f5a6dae95b5ec653acaa5eb4b833862d6f0fd4685a8cec097dadc1b8a934e1bf6055672c7a617f9a0ad4a7dbf2e78084297f10b7ada04 SHA512 3d0369ed3028209c4ecb9b9e7b5f5e3a20be8cc05199675df4f091d62a96c0734bc1dbd7630928fe162792392ec6d0daf9ceed10771531ce022200c7b631e3be
 DIST rustc-1.65.0-src.tar.xz.asc 801 BLAKE2B 43ff92011cd6f7f34ce0495fa341379e5907d032ea90f91e533e5edaec6ad518aad50a9d8b2694074d6909ee96aa779403b16e95792e962e79c1b967542ae26f SHA512 75b9be53363022c81333117876cbcc573bbd4733edf767cbb164218644efb1a9c4bfc2aa73aaa1e39f248a84f1adacb1930a94a6e63f60093ff760fb9ae02efc
 EBUILD rust-1.64.0-r1.ebuild 23867 BLAKE2B b9d8aa35b84e668fb038fb813bfc6bc2bae4dce945e381cff0645a1fa9463a8cd30aa92e0018a407263929bd0da169191de136e634c9edacccd1ac0ffb69337b SHA512 4a174b1d34e6f7bfd860629d0bc06e99a7accf9eb7c7bf51f10db8b255237c63b3a5aee1291dd2ceb404676a67f5e507a7414ecc132c5926ee292cc047b0ced4
-EBUILD rust-1.65.0.ebuild 23814 BLAKE2B 85f3750587026d3447efc5c7c6aacfe083e24408b2c19b1ec665608aabee39b0d1787714fac3f720a2678c3bdcfb2879beeae0260618cb3551125edb3e3f1ac9 SHA512 f02ab726b02167a018f924ed46138036beb87d462508f6fa159050e7d0a78b91e65e7c42e832b298bd511dc1050453b888e05d93eec1fd88c24a77f4ab736bdd
+EBUILD rust-1.65.0.ebuild 23813 BLAKE2B ae34400b4569c40d5174f3b739bbfee5719e0c4b30136231b447e40d02918732af673b4bffaf6b92d020043715c6c4bef943d4f0a476863be52225bdbecbb59a SHA512 3253606e2624b94df77d10e8176f1b06a73d2f42677b21edd44dc11b4c4d7b46903c1638afa2c25c70b1da43b984abdd928f3760bb3641798e284db9fd7de1ae
 MISC metadata.xml 1770 BLAKE2B d5881dc5ea39a5bfff7c74fa883dc1a6370db572568e10fce81467c2f2a17018de48123dfa7993d6d9644305bfc5ef5b0f445ef40362065fce943efb4af2e761 SHA512 c914e1a0cee95fa5cb332240f3eb6fbee73e5d8baabfa6bdcdc3e852c9480fea0686e435b969e14f45d8c791655edc6e6a7df2259ac99b6a6e63af65b09fa57e
diff --git a/dev-lang/rust/rust-1.65.0.ebuild b/dev-lang/rust/rust-1.65.0.ebuild
index 2306e80be316..8f141a77a25f 100644
--- a/dev-lang/rust/rust-1.65.0.ebuild
+++ b/dev-lang/rust/rust-1.65.0.ebuild
@@ -19,7 +19,7 @@ else
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="amd64 arm arm64 ~mips ppc64 ~riscv sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~mips ppc64 ~riscv sparc x86"
 fi
 
 RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index c487eca7bd93..84fcc0f28156 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index 705dcf4a124a..8bf2018c7659 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -2,5 +2,5 @@ AUX libebml-1.4.2-header-fixes-for-gcc11.patch 599 BLAKE2B 850d5eca5b6126a791bbd
 DIST libebml-1.4.2.tar.xz 70484 BLAKE2B e27da59218c6c5655e2b57295b8f0ea8770f92eea4fe65331147a963f45fa8a06cc685af553b8234ca0162acea05b99b7463753044cc49bc815c752223e3b3fa SHA512 b9535b60ba2716053819d48e345f161ad797a74678fdf60797d652da9dfa7cab905669dac744f30a81083341462bac6f2a0e69fa7d80ee59cf7414bffbd667d5
 DIST libebml-1.4.4.tar.xz 64116 BLAKE2B 641cf6b63b4c8c4fab9e746bdf11d35024d5250f4a493d491ffc27441d9e453e58dfce028f865b8b4f200ccf58562d94b07b1593a4d53995ceb6fb2eb37bce1b SHA512 24f2bf51cd71f583bdd3bb33dbf20b5adeb8e96345de3abf3014f3ae1b0610c1bd04b802f26b4a1a26f884a696d6accf784bed1510f12538a6664cbd9ae51d6d
 EBUILD libebml-1.4.2.ebuild 696 BLAKE2B 34d323e315321cd96bfba608db8037b64eb5ee5f0c6723d2229aa6e4b6cd0f73c6995f8ca9625512835bc6bbe1b4fa88bcab08ae6cd9303150f3eebea9da42c1 SHA512 42df09d9f40bf3e1765de0fa32b755ca2366708e392afe893c52616ab2d26ad687e3da1250b5e956aeb3574d44cdcc0af18e9b0d879406d6040f13a58f549fb9
-EBUILD libebml-1.4.4.ebuild 513 BLAKE2B efc60b250df9a5193c327f4418c1a4c681da5534e987a22894a76c49d3fc5e63692fd5f8967f330fa663f30fb0245a2df921f2dfbad0f2bbc6dca7540ce06226 SHA512 48999482920a6befeccfd1ac9cc388727fcce693079e436f9e50e153618e4d8d67886bed1b0139f8c3fb912a9013673c1dcedecbf54c22d4af34425d4ecabb5c
+EBUILD libebml-1.4.4.ebuild 511 BLAKE2B cdd18129798a3cf35e3e8528841d6b081db010a29160246a7b08d4f5fbbbb58776681bb6eb77e74b9ca5f291f49e94ac5ff46cc90f42e116253266795bd059e5 SHA512 4ed5cd12239851089c1d7748ce6787a5891f825d8a2960dbcdedb1fca5ed6f7d7a3cc990a20a84b4664cd7ec494fb8428ee9771df00d113f77c9600986afcf79
 MISC metadata.xml 317 BLAKE2B 9cec3d87965cab02baa170724fc9f9b6742f4723985d1e8f3d75e97d990ce080f9daa334d5ca019a67d92c70e2b9d0cc8967f0e4817d8dc8f93bf0d03992237a SHA512 b05b64e9380e15165ddbe70592a4e9a0b50f8eefaafc7be6c16a34aa39b632aa7e6ea0a2beccb16c6638909e71f888daff7cce575f024c1dfed0805fc1646233
diff --git a/dev-libs/libebml/libebml-1.4.4.ebuild b/dev-libs/libebml/libebml-1.4.4.ebuild
index 92ac1b85bd78..d7126f8026e9 100644
--- a/dev-libs/libebml/libebml-1.4.4.ebuild
+++ b/dev-libs/libebml/libebml-1.4.4.ebuild
@@ -11,4 +11,4 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 431c67a9361c..79ab1593b4d1 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/comm/Manifest b/dev-python/comm/Manifest
index f30c2ba2f15b..67f9c4098db6 100644
--- a/dev-python/comm/Manifest
+++ b/dev-python/comm/Manifest
@@ -1,5 +1,5 @@
 DIST comm-0.1.0.tar.gz 5364 BLAKE2B 25715bce2ca51ef81de742ab04dd17120cab1f2f6d563ef566bbefda71daeafe5c2361a56944329d7549610c8c8fbe84100dc5e85f550eb93056d81eb7081f28 SHA512 075c1c1126d4de4321470de4e5cce5b6c9bcbe3f3cc1676f80a464bd559977816d92ce609b58884a195699e1f1713f535045f6070ecf2726e47ff61feedc66f0
 DIST comm-0.1.1.gh.tar.gz 5382 BLAKE2B 8749ae33ecead77c1e3e0130c7d68082ac465fb733ad0908cf42a91d5a1aeca90c987fc469bcf47b5a384e108bafadbe009368162507c8a751b9e16eb5bbc2b0 SHA512 31ce4a1f1f35a3e1790e5a9896fd3f453a952c5fb0de094286bb31b806138a6661b143c1beb076b6fb73328304768e52c0ae6015f040b0451540a2d850f9d448
 EBUILD comm-0.1.0.ebuild 568 BLAKE2B ce67afca071ce2bdc0280c5c915b2a0344b5129b2570d37f2b1d405f9bd5b25bd2afea3b8fc0de604348b5f9b6083e507b8b96dfff3d2ad355f7ab7bd4dfeb2a SHA512 796b9dabac4f7fd608ac9f6f533f1824931f3661c2b642ebe2f521ff0e0744ce83aeb636192c4e36af65bfc364cd770f5ce575b90362d40a3956dab372e0fd4a
-EBUILD comm-0.1.1.ebuild 634 BLAKE2B 09e1358dd910f6912041008466cd325fe11c67d68db7509fdc20296a3e1b839c77c6568f80ad3a34373a3ae36235ed15c0d6c5a54980c2a38a81ddb5b49c70dd SHA512 c0b3b02afd4cc6d1b73854f05084ff389f8d5670f5880126b526d88189c435a8cfccbba0792351249097a7d23e73a6a1b1f79cd969f59e8ef33da244b04e57b7
+EBUILD comm-0.1.1.ebuild 639 BLAKE2B e5b692e8d3b552d5a2bfb5e15a83eb39a566e2f068b3a72cd47c68d334472d3b9d2a8400d4e9108489f4d1740bd8dfb25953a80e9ef015345025f2af2d5d456c SHA512 6ec4da06df9bf3835b1fca015c577d464eeefd3c0acce8c94e63a569d7cd7d0882447a502d60f99314c06128a40ee643e3444a9a587f0102ae2e8cf97faedcc4
 MISC metadata.xml 384 BLAKE2B c122aaf6c2b9e6776b19efa2549030f0267c1d553f92862c5ecf21926f30a9c3cd7564434a573cca6fdbb85485eb49213b4d95100e8de2a29ced9c9c1fa81153 SHA512 b06853ad3cb1775ad70e44c48bca74bcf85c11715291974e7e3ee496344256fc57b91920812f19809e7cf14f6a7f7938531934d6a12740baec0dd984d5d48632
diff --git a/dev-python/comm/comm-0.1.1.ebuild b/dev-python/comm/comm-0.1.1.ebuild
index d6be1ccf71fd..c32824430eb8 100644
--- a/dev-python/comm/comm-0.1.1.ebuild
+++ b/dev-python/comm/comm-0.1.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>dev-python/traitlets-5.3[${PYTHON_USEDEP}]
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index f0280b531824..0051d5cbb474 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -11,5 +11,5 @@ EBUILD ipykernel-6.17.1.ebuild 2107 BLAKE2B 7be212425f9b84d7b5f04f5314411e54f674
 EBUILD ipykernel-6.18.0.ebuild 2137 BLAKE2B 686df5f65d91a5b6faf0bbc5fb66233361df010242bbedeba00da2edc2a2814f6fe3832b46e66b23b1fde1d00c2bd36b2db905c2d7292f9e210c163c1a904b4f SHA512 ec3ab8d9aca1a75e7b578747db127272071d93dda8cb31c5f224c99cbcf157844f6fcec07c5c9ac47b439827f9eb527d3b4c313d4ef5f85b71ebf6ea3919417f
 EBUILD ipykernel-6.18.1.ebuild 2058 BLAKE2B 5cfd9b1c38959c002c48360afef9f9f69c4b606034b5c056df7d62c69b96cd35f4913bc92baee1da48952f274b6778dd6235dca4db1b6d2cfaf5fc860b572df4 SHA512 7935fa4383db9cb7e364850caf30ef90abf4787e771b64cb49e6391c7b63dee99f663b71a79651743518c93c616b70d7cc63b0156c572f23cb88e8ffd86aa9b0
 EBUILD ipykernel-6.18.2.ebuild 2058 BLAKE2B 5cfd9b1c38959c002c48360afef9f9f69c4b606034b5c056df7d62c69b96cd35f4913bc92baee1da48952f274b6778dd6235dca4db1b6d2cfaf5fc860b572df4 SHA512 7935fa4383db9cb7e364850caf30ef90abf4787e771b64cb49e6391c7b63dee99f663b71a79651743518c93c616b70d7cc63b0156c572f23cb88e8ffd86aa9b0
-EBUILD ipykernel-6.18.3.ebuild 2058 BLAKE2B 5cfd9b1c38959c002c48360afef9f9f69c4b606034b5c056df7d62c69b96cd35f4913bc92baee1da48952f274b6778dd6235dca4db1b6d2cfaf5fc860b572df4 SHA512 7935fa4383db9cb7e364850caf30ef90abf4787e771b64cb49e6391c7b63dee99f663b71a79651743518c93c616b70d7cc63b0156c572f23cb88e8ffd86aa9b0
+EBUILD ipykernel-6.18.3.ebuild 2063 BLAKE2B ffd00018ae3c7f5693c203388b36c0b36d8eda858afc6021a45833c3f9d2e8f93c1415f912f0819030214c610816315213ef22f43f7bdb39f7b194704e5cc766 SHA512 e08310b622987335ded6e967f93de4ed181ff60ed818da62139c2e8a667be38a016d3964d015be164356342c5ee910ae3e373d0d530a584c40372e5425b84567
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.18.3.ebuild b/dev-python/ipykernel/ipykernel-6.18.3.ebuild
index 34e2bb08177b..3a97cb237cd0 100644
--- a/dev-python/ipykernel/ipykernel-6.18.3.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.18.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/comm[${PYTHON_USEDEP}]
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 135edb3296c5..6a2311b84571 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,23 +1,12 @@
 AUX numpy-1.22.0-no-hardcode-blasv2.patch 2710 BLAKE2B 71da07805e25acc58120da2b8d8692ec5893040eee3c2842620e2a9186062936082f34610d3056c44e44a921116f99158dfb7481c4eccc82d33b3b18a63b379e SHA512 87bcecee3435dedcd87128c81d0002a786b4b23928973216f32c8d12b797d6a9948c3e7b41142235abe35734683e6ef84c02ffe255ba492a0ad43626071dc5a9
-AUX numpy-1.22.4-py311.patch 1150 BLAKE2B b07b61133b70f59f350759d94fa45e9fe7ec6e9d795c9de5e374fc135dc2dc146a72b3b7f88c61ade00b511ae34ad304453d062c96a0278c153899229240788f SHA512 f55de836c2d9d379bb5ed7a87826143b1f54845d9eb0e215d416936096b2a0a6d4195857cd4dc2be1238c638059bff3e826d9b655acde7be859f00d93347382c
-DIST numpy-1.22.4.zip 11458830 BLAKE2B c999a42119e8d71942e4df4802ea22eef6c1ab65e11ad1f8364dd811c3df0eae1c7499055e76b523dc011bc9574f4060e17ecc3ea8bd35f5247fa17e3e188364 SHA512 bb2993459157c43f8c419de98be1c832f108b4eb6b96e1d20f406eccd782681ad8d0f8653637962ac592abe7d75719c17678ec97f035f6c87d4c7f939a1a8a48
-DIST numpy-1.23.3.tar.gz 10726039 BLAKE2B 4b6d38fc0363ea89f173a0cd65368b7c154b45f7f661098378f7ef31208008d5ff17ae58eab72bed921d166d630a4eca3441fc3097cd41a4a945b8f8180375cc SHA512 e690ea2906c91e567df2c801fbfe41652dabd37208faa99d6e068bda423dcc9f88be013478e9b6c1a339c36ef4c44b07a067d44e4e9c4b2e4f1344cbcb0598a9
 DIST numpy-1.23.4.tar.gz 10728765 BLAKE2B bbac44cc8a09a36537e25f90833c2ad7d1e4025e7d3eebd3c73ae2f12f1109520b58d2a779324f542aa1f2787f8b6c50ea907eb5ab7b7b84ebe3f3342c3d8a09 SHA512 727ca8950b0fbd5670e939b1c9c5cea852781ec4254d56a1659a91dc0430fc10b01ffdd16e1bb28a62319f91029e087024f4c6298bfc859a6050bfb507edcff8
 DIST numpy-1.23.5.tar.gz 10731755 BLAKE2B d2ed6d359a51343a1618f64604e4d5c030115caa63f2aadf2fc150775630e40fbebaad28f5657faae1365264fd45bc9efb00854bf9cd393b7628c96d6fc87db9 SHA512 8f3ece76dbe79bc887275332d25f851ade2087de3026de5fb7ed793590b3e7d274f590357296e152373b4e9a245d4d563393ba7198bca6d44631b941acb89c2c
-DIST numpy-html-1.22.4.zip 23724824 BLAKE2B 44ea3da0a703a024a629c8413dfffaf760458b185d19452da0e7e23c819e19833291e10ebd07bdda794077574b8852a368036dda8335c2753cd481740497502a SHA512 4077d9974bfd7f2c189025c3740350652e6f8e0b5727fbc9711a1c0118c1e4ecc281d4876baf1c6a5dc802d20178d6b04a2922f14e9c321cd3b68228b1e295c3
-DIST numpy-html-1.23.3.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
 DIST numpy-html-1.23.4.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
 DIST numpy-html-1.23.5.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
-DIST numpy-ref-1.22.4.pdf 7537013 BLAKE2B 702398fddde349901f9303f4788a3ae3cc4bb78b4d310e169fcc6193fd62b33947c89ede45ba9aaea55e74f6a6abc755d3d94428adce9a8163678c6718aec2da SHA512 c1617817f94ccdfe2bbdebdc9c6869beefa1369d5ab0897c1573d8fb5cb3de153f90d5588aae84a0f498fba57ad6bc5c0c5c2c3aefb119e2913e4ddf007cc8e1
-DIST numpy-ref-1.23.3.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
 DIST numpy-ref-1.23.4.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
 DIST numpy-ref-1.23.5.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
-DIST numpy-user-1.22.4.pdf 3978348 BLAKE2B 87cc73cb1c406446eb9d86ea6cbaeac6ba13c7d2b2ffd47524483af1698c3efdfaafe61e987624c5ce01939494861413b271e9a96f49abbbe69d634b9be55c95 SHA512 8e04c0c90255038471de6ef0f8f4ed9e356d646b028bb16f667f3c59170eddaa0d86d48226462c5c17b8123b2a28a09982764979e9e76658b4e26cd0a976f3a1
-DIST numpy-user-1.23.3.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
 DIST numpy-user-1.23.4.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
 DIST numpy-user-1.23.5.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
-EBUILD numpy-1.22.4.ebuild 5017 BLAKE2B f96fc50d46976f644412066a0ca32f3f6cbe68e3af54076bd9567a827d2929cc5789483c54656f51cee2f3153f28382a3901ad0a79ddaef84e552be2ebe8e961 SHA512 368980e6e319284d242669515c225766c56805f95d53ee259b0e88b394132a9d1b0fdaa58c0577c5e12a9282755ce39701f6a8d463792d7a5cc0dd3d3340c6c6
-EBUILD numpy-1.23.3.ebuild 4896 BLAKE2B cb89f6fd839ea412a25830cc3c94f5b3faa6fc7b2db52ef9d7e5852ccd1825774e1d9df8de918bb0113877bc4a3d8acf56de5c74073db54ef9a7914e550fa61e SHA512 634586d63cdd62f6286a54109b2ca1e699668e8698ca4e21ee9e6726b2f46f2b47304036d3c87177b415c5657a0385792aef0c6a53da81364b9ca6a25a5af520
-EBUILD numpy-1.23.4.ebuild 4897 BLAKE2B 3f362d6b9119dd346e05f629f164b9d7ff02803581a36ef4f5beedd98bff322b55f04a29d2492ceacff7b858966d56d1518b2d8a3bb64fd1de18e8560515f31e SHA512 e8e96b1cba1ecfc2c3aabaf656693d2993168fbc9d1933e5c168792218ef96bb2f0daadd7863a74319665dc3b873ba2dffbf205301b8aec33856c503c9e4bca2
+EBUILD numpy-1.23.4.ebuild 4896 BLAKE2B cb89f6fd839ea412a25830cc3c94f5b3faa6fc7b2db52ef9d7e5852ccd1825774e1d9df8de918bb0113877bc4a3d8acf56de5c74073db54ef9a7914e550fa61e SHA512 634586d63cdd62f6286a54109b2ca1e699668e8698ca4e21ee9e6726b2f46f2b47304036d3c87177b415c5657a0385792aef0c6a53da81364b9ca6a25a5af520
 EBUILD numpy-1.23.5.ebuild 4904 BLAKE2B dc24a0d2a22d985086a49bdaf0333cdae749fa6ea344252636eb0279dfb6a706cf9574cff1529b64918bc99b0bf0184f76fad4228aa25df22c34dae8ac328a73 SHA512 c4771518334b27985b86b1fc41d322e4523b8a35309052a07a506400b1355e48abe88667550dd69e8c0e6fb9d6481eb1c24cd6edd1aa08b603dc1bd433de087e
 MISC metadata.xml 932 BLAKE2B 7a4af31f613bab05ff542da48bf6ff1484d9df2459f559516e71329451dd739d3df0fead507c8033d94ab9ed516b68efe7f21819a8cd6ca303643d8c8bc34e86 SHA512 32cb8c1ab61521a02cbec38f6ea383f074e50d46aa3462ddcb85710f9d348e8e628cf2a5725e3cd921cc32f02885a1b5f02125639f0ec885384eeeff7f468a06
diff --git a/dev-python/numpy/files/numpy-1.22.4-py311.patch b/dev-python/numpy/files/numpy-1.22.4-py311.patch
deleted file mode 100644
index 7af6431a5892..000000000000
--- a/dev-python/numpy/files/numpy-1.22.4-py311.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 42f3203a45231b338cf1a4c77fe81ca4b7fef4ef Mon Sep 17 00:00:00 2001
-From: Bas van Beek <43369155+BvB93@users.noreply.github.com>
-Date: Fri, 20 May 2022 02:42:37 +0200
-Subject: [PATCH] TST,TYP: Fix a python 3.11 failure for the `GenericAlias`
- tests
-
----
- numpy/typing/tests/test_generic_alias.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/numpy/typing/tests/test_generic_alias.py b/numpy/typing/tests/test_generic_alias.py
-index 52d3deae4..267230a95 100644
---- a/numpy/typing/tests/test_generic_alias.py
-+++ b/numpy/typing/tests/test_generic_alias.py
-@@ -20,11 +20,11 @@
- if sys.version_info >= (3, 9):
-     DType_ref = types.GenericAlias(np.dtype, (ScalarType,))
-     NDArray_ref = types.GenericAlias(np.ndarray, (Any, DType_ref))
--    FuncType = Callable[[Union[_GenericAlias, types.GenericAlias]], Any]
-+    FuncType = Callable[["_GenericAlias | types.GenericAlias"], Any]
- else:
-     DType_ref = Any
-     NDArray_ref = Any
--    FuncType = Callable[[_GenericAlias], Any]
-+    FuncType = Callable[["_GenericAlias"], Any]
- 
- GETATTR_NAMES = sorted(set(dir(np.ndarray)) - _GenericAlias._ATTR_EXCEPTIONS)
- 
--- 
-2.35.1
-
diff --git a/dev-python/numpy/numpy-1.22.4.ebuild b/dev-python/numpy/numpy-1.22.4.ebuild
deleted file mode 100644
index 2be8c1d0c0d3..000000000000
--- a/dev-python/numpy/numpy-1.22.4.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs
-
-DOC_PV=${PV}
-# For when docs aren't ready yet, set to last version
-#DOC_PV=1.22.0
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://numpy.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
-	doc? (
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
-	)"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
-	lapack? ( virtual/pkgconfig )
-	test? (
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/numpy-1.22.0-no-hardcode-blasv2.patch
-	"${FILESDIR}"/numpy-1.22.4-py311.patch
-)
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-python_prepare_all() {
-	# Allow use with setuptools 60.x
-	# See numpy-1.22.1-revert-setuptools-upper-bound.patch for details
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# very disk- and memory-hungry
-		numpy/lib/tests/test_io.py::test_large_zip
-
-		# precision problems
-		numpy/core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
-
-		# runs the whole test suite recursively, that's just crazy
-		numpy/core/tests/test_mem_policy.py::test_new_policy
-
-		# very slow, unlikely to be practically useful
-		numpy/typing/tests/test_typing.py
-	)
-
-	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
-		# Degenerate case. arm32 chroot on arm64.
-		# bug #774108
-		EPYTEST_DESELECT+=(
-			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
-		)
-	fi
-
-	if use x86 ; then
-		EPYTEST_DESELECT+=(
-			# https://github.com/numpy/numpy/issues/18388
-			numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
-			# https://github.com/numpy/numpy/issues/18387
-			numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
-			# more precision problems
-			numpy/core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
-		)
-	fi
-	if use arm || use x86 ; then
-		EPYTEST_DESELECT+=(
-			# too large for 32-bit platforms
-			numpy/core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
-		)
-	fi
-
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# known problem
-		'numpy/typing/tests/test_generic_alias.py::TestGenericAlias::test_pass[__dir__-<lambda>]'
-	)
-
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TEST_DIR}/lib" || die
-	epytest -k "not _fuzz"
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.23.3.ebuild b/dev-python/numpy/numpy-1.23.3.ebuild
deleted file mode 100644
index 2026f4e14c27..000000000000
--- a/dev-python/numpy/numpy-1.23.3.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs
-
-DOC_PV=${PV}
-# For when docs aren't ready yet, set to last version
-#DOC_PV=1.23.0
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="
-	https://numpy.org/
-	https://github.com/numpy/numpy/
-	https://pypi.org/project/numpy/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
-	)
-"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
-	lapack? (
-		virtual/pkgconfig
-	)
-	doc? (
-		app-arch/unzip
-	)
-	test? (
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/numpy-1.22.0-no-hardcode-blasv2.patch
-)
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-python_prepare_all() {
-	# Allow use with setuptools 60.x
-	# See numpy-1.22.1-revert-setuptools-upper-bound.patch for details
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# very disk- and memory-hungry
-		numpy/lib/tests/test_io.py::test_large_zip
-
-		# precision problems
-		numpy/core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
-
-		# runs the whole test suite recursively, that's just crazy
-		numpy/core/tests/test_mem_policy.py::test_new_policy
-
-		# very slow, unlikely to be practically useful
-		numpy/typing/tests/test_typing.py
-	)
-
-	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
-		# Degenerate case. arm32 chroot on arm64.
-		# bug #774108
-		EPYTEST_DESELECT+=(
-			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
-		)
-	fi
-
-	if use x86 ; then
-		EPYTEST_DESELECT+=(
-			# https://github.com/numpy/numpy/issues/18388
-			numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
-			# https://github.com/numpy/numpy/issues/18387
-			numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
-			# more precision problems
-			numpy/core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
-		)
-	fi
-	if use arm || use x86 ; then
-		EPYTEST_DESELECT+=(
-			# too large for 32-bit platforms
-			numpy/core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
-		)
-	fi
-
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TEST_DIR}/lib" || die
-	epytest -k "not _fuzz"
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.23.4.ebuild b/dev-python/numpy/numpy-1.23.4.ebuild
index 5f85c52bd703..2026f4e14c27 100644
--- a/dev-python/numpy/numpy-1.23.4.ebuild
+++ b/dev-python/numpy/numpy-1.23.4.ebuild
@@ -29,7 +29,7 @@ SRC_URI="
 "
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index ab1690217c9d..7656797637f3 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,7 +1,5 @@
-DIST pandas-1.5.0.tar.gz 5191537 BLAKE2B c7dec1d0197e6ac860667177f0f255bb327dbd48fe4501280d578b93f4496e61c0847dc478effeb8c5729d7a9d3e8a643c01db095a9843d6d211a9420f94d42c SHA512 8d340da1e0dff9b64c8993359b35ddcfc796fa15fee1bf1a27ea5a12e33f8b20d45bfac0ff9275b16ff0d4f7855a73962629e06c62bc08ca5e21b4ef1ea29ec2
 DIST pandas-1.5.1.tar.gz 5199286 BLAKE2B 17d98870f3397d7a9289a18708021a614b1d456e2ea99dae8927727aabb8aab73bd31f25c3035947f8f4c38404e7d971bf999500b300307b19a2cf6029763d0e SHA512 e5f25f21f17f36c6488f14fbfa391beb9f1989652de01cb8346d2826dead9331fea27295ee1e6f42d0875f2f1a91fcd23d606edd339432589bca5ba8d89e5ecd
 DIST pandas-1.5.2.tar.gz 5201551 BLAKE2B c6a8156a6c116f1b576837882e4ad4ada6cf21bf72acd673d74bdb1dda4f97f88a5e6422e8f8ad2fbbb85a334cd68cb0abae316d5826c54a85baf8b325ab6183 SHA512 1e6b653ff418c839895946123f90fffcfafd57f24dfbd6bae4e9988893b7d57d6276ed101112c8f9730af53f600d006fe3a53bbed597c0376856f2cfc90c1f05
-EBUILD pandas-1.5.0-r1.ebuild 6746 BLAKE2B 68d0eb2a48bf831b3fdf9031af522aa1d6083f085156ea52130e420e241257b87b2fc444ffcdfb44f2e959c91118483fe1b7b5af8ccb9096c48a7d8e87c00ae4 SHA512 ed0e4cda6901c6a95ebc77f67178eb229bc73a89fbae30d86b9cb9682b35a1132890e6f3422604a2b14de548d4f7a5d1f9f4f9d01a3a1ff91cfd76b46c835ee4
-EBUILD pandas-1.5.1.ebuild 6845 BLAKE2B 201d356a0582989a93af1903cb6d8d0c8c773a96ded4eacc5bc8b8af0362269f9b2ed05ca6cb8ccd23dd31c3ecae5750768496490f6e2926f1ec7b07925541fe SHA512 9b4e8a9c73dc41c1d05f8d2800613c38715c73dcd436670e47e0746f7ca22c6e873d4ea0760d65eceb5080440cd77361f0545e764d555f8d6e73d28db267e2c1
+EBUILD pandas-1.5.1.ebuild 6844 BLAKE2B b0b347e79125283d136c1fd8792ce26a9bf08ea9a2fc8f4f6310ecab9fb1a75ef7fcda60bef12bf08150586b86e0ea49250a491b21bc81883a4ab5cbcf5d19a5 SHA512 b8f5f35ac4c1e36d565dbf90e729c2e088e2d214f9340cdc1a085b8af7d0850fe16f22b814eae6e0b0949c6c3f4ac86f0d37c8449caf869885158350d85800e6
 EBUILD pandas-1.5.2.ebuild 6850 BLAKE2B 3a609bc77c708551a04cdf6734c492c7aba0e83223fb59976d12d126be7ce2feab7f18e146afcf4a39bb510377aecc31902efab9ab3790483c986cb12989b553 SHA512 a18046189859268d43ac0f67dc43a57a07f072547e3f5c2f1d2b4b320e8763b19638b8d0ea76fd667b2c2169dd4938c09233cc2f0db77ec2431cf9f22a1e6eb2
 MISC metadata.xml 920 BLAKE2B d6bd854acdd851d578038657d91adaedf4f220dbdc5905ebba5e35e74437c6d5bc2384061f7796a6f359aa128c526485635debfd0e1a9646d09daed740167c87 SHA512 dcd949e89cae9df918acb3cf8be5ad8c396ee5e646d2179aa2b646fafa15ffc11e9ccf853df8d7fdcc787f88ce7063639d8d87715aaba943774edc8ad98b540a
diff --git a/dev-python/pandas/pandas-1.5.0-r1.ebuild b/dev-python/pandas/pandas-1.5.0-r1.ebuild
deleted file mode 100644
index e35c75b46bc2..000000000000
--- a/dev-python/pandas/pandas-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="threads(+)"
-
-VIRTUALX_REQUIRED="manual"
-
-inherit distutils-r1 multiprocessing optfeature virtualx
-
-DESCRIPTION="Powerful data structures for data analysis and statistics"
-HOMEPAGE="https://pandas.pydata.org/
-	https://github.com/pandas-dev/pandas/"
-SRC_URI="
-	https://github.com/pandas-dev/pandas/releases/download/v${PV}/${P}.tar.gz
-"
-S="${WORKDIR}/${P/_/}"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86"
-IUSE="doc full-support minimal test X"
-RESTRICT="!test? ( test )"
-
-RECOMMENDED_DEPEND="
-	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/numexpr-2.7.0[${PYTHON_USEDEP}]
-"
-
-# TODO: add pandas-gbq to the tree
-# TODO: Re-add dev-python/statsmodel[python3_11] dep once it supports python3_11
-# https://github.com/statsmodels/statsmodels/issues/8287
-OPTIONAL_DEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/blosc[${PYTHON_USEDEP}]
-	|| (
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	|| (
-		dev-python/openpyxl[${PYTHON_USEDEP}]
-		dev-python/xlsxwriter[${PYTHON_USEDEP}]
-	)
-	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/xarray-0.12.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/xlrd-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/xlwt-1.3.0[${PYTHON_USEDEP}]
-	!hppa? (
-		$(python_gen_cond_dep  \
-			'dev-python/statsmodels[${PYTHON_USEDEP}]' python3_{8..10} )
-		>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
-	)
-	X? (
-		|| (
-			dev-python/PyQt5[${PYTHON_USEDEP}]
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-COMMON_DEPEND="
-	>=dev-python/numpy-1.21.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.1-r3[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2020.1[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
-	doc? (
-		${VIRTUALX_DEPEND}
-		app-text/pandoc
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/nbsphinx[${PYTHON_USEDEP}]
-		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/xlrd[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		x11-misc/xclip
-	)
-	test? (
-		${VIRTUALX_DEPEND}
-		${RECOMMENDED_DEPEND}
-		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5.5.3[${PYTHON_USEDEP}]
-		dev-python/openpyxl[${PYTHON_USEDEP}]
-		dev-python/pymysql[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.31[${PYTHON_USEDEP}]
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
-		dev-python/xlsxwriter[${PYTHON_USEDEP}]
-		x11-misc/xclip
-		x11-misc/xsel
-	)
-"
-# dev-python/statsmodels invokes a circular dep
-#  hence rm from doc? ( ), again
-RDEPEND="
-	${COMMON_DEPEND}
-	!minimal? ( ${RECOMMENDED_DEPEND} )
-	full-support? ( ${OPTIONAL_DEPEND} )
-"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^              'sphinx.ext.intersphinx',/d" \
-		-i doc/source/conf.py || die
-
-	# requires package installed
-	sed -e '/extra_compile_args =/s:"-Werror"::' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile -j1
-}
-
-python_compile_all() {
-	# To build docs the need be located in $BUILD_DIR,
-	# else PYTHONPATH points to unusable modules.
-	if use doc; then
-		cd "${BUILD_DIR}"/lib || die
-		cp -ar "${S}"/doc . && cd doc || die
-		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# test for rounding errors, fails if we have better precision
-		# e.g. on amd64 with FMA or on arm64
-		# https://github.com/pandas-dev/pandas/issues/38921
-		pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
-
-		# TODO
-		pandas/tests/api/test_api.py::TestTesting::test_util_testing_deprecated
-		pandas/tests/api/test_api.py::TestTesting::test_util_testing_deprecated_direct
-		pandas/tests/io/test_clipboard.py::TestClipboard::test_raw_roundtrip
-
-		# TODO: xdist?
-		pandas/tests/test_expressions.py::TestExpressions::test_run_binary
-
-		# TODO: these require a running db server
-		pandas/tests/io/test_sql.py::TestMySQLAlchemy
-		pandas/tests/io/test_sql.py::TestMySQLAlchemyConn
-		pandas/tests/io/test_sql.py::TestPostgreSQLAlchemy
-		pandas/tests/io/test_sql.py::TestPostgreSQLAlchemyConn
-	)
-
-	local -x LC_ALL=C.UTF-8
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
-	epytest pandas --skip-slow --skip-network -m "not single" \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
-		einfo "An initial build of docs is absent of references to statsmodels"
-		einfo "due to circular dependency. To have them included, emerge"
-		einfo "statsmodels next and re-emerge pandas with USE doc"
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
-	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
-	optfeature "for msgpack compression using blosc" dev-python/blosc
-	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
-	optfeature "Plotting support" dev-python/matplotlib
-	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-3.0.0" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
-	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
-	optfeature "R I/O support" dev-python/rpy
-	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
-	optfeature "SQL database support" ">=dev-python/sqlalchemy-1.3.0"
-	optfeature "miscellaneous statistical functions" dev-python/scipy
-	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
-}
diff --git a/dev-python/pandas/pandas-1.5.1.ebuild b/dev-python/pandas/pandas-1.5.1.ebuild
index 6be58cf9033c..e59a6a296625 100644
--- a/dev-python/pandas/pandas-1.5.1.ebuild
+++ b/dev-python/pandas/pandas-1.5.1.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${P/_/}
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 6f5a273c5896..b4f93be10a1b 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/aws-partitions/Manifest b/dev-ruby/aws-partitions/Manifest
index da267f3a39c6..38bd6ff394f8 100644
--- a/dev-ruby/aws-partitions/Manifest
+++ b/dev-ruby/aws-partitions/Manifest
@@ -1,7 +1,3 @@
-DIST aws-partitions-1.297.0.gem 20992 BLAKE2B df538a03fc579ecb65dfcadc0fb5dbef93a896a3c21d1e6cdaab75572aebc354ffe0a41cb82d5bc34e1414d560105270ede590e9a79ead1ac43a78a225bec861 SHA512 90d3484cb6d06597b1122512185dc8b0f5964a1c0748855b89c3efbefd410432ab7e88e6698d9532db7bc3db51f9dbce1f236e6745c31bf1312c6e0a1cd1f76e
-DIST aws-partitions-1.298.0.gem 20992 BLAKE2B fb6776a6f5a9d75b32142129da38470cffd8383c77ea705567220902c90967926bea149b46624ace941e9dfd67e7dbb59202d1134b392c35acaab4f858d21f2c SHA512 fe42afbc96899637918938ecb84335efdbc8746ac46a173621f176df924b857cf95de9756f242ee61adba8048192626b47b6e49a51dfb5d1f2e98b20108278a7
 DIST aws-partitions-1.370.0.gem 22528 BLAKE2B 504b25a41da2b948b00c3ea4b7e94a553ad77a471849d7e8d2d9a714860e9efce06c788dd22e6600b6885939987a1ea481dd0ef9f0e6c6ba9fa342ae24f4d627 SHA512 49bec442cad737c4781f759b7babef3d45daa49866135b4fb15aed9e248e737e95a589c0b17b86a6fe4e042c039fcdef7f2088e1eaf6738801fb314c71e0cc56
-EBUILD aws-partitions-1.297.0.ebuild 483 BLAKE2B f943c5124445a47fa44cce13fb8e0cf50da463ddffa65a548bc8f4b95ab60aa707764bc0c09a9782c4a28e5e55e1cfaa5cc6846bb6a7b8d92d9ded6f4812b59d SHA512 ff59918cc181d923927769e600f312039fd1a3cf55efbd9221ea41d807f5c76cbd5fb899e6cafdcac199885fa0f1cbf4104559e9e3547fac95aa5164169f5fb1
-EBUILD aws-partitions-1.298.0.ebuild 483 BLAKE2B f943c5124445a47fa44cce13fb8e0cf50da463ddffa65a548bc8f4b95ab60aa707764bc0c09a9782c4a28e5e55e1cfaa5cc6846bb6a7b8d92d9ded6f4812b59d SHA512 ff59918cc181d923927769e600f312039fd1a3cf55efbd9221ea41d807f5c76cbd5fb899e6cafdcac199885fa0f1cbf4104559e9e3547fac95aa5164169f5fb1
-EBUILD aws-partitions-1.370.0.ebuild 483 BLAKE2B 9cf30442142636844a7d5036380802569ac255e18a5cac1fc4d6ba59172e45d472df851bed5de7c8ab0498dbbb94a717edeb8355a0134a0ac817f077d970e256 SHA512 637917df7f055f117b47000dd2be91f3350f5c17f821970b4c09f0eedd67ffbbfe53f7c9fdebf741b141879d0770a35025399dae5cc65f19ad97ca908a3b585b
+EBUILD aws-partitions-1.370.0.ebuild 476 BLAKE2B 8d963c7aca6bf96f07f821b4e572cb9f3e84db5405a9e062ab9e70f6d145de2a19d0fa8524f8b333334a1336459e6700b4b3f0c22684be4ff57b997d40cc4110 SHA512 4b9d59b32a85bf9e6bf04fe5a0d29e86c2a581dc67367a54e79691ce226cdea41db94e5e010794903a3b4ccf1713157e632ce2c154d37afec447c8814dffc2f2
 MISC metadata.xml 343 BLAKE2B 842db55bef3eb3ba8366da82693ca0edd09103a3d0fe2749029dab5641b054bd183a56d59f573841211c1c277f8902f1785228f96d6681255f019271a9d5c7ff SHA512 8b810531a103b842972d49ca0925ca25b53141527cf0a58ee11aa49e1993badc6b90db44403be433351e2444fcc9dcea6d7a15321e6b022b4e0a9c43d0b2a620
diff --git a/dev-ruby/aws-partitions/aws-partitions-1.297.0.ebuild b/dev-ruby/aws-partitions/aws-partitions-1.297.0.ebuild
deleted file mode 100644
index 864a129dbc72..000000000000
--- a/dev-ruby/aws-partitions/aws-partitions-1.297.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-# Not packaged and upstream not tagged.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="partitions.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides interfaces to enumerate AWS partitions, regions, and services"
-HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-ruby/aws-partitions/aws-partitions-1.298.0.ebuild b/dev-ruby/aws-partitions/aws-partitions-1.298.0.ebuild
deleted file mode 100644
index 864a129dbc72..000000000000
--- a/dev-ruby/aws-partitions/aws-partitions-1.298.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-# Not packaged and upstream not tagged.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="partitions.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides interfaces to enumerate AWS partitions, regions, and services"
-HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-ruby/aws-partitions/aws-partitions-1.370.0.ebuild b/dev-ruby/aws-partitions/aws-partitions-1.370.0.ebuild
index 73c0a30e60e7..6bc3494de56d 100644
--- a/dev-ruby/aws-partitions/aws-partitions-1.370.0.ebuild
+++ b/dev-ruby/aws-partitions/aws-partitions-1.370.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
 # Not packaged and upstream not tagged.
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/builder/Manifest b/dev-ruby/builder/Manifest
index 9f9075d83e31..3767c00f7cc9 100644
--- a/dev-ruby/builder/Manifest
+++ b/dev-ruby/builder/Manifest
@@ -1,4 +1,4 @@
 DIST builder-3.2.4.gem 32256 BLAKE2B a2768fe25023631d134f062d8e7ff2aa25f6b4db0358bdc0d4baebb33d93673fca66049b8b9c42382bad3494f6e03cefdedc72d71958dff63d43eb7a2a187c75 SHA512 730317ec0a4af33e183283e309e38d47deb08db0ab6bd6dfebdedcebb7470bd383c6c1d32ad674adc43298e0f86930b97c652fff9827ca8890db2d1d68e792f1
-EBUILD builder-3.2.4-r1.ebuild 1035 BLAKE2B 4f33ef5786d69ea41bbd5706ff7d414ea99a9ab7dfef97a6f007e3fc9b822662c3c937728346c61a6a2f7a7b0df8f79160f90b10620d3b48808b51c2515bf594 SHA512 ae6849a6cfd44fabe953229cfd03ec81d9d126e701f9ad21eb2e2b0dd0759759b0dcda47ebe40fea7ce77be41bf86bbe5edbb65622fc5b00956a5584ab62d729
+EBUILD builder-3.2.4-r1.ebuild 1027 BLAKE2B 4e649873899100211e5dbfe74ab295ff3db474b7a8f4ab0e845f4295a8266f0d0e125f163fc2458ee7342bb4d6f781223d15b6aa17076aaa16197595b5bc2e33 SHA512 463878451e08c4a67a1e1f42c2ee3166d58ae228e6b758e4cbd4827f46ea4f37136ac2db2dbca1e848d69e78c6eb53161e2a588e8c8a7b551b7df5d7baa94820
 EBUILD builder-3.2.4.ebuild 812 BLAKE2B c1b221b439cb2f34515406b14efc94f4a24fbe33a3898dada6a6af44cc9704110291ebb881d129fecc9dfcdb093c2dc54bcd981e9cb463f425ae4bc5c0f13dd2 SHA512 b809a6eabbdc68366694c98ec61e60d1920883d268a41f56467e56793a13dbc692b31e0c52f310668a1f8f07820ca415cc9ba329239588079ba7e662cb086e6f
 MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/builder/builder-3.2.4-r1.ebuild b/dev-ruby/builder/builder-3.2.4-r1.ebuild
index 9baea544e313..b57ed701eebc 100644
--- a/dev-ruby/builder/builder-3.2.4-r1.ebuild
+++ b/dev-ruby/builder/builder-3.2.4-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://onestepback.org/"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/classifier-reborn/Manifest b/dev-ruby/classifier-reborn/Manifest
index 6bf7a44fcd85..d71d6093dc99 100644
--- a/dev-ruby/classifier-reborn/Manifest
+++ b/dev-ruby/classifier-reborn/Manifest
@@ -1,5 +1,3 @@
-DIST classifier-reborn-2.2.0.tar.gz 319010 BLAKE2B f4bd3259b9d6e324f3f0feb06dfd1c8736eaa8ae0f687e488b6e11b9cda8e6bf9e56a175c01dfb9352184da1a030d1330e22917c7bfdcb4242fa0102f6291940 SHA512 d299ce8f3b96de5c6194e816d880ebb895faaacdc2a19985166bdc3d9760242ec41d85f22167ea66e9afd743f5d91d63881da02882d1a412fc95a0c5db63d04c
 DIST classifier-reborn-2.3.0.tar.gz 325647 BLAKE2B eb663b0e12440e508bbd882e4f72c790445916e5e19234d4d50d5f20a692f0a7bbd45348e898a9782798ccc82568ccc825bc1477f02885cf33f9a9aab90ab10b SHA512 428073f63ce93cc6284275f92063fa092e3cbd99817a2d6650bafc46ac91fba240ce5ccb09f428b10818c24b04de56dd88090ab0d1cffd644b381a88d9c92050
-EBUILD classifier-reborn-2.2.0.ebuild 1037 BLAKE2B c58d59a100eb9b5d94f92a7702a8fb66108818ed76b9ba3a0d867b2b6db03d999aa452d7d094d656910ade838cbed49f2001adc567ece206fb00256836deb297 SHA512 b0d3afcc4447980560faed70446360c40fb8c678d64e0eb11f9bcc102bd5130c3dc41b8e3a31cb21ac59e0cb9609fe5bdefd81e314e6e72e89281b90a2b2bb58
 EBUILD classifier-reborn-2.3.0.ebuild 1054 BLAKE2B 63a6febb5dbd3b81865883a00aa168139d4fdda09a62808850d2984f9694dfe68159eebddb0f3f1ef9b0d5a19dfd9e1fd6e949fd201d1beb3332e4d27d39d1e4 SHA512 daac8269c3987569a9450ca78003225c974518571b2382a0e26ce1282da835081d0ff9ccd8aad9e6469ca2f980b75220b9349980faf67ed722b82fdda85ec204
 MISC metadata.xml 351 BLAKE2B 48faea9b6a17e4edc671f8dc753fdb1968422e34c7c4613b9f7a732cc16fa0440b90c2a70e64a2145045bf175cca4b14955de0fd0af55b85273e64ccbdbf5466 SHA512 5de25b87f655d8e8e029a753e8fb27692b32b8050250b92ce8513637321524db56d6061dc0f7b8c94af2e567ce5f073fda3b5977ad00d416107dcc5e2e95e8c0
diff --git a/dev-ruby/classifier-reborn/classifier-reborn-2.2.0.ebuild b/dev-ruby/classifier-reborn/classifier-reborn-2.2.0.ebuild
deleted file mode 100644
index 0dab37a47b84..000000000000
--- a/dev-ruby/classifier-reborn/classifier-reborn-2.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Module to allow Bayesian and other types of classifications"
-HOMEPAGE="https://github.com/jekyll/classifier-reborn"
-SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="gsl test"
-
-ruby_add_rdepend ">=dev-ruby/fast-stemmer-1.0.0
-	!!dev-ruby/classifier
-	gsl? ( dev-ruby/rb-gsl )"
-ruby_add_bdepend "test? ( dev-ruby/redis )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	if use !gsl; then
-		sed -e 's/$GSL = true/$GSL = false/'\
-			-e 's/vector_serialize/vector/'\
-			-i lib/${PN}/lsi.rb || die
-	fi
-	# Comment out broken test
-	#sed -i -e "/assert 'Normal',/s/^/#/" test/bayes/bayesian_test.rb || die
-
-	sed -i -e '/reporters/I s:^:#:' -e '/pry/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 114ee3d8c44a..49b9988da840 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -2,5 +2,5 @@ AUX facter-3.14.23-gcc12.patch 302 BLAKE2B ebb0251449a861db1fe55f005d62df7d14c8a
 AUX facter-3.14.6-fix-static-libcpp-hocon.patch 488 BLAKE2B 73f28cf30f5dca16f2ea8bc3346ea95df5d6b3d925a6373153460699e9075017fb43640b714f025c5f8a2167e0742bfffc20dcf886b5e0f6bdabab181a07a7fb SHA512 72192b75ae6d084d0e47ec6a7f4d0817dafd0623269d16cebcb5615d8df0efc891176d0cf246f41dd0f2180d54b8cc94ee596295787fbdb3ca83d0cd41380e89
 AUX facter-3.14.8-explicit-rspec-2.patch 578 BLAKE2B 7bd6134235c61e03b2706388ad0c2c21e67582b00c5588b1d0596e3f783eb1df448a92c031862b03c0dffeefa10e0b69fdda4b44d88ac6e09a66f325900cf96f SHA512 a4c219b78b25c2a12e8578c092284fb4bd6d07b8b0d819d5625b1043d2b395413609e21266d3a7bceaf0461ad059e0edfea14a5e48bab85995eadf2d77bff17d
 DIST facter-3.14.24.tar.gz 410547 BLAKE2B 69d2fd3b1bf9f91456ca570f9fef44ddd6e7656a285c035ecb42df2553c461be137d06232fc1f96f239598143912928dcfaf0d9b3078f4335dfc83163eee5120 SHA512 88e47271f213570fb7819630f7b08076bd8b234612a2bb885de760acab48c37b588c1f214da11c5096f0db6b7df4a516b6e83abc56a1d95779b6f1353831e588
-EBUILD facter-3.14.24.ebuild 2150 BLAKE2B f6bb2cf6bd79409c58799eab64d04464786b4fe1fe904c114cc22e52cacfa48fb5399025c17cab9a848e6bc81566a6fbb9d493a91c034089fd6fe9842d8ea9ac SHA512 8780d010a5ea09ec30c11d622e28ab2899ed94134794a6bd63cb32eb7d3c4827a15cfa7af8d9ff747ccb761ed4bf1b4fd6e243e3ce53840cd866d703eaec9236
+EBUILD facter-3.14.24.ebuild 2136 BLAKE2B 36bab1deadfda1f3ad2f25116e2f345f1c0e39bd25339063307d18f2b7ba285930f267bc44573de8bb6ed23db5919d743cd08d8576d13150d84d17aff0e3f524 SHA512 b73aa7de328d6526fadba4002130d53b4157b2f8030b4481cd971cdb4620fbd8931605ec85d02166c4a6d7723e9e224ffdf6afb563fe8334a4cf79a0e45b4f34
 MISC metadata.xml 540 BLAKE2B 584d6db1a27bfa9383048929df3d6da07040cf507acc2aa58de7a4e9ba665079cac60b48b398bbb0510914acc03be1fd3468e5678e690f8d6fd03060e659dd4a SHA512 c1311ca348655bf9566889ec9edcd012a2d003f0b1122749caa9066cea2005d3fed7b7a0d1bca75281396e8e43cb6a2f611550572523dc011113424d642c2a2f
diff --git a/dev-ruby/facter/facter-3.14.24.ebuild b/dev-ruby/facter/facter-3.14.24.ebuild
index 86f809405ae9..f96cf08d6439 100644
--- a/dev-ruby/facter/facter-3.14.24.ebuild
+++ b/dev-ruby/facter/facter-3.14.24.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
 # git-r3 goes after ruby-ng so that it overrides src_unpack properly
 inherit cmake ruby-ng
@@ -25,7 +25,7 @@ fi
 
 RESTRICT="!test? ( test )"
 
-ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:3 dev-ruby/mocha:0.14 )"
 
 RDEPEND="
 	>=dev-cpp/cpp-hocon-0.2.1:=
diff --git a/dev-ruby/pg/Manifest b/dev-ruby/pg/Manifest
index 795d52f6feef..086ade3da6e7 100644
--- a/dev-ruby/pg/Manifest
+++ b/dev-ruby/pg/Manifest
@@ -4,6 +4,6 @@ DIST pg-1.3.5.tar.gz 256197 BLAKE2B 8a8cd0135eb7dcf8389d2b0afa174059d12f542b1e28
 DIST pg-1.4.1.tar.gz 258388 BLAKE2B d2f2c81b51fb159a95990382cce316938b97d8ecb1c9590c4a70be741f4806bc47dc99423c1d54e939bc156e287cc7cba28d854dc68900501c10fbaf15cb3076 SHA512 e8e0ad7b6df4a98d8ac6dfa8006044f7fbfc45713e1aa866e80a83061be5a6a1a57456cc2ffc14d976c2d108ce526c6fa9d4ce59222a9d9bb3ef676e9dec8da9
 EBUILD pg-1.2.2.ebuild 1599 BLAKE2B 149a940668b995cb54316a3f8ff3c7bc277c9bdeacb25d85e211033042ae2b967ab59595a656f984c9034699797e4756f30a7081299295bd9551c0c02954bda5 SHA512 d6b1b1a9fff2fc2a9fb310781daaebb52410610f4f6ab1bf94fa114af1e0bca225f9cdecc420eb2b15cea7072fb9cd29475e1fabb20189e1f00d3afc233698ae
 EBUILD pg-1.2.3.ebuild 1430 BLAKE2B 7d9314ac6ad276aa24f70ce351cf440d1e22df8f18dbed98e1ef6bf0bf948985bcd7d7619ba2415c0b019a572339210bcecb66329e735bce87c3999c5b006b7b SHA512 b1ff29049c4ac2ce90d38fa6461157b0a9218776fa5ecadad3a0f8419a2850f89f322b81a5ca7348ccf88efd1ad35612a16f8ba447f59a2b5b95ff5d553ef990
-EBUILD pg-1.3.5.ebuild 1934 BLAKE2B 8df64746d37e1731882e1bc0165f1e82753f9e0c92d181c67d046903580e5aac1072379d8182c1994a81065fc037b5bc53b080870da2acb5aab8d7dbde53c687 SHA512 9234a1fc1197cbf705c7733823385fd230762d8f0f17e054d16bc6987b5b8ce8a6ff869ffc0b722efaa06b6ccd258f58d2a1c05a26362a0949bc736a3188c53e
+EBUILD pg-1.3.5.ebuild 1931 BLAKE2B a4ab0ebd575dc751097f3ecb4c3a2dfd922d9d15b59a41dceb2f03fa53c80afbfbe68df2b86046e4b1098e0664018aaccb3a2069b5cb3bc72bdd0e980339cdd2 SHA512 959914d49f84b0515fdf36fc27e2e57a385160bd0a8597790b86eecd3ece02d0e88a1320f31a2adf5584e4169ddf59a3e01f9fe18394ccc086467c1e7a3e2f08
 EBUILD pg-1.4.1.ebuild 1934 BLAKE2B 8df64746d37e1731882e1bc0165f1e82753f9e0c92d181c67d046903580e5aac1072379d8182c1994a81065fc037b5bc53b080870da2acb5aab8d7dbde53c687 SHA512 9234a1fc1197cbf705c7733823385fd230762d8f0f17e054d16bc6987b5b8ce8a6ff869ffc0b722efaa06b6ccd258f58d2a1c05a26362a0949bc736a3188c53e
 MISC metadata.xml 338 BLAKE2B b827b967fa6a0795016f741de3ad7738103580b06bb6d1f56957fbbcde06a63eeacc6b9aa2bbd726bad77c91b28659a3318e6ec43d141cd1cd05982b209c2f1d SHA512 8f1ea2d36aaa43547b48d39df2f403bbbf63b5bd57570bddf8515f84bea573793f1ecacc807d02f05d96a919c8778465f4c87822bd1807ebeca115f6dec81e99
diff --git a/dev-ruby/pg/pg-1.3.5.ebuild b/dev-ruby/pg/pg-1.3.5.ebuild
index 1b3c4b0ee647..ff01b33f5a69 100644
--- a/dev-ruby/pg/pg-1.3.5.ebuild
+++ b/dev-ruby/pg/pg-1.3.5.ebuild
@@ -20,7 +20,7 @@ RUBY_S="ruby-${P}"
 
 LICENSE="|| ( BSD-2 Ruby-BSD )"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND+=" dev-db/postgresql:*"
diff --git a/dev-ruby/racc/Manifest b/dev-ruby/racc/Manifest
index 60ff3ee1f3c4..388e99a7436b 100644
--- a/dev-ruby/racc/Manifest
+++ b/dev-ruby/racc/Manifest
@@ -3,5 +3,5 @@ DIST racc-1.5.2.tar.gz 434903 BLAKE2B cfbaa09c1b2e233e82228075cf979c54688e51e702
 DIST racc-1.6.0.tar.gz 470565 BLAKE2B 482b17723630dfb1d6e010c3eeb7da5a9f7b97f544d1a5020195134cd5446d28eff9a75b6c392a75970ddf024f560d2c7135abc4a2de76b581aa835c0901b524 SHA512 c19b7444bfafa0dfe3448600d10a1a09319702c37632e19569aeb947e7c035cc4067da040d45ede0dab35eaa197a55eac394715aae520fba41ed6e0c01c95e3d
 EBUILD racc-1.4.16-r1.ebuild 1921 BLAKE2B d94500a6f0676626661bddf4c4057ee0f2b3bccb0f2673b04ec6fa1891242cab213feca9e547e4d1bbcfdf9a4ca961a4bc06aef0d3d7245395e4abeb6acad1cf SHA512 c29be6f4315ad7d761984b2284a06eb767edbc0353d30c1720847da9966ea84d15f87d8304d8fc04013378b455804fcdaf28f730e89569e1e67bfac1db588e30
 EBUILD racc-1.5.2-r2.ebuild 1742 BLAKE2B 730934ec0ca983208511289ec94ecadb4e556d535660b88f2b2f305aa5ce8a7816e05b034e9985e86c2e1d7f330672e8f425924c783334398b223448610405ac SHA512 27b87aa5228cbe86c314bc8ee1e187e8b3aa296205c1a7f540d1ae9819a61b22e637451a164297d4da5e4539a74205760aeb3087dc45d26cd075d6101a692ab9
-EBUILD racc-1.6.0.ebuild 1539 BLAKE2B b3e6d617fa914b774f70fe7e3afff60fb411072ea488f8ed05348829e336939d21d4c04f0ccab151e9b347cf7a3a8b4ca97ff68b7fba431335596c00eb84b578 SHA512 c9913e17a71d9439d65221d986165a2b0a5277033fd8f11b90002d193f8fd8a84f57feb64e5d539796c274b352b81082810666d1d6330d44cb93a198e52d074e
+EBUILD racc-1.6.0.ebuild 1536 BLAKE2B 301885538fdf0f4c1abaf76ed2272aa7d77e3c02375ccb455dc044288514612a71cab60e3de7c172d6a5fa1c7aad170cc830377d1baa9afd0fce1ac7b303da59 SHA512 e29a6ad1ebdb91f0ab83af0fd096f3f8c572cd7579f5366a9bfd925f65a84bc0d54cd89ef7d4aec51cabc8a0afcf02342b85b43392a3ae1239b2e2dcffcda579
 MISC metadata.xml 332 BLAKE2B a8a4b14418894206acc7f1e27c92162ef02d0554395b9e5b2727b231f435b2c31fa0ad7aa746a8e095eebeb3b0a53352709880609fd4e3427ba90c6528df9343 SHA512 88ab246151ead3016e6c9480043db93b9ecfe6c282ea0663e4882185af124e3c531b8186a96e105cc90867ac05c0cffcfcf043e0f67303bbca4f8c7cd0c56043
diff --git a/dev-ruby/racc/racc-1.6.0.ebuild b/dev-ruby/racc/racc-1.6.0.ebuild
index c25911a96cbb..1c4cd0fe8eb2 100644
--- a/dev-ruby/racc/racc-1.6.0.ebuild
+++ b/dev-ruby/racc/racc-1.6.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/tenderlove/racc/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index 73a24a9bf067..9b2b930c7d63 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -6,5 +6,5 @@ DIST rmagick-5.1.0.tar.gz 1991405 BLAKE2B 79b0a5551ec51edac9c023edd9b7962f033884
 EBUILD rmagick-4.2.5.ebuild 2423 BLAKE2B c58a2d4ffab47b33971abc39effebae23b38cc1643e6cb203ff35df285b69a056bbef822a022adf9ea4524e086af4076d58a73d365164cf066d77a9b42f8a7ac SHA512 3d7c15cd33ca7ff539269078b65b98f82eb5c46791b1ce58e19d487cf14c370ad7c23b83620e48845b5fcd8932a88ee4f6e3e42e4e9ee0d7d620991a836ec982
 EBUILD rmagick-4.3.0.ebuild 2370 BLAKE2B 5a35f5ea39504c8ad47d39a8591b968c21c6080495d4e73a143f510e71d344693f414da33c912b73ac4cd98483556b94282aaea768715922f9fc17b9210173be SHA512 5b5153af8a980ffbf548ae1c1260f28415c552cf713c1afc30815c0f4edc4745b999c26d56058a8eae78c8568a2aefeda0be275c422594426b2bfca515db88b3
 EBUILD rmagick-5.0.0.ebuild 2057 BLAKE2B dcede88d504ebb65dc6af9f411ac58b00858deaa41fbe6bcc5637f1bf2371c9b86118e70eef40d3dbf3ecc48a79d43ab34fde306139feb693d58f92c123699dc SHA512 f440e6b756a3c2e83c56d9aee0a508bf38676e17c5a7af56b8a9747be5cda8db4da2609552e5385317e1bff98855667247822be077ba64f7e69f727cddba2fc2
-EBUILD rmagick-5.1.0.ebuild 2057 BLAKE2B dcede88d504ebb65dc6af9f411ac58b00858deaa41fbe6bcc5637f1bf2371c9b86118e70eef40d3dbf3ecc48a79d43ab34fde306139feb693d58f92c123699dc SHA512 f440e6b756a3c2e83c56d9aee0a508bf38676e17c5a7af56b8a9747be5cda8db4da2609552e5385317e1bff98855667247822be077ba64f7e69f727cddba2fc2
+EBUILD rmagick-5.1.0.ebuild 2097 BLAKE2B b365e556dd3ce4d9b75d18496e4d189ea1a67c8c4da4163737b643fdd39ba75c2d6e10e7c6ec9df14bd25c21a670d3f4323212d4c28d549774569fc539ca6720 SHA512 b26b84c4d0510cfc39a4199251b9912a61bfad62f89fcad74e2755a6fca07c13844aebad6529abf816301051a30689f6f6b193d1ca1b40cd26d061da74c90e98
 MISC metadata.xml 342 BLAKE2B cb38f3f9a158134520f82cef13b3322af5ebbe3b638bf695077e17406d754643ced9878aa304424057f0fd63da296efb787b40f5249d02e0d5993e2815256c00 SHA512 014d14485664346a449dff7c9a0c01bd1f6c549a6842da456bcb10c4f0b38111ccb025a8507f222e756cd4d136de6a217689e0ac807cf7fd0e3f806a6069fd28
diff --git a/dev-ruby/rmagick/rmagick-5.1.0.ebuild b/dev-ruby/rmagick/rmagick-5.1.0.ebuild
index 8078c21eb70d..26adb72d7ad0 100644
--- a/dev-ruby/rmagick/rmagick-5.1.0.ebuild
+++ b/dev-ruby/rmagick/rmagick-5.1.0.ebuild
@@ -31,6 +31,8 @@ IUSE="doc"
 RDEPEND+=" >=media-gfx/imagemagick-6.9.0:="
 DEPEND+=" >=media-gfx/imagemagick-6.9.0 test? ( >=media-gfx/imagemagick-7.1.0:=[jpeg,lqr,lcms,postscript,tiff,webp] )"
 
+ruby_add_bdepend "dev-ruby/pkg-config"
+
 all_ruby_prepare() {
 	# Avoid unused dependency on rake-compiler. This also avoids an
 	# extra compile during tests.
diff --git a/dev-ruby/ruby-odbc/Manifest b/dev-ruby/ruby-odbc/Manifest
index 19256af02830..509e6aeddb3d 100644
--- a/dev-ruby/ruby-odbc/Manifest
+++ b/dev-ruby/ruby-odbc/Manifest
@@ -1,5 +1,5 @@
 DIST ruby-odbc-0.99999.tar.gz 76934 BLAKE2B 59de5a544b7eefe8e181f2c6a9a61915361743ef5f7554f778667b50ca0dc57fd0c4f71e406ad6f1d00fb2c6a6509030e61ad34dddecff61896f7bfe383d0a9b SHA512 05e3e67a895406e1a57fbea6f8ecd1c087d836794ea3245bd9eec888eb3c46fa2bf2607cc1b8fdc416d7bc531d783d621c03c9fde004db8c2e431fe838c531af
 DIST ruby-odbc-0.999991.tar.gz 77110 BLAKE2B dd32698811f14e05f1190ffd73b390fa02924a1dd936db0b2b3c6ac9d8d8663f5d400ff89e03591081b45d558378a76701cf6b8be8502297a141c271dde3c24b SHA512 3f1e2e75e31f10f47392cda1cd28aa54451a499c3bd6e9224466a7b338406835a5d453600e79a3bac040197397c31d9f744567969058969685d6f4e06e72addb
 EBUILD ruby-odbc-0.99999.ebuild 1446 BLAKE2B 5eca14e58c5c7d3bad13a9371afad1e1ffaeca41a4e62adebbd98bf841cfb6536b9d76a777057f9e71fb6bae57784530d69bfb61d68311239657b9fd205b06f8 SHA512 783f78718da091cb7b3c3d31b5e709c86b662409fd72c4a198636422b14dfb61ad02d4965bfa28e4f11442f5ded373d02701c66de77a4185c67c47c6c869d90a
-EBUILD ruby-odbc-0.999991-r1.ebuild 1176 BLAKE2B 0b44fe4a39b6286d3442a13d5b50f99356c7933013eab019f4e6405b0442d8437a8b22b547b0216fe889aa43c954d88e8ebe3da1e3cfc8af5531e31a9188fb67 SHA512 b352a7d7b629a199971cf188b3d0371e000175f4728d05241a6cc314b81099fa1ba7bf4f5916d49c99628a4a897c0a023bd3abb9c359e4359272a4b1121eae37
+EBUILD ruby-odbc-0.999991-r1.ebuild 1175 BLAKE2B 26b2e7ef3e3deb53530cacbac5b91946e85b9a58b616f59d51e299e8950815c7d00ef6f56ffb13e859163f608dc6f43f30525d58980a5b91f6313647008bad0b SHA512 e0b67616197905966ac0a9c526277c545c7fb5470b47010f8a67bd52d8b38213d52e3db1512fe96f01cfc0fc3c159ba96fa60079b89542cd6775df93e703f2c7
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/ruby-odbc/ruby-odbc-0.999991-r1.ebuild b/dev-ruby/ruby-odbc/ruby-odbc-0.999991-r1.ebuild
index d73895f25dc8..70e2874b78f5 100644
--- a/dev-ruby/ruby-odbc/ruby-odbc-0.999991-r1.ebuild
+++ b/dev-ruby/ruby-odbc/ruby-odbc-0.999991-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="http://www.ch-werner.de/rubyodbc/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 Ruby-BSD )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="${DEPEND} >=dev-db/unixODBC-2.0.6"
diff --git a/dev-ruby/semantic_puppet/Manifest b/dev-ruby/semantic_puppet/Manifest
index 870edce9159a..4db6a3979bf2 100644
--- a/dev-ruby/semantic_puppet/Manifest
+++ b/dev-ruby/semantic_puppet/Manifest
@@ -1,5 +1,5 @@
 DIST semantic_puppet-1.0.2.gem 31744 BLAKE2B fd80225f799f55fe668c712cec20ad57163c3829ce70f49a30e7b73037883ea1960be0ea8f510e147c30254b7527e64f323fd7f9edb30f934762088ed997a241 SHA512 b059d8c7b13ae96dfe012318e7c6ee483cc09986d5d065c8422167a27a14d8e99433229c90388a7ff9ee425a0f5b6a6a6d5bc55f8b81901490afd8039ea86480
 DIST semantic_puppet-1.0.4.gem 32256 BLAKE2B 4704a6d913388d10cf32442511d66d742bcdba792d81d67de960209dbffc8ade970431e794934152b71031de83a75d9e09bda830e6e66838b68913d2bbb9da0a SHA512 8b830626e973bc74fb4f4147e83ca8048d412751ff48dbe96ec6e790645eae7a51c665b75a09d0f0fdec3b29d3798158c38b613e2f83d115d1ba2a4c8d24362a
 EBUILD semantic_puppet-1.0.2.ebuild 516 BLAKE2B 82ded36da2a07bb20348ed9cb670f7a8bd50cdd62f8497059725748dcc4e7b189e203c8263244f0815d04a790253d9ec3182fffbbea6eee3e2fb8dc2655d800d SHA512 7d098d0348cc26239bee23bd761f2dffcd586b21dac5e3bd63a39c47fcccb77a80c813d7e7920bc0b2856a19177934866a435838c0f565b4066dd39d7d776a37
-EBUILD semantic_puppet-1.0.4.ebuild 501 BLAKE2B e9d824e9a11b5ffe15eb4ad1e75e1511b085149a325fb0f643bc8a10b9cbb4d9884df77f0ff74fecfd37eed604f9ee8bdd0d48a5e85b225e3e13e28a83920c57 SHA512 cffaa9ee12a0cdb5fd2f7bd55f2c2c6f0ba8d4aae575ad1aa07fa07c3deabde389af2fa60988c74ceede82ebeba8aa80309332da0e5d1c9cab118ebacc9a1d27
+EBUILD semantic_puppet-1.0.4.ebuild 500 BLAKE2B fc267117bc241e64c5b9cb077d0f127c1dee9a698ee24a2519a056e183361dec42c4d5679519d7f658e43199d61e80d60d6f6a0c6718a786f62a2885bea1f05f SHA512 6b4d3f60d60f8eb31d235f5df1a4a2a5bfbe0632d4a2c16a198cfc8661fec0923d5d35f267b51bcc071b41f819b71abc642845bfe69c1f5390aac994db32c3fc
 MISC metadata.xml 454 BLAKE2B 0f6caa19f53cce31b3b89da348015176d95f146b6e964b10c33d26c84e7bcdf785d6182155dddc3fa530b5ce21a5f53db1d3cc85501eb6ad388f903307fcdc37 SHA512 a5de04c5c0c220e447835e27f441e089b9bfd1c4ff3a1122d1f2bb7f2c2763a4e5136be3509d669de2e46b37dcaf48224a399ccb52a3f0f006449a796e989aca
diff --git a/dev-ruby/semantic_puppet/semantic_puppet-1.0.4.ebuild b/dev-ruby/semantic_puppet/semantic_puppet-1.0.4.ebuild
index d992c234d0eb..5b2ba7cbab09 100644
--- a/dev-ruby/semantic_puppet/semantic_puppet-1.0.4.ebuild
+++ b/dev-ruby/semantic_puppet/semantic_puppet-1.0.4.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="https://github.com/puppetlabs/semantic_puppet"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv x86"
 IUSE=""
diff --git a/dev-ruby/stomp/Manifest b/dev-ruby/stomp/Manifest
index 4be3d49f9cad..a52385fccb1e 100644
--- a/dev-ruby/stomp/Manifest
+++ b/dev-ruby/stomp/Manifest
@@ -1,5 +1,5 @@
 DIST stomp-1.4.10.gem 99840 BLAKE2B 5dc2b18d7551629dccb599a77934bffcf92d83158b6797a1645f5fd8af6c4738e1d8d97d5a6c6bb6655c19f98accd4ecdee0677096f9a5e89bdf0295532a1087 SHA512 bff1a533e5455cf4540bab3b5d16c63f1e0783b0257b5e0bf2fd26512586670ce5db66f97e098805c7b5fc02913478553409b90a4014bdc883465bc7b474eb7e
 DIST stomp-1.4.9.gem 99328 BLAKE2B 9aa50880224cede15be69657ec7ecccf1a075db3e51de55faf3a0ba50335b90b910d1202c646585229cc35c0e2e4cf01fd99774960d9ae90ff82030c4bac6a69 SHA512 e1e3aed86621e2dac199fd7e4ba67fedc3582b5cfe9e4ff2efbdc9c545bb25d2c52391d9403e2fa935f69635e85bd3c1ca29d2d5b3c425aa850d3ccb8f7a5e86
-EBUILD stomp-1.4.10.ebuild 621 BLAKE2B 4bf5fe8e6970a741ae25699bf849c1d97a412c4bd9a63ebfcb8e5719ec8d76eb3ea6148bf152b76dc24398b28f510b49251020c244d92ee33ed98e84386ebc0d SHA512 10e5972fb0001bd459ff3e7597abd6b80d027bc0da833ad48e9dae9a11872857224ea99fbc3e3193fd7666a7d0752c962b98d760f24423afde5bcb67b0a78d8e
+EBUILD stomp-1.4.10.ebuild 620 BLAKE2B c8721efc9c6996b1b4ad67d38d5b538446fefbf2667e4273921f8af4d38156abbf5343297207dbff680711a0204594c8e5d7fb88d71d1d9b0c6744d7c7c07c3d SHA512 d2601668dd0b166bee76da80f8f9cf9c1946af4386c69e8d5cb51d03650392437e4764980af78c2205af4e9b31a34358555667965fcc4f233b2a14627663251c
 EBUILD stomp-1.4.9.ebuild 620 BLAKE2B 857b9ab497071b6cee92003dc594714684edd3c43482e83bc025ea985898fb765ebae06d08a88e283c992d3a9f86a54d2c9d458fd19a5d67b1bc1cb85479a4d1 SHA512 cdcef5d74ea1c7f821f57943f026da463f97c20f2d5c45b08f45a4d8e74dbd722fc25e8b147f96e0270887dc327b1e275c055d6c0527e83b778f6480562924a4
 MISC metadata.xml 341 BLAKE2B 6574cce9057c215a7742c460afbbf28911e86e8355049b1e677f7ee867008fdd9a1c6895de69b52fdbeddcf7a034322bfa74bef2ecd9aa2a60aa0b15091fa94c SHA512 5c55a763563879d691d30c1a6830e6a3e85246c145aaf9daf4a48791edcb36dc1c76f8692829934015c59287bd9390978fb7af6fb8975536d39fe50dd2e9340e
diff --git a/dev-ruby/stomp/stomp-1.4.10.ebuild b/dev-ruby/stomp/stomp-1.4.10.ebuild
index 77d3fa18814a..e57bb3a1bdeb 100644
--- a/dev-ruby/stomp/stomp-1.4.10.ebuild
+++ b/dev-ruby/stomp/stomp-1.4.10.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/stompgem/stomp"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/tilt/Manifest b/dev-ruby/tilt/Manifest
index a0cd034de8f5..9de449a1b310 100644
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -2,5 +2,5 @@ AUX tilt-2.0.10-ruby30.patch 1482 BLAKE2B 00647a8d443e9800bc9aa7e28d91b9f0ed59ad
 DIST tilt-2.0.10.tar.gz 51446 BLAKE2B de5c12dcf22994f182ae163a82c3060f1d0d8b4bc2a4495f28c9befc954b4949b9d2ae6aed42e3a9c35fb68825844881d9f15b2b68d949236e5396083ff199a3 SHA512 4a36c55347e307ea0c842aad3da72cebe98bcf8a0421040cfce7a43540d1746e736ce92b7ce7492a5cfc184372842c3ac7a006f3650b4c9420d5825ec005b4ef
 DIST tilt-2.0.11.tar.gz 53041 BLAKE2B 2509cc3efe5e6302c8943c00108eeda6ee4b23a18952ad23049e11ea28b397b80a21d34c4d241119f45cedf2a978a2673d857a6cc32d7e26a2016caa510458f9 SHA512 e28e31ab92aa42eada34e0f6c05dab6a54945d07b649588356b1635ba8a36700f6e537e8702613883693501442d21690d8b3690b06f7b9f331192134511b78b7
 EBUILD tilt-2.0.10.ebuild 1603 BLAKE2B c046401f51f7a87aeff75991d0ddbbb6c402a1cc8dee8d867ac44922ddb72791e673d296353e5eeb5f52860230d10c2eceab6e056d29f85f7df7e78c3b355a31 SHA512 9c4f2a2c43b29c76e9ed970f44be4b6b8c5b4c96ab5b34e17dfcedad416d4487efa9a6ebab332bde09b1aea5870e4bf3ac1752505838ceb506d1a464b0f16531
-EBUILD tilt-2.0.11.ebuild 1372 BLAKE2B 90a5dfd8d1069764ed636a20af9a6b383769b76bc575094dab862f70be5cd437ac5fe4ee1b45717d9ec1aabbafb28a1ca89c9ae08bb2cd59cb43a248e1a44f9c SHA512 8f85ee0be42480ef64c1b192ac40896b5288ccfdfa115d1f4070b37904b56011e13edb7c7fb79aed46446c52b650ae704351dbd395741311c2276e6de376cade
+EBUILD tilt-2.0.11.ebuild 1371 BLAKE2B 200706c215f35e11edf71d8baa2b6c51ee405d4d9b08f3ad77c99235c41807fdf6c6035f25e8dd9937f4d5bcbae991c6cf93a7cf54b8d612bc25d266ff186928 SHA512 820f91e3adb0d8cffcb7ee313b11ff6a7141aed25174babce20d66324284b470d58f7d12ea2f9943c33a51f65547439b4f7a37eb3141ccd5382b74bc3bae5b14
 MISC metadata.xml 340 BLAKE2B 5414049365511f348e3da85bf3f207b791dc4269331e6a650f90398b6afe2502e2e62624ec9597a2d55dca4a7e4a99e209837c44bac7a901ec42139518f41647 SHA512 4be8002eca7cc4c0204311dd7dd187caeee3f40db9b00d108fb18e97009f8cec10d298a958bf83d24177297cebd78789cdd546a0c5e9c7288aa697dee1facf71
diff --git a/dev-ruby/tilt/tilt-2.0.11.ebuild b/dev-ruby/tilt/tilt-2.0.11.ebuild
index f4d2ea07632e..5e2ef19dd5a8 100644
--- a/dev-ruby/tilt/tilt-2.0.11.ebuild
+++ b/dev-ruby/tilt/tilt-2.0.11.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rtomayko/tilt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Block on some of the potential test dependencies. These dependencies
diff --git a/dev-ruby/vcard/Manifest b/dev-ruby/vcard/Manifest
index ce167196ee6b..55faf5f9cb3c 100644
--- a/dev-ruby/vcard/Manifest
+++ b/dev-ruby/vcard/Manifest
@@ -1,4 +1,3 @@
 DIST vcard-0.3.0.gem 54272 BLAKE2B ed019b7f771dbe2da574fc059dacdc8eb5b5eca735abe15c2d8aec08b4f91b22c413f317d4f39f100bc78d16bf8e3edf0e0a99d55b8fbdda5b47315bc33d37b1 SHA512 5b54bada881f4d6cce66bb76c15b3594e310659024d163598f857c4c434379c57e07f28873646d0a5a5aecef4313c8fc731313e80df5542e982f333c05802d4d
 EBUILD vcard-0.3.0-r1.ebuild 591 BLAKE2B c8db63e6948acec4414f00e547dfff36f951101d016f99321fccd5632f5b104ca389bb2d6622051c270030cbda244f720b1abc48ddb5269941a045bcdea8e87c SHA512 753fc140f2ee260b801d92bafe691c89c29e2b846ed5a310436eef5aa0939ee0ed566cdc6fd94d0e902fe79c639f5f3365c4ac834cf48d5ae9484468691016c1
-EBUILD vcard-0.3.0.ebuild 584 BLAKE2B 88d67fc0a866f92e9659e6a260679fe2f17fa4b1b2bd3cb1803d16879620c0b2ecf0b4b87807371df626bdf7f04b384677935218d92c052c1ed742e44be9ec18 SHA512 0d7e754ddacc0b0022e62a675232f57423547071477fd137676d6a2d9bd701f365fe163a57dd99a9b4ce6c452897fc0253ae1b4db6a1326d8c2b6363b8d9c86d
 MISC metadata.xml 452 BLAKE2B b78826702f0418a8800e83661797271fb5910daaa3b749dcc9490c158c45c621bc330df22df783b726ad9ed1d0f48f493a8bc0be00638b8e7110e08a95734f3f SHA512 2a4ce035d19ff1bebe679b5bc940bb59649514e9d44cf88855c7cdb1147d4bb150a2bf0e30f4db241cfd23dbe6bd666fa12c155ae3d5b6b4febe4a70ff2305dd
diff --git a/dev-ruby/vcard/vcard-0.3.0.ebuild b/dev-ruby/vcard/vcard-0.3.0.ebuild
deleted file mode 100644
index 8c9fdf412fbb..000000000000
--- a/dev-ruby/vcard/vcard-0.3.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-# Avoid the complexity of the "rake" recipe and run testrb-2 manually.
-RUBY_FAKEGEM_RECIPE_TEST=none
-RUBY_FAKEGEM_RECIPE_DOC=none
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby vcard support extracted from Vpim"
-HOMEPAGE="https://github.com/qoobaa/vcard"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-
-each_ruby_test() {
-	ruby-ng_testrb-2 --load-path=lib --pattern='.*_test\.rb' test/
-}
diff --git a/dev-ruby/vcr/Manifest b/dev-ruby/vcr/Manifest
index 3020a171594d..008ebcf913d9 100644
--- a/dev-ruby/vcr/Manifest
+++ b/dev-ruby/vcr/Manifest
@@ -5,5 +5,5 @@ DIST vcr-6.1.0.tar.gz 153296 BLAKE2B b34fbb88458bca2faef0b7bc801f664eb7b1ed79c09
 EBUILD vcr-4.0.0.ebuild 757 BLAKE2B ce86dd663d034dcfdd9f8b4a6ffbc1a9f6b58c74df593a47527fa1cebcaff490e6a10b41cc15e9c1a157d7e25dd8fae80ac2a1d706df1bdd6fec03527c036603 SHA512 f55409b5672d06bebccca4eb81b04e169d625db21fd43005c6ec1e50d339bdd37dbe3e5b416a1a11f3345586e9750e4f8fc02ad58205d6c4de6d04f2c2d1d4a1
 EBUILD vcr-5.1.0.ebuild 780 BLAKE2B ee40daa44cadcd4fc1045aa744dfea2aa9da0c882ed516af5123e3d0f1779892375fd134c0b5592cdf9200fea902f1dec8e5417545397ec7fca62811417bc71d SHA512 bdcb20c50b26f81de30067208fa60c31575c97083ba2e4ce5ca6493e4bbacabb46d4571838311b984cec4973b44eb31d0d36de84449de0028e87a9a39c037254
 EBUILD vcr-6.0.0.ebuild 780 BLAKE2B 2d407c697feeab2b539811f874f22c18f0545ddf2876b00ce1baf6accc62f54bd6fffe587e2ac7c71d2a86f3908a56f5dc1e2bb53c5e3926c12717c1a7b04e16 SHA512 a9257d928c39bb5ce6e7af37cc489c7252e267d3daea4bf4aa4309d72f23557fff088ddc1cdaa4be4c439c0fe9c5b2aa3af3120ddeeded7ed680680a85009229
-EBUILD vcr-6.1.0.ebuild 788 BLAKE2B 84dc56103f9a61f82278283fa5bcc46f9c044f6569064de69e4343e7091bae4c91c36d5e207fc0e2c68a24201ea9947da0d99eea0525f0a081a4ebb32ae3ebd0 SHA512 ec970ac7e81ad9b03c80c10632e40dbca15d0ac4d53098de16ff3a379ea08c1232c7e580412d892a3a61b6e1fb94c24b542551244bf69789f79edc64f31c6772
+EBUILD vcr-6.1.0.ebuild 787 BLAKE2B 86f03f9aba475ea196e81beb645c85e3c0e1c0746d277f00fcdcc7c74a76480b88afb60a167dd50920549b08b1bea584441ef43710eefc9cfcb5300f97dda2e9 SHA512 dd6c3c790df8afe6e58c19b67869350237daa49edbdd5a8dc285fecb5a93ad2760639e420b02d6570a07777d82aaa2f00ab50156329cef04eef4b63981a3c0c2
 MISC metadata.xml 435 BLAKE2B 79e71186140ae8aa7f495640d1fc8d4227bb15419296f6d8ea72ef1cf71778e06df69220922c5e5754cb38f4d28b4604e5ddea955929a4b506e9773e68562ed2 SHA512 1d4e7cf1f4795c030ae746014c2a696d302cc9d5ca7d514601848f231cc728b0e186498f82cee1df12d9db9e5628bae90216c802190800d9ef12d6f4a06d46dd
diff --git a/dev-ruby/vcr/vcr-6.1.0.ebuild b/dev-ruby/vcr/vcr-6.1.0.ebuild
index bd3e418c167c..fe58071be63e 100644
--- a/dev-ruby/vcr/vcr-6.1.0.ebuild
+++ b/dev-ruby/vcr/vcr-6.1.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/vcr/vcr/"
 SRC_URI="https://github.com/vcr/vcr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
 SLOT="$(ver_cut 1)"
 IUSE="json test"
 
diff --git a/dev-ruby/virtus/Manifest b/dev-ruby/virtus/Manifest
index da9e3edc4c1d..8d06bb23fd99 100644
--- a/dev-ruby/virtus/Manifest
+++ b/dev-ruby/virtus/Manifest
@@ -1,6 +1,4 @@
 AUX virtus-1.0.5-equalizer.patch 8422 BLAKE2B 939c71ea56a77c1a654e7baf11e0f2ee40b044ad0dde0c1689a0e8c50789b6adf2f8586467f662c3d20e2a9643cda21ff9af865ee19c40ccc3e48069d43e1932 SHA512 70db78b928e1dc23df126bdd081db2664dcf75379e92d3480ad0dad951df9a91d0feaa40de570a6116a71708342d891c073b07395180d85cad50e9e3dd509020
-DIST virtus-1.0.5.gem 49152 BLAKE2B 24f422d96b10c38f9599c48a2018dac5b5bb8979acce1ee206b11d64d74a852ffbd276b78bd55b3b184cc109eb00d27ff1347d143695a4e06edfb94a3e87fd5b SHA512 468b74d6a49410bb4e59c535b9f7736cd5e4743817f19f97483247b0d259e17b069044bd5ccc787d72df972d37903eb7c9a9d6ca0c6642c550f1c84a3bc71825
 DIST virtus-2.0.0.gem 50176 BLAKE2B 16a8977b782691faa48e239354c8d25d63e350bcc0e8499691586021817d462e7575eb9d6c6911c371e00a711bc404f2be6dae2168d167fc683049fb14c798f6 SHA512 17f1a0b13ca0912d0a245886b7d8c1b0bcb9f08c1ac3c89d8e5de234e6afa3989c4f15b555342827ab3f8a5570e888bfee893aff851189b1769fb34fb3f1a64a
-EBUILD virtus-1.0.5.ebuild 844 BLAKE2B 1488d31d87815d8c855f111dd38a26bc83ca9cb5d3cddd51d6cafe7f45e0cf067a56a981b7325a222e8ad7064b293d4ad68e7cf8e8e4f46f6c408cea03e474f7 SHA512 864ff9f81a6bcf62092b55897ab9387ac23ee60545d2d5d6cce14f52cc9c3bab11f31ec43ac8183ecd1bde61d85b8798481a0af306db637af5b1a706d8d3a127
 EBUILD virtus-2.0.0.ebuild 975 BLAKE2B 3ca7f5e7b2652399352425cd177740f03e53a0325af9ea17e71c02356dff8173b023f424bc7b16ae83cb1ddb333896ff3712cea7ebbe48768df97d7eee085459 SHA512 7ad23b52a30c87470378e03640f8b860e70837883fed915d76ca93b54a6613fdb9e4c11905d6bd4c2ba87deb490163330db600e0de7b705f618aa118a4f74e23
 MISC metadata.xml 390 BLAKE2B 643e41d32d7266a1db20e8e955cb60dff232b41f720d810c0a0a2b7f9ea78f70519de33b38770b0ca8982da6ab19718dc5f8796ef68ee82c51195bffb2c5b3e4 SHA512 88175c18f159270520bf9fcad6a4295ad5bce8e567996af2fc91c1ed9b4dd0f0953bd61f36d3a331eef079346df51b9ed88208e90a9d8aef1086172c8cb909ec
diff --git a/dev-ruby/virtus/virtus-1.0.5.ebuild b/dev-ruby/virtus/virtus-1.0.5.ebuild
deleted file mode 100644
index 331877bd8fb7..000000000000
--- a/dev-ruby/virtus/virtus-1.0.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md CONTRIBUTING.md README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Attributes on Steroids for Plain Old Ruby Objects"
-HOMEPAGE="https://github.com/solnic/virtus https://rubygems.org/gems/virtus"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-equalizer.patch" )
-
-ruby_add_rdepend ">=dev-ruby/axiom-types-0.1
-	<dev-ruby/axiom-types-1
-	>=dev-ruby/coercible-1.0
-	<dev-ruby/coercible-2
-	>=dev-ruby/descendants_tracker-0.0.3
-	<dev-ruby/descendants_tracker-1
-	>=dev-ruby/equalizer-0.0.9
-	<dev-ruby/equalizer-1"
-
-ruby_add_bdepend "test? (
-	dev-ruby/inflecto
-	dev-ruby/bogus
-)"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 33d6d4dd2256..f4221a8710a3 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index ef486bb589a7..455be55b90ae 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -3,5 +3,5 @@ DIST diffoscope-227.tar.gz 3163754 BLAKE2B 8a93b168e8ac404b6cfb08ebf9de5adf0288a
 DIST diffoscope-228.tar.gz 3164190 BLAKE2B 21e75cb8e297540b149f22c52949d33a2e6ddd8c0fa8641e5d8b0c20045f1a7f6638b6b844631c2a5353cd23dc4d8447fadd9b8b3f5cd87fa33eb4b85abe3e2b SHA512 5ea3f0dfa17d2e17167241f9388a6fba919deec4c26a39e238fc282b0011f30e77b4daf27c0b076eadcc13ca51eb408eba983ea427adbaee3233db222b60948a
 EBUILD diffoscope-223.ebuild 3444 BLAKE2B ace11e44d106488caa6e2e2014236e1d5889667c48348ef29b6b34b719f5b95392cc0f2aaf73ecf0a01085263e4dea21c3ba4280802abca4fe95ac2c2c018c17 SHA512 e9cb6a0ec3fe55146081dd3336409c49112b55dda2e7edb97c9c0b6269ca29f9706dbf9b1cc5061d4d0869f980824ea8ebe447e191d015510af58a50014f659b
 EBUILD diffoscope-227.ebuild 3558 BLAKE2B 0b9aeb382a8bb6821e7b0e6a582fbc85564ef64e9d4931322e339c104d92a08d054958b0c604fc5688cb2ec6e5a1639aaf7700f97a203f12f17951f48cd661b0 SHA512 3ebd890410be2c423fc465f3cb149f98a4690ecaa5683b6c1dcf91a5c3c8423d5515ab516652d2c6e8a7ba2b8407d7830550244ded1fc5fc4d2cd91efb7a683e
-EBUILD diffoscope-228.ebuild 3558 BLAKE2B 0b9aeb382a8bb6821e7b0e6a582fbc85564ef64e9d4931322e339c104d92a08d054958b0c604fc5688cb2ec6e5a1639aaf7700f97a203f12f17951f48cd661b0 SHA512 3ebd890410be2c423fc465f3cb149f98a4690ecaa5683b6c1dcf91a5c3c8423d5515ab516652d2c6e8a7ba2b8407d7830550244ded1fc5fc4d2cd91efb7a683e
+EBUILD diffoscope-228.ebuild 3556 BLAKE2B 058abedfd71123ed6edce1f5a94508fbcb0b89ed6e453f449ea43d92672217116b9bb51cadaa9a6e8b680cb989d740e5700015c2565bfc742bbc476b0c348ba1 SHA512 30a60cd042024b72f0a38523103dd19065e6545928482c192f1b6f18e39947c9bba14de738dcb361b03f5da6c8bbf29ada9a24743296b50205afb1cd07860a8a
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-228.ebuild b/dev-util/diffoscope/diffoscope-228.ebuild
index e7f6e7cb72c0..d908e8be10a8 100644
--- a/dev-util/diffoscope/diffoscope-228.ebuild
+++ b/dev-util/diffoscope/diffoscope-228.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
 find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
 mono opendocument pascal pdf postscript R rpm sqlite squashfs
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index dfa0c004f09a..a9e536399a6b 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -5,6 +5,6 @@ DIST glslang-1.3.224.tar.gz 3543160 BLAKE2B 5773f884b39f2bd01bf71269e62ee3c0ee36
 DIST glslang-1.3.231.tar.gz 3657070 BLAKE2B 3a33854d165e966f339027f73d0f05bf4a2df5998f379529413209eaca2b3e95939ead4bb606e7f65effb7a32e81ce40f4bd7af94b2e6fbad1ed8d809f6a1f19 SHA512 2235c476b03bcb93ac9d0d8a88fdf980f6435086d7ce13a1d9c8ff223880d788a49f35e7392f1b5af9174da7b501a171b80ce4e89bc0c6d609d2b737da982e56
 EBUILD glslang-1.3.216.ebuild 809 BLAKE2B a207750c9898380d2ca4b7b3769828d3a7e7950666282cc54a7e02f0e1b1dd0ba1834b08ca081e152cdcfe55dcf5ab165c3ad743539253e69988008e717be603 SHA512 a51a0c70ef135db12b71c6b42663f5528127602adf1327411fb81a10159461314472814e8aab044c48ff7dbb2c3e8ee9fa2e76c9eeb74725a9ed33ecdfd70f0e
 EBUILD glslang-1.3.224-r1.ebuild 874 BLAKE2B adb8e53b4667fc094fed4f3568bb82a338906bc6056c2975fa04ce3346c43c79a4140c052efdd286b37eb6f6350b0b70fcbc343fc5e35592ee36d3e7f0f531c2 SHA512 9ace062e32cd94a8691afe87c4d838c639b1227fa8cd7bca53ab9999cd031a5734ad620dbcfa54a34ff741efc91968f62f4099474e45aba76e261a2b5bfe8e74
-EBUILD glslang-1.3.231-r2.ebuild 969 BLAKE2B 6f11eb37e246b2ed1c1fe0887907131b715faa57081b824a2e91642d23bafdcf9cf55fce8cf09d1dbb8426c0263314cb034a6738b8a05b04dba4478b9a9955b0 SHA512 d9c97a111902298a6cadfb01c5fd9e77f8afe0b3bfaba773644f6836a60a408ffa22d8707247d0fd9cb3450ec08c5d957390945fb9a8ee752482b984e5ce7bb9
+EBUILD glslang-1.3.231-r2.ebuild 968 BLAKE2B 0af30146d43d3b60db1b416e5920c3de804ce4544e886b20cfc96a0f0a1568278e84d3a9fdde1a8e4c2d6c64e4e53587d29a88f715463fb12c9ca833994c83fe SHA512 199601a75ed6a33a2c808c91e3fcb0c67636eecce75a97760f04d133e4914e4a81a776c2d1dbbac034452e02ca5d198e054f59a2031249b01f841a74316c0373
 EBUILD glslang-9999.ebuild 978 BLAKE2B 35807072685f3364ccb38b47af47cf8f6ed3c918b246312877a22659b20af6cb8d3f6a0dc7a404a1fdc0d55c4d516804621cd6b543f1efac28bc8908a3c559a8 SHA512 069143c55a6c62101a4efe4f220e219e4970592663be8c5fcc89fed2c80ae5ff5393a2ee363d74af747b92e2b5aaaecdb15955ef5f821da5ec128cee7899c225
 MISC metadata.xml 330 BLAKE2B c3874bbe807a8dd1a55897feadfc0a89e4cb806441390ee7e7cc317f3b533a08338a669834122ede89cefd9b6532d789aece2c29fcc6cdfc7f76a81bf382192b SHA512 1c591a28214fb76334171e4a49c8ac302b6f174f265749ad005f2503df1312e8303c92a68248775ed3db98d65107471f9cfc8cfb758c89261f283711beaac764
diff --git a/dev-util/glslang/glslang-1.3.231-r2.ebuild b/dev-util/glslang/glslang-1.3.231-r2.ebuild
index 519eb9fd2b13..28feeb431798 100644
--- a/dev-util/glslang/glslang-1.3.231-r2.ebuild
+++ b/dev-util/glslang/glslang-1.3.231-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SNAPSHOT_COMMIT="sdk-${PV}.0"
 	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 5714c6d43600..d8ceb7c59389 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index f31b320fb32c..47e394a5dc48 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -10,6 +10,6 @@ DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c
 EBUILD gucharmap-14.0.3.ebuild 1708 BLAKE2B 31654745e590266a69f0e716e884e65eafe3e211a111f4df42092f463d762a16780824710c7bfb40ce2cd85ea83dc7cfc8b81a462596fe9d9a19992d5c71a605 SHA512 af36e8e7e29d0c05db8ed6c6cd36645da80ffb7342e70c15c0f61060cd91ca6583dea5034ae3f2c01102f86f96346c6d4c6c21e826d2a754d5e069b5a847f9c4
 EBUILD gucharmap-15.0.0.ebuild 1696 BLAKE2B f2616d6fd69b90c9691dbd44ba72668c003a8d3f23cde395b924507ac2bd40d204fbb91fc7f935aa94c49babde6ad9a683fbf4995763cc634fbd664b88137dea SHA512 9939ac87a9b7b3278a24f4b7fb1de48f4560027dfdea960085d581efe05356087aa2a388fa96140140a31106267b051559b3fa853d1e6ad3b49a0d557d3194b6
 EBUILD gucharmap-15.0.1.ebuild 1689 BLAKE2B 80ac27781c43f371aeac686e6d64fc9056c5a3470232419d7452044146f913167d24ff74efa52b990e928b7bbdaef8f68df881b2bafeca0c87923e8d38678fba SHA512 190e36f01b3ee3cef9d43f3f811629b7f6006ff12364142977c6c9456cad4cb0bbdbf741000136198cad68ac0da512394cb450e60f266b1d41b09fe6baacbfe2
-EBUILD gucharmap-15.0.2.ebuild 1591 BLAKE2B 3ba185478cab78fb07f327a9488ff46cb3f6ea783246652b6e9b95c242dc3e9790dd89af50fef9e64417a8b0d91d4534fdf8416f5cdfdf5b58bcbcfda2e61b37 SHA512 58b09f72b903080dd6ce8b0255d4e5d41692fe6548fc16685820e61aef02005a548aa0bf7ae9da35bb57c5cde7c081997c681e1b8ff84f575229332cf44802c1
+EBUILD gucharmap-15.0.2.ebuild 1655 BLAKE2B 4473685955683378ce24d8ed8894cefdc219f654fbc030d2710aca23124cf1a3b1d73cd1ec3b6853ac6ac81c75d5c70f034daabdfbe47807654fea93548ba3d1 SHA512 68c023c41c25780ec5688f82d3d43fc2d6c5551ad74dab913fe19038a9efcf08d9584b715526e3c2aef5ab967c0c1c01d71dfab492ab4fedad96ae52a86894c0
 EBUILD gucharmap-3.0.1-r200.ebuild 1477 BLAKE2B 4ffe6feb86be5711b4850d4c1233bd79e2cb9cbca765977ac15b7a335c3b3f80beffe2119835a73024d38a22e4623037755c8672f77edb6016b818047b8c2256 SHA512 b0313be9418955ebfde4547603d66c8121cb36b7cf390e23ee9b536ea9ff21b4760bb9d9e0d843bd49fcb63db28b173d8536a6d5a5b72de1eef76a87bed769dd
 MISC metadata.xml 350 BLAKE2B 980e1e37dcf73e8d3d41f93cef5a3ccb1ab98ac54d6bb2e69c0d6d20bf9ca62ee4ec342c7fd243348f84998e48b30e4d86e9db956731e7c6b250bfc4505df7bf SHA512 48df258ddd3271d63abfbeaaaf408e9b890a526e3363aa10cd8820de07d7d1683722dd02d38329e04559ccb2df529d0007b4609dd744fd4f21ad86c497e1bf69
diff --git a/gnome-extra/gucharmap/gucharmap-15.0.2.ebuild b/gnome-extra/gucharmap/gucharmap-15.0.2.ebuild
index c0100aa369f5..3b59c1f301a0 100644
--- a/gnome-extra/gucharmap/gucharmap-15.0.2.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-15.0.2.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
 
-inherit gnome2-utils meson vala xdg
+inherit gnome2-utils meson python-any-r1 vala xdg
 
 DESCRIPTION="Unicode character map viewer and library"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
@@ -27,6 +28,7 @@ RDEPEND="media-libs/freetype:2
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	${PYTHON_DEPS}
 	app-text/docbook-xml-dtd:4.1.2
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 233c59b55707..d520351cc8ea 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 373c0f6c6b40..76b2faa9cf57 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,6 +1,5 @@
 DIST kwindowsystem-5.100.0.tar.xz 2433288 BLAKE2B eedd8509cc7599a5a4c6fae97a238f5d3f1fbed1dc3828c4970aed7cfcae09f25891e34e3317f7b3774103443d4361a57348394b63fb7dd51cacb29abcc20431 SHA512 190607c1264609b687e5967e472decd6865b14f0bf0dc22fae7f154d093c8559dd5d2266203e9a1b6ce90ee628e319c8200b3e242d35c056fee569e2ab4c4b92
 DIST kwindowsystem-5.99.0.tar.xz 182540 BLAKE2B c4789c96b65ba678e32264cb28c344866c39a08007a5324876247c3e823825202b8314c402e5a854569b6b459dabbcf8ffbc9bf8bd4c58ac95ef6eb8ff8e2cff SHA512 91719c273730693cd49dcd4a94701190d983a9c64a74cbd66143901efd77de8e78a6fffb0cc289888567ce66541ca64685458cac932b6fd7333e18a38487c1bd
 EBUILD kwindowsystem-5.100.0-r1.ebuild 939 BLAKE2B 591321c3a882d37745aaf9605e03539bc341be2f7d580da6bc303baf667d896851c0fff8180a1220206539e1616f5b660afd76ee69470aee59210c1becb6b87c SHA512 e9fc1b3fecc69c13f24333d704c052ed92e2c331bc7a0c6f48e5488691d5f4b070b9dc1b43d3dde79d59bdc34ffcd502ce383ca693a3cb281ae91289211b2f31
-EBUILD kwindowsystem-5.99.0-r1.ebuild 937 BLAKE2B 8d93c149a4776ad44618227e8952c7616798ba2b0868665293b2e73abf5b5e0c29d8b90336b19309031d242724a5984e570dc2f47efc5f2f3c8c8355dae404dd SHA512 9d354463b52663a81604823a9fb49282b40f9ef7d73e101c7c80ff807d6ae0069d020c599960ebfc0481521fea7e5b1128cd75ac8f2478349bd987ebab2978f3
-EBUILD kwindowsystem-5.99.0.ebuild 859 BLAKE2B fe68028835dd98a4d9be1daeaddc2329319d7432d711f47452d090fa701bd88ed6ebe042bc8f29d00ae84f60f0980adfbe81a6ca9afd120200532ed79e726273 SHA512 e947673f7b2c61f1a69421cdfadb0dec68922252ae99984f5af800fbb312ab79c38a59abec19398459e4000e227dd8fbed1d33d8987259a8bfd4940d948104b4
+EBUILD kwindowsystem-5.99.0-r1.ebuild 936 BLAKE2B 40e28fc73ab17309cf56c8905bfa6884edd53f1b4a5af60993dcaa1f93e04e320b6ea5fe5f17135ae5c2f26c80a3dc821baece2757e75768265449b6ddbf2b10 SHA512 88d097c65a055fe68bb4506b46d548f594fda1e9ea7d859854e707553b24dae1fe8f841bbe43a126181a17d07b605944a0c0520241599a11f259578563367bec
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.99.0-r1.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.99.0-r1.ebuild
index 87a2cba741a3..17935e130cdd 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.99.0-r1.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.99.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework providing access to properties and features of the window manager"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="wayland X"
 
 RESTRICT="test"
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.99.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.99.0.ebuild
deleted file mode 100644
index e85da1a490b5..000000000000
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.99.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=8
-
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Framework providing access to properties and features of the window manager"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="X"
-
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libXfixes
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
-BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
-
-DOCS=( docs/README.kstartupinfo )
-
-src_configure() {
-	local mycmakeargs=(
-		-DKWINDOWSYSTEM_NO_WIDGETS=ON
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 9bc705b24443..aeedd174aefd 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 53ff36ced8c1..2ec84738f2c6 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,6 +1,5 @@
 DIST kwayland-integration-5.25.5.tar.xz 24296 BLAKE2B 30fd0d0c2cb8ce34da692a40d558e7616796475f74ff7fc4212fdded88e7c55271836f160b48907fd3e195f41738c294e40c122bf51ec967861e17bc3d7de3bd SHA512 eabb2040275fd32b4ca1e8a5717a05589a331aac97e21861f36e8ac2b3c683b369d5f40507b0dbebd714dc766d311bd1233043327253e3c5d68de2464e12a342
 DIST kwayland-integration-5.26.4.tar.xz 26976 BLAKE2B 8d4afb514c6851255f437360a8240d95d9d2c5d51c3ada30bf1a8c30bda1a063e89e098509bc69e8226d7bfb18185221b909081982eab1d8ed2b80c9c84cce47 SHA512 59cf5dcdc8713654221ac5411885be5b656bf1d1cefd344f35b1a3f45e2f036a43633eb474bcc4357783e4e5114afee6c192c63e4c02325d8db9b329b460f1e3
-EBUILD kwayland-integration-5.25.5-r1.ebuild 1174 BLAKE2B 796283969dc38e6cf7c0a2feae14c92cd30cc8680bc806a6c4fa2a9c336cbe48e9aceadee1d35240c5c0f9349577c1cd0b90a580f9056905f4d6354a27433172 SHA512 869fd729a9126f0a460af3dd590deb8986539e7fa2f8a0150e3eb5730f473df69c1364712d9a344326aa1cfaaefb41436c01e04df5ccd6425832690ff2088f0c
-EBUILD kwayland-integration-5.25.5.ebuild 1168 BLAKE2B c395dd7cccf776195893c63d8c1f197dd4be6e1f1eee90d0c8dd07c3b9cd2f28f1104e952c453d28b44e9e065abda148d45a7769bde68b6bb147193f1238b7ac SHA512 fa46622e16a31047128784bf9b3d11a7daf6695f5d3bb10cfd0c1d42eeaaa6821f4c1b41518a4fd9258e77c26a9910c744238e702226020d03291ec4925ddde9
+EBUILD kwayland-integration-5.25.5-r1.ebuild 1173 BLAKE2B 8ee3b95573a44d0677df085c46fdb5661360820db505039af0082206b8f308ebf14cbe15592322b8f60a97473931f7965977f1f32bd4dacd7056649e38e08afc SHA512 771a118575350b9cbea3da525d2f6ca4951b9c97e86c86cd1b02de72242603c1703d0d3491eae9cf863c92daa26fba4922cd3a55f932caa84fcc1c0d1c09492e
 EBUILD kwayland-integration-5.26.4.ebuild 1241 BLAKE2B 3191d82543ede65d4333755f958cadb9081cf29c7aadc57badad1ed8fadc86d5b9bfee3cc4957ca3233c88f1cc4a5e2d2dc0e2470da899154e421d8bfb38dbb2 SHA512 a86b4134798d694397ea031367d87c71df99f6ad468e02ef1df34bc6aab99428eb11b443efa6d98eab80d44593068438a98c3b3e52735476f66a1329e9fbd34d
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.25.5-r1.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.25.5-r1.ebuild
index 4260f44d8a94..69020ca163c3 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.25.5-r1.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.25.5-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE=""
 
 # dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.25.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.25.5.ebuild
deleted file mode 100644
index 1d7a25d08047..000000000000
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.25.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=5.95.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.5
-inherit ecm plasma.kde.org
-
-DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
-HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE=""
-
-RESTRICT="test" # bug 668872
-
-# dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
-# slot ops:
-# dev-qt/qtwayland: Qt::WaylandClientPrivate (private/qwayland*_p.h) stuff
-# kde-frameworks/kidletime: KIdleTime/private/abstractsystempoller.h
-# kde-frameworks/kwindowsystem: Various private headers
-DEPEND="
-	>=dev-libs/wayland-1.15
-	|| (
-		>=dev-qt/qtgui-${QTMIN}:5[libinput]
-		>=dev-qt/qtgui-${QTMIN}:5[X]
-	)
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtwayland-${QTMIN}:5=
-	>=kde-frameworks/kidletime-${KFMIN}:5=
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5=
-	x11-libs/libxkbcommon
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=dev-qt/qtwaylandscanner-${QTMIN}:5
-	virtual/pkgconfig
-"
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 6d1b732b449c..f17f38b080e2 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -6,6 +6,6 @@ DIST plasma-desktop-5.25.5.tar.xz 6327616 BLAKE2B b0693b2097b3cbee01c82c19b803c6
 DIST plasma-desktop-5.26.4.tar.xz 6351076 BLAKE2B 02ed7c771f73cfda4f776befeb4375e775cf6402337315658a7c537ff52bd6e233acf65e9636ad1d0decdf32a2d4d67a9bc0f7a94acab62bc70006703fdd9230 SHA512 69c41879858bc60eff38c61e1d68d9b8ddfb9c83b28097b2052b43be3b16fb40f906d551667d1cdc7699496aab1f78ea2f7e51d4702c520ba125859fbdae126c
 DIST plasma-desktop-override-include-dirs-2.tar.xz 8324 BLAKE2B 5ddf9340edf6b6fa76e80158a982ac887b0fb464bc40d5bc4dcd3d6b8f5a87c2d6ecdd153e67e168454aa7faff8d84defb90ba16096b64f3af1e7a74570a00c6 SHA512 452923555bd419d3e389e808c4c9ea35e48795d4f0d78c5845aea677e21f594068540538a8968c2d4034aacb11e910a7b69908e10518eba486ebcc0dda39221a
 EBUILD plasma-desktop-5.25.5-r1.ebuild 5370 BLAKE2B 1deec9c9dee26a5b739dca721ed71cdddf9a9623082b6c25fb3c22b3031b1c9bf4fef9711be798a62286e4a7c5e1683a26f09f79a9e45f95969d98ebb7b01e19 SHA512 5399f404139c86e0e6c2fb4864fdda3d7d459619e63f9b1082a77e73d06b538ac969dc9f076e6fd85fbc7eb4acf07d189d0a09a8880149ec3b79d805664b0097
-EBUILD plasma-desktop-5.25.5-r2.ebuild 5470 BLAKE2B aec4a8aaf38c8b448efecf859ffee6fd32d0bd55d93c8ed0cc812164c6a73e3146d513c2a636683cc5ccfcd0950c82c8b21a72e4360e2522737c006d62aa3ef4 SHA512 0f1a09d6ae37e763df3aac85aad4542293fe2fd0f8018721eeaeb2cb2a618ff228804dbf22b43d212af48014ebb08be648ffc3f9f9f5990c160b21b1ca5b1234
+EBUILD plasma-desktop-5.25.5-r2.ebuild 5469 BLAKE2B 26a135bc888a05120351bf8052ed06cb1df987e0dde0d6c5dc117a3ab0f1b1f8a2c167a128f63ac4d696b245c58e9304b573de912cbe9814b047f09586222fb0 SHA512 56343cc7e5976c4eed101862763d0d91db0776fc72e3496da2b8547524845268d0ceb2d1ffc9e37fd15d71bbabe00f9e31e95d0a4d887d232d7342b170cd0183
 EBUILD plasma-desktop-5.26.4.ebuild 5483 BLAKE2B 0c8b23c812d620369cdfae062ebf2b1c94e9d4b931ac6a130cd89e2d093b3acf4f89337d384c047394512e7f6849a169f7d54489fc3e472a1a93048acff49d14 SHA512 3d37a2fd2582bd660fe6f322338b55ceb7d0823508b53790e58eb8aae161dbcd54423e994632731152a05add86e58f4400d889b3dafbea7541738538b3674f38
 MISC metadata.xml 682 BLAKE2B fbd378484f259e8b85c9c8776c5ce7eb034432f9a4e547453e0b810b22273bc8c494fdcc5f435c1b660c9660fc68b4860fc40987b0c6b8ee82764cc7fd15e771 SHA512 dff0c23d15a172b901fb0d0b9e383b8cfbc47b2123cf06545c3f9064db492987043695305de4af66fedc8d1900fcfb266b120f4883e2384303c9e4f2a208bee5
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.25.5-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.25.5-r2.ebuild
index 37659b1f1cc5..82c081a2a29e 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.25.5-r2.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.25.5-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index d8fa2066a5ba..25436aca6dac 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -15,6 +15,6 @@ AUX plasma-workspace-5.25.5-widgetexplorer-recurse-containments.patch 1438 BLAKE
 DIST plasma-workspace-5.25.5.tar.xz 18638932 BLAKE2B f83aabf84b775c0bf9d1e60db03f94400e3363fa8f45767bdc471706682cda7323fae4948cffa156188cc7ed2d30d05349a385dd370ef941c16464ddddf8fa01 SHA512 0c6cf5104b584b34a8bcb45d57069fed3b25e871fccf1bfefd47d8fc1b595867c1c4f0fcfcc0e07847534e1e77ce8ed1f3be1ac6cb7eea8669a9c7649c8466cb
 DIST plasma-workspace-5.26.4.1.tar.xz 17472540 BLAKE2B 84d30fe7345c1400d8ccb3b8f1c15503402e734bf26dbfe6b05581257cc0e489792bc1ea5389b9daa9e65348d3ae63eefab4a38424185d114485ce2c66a18fe9 SHA512 d4cef07da2802711265e04b1e5ebe284c59ab507e306041e290fd91687179141e42be678a4cd6473b59edfaefcd3edf603ae5cab1f7e85508f6e3d1abaa76784
 EBUILD plasma-workspace-5.25.5-r4.ebuild 7034 BLAKE2B 3539851cf3cad460f3598a5e4ce0e1b997ea8d500fa2de304d7c3ca05bb1b81323519b4e11adfeebb7617d06dad9a90179d491aa209ed4b6ea873e20bf7c9943 SHA512 6cb92c9b73d02d4d543ba5c905c6569b205b762ebe6a6f9479c08398c545e7b3c3263dd63ed7de2eac699e281d8bce726ecf6bb2fc545ef1d90fe7293de9ac77
-EBUILD plasma-workspace-5.25.5-r5.ebuild 7411 BLAKE2B ca60841003ef5288a764f7396e56dc2be9487c9a6cf0227c9ea83c8f0b96b67629650dc6f3eea78e82f27e895441d084748f894d5ac9ddc7fb79a520f629cab8 SHA512 3b5532eb4b522bdda35653796cefef34448958a9b92efd011ef0275523d1afff6cf89ee8ad5f4ceb324eddeaa9ea96e4fdb9862254b6229b190023568e6af5a3
+EBUILD plasma-workspace-5.25.5-r5.ebuild 7410 BLAKE2B 48c72c6987afd8fb1c7731fe2ab5051abf511963cff9566ab3dbfa6c504cddeb212a07642e1fcbe9ff35c53f4e515bc7c8ba014620f1d9d7cb468ea12f8686d5 SHA512 aafb94f70606104ceb339c4ccf89117c351f135f1f1cf499c118775ecebc72d24726890fc1a0caf229f1074093bcf7c2f799dc4d47bc0126b2bd3c19fef14e82
 EBUILD plasma-workspace-5.26.4.1.ebuild 6721 BLAKE2B a6531310141e8b6beffa5b3fd9e70fdf99ffb363a37500ddb0ec5db7ae501d5f7359cc3068a7128496e4abeec802c99947463bf8eeee43752ee512afe9d828db SHA512 59ddb5282490cd42337fc3e4d578a58c1c2d7fbee9e9e1a6741a7a3220e5004df70849e6f4dc13ed7b6ddfdabbd3b5f626e0ad7f2ce5ba2d4c327aa47de9917e
 MISC metadata.xml 959 BLAKE2B 6513ae79e0cf24efd0bd33a16708950d36393770b51ea752c4c8c6e7ec63c7675dcf5e96dcfbb07d527ba910462b7c23afe35c55b4643ec69d1175660b245478 SHA512 8af28473216b00d4273be4bbb5d93adf8a4db79c46d9e97bd8b2822fa3920e8fc789042669bc93e6e9a6fa1c864a49fc23887be8456ea122a6d8b09e384dffbd
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r5.ebuild
index cdb8cea690a4..c642d1cafc2d 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r5.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="appstream +calendar +fontconfig geolocation gps +policykit
 screencast +semantic-desktop telemetry"
 
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index dabb3730f942..a71389055492 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest
index d64237dd0a86..a8c51f17f3f2 100644
--- a/media-gfx/renderdoc/Manifest
+++ b/media-gfx/renderdoc/Manifest
@@ -11,6 +11,6 @@ DIST renderdoc-1.22.tar.gz 46942430 BLAKE2B 8dfdea0883fd050af2359bb26c7ed2f99109
 DIST renderdoc-1.22.tar.gz.asc 833 BLAKE2B e8281369e602302a56189f81c6a4fc8084d0167de7ca76cb5066653a3697aa0c74ade8565ff98fad64e72ba1e0d3eec6447c7b96974ef7814d512e07ebfa0a9c SHA512 070255fa5ddbcb52c938b9354c6505b9b1c4ba3cade9f066cd938424076f4c475efee061575da111038e9fb7b49487216542a7742048596d9e729160f8d68e9e
 DIST swig-renderdoc-7.tar.gz 4006241 BLAKE2B 619f41239f4aef496264d61f44ae042cf80d3ff28491d452cf11ad07e898554c4a32df6119ee0e8e3de36e6bee61855358cd968ad01c9281976e24e9a6cac839 SHA512 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86
 EBUILD renderdoc-1.21.ebuild 5441 BLAKE2B e92947959aed6e9557b53f88b63d0e3515f146c2e2acb61f84f90714d6bb8176fc9b582d8347d28a16174480392c0d5b1c06db01b049c305642e2b9b8de73c51 SHA512 4b62fc9e1424284e285ed031b3d1120964412abda30295238506136dfcb9201ac0a9fa771b69274a4f8386446459b263c0adfbe320d40b47efeb8186208f3ca0
-EBUILD renderdoc-1.22-r1.ebuild 5529 BLAKE2B c13863bc6e8bfce79ac4333cd807272f6968217dfdc118bb86b9e774e0b4bf26c2d656e8c6d108ae703a379058671e5e3a7e41a385e43f57a94e1015ffdedfdd SHA512 441e64455159dbb72f087255ce5305cfe4aea5e3387d648e77e0ffd9ac0643e17f7442f76df5de5c043f5ee5045f444461121e9f46bfe97440c94134f1f743ab
+EBUILD renderdoc-1.22-r1.ebuild 5528 BLAKE2B 62bc9ec7618bddfadfadfcd299dbe2b96a89412d4935f0f287a3a4d9995b11debab1f9fe97bff0390024bb398362c9bf978032e2b7850931ba98730cef894c8e SHA512 9f4af98ace1ec84d33f29d85fd30c91cc7e52a8b93763cf92310c611dd7868231967a707a4333823741fcba5ee45141db02bc5afe1d91e769364b0573eeb4982
 EBUILD renderdoc-1.22.ebuild 5513 BLAKE2B d143413c1cada6a312d557ca2da6bb0b2adbee2b7a58864f22c3d9bb487b7689e3ec63816d5c1ab94d50c561207fbf97b10b69ffe733fd2263e308411719c177 SHA512 a94a0fcefaf0059f62aa599e22ef7761aa2719352e079546cb1360b86306b09dd834192ee8c4e4fbd2191a51fbd5e57d376f972e6e13c70c7b86268c9dcd2dcb
 MISC metadata.xml 551 BLAKE2B 6b04ab731ce0f9c836b958914e25fcd4a4b76032fd97ba41f6bda742e99a4b7404de51acac99fe4736ba87e488300e94dc1ef7621a780d0a8e453d0fde0430f2 SHA512 a1c2b5260d0265efe2e1294cb88aa1c43618654c7d989cd8f4bd6e919082ea1d37fed4df8a601a702b5b120d5fb5f6658d3e155c5346dacb17249fed629c04d0
diff --git a/media-gfx/renderdoc/renderdoc-1.22-r1.ebuild b/media-gfx/renderdoc/renderdoc-1.22-r1.ebuild
index a7491c866ecf..f89d8865ddb7 100644
--- a/media-gfx/renderdoc/renderdoc-1.22-r1.ebuild
+++ b/media-gfx/renderdoc/renderdoc-1.22-r1.ebuild
@@ -40,7 +40,7 @@ SRC_URI="
 # swig: GPL-3+ BSD BSD-2
 LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="pyside2 qt5"
 REQUIRED_USE="doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index c420023addbd..c0f0bbc911e8 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 8726f91a9f10..a8ad625c49a5 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -7,6 +7,6 @@ DIST SDL2-2.24.0.tar.gz 7520541 BLAKE2B 9d5bf061a66dc6443f3c6bcdd1be15926fcb4e4c
 DIST SDL2-2.24.2.tar.gz 7525041 BLAKE2B bdd6fdffca8f5360b96bba31b2f64e5b01f1081c184070fba6a0a52b7ee5f6d08ca5d647a40bbfb9b2ba49374ce7d7f21bc60e798017fa79d673ab048f5a281c SHA512 6f3ce5c4121a17d4e85a087c9010fdff37eb4e381517dc0d64fff955cf7041016aa1f37ac2f14a335bfaac13cb92031431eb31bfa0f00a6827c177b5a671f841
 DIST SDL2-2.26.0.tar.gz 8085459 BLAKE2B 4971cef0d34706dd02eff5277fd58b35523ee3b1d860999b37ddf4dbc463f493859a43325c4faa9bd048c519d49788adb3dd7f38e6b29eb635c0e0e405c944e9 SHA512 b4379140399e2248b28c4fe36ba6bb142cd047014c3cfc6fd2c0fee7110ad28af6553f24ca4ccf4996165940de127aafe8d744b09bea9d5684ce8244697996bf
 EBUILD libsdl2-2.24.0-r2.ebuild 6525 BLAKE2B 6643135d04b333c6837736b50cd0a4367dc8982886e76fb1830c58df1b2bcd0649cf7e2870c5b638f89d9839710d5feb68d647d7e08602995c7a7fbbcd7e6666 SHA512 5d019cd23df2edb4a4906520040d1aa81477f9860cdcb867e7393549a33bb0685f7f8918ae19550d7a44fb6aa5de37b654b4439f4810be6d6b85b4abcf3c59bd
-EBUILD libsdl2-2.24.2.ebuild 6377 BLAKE2B cdfd0c89c138b2b8bd9c444216e0875d3832d8a3e077efdb3654a5ae81ad5fb2a47e44f269ddc0f5bb4b21eee6d410e0c09a3fa8e30c60187f7955870e4c0ab0 SHA512 cab54b77d8586b92b74473d3a1f1fa5d381f5d750bd8ed195a1ed2bc188c4b9d62459f620add7b671bac2ace88d46f8c8a34149441433c6b4d6cb6fcdbd9491f
+EBUILD libsdl2-2.24.2.ebuild 6374 BLAKE2B 50e4b271232e3c9fef072e7e286c3559a249519145e36258b4e98ffb833c2c4e884c7f63943714fdf97d19344186e75dfbbbe762427dea682ae286e82d246ed0 SHA512 598cdf1fd94737eb3cb854fe38894e76b344287f63c655e377c2119763b009aad210ad1769ba8aa5d7b024998e5868d561e772cfd0c10b353413fbef2f462206
 EBUILD libsdl2-2.26.0.ebuild 6496 BLAKE2B 4efe9b4a44056e23aad1d1d5eb11887b8773451869c2332123b6d8bbb91d3324501cb52841b1d8d4c86fd5783e113ed3f55e953c3bcdd5a6ba25f12f01536044 SHA512 a735efb376e357093e0b530e88d04ff35c44c4fed386e12e2334f6d5dc7d125963fc0de55b047b76318a111a0d06d068bc9b957943c0a4ad10957f351416077c
 MISC metadata.xml 2054 BLAKE2B 611185e0b090bc8865c6ef61cf0dfab07a1806fd2db9fc50f2e3eaefba6ccb26127a51d61afd0a96c520d3d11be5a1a789631554705d7aa36270626d69ddfe89 SHA512 3a9bcecb9e0a8bc74ff8eb36d9dc4e8c1f7bf892428b3f6edd91b97082dd16e591117d45ee3d4558fc1b8137f16b54d01703b9c9c7c24cc149856ccc14bed2c1
diff --git a/media-libs/libsdl2/libsdl2-2.24.2.ebuild b/media-libs/libsdl2/libsdl2-2.24.2.ebuild
index ef182a0e1b8c..ca1cd4902af0 100644
--- a/media-libs/libsdl2/libsdl2-2.24.2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.24.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 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"
 
 IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index d982117e14d7..97142bd4364e 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -4,10 +4,8 @@ AUX netpbm-10.86.21-misc-deps.patch 1565 BLAKE2B a4d629ea9fe01efc45c799dac4bd376
 AUX netpbm-10.86.21-test.patch 331 BLAKE2B 59451b2f1632afdd8e84bcec0ef91e0589604706b373281bf4963385fe971991711cc6ed4f169cc45aa460ac1db20de69039b137da1a2ec3d6cb82b60ae5f745 SHA512 e5c1a88cc03e227c7a7a01e9586ceacaf24a6752f4285f228b0176a8a12a6a9ac83d8ce1c5965e8f56ab652b5e42aa2cd535f1e121449fe668312b7e49720e4f
 AUX netpbm-10.86.22-fix-ps-test.patch 15448 BLAKE2B cfe77600197fc39ef0be0ed793f5181db57fd718a6fed268a8afb2fd2b5afab404c3be3c89dc25d178f8fe2edc4d386e33f22f7b3bc826e9c90307ef3895830f SHA512 a521c771d2384cb86d87b4efdf05e0835adcbefb84d4e66e744b2f8bc40df5358f20c4824dce5a942ccc24b18168276278d65e8e9a529b7c09b157b3e02438bb
 AUX netpbm-11.0.0-misc-deps.patch 1446 BLAKE2B 721e926a83d50d04d4a407051ee077db5e5bf8fb1ae9aff1ff1d7859cf1bb0d5f74fa1143681b451d36323f93d5e7fa3876e485d6538958e30779cac081df5b8 SHA512 7135533660b15a113df5a38298725f895e8cbd6ac4695eb5f2d40bd214c43cb9d1c261063e0cea162a6ca6071cda5f4e0380d29eefa6af57e7d67ce319fe2216
-DIST netpbm-10.86.34.tar.xz 3698852 BLAKE2B 7ea0e93450fb0bdf50b1b498468dd32350f20c8e993cda3e0ffa942dcdeab775a532a4771b10c55c862340964a4520f51ea4916c20051d5140dbb0a9ce373860 SHA512 bbb4dc685a44c0d7733808edd938b1205891ae5cf312218ef717bf63053513058251a659e3cf9acc762b0aeec8da3fc8e8a05e1442591c87f5a1dce7f63ee870
 DIST netpbm-10.86.35.tar.xz 3699944 BLAKE2B 754b695ab25ba2c3ff0cdc8d3810a3df7af9a30476dfd6afa70591df0931334806ad41da41797e3f6121b77b7e3fb77a3c01ebc533812e9a8cb3ccb3eb6c19ea SHA512 a4a0107f04ccdef066d340f97a7d3487a2b349dd5994b294fd815813bb04db10063ba933442ef77e27a96fb3b31a5769f3a19532a651b802f14667dbf43c06f5
 DIST netpbm-11.0.2.tar.xz 3768544 BLAKE2B b6a8b9f3cdd3c7b633953aba911b4584e86f1b7ee4458025bcb058726ff868dd83c534f15f378cfe5977aff70489ffc1f450d2b9d3cbc4ca34978973f0866ea0 SHA512 6b2e4833d1be30a1cc46071643b6acba95b3f5b251014ff2a910f4d03bd29f0ef096e4bacb31e502f77eeffeece3c90320ce55ba322b8ce669782d69f64c8ced
-EBUILD netpbm-10.86.34.ebuild 6049 BLAKE2B 75cca31ec252ba64f4997d09a013e80b76d5aa4fa83654b7492a277f07c61e0070dcb0691b01a24662bb8549e9123ab8ea4ee0fd6a0dfe4d6aa7a2914582e1ad SHA512 bbf15b9c22a5a71e2e07f24fa946f757af8ac5f46fc8e9dfdc9fe6b23b329d1cff3c088f92ab62b3eb9e1a0fe985d8a39a2697cedee0da95ed7783e2d6d5392e
-EBUILD netpbm-10.86.35.ebuild 6871 BLAKE2B 3100d9e7b72b1d1f5a2a542d9939fe180f07fd2e356f668becec70b0092553092e9ae3c5fcaf62f6956c9a71dc7470fc9e12fec24830c867785e275129ea2e33 SHA512 a5e4936649a83abedbc246f5b03d6d34677dc2494c4f68869fbd9530caa25e5b844f8d0d272ca4715870e15c535e8bef53f3a83cc9b6d2b160ad68f89a143c50
+EBUILD netpbm-10.86.35.ebuild 6868 BLAKE2B 3863661d22c7720ded1328e566f76a94db9dc319f7e773ce1fb69c91e191a22a1d1a58fb95dc71bcbefaf882bce7be6bf41393333cd1a67593ad06db8e9e632e SHA512 8eb7eefa61c52cd1237ffa47965dad4cfd5a6482c3db79f74ed85afb6406bcf61ecfd2953d05e76ce57684dbfe318bb660d1145f4141c819c5203820592ef798
 EBUILD netpbm-11.0.2.ebuild 6922 BLAKE2B 64b66118c15efb4c99eca85e234886c738f4748c6f7d5109c371c0b5acb89bc0d815c625b3b47ce9aa614c1ce46e4313f39595c7539d065b6851ebe90ac1b8c2 SHA512 aad11fc8bd9522ccc5362079ee6bcaef9bc4d3ecac23054dc33f54fdc6df7378db26adab98218e9e1959931fb86e48af8f6909076c953a6b930b309ee4adce56
 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80
diff --git a/media-libs/netpbm/netpbm-10.86.34.ebuild b/media-libs/netpbm/netpbm-10.86.34.ebuild
deleted file mode 100644
index a9ec64dd2493..000000000000
--- a/media-libs/netpbm/netpbm-10.86.34.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
-HOMEPAGE="https://netpbm.sourceforge.net/"
-SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml"
-
-BDEPEND="
-	app-arch/xz-utils
-	sys-devel/flex
-	virtual/pkgconfig
-"
-# app-text/ghostscript-gpl is really needed for postscript
-# some utilities execute /usr/bin/gs
-RDEPEND="jbig? ( media-libs/jbigkit:= )
-	jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] )
-	png? (
-		>=media-libs/libpng-1.4:0=
-		sys-libs/zlib
-	)
-	postscript? (
-		app-text/ghostscript-gpl
-		sys-libs/zlib
-	)
-	rle? ( media-libs/urt:= )
-	svga? ( media-libs/svgalib )
-	tiff? ( >=media-libs/tiff-3.5.5:0 )
-	xml? ( dev-libs/libxml2 )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/netpbm-10.86.21-build.patch
-	"${FILESDIR}"/netpbm-10.86.21-test.patch #450530
-	"${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
-	"${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362
-)
-
-netpbm_libtype() {
-	case ${CHOST} in
-		*-darwin*) echo dylib;;
-		*)         echo unixshared;;
-	esac
-}
-
-netpbm_libsuffix() {
-	local suffix=$(get_libname)
-	echo ${suffix//\.}
-}
-
-netpbm_ldshlib() {
-	case ${CHOST} in
-		*-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
-		*)         echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
-	esac
-}
-netpbm_config() {
-	if use ${1} ; then
-		[[ ${2} != "!" ]] && echo -l${2:-$1}
-	else
-		echo NONE
-	fi
-}
-
-# for bug #828127
-netpbm_cflags_for_build() {
-	if is-flagq -fPIC; then
-		echo -fPIC
-	fi
-}
-
-src_prepare() {
-	default
-
-	# make sure we use system libs
-	sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
-	rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
-
-	# take care of the importinc stuff ourselves by only doing it once
-	# at the top level and having all subdirs use that one set #149843
-	sed -i \
-		-e '/^importinc:/s|^|importinc:\nmanual_|' \
-		-e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
-		common.mk || die
-	sed -i \
-		-e '/%.c/s: importinc$::' \
-		common.mk lib/Makefile lib/util/Makefile || die
-	sed -i \
-		-e 's:pkg-config:$(PKG_CONFIG):' \
-		GNUmakefile converter/other/Makefile other/pamx/Makefile || die
-
-	# The postscript knob is currently bound up with a fork test.
-	if ! use postscript ; then
-		sed -i \
-			-e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \
-			converter/other/Makefile generator/Makefile || die
-		sed -i -r \
-			-e 's:(pbmtextps|pnmtops|pstopnm).*::' \
-			test/all-in-place.{ok,test} || die
-		sed -i -e 's:lps-roundtrip.*::' test/Test-Order || die
-		sed -i -e '/^$/d' test/all-in-place.ok || die
-		sed -i '2iexit 80' test/ps-{alt-,flate-,}roundtrip.test || die
-	fi
-
-	# the new postscript test needs +x
-	chmod +x test/lps-roundtrip.test
-
-	# Do not test png if not built
-	if ! use png ; then
-		sed -i -r \
-			-e 's:(pamtopng|pngtopam|pnmtopng).*::' \
-			test/all-in-place.{ok,test} || die
-		sed -i -e '/^$/d' test/all-in-place.ok || die
-
-		sed -i -r \
-			-e 's:(pamrgbatopng|pngtopnm).*::' \
-			test/legacy-names.{ok,test} || die
-		sed -i -e '/^$/d' test/legacy-names.ok || die
-		sed -i -e 's:png-roundtrip.*::' test/Test-Order || die
-	fi
-
-	# this test requires LC_ALL=en_US.iso88591, not available on musl
-	if use elibc_musl; then
-		sed -i -e 's:pbmtext-iso88591.*::' test/Test-Order || die
-	fi
-}
-
-src_configure() {
-	# cannot chain the die with the heredoc
-	# repoman tries to parse the heredoc and fails
-	cat config.mk.in - >> config.mk <<-EOF
-	# Misc crap
-	BUILD_FIASCO = N
-	SYMLINK = ln -sf
-
-	# These vars let src_test work by default
-	PKGDIR_DEFAULT = ${T}/netpbm
-	RESULTDIR_DEFAULT = ${T}/netpbm-test
-
-	# Toolchain options
-	CC = $(tc-getCC) -Wall
-	LD = \$(CC)
-	CC_FOR_BUILD = $(tc-getBUILD_CC)
-	LD_FOR_BUILD = \$(CC_FOR_BUILD)
-	AR = $(tc-getAR)
-	RANLIB = $(tc-getRANLIB)
-	PKG_CONFIG = $(tc-getPKG_CONFIG)
-
-	STRIPFLAG =
-	CFLAGS_SHLIB = -fPIC
-	CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build)
-
-	LDRELOC = \$(LD) -r
-	LDSHLIB = $(netpbm_ldshlib)
-	LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
-	LINKERISCOMPILER = Y
-	NETPBMLIBSUFFIX = $(netpbm_libsuffix)
-	NETPBMLIBTYPE = $(netpbm_libtype)
-	STATICLIB_TOO = $(usex static-libs Y N)
-
-	# The var is called SSE, but the code is actually SSE2.
-	WANT_SSE = $(usex cpu_flags_x86_sse2 Y N)
-
-	# Gentoo build options
-	TIFFLIB = $(netpbm_config tiff)
-	# Let tiff worry about its own dependencies #395753
-	TIFFLIB_NEEDS_JPEG = N
-	TIFFLIB_NEEDS_Z = N
-	JPEGLIB = $(netpbm_config jpeg)
-	PNGLIB = $(netpbm_config png)
-	ZLIB = $($(tc-getPKG_CONFIG) --libs zlib)
-	LINUXSVGALIB = $(netpbm_config svga vga)
-	XML2_LIBS = $(netpbm_config xml xml2)
-	JBIGLIB = $(netpbm_config jbig)
-	JBIGHDR_DIR =
-	JASPERLIB = NONE
-	JASPERHDR_DIR =
-	URTLIB = $(netpbm_config rle)
-	URTHDR_DIR =
-	X11LIB = $(netpbm_config X X11)
-	X11HDR_DIR =
-	EOF
-	[[ $? -eq 0 ]] || die "writing config.mk failed"
-}
-
-src_compile() {
-	emake -j1 pm_config.h version.h manual_importinc #149843
-	emake
-}
-
-src_test() {
-	# The code wants to install everything first and then test the result.
-	emake install.{bin,lib,data}
-	emake check
-}
-
-src_install() {
-	# Subdir make targets like to use `mkdir` all over the place
-	# without any actual dependencies, thus the -j1.
-	emake -j1 package pkgdir="${ED}"/usr
-
-	if [[ $(get_libdir) != "lib" ]] ; then
-		mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
-	fi
-
-	# Remove cruft that we don't need, and move around stuff we want
-	rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
-
-	dodir /usr/share
-	mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
-
-	doman userguide/*.[0-9]
-	dodoc README
-
-	cd doc || die
-	dodoc HISTORY Netpbm.programming USERDOC
-	docinto html
-	dodoc -r *.html
-	dodoc -r ../userguide/*.html
-}
diff --git a/media-libs/netpbm/netpbm-10.86.35.ebuild b/media-libs/netpbm/netpbm-10.86.35.ebuild
index b6d749772636..3387ac5fd38f 100644
--- a/media-libs/netpbm/netpbm-10.86.35.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.35.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P
 
 LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain"
 SLOT="0/stable"
-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="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml"
 
 # app-text/ghostscript-gpl is really needed for postscript
diff --git a/media-libs/sdl-image/Manifest b/media-libs/sdl-image/Manifest
index 4d84b0bf92ef..91041a87e150 100644
--- a/media-libs/sdl-image/Manifest
+++ b/media-libs/sdl-image/Manifest
@@ -1,5 +1,5 @@
 DIST SDL_image-1.2.12_p20210314.tar.gz 10890897 BLAKE2B ddc3e0a49e4ce8fc3c46c5dabe277f9bd2db81f43880aadc8fbd3b6fa09254669fdac90ee4c3c7b92d5c7ec97747944c3953ea2dca065e646416391730cb22dd SHA512 f087472593cbaa9e65c5d643d7801e2ff5e49bee66502d8c094ea18bcd5f66e6da153d39bff7bc81ed20556c909fc4cce279275ff55ee00aebf07d39c27fd543
 DIST sdl-image-1.2.12_p20220527.tar.gz 10888198 BLAKE2B 413e130794ca3c59226e18f4380bc34fb497aadbe01da67ce2c9c76ebbaa5d3e47bad31043d823510ff62ef4bfaa4834d57799b7ea733f11ab66e58b37007583 SHA512 e0a091e1f1a646409c2f636b6e913b6532f31fa498a234fc669dd56b75dda34234818a22d7c3b5385cb50eb3af53316fa2f658a6739b40e4dd5d9513118143c6
 EBUILD sdl-image-1.2.12_p20210314.ebuild 1834 BLAKE2B 1e72f9c8325bf61eb0852bc4f81685cb19b35372a41015527e3fd6d126fcd477934f4e830734009b070110db8e3167e65ba6c2899d489ac05c0d96bdd9db56cf SHA512 3188b78295cb2a99565f8ef5299f406ced211c91d3fd71556c75f873a4552a1a8b74debb230891d67f1f18a49ab93d52ea9c074343bcc08f29626c6e621adfa2
-EBUILD sdl-image-1.2.12_p20220527.ebuild 1880 BLAKE2B aa43b9924b2266b4cd469a858d0825e5e2989edd820114af516a6af3f949c02b0fb434b68a3578fa8a6f546cfae17eaffae17e813bf68c918804728d5dac7951 SHA512 8e18fe78a74fa5d16c48c64d4d281643836a639dca5733f0dc200917313f3f7fe03eb4ac471134645f10a22fd2aa7019989875749a7aae3a6edfa26567029619
+EBUILD sdl-image-1.2.12_p20220527.ebuild 1878 BLAKE2B 6aa43154955bb2b2cc648129f0d29511cc5dab492f27d81ce1acb49bd563875c2d4adef66ea5148b6b676705f6f85576a6af25b6e473b0a1cd999b3d1d87e008 SHA512 545c03e8ed303c753118c2f84eea78739462502b8ac52edcd725988af8e08cd43bb118b2beebec0678c9c187fe435a642885e8c80ab17a76c783545fbf5f5b01
 MISC metadata.xml 365 BLAKE2B e7adf1771a0e52171d5ace8c77b8fb4b65019796c885f279e813b22f5a1abbefcee1fa9189a479788db4e5d1d2b96cf61f79e6881c816a19f0270fb69521e8d6 SHA512 80cc2d8d6af06bd4a43448c91747a2f04c477a59e19c9b46007b444c949e60664c26b8dc51755b67d7dfbd13a218b4126301f10fa3074d65740a8bfc7a0fe477
diff --git a/media-libs/sdl-image/sdl-image-1.2.12_p20220527.ebuild b/media-libs/sdl-image/sdl-image-1.2.12_p20220527.ebuild
index 03519ff7c99c..028fe9afb080 100644
--- a/media-libs/sdl-image/sdl-image-1.2.12_p20220527.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.12_p20220527.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_IMAGE_COMMIT}
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 1e5482f5d0a4..4952c29081a3 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -9,5 +9,5 @@ DIST SDL_mixer-1.2.12.tar.gz 3707781 BLAKE2B b2fa822204fdaad860ff30307120bff7bad
 DIST sdl-mixer-1.2.12_p20221010.tar.gz 5861748 BLAKE2B 95b8e59bf796aa1a1593d8895aa153d62653fc9085e65c380cef3a0394201dd6c5c0deb323d6acecd4bca0e46d11f0ec94ebab8be872654e46d2d56231a1fd12 SHA512 5b15bf81b868968a09f82b160e371355e40a29c95a3e79c3cffa49ab5cc7c3212034d12301c21c8a44aef5c981a7a8fec3cb76e9dfe55619159a613b8dec6557
 EBUILD sdl-mixer-1.2.12-r5.ebuild 3601 BLAKE2B f51bbe3d0cc2c60b47ddf3626a07b45bbfcc5334adf4f1fef0d6fd681b9fac44d47e3e879397329355539288c6d983cc31a600f9e9c4403143688c221e1df881 SHA512 dd3969be4a66304acbf4366dfd387a00ae4558ad7d595f62c7e7790d6206be5fede4ae807abec8a5baaa9484c98b158e5431f4c663306bf6f120cd4b25aefcce
 EBUILD sdl-mixer-1.2.12-r7.ebuild 3660 BLAKE2B 8b140bae4093ad4cfb2d8f69890ec72735e20037033a17fbacb889e749e61d609bb3b252cfa58edb77dbf6d0f3413e6389d70ce5a1b50096606c7cba67274c30 SHA512 570cfd9dce65dfe49f1303d89a0eeb1e6ffb6c0582fd144b1900f274068bae76a9c7e52c04e2c5e80913f862df7deebde79f46696e966641389782c722b7bc3f
-EBUILD sdl-mixer-1.2.12_p20221010.ebuild 3122 BLAKE2B ef3e790ed0bb8f0cef6ec3e65ccfe9c0c67c6fa5cdb1124c8125abfc1f32726e87fef5b7ce3b3c3275f3fffe0193ef674bcbd0ef744d2603fdee2527cf7dcb87 SHA512 d2d5a959cca206ce9f2bef88987459965fd30e4998ed2f57b27ef285e9129d41eab2d393e2fa826f04540c61d08925e92081fb389c9afb60054e7b963dcc3ba5
+EBUILD sdl-mixer-1.2.12_p20221010.ebuild 3121 BLAKE2B feb56a82e51f56fdb53cc4849f1a4813a1ae943697c62f7322e6d9cbebbc9d4effc68a93300ae8eab418b5a12dec038e3d284ca32fcb97dbfa4c183250aaea5e SHA512 8ea957de4bdd85ba2a8f9ca03177ace3d4e657b668f12ea7cd4ce6ffa45ee7741bbb41efcc49249aa5d704bdbd679e5353d86981ac4c17564b02b57276e326e8
 MISC metadata.xml 787 BLAKE2B 4a9a04b0b88ec853de52f1cc7f6ad63e6bd4e5a421906daa2e0935c32d756538ef9aee8631e5be96665dd37ec6c4e47d256e30b01f7cc6ca56f29baaaa5ef27d SHA512 46520c6a56e9d6ff2137e71bf728349ed167f7ec10417345528e6da051e482b3a27158e46ae973d1bd0f348cac9e3f65e8a02eef984b8e00fbb2aced256ad2bd
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
index e15f193b6209..7c4950f1504f 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_MIXER_COMMIT}
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
 
 REQUIRED_USE="
diff --git a/media-libs/sdl-net/Manifest b/media-libs/sdl-net/Manifest
index 05b55cedba84..52c3d8487905 100644
--- a/media-libs/sdl-net/Manifest
+++ b/media-libs/sdl-net/Manifest
@@ -1,5 +1,5 @@
 DIST SDL_net-1.2.8.tar.gz 360958 BLAKE2B 656fb9c86949bc962656edc7b950e64eee9b9b1ce1b257e6c4974c2d9be99714128c5556d3a3b7ea92cc6d294846af7a51a1925d17418afc8409e44a7b71099a SHA512 2766ca55343127c619958ab3a3ae3052a27a676839f10a158f7dfc071b8db38c2f1fc853e8add32b9fef94ab07eaa986f46a68e264e8087b57c990af30ea9a0b
 DIST sdl-net-1.2.8_p20221010.tar.gz 373106 BLAKE2B 00f98a3326d5aba85acf839c4c4d02e8ac78d99bf5633ce8cdf0cf8bb281f2a730769a9ef769c834f847db74712c6715928b37520ed5c60aa06e4d828c8650e2 SHA512 643f0505252e32cca88456edcce7d41f0b37e1362bcdf26d714d2473be323ed70b43c825eb96522d9562be5f6830cb9062250de2e8b1244bbc8d31fa800d3342
 EBUILD sdl-net-1.2.8-r2.ebuild 895 BLAKE2B 751089b5fc5ae6abb7b25c07d045638110db282915bd51fd26e418ff28b0662720d9e4f6d265ad24ddb54a94b76c8fc09aa5975103e25dd72e6d204701a8aba1 SHA512 4dab254afeeff6b43e942062a85740f4b100a0ef16ed00288beaa7599e51f656032815139fda5e53b7ea67cece0c3c0bc52920d65c07448649175776858a08c6
-EBUILD sdl-net-1.2.8_p20221010.ebuild 896 BLAKE2B ec21e2609c9d77af973125fc147b6ac1a9099d41cbaf5660368d5ce9ad2f6c77f411c7ee449514a1d39d9865955c111358bb1874a68a5797d98925aaed73bfc9 SHA512 ceaf47ca3a28ebb9ca9b52cc976d9bb459475a9bef67daada65516a68b34073bd28cd05c9d56b1bba65459e7371587f16455cb7602536ecfe5cab7bd6a12bcab
+EBUILD sdl-net-1.2.8_p20221010.ebuild 895 BLAKE2B e1a9e20b3ffe2d715b2e2c4b449e994487abf3f53f5a3226f6b02d256161b285e12f7f78cfddb0e96a24c936426b17aec6714214d5c21db4a6a32483289ea54f SHA512 844b1d0a5b2696a004d309dedf63251ef6e7c13bd9b44ce0943cc640a46c0a840e97b9adbead4643d23da31370c2beb95ff09756f7f12b42fe00176b6ff76518
 MISC metadata.xml 337 BLAKE2B 48ae83a7d75050dc1fc90dcd86e5f56d347f356af4c7d7e6bf0e7bd58a3cb56cc9a1d20391a195066f2198651e41c0af832b427490aad18c15d21250cd598f88 SHA512 9cf8aeb4bb0d72403d3c13e45bac9dbb54f791d1e783f384c5b87c014fa8b25696c29679479aa40d9ea96a2c6c71263bf1f3e3094f2930bc28fb11c32e36254a
diff --git a/media-libs/sdl-net/sdl-net-1.2.8_p20221010.ebuild b/media-libs/sdl-net/sdl-net-1.2.8_p20221010.ebuild
index ed742066f7d2..bdc3eeac0897 100644
--- a/media-libs/sdl-net/sdl-net-1.2.8_p20221010.ebuild
+++ b/media-libs/sdl-net/sdl-net-1.2.8_p20221010.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_NET_COMMIT}
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="media-libs/libsdl[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-libs/sdl-sound/Manifest b/media-libs/sdl-sound/Manifest
index ff996dce87d1..c88f30b853d1 100644
--- a/media-libs/sdl-sound/Manifest
+++ b/media-libs/sdl-sound/Manifest
@@ -5,5 +5,5 @@ AUX sdl-sound-1.0.3_p20220525-underlinking.patch 1476 BLAKE2B b9abb706fe79cb6c9a
 DIST SDL_sound-1.0.3.tar.gz 1127100 BLAKE2B 6fff5ea22ae82f9692a51910d5415288d5a1ebc1c463b2c741f9ee9fabeabb385de12f781d4f40aaf0628598824758376c51b442f434d77d96d0376379908ff6 SHA512 3e60671777d804e6104d7d441f4a29866492c9412040eea3fd2283c0914a0a1ebc550260631c2bf500e7d982e05a6f9feeda81e9eeef8257303750c1be582824
 DIST sdl-sound-1.0.3_p20220525.tar.gz 1044804 BLAKE2B f82f7649bd411290d12ec6b6a4879e0f6a5a155b764b307b087ce2cad5b81dc0ac6fed674c666f470201e5aab5182d9e0c4b6f0d9fc94e9d4bc61d7dacd61cdd SHA512 0f4923e8234334c65697c1d9453a66b05aafd859b1586d9ed26005d93f4a27175b06a77616f09e450b586d0f21c7a1d76761de0fe5f1b144d444e6a2379055b5
 EBUILD sdl-sound-1.0.3-r3.ebuild 2134 BLAKE2B f1f5429dfb243da26936fa89ee47e50cd171defc1b470b75af1ad3666071ceba5ee1bf580d75c425370984d87a6e36507332bb8d6b6712ff72d8c8dbb506fa04 SHA512 05794ef14e799d102fc2354c4f3e02106b66c5ee8dee1c5a6a30f28a95a6294e7bc0b61b0e859d9c286b9f885a043dd361767fbbc8e532459d930c347b064d70
-EBUILD sdl-sound-1.0.3_p20220525.ebuild 2039 BLAKE2B c8cde4f4f04cc075fe7ca91ee8760eae35fcea727c87c04e4315a7bdb23d5290c1242b6302b4a409aa7686ea37f9cbd7cd1b91dedbca4f422ea3d3e99ad3e9ea SHA512 0a01de2c37ba86cace84b03a5eb60b0fc9cdd63316a14a1ae0188fcf5dd0a880e25440069c01ac36e9f59e9433474c4feb13de6694fb6fc38ff695f80e2be74e
+EBUILD sdl-sound-1.0.3_p20220525.ebuild 2038 BLAKE2B 9e2cfad010b82d8229c0b6655775d457c079bbe3a56cc5c4ea6f053a3fcf1ba785628187a1cfe5626d9edf1b9e76685d685477f7405064bd08ffba4af70a845d SHA512 7fefd4ff0310701970a1ff02f261a8121314d0a3bd93e478d91cb95b368aee62eadf6bf6a2da31e78a3ce6856a4b38fb3b7b71a15059a994f26091235bbbd48a
 MISC metadata.xml 530 BLAKE2B 1927045e4dd57e0b2ac63cc6ef1165009aafe2a981c2d8bc0ff9ea3e3b9473fdca4945b8b7227a285a425bfd97fa4a65809e7ebe6477ac95bfa0952ea5a6190d SHA512 cc8d087914c0ab7689a7cc9ce230de1d531c4e424bed3b73c21a215a8b681314c9e0fad95039cbf4ec2e4e93911ac876821505ac7f0872c251240121d8e77b77
diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3_p20220525.ebuild b/media-libs/sdl-sound/sdl-sound-1.0.3_p20220525.ebuild
index 5d6c6d84b2a7..6ce3a9672d52 100644
--- a/media-libs/sdl-sound/sdl-sound-1.0.3_p20220525.ebuild
+++ b/media-libs/sdl-sound/sdl-sound-1.0.3_p20220525.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_SOUND_COMMIT}
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="flac mikmod modplug mp3 speex static-libs vorbis"
 
 RDEPEND="
diff --git a/media-libs/sdl-ttf/Manifest b/media-libs/sdl-ttf/Manifest
index cfef12df3c71..ba7321ac43b9 100644
--- a/media-libs/sdl-ttf/Manifest
+++ b/media-libs/sdl-ttf/Manifest
@@ -3,5 +3,5 @@ AUX sdl-ttf-2.0.11-underlink.patch 244 BLAKE2B 2eb1782f89a72c94a1d90e4560895aafc
 DIST SDL_ttf-2.0.11.tar.gz 4053686 BLAKE2B 3a78eeec91d7f6983b851cdd52925890c168cdf85dd34c7722183cc5a8848dab530c0c2d76493e0a380aa7e4f81967eeefd7cb34dc74faafc40497ffcb0e577b SHA512 64e04d1cd77e525e0f2413ad928841e5d3d09d551c030fc577b50777116580e430cb272b2aeb6191dfcc464669cf2f7a5a50d10e7c75637a3b1e8c8fca7fc78b
 DIST sdl-ttf-2.0.11_p20220525.tar.gz 5421461 BLAKE2B 93422fdc912369a503ef0bc2f474a7afd749396176a295484b9ff8b1c0b5a06c2a5a21b93c91b616816f7c1c5f3ff35c611618251e8ae7f2b2d337109a3cab56 SHA512 a371488b59b8d1d2b067ee8bb67912d11875ac202912ffd31d5fee4630dac205e2e757505ab4dba3267e4d2700c043873c3b37aa6813ece8333f1b25fa096346
 EBUILD sdl-ttf-2.0.11-r1.ebuild 1398 BLAKE2B ea98a92174df8aa8d932c6c3e296250bd83fac8796a94e7a1c992c939b35d577813a8508a1f5df2ce5d37c7dc04a5d2bd0b07c5377a1afb7a2461c545fe00e76 SHA512 e6e4f41689ccd531dd2766d0417e787ab28d48c784f2cf7554f6cf69c91dacc98ae07ad5aa10d8b134a2703146b7cd1a945f48c677d4778a45f62bdf61b5764b
-EBUILD sdl-ttf-2.0.11_p20220525.ebuild 1239 BLAKE2B 77403ccbdce0ad8cbd4b350f5d7007a06f82ed27e7048ab661693cdad9a875a64ba2eb03135d9c6e5a66aa07e708c4538195391e35af5045e1d282d398096c6c SHA512 bd79b574e56ca285f56b03c7684d37a64ef7c0a751fb436aa437473204842c2f731e5f7df0a50dcd79b7dd617c7968b8aa59a38a671f066a255b045244c43b68
+EBUILD sdl-ttf-2.0.11_p20220525.ebuild 1238 BLAKE2B d7e124ac68d06880704650902a02826297fa17ca6ed04fe9b691aae5a6d81740d50a041f5abbc6ef27bca59947e209fd748fd3c0a0453628dc4145fba2bdf0c7 SHA512 620e39192ae7001887d3730a0cb3f092a7ac82aa7344b234e846f0621f3ff2e26768aec5000118cc16da61cb1e8933dcd9b7df163d90b6e9325209ddda17c0ef
 MISC metadata.xml 604 BLAKE2B 28ad2d239df5d6096bbc586e3842b9b41739a76a740995955e08e7a324cca40566fed84a4050447cb9cb8edfbe14562f62bdfe7aa6b5b1c407104a0912dfc013 SHA512 07e5dc681f113e2657bb37307e4a28b1630e142d42685403f04af8505f9eb52dc6bae513710ca0b94170174d75455d0315dd75c784d99ae0cd1ac79fde3cf793
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
index 1e861438662a..b3dff2793631 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_TTF_COMMIT}
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="static-libs X"
 
 RDEPEND="
diff --git a/media-libs/sdl2-ttf/Manifest b/media-libs/sdl2-ttf/Manifest
index 3ea386de4d03..d2a041e54364 100644
--- a/media-libs/sdl2-ttf/Manifest
+++ b/media-libs/sdl2-ttf/Manifest
@@ -3,5 +3,5 @@ DIST SDL2_ttf-2.0.18.tar.gz 14896353 BLAKE2B d1409353b06a1ca33e053ffabf1b0522270
 DIST SDL2_ttf-2.20.0.tar.gz 13156472 BLAKE2B f31b1193beaaab0e2aaab6f56c82f4931db79ab81526398e20176c9fb121409d4f9f56109aa721d645496f6c228450cb95bda48c40037f1a3f904154e0e21fee SHA512 14c78cfa04b938f0bd141d841a9473a1678bb04d01a96391cfa37ae3e7e316c90f175aff7d052499f7d982f59b823813e4cfdd367631a44b08b85f9b60d09c8c
 EBUILD sdl2-ttf-2.0.15.ebuild 1012 BLAKE2B bf74f411dec169458fc2d3bbd4ef6767dd71dfdcb864a0ced60dafa9d66c1336ada53285218304c935389d1d8e76362bb0560a796302ea982a2030a96747f5d1 SHA512 7c4aea39529b338e10a3d005ea3563f49f8b38481fcfb47546112c7900ab59696f7b9c0591291b0528c3e24e4f0b4c7e7d3140a735688fb6021c267792e820ab
 EBUILD sdl2-ttf-2.0.18-r1.ebuild 1263 BLAKE2B d269da1117ec58cf58adaa977c1e169da57b8be96f24ff3f616adeb633e719fbd6f8315ed194d98d49fa07b395796724512b1e710e4efedada2fa5f717c33024 SHA512 ba3422de6719f35811bfd1fb510256b6747cdc1168bcf1bc968c7d68e956a0e6b6b7348f3c0f572a8a5c6a8617ac8b9f217d2fedeb1b6e0c7b513783ed9d1561
-EBUILD sdl2-ttf-2.20.0.ebuild 1080 BLAKE2B 95ec88809ba12874ccf1064cafc9920911146210cf1d32925e8fe99ccff0226962ac2ba72d76fbac6a2221064312ae71e8fee92ab7bc76a0d47b98e2941475cd SHA512 1cab75d377ba8b3acd720f893b0c3fb7ee20312987631499b6e6995773a0f3044bfc6880c301120bbe48df70bdf3e77cc47aa2de795e6515d43d15ec8272ce50
+EBUILD sdl2-ttf-2.20.0.ebuild 1079 BLAKE2B 7790dcdc1d4f6dfcf512b1bc1c3d296b321f5a4c9340a929bec67eae282bbf775b76a5ef56bf4a4a2303427ad7aeb73b783312d251bb40d9db961004131929e7 SHA512 ddce50a5e4d7bc6b3b1d0b8626db85d980a183c5a171671224abda3ceee19734d495cd57837e1e97079af2dcc5181668235bd3120763703ef6ab5d9d78631acb
 MISC metadata.xml 694 BLAKE2B def65e69533279b6f10d380901d78f004e3524413598d9ecd2661262eb2ae5f6331f1a0fa2729084b2b5fea05e0811057098686a4fa4f65d6a92a0cdb667310a SHA512 f5d6cb83fe8ff6db7f3c6c171a435e7682470299738cbe4a90a7132dc5bd0083f0abd052754c037e10b23a94dc57e57a938bf489334191ed9c144e4493d28232
diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.20.0.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.20.0.ebuild
index 23bd6cdcdf9b..a7e29e6862e1 100644
--- a/media-libs/sdl2-ttf/sdl2-ttf-2.20.0.ebuild
+++ b/media-libs/sdl2-ttf/sdl2-ttf-2.20.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="+harfbuzz static-libs X"
 
 # On bumps, check external/ for versions of bundled freetype + harfbuzz
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 1d2fa3668d69..ffbe7fdff49e 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -2,7 +2,6 @@ AUX tiff-4.4.0-hylafaxplus-regression.patch 1100 BLAKE2B 7d45e1b8c9ff6e2956b7190
 AUX tiff-4.4.0_rc1-skip-thumbnail-test.patch 1176 BLAKE2B aec14df94825b3709941b065bfa6eccfef5727ab237feb4022e614749964541b5528f9724763bd86ead8aa1584590cb7900f17123c58d3e4b45a470f240a4d68 SHA512 e58fc43a081205107175122dc6f05281e2c11ef961645e3f0ac4ee6b54c22d3898c978c8ea8984394fc74a92bd81c4fb4a37915d32689314fb97c7f3aeb5b6c1
 DIST tiff-4.4.0.tar.xz 1929292 BLAKE2B d05a2fb293557d1e7cdec116c65c8338d7714af7b6abd8dd3bb2b476d62e044adc7d6c298843649d63c6bc09f6ce4660ee23638f9beb716937ccf236c2829dcf SHA512 c9611faadc9b1199f3aba9a43bfa160c77c11558d1fa358b42115ed78db73c8387531c0668cc9021842c58f1c02f8d84264d3600e1039dfe6f866822ad91cff9
 DIST tiff-4.4.0.tar.xz.sig 310 BLAKE2B 00dc8ff9c232ec4cca8b294659e6379b9bb512b58cd3d2f9231e7c10111510ac56aff3c6fc133a47f9fafc27595e099297c25940414495d8ea7f5a75aa43e9d2 SHA512 4ffdcbf5a8ce4a3be543d0ad43101ddcdb6ef22c3da5768c86660a40cc0cab48032a65c5e7bb0667f43d55dad5aa09dc0df302e2f9dbc9f24b8ccac643a0408c
-EBUILD tiff-4.4.0-r1.ebuild 2829 BLAKE2B 044ecbfc0d8b0e29f21e2dd1052979b7d39b37efb3d1ef7dba9c066c9a3589a7ce12f51f481daef65b75ca1ae4d5504f09922106dfd1bee26912242e02477a0d SHA512 da712144361acc856e5204966e9638a169e03ca57fb56686e4ef64ad815b245e170579f7f5c7a37c010fcb556c8d0090a6492c849b7adba0410ff5d65c3f555d
+EBUILD tiff-4.4.0-r1.ebuild 2828 BLAKE2B 7e519df6e4d72869c2bef577881b911feaf9f74d0e574a5697f4c937cc05d2d980309b13dfe9ade1cc286e4a692c83bdd53c7f2d1ff542440791fbef6233b3b2 SHA512 c446d72065674828b2f6c18ec8749ea184a20b4fd64d0cbb46b581742e59c36b7f4f7613003e99a238cd85a89488b35c404b8d589e6511d7a54ff35df8f11911
 EBUILD tiff-4.4.0-r2.ebuild 2974 BLAKE2B 25dd9fd95309abeb2a5e5217cf1faf2f98b9a47f3bad8b1dd21114823e0bce44f07b9a0b4304a3ae9f5a4fcb2af735e0cbb000add98f19a0275508784b467d96 SHA512 0f36897a0736c590cdebb4a33152f7b0a75e57e1a2788e034cd43d819601cb7c92f4953f0163067664e0b3fe1b4b93db589f585dd95c050ca4b51e8fd25908b5
-EBUILD tiff-4.4.0.ebuild 2748 BLAKE2B 15347b6b3ce18e49c06cb471a31f18b4c0488aeb1007e37c1c4b6f34b849e897c1bf224b32b883d0995bacfd2d1a3a0b85e58d9d1496b118ccd82f2b09962a5a SHA512 2f1d9c4448dc494a58c863b96d4acaac5d19f472110da666458b31773ef29658049a5f57658586d739fdfa7e67c9efa4cf3ee38027d71d517bbd19ffc86a9801
 MISC metadata.xml 615 BLAKE2B b76f8c2714111fe539c2d15b56361bc3b2bc7469b3cd74cf933a9dad4ac8577b7bb1a2bc010ceb3623640778d1dbc912433988e938db7df8f8fca67c51003c2c SHA512 81b22e0e2763fbcd573d2c1fee362785c15c7c33cc00d0f7ce89eb9f95f55e64aee78eefc51de6d7270aa966102b744f070620828becbbb03012cc22e3e99469
diff --git a/media-libs/tiff/tiff-4.4.0-r1.ebuild b/media-libs/tiff/tiff-4.4.0-r1.ebuild
index 010a21b5d403..4fce57119100 100644
--- a/media-libs/tiff/tiff-4.4.0-r1.ebuild
+++ b/media-libs/tiff/tiff-4.4.0-r1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 LICENSE="libtiff"
 SLOT="0"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/tiff/tiff-4.4.0.ebuild b/media-libs/tiff/tiff-4.4.0.ebuild
deleted file mode 100644
index cfefc5a4c9e2..000000000000
--- a/media-libs/tiff/tiff-4.4.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QA_PKGCONFIG_VERSION="$(ver_cut 1-3)"
-
-# Release signer can vary per version but not clear if others will be doing
-# them in future, so gone with Even Rouault for now as he does other geosci
-# stuff too like PROJ, GDAL. Previous release manager of TIFF was
-# GraphicsMagick maintainer Bob Friesenhahn. Please be careful when verifying
-# who made releases.
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/rouault.asc
-inherit multilib-minimal verify-sig
-
-MY_P="${P/_rc/rc}"
-DESCRIPTION="Tag Image File Format (TIFF) library"
-HOMEPAGE="http://libtiff.maptools.org"
-SRC_URI="https://download.osgeo.org/libtiff/${MY_P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://download.osgeo.org/libtiff/${MY_P}.tar.xz.sig )"
-S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
-
-LICENSE="libtiff"
-SLOT="0"
-if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
-RESTRICT="!test? ( test )"
-
-# bug #483132
-REQUIRED_USE="test? ( jpeg )"
-
-RDEPEND="jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
-	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zstd? ( >=app-arch/zstd-1.3.7-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-evenrouault )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/tiffconf.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.4.0_rc1-skip-thumbnail-test.patch
-)
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--without-x
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable cxx)
-		$(use_enable jbig)
-		$(use_enable jpeg)
-		$(use_enable lzma)
-		$(use_enable static-libs static)
-		$(use_enable webp)
-		$(use_enable zlib)
-		$(use_enable zstd)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	# Remove components (like tools) that are irrelevant for the multilib
-	# build which we only want libraries for.
-	# TODO: upstream options to disable these properly
-	if ! multilib_is_native_abi ; then
-		sed -i \
-			-e 's/ tools//' \
-			-e 's/ contrib//' \
-			-e 's/ man//' \
-			-e 's/ html//' \
-			Makefile || die
-	fi
-}
-
-multilib_src_test() {
-	if ! multilib_is_native_abi ; then
-		emake -C tools
-	fi
-
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-	rm "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} || die
-}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index e615e20ac6cc..ba72b76382c1 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 9a83405b6909..f1322feaf40a 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -11,7 +11,7 @@ AUX vlc-configure_lua_version.patch 2057 BLAKE2B 995291bab038c912b5d76982da803da
 DIST vlc-3.0.17.4.tar.xz 26567148 BLAKE2B 4f36e7a9695d9e839fbebe92ec85c9411fa5b980b18332caf3dacfe51c6fea30cae71ee4cb0dad8b5536dd7d9b8801987f87a3c978eec17e444eaeacda603881 SHA512 dac14c6586603c064294672eb878253e52b3a7bef431fb10303345e5400591b5c1f2d452a2af03f503db0ca186582a84be06fdf05ab011c33f7b0bd5389c51fb
 DIST vlc-3.0.18.tar.xz 26631372 BLAKE2B 73d80615d5b4789ca980bd631db248e74de13d466e5f19b66a170ca785b46f281a1a242c6fdf14686cfb224aba3ddfeda16ffce11edbef3255c4bbdff36c517d SHA512 6fc8fdaa7e8862ad7133d69b3dab99ab9cd3945846a6ce5e2379b7f68ee9accd385c53b8573fc7c82f732c24678b4932b1154d2ad8accf06305f2f578d6fcd8e
 EBUILD vlc-3.0.17.4-r2.ebuild 13629 BLAKE2B 3eb7133d0acea2d9abb614f5fdd72188a603301321e92558312a1850c28ed17a78ad64a13e7cfa7928ac85ef7e12ac478b4089a28f97b0401c944f0f85aba4e8 SHA512 13a7d4d473e14e0e87a7ce17a9db384129ccb53512ac33e326e0b4dc6b262814e68d29e1407c2ea11a28086beedda70a1dc538edb453cf6fe2092095642bbf04
-EBUILD vlc-3.0.18.ebuild 13466 BLAKE2B a2a4307740f924347fe907448d875fa90ed975e72f5e08d9a1a1791e0320f99992de4a775d8736af2b98ebe23be6e9a49d879765818c8a3d14193cf20b4d0ad8 SHA512 496a655cd1603c5ddd39f89e40b9d7372f5e32d034a5459511761ac8df80da69e2ab305339ef8c8764b1f27ebc511dfefbab355fd95d719a1110e2d717a57043
+EBUILD vlc-3.0.18.ebuild 13464 BLAKE2B 6f932f2e6b56e4421440a9cd14d2675748876dda26d643b8e1ff267e9ddde46c0ea8bc038f42035a516b89f5521a81873aefc367c56ed304370c90e1217fa6b2 SHA512 7d4e119d0b98f1bc3de8edaab4ef0a104b46e1a1fa839c109ea1f1980f775918ff8266d9f623a461b5d9d0d5b60d98fc94b90acc9cc4dc58420e043287c51cda
 EBUILD vlc-3.0.9999.ebuild 13460 BLAKE2B d22acd93a5454be55ac2fbbe85adce8cf1b9105badeb062d03a608afd5a94f4d571374dbe503d1c3592a423702f074917760897c55b1dce82586d4ff79f659bd SHA512 8212b47b6726bca0110b53db38ea7c538112a8eb4243e8ad69ae3780498bfb52d61af4ddccb2995cfb57bc4303c93240fcb38513bacd1bcfeaf02b9f5ef75043
 EBUILD vlc-9999.ebuild 13510 BLAKE2B 4469d35b248303fe06842de7d15fe8fddb0092c81f786883fb3561cbe9a8ea6d80bd20e3d6605764168d68b6478666e003e0d0839773f2deef8f6c4344f7b76c SHA512 4acfbc0cee4d3c884aefe1f3b9cd193b765f925f3d0a368c20d7ebea08c25125ecea2be91ef489c9a506d534b1693e44f4893b86c42630a5a74de706c2b80b5a
 MISC metadata.xml 4923 BLAKE2B b115bd6bc666f1da6a0ba4d5b6237fedfff4baada406e56eff9c0f9574968177490c456e2d8f0ad07cf73b8e52bcc122931ae9f800d6a29e41cbfdd4ed6780fe SHA512 4b953a8662e31a66af1fb710e166316106b393d136fca7c1c5b61e78bd285bc578037fc11b7ae07202a6fae2a4a6e43f7f6560400bab8d92457012a4fa7e3045
diff --git a/media-video/vlc/vlc-3.0.18.ebuild b/media-video/vlc/vlc-3.0.18.ebuild
index a018ceda563b..ede271d53ba1 100644
--- a/media-video/vlc/vlc-3.0.18.ebuild
+++ b/media-video/vlc/vlc-3.0.18.ebuild
@@ -20,7 +20,7 @@ else
 	else
 		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv -sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv -sparc ~x86"
 fi
 inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index aa90871bf650..191bf345625e 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index dfcb66fb1040..0da6323eef3e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 03 Dec 2022 14:09:34 +0000
+Sat, 03 Dec 2022 20:09:38 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index fd54f1961c35..5297b6094b50 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 537682 BLAKE2B 5ea36706e9f3100f98a8bfc48465fc9c9965ad20b834454f02d0d345f47d095e5a9ed35b5f6e37007ee947d09446b720eafc19bfcbc8f9bac4db48a6a80580dd SHA512 0f5654de23f73899b445d3d10fa87c3ab643f77308df25999549e1b63748b5f101eb3f130afac8fb3e03eab64646d0e2016efd11a0f4eccc7a3b6117155d8d63
-TIMESTAMP 2022-12-03T14:09:36Z
+TIMESTAMP 2022-12-03T20:09:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOLWKBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOLrQVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBbvhAAsXQmTCM3EpYeAtuLfdJjYBW2jPWvYpVW8aQllJlp+xCovW5Ntq1pSWpH
-rxbzXc3xV3kBFxmI7NvgxcBvjEJkBlWSQaEOw8agp2qRron5JUqQxOnr84aPG/Ej
-IAcjIyQeKRuGYJD8ins3dG98CkUcbsMZMWjtc9j/QaJzkKb5pw1o8Tr8Yj5xP8zk
-jejbWOVWIcWfsxK/1SGVa6FRpMA5sJuAvBiOcELwSm0qaMPUFpAotEfQm7nm6XO8
-tn+0ZiVB70+KdIjT/E2fiuiDTbIO9peBPlvMZ3W1eSWDoCTDwjil0X52fr9l9JuO
-0u6YDm0AFT6oqgBWXKgpWThHRnUNOEp0NhEQBXkGtrT+ZgInzv9x+mPCUoa1xmgT
-ofpPhE/5GHBcyHtrgU3NQ/BxgWA4EDgJWwa0JYSx00q4cHjYhMcwLh/IbF4TiTrk
-iOxoiSSKOAtfcFpqSC4nj2YfKDqzKU0lRjoqLRoSOoAbcllpZtWOfUu41jSEAx5a
-6TeO/WYQKh2S8O5ejbTnr6qhM0oXm45Ge0Fo20k+TC+YRmM92KWtm8IKGEi1A+5D
-gR91HOlsXtsP5PLHgl9MsgSw2b2oBgawAr1UmgBSrFrH9x1gVwrw3cxJU3qcYA37
-uNm2Vf4ewjw9LI+Ddaij0w+Qo3vaRnefCplyC62jylrN/r8YGAY=
-=5I3N
+klC36w/9EERoZyi9fmBq5MrnQuPWQSJspRqtsAEEyzKy6SJQc6mtFIr0miIB90Ku
+L7lIBODgdek/9avXk9J0ORy61lWOOMhy9inFSDAEsHMPjAVD74tHqrkLAYVITMjy
+kdG/rSBDVTLV0qu0C3m2aKVk6oentBDoi1HooY+1qBnK68IkR4/YePDcRYP9smv+
+cb8+WhCPisv6tDs4ILD0KlV8P0+fEKw2ccKbjLoIzY2yjTnuCcO1K9/WVIeKF8Jh
+P+BDYa60sLjG+UNCqka59CsZKtEJWgJXHup1+/mUox7DHqbAP7c+4uiIMPLoKJWc
+oQ00AVxVt9+MfsM0C+SVPsfta8ai06bmfadMPwqxP+INYCCLzAwPk9KAZxCTyFoi
+1IjS4c2oQZvQuXw+86X6WzinjlYROpufL8ssNbBFrO9cK8bgy2/VE92EeQjaW/Gr
+XtbeSCmptdN36PiBJz//3QJ/JQsudtgQJOjmEWg3iUWzB6NuV16s9TKXRsU6+AHU
+EeTu5vHdLkJdeg32GlslE0D5s/UvY+sInoHAQEbC2tEUqtQm82Xt9YPKV0o3jcLh
+YTFysyEaxTIasQzBc7xTFPUu7SMhCekzRLVCRfns5l0dO4uUahed+BEERvTG8uja
+WP114VDS9dgX6AY5lKI/6aR9Vq9EywbRg2hgGLg+uS+9zX8k+8E=
+=Boa5
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index dfcb66fb1040..0da6323eef3e 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 03 Dec 2022 14:09:34 +0000
+Sat, 03 Dec 2022 20:09:38 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index e89a029bb828..abd5d929dea4 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 62ae907be44f..a02a68a90bbf 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/emacs-18.59-r14 b/metadata/md5-cache/app-editors/emacs-18.59-r14
deleted file mode 100644
index 441d416385ad..000000000000
--- a/metadata/md5-cache/app-editors/emacs-18.59-r14
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=sys-libs/ncurses:0= amd64? ( abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] ) !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) ) gui? ( x11-libs/libX11 ) gui? ( x11-base/xorg-proto x11-misc/xbitmaps )
-DESCRIPTION=The extensible self-documenting text editor
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IDEPEND=app-eselect/eselect-emacs
-INHERIT=toolchain-funcs flag-o-matic multilib
-IUSE=abi_x86_x32 gui
-KEYWORDS=amd64 x86
-LICENSE=GPL-1+ GPL-2+ BSD HPND
-RDEPEND=sys-libs/ncurses:0= amd64? ( abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] ) !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) ) gui? ( x11-libs/libX11 ) app-eselect/eselect-emacs
-SLOT=18
-SRC_URI=ftp://ftp.gnu.org/old-gnu/emacs/emacs-18.59.tar.gz https://dev.gentoo.org/~ulm/emacs/emacs-18.59-patches-14.tar.xz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c9f26a031aed94f56d615e5cd8eab405
diff --git a/metadata/md5-cache/app-editors/emacs-18.59-r15 b/metadata/md5-cache/app-editors/emacs-18.59-r15
index 941dc0b79071..8d251571c3eb 100644
--- a/metadata/md5-cache/app-editors/emacs-18.59-r15
+++ b/metadata/md5-cache/app-editors/emacs-18.59-r15
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
 INHERIT=toolchain-funcs flag-o-matic multilib
 IUSE=abi_x86_x32 gui
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-1+ GPL-2+ BSD HPND
 RDEPEND=sys-libs/ncurses:0= amd64? ( abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] ) !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) ) gui? ( x11-libs/libX11 ) app-eselect/eselect-emacs
 SLOT=18
 SRC_URI=ftp://ftp.gnu.org/old-gnu/emacs/emacs-18.59.tar.gz https://dev.gentoo.org/~ulm/emacs/emacs-18.59-patches-15.tar.xz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=252d8d1291c10264cfa5645cad300711
+_md5_=1e2b4991fd8bcbb913b36dcab01abaac
diff --git a/metadata/md5-cache/app-editors/emacs-25.3-r12 b/metadata/md5-cache/app-editors/emacs-25.3-r12
deleted file mode 100644
index 08b3f6533bf0..000000000000
--- a/metadata/md5-cache/app-editors/emacs-25.3-r12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IDEPEND=app-eselect/eselect-emacs
-INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
-SLOT=25
-SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-25.3-patches-3.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=be9188b96b8bdcad542bb4789865a215
diff --git a/metadata/md5-cache/app-editors/emacs-25.3-r13 b/metadata/md5-cache/app-editors/emacs-25.3-r13
index 2720b5000b94..dde71aa860e1 100644
--- a/metadata/md5-cache/app-editors/emacs-25.3-r13
+++ b/metadata/md5-cache/app-editors/emacs-25.3-r13
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
 INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=25
 SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-25.3-patches-4.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=2ccf5192f4f95327b55acf6d803940c0
+_md5_=92f9b41d55f3eabd4307ffd665c48d2b
diff --git a/metadata/md5-cache/app-editors/emacs-26.3-r8 b/metadata/md5-cache/app-editors/emacs-26.3-r8
deleted file mode 100644
index ca6fdf2d7c67..000000000000
--- a/metadata/md5-cache/app-editors/emacs-26.3-r8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig gzip-el? ( app-arch/gzip )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IDEPEND=app-eselect/eselect-emacs
-INHERIT=elisp-common flag-o-matic readme.gentoo-r1
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
-SLOT=26
-SRC_URI=mirror://gnu/emacs/emacs-26.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-26.3-patches-2.tar.xz
-_eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=41ca8e2b176342d95c5fa6f72b77c3fc
diff --git a/metadata/md5-cache/app-editors/emacs-26.3-r9 b/metadata/md5-cache/app-editors/emacs-26.3-r9
index 352b1412f7fb..608659e55b6e 100644
--- a/metadata/md5-cache/app-editors/emacs-26.3-r9
+++ b/metadata/md5-cache/app-editors/emacs-26.3-r9
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
 INHERIT=elisp-common flag-o-matic readme.gentoo-r1
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=26
 SRC_URI=mirror://gnu/emacs/emacs-26.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-26.3-patches-3.tar.xz
 _eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=01f3817beb67bc6af38e3722198b317b
+_md5_=3ef139ba8e9b2a89782462f84bc030c6
diff --git a/metadata/md5-cache/app-editors/emacs-27.2-r6 b/metadata/md5-cache/app-editors/emacs-27.2-r6
deleted file mode 100644
index f4f239f6c5d9..000000000000
--- a/metadata/md5-cache/app-editors/emacs-27.2-r6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IDEPEND=app-eselect/eselect-emacs
-INHERIT=elisp-common readme.gentoo-r1 toolchain-funcs
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
-RESTRICT=test
-SLOT=27
-SRC_URI=mirror://gnu/emacs/emacs-27.2.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-27.2-patches-3.tar.xz
-_eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=ad97dd430bb7e54780eec79b03320c5d
diff --git a/metadata/md5-cache/app-editors/emacs-27.2-r7 b/metadata/md5-cache/app-editors/emacs-27.2-r7
index 7be2896af4f3..b5ef007dcc73 100644
--- a/metadata/md5-cache/app-editors/emacs-27.2-r7
+++ b/metadata/md5-cache/app-editors/emacs-27.2-r7
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
 INHERIT=elisp-common readme.gentoo-r1 toolchain-funcs
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 RESTRICT=test
 SLOT=27
 SRC_URI=mirror://gnu/emacs/emacs-27.2.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-27.2-patches-4.tar.xz
 _eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=27cde9bd5834dcbe905491f7bf5539b9
+_md5_=2f293ce07312cdadb0b31e30146587e1
diff --git a/metadata/md5-cache/app-editors/emacs-28.1-r2 b/metadata/md5-cache/app-editors/emacs-28.1-r2
deleted file mode 100644
index 6324e10272c4..000000000000
--- a/metadata/md5-cache/app-editors/emacs-28.1-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IDEPEND=app-eselect/eselect-emacs
-INHERIT=autotools elisp-common readme.gentoo-r1 toolchain-funcs
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
-RESTRICT=test
-SLOT=28
-SRC_URI=mirror://gnu/emacs/emacs-28.1.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-28.1-patches-1.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8223133ec14006d53890d385d1597119
diff --git a/metadata/md5-cache/app-editors/emacs-28.1-r3 b/metadata/md5-cache/app-editors/emacs-28.1-r3
deleted file mode 100644
index 292fe129cd09..000000000000
--- a/metadata/md5-cache/app-editors/emacs-28.1-r3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IDEPEND=app-eselect/eselect-emacs
-INHERIT=autotools elisp-common readme.gentoo-r1 toolchain-funcs
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
-RESTRICT=test
-SLOT=28
-SRC_URI=mirror://gnu/emacs/emacs-28.1.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-28.1-patches-1.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1bd32b502f7f373098e1be0786a02786
diff --git a/metadata/md5-cache/app-editors/emacs-28.2-r2 b/metadata/md5-cache/app-editors/emacs-28.2-r2
index 2d36c21850a9..13371fad7569 100644
--- a/metadata/md5-cache/app-editors/emacs-28.2-r2
+++ b/metadata/md5-cache/app-editors/emacs-28.2-r2
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
 INHERIT=autotools elisp-common readme.gentoo-r1 toolchain-funcs
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=28
 SRC_URI=mirror://gnu/emacs/emacs-28.2.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-28.2-patches-1.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=0077a661ba2eba96aac3c5f690379191
+_md5_=8cae7ebf4379139f7f002c1b081bc9bb
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 62b0334de934..2e3e446a4d33 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-wine-2.0.1-r2 b/metadata/md5-cache/app-eselect/eselect-wine-2.0.1-r2
index 5231d84d5ed9..bedf4d995c59 100644
--- a/metadata/md5-cache/app-eselect/eselect-wine-2.0.1-r2
+++ b/metadata/md5-cache/app-eselect/eselect-wine-2.0.1-r2
@@ -8,4 +8,4 @@ LICENSE=GPL-2+
 RDEPEND=app-admin/eselect xdg? ( x11-misc/xdg-utils )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/eselect-wine-2.0.1.tar.bz2
-_md5_=71fc599c9ffd1838f55b40ec8f5bfb90
+_md5_=14fe6dd1251083d42745964db242c10b
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 01cee34b16d2..504554c31c30 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/portpeek-3.2.2 b/metadata/md5-cache/app-portage/portpeek-3.2.2
deleted file mode 100644
index f5e3f64ae047..000000000000
--- a/metadata/md5-cache/app-portage/portpeek-3.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 )
-DESCRIPTION=A helper program for maintaining the package.keyword and package.unmask files
-EAPI=8
-HOMEPAGE=https://github.com/mpagano/portpeek
-INHERIT=python-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) >=app-portage/gentoolkit-0.5.1 || ( >=sys-apps/portage-3.0.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/mpagano/portpeek/releases/download/3.2.2/portpeek-3.2.2.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=b1b522aa4c1c3692e75781d82be39384
diff --git a/metadata/md5-cache/app-portage/portpeek-3.2.2-r1 b/metadata/md5-cache/app-portage/portpeek-3.2.2-r1
deleted file mode 100644
index 6df0eb82d6d4..000000000000
--- a/metadata/md5-cache/app-portage/portpeek-3.2.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-DESCRIPTION=A helper program for maintaining the package.keyword and package.unmask files
-EAPI=8
-HOMEPAGE=https://github.com/mpagano/portpeek
-INHERIT=python-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=app-portage/gentoolkit-0.6.1-r1 || ( >=sys-apps/portage-3.0.31[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://github.com/mpagano/portpeek/releases/download/3.2.2/portpeek-3.2.2.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=64ae907cbe7956f9f96d72eeacdcc7c1
diff --git a/metadata/md5-cache/app-portage/portpeek-3.2.3 b/metadata/md5-cache/app-portage/portpeek-3.2.3
index f17260afecc9..f6919fb70505 100644
--- a/metadata/md5-cache/app-portage/portpeek-3.2.3
+++ b/metadata/md5-cache/app-portage/portpeek-3.2.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/mpagano/portpeek
 INHERIT=python-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=app-portage/gentoolkit-0.6.1-r3 || ( >=sys-apps/portage-3.0.38.1-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/mpagano/portpeek/releases/download/v3.2.3/portpeek-3.2.3.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3bdc3d6ec99b9ab788db2215dc6b5839
+_md5_=664a0159056ad2108857aa895c9da948
diff --git a/metadata/md5-cache/app-portage/pycargoebuild-0.5.2 b/metadata/md5-cache/app-portage/pycargoebuild-0.5.2
new file mode 100644
index 000000000000..3d1a72824f4a
--- /dev/null
+++ b/metadata/md5-cache/app-portage/pycargoebuild-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A generator for Rust/Cargo ebuilds written in Python
+EAPI=8
+HOMEPAGE=https://github.com/projg2/pycargoebuild/ https://pypi.org/project/pycargoebuild/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/projg2/pycargoebuild/archive/v0.5.2.tar.gz -> pycargoebuild-0.5.2.gh.tar.gz
+_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=d3b5fa2a0324efb18f22dd722e125c1f
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 7037e0e35334..6d551a3bc165 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.31 b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.31
index b334da043f52..d44041c07aaa 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.31
+++ b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.31
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://dev.mysql.com/downloads/
 INHERIT=cmake-multilib flag-o-matic
 IUSE=ldap static-libs 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 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-arch/lz4-0_p131:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( dev-libs/cyrus-sasl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<dev-db/mysql-5.6.45-r1 !=dev-db/mysql-5.7.23* !=dev-db/mysql-5.7.24* !=dev-db/mysql-5.7.25* !=dev-db/mysql-5.7.26-r0 !=dev-db/mysql-5.7.27-r0 !<dev-db/percona-server-5.7.26.29-r1
 SLOT=0/21
 SRC_URI=https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-8.0.31.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=68d5c00518a685ef91510d4f322ffec1
+_md5_=05753c56db6b204349a4e4135fb3a283
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 2ba2ba358a9e..468b306e06a1 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/u-boot-tools-2022.10 b/metadata/md5-cache/dev-embedded/u-boot-tools-2022.10
index 5c8b73d094a2..6b7ce5a533c5 100644
--- a/metadata/md5-cache/dev-embedded/u-boot-tools-2022.10
+++ b/metadata/md5-cache/dev-embedded/u-boot-tools-2022.10
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.denx.de/wiki/U-Boot/WebHome
 INHERIT=toolchain-funcs
 IUSE=envtools
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:=
 SLOT=0
 SRC_URI=https://ftp.denx.de/pub/u-boot/u-boot-2022.10.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8b56bc44a77a2d1778c89c60e945e34d
+_md5_=728ff79d28c1b0f925dea65d5a42aa6e
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 69add4beb22e..704cf5491e7d 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/felix-main-7.0.5-r1 b/metadata/md5-cache/dev-java/felix-main-7.0.5-r1
index 780eedbf3dde..2732f52e05df 100644
--- a/metadata/md5-cache/dev-java/felix-main-7.0.5-r1
+++ b/metadata/md5-cache/dev-java/felix-main-7.0.5-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://felix.apache.org/documentation/index.html
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/felix-framework-7.0.5:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.main-7.0.5-source-release.tar.gz -> felix-main-7.0.5.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=bc57eed89f51f390d21f0c356616d378
+_md5_=9f95cadccc5e4d0542f6a660c1f5f031
diff --git a/metadata/md5-cache/dev-java/greenmail-2.0.0_alpha2 b/metadata/md5-cache/dev-java/greenmail-2.0.0_alpha2
index ac51b172de89..53dcbd871837 100644
--- a/metadata/md5-cache/dev-java/greenmail-2.0.0_alpha2
+++ b/metadata/md5-cache/dev-java/greenmail-2.0.0_alpha2
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://greenmail-mail-test.github.io/greenmail/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-activation-api:2 dev-java/jakarta-mail:0 dev-java/junit:4 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/greenmail-mail-test/greenmail/archive/release-2.0.0-alpha-2.tar.gz -> greenmail-2.0.0_alpha2.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=b449e6c5cf86c51e6a6e30f7993170f2
+_md5_=b9df8132f54d1cc77e67c59f605680b2
diff --git a/metadata/md5-cache/dev-java/jakarta-mail-2.0.1 b/metadata/md5-cache/dev-java/jakarta-mail-2.0.1
index 2057d619f8b2..e0396775a9ba 100644
--- a/metadata/md5-cache/dev-java/jakarta-mail-2.0.1
+++ b/metadata/md5-cache/dev-java/jakarta-mail-2.0.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jakartaee/mail-api
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-activation:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/mail-api/archive/2.0.1.tar.gz -> jakarta-mail-2.0.1.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=fd9fa0c4cb7b395245afb022e9bfbf5c
+_md5_=8cdd8992109772f04714d6e851383ff6
diff --git a/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0 b/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0
index 93df161b8a8e..b155fdd326e5 100644
--- a/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0
+++ b/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.servlet
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=6
 SRC_URI=https://github.com/jakartaee/servlet/archive/6.0.0-RELEASE.tar.gz -> jakarta-servlet-api-6.0.0-RELEASE.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=5d2664ad92fb3e75a46097321e695be3
+_md5_=a2e13785d9e40e2220de63b1b386fda0
diff --git a/metadata/md5-cache/dev-java/logback-classic-1.2.11-r1 b/metadata/md5-cache/dev-java/logback-classic-1.2.11-r1
deleted file mode 100644
index f94c5d119df3..000000000000
--- a/metadata/md5-cache/dev-java/logback-classic-1.2.11-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=virtual/jdk:1.8 dev-java/janino:0 dev-java/javax-mail:0 ~dev-java/logback-core-1.2.11:0 dev-java/reflections:0 dev-java/slf4j-api:1 java-virtuals/servlet-api:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=logback-classic module
-EAPI=8
-HOMEPAGE=https://logback.qos.ch
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=EPL-1.0 LGPL-3
-RDEPEND=virtual/jre:1.8 dev-java/janino:0 dev-java/javax-mail:0 ~dev-java/logback-core-1.2.11:0 dev-java/reflections:0 dev-java/slf4j-api:1 java-virtuals/servlet-api:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/qos-ch/logback/archive/v_1.2.11.tar.gz -> logback-1.2.11.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=140722e2e887d3012dce39c562e62703
diff --git a/metadata/md5-cache/dev-java/logback-classic-1.4.1 b/metadata/md5-cache/dev-java/logback-classic-1.4.1
index b2aba926537a..4f7127dc76a8 100644
--- a/metadata/md5-cache/dev-java/logback-classic-1.4.1
+++ b/metadata/md5-cache/dev-java/logback-classic-1.4.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://logback.qos.ch
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=EPL-1.0 LGPL-3
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/janino-3.1.7:0 dev-java/jakarta-mail-api:0 ~dev-java/logback-core-1.4.1:0 >=dev-java/slf4j-api-2.0.0:0 dev-java/jakarta-mail:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/logback/archive/v_1.4.1.tar.gz -> logback-1.4.1.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=3f0cf1e87cb30d4208c2dadb59389420
+_md5_=14741cc4abd85227aabf0ccf826d15d6
diff --git a/metadata/md5-cache/dev-java/logback-core-1.2.11-r1 b/metadata/md5-cache/dev-java/logback-core-1.2.11-r1
deleted file mode 100644
index 42b3e1127c9c..000000000000
--- a/metadata/md5-cache/dev-java/logback-core-1.2.11-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* dev-java/jakarta-servlet-api:4 dev-java/janino:0 dev-java/jansi:0 dev-java/javax-mail:0 test? ( dev-java/assertj-core:3 dev-java/joda-time:0 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=logback-core module
-EAPI=8
-HOMEPAGE=https://logback.qos.ch
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=EPL-1.0 LGPL-3
-RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-servlet-api:4 dev-java/janino:0 dev-java/jansi:0 dev-java/javax-mail:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/qos-ch/logback/archive/v_1.2.11.tar.gz -> logback-1.2.11.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=7218cf00cbd9b4db0bc6e52088799271
diff --git a/metadata/md5-cache/dev-java/logback-core-1.4.1 b/metadata/md5-cache/dev-java/logback-core-1.4.1
index c77b92e90235..2883bb6662f4 100644
--- a/metadata/md5-cache/dev-java/logback-core-1.4.1
+++ b/metadata/md5-cache/dev-java/logback-core-1.4.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://logback.qos.ch
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=EPL-1.0 LGPL-3
 RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-mail:0 dev-java/jakarta-mail-api:0 dev-java/jakarta-servlet-api:6 ~dev-java/janino-3.1.7:0 dev-java/jansi:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/logback/archive/v_1.4.1.tar.gz -> logback-1.4.1.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=8aee49bad77ac01751045038b5292bd0
+_md5_=62648581b88455f373c665dfa72cfa1f
diff --git a/metadata/md5-cache/dev-java/slf4j-api-1.7.36-r1 b/metadata/md5-cache/dev-java/slf4j-api-1.7.36-r1
deleted file mode 100644
index f6e10e32f8b7..000000000000
--- a/metadata/md5-cache/dev-java/slf4j-api-1.7.36-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/zip
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=The slf4j API
-EAPI=8
-HOMEPAGE=https://www.slf4j.org
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=1
-SRC_URI=https://github.com/qos-ch/slf4j/archive/v_1.7.36.tar.gz -> slf4j-1.7.36.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=6f8c59bc920e5e45a506170e632956a7
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 949c8305a44c..5d91e1bb1460 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/erlang-25.1.2-r1 b/metadata/md5-cache/dev-lang/erlang-25.1.2-r1
index 7603b7b55961..4091ddadbe4a 100644
--- a/metadata/md5-cache/dev-lang/erlang-25.1.2-r1
+++ b/metadata/md5-cache/dev-lang/erlang-25.1.2-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.erlang.org/
 INHERIT=elisp-common flag-o-matic java-pkg-opt-2 systemd toolchain-funcs wxwidgets
 IUSE=doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets java
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/25.1.2
 SRC_URI=https://github.com/erlang/otp/archive/OTP-25.1.2.tar.gz -> erlang-25.1.2.tar.gz https://github.com/erlang/otp/releases/download/OTP-25.1/otp_doc_man_25.1.tar.gz -> erlang_doc_man_25.1.tar.gz doc? ( https://github.com/erlang/otp/releases/download/OTP-25.1/otp_doc_html_25.1.tar.gz -> erlang_doc_html_25.1.tar.gz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6
-_md5_=6ccdc372876c57ce579985da5143fa4c
+_md5_=3ba91c0cfb783c1fadc8461e9ec73f5f
diff --git a/metadata/md5-cache/dev-lang/ruby-2.7.6 b/metadata/md5-cache/dev-lang/ruby-2.7.6
deleted file mode 100644
index ce764701b6f3..000000000000
--- a/metadata/md5-cache/dev-lang/ruby-2.7.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20191222
-DESCRIPTION=An object-oriented scripting language
-EAPI=7
-HOMEPAGE=https://www.ruby-lang.org/
-INHERIT=autotools flag-o-matic
-IUSE=berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Ruby-BSD BSD-2 )
-PDEPEND=>=dev-ruby/minitest-5.13.0[ruby_targets_ruby27] >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby27] >=dev-ruby/power_assert-1.1.7[ruby_targets_ruby27] >=dev-ruby/rake-13.0.1[ruby_targets_ruby27] >=dev-ruby/test-unit-3.3.4[ruby_targets_ruby27] >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby27] virtual/rubygems[ruby_targets_ruby27] >=dev-ruby/bundler-2.1.4[ruby_targets_ruby27] >=dev-ruby/did_you_mean-1.3.1[ruby_targets_ruby27] >=dev-ruby/json-2.0.2[ruby_targets_ruby27] rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby27] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20191222
-SLOT=2.7
-SRC_URI=https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.6.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=038a53cda53b9a74cabc85b8d01e964e
diff --git a/metadata/md5-cache/dev-lang/ruby-3.0.4 b/metadata/md5-cache/dev-lang/ruby-3.0.4
deleted file mode 100644
index 197593ed1b8d..000000000000
--- a/metadata/md5-cache/dev-lang/ruby-3.0.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20201225
-DESCRIPTION=An object-oriented scripting language
-EAPI=7
-HOMEPAGE=https://www.ruby-lang.org/
-INHERIT=autotools flag-o-matic
-IUSE=berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Ruby-BSD BSD-2 )
-PDEPEND=>=dev-ruby/minitest-5.14.2[ruby_targets_ruby30] >=dev-ruby/power_assert-1.2.0[ruby_targets_ruby30] >=dev-ruby/rake-13.0.3[ruby_targets_ruby30] >=dev-ruby/rbs-1.0.0[ruby_targets_ruby30] >=dev-ruby/rexml-3.2.4[ruby_targets_ruby30] >=dev-ruby/rss-0.2.9[ruby_targets_ruby30] >=dev-ruby/test-unit-3.3.7[ruby_targets_ruby30] >=dev-ruby/typeprof-0.11.0[ruby_targets_ruby30] virtual/rubygems[ruby_targets_ruby30] >=dev-ruby/bundler-2.2.15[ruby_targets_ruby30] >=dev-ruby/did_you_mean-1.5.0[ruby_targets_ruby30] >=dev-ruby/json-2.5.1[ruby_targets_ruby30] rdoc? ( >=dev-ruby/rdoc-6.3.0[ruby_targets_ruby30] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20201225
-SLOT=3.0
-SRC_URI=https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.4.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=96d61ab182382bafa921f12378175635
diff --git a/metadata/md5-cache/dev-lang/ruby-3.1.2 b/metadata/md5-cache/dev-lang/ruby-3.1.2
deleted file mode 100644
index 33448f3e0a24..000000000000
--- a/metadata/md5-cache/dev-lang/ruby-3.1.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20201225
-DESCRIPTION=An object-oriented scripting language
-EAPI=8
-HOMEPAGE=https://www.ruby-lang.org/
-INHERIT=autotools flag-o-matic
-IUSE=berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Ruby-BSD BSD-2 )
-PDEPEND=>=dev-ruby/minitest-5.15.0[ruby_targets_ruby31] >=dev-ruby/power_assert-2.0.1[ruby_targets_ruby31] >=dev-ruby/rake-13.0.6[ruby_targets_ruby31] >=dev-ruby/rbs-2.1.0[ruby_targets_ruby31] >=dev-ruby/rexml-3.2.5[ruby_targets_ruby31] >=dev-ruby/rss-0.2.9[ruby_targets_ruby31] >=dev-ruby/test-unit-3.5.3[ruby_targets_ruby31] >=dev-ruby/typeprof-0.12.2[ruby_targets_ruby31] virtual/rubygems[ruby_targets_ruby31] >=dev-ruby/bundler-2.3.3[ruby_targets_ruby31] >=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby31] >=dev-ruby/json-2.6.1[ruby_targets_ruby31] rdoc? ( >=dev-ruby/rdoc-6.3.3[ruby_targets_ruby31] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20201225
-SLOT=3.1
-SRC_URI=https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.2.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c515de4b67a6fc03f3fa81c81d3c21c6
diff --git a/metadata/md5-cache/dev-lang/ruby-3.1.2-r1 b/metadata/md5-cache/dev-lang/ruby-3.1.2-r1
deleted file mode 100644
index f6c6567095f4..000000000000
--- a/metadata/md5-cache/dev-lang/ruby-3.1.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20201225
-DESCRIPTION=An object-oriented scripting language
-EAPI=8
-HOMEPAGE=https://www.ruby-lang.org/
-INHERIT=autotools flag-o-matic
-IUSE=berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc socks5 +ssl static-libs systemtap tk xemacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Ruby-BSD BSD-2 )
-PDEPEND=>=dev-ruby/minitest-5.15.0[ruby_targets_ruby31] >=dev-ruby/power_assert-2.0.1[ruby_targets_ruby31] >=dev-ruby/rake-13.0.6[ruby_targets_ruby31] >=dev-ruby/rbs-2.1.0[ruby_targets_ruby31] >=dev-ruby/rexml-3.2.5[ruby_targets_ruby31] >=dev-ruby/rss-0.2.9[ruby_targets_ruby31] >=dev-ruby/test-unit-3.5.3[ruby_targets_ruby31] >=dev-ruby/typeprof-0.12.2[ruby_targets_ruby31] virtual/rubygems[ruby_targets_ruby31] >=dev-ruby/bundler-2.3.3[ruby_targets_ruby31] >=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby31] >=dev-ruby/json-2.6.1[ruby_targets_ruby31] rdoc? ( >=dev-ruby/rdoc-6.3.3[ruby_targets_ruby31] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20201225
-SLOT=3.1
-SRC_URI=https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.2.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=6f2fd55d0b5590583b27337932b13bec
diff --git a/metadata/md5-cache/dev-lang/rust-1.65.0 b/metadata/md5-cache/dev-lang/rust-1.65.0
index 339aaf2235fe..2baaaa1f3bec 100644
--- a/metadata/md5-cache/dev-lang/rust-1.65.0
+++ b/metadata/md5-cache/dev-lang/rust-1.65.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.rust-lang.org/
 INHERIT=bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib multilib-build python-any-r1 rust-toolchain toolchain-funcs verify-sig
 IUSE=clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind miri nightly parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=amd64 arm arm64 ~mips ppc64 ~riscv sparc ~x86
+KEYWORDS=amd64 arm arm64 ~mips ppc64 ~riscv sparc x86
 LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
 RDEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= dev-libs/openssl:0= system-llvm? ( || ( ( llvm_targets_AArch64? ( sys-devel/llvm:15[llvm_targets_AArch64(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_AMDGPU? ( sys-devel/llvm:15[llvm_targets_AMDGPU(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_ARM? ( sys-devel/llvm:15[llvm_targets_ARM(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_AVR? ( sys-devel/llvm:15[llvm_targets_AVR(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_BPF? ( sys-devel/llvm:15[llvm_targets_BPF(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_Hexagon? ( sys-devel/llvm:15[llvm_targets_Hexagon(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_Lanai? ( sys-devel/llvm:15[llvm_targets_Lanai(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_Mips? ( sys-devel/llvm:15[llvm_targets_Mips(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_MSP430? ( sys-devel/llvm:15[llvm_targets_MSP430(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_NVPTX? ( sys-devel/llvm:15[llvm_targets_NVPTX(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_PowerPC? ( sys-devel/llvm:15[llvm_targets_PowerPC(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_RISCV? ( sys-devel/llvm:15[llvm_targets_RISCV(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_Sparc? ( sys-devel/llvm:15[llvm_targets_Sparc(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_SystemZ? ( sys-devel/llvm:15[llvm_targets_SystemZ(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_WebAssembly? ( sys-devel/llvm:15[llvm_targets_WebAssembly(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_X86? ( sys-devel/llvm:15[llvm_targets_X86(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_XCore? ( sys-devel/llvm:15[llvm_targets_XCore(-)] ) wasm? ( sys-devel/lld:15 ) ) ) <sys-devel/llvm-16:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) ) !system-llvm? ( !llvm-libunwind? ( elibc_musl? ( sys-libs/libunwind:= ) ) ) app-eselect/eselect-rust sys-apps/lsb-release
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) miri? ( nightly ) parallel-compiler? ( nightly ) rust-analyzer? ( !wasm ) test? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=stable/1.65
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.65.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.65.0-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.64.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.64.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.64.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.64.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.64.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.64.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.64.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.64.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.64.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.64.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.64.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.64.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.64.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.64.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.64.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.64.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	rust-toolchain	9e3a9f96182f7084ca9c6e173d2f2f5c	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=3b17562db6d462a087def09d0d981c32
+_md5_=08503fbd6b81e57d28c2d325b3a3c22c
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.65.0 b/metadata/md5-cache/dev-lang/rust-bin-1.65.0
index 966727e04cb0..2e4b44a411be 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.65.0
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.65.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.rust-lang.org/
 INHERIT=multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
 IUSE=clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
 RDEPEND=>=app-eselect/eselect-rust-20190311 sys-apps/lsb-release
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2022-11-03/rust-src-1.65.0.tar.xz ) sparc? ( https://dev.gentoo.org/~sam/distfiles/dev-lang/rust-bin/rust-1.65.0-sparc64-unknown-linux-gnu.tar.xz )
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	prefix	eab3c99d77fe00506c109c8a736186f7	rust-toolchain	9e3a9f96182f7084ca9c6e173d2f2f5c	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=7d51c0eef6449c15ed2782846e373513
+_md5_=f8c7d911eb4e18e19d6e37827ebba528
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 94186f7e0828..962f948f256f 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/libebml-1.4.4 b/metadata/md5-cache/dev-libs/libebml-1.4.4
index c61043d3db87..7585771a6086 100644
--- a/metadata/md5-cache/dev-libs/libebml-1.4.4
+++ b/metadata/md5-cache/dev-libs/libebml-1.4.4
@@ -4,9 +4,9 @@ DESCRIPTION=Extensible binary format library (kinda like XML)
 EAPI=8
 HOMEPAGE=https://www.matroska.org/ https://github.com/Matroska-Org/libebml/
 INHERIT=cmake
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 SLOT=0/5
 SRC_URI=https://dl.matroska.org/downloads/libebml/libebml-1.4.4.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6d143dd0c0381537fad8edc423e7655c
+_md5_=806f2f1fa3a36c49855ddf7692103d94
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 76569056b78c..41a4a5ff51cc 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/comm-0.1.1 b/metadata/md5-cache/dev-python/comm-0.1.1
index 071fbb691f0d..3dc3e9c95364 100644
--- a/metadata/md5-cache/dev-python/comm-0.1.1
+++ b/metadata/md5-cache/dev-python/comm-0.1.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/comm/ https://github.com/ipython/comm/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>dev-python/traitlets-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ipython/comm/archive/0.1.1.tar.gz -> comm-0.1.1.gh.tar.gz
 _eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=9ac532ebd9ae71459f475c20158664a5
+_md5_=cf0e4b2260714907f902d67879ccbf00
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.18.3 b/metadata/md5-cache/dev-python/ipykernel-6.18.3
index 5e0e2fc28c45..9a6d766115cb 100644
--- a/metadata/md5-cache/dev-python/ipykernel-6.18.3
+++ b/metadata/md5-cache/dev-python/ipykernel-6.18.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ipython/ipykernel/ https://pypi.org/project/ipykernel/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-python/comm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.18.3.tar.gz
 _eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c829c1dd720112de35f8c844cb7bc9e1
+_md5_=8748dafb8e2149989684b425de4f28a0
diff --git a/metadata/md5-cache/dev-python/numpy-1.22.4 b/metadata/md5-cache/dev-python/numpy-1.22.4
deleted file mode 100644
index ae4cb3b09290..000000000000
--- a/metadata/md5-cache/dev-python/numpy-1.22.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) app-arch/unzip >=dev-python/cython-0.29.30[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] lapack? ( virtual/pkgconfig ) test? ( >=dev-python/hypothesis-5.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cffi-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] lapack? ( virtual/fortran )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=lapack? ( virtual/fortran )
-DESCRIPTION=Fast array and numerical python library
-EAPI=8
-HOMEPAGE=https://numpy.org/
-INHERIT=distutils-r1 flag-o-matic fortran-2 toolchain-funcs
-IUSE=doc lapack test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] ) lapack? ( virtual/fortran )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/n/numpy/numpy-1.22.4.zip doc? ( https://numpy.org/doc/1.22/numpy-html.zip -> numpy-html-1.22.4.zip https://numpy.org/doc/1.22/numpy-ref.pdf -> numpy-ref-1.22.4.pdf https://numpy.org/doc/1.22/numpy-user.pdf -> numpy-user-1.22.4.pdf )
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	flag-o-matic	29a755b1291d64133634d80b0328f153	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=075a9fed3a7e76a606b6165149a7693a
diff --git a/metadata/md5-cache/dev-python/numpy-1.23.3 b/metadata/md5-cache/dev-python/numpy-1.23.3
deleted file mode 100644
index fd5b4c4bad98..000000000000
--- a/metadata/md5-cache/dev-python/numpy-1.23.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/cython-0.29.30[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] lapack? ( virtual/pkgconfig ) doc? ( app-arch/unzip ) test? ( >=dev-python/hypothesis-5.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cffi-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] lapack? ( virtual/fortran )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=lapack? ( virtual/fortran )
-DESCRIPTION=Fast array and numerical python library
-EAPI=8
-HOMEPAGE=https://numpy.org/ https://github.com/numpy/numpy/ https://pypi.org/project/numpy/
-INHERIT=distutils-r1 flag-o-matic fortran-2 toolchain-funcs
-IUSE=doc lapack test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] ) lapack? ( virtual/fortran )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/n/numpy/numpy-1.23.3.tar.gz doc? ( https://numpy.org/doc/1.23/numpy-html.zip -> numpy-html-1.23.3.zip https://numpy.org/doc/1.23/numpy-ref.pdf -> numpy-ref-1.23.3.pdf https://numpy.org/doc/1.23/numpy-user.pdf -> numpy-user-1.23.3.pdf )
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	flag-o-matic	29a755b1291d64133634d80b0328f153	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=858b2b6dad94a50c1eb43cfcff29daa1
diff --git a/metadata/md5-cache/dev-python/numpy-1.23.4 b/metadata/md5-cache/dev-python/numpy-1.23.4
index 543ae3c79ac3..7770bae8a6ea 100644
--- a/metadata/md5-cache/dev-python/numpy-1.23.4
+++ b/metadata/md5-cache/dev-python/numpy-1.23.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://numpy.org/ https://github.com/numpy/numpy/ https://pypi.org/project/numpy/
 INHERIT=distutils-r1 flag-o-matic fortran-2 toolchain-funcs
 IUSE=doc lapack test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] ) lapack? ( virtual/fortran )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.23.4.tar.gz doc? ( https://numpy.org/doc/1.23/numpy-html.zip -> numpy-html-1.23.4.zip https://numpy.org/doc/1.23/numpy-ref.pdf -> numpy-ref-1.23.4.pdf https://numpy.org/doc/1.23/numpy-user.pdf -> numpy-user-1.23.4.pdf )
 _eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	flag-o-matic	29a755b1291d64133634d80b0328f153	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=09dd6cd5ccc9117ddbeebd3db696abb6
+_md5_=858b2b6dad94a50c1eb43cfcff29daa1
diff --git a/metadata/md5-cache/dev-python/pandas-1.5.0-r1 b/metadata/md5-cache/dev-python/pandas-1.5.0-r1
deleted file mode 100644
index b27bb03b4e4c..000000000000
--- a/metadata/md5-cache/dev-python/pandas-1.5.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-python/numpy-1.21.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.1-r3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2020.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cython-0.29.32[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( x11-base/xorg-server[xvfb] x11-apps/xhost app-text/pandoc dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbsphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpydoc-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openpyxl-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytables-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xlrd[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-misc/xclip ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost >=dev-python/bottleneck-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numexpr-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/blosc[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( dev-python/openpyxl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xlsxwriter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytables-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xarray-0.12.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xlrd-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xlwt-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !hppa? ( python_targets_python3_8? ( dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/scipy-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) X? ( || ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-misc/xclip x11-misc/xsel ) ) dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hypothesis-5.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/openpyxl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pymysql[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-xdist-1.31[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psycopg:2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xlsxwriter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-misc/xclip x11-misc/xsel )
-DESCRIPTION=Powerful data structures for data analysis and statistics
-EAPI=8
-HOMEPAGE=https://pandas.pydata.org/ https://github.com/pandas-dev/pandas/
-INHERIT=distutils-r1 multiprocessing optfeature virtualx
-IUSE=doc full-support minimal test X python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86
-LICENSE=BSD
-RDEPEND=>=dev-python/numpy-1.21.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.1-r3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2020.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !minimal? ( >=dev-python/bottleneck-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numexpr-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) full-support? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/blosc[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( dev-python/openpyxl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xlsxwriter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytables-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xarray-0.12.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xlrd-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xlwt-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !hppa? ( python_targets_python3_8? ( dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/scipy-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) X? ( || ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-misc/xclip x11-misc/xsel ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pandas-dev/pandas/releases/download/v1.5.0/pandas-1.5.0.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=2a018e3326afb21b75d46cd7d32c3c75
diff --git a/metadata/md5-cache/dev-python/pandas-1.5.1 b/metadata/md5-cache/dev-python/pandas-1.5.1
index 60356f1af96c..c99cf64f13ff 100644
--- a/metadata/md5-cache/dev-python/pandas-1.5.1
+++ b/metadata/md5-cache/dev-python/pandas-1.5.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pandas.pydata.org/ https://github.com/pandas-dev/pandas/ https://pypi.org/project/pandas/
 INHERIT=distutils-r1 multiprocessing optfeature virtualx
 IUSE=doc full-support minimal test X python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.21.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.1-r3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2020.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !minimal? ( >=dev-python/bottleneck-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numexpr-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) full-support? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/blosc[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( dev-python/openpyxl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xlsxwriter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytables-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xarray-0.12.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xlrd-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xlwt-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !hppa? ( python_targets_python3_8? ( dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/scipy-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) X? ( || ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-misc/xclip x11-misc/xsel ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pandas-dev/pandas/releases/download/v1.5.1/pandas-1.5.1.tar.gz
 _eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=c11a351d7a6962de3cae23955e468164
+_md5_=f5d0c62646ffc81c91f1f85d91f35a6f
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 24d8c8779535..f23c1ff9dc63 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/aws-partitions-1.297.0 b/metadata/md5-cache/dev-ruby/aws-partitions-1.297.0
deleted file mode 100644
index f0293f26ee23..000000000000
--- a/metadata/md5-cache/dev-ruby/aws-partitions-1.297.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Provides interfaces to enumerate AWS partitions, regions, and services
-EAPI=7
-HOMEPAGE=https://aws.amazon.com/sdk-for-ruby/
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 doc test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test )
-SLOT=1
-SRC_URI=https://rubygems.org/gems/aws-partitions-1.297.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=90252676dd1761ed67b99228e01f57ad
diff --git a/metadata/md5-cache/dev-ruby/aws-partitions-1.298.0 b/metadata/md5-cache/dev-ruby/aws-partitions-1.298.0
deleted file mode 100644
index 5644b02e43b2..000000000000
--- a/metadata/md5-cache/dev-ruby/aws-partitions-1.298.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Provides interfaces to enumerate AWS partitions, regions, and services
-EAPI=7
-HOMEPAGE=https://aws.amazon.com/sdk-for-ruby/
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 doc test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test )
-SLOT=1
-SRC_URI=https://rubygems.org/gems/aws-partitions-1.298.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=90252676dd1761ed67b99228e01f57ad
diff --git a/metadata/md5-cache/dev-ruby/aws-partitions-1.370.0 b/metadata/md5-cache/dev-ruby/aws-partitions-1.370.0
index e543210ef932..e1631cd5bb22 100644
--- a/metadata/md5-cache/dev-ruby/aws-partitions-1.370.0
+++ b/metadata/md5-cache/dev-ruby/aws-partitions-1.370.0
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=Provides interfaces to enumerate AWS partitions, regions, and services
 EAPI=7
 HOMEPAGE=https://aws.amazon.com/sdk-for-ruby/
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 doc test
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 doc test
 KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-partitions-1.370.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=449d47795834ca53ed7f616e69c53d58
+_md5_=7660c05d6059d1df9adeeda2a0ee489c
diff --git a/metadata/md5-cache/dev-ruby/builder-3.2.4-r1 b/metadata/md5-cache/dev-ruby/builder-3.2.4-r1
index dabf214c676b..2f0c70fdd35f 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.2.4-r1
+++ b/metadata/md5-cache/dev-ruby/builder-3.2.4-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://onestepback.org/
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3.2
 SRC_URI=https://rubygems.org/gems/builder-3.2.4.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8b7de3abe8d493552ded586a034bf325
+_md5_=15ca2f02ecb4fe8e00d732c962af3330
diff --git a/metadata/md5-cache/dev-ruby/classifier-reborn-2.2.0 b/metadata/md5-cache/dev-ruby/classifier-reborn-2.2.0
deleted file mode 100644
index 17d2bd94a302..000000000000
--- a/metadata/md5-cache/dev-ruby/classifier-reborn-2.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby27(-)] !!dev-ruby/classifier[ruby_targets_ruby27(-)] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby27(-)] ) ) ) ruby_targets_ruby27? ( test? ( dev-ruby/redis[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=Module to allow Bayesian and other types of classifications
-EAPI=6
-HOMEPAGE=https://github.com/jekyll/classifier-reborn
-INHERIT=ruby-fakegem
-IUSE=gsl test test ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm64
-LICENSE=LGPL-2.1
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby27(-)] !!dev-ruby/classifier[ruby_targets_ruby27(-)] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jekyll/classifier-reborn/archive/v2.2.0.tar.gz -> classifier-reborn-2.2.0.tar.gz
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d0b44f34e45109e87ace7ed1ef7438f8
diff --git a/metadata/md5-cache/dev-ruby/facter-3.14.24 b/metadata/md5-cache/dev-ruby/facter-3.14.24
index f941caf7de93..95b7f7e76c01 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.14.24
+++ b/metadata/md5-cache/dev-ruby/facter-3.14.24
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/rspec:2[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
+BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] dev-ruby/rspec:3[ruby_targets_ruby30(-)] dev-ruby/mocha:0.14[ruby_targets_ruby30(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-cpp/cpp-hocon-0.2.1:= >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= sys-apps/util-linux app-emulation/virt-what net-misc/curl dev-libs/boost:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
+DEPEND=>=dev-cpp/cpp-hocon-0.2.1:= >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= sys-apps/util-linux app-emulation/virt-what net-misc/curl dev-libs/boost:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
 DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
 EAPI=7
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
 INHERIT=cmake ruby-ng
-IUSE=test ruby_targets_ruby27
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-cpp/cpp-hocon-0.2.1:= >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= sys-apps/util-linux app-emulation/virt-what net-misc/curl dev-libs/boost:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
+RDEPEND=>=dev-cpp/cpp-hocon-0.2.1:= >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= sys-apps/util-linux app-emulation/virt-what net-misc/curl dev-libs/boost:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.14.24.tar.gz -> facter-3.14.24.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e64ec6053d91efd588fa19db5f013321
+_md5_=9acc2dca281dead887dc6140a0e9f74f
diff --git a/metadata/md5-cache/dev-ruby/pg-1.3.5 b/metadata/md5-cache/dev-ruby/pg-1.3.5
index 233ae116735b..8aa0169ff01a 100644
--- a/metadata/md5-cache/dev-ruby/pg-1.3.5
+++ b/metadata/md5-cache/dev-ruby/pg-1.3.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ged/ruby-pg
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( BSD-2 Ruby-BSD )
 RDEPEND=dev-db/postgresql:* ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ged/ruby-pg/archive/v1.3.5.tar.gz -> pg-1.3.5.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e7f15b8e92ae958af2bb655e13132aae
+_md5_=f13f2d375f4dd40f0b1fdf0adf98b407
diff --git a/metadata/md5-cache/dev-ruby/racc-1.6.0 b/metadata/md5-cache/dev-ruby/racc-1.6.0
index 6d71b1e84f4b..b6b0069a41a0 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.6.0
+++ b/metadata/md5-cache/dev-ruby/racc-1.6.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tenderlove/racc
 INHERIT=ruby-fakegem
 IUSE=doc test test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tenderlove/racc/archive/v1.6.0.tar.gz -> racc-1.6.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f8a5e346722ef9d6e5a3c193de8e390c
+_md5_=7afe154307a8eeea4871690f3881eed2
diff --git a/metadata/md5-cache/dev-ruby/rmagick-5.1.0 b/metadata/md5-cache/dev-ruby/rmagick-5.1.0
index 4c6d27544f3f..e533cbaca7cc 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-5.1.0
+++ b/metadata/md5-cache/dev-ruby/rmagick-5.1.0
@@ -1,4 +1,4 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
+BDEPEND=ruby_targets_ruby27? ( dev-ruby/pkg-config[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/pkg-config[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/pkg-config[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=media-gfx/imagemagick-6.9.0 test? ( >=media-gfx/imagemagick-7.1.0:=[jpeg,lqr,lcms,postscript,tiff,webp] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=An interface between Ruby and the ImageMagick(TM) image processing library
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/rmagick/rmagick/archive/RMagick_5-1-0.tar.gz -> rmagick-5.1.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=981f23af4f477ac8b11a3511dda12847
+_md5_=7668dc41a29e45cef4dcd0eb605eba64
diff --git a/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991-r1 b/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991-r1
index f4dde10b0ece..328d27f1f161 100644
--- a/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://www.ch-werner.de/rubyodbc/
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=|| ( GPL-2 Ruby-BSD )
 RDEPEND=>=dev-db/unixODBC-2.0.6 ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=http://www.ch-werner.de/rubyodbc/ruby-odbc-0.999991.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=965ae72cbe610600ef206965a0ef4e01
+_md5_=5974d4efff37a2b990484320ce2b88b9
diff --git a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.4 b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.4
index 573968aa7ded..a79d88d353a7 100644
--- a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.4
+++ b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/puppetlabs/semantic_puppet
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/semantic_puppet-1.0.4.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=12791843277f42644c6e6f7e017450eb
+_md5_=1326cb574ca2ba1de30481e3e3c42f9a
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.4.10 b/metadata/md5-cache/dev-ruby/stomp-1.4.10
index dd8026abf5be..29fd4bb1d2b8 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.4.10
+++ b/metadata/md5-cache/dev-ruby/stomp-1.4.10
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://github.com/stompgem/stomp
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/stomp-1.4.10.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=7498abcf0dd37372308d798709d58dd2
+_md5_=91a32526d73f4d6307f28010c6889f5c
diff --git a/metadata/md5-cache/dev-ruby/tilt-2.0.11 b/metadata/md5-cache/dev-ruby/tilt-2.0.11
index 60f1078771da..98275f3e7962 100644
--- a/metadata/md5-cache/dev-ruby/tilt-2.0.11
+++ b/metadata/md5-cache/dev-ruby/tilt-2.0.11
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rtomayko/tilt
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rtomayko/tilt/archive/v2.0.11.tar.gz -> tilt-2.0.11.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=85e7d9269f45f1008e49743d11c78839
+_md5_=62ae53e2f23880c7c2399993748a0747
diff --git a/metadata/md5-cache/dev-ruby/vcard-0.3.0 b/metadata/md5-cache/dev-ruby/vcard-0.3.0
deleted file mode 100644
index bc6faa83d774..000000000000
--- a/metadata/md5-cache/dev-ruby/vcard-0.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=Ruby vcard support extracted from Vpim
-EAPI=6
-HOMEPAGE=https://github.com/qoobaa/vcard
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 test
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/vcard-0.3.0.gem
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a034657c02551445be09e4599cf7881b
diff --git a/metadata/md5-cache/dev-ruby/vcr-6.1.0 b/metadata/md5-cache/dev-ruby/vcr-6.1.0
index d297cb662743..1722a007d982 100644
--- a/metadata/md5-cache/dev-ruby/vcr-6.1.0
+++ b/metadata/md5-cache/dev-ruby/vcr-6.1.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/vcr/vcr/
 INHERIT=ruby-fakegem
 IUSE=json test test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( json? ( dev-ruby/json[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( json? ( dev-ruby/json[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( json? ( dev-ruby/json[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/vcr/vcr/archive/v6.1.0.tar.gz -> vcr-6.1.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f10fa75908dccc45a099ffaac87f0188
+_md5_=3557c702076d8e987f9d2a90adb150b9
diff --git a/metadata/md5-cache/dev-ruby/virtus-1.0.5 b/metadata/md5-cache/dev-ruby/virtus-1.0.5
deleted file mode 100644
index 4e576faf10a4..000000000000
--- a/metadata/md5-cache/dev-ruby/virtus-1.0.5
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/axiom-types-0.1[ruby_targets_ruby27(-)] <dev-ruby/axiom-types-1[ruby_targets_ruby27(-)] >=dev-ruby/coercible-1.0[ruby_targets_ruby27(-)] <dev-ruby/coercible-2[ruby_targets_ruby27(-)] >=dev-ruby/descendants_tracker-0.0.3[ruby_targets_ruby27(-)] <dev-ruby/descendants_tracker-1[ruby_targets_ruby27(-)] >=dev-ruby/equalizer-0.0.9[ruby_targets_ruby27(-)] <dev-ruby/equalizer-1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/inflecto[ruby_targets_ruby27(-)] dev-ruby/bogus[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=Attributes on Steroids for Plain Old Ruby Objects
-EAPI=6
-HOMEPAGE=https://github.com/solnic/virtus https://rubygems.org/gems/virtus
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/axiom-types-0.1[ruby_targets_ruby27(-)] <dev-ruby/axiom-types-1[ruby_targets_ruby27(-)] >=dev-ruby/coercible-1.0[ruby_targets_ruby27(-)] <dev-ruby/coercible-2[ruby_targets_ruby27(-)] >=dev-ruby/descendants_tracker-0.0.3[ruby_targets_ruby27(-)] <dev-ruby/descendants_tracker-1[ruby_targets_ruby27(-)] >=dev-ruby/equalizer-0.0.9[ruby_targets_ruby27(-)] <dev-ruby/equalizer-1[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/virtus-1.0.5.gem
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=024b8e9733798ba6e425c0e828f89739
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 0e18019c529b..87d8b80628bc 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/diffoscope-228 b/metadata/md5-cache/dev-util/diffoscope-228
index 6e4dbaff9a24..53bc8585affd 100644
--- a/metadata/md5-cache/dev-util/diffoscope-228
+++ b/metadata/md5-cache/dev-util/diffoscope-228
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
 INHERIT=distutils-r1
 IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tlsh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[ncurses] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/diffoscope/diffoscope-228.tar.gz
 _eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=802742b4f4e959641bd2d0639d82fefa
+_md5_=0f8eebc8039ac214cdfad0a9f2a911da
diff --git a/metadata/md5-cache/dev-util/glslang-1.3.231-r2 b/metadata/md5-cache/dev-util/glslang-1.3.231-r2
index 550d1b056f53..d90e7518ec6c 100644
--- a/metadata/md5-cache/dev-util/glslang-1.3.231-r2
+++ b/metadata/md5-cache/dev-util/glslang-1.3.231-r2
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang
 INHERIT=cmake-multilib python-any-r1
 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=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RESTRICT=test
 SLOT=0/1
 SRC_URI=https://github.com/KhronosGroup/glslang/archive/sdk-1.3.231.0.tar.gz -> glslang-1.3.231.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0735ae61a359af5d9a238a3a7e236283
+_md5_=93a4cc06bb6f12c8b9366b36d1aa572a
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 97d493ef6527..3a4b7682a3f3 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-15.0.2 b/metadata/md5-cache/gnome-extra/gucharmap-15.0.2
index 1bb4bb1e6df7..5435b60744c4 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-15.0.2
+++ b/metadata/md5-cache/gnome-extra/gucharmap-15.0.2
@@ -1,11 +1,11 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( >=dev-util/gtk-doc-1 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) vala? ( || ( dev-lang/vala:0.56 ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) app-text/docbook-xml-dtd:4.1.2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( >=dev-util/gtk-doc-1 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) vala? ( || ( dev-lang/vala:0.56 ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=media-libs/freetype:2 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3[introspection?] >=dev-libs/libpcre2-10.21:= =app-i18n/unicode-data-15.0* >=x11-libs/pango-1.42.4-r2[introspection?]
 DESCRIPTION=Unicode character map viewer and library
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2-utils meson vala xdg
+INHERIT=gnome2-utils meson python-any-r1 vala xdg
 IUSE=+introspection gtk-doc vala
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-3+
@@ -13,5 +13,5 @@ RDEPEND=media-libs/freetype:2 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3[intr
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.90
 SRC_URI=https://gitlab.gnome.org/GNOME/gucharmap/-/archive/15.0.2/gucharmap-15.0.2.tar.bz2
-_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=264675921b18d9a7a2b1ea903e93767d
+_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=2e0c7bd5f9437c0a72ba6e1a5c5bb0c8
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index ee954f8100c1..5c3d7dea2f23 100644
--- a/metadata/md5-cache/kde-frameworks/Manifest.gz
+++ b/metadata/md5-cache/kde-frameworks/Manifest.gz
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.99.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.99.0
deleted file mode 100644
index 7c3b03df253b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.99.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-qt/linguist-tools-5.15.5:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 || ( ( =dev-qt/qtcore-5.15.7*:5 =dev-qt/qtgui-5.15.7*:5 =dev-qt/qthelp-5.15.7*:5 =dev-qt/qtsql-5.15.7*:5 =dev-qt/qtwidgets-5.15.7*:5 ) ( =dev-qt/qtcore-5.15.5*:5 =dev-qt/qtgui-5.15.5*:5 =dev-qt/qthelp-5.15.5*:5 =dev-qt/qtsql-5.15.5*:5 =dev-qt/qtwidgets-5.15.5*:5 ) ) ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.99:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.5:5 X? ( >=dev-qt/qtx11extras-5.15.5:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) X? ( x11-base/xorg-proto ) test? ( >=dev-qt/qtwidgets-5.15.5:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing access to properties and features of the window manager
-EAPI=8
-HOMEPAGE=https://develop.kde.org/products/frameworks/
-INHERIT=ecm frameworks.kde.org
-IUSE=X test debug doc test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
-RDEPEND=>=dev-qt/qtgui-5.15.5:5 X? ( >=dev-qt/qtx11extras-5.15.5:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.99
-SRC_URI=mirror://kde/stable/frameworks/5.99/kwindowsystem-5.99.0.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	61c165e3e2ee9247a96df5f5e3b31472	flag-o-matic	29a755b1291d64133634d80b0328f153	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	f4e23ee9fed407c2ceb93f819e8d9263	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=dfac461017ad926261d74431b6866899
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.99.0-r1 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.99.0-r1
index ad892ccd2729..bbc271e221c9 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.99.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.99.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://develop.kde.org/products/frameworks/
 INHERIT=ecm frameworks.kde.org
 IUSE=wayland X test debug doc test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
 PDEPEND=wayland? ( >=kde-plasma/kwayland-integration-5.25.5-r1:5 )
 RDEPEND=>=dev-qt/qtgui-5.15.5:5 X? ( >=dev-qt/qtx11extras-5.15.5:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5/5.99
 SRC_URI=mirror://kde/stable/frameworks/5.99/kwindowsystem-5.99.0.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	61c165e3e2ee9247a96df5f5e3b31472	flag-o-matic	29a755b1291d64133634d80b0328f153	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	f4e23ee9fed407c2ceb93f819e8d9263	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e44b6fb391c4b8735675dd274dc24e97
+_md5_=92641d4a94f345ce7d7b8b4a17467b00
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 311c3917c0c0..669e982aff55 100644
--- a/metadata/md5-cache/kde-plasma/Manifest.gz
+++ b/metadata/md5-cache/kde-plasma/Manifest.gz
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.25.5 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.25.5
deleted file mode 100644
index 1acf5bda59ed..000000000000
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.25.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-qt/qtwaylandscanner-5.15.5:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.95.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15 || ( >=dev-qt/qtgui-5.15.5:5[libinput] >=dev-qt/qtgui-5.15.5:5[X] ) >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtwayland-5.15.5:5= >=kde-frameworks/kidletime-5.95.0:5= >=kde-frameworks/kwayland-5.95.0:5 >=kde-frameworks/kwindowsystem-5.95.0:5= x11-libs/libxkbcommon test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/kwayland-integration
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/wayland-1.15 || ( >=dev-qt/qtgui-5.15.5:5[libinput] >=dev-qt/qtgui-5.15.5:5[X] ) >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtwayland-5.15.5:5= >=kde-frameworks/kidletime-5.95.0:5= >=kde-frameworks/kwayland-5.95.0:5 >=kde-frameworks/kwindowsystem-5.95.0:5= x11-libs/libxkbcommon || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.25.5/kwayland-integration-5.25.5.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	61c165e3e2ee9247a96df5f5e3b31472	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	f4e23ee9fed407c2ceb93f819e8d9263	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9c700477adf5a26e14f246f138ad06b5
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.25.5-r1 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.25.5-r1
index 520b070e715a..242207a2f15f 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.25.5-r1
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.25.5-r1
@@ -7,10 +7,10 @@ HOMEPAGE=https://invent.kde.org/plasma/kwayland-integration
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm plasma.kde.org
 IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/wayland-1.15 || ( >=dev-qt/qtgui-5.15.5:5[libinput] >=dev-qt/qtgui-5.15.5:5[X] ) >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtwayland-5.15.5:5= >=kde-frameworks/kwayland-5.99.0:5 >=kde-frameworks/kwindowsystem-5.99.0:5= x11-libs/libxkbcommon || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.25.5/kwayland-integration-5.25.5.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	61c165e3e2ee9247a96df5f5e3b31472	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	f4e23ee9fed407c2ceb93f819e8d9263	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2fa98292f971969d19ddd41e6eb85ea9
+_md5_=63c9e3d0309f3e99693d4ad90fa022a4
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.25.5-r2 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.25.5-r2
index 14042236057a..81c08df2b33a 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.25.5-r2
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.25.5-r2
@@ -7,11 +7,11 @@ HOMEPAGE=https://kde.org/plasma-desktop
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm plasma.kde.org optfeature
 IUSE=emoji ibus +kaccounts scim +semantic-desktop telemetry test debug +handbook test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtconcurrent-5.15.5:5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtprintsupport-5.15.5:5 >=dev-qt/qtsql-5.15.5:5 >=dev-qt/qtsvg-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtx11extras-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 >=kde-frameworks/attica-5.99.0:5 >=kde-frameworks/kactivities-5.99.0:5 >=kde-frameworks/kactivities-stats-5.99.0:5 >=kde-frameworks/karchive-5.99.0:5 >=kde-frameworks/kauth-5.99.0:5 >=kde-frameworks/kbookmarks-5.99.0:5 >=kde-frameworks/kcmutils-5.99.0:5 >=kde-frameworks/kcodecs-5.99.0:5 >=kde-frameworks/kcompletion-5.99.0:5 >=kde-frameworks/kconfig-5.99.0:5 >=kde-frameworks/kconfigwidgets-5.99.0:5 >=kde-frameworks/kcoreaddons-5.99.0:5 >=kde-frameworks/kcrash-5.99.0:5 >=kde-frameworks/kdbusaddons-5.99.0:5 >=kde-frameworks/kdeclarative-5.99.0:5 >=kde-frameworks/kded-5.99.0:5 >=kde-frameworks/kdelibs4support-5.99.0:5 >=kde-frameworks/kglobalaccel-5.99.0:5 >=kde-frameworks/kguiaddons-5.99.0:5 >=kde-frameworks/ki18n-5.99.0:5 >=kde-frameworks/kiconthemes-5.99.0:5 >=kde-frameworks/kio-5.99.0:5 >=kde-frameworks/kitemmodels-5.99.0:5 >=kde-frameworks/kitemviews-5.99.0:5 >=kde-frameworks/kjobwidgets-5.99.0:5 >=kde-frameworks/knewstuff-5.99.0:5 >=kde-frameworks/knotifications-5.99.0:5 >=kde-frameworks/knotifyconfig-5.99.0:5 >=kde-frameworks/kparts-5.99.0:5 >=kde-frameworks/krunner-5.99.0:5 >=kde-frameworks/kservice-5.99.0:5 >=kde-frameworks/kwidgetsaddons-5.99.0:5 >=kde-frameworks/kwindowsystem-5.99.0:5 >=kde-frameworks/kxmlgui-5.99.0:5 >=kde-frameworks/plasma-5.99.0:5 >=kde-frameworks/solid-5.99.0:5 >=kde-frameworks/sonnet-5.99.0:5 >=kde-plasma/kwin-5.25.5:5 >=kde-plasma/libksysguard-5.25.5:5 >=kde-plasma/libkworkspace-5.25.5:5 >=kde-plasma/plasma-workspace-5.25.5:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.5:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.99.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) !kde-plasma/user-manager >=dev-qt/qtgraphicaleffects-5.15.5:5 >=dev-qt/qtquickcontrols2-5.15.5:5 >=kde-frameworks/kirigami-5.99.0:5 >=kde-frameworks/qqc2-desktop-style-5.99.0:5 >=kde-plasma/kde-cli-tools-5.25.5:5 >=kde-plasma/oxygen-5.25.5:5 sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs kaccounts? ( net-libs/signon-oauth2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.25.5/plasma-desktop-5.25.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-2.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	61c165e3e2ee9247a96df5f5e3b31472	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	f4e23ee9fed407c2ceb93f819e8d9263	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cb9abd9ce2caca6b184ee7f6479f9eb5
+_md5_=89ce98c011dd23cd10e1a9ae7ecd559e
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.25.5-r5 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.25.5-r5
index e7ffac247e14..02c92645bc9c 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.25.5-r5
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.25.5-r5
@@ -7,7 +7,7 @@ HOMEPAGE=https://kde.org/plasma-desktop
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm plasma.kde.org
 IUSE=appstream +calendar +fontconfig geolocation gps +policykit screencast +semantic-desktop telemetry test debug +handbook test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=GPL-2
 PDEPEND=>=kde-plasma/kde-cli-tools-5.25.5:5
 RDEPEND=dev-libs/icu:= >=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5[widgets] >=dev-qt/qtgui-5.15.5:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtsql-5.15.5:5 >=dev-qt/qtsvg-5.15.5:5 >=dev-qt/qtwayland-5.15.5:5= >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtx11extras-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 >=kde-frameworks/kactivities-5.99.0:5 >=kde-frameworks/kactivities-stats-5.99.0:5 >=kde-frameworks/karchive-5.99.0:5 >=kde-frameworks/kauth-5.99.0:5 >=kde-frameworks/kbookmarks-5.99.0:5 >=kde-frameworks/kcompletion-5.99.0:5 >=kde-frameworks/kconfig-5.99.0:5 >=kde-frameworks/kconfigwidgets-5.99.0:5 >=kde-frameworks/kcoreaddons-5.99.0:5 >=kde-frameworks/kcrash-5.99.0:5 >=kde-frameworks/kdbusaddons-5.99.0:5 >=kde-frameworks/kdeclarative-5.99.0:5 >=kde-frameworks/kded-5.99.0:5 >=kde-frameworks/kglobalaccel-5.99.0:5 >=kde-frameworks/kguiaddons-5.99.0:5 >=kde-frameworks/ki18n-5.99.0:5 >=kde-frameworks/kiconthemes-5.99.0:5 >=kde-frameworks/kidletime-5.99.0:5 >=kde-frameworks/kinit-5.99.0:5 >=kde-frameworks/kio-5.99.0:5 >=kde-frameworks/kitemmodels-5.99.0:5 >=kde-frameworks/kitemviews-5.99.0:5 >=kde-frameworks/kjobwidgets-5.99.0:5 >=kde-frameworks/knewstuff-5.99.0:5 >=kde-frameworks/knotifications-5.99.0:5 >=kde-frameworks/knotifyconfig-5.99.0:5 >=kde-frameworks/kpackage-5.99.0:5 >=kde-frameworks/kpeople-5.99.0:5 >=kde-frameworks/krunner-5.99.0:5 >=kde-frameworks/kservice-5.99.0:5 >=kde-frameworks/ktexteditor-5.99.0:5 >=kde-frameworks/ktextwidgets-5.99.0:5 >=kde-frameworks/kunitconversion-5.99.0:5 >=kde-frameworks/kwallet-5.99.0:5 >=kde-frameworks/kwayland-5.99.0:5 >=kde-frameworks/kwidgetsaddons-5.99.0:5 >=kde-frameworks/kwindowsystem-5.99.0:5 >=kde-frameworks/kxmlgui-5.99.0:5 >=kde-frameworks/plasma-5.99.0:5 >=kde-frameworks/prison-5.99.0:5[qml] >=kde-frameworks/solid-5.99.0:5 >=kde-plasma/breeze-5.25.5:5 >=kde-plasma/kscreenlocker-5.25.5:5 >=kde-plasma/kwin-5.25.5:5 >=kde-plasma/layer-shell-qt-5.25.5:5 >=kde-plasma/libkscreen-5.25.5:5 >=kde-plasma/libksysguard-5.25.5:5 >=kde-plasma/libkworkspace-5.25.5:5 >=media-libs/phonon-4.11.0 sci-libs/libqalculate:= sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.99.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.5:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.99.0:5 ) gps? ( sci-geosciences/gpsd ) policykit? ( virtual/libcrypt:= ) screencast? ( >=dev-qt/qtgui-5.15.5:5=[egl] media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.99.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.15.5:* >=dev-qt/qtgraphicaleffects-5.15.5:5 >=dev-qt/qtpaths-5.15.5:5 >=dev-qt/qtquickcontrols-5.15.5:5[widgets] >=dev-qt/qtquickcontrols2-5.15.5:5 kde-apps/kio-extras:5 >=kde-frameworks/kirigami-5.99.0:5 >=kde-frameworks/kquickcharts-5.99.0:5 >=kde-plasma/milou-5.25.5:5 >=kde-plasma/plasma-integration-5.25.5:5 sys-apps/dbus x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot !<kde-plasma/breeze-5.22.90:5 !<kde-plasma/plasma-desktop-5.23.90:5 policykit? ( sys-apps/accountsservice ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
@@ -16,4 +16,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.25.5/plasma-workspace-5.25.5.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	61c165e3e2ee9247a96df5f5e3b31472	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	f4e23ee9fed407c2ceb93f819e8d9263	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f896fb5ca272a94654148dc23012dab7
+_md5_=c761678e579e43877554b73b4d7aafe7
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 39e0f5f6f721..2c38712aeff1 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/renderdoc-1.22-r1 b/metadata/md5-cache/media-gfx/renderdoc-1.22-r1
index 5345ae2c1b1b..03f403304ac8 100644
--- a/metadata/md5-cache/media-gfx/renderdoc-1.22-r1
+++ b/metadata/md5-cache/media-gfx/renderdoc-1.22-r1
@@ -7,11 +7,11 @@ HOMEPAGE=https://renderdoc.org https://github.com/baldurk/renderdoc
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools cmake flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg
 IUSE=pyside2 qt5 python_single_target_python3_9 python_single_target_python3_10 doc verify-sig
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB
 RDEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= >=dev-util/glslang-1.3.231:= x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_9? ( dev-python/pyside2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) ) qt5? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
 REQUIRED_USE=doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0
 SRC_URI=https://github.com/baldurk/renderdoc/archive/refs/tags/v1.22.tar.gz -> renderdoc-1.22.tar.gz qt5? ( https://github.com/baldurk/swig/archive/renderdoc-modified-7.tar.gz -> swig-renderdoc-7.tar.gz ) verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v1.22/v1.22.tar.gz.asc -> renderdoc-1.22.tar.gz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	cmake	44afbf15c35884f7c840470f1cf05d0d	docs	2af4a2f0074bd646101ce0f66ca6dd03	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b993ac83266cd6e27df9609f07333ae6
+_md5_=b8bb8633917745574f9eafa026eb5efc
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index c18f785be8f7..194492273f18 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/libsdl2-2.24.2 b/metadata/md5-cache/media-libs/libsdl2-2.24.2
index 88b274fdfc01..d80d43f70f0a 100644
--- a/metadata/md5-cache/media-libs/libsdl2-2.24.2
+++ b/metadata/md5-cache/media-libs/libsdl2-2.24.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.libsdl.org/
 INHERIT=autotools flag-o-matic multilib-minimal
 IUSE=alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver 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=ZLIB
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fcitx4? ( app-i18n/fcitx:4 ) gles1? ( media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gles1] ) gles2? ( >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gles2] ) ibus? ( app-i18n/ibus ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kms? ( >=x11-libs/libdrm-2.4.82[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gbm(+)] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pipewire? ( media-video/pipewire:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndio? ( media-sound/sndio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl(+),gles2,wayland] >=x11-libs/libxkbcommon-0.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-6.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) vulkan? ( media-libs/vulkan-loader )
 REQUIRED_USE=alsa? ( sound ) fcitx4? ( dbus ) gles1? ( video ) gles2? ( video ) haptic? ( joystick ) ibus? ( dbus ) jack? ( sound ) nas? ( sound ) opengl? ( video ) pulseaudio? ( sound ) sndio? ( sound ) vulkan? ( video ) wayland? ( gles2 ) xscreensaver? ( X )
 SLOT=0
 SRC_URI=https://www.libsdl.org/release/SDL2-2.24.2.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=ff20b7dc46de7b710b9d05854a154d40
+_md5_=3d008ce55c63838afbe66dd7a6b1469d
diff --git a/metadata/md5-cache/media-libs/netpbm-10.86.34 b/metadata/md5-cache/media-libs/netpbm-10.86.34
deleted file mode 100644
index 9bcf73749219..000000000000
--- a/metadata/md5-cache/media-libs/netpbm-10.86.34
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/xz-utils sys-devel/flex virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=jbig? ( media-libs/jbigkit:= ) jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) png? ( >=media-libs/libpng-1.4:0= sys-libs/zlib ) postscript? ( app-text/ghostscript-gpl sys-libs/zlib ) rle? ( media-libs/urt:= ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) X? ( x11-libs/libX11 )
-DESCRIPTION=A set of utilities for converting to/from the netpbm (and related) formats
-EAPI=8
-HOMEPAGE=https://netpbm.sourceforge.net/
-INHERIT=flag-o-matic multilib toolchain-funcs
-IUSE=jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=jbig? ( media-libs/jbigkit:= ) jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) png? ( >=media-libs/libpng-1.4:0= sys-libs/zlib ) postscript? ( app-text/ghostscript-gpl sys-libs/zlib ) rle? ( media-libs/urt:= ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) X? ( x11-libs/libX11 )
-SLOT=0
-SRC_URI=https://github.com/ceamac/netpbm-make-dist/releases/download/v10.86.34/netpbm-10.86.34.tar.xz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=94e1f7a55cb8f37d298123b4d0f8d33d
diff --git a/metadata/md5-cache/media-libs/netpbm-10.86.35 b/metadata/md5-cache/media-libs/netpbm-10.86.35
index 3a648a949ee8..827f5c260f60 100644
--- a/metadata/md5-cache/media-libs/netpbm-10.86.35
+++ b/metadata/md5-cache/media-libs/netpbm-10.86.35
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://netpbm.sourceforge.net/
 INHERIT=flag-o-matic multilib toolchain-funcs
 IUSE=jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml
-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=Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain
 RDEPEND=dev-lang/perl jbig? ( media-libs/jbigkit:= ) jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) png? ( >=media-libs/libpng-1.4:0= sys-libs/zlib ) postscript? ( app-text/ghostscript-gpl sys-libs/zlib ) rle? ( media-libs/urt:= ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) X? ( x11-libs/libX11 )
 SLOT=0/stable
 SRC_URI=https://github.com/ceamac/netpbm-make-dist/releases/download/v10.86.35/netpbm-10.86.35.tar.xz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1e50fbfdb992186960b335eed752eb4a
+_md5_=41f2767e69a05a5b5665631bfdd4824a
diff --git a/metadata/md5-cache/media-libs/sdl-image-1.2.12_p20220527 b/metadata/md5-cache/media-libs/sdl-image-1.2.12_p20220527
index 3d2553b4b773..6ef8b487076a 100644
--- a/metadata/md5-cache/media-libs/sdl-image-1.2.12_p20220527
+++ b/metadata/md5-cache/media-libs/sdl-image-1.2.12_p20220527
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/libsdl-org/SDL_image
 INHERIT=toolchain-funcs multilib-minimal
 IUSE=gif jpeg png static-libs tiff webp 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 ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=ZLIB
 RDEPEND=>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] png? ( media-libs/libpng[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[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://github.com/libsdl-org/SDL_image/archive/633dc522f5114f6d473c910dace62e8ca27a1f7d.tar.gz -> sdl-image-1.2.12_p20220527.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c10f354075a2690965bdce1e37287032
+_md5_=5e926633a9b5fd31f9436665cc38ca47
diff --git a/metadata/md5-cache/media-libs/sdl-mixer-1.2.12_p20221010 b/metadata/md5-cache/media-libs/sdl-mixer-1.2.12_p20221010
index acfb3da9d1f8..41d00d91a213 100644
--- a/metadata/md5-cache/media-libs/sdl-mixer-1.2.12_p20221010
+++ b/metadata/md5-cache/media-libs/sdl-mixer-1.2.12_p20221010
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.libsdl.org/projects/SDL_mixer/
 INHERIT=multilib-minimal
 IUSE=flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav 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 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=ZLIB
 RDEPEND=>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] flac? ( >=media-libs/flac-1.2.1-r5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) midi? ( fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) timidity? ( media-sound/timidity++ ) ) mod? ( mikmod? ( >=media-libs/libmikmod-3.3.6-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) mp3? ( mad? ( >=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) smpeg? ( >=media-libs/smpeg-0.4.4-r10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) vorbis? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=midi? ( || ( timidity fluidsynth ) ) timidity? ( midi ) fluidsynth? ( midi ) mp3? ( || ( smpeg mad ) ) smpeg? ( mp3 ) mad? ( mp3 ) mod? ( || ( mikmod modplug ) ) mikmod? ( mod ) modplug? ( mod )
 SLOT=0
 SRC_URI=https://github.com/libsdl-org/SDL_mixer/archive/7804621c533dddfe970e97c94c4ea72d48ed7f48.tar.gz -> sdl-mixer-1.2.12_p20221010.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e1f60b95cf43c72640c95f8afa3db342
+_md5_=91d238fc9ec848f2279f94e00e9eb325
diff --git a/metadata/md5-cache/media-libs/sdl-net-1.2.8_p20221010 b/metadata/md5-cache/media-libs/sdl-net-1.2.8_p20221010
index 336c354337fa..2454d97b1d28 100644
--- a/metadata/md5-cache/media-libs/sdl-net-1.2.8_p20221010
+++ b/metadata/md5-cache/media-libs/sdl-net-1.2.8_p20221010
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/libsdl-org/SDL_net
 INHERIT=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 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=ZLIB
 RDEPEND=media-libs/libsdl[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://github.com/libsdl-org/SDL_net/archive/091c95c031769f48d3ffaacddfdea1af999f4446.tar.gz -> sdl-net-1.2.8_p20221010.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=abe3a52265e68162cbb002f6ad164d3e
+_md5_=9b91d6491db39e5e52a9d1c98fe68fa3
diff --git a/metadata/md5-cache/media-libs/sdl-sound-1.0.3_p20220525 b/metadata/md5-cache/media-libs/sdl-sound-1.0.3_p20220525
index 438f62bf3556..430fc2145517 100644
--- a/metadata/md5-cache/media-libs/sdl-sound-1.0.3_p20220525
+++ b/metadata/md5-cache/media-libs/sdl-sound-1.0.3_p20220525
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/icculus/SDL_sound
 INHERIT=autotools multilib-minimal
 IUSE=flac mikmod modplug mp3 speex static-libs vorbis 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=amd64 ~arm ~arm64 ppc ppc64 sparc ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~x64-macos
 LICENSE=LGPL-2.1+
 RDEPEND=>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] flac? ( >=media-libs/flac-1.2.1-r5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mikmod? ( >=media-libs/libmikmod-3.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( media-sound/mpg123[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[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://github.com/icculus/SDL_sound/archive/2076a4f555f95ed28dead5e28ee8e57cc74e425f.tar.gz -> sdl-sound-1.0.3_p20220525.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d08576966d729e9d8e64b7f61970cf75
+_md5_=cf2e9fb031b8414fcf160a73bf977577
diff --git a/metadata/md5-cache/media-libs/sdl-ttf-2.0.11_p20220525 b/metadata/md5-cache/media-libs/sdl-ttf-2.0.11_p20220525
index 49bf37670c81..e704dc2f0db8 100644
--- a/metadata/md5-cache/media-libs/sdl-ttf-2.0.11_p20220525
+++ b/metadata/md5-cache/media-libs/sdl-ttf-2.0.11_p20220525
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/libsdl-org/SDL_ttf
 INHERIT=multilib-minimal
 IUSE=static-libs X 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 ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=ZLIB
 RDEPEND=>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libXt-1.1.4[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://github.com/libsdl-org/SDL_ttf/archive/2648c22c4f9e32d05a11b32f636b1c225a1502ac.tar.gz -> sdl-ttf-2.0.11_p20220525.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=fa85abe18cbf90782455c438e2fe1ef7
+_md5_=f2823b63182f88b47fa181ff812585a7
diff --git a/metadata/md5-cache/media-libs/sdl2-ttf-2.20.0 b/metadata/md5-cache/media-libs/sdl2-ttf-2.20.0
index 2268926ae962..727ce305baba 100644
--- a/metadata/md5-cache/media-libs/sdl2-ttf-2.20.0
+++ b/metadata/md5-cache/media-libs/sdl2-ttf-2.20.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.libsdl.org/projects/SDL_ttf/
 INHERIT=cmake-multilib
 IUSE=+harfbuzz static-libs X 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 ppc ppc64 ~riscv sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=ZLIB
 RDEPEND=>=media-libs/libsdl2-2.0.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.10.4[harfbuzz?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] harfbuzz? ( >=media-libs/harfbuzz-2.8.0:=[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://github.com/libsdl-org/SDL_ttf/releases/download/release-2.20.0/SDL2_ttf-2.20.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6a19642e9961a6821dc485d093c9b00d
+_md5_=24f29c952bda15757b59df1761d68731
diff --git a/metadata/md5-cache/media-libs/tiff-4.4.0 b/metadata/md5-cache/media-libs/tiff-4.4.0
deleted file mode 100644
index 33bf49f44d07..000000000000
--- a/metadata/md5-cache/media-libs/tiff-4.4.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-evenrouault ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( >=app-arch/zstd-1.3.7-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Tag Image File Format (TIFF) library
-EAPI=8
-HOMEPAGE=http://libtiff.maptools.org
-INHERIT=multilib-minimal verify-sig
-IUSE=+cxx jbig jpeg lzma static-libs test webp zlib zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=libtiff
-RDEPEND=jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( >=app-arch/zstd-1.3.7-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=test? ( jpeg )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.osgeo.org/libtiff/tiff-4.4.0.tar.xz verify-sig? ( https://download.osgeo.org/libtiff/tiff-4.4.0.tar.xz.sig )
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=dc656f95bf18b49964843080bdade39f
diff --git a/metadata/md5-cache/media-libs/tiff-4.4.0-r1 b/metadata/md5-cache/media-libs/tiff-4.4.0-r1
index dfbd7a0a0c87..9a5602253289 100644
--- a/metadata/md5-cache/media-libs/tiff-4.4.0-r1
+++ b/metadata/md5-cache/media-libs/tiff-4.4.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://libtiff.maptools.org
 INHERIT=multilib-minimal verify-sig libtool flag-o-matic
 IUSE=+cxx jbig jpeg lzma static-libs test webp zlib zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=libtiff
 RDEPEND=jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( >=app-arch/zstd-1.3.7-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test? ( jpeg )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.osgeo.org/libtiff/tiff-4.4.0.tar.xz verify-sig? ( https://download.osgeo.org/libtiff/tiff-4.4.0.tar.xz.sig )
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=5071709fa933a7bc13e13e01b1bdd354
+_md5_=9241811f2f9dee219481a96a3a0ae1d2
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 5208c9272394..853af32b5434 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/vlc-3.0.18 b/metadata/md5-cache/media-video/vlc-3.0.18
index b73a6c1fc004..1a4cc9846b71 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.18
+++ b/metadata/md5-cache/media-video/vlc-3.0.18
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.videolan.org/vlc/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
 IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer +gui ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse +lua_single_target_lua5-1 test
-KEYWORDS=~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv -sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv -sparc ~x86
 LICENSE=LGPL-2.1 GPL-2
 RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz:= virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:= >=media-libs/libdvdread-6.1.2:= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac:= media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6(+)] ) v4l? ( media-libs/libv4l:= ) vaapi? ( media-libs/libva:=[drm(+),wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) skins? ( gui truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5-9
 SRC_URI=https://download.videolan.org/pub/videolan/vlc/3.0.18/vlc-3.0.18.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a3aeefff543bed1f47aa637b7c79a862
+_md5_=88a55556a7d3ab03fd72a3d94ea62e55
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 3ec9004014ed..5f7643d768c8 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/avahi-0.8-r7 b/metadata/md5-cache/net-dns/avahi-0.8-r7
index bd1bba292957..09c2ccafc59f 100644
--- a/metadata/md5-cache/net-dns/avahi-0.8-r7
+++ b/metadata/md5-cache/net-dns/avahi-0.8-r7
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://avahi.org/
 INHERIT=autotools flag-o-matic multilib-minimal mono-env python-single-r1 systemd
 IUSE=autoipd bookmarks +dbus doc gdbm gtk howl-compat +introspection ipv6 mdnsresponder-compat mono nls python qt5 selinux systemd test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-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=LGPL-2.1
 RDEPEND=acct-user/avahi acct-group/avahi acct-group/netdev autoipd? ( acct-user/avahi-autoipd acct-group/avahi-autoipd ) dev-libs/libdaemon dev-libs/libevent:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/expat dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gdbm? ( sys-libs/gdbm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt5? ( dev-qt/qtcore:5 ) gtk? ( x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( sys-libs/libcap ) introspection? ( dev-libs/gobject-introspection:= ) mono? ( dev-lang/mono ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[gdbm] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[gdbm] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[gdbm] ) python_single_target_python3_8? ( bookmarks? ( >=dev-python/twisted-16.0.0[python_targets_python3_8(-)] ) dbus? ( dev-python/dbus-python[python_targets_python3_8(-)] ) introspection? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( bookmarks? ( >=dev-python/twisted-16.0.0[python_targets_python3_9(-)] ) dbus? ( dev-python/dbus-python[python_targets_python3_9(-)] ) introspection? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( bookmarks? ( >=dev-python/twisted-16.0.0[python_targets_python3_10(-)] ) dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) introspection? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) ) ) selinux? ( sec-policy/selinux-avahi )
 REQUIRED_USE=python? ( dbus gdbm ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) bookmarks? ( python ) mono? ( dbus ) howl-compat? ( dbus ) mdnsresponder-compat? ( dbus ) systemd? ( dbus )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lathiat/avahi/archive/v0.8.tar.gz -> avahi-0.8.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e1cb30636cd3f22cff15754454fabd02
+_md5_=1c74c122bcc3572a27c2455367151280
diff --git a/metadata/md5-cache/net-dns/knot-resolver-5.5.3 b/metadata/md5-cache/net-dns/knot-resolver-5.5.3
index aad628d21ac0..62ab0c65eb99 100644
--- a/metadata/md5-cache/net-dns/knot-resolver-5.5.3
+++ b/metadata/md5-cache/net-dns/knot-resolver-5.5.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.knot-resolver.cz https://gitlab.nic.cz/knot/knot-resolver
 INHERIT=lua-single meson tmpfiles verify-sig
 IUSE=caps dnstap kresc nghttp2 systemd test +lua_single_target_luajit verify-sig
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) acct-group/knot-resolver acct-user/knot-resolver dev-db/lmdb:= dev-libs/libuv:= net-dns/knot:= net-libs/gnutls:= caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) kresc? ( dev-libs/libedit ) nghttp2? ( net-libs/nghttp2:= ) systemd? ( sys-apps/systemd:= ) virtual/tmpfiles
 REQUIRED_USE=^^ ( lua_single_target_luajit )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://secure.nic.cz/files/knot-resolver/knot-resolver-5.5.3.tar.xz verify-sig? ( https://secure.nic.cz/files/knot-resolver/knot-resolver-5.5.3.tar.xz.asc )
 _eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=4fe17238e992f97efdffa5d19c65b369
+_md5_=e4521eed6dcbd38c34200e21861fec6a
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 000ea653ee60..a6aef3f2c266 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/mu-1.8.11 b/metadata/md5-cache/net-mail/mu-1.8.11
index 6f41ba4b0622..c8be8d988146 100644
--- a/metadata/md5-cache/net-mail/mu-1.8.11
+++ b/metadata/md5-cache/net-mail/mu-1.8.11
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
 INHERIT=elisp-common meson
 IUSE=emacs readline
-KEYWORDS=amd64 arm arm64 ~riscv ~x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~riscv x86 ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) readline? ( sys-libs/readline:= )
 SLOT=0
 SRC_URI=https://github.com/djcb/mu/releases/download/v1.8.11/mu-1.8.11.tar.xz
 _eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=98aefb8f4462a8a0f28caf95229f9489
+_md5_=c79a9b4867770297eab6ab95b3c42c21
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index d1200eeb7cc1..3a908a98ed6d 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/gnome-remote-desktop-43.2 b/metadata/md5-cache/net-misc/gnome-remote-desktop-43.2
new file mode 100644
index 000000000000..1b713390a9dd
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gnome-remote-desktop-43.2
@@ -0,0 +1,18 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils virtual/pkgconfig doc? ( app-text/asciidoc ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=x11-libs/cairo x11-libs/libdrm >=media-libs/libepoxy-1.4 >=dev-libs/glib-2.68:2 x11-libs/libnotify app-crypt/libsecret >=media-video/pipewire-0.3.49:= app-crypt/tpm2-tss:= rdp? ( >=media-libs/nv-codec-headers-11.1.5.0 >=net-misc/freerdp-2.8.0:=[server] >=sys-fs/fuse-3.9.1:3 >=x11-libs/libxkbcommon-1.0.0 aac? ( media-libs/fdk-aac:= ) ) vnc? ( net-libs/libvncserver )
+DESCRIPTION=Remote desktop daemon for GNOME using pipewire
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-remote-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson systemd xdg
+IUSE=aac doc +rdp systemd +vnc
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=x11-libs/cairo x11-libs/libdrm >=media-libs/libepoxy-1.4 >=dev-libs/glib-2.68:2 x11-libs/libnotify app-crypt/libsecret >=media-video/pipewire-0.3.49:= app-crypt/tpm2-tss:= rdp? ( >=media-libs/nv-codec-headers-11.1.5.0 >=net-misc/freerdp-2.8.0:=[server] >=sys-fs/fuse-3.9.1:3 >=x11-libs/libxkbcommon-1.0.0 aac? ( media-libs/fdk-aac:= ) ) vnc? ( net-libs/libvncserver ) x11-wm/mutter[screencast]
+REQUIRED_USE=|| ( rdp vnc ) aac? ( rdp )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-remote-desktop/43/gnome-remote-desktop-43.2.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=994ab546b1c9af1679feb991cedb62ee
diff --git a/metadata/md5-cache/net-misc/putty-0.78 b/metadata/md5-cache/net-misc/putty-0.78
index 8f202eff6300..8220eccc0ed0 100644
--- a/metadata/md5-cache/net-misc/putty-0.78
+++ b/metadata/md5-cache/net-misc/putty-0.78
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/putty/
 INHERIT=cmake desktop xdg-utils
 IUSE=debug doc +gtk gssapi
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango ) gssapi? ( virtual/krb5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~matthew/distfiles/putty-icons.tar.bz2 https://the.earth.li/~sgtatham/putty/0.78/putty-0.78.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c6eb80de62fc05ba9106f7497131b5d9
+_md5_=ff3dd36a8c0669469003e777fc959edc
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 9afc364cce06..4a581774a243 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-2.4.2-r6 b/metadata/md5-cache/net-print/cups-2.4.2-r6
index 655b44451119..1f831fce585c 100644
--- a/metadata/md5-cache/net-print/cups-2.4.2-r6
+++ b/metadata/md5-cache/net-print/cups-2.4.2-r6
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.cups.org/ https://github.com/OpenPrinting/cups
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools linux-info xdg multilib-minimal optfeature pam toolchain-funcs
 IUSE=acl dbus debug kerberos openssl pam selinux +ssl static-libs systemd test usb X xinetd zeroconf 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 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 PDEPEND=>=net-print/cups-filters-1.0.43
 RDEPEND=app-text/libpaper:= sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) acct-group/lp acct-group/lpadmin selinux? ( sec-policy/selinux-cups )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/OpenPrinting/cups/releases/download/v2.4.2/cups-2.4.2-source.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	optfeature	1a2157392a869265b2afcb63a26c12ac	pam	e44a1dd98f13e1ad76de01e919bde1f1	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=69ca65c7f9220ddba5b3d095f8660275
+_md5_=2a5760d8f980340474e49ea94566fd57
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index be1b66f7823d..277605da2aa5 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/irqbalance-1.9.2 b/metadata/md5-cache/sys-apps/irqbalance-1.9.2
index 4759eed26abb..48db8d80a630 100644
--- a/metadata/md5-cache/sys-apps/irqbalance-1.9.2
+++ b/metadata/md5-cache/sys-apps/irqbalance-1.9.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/Irqbalance/irqbalance
 INHERIT=autotools systemd linux-info
 IUSE=caps +numa systemd selinux tui
-KEYWORDS=amd64 arm arm64 ~loong ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/libnl:3 caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl ) systemd? ( sys-apps/systemd:= ) tui? ( sys-libs/ncurses:=[unicode(+)] ) selinux? ( sec-policy/selinux-irqbalance )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/Irqbalance/irqbalance/archive/v1.9.2.tar.gz -> irqbalance-1.9.2.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=6749f281f9cf88d8eda846ded608b4ff
+_md5_=57e62a60c778fd0345f338af996c8df5
diff --git a/metadata/md5-cache/sys-apps/merge-usr-5 b/metadata/md5-cache/sys-apps/merge-usr-6
index a81f8a07cab3..4cdda5e3a81d 100644
--- a/metadata/md5-cache/sys-apps/merge-usr-5
+++ b/metadata/md5-cache/sys-apps/merge-usr-6
@@ -10,6 +10,6 @@ LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
-SRC_URI=https://github.com/floppym/merge-usr/archive/refs/tags/v5.tar.gz -> merge-usr-5.tar.gz
+SRC_URI=https://github.com/floppym/merge-usr/archive/refs/tags/v6.tar.gz -> merge-usr-6.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=a5551c3150b45b259f31b1f393ac6519
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 306118eccc35..b27471bfccf3 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/gettext-0.21.1 b/metadata/md5-cache/sys-devel/gettext-0.21.1
index 9fa51f61eb61..0037bb3292ee 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.21.1
+++ b/metadata/md5-cache/sys-devel/gettext-0.21.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/gettext/
 INHERIT=java-pkg-opt-2 libtool multilib-minimal verify-sig
 IUSE=acl cvs +cxx doc emacs git java ncurses nls openmp static-libs java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-3+ cxx? ( LGPL-2.1+ )
 PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.3:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:0= ) java? ( virtual/jdk:1.8 ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.21.1.tar.xz verify-sig? ( mirror://gnu/gettext/gettext-0.21.1.tar.xz.sig )
 _eclasses_=java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=290dba3cec5239da55e8d0e7695f0824
+_md5_=a0257dbcba5ecd7e3838142540d87513
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index a2b8e1ac6d51..fa335d386853 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/exfatprogs-1.2.0 b/metadata/md5-cache/sys-fs/exfatprogs-1.2.0
index dbaa17d5d69d..1189735c9e10 100644
--- a/metadata/md5-cache/sys-fs/exfatprogs-1.2.0
+++ b/metadata/md5-cache/sys-fs/exfatprogs-1.2.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=prepare
 DESCRIPTION=Userspace utilities for new exfat filesystem (kernel 5.7+)
 EAPI=8
 HOMEPAGE=https://github.com/exfatprogs/exfatprogs
-KEYWORDS=amd64 ~loong ~ppc ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~loong ~ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=!sys-fs/exfat-utils
 SLOT=0
 SRC_URI=https://github.com/exfatprogs/exfatprogs/releases/download/1.2.0/exfatprogs-1.2.0.tar.xz
-_md5_=468405e27d2a88413f1c946cb9be8a51
+_md5_=7758152dfe36d966e161300b4a44b5d7
diff --git a/metadata/md5-cache/sys-fs/squashfs-tools-ng-1.2.0 b/metadata/md5-cache/sys-fs/squashfs-tools-ng-1.2.0
new file mode 100644
index 000000000000..f70514ac4736
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/squashfs-tools-ng-1.2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=app-arch/bzip2:= sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo:2 ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=A new set of tools for working with SquashFS images
+EAPI=8
+HOMEPAGE=https://github.com/AgentD/squashfs-tools-ng
+IUSE=lz4 +lzma lzo selinux +tools zstd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-3+ BSD-2 MIT tools? ( GPL-3+ )
+RDEPEND=app-arch/bzip2:= sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo:2 ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
+SLOT=0
+SRC_URI=https://infraroot.at/pub/squashfs/squashfs-tools-ng-1.2.0.tar.xz
+_md5_=e8e74532066669b2e57829da30500a94
diff --git a/metadata/md5-cache/sys-fs/squashfs-tools-ng-9999 b/metadata/md5-cache/sys-fs/squashfs-tools-ng-9999
index 4fb2e5de01b7..49088885443e 100644
--- a/metadata/md5-cache/sys-fs/squashfs-tools-ng-9999
+++ b/metadata/md5-cache/sys-fs/squashfs-tools-ng-9999
@@ -1,14 +1,14 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzma? ( app-arch/xz-utils:= ) lzo? ( dev-libs/lzo:= ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
+DEPEND=app-arch/bzip2:= sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo:2 ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=A new set of tools for working with SquashFS images
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/AgentD/squashfs-tools-ng
 INHERIT=autotools git-r3
 IUSE=lz4 +lzma lzo selinux +tools zstd
-LICENSE=LGPL-3+ tools? ( GPL-3+ )
+LICENSE=LGPL-3+ BSD-2 MIT tools? ( GPL-3+ )
 PROPERTIES=live
-RDEPEND=sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzma? ( app-arch/xz-utils:= ) lzo? ( dev-libs/lzo:= ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
+RDEPEND=app-arch/bzip2:= sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo:2 ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=32efdc0172c56120ff318292bf2c8d50
+_md5_=e8e74532066669b2e57829da30500a94
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 9f8d205778b1..98c8d90443aa 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.156 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.156
index 05a365368a81..7bfae67cdaa7 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.156
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.156
@@ -6,7 +6,7 @@ HOMEPAGE=https://www.kernel.org/
 IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 INHERIT=kernel-build toolchain-funcs
 IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm arm64 ~hppa ~ppc ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.10.156
 RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.156 virtual/libelf
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.156
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-165.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-165.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
 _eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	1c0e75f081d2e3eef51a73da749a45ff	kernel-install	238be8d2f82d53a648a5905b57a4969b	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1ba830ae96eaacabf8a46ec03e0ad33c
+_md5_=98b6b100a3b6e3e7457bf50748465b2b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.80 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.80
index 7953e3226230..b93366d7f955 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.80
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.80
@@ -6,7 +6,7 @@ HOMEPAGE=https://www.kernel.org/
 IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 INHERIT=kernel-build toolchain-funcs
 IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm arm64 ~hppa ~ppc ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.15.80
 RDEPEND=!sys-kernel/gentoo-kernel-bin:5.15.80 virtual/libelf
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.15.80
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-84.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-84.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
 _eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	1c0e75f081d2e3eef51a73da749a45ff	kernel-install	238be8d2f82d53a648a5905b57a4969b	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1725c0e270a5f5919be1c42812b3535c
+_md5_=3c0a9a345a7aba91c0d17740cb6d2435
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.156 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.156
index 4faf8535122d..e0aa91202e8d 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.156
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.156
@@ -6,7 +6,7 @@ HOMEPAGE=https://www.kernel.org/
 IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 INHERIT=kernel-install toolchain-funcs unpacker
 IUSE=+initramfs test
-KEYWORDS=~amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.10.156
 RDEPEND=!sys-kernel/gentoo-kernel:5.10.156 virtual/libelf
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.156
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-165.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-165.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.156-1.gpkg.tar -> gentoo-kernel-5.10.156-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.156-1.gpkg.tar -> gentoo-kernel-5.10.156-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.156-1.gpkg.tar -> gentoo-kernel-5.10.156-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.156-1.gpkg.tar -> gentoo-kernel-5.10.156-1.x86.gpkg.tar )
 _eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	238be8d2f82d53a648a5905b57a4969b	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
-_md5_=f21e591b8137b215b7bbcd833a76037f
+_md5_=fb41fec5718d0547691b6257fc439168
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.80 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.80
index 2ee872d9bc22..5edcfc61e0e1 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.80
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.80
@@ -6,7 +6,7 @@ HOMEPAGE=https://www.kernel.org/
 IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 INHERIT=kernel-install toolchain-funcs unpacker
 IUSE=+initramfs test
-KEYWORDS=~amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.15.80
 RDEPEND=!sys-kernel/gentoo-kernel:5.15.80 virtual/libelf
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.15.80
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-84.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-84.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.80-1.gpkg.tar -> gentoo-kernel-5.15.80-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.80-1.gpkg.tar -> gentoo-kernel-5.15.80-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.80-1.gpkg.tar -> gentoo-kernel-5.15.80-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.80-1.gpkg.tar -> gentoo-kernel-5.15.80-1.x86.gpkg.tar )
 _eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	238be8d2f82d53a648a5905b57a4969b	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
-_md5_=4f954deed68f95858ab6ab5982775ba0
+_md5_=83719e04f1392fa5d42e9e0e74bf5a5d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.300 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.300
index 6c98400f8ae2..5595e0940a42 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.300
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.300
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-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=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.14.300
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-311.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-311.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-311.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-311.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-311.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-311.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	222472d400d477278b203edbf50c3b98	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3af65335fc9f535aaaf27f380635df26
+_md5_=e041c5c54a3eb8805f5bbbd21512c7fd
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.267 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.267
index 6f53d9e9affd..adcc14cca2f0 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.267
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.267
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-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=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.19.267
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-266.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-266.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-266.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-266.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-266.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-266.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	222472d400d477278b203edbf50c3b98	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=68400fa416f544c58cd0994654d44fb9
+_md5_=c144c866401622dad67d3e0963815946
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.334 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.334
index d50d9ad1870b..795586fff840 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.334
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.334
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-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=GPL-2 linux-firmware
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.9.334
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-337.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-337.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-337.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-337.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-337.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-337.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	222472d400d477278b203edbf50c3b98	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=45c5eb5660b8781f90d6d18c938d9bb0
+_md5_=e8ca465af0003bbcd4fb7d43f691e262
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.156 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.156
index 4cd6cde29d4c..1fbcd43f5369 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.156
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.156
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.10.156
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-165.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-165.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-165.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-165.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-165.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-165.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	222472d400d477278b203edbf50c3b98	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=97914d85a487932aacec6e39f9e60d5b
+_md5_=19770678efc867c3d5fb8eae91571bb1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.80 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.80
index 87eee2859ad0..5493b84bc55d 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.80
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.80
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.15.80
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-84.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-84.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-84.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-84.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-84.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-84.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	222472d400d477278b203edbf50c3b98	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=ec225ec3f712cf25e0e94dd583db88b6
+_md5_=5b2d119a4ce4af35e508134a4157236d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.225 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.225
index a7e41826dfda..999d249a60b0 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.225
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.225
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-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=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.4.225
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-230.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-230.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-230.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-230.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-230.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-230.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	222472d400d477278b203edbf50c3b98	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=dc78b9f8faeb9aa7e26abb5b46aba9a1
+_md5_=2f8ae28ab697ef837ed45e1d5e0fd1e5
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 38ab3129dd44..e38cec16cbb9 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.156 b/metadata/md5-cache/virtual/dist-kernel-5.10.156
index 45422dccc283..e0edeb9866bb 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.156
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.156
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
-KEYWORDS=~amd64 ~arm arm64 ~hppa ~ppc ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 x86
 RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.156 ~sys-kernel/gentoo-kernel-bin-5.10.156 ~sys-kernel/vanilla-kernel-5.10.156 )
 SLOT=0/5.10.156
-_md5_=097a109ec7bdd0610dca12cca16509ed
+_md5_=8e04478c89d67837ed02a4ebab2037e0
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.15.80 b/metadata/md5-cache/virtual/dist-kernel-5.15.80
index edcf34194f1f..a65bb89089ef 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.15.80
+++ b/metadata/md5-cache/virtual/dist-kernel-5.15.80
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
-KEYWORDS=~amd64 ~arm arm64 ~hppa ~ppc ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 x86
 RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.15.80 ~sys-kernel/gentoo-kernel-bin-5.15.80 ~sys-kernel/vanilla-kernel-5.15.80 )
 SLOT=0/5.15.80
-_md5_=097a109ec7bdd0610dca12cca16509ed
+_md5_=8e04478c89d67837ed02a4ebab2037e0
diff --git a/metadata/md5-cache/virtual/rust-1.65.0-r1 b/metadata/md5-cache/virtual/rust-1.65.0-r1
index e2b77166387a..cc700b2a96f4 100644
--- a/metadata/md5-cache/virtual/rust-1.65.0-r1
+++ b/metadata/md5-cache/virtual/rust-1.65.0-r1
@@ -3,8 +3,8 @@ DESCRIPTION=Virtual for Rust language compiler
 EAPI=8
 INHERIT=multilib-build
 IUSE=rustfmt 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=amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 RDEPEND=|| ( ~dev-lang/rust-1.65.0[rustfmt?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-lang/rust-bin-1.65.0[rustfmt?,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/llvm-15
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=dd7ff6ebeee497f6ce8fa27f6b53961a
+_md5_=22bf149de2653661a7b8e5808acaee07
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index d88ed8f32ab0..03c2e3749e14 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/nextcloud-24.0.7 b/metadata/md5-cache/www-apps/nextcloud-24.0.7
index 26e85d63e49b..40ee19fb8938 100644
--- a/metadata/md5-cache/www-apps/nextcloud-24.0.7
+++ b/metadata/md5-cache/www-apps/nextcloud-24.0.7
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://nextcloud.com/
 INHERIT=webapp
 IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=AGPL-3
 RDEPEND=<dev-lang/php-8.2[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php app-admin/webapp-config
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=24.0.7
 SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-24.0.7.tar.bz2
 _eclasses_=webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=a8ff3c6c90e9b826aadbdf86b7422e3d
+_md5_=8dab4eaeb25722fa4ed2b527e58bbb0f
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 7ed7e697716b..5aff6829befa 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/libgxim-0.5.0 b/metadata/md5-cache/x11-libs/libgxim-0.5.0
index 9e61446443d0..7a0a9f013e4b 100644
--- a/metadata/md5-cache/x11-libs/libgxim-0.5.0
+++ b/metadata/md5-cache/x11-libs/libgxim-0.5.0
@@ -1,11 +1,11 @@
-BDEPEND=|| ( dev-lang/ruby:2.7 ) virtual/rubygems dev-util/glib-utils dev-util/intltool sys-devel/autoconf-archive sys-devel/gettext virtual/pkgconfig test? ( dev-libs/check ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+BDEPEND=|| ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 ) virtual/rubygems dev-util/glib-utils dev-util/intltool sys-devel/autoconf-archive sys-devel/gettext virtual/pkgconfig test? ( dev-libs/check ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-apps/dbus virtual/libintl x11-libs/gtk+:2 x11-libs/libX11
 DESCRIPTION=GObject-based XIM protocol library
 EAPI=7
 HOMEPAGE=https://tagoh.bitbucket.io/libgxim
 INHERIT=autotools ruby-single
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 static-libs test
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 static-libs test
 KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-apps/dbus virtual/libintl x11-libs/gtk+:2 x11-libs/libX11
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/tagoh/libgxim/downloads/libgxim-0.5.0.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-single	4e65f388d03c4681739781edf3bbf119	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8e963a4833a1df57aab739a17feaa0bc
+_md5_=29d3f018fbe89b40717f0b2f03dee505
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 8676d56d493d..3abb292c3194 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/sddm-0.18.1-r6 b/metadata/md5-cache/x11-misc/sddm-0.18.1-r6
deleted file mode 100644
index cd227d22fa73..000000000000
--- a/metadata/md5-cache/x11-misc/sddm-0.18.1-r6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/docutils dev-qt/linguist-tools:5 kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=acct-group/sddm acct-user/sddm dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 x11-base/xorg-server x11-libs/libxcb[xkb] elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower ) test? ( dev-qt/qttest:5 )
-DESCRIPTION=Simple Desktop Display Manager
-EAPI=8
-HOMEPAGE=https://github.com/sddm/sddm
-INHERIT=cmake linux-info systemd tmpfiles
-IUSE=+elogind +pam systemd test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain
-RDEPEND=acct-group/sddm acct-user/sddm dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 x11-base/xorg-server x11-libs/libxcb[xkb] elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower ) !systemd? ( gui-libs/display-manager-init ) virtual/tmpfiles
-REQUIRED_USE=?? ( elogind systemd )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sddm/sddm/releases/download/v0.18.1/sddm-0.18.1.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=aec4ca9876393330f4ae250bdbe095c8
diff --git a/metadata/md5-cache/x11-misc/sddm-0.18.1-r8 b/metadata/md5-cache/x11-misc/sddm-0.18.1-r8
index 8d08557bba99..a6f78269b428 100644
--- a/metadata/md5-cache/x11-misc/sddm-0.18.1-r8
+++ b/metadata/md5-cache/x11-misc/sddm-0.18.1-r8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/sddm/sddm
 INHERIT=cmake linux-info systemd tmpfiles
 IUSE=+elogind +pam systemd test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain
 RDEPEND=acct-group/sddm acct-user/sddm dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 x11-base/xorg-server x11-libs/libxcb:= elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower ) !systemd? ( gui-libs/display-manager-init ) virtual/tmpfiles
 REQUIRED_USE=?? ( elogind systemd )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sddm/sddm/releases/download/v0.18.1/sddm-0.18.1.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=032076940e71756b7e2ceeeeda543691
+_md5_=9998f993101d2554186a3eba42d493e1
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index cd5396c23dce..3c749cfb071d 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14599 BLAKE2B aa7561b35b3a906adb3ee194869ba11db4d8bf246ffbe64bb40e842e4206cd3dc1a9a483b23806e663dc2b6dadcf28cb76ae0c680aedb396cf4cc94ea51667c7 SHA512 0a2754da6017ade39957bf3272d6f9c7b55980889c20509b7c191037e097312158a2f4435ce79f798fd09ca4ab22aebea18ef44a3f8006ce02798af82523be49
-TIMESTAMP 2022-12-03T14:09:36Z
+TIMESTAMP 2022-12-03T20:09:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOLWKBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOLrQVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBlDg//apvlZPEs7EaJR0ov7nUlsdwVMBi0tykqXXiNMKun12ugTowelr61Nf3Z
-pEICj98D2jDf8a6BpGzrzbjGIj65jaWl3BB5fb0pzVhDAZHqTuIfWmXdWtlsI8g/
-K8ITYx6gPc9eZaHb4WlKhOZVM/0m0zxheWttUBSjr0FfHgfYmnLtPPjxGKljFuGz
-03feERrrQcLzBE75SPgfgOqxxcpsb1MrllLPd3GEi2j7d7rEm8i0VjwXTtfXoGf8
-zQrnCxoy5J6JkS9t+B8Bnc5xUbXzjrF0MTBrJNj1hiSR55LBbYFtR1d4Va971VHL
-qF1Spe0Lmh1dvX2SPatqgyfkhhN0chi18n7qpjfRJxmgydColrsPZkGwg9gDOI5m
-9sAXyBbaeFlfhShUvjVX57Afseh0hsRktBMexE+kN0Hb6t9iVRoLXC2r7VkUPPAL
-0qZwLiAk4BWQ7LG7fGTTM7z68O/AQTsnaA3A6E4nU2eEUcc6tH0/snmpvaQGu3KZ
-PrLu9vmfaWlHVrzVmKEn9Q6cGRcfIpcQQfFX6PK33txQuPPl4ser8FzPtlKk2RC5
-Yn7EZBAhpYUsWA7O4efh+2uymwWGuN+JoCN4FsqPTNOjftcbtOx8trvbahWvDegV
-uobpT7xjG8U3dkfbL137EIP6rFbMm81BhfQ7aT9k6faZ7tEKwuc=
-=AMP2
+klCGzw/8DSjb3zAqkbhUclCwPgVhR5hLgnlFfQL5fm/IsQ2SU5VymksaZ5CdN6qa
+cxHFJEIjBBR/iyI8wlGqlet9jYqQM8bohGwp/904gQ0WghMfD8U/h2+bqhuX11dz
+dkCPE5T4z6tkzqAl0oI5YFOo5r+BzJITR7nCKau72I22JbScaDM12ZHHmtEUqAQW
+PwqXzBqOv3CLtbb4/K1zre/S71gwFZk2PCteCwyeuzK0N+nuPpfJeertO46GQj62
+7QFHPB1m00uMz7KNDgit7hCv3pAZo7JFY+ZMK/k8lyy+U3CTLCXJjqcicA86l5kZ
+P8uYEn44dcVDvFjRth9KJk/5W7r4OIUjmZQVEo39vknLPFufuP28Zg+rgaU2Bsi2
+E0mlAUTFtnzhu1kcljbppm3dfM+IvEzBw9YYopWfX50esUW1SYN51Pxl1VH5hL7l
+0SWUiV3VLt2/opl36O0eaUV9ECMdcT1WaM/V6FNfRVMY7pWRXs8b5Vh0DU8HmEW+
+LqhSpFDBYw2IO8Iu5kdQlpnjmCn87liBlIPO00tArpzw1CakZ3+vcgfpFB0mZpF0
+tZLwVDLeaK0Sa5wpX9qOkHNPwol4byRGMPSdOsKLpn8tAYazNqz741z0T/BFoJ48
+14yBju7PdxUE9skY79psevSv+hXNJsPyhB045sqNEnJ6WMuTQ3w=
+=r8T+
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index dfcb66fb1040..0da6323eef3e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 03 Dec 2022 14:09:34 +0000
+Sat, 03 Dec 2022 20:09:38 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 7f1e997ab62a..320be87482e6 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Dec  3 02:09:34 PM UTC 2022
+Sat Dec  3 08:09:38 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 1ddbbb5c56a9..cdbd8238c6e7 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 03 Dec 2022 14:15:01 +0000
+Sat, 03 Dec 2022 20:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 24d86679eb0f..cf39e0bdfd4d 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-79cce30abd02567f8465f879a91b273544126c84 1670075530 2022-12-03T13:52:10+00:00
+3fc0725142c1edea0341a1aea681d2d2e0c89c75 1670096898 2022-12-03T19:48:18+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3c775ac07582..b9877df125b8 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1670076601 Sat 03 Dec 2022 02:10:01 PM UTC
+1670098201 Sat 03 Dec 2022 08:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index dfcb66fb1040..0da6323eef3e 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 03 Dec 2022 14:09:34 +0000
+Sat, 03 Dec 2022 20:09:38 +0000
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 08a3b6f87f63..64267387fca6 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 58068d82b645..abe11c2cd76a 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -7,5 +7,5 @@ AUX avahi-0.8-potentially-undefined-fix.patch 1385 BLAKE2B 2fdd4956f40ecb0e7cbfb
 AUX avahi-0.8-strict-prototypes.patch 1397 BLAKE2B 31139f99225c36cf116b74f34abf693431efd9ea8ddc9de4aad1c198b008821cb2202ab5b5cdfa3003b897de1f370b7a137b06db793e3f48e32499e0b0f3a9c5 SHA512 266e25bf6271232f7785947642f64e0917675c05acecfa71db7df30e6054c99a138e1f11d4f6caceb6cff10db9095df838232b56c80394fb771599443ea7732c
 DIST avahi-0.8.tar.gz 953319 BLAKE2B ddede1b8790ff3057ea5f4bb710e95578229e078a7abac83121e043017dda1ab3d971c723f920fdd4f3d98b88bd2cf21f9645bec1b7bbd2ea194cb399a5f5b46 SHA512 27bba9a551152dfc7e721f326042e7bfce55d227044a6cbaee04d6fb0e3f59c36e159c2b7a4dd42d1c955cdf37cc1c303e91991c08928bbded91d796e9a22abe
 EBUILD avahi-0.8-r5.ebuild 5323 BLAKE2B a9bed404ffc47969223ee6479653dc94eb1caaa3cf0f990c0a99f0002f91a65c4d3fcabd90caa7c990fafee655be9e1c4e8c220d70e2e995021d6f644c78a0ad SHA512 0f7e8c9cfe636dfa8ee2ab16e9364ed15c0b400af32019ce689205f86089655c5f88994249e5b1f54c7a1cd08a11bdf0ce6652fbd89edef814ad947d859ba52b
-EBUILD avahi-0.8-r7.ebuild 5511 BLAKE2B bcc6015d702d98b3bf39e78eabdb175349c3414a4cca4e3f7e3ec9c8d4839f2460fb24c3521ffbecef18d78e84d2d2343f18b3efdc76050778a4f829f31ff85b SHA512 7dc6fc05afc4ab2895a07fa53928697ba87fdb302f31cf302002ad42b0db0076dd0237bde3f3ff9b9473bd3eaf547050cbe5fec642d9803232776e5a9fc7538e
+EBUILD avahi-0.8-r7.ebuild 5507 BLAKE2B bd9a66a409d00c3127fbefa981925d87b26468570d6c766a750659ee7f115530fbcf6476080e5721bce2d917c4b0e8cb37031e081ad238f2db794488aa3c3b99 SHA512 cf72d932b915f9f668165fe97af2cbc85a4c951cb653dbf534458d6620091e55ca3cc94cbac2a35d4a3dcfc3b8db6db5fe250c298fc01dbd586c40ba6c2d9621
 MISC metadata.xml 866 BLAKE2B 1bbb5863a98c0f5aa6b3b7337c7f8c3ae21b5701f780fb53fa036dde754582462f2bc09d3999bdda524616951c3dcef5153ed77a27ec0877673cab782f480691 SHA512 775872c0491b4b7c448a70336d112e2c7435baddc18c851bb93bd3e2aa0138290e9952b3cb2abff60df78d03c7aad23d4ee5d704ba6afe30f489b76e5ba2e132
diff --git a/net-dns/avahi/avahi-0.8-r7.ebuild b/net-dns/avahi/avahi-0.8-r7.ebuild
index 328dc0b4c234..e3ec9f406a26 100644
--- a/net-dns/avahi/avahi-0.8-r7.ebuild
+++ b/net-dns/avahi/avahi-0.8-r7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-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"
 IUSE="autoipd bookmarks +dbus doc gdbm gtk howl-compat +introspection ipv6 mdnsresponder-compat mono nls python qt5 selinux systemd test"
 
 REQUIRED_USE="
diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest
index 8e88d718a1d9..1e647b2a137d 100644
--- a/net-dns/knot-resolver/Manifest
+++ b/net-dns/knot-resolver/Manifest
@@ -2,5 +2,5 @@ AUX knot-resolver-5.5.3-docdir.patch 925 BLAKE2B 9d40a287fe0a6d883d46dbe13fa3ba5
 AUX knot-resolver-5.5.3-nghttp-openssl.patch 1087 BLAKE2B 4570658d9d358384c435c0b4694995945f9c788249899670e000d3273ae6c2631ff69319660db2d04f4143e24746bc0160295042a7887d30dae09de11556ce8e SHA512 50e8a99aef8bc4ce41ddb4d1760cd96818859b440aa74effdc1482af150c21f4fc3e451fae739a07161fc5a2e0ee2cd093c26950dd4e16de430e6bb8a635dd84
 DIST knot-resolver-5.5.3.tar.xz 1921668 BLAKE2B 7efdf1a69081d8f9f43b5bbe1b483826b94b87a0b001a449a5f89988afce070e4e3310e513e6281691bd81274a523ab8c7e52fe56a3d62019efe07809033a5a8 SHA512 7bf29bbf82e71727c1f47095a04a12712ca89a6f34d3a325337625ad116f49a47a90cb402525fdbf59cb0889b64d7083b908c335d65429b24d776603a3a8f28a
 DIST knot-resolver-5.5.3.tar.xz.asc 833 BLAKE2B 7ab348587c2604f14171d09436b2a296e9fb7124e6f899aba91215d32d8642dc5b9ae8300edf55c0790289bc954d5cf95c71b66a20b960c848d15e34469fc2f3 SHA512 1e95fffdb1c78a225b5bf861f978c1c18a9935ecd495e8f708ed4a241308b9302d2cf5a5ec51334dbecf50950af5f775bfff78995663cf1681a3dbc354d3a686
-EBUILD knot-resolver-5.5.3.ebuild 1977 BLAKE2B 4ca215563d7ed52a77cdb46d90be47817f53939932b0a2eec93adc5dae8c15bec11e90b9eed5c25a3ad723ebd818782c92d57414ab50ef63cd659e51813e3ec3 SHA512 6c2cf4e40a65434bde84fc469ac333742cd9ad4b89b24952777a2e0048420bfdd481b41e66805f294bc01b308e46f34ed88f8c0c008aafe5b758f9ce622507a2
+EBUILD knot-resolver-5.5.3.ebuild 1976 BLAKE2B bfc97cfa0b887c4bd7dd5afd43ce3260942735496749cea618b25c7a3f2bf7a28925c063760df27ff5dc70f60e6bce387d82e62b697fbd069ede8f898829211d SHA512 1f7493f996cc3d519cc488cd9edf293970ebabee6d6991384dca9e05a660c4a1cc8297b6f1a70a8fc39ae3b1c051a068636e3155da6287e5ca4c7bbb9143c88b
 MISC metadata.xml 470 BLAKE2B 16d945ec59b8b4bf54306a3f3182bc61f45ec8cc1880480366a6a918cbad337fc102ae6d2f0cdf3347e7a7a85fc5bc58129bb7e2f1378e42cb047aaa15dbc138 SHA512 09e7fce327eff1d4b5c4702ac4c90c6cf157d076715808eaea42cf0371007ed44a84466bed7c03b296c3fc1b99059cfd0cb575a2a957e7730d49a26bb35c160a
diff --git a/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild b/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild
index e059f6d60333..e8618808dcc5 100644
--- a/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild
+++ b/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="caps dnstap kresc nghttp2 systemd test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index d5cdd755262b..8609e2fba5b9 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index b1a966c61fbe..6c50386f6ed9 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -2,5 +2,5 @@ AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f485
 DIST mu-1.8.10.tar.xz 541408 BLAKE2B e1533d5fb83df2913a6041526adc1efa15d7eca2933f21765d1b9f405d69043932dfc9a9a65eca81bb898bb7bb9d0213fca7025dfc4e8dd729fe46daccb9a5b8 SHA512 56e4d51b40b406b53857b883b60eda2499b6c07fa3bad7c2bfdfab472f1fe60aa33eeb2b24fdeef1cc2655c8a0e9d799e81dad96fba3d7152e66e80a1d7f0bce
 DIST mu-1.8.11.tar.xz 543168 BLAKE2B 196007390b909057e27f9f864709c8dc9b20d6baa575938531a8d6aacb5d3244e55d50473771cb6e41a019b4d5013d9a51c6640d6274b53fad2e19dcafb5066d SHA512 24abc3499d3e6c9e55f7bf75d8c8fae68be5976b28edf3fa8c6e04e55acf8ad2356bdbc820fcd8cae327ed930f3f2164c4cd92108aafde6af1addac8f8411fe2
 EBUILD mu-1.8.10.ebuild 2106 BLAKE2B 7da6a51b1de0124d20aede38a1826eb75a91e92518518393cc0cfa8320f3c26f4a0f5fbe2e8e229eea38f58eb11b6dd09733965043bfd0bed3fee38ad250efbe SHA512 21f779ba0ca3b2f48724fc27c60cc243a501fb0d36a189246750f4d6c9913f7062fbabd8f206019d20417f0bd2913ba0789582a216f8db257bc304b3458806c0
-EBUILD mu-1.8.11.ebuild 2107 BLAKE2B 824be5eef39ca5aceedb7fb4567ef3020203d6d25d620b4a5a2405a6c5ad3ea957c5b68aacb268838d7194d608be7e1418db18ecd725a1d143e87bc348b5c35c SHA512 738e9f940381ce948be3857a82779fdf4027beeb1d291d34be4014884238a12edf5bbc72ee28e0bb9f879366433e5ea109a57192541113b350903210ff592e9f
+EBUILD mu-1.8.11.ebuild 2106 BLAKE2B 7da6a51b1de0124d20aede38a1826eb75a91e92518518393cc0cfa8320f3c26f4a0f5fbe2e8e229eea38f58eb11b6dd09733965043bfd0bed3fee38ad250efbe SHA512 21f779ba0ca3b2f48724fc27c60cc243a501fb0d36a189246750f4d6c9913f7062fbabd8f206019d20417f0bd2913ba0789582a216f8db257bc304b3458806c0
 MISC metadata.xml 893 BLAKE2B 4d21c0794fc184957939ebaab628b9a1abe0bbdb63915157e266ce0a773fe3acc52722d010d3b4e096f86257e945c0f9dd51cd0dbe54c37f717408ffe942bc06 SHA512 7f499e039820d12c9acd0affe2a402fc53ee6367684a3c2ba25669987f02b0fabb3db0de978e197876bd9e3af315734af398ba7c8305119c511d59c709b6e225
diff --git a/net-mail/mu/mu-1.8.11.ebuild b/net-mail/mu/mu-1.8.11.ebuild
index ece19ae53d62..62b981bf5db6 100644
--- a/net-mail/mu/mu-1.8.11.ebuild
+++ b/net-mail/mu/mu-1.8.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos"
 IUSE="emacs readline"
 
 DEPEND="
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 6bb4f5391569..a77680fc458f 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest
index cb03de8033aa..e8ad47acb910 100644
--- a/net-misc/gnome-remote-desktop/Manifest
+++ b/net-misc/gnome-remote-desktop/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-remote-desktop-43.0.tar.xz 195212 BLAKE2B ccfb43075ce6e36de4bcf3f92265e6596b78831393e3d6b079ef71ae729a9d48fdf177673b4b7e67db8c92a0d397461c60727780f18ff78c671eac6a01229ab4 SHA512 d774d85ef15b02f6c668806e8d7b036c3063decbec81a8cf253aaa01e13a49d802f4338e677744867e2e1ab3dc02ed30c8d8edbca2a9c428b783d5a4cdd8d110
 DIST gnome-remote-desktop-43.1.tar.xz 195740 BLAKE2B b73f0e72f72c45169deb1018dd19cbac779effc2bafc53b8db21cb72c48f5871ef64e3a085509aa859550b4fb54713506e2b6410e211eba7ee8850649af7c39f SHA512 5e0164092da0fdb4877c8a1b40f1df609315390468522efaaad8f30f5c8e29111b021c1a7f3b8ce25627dfbe7937a4876d6673a816d81fdc191d30d4553a0596
+DIST gnome-remote-desktop-43.2.tar.xz 195984 BLAKE2B 7f6bcf142f98a1b6f357cbc6bb651c63bcae5360a52a83ac44b8eea8f0f3bcdb29c23ec4d973ee40b29ebc0ff59958468a236238b50e68a886e31334a45f5c5c SHA512 e7e9c36e04a7273cb1700859d59ab8130bca7103c3def7f51a6df31b98f6021b9ceb15d2f9e71fef2464141dcd01d467e126731028d7dd6b6ec843dd52b1e8d4
 EBUILD gnome-remote-desktop-43.0.ebuild 1362 BLAKE2B 8e0b92def7905f3e36e56664eb7c192de4acfaa8da21af45ad3dec7b563c52715baddae6cb68a0ce2405a484b347e286d7f7f4b8ec9bbc3bebd2c3af4d9008a5 SHA512 6d21560f9d01cbfef4d36c3d361c2803df0812b5a1c0c522b02dd4085e3b642270a9c4827bd57389e1cb9fa0fb8b9f17015a882996184a110b7eff0a9e3b310f
 EBUILD gnome-remote-desktop-43.1.ebuild 1368 BLAKE2B b579aab040bebf357e960ba6f65813026023a63dc5023f4079dc5b7b3fe38d71fe7c1dd549ea541d90bb5f23c017e89900c56987eefbaf96e5868e152efefd33 SHA512 68ec11a3b414a8847900f9900af4beeacd9a6e45b0958afda0e4fa5351a539ba2caede34e0a6bb9649d56d4a113bd1e20e7fc55cabf8da2e0240d65d70846651
+EBUILD gnome-remote-desktop-43.2.ebuild 1368 BLAKE2B b579aab040bebf357e960ba6f65813026023a63dc5023f4079dc5b7b3fe38d71fe7c1dd549ea541d90bb5f23c017e89900c56987eefbaf96e5868e152efefd33 SHA512 68ec11a3b414a8847900f9900af4beeacd9a6e45b0958afda0e4fa5351a539ba2caede34e0a6bb9649d56d4a113bd1e20e7fc55cabf8da2e0240d65d70846651
 MISC metadata.xml 488 BLAKE2B 14e2e29779ea62269e8c473a877b3da316a60b6b970ac784e6cd853610ac81a981ed9dd4104a99d5e7c48f4146f74efdbab9f71d81c405baf24f3cb3e9a1702c SHA512 7d9b8b371cc0f609e77baa3a3eff701a5a68922e5405995d5c3f70bc92af0308ca409bc05e28480ab8f008b879e417cd679bb0ec5494f17d3abb8a7b52248a06
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-43.2.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-43.2.ebuild
new file mode 100644
index 000000000000..90f943fab5e7
--- /dev/null
+++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-43.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="aac doc +rdp systemd +vnc"
+REQUIRED_USE="|| ( rdp vnc ) aac? ( rdp )"
+RESTRICT="test" # Tests run xvfb-run directly
+
+DEPEND="
+	x11-libs/cairo
+	x11-libs/libdrm
+	>=media-libs/libepoxy-1.4
+	>=dev-libs/glib-2.68:2
+	x11-libs/libnotify
+	app-crypt/libsecret
+	>=media-video/pipewire-0.3.49:=
+	app-crypt/tpm2-tss:=
+	rdp? (
+		>=media-libs/nv-codec-headers-11.1.5.0
+		>=net-misc/freerdp-2.8.0:=[server]
+		>=sys-fs/fuse-3.9.1:3
+		>=x11-libs/libxkbcommon-1.0.0
+
+		aac? (
+			media-libs/fdk-aac:=
+		)
+	)
+	vnc? (
+		net-libs/libvncserver
+	)
+"
+RDEPEND="${DEPEND}
+	x11-wm/mutter[screencast]
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	virtual/pkgconfig
+	doc? (
+		app-text/asciidoc
+	)
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use doc man)
+		$(meson_use aac fdk_aac)
+		$(meson_use rdp)
+		$(meson_use vnc)
+		$(meson_use systemd)
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 6094be383507..b46939e3835e 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -3,6 +3,6 @@ DIST putty-0.77.tar.gz 2619481 BLAKE2B 83b0838a3923c93f95020297d6402872605609da8
 DIST putty-0.78.tar.gz 2811628 BLAKE2B 544fa7d3f7acfeb76cdb19e5ff3b60c81e4a1101ba16fab107d1f403745f792ab562d438d64a8a0a429b31ec426806c296a7b4e03916f8f32d2c227a54c32c71 SHA512 d7a3e2eabd5f1f65fc0f3f1ee0789c30fbe891b57f63ddeac0b92befcb6aecd4a748f04a21c76ee42d992deb77c2e1a0454a71cc620ef26fbf23af660bd84bb5
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
 EBUILD putty-0.77-r3.ebuild 1899 BLAKE2B 8924c081a3d250bf5bd3e86097dfe4ea697aaf663b1173cf567a86327f35f780f821051af656bb58bbf30002d9410dbe179088d61d8f0cde8056298d38185649 SHA512 24b4ce38c7c5eb014f80260875d3db63f0566b5d480d955d7113a9e454991a72cee5840e177824c8be85af727d8bdc8909a160dc30f9c309be6edd1479adfc9b
-EBUILD putty-0.78.ebuild 1740 BLAKE2B 1a46a5e4b74a94a9da338bd8ab7ffee3e7004d0ceedce4b10ff2610606cbd19349584945d3eba593280401a1536ea477fdaa5f21e15981d69851c1a3e38899b5 SHA512 69fbbd509ee11ac613a6805db6fe779e7d595a517b40367030829cd51fee465bfee9afa164ba8101adb2e727e874c7157ffed1c78bb79504a9f490a25acc6b22
+EBUILD putty-0.78.ebuild 1737 BLAKE2B dba8b3d1142ab6b2eba92d78ca33a2c0a4cd0fbda6f50f60c47c2324011d3b428c4b56d6272d5fc7dd3b2b8a11a443b1a620012ddd2a01544792c368f4f9c400 SHA512 fc6a7e0bf203e35516f00e288b5d8c7f8e4858914b94e68d598c74733cf7e16d5d496d9c3e3d142a3e14da166a5d5a138d10d0f980ed687505ab483e16727e49
 EBUILD putty-9999.ebuild 1830 BLAKE2B ae8ac481031ed674d52aa70031c0eaa8f769b23534ef63a3b59b9a420a67b53e472cb7b7bf35ccd5d36243defdc9be5e9d55b0c606e7ce620b8629408096b166 SHA512 c373accbd85ab6ae24c243ef11bffc3f6afc0ff7d18430a9715be3c7ff8c898714f68f3963f500f82fb38c338ef3513a64241c3fc91bb8f151659a4801738535
 MISC metadata.xml 1007 BLAKE2B 358ab09685c2020a9d0bd49a7c4845cf3b0f31776d7ad9d11c99b70b325b9d902bad73690e68aa991b0123a3a720eb55f50d07f6df35e7142ddddb5146b92ed8 SHA512 45ed3f5781db722328f6101496538c2d920c6cfe5f9422ba838e4d723b9ca53ad2fa783a6c0dd36557e7d0008071d7886bd7e5f1ca76e1b83465a6312c01d772
diff --git a/net-misc/putty/putty-0.78.ebuild b/net-misc/putty/putty-0.78.ebuild
index 3ae9e04f3a16..dd68284f8bf4 100644
--- a/net-misc/putty/putty-0.78.ebuild
+++ b/net-misc/putty/putty-0.78.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git"
 else
 	SRC_URI+=" https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
 fi
 LICENSE="MIT"
 
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 8d473422d0f0..64e01a933e14 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 30fdaaa5bb70..8d5d0a01e5c6 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -6,6 +6,6 @@ AUX cupsd.init.d-r4 577 BLAKE2B 48508b10a13ee73e905b3d061275f5cb12ebdc2175ce46af
 DIST cups-2.4.2-source.tar.gz 8128785 BLAKE2B 97053feb502d4fdc28810b806000b6c84a6795d5adcec0789e73e5477d5802d46a99381366d16219f627166df088f6decde5c144bd0c38b5745815dc1e426bc5 SHA512 07474643bffe11c79b3226b70d28f1bb803dc19daa10711938cea303feacdcce3945ba8ff0334d94fdd5922ea7d6bf37a28c1ea62cce8ce946c2f90a0faf002f
 EBUILD cups-2.4.2-r4.ebuild 9565 BLAKE2B 6f0d1515121e17b1aaa51b63d13d6e5179e549b10150aaf17a327bf81c72eb04a351824217c9ca68caf57647a5706e212a165fcce6714bcb0d2b42b3721ed228 SHA512 621b343f64cc21f4080ebe30e291fead821c0a2b22a4ae7419b27383a0d99fab557c89156620fcafc17780518fa11eea5c3d474199632483f3228a44ee7b689d
 EBUILD cups-2.4.2-r5.ebuild 9608 BLAKE2B d6209822fc9dd2547155a03e1d18878145513ce660e4f0e7f48e56ac2c4c3ba9c113e44cd62ac57fa9daf0938cfc6cdd199137322cc6ac26cd6511e53ec765dd SHA512 65f9f3bc8e9f995a7b3c1180ae54714874cdc4fdd612945917016ab35154723162009d76895be076d30ba28d726fc935bea8a35e038ab70d6b03c7ae93de3d01
-EBUILD cups-2.4.2-r6.ebuild 9665 BLAKE2B f3473e89855d465084c5fc3004a85b75b798e3b2eb91cfafadd90e32b02c7531d7b5eb9ef1fec2b29af083aae699b6cae27b4241c7c387832e2c13e02de82768 SHA512 546fd4c8fe4364bafd44cb2dc90acf46ac9cbaf8bd426fec7866bd9b3270699b3d1d15cd3706b4a0dc73c487a7bb64e061e36caa83fc9b7f4880b2d2e85e286a
+EBUILD cups-2.4.2-r6.ebuild 9661 BLAKE2B 9119c3b4b54cc866e1c9b5fd2ec51cdff3fde93fd0f7a91d0c6d6424cf5d2bea376c27230ece6c8d96bb67f75d6e02a200b5fb37677fd96f878786c627ff4e30 SHA512 e8cabe54e2719eef34c10855ec5f5d81d137fb6a1b3c464d94db6ab3e7051c9530ab6cab0c2064255ee6942c7a694b7361a9fc39e516e7787516cc191f6b3a5f
 EBUILD cups-9999.ebuild 9486 BLAKE2B cd5ffbf3615df20ebe62536c0a8e4d49cee67104fe9b265ea4a46ec8624545317be37dfef18e54e0b4350f1fcc5cbb7aedce15905978e396b9db9a18ffc1263a SHA512 50ce41c2012ff045f4ced0f0b7052bae28650693e03351882fe609648675cbf4f51bb7f43d86d210bf9b39232a674f563f91281fb22f4d92fe45665b1dd5b2d7
 MISC metadata.xml 527 BLAKE2B 04a32175e666165226eaa97785a6b9e4b779644e352c503a4653870631f28089dddbaaa3db3143f09a1d97c7f57952e4d760d64005eafacb379c23035fe9ad19 SHA512 136c81a99b501ffcedfd71f4425ba556292b79abc0ac819d336d2c845401775955b8cd72e6194f02f4c48d0cd26bc93ee7c94c7438228b49410daca80a159523
diff --git a/net-print/cups/cups-2.4.2-r6.ebuild b/net-print/cups/cups-2.4.2-r6.ebuild
index 50d39ce182e8..cca046d335e0 100644
--- a/net-print/cups/cups-2.4.2-r6.ebuild
+++ b/net-print/cups/cups-2.4.2-r6.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		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"
 	fi
 fi
 
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index e1459ca435ec..ae2f2610f85c 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index e3e260a6ce55..e6aaace2c608 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org> (2022-12-03)
+# Obsolete slot without reverse dependencies. Use a newer vcr
+# slot instead. Masked for removal in 30 days.
+dev-ruby/vcr:3
+
 # Sam James <sam@gentoo.org> (2022-12-03)
 # Dev channel releases are only for people who
 # are developers or want more experimental features
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 8a5135f5c041..6844b987d580 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest
index 6c4a6b408421..8212119ee28d 100644
--- a/sys-apps/irqbalance/Manifest
+++ b/sys-apps/irqbalance/Manifest
@@ -3,5 +3,5 @@ AUX irqbalance.init.4 555 BLAKE2B a90aa453f6d59ec8da954d47a386cfcc2395e36b3b7f9b
 DIST irqbalance-1.9.0.tar.gz 55779 BLAKE2B 11df51b03a473da10340c0c9ca9a28b3d9f9ed81e202e434b135a4be1cf54bc5558b33a4a922eba89bdd8cebbd6d3448527507fa72f03c4ff494ae83d513854e SHA512 878977da5eff18e53bdceeaa4aca952f73ba8b03eb028cf176816af971ffc65f0b1f1bb3a68e3a2502491895cc2b9438652dc97d5696232bb2f64860109e9a24
 DIST irqbalance-1.9.2.tar.gz 62188 BLAKE2B bc640323c3a594090f77983e63d9b7df177a05b859e4d29edb5b654f886c9e9f0d748ce22b1323bee443ea8369e014b9e0ce383bfe6f396692346649199d10a2 SHA512 d0fb157fbfc096fa9cfb4562e51fd4c3f4fa8788f72377c58b27df67c70073b787bba05e39809dcbe17532bb5b8e74b6d27c5e5b3d9af09bc9ce1a9b6aab9378
 EBUILD irqbalance-1.9.0.ebuild 1334 BLAKE2B 74900103bf0167ae4d3dc4fe0d73de353ccc818f29b9edddffe9c163f47f46d3baee119b403ceb24058598739c9c691a69bd4a896f47a591687435c22ab32124 SHA512 03363872eae5a613833a7e1b6506f5440cc40b1bdce4aafbb891e5091f1c1815848c3df8f0b578a3742b25b5f3a0dd3f22100fb1c2068882a3affb4fbfa625ad
-EBUILD irqbalance-1.9.2.ebuild 1443 BLAKE2B aa3b44051ba7c143ce767f4ce6a8e440f969dd0660e2f4c3d235316510a1f0094b3cf3e69d4c22bc20279a012a957bbf2d5abe81832c9d9c614c917e451e708b SHA512 c58595b876c9cfc076cb9d67229b65d7aa32f2194a8bbe01c925a20df3670d411cd87223f0885865fc8e87c1a51d86722ea4317dfc63b095b23e36e05a446323
+EBUILD irqbalance-1.9.2.ebuild 1441 BLAKE2B 5d93a47edeae40242db702f071a5b34790bd613efca45520cdf67b796b9e9b19c85e30907539d811a51572e403186ba6a7c67a073ed930109ab94da58fe29019 SHA512 dffad50bc2229f061d7dea667ebbe3279c3104fe8fa355af2aeb2d800c582aa47114630787a82838eff6fd7dfca44a1aa6a147214f151bbb923f4eb4e202d45b
 MISC metadata.xml 547 BLAKE2B 0a83f459995622fe247317aa9f045c0696f888712e9e5b56ac4eedb12862772044aaf407e25181ac84d64b9fced0e950b74c9dfcfa7a44e2451356dbab03461a SHA512 90b145e0e3fd1519eb1e6a412fc06700eed8bd27bea262e3d0bed02b0140586c0a9a01b9e301d3c0ec464c2cfbc6f80118c48eead3c830ba13dfd3b1588f6c9f
diff --git a/sys-apps/irqbalance/irqbalance-1.9.2.ebuild b/sys-apps/irqbalance/irqbalance-1.9.2.ebuild
index 5d26daf8bbc5..7004301933b7 100644
--- a/sys-apps/irqbalance/irqbalance-1.9.2.ebuild
+++ b/sys-apps/irqbalance/irqbalance-1.9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 x86"
 IUSE="caps +numa systemd selinux tui"
 # Hangs
 RESTRICT="test"
diff --git a/sys-apps/merge-usr/Manifest b/sys-apps/merge-usr/Manifest
index 298cedceccdb..10d123473eba 100644
--- a/sys-apps/merge-usr/Manifest
+++ b/sys-apps/merge-usr/Manifest
@@ -1,3 +1,3 @@
-DIST merge-usr-5.tar.gz 9492 BLAKE2B 5fbd23a59f76004a1548ae230a4eccc9ecc81a36b235ed8744fd48cd980815c62929fb436068dd232812d92c39ed5f7d778ffe2ddbaaf4f9c7785c6927d6eb87 SHA512 b0b4d8da51a570057ce9aeccd4cf880c2a6bc52067958e23e5162d589b671a123ddbdab8a74dd5f076f689be737637e1b1a7b0581e94bfbae4e16ada37be6045
-EBUILD merge-usr-5.ebuild 624 BLAKE2B b03d393a5f75c2d0b64b33a0eefbf70468503b567979b3087c633cc93c806c2b601364b6c2db681361ff35ae42eff5c2d7a5e418b68ec697e7c283090dd49908 SHA512 9109b04e0fe49cc73d1ed9ee703cfc3fd75d8790458e80cbcaf35608eef4dfd7fb8084a2d92f80109589e8ca8833b8676106dc154303c029e25bab98eba77fb4
+DIST merge-usr-6.tar.gz 9501 BLAKE2B 3cdb769c1f75cb35a941c6ba6fe1d469e38bb0e96ce7aeac6fa6b8cfead4b630a13eac7b03144bb00f35a722a5264b39a504826e442d3c44b12d505c911d14a2 SHA512 57cbf2fadac587747b10f88299224e2c40a7a9375c0fc502ad966f42cf87f034b0b28d195001b275869f90dd1eecf210c47ffce9cd0163cc01b67b7860a680e4
+EBUILD merge-usr-6.ebuild 624 BLAKE2B b03d393a5f75c2d0b64b33a0eefbf70468503b567979b3087c633cc93c806c2b601364b6c2db681361ff35ae42eff5c2d7a5e418b68ec697e7c283090dd49908 SHA512 9109b04e0fe49cc73d1ed9ee703cfc3fd75d8790458e80cbcaf35608eef4dfd7fb8084a2d92f80109589e8ca8833b8676106dc154303c029e25bab98eba77fb4
 MISC metadata.xml 353 BLAKE2B 9e4087255bb09abf0945581eb1db80afdc81d6d069160f506a7e3b70f7fb52d24e088e294d4617099efcde54101f6bc711557716bfecfb256f2651b0eabaec71 SHA512 e93595bf297480f90ec3c1a477c524516c646670b3b99b176c554b7dd1e2d738c9370f6540cb787f6f9ba96177b7d76cdd3b65a936c4fbee02563dce9ac4d952
diff --git a/sys-apps/merge-usr/merge-usr-5.ebuild b/sys-apps/merge-usr/merge-usr-6.ebuild
index a7131924dcf8..a7131924dcf8 100644
--- a/sys-apps/merge-usr/merge-usr-5.ebuild
+++ b/sys-apps/merge-usr/merge-usr-6.ebuild
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index aa3d84b5652f..4723763e0296 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index a4f4bc1cc73d..9c9bff117961 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -10,5 +10,5 @@ DIST gettext-0.21.tar.xz 9714352 BLAKE2B e36418323c79f582d13777083b455ae76ccb29e
 DIST gettext-0.21.tar.xz.sig 819 BLAKE2B 22a6e5f6e8a6322e24db9c1f575754bccbf6c7cff7cd14cb51ae8f5cf17cd7b677d8ecfc6b876e1b6f8d62077d568cbf57930e1d8accc5306e6869d3c6560bf4 SHA512 67c9515ad5e11773a28599d517dd84131e4afd878d67e97f505cd024e290518ca9cffff7446c62f88b56aea2c7234d11811738e8e2a076b2159f24c2f6809703
 EBUILD gettext-0.21-r3.ebuild 4676 BLAKE2B 44a27f8c9ca8b7093cbb6c53dfea6ad562da229c0c00ba2420a06cfa1e52e5fff178c1ac4ae1516f855e1aeef05b5aefc61add22f1ca3a12b6371090b07f41a9 SHA512 c11ef2bd673318196170021a272595a916b136524aa1ccc1450bdd66cec8a757d020a4cd8a4ed4ecbff5343ce482ded80485c80990b10d97749ce732c2f559fd
 EBUILD gettext-0.21-r4.ebuild 4877 BLAKE2B 67bca7075a3682ec3a4fd57c4c8e12230f2e11932821eef3aca9128135a833be768fcadb85bbed8a41e8b50220f14e9da9c618aaa64a25afa662df6c297c72d6 SHA512 ad26cc64f6ad1ce6ee94d4a062fce82b4ab83707e772e94264d2e1534549f1aed12a0f198e77506a66a3b5307279900a86a6ef42fb418724451d6ffe953e331b
-EBUILD gettext-0.21.1.ebuild 5156 BLAKE2B 0675a933ee10627916e12df254a83bdceaa782c20d50e31c4ae8fcd09a1fb673125f3b8a60120537671cd365e68438993bafc5515b03eea2ff4f2bd55474ee8c SHA512 b2247ad5332a84744929b6e7763664f270958b8abe839e5f24f7798ac5f68fb82f505bc8c50ca2db02b529776f668ce4ab373d217aac5d024ddb262e0530d1b5
+EBUILD gettext-0.21.1.ebuild 5155 BLAKE2B e8543612fecd1ad5bc765547df163c7ef572149a00c8b8f9e35a042669844dbb8b831f9769b5bc04b16e35f429ebf35a33ee6f9246d5895692360f9c95dfe772 SHA512 3f7fc243ccb88a7a3694fe64f5a4e6179af3ced1540cf49806483b0aef32e75187168b1653a6e14b2dabff9b19dabfc749e63a22a6017b3379dbe62a75087022
 MISC metadata.xml 708 BLAKE2B 851174e455d052a1c3a4e0a5dbfeac2feb10781a54fa0bfb52b3934ed88a3f8a2437a922f3ce5b56e21aa6aaec3488539e151362e3441344f97c246b79e2c2e2 SHA512 9dbd43e82384160c392bcfa94a271951a754c2cbf116cf61659642660e93b4a82a7636d600cc8a83b68fcd2d92669e4b5b009334039ff66c58b92baa24961aac
diff --git a/sys-devel/gettext/gettext-0.21.1.ebuild b/sys-devel/gettext/gettext-0.21.1.ebuild
index d4ff1e51aa4b..654d28fe3fbd 100644
--- a/sys-devel/gettext/gettext-0.21.1.ebuild
+++ b/sys-devel/gettext/gettext-0.21.1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *_rc* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 # Only libasprintf is under the LGPL (and libintl is in a sep package),
 # so put that license behind USE=cxx.
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index deb5e765b826..2fae7bb95c9c 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/exfatprogs/Manifest b/sys-fs/exfatprogs/Manifest
index bf2242960129..4936096256c2 100644
--- a/sys-fs/exfatprogs/Manifest
+++ b/sys-fs/exfatprogs/Manifest
@@ -1,6 +1,6 @@
 DIST exfatprogs-1.1.3.tar.xz 261936 BLAKE2B 7d1e471eb24f408999efd7fd6e8e2b60f0ef4efbceca9780de5a52c0b0bcad18a25648b7e669e805a40f382541406c01ea75cd40b4660f44281848bf38f9d1c0 SHA512 d23bfe4d0233d944b0d5a484e1167746db77ea9b7fbacdbfac2dd4d37a8a1d747f2445b09baced9fd7b5d3dbfc7664bdc1efe16326d7e678d05294eee124efa3
 DIST exfatprogs-1.2.0.tar.xz 272716 BLAKE2B d8b4188ee2fd96b4b0abab52540e894f55279e3031596081f8077a45a2ad5737870298a0658feee177818dbf02ae036e035c350437c3ea4b7ab7100f46fc8772 SHA512 61a78af024e1ff7e12f2d7449c3ee2ff9476c8746269e29c453c77dbc73d3f52af7ca8fc3e1bd85d6a75b6ed8b7712b5f80e5cc1dffc5ff00fb63455a57ca9bf
 EBUILD exfatprogs-1.1.3.ebuild 623 BLAKE2B 0a18440e3d1b53f3b8da000793db3de0cd5792dc225394fd9a522b618d332be16096240b61cada89b3153ba61fa2388d66283a6c988d101d485e133219e3bc7c SHA512 1201ba29fdd440594cccc4330f3764ef3e7263f690311ab39fbd80d1fb8eae415de0c205bdbf0cff2dfd6efb2caffe07ce2b39ef0d60dd9e0049c9f69866ada7
-EBUILD exfatprogs-1.2.0.ebuild 614 BLAKE2B d09affb2403a3a0920d91987aaa255ab86a0a7ad6b6b0f1527b2cb89b2a4439c6fe75563707c2e0c642680d395fb683aa801f9903b927e9bb15d05f3dd2825d1 SHA512 69c718b2a2c8fb2f9526b7fda0b2efada20f37a34ad40dfc5d119040162cad6f1e6f527f68531de8e31ba0ead10a9f50386a26a59f1c16652e5c21af0f38f134
+EBUILD exfatprogs-1.2.0.ebuild 613 BLAKE2B 7c7a9864318de7f85dbfc34b464802e61d86017e98f48be2f970c17b34d6b75d916722ed3f53cd6668c60a5e5327fd59c4f81a8e2648a247352e45a5c851bf83 SHA512 c438788901e5223faefd0479a0d0d265a4532115be4f06f63d3cd13f6d1e0d2ddc853a97c76717a11799a0a9c8a76631bec6b864a3ede3392332b427d4c7ac78
 EBUILD exfatprogs-9999.ebuild 616 BLAKE2B 91c306c2f4b3021dde2621ffc22c8a4848e060cbc0d105e0f10b83f5426ef4d7b9c1c5a42998c93e9c95bc68222224639fab76ca2074fc2974eeb52b08db9554 SHA512 6915a80d52ecfb9425a38faffc3c3e5769a7780751a6b808e3b9ebb1695bc26c2cec91b8b5761394654f57f162f47cda65440399a7edb40959fb288ef655502b
 MISC metadata.xml 344 BLAKE2B 6f45e027a37eb3d01018cfd5b1d07691129367cb969896e42303b38ca81bbdc8aef68f1dc542b2a5aefa793d2f28c60c8c5dc2261b75b817973302dd7e817541 SHA512 5ce136106ee694a1a8725e3498189a1162aa249a91b4597a3cd6f87c202b6a30fd1bd6daa13e9f80fe108f3e024ca995502b9b18b30bbad47722b18fa325fa1d
diff --git a/sys-fs/exfatprogs/exfatprogs-1.2.0.ebuild b/sys-fs/exfatprogs/exfatprogs-1.2.0.ebuild
index 2f1d60188511..75231f8a87c1 100644
--- a/sys-fs/exfatprogs/exfatprogs-1.2.0.ebuild
+++ b/sys-fs/exfatprogs/exfatprogs-1.2.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~loong ~ppc ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~loong ~ppc ppc64 ~riscv x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-fs/squashfs-tools-ng/Manifest b/sys-fs/squashfs-tools-ng/Manifest
index 39f9c2bde5e1..0d9458095e3f 100644
--- a/sys-fs/squashfs-tools-ng/Manifest
+++ b/sys-fs/squashfs-tools-ng/Manifest
@@ -1,4 +1,6 @@
 DIST squashfs-tools-ng-1.1.4.tar.xz 1311684 BLAKE2B b976ac223d57919958e0ad04c989e0a9cf2837e1c7ef1e1962069b4796b492fe2fc99c59d1e38b11e380226dc2fc4b2e25e29244635a32d03d0667f2b3ef1d7f SHA512 10e0bebd70de686862f1473588cdbf922ad766c86b64ebd4d6338fd863f862fe0c9374950fa54a197c0f02021c63943cf1ba57ebb7f93a4188e68e2b25b4a800
+DIST squashfs-tools-ng-1.2.0.tar.xz 586992 BLAKE2B ca20e4e01033b4dfa3ada2abd0f618305cb3f49f683863d36ea93679c2cfc0c396ee209c3254fa318d30cb2c4c000c3634d4b625212842cabae0a5e53b4a2bdc SHA512 0c52890a92e2aee928db3e2407c087703d331e9dd8cba1b58ef44fe78cdd7ed1523e9b0485f7da83ad77423ffdccaf392a2b752ad948d62a5f1b5e600b523070
 EBUILD squashfs-tools-ng-1.1.4.ebuild 1128 BLAKE2B efb69f0559657086b5f7280e9eef7ca59cfe254468383e079938ed95f64ef395423bc70eab6474d6bd64e86a879a7d9bd39bc8a0c108aacd9d11f52c5ab3eebf SHA512 b8ab85e23e2bf6849c630ed9b014299a419ceb6467c723e044e7f349e8238ae870b9bcb55ce96395053e6c4d7ae06d05ef531252d3d7a828d8ffe52895825430
-EBUILD squashfs-tools-ng-9999.ebuild 1129 BLAKE2B aa3e69a031b60b665d6c74b16a0bfc61a327a092a6b9dfa64035fa2fdf2ecc7c3805cd1753b9f2703af02659e7187b9b939011d9a2e0741493f5cedcde56ea30 SHA512 2ccbfe6a31cf89e5a35ca4bd7bc299758464760be4a6de352ee19b5cebec9f564a39f485d64bc1cc2d7435c527e0758fa675d9615d1bd58761a6872c86a90d66
+EBUILD squashfs-tools-ng-1.2.0.ebuild 1155 BLAKE2B c3633068452b558baa2b677378e632dfbeb67a7328ca63a1f10df3284b0198ac59a3eb617bce230ff5b169885845e3c8a97330b7e2364a4ad5f5033f5cd74aae SHA512 a49caa2a907e192bd9c90a7e4da087044faf4d7a59e6683b4e44f286af1090e8fa1dc4f63b78c8f1dbb36cf281b3a2705b67cd0e619a7fba63e546c8e9170ca4
+EBUILD squashfs-tools-ng-9999.ebuild 1155 BLAKE2B c3633068452b558baa2b677378e632dfbeb67a7328ca63a1f10df3284b0198ac59a3eb617bce230ff5b169885845e3c8a97330b7e2364a4ad5f5033f5cd74aae SHA512 a49caa2a907e192bd9c90a7e4da087044faf4d7a59e6683b4e44f286af1090e8fa1dc4f63b78c8f1dbb36cf281b3a2705b67cd0e619a7fba63e546c8e9170ca4
 MISC metadata.xml 453 BLAKE2B 4bfc83a611fe2b8da5ce57e56c438c671489d0944cbb4b3f82113bac6bee89028091551c1c96953f166959b087d7e776b28ecb6b9290489f007ea5ca33090ebf SHA512 013b8d87af8c6298eaba48b4aa4282a8781321b0a15d1a8745361e389bb6c5ae6957b24af4bb6b88125cff5f9824b0e878051bd395fdeb98c2ae0ef7f2b370a7
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.2.0.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.2.0.ebuild
new file mode 100644
index 000000000000..d5956518b2df
--- /dev/null
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A new set of tools for working with SquashFS images"
+HOMEPAGE="https://github.com/AgentD/squashfs-tools-ng"
+if [[ ${PV} = 9999* ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/AgentD/${PN}.git"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz"
+fi
+
+LICENSE="LGPL-3+ BSD-2 MIT tools? ( GPL-3+ )"
+SLOT="0"
+IUSE="lz4 +lzma lzo selinux +tools zstd"
+
+DEPEND="
+	app-arch/bzip2:=
+	sys-libs/zlib:=
+	lz4?     ( app-arch/lz4:= )
+	lzma?    ( app-arch/xz-utils )
+	lzo?     ( dev-libs/lzo:2 )
+	selinux? ( sys-libs/libselinux:= )
+	zstd?    ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		$(use_with lz4)
+		$(use_with lzo)
+		$(use_with selinux)
+		$(use_with tools)
+		$(use_with lzma xz)
+		$(use_with zstd)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
index a9e2e335faeb..d5956518b2df 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="A new set of tools for working with SquashFS images"
 HOMEPAGE="https://github.com/AgentD/squashfs-tools-ng"
@@ -13,15 +13,16 @@ else
 	SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz"
 fi
 
-LICENSE="LGPL-3+ tools? ( GPL-3+ )"
+LICENSE="LGPL-3+ BSD-2 MIT tools? ( GPL-3+ )"
 SLOT="0"
 IUSE="lz4 +lzma lzo selinux +tools zstd"
 
 DEPEND="
+	app-arch/bzip2:=
 	sys-libs/zlib:=
 	lz4?     ( app-arch/lz4:= )
-	lzma?    ( app-arch/xz-utils:= )
-	lzo?     ( dev-libs/lzo:= )
+	lzma?    ( app-arch/xz-utils )
+	lzo?     ( dev-libs/lzo:2 )
 	selinux? ( sys-libs/libselinux:= )
 	zstd?    ( app-arch/zstd:= )
 "
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 99620da57ee3..5ccc5adaf0a5 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 74f0ff82a53c..f70daf3244e1 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -88,11 +88,11 @@ DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6
 DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
 EBUILD gentoo-kernel-bin-5.10.153.ebuild 3008 BLAKE2B 300e9e3a2bb5e48c84d15e794af3528cb36f9af85644efaf5389ae3bda0f9c950a883f07f65d76e18f141505501a6183200ea02522989cd8254cec375f61cc14 SHA512 e2d748d0cba72dc83e86e4b9f970d4bb7ba9f769b8b17ccc55a7721a124f6df8de9a5a24bbb8d24a10628bcb61d6f4906e9dcaf88daf456dc5656c9c1447982f
 EBUILD gentoo-kernel-bin-5.10.155.ebuild 3010 BLAKE2B 196eb0cb19cbd99979d6fc8d2d205d87257888ea9a0017a06d1cf70a86417a3e220e320a305b8a708acc27371e82e85102fc88e8c882cba77fef141ac0e690cb SHA512 9e4fb16a50cee00a31cc28f2974fc8dfa4866f6e6050b6ebe6a25009d92d58edd222936e750044770a7d7ddc76b217cecd038ca537f7725c03ff66f53ca9a0a7
-EBUILD gentoo-kernel-bin-5.10.156.ebuild 3009 BLAKE2B 2b8b660da384a97318b541cfbcb483bf21e9dbb0468bdf41d0532278161e8a492132c74a6e474b2bb01ed21ad9dd19014552c71e635f239a657df28040c1e457 SHA512 c5df0c5438f51f609d6a014e01896d6f13f3bb2da62987cb6ee1113bb8fe0cf6b90f085ac6839759ec58ef5db65739c18e45f6b59e70b74af51892e3251e8eb3
+EBUILD gentoo-kernel-bin-5.10.156.ebuild 3008 BLAKE2B 300e9e3a2bb5e48c84d15e794af3528cb36f9af85644efaf5389ae3bda0f9c950a883f07f65d76e18f141505501a6183200ea02522989cd8254cec375f61cc14 SHA512 e2d748d0cba72dc83e86e4b9f970d4bb7ba9f769b8b17ccc55a7721a124f6df8de9a5a24bbb8d24a10628bcb61d6f4906e9dcaf88daf456dc5656c9c1447982f
 EBUILD gentoo-kernel-bin-5.10.157.ebuild 3012 BLAKE2B dbf0e0efab29dca830ae87344d02a4188c3ce23fc70762e507b2b62dfc0516677f36eb40f871cff6e89ae47ff6f1408c439471bcf7ed9706284389db6e324a66 SHA512 631b282510e57b7cee4fffddcbb69f6c97397dca26971322eb221787ddcce282701c2d9cc61bc36de81ef82df802951a0fd31101e3678d57d001c278936d3c86
 EBUILD gentoo-kernel-bin-5.15.77.ebuild 3008 BLAKE2B 4fdf89c9b4429a6e24f89f349ea0c2a90e75d14d99b74515349eaaeb3a89d61901b050c9d71c81c91753eaa6c9609e33645bf6b8a735d1941fe98f4b800c5ce3 SHA512 7b7d93d10e7ca6a71f0f52223ede5ca697e31a17dc455b7ae5349d6eb66c0b877c03cef5b3a8c359f43eb34e12413c6f42e1de0f9759e5e8a2998321a837476c
 EBUILD gentoo-kernel-bin-5.15.79.ebuild 3010 BLAKE2B fc2d18deccbc6a8859381f95f1ca104d912400fb937fb7c3ad6698952c9b9c9e33ab7b92ba7ef9bfb3e7e66996bdcebea4c68316245bbd8f7463a170dcc5d2a1 SHA512 b453530eee26d316e86b5a5ae32ca494d18851da1a109e0cb42329fb6b3d7786eddb165766b0b11730a1fd6d86c9eef315db17da85f669e6664cbc253994f425
-EBUILD gentoo-kernel-bin-5.15.80.ebuild 3009 BLAKE2B ca949fa860dba83bc63909148917aba0547affb430a041c9ff9609ae417e0450295aabfdb7bd7bc29e1ab73bc11c9ff9e2e2b59aab7f2573017bf9ba942a0784 SHA512 1bc02e49b2c0a75d6773986d09ab4b170c6422e9e809df498e03ed0edfecabf5816861a43e968e8fe79d7e6a41059ed9d277a3deaf00cd66f69de183f34addf6
+EBUILD gentoo-kernel-bin-5.15.80.ebuild 3008 BLAKE2B 4fdf89c9b4429a6e24f89f349ea0c2a90e75d14d99b74515349eaaeb3a89d61901b050c9d71c81c91753eaa6c9609e33645bf6b8a735d1941fe98f4b800c5ce3 SHA512 7b7d93d10e7ca6a71f0f52223ede5ca697e31a17dc455b7ae5349d6eb66c0b877c03cef5b3a8c359f43eb34e12413c6f42e1de0f9759e5e8a2998321a837476c
 EBUILD gentoo-kernel-bin-5.15.81.ebuild 3012 BLAKE2B 04ea3b3d8abcd9480329d69c7e8348e0b742f362be80f1909ae07243365006149212cbed76bd1df3b412f0a6b5f74d0f66c6e7da68af52b241ada8f44e68f7bd SHA512 5c55cf2d55fa1337638d95b4dabbd7d461c4ce69097f5bc22581c1006ec6d9a0ce842a6f2fd9d49488071c1667fd92aac254204bfacaff266920d94f63449682
 EBUILD gentoo-kernel-bin-5.4.223.ebuild 3008 BLAKE2B 44a7d00adfd07a697f713774eee327f3110ef86906d286a474fdc784db77af2f3806d6b6a4dc53de9033ad3924827dad33ec59dc2bbc273eac55e55b700cfb04 SHA512 c7f7373c82f7689c46cb1ef4b891471d6f585ebd2f09435778869a072c00694ccae4fd25fdc7522dce8477a93b2872113cd88094906f085fb3ae7f5ab4d41481
 EBUILD gentoo-kernel-bin-5.4.224.ebuild 3012 BLAKE2B fde58ecd786f89eb82a501cb24b2fe1aae9656768bb5be88c19d1712a2c1e4f55e7d0c0c069740e0192ac2f976601d12be99763ab8876be26c194552f088c6fe SHA512 3b724af3388eced9ef87130e7a5deb0f175586d72b855507ad3456e60559b1f76e34767f072e12c79021e23e7069930d28d35274ec58dbb0f4fac2bb61396848
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.156.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.156.ebuild
index ed83530eaf90..8f9a87c041fc 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.156.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.156.ebuild
@@ -35,7 +35,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.80.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.80.ebuild
index 5576bdcbbf34..7745a774a549 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.80.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.80.ebuild
@@ -35,7 +35,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 4ba5c6d530db..d2c7bb903283 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -50,11 +50,11 @@ DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6
 DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
 EBUILD gentoo-kernel-5.10.153.ebuild 3598 BLAKE2B 08ce2dc5719f68b0359e131864a5b4d27a9cd1ca35d5ac0e1f9092958d8923015f99da9361104fa0fb45649c2422c2d204f89b9f66a38214d83ead29aa7f9f06 SHA512 b054a9e9858f23ef6f7ba77e6bf19abd9aec489661718107e5c3562362fbf1353319be98a7d6d551f9f998ee60ab2554ea6baadc744ce4527fc0695b4f05dff3
 EBUILD gentoo-kernel-5.10.155.ebuild 3600 BLAKE2B 61673f8be761883f8b317eacc5e8b358b79853968d7249baf49bc1180431a84551ed5d5b676a82d62b709877dfe727073ae2b675ad1e26aad736b414425d2992 SHA512 80c583958f77062b274653cc44b4168541487fd14aebca3a6872ac911ce8042b3d9bed97dc845a3301f1336daf4cab78cf9006fc7c42efc2254a695468e6c665
-EBUILD gentoo-kernel-5.10.156.ebuild 3599 BLAKE2B 7cf1630d92f9bd9f46fdcd0e069bd76421bc7679252080e55b63b18ff1f7486bc122effe57b378d2846b460b9eea0c989cd60b92bc183f69c4b2ecde8d666a80 SHA512 01cbe0622070389b07c363a634e9f2c958cf4784824767827452f2840a7fae10c68e14f215ca1436f73d5192cdab47484ee2dfbf89f0f96f4d3c34fd4f28d1f9
+EBUILD gentoo-kernel-5.10.156.ebuild 3598 BLAKE2B 08ce2dc5719f68b0359e131864a5b4d27a9cd1ca35d5ac0e1f9092958d8923015f99da9361104fa0fb45649c2422c2d204f89b9f66a38214d83ead29aa7f9f06 SHA512 b054a9e9858f23ef6f7ba77e6bf19abd9aec489661718107e5c3562362fbf1353319be98a7d6d551f9f998ee60ab2554ea6baadc744ce4527fc0695b4f05dff3
 EBUILD gentoo-kernel-5.10.157.ebuild 3602 BLAKE2B e4207d9a6e95adae3fe6502d582025a0a82d7e29c77e2d1d1bd89435d98640502c341a01666b61f2013b6373d26dda91396ec9d3d68c14e1214112d74d72f54b SHA512 66d938e669fbda1ff8a0f54d158174fec65692a5039f7cfe6f1f0d89cc2c3d4342b789376bc272dcd628ae285ea8d28c021d16ba674fdc5f887d8387a3bb10b8
 EBUILD gentoo-kernel-5.15.77.ebuild 3595 BLAKE2B 3f9177ab76f55b26f0b9785ca179df92d66c3faf2a875ea90c996834670cb22a0b0076549390f48058b71d5b3e352e2ab7c01003b1224f3b1380c5cb20ab6b47 SHA512 d2b6b3aecc1b3571043b19deeb89ae32c07cc62e81bb9385628de7fe7506d277cadcdab5d75a6af07c9f62a0bb88e9c80ec6e467b3ded7a9468ad858ffa4cd8f
 EBUILD gentoo-kernel-5.15.79.ebuild 3597 BLAKE2B a5d52517df75a431de25136b38348117eb80b22214d649479a8a34aaea32e4b8259a6f9724d259f9057626884554e2e868e9bbea6895ed17c8a14484dcd93f02 SHA512 b7cd8139884f7bb2be1489434e50858801653bccdf7aa6a853d89508932459f245f86e9058969220a9523dffa6edfe3d4c662bc59d34aa3ca917da927c1eeca3
-EBUILD gentoo-kernel-5.15.80.ebuild 3596 BLAKE2B ff0f8b43fbf1961c8e3a6edc0fa655997a655b3b65ff060163219a82f5a4eb9a5f7c3a1478edf83fa01b878a10f842f2f0203778e8a85db924cd8ef727e782df SHA512 a95b6c85fc5d526755e7f259b5bbaa186e16d39984533e9dafeef9fd9165247b6a34fd4753b1dd60127f3aa6f3d35cad5e383dd1240a38dfd14f59c92719a722
+EBUILD gentoo-kernel-5.15.80.ebuild 3595 BLAKE2B 3f9177ab76f55b26f0b9785ca179df92d66c3faf2a875ea90c996834670cb22a0b0076549390f48058b71d5b3e352e2ab7c01003b1224f3b1380c5cb20ab6b47 SHA512 d2b6b3aecc1b3571043b19deeb89ae32c07cc62e81bb9385628de7fe7506d277cadcdab5d75a6af07c9f62a0bb88e9c80ec6e467b3ded7a9468ad858ffa4cd8f
 EBUILD gentoo-kernel-5.15.81.ebuild 3599 BLAKE2B ce2f332e14d6420a0ce635a8f1ea29788e46f385b7aef0fd7f86b2358c66574ea9e713927df98ae3e95b37ef0cf321cc4325bd1e8ad3a0da128d8942097286c9 SHA512 bc805c80743ad1ce74a09910c234e3ceddd6ff333eafc0babc7ff9ac7ba44ddc09d2c9e108a74b3223e6677eb77f91fe832b58f25e82a204a4adf8cc85517dec
 EBUILD gentoo-kernel-5.4.223.ebuild 2799 BLAKE2B 925a58a4afcb3c66f5179e8e5c23912332e7a1025ecd9d77b7d53cb89b25482c3dbf136b0340ecbbc4bd1430599302e5537d7a9e9e0314b5bbec1f9b98e76166 SHA512 4d67a306017b4741452ebbe3d0be3f29cffb0debc69bc2a605c6298d730c19a908ce8aca41a30888d9015f1330b9b6a4f5ba518714df41daf17900e8f29ddd44
 EBUILD gentoo-kernel-5.4.224.ebuild 2803 BLAKE2B b7562ff0061430bc6bc4978000cf3910f77d677262c29b1049d7cc9945f97319fcdc590a718ada8b6d51e7f84e2ba4956b37e770b4a6f933845889f32fe70d8e SHA512 3c00eea38ddeb1a18b6e1a57e0b6043835817e64635fec81928590f7833102265ba4db2c5783e218a284cbfdc7061a9e43da2ebc7fb34e3c5c0378a18ce41d81
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.156.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.156.ebuild
index 7afffc681023..b20535df0df0 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.156.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.156.ebuild
@@ -40,7 +40,7 @@ SRC_URI+="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 x86"
 IUSE="debug hardened"
 REQUIRED_USE="arm? ( savedconfig )"
 
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.80.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.80.ebuild
index 406100256343..594cf4733237 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.80.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.80.ebuild
@@ -39,7 +39,7 @@ SRC_URI+="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 x86"
 IUSE="debug hardened"
 REQUIRED_USE="arm? ( savedconfig )"
 
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 8b0776a15696..39ece0c3e1fb 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -89,26 +89,26 @@ DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed
 EBUILD gentoo-sources-4.14.286.ebuild 667 BLAKE2B 51c4dcd1df752044a208a5947e98b6ca88e270637e7ee701c23c8671305624d007310d29d2f793831945110f5d35c1693df8d137aede8916ba6ee20551b2252c SHA512 cb75c61dc7355261b957c232073f346df0591f477d672951f3c129f59e001eed107decbe19580ac1324a8006f8ec7b52799524cd50f5e97461e82c89bfeb3ac7
 EBUILD gentoo-sources-4.14.294.ebuild 709 BLAKE2B a9723c5ff731af172bf37df7c24594e822644578eb70dcf9f8b64e08f94e56813fede124fe7313292551ee959de25257c9e4d2ef17b2ac3935aae2fdbf9dd495 SHA512 09ebf9d3516a6d531c2df1975b5e11c32751934308932fbcffc78f2c310982dfd90d16f3d968152394d693f57c88acc68828a0d59a8b17c4f1524679e1830edb
 EBUILD gentoo-sources-4.14.299.ebuild 742 BLAKE2B 3beaaf19461ff66bbe4feda4df646ff6b7390baf524b4e65bf396fb422859fd4d4415931cdb1d1a70573c864ee6f1badaf6f673dd428d6a4bd82251c172023a7 SHA512 25e7dd1b38d49ead0734ed935042a5bf80788ff6c8f68aba3dc64caa2a6bda6bda32a545d21f2ce275d59ffc3ca0c9a2893f61002c51765cfcbeeef13cf0f7bb
-EBUILD gentoo-sources-4.14.300.ebuild 737 BLAKE2B 63bde1fe790e30d40bce92eba62aaa2021cbdda4195a2aff011a797ac269601d6c250b90d4619f9be58648b3dc0b923b33fc42326cd19e46b9716901b7fbf297 SHA512 4afa610aa44c97ae4e435070aec5d881f22e5ca9feebca79d5e28124dafa86ca41edefc4327d52f122e529b610a0e60fddfb3ba1f89b9d777799feffbc8d2333
+EBUILD gentoo-sources-4.14.300.ebuild 736 BLAKE2B a38b249e76eb1348e0b2c2c07b8ba217bedbfae6b2b6b7a143b118764b00defdfc6d8a4993d1f763ad2c059948c255c38f71a5782ab1d2b168f19130267616b1 SHA512 118081f5c2b795cb59d17fe0379fd0a1091023383edadf190411ec825c9dda97c2463d4d1832111884f5496ad5b22773299a786170a8fed9009aec01979ea7a0
 EBUILD gentoo-sources-4.19.250.ebuild 667 BLAKE2B bb76a9fcd6e09218fee56ff4c9f24730e35d13e19978d87473fcb1c599f1a742acc695b1288aa206cf910220e1065fdf06b08a2dcdbbec40a72b9ca9ae5eec59 SHA512 f1d69f051f38e87979fee1ab6954b0df50330512b7757a84e3f1c59f090489c06d9119f8a07fd415a4b74522cc7cf18f14acc54db1fa92c5a6ca7f052181ce54
 EBUILD gentoo-sources-4.19.259.ebuild 709 BLAKE2B 91b4efb07f71db7c982ca30999010b7907c3c55b4f3e638e49d45ba7857f2061e594a5043c8f143d281c92381cef7009a8e7c9d730dae6bd70f7d9e62544565b SHA512 db5307dd9aed6c024a6e332f05afdfa609f7e98f873e5989b582f4f6b7bc435f86f6e01106fc63a4d36eb8e7410d41650d15e5b3e06a2ab009698e79fa1e92ed
 EBUILD gentoo-sources-4.19.266.ebuild 742 BLAKE2B 62244936e90fea265ff9dcf78901a4e35031a70a079c70a7bb1c03e1f2fa787878d941f09d9c592fff3904d302f02fdb47bbd27a85c29699d842fde8255de9a9 SHA512 46f0297bb5f8767c589ca8ba27e26e5c1848cee8d0a5109d6415f6be004ee72d4ae7fd4e17c0c463e180fe11eb36a3609915f3db662303d12ce4770ee7789b86
-EBUILD gentoo-sources-4.19.267.ebuild 737 BLAKE2B c0cf6628ba1913ef300116a4f523e3fb2829f26e755184b3da1ecfaf41796357a87f5745fedccedba6d99092683a3b2100ae40021e65ace494aff15e03735c72 SHA512 d932225189d4fa894ec73f5ce08fe34a1a169a675d367447067e8c1f7713631a1f5da9503a80e62c7c24e18c5b54ed72ec7d3b6e25039c59f3aa42d43c305438
+EBUILD gentoo-sources-4.19.267.ebuild 736 BLAKE2B d19d567753f763baf0d03d769c021fa585e0b0c403b92b2c3297927c33aac196eb4b5abf00d82b0eb9c1d802b4bc84aad35f51ff3d7c80d8a20001351d328081 SHA512 4faa5ea507bb82b7b99afeff2036cda23bb752a181cb2256eda8e71fa7771e8e89d812297c77218d229a095f56242b25ad9c46eae5d7cbbd8663af32764b5bcf
 EBUILD gentoo-sources-4.9.321.ebuild 667 BLAKE2B 444003c6649801be27c4571babb82c79050ca8dfb951509054b75de1091fca7c42f0f4267554b6203e6df75ce1cd6b7f5354b31eac068c806c426e0df5466f71 SHA512 8b24c4e9fa79a1d32fd09e5ba3b58b787f40fa5a51a1e3a482c680cade3d271a70ccfdf6ea3ffeeb323f2e87cba251568e9d3490e6cb76f48ef81c5eb855fbec
 EBUILD gentoo-sources-4.9.329.ebuild 709 BLAKE2B 0a3b8c8dc74c5fcf9419c12129b45118fc9e357aa4f0000651c295b85a8d52030ae7679d4ee383988059fbcff2c4146cb206d1d9d0799d1c81c6555cd09b2861 SHA512 c478594c420b7bbbebbfb6fbc1e0047f74c93dc097f71afca8cfd19f8c5af4612662f5374f5c69489dd74786adb82d938b2f8cbd06410753b969f9ed9cc83433
 EBUILD gentoo-sources-4.9.333.ebuild 742 BLAKE2B 8a2486833a601f3c48a1246a8bd2df7e570cd57ca51d443b971287b2eedbad9b1df14404bc1c7408714f56f5a27fc41499272f979181370ccb3a6db9f635788f SHA512 81c0028823b0c328ee93bb8f0adb158e1d649b4a8ff6355da79f7b4398361c9206ec70653b304f0dd3c9d3bc35806c1db2f0a5ca750fa418f5a10bd41a091860
-EBUILD gentoo-sources-4.9.334.ebuild 737 BLAKE2B 859e83eb0bc032fe14caddd78f717c6fad028ea52d55e2e41caa8c4c9dc6d5aaeaa74fc879f0795ba2eb6c31f3f25cf6b00cd8e55f02383e75e1a021008bb2f4 SHA512 b98ef33554b36fe856fc2a0ac2d23a60b927de0938ceb023719d0cf3b07b47fe99aaab6bcd0426db03b81dbf9d7745d83e9da4f7858b19167a6cb0e4d259300e
+EBUILD gentoo-sources-4.9.334.ebuild 736 BLAKE2B 8feb7e77841c36613319ec7b0e6e5a4ec1adc958563e9b33e559235f5adb14345a98469fd719491b3c73c8b86abb3fa2457a1b7224c3f7fba7246358cfbcaa5a SHA512 51d912d91aa33789dd2d88088f5385afb2bec0025e348ecfd2335ea1384ccbde2f074100e60d369b6ce41b6a35a69c7d85f2042385605c5137d4514dc518cd88
 EBUILD gentoo-sources-5.10.150.ebuild 715 BLAKE2B c311f02a34432a4bbd98eff223b0e9693e7a85ff80be4a9d4d9b9e24d1c77a9447846fd47613ed6c8cdcac6017637b6e3d3e7c4be587a254ead4a89ea16f686a SHA512 e2c69c2e3d2cfc687b8c89c534960d9cc9734da203316abfbcf93e9f6bbd628098ffbec26b3ec9d38131a11862af5f7d9a6dc2d54a01ba01ea699d63df183eb4
 EBUILD gentoo-sources-5.10.155.ebuild 749 BLAKE2B 49343c55b71f1efc6f3faf28d05980e5b3be01d12e3587d138dbf61b62ca5831043218195ef3e1c6119b57016a20fc41ec1a564123a334db3e936e57cd1812ea SHA512 253cb51b6a3fbb830b37bf6d66f8e133250c4e6bdea174d4480818e812d063fabccd62d8a7aac8830f06ed95693667bc45d541f716d6091aaafc0a37cc03586c
-EBUILD gentoo-sources-5.10.156.ebuild 744 BLAKE2B 83ce26b4ad348f26aaf0e53de4be441804b63103c96fec186240d4530b92e479438a93aebc22a430038eb51b11aeb84caa87859373a93e45e9ec94e1dc1d997c SHA512 ff20f871b918a8837163348a697578309ee5eb7f81ea629aab779004f7f102fe329ad02a518e1bb504c1a21f4df7e01981c8eafbb09c5f3d8cff464b95126d70
+EBUILD gentoo-sources-5.10.156.ebuild 743 BLAKE2B d5d30baf1b3a2bdaac5a4817798c44f95ee122f2d5621bcec089395e52db90ffc2e3469cfc05bad0f3e7548c31a2ce8e70b6781a5ef3f5d84ad6f42d22d920af SHA512 f23c3d24804dd9f7563e5acd04991353f778007d6a0daf34b0408905cdfe24c9843ec4bc695d212470293f7f6bc50e08a4371b77b3e198ad68c85e07882891f6
 EBUILD gentoo-sources-5.10.157.ebuild 749 BLAKE2B f9d347ea45f6eac709cad6443adbf5cde0186d42614590a109cdddd4643780d7628a481486144d00253d274801205728000f48499a8363ca1cc457fdacec5526 SHA512 6c764ae9936fb3c923e283084b0d23f7420d816a2aff22b316aa686b8d137401e9c951b029ad698ea5f599dcd106c8f329a667262c5126297fd64c79d31bac9b
 EBUILD gentoo-sources-5.15.75.ebuild 714 BLAKE2B 5061aaec399ae6fd94531162a9bd4bf5a94e5563a53ecae8f030e851188bc2285ae4119085252e0c587906bf7e577283323ae82f7fc6542f508400a9fa6ea187 SHA512 051ac39bf68219ab7cfa1ed84e5593047a8e366655d7b9723ba0a24e1353082f5dc77e636551226d959ed24cd604f9e3d3ddfdcddd33ca802dd8d4eea1c4ca12
 EBUILD gentoo-sources-5.15.79.ebuild 748 BLAKE2B 9330b27700db729b4a2dcb85c8af4a8e5eb06beb1cf2ba08e93b28ee6898ee8a6b56f92522723a7d024a432a3e3bd79b58fb25c901d44446f9d3de60732eb0e2 SHA512 05d7847e2a9d3ed2c72a3ba1fdb6aa82c1eab8c011181b040784abf5ee669e1744498d9d2237c4a60d41a4dd7429fe7369926cf574eb44044233b603e81b9d22
-EBUILD gentoo-sources-5.15.80.ebuild 743 BLAKE2B 84ed51ba515b753cf10e0beb9f1a3662f44710e0f1c86eb9a83171ba05c92b246fc544394e86fdb2fd837865aba53c206b9fd196846257ef15e4260511eec622 SHA512 468821394139c7bfd2d37912d147f24ff393893d5ec5ed88a1f3d810d8db0baeb8bb670f39ec7a875caf35dbccb31495730c5f42ddf3c1cecbfd90a5b83b0365
+EBUILD gentoo-sources-5.15.80.ebuild 742 BLAKE2B 1344c2e1e7ebd79243c55590fa65d6addd1b3123cbe486f157cadc6f7cb34c2b1ef930c45d4690a803ccc33423c5c3d7bf03720a156529273824ca2b242a7cc3 SHA512 fd0576480807969e6c892c3157770f1c560623879cbd34cb260e07a8b654adad3eaad272680d88e31cc2a0f12782ca0b1170af79446b23399f53de24cdcf5ccb
 EBUILD gentoo-sources-5.15.81.ebuild 748 BLAKE2B 8fa47ddb96b73d9945bead65b83613fea051fdef0bf5f1dbc640311d1f88618164c37fdb0097d567823d8782724d444c39fc8d97273e1da6b8795e5949aac76d SHA512 60172180aadd38fa5306b8db8cf99ecd072bc597098781bf737603ceae4e453fd464d1754b47ccb38e89e6560ad75e86f39cc60bcf66ff9b7a9100bd7bf02bbc
 EBUILD gentoo-sources-5.4.220.ebuild 708 BLAKE2B f5cb1276ac3e23696d935263654a6e50288c5d9f050a45271dc3a84bbfb89464d77669dfb60255afe8d79b6b0f5f90bc7f7aa1dee6d7c12eaa7d6e4cf9b64fd3 SHA512 12ffea4625a6d50869230792451a903e84cdfd8ec13fe60492199b0dab1b652e0c689a1b8ee1f177cb753aad2c1b4ca1442a9bfef12c08e34d6fd9727d98fae5
 EBUILD gentoo-sources-5.4.224.ebuild 742 BLAKE2B 4d326546e02f558d32786ea7551bdb275e923d14ff2b14d937114a8ff5a6c2509cecea76527ae2634de28b042acbf77f97201b6271525da9260947f58fc2bfe5 SHA512 33e2c03fd3785926f91c8ab1b86bcbc67cdb4882908aef85c1bf34834d16578bc9923e726cacc7b906463bee0f65732b9c0ca0968cfbe34c3d58024879aee9b4
-EBUILD gentoo-sources-5.4.225.ebuild 737 BLAKE2B b0f0c7f4a12b9cec83b7542d4d1566b94e993bd5c52cd9e15ebc77532ea6fdf1591b0ffe5e47f208e668456b3a2694f40a58531efb4c22423caa7aec013d701f SHA512 61cc5c72bc54bc3c380918ba23710ebb0ec4296f841b00b063bdcd719d7951cdca31179035433118d8ff743aac3c32ed396b55cbadd74ebf485a649d4e506dd5
+EBUILD gentoo-sources-5.4.225.ebuild 736 BLAKE2B 22c0f5748b7d81338f95f53009f1601bed5bbb830300b710e607c6f1551ee31aedfc4785d99b453ff17274a25c0313340b8cac648bc2375ba2bba80fcb93b3fe SHA512 49607d49ce0456c8bbbe8a8a156d141aba1cc0d718b59eca3b9c9424ffadaea762381aea7d8b24afa5807d2fc2e22516c1da7a296c5e70acffb0d0b9657ad021
 EBUILD gentoo-sources-6.0.10.ebuild 742 BLAKE2B f06a94809b2e5669f8369824e058d99c6138e08fd43472c36ceadb5c451713bf959889aa5489f88215aacd2ed1bbbc0bce38dce3cceb613ce8b5434c9474df6f SHA512 ba8a37da374218267ee70835aed2b00dc38f82309448ed4a10c2387ba34e3b1ae518ee37499bc42c3edd74e69cf70a3fb17e29b83ebed29c04605afeacc2e52d
 EBUILD gentoo-sources-6.0.11.ebuild 742 BLAKE2B 227a639a956829c3fdd0cdd4529ff974db99c58b36a50bdf6b81a162cd14f33fa3032815d4e16ac9abaa8e46e86c13825370a27550806b0687e45b302c7f040f SHA512 77657c173f204d57907181881139b199ed7e81939987cbc10254f7df31414df49d60f451d80e423558909e9a99ec80b7a07337a860128eec389987050bd808a4
 EBUILD gentoo-sources-6.0.8.ebuild 741 BLAKE2B 9226411e47b51cd3681da2ed11df2d43afb3c0c7cd619bbe48d7c0a0f982ebdc870a2b127eebb412c33f1975ab0b478e955a6fcddae42b88bac8f3fce7487397 SHA512 447a4b1eb82e1fb20cc42a4cfd98d4431fdcd211e25bd0e67aabe83b78e7433330a82e548669c37241b0c70cbaea8eac299f995f1b27a396d89544c5450d865a
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.300.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.300.ebuild
index 2f01bf2b2cb7..7278bfa087fe 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.300.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.300.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.267.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.267.ebuild
index c8576301ef7f..33e395d13436 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.267.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.267.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.334.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.334.ebuild
index ea0a8c397714..c50a89c097e8 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.334.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.334.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.156.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.156.ebuild
index c3857306ac13..ea0890a7504e 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.156.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.156.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.80.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.80.ebuild
index 4e1da7864e83..a289c620fd0a 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.80.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.80.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.225.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.225.ebuild
index 06de666f7e2d..bd056b3e77a5 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.225.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.225.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 9a356bc09685..64eab86a524e 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index df283f4e3153..4c0d6a9ecf3b 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -1,10 +1,10 @@
 EBUILD dist-kernel-5.10.153.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
 EBUILD dist-kernel-5.10.155.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
-EBUILD dist-kernel-5.10.156.ebuild 400 BLAKE2B 5041e3d994fedafddfd75d4aec0f3f7694569ab2b909280d9b069181934feb4abbe5d7bfafa4d390b25f534a562a95ee6b6a0875bb1794ec929d58f3d7db3499 SHA512 fa4ca2a00e52f04fea7505e60b346b5ee58551112e6379a9e1199ac18c46211e75deb68ea39c866a8bbbe2e8840416e1909480f6c9abb8f6202a166809bf9c04
+EBUILD dist-kernel-5.10.156.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
 EBUILD dist-kernel-5.10.157.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.15.77.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
 EBUILD dist-kernel-5.15.79.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
-EBUILD dist-kernel-5.15.80.ebuild 400 BLAKE2B 5041e3d994fedafddfd75d4aec0f3f7694569ab2b909280d9b069181934feb4abbe5d7bfafa4d390b25f534a562a95ee6b6a0875bb1794ec929d58f3d7db3499 SHA512 fa4ca2a00e52f04fea7505e60b346b5ee58551112e6379a9e1199ac18c46211e75deb68ea39c866a8bbbe2e8840416e1909480f6c9abb8f6202a166809bf9c04
+EBUILD dist-kernel-5.15.80.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
 EBUILD dist-kernel-5.15.81.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.4.223.ebuild 388 BLAKE2B 2cdbd973ff8c248bfe49420683c3040deb65612b315e212e61657b071338e9e54b321a9167467da27a04f185d9e8c4f38142f5195a8a9d658c2a464f76c0ee49 SHA512 164347601db14a749e61850cc9407485f8581a05efca57df2d57561ba467184728373f7ef5cf5b956bc695274814a4880ab3556b6e71187ae0050cf6bd228a11
 EBUILD dist-kernel-5.4.224.ebuild 392 BLAKE2B 0a46c1101b608049d3edf3c20d36e290ca8592cc5255a06f23c32f2635ef78d68ecbc7f9c6d640b86fc5b338de2eff99791996c22494418f923b3e67eb924eb6 SHA512 54ca8c680a499e7331c1de1e49f0b9e0ac684027362af4c7c62acae82ce82d93e656e922ddc64dbe7b989524b87dcc3aa769bfd9dec587ed1565c14ba2151462
diff --git a/virtual/dist-kernel/dist-kernel-5.10.156.ebuild b/virtual/dist-kernel/dist-kernel-5.10.156.ebuild
index b9607022eb7a..a8bfe038d31a 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.156.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.10.156.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 x86"
 
 RDEPEND="
 	|| (
diff --git a/virtual/dist-kernel/dist-kernel-5.15.80.ebuild b/virtual/dist-kernel/dist-kernel-5.15.80.ebuild
index b9607022eb7a..a8bfe038d31a 100644
--- a/virtual/dist-kernel/dist-kernel-5.15.80.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.15.80.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 x86"
 
 RDEPEND="
 	|| (
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index 1ea013d1ec09..b6edf21a5865 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -1,3 +1,3 @@
 EBUILD rust-1.64.0-r1.ebuild 593 BLAKE2B 8b815abe648d7b4b236ab4fb373330f2d5f21ee01a3fe18c49d1f615f4f246a1db34c2b47afa76f2413ed5b3f70da9077a60581f5113f74987270951e5297cbc SHA512 1e9ff0cf0f333112e3a4ff7a76c3a8829aafc1da99fb9b4ff3b8416caa961bbf8766648fab0c12227b5ae2a092cbda29657fc7ff60c33dadeac3a0e0dbe49639
-EBUILD rust-1.65.0-r1.ebuild 602 BLAKE2B 041a4fa73453153916efd1fcd05467dd1ca0e5d4fa888c7ec46409df660208b5bf238446597cab848b7bc79400edd152d46e3a519760fd1e1a4f34711dc0ed3e SHA512 a1d890b1f236c42871b733487062ad47f2ddf0a600dd917f56079d2f45c76aca16a494e0ffcaed0bc962b38118b9278c2c834aaa72d93f034242d3b6039dcd33
+EBUILD rust-1.65.0-r1.ebuild 601 BLAKE2B a94ce87582eebb39965295217fd22cdab31c803999fc259c7f63281c6ea4b74fe1d7cd731b53ba292490606282169bf5eddb1a86f51398572c5b760ac0579df2 SHA512 bfa5d6bd05cb06c72fd954090fd34b89ee3c64491b192c5de5815717b05672a6e301d81611cf31bfc4376c6b5b4ad8bb6582df8afe477ea6bd8b316db1fbb06e
 MISC metadata.xml 351 BLAKE2B cf3c7f2e804dbe6ddce9380d9c7b32e734df16a04ea867a474a4e6868edfaa72abb79dd6eb47f67128a1b60cb4872c999949e8237102bc2117e581309307f862 SHA512 d32137e0b4549baf85ffaff35d2c5fb058a44e3fbeb7f560db3ebbfc1d44d9ce3651e033cb8434f211994218a85d5bf89f42ea9e3ab76e361c1014dcc6f25997
diff --git a/virtual/rust/rust-1.65.0-r1.ebuild b/virtual/rust/rust-1.65.0-r1.ebuild
index 50dc49299a9e..424441f6287d 100644
--- a/virtual/rust/rust-1.65.0-r1.ebuild
+++ b/virtual/rust/rust-1.65.0-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE=""
 # we do not allow multiple llvm versions in dev-lang/rust for
 # neither system nor bundled, so we just hardcode it here.
 SLOT="0/llvm-15"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="rustfmt"
 
 BDEPEND=""
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index e43005987c0b..7ec436a24c99 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index 54bbee61f296..64827a2920d8 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -5,6 +5,6 @@ DIST nextcloud-24.0.7.tar.bz2 124233139 BLAKE2B 991668bf897984da0f0034f954d00777
 DIST nextcloud-25.0.1.tar.bz2 146695370 BLAKE2B 01d9482301fa50e2b938cbe164310d0e3db3a791944e78ef2d7016ecd3e214907d53b589abc51c550263e636c114ee37dd027ebf3d164493c53775a10f102a61 SHA512 7fd401ffe01e5b1d568e4f66cdc5972d5e3c0b82f147a04330da9fe5ab1f2ddf152943e28f152fb635e8bca8d83a95a5a269a1f34fa189cef4a3c9dbe4e8c89b
 EBUILD nextcloud-23.0.11.ebuild 1088 BLAKE2B 83dea08b95d1f947bda224a9a5cf2d42956344956b461f6ba533cb37dae1b4a63e39855d616605f5e7c4744b9ae57d3c5a825935ff318c1f0b31d65d22954987 SHA512 efb61bed84b86d9c86fe3e5a7a354535cc61295e2bb8486836b5f51cbef8994f6e1146e537c182266b6482e2e6729417d65ad02152cfc8b20b2e1d9953dc8227
 EBUILD nextcloud-24.0.6.ebuild 1086 BLAKE2B ba714c8023bbc3d2036069e54b982a0f575cb6cd04bc6a9bd80caa20ad877ac0cb744859f47d384af5befd07b12e6c3959db644a2e8ef25150cc822a8e4c7065 SHA512 ecfe7f0af35b603bc87977bc6e0889d7e14861304edfde9f4ad0308ffccd4c2a1f7e59603675b0a49781be68b2e16747e49c41c7aecbe7ca3b443bccacab6f38
-EBUILD nextcloud-24.0.7.ebuild 1088 BLAKE2B 7962cd29c375d2ec2dff7669ee1f7e78be6147df08150437dd6afcaf90805269a0111aad4e1a54e4b9884acfb26366e9944bde0c4811db0462198220e9d82339 SHA512 2c16f73f666ba666908750fb360323d005da3210207396c1eda30b062d6fd094722a5a651eb710d99dbbcfe16642266ca27ebebcd36f14f70d6824e03c2baf16
+EBUILD nextcloud-24.0.7.ebuild 1086 BLAKE2B ba714c8023bbc3d2036069e54b982a0f575cb6cd04bc6a9bd80caa20ad877ac0cb744859f47d384af5befd07b12e6c3959db644a2e8ef25150cc822a8e4c7065 SHA512 ecfe7f0af35b603bc87977bc6e0889d7e14861304edfde9f4ad0308ffccd4c2a1f7e59603675b0a49781be68b2e16747e49c41c7aecbe7ca3b443bccacab6f38
 EBUILD nextcloud-25.0.1.ebuild 1088 BLAKE2B 7962cd29c375d2ec2dff7669ee1f7e78be6147df08150437dd6afcaf90805269a0111aad4e1a54e4b9884acfb26366e9944bde0c4811db0462198220e9d82339 SHA512 2c16f73f666ba666908750fb360323d005da3210207396c1eda30b062d6fd094722a5a651eb710d99dbbcfe16642266ca27ebebcd36f14f70d6824e03c2baf16
 MISC metadata.xml 533 BLAKE2B bbbb5b440e2d38d6882451584a997c4b21b2afcb8e8da8c8dd9fcaf00fdae0a3643413d3619401faa3875f93cdbd1a090db308b72d315711e859405757d4df7f SHA512 a18ee96f8aae2ed8c66faa777a303bb45eb27c49c25ff56e5f01ef4a4f9df03ef0581ad92084e37683ece26b1c25c1a9ec843d1219964954d19c2bcfbe3f4a0a
diff --git a/www-apps/nextcloud/nextcloud-24.0.7.ebuild b/www-apps/nextcloud/nextcloud-24.0.7.ebuild
index e35dd132e50a..4eb1821d041c 100644
--- a/www-apps/nextcloud/nextcloud-24.0.7.ebuild
+++ b/www-apps/nextcloud/nextcloud-24.0.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://nextcloud.com/"
 SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
 LICENSE="AGPL-3"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+curl +imagemagick mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index f26f3eb06834..65f1121e02a5 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libgxim/Manifest b/x11-libs/libgxim/Manifest
index 82f401f8016c..26de6ea6000c 100644
--- a/x11-libs/libgxim/Manifest
+++ b/x11-libs/libgxim/Manifest
@@ -1,3 +1,3 @@
 DIST libgxim-0.5.0.tar.bz2 469547 BLAKE2B 183ea514b990b93efcf41a56704385e8b84b18d1f4f992ddaa8f7481a74b132f05b56322450258d53bc1fbcaf42d2528d297922ae042f5831010d58540974982 SHA512 ca143e16e8ddd8e3cea01cc0857cb0e665f9cf397462e2fd9ed714b825eaa06056dae4115aacd117f8113e815f11184d9dd9f239259a1eee691d0b120db580f7
-EBUILD libgxim-0.5.0.ebuild 1333 BLAKE2B 5bb602b29f408b6031e05917879877277db19f9d7842721bc32f294d29532eba112eb2ba5b882d876931f112067ef058b74ac2b240a4e953574b97b96fa84cc6 SHA512 2c7f1de20ec4286c5f691af0195fd835ad2aa98c0dee7974a41315534707f392a2b4052a55875038df27b363ee7274df45fbc5a189b833f612ffab9e073af407
+EBUILD libgxim-0.5.0.ebuild 1326 BLAKE2B 0a9c2cdd4df4aecc9f49ac0e2e9af09b257198d2433b131bb3f889fd2c5b83e62418a69613584139a9a693090f1c81c2db42805a0edcab692d1c5abef5c9665d SHA512 621f756c82d4ba6a65d6c0a6cd7ba252e519b0b74634bed057ce30364c0298f5ee4f4be7c9e0fa1c666fdc948567410a9ff4d6581064a2b41debc4390395fda9
 MISC metadata.xml 316 BLAKE2B c6389aed019cb4f4667f4d452f72634648dedac018e25c520805c761d8f2d161d0b63ef698b4229db3d619495dfa031ac4ec7a74d77d399c47ac2e603aa830c0 SHA512 1e797b6c97a0fe8a4cb0dedc6688a36b63a37b0ca11ea1e5b52ef43c84433eb9b4dd0951a7ebbff6aa10201af18fdeb404f7e6241b69814bbf245c218e60a51a
diff --git a/x11-libs/libgxim/libgxim-0.5.0.ebuild b/x11-libs/libgxim/libgxim-0.5.0.ebuild
index 5f7418aac956..4496a8635199 100644
--- a/x11-libs/libgxim/libgxim-0.5.0.ebuild
+++ b/x11-libs/libgxim/libgxim-0.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
 inherit autotools ruby-single
 
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 7c2754ce9b2b..c415b0377460 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 8cafe57d9235..34c73a82a46d 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -12,6 +12,5 @@ AUX sddm-0.18.1-respect-user-flags.patch 774 BLAKE2B 050d261762b872a475ce9f250b4
 AUX sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch 3616 BLAKE2B 71a4c6f592214160ff993e86582bf5f550be204193668f5bab7786db88ae9a1a09ee268beb3e3157c1b033e765053ba415f3d291f299b09606aa566c9c197370 SHA512 b33b26517173262194bdc98e63b84fbb1f03005abc3c079332dd9b275167d8ddc680ba5c2a9968be5c54963b64f291aab65ad9f04b9f3f69299d030753cd90f5
 AUX sddm.tmpfiles 31 BLAKE2B 51d22f1d6e25aed3df726c0c315e83193bf28b5e9cafb681b648e6788ad8e9ddd8610ef5c305627373e32465ac104b33d71c333153217f8f8f560ace9ddca45a SHA512 bb5ecdcc6cfcc6b1056a7b10b8a6f323a3e12ea5496a26d80f199a275402fd99ed0fa810fad6687407605964f980784c24082686e177063113a358e1d4220136
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e SHA512 ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
-EBUILD sddm-0.18.1-r6.ebuild 3633 BLAKE2B 0affec98b1374d883ded0c9061cb75bf5418bf7f3a261d940fd9724c97f64062fb8fec77d6011f0185dbafa076e0c2630439328e7a8b3454f516886ad9ab0c90 SHA512 bff069801e117b1657384792a5afc0a799b4d17e3b74d48201c2f0df7bf5ed8830a905f3af0728c9208d6e563e55ec9463062216382014e4ecaee626cd051fbb
-EBUILD sddm-0.18.1-r8.ebuild 3786 BLAKE2B 5c5786b4b1ec054ea6acb469ac4ebd2b590c0da769b929e34fa40d84d0c8d99735b3bb7b3e936dfa84c7f4aa1ce221370a22798d5ea5ea40e5bf16aea83855bf SHA512 01da23a287ee96f448e01bb30d33221865030bb0704ffdf66d0f61727c311765243e15770018d9a72cd15d3233dd5118d0a2039057c6efeefba387f650282e69
+EBUILD sddm-0.18.1-r8.ebuild 3785 BLAKE2B d187956247816e988d69e7ecbca870c4f9b95639f135b579a75c3784763dc652b873b219d0767fccd9cca5ad81ebcdd602d29852ad4130ae5c1bf9fefd692a76 SHA512 1582fa4b54e516024f98b811692952e97774b8f671f061e53bc52e51decb934379d2be64935d326d83e3b39d4eb0f036360201715d8ed15de5d727624f449408
 MISC metadata.xml 722 BLAKE2B fc34c0b25b7f3e6ab876c99a30f475dc90cc4b319f497a2ba4bd2beac1dc1189d3d9611999c0c3b078254db23c4c9b2ef0416da41e706c1a1db96d5bbec28177 SHA512 c1fa48632080e295272df6e7ceb7c0a1ad64a41155c7d53d91728f072cb7abf618e7bf4d5cced2ca0b198bbbf5ed1e72c5bfc9ea9d590064e5f5494747d32b0d
diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
deleted file mode 100644
index c2cc2cb95d77..000000000000
--- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake linux-info systemd tmpfiles
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="+elogind +pam systemd test"
-
-REQUIRED_USE="?? ( elogind systemd )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	acct-group/sddm
-	acct-user/sddm
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	x11-base/xorg-server
-	x11-libs/libxcb[xkb]
-	elogind? ( sys-auth/elogind )
-	pam? ( sys-libs/pam )
-	!pam? ( virtual/libcrypt:= )
-	systemd? ( sys-apps/systemd:= )
-	!systemd? ( sys-power/upower )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!systemd? ( gui-libs/display-manager-init )
-"
-BDEPEND="
-	dev-python/docutils
-	dev-qt/linguist-tools:5
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-respect-user-flags.patch"
-	"${FILESDIR}/${P}-Xsession.patch" # bug 611210
-	"${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch"
-	# fix for groups: https://github.com/sddm/sddm/issues/1159
-	"${FILESDIR}/${P}-revert-honor-PAM-supplemental-groups.patch"
-	"${FILESDIR}/${P}-honor-PAM-supplemental-groups-v2.patch"
-	# fix for ReuseSession=true
-	"${FILESDIR}/${P}-only-reuse-online-sessions.patch"
-	# TODO: fix properly
-	"${FILESDIR}/pam-1.4-substack.patch"
-	# upstream git develop branch:
-	"${FILESDIR}/${P}-qt-5.15.2.patch"
-	"${FILESDIR}/${P}-cve-2020-28049.patch" # bug 753104
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~DRM"
-	use kernel_linux && linux-info_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if ! use test; then
-		sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die
-		cmake_comment_add_subdirectory test
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PAM=$(usex pam)
-		-DNO_SYSTEMD=$(usex '!systemd')
-		-DUSE_ELOGIND=$(usex 'elogind')
-		-DBUILD_MAN_PAGES=ON
-		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-
-	# Create a default.conf as upstream dropped /etc/sddm.conf w/o replacement
-	local confd="/usr/share/sddm/sddm.conf.d"
-	dodir ${confd}
-	"${D}"/usr/bin/sddm --example-config > "${D}/${confd}"/00default.conf \
-		|| die "Failed to create 00default.conf"
-
-	sed -e "/^InputMethod/s/qtvirtualkeyboard//" \
-		-e "/^ReuseSession/s/false/true/" \
-		-e "/^EnableHiDPI/s/false/true/" \
-		-i "${D}/${confd}"/00default.conf || die
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-
-	elog "Starting with 0.18.0, SDDM no longer installs /etc/sddm.conf"
-	elog "Use it to override specific options. SDDM defaults are now"
-	elog "found in: /usr/share/sddm/sddm.conf.d/00default.conf"
-	elog
-	elog "NOTE: If SDDM startup appears to hang then entropy pool is too low."
-	elog "This can be fixed by configuring one of the following:"
-	elog "  - Enable CONFIG_RANDOM_TRUST_CPU in linux kernel"
-	elog "  - # emerge sys-apps/haveged && rc-update add haveged boot"
-	elog "  - # emerge sys-apps/rng-tools && rc-update add rngd boot"
-	elog
-	elog "For more information on how to configure SDDM, please visit the wiki:"
-	elog "  https://wiki.gentoo.org/wiki/SDDM"
-	if has_version x11-drivers/nvidia-drivers; then
-		elog
-		elog "  Nvidia GPU owners in particular should pay attention"
-		elog "  to the troubleshooting section."
-	fi
-
-	systemd_reenable sddm.service
-}
diff --git a/x11-misc/sddm/sddm-0.18.1-r8.ebuild b/x11-misc/sddm/sddm-0.18.1-r8.ebuild
index 7e05e7874d69..6394fe47a726 100644
--- a/x11-misc/sddm/sddm-0.18.1-r8.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="+elogind +pam systemd test"
 
 REQUIRED_USE="?? ( elogind systemd )"
author	V3n3RiX <venerix@koprulu.sector>	2022-12-03 21:00:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-12-03 21:00:44 +0000
commit	9bf71d942b8f2e9c367ac95320da8d0d0593e19f (patch)
tree	e324566752ad7ba1f0411723c7144174a49018ea
parent	529abfa74a08ae5099db9780bcdf8250aa52ecb6 (diff)