gentoo auto-resync : 16:05:2023 - 22:07:44

359 files changed, 3883 insertions, 5342 deletions

diff --git a/Manifest b/Manifest
index 490639332dd8..ef942f14d749 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29450 BLAKE2B 80a16005085eb67f98d4fc3396cc08d500bd4140649c19ed5896dc6616e9d83ffd419f4da5886c7c9bf2ccff68df71227ff26cc7d23f8a8a365aaa8d19992468 SHA512 6d371225c063559505afb62d7ed1c2a8571b92b6e5fa7b322c496674a2197e6c1e03520d2733167145b5a1f1e86d1dc0226793562335bff2ccc4bf1f979251f9
-TIMESTAMP 2023-05-16T14:40:09Z
+MANIFEST Manifest.files.gz 29457 BLAKE2B b1c1a4e342ef031e25e0fd379e4d23cbe50f45e324256be11171f9c10b9653c8e9d95c3810ea25463d7b9419cdf02a43c9395d58c38aa5ec2cf77439cbce9fc6 SHA512 4dd7222cf6a875979943a749c07f351d0045a0ca632899cd7e63948e2d30d604f0857ebf1c1cb87ea97534569f1f9233a9b947d30aedf14b8c2b6cfeb9881680
+TIMESTAMP 2023-05-16T20:40:05Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRjlclfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRj6iVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA/vxAArKw82bYq2PeeWzU9aHw1LxOOCw0z/p7K6hlClKlfMnA3aFwE4L5uP1xZ
-j9iYmP04gLI3YB8zDCY3yjRqGPc1jBMgXm2TyxzAsLdae84igp1bhT96A0XpReV1
-lcLtLy+pGOCS4AMyIV8j5Rj0Tnh95KwWc6PYTpc/0rTTUGo87crhRZ5upAkGEfVs
-92BSgX8vijp2xSTe7Lj+kQMuZFJdpQ3BUhAVT9ko1HqaHxJHbPUKZUx1YdwunDM/
-8+vkEuKK6rq2CJEieyFAnBNC4CAavcH97b/RlEe+hyxtdtFKSITZ9w2pdEfMOfJq
-NJ0EmDdFHpAUqWVu0fnaz9XeEB1S2tMxgve900IzHJjOug/9IQsBNPWSTGNBYpAo
-AuCOQaECZ7fhy0WZ7rqn/B9ojlpam3R2BkbJRzDAORKpr8ZJ7slkuXfUpPzy9U0J
-lWK3Wonq0DZ26t+VjnqNVOzeTZRS0PsjOdjb5Zx8sStPLPC1fIWA9ZHKsXrRYJzK
-pv8tTn0eKH4QInkZ2j9Fx8n0jrOjAIE1OZurXNpm0w1f71asZ6Q2W9NhsmUcjv/i
-0kO3FS+CV2PXny4cbl85XB3i01AeHmzLtxVU8FYI0CedQU8FLMU4SwO2tCtQSHtG
-CV5BdxEPCFH0EzFVzN7VLRz/TNA6fNSmk0/xi2c4h/B+sZ0I7KE=
-=qrrv
+klBYVQ//SEXPmnatzgB3og3Zi0GYHEby6eUnlQd5pqJHuD9Nbi7lG5l7Bc0/h/UM
+tv+BUrNWqMijqsddE0gR0QnumSRqtbUBklWS8IYRfu8umrew+ZCTMsmGNFWQrj2D
+0qN7+dlgOGp1Xh1YWwfv0a4KvyIEPBq3fF4iZ16ff8d0aduW4tUnbd6fPSRbftui
+khj6mfb55exq5DSvHxxJjjDyCCMJ7gIIgeUdrupQqgChuRWkgCBTDgd99rHE1nBq
+WSeCuG+1glTZimCGr2Ib/eSYyX53Ob1CpoGF2BftFckTnIKloQaNOr1Iax76a6ep
+7+/wSAZl6Ny5PGXLAP6HUMYp7vMY0005KFW12QOagu3CdFGwol9Oyd68B6TqKMyK
+obVvItrTjHDxJfHQqCtw2xQ0zEJmqPz0bco3AO8CyiACdAIcrcrgGqtmAIAUYgCq
+f5rgjCXUvHNb+h02DbeBftE7T4YHVLHZ7wOsT67i9IxP8Y7OlGvf3pHxrBca3W3K
+kEB+l+tR+9sDdvCJt+BXeHC+ao/h1c1cDJZ7tAhhaxQ6JsToEtIGRg13EAcQHWl1
+wsPuIIZ0EO+8O6FORj3q3YNNHjwwtnJ6KZx8d8cmpCuGNGVr2IdDpRfqonqzIQww
+0zCLIBw7bkOX2iAw8LpH9XLy6ejiFmF5MZobBfl84Uku2FbxE1Q=
+=4PUh
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 8884f1d00f1c..1bbfcf3c90aa 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 9793ce059058..7d5fc4b7f8a4 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/jinx/Manifest b/app-emacs/jinx/Manifest
index 63a04e040701..de690f4f8d2c 100644
--- a/app-emacs/jinx/Manifest
+++ b/app-emacs/jinx/Manifest
@@ -2,5 +2,5 @@ AUX 50jinx-gentoo.el 191 BLAKE2B a183a9485eea61590192547a8c99e8c974b1974851073a4
 DIST jinx-0.7.tar.xz 17816 BLAKE2B d31ae1c35c5808237890c5c6ecaab915af7cc70260ae05de06c049a9bc250c3ff824a18256715fb7ed12e02df60b24aa957192b95fd3a0ab28e5102f5cf63718 SHA512 ed291b1d5eb5b799f629ed3d0d5bfca65e7f11d9349a672f09087a47ebe65a7bc8bef8fda6d344472dc8bc14c97c5d49c79365d45da5c9570e0cf84d51723928
 DIST jinx-0.8.tar.xz 19064 BLAKE2B f5c2382e635b4266ac7ea4a500f3ca56f029c1104608ae12570a5983e971dff17bd2d4c7c721b080ac7ab136e7a7cc305cc96b2a5dc825caf17c5713d37702d8 SHA512 63ef5031252a98e3c4e22a331fbe99d6fb0465f965fbf7ce4e319514b2ddd8230db66d48c72bc5d957a77b2c8609f08636f1579fe4cefb44e2f56b654638fb52
 EBUILD jinx-0.7.ebuild 851 BLAKE2B 34a93054271372e697f5432bde9fe725fb0b357251a4866c3748c816c30910df8a0c130f06ef42e8ebe643117e3033f8710f4eba26fd3ca9ce99129d8af9988f SHA512 e9f0d8cc02c507f1952d09a65a3954e90517dc3a9bd390c235e26713dc5f50816ed53c0f7f9a09d9a31edd3c9062ec744ae0e7fec4d6c507962e24f4533fa0fc
-EBUILD jinx-0.8.ebuild 851 BLAKE2B 34a93054271372e697f5432bde9fe725fb0b357251a4866c3748c816c30910df8a0c130f06ef42e8ebe643117e3033f8710f4eba26fd3ca9ce99129d8af9988f SHA512 e9f0d8cc02c507f1952d09a65a3954e90517dc3a9bd390c235e26713dc5f50816ed53c0f7f9a09d9a31edd3c9062ec744ae0e7fec4d6c507962e24f4533fa0fc
+EBUILD jinx-0.8-r1.ebuild 869 BLAKE2B 29da58ffa06954ae91f1026a98cde40e572c257a02d071bab998aaa0eeced66ff2082b1101b848c746a9f7c659c69ef104c9aab6dfbb79c03376d3fcd4831253 SHA512 d749387d989854694307bb55df2448c559ac8c42dbf050ccc5b7818c8bb33177975dca055ee8d66a059bf2e953730675b98f30b0775c1ccfc24108510e50de40
 MISC metadata.xml 596 BLAKE2B 637e6f9f170f3ce64857712ff8156e123e42fa1e3495291ca05fc260f69ba267df6536c08b2a1ba042d8cc13f86f499d1e5f8dd223b89efd2c62ca38a9f37d2d SHA512 1fd1a6b8ba360f7aa2c03e8c318482b564afcf2392c20fe0c70d96b181df9323706c3b81bd3aa98916b65cff29aafcf9c9a486bfbbd55b775ff7adee85886950
diff --git a/app-emacs/jinx/jinx-0.8.ebuild b/app-emacs/jinx/jinx-0.8-r1.ebuild
index 3708e4eda694..9e53b9cc2c8e 100644
--- a/app-emacs/jinx/jinx-0.8.ebuild
+++ b/app-emacs/jinx/jinx-0.8-r1.ebuild
@@ -38,4 +38,5 @@ src_install() {
 	elisp_src_install
 
 	elisp-modules-install "${PN}" jinx-mod.so
+	doinfo jinx.info
 }
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 08379bb02b2e..e416e8a9896a 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,15 +1,15 @@
 AUX 50org-mode-gentoo.el 95 BLAKE2B 9c74869edce0915d9793a3b10f61e8002dec553a93fe9856c526d77e5e988a35203c35322a1ea7ce9e19b02ff9a5ce1b2b4d73b8ba19bada30b7fbf453e43b01 SHA512 aa2e47c060d441ef1f631f2a44f3b7adc7cf5306155b9cc3f3f808aa053b411980671a89933c77fe02aac79bb6f25f2fe98c676e13e097dd885f23bc9d8cb000
 DIST org-9.4.6.tar.gz 4729335 BLAKE2B b88edaf8098124b2048ce57d6005d2af0de34e9b8fa94c24eb041a42a6fca1fd6da7f242be89e6b0ca5e7b80d879096f9114dca0ba86b20a5d26d2a185baa537 SHA512 7e50d7e9e2073bc0f06d2c861f59d4c9b8af4cf63c98f730c810a3a8721e65829fe9ef7ba0ac99f49bf9da427a4d5ad1d028e05c1a8ab6a3bea2ff2020c0e61d
 DIST org-mode-release_9.5.5.tar.gz 2049730 BLAKE2B 382e6585f693fd30def29da740d1329a52b4565382df90a37e3646324ee44106f1a99c2ea0c0862d77721cc9bfbec0736cb03065b59b2fdea0a68d8f8ea37c9a SHA512 ce06bab17ae7944c1623f935bbad0379d06390c72c43633ba0de2bc04ad362e18d9aaae96103eeaa23f7ea9e4e00976a97a914da87fb7941a13746b1fa77f591
-DIST org-mode-release_9.6.2.tar.gz 2208663 BLAKE2B f76e48f058a2a32cb09c14041b6781c385e1267eb2c80e39d0c2b3432ff7555e27b21ce33e1e5e0c0a99ded31b6d3b3ed678e41ff00752f97d2feda8b0111911 SHA512 2dfbcaa8c720b628770ae3bee223c51c270220395b5d1659dc529bd60b20f7308091b565d90d53ebb9462edd6207a1652059623dc80b0bf8b2799b3beac5a2fe
 DIST org-mode-release_9.6.3.tar.gz 2208740 BLAKE2B 77d8e7de2230a3d4b5f3e85336519de1b2d55481522bedc206c5edb2cd56963f729d1e48fe483717fd4c295c6eb1b73e9335ab6a56c2903dd9ee54e15da0a8a0 SHA512 4a7040bab029c8384fa8689782672887baec7eea66ea99a32fd026eddb1659fa15e6c8ba99546fb7b8a16492d1fa476542acba3adef745079f583bd0e2b834e0
 DIST org-mode-release_9.6.4.tar.gz 2208733 BLAKE2B 4ac49b4af872750453dd29eb0fb7de75a140246defb98a1ee62b693fe5083b892eff32ffda6a87cdc4d22486c8246134bb7483e3ec335e23ee131e0f6894475d SHA512 fa117500e0618f20b55af6e7f3cee2d24bbcf396649fabc1420299d99599335c0697e865ac38e49a30d5f2cd00e6daf163f340364e51c306583a7198852df059
 DIST org-mode-release_9.6.5.tar.gz 2209154 BLAKE2B bce49c4cdf51550c83ad78b683e2cb400a4378ffa344e00201450fdbc403248b85ab7a69c64abb5edc45b64c7134bd286e4a7115c255c9f6ff4866425c303711 SHA512 89829a0ccd82a42ba4b612e3ee2208632a0b5d32419192ac47660f6e9ab05e9848a844b6625dab6426a27fc3009bf75925856574d0aab49fefe639b6f31cf2fc
+DIST org-mode-release_9.6.6.tar.gz 2209391 BLAKE2B fd88d0cf686007b7a4f90ad8870f614525efa2edcdf9198eb2576560e8a830ac69c05fe92d1080b191a0c10247669d2cc75306486a0c0ce1c9281ef56a779bd3 SHA512 a8e34bf6766204ac88ab3a0d2d20b5db911c66deef7b252e57691e7032cc0e34bee4d27b1fa4053d5b2011d08c9b1b1b556b5698109150d09018956095e42d5a
 EBUILD org-mode-9.4.6.ebuild 1696 BLAKE2B 1e2b698f0ba118149cd4e960e5a34b6370c878a917746ecafa9758b5f3ce24d55ea0a7ff3a99b370c972cb0c97c0321bdfe5735d5782d98adcf1ab4c65e4b84e SHA512 76bbc761a82b08a26bb73c0d655b52308487586a8a108a6bc2a29ec66816fdf1f173c626f8594198c00c6a45000686e0876b98dbeb3e566ae212b03005c90ba4
 EBUILD org-mode-9.5.5.ebuild 1386 BLAKE2B 2686e19cbcc0e8298702d9be753b8023e8736feac0d07793c581dfa51a9167d65b072a1d8a268b319b4dd87e04a6e920d400ddb13c50f3da5837bc08cc58f8a7 SHA512 b3417352a09da826becf217c2789d90b25971c4d97ff92225459b50617c04f85bb1cdf53b933ba1c5927a202a4852acf6bb1b6bee3e2c2c40a3fb772669017fb
-EBUILD org-mode-9.6.2.ebuild 1402 BLAKE2B 6d24234cff61823b747d2bf5acd2c5ea42e44230fff15e7414ce501ac80efbe6aa3a278544f8875af5ca6cda3f34e8ebc52ce58a02805b92cd9ac2173d050748 SHA512 31946a3e38c438325919b05e2d084e8533248e15f68bf74bbebfec4c00fe9f39e66d622e49c3fca9714b22ef35e8eb0583bafe66cc40f85838df327cdd0f064e
 EBUILD org-mode-9.6.3.ebuild 1402 BLAKE2B 6d24234cff61823b747d2bf5acd2c5ea42e44230fff15e7414ce501ac80efbe6aa3a278544f8875af5ca6cda3f34e8ebc52ce58a02805b92cd9ac2173d050748 SHA512 31946a3e38c438325919b05e2d084e8533248e15f68bf74bbebfec4c00fe9f39e66d622e49c3fca9714b22ef35e8eb0583bafe66cc40f85838df327cdd0f064e
 EBUILD org-mode-9.6.4.ebuild 1405 BLAKE2B c72dfd77145677c969a4cedf57a53ddfbf09621b5830ffc96171661d6df7974114d169c5111d8ff346c232201f67d8d79999d7f3589566a132fb0b2de19303c2 SHA512 7ac81d9b86c6317c50c4cdd5d7b8786e1c0fd2a930b0adba139451d32e7d6801f8c38f9eb11723ab50af8da10dde5f4a7d2b5b25e469959b7bf0ac8b2701886f
 EBUILD org-mode-9.6.5.ebuild 1405 BLAKE2B c72dfd77145677c969a4cedf57a53ddfbf09621b5830ffc96171661d6df7974114d169c5111d8ff346c232201f67d8d79999d7f3589566a132fb0b2de19303c2 SHA512 7ac81d9b86c6317c50c4cdd5d7b8786e1c0fd2a930b0adba139451d32e7d6801f8c38f9eb11723ab50af8da10dde5f4a7d2b5b25e469959b7bf0ac8b2701886f
+EBUILD org-mode-9.6.6.ebuild 1405 BLAKE2B c72dfd77145677c969a4cedf57a53ddfbf09621b5830ffc96171661d6df7974114d169c5111d8ff346c232201f67d8d79999d7f3589566a132fb0b2de19303c2 SHA512 7ac81d9b86c6317c50c4cdd5d7b8786e1c0fd2a930b0adba139451d32e7d6801f8c38f9eb11723ab50af8da10dde5f4a7d2b5b25e469959b7bf0ac8b2701886f
 EBUILD org-mode-9999.ebuild 1531 BLAKE2B 6c06454ac286f2d681af7e55c151a9855dac8aa3028c41c43753ee907fe4d63ec26e5e8e4a0a4f97b80172b0f8fabc92ba591298bef9b5301a176460a1ce9358 SHA512 5526252d6a1190a8bee375b96e9b85c33e593f6bc77f118a33cd566c8fc5634e9e839dbe931c9ad96252e81d669fdc84f9999ea6b834cf2273d31d1e8cb86d90
 MISC metadata.xml 1369 BLAKE2B 4da436ff9e2de1e6f01a37be7cd8a893d49896d00c83a16a47838c3908e04b46f7f07499ce3bdf41a25033ec1313e16b30d6498622e476fdede774ce711d77ff SHA512 d0817690d4662401fcdd28de85b3e7e5f0c69cb37de4ba7ada8499d7ef964217cda8cabed4849c9b48ebecc393d65b2de5067c36db1e98834ac8a86024b901d1
diff --git a/app-emacs/org-mode/org-mode-9.6.2.ebuild b/app-emacs/org-mode/org-mode-9.6.6.ebuild
index 2747f4956985..77e4614e18c6 100644
--- a/app-emacs/org-mode/org-mode-9.6.2.ebuild
+++ b/app-emacs/org-mode/org-mode-9.6.6.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc odt-schema"
 RESTRICT="test"
 
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 97466915357d..566b18b26bfe 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/docbook-xsl-stylesheets/Manifest b/app-text/docbook-xsl-stylesheets/Manifest
index 7e869e207b73..c7b197e10d1e 100644
--- a/app-text/docbook-xsl-stylesheets/Manifest
+++ b/app-text/docbook-xsl-stylesheets/Manifest
@@ -1,5 +1,5 @@
 AUX nonrecursive-string-subst.patch 1205 BLAKE2B 0c7bb8e3ba646a137bc0b50722448c65437881672a4bbb3f3dc7a181e5074f667fca0fbcb4475b83f04ac63bdddbf3dae800b7a7094b5d9aea270faeb81d9e50 SHA512 6a26838078a3ce28273dddfa1af6a378cffc28b6d1ba48a4cfc839addd7bf58ce217d6584b735f9c75381954744ab2386c75fa3c593858b6e27882be55c00d04
 DIST docbook-xsl-1.79.1.tar.bz2 21967928 BLAKE2B 42b7e989616d16fa100c2dad713830ecedf6c7e26f56f99a9bf9330385c753f282cea1033e689196352bd41f9dca59a06ff09fc4638051cb478a630df9bfeb0b SHA512 83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7
 EBUILD docbook-xsl-stylesheets-1.79.1-r3.ebuild 2264 BLAKE2B ffd98439f53de633429325f221fcc9fd82bfc43db0dec0e37fd5a600b066b572295b54e55e9282ca7ceb75751820614c2a71cd8215f27a57f0788957cf0dd189 SHA512 311211ae7785b42d8730ba25b7984890b05574308031719bcdcb06bed9ba9f6dc02c38c794bc17c7f7956e34137c79f34a613b9437a8a2a83c86151b470b12a8
-EBUILD docbook-xsl-stylesheets-1.79.1-r4.ebuild 2288 BLAKE2B 91c0ccf48ac9b6b47a4528b33d9738e2ff721b2594e7446a9618871fa41b05fd669feeb845abda90ebe10b478ba14d89f40cf1a33ed3c15a4fe97c3fdd15f637 SHA512 1bb2e6422ca940bccc759fb822c922fa8f6a1166ad37027f732731d0546914e65a8d8711b3997b757f2df032205168535abb769d5514c517e433411644a0cc6f
+EBUILD docbook-xsl-stylesheets-1.79.1-r4.ebuild 2286 BLAKE2B 97b22cb4ee2c96fb0efb0736dec5e7c54092b9a94c867259f506a0359256955fb86c2736da499c8248e09de244493ebf9f12ca59615e426fd58f043a7ccacb0e SHA512 6d55bbd807ffe3769de6a89fc13dc988cfdef22a62d553569988d6b3d045f7c7bc63df3f5acab88aa34e0852685cf8a1aa44ef3f6fc0e2550785b637b6ee9b6b
 MISC metadata.xml 414 BLAKE2B f10f5576731ded90514b956bb032bf6472634a509e709e998b0120ced275cea6d7027b18623b8f7d8198b6137a9566eab1b0462626a20693655c791b9763952e SHA512 f844b8d60c1c3413b8eb647bdffba6fb08e09e7f62df9e122ad6d69f9f67ec67711a66ec840f1ef92edefef83bd5e77103a10b0feeeb4a08f98680274c3dd93a
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild
index 13407ff47c17..552379eab71f 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~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 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ruby"
 # Makefile is broken since 1.76.0
 RESTRICT="test"
diff --git a/app-text/languagetool/Manifest b/app-text/languagetool/Manifest
index 8e6f173dadcf..7e7ada5833e8 100644
--- a/app-text/languagetool/Manifest
+++ b/app-text/languagetool/Manifest
@@ -2,5 +2,5 @@ AUX languagetool.desktop 191 BLAKE2B 726e670645f78c3ea11c788a6440116753d66cf9886
 AUX languagetool.initd 473 BLAKE2B 74f55cfaf5b6c2e2fa166533c031408dc7e2e2b1882e6e09227af38e500f12481a551e8cec166620c73e671f00063cb63cc9dda500355110ff048d806dfa2d77 SHA512 fb9ab4fa28df1f43791995557fc4568ee79f7af7991481d295c28739c975c6648999676ea078ee852dc3dc9f49fbb9945c9dc571c385dd4db3d69ca5bf501623
 AUX logo.svg 2824 BLAKE2B 7653478b44ebd3dc80691849751745aba14a652d1ffaf52ef27910a52fae15b39c9ef0224795f698b1ac6f95a3e677ee46603b29261dff0d50d9eedba5e09de5 SHA512 501e3dee99f762556774f42829a9e450fc412271a7ade87f17ffb211929d24564ea3385b2bfc1c261e46d4b0b3562be62903b111ecd1c7dacb97c3c8ffb0d6d5
 DIST LanguageTool-5.4.zip 202761711 BLAKE2B b23c2944bf40dbef70d43391761849fb83b55538ac1cf0312c82079caef0a91f177f67c0e5818ea558c485d0bc2f4425f6cd32064095aede755a3b1233cf62d7 SHA512 08048f5bb8c5f7050ca2081a9f00405b0b397c37511a8297675f031bbb59e19863195e3b624dabb0964d436ad1570112e8c85225905ae22f2bde2a0200fcd883
-EBUILD languagetool-5.4.ebuild 1699 BLAKE2B 0cb39a453278852524a7e4495f2b16d5d157ca3074fe994d9a858308e3507c0a3221647fc82c9c2501141c5987cc9462cf2f5846d63c36fa1aff5499cf94dac1 SHA512 470199e51884c0294df159ec4a2399fd460bb27ba8eeec6ee7deff925ea80374c77e09953bc958ee75a58c090572d34168bca344f6d4984ea935992d435da246
+EBUILD languagetool-5.4.ebuild 1706 BLAKE2B c07f7f3e837217d85fc8deca86f32a38e7988a6fa1fd15669c0d603755147d332c6400687586d772cbd8010ffcbaf9bf1a8879767df3fb4abdc69bf71dab6acd SHA512 fb88af597a204694a7f1dbf3dc462c8f7891a3811b0656735dac8a00172c8349180813fc46034da481c6e5f5aefc6c0952e2064cc34920a389d4f503060267f4
 MISC metadata.xml 256 BLAKE2B a2cc41acd036354767d8637d65524b95dd6a79ae0126f7e6ba61abd53bf681cc4b7eb8f06c2842be9a634ef4b6820aa20bf7931debb508b2e819706665dd6eef SHA512 bd920ac1d3d1ac26afc3685652533d93bed59162ce9acab9f44cf4548f75ebcec2a1713f0f596a1d3e08a06a72fa27c56331a19321eeae5bce74e8a10a79ae70
diff --git a/app-text/languagetool/languagetool-5.4.ebuild b/app-text/languagetool/languagetool-5.4.ebuild
index 34da42ede96b..870c19e57437 100644
--- a/app-text/languagetool/languagetool-5.4.ebuild
+++ b/app-text/languagetool/languagetool-5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://www.languagetool.org/download/${MY_P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 CP_DEPEND="
 	dev-java/commons-cli:1
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index a90f2bcbc958..b2adeaf6059f 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/bash-support/Manifest b/app-vim/bash-support/Manifest
index b824cdb32964..97a986946338 100644
--- a/app-vim/bash-support/Manifest
+++ b/app-vim/bash-support/Manifest
@@ -1,3 +1,3 @@
 DIST bash-support-4.3.zip 249238 BLAKE2B 46fa031b4ba927e5a229fa9dc93a3dbe005322a1de494bc8cbeb56138f2c580ea5b39b203d46b59013e1985930422c2e4217234a317fbf8ee6209889c4047323 SHA512 fd9294e467129990bc9796cda309a5b0ec5af3ddbda7f141939622ec0d96c1573b35d9a20e99040d6a4e83b1e98c1f6b847c77d055cca9492922e1080dc64118
-EBUILD bash-support-4.3.ebuild 589 BLAKE2B 48e48b3359d7319f2ff5fcecb4881b34fa470a1dc76882f9e2dc121461f7a86337104e72b289717b1715a1f023b5a64d647e41cc952773f70c01ee1c1818169d SHA512 73468e80ed9834500428157ef05aaede6d670570fd4ee4dda7fe7b1a211a6015399e15f5e83e1635d424c5c31c6aa09352ec97a86d798b6d925b23a2389148fa
+EBUILD bash-support-4.3.ebuild 596 BLAKE2B ebea337c04f44b3610158820b62c917dff869094151573719feca886e316ef21b7a1db0a53056156633858495fe7c12b1f0fcd4d229dc85e6829be9bb22e7ebf SHA512 b54db4f99b5ce9af676408b4d7314a3c1c16ada559acd36132a82193350bf0bf5358ff08fd54febd6f4a26ca7cbedad4e724d3637669b8f238d0b457e8cea765
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/bash-support/bash-support-4.3.ebuild b/app-vim/bash-support/bash-support-4.3.ebuild
index f1eeb80f2070..4937c819b4f7 100644
--- a/app-vim/bash-support/bash-support-4.3.ebuild
+++ b/app-vim/bash-support/bash-support-4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=24452 -> ${P}.zi
 S="${WORKDIR}"/${PN}
 
 LICENSE="public-domain"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/app-vim/languagetool/Manifest b/app-vim/languagetool/Manifest
index a6d74b145968..72d62deac983 100644
--- a/app-vim/languagetool/Manifest
+++ b/app-vim/languagetool/Manifest
@@ -1,4 +1,4 @@
 AUX languagetool-1.29-script.patch 1413 BLAKE2B 23aa4adc8c59689fcb18ff9b6fa0068035eaf212aedc9920d87a729cc7e4b34a32e11524cec1785d23cb08cbf9b1fe5ec5315ef4c7fdc2eb96324f06caac5c3b SHA512 b4e25e527a8af3ea5fe649bd31aa0ecf0f073a0852f1f155ecf2cbdc58d105ce114db8a12dc56ee086a9076cb15e5bde61e7340e570fff59093ed2f266247564
 DIST languagetool-1.30.tar.bz2 8089 BLAKE2B 518036b68b80bbc083718a23c3aa07e9d118b8c6dc4f69cfa289566924ac2bd218b45ca53e850244676351b1566b580c6fac909376087d8274c289ab20727e49 SHA512 c04115752f8a601e85b718ea8d68cbdaa7628d14c252b4bb5bd11449ae2c5558ddee3d0f3a1bc2db84364e127fc211a0c4fe51e4ff9b442ebe99aa4f9d1db935
-EBUILD languagetool-1.30.ebuild 425 BLAKE2B 92c776abdd10fadb34e7b53ced866252cfe93e091f3d12d9413fcaee9769a5024fc25ff2fb3c89b60e5482db5f2c825bb54e85ccdd1056e151c023b086a887b4 SHA512 da2177d7f99694a11d5d2b820109c4016e8c872754717f9168da7c78a18d3f58c4fe7c8eadcbc927134c8c36e5adc81e5e90f1ee944d1279b100eba36cd27a14
+EBUILD languagetool-1.30.ebuild 429 BLAKE2B e35861f3e843871d7a907d479d26c55a9960031d419b84bc66a46fba084c666f5981be96de5cee576fd0115ec397da27a9ac5e3aab8b98078135b463c71494ae SHA512 62e72ae65074c28d0fdbe4abbe1cb925571eec89967f32f67491e9666f24d9d77130367453a97ba1dad383bacd1999677ea50def95e4d58051fd490b6d407018
 MISC metadata.xml 256 BLAKE2B a2cc41acd036354767d8637d65524b95dd6a79ae0126f7e6ba61abd53bf681cc4b7eb8f06c2842be9a634ef4b6820aa20bf7931debb508b2e819706665dd6eef SHA512 bd920ac1d3d1ac26afc3685652533d93bed59162ce9acab9f44cf4548f75ebcec2a1713f0f596a1d3e08a06a72fa27c56331a19321eeae5bce74e8a10a79ae70
diff --git a/app-vim/languagetool/languagetool-1.30.ebuild b/app-vim/languagetool/languagetool-1.30.ebuild
index b3e96c572a45..63d0ccabc6ab 100644
--- a/app-vim/languagetool/languagetool-1.30.ebuild
+++ b/app-vim/languagetool/languagetool-1.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ MY_PN=LanguageTool
 DESCRIPTION="grammar checker for various languages"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3223"
 LICENSE="vim"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 VIM_PLUGIN_HELPFILES="${MY_PN}"
 
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 3a8fd4e135fe..6dcd82929605 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/doctest/Manifest b/dev-cpp/doctest/Manifest
index 9d488d5c0ac6..0aab97c0f013 100644
--- a/dev-cpp/doctest/Manifest
+++ b/dev-cpp/doctest/Manifest
@@ -3,6 +3,6 @@ DIST doctest-2.4.10.tar.gz 2297167 BLAKE2B e6d2af9dc9207a1a5d86ebdad16f29a4c4d86
 DIST doctest-2.4.11.tar.gz 2183312 BLAKE2B 277f22f3a9e275dd9f5cfffeeaf8346577223c2b872606f21fe5b8462573917a59a88bb61de145a92be61129396f9b4a87d94f4723e362428b1bd856ed84fcfb SHA512 04425686057079d3f1a6f767c487f1953050f553dbff9fc42b42dde1358fe26e46bf6219881bbfce625f15cb9c229474d82688120eb2cb2b1d8138db0cc91b3c
 DIST doctest-2.4.9.tar.gz 2292632 BLAKE2B 7d501eede5a2311117a04a11da5b518fcac4de53a73ba7b14f47395a759bc5d708438f25df61053a16a256ffcdfa37500a6892ef0890aa4df4d9f23533bfb18d SHA512 c7337e2de371c18973a0f4cb76458d6ae387e78874c9bc8aa367ffd2d592514b774e7c5ebf44f83b7046f6b33c6905fd079c36f4c33eadf52b3d651d978182cb
 EBUILD doctest-2.4.10.ebuild 687 BLAKE2B e35385d2c8b0a748c1d98be01c207816e6bc3a057aacfd292a6fb6d9b1e844f3e729aa4c3b3d618ae3c1bae297fca495e25b7243cb021f1586ec67b305187f48 SHA512 a473db364467a1b54c59a081b530acb8f82978b43a56b1d9b35639c18f055081edc5a6090be780c598d3d881348e5629d1cb16773630e09545e54e0bb3b754a8
-EBUILD doctest-2.4.11.ebuild 748 BLAKE2B d3f80e7a93df38799241de3f9d1aad45059c16c4913fd6a1387ede141b3382613fb4510c9b7d9a43d95fc6c343db5efe0e04680c3b42fdd587bca572355c3261 SHA512 c54493be995246528f6ff6367ca694d79ee4bbd98f16b143d586cd230cd019531fae4773db51e887c8fd7e7b044190df6ce5ef989c4250f3009b795a0cfb03ad
+EBUILD doctest-2.4.11.ebuild 746 BLAKE2B c9c39628630d07102eec9453dc21113124fe0473ecb7e1eb40d854537135fa87b3b34abe0a06bc88886a91f194d684c0e44cc787ab5b2008b7054d0843ca7872 SHA512 a38e878eea4733cd16c3be3b736bb8f6aaaa2d64e82dbaa685979b0a6603b594770886a6312d442ced293e634306997c1f3d0063fb4252ae0df073c911b0829e
 EBUILD doctest-2.4.9.ebuild 587 BLAKE2B eeaadb18066ff1f52907d6fb01625d72996e1f715640adc080b7f0d88ed9623d65f3baa9945657ea0991da3ca2e14ff518e846de272874e8f1de07577a0b205e SHA512 c16ece60b5c19a7b8c58fcc888942ffd6886f3c71154603df44d38cc491e6eab8bd17eacb20e29a6b4715ad71af48099a5b80e76b001dc8425be075686540dee
 MISC metadata.xml 471 BLAKE2B 530d91c53109b2e99bf3b5ef79fb1343f1cf37bc48aaae35da5468c304c8a2e38c439e79a43c139b5dca5dca8dd9231e7a9020b6f1f12d2074d92b95542bbf31 SHA512 5d143f4ba813a3de07351c5e45cec1aa66d395806fdbc9a04151c0adf1c74dff8192b7993d767e2e82da54090f7c3948ce33c747d6bd030333fc35329203083c
diff --git a/dev-cpp/doctest/doctest-2.4.11.ebuild b/dev-cpp/doctest/doctest-2.4.11.ebuild
index 75632c8c06a5..ddd96dbdf2d6 100644
--- a/dev-cpp/doctest/doctest-2.4.11.ebuild
+++ b/dev-cpp/doctest/doctest-2.4.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/doctest/doctest/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 PATCHES=( "${FILESDIR}/${PN}-2.4.11-backport-pr770.patch" )
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index d4f0600af7c4..1a16ec63e40d 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 6517a4b69e4d..ad510ffea090 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -22,7 +22,7 @@ DIST mariadb-10.6.12-patches-01.tar.xz 5120 BLAKE2B 5c5b25be056edf2ea665ed2ceca3
 DIST mariadb-10.6.12.tar.gz 95085449 BLAKE2B e915601e53c9ebb8c0f2b0536d6adb9bc4a0268fd0e5808ff851f33e6c49571e4edb66ef6c11511a65331a292c8431cd71be75d5ffd786830b14f3b843d210f2 SHA512 f6d5178ce2a4d755367bb805f23e849824ee4c982a01a114c35a13d250a9b3b2a93ac9b745fb3685fd9e6b44deff0b5c936b43e5441d3af8a300881109db0549
 EBUILD mariadb-10.11.2.ebuild 42478 BLAKE2B 9f841e3b2cd8e70fbb95ff8752e93c77f83d531d0594c2bfb0b75db3e1bcaf62eb6adeeeb9286d85b822218639a1bdcc80bd81f5b149bd98b1e76b611a75b294 SHA512 f07d4f15134d4b85fe40bf1cc171a04d0ce57b1fc57952666c8e84f7c160a6560c7ebc7e4bb9dff2c9dcc4ef8d1af543eff74366c87f21f849cde4316dccc4cb
 EBUILD mariadb-10.4.27-r1.ebuild 42114 BLAKE2B e66ce90c7829a25e7b12bfce1428567866898cf214377a169aa723649338299eb098b4cb6df439b27c5350fd312a1147cd676f25122bb45a5f3d934cf084b86d SHA512 bd30a7ecd49884d3cc79513137d337301f455613a6e7d34372a54e0f77bd0ba3562e021d83bedf95f277a2945e6c738687789a894a576f802b56bb98fadcd22d
-EBUILD mariadb-10.4.28-r1.ebuild 42266 BLAKE2B 4346f66a0b0c51975fa8853b82ff9429ca4146f303802a9770ceb3641d2e8adf15a4d4ed5d3e7cc401453903d75a75c6d32e52d7d32bf40d76666aa96e494b43 SHA512 d40890947e818b8e782b3686fa1ee4adc2167e255ca328f5e95e88fe10dc5055030556eca40eadf469ff79ae256e109b4c4476f05d522c98e07d6a2130b1ffef
+EBUILD mariadb-10.4.28-r1.ebuild 42265 BLAKE2B 090e17afb359e1875f44e30d97cf811087fda21c39c5f2e0efe594b92d0342e928197d276402ab04cdd1124df7a250ef62941b6433f9418acbbccdbe39bfdd43 SHA512 28f559e7ea3d982548b20a8d6de7f369e2b9da93308f67c03fb275bff97b40e7521216264869da31257990f76b8f041d9a20953cc9e7fb112bb257a14796fa54
 EBUILD mariadb-10.5.18-r1.ebuild 42073 BLAKE2B 92380cfaeadfb278d307a9bd05ea405ab93bf500827cfaad531fcef803aa77f0b07ff69add72e51985f18c30df302279a339eb166580ac4c9e19a39251d69e0c SHA512 3c0d0c8d7befd3d1a8511dca82e285b8e9ba6dcb7acea5bc6bbc8c48092545a9d9da05040ae5d78aab250a2d5159272fda28b81a29d3b298894cd5762739990a
 EBUILD mariadb-10.5.19-r1.ebuild 42274 BLAKE2B c87e4084a4be85499ce55ba688dc261b9abcde6903f0234663a1afa3b1151fef0b9a15b2b8f32352c573f8fe329c7dbc1f496260a26b4624f4631044f12c5984 SHA512 623031ec6d047e557f087180d0cc4e27b421e0f0d0f5a807b80c977281c1f2cf24fead92a9a8a29a5da7b2ea6e505bf8b383b95eb140d1c15220152b5371aa99
 EBUILD mariadb-10.6.11-r4.ebuild 42736 BLAKE2B 478311e51f2c1a78b67f3351fc1cd547198d41e8536e462b20af3d23b48916f475c9c3a590d3210738a7064e1f23e7a324a1ea87830894a837fa011e2dd164f3 SHA512 9518acfe2d87b663a88ae0210367b0710fe7e003f53ca3edf02a136fd1bdccafefc2f8f6198430d2176a5674af9d18c6efa8a60a994aefc52c4fb03c7172da91
diff --git a/dev-db/mariadb/mariadb-10.4.28-r1.ebuild b/dev-db/mariadb/mariadb-10.4.28-r1.ebuild
index 83d1d9c9e7d6..c03756532dd5 100644
--- a/dev-db/mariadb/mariadb-10.4.28-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.28-r1.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index f09a5bf3237c..bd904da73b65 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -3,6 +3,6 @@ AUX unixODBC-2.3.9-clang16.patch 9332 BLAKE2B 8037f82286ae4a94698803530647ffb6d2
 DIST unixODBC-2.3.11.tar.gz 1752585 BLAKE2B fa1502d7b83c8c10ee9d54b23281096156a3e3ec893b81acf125cd95c1de0f4ae7657ab3b4c5214a5c6a0fc9209e53cd9acdf6f99e65840e0a05366182af5600 SHA512 dddc32f90a7962e6988e1130a8093c6fb8b9ff532cad270d572250324aecbc739f45f9d8021d217313910bab25b08e69009b4f87456575535e93be1f46f5f13d
 DIST unixODBC-2.3.9.tar.gz 1676145 BLAKE2B f4078f9266cea753b6f78d234290efe95a6fa9551088a6ce352b0b6ac5391bf2724f872dcc2df0368e98befd24f995ab4eb6958a34bb080b0f6d08993991a0b7 SHA512 6637eab751401522e0af775cb104cd07693b82927453a98e5af28e079f4b9f40e1cfab8cb36f509c46dced89b45244bc5ed1a3dda17ba5a52a844e8e82f187bb
 EBUILD unixODBC-2.3.11.ebuild 2067 BLAKE2B 371a4c5836be221a84ecd62f36477772f8140b36eab8ed27ed2cbb4a41afa42070ab3c5b709e7680c9b3b03c6e6c901de0b36ba00b1e0d366cd0ffef3efbe829 SHA512 b1adeffa94592318f78de1f5282bd8c492b7152587458f94b8314371e91a4ff4fdc1a6025439d2884821b766415910070e96b4e416496974abeee8be7ca22094
-EBUILD unixODBC-2.3.9-r1.ebuild 1941 BLAKE2B a83e1e194a5761c3265b5310a10cef4212d95bc1ce0bb8b42948caf55e1b817a29a325514367a8e3cd369246182127f27d7f6c9ccf3b83e63ca582a172c9bfd6 SHA512 5cb2bd787359997319859b48dc09b3c1bcc12ac4631d45c572cf63f07f3e39f35c2424c0d40259d9f332ce722e735043af8482141a594a661ff61e787fe83351
+EBUILD unixODBC-2.3.9-r1.ebuild 1939 BLAKE2B d78301fbaa17da4f8ec9bc164c07e83ae455e62ed87ad73125789639eb9a48f7f29f4f2b23af3726789752dea6412462775071b3cda65f56f7b8486a95d39d80 SHA512 9b1e74dddea15e029d9416791935b0a6ee97477ff99cd76ccc8d45318d1c74b1b0d01a103c749b281d2316ea04fee893c0acf7a1c18d81b4d9222cd8e5cb5805
 EBUILD unixODBC-2.3.9.ebuild 1823 BLAKE2B eb9beb124808cc49f19ced7301b4ced73451ae73b1551a250e163d1081658f8531a21e6c3165067f46d88ea09914a6329dae880a7486c7a41797535b66d26f7a SHA512 75250bf39439732fca97e50ca4df4973027a0f08022e5ae5ebea51f3c436a0e3c53f66e7221a84ec2396833b991fbbd0e9b05f3b6b6cd77d5ad01a89bbfeca89
 MISC metadata.xml 479 BLAKE2B 298fd55d5c29508598a3e221f0d3b850b3f2e195885460c5a9cb9d4111d9246576d1ae0c8c586f6484931ea2b8b9a2e0127db5e4c01c456e66fb66436b62f2aa SHA512 a751b3121ce1298c50e4f66ce8c654d578be088fdf52490a4149d380053bef287736d27ef1b430fef789019cc1e0f53904cafc6c292d984a78da105a493be6a5
diff --git a/dev-db/unixODBC/unixODBC-2.3.9-r1.ebuild b/dev-db/unixODBC/unixODBC-2.3.9-r1.ebuild
index 6402d92becf6..a8111bd2a88d 100644
--- a/dev-db/unixODBC/unixODBC-2.3.9-r1.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+minimal odbcmanual static-libs unicode"
 
 RDEPEND="
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index a258fec73717..dc18b9d3413c 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index f60ce109c57d..d088ca62b6f6 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,7 +1,11 @@
 AUX go-sets.conf 313 BLAKE2B 03e94776e317d34b72bfb8385b8b0dfa6a599a6086e4d0c9214e7b49293768947c21d9afb323ffcc7fd85ba0af72d9cb243dbb571eee9eb81de9400fd5f5e79c SHA512 7d01b98bc8d1b609183682dd942bd4c9fa757a98243c7de3cf6c497c7bc20b8cdbe59dd669ce4bb11f914a0e9b6d100e65cea2dffd99f38be50b18e0ecf66315
 DIST go1.19.8.src.tar.gz 26553006 BLAKE2B db085e575f1bc978502cc5d9e45206542cdf9c6edd6769b1918f07a6be7afb4a387cb18ffb7cb37f5de936bb970c703504cbb6bf88c597dc30aab4d80eeb8820 SHA512 d7ecbae3034211d7c64df4c0fce6894bae3e7e8de20bd2aa9f24b39cc040fa64d8a3bea311582cf4455a981dc3c8f319141f7f357db4eebd27d4451fee05727a
+DIST go1.19.9.src.tar.gz 26556330 BLAKE2B 2eb6bfd4456b4f4c7f3bcd794bc40015e1d7dc4f443082b559d81621f428828cba03c63bf24e51e57f258dae8e7c9d4b2c85e2b6acaafce3c3b80a131b0b6d90 SHA512 548525fc33b0d0c6e5e175190b3235a3bfe2046607a87e3b890735bae4f6279f77a15122cfd432c7971c829a631883a1ed2e39399e23c9b8fa96f86502a8c02e
 DIST go1.20.3.src.tar.gz 26184364 BLAKE2B faa9cf8c141d013955d3582d5cf1a43ac0d89c2a7ceb7ab00e10aeacedc3bf1c324d62cd17dc6299057cc9acd347ec7672c7f9acafc1b926855d953ef2bac8d6 SHA512 47ebb3925956a3facef9e5e6f4efec3058e55632020ea247844c55b160d23e2be3880ea24dec2f73382a7c7858259896cbb7de1bb764c481c176bed479676029
+DIST go1.20.4.src.tar.gz 26185429 BLAKE2B 74ddecc43d53ae9ba9429ec7797061d96b114e24c7cd3bd60546c1161362ad449dadfa3ab53a0783737a4cb36e6724b66977ed554e7f724c8bfe2f3a083b02c7 SHA512 43898325bab48c24e533f360a2c7de356a8a56946602e727b5bcd4a62ff4f64fd750e2650032f7e0525b0699e40e506d79446e16838f097e6bdc2a16f10d81be
 EBUILD go-1.19.8.ebuild 5233 BLAKE2B 86b49ba0ccc71624134e67f3e97db2b58460835459080228ccaa6a6b043123bc4592cf8ac180d8e67eebfe0b6aaef0bd48c5e9358246099c20668181301b7842 SHA512 10577e3953f04e5998acce259355643455dab7e67bd42efa5fbc4d2aeb91d0807acdb3c59813f2d69acb853e7f6d6d2fcb3cb72e2ec9834dec5ccc6f6a50a7ba
+EBUILD go-1.19.9.ebuild 5237 BLAKE2B d1955b14a44b8bf4a0c0ef7ae09903fc7cbe43b081d4418f060992a1f48d7b8597d36c2ff643fb4f0273118c44846933b6a582959aadac23c2ff23430faf3050 SHA512 84d747c9a9c8117e95e17993e43fac13489499a26b79776787ae98c9dc9ad3bfe2b3fd6297c5f0bab96ce556b62863a307e7b9ae00f3c775423455d95242c8c3
 EBUILD go-1.20.3.ebuild 5233 BLAKE2B 86b49ba0ccc71624134e67f3e97db2b58460835459080228ccaa6a6b043123bc4592cf8ac180d8e67eebfe0b6aaef0bd48c5e9358246099c20668181301b7842 SHA512 10577e3953f04e5998acce259355643455dab7e67bd42efa5fbc4d2aeb91d0807acdb3c59813f2d69acb853e7f6d6d2fcb3cb72e2ec9834dec5ccc6f6a50a7ba
+EBUILD go-1.20.4.ebuild 5237 BLAKE2B d1955b14a44b8bf4a0c0ef7ae09903fc7cbe43b081d4418f060992a1f48d7b8597d36c2ff643fb4f0273118c44846933b6a582959aadac23c2ff23430faf3050 SHA512 84d747c9a9c8117e95e17993e43fac13489499a26b79776787ae98c9dc9ad3bfe2b3fd6297c5f0bab96ce556b62863a307e7b9ae00f3c775423455d95242c8c3
 EBUILD go-9999.ebuild 4798 BLAKE2B 50daca174e8bc89f747432e96bc7d66e6c7dd50320d0b4c97754bb90267d62b700d34c250a892fdf60c907fa5eb881dd7adb3e64eba7ceb240740bd90c399f83 SHA512 051671c9a99efe554f9ed66423a20d053546ba68fdbf8a900e4ef0a365622bf8fcc976c678e393ade4a5475e01ccc53668d61d98e1b976e69de030662498273a
 MISC metadata.xml 590 BLAKE2B 56da63bdc350df5c6ef3b511a386627f4020f655027ca88da6a83ecb09581d3c3055c836eb8fe98a383412b3d431a77a9935ad753fe2d8392afa37cd613c15b0 SHA512 5d78adbae30c3a805194567bbb1af2ad59b78487819e7841a040d2a4d5db02f5b5d1d58f7cfc7a37f39e5e9bcf332dda4d336456e33e36c33caef792ac45d48b
diff --git a/dev-lang/go/go-1.19.9.ebuild b/dev-lang/go/go-1.19.9.ebuild
new file mode 100644
index 000000000000..425573ed2f88
--- /dev/null
+++ b/dev-lang/go/go-1.19.9.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* ~amd64 arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		;;
+	esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://go.dev"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="abi_mips_o32 abi_mips_n64 cpu_flags_x86_sse2"
+
+RDEPEND="
+arm? ( sys-devel/binutils[gold] )
+arm64? ( sys-devel/binutils[gold] )"
+BDEPEND="|| (
+		dev-lang/go
+		dev-lang/go-bootstrap )"
+
+# the *.syso files have writable/executable stacks
+QA_EXECSTACK='*.syso'
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# This package triggers "unrecognized elf file(s)" notices on riscv.
+# https://bugs.gentoo.org/794046
+QA_PREBUILT='.*'
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+	CONTRIBUTING.md
+	PATENTS
+	README.md
+	SECURITY.md
+)
+
+go_arch() {
+	# By chance most portage arch names match Go
+	local tc_arch=$(tc-arch $@)
+	case "${tc_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		loong)	echo loong64;;
+		mips) if use abi_mips_o32; then
+				[[ $(tc-endian $@) = big ]] && echo mips || echo mipsle
+			elif use abi_mips_n64; then
+				[[ $(tc-endian $@) = big ]] && echo mips64 || echo mips64le
+			fi ;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		riscv) echo riscv64 ;;
+		s390) echo s390x ;;
+		*)		echo "${tc_arch}";;
+	esac
+}
+
+go_arm() {
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os() {
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple() {
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile() {
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+src_compile() {
+	if has_version -b dev-lang/go; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
+	elif has_version -b dev-lang/go-bootstrap; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
+	else
+		eerror "Go cannot be built without go or go-bootstrap installed"
+		die "Should not be here, please report a bug"
+	fi
+
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="${PWD}"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	use arm && export GOARM=$(go_arm)
+	use x86 && export GO386=$(usex cpu_flags_x86_sse2 '' 'softfloat')
+
+	cd src
+	bash -x ./make.bash || die "build failed"
+}
+
+src_test() {
+	go_cross_compile && return 0
+
+	cd src
+
+	# https://github.com/golang/go/issues/42005
+	rm cmd/link/internal/ld/fallocate_test.go || true
+
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+	cd ..
+	rm -fr pkg/*_race || die
+	rm -fr pkg/obj/go-build || die
+}
+
+src_install() {
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# The use of cp is deliberate in order to retain permissions
+	# [1] https://golang.org/issue/2775
+	dodir /usr/lib/go
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	einstalldocs
+
+	# testdata directories are not needed on the installed system
+	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+
+	local bin_path
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	local f x
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+
+	# install the @golang-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/go-sets.conf go.conf
+}
+
+pkg_postinst() {
+	[[ -z ${REPLACING_VERSIONS} ]] && return
+	elog "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
+	elog "all packages compiled with previous versions of ${CATEGORY}/${PN}"
+	elog "due to the static linking nature of go."
+	elog "If this is not done, the packages compiled with the older"
+	elog "version of the compiler will not be updated until they are"
+	elog "updated individually, which could mean they will have"
+	elog "vulnerabilities."
+	elog "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
+	elog "See https://bugs.gentoo.org/752153 for more info"
+}
diff --git a/dev-lang/go/go-1.20.4.ebuild b/dev-lang/go/go-1.20.4.ebuild
new file mode 100644
index 000000000000..425573ed2f88
--- /dev/null
+++ b/dev-lang/go/go-1.20.4.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* ~amd64 arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		;;
+	esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://go.dev"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="abi_mips_o32 abi_mips_n64 cpu_flags_x86_sse2"
+
+RDEPEND="
+arm? ( sys-devel/binutils[gold] )
+arm64? ( sys-devel/binutils[gold] )"
+BDEPEND="|| (
+		dev-lang/go
+		dev-lang/go-bootstrap )"
+
+# the *.syso files have writable/executable stacks
+QA_EXECSTACK='*.syso'
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# This package triggers "unrecognized elf file(s)" notices on riscv.
+# https://bugs.gentoo.org/794046
+QA_PREBUILT='.*'
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+	CONTRIBUTING.md
+	PATENTS
+	README.md
+	SECURITY.md
+)
+
+go_arch() {
+	# By chance most portage arch names match Go
+	local tc_arch=$(tc-arch $@)
+	case "${tc_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		loong)	echo loong64;;
+		mips) if use abi_mips_o32; then
+				[[ $(tc-endian $@) = big ]] && echo mips || echo mipsle
+			elif use abi_mips_n64; then
+				[[ $(tc-endian $@) = big ]] && echo mips64 || echo mips64le
+			fi ;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		riscv) echo riscv64 ;;
+		s390) echo s390x ;;
+		*)		echo "${tc_arch}";;
+	esac
+}
+
+go_arm() {
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os() {
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple() {
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile() {
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+src_compile() {
+	if has_version -b dev-lang/go; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
+	elif has_version -b dev-lang/go-bootstrap; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
+	else
+		eerror "Go cannot be built without go or go-bootstrap installed"
+		die "Should not be here, please report a bug"
+	fi
+
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="${PWD}"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	use arm && export GOARM=$(go_arm)
+	use x86 && export GO386=$(usex cpu_flags_x86_sse2 '' 'softfloat')
+
+	cd src
+	bash -x ./make.bash || die "build failed"
+}
+
+src_test() {
+	go_cross_compile && return 0
+
+	cd src
+
+	# https://github.com/golang/go/issues/42005
+	rm cmd/link/internal/ld/fallocate_test.go || true
+
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+	cd ..
+	rm -fr pkg/*_race || die
+	rm -fr pkg/obj/go-build || die
+}
+
+src_install() {
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# The use of cp is deliberate in order to retain permissions
+	# [1] https://golang.org/issue/2775
+	dodir /usr/lib/go
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	einstalldocs
+
+	# testdata directories are not needed on the installed system
+	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+
+	local bin_path
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	local f x
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+
+	# install the @golang-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/go-sets.conf go.conf
+}
+
+pkg_postinst() {
+	[[ -z ${REPLACING_VERSIONS} ]] && return
+	elog "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
+	elog "all packages compiled with previous versions of ${CATEGORY}/${PN}"
+	elog "due to the static linking nature of go."
+	elog "If this is not done, the packages compiled with the older"
+	elog "version of the compiler will not be updated until they are"
+	elog "updated individually, which could mean they will have"
+	elog "vulnerabilities."
+	elog "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
+	elog "See https://bugs.gentoo.org/752153 for more info"
+}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 6ab442cb91b7..cbfdc7bbebbb 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -11,24 +11,17 @@ AUX php-iodbc-header-location.patch 481 BLAKE2B 9ea6a5d529dc7a8c78eeee800900372b
 AUX php80-firebird-warnings.patch 1949 BLAKE2B ab1b693afe26b6529aab8628f9a614478c388ed23603ad1dd4d17b63154d535a3e4c2db04fe27fb22a3d7e1335e368ffd383ed24647ac53ac05170ec3e1beb75 SHA512 d37815ea529167d4959aef056a3a0be6902ee4cda809a48c24299b05ff6477ee82e8ed8dcf49051b8e74ba5c31e3985454591ea751d4550df3d2e3639ec0d616
 DIST php-7.4.33.tar.xz 10420144 BLAKE2B e75817e79c698628c873c90afb3b5677480d03ecf07e8f2e26a062bc5b91affc6079e792e864f28cf12d45f86e5d01ede289ecdcefc06477986d193d22c982ef SHA512 499b63b99e5d8e8082ff89d3a91b4cb9a593ea7553b96e48863414c13d2e50275904ed29070e2232e529ee91160f505e6060a4d129cb5bf098aa5b6ea0928d3d
 DIST php-8.0.25.tar.xz 10802888 BLAKE2B c1f283613c43551cccd52955deaae364781fffd4f73befa5e103211ed2b972272189973639d840ef1839b038e1872a6a28424939ea133f0bf86d82b56bb591fb SHA512 43bb0637e424e2a637e05f3faf0ca2c5309f2d9cc03def9fc9af9b756003ea6efe730b608c70177c3c1b9cb03cef31c27cd6507cca9d9f0fd854aadb5e51aee3
-DIST php-8.0.27.tar.xz 10802096 BLAKE2B 343a05759a074b746a38578f5fa88382ad91f44f23aee65a7a9b54fa80e991c944b61c6d5979710516a795506dcc8a2c628997e222981ae99bcdfad47afb606d SHA512 443d4fe5d3165e2806e6ce03356f38b1d70fb4c86054f10b22e62191d5961bb51b10a31c49f3d74e6360836254db3107a8910589966481ebc7f5e06886b5e026
 DIST php-8.0.28.tar.xz 10801568 BLAKE2B de03f5ad262e830c70d24b9e2dd997897e5613d8bbc998ab7e59df703db89d587c6c8955e6f82f0cf6630eed82f33e21567ccf7a873ca07f4d0659f7bf4bd974 SHA512 d66e41cdccc332fccaf03bb24356652b17be5267cba5a47d80f1b74732b674f6a23c91e4a151ca442e629de8e8bcf6daecf0b34cbcbc9e33f53b8da9f06dc6b9
 DIST php-8.1.12.tar.xz 11747176 BLAKE2B 0505794826fb0fc92b04be5f7162af8aa92d782bb228243348d85b46866cd47089fcb7febd6886a8179babf64cb227bcdbf5d5f60d44dfefe1c947a3a708e3c1 SHA512 437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907
-DIST php-8.1.14.tar.xz 11752004 BLAKE2B 5ba60621c641b25c2d8ab0c82e97d59131587718c75cc013dc4ba1ad68e668e7f86b67f01f02c434e65c8a9075581a7f2decb2b8c3706e325e25e9f717cdfd82 SHA512 75a5dc3b0490cd8105d4f6c5446522b38953d78fe7b568798db749740f365c818b251d86aba72f5e555c5fe4e4a28e352a9510803bf3cdfe37d125824ae84d61
 DIST php-8.1.16.tar.xz 11760948 BLAKE2B ac0d352dae05115197852092b9b3c0b5091528326806c70eb34e0aba6007f718e927e67045d65976cb2104e4737a475b2224d4f05ff89ddf8c3066e0240c38e1 SHA512 4515da38803272abfafb069d1684c66dbb5086987b148c48dd7d8acf8f5316d255cf321ec57d6fbffe914a35551a533446ac13c34bb7c984e0d109247e8e64da
 DIST php-8.1.18.tar.xz 11782240 BLAKE2B fc3355e34427198d87c51aaa5d5f02cb590859892d3d04fe067af555c7ad4e1e6908836faf534c29c720d2b9cfee1f3ed9de559d49902edef45520955d6c7f81 SHA512 e30dba23ab8711a04c21ad040d69807f479760a20f363fe3f91a297e9e6463d9558299b15231e00e2b1c95d03309e03bde8cbbe4043fce3e1b965236ece1d0f3
-DIST php-8.2.4.tar.xz 11991796 BLAKE2B 4e1aa90472e2dbacb23f95736c399ac2b0f6e9577f58b502c26b5a2731b7c1eabb34bbdb75a13a5903870937a063ef8f321bf22bb23a74404592542186065ff6 SHA512 997435f3f921f305147a520497c68031aad6d1212365ddf04674d919fd2787d169d2898536a59709b5530857c5746a25cf43e726a2c3a30bcf3372107b2cd388
 DIST php-8.2.5.tar.xz 12001192 BLAKE2B 9c404801a9c3fefcc5bf166de257617e5fb34e76a01147e7778ebf09a97e2499f79fec1f4e7ee1945aa8083f8e7a33acbd4d9cdecdf215cb9dcb240c927d6c22 SHA512 ae8aac35a58b342fbfb725044eecdb1065690c461b26e4225445bda3a1719e43eacc4ad5536ccce326cf56a18c20d424b85b1a53277100c7186fc4d54b2d77f0
-EBUILD php-7.4.33-r1.ebuild 21423 BLAKE2B 8dd66cd6b064ac0fd5b4157a37e819cccde4a2e40e3185624e73b1d5e1c0acc9efbb62c3da887942fd7e5813953a75b5e64baee72844fbb5e7b82c44148227d7 SHA512 5ade5f1bded3433579af049bc70a8bacecfda257efbb1165133033ed8f2b68a6ed6adc0479a6d9ec6abf6ec291d81f41fc4cf6bd29d894c94d86c20b2d53f908
 EBUILD php-7.4.33-r2.ebuild 21559 BLAKE2B 67c3ed1964c4d84ba6ddd1a8f5d65d4037c150c951700ac62583bfa7330bf096f7dea9f2ab35fa59826c16353b1d37fca2dc9a8db939c6b7031f05688f65d50d SHA512 b659397022e4c23bb9b41c86737496d159ba77b3dd5145ee30de33eacd5c34d1782c60e6ae1fff86d9f2974d7ca3f0be530e31dad65a8c65e6bbabc1da1e01e0
 EBUILD php-7.4.33.ebuild 21371 BLAKE2B 1a1f130cec31dac7fea7b6aa38473eb7ac19b1194c2c2a76023b09043261f73e516a3ba5d21d1da5e3354d6abf3ac606dfb2f27bc0fe1ab1aa162f7c05f95522 SHA512 4ffaae2b5e4724860c40d789f920a3e06455a0efe5ed5d628d74a7012aa57b352188bd577a8e4707ce01be9f3e26534ba1524dfbc4218a93927c6417277cc2e4
 EBUILD php-8.0.25.ebuild 21880 BLAKE2B 966f8b33f46767a4456686cd788f0b3c1b8fd4049f2022b1136a8530ef3a5021efb393db45de6ce60aa77ba029c384858838e576a6d2799808246fbc2645730f SHA512 2ba7d167b4075b89e6aac2feb387103ae3fca4dc0be4d6791d23995f4eeb1ca65941664374c52e48b07a8815ccdc7bf1c79b9f2da910bbae8c7c3c373b856ab5
-EBUILD php-8.0.27.ebuild 21885 BLAKE2B 45399d624d7a6e5563df67133e4bc770c97f79e26b498e2ff9bea3ed8715ceb61f138daccd5dcb9fc140c4712a0ff80c75db9ae1ed1f767a412b03f3209ff3dc SHA512 582a3231a3701b4e29338025d3e0bba5915b14eaff0940a0b88a9084dc7086ca559c917bc89770c2aef2c94767f4d94948f120aac854181abcf2dd64407c5fd0
 EBUILD php-8.0.28.ebuild 21883 BLAKE2B b0c23c162b11e652a57ec6218a26b6792baf81190168a6ac6c279d682bfa4a7a36b02598d063f9fd69f503bf463a97660b7c6ccdcfe637dc8a24cf097909f459 SHA512 2c8326ec110c74729a8daad7cfcb1a3c58d86ef741d6164e9248d68519dde26739e5c2c1bef89819fa641ed4c07f7566dfced4361ece573789a5752a3b9d9136
 EBUILD php-8.1.12.ebuild 21815 BLAKE2B c1610ff5a4e439954b228744cd0223a4205dd1b53e6cff7a48535db414b6d20d307ba1b31c96ea6ab60b2ed1f811eb612c80e245b49acdf9659a6f8b2bb94b08 SHA512 73b766c5dec9b7231f1149b279b47e8621e527bbce2e1606bafdf1e6cd3f647ca30b2fcd16e1d9c3160c4a50c464fdeefbd05e1102f9debe7b79abd68fbceb4d
-EBUILD php-8.1.14.ebuild 21820 BLAKE2B cda25e68ea7ea22d38db686ebb940f52d616ec7f72320ef66ad12a7768f6f484a72045577ce2d5e3e250d5065a278aa96496bb84ae7686a5b1edc8f057f52785 SHA512 315620f4d75fe120620c149a45b84917cac7b0ca3138797a0894f9ad3907d8cfc73fb18e0233ab2b3f3891771c2aac585a2d2b6d04995129923936e132f7dd45
 EBUILD php-8.1.16.ebuild 21818 BLAKE2B 1782dc5c71cef2ac3ca067f4d53fcf64e61850044384dfe9bc0e64a025ab1dcf328a455b2aadbd17dd8c92cc65029337598763e3644f488122cde39a913d3343 SHA512 2215fb5851cfd28ffff620ffe86b0d924f61e9a24ff724fa019be7c788fb7de3c53f23489d21553fd81670887cd463b959f9f9857a53cc872e72f70478e330d9
-EBUILD php-8.1.18.ebuild 21865 BLAKE2B 678c8f65ad61230798ecf3626d5721700d2329bb85838ba537597817fd8ae6500f201f5fd1a5ecd96183e2d655c93f450e9a15060ca176bf62ef502fa5c19f51 SHA512 0396b11714958b3153471a0b4a4dde98279878147ea0cc632607ffab26753f7f7f5cbb35bee377d719c50729e07d5e821f921a1796260f226d4de5e9c6244910
-EBUILD php-8.2.4.ebuild 21938 BLAKE2B 961781609a864080f2a53f834ab59522bd8b61af484188fb770a24b482890aed9c3c04dbe7fd9b5717c2f6072653b2439572c0451eb64ba51e96149961308fe8 SHA512 0c1a248916133b760585f6622708c5abd0a5defe8a5c3018ff418b65c7399e9c96acb936d0fee85c0cfb15b9624f25b841dac64d3d163faabc9edc15dab8c649
-EBUILD php-8.2.5.ebuild 21981 BLAKE2B b22900e8aa5c1a424acac7856ddbf54bbf3221a28f16bc90d61ee93ab5c2edd3dd467a192ebf1cb9469daa5d66b8668202687b947b8f369aa21239d7a9898295 SHA512 3e692a301efa542d78d22154575d03c750d39355ad4685d90b29589f23d35550073fd885b66403f00e31b420c9942583a6ad30e8e5257ce2a13c48bbd4d82b45
-MISC metadata.xml 3940 BLAKE2B 30345df2362f848bcb46aae1822d7c70716bb45348b25a75a3d19acf450d777c247445bb24eb8a17f5bf72758894a2d2ebfe05e9256dbe4aad7459b0fe3c1db1 SHA512 e5d9f6281cab122b3239fb694344b8ff5ae0c30da4bb9ed92594d1cf70bf82ddfe6816db3ee0326adfa471f5aec508ab0a7284fc3efab98dfc73fcc6770551ef
+EBUILD php-8.1.18-r1.ebuild 21949 BLAKE2B bade18fc56eddf467ef96b77d932673bbac81ef3c34d1075af998b78a89f6bec107adca6abe63d8b9c915f5a75c30fe7b9b735e7e98d1449a91359c964c8a90d SHA512 d5eee5a0898a3706bc71287722e9792713833a386adead7d5a2f975f487d81ecb6a32456630702aa659a419243f5a0075d21acc89d097c442a16d1a5409e3ee7
+EBUILD php-8.2.5-r1.ebuild 22056 BLAKE2B e97f7984e46f09ba39ae473b4475e040ff52ee88d6c4f6e09e5eb3e971be1e930d25a9c2323cc33ae56cdac4dc383cd71caa6f060eaaccd799128ccb9f17e2d2 SHA512 d4684b697ea16b008d2fd0f44ac5a2b5bed400704b594b31229ffef392e58734f6d9d106a7dabcd3115dac7012484c98c9c4d8a894d683f7479fc3596417ae82
+MISC metadata.xml 4018 BLAKE2B a2413be53cf35069736693b31b2ef8d4277c25c1cb4ea75d949e3a50809e77b9fae2dceeb8a71bcd0ea4c74131cfcaeaefa09ca67f312bd7eb934c2e07156502 SHA512 ba8385d8596d5e71d6b5cc7e225d2afbbed0cde36ea1b49a43efd16c03141d63baa26b440ddfeb39dea04313467077353c5ac6b8b75307bb64ea0c09fe456933
diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
index 7143eef2004b..5783b3b852f7 100644
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@@ -17,6 +17,9 @@
     <flag name="argon2">
       Enable password hashing algorithm from <pkg>app-crypt/argon2</pkg>
     </flag>
+    <flag name="avif">
+      Enable AVIF support in bundled libgd
+    </flag>
     <flag name="bcmath">
       Enable the BCMath Arbitrary Precision Mathematics extension
     </flag>
diff --git a/dev-lang/php/php-7.4.33-r1.ebuild b/dev-lang/php/php-7.4.33-r1.ebuild
deleted file mode 100644
index 85374241ad90..000000000000
--- a/dev-lang/php/php-7.4.33-r1.ebuild
+++ /dev/null
@@ -1,750 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic systemd autotools
-
-MY_PV=${PV/_rc/RC}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
-	enchant exif ffi +fileinfo +filter firebird
-	+flatfile ftp gd gdbm gmp +iconv imap inifile
-	intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-# The Oracle instant client provides its own incompatible ldap library.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	!cli? ( ?? ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	xmlrpc? ( xml iconv )
-	xmlreader? ( xml )
-	xmlwriter? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	oci8-instant-client? ( !ldap )
-	qdbm? ( !gdbm )
-	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
-	firebird? ( pdo )
-	mssql? ( pdo )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre2-10.30[jit?,unicode]
-	fpm? ( acl? ( sys-apps/acl ) )
-	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
-	argon2? ( app-crypt/argon2:= )
-	berkdb? ( || (  sys-libs/db:5.3 sys-libs/db:4.8 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( <app-text/enchant-2.0:0 )
-	ffi? ( >=dev-libs/libffi-3.0.11:= )
-	firebird? ( dev-db/firebird )
-	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( net-libs/c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11:= )
-	ldap-sasl? ( dev-libs/cyrus-sasl )
-	libedit? ( dev-libs/libedit )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
-	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	session-mm? ( dev-libs/mm )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	sodium? ( dev-libs/libsodium:=[-minimal] )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-1.0.1:0= <dev-libs/openssl-3.0 )
-	tidy? ( app-text/htmltidy )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.7.6 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt )
-	zip? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-PHP_MV="$(ver_cut 1)"
-
-PATCHES=(
-	"${FILESDIR}"/php-iodbc-header-location.patch
-	"${FILESDIR}"/bug81656-gcc-11.patch
-	"${FILESDIR}"/php-7.4.33-CVE-2022-31631.patch
-)
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "../ext/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Emulate buildconf to support cross-compilation
-	rm -fr aclocal.m4 autom4te.cache config.cache \
-		configure main/php_config.h.in || die
-	eautoconf --force
-	eautoheader
-}
-
-src_configure() {
-	filter-lto # bug 855644
-
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		--without-valgrind
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_enable bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype)
-		$(use_with curl)
-		$(use_enable xml dom)
-		$(use_with enchant)
-		$(use_enable exif)
-		$(use_with ffi)
-		$(use_enable fileinfo)
-		$(use_enable filter)
-		$(use_enable ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl)
-		$(use_enable ipv6)
-		$(use_enable json)
-		$(use_with kerberos)
-		$(use_with xml libxml)
-		$(use_enable unicode mbstring)
-		$(use_with ssl openssl)
-		$(use_enable pcntl)
-		$(use_enable phar)
-		$(use_enable pdo)
-		$(use_enable opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_enable simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap)
-		$(use_enable sockets)
-		$(use_with sodium)
-		$(use_with sqlite sqlite3)
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer)
-		$(use_enable xml)
-		$(use_enable xmlreader)
-		$(use_enable xmlwriter)
-		$(use_with xmlrpc)
-		$(use_with xslt xsl)
-		$(use_with zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype)
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg)
-		$(use_with xpm)
-		$(use_with webp)
-	)
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_enable gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl)
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	if use odbc && use iodbc ; then
-		our_conf+=(
-			--without-unixODBC
-			--with-iodbc
-			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
-		)
-	elif use odbc ; then
-		our_conf+=(
-			--with-unixODBC="${EPREFIX}/usr"
-			--without-iodbc
-			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
-		)
-	else
-		our_conf+=(
-			--without-unixODBC
-			--without-iodbc
-			--without-pdo-odbc
-		)
-	fi
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite)
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit)
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-external-pcre affects ext/pcre
-	our_conf+=(
-		--with-external-pcre
-		$(use_with jit pcre-jit)
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	local one_sapi
-	local sapi
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	local sapi
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi="", sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						# Install the "phar" archive utility.
-						if use phar ; then
-							emake INSTALL_ROOT="${D}" install-pharcmd
-							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
-						fi
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	local m
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-8.0.27.ebuild b/dev-lang/php/php-8.0.27.ebuild
deleted file mode 100644
index 7f91462eb149..000000000000
--- a/dev-lang/php/php-8.0.27.ebuild
+++ /dev/null
@@ -1,759 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic systemd autotools
-
-MY_PV=${PV/_rc/rc}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
-	enchant exif ffi +fileinfo +filter firebird
-	+flatfile ftp gd gdbm gmp +iconv imap inifile
-	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
-	+xml xmlreader xmlwriter xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-# The Oracle instant client provides its own incompatible ldap library.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	!cli? ( ?? ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	xmlreader? ( xml )
-	xmlwriter? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	oci8-instant-client? ( !ldap )
-	qdbm? ( !gdbm )
-	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
-	firebird? ( pdo )
-	mssql? ( pdo )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
-	>=dev-libs/libpcre2-10.30[jit?,unicode]
-	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) )
-	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
-	argon2? ( app-crypt/argon2:= )
-	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	curl? ( >=net-misc/curl-7.29.0 )
-	enchant? ( app-text/enchant:2 )
-	ffi? ( >=dev-libs/libffi-3.0.11:= )
-	firebird? ( dev-db/firebird )
-	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( net-libs/c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11:= )
-	ldap-sasl? ( dev-libs/cyrus-sasl )
-	libedit? ( dev-libs/libedit )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
-	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
-	postgres? ( >=dev-db/postgresql-9.1:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	session-mm? ( dev-libs/mm )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	sodium? ( dev-libs/libsodium:=[-minimal] )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-1.0.1:0= <dev-libs/openssl-3.0 )
-	tidy? ( app-text/htmltidy )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.9.0 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt )
-	zip? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-PHP_MV="$(ver_cut 1)"
-
-PATCHES=(
-	"${FILESDIR}/php-iodbc-header-location.patch"
-	"${FILESDIR}/php80-firebird-warnings.patch"
-)
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "../ext/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Emulate buildconf to support cross-compilation
-	rm -fr aclocal.m4 autom4te.cache config.cache \
-		configure main/php_config.h.in || die
-	eautoconf --force
-	eautoheader
-
-	# Remove false positive test failures
-	# stream_isatty fails due to portage redirects
-	# curl tests here fail for network sandbox issues
-	# session tests here fail because we set the session directory to $T
-	rm tests/output/stream_isatty_err.phpt \
-	   tests/output/stream_isatty_out-err.phpt \
-	   tests/output/stream_isatty_out.phpt \
-	   ext/curl/tests/bug76675.phpt \
-	   ext/curl/tests/bug77535.phpt \
-	   ext/curl/tests/curl_error_basic.phpt \
-	   ext/session/tests/bug74514.phpt \
-	   ext/session/tests/bug74936.phpt || die
-
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		--without-valgrind
-		$(use_enable threads zts)
-	)
-
-	our_conf+=(
-		$(use_with apparmor fpm-apparmor)
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_enable bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype)
-		$(use_with curl)
-		$(use_enable xml dom)
-		$(use_with enchant)
-		$(use_enable exif)
-		$(use_with ffi)
-		$(use_enable fileinfo)
-		$(use_enable filter)
-		$(use_enable ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl)
-		$(use_enable ipv6)
-		$(use_with kerberos)
-		$(use_with xml libxml)
-		$(use_enable unicode mbstring)
-		$(use_with ssl openssl)
-		$(use_enable pcntl)
-		$(use_enable phar)
-		$(use_enable pdo)
-		$(use_enable opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_enable simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap)
-		$(use_enable sockets)
-		$(use_with sodium)
-		$(use_with sqlite sqlite3)
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer)
-		$(use_enable xml)
-		$(use_enable xmlreader)
-		$(use_enable xmlwriter)
-		$(use_with xslt xsl)
-		$(use_with zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype)
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg)
-		$(use_with xpm)
-		$(use_with webp)
-	)
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_enable gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl)
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	if use odbc && use iodbc ; then
-		our_conf+=(
-			--without-unixODBC
-			--with-iodbc
-			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
-		)
-	elif use odbc ; then
-		our_conf+=(
-			--with-unixODBC="${EPREFIX}/usr"
-			--without-iodbc
-			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
-		)
-	else
-		our_conf+=(
-			--without-unixODBC
-			--without-iodbc
-			--without-pdo-odbc
-		)
-	fi
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite)
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit)
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-external-pcre affects ext/pcre
-	our_conf+=(
-		--with-external-pcre
-		$(use_with jit pcre-jit)
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	local one_sapi
-	local sapi
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	local sapi
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi="", sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						# Install the "phar" archive utility.
-						if use phar ; then
-							emake INSTALL_ROOT="${D}" install-pharcmd
-							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
-						fi
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	SKIP_ONLINE_TESTS=1 REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	local m
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-8.1.14.ebuild b/dev-lang/php/php-8.1.14.ebuild
deleted file mode 100644
index 41fbdffdc673..000000000000
--- a/dev-lang/php/php-8.1.14.ebuild
+++ /dev/null
@@ -1,757 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic systemd autotools
-
-MY_PV=${PV/_rc/RC}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
-	enchant exif ffi +fileinfo +filter firebird
-	+flatfile ftp gd gdbm gmp +iconv imap inifile
-	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
-	+xml xmlreader xmlwriter xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-# The Oracle instant client provides its own incompatible ldap library.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	!cli? ( ?? ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	xmlreader? ( xml )
-	xmlwriter? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	oci8-instant-client? ( !ldap )
-	qdbm? ( !gdbm )
-	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
-	firebird? ( pdo )
-	mssql? ( pdo )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
-	>=dev-libs/libpcre2-10.30[jit?,unicode]
-	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) )
-	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
-	argon2? ( app-crypt/argon2:= )
-	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	curl? ( >=net-misc/curl-7.29.0 )
-	enchant? ( app-text/enchant:2 )
-	ffi? ( >=dev-libs/libffi-3.0.11:= )
-	firebird? ( dev-db/firebird )
-	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( net-libs/c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11:= )
-	ldap-sasl? ( dev-libs/cyrus-sasl )
-	libedit? ( dev-libs/libedit )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
-	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
-	postgres? ( >=dev-db/postgresql-9.1:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	session-mm? ( dev-libs/mm )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	sodium? ( dev-libs/libsodium:=[-minimal] )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-1.0.2:0= )
-	tidy? ( app-text/htmltidy )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.9.0 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt )
-	zip? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-IDEPEND=">=app-eselect/eselect-php-0.9.7[apache2?,fpm?]"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-PHP_MV="$(ver_cut 1)"
-
-PATCHES=(
-	"${FILESDIR}/php-iodbc-header-location.patch"
-)
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "../ext/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Emulate buildconf to support cross-compilation
-	rm -fr aclocal.m4 autom4te.cache config.cache \
-		configure main/php_config.h.in || die
-	eautoconf --force
-	eautoheader
-
-	# Remove false positive test failures
-	# stream_isatty fails due to portage redirects
-	# curl tests here fail for network sandbox issues
-	# session tests here fail because we set the session directory to $T
-	rm tests/output/stream_isatty_err.phpt \
-	   tests/output/stream_isatty_out-err.phpt \
-	   tests/output/stream_isatty_out.phpt \
-	   ext/curl/tests/bug76675.phpt \
-	   ext/curl/tests/bug77535.phpt \
-	   ext/curl/tests/curl_error_basic.phpt \
-	   ext/session/tests/bug74514.phpt \
-	   ext/session/tests/bug74936.phpt || die
-
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		--without-valgrind
-		$(use_enable threads zts)
-	)
-
-	our_conf+=(
-		$(use_with apparmor fpm-apparmor)
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_enable bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype)
-		$(use_with curl)
-		$(use_enable xml dom)
-		$(use_with enchant)
-		$(use_enable exif)
-		$(use_with ffi)
-		$(use_enable fileinfo)
-		$(use_enable filter)
-		$(use_enable ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl)
-		$(use_enable ipv6)
-		$(use_with kerberos)
-		$(use_with xml libxml)
-		$(use_enable unicode mbstring)
-		$(use_with ssl openssl)
-		$(use_enable pcntl)
-		$(use_enable phar)
-		$(use_enable pdo)
-		$(use_enable opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_enable simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap)
-		$(use_enable sockets)
-		$(use_with sodium)
-		$(use_with sqlite sqlite3)
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer)
-		$(use_enable xml)
-		$(use_enable xmlreader)
-		$(use_enable xmlwriter)
-		$(use_with xslt xsl)
-		$(use_with zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype)
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg)
-		$(use_with xpm)
-		$(use_with webp)
-	)
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_enable gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl)
-		)
-	fi
-
-	# MySQL support
-	our_conf+=( $(use_with mysqli mysqli "mysqlnd") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	if use odbc && use iodbc ; then
-		our_conf+=(
-			--without-unixODBC
-			--with-iodbc
-			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
-		)
-	elif use odbc ; then
-		our_conf+=(
-			--with-unixODBC="${EPREFIX}/usr"
-			--without-iodbc
-			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
-		)
-	else
-		our_conf+=(
-			--without-unixODBC
-			--without-iodbc
-			--without-pdo-odbc
-		)
-	fi
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "mysqlnd")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite)
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit)
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-external-pcre affects ext/pcre
-	our_conf+=(
-		--with-external-pcre
-		$(use_with jit pcre-jit)
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	local one_sapi
-	local sapi
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	local sapi
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi="", sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						# Install the "phar" archive utility.
-						if use phar ; then
-							emake INSTALL_ROOT="${D}" install-pharcmd
-							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
-						fi
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	SKIP_ONLINE_TESTS=1 REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	local m
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-8.1.18.ebuild b/dev-lang/php/php-8.1.18-r1.ebuild
index 7a0c8ba9fcf7..c0e72501cd78 100644
--- a/dev-lang/php/php-8.1.18.ebuild
+++ b/dev-lang/php/php-8.1.18-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 WANT_AUTOMAKE="none"
 
-inherit flag-o-matic systemd autotools
+inherit flag-o-matic multilib systemd autotools
 
 MY_PV=${PV/_rc/RC}
 DESCRIPTION="The PHP language runtime engine"
@@ -33,8 +33,8 @@ IUSE="${IUSE}
 	${SAPIS/cli/+cli}
 	threads"
 
-IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
+IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar
+	cdb cjk coverage +ctype curl debug
 	enchant exif ffi +fileinfo +filter firebird
 	+flatfile ftp gd gdbm gmp +iconv imap inifile
 	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
@@ -49,6 +49,7 @@ IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
 # The Oracle instant client provides its own incompatible ldap library.
 REQUIRED_USE="
 	|| ( cli cgi fpm apache2 embed phpdbg )
+	avif? ( gd zlib )
 	cli? ( ^^ ( readline libedit ) )
 	!cli? ( ?? ( readline libedit ) )
 	truetype? ( gd zlib )
@@ -82,6 +83,7 @@ COMMON_DEPEND="
 	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) )
 	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
 	argon2? ( app-crypt/argon2:= )
+	avif? ( media-libs/libavif:= )
 	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
 	bzip2? ( app-arch/bzip2:0= )
 	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
@@ -262,6 +264,7 @@ src_configure() {
 	our_conf+=(
 		$(use_with apparmor fpm-apparmor)
 		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_with avif)
 		$(use_enable bcmath)
 		$(use_with bzip2 bz2 "${EPREFIX}/usr")
 		$(use_enable calendar)
diff --git a/dev-lang/php/php-8.2.4.ebuild b/dev-lang/php/php-8.2.4.ebuild
deleted file mode 100644
index bb2d5ee06588..000000000000
--- a/dev-lang/php/php-8.2.4.ebuild
+++ /dev/null
@@ -1,759 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic multilib systemd autotools
-
-MY_PV=${PV/_rc/RC}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-#SRC_URI="https://downloads.php.net/~pierrick/php-${MY_PV}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
-	enchant exif ffi +fileinfo +filter firebird
-	+flatfile ftp gd gdbm gmp +iconv imap inifile
-	intl iodbc +jit kerberos ldap ldap-sasl libedit lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
-	+xml xmlreader xmlwriter xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-# The Oracle instant client provides its own incompatible ldap library.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	!cli? ( ?? ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	xmlreader? ( xml )
-	xmlwriter? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	oci8-instant-client? ( !ldap )
-	qdbm? ( !gdbm )
-	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
-	firebird? ( pdo )
-	mssql? ( pdo )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
-	>=dev-libs/libpcre2-10.30[jit?,unicode]
-	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) )
-	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
-	argon2? ( app-crypt/argon2:= )
-	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	curl? ( >=net-misc/curl-7.29.0 )
-	enchant? ( app-text/enchant:2 )
-	ffi? ( >=dev-libs/libffi-3.0.11:= )
-	firebird? ( dev-db/firebird )
-	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( net-libs/c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11:= )
-	ldap-sasl? ( dev-libs/cyrus-sasl )
-	libedit? ( dev-libs/libedit )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
-	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
-	postgres? ( >=dev-db/postgresql-9.1:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	session-mm? ( dev-libs/mm )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	sodium? ( dev-libs/libsodium:=[-minimal] )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-1.0.2:0= )
-	tidy? ( app-text/htmltidy )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.9.0 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt )
-	zip? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-IDEPEND=">=app-eselect/eselect-php-0.9.7[apache2?,fpm?]"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-PHP_MV="$(ver_cut 1)"
-
-PATCHES=(
-	"${FILESDIR}/php-iodbc-header-location.patch"
-)
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "../ext/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Emulate buildconf to support cross-compilation
-	rm -fr aclocal.m4 autom4te.cache config.cache \
-		configure main/php_config.h.in || die
-	eautoconf --force
-	eautoheader
-
-	# Remove false positive test failures
-	# stream_isatty fails due to portage redirects
-	# curl tests here fail for network sandbox issues
-	# session tests here fail because we set the session directory to $T
-	rm tests/output/stream_isatty_err.phpt \
-	   tests/output/stream_isatty_out-err.phpt \
-	   tests/output/stream_isatty_out.phpt \
-	   ext/curl/tests/bug76675.phpt \
-	   ext/curl/tests/bug77535.phpt \
-	   ext/curl/tests/curl_error_basic.phpt \
-	   ext/session/tests/bug74514.phpt \
-	   ext/session/tests/bug74936.phpt || die
-
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		--without-valgrind
-		--enable-ipv6
-		$(use_enable threads zts)
-	)
-
-	our_conf+=(
-		$(use_with apparmor fpm-apparmor)
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_enable bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype)
-		$(use_with curl)
-		$(use_enable xml dom)
-		$(use_with enchant)
-		$(use_enable exif)
-		$(use_with ffi)
-		$(use_enable fileinfo)
-		$(use_enable filter)
-		$(use_enable ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl)
-		$(use_with kerberos)
-		$(use_with xml libxml)
-		$(use_enable unicode mbstring)
-		$(use_with ssl openssl)
-		$(use_enable pcntl)
-		$(use_enable phar)
-		$(use_enable pdo)
-		$(use_enable opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix)
-		$(use_with selinux fpm-selinux)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_enable simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap)
-		$(use_enable sockets)
-		$(use_with sodium)
-		$(use_with sqlite sqlite3)
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer)
-		$(use_enable xml)
-		$(use_enable xmlreader)
-		$(use_enable xmlwriter)
-		$(use_with xslt xsl)
-		$(use_with zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype)
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg)
-		$(use_with xpm)
-		$(use_with webp)
-	)
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_enable gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl)
-		)
-	fi
-
-	# MySQL support
-	our_conf+=( $(use_with mysqli) )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	if use odbc && use iodbc ; then
-		our_conf+=(
-			--without-unixODBC
-			--with-iodbc
-			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
-		)
-	elif use odbc ; then
-		our_conf+=(
-			--with-unixODBC="${EPREFIX}/usr"
-			--without-iodbc
-			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
-		)
-	else
-		our_conf+=(
-			--without-unixODBC
-			--without-iodbc
-			--without-pdo-odbc
-		)
-	fi
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "mysqlnd")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite)
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit)
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-external-pcre affects ext/pcre
-	our_conf+=(
-		--with-external-pcre
-		$(use_with jit pcre-jit)
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	local one_sapi
-	local sapi
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	local sapi
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi="", sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						# Install the "phar" archive utility.
-						if use phar ; then
-							emake INSTALL_ROOT="${D}" install-pharcmd
-							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
-						fi
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	SKIP_ONLINE_TESTS=1 REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	local m
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-8.2.5.ebuild b/dev-lang/php/php-8.2.5-r1.ebuild
index d8e80841110d..7da6cd162462 100644
--- a/dev-lang/php/php-8.2.5.ebuild
+++ b/dev-lang/php/php-8.2.5-r1.ebuild
@@ -34,8 +34,8 @@ IUSE="${IUSE}
 	${SAPIS/cli/+cli}
 	threads"
 
-IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
+IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar
+	cdb cjk coverage +ctype curl debug
 	enchant exif ffi +fileinfo +filter firebird
 	+flatfile ftp gd gdbm gmp +iconv imap inifile
 	intl iodbc +jit kerberos ldap ldap-sasl libedit lmdb
@@ -50,6 +50,7 @@ IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
 # The Oracle instant client provides its own incompatible ldap library.
 REQUIRED_USE="
 	|| ( cli cgi fpm apache2 embed phpdbg )
+	avif? ( gd zlib )
 	cli? ( ^^ ( readline libedit ) )
 	!cli? ( ?? ( readline libedit ) )
 	truetype? ( gd zlib )
@@ -83,6 +84,7 @@ COMMON_DEPEND="
 	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) )
 	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
 	argon2? ( app-crypt/argon2:= )
+	avif? ( media-libs/libavif:= )
 	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
 	bzip2? ( app-arch/bzip2:0= )
 	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
@@ -264,6 +266,7 @@ src_configure() {
 	our_conf+=(
 		$(use_with apparmor fpm-apparmor)
 		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_with avif)
 		$(use_enable bcmath)
 		$(use_with bzip2 bz2 "${EPREFIX}/usr")
 		$(use_enable calendar)
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index c6d27fc1f46a..f935a841c973 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest
index 8d625959f494..b9e64fdcc004 100644
--- a/dev-libs/c-blosc/Manifest
+++ b/dev-libs/c-blosc/Manifest
@@ -1,3 +1,5 @@
 DIST c-blosc-1.21.3.gh.tar.gz 1532077 BLAKE2B ff8ad36e4e34b245062025c5820655bb52fea40276e88a748253d5079c3b5f8662079f177835ab38aa6e58d87e7849a93d7e1289346fcc53c077ef85b7382462 SHA512 e9542aa2d1ebae9f6dcc12916d7ac3b920d771281ab96e2b2d59c2951e5f51d02d2684859b8823643d43d320613fb9dd8a3ea411ade34e66e323fcefa8165a91
+DIST c-blosc-1.21.4.gh.tar.gz 2458878 BLAKE2B 5b58e5069ed99e67adaef832871d45e4e3b88dede169833b07bb1800d35d6d43909c59645f79c003f9a80604e432c81f7d5da35fd19899fbb0378e81f015b0fa SHA512 cbe8406dc88318a582b6ea5e5ba1a25b66814f741743dd512b1a61664691977bfe0896baf24d2e998cdbb209a3ba83c6eb79e86bc1e7a2eb5ef2cde697e8eb65
 EBUILD c-blosc-1.21.3.ebuild 1186 BLAKE2B ed4ea2d818c43f159c7fd41800e46c193ef630f5339cf649c81fe9b50f12a81729aa3f16a4929f5bbd219c37efd126ababcec71808fbc644d93e72824b77fa68 SHA512 c2c417225de6ca5587e7a1ffa310e9e51ed8c98c5302e14228913466fa579af94ee0285ab52f403b82665be5df9c6b1d8c6ac5611ad90192f5f796d68ac764bb
+EBUILD c-blosc-1.21.4.ebuild 1192 BLAKE2B 08c145074df35833bd2fd9876d83bf4beb6145479d4f8dca7f6cfe5029c9ccee258fb533bf2bed69d35d3f766999c8928b4cbefff6f74ed16cb4196a85bd7dbe SHA512 83f17e05e91478c6cd2ea4566a3831909b778b2a731e3518865fba36c6d8ff9b1389279ad4f2e3f2d3af38ed54034ac790d93a5d6e51c244f5538e641e6701e6
 MISC metadata.xml 839 BLAKE2B 108d89a888ba31f03eb42a0717c7c9458d599cdb67cf98940c88ff943ce2079c736b6a52ac4206d4ceda17f56ea67e52dae1c77b304d39fbb9ec249a8ac38576 SHA512 f4ed6f93992492a98499ad1dff54b3fcd14e35710e0307041e606ddfff54769c5ed6ccd3ef90a5ce7943425bcee93ea9b46211f643da30d94db88adb6be7d5f8
diff --git a/dev-libs/c-blosc/c-blosc-1.21.4.ebuild b/dev-libs/c-blosc/c-blosc-1.21.4.ebuild
new file mode 100644
index 000000000000..a5c63c1a8c94
--- /dev/null
+++ b/dev-libs/c-blosc/c-blosc-1.21.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Blocking, shuffling and lossless compression library"
+HOMEPAGE="
+	https://www.blosc.org/
+	https://github.com/Blosc/c-blosc/
+"
+SRC_URI="
+	https://github.com/Blosc/c-blosc/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+lz4 +snappy test zlib zstd"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	lz4? ( >=app-arch/lz4-1.7.5:= )
+	snappy? ( app-arch/snappy:= )
+	zlib? ( sys-libs/zlib:= )
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+
+src_configure() {
+	# remove bundled libs (just in case)
+	rm -rf internal-complibs || die
+
+	local mycmakeargs=(
+		-DBUILD_STATIC=OFF
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_BENCHMARKS=OFF
+		-DBUILD_FUZZERS=OFF
+		-DDEACTIVATE_LZ4=$(usex !lz4)
+		-DDEACTIVATE_SNAPPY=$(usex !snappy)
+		-DDEACTIVATE_ZLIB=$(usex !zlib)
+		-DDEACTIVATE_ZSTD=$(usex !zstd)
+		-DPREFER_EXTERNAL_LZ4=ON
+		# snappy is always external
+		-DPREFER_EXTERNAL_ZLIB=ON
+		-DPREFER_EXTERNAL_ZSTD=ON
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/c-blosc2/Manifest b/dev-libs/c-blosc2/Manifest
index 1f24624fd715..af424bf7dee8 100644
--- a/dev-libs/c-blosc2/Manifest
+++ b/dev-libs/c-blosc2/Manifest
@@ -1,3 +1,5 @@
 DIST c-blosc2-2.6.1.gh.tar.gz 2365300 BLAKE2B a3fdc8798eb70e97791b7b708ef872142d38b9c4fdb8efc6d5da2010149fa61f4115f27af630a43edd5f351cb8693fbb79457f19ccf1a518f057902b93196b3d SHA512 9f5daa59d5191784ee91deb18ed15a3b36504b05061ca8b1532eaf8e402c793944059894b277843e8da19f00af05615e0865d9fdb80decd83aa07867b0e661a0
+DIST c-blosc2-2.9.1.gh.tar.gz 2793299 BLAKE2B 1853611566f081f5c6236ade1882b07aa6d596f65bb303823f418faaf0e971c1850e3e78ca501650880d4611110200c302896e81a5b13cdf05bc43c81b81dd3a SHA512 9430c026f9d7a98e38915e3d308402989073aa6fa1e8e1d5b9bdb155c70c5cc24ca118cdb5b3584647f72ae80a13be0a8467250af7ef336a1ac72eb8ec8a67f5
 EBUILD c-blosc2-2.6.1.ebuild 1391 BLAKE2B 2b44bfc10ec112298f66cbf8d681ff7396b37378c021d4c43492c6ec02a5483c3e04971b9c4d8aa21ec6fea0b96cefc7918c71dfef1381ef0daab64e2c400afc SHA512 bd4aee3783cc1fac740df283629054fdb83a5c98406b7f39efb9aff412aac0387a1adfbed9c3506e66bf5d826df2cddd89350a7b54fc15f8af91aeff53841fac
+EBUILD c-blosc2-2.9.1.ebuild 1394 BLAKE2B 8a147114436734249aee396ab2f0e0a57e84d741fa104baf21b88bd79daae253018e19713628eaa4caae86fa74c0dee7e3e9f9efd6ff14bae1f11ca2d4ae6778 SHA512 232708c46657997be859a9a1f545fc4235165a371633ae09dd4aac9e4a87bfab706741471904ff3e9537b4917c9ccb29fd1fb9b039667e12dd1bd8f83b8a01fa
 MISC metadata.xml 327 BLAKE2B 5fafd7f688780e7c5479d492da4943b9a95122d5c64e36e4415fe69a708f983f9463824981d771424c1c75f7236a159ef843738a0b31430ccd572770fbc5a74e SHA512 9d2aa06eb8e144bafe1c65b9c7704993633f9e1db629d77209e8c832e09de34c641d9f588cf208d8f5f65ff489c56f1e01ef573213439ba99678601d6a790ee0
diff --git a/dev-libs/c-blosc2/c-blosc2-2.9.1.ebuild b/dev-libs/c-blosc2/c-blosc2-2.9.1.ebuild
new file mode 100644
index 000000000000..1a7c40ef0f55
--- /dev/null
+++ b/dev-libs/c-blosc2/c-blosc2-2.9.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Blocking, shuffling and lossless compression library"
+HOMEPAGE="
+	https://www.blosc.org/c-blosc2/c-blosc2.html
+	https://github.com/Blosc/c-blosc2/
+"
+SRC_URI="
+	https://github.com/Blosc/c-blosc2/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test zlib zstd"
+REQUIRED_USE="test? ( zlib zstd )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=app-arch/lz4-1.7.5:=
+	zlib? ( sys-libs/zlib:= )
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+
+src_configure() {
+	# remove bundled libs (just in case)
+	rm -rf internal-complibs || die
+
+	local mycmakeargs=(
+		-DBUILD_STATIC=OFF
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_BENCHMARKS=OFF
+		-DBUILD_EXAMPLES=OFF
+		-DBUILD_FUZZERS=OFF
+		-DDEACTIVATE_ZLIB=$(usex !zlib)
+		-DDEACTIVATE_ZSTD=$(usex !zstd)
+		-DPREFER_EXTERNAL_LZ4=ON
+		-DPREFER_EXTERNAL_ZLIB=ON
+		-DPREFER_EXTERNAL_ZSTD=ON
+
+		# upstream overrides CMAKE_C_FLAGS, preventing ${CFLAGS} defaults
+		# from applying, https://github.com/Blosc/c-blosc2/issues/433
+		-DCMAKE_C_FLAGS="${CFLAGS}"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# Tests fail in parallel, https://github.com/Blosc/c-blosc2/issues/432
+	MAKEOPTS=-j1 cmake_src_test
+}
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index 591659e0f018..bdba2a932298 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -4,6 +4,6 @@ DIST tree-sitter-0.20.7.tar.gz 2928761 BLAKE2B 280083381ce4f5949ab1ca1412026cac7
 DIST tree-sitter-0.20.8.tar.gz 2941223 BLAKE2B 158820a88b20cc96252f8bfdd257e910ca4dc79174bb45ee52623c923b8a634714c65be8f9534411865fb03aaf84bf16bf659567a74cd58141ea687fa89601e5 SHA512 30fa3f97e1a24d469a7565dc91db629accdfbe081b43d951e9751059a0c7f763d727e95efce5806cd9b1689650773bee1106f4f91ba001da57df3b0d83dda967
 EBUILD tree-sitter-0.20.6.ebuild 1021 BLAKE2B b36aa0a4a1563751dd8315f27f01203693f543f22513d21e269087050898d5a9cfc67c856147ef407718257634214678e12e820af645217a52deb26229a4ce3c SHA512 c229498f68a38d73b7ed14c3d0ecb8261c789651b858a6c73a70056a6b12b36d1dac69f1af82258052dd309543aa0da2dcff6329b08715bb3c7127732a316f97
 EBUILD tree-sitter-0.20.7.ebuild 1069 BLAKE2B 43e08f495241ef7b83d758766d44ebf1ab94bae8720fc2bf2ebdcfba1d5699b8d7ae0ad80f9525879cb79c0a51dbb8319481adf39f7acd263f5e13bd7c1effcc SHA512 6f9ec44dc47431fc10adf150d27d6824506e35cf1a8b0d78656e4df170a085f70ada39ce1204c2c83df78edd1d62ab1e7d0c6e143b6c8f8cd0da2639f354afbc
-EBUILD tree-sitter-0.20.8.ebuild 1279 BLAKE2B 8f7d3ac5dea0870b60e52a414cc3ebaab64c6a3637b65cfac76f0584646a7668f577a025128add4dbccfdda8b4404125015983d2c555d4116bfe0358d14dfc49 SHA512 09c2eb7e9f978fab943fe8d3249501a521e4dbbb520e0f0691dd5daf760983781b33a475fa084d004d54639391d12e53063fd34d65d7953f7d13ac252d608c38
+EBUILD tree-sitter-0.20.8.ebuild 1277 BLAKE2B fca5db0fb7a996038dd8c65c12b74e038d566b01d68e2a19ea00a56b69d5e17feb1f175ffc7077dde778861fa1a918e3f1d33201f08b3d46ec90cb19e5639acf SHA512 97138d0d18931238eb7359a4f0043c69bb63624785d48326ca127fc166c3cb8c372dabbde1aa787041fe7345aca642b6eafdc2c9907bc75992e771185fcf3933
 EBUILD tree-sitter-9999.ebuild 1029 BLAKE2B c335042cf6c9155c2fad5c9c3eb9b508956b077cb22ee9e20f2f612a4afb2e0ec3797b149bb2b085c70e9d9110b6cdcb818aa4b66afff9d8fe54b40a5921699a SHA512 3284675110336a56485f5b4577e5461cbcf2e400deb4a4de5b107b248d8271f5e382dd247d1679c0be70e0ffb5f8820592e54c83f37807ae301b21f63d17b3de
 MISC metadata.xml 927 BLAKE2B 1b94b1e0f323461151d82920b4185cdee4aff41ff751f170d893b80f62423545adfd5efd8cc920c933f599089fbd72423ffdb4e43dc51f975bbc4eebe601abd1 SHA512 88e936a507fbd1154c1c167f6fc343ded2e3e6d2c073d2efce9a2e1c98ac1877e5c1197a903a597b403b444189cf2e4b519c4cf144a8eb1ad050c0a8b07ae101
diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.8.ebuild b/dev-libs/tree-sitter/tree-sitter-0.20.8.ebuild
index bff0ec17c818..f44668ee69e9 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.20.8.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.20.8.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 fi
 
 LICENSE="MIT"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 9f782ac7d394..280ed9cb29dc 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/csexp/Manifest b/dev-ml/csexp/Manifest
index 78aa3c6341d2..ba9b15cf1329 100644
--- a/dev-ml/csexp/Manifest
+++ b/dev-ml/csexp/Manifest
@@ -1,5 +1,7 @@
 DIST csexp-1.3.2.tbz 9775 BLAKE2B b1afea15558a5520abab214874653e9768ebbb22e064b51dab2f5bd5543460e357f9e1cba964341bcb24c5d53d8477de5458186e4d83db21d99a8ca45009d818 SHA512 ff1bd6a7c6bb3a73ca9ab0506c9ec1f357657deaa9ecc7eb32955817d9b0f266d976af3e2b8fc34c621cb0caf1fde55f9a609dd184e2054f500bf09afeb83026
 DIST csexp-1.5.1.tbz 10082 BLAKE2B 71d6844d5ae37d64c4b29ed8e2479869bda23bc8b352acc17a83a061acb6bb2dc223e3e9aba444c87949137123a716450a0c665c2c109bd98dcd702931e4a2be SHA512 d785bbabaff9f6bf601399149ef0a42e5e99647b54e27f97ef1625907793dda22a45bf83e0e8a1eba2c63634c5484b54739ff0904ef556f5fc592efa38af7505
+DIST csexp-1.5.2.tbz 11447 BLAKE2B 2c0481fa1e713e86f0146acdae132b645374deb813c085e0c65881c1edcee45ebfc863d13b9e5fa15d236f1a5634c4549248fe986afff71edf47ab9d648aa552 SHA512 be281018bcfc20d4db14894ef51c4b836d6338d2fdfe22e63d46f405f8dea7349e16f1c0ecd65f73d4c85a2a80e618cdbb8c9dafcbb9f229f04f1adca5b1973c
 EBUILD csexp-1.3.2-r1.ebuild 537 BLAKE2B 0502096a11f70a35e390c34732d4844b714148c33a96647e5b104bea1f773ab8dd3aaad71cc17b3a9cd135cf89e0f943826bb69e98f7df5a0605503d8df8b75c SHA512 c9954455bdccd9b7c37e39fa435e20f0fa6ffb6940ab85b1f4ff9c7985f5786e5cccd7426871654e8b2ffd1aa81a496328d670f2466eeda154b3a1fa127f6c1b
 EBUILD csexp-1.5.1.ebuild 544 BLAKE2B 2224d126f555659916abc541b5c2256dd206d20d6273f6dfe117f058a785cd450788d8cb917496c13ab5d2c3f6829b3a91132722a1f7fc48fd27745e82b7d608 SHA512 ae086562891bfc67784868c1b0f683e035ed87f5b750c5a8b3f8aeeb5cae2d390693d26149182d540bde2ad5777d24efdb45735fecef58bbe74c53a7405cb978
+EBUILD csexp-1.5.2.ebuild 559 BLAKE2B b49ae6dbe84b2fbfaede3fb91b50173820ba58c20035fac569b24d5428897e8b37b860cd46a93767b61ce665fc1393f56f8e6b0116c48e64644453b188c56c85 SHA512 bd98f99096f49835d54cc0819a700ecb50e98c9860b9fedce7dd356c17dab301874eb5b111beabc2fef8494a76cf285624ac82331277f33375acd5ded8d1b1be
 MISC metadata.xml 419 BLAKE2B 393ddafadd2d367c70b559c8da57b48db180b80c2a27d8d2ee9e311684034596edd12bf48b061cddae4b6718f1f4f536e8aec8d5698db58f6f9a933cfa0c0f8b SHA512 4a4cf3230718991dd88e5e1ecc6fe99bc4b5c3983f27bd61d804b57090673f27da642530845266c275bd658be1e2c18b3cdcfeb7bb43860eecc05129f5383214
diff --git a/dev-ml/csexp/csexp-1.5.2.ebuild b/dev-ml/csexp/csexp-1.5.2.ebuild
new file mode 100644
index 000000000000..ce18d6efa6e7
--- /dev/null
+++ b/dev-ml/csexp/csexp-1.5.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Parsing and printing of S-expressions in Canonical form"
+HOMEPAGE="https://github.com/ocaml-dune/csexp/"
+SRC_URI="https://github.com/ocaml-dune/csexp/releases/download/${PV}/${P}.tbz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-ml/result-1.5:=[ocamlopt=]"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-ml/ppx_expect )"
diff --git a/dev-ml/mtime/Manifest b/dev-ml/mtime/Manifest
index cea027c66497..f12618ce68ad 100644
--- a/dev-ml/mtime/Manifest
+++ b/dev-ml/mtime/Manifest
@@ -1,5 +1,7 @@
 DIST mtime-1.2.0.tbz 16272 BLAKE2B 317201f8d5e7a55636e58748ffd269db5e88aed012e8dd7ed269d1f128f8d21ed0e707679b030b9c822bac98c9b76033e8d2402171c4ee758d8c936fbeee7ee9 SHA512 0f0ed220cd0f899643930814010f8592e1f47b6dc6c4dce8eebfb17a81b0abed093a3dbf9c02490af99bf81ea640372f73b4ab88fd8ef0e0c7c66920692a8778
 DIST mtime-1.4.0.tbz 15909 BLAKE2B 3c49deaf72d3873c8447f4a6d8ce89d55f3df60df108132ec078d81702a6fb9d532266efdf5290fe396d57a84de2d1912b48ad92f84db6d573d977492407b95b SHA512 0492fa5f5187b909fe2b0550363c7dcb8cffef963d51072272ef3d876b51e1ddf8de4c4e221cffb0144658fccf6a0dc584a5c8094a4b2208156e43bad5b269d4
+DIST mtime-2.0.0.tbz 16284 BLAKE2B de653a8ce5d53c53520f755f706d7eea8c13a53b0dcd27146d19b273b03bbc1582c77698f8e7b2148b4d1a3af63a37698978547945b06814fe9333c963619c08 SHA512 2ebec45218901c08f73420aa3318c506f155b6c0df713e9856682e59d3246696821ea477ce3682af0bf4cafd0491b1d66904f8c0256e2cf831e93a0aea322f04
 EBUILD mtime-1.2.0.ebuild 718 BLAKE2B 2be384d73659fe626b5306df55b7544ab604c9359c1e63b12ef2bcee92614e9e9284f79357a47f33da9bd1d19ea594b0d0bd1946711671bd53b50bf476c1b85f SHA512 f8b26c028751b67abf9d8a1d786cb81aba9ef7dfdbd2dba5c76b587c0fa4ab8d99ab2d23f302e8633c0ee48ab2ad8ab686412ca2a732f9a1eebf38adba48e7f3
 EBUILD mtime-1.4.0.ebuild 690 BLAKE2B bd5ab7d5a35ff8616f653438b1f6b7f473a50c13947906fcbf2acf9eeced93f2b384755f27e3798d8d8b50dee0397f229daa94dc16cc9618cb8ecac93f115d0d SHA512 0ae6fe7f583dbe2ea7c9bfd50965c875a35cf604f23cc1d6fa22ef42a443821eb138de028f3d7ecf91fed6b62b62e10db95ae835ca43a39d6afa1236ea7a2724
+EBUILD mtime-2.0.0.ebuild 701 BLAKE2B 418838e627302d35f8c4124b24a0389b8cdb906bc218f5ed4e80c7e2802306f5421004b97e4e86d0804c7b8e46b904fe116cf8bf48ce0c06f8d62f27e5c4d71d SHA512 09f2d080dd39157ca4b9f83b165c467790782edf3df49510932d967348e895087fa4e87b92a78766ab10be5c50e241d1effd411c771268763d43b78f847c5026
 MISC metadata.xml 312 BLAKE2B aad4e2756300a7fdc494215d874c8a754ddee0f94fb24788b8b7ba17d0062f266790d8bc74954c7c21ed481782ed9ddb2b007284266f92f707078a7466f961dd SHA512 aabba72b993e6d70b4d1d1ef3eba7d8adb37ace4afc51c4f9a067f6176bd525716118d225518b00ddc28aa31150b4c558b64d1a43b3a3db2319e02f03afef338
diff --git a/dev-ml/mtime/mtime-2.0.0.ebuild b/dev-ml/mtime/mtime-2.0.0.ebuild
new file mode 100644
index 000000000000..89bcf7cd92cc
--- /dev/null
+++ b/dev-ml/mtime/mtime-2.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo opam
+
+DESCRIPTION="OCaml module to access monotonic wall-clock time"
+HOMEPAGE="https://erratique.ch/software/mtime/
+	https://github.com/dbuenzli/mtime/"
+SRC_URI="https://erratique.ch/software/mtime/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-lang/ocaml:=[ocamlopt]"
+DEPEND="
+	${RDEPEND}
+	dev-ml/topkg
+	dev-ml/ocamlbuild
+	dev-ml/findlib
+"
+
+src_compile() {
+	edo ocaml pkg/pkg.ml build \
+		--tests $(usex test true false)
+}
+
+src_test() {
+	edo ocaml pkg/pkg.ml test
+}
diff --git a/dev-ml/yojson/Manifest b/dev-ml/yojson/Manifest
index 14ae50851a34..47ab22034ecf 100644
--- a/dev-ml/yojson/Manifest
+++ b/dev-ml/yojson/Manifest
@@ -1,6 +1,8 @@
-AUX yojson-2.0.2-dune-seq.patch 176 BLAKE2B 83eec30981c810286535e51e8f056de44f112ece17047dca36d32c47fd745eb3b0295337f366d4209129f9305723f3e902c6ef1634c52f51a2db2cdbb25aa46b SHA512 c90c4e2c97333b6a5a4a194310d74881fc04e5341c12939ff69f95ade80704591fcf62f85153a57d0c0127f2823fc6db9ddb12a854785492376cb70365379baf
+AUX yojson-2.0.2-dune-seq.patch 175 BLAKE2B 51c940fccee438dedbe21919d61af12e16fba1349d014bdee714ac4d6dcef5a2a9cef241ea68364c7017697617916b6642171ae91879f2e24b5792d96781570a SHA512 a6994048ff3d0cbf2d79ab60ceeb54dfb66b04e0e9ac00446d6337f1a0fd85d2edf5d9d398ae850ebfce2dc182d059ebb1d50a580304bdc6b4d3842fa96a8d13
 DIST yojson-1.7.0.tar.gz 29704 BLAKE2B edbd7f66d69a85880fc8ee9bb25a993744a310887024f7af63665ba8f5067f1b9383ec4d6dd5f4ca3376d698665a8f605c078f7597ddd4e71857c1a20143c2e5 SHA512 25eedb64e4bf7c7e8d5a5a115812cd502540afbdeb7c947da3a14e5968aa0a7db8ab402425662571d8935b9cd6a19796ce81dd80a65dc614f156626c60e7036e
 DIST yojson-2.0.2.tar.gz 46731 BLAKE2B adca246c055efe04b63e694b7735fc81a714ae3b3ab164152797cc1eff1e483976b80ff31d0ac90f9d4ac234304ec805abb118bb231d0479bc738ddeb56a236c SHA512 61e8084d66d62d05a7802ee82a414807a76959ce6e0b14fd01f1c9c71ea69976d8a2cf3d5718e4059da4161786136a08624cd8470693ef2893b862efa7d6ffd2
+DIST yojson-2.1.0.tar.gz 48316 BLAKE2B 49634800de95035624803883b7f44eda1dd4ba8c050efc52ba31246aba7c37b57d717ebc6d487a9c99ba55ab416a5b196974b0bac09bc6a74992356840e4ae52 SHA512 d52e4fcac41165f9fb74e922d35dd247e1622674f74d6e80978fbc1f42b45f45797965e41129e7acd049451ef5fcec48021ca7c866e36a4e8c4c51e78bab9d7f
 EBUILD yojson-1.7.0.ebuild 767 BLAKE2B 7cd6e84710e5dd9a6bcee87d1cd8e7f593e28a68935bf1a970979ccc88b9816c86568d556c526ec0296033b8dc80aed2d3d9ff3437d7d7f0314a9d953365deb7 SHA512 239fc8c92a3b66d5e1cb3452010f8c444c560e4dc99b4f454499287cc03eb606124eea147556a1d825a25070e1fc329f94d4415edd0f508741c72b831976f3b4
 EBUILD yojson-2.0.2-r3.ebuild 856 BLAKE2B 8bbd368fb2d5d6251df105f1d9e71cb3b9c6c3dc0cd5c2b0ca0dc45cd09b52de686c5a1c3d1599003540003fda089114f526004e3b92d2d48f14b8e4cb96c67c SHA512 5b18c577b83e81e7669ab6777e8c32967ebf548f9b37d362118f58e4b90d1fc5d2d4499e150113dff5cdda93b00c5e6d2298807b7afc63e41ef543de67a9ee59
+EBUILD yojson-2.1.0.ebuild 864 BLAKE2B b3e8216124740401e6e88152a747eab7d85000a444734e98fd1ebe4113e5997bdbadced2de8c358687af3c2695bb743f9c89aca1630d09e4f91e1c4264c127c2 SHA512 3413400a7ac1bef69406ebc68f2b58d4774ca3decedfb64a8e8cb0fd9aad9de309c2346d5637143babad7325ced7639856377c6a15484c32d9c2c73a83d5ba38
 MISC metadata.xml 529 BLAKE2B 4cfc5392ca4b4402f01251818c776c63d607c2e1b8d216930db594ffe2e1146ac52f9492823e5ef97ba7b6f89b2ee8eaf367e785120ca5fcabdb36549ffb6ebd SHA512 7c415ac7330d8d3397911ddd213da9a6cd5dfe76fa2530ab22cbd70cd8f411fbfdb9d40aa8ca66dc202227799fe0b8ff81c81e57815f5e206c7f424b6218baf1
diff --git a/dev-ml/yojson/files/yojson-2.0.2-dune-seq.patch b/dev-ml/yojson/files/yojson-2.0.2-dune-seq.patch
index e4783220b822..c94933291f30 100644
--- a/dev-ml/yojson/files/yojson-2.0.2-dune-seq.patch
+++ b/dev-ml/yojson/files/yojson-2.0.2-dune-seq.patch
@@ -1,5 +1,5 @@
 --- a/lib/dune
-+++ b/lib/dune_
++++ b/lib/dune
 @@ -34,5 +34,4 @@
   (public_name yojson)
   (modules yojson)
diff --git a/dev-ml/yojson/yojson-2.1.0.ebuild b/dev-ml/yojson/yojson-2.1.0.ebuild
new file mode 100644
index 000000000000..948e1c8a6440
--- /dev/null
+++ b/dev-ml/yojson/yojson-2.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="JSON parsing and pretty-printing library for OCaml"
+HOMEPAGE="https://github.com/ocaml-community/yojson"
+SRC_URI="https://github.com/ocaml-community/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="examples +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.07:=[ocamlopt?]
+	!!<dev-ml/seq-0.3
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-ml/cppo-1.6.1
+	test? ( dev-ml/alcotest )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.2-dune-seq.patch )
+
+src_prepare() {
+	default
+	# let's not build this
+	rm bench/dune yojson-bench.opam || die
+}
+
+src_install() {
+	dune_src_install
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 9c465dc2a8a8..7373819b000a 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/tornado/Manifest b/dev-python/tornado/Manifest
index 6b8b8432799c..018ad0737709 100644
--- a/dev-python/tornado/Manifest
+++ b/dev-python/tornado/Manifest
@@ -4,6 +4,6 @@ DIST tornado-6.3.2.tar.gz 508776 BLAKE2B 10cea881365ab72290ac9bc240dc7fa4e77511b
 DIST tornado-6.3.tar.gz 507992 BLAKE2B a894fbb62e4246be82b09856977758e8e55886b77917a4a23a6411a58b2b85ae1ae9113e70cc00bf0b0775566d0bda237ab3ba91ff18012c7c72f24dff587a9e SHA512 f25bbf1e489bb53ba5ed502a9241b3629a66a8bee3ba54d8bd96946e478ea06dfdf70e6f937da25c8240cb16cc5c9ff3011415503c7d03e2b1eeb2f7567d8209
 EBUILD tornado-6.2-r1.ebuild 1731 BLAKE2B 4750f57886291ae09f300e20eddee0cccba0dfa07144e563a7ab9aa15879700760e511c1c9556fe4e82d6bf48036aefcfe67099dcb1261a248c538ab528f5ddc SHA512 f32d7d2078531728822b732bafcc8c738656e2a3dbba1ad9e1e6fb09346c4506d2a1814d56e95cf37780a8c8180e0b3560c791a9cb3afc1b45668b780b988401
 EBUILD tornado-6.3.1.ebuild 1321 BLAKE2B b0e47d2f9d7a089e459f94531c8246e9d0cf3adf27552da3adc960286856ec6f1063270ef492012dd72b9f3f6ab192ae09fc791cf341b9b7d7e45ecf234264c1 SHA512 e4d01cceac4bf818ac8a54df022010fce75d6a27966911c57f07bfdaf07ea2b9c19352b0c6c84ac5c0e50368e54f808f4266c3c6cd3252716a4733ee1c88debb
-EBUILD tornado-6.3.2.ebuild 1317 BLAKE2B 7691b13e69a0b53b7e6c42886826975e9a105ec2fdd565e7db57dcf608aaddc921f673630be8113346d08f7c565393f54ac7b0a5a1678bbb296cb250d8c96200 SHA512 6d552881f7d730536a554927eb185ae5c6e7110101b644e451234bdeb9298dbb02a615b8d278e067a87af68e8dc64bf644a99f50cc11c9e72bb3989f07ac1f63
+EBUILD tornado-6.3.2.ebuild 1315 BLAKE2B d98101c662ccef9e23f3a54c22ed8601ea9594107ba36855a4b68ada5ee24fb98648a0783e519832d9d2095a3da6bc057014fb12b218dc2177f32075c0ad3d8b SHA512 53a83ff38f26c8033eecd8031e3d77f843284715623c3382fcaa61611bf86d3605d992c922eb2cf7697d3ac1b65558842be0ee31160be0ef1b3f1b42ada95ac5
 EBUILD tornado-6.3.ebuild 1305 BLAKE2B abbcf9da88e6413cc75d7e6b1efda18ad742fa7c3467e691ba67bb11349c9f14c38eded49074e028f498e14af8560e1f8541290f58953d1f7992d641391fe4e8 SHA512 0e632b21bf10141731907854cb8c46c2037864e892e9c816b2fa38b02331775f0da2df3279727778a3e8c5772e5362477bac64b327f844a0af13c1856c219be0
 MISC metadata.xml 381 BLAKE2B 96d5942b11b6364eeac2248f6e92a9e7a54094ba2b6e9ef966be4143e1fa01fa0c417027d33a71c51bb094b905b9ff79e05107e1a9debb4b1ef932ba11fd8565 SHA512 cd4db13e0c6a9cf8b3c788c53dc5ecd0dce2cf783e7b2d67dba71299d1c6a3d1dd2c2a76c0d69816ab0da4ca23f831613323c55864fd858690c605da5426bf60
diff --git a/dev-python/tornado/tornado-6.3.2.ebuild b/dev-python/tornado/tornado-6.3.2.ebuild
index cdbe5317884b..2191de2910dd 100644
--- a/dev-python/tornado/tornado-6.3.2.ebuild
+++ b/dev-python/tornado/tornado-6.3.2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 56d92f5a1f68..899f977cbdc7 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/guile-gnutls/Manifest b/dev-scheme/guile-gnutls/Manifest
index 60a6045df2d7..4a05a7989733 100644
--- a/dev-scheme/guile-gnutls/Manifest
+++ b/dev-scheme/guile-gnutls/Manifest
@@ -1,3 +1,5 @@
 DIST guile-gnutls-3.7.11.tar.gz 684772 BLAKE2B 518d46fdc6f24cae03216205ffd010e45a9c38c6f8d0f6b7021df74308bb24706772174b6e8078057d20b06f7c81a4fe42b388c309ce463ad044f194ea33cbc6 SHA512 bdd7e0dc97939ef792facde0038062ffc4f6a8d2495eb57d08b774b774a4edd7259de46d3a86de2a36c0ed5027889ffa91f2edce2289e5932f16a421870693d7
+DIST guile-gnutls-3.7.12.tar.bz2 159199 BLAKE2B 1d44344d98231d2dcceedc87f8959c301024a1cb20a7e055dcf477e79b166405673d2447080e6579022435c546f8f34223320718d03ecc3612f9c6c10607dcac SHA512 c75ed619fd2eb79718ac5634c24a589308e371f83cac941fafcec297ea2877cb793760c4bfa0ca9f7396ca591daa781aebc0622636fc904f58f544193a655e3d
 EBUILD guile-gnutls-3.7.11-r1.ebuild 1070 BLAKE2B 685dfdbbcef1f3936932fab306c98279c11db2ed02d4ffe8a7b8059229f0cc238202f0eb2521416f2e727a99f5b27d46a87a43ddc50fc41bd805dac85cb0939f SHA512 890d60b8dbd883803b045519a60b5a105eda4b8a3952c66a7c50c55ca4c63161a88e68c2918708afc75db31a9dacac1ef8aaf9b84d0cf748ce370a69a2345d15
+EBUILD guile-gnutls-3.7.12.ebuild 1133 BLAKE2B e15aae52022b4e21c44dfb6e59ea38b6c89b1169d0ebcda2a67ccce631fcdd2f561ff534ca6a830b325a8056851e1bc8f7695c5ab3d4c352e64384068ffcd37c SHA512 19b37729546cde2ca5f9d2218a445c1e453410dec7723770f7fedbe029efc6348077e9a1435688dc3636bff0937e73b8520fbf766bb2cb169c36f3dc082dbce6
 MISC metadata.xml 463 BLAKE2B a94ab7691c343e2d12f8f4efece84c4848d1b85fcdb598a2cb4b451cea6a628631857eaa5eb57e73dda4589d72f24efacd99dd74ae9bbf0823eb5f2024f5e321 SHA512 9194a577fd0a60cf1fd795b9b73d3f638673f0ae4f48aad152c72c6f37072493b7c342637d2f37f1d516a86083ed10e99f90a12d73f1fd9eb458b8d1f1260957
diff --git a/dev-scheme/guile-gnutls/guile-gnutls-3.7.12.ebuild b/dev-scheme/guile-gnutls/guile-gnutls-3.7.12.ebuild
new file mode 100644
index 000000000000..2ddce6cbaeee
--- /dev/null
+++ b/dev-scheme/guile-gnutls/guile-gnutls-3.7.12.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Guile-GnuTLS provides Guile bindings for the GnuTLS library"
+HOMEPAGE="https://gnutls.gitlab.io/guile/manual/
+	https://gitlab.com/gnutls/guile/"
+SRC_URI="https://gitlab.com/gnutls/guile/-/archive/v${PV}/guile-v${PV}.tar.bz2
+	-> ${P}.tar.bz2"
+S="${WORKDIR}"/guile-v${PV}
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-scheme/guile-2.0.0:=
+	net-libs/gnutls:=[-guile(-)]
+"
+DEPEND="${RDEPEND}"
+
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_PREBUILT='*[.]go'
+
+src_prepare() {
+	default
+
+	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
+	find "${S}" -name "*.scm" -exec touch {} + || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-srp-authentication  # bug #894050
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	# Workaround llvm-strip problem of mangling guile ELF debug
+	# sections: https://bugs.gentoo.org/905898
+	dostrip -x "/usr/$(get_libdir)/guile"
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ae8bec5d468a..637c619bac74 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 06a97d623d6d..702ab1cfcb0a 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -22,6 +22,6 @@ DIST cmake-3.26.3-docs.tar.xz 507560 BLAKE2B 1859321d884d518c849082fcbd293656c32
 DIST cmake-3.26.3.tar.gz 10668855 BLAKE2B c105b19d49ac47d0a9fdfee7908c64db3bfe82d57cfb342c76938fa824a1413d7215b56a7407ac35dfcbd0d7a9e47dd631bd52d45aa097ac7d96b493bcfa64b4 SHA512 b09447318512b91c772e36c764049789224032c6c650289a94f6311f999ca104b617bf2dced57b723da23472f015549affabd9c8c076857490c47a1aee7eb7a0
 EBUILD cmake-3.24.3.ebuild 8809 BLAKE2B ead6e18dc3b681108680c13cde096e898cb0cfb0afddb85c52596dc8df0b5e2b7553889d6de59e53eec0fc76e27d4240355c6e9af7eeb2780af7e2f72d394896 SHA512 9131ae15daeffc6570fe433ce18de40237a7663fc9a45dc8fd91801f442b2a0eb91b55ab611e00c6db2c15726c7b7c484615d002b65ab22cc7f987e00767e148
 EBUILD cmake-3.25.3.ebuild 8809 BLAKE2B 48f85b5bdd45ac0fb69374c354408606f2f315ecaa46ad6c8365922127cd77d9a8e8cae3c6f7478342ccb862e0acc43eef07b43d44169bf7cb303be7a38fb485 SHA512 46f18794b82460a58bb3ed4ea0a2725b68b65b9f3d01a00208c9124a7e7a54f508625310f85167de48f69e6867b22cd00f19abd50b13c01a299ef95a229d334c
-EBUILD cmake-3.26.3.ebuild 8837 BLAKE2B 0eaaee95683d0f984ad10cc4f5257af71c04bc393a0b6c39f808e9824194db6c3d216923cb874eafed308328c321f7bb0f614e194c501df12cf2fc400de85299 SHA512 90192ba15df7d674f1373cd1727f32c3328d704eb0635e94cbad5874e2552ffd241c2d3824da860ff83f5c14caed8813bf83bc8147f04940544243582cbfcf93
+EBUILD cmake-3.26.3.ebuild 8836 BLAKE2B 74b146c5916732ea2b8b202258172e5abe185e6c8c44c2b5a4617ae361788d88824977b740e9a9fbe983bd44c04d19e98c12c5b035ff058f140217a127aad8b7 SHA512 83a08255398ca059b642672aa731dce44a59673b2d082ab9896346e11566ec8d1f2c8995634ad888a1d02e303e0ea9e49785d83df96fdb7c9819416cc7094821
 EBUILD cmake-9999.ebuild 8843 BLAKE2B 5c9cdbb3cf940d6a91073f66e4a02968e6f6ba0fc148123e40fda54b5091410d6d0362bb47b200d2ec54f9ff07eb9d580a870a17b8a581287de43aeb8dbf7381 SHA512 774d3e77ec2d16bf33bb7956b850015182bce6c482667793fda9429bdd1d34644a48aa5fb42dc0fb062c4cee86e3a411d4ffb96a545069a38ef5cb03c0f78f9e
 MISC metadata.xml 456 BLAKE2B 2dc475cae4d2f65744e25381b1e4fe8b6399225380d0f9fa81870813221d180b1c4b538c3f9249f80e921a1db8afab7071db206898fdec294372811dc456d1f5 SHA512 347c1e13f459dfb9bec9d52ce556526eb74e6c432ff28aed28f05dc17bba17934fff1ce2fc27765b390bb55aaa7b02d0800939eb4382eba6c4b85a62ec136f5a
diff --git a/dev-util/cmake/cmake-3.26.3.ebuild b/dev-util/cmake/cmake-3.26.3.ebuild
index e33e19a74327..da765ef9cb9f 100644
--- a/dev-util/cmake/cmake-3.26.3.ebuild
+++ b/dev-util/cmake/cmake-3.26.3.ebuild
@@ -48,7 +48,7 @@ else
 			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
 		)"
 
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
 	fi
diff --git a/dev-util/gitlab-cli/Manifest b/dev-util/gitlab-cli/Manifest
index 7dcba286f3ad..7fe6852db757 100644
--- a/dev-util/gitlab-cli/Manifest
+++ b/dev-util/gitlab-cli/Manifest
@@ -1,16 +1,7 @@
-DIST gitlab-cli-1.24.1-deps.tar.xz 34979684 BLAKE2B 238ac4e1a4182cc2dd83a4a49f9306e2e76635a43297df21e022b9990eb20dc0eb3b06b16d0132f1b813fc7440ddcaf6335ef77afc3c79e4d0a7d4b3443fdbd1 SHA512 e96423b82812fce4621fb4467ea6f861e87d9b897b5f1a6512a860880e22a8ae1ec08ae6a4e874e3ba33456bc93c3f0e1117a2705c911056f55f6f7aaef318c5
-DIST gitlab-cli-1.24.1.tar.bz2 16630772 BLAKE2B 61f618ef8cee468904457d8ac8a992ce45dd0e354296e24e4176c9f22acc26d33d9672e47542b017bdd515fb9c17bb11b9ba17cafabe66d739b9c6414a640a34 SHA512 aa92f3edbc490fe3fede9a65dda9267475f0f15a3265de31a00dc62719f7ba36d75573a7cee807e013b9218ea3497c3b6e8663bcb1a872e91a15000a2d16f386
-DIST gitlab-cli-1.25.3-deps.tar.xz 35966236 BLAKE2B 63fbcccacd6df665219d5196983cb7082424f7e87c4e58f962b73d185983a5b2a73e267fd2837a39c11eb9765f63f749a9dd61cdf901e90f0b648fd4d13faa20 SHA512 b2d73f16529ada87804ec948e7dc014c0c3309fa4ebd260e94ffd24a40f58fd1bf327c652adf74a4503bd63d685b1506b90c53230f75586107d5ec559320d47b
-DIST gitlab-cli-1.25.3.tar.bz2 16771835 BLAKE2B e36003e41649b3fc5289033892525130f9965a02095e30baf93dc7179a61ee336e12b57a3892c94259acb68717bb9fea3074985a29cf51afd28596cfcc3d864d SHA512 f916ab28d10e851a0fa389487fca4650bd0ea5b612213a26497838d45c77efcfcccbd6dc6500debedc8cd869afec0c3f0b2bf95cf3d5151ecbd0b9c793af1063
-DIST gitlab-cli-1.26.0-deps.tar.xz 35962880 BLAKE2B 895a442b5a8d259fccb58a04374d8abe88792392744ad748bf448ae5cbf5cb5927ad69dee6def59afc781ce6aa477c84d3ea219f79f069b98b09140f11cfccd2 SHA512 69e16358c60a0a71564943a2095b2055a11d6028021a77734f8b06b5348ac848a6a4bdf1f08b8b7af5bf344a66042fa7d8c9fa0061212b3cc4c1b2802c36f551
-DIST gitlab-cli-1.26.0.tar.bz2 16777071 BLAKE2B 51cab57139b11ea1d4b1834b1c9efdb061099c494441243e8acc2608f05cd17d7968d6602d46c4a8aa6e8cb6ef2ae3c9cbf03019214fe77d593bce8c9a030540 SHA512 70f02bf28c01a47dacc5282d9a20211f686a8f099579be10b6f180002ff5bd4e53c70cd25828eb148c190b0f58e1569625535fe842f70a919059350187352e65
-DIST gitlab-cli-1.27.1-deps.tar.xz 36052928 BLAKE2B afc415014e36bf5ccc0f454cff85719a2c7376c6a145471e3718ba7353fd5a5180473c55b9a802f369ac3a6d8afabf131bd49eeecdb54fa2b1eb7182f0951c79 SHA512 05bb6fc81e603aac2ea10d4ffb0669562988166c95a0e8d331845aeefbce2e324e3383e27b9908c92fde6c41bfa527bab975411d6067cad4579c5bbd3ae7a08f
-DIST gitlab-cli-1.27.1.tar.bz2 16780511 BLAKE2B d0baba9a6269deec6b98dd620e47c21eaa821fe3ef608478edb3e599ef13576f00e8f80424fa1ac42f894bf9d8c456f9e75d3d83899ac99754acec8e597c290a SHA512 74413f538b4983cbcdfa4a9197e38d6d52d4c675e708bc459d4460e61af4663394b2776d6568a294f1249fe7de21b882a95a68130100769fceb29ba725458d07
 DIST gitlab-cli-1.28.1-deps.tar.xz 36252544 BLAKE2B 8c7d4ef554bec4c7e8216bffd8ff138dfaa4aca5ede0d8e68d9291f296121f77bb0e607629dbeadd854ddc767ece394e8e22100f52776d704bd1908e1f0ac5e6 SHA512 6e6d2283a19ef1160ac933399cc497ea92075d7fc0bbc2bc998614b5c077b0331796a224f472139a4f6f273a2e1271ac70ea5ab7c0a479bb749055980e31e2e9
 DIST gitlab-cli-1.28.1.tar.bz2 16781342 BLAKE2B 0b59e60d0f8b7f1e95bbdf1aff8c22017dbf54eae2a72848a5416c35bee893341c1606249eeeaee1ffff1aa72500a8fe91389358abdf066339d9218a6ecdc648 SHA512 57b9d6e2b527bcaf227d8c07101129749a80203db061ac757adc84bda72576e35f6404d80972ffcecb6fecd2e9b644b0e5c9a06b6135a7e3a68c46af82de69b1
-EBUILD gitlab-cli-1.24.1.ebuild 761 BLAKE2B 261e2cebd808f585e3c98f8d14b3f5286c62dce03a116c90eba4c69216683ce9dc2847efa59c14689ec00624c358ab0e40aff602d4f945b92231cb5efef3d121 SHA512 3cad1befdb9ea097c2ea0f0167756ce091753b32f94f690fcb1f1ce019d20e202a2c49a1f97dcc89b26af8e370ca22026c4543b786198aa8f86bda6e320ce3f6
-EBUILD gitlab-cli-1.25.3.ebuild 761 BLAKE2B 33652ab55e51df4696f4ff3693bd1a1f1320ed8993cb4a8d682f29be6df786b1dcced99e6b46de2ca3a7557b31ffc050875656b68098751695de2cd0d5b588bf SHA512 2b3d6b86b99f5ded06edeeb5630aa74e4c54a7f28483ab678326d7d5bef35deaea526c43a59ff8470c4c4a97c7c5368e83c268676ecb930c8e173be29819dc4a
-EBUILD gitlab-cli-1.26.0.ebuild 754 BLAKE2B fc56e55faebb3f4127d3e32d066a6d0f6b5e24b21a919a898495cbc0ea8189fb8b1af4a2fdceb367e9768cc2a691947e9dc30d5b12fe90961295649206debb7a SHA512 04415709ae960428d9598ba556c1332c20dc36fb946b85a7c7d67bcfdbc3d175b88da84499a573969c0867a055b2bff87544c36e4450f211142928bd32b61907
-EBUILD gitlab-cli-1.27.1.ebuild 761 BLAKE2B ee81c7d528b40624c51c29b8b82f5d9f2305e78a9f6684c88bf337104f390c379c33a9a43b1bd1225e54b338363ebf3bc5205a0a2fc72753fa1b5b0ca00c6fd5 SHA512 8bcbbd10b4a9fbbe7e8492dfae6654d26da511fbc1be500a8e9ad613e2bc1f8bd754bd0636c4683c5b603828554efc63dce1725e60085de5ecb96a587bda591e
+DIST gitlab-cli-1.29.4-deps.tar.xz 38656412 BLAKE2B fcbb787a1fb893ae8d3452919e9e540f011ce0d35827a383f083e1492018a335f80089f2f87315329afb42bebdd1014ef6dc59e6673b930d4397edfa57384513 SHA512 12382eb22cf71cf11ebdfacf834dbcd08d6dc5fb02f7f705772240d896b907e8054a1847976a1ba9105b765df194eb5581dbd8d77fc191ac01b63257f1e76370
+DIST gitlab-cli-1.29.4.tar.bz2 16787326 BLAKE2B d0cc93c92cfb9ae01b9acfec04341c1e06a1bce36f666abec46c6bd0eab6700e2b6ea4f8cc27606da499b8246795c145a402dbf32c8f94074c0feaae34b8ec8a SHA512 a212f73fb06849c1d197efac1a7cf33a09fc94a3b8d954de1d442462deb59e52ff1a89c68e6ce4deb0a1472367890947ccabebfd459fd6e172142a9931c68df1
 EBUILD gitlab-cli-1.28.1.ebuild 761 BLAKE2B eeab83c2137cf556cf9ecc1f97941fbb808c3df1ce7d9137fb62eb86e2ed574bf454eced1be24b785a00d4cdd004e2921c96863b632e17c62599ca52754a0316 SHA512 5759b1f9cf1e6a84a3a854aeb310cefdfb84a07bf9290082e365d34f6de8d40cb24d5180a422c0c544b16ee6e56d6cd378fb528b157bfbc8ea1ee8bda2643fe0
+EBUILD gitlab-cli-1.29.4.ebuild 761 BLAKE2B d325afadbda01c64d8d94f4f9a4aecc22b0a0bf85ecd288f60ad2e276da2679cfd586f8b9f1c529880fe44ea9988820f799d570789739dc56f46e596643bfeba SHA512 4d96944fb2c67a7883d7866a296f74aab42d7037dbb14bb94a70d5e2eec7f86181ec65440046c30a7c59cfce5abbf0f2af3d2d556d856e71554a66c1fd7f7338
 MISC metadata.xml 328 BLAKE2B c15cee65978853695fcc911a6beb02ac29f8e82d7a82417989e497a0c014a2c5c2c22503cf2c099600e0885399496d0e7ce3b3590c8b8cfa0f6ecc6a63988d46 SHA512 4df241882ef7e722711132110271b672ef49913a92e9d70972857968e7d12a8403f5b19b5079fd78f3f08fb4aab8e615b51a6073db2c460aa2ae3ec31d8e3a28
diff --git a/dev-util/gitlab-cli/gitlab-cli-1.24.1.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.24.1.ebuild
deleted file mode 100644
index 1a5307e23852..000000000000
--- a/dev-util/gitlab-cli/gitlab-cli-1.24.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-GIT_COMMIT=e02b30c6e3ff7801f22d37ed63850211ca0c7bb6
-
-DESCRIPTION="the official gitlab command line interface"
-HOMEPAGE="https://gitlab.com/gitlab-org/cli"
-SRC_URI="https://gitlab.com/gitlab-org/cli/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# tests communicate with gitlab.com and require a personal access token
-RESTRICT="test"
-
-S="${WORKDIR}/cli-v${PV}-${GIT_COMMIT}"
-
-src_compile() {
-	emake \
-		GLAB_VERSION=v${PV} \
-		build manpage
-}
-
-src_install() {
-	dobin bin/glab
-	dodoc README.md
-	doman share/man/man1/*
-}
diff --git a/dev-util/gitlab-cli/gitlab-cli-1.25.3.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.25.3.ebuild
deleted file mode 100644
index 461cbd9de31a..000000000000
--- a/dev-util/gitlab-cli/gitlab-cli-1.25.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-GIT_COMMIT=7ab3ef14820c565a9430fa0da58a491048699638
-
-DESCRIPTION="the official gitlab command line interface"
-HOMEPAGE="https://gitlab.com/gitlab-org/cli"
-SRC_URI="https://gitlab.com/gitlab-org/cli/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# tests communicate with gitlab.com and require a personal access token
-RESTRICT="test"
-
-S="${WORKDIR}/cli-v${PV}-${GIT_COMMIT}"
-
-src_compile() {
-	emake \
-		GLAB_VERSION=v${PV} \
-		build manpage
-}
-
-src_install() {
-	dobin bin/glab
-	dodoc README.md
-	doman share/man/man1/*
-}
diff --git a/dev-util/gitlab-cli/gitlab-cli-1.26.0.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.26.0.ebuild
deleted file mode 100644
index ff656b6ec855..000000000000
--- a/dev-util/gitlab-cli/gitlab-cli-1.26.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-GIT_COMMIT=ef363646f539ed785d29e2b07c20b5f8f00c4d45
-
-DESCRIPTION="the official gitlab command line interface"
-HOMEPAGE="https://gitlab.com/gitlab-org/cli"
-SRC_URI="https://gitlab.com/gitlab-org/cli/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# tests communicate with gitlab.com and require a personal access token
-RESTRICT="test"
-
-S="${WORKDIR}/cli-${GIT_COMMIT}"
-
-src_compile() {
-	emake \
-		GLAB_VERSION=v${PV} \
-		build manpage
-}
-
-src_install() {
-	dobin bin/glab
-	dodoc README.md
-	doman share/man/man1/*
-}
diff --git a/dev-util/gitlab-cli/gitlab-cli-1.27.1.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.29.4.ebuild
index 3d0bcc6253b9..10e6e59a82ab 100644
--- a/dev-util/gitlab-cli/gitlab-cli-1.27.1.ebuild
+++ b/dev-util/gitlab-cli/gitlab-cli-1.29.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 inherit go-module
-GIT_COMMIT=af7cd633c15d6ec4eacf5a8fb6f8a0c494f7e9ed
+GIT_COMMIT=654ae7c117d2d93fc4621b58a8cfb5388ba485a0
 
 DESCRIPTION="the official gitlab command line interface"
 HOMEPAGE="https://gitlab.com/gitlab-org/cli"
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index 57907ca44ac2..56f86f6783c3 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -45,6 +45,7 @@ DIST cargo-xwin-0.13.3.crate 26125 BLAKE2B 27de731d71c9cbd815c98ea78345eda866c13
 DIST cargo-xwin-0.14.2.crate 27108 BLAKE2B e56e3266cf5ec50d22d9ded280cb439cbcd013dd1dc0a58422cab9f112df37806532d210ec3ccbac0f3ef167c1edd6f32a0bbbe7368b26c7e988716eb7a3b19b SHA512 cbf8d73e1353f06f61fa8b5debae100205fe1714e88e2ec7ebc3c71fab3571d95c2999968f979ffed5b65a0b36b38fc886e7cc0b90fa4ce8d933a44e0fdd6f59
 DIST cargo-zigbuild-0.14.3.crate 26978 BLAKE2B b6178cf2ba7d5f85990b9be102a3fc7d86b7b8a2d2a9cd42a71f68fc8f9172e360cd94b74076bf4fa718cb1925e0337179ff57fe146f9141a8476f4ebfca0950 SHA512 995eafd4be4d99776ec6060ab8e5a0dd7e0ce801c76ae3d33557f1d55a7ce249dbe691c776aad8956f6f416a3812b3ca66f528654a2b334bf5d31b45bb5bc17b
 DIST cargo-zigbuild-0.16.7.crate 30641 BLAKE2B abf6b04116ed5f83cf89d0b9d87e20bf1abb1564d62b2630da853d314c61cf575cbfa4b99aaef864b4cad6dc18bd3b390f742385d48e09e22f7350334c0edbca SHA512 72487f287fff7b9aa1292142d8ec36f29ac95267245462e1414c08a98b621a08d3f720e751ea58e8540140c86be4a4be03572db482bedbfde376814b9381c093
+DIST cargo-zigbuild-0.16.8.crate 30652 BLAKE2B 5aee05aebca296058124ba6cecfa533410dae0b519d2385dab109211fe43f21011fae66853c8a8905bf5ac1655baec549ddd1495e270cd2135808056a53c3de9 SHA512 f9a81b84848e87792a49844ae9540973ac753e1b4739fc01470efddd07a8addb63bcc64c37d58b81490336b0d151b43bee8851bc99ed45c486c0f244ebee2a3e
 DIST cargo_metadata-0.15.2.crate 18528 BLAKE2B cb80318d0cf7316fa57badcaa0502737232b28bc9efd17a71ef1afa8e1b61a597d7f36d6ecfb41a2859360ed7ed7c7ffa86b9184400c4646d3196fb895cf3e94 SHA512 f663676ac3e2182d67d1047164eddd24d1006f61f378003abb1d5f53f9dfee672202d33a530cac1bb749955edd142ca78169dc3412d78c8fe98d6121c4303fd3
 DIST cargo_metadata-0.15.3.crate 19738 BLAKE2B fee5834f3eb741704c2322d9035943b1e841c8043c18686ee0748b90facad535c715bb882b61dfadf9e027556927051fe816de15c5f4f11e89c8927ddf717583 SHA512 60c0e601c73f11a02da6a168ea80e7cfaa27b895ef6f869ecf5932126364cc23bb480457601edcc7d0bf8c8635e71c0d1dbdfe37ab3e95ddec41f797bbfbac7e
 DIST cargo_metadata-0.15.4.crate 19993 BLAKE2B 33bb182a4fbf453be323cd657e0927d7ae8f4cada172c482d96ba959155aa0bd5fc392d4e0a6d4a869456be5de8756c92a4ee0642d60db992aca6d8adadb8f0a SHA512 dae54e7d21642a12fe967d832769f2310a18903a0a46694dd441974f037d8a53e148bae2668a177478b91629c5da736ce56aca3e140d442267ff0bc65bb984a0
@@ -86,6 +87,7 @@ DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d4
 DIST core-foundation-sys-0.8.4.crate 17725 BLAKE2B 8afe47838dc91c8848c0d6a96a604149e5f0762228dbc10c17b85e4e9cd2c3928712bd0b28e1071f5fd6fd76d4ef972cb86c6c929246fb6e84577776933a8ac7 SHA512 15da472316d6decc213e4e5f08ecd22a108ebefe427b890741de4f9199614f19123e64329da76de5e8b4c9ff74ffc31738fd929acc1460fc757b4aa1fd3fdbb6
 DIST cpufeatures-0.2.5.crate 11251 BLAKE2B 2724be40d3bc0e2fda957f645e1cd6472450dee68db3592ab607bdac444283f571f3c904e47981a3fdaa06cab4032734a54470e3dd6e1b67fd856daf010e1277 SHA512 d02327a27ca9fc3c587dcbd10da6b1370671cd7b1df8dfc9078b47180744d0572ef41a7ec205ae9f1c571e5b7f4bc81278ab4c6b076c6ccac0167100e346e74e
 DIST cpufeatures-0.2.6.crate 11467 BLAKE2B 3c04a3b912e7f65d6da4b2e47029d47cd6d84383fe49bbfb88aee58bb2419f0805a0fc550a104233980a4a38d94ab545df76db8127873cf10780bf15019896ad SHA512 2b3ff21b38f61966ec63b56030c057a4eb3ce261c739c6bc6349dc0da6f6b31d06393db792696cce79950c68576bdc0ef2bf1c2ee0f456eae165af40f22c5dcd
+DIST cpufeatures-0.2.7.crate 11563 BLAKE2B 917f8ce2675519b4d5d89fe09b02e147f00a915d195158a690b292376bcc2937dee8f76778506556ecde0187c74ca8c046973f44e1f34e4c8bb6809d2d4347b7 SHA512 46988efd895b88751200dd9693a1040f698c8b2ecd5d3d4ae1d8055e719aff262afea764083dabf1d8202a51e7e16b4f51adcffc8a2424c841b58840b6669490
 DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
 DIST crossbeam-channel-0.5.6.crate 90292 BLAKE2B 7da87ab15c384754d2493dd1a30e83550cd4b2b749b7f0c24de131f054e3a2e521e1bb4ba10094378c8f4c7bdf19218e35b10562c50b4ad1d2871bf6f821e488 SHA512 de6a42ffede95750a13e3b9af6ab26cbc498125860cd8e4d227c7361bd831e558254a48bdef5cf901585a915003071b0efa321f2011f282218c364780f62f44a
 DIST crossbeam-channel-0.5.8.crate 90455 BLAKE2B 017132056f1b40e55fbc7a09b75509d72b0a6123a0e5ea5d6104fe822f73b3ccce670d711d3b84b5ce743dcab5f10445297a6701b71213b77c0d56e2c3fd7160 SHA512 47677d6fe63050c51393e4a0537a3c65d7055c9eae118ebe60c5d716b4f47f23c2b1947b1e1b66bfb34a57c4db3a44631d323e996dd545565fe4f58c25863ff4
@@ -179,6 +181,7 @@ DIST libc-0.2.137.crate 606185 BLAKE2B 6724b7ddc2460fef1d0f20efee8726162d904b929
 DIST libc-0.2.139.crate 638983 BLAKE2B e92b296cf8c916e10e859722ed75f4790401662ff7aa2fe8ed84ef9b94a00538768be33c272f0881e42da887c8c43e1fd44d061343386216492a76fe5d308598 SHA512 ff5fae517c49c382dee9b1d7479b65b0a818780453e5c00c416847d02f42186e2fcf19a8a8dc5e9cc2611300690c6ad324f9c0f0e8172e913a1b781fb7c0b5b4
 DIST libc-0.2.141.crate 671145 BLAKE2B c0e37825ac3fba376e942a0e2c2aeefcab384b24c50a453d1948376cecb3f953d59735e37aef8a9ca7ae707fc6b4818823fae7330f213bf084e5460a82dd3ed5 SHA512 29d81f440d62fa1c9f7983c38138994e61f4897761a50a4f14abce1ced85a8994c6f0cc0ce86f77113b74495e36ddbebae6627f0b94c44621620a395a6723cdd
 DIST libc-0.2.142.crate 679343 BLAKE2B 4168a8c3766bbc4f5adbd4babd84757cb81bb3c8cc806b8b5c1381a88ddccbb8bf55ae84f2879ab26adda09a3d44d21e2708dc9bce5d4868663fad8dd0f0e086 SHA512 8eb465fea8bfa865aa592185ea2dd89a6d89252b0e44fb7398ae82c9fa031d501fc3a1c37e50d1971be528c6e1a4ca416da224ba82e5a8766ec598464593afdd
+DIST libc-0.2.144.crate 682092 BLAKE2B 1f699cb880a65baf9210527789abb35fe8be9565828d061e12b5c76330e21babab67b21e9a44be6a706f643f3c8b98503a3b40482183188b49f33f96a2489a68 SHA512 576da68e3845a7149f64bee425529ffec4bbb8df0272790182e49c8bad5b9744de21ffb5c1206753b57b7fe45af02c6c429e16522b72a77e5262482d64df5692
 DIST linux-keyutils-0.2.3.crate 18434 BLAKE2B a31163a446ef8897be8ad73be22ae3bf56a9ddac4ddb6b89bba2360b967f0f6eab4aaea98eaee16e5fcf0ddb43fc1883bd0da2a5c85db505b7b404586ae6604b SHA512 3dd56475a93dc46f9645e60eb145c315e647e3779fb66326962b8780d3a5955fb217fbfbf56d18d0c3d4872bcc02e64f09dd7734e6df3418d82e5648fe6bfe70
 DIST linux-raw-sys-0.1.4.crate 878981 BLAKE2B b8708b06e48ef4e32d820b5a0e25ce12d3d985d729a2d7fef46d0b3b4518b4ad40d037d4689fb2270f9c2583dc031d0f4daa26500197e6c32bffd1400357934c SHA512 ee6d5a7a08b183681ae00890784c9e6b72e4c987b2ce2d7de6e7308b7a10d4a2b532db3d5121523bf5d4a262407f3033af4f4c1fd9f09be091523366fa30d768
 DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990
@@ -188,6 +191,7 @@ DIST mailparse-0.13.8.crate 36008 BLAKE2B 8112658b4ceb5b3528375f4f8a178a26c18b54
 DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19
 DIST maturin-0.14.17.gh.tar.gz 392461 BLAKE2B 4d0d2d5101a05017883b27dca270c3f3b84c77dd53f19db04c2b5a988b699f3b39b6b7a88c7ac02b5e322679f5509bdf68b5c5f27ec229816c394ebc5fb57fd8 SHA512 d12503530b0d865b6b3c40e564742d0e798107102fb7167c137c1b0a4fa63bfad739320901cff15a680a09034aae553c3cd55cf0c8f1d3ed0fd96404bb93cbfe
 DIST maturin-0.15.1.gh.tar.gz 425107 BLAKE2B 2a1b50080033618c062ec2013779465a1eb11cbd5b2f8800cbd8b46b9c75709cbe0cdbeb3fe0d5f7564e10e3d27e6439e9e2caea6bf7a0049f5474353c1ba53c SHA512 e298abb3cbfeae266c5f7c4bc8e57154527a5d040bf0276afe6e63e6d56978101ef399ab4883e7a5826d5eaa31f03019130200ca519b08d4e3bb0a12bee8eb77
+DIST maturin-0.15.2.gh.tar.gz 425933 BLAKE2B 8efd8bd1a4580dcccec5261031333af07818107808df4d6e86281d23e76303d9692406c4648e980d3550498a1c4524cce3ececdfbe9a737e8283cfb6e070face SHA512 360965fe33d67fb0c75310b9dee357ccbdc71dffda92778a23d2044312728a38869579e3703ed357bc14869f06d482c550c6daaa2f8b5c403de39e82987397a9
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST memoffset-0.8.0.crate 8912 BLAKE2B 19ad3abed21fc39461b0382b15a8cc312378aba36f042b1e5335012115d31b350a4e3bc720f1eea300d7d19b9b317f75a28d4ccd78ff3b31defd9e4b3147899c SHA512 47adcae0848ff967035e10543ea599c7af9c5bad387023eb4dc77c9e8d875994ec8139b9941b3ecc4fc17214d80944a47a3be174a45b334661914a5a7382dfbe
@@ -196,6 +200,7 @@ DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a0587345
 DIST mime_guess-2.0.4.crate 26399 BLAKE2B 667f9b8009bac2e1d8b835ae8825afaaa2ea6eddd4cebbf18de8f8fcde9318eacaeeb08066bdd611883bef5f8a53fa2506b57dffff543c3a57316e07b525f7f5 SHA512 acfbbfdc5bd725edde43e4915858b8d016e90a5b483664f0bcd5e8d2b0b3684bf0f6020aea147b5bf429f218a7af8080761cea4c5c04b68fa66fd6a676376908
 DIST minijinja-0.30.5.crate 115968 BLAKE2B c6b7555e6dee4359b9cb53c84e03abf4a6caf07a08196893796fec16354aa762be79193b5c534242f99be3c1e25499d45423dd6579e9b7265afbaa179e844f2a SHA512 03b557d470e8dfa142c8547a68c21c0f00f71e3be86377e13b9099d324ddf392ff7d3ff81eb955ccdf48348e0e5f8cb6c695a7aa434c592e41b20b4c316bf272
 DIST minijinja-0.31.1.crate 119675 BLAKE2B 89777df8b7a3d87d01f892b27a9fe4e3a7bf27532ab4ce023f018ea566f8ee483c8aeab3ed72713c9af14c91db24bd4e603facc1e52241fa8cf03b4e5f2f0518 SHA512 e763558de675d2b126fd074b1b58c8c447bc89ac6000254c7158d550a92677ea76d75ceb50f9a7d6262f396d577cb583cbe6eb21e6dfac9170857e58084c179b
+DIST minijinja-0.32.1.crate 125468 BLAKE2B 0ba474a128d0cb47eb5c8b6c940afd712f6a418c26232028810951ef7edeca78da0f6389efac794db987b5494518b6190ea3d49f057c658938503851e56c47e2 SHA512 1393547167ffa1d8589838f8e8631b808511acd90d759399aa3b683f50d22e15256a774fb73c4918d86f6d11b8b55d50dfdea872c95fdcfc4cb221feff88e7f5
 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
 DIST miniz_oxide-0.6.2.crate 54536 BLAKE2B 8127ebec5a2cee1c2101d9533da573e01ef1a0fcb169bb0fb1419973ddd2e6953d8dfe85f9509a5d1226643ad290f0ee1479fc68f1788ade7ddf9633d90bfe1e SHA512 250782e214572acdd11df87c2788cd5f78e8388d9b285d0a850918219678e262e8b9905cc88728f5b70d13920ef9d19c43d243dad8fbcc18f8c8462662ce1419
 DIST miniz_oxide-0.7.1.crate 55194 BLAKE2B 56afbe0c0b3eca98105ae2d507493f365353cce29a6b04910ff26bc75899400fdbd067756cbda7b3d86f047fb8f3d737de00043a4a7348a813cc43e45824e33f SHA512 5eb6ffe34a866403273ff0267ff7838aeb50722ca57a03d5a1d842a5f19a3b4af570b133a3b9d64d78eafe49e4b9732b92dd63fd9c6b0ce59b3295daf10f6a3c
@@ -226,12 +231,14 @@ DIST once_cell-1.17.1.crate 32856 BLAKE2B 8bde2aaaf9ef45d1f6b8458686179f1fe9295e
 DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
 DIST openssl-0.10.45.crate 234763 BLAKE2B adae6de12bb2f044c091c2899dba4e45d4f329d018b09943aac5e18e5d91d6a7667e47a33ed9e20a0e41554c2a372ab1d5a4a3ab54dec343596850dac505badf SHA512 bf67effbaf5ccf576a062ebf75ca14579db3da5ca456d85b60d47415cdc52fcac0c0309dfa55a909a452cb9cbcec9f132274187596f040339239e1e15f4f98c7
 DIST openssl-0.10.50.crate 252262 BLAKE2B 29c9bf06ed36efe7a44c98b0c0db4561fbc21be2217e55d2923c940a9b032ce5303df4dc4f4bd5e4b225a3d47db091402d2bf5566c1ef9a9c6a2be5d8002004b SHA512 9aa1dc93c5936049be135b5d00eead50be9b40bfcc27871b4044642e93e1d26ccc1aa78176776b7f35bd5c8ef7c462c98da19cacc9448d025f86e5bcc22f593e
+DIST openssl-0.10.52.crate 257165 BLAKE2B b4accd62f52caa549b3d89109ed3a1e8a9916d30c63f4f0b7574b64855d0fe5a009648ba423de389778bf2c9f11171bb31389a3fb15fc26e548d886f271f6fef SHA512 92ba2341c5cfa42ccd1e537ff222e560fe3246eba35523575f6d3d6891aff6a88a07ee8836e2d192f6b1ef32dbb4385d5ba67777e6ce72b9c04800476e92aa11
 DIST openssl-macros-0.1.0.crate 5566 BLAKE2B 51116df0f86274435f41b8bfd2b385d5a6464560a05c214445dde5cb414999d200c55e5529fa98e95abfbf26bdfe31c88708ddfa2a81671341792059ea703c07 SHA512 7e37a0c05781da13bbaf4c056c19d032a93820cc324f9f6e5743bfcbfb30e057501af1bc7cbf5f07e3a05191678cd5ae5bc4d6832f02ce75bfb03c027d18abfd
 DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c
 DIST openssl-src-111.25.0+1.1.1t.crate 5112453 BLAKE2B 74eb78ed6cef3fece7206e969b4969ee0000e7c5e09be9243b4a643f13fb82a7f16fe85c2461eb07932179515e40b48246c9b9239d2d0cf392f90b12f74c78f9 SHA512 297ee8398611892f12841a0559092fb57eacd8219f78f542b92f27bc11df96029886d6509ec41a28901545013f6f623f21db14625c95d466c5c192e4b6ae6113
 DIST openssl-src-111.25.2+1.1.1t.crate 5112613 BLAKE2B e488bf0eb80860fcc7cb9acc03413901b91a44f5ab013aada7019953ac0cd00647ecad66f8897da1b7cdbf2a538a51b0c751fa415ed875fa571e70c44fda4c2a SHA512 e01d92e1b323442711afa5d397eb997adcc2b415384e1059bd481f18e8357833145a9064cb385936a992d9900a4e150f8edd256b6a0cad04840a5f3bc36494b4
 DIST openssl-sys-0.9.80.crate 61687 BLAKE2B afe13340a51b5f7c6242085a0861c02ca20de7ec24e12efadb4eafd55b769f45d0ec4866799bf64bc383e68933277503639f148dc600f8036ecf6c325b745f5d SHA512 e141423f7a7c72d9062616b87163d2e1ded028ec165b3758c52a2e5f8519cd517fb1a89fa0ab3da27e0b47a1f5973772673d8233e98cf4ef79ded56e0363a072
 DIST openssl-sys-0.9.85.crate 63150 BLAKE2B 5c96fd2fc82ab8a7900d01003c2a55455be5277d232027e4a932e9af33765d6a0ccd32f936ea09f802587d615886e4e6483165b7408f540b5fe44feb6111db43 SHA512 37da552f7d74a44538a86442b350dab80620460d80d02bd7f998b35c7ecf10a18cd2ed2da6c02f193e787fa98aa22659c1d2befa20e4f183c52a8cada9787604
+DIST openssl-sys-0.9.87.crate 65702 BLAKE2B 578cab5b9bb3cb4dde866f3492aa3ca36fef7eb5d367ca46f3f93f388121ce131cd85b0b59a703e9bf989a7b891784fb54270027acc00f217356b3d2d9a60bd6 SHA512 b2f8fdd679aac50b2f830db32ca09e203c7d40a6bc0d83dcf66efe641a38a65e86d8ba9881b4fb073069fa54a7ff206e24d28b29788a2cce0c60e5e1e3d3ac39
 DIST os_pipe-1.1.2.crate 11375 BLAKE2B 076382ac0ae63fa10073341f6a61a3749baf18ed3a7fa78b3fe4b9ad4bc146e53a1820f61de7390b5d181b4311b159ff6e4801a900f7d3fa18cc771b46c60163 SHA512 daff52e9f78695a964b7d9c0253ea9f9d97418a66875c01af161148b3189e88f7cd23e794106e8780ea99d8a57efa3b01a9f9ccce32c16187be99eee7e1832a4
 DIST os_str_bytes-6.4.1.crate 23101 BLAKE2B 252fc826f646bbb999fa80b47f58ac9a77e409b10a99284c7b669304c0cd701a3d20e690350018f5d7de8c6c7d38521f3413ac81d08067dc26f76b7c0e5b056b SHA512 2199502ad24449e08370686a596f905325f5b145e105e8c7bf90ed7729bbc405e065fce62c98eada40f77f0665ca041db41f16cc8e62473501eca32c24e56f43
 DIST os_str_bytes-6.5.0.crate 23166 BLAKE2B 60f5beced502b7bcf165dd2bca2989f9039fc22cda80bbb09d2ed0eb115831c6e0f80292e656f4bf9c0b0635ad10210c88c1b23bcbb59b8d2729b6cda473ecd7 SHA512 cde7779ba24304256cc57de78208af4d26bc91dae7fbb9c85e3f67c3e35cb6268caf3fc9eef530a8d3cbdc951ec3534223f3559d2a013561912231ebdb1801b2
@@ -253,6 +260,7 @@ DIST percent-encoding-2.2.0.crate 10075 BLAKE2B 397e59acc3953868c709244b89a2e0db
 DIST pin-project-lite-0.2.9.crate 27713 BLAKE2B d6985b5add432fb6287d1b0c9fb0cc91a195f82c5a748a9ea430e4ba884717ec7b16d730b5ea62de5b2bfead1771da2d115b3776e12e605f70f2538f374a28fa SHA512 cef0b77233adca712db1183f780732ea577cf1b27c2643de221d54c837c75ce749f907e24a967be7474812c7682cba613a3fc5d553a9578a1b80569da0e562e4
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST pkg-config-0.3.26.crate 18662 BLAKE2B 2ad92dfdc8ac0414b12a61dd30ea4ac5f142bbb55d0555ecfa3a53e750367e1b11766a693ef11f8cbe5a2ddb978327632458b2bcf75be7aa8f973262033349ee SHA512 509c4d1494cccc20de6a62d9d037c63ff77ebee8d907747c57ba0926d177b08fcac0231ccdda14511b453deb0b76ddd10f8fbdf63ff94257d72a12a889546435
+DIST pkg-config-0.3.27.crate 18838 BLAKE2B 1295eb4f08751b3663cb2c7c2753f29bf2ccd80f4e5856909fe10b6f006c37fb9672c9518b9b416546469faa18821512673a66543c0bd1e848bddabc456d0a90 SHA512 41e9b8d4fce6b8244c2ac8566318a001b481bd42a182f1a832c81ce93c6a023e18af03aa3500b134c30195219d35080433bdba69b2594e9665081debfbb4533a
 DIST plain-0.2.3.crate 10664 BLAKE2B b0ea38fcf6d4f4e3ff91d572b5639f01eac4f19b2c451d27bca49d994a07c6f46118cd58a1b86b3d2a61b7ac9e17e8236f1cc98414738d8c86086d37e0fe4d35 SHA512 6909e4b4b4a0a49e6a226d7393b121ec04beb8a13b1652c23337eb09b3c2e5f202b53a7663dfe7828dcb32c3d18135b514e9a982967c188e127a63b6cbeda252
 DIST platform-info-1.0.2.crate 10950 BLAKE2B a1eaacb9956b98dcaece4b3d5c07b239069be08bde5b080699e3b46b92ad3de4c0ed649932dcb4959501ad832a03c8d2fdadb7cf87b02c33bdedcf8b2eac8fcf SHA512 cd28b51267f6327e651729ea3d20096d7f59cd3b99e880fe6a3c36858ba97f965d506c67fc778b60256f543e9754f6d96fea5ffaae4b7f4396b3966525781ea5
 DIST polling-2.5.2.crate 22248 BLAKE2B 612ede5fd65912ed57ed8c458103ec9d52413d2fa8311b5a20ff9964650ca39fc5064d5177d313b27f681b7f30670d76537c75ed95488032e5f52ab797739127 SHA512 43731459c75e94678b6075e2a46f2189debcae570d810bc7b8b9497d79128ded3bf41677a75a9be2a36ad7848e56d22b1fabe11df99a9df777f1d5d83c83efe8
@@ -268,6 +276,7 @@ DIST proc-macro2-1.0.46.crate 41954 BLAKE2B 3bdc274c8ada8bf1a84d4480b25e0348f4ec
 DIST proc-macro2-1.0.47.crate 41955 BLAKE2B dbfc20b61443225130d08b05deeba56e63e76921e56359c9b0531798b18778d6ddcb56c3372fb6ccc68586a6c1dc725054f0e83f93e8623cb5ff6a7a2ed3dc83 SHA512 60c5d0dcbdee7ddab40664882d3cf5a868f7ea5b49ebab3b4419c3f325582b816625e73e0d1737bbd46bd7d765ece6c81c2ff4be894555d4b255f5cb9255e931
 DIST proc-macro2-1.0.51.crate 41804 BLAKE2B 579e5a157da81cd8350a6407603e5f8102bb9b6618ea8e81ced1692a6a6f4b57bec35aeb965b643f2542f65a3b9965fbbcf7e0ade35cf159270583d34665a628 SHA512 10ad77a5d05437c1b2c40a8f82389d081e64993171aa6259e8dca98d9afb04f5fb870f2037ad626a280d59c1a89fd4482bead701d744d6fb7c893bd9e78dfc1f
 DIST proc-macro2-1.0.56.crate 44454 BLAKE2B b2a1f28979245a784a4b3a0af8cb04bd01ef3e7aba32c45122fc05a6cceddb1b7303890827f1a2cb99b0b2ae013cd772bffd6e94ea226f0030cde867d6c22aad SHA512 511fd8332eca47ed834736d405e18d53d83642cf528bebb8fd67fa5561e19b0a43c359b3e8020ecd28f9fafdb065c484ca360abc0287a0f97e94d4f779145f03
+DIST proc-macro2-1.0.57.crate 44506 BLAKE2B 6f3535a71213b2403b4ffd088366cb9e6b729def8b31afeb153702d6af24e93b4e90ca3d167ee260d7ae92d0c30ef69675587f63dc2c0b267a9354db05f648b4 SHA512 c812e51f1a85b9592d2259f5568ed39ebbc837a44b31237b943f6f0fe9c6149854597320d009730f5d6337dad59bbf648a0c3764fcfdc74436645c9edb8e9336
 DIST psm-0.1.21.crate 23126 BLAKE2B 5972b4bad729d3c8842d4d616b1a469fd59ac7cecac5dc5754f084b7f2c623f715f302a9132cd146f48f323982c837a63cddbabfdc97c73ba88ee60df3d036da SHA512 33e34bb30efa5ec700c135e11fe03447d56e6f0dbca5536fa8bf9ca2c605c65e2dfe0a2a79a0bbe08eb2d2a37e569e31def340e1187bc25060c2f0e6537e3e5b
 DIST pyo3-0.18.1.crate 415128 BLAKE2B c77b956c4c96c4f0356abf5df14f89ef7fbd4d779169c2acccfc827a3a5d2d7980e5e8a467c1f6e73bb00a4500293995bc81014f110853c33b8e30d0698d0a21 SHA512 37e82b2b212de59335f8b5e4129dfc53872ceda156238f4aaee8cf358a8daf2d64cb716aa63d343c4f602fc61344b94bcd3cc8e02bee80256f5b49033a5c5825
 DIST pyo3-0.18.3.crate 420236 BLAKE2B bc00a825a67ed3590b31d3ea6bd77f6c4c927c0355d9d03ce64ca44e36ae3e29ab4d891bf2d94ca074b3bf858e077c516dc64e4620f875fe1e8fbffb5c9db1ec SHA512 39f044a19a42a5e2f46049431fbe3fe10c14d12a4741cc789b42de7cbf448bcbded7fe38a0f124d994ff9bcd3d95a19305dbfdc7462331fda3e6686cc4289be5
@@ -323,7 +332,9 @@ DIST scroll_derive-0.11.0.crate 5615 BLAKE2B 83b8b5d68b7496cf49f16b7a1450ff5927b
 DIST sct-0.7.0.crate 27502 BLAKE2B 93912044e47473d72d7415e01cbe2545f84d7d087e7a7fb210be7524d44f69daaa58edf487ea6f8e5f06cbe25ec02062b1b55978e7cb4761b8bfd79a32d4fcc7 SHA512 175d2a912e3f35dcb110991a066d7d9b0d47a0febe4e92ab7d92a27c886a7eb9abf203c9080b3e2cbda9bedbc816bd138476363c2a0c7367d3abc7e6bce83046
 DIST secret-service-2.0.2.crate 26687 BLAKE2B d813dd84ed60ca57f6fc8193756cebe8a4b45bb02e1ac2cf623673589dc7e6ffc376662d1f1863c3bffc27a131b2dd7c700008fa22a8de47e50fcfa14fdb6db9 SHA512 8c64d20f0206f54f3749e516e0b0090c83d84d9c5d73d9e36afb69ae91096c97b019754f39f14844e95e73de7a14a0a30712543379e54be9ae353cd5f2788676
 DIST security-framework-2.8.2.crate 77045 BLAKE2B 8581e0056fc0422aef0122e4948d6244eebdad0935c73ac1b01fe31de19f730325f11446dc3dbf5f1ec4400de099eed1d61caef5b8e318365c4dbf9dabab3be3 SHA512 6abaf2129cff62220f152786a36fd4728c72fb2b55f3f75b396ffdf4344902077c8c0784eaaf07e2a4d9311f833298b46372a968b798dd838ea495668fde1be3
+DIST security-framework-2.9.0.crate 78799 BLAKE2B 3fde6a07bff0f71920e81e5b2643b7a6ea09511f437fb0431b0daea655891ff7b6abdb361eab1ca1b784bce25ed338a2c3f0e7e12aa6a3573636c1bad104f8bf SHA512 74fc7749b2edebc61abc11f48556d75db238cf7b5f445cc3ee016bdac1141c6ed5f6fc0897a7c271ff244e52abf38246c5f2a8b77484089030c033cc56209f5d
 DIST security-framework-sys-2.8.0.crate 17911 BLAKE2B ed066e2cb8986930bdcf55060fcb5a34f826aa27d51ba4236f8a8e56de8fe3a2b33be8da14c64c0809f46c0dce02a20729e6863af2261a04006ac65a291ddea7 SHA512 5e670f5f5d54f2bc11e05435b975d5d26d990d6f7446613dcd5be88c3cd52baeb702931cfc663fd5018c8c99f4619c23e57f31eea60b15d3a5e7ce01a291886c
+DIST security-framework-sys-2.9.0.crate 18197 BLAKE2B 9eb2881c86bbef77120177a2548a50e6bc5410910ce808183491d9c6f606c1c8c0ddce9e8b910eb2043293d9993456568a27b7d46b2a08926eca2193ffdce07e SHA512 152133eb3bf66a37046de74df94bba856696c76c6c50b9cad2bb09ac3d6b73d1e23aef8c18fcf050ffb43e7246313cc6ed563a0af8b55e58ba62ae549a6ad9ee
 DIST semver-1.0.14.crate 29813 BLAKE2B a080f0a65127142a90bf033452241ffebfc7098b56a6a6b8bd818528df3b88fb48b3982125b405c1601e1bd55f3a0fdb4ffd9653e398295d8156651a04b2e903 SHA512 04db4c0a30141c2767d24d6d715b66ecd6355c1c88e572d4c473e0fa8c1fdd7197092b8286c973f25d201c5fcdc9105ba3e28c11ba1546a666167afc1fdf6728
 DIST semver-1.0.16.crate 29850 BLAKE2B 6a6a680e55b6e98e5d0d466cae2f144531d3019988a7a241e7f0e54ebf2ebfbef27eb7af5ac59a618fdaa5546bb84c65e4616734b775fb2e90d87c1ac0b07317 SHA512 4fac06eb9ea475f8a31dd85e4d28c70a351656914e8e61518ad69274e93f1b6f14cc32a5b0c0e5a7d9ba0c74d4a16d502518dfdf2756e8df5e45869886db8c2d
 DIST semver-1.0.17.crate 29685 BLAKE2B b9beb685eb9f6cffe557d1185997e1a93d0e50ecd8e9719d9855347f12dd430ed1020df81839b7924a984596437ae7fb2951e7ae44c5540692a7f37b591bee2e SHA512 5199923757e675506d68c252182b10f55955e47054880492e5471a0a0f9ad13ef25d552d2ab9bd68fba37121b8026d9989bf15db67e95265b3aa53d06377fda7
@@ -398,6 +409,7 @@ DIST toml_edit-0.19.8.crate 94457 BLAKE2B 8fb45302a44f48a5a75db4dd6e3c7c2b3e4cbc
 DIST tracing-0.1.37.crate 73888 BLAKE2B 60c74379bf84d7b152f0b4d5b4d4669a1227dce0f3b5c10210338193853ca332de7eed3cc3b6160ee3719da7fdfe565665a887f2f82fb1e1c716c421048a2e87 SHA512 2116045f51b35e90fc933cc136d045d09c0aaa33400a9056051d887fea2d2982b394830e4d4c3bcb4b831e62b9c19f6c751c2d216169f663aa18c4067aed7d75
 DIST tracing-attributes-0.1.23.crate 30450 BLAKE2B fa21c4074eefbc1110268cfc79291c909503428b26560cf68cf04640a6387d04c29e22b8f86fd48cc1b8c0fd4bb67fca428c9f8009b3c99879352b9d9f68c5ea SHA512 55e92b4e0410805f8cf9eb8ee50cabcf08d1f6c6b4b38c5a51c70f59d06c82096af1f3b9b7dd4267945cf631fa8d99f78ae9b3d0760f9c7ed4d6da6e5e6ff3cb
 DIST tracing-core-0.1.30.crate 60351 BLAKE2B eadd1ad68830f4fa9972d207fac3b5be6b0f6d3d2ee4299f2fcd6d03313db6850ae0bb278ae618615e0bc2cd83ffbde0928857fe8e01dd9591a9e80114e0ff88 SHA512 9a14edf6338eff6636473f4ea844dfe337e434c14f40e7b9af6d7e6cf25f745f37bbe372bc63c01043667bea2f5b248b8afa8d6aae4cac3dc5193e3383ef1c65
+DIST tracing-core-0.1.31.crate 61263 BLAKE2B feec046ddd3e04995bfe24defd6ae1187fd7ad78d80d69031178f67ed534e9aa6ab6aaea92dad509f57e220df5f6f025ab8f96bbc957834126f53dcad36580c3 SHA512 66fcd0b4f32de3816b1dcbeda1af26fae0a79d088894637984dc6a0ca65b609f5f166cea376601f6a75f8e3a281da6d4450dc796aa0a7177ad615330237e2bed
 DIST tracing-log-0.1.3.crate 20549 BLAKE2B 1e2b5f1d96983b0dcf3e61f71132536e21dc19af0d532dcff7cc91db45e60cbdc1f8b5b7a7b2c13214dda4e3becd4f3d62262def1b608a99fa330ccf1d716323 SHA512 440cb8ddd5823cd0d86b68bbbf29f6886d5800f95d0aaa9477f98f188013fd009c2b9bc982b17efd08abd071bc70ca511f988b9db8c21d8e3d323fb67614d289
 DIST tracing-serde-0.1.3.crate 7329 BLAKE2B 55d924fc3acfd496abca8b42bf3fa4a2511340cf2ebb060fb31bc0b5d81dcbbaa299daef3cddc3647625afd124b9c83efc1ef104f55dc6d4cd4d91e0e667c160 SHA512 3822ac747df404c33573ad2a5c722f9708066a72c2893dbf507563ef29bebcab79cec17515fa87c0fa64be8a08073c38ab57ccc463c74df8caf3df69c72e131b
 DIST tracing-subscriber-0.3.16.crate 193572 BLAKE2B 55e582a5989b68ba9fd44defda52a8ec6e85322cb6d629b35c20e75b0852252f97bd21ea5d7587a1712b02e795e534948549e867277caef28592d0e6a50e9aed SHA512 e7e2c00c027cf36e3e97a6779a2ce97bc8b094eed608e940fa0b994188103632c75e565c76944d5f6ddfa2fc6e3b44049c10d35d9e3f3a639eb5249d675e4c45
@@ -436,6 +448,7 @@ DIST ureq-2.6.2.crate 105924 BLAKE2B b055cf00473a6d67d181fe6ffc9d960ee9c1ef4bc34
 DIST url-2.3.1.crate 72777 BLAKE2B 6ca0e537baf373b92269b2531945c1cdf360f1566cae4734dfb96f05a605e5c6c82e3192a1b9dde0ff22b92b87aba2d56e32a1bf17882b4de15efd7cdf52bc76 SHA512 8224010bef067574481e5d84100d944782d52b49db7c396ae2b4dfc145ed58769c15440d97a0fed4d2f9857592a8601417cc5b1bdea959c47a3e7a1f7182ed0d
 DIST uuid-1.3.0.crate 53736 BLAKE2B 1618c1f43db7673019d804b7419390a4acb62fd234dfe2a36d22cbc33f526f3a7e213e3c98160fb35a713f15e146b0ef89eac9e4e397532073c01229026cce12 SHA512 0914998dc2d516c215b1309a2527af557cecfbbd57f793d416d7ce6520b75dac60951d7e0951d10f251e8bb66733615e502c946acdaa503aba2fc0e3d4a874da
 DIST uuid-1.3.1.crate 53800 BLAKE2B 5d639558825fd0841b2d05873548dd5688629a4efe8d64a7df8e94da7914fbe173f986d1ced0ac9cb537309773c0c36479f518f9846e893a9d1cb71424040c53 SHA512 53f2782cf4ded7bd84614d819e10979c3d60fb05fbbdf6adc8d282ec6a89be829feccc38fff29203260a4b267f332243cbb4d940d3dd83fc210716bf46e8ba44
+DIST uuid-1.3.3.crate 53826 BLAKE2B cbb0a32a6b5b232f6f13df8507660e195757db68118a7c3141b41fdc7e3bb1b21f34d54ff7cf3784312d689466ae613c28e61d1ec52d38b64bc57ae88f35ac10 SHA512 34a545f72acc1c9ff3d55667c19b652d9900be4a7c3b63a86c59ac74e3324fe3d67ee429c5225b44084c042dca20a70455de1540683dbfea80a5f400cb9fd4aa
 DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
@@ -500,8 +513,10 @@ DIST zbus-1.9.3.crate 62957 BLAKE2B b7011d1c78e5b8a23a93b0d88ef5d13164b964d046f6
 DIST zbus_macros-1.9.3.crate 14794 BLAKE2B 7ae5cc45f8d7c9eae4d282f3c4884abfedf91ff14b48f09f21a3a7e5d80100b001f2e7a7b3dc24bbb35b65f7c6ce615a80869c5d81336bf5c12fea99802b0925 SHA512 1b22cf49dc10d9854f9f4150e52307e98dff1f6d3102c5e5af4bfb305cf3509d5b8f07ed6ae43f8b4f03c4e22d11648ccb49f5f3f7731400a34cceea7ee19677
 DIST zeroize-1.6.0.crate 19049 BLAKE2B 8dad6af58edd7b22ece7dfefa47b478dfb74efd1e08c03c571c9cd50962a8eda8cdb59fab91fd44053f8acde8d1d84efac4bc48c5e6576255620ef21f2813de2 SHA512 9ebc81c10516440476b5c198dd4ff0d284a0a37cee11a2cdfb5a1995f95b72d05beb827483b16e8b764f720fbcf30a5e5d8b1517cfbbf572bcb27c2efb18393b
 DIST zip-0.6.4.crate 62396 BLAKE2B cfe4d7fcdb71ee6da3b6bf6f8cf4ecca9f717f7bbe96307af943c1b3d75dc233f1ae0df2f8515356da2fa27c0bcb534ee73c72e7afced4ae997b888c9078e149 SHA512 29392175711fb8585d400f99798596e10415423b3fda245069ca3144bce4b1027db845526c233bcf8be13b756e9605df21657bd2b5713339adeb334fe964ff8e
+DIST zip-0.6.6.crate 65789 BLAKE2B acefc076297468d72cb20d8c6234fe5406875056fbf78fc0eac3ac430af78f320ed839f8683bd96fa1a03c457d6ac568d42bd703a902bc37bd126791d8b4c709 SHA512 affd46c17ceaa0545a155250dfd16756f8706dda43bae8a322ec0481dbfb41e4cf3166bf9662fc139ef9d0ab3b0f9f158535b21d2a61b21d38b8b2407813eeef
 DIST zvariant-2.10.0.crate 64374 BLAKE2B 65f5ec09b812217b2d96f57fcaca7fba97545dc715b1395cafe6386553a52e9a72d08c3a599bc08d5f563ea71324f1e7d60db2797c3ad1ad23a9c322a3939346 SHA512 48227afe709c1cc54cb70b4d9ae26e7f836559b4b11a68136d7720d01bacf757c1f5f40cad9de634fa27e196e4942df69c33a7de1334bb23ca995ea34690c5ba
 DIST zvariant_derive-2.10.0.crate 8746 BLAKE2B 8408e6689f6f849d37d0ade5549dbac25a01a8ef6de5692290f24462e0984128fb5b1d72e87e94e4c422896d68f9acaa382ca6af57f47f470448894a85071b1a SHA512 ba06d0761de8e20839246517d89494e5728fd654cf95eec193a4ca4cdb90090542bbfd7ed0ffbc9fc44edda38c5270139f54e63cb88d09f6c26b39199ea1deec
 EBUILD maturin-0.14.17.ebuild 10078 BLAKE2B 21fafcff8200d77969ed07c3025a7847105ce0009e8edcef01ca48ef5e628961af3127be432014aeed9fa8252494ba71be6f9b8a8d0e8c3db70e50ddbe30c397 SHA512 9d6fdf6f349453efc1fbc2355a51371fb21739708ae2ef1791b5dffc947891ddbda85ed14a1240ed5200662f0bd0b3043d87dceea14f2550b1afae8e469808d4
 EBUILD maturin-0.15.1.ebuild 10254 BLAKE2B ac8dde56e8b8ffaa8e53fff79e01dfcf44ba0dc446ab60778a65b2633efd35b3cddefc71c697a86ea639b1c0ce7c6811cd28268602351e85d1edef37b359be13 SHA512 9d29540c30a901f32ceea982d1519ec765285fd9e52ffb0f3540f35c91173fc31d4ed71be62e7ed48a5eeea746a974da167931e4dae384e7a21540715dd0e8c1
+EBUILD maturin-0.15.2.ebuild 10250 BLAKE2B 10607fbb4f687e79b4a3bab0dd00343fa069659658e40aa565ecd82471a36952a6f792fbbe8cbd9156e40bb26222beda1a112cb4bede7968f6bdc270409eaeae SHA512 43153686adc7996af9c36aa3aac874a382783f502148738e54c96659dab1aedc606cd0788dc1d3dafe55f78c15b344f4d3c0ed8dcaeed955d1a24fe8ca470a49
 MISC metadata.xml 644 BLAKE2B 68c4178fb0120813b880155cf6660aa7092335e3cd0daa9a112ad7f00fb081c8076cfb30c2b7299797fba0929dc2b223585da6f9c57d28e1b9d91e2d40843355 SHA512 9fa1da4be0fc70d10a6aaf6381a0d211a14807f0335660b501f86d2e750e93f76d31ae9b141aa0a170cb5ef36d52fd744c75dc4342226c2179e07f579d108ff7
diff --git a/dev-util/maturin/maturin-0.15.2.ebuild b/dev-util/maturin/maturin-0.15.2.ebuild
new file mode 100644
index 000000000000..dac73a770f98
--- /dev/null
+++ b/dev-util/maturin/maturin-0.15.2.ebuild
@@ -0,0 +1,477 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	adler-1.0.2
+	ahash-0.7.6
+	aho-corasick-0.7.20
+	anyhow-1.0.71
+	autocfg-1.1.0
+	base64-0.13.1
+	base64-0.21.0
+	bitflags-1.3.2
+	block-buffer-0.10.4
+	bstr-1.4.0
+	bumpalo-3.12.1
+	byteorder-1.4.3
+	bytes-1.4.0
+	bytesize-1.2.0
+	bzip2-0.4.4
+	bzip2-sys-0.1.11+1.0.8
+	cab-0.4.1
+	camino-1.1.4
+	cargo-config2-0.1.7
+	cargo-options-0.6.0
+	cargo-platform-0.1.2
+	cargo-xwin-0.14.2
+	cargo-zigbuild-0.16.8
+	cargo_metadata-0.15.4
+	cbindgen-0.24.3
+	cc-1.0.79
+	cfb-0.7.3
+	cfg-expr-0.15.1
+	cfg-if-1.0.0
+	charset-0.1.3
+	chumsky-0.9.2
+	clap-4.1.10
+	clap_complete-4.1.6
+	clap_complete_command-0.5.1
+	clap_complete_fig-4.1.2
+	clap_complete_nushell-0.1.10
+	clap_derive-4.1.9
+	clap_lex-0.3.3
+	cli-table-0.4.7
+	concolor-0.0.11
+	concolor-query-0.1.0
+	configparser-3.0.2
+	console-0.15.5
+	content_inspector-0.2.4
+	core-foundation-0.9.3
+	core-foundation-sys-0.8.4
+	cpufeatures-0.2.7
+	crc32fast-1.3.2
+	crossbeam-channel-0.5.8
+	crossbeam-deque-0.8.3
+	crossbeam-epoch-0.9.14
+	crossbeam-utils-0.8.15
+	crypto-common-0.1.6
+	ctor-0.1.26
+	data-encoding-2.3.3
+	dialoguer-0.10.4
+	diff-0.1.13
+	digest-0.10.6
+	dirs-4.0.0
+	dirs-sys-0.3.7
+	dunce-1.0.4
+	either-1.8.1
+	encode_unicode-0.3.6
+	encoding_rs-0.8.32
+	errno-0.2.8
+	errno-dragonfly-0.1.2
+	fastrand-1.9.0
+	fat-macho-0.4.6
+	filetime-0.2.19
+	flate2-1.0.26
+	fnv-1.0.7
+	foreign-types-0.3.2
+	foreign-types-shared-0.1.1
+	form_urlencoded-1.1.0
+	fs-err-2.9.0
+	generic-array-0.14.7
+	getrandom-0.2.9
+	glob-0.3.1
+	globset-0.4.10
+	goblin-0.6.1
+	hashbrown-0.12.3
+	heck-0.4.1
+	hermit-abi-0.2.6
+	home-0.5.4
+	humantime-2.1.0
+	humantime-serde-1.1.1
+	idna-0.3.0
+	ignore-0.4.20
+	indexmap-1.9.3
+	indicatif-0.17.3
+	indoc-2.0.1
+	instant-0.1.12
+	io-lifetimes-1.0.4
+	is-terminal-0.4.2
+	itertools-0.10.5
+	itoa-1.0.6
+	js-sys-0.3.61
+	keyring-2.0.2
+	lazy_static-1.4.0
+	lddtree-0.3.2
+	libc-0.2.144
+	linux-keyutils-0.2.3
+	linux-raw-sys-0.1.4
+	lock_api-0.4.9
+	log-0.4.17
+	lzxd-0.1.4
+	mailparse-0.13.8
+	matchers-0.1.0
+	memchr-2.5.0
+	memoffset-0.8.0
+	mime-0.3.17
+	mime_guess-2.0.4
+	minijinja-0.32.1
+	minimal-lexical-0.2.1
+	miniz_oxide-0.7.1
+	msi-0.5.1
+	multipart-0.18.0
+	native-tls-0.2.11
+	nom-7.1.3
+	normalize-line-endings-0.3.0
+	normpath-1.0.1
+	nu-ansi-term-0.46.0
+	num_cpus-1.15.0
+	number_prefix-0.4.0
+	once_cell-1.17.1
+	openssl-0.10.52
+	openssl-macros-0.1.0
+	openssl-probe-0.1.5
+	openssl-src-111.25.2+1.1.1t
+	openssl-sys-0.9.87
+	os_pipe-1.1.2
+	os_str_bytes-6.5.0
+	output_vt100-0.1.3
+	overload-0.1.1
+	parking_lot-0.12.1
+	parking_lot_core-0.9.6
+	path-slash-0.2.1
+	pep440_rs-0.3.6
+	pep508_rs-0.1.5
+	percent-encoding-2.2.0
+	pin-project-lite-0.2.9
+	pkg-config-0.3.27
+	plain-0.2.3
+	platform-info-1.0.2
+	portable-atomic-0.3.19
+	ppv-lite86-0.2.17
+	pretty_assertions-1.3.0
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro2-1.0.57
+	psm-0.1.21
+	pyproject-toml-0.6.0
+	python-pkginfo-0.5.5
+	quote-1.0.26
+	quoted_printable-0.4.8
+	rand-0.8.5
+	rand_chacha-0.3.1
+	rand_core-0.6.4
+	rayon-1.7.0
+	rayon-core-1.11.0
+	redox_syscall-0.2.16
+	redox_users-0.4.3
+	regex-1.7.3
+	regex-automata-0.1.10
+	regex-syntax-0.6.29
+	rfc2047-decoder-0.2.2
+	ring-0.16.20
+	rustc_version-0.4.0
+	rustix-0.36.7
+	rustls-0.20.8
+	rustls-pemfile-1.0.2
+	rustversion-1.0.12
+	ryu-1.0.13
+	same-file-1.0.6
+	schannel-0.1.21
+	scopeguard-1.1.0
+	scroll-0.11.0
+	scroll_derive-0.11.0
+	sct-0.7.0
+	security-framework-2.9.0
+	security-framework-sys-2.9.0
+	semver-1.0.17
+	serde-1.0.155
+	serde_derive-1.0.155
+	serde_json-1.0.95
+	serde_spanned-0.6.1
+	sha2-0.10.6
+	sharded-slab-0.1.4
+	shell-escape-0.1.5
+	shell-words-1.1.0
+	shlex-1.1.0
+	similar-2.2.1
+	smallvec-1.10.0
+	smawk-0.3.1
+	snapbox-0.4.4
+	snapbox-macros-0.3.1
+	socks-0.3.4
+	spin-0.5.2
+	stacker-0.1.15
+	static_assertions-1.1.0
+	strsim-0.10.0
+	syn-1.0.109
+	tar-0.4.38
+	target-lexicon-0.12.7
+	tempfile-3.4.0
+	termcolor-1.2.0
+	terminal_size-0.2.3
+	textwrap-0.16.0
+	thiserror-1.0.39
+	thiserror-impl-1.0.39
+	thread_local-1.1.7
+	time-0.3.20
+	time-core-0.1.0
+	time-macros-0.2.8
+	tinyvec-1.6.0
+	tinyvec_macros-0.1.1
+	toml-0.5.11
+	toml-0.7.3
+	toml_datetime-0.6.1
+	toml_edit-0.19.8
+	tracing-0.1.37
+	tracing-attributes-0.1.23
+	tracing-core-0.1.31
+	tracing-log-0.1.3
+	tracing-serde-0.1.3
+	tracing-subscriber-0.3.17
+	trycmd-0.14.11
+	twox-hash-1.6.3
+	typenum-1.16.0
+	unicase-2.6.0
+	unicode-bidi-0.3.13
+	unicode-ident-1.0.8
+	unicode-linebreak-0.1.4
+	unicode-normalization-0.1.22
+	unicode-width-0.1.10
+	untrusted-0.7.1
+	ureq-2.6.2
+	url-2.3.1
+	uuid-1.3.3
+	valuable-0.1.0
+	vcpkg-0.2.15
+	version_check-0.9.4
+	versions-4.1.0
+	wait-timeout-0.2.0
+	walkdir-2.3.3
+	wasi-0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-0.2.84
+	wasm-bindgen-backend-0.2.84
+	wasm-bindgen-macro-0.2.84
+	wasm-bindgen-macro-support-0.2.84
+	wasm-bindgen-shared-0.2.84
+	web-sys-0.3.61
+	webpki-0.22.0
+	webpki-roots-0.22.6
+	which-4.4.0
+	wild-2.1.0
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	windows-sys-0.42.0
+	windows_aarch64_gnullvm-0.42.2
+	windows_aarch64_msvc-0.42.2
+	windows_i686_gnu-0.42.2
+	windows_i686_msvc-0.42.2
+	windows_x86_64_gnu-0.42.2
+	windows_x86_64_gnullvm-0.42.2
+	windows_x86_64_msvc-0.42.2
+	winnow-0.4.6
+	xattr-0.2.3
+	xwin-0.2.12
+	yansi-0.5.1
+	zeroize-1.6.0
+	zip-0.6.6"
+# additional crates used by test-crates/* test packages,
+# `grep test-crates tests/run.rs` to see which are needed
+CRATES_TEST="
+	anyhow-1.0.69
+	askama-0.11.1
+	askama_derive-0.11.2
+	askama_escape-0.10.3
+	askama_shared-0.12.2
+	bincode-1.3.3
+	camino-1.1.2
+	cargo_metadata-0.15.3
+	cc-1.0.73
+	cc-1.0.74
+	getrandom-0.2.8
+	goblin-0.6.0
+	indoc-1.0.7
+	itoa-1.0.5
+	libc-0.2.134
+	libc-0.2.137
+	libc-0.2.141
+	mime-0.3.16
+	once_cell-1.15.0
+	once_cell-1.16.0
+	once_cell-1.17.0
+	parking_lot_core-0.9.3
+	parking_lot_core-0.9.4
+	parking_lot_core-0.9.7
+	paste-1.0.11
+	proc-macro2-1.0.46
+	proc-macro2-1.0.47
+	proc-macro2-1.0.51
+	pyo3-0.18.1
+	pyo3-0.18.3
+	pyo3-build-config-0.18.1
+	pyo3-build-config-0.18.3
+	pyo3-ffi-0.18.1
+	pyo3-ffi-0.18.3
+	pyo3-macros-0.18.1
+	pyo3-macros-backend-0.18.1
+	python3-dll-a-0.2.6
+	quote-1.0.21
+	quote-1.0.23
+	ryu-1.0.12
+	semver-1.0.16
+	serde-1.0.152
+	serde_derive-1.0.152
+	serde_json-1.0.93
+	siphasher-0.3.10
+	syn-1.0.102
+	syn-1.0.103
+	syn-1.0.107
+	thiserror-1.0.38
+	thiserror-impl-1.0.38
+	unicode-ident-1.0.5
+	unicode-ident-1.0.6
+	uniffi-0.23.0
+	uniffi_bindgen-0.23.0
+	uniffi_build-0.23.0
+	uniffi_checksum_derive-0.23.0
+	uniffi_core-0.23.0
+	uniffi_macros-0.23.0
+	uniffi_meta-0.23.0
+	uniffi_testing-0.23.0
+	unindent-0.1.10
+	weedle2-4.0.0
+	windows-sys-0.36.1
+	windows-sys-0.45.0
+	windows-targets-0.42.2
+	windows_aarch64_gnullvm-0.42.0
+	windows_aarch64_msvc-0.36.1
+	windows_aarch64_msvc-0.42.0
+	windows_i686_gnu-0.36.1
+	windows_i686_gnu-0.42.0
+	windows_i686_msvc-0.36.1
+	windows_i686_msvc-0.42.0
+	windows_x86_64_gnu-0.36.1
+	windows_x86_64_gnu-0.42.0
+	windows_x86_64_gnullvm-0.42.0
+	windows_x86_64_msvc-0.36.1
+	windows_x86_64_msvc-0.42.0"
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+inherit bash-completion-r1 cargo distutils-r1 edo flag-o-matic toolchain-funcs
+
+DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
+HOMEPAGE="https://www.maturin.rs/"
+SRC_URI="
+	https://github.com/PyO3/maturin/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	$(cargo_crate_uris)
+	test? ( $(cargo_crate_uris ${CRATES_TEST}) )"
+
+# note: ring is unused, so SSLeay+openssl licenses can be skipped
+LICENSE="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC
+	MIT MPL-2.0 Unicode-DFS-2016 doc? ( CC-BY-4.0 OFL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc +ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="$(python_gen_cond_dep 'dev-python/tomli[${PYTHON_USEDEP}]' 3.{9..10})"
+DEPEND="ssl? ( dev-libs/openssl:= )"
+BDEPEND="
+	dev-python/setuptools-rust[${PYTHON_USEDEP}]
+	doc? ( app-text/mdbook )
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*')
+		dev-python/boltons[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+RDEPEND+=" ${DEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	if use test; then
+		# used to prevent use of network during tests
+		cat > "${T}"/pip.conf <<-EOF || die
+			[install]
+			no-index = yes
+			no-dependencies = yes
+		EOF
+
+		# used by *git_sdist_generator tests
+		git init -q || die
+		git config --global user.email "larry@gentoo.org" || die
+		git config --global user.name "Larry the Cow" || die
+		git add . || die
+		git commit -qm init || die
+	fi
+}
+
+src_configure() {
+	filter-lto # TODO: cleanup after bug #893658
+
+	local cargoargs=(
+		# TODO: try switching to `--profile gentoo` then should be able to
+		# remove all `use debug` checks and --release in tests, but needs:
+		# https://github.com/gentoo/gentoo/pull/29510
+		$(usev debug '--profile dev')
+		--no-default-features
+		# like release.yml + native-tls for better platform support than rustls
+		--features full,password-storage$(usev ssl ,native-tls)
+	)
+
+	export MATURIN_SETUP_ARGS=${cargoargs[*]} # --no-default-features if empty
+	export OPENSSL_NO_VENDOR=1
+}
+
+python_compile_all() {
+	use !doc || mdbook build -d html guide || die
+
+	if ! tc-is-cross-compiler; then
+		local maturin=target/$(usex debug{,} release)/maturin
+		${maturin} completions bash > "${T}"/${PN} || die
+		${maturin} completions fish > "${T}"/${PN}.fish || die
+		${maturin} completions zsh > "${T}"/_${PN} || die
+	else
+		ewarn "shell completion files were skipped due to cross-compilation"
+	fi
+}
+
+python_test() {
+	local -x COLUMNS=100 # what tests/cmd was generated for
+	local -x MATURIN_TEST_PYTHON=${EPYTHON}
+	local -x PIP_CONFIG_FILE=${T}/pip.conf
+	local -x VIRTUALENV_SYSTEM_SITE_PACKAGES=1
+
+	local skip=(
+		# avoid need for wasm over a single hello world test
+		--skip integration_wasm_hello_world
+		# fragile depending on rust version, also wants libpypy*-c.so for pypy
+		--skip pyo3_no_extension_module
+	)
+
+	edo cargo test $(usev !debug --release) ${MATURIN_SETUP_ARGS} -- "${skip[@]}"
+}
+
+python_install_all() {
+	dodoc Changelog.md README.md
+	use doc && dodoc -r guide/html
+
+	if ! tc-is-cross-compiler; then
+		dobashcomp "${T}"/${PN}
+
+		insinto /usr/share/fish/vendor_completions.d
+		doins "${T}"/${PN}.fish
+
+		insinto /usr/share/zsh/site-functions
+		doins "${T}"/_${PN}
+	fi
+}
diff --git a/dev-util/tree-sitter-cli/Manifest b/dev-util/tree-sitter-cli/Manifest
index 7df3c149473b..2859cd26a846 100644
--- a/dev-util/tree-sitter-cli/Manifest
+++ b/dev-util/tree-sitter-cli/Manifest
@@ -213,5 +213,5 @@ DIST windows_x86_64_gnullvm-0.42.2.crate 364068 BLAKE2B 64bc53e98eb3fc649c9b43a6
 DIST windows_x86_64_msvc-0.42.2.crate 666936 BLAKE2B bc3a456e7f8bc272f8978ec69506ec9d89f97b7582ebbe05d8bd57bdf8156ef62d0d2dc6137a97e81d54059d70db97a24af9a038adff357f5dfd28805d6193b5 SHA512 53a35f438903fceb59e36bd2ac331773fb8e6c8c5a6d984e79021761f91b3b4a23efe49d219667a4d0d23dcdbf906da9c24e74fb1cff93395b5c55ff524e3788
 EBUILD tree-sitter-cli-0.20.6.ebuild 2926 BLAKE2B f92a2937d094f4f357aedad06f6bd714f7c881b521a4e5c9b360dcc288844b11343b0d7bee922502e4d0fbd64df96ff74298289b333f2f63d483a8c98841edde SHA512 7472165b035d24e7108ed13e4cea1e75bd686d5ad32c9320ec45ae0c4c5ae047489861cf0607b6a1890fedf966625df83148fd692ed66b12ce658a29459bce2c
 EBUILD tree-sitter-cli-0.20.7.ebuild 2940 BLAKE2B 425847106b3ca58b17dc9e4fe915c72f8b17990f0ff08aee70e01cc79ffdb68f4672fd0ac80cf02b536646361c9b968600c2d2b1f74357f1fae23d4591b1b571 SHA512 74a4717f1c5bff7f82a7d6269992af5deec4375898d1945f6090270cc526bfacbd5aaa4ea227c367967fe2f03531a03247c8fceee628dacd37af8deb18b8ad57
-EBUILD tree-sitter-cli-0.20.8.ebuild 3226 BLAKE2B 0fe08a29efa816716d4099a035bb32afda6723204b6a62c935f4c7249b28cbb9c0b1ca530cadc6655788d4e28e2d0ac32d6c9aae4f2935c3a6f427bf4b6eec21 SHA512 fdf38296f191a143eb6735798371c3d4601fa851c7045f3d603640ec7e5f308db15522af25895503cc632e3f5b526dbca649d0ca9316d2be54b4183212816dbc
+EBUILD tree-sitter-cli-0.20.8.ebuild 3224 BLAKE2B 42bb9f19dfb687c2e9fc24eadf09800af26720da9c261c587ea9bc16043206a93f9ba1207c649c805edfd41399a513d77b0849bcd2d89925528581ec6e8e2d23 SHA512 7082b4d19c5a77dc11ee7101db9244389ba64f724007343419b506638705e347d6f69a3ced7798b422ef16439a2021ccaa123ab48ca0fc297ea532261677dfee
 MISC metadata.xml 678 BLAKE2B e000f4502ed07b8fffcbf05a9dcf0730407d70a00ddf289b8ffdd9e6d28df6481f7e6eec3416aa1278ad9602c098bde72bcaad4f7819c9554c39baf045555dc8 SHA512 37e64d773a4b01b34208b65be600e6f46c7633571d7ad39210b7957f41f31b296565304a4dc8a4ec0518489a89b1bf7a1b204111c4d428307b562e3f6d0575f8
diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.8.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.8.ebuild
index 0d6126beb4d7..e493c55eeb52 100644
--- a/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.8.ebuild
+++ b/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.8.ebuild
@@ -136,7 +136,7 @@ S="${WORKDIR}"/${MY_P}/cli
 
 LICENSE="Apache-2.0 BSD-2 CC0-1.0 ISC MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Test seems to require files (grammar definitions) that we don't have.
 RESTRICT="test"
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 3eae397ce06d..0cd52116805f 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index d551d864eafc..df31485378a0 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -18,5 +18,5 @@ DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B 7f7fa093e8af30919dd7
 EBUILD pcsx2-1.6.0-r3.ebuild 2647 BLAKE2B 7d7a0e595d3d8297f3ae0049b3c376f404eeb5a6f477486076e5ac2b72dae6065c97b845f715f4e7e52af158b9dfbe6bbc5cf4f10d051838eafe44553f76efd3 SHA512 18b6131c6ff0b292f4dde4a54b4a5c698a403860ab332e01f181e18931e5ac14cc131ce140de563125f63eeb8b3523b51c6df4f4ecf2086a00e000d4e3d0289b
 EBUILD pcsx2-1.7.3738-r1.ebuild 7645 BLAKE2B b4221e5efbd9dcf9453997909242c9ac505dd89e2e8ba92b3e9f3e006a01d6ae183bae1d9c2b4f7479130d66ed0bca7e2398882c71eca84b2ae71950a9ae1f95 SHA512 543fca97eb19b0b30a8dd3ff85bc8381ee13faddd1385a2258f5604d362580bbb65bec8326767ba320e9d1158d6fee18a3b7be80654ad444a1780fe7f835f8fb
 EBUILD pcsx2-1.7.4425-r1.ebuild 7824 BLAKE2B a7cd2fdfee6ad209b3c28b62315646de8de929b9e89b89cbcb3e3c66db911136070e1386fc8d7e5ba9d9c30300f985d3aab05692187b79f9a7ba9abd57dd3a30 SHA512 dbba738ebe39c1fb89f8a72d4c303054ad3a4ea360f462a9a0eaf5c890636cff2a34809ee134deaa3f342c998b19111187d0c9597e88e85be27cb8c90788cc08
-EBUILD pcsx2-9999.ebuild 7880 BLAKE2B 67c1e54baf71fa9f91b079a8d0e9920dc75c941ce31733700bcc7b795dde81c7bfb65d0ed41d985fdd122f2f023246f64a6ced9705ddabc4837e883a92f2a91a SHA512 2fa523c7812ac54acfd8cedc85c9c854c5bb6430f751a3804a35afe356bb7aa9c6fe4daa88d0bb4d64d114220cd9a51a690ff8583d29becdeff88e1415e0fb4b
+EBUILD pcsx2-9999.ebuild 7860 BLAKE2B d2ab654d35af92820542ce8bf791210c662433a6382f1b401420b145704123944a4904867979d75ffdd2205c7bba7bd70b5b2ee604ece8c157912cb6417cc853 SHA512 7801273b8722c9975a27549046f0b0f9548a8caf2656c978f318c955e4fd2008530ffa6198471622946ba3da1e7724713062f76594f41cde7de76215acc9f224
 MISC metadata.xml 905 BLAKE2B 704b0ab594db3d23761b25d1d18b0a7121a989f967cfeb533f06ffa2d688fbaaa426c61d9f7c8068410129784924c26684de9919994a9580f2db531f5e34aea3 SHA512 f65374e9062406f81607514193b362a11e7e682aca7e40995679a7d7597ab13304c0f57f6b4c9eebb4ebee60cb4cdaff06ad9801ba6ce75c3698e3a926d5bf1d
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index ca3efae59de9..be8593008a14 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -135,8 +135,8 @@ src_unpack() {
 src_prepare() {
 	cmake_src_prepare
 
-	sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/${PN}\";|" \
-		-i pcsx2/Frontend/CommonHost.cpp || die
+	sed -e "/AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/${PN}\";|" \
+		-i pcsx2/Pcsx2Config.cpp || die
 
 	if [[ ${PV} != 9999 ]]; then
 		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}-gentoo'"/' \
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index bda3c628d0a3..e6c2d5cf8ac5 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 8c17d0a4138e..3ae458f4b8a3 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,5 +1,7 @@
 DIST kdiff3-1.10.0.tar.xz 1073920 BLAKE2B 146a52805797742e377cc3b7291df7f9495f4e9b0c4bae53b5e0a1081c0a125603a966e2f8a8d6bafc24c437559ab3394e6cacc35007f265563e14d78af5f842 SHA512 5126605aec2ac0a7537f9fae583e54947015cead205ababcfddb44b4992f417633eab2a1bc3b06fffe2a427befa4d9e1efe9c13abdc5d9c3c4aaa1dde10d066d
 DIST kdiff3-1.10.2.tar.xz 1112600 BLAKE2B 095bf797c076ee52b65dbf67b948b7767252c793024a1cf45a522dc98393265d912a30c1a167ffdce3c575bdbbe878fe71d15f4c634fd07bc3bfefd227f2396b SHA512 cbf63eae296370174c97a52213f436e326c1c1c576506d83ebca0a4c443b95aa4d69593df0e6688e13d5f187d60c81bfeb198f3681c2df8a4cfd6279bbd9cd7d
+DIST kdiff3-1.10.3.tar.xz 1112224 BLAKE2B 0ec1b1d749fdc3b9669c508793efe12d7fac0f4efe36e39a7a7425f5b9ddaf2ff14152963f29b2a823d8e05518f151e6106d08a372b25fcab5a36222163ce9db SHA512 368621b7576d75973fba30ed2089cb249e3e695198996c4ffd1440ca0caffabc7540504dce559d9d2647609bbfe1645dc67198cd8b1d1c592a0d2a4332818f69
 EBUILD kdiff3-1.10.0.ebuild 1130 BLAKE2B cd197319fba952a492111451cdafed43bd08544f4af6cf3633bcd640a4bf66934abf69e79f4d6646e892fb8eebe124f9cfb9889f27fb14542dc04db84414fe14 SHA512 918b4db154262eb286819b32143dab7256ccd51334c860a8720da4a1e47210a60072d45d00e3e23ef3937561a15293c1c4a5bb62565c9555bfef82b945af3951
 EBUILD kdiff3-1.10.2.ebuild 1132 BLAKE2B be8644fd2509c51d7f3bf67a555b48c7e190d8bd384f249bc28d4009b362fdf88c7e3636e57484e9de13ace93eab04ef6b8ff7d979fb5ac445989467f5efdd3e SHA512 3f0b67a6249aa3f7af5f8bceaab2e48c55bbeb02ff12347c7cf164f9921a4a608b2f1a789a075c2e0d829acba98dcadf732123cbb45cb265b8208580e5d2f991
+EBUILD kdiff3-1.10.3.ebuild 1132 BLAKE2B be8644fd2509c51d7f3bf67a555b48c7e190d8bd384f249bc28d4009b362fdf88c7e3636e57484e9de13ace93eab04ef6b8ff7d979fb5ac445989467f5efdd3e SHA512 3f0b67a6249aa3f7af5f8bceaab2e48c55bbeb02ff12347c7cf164f9921a4a608b2f1a789a075c2e0d829acba98dcadf732123cbb45cb265b8208580e5d2f991
 MISC metadata.xml 431 BLAKE2B 6848facdd79d1805d96f6b9c8b8fadd673ac7884eb14b31c854e7043d8474ef2702ca0b43b6ddb235ea70a25b41b5ad93a2616d5ce2b87a53a53bcd4c42839e1 SHA512 7f2f61311bf3f8f926d2f6538e3f693ffbc059068062e6c5313d4b48c0ad4e8155f9ccda52f79e65ffdcd529002c9b29f84dcf6b612e3984db9444177509bd0c
diff --git a/kde-misc/kdiff3/kdiff3-1.10.3.ebuild b/kde-misc/kdiff3/kdiff3-1.10.3.ebuild
new file mode 100644
index 000000000000..1d6faa6f4ef7
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.10.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=5.82.0
+QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/kdiff3/ https://userbase.kde.org/KDiff3"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/diffutils
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_QT6=OFF
+	)
+	ecm_src_configure
+}
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index ba9ccc3a0bf1..c01d538d2c33 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest
index b135ef8a819d..ec4b86d434d5 100644
--- a/media-fonts/noto/Manifest
+++ b/media-fonts/noto/Manifest
@@ -5,6 +5,6 @@ DIST noto-20230201.tar.gz 1006343445 BLAKE2B 42d8c4777751f28d03ef45335e75f8c7b26
 DIST noto-20230331.tar.gz 1020818875 BLAKE2B 82df27ba94a15ba16fb7c47168ffd9684e030f478c91b98c7c99b97f9d0179f2124ffd68e662dab3edd1643ce032c35e4197d6f8c4f206a621a53b894b0c19a3 SHA512 e839a942e358b37acc47f57f9046a74b2370938b02de686d3dc89532d7ec0a664945f5010bada332466478b7b0d3b4866ce17ac568300ccee2bc27ee9da9e838
 DIST noto-20230430.tar.gz 1020909284 BLAKE2B 552d52204409fe143436160c2378b7ff0bfc0bf9f3e6ccbf22cf712b73d3a598c08f02399005b46f6d8701cec3537a2dd7a254a5ec036fa9f68dfe33326de1d8 SHA512 04af7b86089194b7428bda530d0a92fda2a62858eccf23a694dc0ec4c0506ca5afe944c0fb4ae9efe6f57aa6983f3f6dd681efa829abbffd82ec1ecd901f09fa
 EBUILD noto-20230201.ebuild 1331 BLAKE2B 34104c993ca3dd42357b5903c4c7a3f574c31833a18f55e8062eb0524950e89a3d4324f7aee276d579081ec2fc5e6f30ed6b83d9dfaf0472ac4fc2b78d90c256 SHA512 c11948ca12b43f314568b597663e32fd0844fbd52749d68a150c3d31059934456e9db6a71238fce339c7a57ad2d86a347f7e45441311710af1e60a4dfe28ad13
-EBUILD noto-20230331.ebuild 1332 BLAKE2B 83b22ebdf979617628568d774304579c379604bb94870e18771c61db9875643c6f03ae50086f89be4e3a74eb5efdf3b63cf6bf1d8a94eccf4a397e25d6dd7bcb SHA512 eac680c2dcb841f722c66ae36a7f804ef96e0c53c821d387a076d346c76531de86020f372ce8106857cddc2c7b07dc882798f4d38b1af9d5ac0590ff30eb7bc0
+EBUILD noto-20230331.ebuild 1331 BLAKE2B 4736f3d50a8dba4eecfcb3b32ca4b3c0c0618510fdb12ff3188c45056561ac8613e93403912c1a5c9398e80caef730a2d9e8de8a9d59f286dfc44655a2480e21 SHA512 4ca68b3e60f263689949d9075e1d0c1422a9443dd33179dfbe19fcb89c68ef8cfffc416fe8e0b092e780eac21fd009c98ef8f37f181196ee5935e9246da216db
 EBUILD noto-20230430.ebuild 1338 BLAKE2B bcb8c1d66acb7860551a621266364a5463323154d30f49254dcc86fe926eb360d1cd891b014d0745ba47950004bd27ed089a5ddb66a2fdd7c154be1cc2703c62 SHA512 c976da1a2e46e9eddfdfbce5ede85e213db08d9ca44a6a8556948b11ef95d13b91b7ef283a199ee4e1eee24aa5055f94e8113222d7a21500b92bd254d5dced77
 MISC metadata.xml 564 BLAKE2B 8a5a57d0c7d0595cd149b35ca37bb0657a59e32c8be70ab9f1db87f091fa2c725be532cc6266c05440582fb4b0a7bc90c2e96eb9ce54a4c957d48f25e5daf504 SHA512 058b6a482169a2b4839f79de7ff1eb98bc98c4592785cf7d431d69bbf6622ac620b718670a248011d42a258620a35fb98c7e992adc0bfcdfc8488698a891ddde
diff --git a/media-fonts/noto/noto-20230331.ebuild b/media-fonts/noto/noto-20230331.ebuild
index b63f563b0e40..e7c347476c41 100644
--- a/media-fonts/noto/noto-20230331.ebuild
+++ b/media-fonts/noto/noto-20230331.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/notofonts/notofonts.github.io/archive/${COMMIT}.tar.
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 # Extra allows to optionally reduce disk usage even returning to tofu
 # issue as described in https://www.google.com/get/noto/
 IUSE="cjk +extra"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 5c7bd5363bc7..fb8eb30f97f9 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index 8171797770f1..5d8116abba46 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,6 +1,6 @@
 AUX fotoxx-22.18-documentation.patch 1074 BLAKE2B ecc735e158614bdbe2d44ec7463314a3f2f1151aaa95938a9415c7041ba0677acb4393d7f4d6c8817c0335e46dd365cc6f441102e0b6eb6f5ab233e70bf11ee1 SHA512 047ec5fa957ed3a9ad4e9667998045ec1c2d4cd6676f57275c40ea7d8797a0f95c7cfa2cd747e72f0f913c376bccdc708d73f675929302ce828c9d346d20885f
-DIST fotoxx-23.2-source.tar.gz 9233622 BLAKE2B 425c6f20210c62d08ee14f53436f3256e829a6fa3453047fe07ee0357fa277cdfe37340a6c19d0c39c2885b5ab6478d4791eb00631447f0b8d6ee53436750d5b SHA512 6193c99f11034609fdc052cf29184835644c76fd37270d8a8e9a76524d7bec7ea6ddc8e0c0ad7874d6997eba5c8c81f0f1a355a06a1220600380931aab10759b
 DIST fotoxx-23.32-source.tar.gz 9273650 BLAKE2B 20d159e25ba280ff4f264da1a99f2af729bf881b5f2b140faaa278c924934aa5443b3d56144685be835184531972f8caa7cb550d418d41ad48c2e56b87ba7bf3 SHA512 484939d48e6bdfc15075718fcc26ae07e8b91462f00f447dfb97a7019931fe524d0fda89e07eec711ea03ad05913073ae253f166ebe39643e2a4b0f2caccee28
-EBUILD fotoxx-23.2.ebuild 2277 BLAKE2B ae2639674583950bd2a4c5b1f01338d426afddc900326269a51ac2f0fee09c6976641cf61c0db5354a5766be395c22b4ea08d68544ff1944e1b51542c3370c12 SHA512 7c97016ad17c0a041604ba86c5ac7806db1d6661a6c49fcf52fccb574e9397a5fc3182bd4c54d87a7a4faeda5629f5534a8e78ce3ad69de326de30ddae86d62d
+DIST fotoxx-23.50-source.tar.gz 9344552 BLAKE2B cb634e24b034bdb6e52bb2824fc549cfc1321516f4af8d8b34df4828122476fd46ca0234c6009616ad96a5d003818d403ef8ae6be115ac0a33db94e2eb8bd03e SHA512 629c7da961fcaff26916765a7b494b4596b8a9b62397901946c39c92bbc54694a2d3b9378a653f4144a191f74015e1067f0a414bfd4df00bc16982a922b52400
 EBUILD fotoxx-23.32.ebuild 2284 BLAKE2B 2612931ab0655bfcfa43514cad885b666a454a5ec7a3499f9fe184d6c97c5f3f5c63d0b718f543fc0ed6f06e524ad2865f9d7c4e8972da6bfeccc0f0a53e2590 SHA512 505990c00a1c630ef146eee15278fdaa36b73b0870b0cb91402a7d9529e9c3a5084e5eaa3a089385db7cbd9364872dbd7302a73e9dd37107e7530373c058ffca
+EBUILD fotoxx-23.50.ebuild 2286 BLAKE2B 379a2d8202422e3cbb09e1dc00b2d42513b9afc6cdf2d8e004a269e3de7d656b2c404160197cb3d0eb1e1fb0a795756949655588848d652c0ca20e5a5800c86c SHA512 04d5ca6c5057cfed2e05c7ca839741b529b6e72218f3bd083a2dc2d0a384bfbcbb2011e407c004658923291c70fec312951e391f904b36c43cbcbe704a16a508
 MISC metadata.xml 851 BLAKE2B a6c60b79fb5646c3bd7d6959d4a1b974ee714bf6ed64f205d9c00d684b3da94672005658336c1c5fcb903605d11c9a5607616151b2f6262f3173e15b8fc44655 SHA512 2794ae92afa076875c7f725969efdcf9cb84435d0ea033adc28f5860a69438b754f4d22b0db27dc7392683439e51b51ae581a6da450719276e8df51a2a306ad9
diff --git a/media-gfx/fotoxx/fotoxx-23.2.ebuild b/media-gfx/fotoxx/fotoxx-23.50.ebuild
index 6ccee638d826..6d3e66505952 100644
--- a/media-gfx/fotoxx/fotoxx-23.2.ebuild
+++ b/media-gfx/fotoxx/fotoxx-23.50.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://kornelix.net/downloads/downloads/${P}-source.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 # For required dependencies read doc/README, for required tools read
@@ -57,7 +57,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	optfeature "HEIC file support" media-libs/libheif
+	optfeature "HEIC & AVIF file support" media-libs/libheif
 	optfeature "additional RAW file support" media-gfx/rawtherapee
 	optfeature "additional RAW file support" media-gfx/darktable
 	optfeature "video thumbnails & playback" media-video/ffmpeg
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 4c7817eb22e8..e7834772de08 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libmp4v2/Manifest b/media-libs/libmp4v2/Manifest
index 46748fab150f..78728ab5f08f 100644
--- a/media-libs/libmp4v2/Manifest
+++ b/media-libs/libmp4v2/Manifest
@@ -11,5 +11,5 @@ DIST mp4v2-2.1.2.tar.bz2 594365 BLAKE2B ca7438ab34d826926bb39a9f1c09f24a65c2ea7a
 DIST mp4v2-2.1.3.tar.bz2 594549 BLAKE2B ee8e5792b5b92098e2990bd76a8be7aa6cffc60cb28059702a07eb5cc73dcc9def59dec290f40cbf246069b491d1911714fb00f8d48b77e421e8993fac37f76c SHA512 89bca9c76cf468a932a09d66bc5409266acde51184bf1262c5bc9a524ee5c9a3e073fd0d37450580284e12d9d46d1fd5db0c4ce647c365cc5106fb39ee3d59f6
 EBUILD libmp4v2-2.0.0-r2.ebuild 1315 BLAKE2B 17163eb97e6847b1c32b0065504a3108d4d389e5eb75c1f1823fd786583456c82d868b209f76f04b53306d3e17220e95d3b7bc247ea8fb635a787cded49dc1d2 SHA512 ef0f22022e9ee1371a566e3cd8435a14ae15ff25f654c34c9513e454bff12520a2878af8dee677deb0590c083a257f49ae31546047ba7a636df00d9bf0147934
 EBUILD libmp4v2-2.1.2.ebuild 802 BLAKE2B 550e959ec48a2ed79f73ace3c37570d994cbaf33d7638996270f3b8d370ab3ea44318aa309c4dd73ad10e560c6d76cc91b4061c58e297612afe0104e2acc77b3 SHA512 5eaecd3f6fda0e7792277214dd030a47823ca90273e92363a277193c642bffd464ff349e77c5128f3468c9d239db110813dbf004e09118d437ad7ec61e610654
-EBUILD libmp4v2-2.1.3.ebuild 798 BLAKE2B 9b58e9d91af0dc9d02d6d45f844eaf026c7645f2e9f782def3d365197e2b17258253310801d1ccfcb16733f03ab83414702d9d0480dd4c5a828a3e14f9530c4b SHA512 68da5450fbcef0e3e70ccb20098dbbdd8d3a335c0924e74b86f26a499c592b7492ace0d9421e017ae21c451fbdfba00a935e6857140d09533c6af56727265c75
+EBUILD libmp4v2-2.1.3.ebuild 796 BLAKE2B ef15542d87e8886fda5aaeabfd1cfc0c6c1615a6d710f621d6d513e9f2ecccd8a6b5f2949d22755f788c4941e1b956a787016cf628cbc9e2d59823994dd7d6aa SHA512 29e65c1c2d29e2e7d9a628afba396d92652429a5730bcdeb3bce85b3431af449e9b06b0e20c844105b0163121373dd982429bee566bda634f947d16962e6898e
 MISC metadata.xml 407 BLAKE2B bce0be3a2817259413395a925b55e59d503f988bc2d54b9fd3ff632de284205bb515944e3b1ec95da6a7df2f45f32b1a78706e902f5ea4ff6cebe085db483782 SHA512 999f244426cf480a967cb030e4e3e5c63e39c4fc7eb73e3c0e091b492b65f6aef2b66856ee9040a5d9d44efe72a136fea848479875a39eac37bc62dfaa294777
diff --git a/media-libs/libmp4v2/libmp4v2-2.1.3.ebuild b/media-libs/libmp4v2/libmp4v2-2.1.3.ebuild
index a50a5f46e9cc..2f1481443979 100644
--- a/media-libs/libmp4v2/libmp4v2-2.1.3.ebuild
+++ b/media-libs/libmp4v2/libmp4v2-2.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/enzo1982/mp4v2/releases/download/v${PV}/${MY_P}.tar.
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="utils"
 # Tests need DejaGnu but are non-existent (just an empty framework)
 RESTRICT="test"
diff --git a/media-libs/ptex/Manifest b/media-libs/ptex/Manifest
index 20aff6a20661..0999cf9cd10e 100644
--- a/media-libs/ptex/Manifest
+++ b/media-libs/ptex/Manifest
@@ -1,6 +1,3 @@
-AUX ptex-2.3.2-cxx11.patch 828 BLAKE2B e445858c625de0c924a412690cbf2f1bed6ee4fd7efafd60765a4f43fa204ba474cdf2944acf3eb94b061df6c39cd9016413e6c5d73da3813144fa289746ceb4 SHA512 53d6e66dd4a35dc2e16e5f227a24ec90d3f7667c5f80dc3d7321086b4efb4d63451783450a02a389c09a3faa6808cd90e89e2097390ef9881ffe313fbfd8c6d1
-DIST ptex-2.3.2.tar.gz 308550 BLAKE2B 7b3145dbf9d2c13140c3f20ed606ee911deed3c38fd30adfbb01b58c3af5794dbd4e0fa1fbab6e8ae83556a0ffec725bf077271abf752f1271ed721ca200a1ff SHA512 dbc557dc5e1761204ee3483af9bf4ff1504cbd7955e0405dc27a51f7182e2445e41db086b2792c2491aa2cbaddc74e523170a4b3d25e44d332123d5b7081f4b9
 DIST ptex-2.4.2.tar.gz 312942 BLAKE2B 13446eae2327f92410859f7e01dc30e46a069d2069b2b1bf1bd9fe52902efacb6aeadc2c3bdc66dfad17662e01ae6fd3fac2861674691646871721d9e12ceb12 SHA512 3b9607b7803e7c857bb00a6d4d8bbe108810c622a3593fb5d655183f3e6689f274ee5e79bcaab6928de38daf05cf25eb56125f39477f134131a8ad45071551b3
-EBUILD ptex-2.3.2.ebuild 792 BLAKE2B 9759109603da17ed5649107fd744feb96564be649e4c12d318e304c634c6dcea9b5eadbaf9de8f169ee86fed713cc6a0c47c2b365361855ecdeb655c9509fea8 SHA512 71ea5748f83cdda076fef5e33e4e408738b528e03573766051728fa5154695e53551dc8db89a21a1c2bb792f37fb8302a901a16b9c2d4fa7046edb3d36b81eb8
 EBUILD ptex-2.4.2.ebuild 760 BLAKE2B 2bd771cc2ccf6e0694da84d96ec24ee1d2f78f6eab914e19a1d358473934fa785e252dec4768fb626996219757785008b027a0b0cf8fb6024c2a4fc33e91b179 SHA512 5b3fa1b73ac2fb19033e537aafae72867ed16921780896708dbc0a70be11d86aecadb81f864a5df4957bcf470ed6b59df351b96e5ae70f61a088788c42ad0c5d
 MISC metadata.xml 600 BLAKE2B d9d0adf3359a65e862ebf7cf81cf0a70f88c84eb9ae3100116d66083537760d7b94cee5ee28cb01adaf4d2db701b1116a5ef70dd39044038bcdadacbdfd4a463 SHA512 28ee7d1b2eb3bb208762a0bbf78a56fba7b0107858dd12f8f7d1a86eb4211ede2acdca82726c20b4e244b52bade183cbdd2a1d9b9bff77613b7c17bc6a87fac2
diff --git a/media-libs/ptex/files/ptex-2.3.2-cxx11.patch b/media-libs/ptex/files/ptex-2.3.2-cxx11.patch
deleted file mode 100644
index f35372b7c636..000000000000
--- a/media-libs/ptex/files/ptex-2.3.2-cxx11.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/CMakeLists.txt	2019-03-08 18:39:47.000000000 +0100
-+++ b/CMakeLists.txt	2019-05-21 23:20:50.964082298 +0200
-@@ -5,19 +5,6 @@
- option(PTEX_BUILD_SHARED_LIBS "Enable building Ptex shared libraries" ON)
- option(PRMAN_15_COMPATIBLE_PTEX "Enable PRMan 15 compatibility" OFF)
- 
--if (DEFINED ENV{CXXFLAGS_STD})
--    if ($ENV{CXXFLAGS_STD} STREQUAL "c++17")
--        set(CMAKE_CXX_STANDARD 17)
--    elseif ($ENV{CXXFLAGS_STD} STREQUAL "c++14")
--        set(CMAKE_CXX_STANDARD 14)
--    elseif ($ENV{CXXFLAGS_STD} STREQUAL "c++11")
--        set(CMAKE_CXX_STANDARD 11)
--    else ()
--        set(CMAKE_CXX_STANDARD 98)
--    endif ()
--else ()
--    set(CMAKE_CXX_STANDARD 98)
--endif ()
- set(CMAKE_CXX_EXTENSIONS OFF)
- set(CMAKE_FIND_PACKAGE_RESOLVE_SYMLINKS ON)
- set(CMAKE_INSTALL_MESSAGE LAZY) # Silence "Up-to-date:" install messages
diff --git a/media-libs/ptex/ptex-2.3.2.ebuild b/media-libs/ptex/ptex-2.3.2.ebuild
deleted file mode 100644
index 7a3f0ff151bf..000000000000
--- a/media-libs/ptex/ptex-2.3.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Per-Face Texture Mapping for Production Rendering"
-HOMEPAGE="http://ptex.us/"
-SRC_URI="https://github.com/wdas/ptex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-IUSE="static-libs"
-
-BDEPEND="app-doc/doxygen"
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${P}-cxx11.patch" )
-
-src_prepare() {
-	# https://github.com/wdas/ptex/issues/41
-	cat <<-EOF > version || die
-	${PV}
-	EOF
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/html"
-		-DPTEX_BUILD_STATIC_LIBS=$(usex static-libs)
-	)
-	cmake_src_configure
-}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 1b2e2506fe24..37b4a0028ff6 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 4f8ce361f6b1..dae16d0b250c 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -13,7 +13,7 @@ DIST pipewire-0.3.69.tar.bz2 1567927 BLAKE2B 1b62e7cd359a4b1ee75793939026eef2c09
 DIST pipewire-0.3.70.tar.bz2 1573378 BLAKE2B 3824106cba9c1b0a82c6d8889b2b1473f4bfc5d0994ee9dd8b46a454c287bbd4e0ad5dc508df5d4a9b7c5f683898ed756947788e561f2bf51a3116b12e46d075 SHA512 8b25d90232d07d5b1e210bd8f24240438a7dcece23a5be59a4e49fc3daf51ebf659f2cc343a0d913310a4659792590ef981ab7a59890506557f9510d902a0cff
 EBUILD pipewire-0.3.67.ebuild 17491 BLAKE2B c4778fa3e2a3e72691ee280e06b94dc68730851b8baccc7a8a1db630dcf89ec06a5229e826c5e7b53a7b1369047ffeb2782aba5b47b7db6f4b0acbacd678070d SHA512 d49074253b32fbf4da193e99c2e5b684b9adbe85d4a68d666ee30adadf0fab925195b63544b929b85eeb049ed23010f88a05806cb87ad33f836185b8430943e0
 EBUILD pipewire-0.3.69-r1.ebuild 17542 BLAKE2B 91ea87322e38984dd97391cd96e5a85a463651d9133f4c5ced0ce8498aef6f20c2c517aed9668ee138b2dbeef92af42a8487b30e556f481ae7380621b54a5422 SHA512 6c678aceec2805be7319d8f0000e7e0749cf17684c0f080ad572ec1477f97141aecd9977e76afcd6e0d3d0b2220cf71387acee5934b93f7e7f9610ae0a642e1d
-EBUILD pipewire-0.3.70-r2.ebuild 17540 BLAKE2B ab6495749d1ca095bf0be3e323300b29fdc57914636a04e7084f2161d6d932713a110a486c9e00aac4559290d0fbd636f6b4f20a0eac406449cf2d060ef23f97 SHA512 1dde96578437fcf4d733b5f70fba85b1b09d071f63dec59bcc1289c37418f9db60734e2883bf788a9925bbf494a229b297efbaa610b0ea84137ebf09b5f446ec
+EBUILD pipewire-0.3.70-r2.ebuild 17539 BLAKE2B 9f164fe20cd835c94c0250578b20d3e1861e668ce8699be49fd4d42f4915c00d425abdb23446ea9ff8c1661cd2efb46fcf6102e4e4b14ccc39e7e7c6db879a88 SHA512 0fe3258c2380f98003299c731468ce11bf075124c0ca700620f8908d069055258cf682bd6c90c9e021ac925a7afd3cc139b6acfbaa74d1ea3e5b827d2aaaedd9
 EBUILD pipewire-0.3.70.ebuild 17542 BLAKE2B 91ea87322e38984dd97391cd96e5a85a463651d9133f4c5ced0ce8498aef6f20c2c517aed9668ee138b2dbeef92af42a8487b30e556f481ae7380621b54a5422 SHA512 6c678aceec2805be7319d8f0000e7e0749cf17684c0f080ad572ec1477f97141aecd9977e76afcd6e0d3d0b2220cf71387acee5934b93f7e7f9610ae0a642e1d
 EBUILD pipewire-9999.ebuild 17545 BLAKE2B ebcd85f9a008ccc102ed070749b594309a410a6a74eefa2e6d41c9a8d1d8ee0bbd806e738aa02a6afe2d4e8f3ad8d5376c1cf5481e1bf60035f81560ab0fb745 SHA512 986786459c00b68fe51553f1ddcb3ce2aff5e1bddbc587bcb4465236978a2c742eaff708db4aa24231eeed810199adc0900c6d95aecca2a64bcf1becf2bb5421
 MISC metadata.xml 1860 BLAKE2B 8f537f36217aa1c5869e48a1af71cae96b56e60f5cd9b811739be159dd3aeeabe3c31dccc3d7f695f7361f7d262f8c68230fb410e389465b9264d8e6af232aa5 SHA512 d2ae3129e67b7527bbd3481ac77e27de4e26f6ff77601a7538d5e888c7737b7b39d981be4dcf245ea8d676823f1b1fbf8d854feefa62b74962710af17248d731
diff --git a/media-video/pipewire/pipewire-0.3.70-r2.ebuild b/media-video/pipewire/pipewire-0.3.70-r2.ebuild
index 732e73fff23e..bb244de636b6 100644
--- a/media-video/pipewire/pipewire-0.3.70-r2.ebuild
+++ b/media-video/pipewire/pipewire-0.3.70-r2.ebuild
@@ -29,7 +29,7 @@ else
 		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
 	fi
 
-	KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 70fe9b54dcce..ea98c62e78b0 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 02f90f93717d..49c9fed8e183 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 16 May 2023 14:40:05 +0000
+Tue, 16 May 2023 20:40:00 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index bea675364f8e..e8488571ed9e 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 543888 BLAKE2B da15fb010da91c403608af1847df77a89c9a8a24b2f5c1999256191c31d7755cd7667c19867e75c2bbdd07063f4ce4dd641cf53415eb08b83e35cbb3d2cd35e2 SHA512 ac5e51b2bf8075889870e4eedfe469274eaf28945ed1e974bc76ae0576dc1aa0db2a5fdacfc15e8cfb28486195fad65b487cf50896a207c5fcad4ffae850adbc
-TIMESTAMP 2023-05-16T14:40:09Z
+TIMESTAMP 2023-05-16T20:40:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRjlclfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRj6iRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCLnBAAsmmyQsg5Y8mVzVC4KDPvBnYM/R46Hb49idQ0gFgPcsPNRArR0XJHIzMu
-SVzR/2//DxKWlLK9SQZXgRC2RWhRiwn/Y+ejUV+bSYlHllbBTXB/x3WCLgkD8D2z
-EDRRo1bJHTiIyTOe2U8Q8r8LhxbE3qQzAU12yQRR7pp8brMeve/D066rB3583VNh
-z77XWY3M1p0r3cE+gAbwzpDRHyS03EAbeRoJboJzOVejrRvXqLjaPxmoxBMuU96O
-lw5ZkWw/ujAH0+19Yj6Z7JTiQRHDeulypw+AL5PesTGYSWqo5lz36MMHbxDwraP+
-whJMSIO3fjkiu6Bodra9vyG5Stmca+inmt9yf3jirKSohIjMH2AhIsV+TODf4Q2a
-99M/W3sBPwSxJeKMuFv6ficJLvYZkOJEo11kod/4nBKvPGWlSmA1cm7QbvM4UJ56
-5ZIM1Oc1JxqzAiMYZVmbZCJ0ITzf/IyhDjGSt/pCk+rB1OfRARnwOR9DzvV0qJbT
-rtKQMENfWzHUYY553utNuq7j+hV3NaoHFFCdwktfCZt/R3BlX3sZMoDGYATyJWiI
-Kv8MxbEixTt15GMebAevHcwoRvuJcdRRDk/Ew8IvPl3jESSh1UiZ8FGDUJGQGaVh
-MAcWPIhRsQDWsOPq8AaO4KVo1DsT2KGc6+AL/z6JoSs9/4UTQ8o=
-=ikhk
+klCUARAAqH7v9kSfIYE7dH/WgCUYe3jfla07iQxWgnSJJWZinp5qXcoOqU5HPrzN
+Bx3tewIuRtm7C6Z3jQ5p7G89RNG7FQ8IVpv2QoDnB3EaHxAEQ1OTveIbSgg8Bp/w
+SleIfW6Zscx3pTFVclhaQwpmmjeHyCycUH0WafPo0gQAPdW1A+uUcL7HwckV9Wa/
+jMcl5G9JpYv7O38l9CKsQr6mcZxCvQglAWwcVoTwVS3nXQDAAHhcoGBQnq7s5/ho
+C8FYTQzLMFBoSeHOYJsXBTMKeNCo81jw0pFHVS3YQkTATFvbDA8qSd2iY0bI1kk2
+0JkIN5eKDkH2TLuAHsSorTNS8OPdl8zqcRXYQqJja2tcCfzO6B/s313YesXq4m4M
+a7IWBxVN96i30KMZC5OQ68/UHl6w4WPf0OA+P4DjBlmGcFrVcB4FGMLKQLIyNjm3
+/J8xtKrg83Z4UcZ+m5smfLL6/KITrmmS+iOfAFmXg9h+wZEaTuhEvcFryvkRXTK4
+I0nTrAFDP6IGtAla0vaETsY6Gk8/dDKShv4QKNWjsVzc6NQWlZGQAmpooOwPWYzW
+cqJjHS30OdGBXJwp7WThT6WRVS4BYR65CV5ZnAqO+ktvdATPnWrG6hzQl+F+XkO3
+4T2jVfRdQZlU7i74JEzzKEfGbNp/GzhF5YIhn0AKBtLLktQ2wwo=
+=KBYe
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a61dd9875b4f..c47c50a562b2 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 16 May 2023 14:40:06 +0000
+Tue, 16 May 2023 20:40:01 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 1a433b8753b5..be834d2ec23e 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index e9c6c6fc2653..483a7c3f7d16 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/jinx-0.8 b/metadata/md5-cache/app-emacs/jinx-0.8-r1
index 1e1694aa95d4..3b2422907f5f 100644
--- a/metadata/md5-cache/app-emacs/jinx-0.8
+++ b/metadata/md5-cache/app-emacs/jinx-0.8-r1
@@ -11,4 +11,4 @@ RDEPEND=app-text/enchant:2 >=app-emacs/compat-29.1.4.0 >=app-editors/emacs-27.1:
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~arsen/jinx-0.8.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c2c2ccce990adfae16f04e42eb35b6c7
+_md5_=bac243709d3973226523207d8082a912
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.6.2 b/metadata/md5-cache/app-emacs/org-mode-9.6.6
index afdfc86d38d1..92012923f89f 100644
--- a/metadata/md5-cache/app-emacs/org-mode-9.6.2
+++ b/metadata/md5-cache/app-emacs/org-mode-9.6.6
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.orgmode.org/
 INHERIT=elisp readme.gentoo-r1
 IUSE=doc odt-schema
-KEYWORDS=amd64 ppc x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )
 RDEPEND=>=app-editors/emacs-25.3:*
 RESTRICT=test
 SLOT=0
-SRC_URI=https://git.savannah.gnu.org/cgit/emacs/org-mode.git/snapshot/org-mode-release_9.6.2.tar.gz
+SRC_URI=https://git.savannah.gnu.org/cgit/emacs/org-mode.git/snapshot/org-mode-release_9.6.6.tar.gz
 _eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3
-_md5_=cd8c0a45af44cb1dfb5dc5d90caeeea8
+_md5_=567831454e98525b3087c46320283b5f
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 4572cac6aacd..acbbe529163d 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r4 b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r4
index 46ad465fcd4c..8e58e675863e 100644
--- a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r4
+++ b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r4
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://github.com/docbook/wiki/wiki
 INHERIT=ruby-single
 IUSE=ruby
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~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 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=app-text/build-docbook-catalog-1.1 ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) dev-ruby/rexml )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook/docbook-xsl-1.79.1.tar.bz2
 _eclasses_=ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	ded1d92dc7636277a04b01f3b3cb7e26
-_md5_=d36649142e1e427ddccd19150864e75b
+_md5_=dd128883bc37fc831d7b14839a727577
diff --git a/metadata/md5-cache/app-text/languagetool-5.4 b/metadata/md5-cache/app-text/languagetool-5.4
index eed8b8d1d337..672e793c2655 100644
--- a/metadata/md5-cache/app-text/languagetool-5.4
+++ b/metadata/md5-cache/app-text/languagetool-5.4
@@ -5,10 +5,10 @@ DESCRIPTION=A proof-reading tool for many languages
 EAPI=7
 HOMEPAGE=https://www.languagetool.org/
 INHERIT=java-pkg-2 desktop xdg-utils
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8 dev-java/commons-cli:1 dev-java/commons-collections:4 dev-java/commons-io:1 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/hamcrest-core:1.3 dev-java/jcommander:0 dev-java/jna:4 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://www.languagetool.org/download/LanguageTool-5.4.zip
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7a0a5e045ba2b218e36316fdff669fc0
+_md5_=ede04d29980f6377f9ab4b2390b464a4
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 1c1e0f72dd57..77c814d230be 100644
--- a/metadata/md5-cache/app-vim/Manifest.gz
+++ b/metadata/md5-cache/app-vim/Manifest.gz
diff --git a/metadata/md5-cache/app-vim/bash-support-4.3 b/metadata/md5-cache/app-vim/bash-support-4.3
index 62cc1ead8398..53fd08db59f5 100644
--- a/metadata/md5-cache/app-vim/bash-support-4.3
+++ b/metadata/md5-cache/app-vim/bash-support-4.3
@@ -5,10 +5,10 @@ DESCRIPTION=vim plugin: write and run bash scripts using menus and hotkeys
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=365
 INHERIT=vim-plugin
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=24452 -> bash-support-4.3.zip
 _eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=3ddb6159ccbc2eb1a2ee4a56323e3e26
+_md5_=7d1a89d2ae1c28c4493210c4c6bdbe3f
diff --git a/metadata/md5-cache/app-vim/languagetool-1.30 b/metadata/md5-cache/app-vim/languagetool-1.30
index 2d8ba2c9b034..f8775634f891 100644
--- a/metadata/md5-cache/app-vim/languagetool-1.30
+++ b/metadata/md5-cache/app-vim/languagetool-1.30
@@ -4,10 +4,10 @@ DESCRIPTION=grammar checker for various languages
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3223
 INHERIT=vim-plugin
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=vim
 RDEPEND=app-text/languagetool || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/languagetool-1.30.tar.bz2 https://dev.gentoo.org/~radhermit/vim/languagetool-1.30.tar.bz2
 _eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=82360cb097280db05c9c4918babba7f5
+_md5_=59b8f1e8ede143a8fd7f891304608747
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 31465083c779..542ac157e4a7 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/doctest-2.4.11 b/metadata/md5-cache/dev-cpp/doctest-2.4.11
index 4b59616e6072..aa312bcdaec7 100644
--- a/metadata/md5-cache/dev-cpp/doctest-2.4.11
+++ b/metadata/md5-cache/dev-cpp/doctest-2.4.11
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/doctest/doctest
 INHERIT=cmake
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/doctest/doctest/archive/v2.4.11.tar.gz -> doctest-2.4.11.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d1420624208a658e64cfdd581858d284
+_md5_=19d5f281c37da326ac317ea87e59023f
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 68dc0b36ae46..bc192725b1cd 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/mariadb-10.4.28-r1 b/metadata/md5-cache/dev-db/mariadb-10.4.28-r1
index 45b3f7516148..401bb299b145 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.4.28-r1
+++ b/metadata/md5-cache/dev-db/mariadb-10.4.28-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://mariadb.org/
 INHERIT=systemd flag-o-matic prefix toolchain-funcs multiprocessing java-pkg-opt-2 cmake
 IUSE=+backup bindist cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap tcmalloc test tokudb xml yassl jdbc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.2 !dev-db/mariadb:10.3 !dev-db/mariadb:10.5 !dev-db/mariadb:10.6 !dev-db/mariadb:10.7 !dev-db/mariadb:10.8 !dev-db/mariadb:10.9 !dev-db/mariadb:10.10 !dev-db/mariadb:10.11 !dev-db/mariadb:11.0 !<virtual/mysql-5.6-r11 !<virtual/libmysqlclient-18-r1 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( <dev-libs/openssl-3:= ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy:= ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( dev-libs/boost:= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy:= ) ) >=dev-libs/libpcre-8.41-r1:3= virtual/libcrypt:= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-26* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.8 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -15,4 +15,4 @@ RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.4/18
 SRC_URI=mirror://mariadb/mariadb-10.4.28/source/mariadb-10.4.28.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.4.26-patches-01.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a2ae9a84dcb7a8a4fe76384ba10d8d77
+_md5_=9f29aec39c9a91fc2a6612d0cab7a13b
diff --git a/metadata/md5-cache/dev-db/unixODBC-2.3.9-r1 b/metadata/md5-cache/dev-db/unixODBC-2.3.9-r1
index 68f9d11be431..1e51a53afcd6 100644
--- a/metadata/md5-cache/dev-db/unixODBC-2.3.9-r1
+++ b/metadata/md5-cache/dev-db/unixODBC-2.3.9-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=http://www.unixodbc.org/
 INHERIT=multilib-minimal
 IUSE=+minimal odbcmanual static-libs unicode 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 ~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=GPL-2 LGPL-2.1
 RDEPEND=|| ( dev-libs/libltdl: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(-)?] >=sys-devel/libtool-2.4.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(-)?] ) >=sys-libs/readline-6.2_p5-r1: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(-)?] >=sys-libs/ncurses-5.9-r3: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(-)?] >=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(-)?]
 SLOT=0
 SRC_URI=ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.9.tar.gz
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7703d34196162bf90eea1457d60418ac
+_md5_=f7861fda4a49f8f42c2249f164d66fa6
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 2ae72bd8f0d6..d2be61726090 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/go-1.19.9 b/metadata/md5-cache/dev-lang/go-1.19.9
new file mode 100644
index 000000000000..4795eede78d6
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/go-1.19.9
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
+DEFINED_PHASES=compile install postinst test
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=7
+HOMEPAGE=https://go.dev
+INHERIT=toolchain-funcs
+IUSE=abi_mips_o32 abi_mips_n64 cpu_flags_x86_sse2
+KEYWORDS=-* ~amd64 arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=arm? ( sys-devel/binutils[gold] ) arm64? ( sys-devel/binutils[gold] )
+RESTRICT=strip
+SLOT=0/1.19.9
+SRC_URI=https://storage.googleapis.com/golang/go1.19.9.src.tar.gz
+_eclasses_=multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=9ecb58d33bc8de45131e03bd2e00c74a
diff --git a/metadata/md5-cache/dev-lang/go-1.20.4 b/metadata/md5-cache/dev-lang/go-1.20.4
new file mode 100644
index 000000000000..956aa0cac314
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/go-1.20.4
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
+DEFINED_PHASES=compile install postinst test
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=7
+HOMEPAGE=https://go.dev
+INHERIT=toolchain-funcs
+IUSE=abi_mips_o32 abi_mips_n64 cpu_flags_x86_sse2
+KEYWORDS=-* ~amd64 arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=arm? ( sys-devel/binutils[gold] ) arm64? ( sys-devel/binutils[gold] )
+RESTRICT=strip
+SLOT=0/1.20.4
+SRC_URI=https://storage.googleapis.com/golang/go1.20.4.src.tar.gz
+_eclasses_=multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=9ecb58d33bc8de45131e03bd2e00c74a
diff --git a/metadata/md5-cache/dev-lang/php-7.4.33-r1 b/metadata/md5-cache/dev-lang/php-7.4.33-r1
deleted file mode 100644
index 1d9766071555..000000000000
--- a/metadata/md5-cache/dev-lang/php-7.4.33-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= <dev-libs/openssl-3.0 ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
-DESCRIPTION=The PHP language runtime engine
-EAPI=7
-HOMEPAGE=https://www.php.net/
-INHERIT=flag-o-matic systemd autotools
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= <dev-libs/openssl-3.0 ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlrpc? ( xml iconv ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
-RESTRICT=!test? ( test )
-SLOT=7.4
-SRC_URI=https://www.php.net/distributions/php-7.4.33.tar.xz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=595226639ca5ee81100c80e5e4914433
diff --git a/metadata/md5-cache/dev-lang/php-8.0.27 b/metadata/md5-cache/dev-lang/php-8.0.27
deleted file mode 100644
index cbca6737d528..000000000000
--- a/metadata/md5-cache/dev-lang/php-8.0.27
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= <dev-libs/openssl-3.0 ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
-DESCRIPTION=The PHP language runtime engine
-EAPI=7
-HOMEPAGE=https://www.php.net/
-INHERIT=flag-o-matic systemd autotools
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= <dev-libs/openssl-3.0 ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
-RESTRICT=!test? ( test )
-SLOT=8.0
-SRC_URI=https://www.php.net/distributions/php-8.0.27.tar.xz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a0b9919f645efe8a3520bbedd67921ff
diff --git a/metadata/md5-cache/dev-lang/php-8.1.14 b/metadata/md5-cache/dev-lang/php-8.1.14
deleted file mode 100644
index c3a6c79fbd08..000000000000
--- a/metadata/md5-cache/dev-lang/php-8.1.14
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
-DESCRIPTION=The PHP language runtime engine
-EAPI=8
-HOMEPAGE=https://www.php.net/
-IDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
-INHERIT=flag-o-matic systemd autotools
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
-RESTRICT=!test? ( test )
-SLOT=8.1
-SRC_URI=https://www.php.net/distributions/php-8.1.14.tar.xz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0a514b3d9fcf21fe11cd6c63e5613eee
diff --git a/metadata/md5-cache/dev-lang/php-8.1.18-r1 b/metadata/md5-cache/dev-lang/php-8.1.18-r1
new file mode 100644
index 000000000000..4ee0fae177fd
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-8.1.18-r1
@@ -0,0 +1,18 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) avif? ( media-libs/libavif:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=8
+HOMEPAGE=https://www.php.net/
+IDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+INHERIT=flag-o-matic multilib systemd autotools
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 avif bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) avif? ( media-libs/libavif:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) avif? ( gd zlib ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
+RESTRICT=!test? ( test )
+SLOT=8.1
+SRC_URI=https://www.php.net/distributions/php-8.1.18.tar.xz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=7a6e94f72ee037bbe745e5c667743ea1
diff --git a/metadata/md5-cache/dev-lang/php-8.2.4 b/metadata/md5-cache/dev-lang/php-8.2.4
deleted file mode 100644
index 0867a6153103..000000000000
--- a/metadata/md5-cache/dev-lang/php-8.2.4
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
-DESCRIPTION=The PHP language runtime engine
-EAPI=8
-HOMEPAGE=https://www.php.net/
-IDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
-INHERIT=flag-o-matic multilib systemd autotools
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
-RESTRICT=!test? ( test )
-SLOT=8.2
-SRC_URI=https://www.php.net/distributions/php-8.2.4.tar.xz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b60b55f8fea53c70d7c8f013acf9c8a6
diff --git a/metadata/md5-cache/dev-lang/php-8.2.5 b/metadata/md5-cache/dev-lang/php-8.2.5
deleted file mode 100644
index 61b5ecaed79e..000000000000
--- a/metadata/md5-cache/dev-lang/php-8.2.5
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
-DESCRIPTION=The PHP language runtime engine
-EAPI=8
-HOMEPAGE=https://www.php.net/
-IDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
-INHERIT=flag-o-matic multilib systemd autotools
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
-RESTRICT=!test? ( test )
-SLOT=8.2
-SRC_URI=https://www.php.net/distributions/php-8.2.5.tar.xz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7b383e07f9f46d0a26179f3bee3511e2
diff --git a/metadata/md5-cache/dev-lang/php-8.1.18 b/metadata/md5-cache/dev-lang/php-8.2.5-r1
index e80472a5ebbd..28195653a929 100644
--- a/metadata/md5-cache/dev-lang/php-8.1.18
+++ b/metadata/md5-cache/dev-lang/php-8.2.5-r1
@@ -1,18 +1,18 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) avif? ( media-libs/libavif:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
 DESCRIPTION=The PHP language runtime engine
 EAPI=8
 HOMEPAGE=https://www.php.net/
 IDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
-INHERIT=flag-o-matic systemd autotools
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
+INHERIT=flag-o-matic multilib systemd autotools
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 avif bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
+RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) avif? ( media-libs/libavif:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) avif? ( gd zlib ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
 RESTRICT=!test? ( test )
-SLOT=8.1
-SRC_URI=https://www.php.net/distributions/php-8.1.18.tar.xz
+SLOT=8.2
+SRC_URI=https://www.php.net/distributions/php-8.2.5.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0f0ba45ffc998d830565e8b1430a8d82
+_md5_=cbb5b0f9c76242272f8060366d5aafe2
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index aa9265d1e91e..c3354af4b7c8 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/c-blosc-1.21.4 b/metadata/md5-cache/dev-libs/c-blosc-1.21.4
new file mode 100644
index 000000000000..cde1f94abd0c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/c-blosc-1.21.4
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=lz4? ( >=app-arch/lz4-1.7.5:= ) snappy? ( app-arch/snappy:= ) zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=Blocking, shuffling and lossless compression library
+EAPI=8
+HOMEPAGE=https://www.blosc.org/ https://github.com/Blosc/c-blosc/
+INHERIT=cmake
+IUSE=+lz4 +snappy test zlib zstd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=lz4? ( >=app-arch/lz4-1.7.5:= ) snappy? ( app-arch/snappy:= ) zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=https://github.com/Blosc/c-blosc/archive/v1.21.4.tar.gz -> c-blosc-1.21.4.gh.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=633c375a3606b40795219d3ec7e80c79
diff --git a/metadata/md5-cache/dev-libs/c-blosc2-2.9.1 b/metadata/md5-cache/dev-libs/c-blosc2-2.9.1
new file mode 100644
index 000000000000..658c55593191
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/c-blosc2-2.9.1
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-arch/lz4-1.7.5:= zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=Blocking, shuffling and lossless compression library
+EAPI=8
+HOMEPAGE=https://www.blosc.org/c-blosc2/c-blosc2.html https://github.com/Blosc/c-blosc2/
+INHERIT=cmake
+IUSE=test zlib zstd
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=app-arch/lz4-1.7.5:= zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= )
+REQUIRED_USE=test? ( zlib zstd )
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=https://github.com/Blosc/c-blosc2/archive/v2.9.1.tar.gz -> c-blosc2-2.9.1.gh.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b816b33f2039e8e7a5d0a4eca3b61ed9
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-0.20.8 b/metadata/md5-cache/dev-libs/tree-sitter-0.20.8
index 71ce996b10f0..65956e99988d 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-0.20.8
+++ b/metadata/md5-cache/dev-libs/tree-sitter-0.20.8
@@ -3,9 +3,9 @@ DESCRIPTION=Tree-sitter is a parser generator tool and an incremental parsing li
 EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter
 INHERIT=optfeature toolchain-funcs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.20.8.tar.gz -> tree-sitter-0.20.8.tar.gz
 _eclasses_=multilib	104e1332efb829e2f7cbf89307a474f1	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e568dda37832e38e80d87370eea4c219
+_md5_=2eb31f544950c9c6373ac7b0472c4e64
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index b5427ae0917f..a88828c60a49 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/csexp-1.5.2 b/metadata/md5-cache/dev-ml/csexp-1.5.2
new file mode 100644
index 000000000000..e1e2fc9ffb8e
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/csexp-1.5.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-ml/ppx_expect ) dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-ml/result-1.5:=[ocamlopt=] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Parsing and printing of S-expressions in Canonical form
+EAPI=8
+HOMEPAGE=https://github.com/ocaml-dune/csexp/
+INHERIT=dune
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-ml/result-1.5:=[ocamlopt=] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=!test? ( test )
+SLOT=0/1.5.2
+SRC_URI=https://github.com/ocaml-dune/csexp/releases/download/1.5.2/csexp-1.5.2.tbz
+_eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=cfe78cf686ae6b0114b3f2343a7437ef
diff --git a/metadata/md5-cache/dev-ml/mtime-2.0.0 b/metadata/md5-cache/dev-ml/mtime-2.0.0
new file mode 100644
index 000000000000..cab74393534f
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/mtime-2.0.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-ml/opam-installer dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-lang/ocaml:=[ocamlopt] dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib >=dev-lang/ocaml-4:=
+DESCRIPTION=OCaml module to access monotonic wall-clock time
+EAPI=8
+HOMEPAGE=https://erratique.ch/software/mtime/ https://github.com/dbuenzli/mtime/
+INHERIT=edo opam
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=ISC
+RDEPEND=dev-lang/ocaml:=[ocamlopt] >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
+SLOT=0/2.0.0
+SRC_URI=https://erratique.ch/software/mtime/releases/mtime-2.0.0.tbz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	opam	2d0e114062b346818f6d0fee5e0df656
+_md5_=f98783cccf30801db9bb313c9ac94aaa
diff --git a/metadata/md5-cache/dev-ml/yojson-2.1.0 b/metadata/md5-cache/dev-ml/yojson-2.1.0
new file mode 100644
index 000000000000..31fa72fd3884
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/yojson-2.1.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-ml/cppo-1.6.1 test? ( dev-ml/alcotest ) dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/ocaml-4.07:=[ocamlopt?] !!<dev-ml/seq-0.3 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=JSON parsing and pretty-printing library for OCaml
+EAPI=8
+HOMEPAGE=https://github.com/ocaml-community/yojson
+INHERIT=dune
+IUSE=examples +ocamlopt test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-lang/ocaml-4.07:=[ocamlopt?] !!<dev-ml/seq-0.3 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=!test? ( test )
+SLOT=0/2.1.0
+SRC_URI=https://github.com/ocaml-community/yojson/archive/2.1.0.tar.gz -> yojson-2.1.0.tar.gz
+_eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=12df1bca764ed3e569e11224c4045871
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 6945d478f8d3..ffee6a7a7f83 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/tornado-6.3.2 b/metadata/md5-cache/dev-python/tornado-6.3.2
index 2ccede0c5303..32b253532ba8 100644
--- a/metadata/md5-cache/dev-python/tornado-6.3.2
+++ b/metadata/md5-cache/dev-python/tornado-6.3.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.tornadoweb.org/ https://github.com/tornadoweb/tornado/ https://pypi.org/project/tornado/
 INHERIT=distutils-r1 pypi
 IUSE=examples test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/twisted-16.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/t/tornado/tornado-6.3.2.tar.gz
 _eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=16748f47f1e5f615b2c9b09821fefd33
+_md5_=07c6ec87692707c6661368c0b797d45b
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index a8be9af2a39e..4ce9e0da0939 100644
--- a/metadata/md5-cache/dev-scheme/Manifest.gz
+++ b/metadata/md5-cache/dev-scheme/Manifest.gz
diff --git a/metadata/md5-cache/dev-scheme/guile-gnutls-3.7.12 b/metadata/md5-cache/dev-scheme/guile-gnutls-3.7.12
new file mode 100644
index 000000000000..17378c259414
--- /dev/null
+++ b/metadata/md5-cache/dev-scheme/guile-gnutls-3.7.12
@@ -0,0 +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
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-scheme/guile-2.0.0:= net-libs/gnutls:=[-guile(-)]
+DESCRIPTION=Guile-GnuTLS provides Guile bindings for the GnuTLS library
+EAPI=8
+HOMEPAGE=https://gnutls.gitlab.io/guile/manual/ https://gitlab.com/gnutls/guile/
+INHERIT=autotools
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-scheme/guile-2.0.0:= net-libs/gnutls:=[-guile(-)]
+SLOT=0
+SRC_URI=https://gitlab.com/gnutls/guile/-/archive/v3.7.12/guile-v3.7.12.tar.bz2 -> guile-gnutls-3.7.12.tar.bz2
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=05241342e0a7bac324deb8a463337ab0
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 8cdc1e600581..d5abc41bace8 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/cmake-3.26.3 b/metadata/md5-cache/dev-util/cmake-3.26.3
index 0dd4a9c675aa..e3cf994bb587 100644
--- a/metadata/md5-cache/dev-util/cmake-3.26.3
+++ b/metadata/md5-cache/dev-util/cmake-3.26.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://cmake.org/
 INHERIT=bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing toolchain-funcs virtualx xdg-utils verify-sig
 IUSE=doc emacs ncurses qt5 test test verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~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=CMake
 RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.26/cmake-3.26.3.tar.gz !doc? ( https://dev.gentoo.org/~sam/distfiles/dev-util/cmake/cmake-3.26.3-docs.tar.xz ) verify-sig? ( https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-SHA-256.txt https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-SHA-256.txt.asc )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	7fb5980de96325cbab639f5b2187357c	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=eef6ba1aab2cc93b1742bd765e0b5ad1
+_md5_=5bfbf997428247d03e8b6ea2bef86d63
diff --git a/metadata/md5-cache/dev-util/gitlab-cli-1.24.1 b/metadata/md5-cache/dev-util/gitlab-cli-1.24.1
deleted file mode 100644
index a321670003c2..000000000000
--- a/metadata/md5-cache/dev-util/gitlab-cli-1.24.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=the official gitlab command line interface
-EAPI=8
-HOMEPAGE=https://gitlab.com/gitlab-org/cli
-INHERIT=go-module
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://gitlab.com/gitlab-org/cli/-/archive/v1.24.1/gitlab-cli-v1.24.1.tar.bz2 -> gitlab-cli-1.24.1.tar.bz2 https://dev.gentoo.org/~williamh/dist/gitlab-cli-1.24.1-deps.tar.xz
-_eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ab6ea2d60b698df4665c2475f959cb18
diff --git a/metadata/md5-cache/dev-util/gitlab-cli-1.25.3 b/metadata/md5-cache/dev-util/gitlab-cli-1.25.3
deleted file mode 100644
index 13e5db818d14..000000000000
--- a/metadata/md5-cache/dev-util/gitlab-cli-1.25.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=the official gitlab command line interface
-EAPI=8
-HOMEPAGE=https://gitlab.com/gitlab-org/cli
-INHERIT=go-module
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://gitlab.com/gitlab-org/cli/-/archive/v1.25.3/gitlab-cli-v1.25.3.tar.bz2 -> gitlab-cli-1.25.3.tar.bz2 https://dev.gentoo.org/~williamh/dist/gitlab-cli-1.25.3-deps.tar.xz
-_eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=86650b0f6cb9e2692817610b7a797d00
diff --git a/metadata/md5-cache/dev-util/gitlab-cli-1.26.0 b/metadata/md5-cache/dev-util/gitlab-cli-1.26.0
deleted file mode 100644
index 049eddeae91c..000000000000
--- a/metadata/md5-cache/dev-util/gitlab-cli-1.26.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=the official gitlab command line interface
-EAPI=8
-HOMEPAGE=https://gitlab.com/gitlab-org/cli
-INHERIT=go-module
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://gitlab.com/gitlab-org/cli/-/archive/v1.26.0/gitlab-cli-v1.26.0.tar.bz2 -> gitlab-cli-1.26.0.tar.bz2 https://dev.gentoo.org/~williamh/dist/gitlab-cli-1.26.0-deps.tar.xz
-_eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=52083d19e8b166e8fd896c927fecb6b1
diff --git a/metadata/md5-cache/dev-util/gitlab-cli-1.27.1 b/metadata/md5-cache/dev-util/gitlab-cli-1.29.4
index e55c981e1246..c052040c1ebf 100644
--- a/metadata/md5-cache/dev-util/gitlab-cli-1.27.1
+++ b/metadata/md5-cache/dev-util/gitlab-cli-1.29.4
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RESTRICT=test strip
 SLOT=0
-SRC_URI=https://gitlab.com/gitlab-org/cli/-/archive/v1.27.1/gitlab-cli-v1.27.1.tar.bz2 -> gitlab-cli-1.27.1.tar.bz2 https://dev.gentoo.org/~williamh/dist/gitlab-cli-1.27.1-deps.tar.xz
+SRC_URI=https://gitlab.com/gitlab-org/cli/-/archive/v1.29.4/gitlab-cli-v1.29.4.tar.bz2 -> gitlab-cli-1.29.4.tar.bz2 https://dev.gentoo.org/~williamh/dist/gitlab-cli-1.29.4-deps.tar.xz
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=fc301a73a20b31e55f0255b7a98dd3e4
+_md5_=e194122516ee8ee31f8adcff6840cbf0
diff --git a/metadata/md5-cache/dev-util/maturin-0.15.2 b/metadata/md5-cache/dev-util/maturin-0.15.2
new file mode 100644
index 000000000000..934731dfab17
--- /dev/null
+++ b/metadata/md5-cache/dev-util/maturin-0.15.2
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/setuptools-rust[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( app-text/mdbook ) test? ( python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/cffi[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/boltons[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git ) >=virtual/rust-1.53 python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=ssl? ( dev-libs/openssl:= )
+DESCRIPTION=Build and publish crates with pyo3, rust-cpython and cffi bindings
+EAPI=8
+HOMEPAGE=https://www.maturin.rs/
+INHERIT=bash-completion-r1 cargo distutils-r1 edo flag-o-matic toolchain-funcs
+IUSE=doc +ssl test debug python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 doc? ( CC-BY-4.0 OFL-1.1 )
+RDEPEND=python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) ssl? ( dev-libs/openssl:= ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyO3/maturin/archive/refs/tags/v0.15.2.tar.gz -> maturin-0.15.2.gh.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/aho-corasick/0.7.20/download -> aho-corasick-0.7.20.crate https://crates.io/api/v1/crates/anyhow/1.0.71/download -> anyhow-1.0.71.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/base64/0.21.0/download -> base64-0.21.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block-buffer/0.10.4/download -> block-buffer-0.10.4.crate https://crates.io/api/v1/crates/bstr/1.4.0/download -> bstr-1.4.0.crate https://crates.io/api/v1/crates/bumpalo/3.12.1/download -> bumpalo-3.12.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.4.0/download -> bytes-1.4.0.crate https://crates.io/api/v1/crates/bytesize/1.2.0/download -> bytesize-1.2.0.crate https://crates.io/api/v1/crates/bzip2/0.4.4/download -> bzip2-0.4.4.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.11+1.0.8/download -> bzip2-sys-0.1.11+1.0.8.crate https://crates.io/api/v1/crates/cab/0.4.1/download -> cab-0.4.1.crate https://crates.io/api/v1/crates/camino/1.1.4/download -> camino-1.1.4.crate https://crates.io/api/v1/crates/cargo-config2/0.1.7/download -> cargo-config2-0.1.7.crate https://crates.io/api/v1/crates/cargo-options/0.6.0/download -> cargo-options-0.6.0.crate https://crates.io/api/v1/crates/cargo-platform/0.1.2/download -> cargo-platform-0.1.2.crate https://crates.io/api/v1/crates/cargo-xwin/0.14.2/download -> cargo-xwin-0.14.2.crate https://crates.io/api/v1/crates/cargo-zigbuild/0.16.8/download -> cargo-zigbuild-0.16.8.crate https://crates.io/api/v1/crates/cargo_metadata/0.15.4/download -> cargo_metadata-0.15.4.crate https://crates.io/api/v1/crates/cbindgen/0.24.3/download -> cbindgen-0.24.3.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cfb/0.7.3/download -> cfb-0.7.3.crate https://crates.io/api/v1/crates/cfg-expr/0.15.1/download -> cfg-expr-0.15.1.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/charset/0.1.3/download -> charset-0.1.3.crate https://crates.io/api/v1/crates/chumsky/0.9.2/download -> chumsky-0.9.2.crate https://crates.io/api/v1/crates/clap/4.1.10/download -> clap-4.1.10.crate https://crates.io/api/v1/crates/clap_complete/4.1.6/download -> clap_complete-4.1.6.crate https://crates.io/api/v1/crates/clap_complete_command/0.5.1/download -> clap_complete_command-0.5.1.crate https://crates.io/api/v1/crates/clap_complete_fig/4.1.2/download -> clap_complete_fig-4.1.2.crate https://crates.io/api/v1/crates/clap_complete_nushell/0.1.10/download -> clap_complete_nushell-0.1.10.crate https://crates.io/api/v1/crates/clap_derive/4.1.9/download -> clap_derive-4.1.9.crate https://crates.io/api/v1/crates/clap_lex/0.3.3/download -> clap_lex-0.3.3.crate https://crates.io/api/v1/crates/cli-table/0.4.7/download -> cli-table-0.4.7.crate https://crates.io/api/v1/crates/concolor/0.0.11/download -> concolor-0.0.11.crate https://crates.io/api/v1/crates/concolor-query/0.1.0/download -> concolor-query-0.1.0.crate https://crates.io/api/v1/crates/configparser/3.0.2/download -> configparser-3.0.2.crate https://crates.io/api/v1/crates/console/0.15.5/download -> console-0.15.5.crate https://crates.io/api/v1/crates/content_inspector/0.2.4/download -> content_inspector-0.2.4.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.4/download -> core-foundation-sys-0.8.4.crate https://crates.io/api/v1/crates/cpufeatures/0.2.7/download -> cpufeatures-0.2.7.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.8/download -> crossbeam-channel-0.5.8.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.3/download -> crossbeam-deque-0.8.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.14/download -> crossbeam-epoch-0.9.14.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.15/download -> crossbeam-utils-0.8.15.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/ctor/0.1.26/download -> ctor-0.1.26.crate https://crates.io/api/v1/crates/data-encoding/2.3.3/download -> data-encoding-2.3.3.crate https://crates.io/api/v1/crates/dialoguer/0.10.4/download -> dialoguer-0.10.4.crate https://crates.io/api/v1/crates/diff/0.1.13/download -> diff-0.1.13.crate https://crates.io/api/v1/crates/digest/0.10.6/download -> digest-0.10.6.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dunce/1.0.4/download -> dunce-1.0.4.crate https://crates.io/api/v1/crates/either/1.8.1/download -> either-1.8.1.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding_rs/0.8.32/download -> encoding_rs-0.8.32.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/fastrand/1.9.0/download -> fastrand-1.9.0.crate https://crates.io/api/v1/crates/fat-macho/0.4.6/download -> fat-macho-0.4.6.crate https://crates.io/api/v1/crates/filetime/0.2.19/download -> filetime-0.2.19.crate https://crates.io/api/v1/crates/flate2/1.0.26/download -> flate2-1.0.26.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.1.0/download -> form_urlencoded-1.1.0.crate https://crates.io/api/v1/crates/fs-err/2.9.0/download -> fs-err-2.9.0.crate https://crates.io/api/v1/crates/generic-array/0.14.7/download -> generic-array-0.14.7.crate https://crates.io/api/v1/crates/getrandom/0.2.9/download -> getrandom-0.2.9.crate https://crates.io/api/v1/crates/glob/0.3.1/download -> glob-0.3.1.crate https://crates.io/api/v1/crates/globset/0.4.10/download -> globset-0.4.10.crate https://crates.io/api/v1/crates/goblin/0.6.1/download -> goblin-0.6.1.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/hermit-abi/0.2.6/download -> hermit-abi-0.2.6.crate https://crates.io/api/v1/crates/home/0.5.4/download -> home-0.5.4.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/humantime-serde/1.1.1/download -> humantime-serde-1.1.1.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.crate https://crates.io/api/v1/crates/ignore/0.4.20/download -> ignore-0.4.20.crate https://crates.io/api/v1/crates/indexmap/1.9.3/download -> indexmap-1.9.3.crate https://crates.io/api/v1/crates/indicatif/0.17.3/download -> indicatif-0.17.3.crate https://crates.io/api/v1/crates/indoc/2.0.1/download -> indoc-2.0.1.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.4/download -> io-lifetimes-1.0.4.crate https://crates.io/api/v1/crates/is-terminal/0.4.2/download -> is-terminal-0.4.2.crate https://crates.io/api/v1/crates/itertools/0.10.5/download -> itertools-0.10.5.crate https://crates.io/api/v1/crates/itoa/1.0.6/download -> itoa-1.0.6.crate https://crates.io/api/v1/crates/js-sys/0.3.61/download -> js-sys-0.3.61.crate https://crates.io/api/v1/crates/keyring/2.0.2/download -> keyring-2.0.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lddtree/0.3.2/download -> lddtree-0.3.2.crate https://crates.io/api/v1/crates/libc/0.2.144/download -> libc-0.2.144.crate https://crates.io/api/v1/crates/linux-keyutils/0.2.3/download -> linux-keyutils-0.2.3.crate https://crates.io/api/v1/crates/linux-raw-sys/0.1.4/download -> linux-raw-sys-0.1.4.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/lzxd/0.1.4/download -> lzxd-0.1.4.crate https://crates.io/api/v1/crates/mailparse/0.13.8/download -> mailparse-0.13.8.crate https://crates.io/api/v1/crates/matchers/0.1.0/download -> matchers-0.1.0.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.8.0/download -> memoffset-0.8.0.crate https://crates.io/api/v1/crates/mime/0.3.17/download -> mime-0.3.17.crate https://crates.io/api/v1/crates/mime_guess/2.0.4/download -> mime_guess-2.0.4.crate https://crates.io/api/v1/crates/minijinja/0.32.1/download -> minijinja-0.32.1.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.7.1/download -> miniz_oxide-0.7.1.crate https://crates.io/api/v1/crates/msi/0.5.1/download -> msi-0.5.1.crate https://crates.io/api/v1/crates/multipart/0.18.0/download -> multipart-0.18.0.crate https://crates.io/api/v1/crates/native-tls/0.2.11/download -> native-tls-0.2.11.crate https://crates.io/api/v1/crates/nom/7.1.3/download -> nom-7.1.3.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/normpath/1.0.1/download -> normpath-1.0.1.crate https://crates.io/api/v1/crates/nu-ansi-term/0.46.0/download -> nu-ansi-term-0.46.0.crate https://crates.io/api/v1/crates/num_cpus/1.15.0/download -> num_cpus-1.15.0.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/once_cell/1.17.1/download -> once_cell-1.17.1.crate https://crates.io/api/v1/crates/openssl/0.10.52/download -> openssl-0.10.52.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-src/111.25.2+1.1.1t/download -> openssl-src-111.25.2+1.1.1t.crate https://crates.io/api/v1/crates/openssl-sys/0.9.87/download -> openssl-sys-0.9.87.crate https://crates.io/api/v1/crates/os_pipe/1.1.2/download -> os_pipe-1.1.2.crate https://crates.io/api/v1/crates/os_str_bytes/6.5.0/download -> os_str_bytes-6.5.0.crate https://crates.io/api/v1/crates/output_vt100/0.1.3/download -> output_vt100-0.1.3.crate https://crates.io/api/v1/crates/overload/0.1.1/download -> overload-0.1.1.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.6/download -> parking_lot_core-0.9.6.crate https://crates.io/api/v1/crates/path-slash/0.2.1/download -> path-slash-0.2.1.crate https://crates.io/api/v1/crates/pep440_rs/0.3.6/download -> pep440_rs-0.3.6.crate https://crates.io/api/v1/crates/pep508_rs/0.1.5/download -> pep508_rs-0.1.5.crate https://crates.io/api/v1/crates/percent-encoding/2.2.0/download -> percent-encoding-2.2.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pkg-config/0.3.27/download -> pkg-config-0.3.27.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/platform-info/1.0.2/download -> platform-info-1.0.2.crate https://crates.io/api/v1/crates/portable-atomic/0.3.19/download -> portable-atomic-0.3.19.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download -> ppv-lite86-0.2.17.crate https://crates.io/api/v1/crates/pretty_assertions/1.3.0/download -> pretty_assertions-1.3.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.57/download -> proc-macro2-1.0.57.crate https://crates.io/api/v1/crates/psm/0.1.21/download -> psm-0.1.21.crate https://crates.io/api/v1/crates/pyproject-toml/0.6.0/download -> pyproject-toml-0.6.0.crate https://crates.io/api/v1/crates/python-pkginfo/0.5.5/download -> python-pkginfo-0.5.5.crate https://crates.io/api/v1/crates/quote/1.0.26/download -> quote-1.0.26.crate https://crates.io/api/v1/crates/quoted_printable/0.4.8/download -> quoted_printable-0.4.8.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/rayon/1.7.0/download -> rayon-1.7.0.crate https://crates.io/api/v1/crates/rayon-core/1.11.0/download -> rayon-core-1.11.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.7.3/download -> regex-1.7.3.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.29/download -> regex-syntax-0.6.29.crate https://crates.io/api/v1/crates/rfc2047-decoder/0.2.2/download -> rfc2047-decoder-0.2.2.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustix/0.36.7/download -> rustix-0.36.7.crate https://crates.io/api/v1/crates/rustls/0.20.8/download -> rustls-0.20.8.crate https://crates.io/api/v1/crates/rustls-pemfile/1.0.2/download -> rustls-pemfile-1.0.2.crate https://crates.io/api/v1/crates/rustversion/1.0.12/download -> rustversion-1.0.12.crate https://crates.io/api/v1/crates/ryu/1.0.13/download -> ryu-1.0.13.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.21/download -> schannel-0.1.21.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scroll/0.11.0/download -> scroll-0.11.0.crate https://crates.io/api/v1/crates/scroll_derive/0.11.0/download -> scroll_derive-0.11.0.crate https://crates.io/api/v1/crates/sct/0.7.0/download -> sct-0.7.0.crate https://crates.io/api/v1/crates/security-framework/2.9.0/download -> security-framework-2.9.0.crate https://crates.io/api/v1/crates/security-framework-sys/2.9.0/download -> security-framework-sys-2.9.0.crate https://crates.io/api/v1/crates/semver/1.0.17/download -> semver-1.0.17.crate https://crates.io/api/v1/crates/serde/1.0.155/download -> serde-1.0.155.crate https://crates.io/api/v1/crates/serde_derive/1.0.155/download -> serde_derive-1.0.155.crate https://crates.io/api/v1/crates/serde_json/1.0.95/download -> serde_json-1.0.95.crate https://crates.io/api/v1/crates/serde_spanned/0.6.1/download -> serde_spanned-0.6.1.crate https://crates.io/api/v1/crates/sha2/0.10.6/download -> sha2-0.10.6.crate https://crates.io/api/v1/crates/sharded-slab/0.1.4/download -> sharded-slab-0.1.4.crate https://crates.io/api/v1/crates/shell-escape/0.1.5/download -> shell-escape-0.1.5.crate https://crates.io/api/v1/crates/shell-words/1.1.0/download -> shell-words-1.1.0.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/similar/2.2.1/download -> similar-2.2.1.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/smawk/0.3.1/download -> smawk-0.3.1.crate https://crates.io/api/v1/crates/snapbox/0.4.4/download -> snapbox-0.4.4.crate https://crates.io/api/v1/crates/snapbox-macros/0.3.1/download -> snapbox-macros-0.3.1.crate https://crates.io/api/v1/crates/socks/0.3.4/download -> socks-0.3.4.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/stacker/0.1.15/download -> stacker-0.1.15.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/tar/0.4.38/download -> tar-0.4.38.crate https://crates.io/api/v1/crates/target-lexicon/0.12.7/download -> target-lexicon-0.12.7.crate https://crates.io/api/v1/crates/tempfile/3.4.0/download -> tempfile-3.4.0.crate https://crates.io/api/v1/crates/termcolor/1.2.0/download -> termcolor-1.2.0.crate https://crates.io/api/v1/crates/terminal_size/0.2.3/download -> terminal_size-0.2.3.crate https://crates.io/api/v1/crates/textwrap/0.16.0/download -> textwrap-0.16.0.crate https://crates.io/api/v1/crates/thiserror/1.0.39/download -> thiserror-1.0.39.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.39/download -> thiserror-impl-1.0.39.crate https://crates.io/api/v1/crates/thread_local/1.1.7/download -> thread_local-1.1.7.crate https://crates.io/api/v1/crates/time/0.3.20/download -> time-0.3.20.crate https://crates.io/api/v1/crates/time-core/0.1.0/download -> time-core-0.1.0.crate https://crates.io/api/v1/crates/time-macros/0.2.8/download -> time-macros-0.2.8.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.1/download -> tinyvec_macros-0.1.1.crate https://crates.io/api/v1/crates/toml/0.5.11/download -> toml-0.5.11.crate https://crates.io/api/v1/crates/toml/0.7.3/download -> toml-0.7.3.crate https://crates.io/api/v1/crates/toml_datetime/0.6.1/download -> toml_datetime-0.6.1.crate https://crates.io/api/v1/crates/toml_edit/0.19.8/download -> toml_edit-0.19.8.crate https://crates.io/api/v1/crates/tracing/0.1.37/download -> tracing-0.1.37.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.23/download -> tracing-attributes-0.1.23.crate https://crates.io/api/v1/crates/tracing-core/0.1.31/download -> tracing-core-0.1.31.crate https://crates.io/api/v1/crates/tracing-log/0.1.3/download -> tracing-log-0.1.3.crate https://crates.io/api/v1/crates/tracing-serde/0.1.3/download -> tracing-serde-0.1.3.crate https://crates.io/api/v1/crates/tracing-subscriber/0.3.17/download -> tracing-subscriber-0.3.17.crate https://crates.io/api/v1/crates/trycmd/0.14.11/download -> trycmd-0.14.11.crate https://crates.io/api/v1/crates/twox-hash/1.6.3/download -> twox-hash-1.6.3.crate https://crates.io/api/v1/crates/typenum/1.16.0/download -> typenum-1.16.0.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.13/download -> unicode-bidi-0.3.13.crate https://crates.io/api/v1/crates/unicode-ident/1.0.8/download -> unicode-ident-1.0.8.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.4/download -> unicode-linebreak-0.1.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.22/download -> unicode-normalization-0.1.22.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/ureq/2.6.2/download -> ureq-2.6.2.crate https://crates.io/api/v1/crates/url/2.3.1/download -> url-2.3.1.crate https://crates.io/api/v1/crates/uuid/1.3.3/download -> uuid-1.3.3.crate https://crates.io/api/v1/crates/valuable/0.1.0/download -> valuable-0.1.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/versions/4.1.0/download -> versions-4.1.0.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.3/download -> walkdir-2.3.3.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.84/download -> wasm-bindgen-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.84/download -> wasm-bindgen-backend-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.84/download -> wasm-bindgen-macro-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.84/download -> wasm-bindgen-macro-support-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.84/download -> wasm-bindgen-shared-0.2.84.crate https://crates.io/api/v1/crates/web-sys/0.3.61/download -> web-sys-0.3.61.crate https://crates.io/api/v1/crates/webpki/0.22.0/download -> webpki-0.22.0.crate https://crates.io/api/v1/crates/webpki-roots/0.22.6/download -> webpki-roots-0.22.6.crate https://crates.io/api/v1/crates/which/4.4.0/download -> which-4.4.0.crate https://crates.io/api/v1/crates/wild/2.1.0/download -> wild-2.1.0.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.2/download -> windows_aarch64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.2/download -> windows_aarch64_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.2/download -> windows_i686_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.2/download -> windows_i686_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.2/download -> windows_x86_64_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.2/download -> windows_x86_64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.2/download -> windows_x86_64_msvc-0.42.2.crate https://crates.io/api/v1/crates/winnow/0.4.6/download -> winnow-0.4.6.crate https://crates.io/api/v1/crates/xattr/0.2.3/download -> xattr-0.2.3.crate https://crates.io/api/v1/crates/xwin/0.2.12/download -> xwin-0.2.12.crate https://crates.io/api/v1/crates/yansi/0.5.1/download -> yansi-0.5.1.crate https://crates.io/api/v1/crates/zeroize/1.6.0/download -> zeroize-1.6.0.crate https://crates.io/api/v1/crates/zip/0.6.6/download -> zip-0.6.6.crate test? ( https://crates.io/api/v1/crates/anyhow/1.0.69/download -> anyhow-1.0.69.crate https://crates.io/api/v1/crates/askama/0.11.1/download -> askama-0.11.1.crate https://crates.io/api/v1/crates/askama_derive/0.11.2/download -> askama_derive-0.11.2.crate https://crates.io/api/v1/crates/askama_escape/0.10.3/download -> askama_escape-0.10.3.crate https://crates.io/api/v1/crates/askama_shared/0.12.2/download -> askama_shared-0.12.2.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/camino/1.1.2/download -> camino-1.1.2.crate https://crates.io/api/v1/crates/cargo_metadata/0.15.3/download -> cargo_metadata-0.15.3.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cc/1.0.74/download -> cc-1.0.74.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/goblin/0.6.0/download -> goblin-0.6.0.crate https://crates.io/api/v1/crates/indoc/1.0.7/download -> indoc-1.0.7.crate https://crates.io/api/v1/crates/itoa/1.0.5/download -> itoa-1.0.5.crate https://crates.io/api/v1/crates/libc/0.2.134/download -> libc-0.2.134.crate https://crates.io/api/v1/crates/libc/0.2.137/download -> libc-0.2.137.crate https://crates.io/api/v1/crates/libc/0.2.141/download -> libc-0.2.141.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/once_cell/1.15.0/download -> once_cell-1.15.0.crate https://crates.io/api/v1/crates/once_cell/1.16.0/download -> once_cell-1.16.0.crate https://crates.io/api/v1/crates/once_cell/1.17.0/download -> once_cell-1.17.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.4/download -> parking_lot_core-0.9.4.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.7/download -> parking_lot_core-0.9.7.crate https://crates.io/api/v1/crates/paste/1.0.11/download -> paste-1.0.11.crate https://crates.io/api/v1/crates/proc-macro2/1.0.46/download -> proc-macro2-1.0.46.crate https://crates.io/api/v1/crates/proc-macro2/1.0.47/download -> proc-macro2-1.0.47.crate https://crates.io/api/v1/crates/proc-macro2/1.0.51/download -> proc-macro2-1.0.51.crate https://crates.io/api/v1/crates/pyo3/0.18.1/download -> pyo3-0.18.1.crate https://crates.io/api/v1/crates/pyo3/0.18.3/download -> pyo3-0.18.3.crate https://crates.io/api/v1/crates/pyo3-build-config/0.18.1/download -> pyo3-build-config-0.18.1.crate https://crates.io/api/v1/crates/pyo3-build-config/0.18.3/download -> pyo3-build-config-0.18.3.crate https://crates.io/api/v1/crates/pyo3-ffi/0.18.1/download -> pyo3-ffi-0.18.1.crate https://crates.io/api/v1/crates/pyo3-ffi/0.18.3/download -> pyo3-ffi-0.18.3.crate https://crates.io/api/v1/crates/pyo3-macros/0.18.1/download -> pyo3-macros-0.18.1.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.18.1/download -> pyo3-macros-backend-0.18.1.crate https://crates.io/api/v1/crates/python3-dll-a/0.2.6/download -> python3-dll-a-0.2.6.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/quote/1.0.23/download -> quote-1.0.23.crate https://crates.io/api/v1/crates/ryu/1.0.12/download -> ryu-1.0.12.crate https://crates.io/api/v1/crates/semver/1.0.16/download -> semver-1.0.16.crate https://crates.io/api/v1/crates/serde/1.0.152/download -> serde-1.0.152.crate https://crates.io/api/v1/crates/serde_derive/1.0.152/download -> serde_derive-1.0.152.crate https://crates.io/api/v1/crates/serde_json/1.0.93/download -> serde_json-1.0.93.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/syn/1.0.102/download -> syn-1.0.102.crate https://crates.io/api/v1/crates/syn/1.0.103/download -> syn-1.0.103.crate https://crates.io/api/v1/crates/syn/1.0.107/download -> syn-1.0.107.crate https://crates.io/api/v1/crates/thiserror/1.0.38/download -> thiserror-1.0.38.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.38/download -> thiserror-impl-1.0.38.crate https://crates.io/api/v1/crates/unicode-ident/1.0.5/download -> unicode-ident-1.0.5.crate https://crates.io/api/v1/crates/unicode-ident/1.0.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/uniffi/0.23.0/download -> uniffi-0.23.0.crate https://crates.io/api/v1/crates/uniffi_bindgen/0.23.0/download -> uniffi_bindgen-0.23.0.crate https://crates.io/api/v1/crates/uniffi_build/0.23.0/download -> uniffi_build-0.23.0.crate https://crates.io/api/v1/crates/uniffi_checksum_derive/0.23.0/download -> uniffi_checksum_derive-0.23.0.crate https://crates.io/api/v1/crates/uniffi_core/0.23.0/download -> uniffi_core-0.23.0.crate https://crates.io/api/v1/crates/uniffi_macros/0.23.0/download -> uniffi_macros-0.23.0.crate https://crates.io/api/v1/crates/uniffi_meta/0.23.0/download -> uniffi_meta-0.23.0.crate https://crates.io/api/v1/crates/uniffi_testing/0.23.0/download -> uniffi_testing-0.23.0.crate https://crates.io/api/v1/crates/unindent/0.1.10/download -> unindent-0.1.10.crate https://crates.io/api/v1/crates/weedle2/4.0.0/download -> weedle2-4.0.0.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows-sys/0.45.0/download -> windows-sys-0.45.0.crate https://crates.io/api/v1/crates/windows-targets/0.42.2/download -> windows-targets-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.0/download -> windows_aarch64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.0/download -> windows_aarch64_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.0/download -> windows_i686_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.0/download -> windows_i686_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.0/download -> windows_x86_64_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.0/download -> windows_x86_64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.0/download -> windows_x86_64_msvc-0.42.0.crate )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	2e0a4a329a7dc5dfe20dcb05e6c36935	distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=0c26b220a27f31f7422e4efb5be9d241
diff --git a/metadata/md5-cache/dev-util/tree-sitter-cli-0.20.8 b/metadata/md5-cache/dev-util/tree-sitter-cli-0.20.8
index 65c79a17ab0e..97a3b753cb75 100644
--- a/metadata/md5-cache/dev-util/tree-sitter-cli-0.20.8
+++ b/metadata/md5-cache/dev-util/tree-sitter-cli-0.20.8
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter
 INHERIT=cargo
 IUSE=debug
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0 BSD-2 CC0-1.0 ISC MIT
 RDEPEND=~dev-libs/tree-sitter-0.20.8
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.20.8.tar.gz -> tree-sitter-0.20.8.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.20/download -> aho-corasick-0.7.20.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.70/download -> anyhow-1.0.70.crate https://crates.io/api/v1/crates/ascii/1.1.0/download -> ascii-1.1.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bumpalo/3.12.0/download -> bumpalo-3.12.0.crate https://crates.io/api/v1/crates/bytes/1.4.0/download -> bytes-1.4.0.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cesu8/1.1.0/download -> cesu8-1.1.0.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chunked_transfer/1.4.1/download -> chunked_transfer-1.4.1.crate https://crates.io/api/v1/crates/clap/2.34.0/download -> clap-2.34.0.crate https://crates.io/api/v1/crates/combine/4.6.6/download -> combine-4.6.6.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.4/download -> core-foundation-sys-0.8.4.crate https://crates.io/api/v1/crates/ctor/0.1.26/download -> ctor-0.1.26.crate https://crates.io/api/v1/crates/diff/0.1.13/download -> diff-0.1.13.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/dirs/3.0.2/download -> dirs-3.0.2.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/either/1.8.1/download -> either-1.8.1.crate https://crates.io/api/v1/crates/errno/0.3.0/download -> errno-0.3.0.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/fastrand/1.9.0/download -> fastrand-1.9.0.crate https://crates.io/api/v1/crates/form_urlencoded/1.1.0/download -> form_urlencoded-1.1.0.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/glob/0.3.1/download -> glob-0.3.1.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hermit-abi/0.3.1/download -> hermit-abi-0.3.1.crate https://crates.io/api/v1/crates/html-escape/0.2.13/download -> html-escape-0.2.13.crate https://crates.io/api/v1/crates/httpdate/1.0.2/download -> httpdate-1.0.2.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.crate https://crates.io/api/v1/crates/indexmap/1.9.3/download -> indexmap-1.9.3.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.9/download -> io-lifetimes-1.0.9.crate https://crates.io/api/v1/crates/itoa/1.0.6/download -> itoa-1.0.6.crate https://crates.io/api/v1/crates/jni/0.21.1/download -> jni-0.21.1.crate https://crates.io/api/v1/crates/jni-sys/0.3.0/download -> jni-sys-0.3.0.crate https://crates.io/api/v1/crates/js-sys/0.3.61/download -> js-sys-0.3.61.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.141/download -> libc-0.2.141.crate https://crates.io/api/v1/crates/libloading/0.7.4/download -> libloading-0.7.4.crate https://crates.io/api/v1/crates/linux-raw-sys/0.3.1/download -> linux-raw-sys-0.3.1.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/ndk-context/0.1.1/download -> ndk-context-0.1.1.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/once_cell/1.17.1/download -> once_cell-1.17.1.crate https://crates.io/api/v1/crates/output_vt100/0.1.3/download -> output_vt100-0.1.3.crate https://crates.io/api/v1/crates/percent-encoding/2.2.0/download -> percent-encoding-2.2.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download -> ppv-lite86-0.2.17.crate https://crates.io/api/v1/crates/pretty_assertions/0.7.2/download -> pretty_assertions-0.7.2.crate https://crates.io/api/v1/crates/proc-macro2/1.0.56/download -> proc-macro2-1.0.56.crate https://crates.io/api/v1/crates/quote/1.0.26/download -> quote-1.0.26.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/raw-window-handle/0.5.2/download -> raw-window-handle-0.5.2.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/redox_syscall/0.3.5/download -> redox_syscall-0.3.5.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.7.3/download -> regex-1.7.3.crate https://crates.io/api/v1/crates/regex-syntax/0.6.29/download -> regex-syntax-0.6.29.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustix/0.37.7/download -> rustix-0.37.7.crate https://crates.io/api/v1/crates/ryu/1.0.13/download -> ryu-1.0.13.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/semver/1.0.17/download -> semver-1.0.17.crate https://crates.io/api/v1/crates/serde/1.0.159/download -> serde-1.0.159.crate https://crates.io/api/v1/crates/serde_derive/1.0.159/download -> serde_derive-1.0.159.crate https://crates.io/api/v1/crates/serde_json/1.0.95/download -> serde_json-1.0.95.crate https://crates.io/api/v1/crates/smallbitvec/2.5.1/download -> smallbitvec-2.5.1.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/syn/2.0.13/download -> syn-2.0.13.crate https://crates.io/api/v1/crates/tempfile/3.5.0/download -> tempfile-3.5.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.40/download -> thiserror-1.0.40.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.40/download -> thiserror-impl-1.0.40.crate https://crates.io/api/v1/crates/tiny_http/0.12.0/download -> tiny_http-0.12.0.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.1/download -> tinyvec_macros-0.1.1.crate https://crates.io/api/v1/crates/toml/0.5.11/download -> toml-0.5.11.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.13/download -> unicode-bidi-0.3.13.crate https://crates.io/api/v1/crates/unicode-ident/1.0.8/download -> unicode-ident-1.0.8.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.22/download -> unicode-normalization-0.1.22.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/unindent/0.2.1/download -> unindent-0.2.1.crate https://crates.io/api/v1/crates/url/2.3.1/download -> url-2.3.1.crate https://crates.io/api/v1/crates/utf8-width/0.1.6/download -> utf8-width-0.1.6.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/walkdir/2.3.3/download -> walkdir-2.3.3.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.84/download -> wasm-bindgen-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.84/download -> wasm-bindgen-backend-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.84/download -> wasm-bindgen-macro-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.84/download -> wasm-bindgen-macro-support-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.84/download -> wasm-bindgen-shared-0.2.84.crate https://crates.io/api/v1/crates/web-sys/0.3.61/download -> web-sys-0.3.61.crate https://crates.io/api/v1/crates/webbrowser/0.8.8/download -> webbrowser-0.8.8.crate https://crates.io/api/v1/crates/which/4.4.0/download -> which-4.4.0.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.45.0/download -> windows-sys-0.45.0.crate https://crates.io/api/v1/crates/windows-targets/0.42.2/download -> windows-targets-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.2/download -> windows_aarch64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.2/download -> windows_aarch64_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.2/download -> windows_i686_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.2/download -> windows_i686_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.2/download -> windows_x86_64_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.2/download -> windows_x86_64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.2/download -> windows_x86_64_msvc-0.42.2.crate
 _eclasses_=cargo	2e0a4a329a7dc5dfe20dcb05e6c36935	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b4dc63d461be59bc2ef9dd412ae51a4e
+_md5_=53dc490f369734b3b977821200c7ebad
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 73f105784ffb..09dfdae5d50c 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/pcsx2-9999 b/metadata/md5-cache/games-emulation/pcsx2-9999
index d178b50db030..2152557a831f 100644
--- a/metadata/md5-cache/games-emulation/pcsx2-9999
+++ b/metadata/md5-cache/games-emulation/pcsx2-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=cpu_flags_x86_sse4_1
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	desktop	021728fdc1b03b36357dbc89489e0f0d	fcaps	c0a086b957a1b183a8d136eabf02f191	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4c0d86efe5f3076a4318e5aebd135b66
+_md5_=549794f36de406ce598310991182b194
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index f7d9845ba872..79adc723c6a9 100644
--- a/metadata/md5-cache/kde-misc/Manifest.gz
+++ b/metadata/md5-cache/kde-misc/Manifest.gz
diff --git a/metadata/md5-cache/kde-misc/kdiff3-1.10.3 b/metadata/md5-cache/kde-misc/kdiff3-1.10.3
new file mode 100644
index 000000000000..a3e1c64cba6b
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/kdiff3-1.10.3
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtprintsupport-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kparts-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 dev-libs/boost dev-qt/qtcore:5
+DESCRIPTION=Frontend to diff3 based on KDE Frameworks
+EAPI=8
+HOMEPAGE=https://apps.kde.org/kdiff3/ https://userbase.kde.org/KDiff3
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm kde.org
+IUSE=test debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtprintsupport-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kparts-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 sys-apps/diffutils || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/kdiff3/kdiff3-1.10.3.tar.xz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	ecm	76234c40ad6f38d0d48cb04228708c86	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kde.org	dc60243572471279b11120514b85b558	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=3aef7142257e0de5629bfa06f4d13119
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index f03b67d9081b..a60c44d8d5bb 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/noto-20230331 b/metadata/md5-cache/media-fonts/noto-20230331
index 4b8229befac5..43d67db48837 100644
--- a/metadata/md5-cache/media-fonts/noto-20230331
+++ b/metadata/md5-cache/media-fonts/noto-20230331
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.google.com/get/noto/ https://github.com/notofonts/notofonts.github.io
 INHERIT=font
 IUSE=cjk +extra X
-KEYWORDS=~alpha amd64 arm arm64 ~loong ~mips ppc ~ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=OFL-1.1
 RDEPEND=cjk? ( media-fonts/noto-cjk )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/notofonts/notofonts.github.io/archive/021feeb29f58d54a45449c89f53d17b5bfa9fd56.tar.gz -> noto-20230331.tar.gz
 _eclasses_=font	aa113a3df9cd0a9693a1c1ee7c34a6eb
-_md5_=cb113d4abc1562c20a62b1124f047da6
+_md5_=497c84f8d3b7335556b0deb8ca3f8a8c
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index c530a112c97d..920cfc5a22a5 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/fotoxx-23.2 b/metadata/md5-cache/media-gfx/fotoxx-23.50
index e145854fa590..8a99202da9d4 100644
--- a/metadata/md5-cache/media-gfx/fotoxx-23.2
+++ b/metadata/md5-cache/media-gfx/fotoxx-23.50
@@ -4,10 +4,10 @@ DESCRIPTION=Program for improving image files made with a digital camera
 EAPI=7
 HOMEPAGE=https://kornelix.net/fotoxx/fotoxx.html
 INHERIT=optfeature xdg-utils
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-3+
 RDEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/tiff:= media-libs/libchamplain[gtk] x11-libs/gtk+:3 media-gfx/dcraw media-libs/exiftool x11-misc/xdg-utils
 SLOT=0
-SRC_URI=https://kornelix.net/downloads/downloads/fotoxx-23.2-source.tar.gz
+SRC_URI=https://kornelix.net/downloads/downloads/fotoxx-23.50-source.tar.gz
 _eclasses_=optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f792ac107445e6c3864e3ab7fd7be1d5
+_md5_=70123bb4bcc4e2deec54b12a7c031579
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 81b413883b51..fe97a2b84737 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/libmp4v2-2.1.3 b/metadata/md5-cache/media-libs/libmp4v2-2.1.3
index 5d97cbd7a2c2..3fc44fa0fdd5 100644
--- a/metadata/md5-cache/media-libs/libmp4v2-2.1.3
+++ b/metadata/md5-cache/media-libs/libmp4v2-2.1.3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://mp4v2.org/
 INHERIT=cmake
 IUSE=utils
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=MPL-1.1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/enzo1982/mp4v2/releases/download/v2.1.3/mp4v2-2.1.3.tar.bz2
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c37c8a7391d932a7ad616af4792c4997
+_md5_=36c5505143bd446c3591b4e4e398f4bb
diff --git a/metadata/md5-cache/media-libs/ptex-2.3.2 b/metadata/md5-cache/media-libs/ptex-2.3.2
deleted file mode 100644
index 135728a1894e..000000000000
--- a/metadata/md5-cache/media-libs/ptex-2.3.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-doc/doxygen >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib
-DESCRIPTION=Per-Face Texture Mapping for Production Rendering
-EAPI=7
-HOMEPAGE=http://ptex.us/
-INHERIT=cmake
-IUSE=static-libs
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=BSD
-RDEPEND=sys-libs/zlib
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/wdas/ptex/archive/v2.3.2.tar.gz -> ptex-2.3.2.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e6fac84dbedf680f02bcb742eab36191
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 876ae315c92f..e378c5877589 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/pipewire-0.3.70-r2 b/metadata/md5-cache/media-video/pipewire-0.3.70-r2
index cf956e4265b2..40c904e956bc 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.70-r2
+++ b/metadata/md5-cache/media-video/pipewire-0.3.70-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pipewire.org/
 INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev
 IUSE=bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings jack-client jack-sdk lv2 modemmanager pipewire-alsa readline sound-server ssl system-service systemd test v4l X 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=amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=MIT LGPL-2.1+ GPL-2
 PDEPEND=>=media-video/wireplumber-0.4.8-r3
 RDEPEND=acct-group/audio acct-group/pipewire media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[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/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( dev-libs/glib media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) 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(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) ffmpeg? ( media-video/ffmpeg:= ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) gsettings? ( >=dev-libs/glib-2.26.0:2 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi ) virtual/tmpfiles
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.70/pipewire-0.3.70.tar.bz2
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=e9ea46c5480d2ccdd32e5ec088db4752
+_md5_=0c28c3ed3835c9d62a67ce33d9c7d6a9
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index afc8102ff139..402bbc7beeb2 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/wireshark-4.0.5 b/metadata/md5-cache/net-analyzer/wireshark-4.0.5
index 558351d5e506..2aa636bd765b 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-4.0.5
+++ b/metadata/md5-cache/net-analyzer/wireshark-4.0.5
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.wireshark.org/
 IDEPEND=filecaps? ( sys-libs/libcap ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 qmake-utils xdg cmake
 IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd +filecaps +lua_single_target_lua5-1
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=acct-group/pcap >=dev-libs/glib-2.50.0:2 dev-libs/libpcre2 >=net-dns/c-ares-1.13.0:= >=dev-libs/libgcrypt-1.8.0:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6:= ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) ilbc? ( media-libs/libilbc:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) gui? ( x11-misc/xdg-utils qt6? ( dev-qt/qtbase:6[concurrent,dbus,gui,widgets] dev-qt/qt5compat:6 dev-qt/qtmultimedia:6 ) !qt6? ( dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd:= ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy:= ) spandsp? ( media-libs/spandsp:= ) sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( >=net-libs/gnutls-3.5.8:= ) wifi? ( >=net-libs/libssh-0.6:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) gui? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test ) test
 SLOT=0/4.0.5
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-4.0.5.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	fcaps	c0a086b957a1b183a8d136eabf02f191	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=343d08a77027ea22d14732b9d3698dfc
+_md5_=17af6743fb4734018ac2d2b02ea09580
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index e7b21fa3ce87..6f7f87abdebd 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/btfs-2.24 b/metadata/md5-cache/net-fs/btfs-2.24
index 5c98fe2e64b3..26655b6925ea 100644
--- a/metadata/md5-cache/net-fs/btfs-2.24
+++ b/metadata/md5-cache/net-fs/btfs-2.24
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/johang/btfs
 INHERIT=autotools python-r1
 IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=sys-fs/fuse-2.8.0:0 >=net-misc/curl-7.22.0 dev-libs/boost:= >=net-libs/libtorrent-rasterbar-0.16.0:= python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/johang/btfs/archive/v2.24.tar.gz -> btfs-2.24.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d19f98c24616cce49e88dda4440df23d
+_md5_=905b05175885d5228dcb636b1b17078b
diff --git a/metadata/md5-cache/net-fs/cvmfs-2.9.4-r1 b/metadata/md5-cache/net-fs/cvmfs-2.9.4-r1
deleted file mode 100644
index 5de86f6af639..000000000000
--- a/metadata/md5-cache/net-fs/cvmfs-2.9.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile config configure install prepare setup test
-DEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= dev-libs/leveldb:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= virtual/pkgconfig
-DESCRIPTION=HTTP read-only file system for distributing software
-EAPI=7
-HOMEPAGE=https://cernvm.cern.ch/fs/
-INHERIT=cmake linux-info bash-completion-r1
-IUSE=server
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= dev-libs/leveldb:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= app-admin/sudo net-fs/autofs
-SLOT=0
-SRC_URI=https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.9.4/source.tar.gz -> cvmfs-2.9.4.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=898e2647d60c08c060669e02dd0c121e
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 4ba1031994ef..6bb04bb594c4 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/telegram-desktop-4.6.5-r1 b/metadata/md5-cache/net-im/telegram-desktop-4.6.5-r2
index ebd83245b69b..85b275e1f74d 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-4.6.5-r1
+++ b/metadata/md5-cache/net-im/telegram-desktop-4.6.5-r2
@@ -14,4 +14,4 @@ REQUIRED_USE=qt6-imageformats? ( qt6 )
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v4.6.5/tdesktop-4.6.5-full.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4d186a71f8e583bde82b46981e01baf4
+_md5_=59d536ce7976158e8bb13e4ff156828c
diff --git a/metadata/md5-cache/net-im/telegram-desktop-4.7.1-r1 b/metadata/md5-cache/net-im/telegram-desktop-4.7.1-r1
deleted file mode 100644
index 1aaacea749f8..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-4.7.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-util/cmake-3.16 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= dev-libs/glib:2 dev-libs/libdispatch dev-libs/libsigc++:2 dev-libs/openssl:= dev-libs/protobuf dev-libs/xxhash media-libs/fontconfig:= media-libs/libjpeg-turbo:= ~media-libs/libtgvoip-2.4.4_p20221208 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20230428:=[screencast=,X=] media-video/ffmpeg:=[opus,vpx] sys-libs/zlib:=[minizip] virtual/opengl dbus? ( >=dev-cpp/glibmm-2.76:2.68 ) !enchant? ( >=app-text/hunspell-1.7:= ) enchant? ( app-text/enchant:= ) jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) !qt6? ( >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] kde-frameworks/kcoreaddons:= ) qt6? ( dev-qt/qt5compat:6 dev-qt/qtbase:6[dbus?,gui,network,opengl,widgets,X?] dev-qt/qtimageformats:6 dev-qt/qtsvg:6 wayland? ( dev-qt/qtwayland:6 ) qt6-imageformats? ( media-libs/libavif:= media-libs/libheif:= media-libs/libjxl ) ) X? ( x11-libs/libxcb:= x11-libs/xcb-util-keysyms ) dev-cpp/range-v3 >=dev-cpp/ms-gsl-4
-DESCRIPTION=Official desktop client for Telegram
-EAPI=8
-HOMEPAGE=https://desktop.telegram.org
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=xdg cmake python-any-r1 optfeature flag-o-matic
-IUSE=+dbus enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland +X
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
-LICENSE=BSD GPL-3-with-openssl-exception LGPL-2+
-RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= dev-libs/glib:2 dev-libs/libdispatch dev-libs/libsigc++:2 dev-libs/openssl:= dev-libs/protobuf dev-libs/xxhash media-libs/fontconfig:= media-libs/libjpeg-turbo:= ~media-libs/libtgvoip-2.4.4_p20221208 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20230428:=[screencast=,X=] media-video/ffmpeg:=[opus,vpx] sys-libs/zlib:=[minizip] virtual/opengl dbus? ( >=dev-cpp/glibmm-2.76:2.68 ) !enchant? ( >=app-text/hunspell-1.7:= ) enchant? ( app-text/enchant:= ) jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) !qt6? ( >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] kde-frameworks/kcoreaddons:= ) qt6? ( dev-qt/qt5compat:6 dev-qt/qtbase:6[dbus?,gui,network,opengl,widgets,X?] dev-qt/qtimageformats:6 dev-qt/qtsvg:6 wayland? ( dev-qt/qtwayland:6 ) qt6-imageformats? ( media-libs/libavif:= media-libs/libheif:= media-libs/libjxl ) ) X? ( x11-libs/libxcb:= x11-libs/xcb-util-keysyms )
-REQUIRED_USE=qt6-imageformats? ( qt6 )
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v4.7.1/tdesktop-4.7.1-full.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ac8cc8ee070d35c5c991af7c56f88a4f
diff --git a/metadata/md5-cache/net-im/telegram-desktop-4.8.1-r1 b/metadata/md5-cache/net-im/telegram-desktop-4.8.1-r2
index 8e102de62ea0..f712e32bb5c4 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-4.8.1-r1
+++ b/metadata/md5-cache/net-im/telegram-desktop-4.8.1-r2
@@ -14,4 +14,4 @@ REQUIRED_USE=qt6-imageformats? ( qt6 )
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v4.8.1/tdesktop-4.8.1-full.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ac8cc8ee070d35c5c991af7c56f88a4f
+_md5_=fe4996721ff39012be15662737cb23f3
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index ca9e3ae1811b..83f27d2697bf 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libproxy-0.5.0 b/metadata/md5-cache/net-libs/libproxy-0.5.0
new file mode 100644
index 000000000000..e8e305596c4a
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libproxy-0.5.0
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig 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 prepare test
+DEPEND=>=dev-libs/glib-2.71.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(-)?] gnome? ( gnome-base/gsettings-desktop-schemas ) duktape? ( dev-lang/duktape:= net-misc/curl ) test? ( net-libs/libsoup: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(-)?] )
+DESCRIPTION=Library for automatic proxy configuration management
+EAPI=8
+HOMEPAGE=https://github.com/libproxy/libproxy
+INHERIT=meson-multilib vala
+IUSE=duktape gnome gtk-doc +introspection kde test vala 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
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.71.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(-)?] gnome? ( gnome-base/gsettings-desktop-schemas ) duktape? ( dev-lang/duktape:= net-misc/curl ) kde? ( kde-frameworks/kconfig:5 )
+REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/libproxy/libproxy/archive/refs/tags/libproxy-0.5.0.tar.gz
+_eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vala	1343f639cc74d2aa8b36fc08677da58d
+_md5_=3a5f401ab559ce996701bb343d6beb1c
diff --git a/metadata/md5-cache/net-libs/nodejs-20.2.0 b/metadata/md5-cache/net-libs/nodejs-20.2.0
new file mode 100644
index 000000000000..652422ca20d7
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-20.2.0
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) dev-util/ninja sys-apps/coreutils virtual/pkgconfig test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.44.0:= >=net-dns/c-ares-1.18.1:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=8
+HOMEPAGE=https://nodejs.org/
+INHERIT=bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
+IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.44.0:= >=net-dns/c-ares-1.18.1:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*
+REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl ) x86? ( cpu_flags_x86_sse2 )
+RESTRICT=!test? ( test )
+SLOT=0/20
+SRC_URI=https://nodejs.org/dist/v20.2.0/node-v20.2.0.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=d61312e7a753aefa7e914fdff0f597cf
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index e43f6ec3ef50..43be72ac2e85 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/curl-8.0.1 b/metadata/md5-cache/net-misc/curl-8.0.1
index 018520528564..cd5c3eb7db10 100644
--- a/metadata/md5-cache/net-misc/curl-8.0.1
+++ b/metadata/md5-cache/net-misc/curl-8.0.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://curl.se/
 INHERIT=autotools multilib-minimal prefix verify-sig
 IUSE=+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls nghttp3 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 ~arm64-macos ~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 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=curl
 RDEPEND=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(-)?] adns? ( net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:=[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(-)?] ) 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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( app-misc/ca-certificates net-libs/gnutls:=[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(-)?] dev-libs/nettle:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( app-misc/ca-certificates net-libs/mbedtls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nss? ( app-misc/ca-certificates dev-libs/nss[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/nss-pem ) openssl? ( dev-libs/openssl:=[sslv3(-)=,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(-)?] ) rustls? ( net-libs/rustls-ffi:=[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:=[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=ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_rustls ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.se/download/curl-8.0.1.tar.xz verify-sig? ( https://curl.se/download/curl-8.0.1.tar.xz.asc )
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=7cef2b34d1f99260dfcc4b52710cd878
+_md5_=3475fe268ca481e079eb3e343fc2f2b4
diff --git a/metadata/md5-cache/net-misc/netifrc-0.7.4 b/metadata/md5-cache/net-misc/netifrc-0.7.4
index 9251087f1496..93d901790a68 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.7.4
+++ b/metadata/md5-cache/net-misc/netifrc-0.7.4
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://www.gentoo.org/proj/en/base/openrc/
 INHERIT=systemd udev
 IUSE=+dhcp
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.15 dhcp? ( || ( net-misc/dhcpcd net-misc/dhcp[client] ) )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/netifrc.git/snapshot/netifrc-0.7.4.tar.bz2
 _eclasses_=multilib	104e1332efb829e2f7cbf89307a474f1	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=86b1032e633de8d1132af613c3918b3a
+_md5_=7cfb5bd453f788c4230136285a7a4f2d
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 6409020acbf9..d52e7526c49a 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/huggingface_hub-0.13.4 b/metadata/md5-cache/sci-libs/huggingface_hub-0.13.4
deleted file mode 100644
index e4eca004c85e..000000000000
--- a/metadata/md5-cache/sci-libs/huggingface_hub-0.13.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=a client library to interact with the Hugging Face Hub
-EAPI=8
-HOMEPAGE=https://pypi.org/project/huggingface_hub/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/huggingface/huggingface_hub/archive/refs/tags/v0.13.4.tar.gz -> huggingface_hub-0.13.4.gh.tar.gz
-_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a3768a48487cfcac0cf0b8f6b23d6d38
diff --git a/metadata/md5-cache/sci-libs/huggingface_hub-0.13.4-r1 b/metadata/md5-cache/sci-libs/huggingface_hub-0.13.4-r1
new file mode 100644
index 000000000000..5ff985679c7c
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/huggingface_hub-0.13.4-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/filelock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tqdm[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=a client library to interact with the Hugging Face Hub
+EAPI=8
+HOMEPAGE=https://pypi.org/project/huggingface_hub/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/filelock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tqdm[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/huggingface/huggingface_hub/archive/refs/tags/v0.13.4.tar.gz -> huggingface_hub-0.13.4.gh.tar.gz
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=1d88fc642236d06685036340d652f5f0
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 8c22877caa7a..5ae2ae050aa0 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.11 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.11
deleted file mode 100644
index d3a3276fa3a1..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-DESCRIPTION=Kubernetes API server
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module systemd
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.11.tar.gz -> kubernetes-1.24.11.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8b056d18443353fb05af12e6bfa49cd1
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.13 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.13
index ebda8ea4d482..2064196fd680 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.13
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.13
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module systemd
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.13.tar.gz -> kubernetes-1.24.13.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6b1647a8a3ca657444fb8bf921c6c477
+_md5_=8b056d18443353fb05af12e6bfa49cd1
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.25.7 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.25.7
deleted file mode 100644
index 18c408bf6a8b..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.25.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-DESCRIPTION=Kubernetes API server
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module systemd
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.25.7.tar.gz -> kubernetes-1.25.7.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=568892010c4c4394551119661b51a4f6
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.25.9 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.25.9
index 7846d8f1e2b2..fa81b8a7d9ac 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.25.9
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.25.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module systemd
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.25.9.tar.gz -> kubernetes-1.25.9.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4cd4947a68a2a8004bd2a53e2d46b9ee
+_md5_=568892010c4c4394551119661b51a4f6
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.26.2 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.26.2
deleted file mode 100644
index d6ec5ec3b36a..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.26.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-DESCRIPTION=Kubernetes API server
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module systemd
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.2.tar.gz -> kubernetes-1.26.2.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=568892010c4c4394551119661b51a4f6
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.26.4 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.26.4
index d92b02f18909..5077be79ae7a 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.26.4
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.26.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module systemd
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.4.tar.gz -> kubernetes-1.26.4.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4cd4947a68a2a8004bd2a53e2d46b9ee
+_md5_=568892010c4c4394551119661b51a4f6
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.11 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.11
deleted file mode 100644
index beb0412a9d6e..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.11.tar.gz -> kubernetes-1.24.11.tar.gz
-_eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ce10ba3ae5bd3c69df7e356bb79338df
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.13 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.13
index 934fea50f867..860d013efbd0 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.13
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.13
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.13.tar.gz -> kubernetes-1.24.13.tar.gz
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=93d5d80c64c44d7d183756279aa1c7e3
+_md5_=ce10ba3ae5bd3c69df7e356bb79338df
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.25.7 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.25.7
deleted file mode 100644
index 70b50206ec72..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.25.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.25.7.tar.gz -> kubernetes-1.25.7.tar.gz
-_eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7e66467d2517afe515e9ea13cd6d0975
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.25.9 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.25.9
index 082f9a1ce813..dd10d979df8d 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.25.9
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.25.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.25.9.tar.gz -> kubernetes-1.25.9.tar.gz
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=72c01f80663487d145745735cb43ad55
+_md5_=7e66467d2517afe515e9ea13cd6d0975
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.26.2 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.26.2
deleted file mode 100644
index 4dc74512956c..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.26.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.2.tar.gz -> kubernetes-1.26.2.tar.gz
-_eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7e66467d2517afe515e9ea13cd6d0975
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.26.4 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.26.4
index ae2221f0c9a5..0a945926214b 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.26.4
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.26.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.4.tar.gz -> kubernetes-1.26.4.tar.gz
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=72c01f80663487d145745735cb43ad55
+_md5_=7e66467d2517afe515e9ea13cd6d0975
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.24.11 b/metadata/md5-cache/sys-cluster/kube-proxy-1.24.11
deleted file mode 100644
index e63286cb8748..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.24.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Proxy service
-EAPI=7
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.11.tar.gz -> kubernetes-1.24.11.tar.gz
-_eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=528423a95b0c1cb892fd67052bc580a3
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.24.13 b/metadata/md5-cache/sys-cluster/kube-proxy-1.24.13
index 5584812cebf9..f321c4b8ccba 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.24.13
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.24.13
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=net-firewall/conntrack-tools
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.13.tar.gz -> kubernetes-1.24.13.tar.gz
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=efec6f66b408d40de804fd660132df36
+_md5_=528423a95b0c1cb892fd67052bc580a3
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.25.7 b/metadata/md5-cache/sys-cluster/kube-proxy-1.25.7
deleted file mode 100644
index 21f51035fc7c..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.25.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Proxy service
-EAPI=8
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.25.7.tar.gz -> kubernetes-1.25.7.tar.gz
-_eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=dc5e9d2646ae373f813081396ff53bfb
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.25.9 b/metadata/md5-cache/sys-cluster/kube-proxy-1.25.9
index 3a408956d0f4..96931e91810c 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.25.9
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.25.9
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=net-firewall/conntrack-tools
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.25.9.tar.gz -> kubernetes-1.25.9.tar.gz
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4d07d6e6a85f4283214166e3e03bd6da
+_md5_=dc5e9d2646ae373f813081396ff53bfb
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.26.2 b/metadata/md5-cache/sys-cluster/kube-proxy-1.26.2
deleted file mode 100644
index 119e3bd64594..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.26.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Proxy service
-EAPI=8
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.2.tar.gz -> kubernetes-1.26.2.tar.gz
-_eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=dc5e9d2646ae373f813081396ff53bfb
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.26.4 b/metadata/md5-cache/sys-cluster/kube-proxy-1.26.4
index d28fcf92dad9..525f2c5e4599 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.26.4
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.26.4
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=net-firewall/conntrack-tools
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.4.tar.gz -> kubernetes-1.26.4.tar.gz
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4d07d6e6a85f4283214166e3e03bd6da
+_md5_=dc5e9d2646ae373f813081396ff53bfb
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.11 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.11
deleted file mode 100644
index 84086a84d1cf..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-DESCRIPTION=Kubernetes Scheduler
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.11.tar.gz -> kubernetes-1.24.11.tar.gz
-_eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=89efe7f05e5372117ac5e1dd931c8ad1
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.13 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.13
index f0b7a7e3a28f..a709451620a0 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.13
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.13
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.13.tar.gz -> kubernetes-1.24.13.tar.gz
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f8c4b21f370d76e38c776fecb43d97bd
+_md5_=89efe7f05e5372117ac5e1dd931c8ad1
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.25.7 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.25.7
deleted file mode 100644
index 806774dcd64f..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.25.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-DESCRIPTION=Kubernetes Scheduler
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.25.7.tar.gz -> kubernetes-1.25.7.tar.gz
-_eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d00c6dbc8f577db9007e1ca64579a741
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.25.9 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.25.9
index ca8f5febefc7..876d2adbc8d3 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.25.9
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.25.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.25.9.tar.gz -> kubernetes-1.25.9.tar.gz
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=27109a0647e998e2663cfeb27fd9d8df
+_md5_=d00c6dbc8f577db9007e1ca64579a741
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.26.2 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.26.2
deleted file mode 100644
index d4ba6f3d80f8..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.26.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-DESCRIPTION=Kubernetes Scheduler
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.2.tar.gz -> kubernetes-1.26.2.tar.gz
-_eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d00c6dbc8f577db9007e1ca64579a741
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.26.4 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.26.4
index 632a73c8271c..1addbec8d774 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.26.4
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.26.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.4.tar.gz -> kubernetes-1.26.4.tar.gz
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=27109a0647e998e2663cfeb27fd9d8df
+_md5_=d00c6dbc8f577db9007e1ca64579a741
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.24.11 b/metadata/md5-cache/sys-cluster/kubeadm-1.24.11
deleted file mode 100644
index ee537435d4fc..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.24.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened selinux
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=app-containers/cri-tools selinux? ( sec-policy/selinux-kubernetes )
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.11.tar.gz -> kubernetes-1.24.11.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=21341ede70d5e0b86ada648e49ef3896
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.24.13 b/metadata/md5-cache/sys-cluster/kubeadm-1.24.13
index ab3a01709872..7ce131d66ccd 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.24.13
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.24.13
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened selinux
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=app-containers/cri-tools selinux? ( sec-policy/selinux-kubernetes )
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.13.tar.gz -> kubernetes-1.24.13.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=fe95d0269667cc7f10422ff8d11a734a
+_md5_=21341ede70d5e0b86ada648e49ef3896
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.25.7 b/metadata/md5-cache/sys-cluster/kubeadm-1.25.7
deleted file mode 100644
index 38f5189a2e18..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.25.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened selinux
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=app-containers/cri-tools selinux? ( sec-policy/selinux-kubernetes )
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.25.7.tar.gz -> kubernetes-1.25.7.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a1d6e48fff34b8182a7cf41e408c0de9
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.25.9 b/metadata/md5-cache/sys-cluster/kubeadm-1.25.9
index 0aafa93800b2..02bafd1afdc7 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.25.9
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.25.9
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened selinux
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=app-containers/cri-tools selinux? ( sec-policy/selinux-kubernetes )
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.25.9.tar.gz -> kubernetes-1.25.9.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9134c716e4a64b1e49b242943c6f147a
+_md5_=a1d6e48fff34b8182a7cf41e408c0de9
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.26.2 b/metadata/md5-cache/sys-cluster/kubeadm-1.26.2
deleted file mode 100644
index 0ff38e87dbfa..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.26.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened selinux
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=app-containers/cri-tools selinux? ( sec-policy/selinux-kubernetes )
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.2.tar.gz -> kubernetes-1.26.2.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a1d6e48fff34b8182a7cf41e408c0de9
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.26.4 b/metadata/md5-cache/sys-cluster/kubeadm-1.26.4
index 05e58f176802..ff5888f9e87a 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.26.4
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.26.4
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened selinux
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=app-containers/cri-tools selinux? ( sec-policy/selinux-kubernetes )
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.4.tar.gz -> kubernetes-1.26.4.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9134c716e4a64b1e49b242943c6f147a
+_md5_=a1d6e48fff34b8182a7cf41e408c0de9
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.24.11 b/metadata/md5-cache/sys-cluster/kubectl-1.24.11
deleted file mode 100644
index 64ae6fe0816f..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.24.11
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.11.tar.gz -> kubernetes-1.24.11.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e2d032be9496ce0453643631710c406d
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.24.13 b/metadata/md5-cache/sys-cluster/kubectl-1.24.13
index 5df70a03ba6c..83175b23346e 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.24.13
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.24.13
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.13.tar.gz -> kubernetes-1.24.13.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=248acdbaaaeb65f61e297ffd2f4cc4f7
+_md5_=e2d032be9496ce0453643631710c406d
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.25.7 b/metadata/md5-cache/sys-cluster/kubectl-1.25.7
deleted file mode 100644
index e31ce076f414..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.25.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.25.7.tar.gz -> kubernetes-1.25.7.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e33bf31ad700a1488df20de29f4be865
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.25.9 b/metadata/md5-cache/sys-cluster/kubectl-1.25.9
index c19c29bf2693..a7b05c5fb24e 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.25.9
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.25.9
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.25.9.tar.gz -> kubernetes-1.25.9.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8d7568fac85c8036aac1e62b6f4ea63f
+_md5_=e33bf31ad700a1488df20de29f4be865
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.26.2 b/metadata/md5-cache/sys-cluster/kubectl-1.26.2
deleted file mode 100644
index 9b38c3010ad3..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.26.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.2.tar.gz -> kubernetes-1.26.2.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e33bf31ad700a1488df20de29f4be865
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.26.4 b/metadata/md5-cache/sys-cluster/kubectl-1.26.4
index 8097014dbab9..1282b91c6c24 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.26.4
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.26.4
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://kubernetes.io
 INHERIT=bash-completion-r1 go-module
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.4.tar.gz -> kubernetes-1.26.4.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8d7568fac85c8036aac1e62b6f4ea63f
+_md5_=e33bf31ad700a1488df20de29f4be865
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.24.11 b/metadata/md5-cache/sys-cluster/kubelet-1.24.11
deleted file mode 100644
index d875d6e0a3d1..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.24.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Node Agent
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module systemd
-IUSE=hardened selinux
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=selinux? ( sec-policy/selinux-kubernetes )
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.11.tar.gz -> kubernetes-1.24.11.tar.gz
-_eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e01050717f23091bc5aefc5ef93e498b
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.24.13 b/metadata/md5-cache/sys-cluster/kubelet-1.24.13
index 8593ba277ec7..d4aa56bf2b49 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.24.13
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.24.13
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module systemd
 IUSE=hardened selinux
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=selinux? ( sec-policy/selinux-kubernetes )
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.13.tar.gz -> kubernetes-1.24.13.tar.gz
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f3f5358d449d67021cb414c8a182e2ab
+_md5_=e01050717f23091bc5aefc5ef93e498b
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.25.7 b/metadata/md5-cache/sys-cluster/kubelet-1.25.7
deleted file mode 100644
index bdfbd7e8cb17..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.25.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Node Agent
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module systemd
-IUSE=hardened selinux
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=selinux? ( sec-policy/selinux-kubernetes )
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.25.7.tar.gz -> kubernetes-1.25.7.tar.gz
-_eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=07f9ce5b96157561e08be78f63243777
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.25.9 b/metadata/md5-cache/sys-cluster/kubelet-1.25.9
index 823041b3be18..5d673d080fd5 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.25.9
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.25.9
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module systemd
 IUSE=hardened selinux
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=selinux? ( sec-policy/selinux-kubernetes )
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.25.9.tar.gz -> kubernetes-1.25.9.tar.gz
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5af1a3c3e2ecac0c7e0ebb16fbfff2da
+_md5_=07f9ce5b96157561e08be78f63243777
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.26.2 b/metadata/md5-cache/sys-cluster/kubelet-1.26.2
deleted file mode 100644
index 8460d61179ed..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.26.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Node Agent
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module systemd
-IUSE=hardened selinux
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=selinux? ( sec-policy/selinux-kubernetes )
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.2.tar.gz -> kubernetes-1.26.2.tar.gz
-_eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=07f9ce5b96157561e08be78f63243777
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.26.4 b/metadata/md5-cache/sys-cluster/kubelet-1.26.4
index 906801cbbc35..0bbcb6dabf94 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.26.4
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.26.4
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://kubernetes.io
 INHERIT=go-module systemd
 IUSE=hardened selinux
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=selinux? ( sec-policy/selinux-kubernetes )
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.4.tar.gz -> kubernetes-1.26.4.tar.gz
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5af1a3c3e2ecac0c7e0ebb16fbfff2da
+_md5_=07f9ce5b96157561e08be78f63243777
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index ae5c1d0e0d92..46f3191c0842 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 7ec34240b3a5..0a36ff8f89ff 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 ~arm64 ~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_=b6ad6a1a8f8b8bd1d8547718b3880282
+_md5_=ed322f1cd1eda0f56e9d4da3f343080e
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 3dcb9d7e099f..429beed7c23c 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/linux-firmware-20230515 b/metadata/md5-cache/sys-kernel/linux-firmware-20230515
new file mode 100644
index 000000000000..7ad0461ebc44
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20230515
@@ -0,0 +1,16 @@
+BDEPEND=initramfs? ( app-arch/cpio ) compress-xz? ( app-arch/xz-utils ) compress-zstd? ( app-arch/zstd )
+DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup unpack
+DESCRIPTION=Linux firmware files
+EAPI=7
+HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
+INHERIT=linux-info mount-boot savedconfig multiprocessing
+IUSE=compress-xz compress-zstd initramfs +redistributable savedconfig unknown-license savedconfig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT ) unknown-license? ( all-rights-reserved )
+RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-block/qla-fc-firmware !sys-firmware/iwl1000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/raspberrypi-wifi-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
+REQUIRED_USE=initramfs? ( redistributable ) ?? ( compress-xz compress-zstd )
+RESTRICT=binchecks strip test unknown-license? ( bindist )
+SLOT=0
+SRC_URI=https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-20230515.tar.xz
+_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	964493f201f557a5c6baccacccf45ee2	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=459b7523843a61bd0615339026fee586
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 46ac050abef8..baaed824b2cb 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/glibc-2.36-r8 b/metadata/md5-cache/sys-libs/glibc-2.36-r8
index c881032ae164..ea0514dcc5f0 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.36-r8
+++ b/metadata/md5-cache/sys-libs/glibc-2.36-r8
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
 INHERIT=python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
 IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd perl profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) perl? ( dev-lang/perl ) test? ( dev-lang/perl ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep app-alternatives/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.36.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.36-patches-10.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.23.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7b87fc88fbebdf2422912609678a56b9
+_md5_=d9137b9c29c0ef102b960f8dd7edad48
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 4bd94b974f2a..95b121170c8f 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/chromium-113.0.5672.92 b/metadata/md5-cache/www-client/chromium-113.0.5672.92
new file mode 100644
index 000000000000..323607f1ca6d
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-113.0.5672.92
@@ -0,0 +1,16 @@
+BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) || ( ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] dev-python/setuptools[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ) >=app-arch/gzip-1.7 !headless? ( qt5? ( dev-qt/qtcore:5 ) ) libcxx? ( >=sys-devel/clang-16 ) lto? ( sys-devel/clang:16 sys-devel/llvm:16 =sys-devel/lld-16* ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 sys-devel/clang:16 sys-devel/llvm:16 =sys-devel/lld-16* ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) ) !headless? ( gtk4? ( gui-libs/gtk:4[X?,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) ) !!sys-devel/llvm:0
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=8
+HOMEPAGE=https://chromium.org/
+INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
+IUSE=+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless kerberos libcxx lto +official pax-kernel pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine custom-cflags +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW pgo
+KEYWORDS=~amd64 ~arm64
+LICENSE=BSD
+RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) qt5? ( dev-qt/qtgui:5[X?,wayland?] ) ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
+REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
+SLOT=0/stable
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-113.0.5672.92.tar.xz https://dev.gentoo.org/~sam/distfiles/www-client/chromium/chromium-112-gcc-13-patches.tar.xz ppc64? ( https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_112.0.5615.49-2raptor0~deb11u1.debian.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-ppc64le-gentoo-patches-1.tar.xz ) pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=84027a60676fcbbba5ce74a06de5b60b
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 1f24c4830b88..478b2f88a62a 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/xterm-379 b/metadata/md5-cache/x11-terms/xterm-379
index 2b65c2fa57d4..c148dfb540a0 100644
--- a/metadata/md5-cache/x11-terms/xterm-379
+++ b/metadata/md5-cache/x11-terms/xterm-379
@@ -7,10 +7,10 @@ HOMEPAGE=https://invisible-island.net/xterm/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=desktop flag-o-matic toolchain-funcs verify-sig xdg
 IUSE=+openpty sixel toolbar truetype unicode Xaw3d xinerama 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=MIT
 RDEPEND=kernel_linux? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/xterm/xterm-379.tgz verify-sig? ( https://invisible-island.net/archives/xterm/xterm-379.tgz.asc )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=172078a074db6aa1ea570cefd2bfbdc7
+_md5_=fe337112134265cba5f929889b9aab88
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index ec3dcbf27f49..a347542cf923 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/gentoo-artwork-0.4.2-r1 b/metadata/md5-cache/x11-themes/gentoo-artwork-0.4.2-r1
index 145ed27057be..c8556eabd0f6 100644
--- a/metadata/md5-cache/x11-themes/gentoo-artwork-0.4.2-r1
+++ b/metadata/md5-cache/x11-themes/gentoo-artwork-0.4.2-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Collection of miscellaneous Gentoo Linux logos and artwork
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Artwork
 IUSE=+grub +icons kde lilo offensive +pixmaps
-KEYWORDS=~alpha amd64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=pixmaps? ( mirror://gentoo/gentoo-artwork-0.2.tar.bz2 mirror://gentoo/gentoo-artwork-0.3.tar.bz2 mirror://gentoo/gentoo-artwork-0.4.tar.bz2 mirror://gentoo/gentoo-artwork-0.4.1.tar.bz2 mirror://gentoo/gentoo-artwork-0.4.2.tar.bz2 icons? ( mirror://gentoo/gentoo-bubble-icons-20060811.tar.gz ) ) !pixmaps? ( icons? ( mirror://gentoo/gentoo-artwork-0.2.tar.bz2 mirror://gentoo/gentoo-artwork-0.3.tar.bz2 mirror://gentoo/gentoo-artwork-0.4.tar.bz2 mirror://gentoo/gentoo-artwork-0.4.2.tar.bz2 mirror://gentoo/gentoo-bubble-icons-20060811.tar.gz ) !icons? ( kde? ( mirror://gentoo/gentoo-artwork-0.2.tar.bz2 ) !kde? ( grub? ( mirror://gentoo/gentoo-artwork-0.2.tar.bz2 ) ) lilo? ( mirror://gentoo/gentoo-artwork-0.4.tar.bz2 ) ) )
-_md5_=5e27ae98f8d30538e78d01b2121dffba
+_md5_=b8f3f2438d4943199d467442c4d9b825
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index d135ef1a2d45..5403fbfeb65e 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15668 BLAKE2B 449292f439e2a4f4fd7b4726028a046b309262c1c104b330b62b26428794c6a1ff66902103e9c2359f352f474b113cc9c85ddbbb187a374b6211d02e6ca79ff3 SHA512 e7b892ad549ad1d2a69c8cd56f9a18807e1e7a0c3b686e86ad5dca719913cab1270dea7dd5e376d522493285e5a8117f923772e2df0f2019b0c49a02107d6b03
-TIMESTAMP 2023-05-16T14:40:09Z
+TIMESTAMP 2023-05-16T20:40:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRjlclfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRj6iRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDkuQ/9FhP0IhjYqbrO1ZlwhvlejknCdGKCsGXsvtqlALtsqXeL/vVuM1KdbMiK
-Q7yPh7mlWC/QlxVKpR0dYntRZnS0hcnuFptB6Q/sjRCTCAryk9XSrJ0PE1a9psYi
-YlyGC1hYMtMBRMjhwHOC3HxxOxgIq5/zEgWUrCSs9ig9eZboEaihXBa4WOR8VIFW
-U/q7FHd+jFFFBrGJfJCGuaROs0UrSK9z1zSYN7ZKGKqvj9mKRnCHOJU2Wk8Tt7i8
-HDGdECDDT9uGlf2mBguK5jiqxwzKruHSBPo8TYUPVp91b2WGQvpEfEht8bBQcYgU
-D9DAXvkPeimMTSnHlPww44XqnGeKFvIHNI9akEIGOqDU/WpRGfpALAH8v7gAmDnX
-RDdK6ZDqezQGXKQmmLVM/TRrmJ021cg/dpChGpRdTXiYaCmvhkJm5iKftOT3oae8
-4UC6rF8OClhaDga9zkRBnTwQQB8mEg0u7HLRh3sUfYrM/dBP88krm0CeuGZh+f8f
-1GbbBlxpQu4xXAha72V9ycZi1VLmrYajr27MyiDFQPhlYttOaQYL/filGsxG96j3
-n/WgNM0c2VAKnf/tN2PIRgQREojZXYvrf9aUmGeG4v9jfZ4DgqYsD/kipjrRbkca
-0cRnShGZD4KE8mDCPkFVDnPkxW/Uhl6d5Ds2GAn22wNNerWkl/s=
-=igLB
+klA1bw/8D0wgAERzaO3CwYo/9xIz+GRf2fZFzG5FCs0vg/jPkCMvBHNeREU0w8V6
+GfswJ4MCvBrYnoGichKXm4UMYjAQVswAYVpL3nExS7zhiMDtYYM9u2nlRudQ8Qyb
+KZvvVA8TXWsgusmYDhPOIeREajJw5D2Gb4PboBx+ZSW3vlnCnB9ml7kVI+von0h2
+wAw8K8Vx8kQ8c0P3Z9uJ4/tlyFYFoYFKWYCGHz0TydyRv4cB7tpOIYqr5rqVMuH0
+Gd1Ol8zYiQgzlyNKkGV1f3wOg5Uye0eYV9Cl/5TyCPHlo9/p+AMNgF7mkIYvgghb
+KpMCnTBEycKiTiGRohTboMlOK4JY66K37GkGfUbm0hQvnyMq01fAMvNMao9tuLGh
+3ypQrNXu+wBMTVrQDFK9EhWUDCgyBLLhNKAJgxAQQo+cMGuTibxogol0AsS+zd8M
+BRsIpIfGmZgaVFyxRHP4CwLuIA0BzAEZS8OFjGzfcqje14RAMeuoZ2I7b7hmV/UP
+Uc5PGhfoEX8iBxZfcDrMmjeZ5bCoZMyUnjQO4muS/oWkX5dJpQ+Zu6I0w0QL61IX
+8eO/Y7N5+p7/AV1mox6N1wCC8U+I92owjjB1b8+QFhKv3i8egATU2vW23q/g7yHy
+HDj4PMgFiRQcDYXwtNaxYHlC1UuKp/XxDmrr2vyrQuskEScyrnc=
+=GPED
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a61dd9875b4f..c47c50a562b2 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 16 May 2023 14:40:06 +0000
+Tue, 16 May 2023 20:40:01 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 99904e5a89c2..20ef8f32335d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue May 16 02:40:05 PM UTC 2023
+Tue May 16 08:40:00 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 6ef49bcdbd1a..1b57a3c30b60 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 16 May 2023 14:45:01 +0000
+Tue, 16 May 2023 20:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index b8df5cc0e298..d370eca48925 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-cf79825c59c249f41ff7aff0b57bad1be3a6213a 1684245442 2023-05-16T13:57:22+00:00
+db56a952bcf3eee212ef12aaad07e71573d6855f 1684268214 2023-05-16T20:16:54+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 5b40022ef6f5..88c129ea8a69 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1684248001 Tue 16 May 2023 02:40:01 PM UTC
+1684269601 Tue 16 May 2023 08:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index a61dd9875b4f..49c9fed8e183 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 16 May 2023 14:40:06 +0000
+Tue, 16 May 2023 20:40:00 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 46da0ca36046..deedd9512ed4 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 31c652ba3144..706eefa14738 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -8,6 +8,6 @@ DIST wireshark-4.0.5.tar.xz 41401932 BLAKE2B 932c017eaef6d0758a70bba3beb018e7512
 EBUILD wireshark-3.6.12-r1.ebuild 7456 BLAKE2B 3b2654658b5af556620cd6a1bbf53dd7f29853e255d75933ed90cea393707d556c1b0179b87e86188fe20555aebc01bdc29e8bd22d65837a749045a1569951e1 SHA512 f289d58b96a89f9f3e0bdf5be1cf9eaac7082ac00d2d98ef7431762eee47049152c6248434b936748aaad2ac89a04f01f1dad658165cc392e8f7b3831aef05a3
 EBUILD wireshark-3.6.13.ebuild 7461 BLAKE2B 3b911e408c6c9c4a11a4d9bf358f4433b9e79dc6157b02be906643fbdf38d1cdb3f94e5d937be90849cac2d34251d0dfb99d062b43dd3961e0e8b0cbf2e4baae SHA512 90150b487e62d70e87c7cd597a27fd77098c11de4e6f9c66fc9a2359a7c9b654764aa5f8633db0530fdd30028f1b86cd63c9b69f532737517a322f3453e0ba53
 EBUILD wireshark-4.0.4-r1.ebuild 7971 BLAKE2B 60d8ff6a50c5af252631dadbe6f97fb6f1e4c3182080c78db8910aee02573c78c65b0477220c6f760fe8e3332bfb6b3c2c3e5b74dd7622463c4cc0140e1dea1f SHA512 07210f6a8c5dca8f26c4c5b32939daf8e59d2a23f8ce5831c4e23ea472d4a6771d3606a235e901508715765fe998d27cc779600b57c4e1abc6cb083e290002e8
-EBUILD wireshark-4.0.5.ebuild 7972 BLAKE2B 6f83176a8ae8b9c0379a7fe7b107178442ea9a38ce43f51f933afc748cc60b4cd72c60b6ae0ef2849e21783084bff96d683aa6c40d71163fda1779bd1897cb01 SHA512 093cd0e14bfafa4eb5a928df74512dc8980dc4c7cffb13412f34a6af626d1211a57c19bdf3396f735a8325d9ef68bcb32cd4d84532447dd6ede74771fcb52c6f
+EBUILD wireshark-4.0.5.ebuild 7971 BLAKE2B 60d8ff6a50c5af252631dadbe6f97fb6f1e4c3182080c78db8910aee02573c78c65b0477220c6f760fe8e3332bfb6b3c2c3e5b74dd7622463c4cc0140e1dea1f SHA512 07210f6a8c5dca8f26c4c5b32939daf8e59d2a23f8ce5831c4e23ea472d4a6771d3606a235e901508715765fe998d27cc779600b57c4e1abc6cb083e290002e8
 EBUILD wireshark-9999.ebuild 8121 BLAKE2B 895b7a15a0f9bc3a89fce4340ed38be878588389b9f368cdc94b63ba98bdbb213ca042734edf16d44bb5051c0fb93c23efd3b5d306fc791b710c8d9cebe18289 SHA512 17277123fb310f820750060d66fd80a60e658bbc64fc761085996966da66306628c395f1b25ab7a0774545ee2a9469345d84307b3acc252a35e48d3373defdc0
 MISC metadata.xml 5488 BLAKE2B d3d216dbc02421c620a6c7fcb04caede1ce604ad134fb9332dfb6f96ee3a7d39d3c2b14dfbd2e0be757f558ad5cd98f2440a415a9d74668fe482a7c18629e199 SHA512 e31157a17c7907f380248fe530114fea29be570f0bc6f2a15a7a898ace88534dd5b9d15ee8cf22920f8330910a629d035ca9afdde06a6b631479b2843c1d30ba
diff --git a/net-analyzer/wireshark/wireshark-4.0.5.ebuild b/net-analyzer/wireshark/wireshark-4.0.5.ebuild
index 765d3a774d08..6039d7e9573b 100644
--- a/net-analyzer/wireshark/wireshark-4.0.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.5.ebuild
@@ -19,7 +19,7 @@ else
 	S="${WORKDIR}/${P/_/}"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
+		KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
 	fi
 fi
 
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 9ab263611b22..8650e3362fa2 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/btfs/Manifest b/net-fs/btfs/Manifest
index 18c90a76f71d..f4653080fb94 100644
--- a/net-fs/btfs/Manifest
+++ b/net-fs/btfs/Manifest
@@ -1,3 +1,3 @@
 DIST btfs-2.24.tar.gz 24328 BLAKE2B d143d25fd78706e60e7ad46053371140bc73a15e313ad35258aedc350614efe72c3662418da2ca61eb8c36a6f153db3477cdc0b5f290afd0eb361739b9d33f3d SHA512 33339d9eefe6836c8c96c4ea0fb6ee99150df5500f4d1dce107c20df72e0d2959152fca0901676cec1eebf1de39a69dc46ea96442aecd234c9fb4e7618337b0c
-EBUILD btfs-2.24.ebuild 825 BLAKE2B 631cd6783a180267807dac5beaeb635d4420dd3c7c3f3176ae2d75bfef290cc9c978fd1b9eec2d53345a5047a72a2c79276223bbbf174539169de1343ed6af0e SHA512 3988c1f23ac63632d242eea0831d2181dd9a526f356a3a3d6819e1e8fa7fcade90814ba3c30369074c7adae7b194b8b482fcfeced76df87ac8d8ec73d9f077d1
+EBUILD btfs-2.24.ebuild 832 BLAKE2B 6eed3a5c8ba9b2961fb31d4ad1c526515745362d9020d27e93c21adc8a0dfd6cf4f5aa8f671174f76555e3d2607afa91e8f4f6ef7c468506c033b083bf68cca2 SHA512 7bf99e1b46e81aba56f3714f7649c132aeb98a5b532e9be2be1c9676d17377c6d68a88ad3206343fea0fa7b5e67637e05ac2a093bf2a72ee1314adf6204e5d37
 MISC metadata.xml 244 BLAKE2B 9f54ce24ff94456bd875b5386abf16c27313f10ba739afc1fc817f65fbf530a6562c2fc32caec6f1a976abab2715b98b674e167f23189653846fbb1f7352af5a SHA512 d3ddeeb221e464dfeb68c3ad361277c3711b9c1639246423454393c3158a6aae80757333d97698e938609fb21ef51f15fe1e8ecc6ebe7355c7a418df44f765c1
diff --git a/net-fs/btfs/btfs-2.24.ebuild b/net-fs/btfs/btfs-2.24.ebuild
index efc0134c4d71..38bd3d6bbeba 100644
--- a/net-fs/btfs/btfs-2.24.ebuild
+++ b/net-fs/btfs/btfs-2.24.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/johang/btfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND=">=sys-fs/fuse-2.8.0:0
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index b564b445fea7..8b29ea247c04 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -1,9 +1,4 @@
 AUX cvmfs-2.10.1-gentoo.patch 2835 BLAKE2B c87f24fece387faa48fa1f7ae46be6c0a8eb93ec2460a45abce26d1646948a9b0f606b4b174ef3a3fb1a36387dec943f2cae4f10bf4fa9aa825ba0d732e3ff71 SHA512 93e8e94da4cce7be896afd483a372bb164a803dea9cb035bdb5bfdce2089c250b2f6d857d1ac5d9769a0c53388f457adc5e215ce21bc1040d4cb269cc66262c9
-AUX cvmfs-2.7.2-builtins.patch 3672 BLAKE2B 80c5851c45150384a2c40b962f1e58b2bde5e1111c3b8c9f18aef126569ffd13461408abacd29d6990db3c5633e987440da34a09ecfb0193ec8e3e1d6c3c2328 SHA512 f064cf7d9c8cbbfec68fc67bac4c91c7266b8eabc0be28b30ce8402d39a1a95d15ef9c929a7ef5f887e3058914717c1906e2f0b749fec89475a7a68b1a7f1d54
-AUX cvmfs-2.7.2-find-package.patch 1412 BLAKE2B c66a614a1aa7451ecac2cceb892c370db94d715e2ce97ddad22fbc16e85c8c602a2c561ae859e2eccb973144bd803d279029a14f9f591f641265ac9e89e89aa1 SHA512 3a525c50165c83a7079f7d1b51441e7a1e6c230ac76d742b7833506c98f13685339dcf86d1c8697086b195ff33775996e2f9d6e0d825cbdedc190aaa3ea427d0
-AUX cvmfs-2.9.2-include-ctime.patch 274 BLAKE2B c0c0aebb4e9b8bef114c06a3fbd2a6aa535ee469ce6b3967bc9cff4743eac9e923c6a4cde74cbd7e988aff70022fc151f7745230d7517d09060e8d62f2bfef91 SHA512 1518dee2b016b5c7bf8c99e0f86a5da87d5dcd37a3d25f6dfb5afc0906ea41e67747dd37360a7e6da8557f8e4aa8587c317a4f105c4954b227aeb28190524ef9
 DIST cvmfs-2.10.1.tar.gz 76493991 BLAKE2B 8d3632137b0fa15bcf07254bf7e376bbcadd8cb87c55ddb96ed98cb2c6cdee4dfdcadf0054a29ac0df93337aeaeec07b0f1edd2caae9adbaf9b1ed2a21bb9949 SHA512 a0c23c40fdd3ff53bfdfb53b347506b87ac4954efb4419c12702f9e9038de36a4d83de2e497749890f723b3263ad424ebb3a49c3ff09a9a698a43a2ada7f132f
-DIST cvmfs-2.9.4.tar.gz 70494380 BLAKE2B 615834c37f555e70ef5530bed02ac6593ca2b403b6bb27ce97316a58350f387571a2f0c7dada585d80fc0300319fb532e4d89f1efb8bb0dcc42e15ad7efb4ab6 SHA512 1150816bdb56ebe1ed886040d6a0bbcb61cba07122f3dc01307d14fa40942f8d4aca5d66a9a21388bd68cdee67b6818088cc5022f794b754968348357f510fff
 EBUILD cvmfs-2.10.1-r1.ebuild 2261 BLAKE2B 09bbaf4ce04acfad64af5077cbb9f5bb849a9884e8bcdc90051ab25e8f46a8e859e86c2748a74c2360db93bb76d987d06b4472ddba740d53cd7c47e4d434950e SHA512 04b231737bd6a867d2765821052c2d5010a3490259775d87a1e99ac85d60807b6d10a7cfe07bee77e9a932e6af737d0e4a2127b96349f1410f6deeb546e98e7c
-EBUILD cvmfs-2.9.4-r1.ebuild 2357 BLAKE2B 5fd703167dd471b6272be4ffed10f59a178d0cd56243a327217599b5278ad48ff9c36c36c31237b47830832a953f79de6bb0ec0a3f3ceaec3ef49df78022ae0f SHA512 a2c4345091b801f861b5d864cd4975953f0e9d65fb1abfb2074f09fe71042ffcbf7e5b58d2b7ae82b80bea2115f05ec28b58df026eba92728a3cd3e6d8c5625e
 MISC metadata.xml 1332 BLAKE2B ad7f06c80b66cf55f6734da058bd21efc10fc8c02165da01c1b5a96f81f4ba0c0f874768482ed271560ae711e862c2b4fea5a92aa09763d45a9a103574409cad SHA512 9fab3df5e006e4b34cbf22b4f9b6f5235d4c1937f8b1e69a41637988c48f2ba583f988c9fff07ccfc7b285ddc9058ca08f660d22211b97cf06a580b3794b27a7
diff --git a/net-fs/cvmfs/cvmfs-2.9.4-r1.ebuild b/net-fs/cvmfs/cvmfs-2.9.4-r1.ebuild
deleted file mode 100644
index ea5bad4096f5..000000000000
--- a/net-fs/cvmfs/cvmfs-2.9.4-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info bash-completion-r1
-
-DESCRIPTION="HTTP read-only file system for distributing software"
-HOMEPAGE="https://cernvm.cern.ch/fs/"
-SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE="server"
-
-CDEPEND="
-	acct-group/cvmfs
-	acct-user/cvmfs
-	app-arch/libarchive
-	dev-cpp/gtest
-	dev-cpp/sparsehash
-	dev-db/sqlite:3=
-	dev-libs/leveldb:0=
-	dev-libs/openssl:0=
-	dev-libs/protobuf:0=
-	net-dns/c-ares:0=
-	net-libs/pacparser:0=
-	net-misc/curl:0[adns]
-	sys-apps/attr
-	sys-fs/fuse:0=
-	sys-fs/fuse:3=
-	sys-libs/libcap:0=
-	sys-libs/zlib:0=
-"
-
-RDEPEND="${CDEPEND}
-	app-admin/sudo
-	net-fs/autofs
-"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-		"${FILESDIR}"/${PN}-2.7.2-builtins.patch
-		"${FILESDIR}"/${PN}-2.7.2-find-package.patch
-		"${FILESDIR}"/${PN}-2.9.2-include-ctime.patch
-)
-
-pkg_setup() {
-	if use server; then
-		CONFIG_CHECK="~OVERLAY_FS"
-		ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	# gentoo stuff
-	rm bootstrap.sh || die
-	sed -i -e "s:/usr/bin/systemctl:/bin/systemctl:g" cvmfs/cvmfs_config || die
-	sed -i -e 's/COPYING//' -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \
-		CMakeLists.txt || die
-	eapply_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILTIN_EXTERNALS=OFF
-		-DBUILD_CVMFS=ON
-		-DBUILD_LIBCVMFS=OFF # static library used only for development
-		-DBUILD_DOCUMENTATION=OFF
-		-DBUILD_GEOAPI=OFF # only used for stratum 1 servers
-		-DBUILD_LIBCVMFS_CACHE=OFF # for exotic cache configs
-		-DBUILD_PRELOADER=OFF # special purpose utility for HPCs
-		-DBUILD_RECEIVER=OFF # for distributed publishers only
-		-DBUILD_SERVER=$(usex server)
-		-DINSTALL_BASH_COMPLETION=OFF
-		-DINSTALL_MOUNT_SCRIPTS=ON
-		-DINSTALL_PUBLIC_KEYS=ON
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	newbashcomp cvmfs/bash_completion/cvmfs.bash_completion cvmfs_config
-	bashcomp_alias cvmfs_config cvmfs_server
-	dodoc doc/*.md
-	keepdir /var/lib/cvmfs
-	use server && keepdir /var/lib/cvmfs-server
-}
-
-pkg_config() {
-	einfo "Setting up CernVM-FS client"
-	cvmfs_config setup
-	einfo "Now edit ${EROOT}/etc/cvmfs/default.local"
-	einfo "and restart the autofs service"
-}
diff --git a/net-fs/cvmfs/files/cvmfs-2.7.2-builtins.patch b/net-fs/cvmfs/files/cvmfs-2.7.2-builtins.patch
deleted file mode 100644
index cbc723a7fd70..000000000000
--- a/net-fs/cvmfs/files/cvmfs-2.7.2-builtins.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 966d98be2d2d6169a29c22eb5565f34fad1c0fb9 Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio <guilherme@amadio.org>
-Date: Mon, 6 Apr 2020 17:19:19 +0200
-Subject: [PATCH 2/3] Build some externals as part of the regular build
-
----
- CMakeLists.txt                     |  9 ++++++---
- externals/sha2/src/CMakeLists.txt  |  8 ++++++++
- externals/sha3/src/CMakeLists.txt  | 14 ++++++++++++++
- externals/vjson/src/CMakeLists.txt |  8 ++++++++
- 4 files changed, 36 insertions(+), 3 deletions(-)
- create mode 100644 externals/sha2/src/CMakeLists.txt
- create mode 100644 externals/sha3/src/CMakeLists.txt
- create mode 100644 externals/vjson/src/CMakeLists.txt
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a50b603fe..3403ae67b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -320,7 +320,8 @@ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIRS})
- find_package (GMock REQUIRED)
- set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GMOCK_INCLUDE_DIRS})
- 
--find_package (VJSON REQUIRED)
-+#find_package (VJSON REQUIRED)
-+add_subdirectory(externals/vjson/src)
- set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${VJSON_INCLUDE_DIRS})
- 
- find_package (LibArchive REQUIRED)
-@@ -333,10 +334,12 @@ if (BUILD_CVMFS OR BUILD_LIBCVMFS OR BUILD_SERVER OR BUILD_SERVER_DEBUG OR
-   find_package (ZLIB REQUIRED)
-   set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${ZLIB_INCLUDE_DIRS})
- 
--  find_package (SHA2 REQUIRED)
-+  #find_package (SHA2 REQUIRED)
-+  add_subdirectory(externals/sha2/src)
-   set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${SHA2_INCLUDE_DIRS})
- 
--  find_package (SHA3 REQUIRED)
-+  # find_package (SHA3 REQUIRED)
-+  add_subdirectory(externals/sha3/src)
-   set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${SHA3_INCLUDE_DIRS})
- endif (BUILD_CVMFS OR BUILD_LIBCVMFS OR BUILD_SERVER OR BUILD_SERVER_DEBUG OR
-        BUILD_UNITTESTS OR BUILD_UNITTESTS_DEBUG OR BUILD_PRELOADER OR
-diff --git a/externals/sha2/src/CMakeLists.txt b/externals/sha2/src/CMakeLists.txt
-new file mode 100644
-index 000000000..091e1ed6b
---- /dev/null
-+++ b/externals/sha2/src/CMakeLists.txt
-@@ -0,0 +1,8 @@
-+project(SHA2)
-+
-+add_library(cvmfs_sha2 STATIC sha2.c)
-+set_property(TARGET cvmfs_sha2 PROPERTY POSITION_INDEPENDENT_CODE TRUE)
-+target_include_directories(cvmfs_sha2 INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
-+
-+set(SHA2_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
-+set(SHA2_LIBRARIES cvmfs_sha2 PARENT_SCOPE)
-diff --git a/externals/sha3/src/CMakeLists.txt b/externals/sha3/src/CMakeLists.txt
-new file mode 100644
-index 000000000..15db012d4
---- /dev/null
-+++ b/externals/sha3/src/CMakeLists.txt
-@@ -0,0 +1,14 @@
-+project(SHA3)
-+
-+add_library(cvmfs_sha3 STATIC #GLOBAL
-+  64opt/KeccakF-1600-opt64.c
-+  KeccakHash.c
-+  KeccakSponge.c
-+  SnP-FBWL-default.c
-+  )
-+
-+set_property(TARGET cvmfs_sha3 PROPERTY POSITION_INDEPENDENT_CODE TRUE)
-+target_include_directories(cvmfs_sha3 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/64opt)
-+
-+set(SHA3_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/64opt PARENT_SCOPE)
-+set(SHA3_LIBRARIES cvmfs_sha3 PARENT_SCOPE)
-diff --git a/externals/vjson/src/CMakeLists.txt b/externals/vjson/src/CMakeLists.txt
-new file mode 100644
-index 000000000..316ab7617
---- /dev/null
-+++ b/externals/vjson/src/CMakeLists.txt
-@@ -0,0 +1,8 @@
-+project(VJSON)
-+
-+add_library(cvmfs_vjson STATIC block_allocator.cpp json.cpp)
-+set_property(TARGET cvmfs_vjson PROPERTY POSITION_INDEPENDENT_CODE TRUE)
-+target_include_directories(cvmfs_vjson INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
-+
-+set(VJSON_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
-+set(VJSON_LIBRARIES cvmfs_vjson PARENT_SCOPE)
--- 
-2.26.0
-
diff --git a/net-fs/cvmfs/files/cvmfs-2.7.2-find-package.patch b/net-fs/cvmfs/files/cvmfs-2.7.2-find-package.patch
deleted file mode 100644
index ce4b85f7921f..000000000000
--- a/net-fs/cvmfs/files/cvmfs-2.7.2-find-package.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 3a4881d1dc211ec358995d6d8501818beedc62ac Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio <guilherme@amadio.org>
-Date: Mon, 6 Apr 2020 17:26:48 +0200
-Subject: [PATCH 3/3] Comment out unnecessary package lookups
-
----
- CMakeLists.txt | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3403ae67b..2895b567a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -295,7 +295,7 @@ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${CMAKE_BINARY_DIR})
- # set properties for configurable libraries
- #
- 
--find_package (Valgrind)
-+# find_package (Valgrind)
- if (VALGRIND_FOUND)
-   set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${VALGRIND_INCLUDE_DIR})
-   add_definitions(-DHAS_VALGRIND_HEADERS)
-@@ -314,11 +314,11 @@ endif (NOT MACOSX)
- find_package (OpenSSL REQUIRED)
- set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${OPENSSL_INCLUDE_DIR})
- 
--find_package (GTest REQUIRED)
--set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIRS})
-+# find_package (GTest REQUIRED)
-+# set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIRS})
- 
--find_package (GMock REQUIRED)
--set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GMOCK_INCLUDE_DIRS})
-+# find_package (GMock REQUIRED)
-+# set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GMOCK_INCLUDE_DIRS})
- 
- #find_package (VJSON REQUIRED)
- add_subdirectory(externals/vjson/src)
--- 
-2.26.0
-
diff --git a/net-fs/cvmfs/files/cvmfs-2.9.2-include-ctime.patch b/net-fs/cvmfs/files/cvmfs-2.9.2-include-ctime.patch
deleted file mode 100644
index 0dd97cc1f709..000000000000
--- a/net-fs/cvmfs/files/cvmfs-2.9.2-include-ctime.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/cvmfs/authz/helper_log.cc	2022-07-04 12:15:08.000000000 +0200
-+++ b/cvmfs/authz/helper_log.cc	2022-09-01 17:55:08.200175687 +0200
-@@ -8,6 +8,7 @@
- #include <fcntl.h>
- #include <syslog.h>
- #include <unistd.h>
-+#include <ctime>
- 
- #include <cassert>
- #include <cstdarg>
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 8884735b09ca..2eba4f9f6bbb 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 71a460d48fe6..73cb9377e4ae 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,10 +1,9 @@
+AUX tdesktop-4.2.4-jemalloc-only-telegram-r1.patch 1307 BLAKE2B b27f65973a6fa8c83469e0c6419a600ca04ebbf35f6c4a406129867eee644082c4f0164fb71afbc6ae729bb4037d0cf6c68ea1ad78f6268bfe245b83e4290400 SHA512 d2c33dd18e354ebe6cb7143b58e9f61dc4cd664bb1e7ad9c60f562efbb05cc72d5b36270af96b866583b366b59cc34cadee3a62dcbd40433276b80b2511e1fcb
 AUX tdesktop-4.2.4-jemalloc-only-telegram.patch 1309 BLAKE2B c6ed3e2cfcce9540e367fb90fcaacab81fa6dbb150be7207634facfef77361b830175e4e5e2781d884f101833fde022f496b7c39702d97990de4d16585b5c33d SHA512 83d8c3eaafc2947fbe3555d9acf5c78ad07e89009b89f05908dc5cd088652063766c297e4b726ee69423b15804faf79f52815405b09bba554538e664a99ce0e7
 AUX tdesktop-4.4.1-fix-dupe-main-decl.patch 853 BLAKE2B 6a3ce346467a3b6450674a77157f3fa45d9e1991160ce33e9cc58292a8441310468943225d5d5b2ba5e5c23feaba544d52f19c964130a8e8c724a99392072abe SHA512 edaad94a901181f0bca4a64b4ab2277a247073005b351156df02532dfff470a4060e6b709197da0778b5484d39a4c1bc1f75e9df068872d68209dd47eca9ac54
 DIST tdesktop-4.6.5-full.tar.gz 63793549 BLAKE2B a425aaf8d1f1c633b3b8ddacff5bb7cc26e6063d4238413fea76db6a4608497d229061a614c79464373e7f1aa3bb854d9718083638e119538e989a202741b3d6 SHA512 4a337e375d7746cb1fa652f5851f8be5718b7b9d9676bba8ab040489b8492b2a665a51848adba28117a910789aa942c386318a01f6c99b4caa12a1eac682c780
-DIST tdesktop-4.7.1-full.tar.gz 63990659 BLAKE2B 0d734dd5a5aebdafbef68d80249b88502a0ea77e37399603a42b86170e51b87dc0dc005d844a6e6c5e28f79880ae574695b70c14d9075cefcfeb8f7d95088a4f SHA512 1e83bcb56cbc84d1d7385b81b411273f4d26235ecff41b288fccfab75a848f80a80fff063212fc058a2ec923bf48a366311c7ccd678b079861ac15702a993f64
 DIST tdesktop-4.8.1-full.tar.gz 63997319 BLAKE2B daac461f0b3205bf647027329660b43f4646db987e27bfe2a2848bfbfb3309c503132d1533f26e95512520417d30f5063b1c395b174787aa7533727549ee77e5 SHA512 4dc495e4502bdba634c4468af4f1321aef1152d619c811f004489f8616504a465069508239eae41a08a83e190a61d26881733ebc38dd88160f81dce070bb0567
-EBUILD telegram-desktop-4.6.5-r1.ebuild 6474 BLAKE2B 91d26eea85adb108c2d7c878e973911b8ff7696c14fd55736af37b954328492d61e6e53663d2e5708a4c4ac9cdb22ed108692394e957c328c56da487fc5cdf33 SHA512 f80558c96f74d6e8cf5ebcaf60e1b7218a849ea2c7b5008993f71efb4073b8073ea058b52d3473655e72232a9700dd822e527dc3d842d88efacbdec502e67b77
+EBUILD telegram-desktop-4.6.5-r2.ebuild 6477 BLAKE2B 811b7eb3e8d91ecfa505af28caf7d5350259f746e10ec90ae2f4aabadb223c51b01898a8265e99a95a9d02828c60b649b85523b12057e3d2935b6ca5719a4d2f SHA512 512bfe912a43c6a614039067e6cadb4a94d851fa9895d5c25cb162c81ee5e6b5752f2915bd62189edbd34f1ec8cd44cbfabc216d6b670eb712dc21c2f6e96fa5
 EBUILD telegram-desktop-4.6.5.ebuild 6473 BLAKE2B 1d7eb299b8d73fced8f786fc125b9de39855e04d016871a0cecf4f7c299d10c028e4a6f3a0de0fe7b104264c4eb06cede3f850b88a144e95d9ac183a46241a99 SHA512 86e54a6a8909d5123f3fef8d1e209d9e824fe7cbb345520a0f80c670fec6ea7be8d3456e23c69386af0e34fc563438cb446d1e96dff26f4402982340304caad8
-EBUILD telegram-desktop-4.7.1-r1.ebuild 6500 BLAKE2B 1b09264a4524952803eaceef593a3277eff3965fbb49d00ad719a40656ce2071626d7dc54a7d54b878a9383683f248f1449ce0a3a10ca1fa2aad980eee1e82c3 SHA512 6bd9ebc599bcea2d5712cc72488c49746b83bcf5dfae146dbaf0bcf3a8a83d55c7628634288fc0ca7cf94c984c5e85d20a64a1b31f615349cfff61b0636eb8c1
-EBUILD telegram-desktop-4.8.1-r1.ebuild 6500 BLAKE2B 1b09264a4524952803eaceef593a3277eff3965fbb49d00ad719a40656ce2071626d7dc54a7d54b878a9383683f248f1449ce0a3a10ca1fa2aad980eee1e82c3 SHA512 6bd9ebc599bcea2d5712cc72488c49746b83bcf5dfae146dbaf0bcf3a8a83d55c7628634288fc0ca7cf94c984c5e85d20a64a1b31f615349cfff61b0636eb8c1
+EBUILD telegram-desktop-4.8.1-r2.ebuild 6503 BLAKE2B 330b95538269a3371fe3d063ad83f5d735209df7ffad5aefb5272a13e21444626d7bf9e835bb135dc0223cd69294ff940dd87e5729708749559498892eedf1e3 SHA512 07cfd0a5155b05a9efcbccfa65572c0e439abede6de8bde346f2c3457e00f2d73024efca712a63f96573fbf304c5b81c7c61628c7b1de3d71136435fa1618c54
 MISC metadata.xml 1055 BLAKE2B a8f873793835f741c0a5efef1c4ef7231b0d2b90b6237093625e351de26e230c6ce5a0eedfb36706bb266ae472370034bbb60a6ef90d05e0f7b4f847c9f0116a SHA512 72d90db2dd9e96ff0f6e6ea2d078242ae6cc6c8ec0afed4df8c84acf100706bbd7cb3bff4d5603a11718250c43ae8d22b18687f4c16676173ca84527f53a5c1d
diff --git a/net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch b/net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch
new file mode 100644
index 000000000000..d56bacea69f8
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch
@@ -0,0 +1,43 @@
+Only link jemalloc for the Telegram binary
+
+Some combination of factors is making the different codegen tools hang when
+jemalloc is linked for those, and they're ran under portage's sandbox. Since
+this is only used during build-time, and jemalloc is merely necessary to
+improve runtime memory use, it's unnecessary to use it for anything else.
+
+https://bugs.gentoo.org/802624
+
+--- tdesktop-4.2.4-full.orig/Telegram/CMakeLists.txt
++++ tdesktop-4.2.4-full/Telegram/CMakeLists.txt
+@@ -1478,6 +1478,14 @@
+             desktop-app::external_wayland_client
+         )
+     endif()
++
++    if (NOT DESKTOP_APP_DISABLE_JEMALLOC)
++        target_link_libraries(Telegram
++        PRIVATE
++            $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
++            $<LINK_ONLY:desktop-app::external_jemalloc>
++        )
++    endif()
+ endif()
+ 
+ if (build_macstore)
+--- tdesktop-4.2.4-full.orig/cmake/options_linux.cmake
++++ tdesktop-4.2.4-full/cmake/options_linux.cmake
+@@ -78,14 +78,6 @@
+     )
+ endif()
+ 
+-if (NOT DESKTOP_APP_DISABLE_JEMALLOC)
+-	target_link_libraries(common_options
+-	INTERFACE
+-	    $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
+-	    $<LINK_ONLY:desktop-app::external_jemalloc>
+-	)
+-endif()
+-
+ if (DESKTOP_APP_USE_ALLOCATION_TRACER)
+     target_link_options(common_options
+     INTERFACE
diff --git a/net-im/telegram-desktop/telegram-desktop-4.6.5-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-4.6.5-r2.ebuild
index f50292ef176a..a0dc810ebc7f 100644
--- a/net-im/telegram-desktop/telegram-desktop-4.6.5-r1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-4.6.5-r2.ebuild
@@ -84,7 +84,7 @@ BDEPEND="
 # dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
 
 PATCHES=(
-	"${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram.patch"
+	"${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch"
 	"${FILESDIR}/tdesktop-4.4.1-fix-dupe-main-decl.patch"
 )
 
diff --git a/net-im/telegram-desktop/telegram-desktop-4.8.1-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-4.8.1-r1.ebuild
deleted file mode 100644
index 349592fc763a..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-4.8.1-r1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit xdg cmake python-any-r1 optfeature flag-o-matic
-
-DESCRIPTION="Official desktop client for Telegram"
-HOMEPAGE="https://desktop.telegram.org"
-
-MY_P="tdesktop-${PV}-full"
-SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
-IUSE="+dbus enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland +X"
-REQUIRED_USE="
-	qt6-imageformats? ( qt6 )
-"
-
-KIMAGEFORMATS_RDEPEND="
-	media-libs/libavif:=
-	media-libs/libheif:=
-	media-libs/libjxl
-"
-RDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	dev-cpp/abseil-cpp:=
-	dev-libs/glib:2
-	dev-libs/libdispatch
-	dev-libs/libsigc++:2
-	dev-libs/openssl:=
-	dev-libs/protobuf
-	dev-libs/xxhash
-	media-libs/fontconfig:=
-	media-libs/libjpeg-turbo:=
-	~media-libs/libtgvoip-2.4.4_p20221208
-	media-libs/openal
-	media-libs/opus:=
-	media-libs/rnnoise
-	~media-libs/tg_owt-0_pre20230428:=[screencast=,X=]
-	media-video/ffmpeg:=[opus,vpx]
-	sys-libs/zlib:=[minizip]
-	virtual/opengl
-	dbus? ( >=dev-cpp/glibmm-2.76:2.68 )
-	!enchant? ( >=app-text/hunspell-1.7:= )
-	enchant? ( app-text/enchant:= )
-	jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] )
-	!qt6? (
-		>=dev-qt/qtcore-5.15:5
-		>=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?]
-		>=dev-qt/qtimageformats-5.15:5
-		>=dev-qt/qtnetwork-5.15:5[ssl]
-		>=dev-qt/qtsvg-5.15:5
-		>=dev-qt/qtwidgets-5.15:5[png,X?]
-		kde-frameworks/kcoreaddons:=
-	)
-	qt6? (
-		dev-qt/qt5compat:6
-		dev-qt/qtbase:6[dbus?,gui,network,opengl,widgets,X?]
-		dev-qt/qtimageformats:6
-		dev-qt/qtsvg:6
-		wayland? ( dev-qt/qtwayland:6 )
-		qt6-imageformats? ( ${KIMAGEFORMATS_RDEPEND} )
-	)
-	X? (
-		x11-libs/libxcb:=
-		x11-libs/xcb-util-keysyms
-	)
-"
-DEPEND="${RDEPEND}
-	dev-cpp/range-v3
-	>=dev-cpp/ms-gsl-4
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	virtual/pkgconfig
-"
-# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
-
-PATCHES=(
-	"${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram.patch"
-	"${FILESDIR}/tdesktop-4.4.1-fix-dupe-main-decl.patch"
-)
-
-# Current desktop-file-utils-0.26 does not understand Version=1.5
-QA_DESKTOP_FILE="usr/share/applications/${PN}.desktop"
-
-pkg_pretend() {
-	if has ccache ${FEATURES}; then
-		ewarn "ccache does not work with ${PN} out of the box"
-		ewarn "due to usage of precompiled headers"
-		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# Bundle kde-frameworks/kimageformats for qt6, since it's impossible to
-	#   build in gentoo right now.
-	if use qt6-imageformats; then
-		sed -e 's/DESKTOP_APP_USE_PACKAGED_LAZY/TRUE/' -i \
-			cmake/external/kimageformats/CMakeLists.txt || die
-		printf '%s\n' \
-			'Q_IMPORT_PLUGIN(QAVIFPlugin)' \
-			'Q_IMPORT_PLUGIN(HEIFPlugin)' \
-			'Q_IMPORT_PLUGIN(QJpegXLPlugin)' \
-			>> cmake/external/qt/qt_static_plugins/qt_static_plugins.cpp || die
-	fi
-
-	# kde-frameworks/kcoreaddons is bundled when using qt6, see:
-	#   cmake/external/kcoreaddons/CMakeLists.txt
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# The ABI of media-libs/tg_owt breaks if the -DNDEBUG flag doesn't keep
-	# the same state across both projects.
-	# See https://bugs.gentoo.org/866055
-	append-cppflags '-DNDEBUG'
-
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON  # header only lib, some git version. prevents warnings.
-		-DQT_VERSION_MAJOR=$(usex qt6 6 5)
-
-		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex !dbus)
-		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X)
-		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland)
-		-DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc)
-		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)  # enables enchant and disables hunspell
-		-DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts)  # use system fonts instead of bundled ones
-	)
-
-	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
-		einfo "Found custom API credentials"
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
-			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
-		)
-	else
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
-		# Building with snapcraft API credentials by default
-		# Custom API credentials can be obtained here:
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
-		# After getting credentials you can export variables:
-		#  export MY_TDESKTOP_API_ID="17349""
-		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
-		# and restart the build"
-		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
-		# portage will use custom variable every build automatically
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="611335"
-			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if ! use X && ! use screencast; then
-		ewarn "both the 'X' and 'screencast' USE flags are disabled, screen sharing won't work!"
-		ewarn
-	fi
-	if has_version '<dev-qt/qtcore-5.15.2-r10'; then
-		ewarn "Versions of dev-qt/qtcore lower than 5.15.2-r10 might cause telegram"
-		ewarn "to crash when pasting big images from the clipboard."
-		ewarn
-	fi
-	if ! use jemalloc && use elibc_glibc; then
-		# https://github.com/telegramdesktop/tdesktop/issues/16084
-		# https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003
-		ewarn "Disabling USE=jemalloc on glibc systems may cause very high RAM usage!"
-		ewarn "Do NOT report issues about RAM usage without enabling this flag first."
-		ewarn
-	fi
-	if use qt6; then
-		ewarn "Qt6 support in gentoo is experimental."
-		ewarn "Please report any issues you may find, but don't expect"
-		ewarn "everything to work correctly as of yet."
-		ewarn
-	fi
-	if use wayland && ! use qt6; then
-		ewarn "Wayland-specific integrations have been deprecated with Qt5."
-		ewarn "The app will continue to function under wayland, but some"
-		ewarn "functionality may be reduced."
-		ewarn "These integrations are only supported when built with Qt6."
-		ewarn
-	fi
-	if use qt6 && ! use qt6-imageformats; then
-		elog "Enable USE=qt6-imageformats for AVIF, HEIF and JpegXL support"
-		elog
-	fi
-	optfeature_header
-	optfeature "shop payment support (requires USE=dbus enabled)" net-libs/webkit-gtk:4
-	if ! use qt6; then
-		optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats[avif,heif,jpegxl]
-	fi
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-4.7.1-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-4.8.1-r2.ebuild
index 349592fc763a..dee0c3c1cc2f 100644
--- a/net-im/telegram-desktop/telegram-desktop-4.7.1-r1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-4.8.1-r2.ebuild
@@ -85,7 +85,7 @@ BDEPEND="
 # dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
 
 PATCHES=(
-	"${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram.patch"
+	"${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch"
 	"${FILESDIR}/tdesktop-4.4.1-fix-dupe-main-decl.patch"
 )
 
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 4422cbd647de..ea108372a97e 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 601446366ef3..7989782b8ab1 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,7 +1,10 @@
+AUX 0.5.0-Guard-PxManager-test-with-pacrunner-duktape-option-2.patch 807 BLAKE2B 8ea15b7fc48be2ed5a0396feba1bc303831ccc362e0eb0ebb70ee65812fadee4d9e3ab993f198447640c4c4cba44621944eb27863bd016c9973d60d74f6d9c38 SHA512 9ae7dbd7ac98181acca853955f6e0e5e2388d3903169a82ee59ca7cf69de665f81e781d067d7746a153c37f4fcc039991b74eb09ea084e7a932a2987aab79f52
 AUX libproxy-0.4.12-macosx.patch 3387 BLAKE2B 6c16cc9bd73255c106413708db7f88a6391ffbc4617461edf8fdbe6bf6bfe8ce194f7770e25c5eeeeacd14302aaf76f0c8a30793277d459b118bed838f81d1c6 SHA512 bb815f33745fe1304139f5da2502d157f049ce896ebc2dd5a62c012877c9a3e6bf850a47438a919a910f27ef49c20f9666a3da5a7386641d3250e58f481c2753
 AUX libproxy-0.4.18-Fix-building-without-duktape.patch 1006 BLAKE2B b6b8a704a61e59bca27946b55967a6b413a219811b632b7486c94d66e5d48c78baefbba2a8f12b44b3c926b2009fa4f6a82d0e74a79d5b0b9b2ba82cc327ee44 SHA512 f77d0223c3afabf9e64e09adf64de119edbd6a93458a070b2bca60e4efc58785c45cc1c09114d2edd4e8d9d1567dd96b14ee51748266b9eefc82e5ceafabd8c3
 AUX libproxy-0.4.18-avoid-nm-build-dep.patch 3592 BLAKE2B 7f7f8af5aebbfb176b405db4c666e894b3adf879ba186f3f08a7b82508d67227905cd1fb31af761c8c0d24e362bfe84341243c2ce5fb6c1ea11dead16f6c9e0c SHA512 64a1823b1710ce3be1019ea077b5ce9e1b0f1ff97b8e940bb4187613af797d198ffcd1f66f21399b23a3a0b1133b7fc71ac80c86ff67bd1d9735abcfb5bcb61a
 AUX proxy.1 681 BLAKE2B 14db05aa4282661bf4148af6187f8d3f2b9cefaa439851c5086b397f1b6972b8f28027aeb9ad7ac801d616f5b46f19b050642f0e754a63bd6aca1354aa2bad5c SHA512 57074dde3303d8775cb842fee5a6dde22f1c14d9e30af16f018e81fa87585c6e5b12edc1453cf8135624b4ac49568aebfdeaf634782307d6776c4cf2c5f8f96f
 DIST libproxy-0.4.18.tar.gz 98037 BLAKE2B 12505cc7afe9ca27bb387df31d7368ed3ac83696255e6bd8fdbca1528fb6fe83510cdf7c6bda09939dcb55daefba24cf9c52435f664c6cba01daad87ddff3f2a SHA512 1148d688a9f070273a1a2b110a788561789799089660292bbba59fbf0a9caf7d28cb039a9ccdcb935f752e1e34739b2d2f4c784b1bb3bbaa03d108e7b38a4754
+DIST libproxy-0.5.0.tar.gz 58746 BLAKE2B aaaaa93217d4b3112b9c2761d7156de1359278b764bdfb3ba0942653e930e4cb60c00adf936fa1210668dc584c6e34fccfe405acdbabfff1927fd25b9de953b7 SHA512 699d09d747c3e56247b1d0a8dee0cd7c122199cc4296aa61753a4e52b4346ad5d98d608f953d28a5779e7d49f64be639e22c696ac82d48bbdaa7b743501b18e6
 EBUILD libproxy-0.4.18.ebuild 2627 BLAKE2B 77d6085a807a75f2e5a676be132ef29f555152339aa1612aca8714df736904f1c803f03a20df0a2e94472f16f5bdfb439f477db1d84a270fd40eb6376be4c1bd SHA512 0584c5ffe9511e7a4c8178496e91a275aaeb79643e59ff119e3af3e4e64dcf05778448ecceed40239ffc1aa34adf2ca8260be4228dba2870630186469d3f46f4
+EBUILD libproxy-0.5.0.ebuild 1827 BLAKE2B c2ff191946ad19a9c3de54c8a5c9eaf898347e643758011d3e38c0d98bdef567e83dc71fbf608a18f439e9d5dc11ccd960a641b94000cc4ca07320cde6ea3104 SHA512 faebdbecf20d0af2d5b544c1c46792f7b13df0dda3a6d8e9d701df6ae418d96cd4a36c291e262ca36936e2bc45b3465ae8eca1ad37186e798e54ce6899615984
 MISC metadata.xml 770 BLAKE2B ae78ea34cf603f837bcb20532febb873d54c9f0e96867c82a2ab095fa94e8c1a1b64d83c6e4f29fbe26c5a21cc3d04b722add5fb88ab74a781ad15fc50f300ee SHA512 90c1cf64ad650e58e172832383a8ceaf396274610d65e0486f9fc19534dda1e5a4356b18139dc62483d7df46769143acd4ccfc35ebe0d18e64dc8a71bd5e5789
diff --git a/net-libs/libproxy/files/0.5.0-Guard-PxManager-test-with-pacrunner-duktape-option-2.patch b/net-libs/libproxy/files/0.5.0-Guard-PxManager-test-with-pacrunner-duktape-option-2.patch
new file mode 100644
index 000000000000..6af2ebbe7f86
--- /dev/null
+++ b/net-libs/libproxy/files/0.5.0-Guard-PxManager-test-with-pacrunner-duktape-option-2.patch
@@ -0,0 +1,26 @@
+From f6aab7bc2a821117b2079f7504ab444dd13f4708 Mon Sep 17 00:00:00 2001
+From: Jan-Michael Brummer <jan.brummer@tabos.org>
+Date: Tue, 16 May 2023 15:10:53 +0200
+Subject: [PATCH] Guard PxManager test with pacrunner-duktape option (#215)
+
+Fixes: https://github.com/libproxy/libproxy/issues/213
+---
+ tests/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/meson.build b/tests/meson.build
+index 4ae8e7d..c8fe11f 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -17,7 +17,7 @@ if get_option('tests')
+        env: envs
+   )
+ 
+-  if soup_dep.found()
++  if soup_dep.found() and get_option('pacrunner-duktape')
+     px_manager_test = executable('test-px-manager',
+       ['px-manager-test.c', 'px-manager-helper.c'],
+       include_directories: px_backend_inc,
+-- 
+2.39.3
+
diff --git a/net-libs/libproxy/libproxy-0.5.0.ebuild b/net-libs/libproxy/libproxy-0.5.0.ebuild
new file mode 100644
index 000000000000..19c04bc6750a
--- /dev/null
+++ b/net-libs/libproxy/libproxy-0.5.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib vala
+
+DESCRIPTION="Library for automatic proxy configuration management"
+HOMEPAGE="https://github.com/libproxy/libproxy"
+SRC_URI="https://github.com/libproxy/libproxy/archive/refs/tags/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="duktape gnome gtk-doc +introspection kde test vala"
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	vala? ( introspection )
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.71.3:2[${MULTILIB_USEDEP}]
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+	duktape? (
+		dev-lang/duktape:=
+		net-misc/curl
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( net-libs/libsoup:3.0[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	kde? ( kde-frameworks/kconfig:5 )
+"
+BDEPEND="
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-Guard-PxManager-test-with-pacrunner-duktape-option-2.patch
+)
+
+src_prepare() {
+	use vala && vala_setup
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_use_bool gtk-doc docs)
+		$(meson_use test tests)
+		-Dconfig-env=true
+		$(meson_use gnome config-gnome)
+		-Dconfig-windows=false
+		-Dconfig-sysconfig=true
+		-Dconfig-osx=false
+		$(meson_use kde config-kde)
+		$(meson_native_use_bool duktape pacrunner-duktape)
+		$(meson_native_use_bool vala vapi)
+		$(meson_use duktape curl)
+		$(meson_native_use_bool introspection)
+	)
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/${PN}-1.0 "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 92d68d258bd2..974f9a768a59 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -4,8 +4,10 @@ AUX nodejs-fix-incomplete-type.patch 1895 BLAKE2B 30b548caee43f47dd25d35b789257b
 DIST node-v16.20.0.tar.xz 35546884 BLAKE2B 5bdb1fb7365e07f13d0a58a8d052d11efaadcf1b0792af0517b78b1ecf01e50eabe26e31588ae410ee63b7494a4eb9d23f70d4dd157a452d0bbf8bd548865255 SHA512 b155acdff0244307afcc334844f113b5c321f7764ebb69326d60a6a79d0e0d38d55257a38b815f5933aa4071e6a788e01c466476ef012cec648c84d74adda406
 DIST node-v18.16.0.tar.xz 40467860 BLAKE2B b16749c0212f3aa196ec9fc0f999a023adeb9031b3332939330ba5a3edb5bc2ed6dc21bf861509696e19ed0cc5d5c54bb882018f0e54eb1ad8e9b0ba3bb64bff SHA512 608ce5db97ce2d851f381c7991f635c5e0927ae79037649b482c7e197479341b7c6560644e25f4d65ece8aa80c5763a0e044349a5be210fa33fbbf97a96462bd
 DIST node-v20.1.0.tar.xz 41501496 BLAKE2B 03731915e734f0fd5cfb94fd05f4bd88ca015c5d5a91666d091499daa1a1b3193a3b4667ccec99ce1442ef6b402838705c42e785275dd327bf72adaae9487f50 SHA512 06b88a3ab3f1c089f0d38fb504083bed9a2d27b1b07633dbd40b02bcb3c0a22f6d04ab70abc394fdfb14ac978e974d97656bffeb27e0e47b0c95e672b925067c
+DIST node-v20.2.0.tar.xz 41778040 BLAKE2B 362b0ee89fe822722caeeb4b918550637bfb10791de75d872da334cb1123b744c351b5822b05abf4d36a0449badc5232ab1d73896dd5ce7755d10b226f0b9f52 SHA512 bf780e79bf6c7f766beb7734c7af45edc62094aba4c608f5519b130ff263e52ece925f85a4ee5740e962d16020070ef00933f6c74e771d948f23525c223da48e
 EBUILD nodejs-16.20.0.ebuild 6528 BLAKE2B 4d3ec05d91f5e72b8a663f9060e365c11db04903fc4e6eed2aee7cd77393d3088f8f43e94a551120e682cee3d0b54565b9d6b3520c42eb284889d3d5308e41e4 SHA512 cde12ca5e781397d259d19bffaa0c32126560d85eca314b370d80cd4bb9ff81dd981f74938826c5f190458a274fd20c4fd8e37c0acf6b7437b6152e70cfec2e6
 EBUILD nodejs-18.16.0.ebuild 7339 BLAKE2B fee49ebd361629b6972908c22dd3e9fda4a5d02d1682d320954c0711736976514d82d500a76ed8bef4a4e461df5f4c5877924ce5238ed4053f23f3ae111cf8ad SHA512 32cb0fe89eedfc5a611ceae2a61f0c921f129d3ecfebfcea5f83d3174e66624effc99727fbcbfd10ee0b5644a6d0cc625958de7f417e3ff61346ddafdd1d80fe
 EBUILD nodejs-20.1.0.ebuild 7233 BLAKE2B 1b3da427b177dd81084403ca7528c4b1fd5a410a50d9126c50d6ac14c6241f23bd42c55af4b676f525afea63131c8ac273822a767d622ee959045df051037b21 SHA512 97d38440f1a94e1908fbcc7e65323e24732207a765b2344f6835f6b2ccbc692150342e9df13819b59a1736cf433c9a648c1963f5dff9ca2c71f3d1cd50d97de7
+EBUILD nodejs-20.2.0.ebuild 7153 BLAKE2B fcf751d78de2653872bded8099c53f45f6ffe6a03486ce54f655158d07b8bdec7093bb96790a56c895711e21ae91ed24d0db5167d0320abed240e22127bbd9b9 SHA512 a19dd18a95bf2f75ef03c5402be98c7786d0b05c08c4484204abea89c57a073e30981f90365206d9451baaa6f8ba92bf87458b14a3d5143fc2847a6820ac94da
 EBUILD nodejs-99999999.ebuild 7215 BLAKE2B e3302e6a3bdd35cf6f2190f1930377f8894e5cc9836d33467783035ff7d46be9a2b323e86e8cc18b45fa403f6d541a57327f0c4594a15410506c8893e1d735cd SHA512 feeb30ef40115457aac6e53e1c203e68d0497419ea18b73f0712a95a3b428c6a467e867e0da58503922ac67141b93dcddaef8c78eee8171c1287b4e177f410a9
 MISC metadata.xml 898 BLAKE2B a67e85ea95c272b8d18746254894b058433267a74b5bad66bac7d78c7db4cec297e06bc87fad3ee836fc91749aaee2c11c88b48b6ba033c36fa79132552faa81 SHA512 d498b288058e7282c5e9a28d4ba192a2ac5ef796eb1edf644aea41cab2d0eb6036426b188dd9af7eeb2eaf04b84011460cb3c3695ca8dde5667add21d9963c97
diff --git a/net-libs/nodejs/nodejs-20.2.0.ebuild b/net-libs/nodejs/nodejs-20.2.0.ebuild
new file mode 100644
index 000000000000..9338f3b60283
--- /dev/null
+++ b/net-libs/nodejs/nodejs-20.2.0.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CONFIG_CHECK="~ADVISE_SYSCALLS"
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/nodejs/node"
+	SLOT="0"
+else
+	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+	SLOT="0/$(ver_cut 1)"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	S="${WORKDIR}/node-v${PV}"
+fi
+
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test"
+REQUIRED_USE="inspector? ( icu ssl )
+	npm? ( ssl )
+	system-icu? ( icu )
+	system-ssl? ( ssl )
+	x86? ( cpu_flags_x86_sse2 )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-arch/brotli-1.0.9:=
+	>=dev-libs/libuv-1.44.0:=
+	>=net-dns/c-ares-1.18.1:=
+	>=net-libs/nghttp2-1.41.0:=
+	sys-libs/zlib
+	system-icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	sys-devel/gcc:*"
+BDEPEND="${PYTHON_DEPS}
+	dev-util/ninja
+	sys-apps/coreutils
+	virtual/pkgconfig
+	test? ( net-misc/curl )
+	pax-kernel? ( sys-apps/elfix )"
+DEPEND="${RDEPEND}"
+
+# These are measured on a loong machine with -ggdb on, and only checked
+# if debugging flags are present in CFLAGS.
+#
+# The final link consumed a little more than 7GiB alone, so 8GiB is the lower
+# limit for memory usage. Disk usage was 19.1GiB for the build directory and
+# 1.2GiB for the installed image, so we leave some room for architectures with
+# fatter binaries and set the disk requirement to 22GiB.
+CHECKREQS_MEMORY="8G"
+CHECKREQS_DISK_BUILD="22G"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+	fi
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	tc-export AR CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.16.0-paxmarking.patch )
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	# LTO compiler flags are handled by configure.py itself
+	filter-flags '-flto*'
+	# nodejs unconditionally links to libatomic #869992
+	# specifically it requires __atomic_is_lock_free which
+	# is not yet implemented by sys-libs/compiler-rt (see
+	# https://reviews.llvm.org/D85044?id=287068), therefore
+	# we depend on gcc and force using libgcc as the support lib
+	tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc"
+
+	local myconf=(
+	--ninja
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use lto && myconf+=( --enable-lto )
+	if use system-icu; then
+		myconf+=( --with-intl=system-icu )
+	elif use icu; then
+		myconf+=( --with-intl=full-icu )
+	else
+		myconf+=( --with-intl=none )
+	fi
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case "${ARCH}:${ABI}" in
+		*:amd64) myarch="x64";;
+		*:arm) myarch="arm";;
+		*:arm64) myarch="arm64";;
+		loong:lp64*) myarch="loong64";;
+		riscv:lp64*) myarch="riscv64";;
+		*:ppc64) myarch="ppc64";;
+		*:x32) myarch="x32";;
+		*:x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		keepdir /etc/npm
+		echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm
+		doenvd "${T}"/50npm
+
+		# Install bash completion for `npm`
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	local drop_tests=(
+		test/parallel/test-dns-setserver-when-querying.js
+		test/parallel/test-fs-mkdir.js
+		test/parallel/test-fs-utimes-y2K38.js
+		test/parallel/test-release-npm.js
+		test/parallel/test-socket-write-after-fin-error.js
+		test/parallel/test-strace-openat-openssl.js
+		test/sequential/test-util-debug.js
+	)
+	rm "${drop_tests[@]}" || die "disabling tests failed"
+
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	if use npm; then
+		ewarn "remember to run: source /etc/profile if you plan to use nodejs"
+		ewarn "	in your current shell"
+	fi
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 31be03de931e..f137bbb7d208 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 5e80b446f3e4..edb3051e51c8 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -16,5 +16,5 @@ DIST curl-8.0.1.tar.xz.asc 488 BLAKE2B 452e1bebe1028e7621bbf8829e50cf56e254cd63a
 EBUILD curl-7.87.0-r2.ebuild 8673 BLAKE2B dec35f2ab2f1133e0c32632f250999f8338241d631526542c3a1de8982475707f77eb0c42cb6a0452b53c36f0163880eaab97e7d3b2374349257890f4a914907 SHA512 7ed2f16728428b42d36dbd255760bff1baa7c766adfcc827363d04dda9940630c43bf631be6234094b3da000601115a70473077c09d3df0711ae2ad457aae304
 EBUILD curl-7.88.1-r1.ebuild 8933 BLAKE2B f1cb8f5257bee408098b77f9b7739f4cf0b619bcfb6225ff1514ec42d9467b77ef045cb1ecdbb8ed18beeb6672f03793361db9380e2ec5a336e9c921f6d90767 SHA512 b4f99cdbfc1819d8437ec70f31cd5104aaf6604b9ecaffb207d5137ca72db61986ae65f782bf0cdb5d567b3e715dfb86a0a49fbb7dc5ab81367a3733439d033f
 EBUILD curl-7.88.1-r2.ebuild 8968 BLAKE2B e26876aaf0e5b5a781c66f0814975cc6c5091910e5a77d7b605da8944bdb7fd70c861f7dae2000483890e9fa013726833766da2cc037e1f8c5be080d6257afc7 SHA512 1b10d0d37959a7ca78a98babca9e442fdeff6e7c2b25de975ee66bc95634e7bd472c88058cd90b71c4eedc82aacb3d7b9be386491f5542d5f3fbac309978de24
-EBUILD curl-8.0.1.ebuild 8769 BLAKE2B 11f799908283d7ba2e1148fbcb66893214e7d1a570c5b6a7b34032ae36c76b5d772b70f22ec9809cac4f94da2d818a9a6514e799beea3d72921e0c9568330cc2 SHA512 eaa5ca16d2d3165345cd0cb46c7d775185777fbd57e86dfe0abc2039b0867bf044f54471ae50ad1652f7b5210ff7ee96b90e2dfcbffa80e67430edb11dccef73
+EBUILD curl-8.0.1.ebuild 8768 BLAKE2B 344ab351696eb6f474e1c2dfd216fcef1d84d26d8e68b6c461efe93c212b9c099a87d90a43527557b21a19ed8c8ffbca99dddd0a4a20b861bd1d39dbade012a7 SHA512 d3c6b6c433f673d171cd126e8acf052ac7b8057144fb50554895399d8911eb43faa192fc993c18b4ef4947f325aa2a624e803a9cbdbb3dfbcf36a233854a829d
 MISC metadata.xml 2289 BLAKE2B a351f315d1913abff2fec9c559b2b74ddc0a60bfb293d20a62e20a2072e820f88295dc88ab32a622855cd962b90b739b0270ba88e097ca6b41c21f7f4f72987b SHA512 45cafa3eac6aaf777de55e025ef64ac039e6d300a760fc86b2eb1b77153f5242181a09082e443e525923e30e804a9ae90e902fb7f252a24214ac88929c3b89fe
diff --git a/net-misc/curl/curl-8.0.1.ebuild b/net-misc/curl/curl-8.0.1.ebuild
index 4dbd864b46a8..d0b594bf9991 100644
--- a/net-misc/curl/curl-8.0.1.ebuild
+++ b/net-misc/curl/curl-8.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="curl"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~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 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
 IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls"
 IUSE+=" nghttp3"
diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest
index 3a64e2a74b96..c11cfd13613f 100644
--- a/net-misc/netifrc/Manifest
+++ b/net-misc/netifrc/Manifest
@@ -2,6 +2,6 @@ DIST netifrc-0.7.3.tar.gz 84770 BLAKE2B 075440bfd81e4dedd406d9555a18f530b07a47f9
 DIST netifrc-0.7.4.tar.bz2 75487 BLAKE2B 3ac3114ee4fb538c620284d02d3c1a0adc905f349ab40e7ff7065a4837113a36824b3962511160d997fc3a85701d55d569d8ac6b6b00c4665281d5b765827f76 SHA512 4934e2b7247a65847eed3a0f982c1c3996c486d7cb1cb401c29d8a6ea36eb94930a64e1cb84ff6ffdfb305e75f369fe6834062fcbb5e1d77d9f336d6592f3dff
 EBUILD netifrc-0.7.3-r1.ebuild 2072 BLAKE2B cb870e8d15264a0159abd7bb6454045c80402081ce021de25ec78e76a71bcf136d8d48cdf8308e8c19176e000ceb649fec3c53e13cad0294270e4364149a9815 SHA512 dd35e00d33a06f0159b7cfe71a0f95cbfbddf9d397975400f03384998b35533fee4e1bd36b16be95527b2b12f09e21e6e3eb96803c2f845c8ff65b5c78124063
 EBUILD netifrc-0.7.3.ebuild 2059 BLAKE2B 04bce3c3cdf9b43384e6918de8e91b59ee43fa74a23715c409bff93a7861b968225e604d40a412cb20440d0f3afaa53ea750eeded1a4b674074ee2e306da9ed5 SHA512 c907ae80e8b9a4552b2f5129efe0133ea48341584cae701acc3b37f3a172936413a0a6f9bb93e04b98139590230373121a0bd24cdfd5e4a3dddc7e64bd87fe5f
-EBUILD netifrc-0.7.4.ebuild 2081 BLAKE2B 0315a743d3dc942ca5d08dfeee66fedc9258d3f93a905873b89c4bbfc526ce845ccde8d958202708b74b01a7feaad4c8545d0ec9bf4ebe6fa31197b5fc434e13 SHA512 ee21e2979005115805e6a04240724af28b9d7ea3bb56839609e3878ef569e395789b14816767e04ac6254baf74d0edb2198c8d81e260eff4333d0694d9330b30
+EBUILD netifrc-0.7.4.ebuild 2080 BLAKE2B ae8612412dd62d7e2ba3166cf9b10ff247cc68d292200abfb21b0f2d0553f83fca3d5f4a0cbdf43db517ce6753a12a4fc37a71da1d9fdc900d8d364d50756824 SHA512 be8a862abad54ceea75f863390fb0598309912d037225489fd5207689504e46f66f34e490b7d25177cb1480d7a37d5a97347919a7f73ee370cd9688e2268362d
 EBUILD netifrc-9999.ebuild 2012 BLAKE2B bb63340644d173eb42992fdde37ed654285465ca1a938478515c052173a584350536d20e3dc038e14c09f40570947f8c1fa880916bba2b2163dc83b07866ce0b SHA512 083befaa94a2bf24c769ed55d74b49387576652d087be062e7a5af6094cf15183344123c94f9944b0acc67384d0c7e21a38b75a021ed98819f397ded0a1d2b76
 MISC metadata.xml 590 BLAKE2B c31ae830efc67c90566de9c4b3c4c7edaaea06f4e248295405d73e89e3fa61c925999e6cdfb89d37e1bd484442fe196c966ae256faa03355a31d331340b0f1ce SHA512 c1b6c24f5ee1cafde0e950fcbfa926f35529f991c1eb91436473d4d0ac8d338941b9b18bab62319fce712a3a14d04fd57019e433e584f4f2fc52a3591b8585f6
diff --git a/net-misc/netifrc/netifrc-0.7.4.ebuild b/net-misc/netifrc/netifrc-0.7.4.ebuild
index e67405ca29c9..37defe11d639 100644
--- a/net-misc/netifrc/netifrc-0.7.4.ebuild
+++ b/net-misc/netifrc/netifrc-0.7.4.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index b4256b3590a9..fe6ffc7dacc8 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 770e4ad080b6..083efcc0c283 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -120,6 +120,7 @@ media-libs/rubberband jni
 media-libs/gd avif heif
 media-gfx/graphicsmagick heif
 www-client/links avif
+dev-lang/php avif
 
 # Sam James <sam@gentoo.org> (2021-02-26)
 # dev-libs/efl not keyworded here
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index d264e4d4e9aa..46424728f28e 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
@@ -193,10 +193,6 @@ opencl
 # Unmask once sys-libs/libunwind gets ported & keyworded.
 unwind
 
-# Pacho Ramos <pacho@gentoo.org> (2014-01-08)
-# Unmask systemd since it is keyworded here.
--systemd
-
 # Tobias Klausmann <klausman@gentoo.org> (2014-07-20)
 # Mask redis USE flag everywhere since redis depends on google-perftools,
 # which are not supported on Alpha at all (assembly).
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index 959adab62d26..a7962c924f6c 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
@@ -55,10 +55,6 @@
 -python_targets_pypy3
 -python_single_target_pypy3
 
-# Michał Górny <mgorny@gentoo.org> (2013-05-04)
-# Unmask systemd since it is keyworded here.
--systemd
-
 # Andrey Grozin <grozin@gentoo.org> (2014-06-25)
 # keyworded on amd64
 -clisp
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index 989f3507b134..0227ba0da37c 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -121,10 +121,6 @@ video_cards_radeonsi
 # media-libs/xine-lib is not keyworded
 xine
 
-# Michał Górny <mgorny@gentoo.org> (2013-05-04)
-# Unmask systemd since it is keyworded here.
--systemd
-
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (2013-08-22)
 # virtual/opencl is not keyworded
 opencl
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index 8e48c570e532..d4913543448e 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -73,10 +73,6 @@ opencl
 # net-libs/libsmi not tested on arm64 yet
 smi
 
-# Mart Raudsepp <leio@gentoo.org> (2017-02-01)
-# Unmask systemd since it is keyworded here.
--systemd
-
 # Markus Meier <maekke@gentoo.org> (2010-08-22)
 # net-wireless/wimax not tested
 wimax
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 1d46d81afb22..91314159584e 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # matoro <matoro_gentoo@matoro.tk> (2022-09-29)
@@ -207,11 +207,6 @@ ecls
 gcl
 sbcl
 
-# Michał Górny <mgorny@gentoo.org> (2013-05-04)
-# Mask systemd flag globally, unmasked on arches on which systemd
-# is keyworded.
-systemd
-
 # Mike Gilbert <floppym@gentoo.org> (2014-10-19)
 # Requires the following packages to be keyworded/stable:
 # sys-libs/libapparmor
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 9a41708780b6..a6cfbf89b074 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -161,6 +161,7 @@ media-libs/rubberband jni
 media-libs/gd avif heif
 media-gfx/graphicsmagick heif
 www-client/links avif
+dev-lang/php avif
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-01-19)
 # uchardet not stable/keyworded yet on this arch
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index 5337dd2771fc..318ce16a1a88 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
@@ -41,10 +41,6 @@ vulkan
 system-libvpx
 vpx
 
-# Matt Turner <mattst88@gentoo.org> (2018-05-26)
-# Unmask systemd since it is keyworded here.
--systemd
-
 #
 # Jeroen Roovers <jer@gentoo.org> (2018-03-22)
 # sys-cluster/ceph is not supported
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 5a9512a589c0..31bc5632ed6a 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -129,6 +129,7 @@ media-libs/rubberband jni
 media-libs/gd avif heif
 media-gfx/graphicsmagick heif
 www-client/links avif
+dev-lang/php avif
 
 # Akinori Hattori <hattya@gentoo.org> (2021-03-03)
 # dev-lang/ruby is not keyworded
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index 187c06dae958..8cf4b1f138ce 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
@@ -198,10 +198,6 @@ opencl
 # sys-devel/llvm s not keyworded, bug #320221
 llvm
 
-# Pacho Ramos <pacho@gentoo.org> (2014-01-08)
-# Unmask systemd since it is keyworded here.
--systemd
-
 # sys-libs/libseccomp has not been ported to this arch yet #524148
 seccomp
 
diff --git a/profiles/arch/loong/use.mask b/profiles/arch/loong/use.mask
index 589be7f7ad98..398d7e3a4ce7 100644
--- a/profiles/arch/loong/use.mask
+++ b/profiles/arch/loong/use.mask
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # WANG Xuerui <xen0n@gentoo.org> (2022-12-05)
@@ -41,9 +41,6 @@ webengine
 # Unmask the flag which corresponds to ARCH.
 -loong
 
-# Unmask systemd
--systemd
-
 # Things we actually can support
 -input_devices_synaptics
 
diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask
index 1bbcb68e5318..3c5efe6fcfca 100644
--- a/profiles/arch/m68k/use.mask
+++ b/profiles/arch/m68k/use.mask
@@ -1,13 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
 -m68k
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2022-05-31)
-# Unmask systemd since it is keyworded here.
--systemd
-
 # James Le Cuirot <chewi@gentoo.org> (2021-01-30)
 # GTK is not keyworded or tested.
 gtk
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index 409c8ea6b8f7..618df7c4de93 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -21,10 +21,6 @@ tpm
 # rdma-core is not keyworded mips...
 rdma
 
-# Matt Turner <mattst88@gentoo.org> (2018-03-25)
-# Unmask systemd since it is keyworded here.
--systemd
-
 # Mart Raudsepp <leio@gentoo.org> (2018-02-11)
 # dev-util/valgrind is not keyworded here yet,
 # though the MIPS platform is supported upstream
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 937d50098c08..64adb538d008 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -133,6 +133,7 @@ dev-python/diskcache test
 # media-libs/libavif isn't keyworded here
 media-libs/gd avif heif
 www-client/links avif
+dev-lang/php avif
 
 # Sam James <sam@gentoo.org> (2021-02-28)
 # compiler-rt* has no support for ppc32 (yet?)
diff --git a/profiles/arch/powerpc/ppc32/use.mask b/profiles/arch/powerpc/ppc32/use.mask
index 8b56e5ee725c..dfc84d5e8125 100644
--- a/profiles/arch/powerpc/ppc32/use.mask
+++ b/profiles/arch/powerpc/ppc32/use.mask
@@ -1,4 +1,4 @@
-# Copyright 2008-2022 Gentoo Authors
+# Copyright 2008-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
@@ -35,7 +35,3 @@ java
 -clisp
 -ecls
 -sbcl
-
-# Pacho Ramos <pacho@gentoo.org> (2013-09-11)
-# Unmask systemd since it is keyworded here.
--systemd
diff --git a/profiles/arch/powerpc/ppc64/use.mask b/profiles/arch/powerpc/ppc64/use.mask
index ef203e88e276..e4ee2f94b694 100644
--- a/profiles/arch/powerpc/ppc64/use.mask
+++ b/profiles/arch/powerpc/ppc64/use.mask
@@ -32,7 +32,3 @@ battery
 
 # Unmask the flag for Playstation 3
 -ps3
-
-# Michał Górny <mgorny@gentoo.org> (2013-05-04)
-# Unmask systemd since it is keyworded here.
--systemd
diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
index cfff2f28c200..ac70255b3d46 100644
--- a/profiles/arch/powerpc/use.mask
+++ b/profiles/arch/powerpc/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # PPC Specific use flags
@@ -127,7 +127,3 @@ nvtt
 
 # fdk-aac is already keyworded here
 -fdk
-
-# Pacho Ramos <pacho@gentoo.org> (2014-01-08)
-# Unmask systemd since it is keyworded here.
--systemd
diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask
index 90360dcf8d5e..1c381636e5e7 100644
--- a/profiles/arch/riscv/use.mask
+++ b/profiles/arch/riscv/use.mask
@@ -4,9 +4,6 @@
 # Unmask the flag which corresponds to ARCH.
 -riscv
 
-# Unmask systemd
--systemd
-
 # matoro <matoro_gentoo@matoro.tk> (2022-09-29)
 # dev-util/google-perftools is supported here
 -tcmalloc
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index a57aae057f3b..41ac083218a1 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -96,6 +96,7 @@ media-libs/libcanberra sound
 media-libs/gd avif heif
 media-gfx/graphicsmagick heif
 www-client/links avif
+dev-lang/php avif
 
 # Sam James <sam@gentoo.org> (2022-04-24)
 # Unkeyworded dev-tcltk/* dependencies
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index c327a57d7ce7..ea07e2cb1eb6 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -1,13 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
 -s390
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2022-05-20)
-# Keyworded here
--systemd
-
 # Sam James <sam@gentoo.org> (2022-04-26)
 # dev-libs/mongo-c-driver not keyworded here
 mongodb
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 150f55f06481..d2f6fc2a96a6 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -171,6 +171,7 @@ media-libs/gd avif heif
 net-libs/webkit-gtk avif
 media-gfx/graphicsmagick heif
 www-client/links avif
+dev-lang/php avif
 
 # Sam James <sam@gentoo.org> (2021-02-26)
 # dev-libs/efl not keyworded here
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index db24b722f93e..321ddb3a648b 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -242,10 +242,6 @@ unwind
 # sys-devel/llvm is not keyworded, bug #320221
 llvm
 
-# Pacho Ramos <pacho@gentoo.org> (2014-01-19)
-# Unmask systemd since it is keyworded here.
--systemd
-
 # sys-libs/libseccomp has not been ported to this arch yet #524148
 seccomp
 
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index c3f90515ea6e..80bda001840a 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -48,10 +48,6 @@ webengine
 -python_targets_pypy3
 -python_single_target_pypy3
 
-# Michał Górny <mgorny@gentoo.org> (2013-05-04)
-# Unmask systemd since it is keyworded here.
--systemd
-
 # Andrey Grozin <grozin@gentoo.org> (2014-06-25)
 # keyworded on x86
 -clisp
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 82a7d776bffa..0b8500a2cb44 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1746,6 +1746,7 @@ dev-lang/perl:ithreads - Enable Perl threads, has some compatibility problems
 dev-lang/perl:quadmath - Enable 128bit floating point arithmetic via libquadmath
 dev-lang/php:apparmor - Support FPM application confinement through sys-libs/libapparmor
 dev-lang/php:argon2 - Enable password hashing algorithm from app-crypt/argon2
+dev-lang/php:avif - Enable AVIF support in bundled libgd
 dev-lang/php:bcmath - Enable the BCMath Arbitrary Precision Mathematics extension
 dev-lang/php:cli - Enable the Command-Line Interface (CLI) SAPI
 dev-lang/php:coverage - Include gcov symbols for test coverage and lcov reports. Only useful for extension developers, and requires GCC.
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 4d97b14bfcf9..fa774d0359ff 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/huggingface_hub/Manifest b/sci-libs/huggingface_hub/Manifest
index 77fe6a681dcd..defb1d0327b7 100644
--- a/sci-libs/huggingface_hub/Manifest
+++ b/sci-libs/huggingface_hub/Manifest
@@ -1,3 +1,3 @@
 DIST huggingface_hub-0.13.4.gh.tar.gz 325227 BLAKE2B 56ad70072ddd7f9878de4db45fffeb200032d71ba36fa2dc0e81d50a079a5ffa9ad80b3a71773a5fe466ac4522db7061fc7974149092d212278b8159d30e212b SHA512 6c07c1dc1a0c327ca463b7f366c265dfc7e55ed69592df5ad10f6d77956ac1dfe3e1f827a2df200f943da2f34a96ba4de1c395944b542e3d7142d925f60ad274
-EBUILD huggingface_hub-0.13.4.ebuild 549 BLAKE2B 62991c8210e954414422db93e98b2e56678524a68e31a07b6ae8fcba5b75b56cc7c46fd618715579067e57d4c96d6dd4754be601d310d96d55d3ed81d384701e SHA512 336bc0fd7eca11ce504b9cd4d6d35722e7073839bd4765c2734452675304b20274ee4a9b0236251528f448846faa6b345674b027150890cfd6fe5305c10811cf
+EBUILD huggingface_hub-0.13.4-r1.ebuild 800 BLAKE2B ea6bec0a03ff98d4c0fb6698c098319df4d22b26f70cc68a571b5a034755a61adc87180a2896002f7ce83f61d884606e773860296270ce0af0feeee3f1014d8d SHA512 a86063f8fb2919cb5af87df72d930f9766bd6637f47dc9d006a4158846e3c7538bc740bbad165f41a0a76d2503d5b46e793ede8d772f75aefbe2030b7fc37ea3
 MISC metadata.xml 393 BLAKE2B 1703224359804943e921acb978be119c5ae48c6dae23177d9ba2a4b843a1f8cf10487c7dfc5af83600bb98f1443cb5d3cdad1d48ddc5db7117ebb3092af5fe44 SHA512 74ac25236d7cd4b169ec6281480b140e25f0b2579998ca441eb2ab5c070ed87690c49b7af1bb7b83d8782685c18dc3d2cd5f7ef27e8a51fa8863badc58214461
diff --git a/sci-libs/huggingface_hub/huggingface_hub-0.13.4.ebuild b/sci-libs/huggingface_hub/huggingface_hub-0.13.4-r1.ebuild
index 29254fa42182..7c519b339f79 100644
--- a/sci-libs/huggingface_hub/huggingface_hub-0.13.4.ebuild
+++ b/sci-libs/huggingface_hub/huggingface_hub-0.13.4-r1.ebuild
@@ -19,4 +19,13 @@ SLOT="0"
 KEYWORDS="~amd64"
 RESTRICT="test" #Several modules not yet packaged
 
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+
 distutils_enable_tests pytest
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 38de7ae42f61..edef31d16f1c 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 316246b09f1a..7ed054cb6789 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,24 +1,18 @@
 AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7334eedcb2593855e7481d5969ed458d322ac29de0e9a9c7f9f041911ee7aeca750ff77ce04fd60bf3a3d3 SHA512 302b2a7ec715967c0aa7d1c177d4e55b26e37ebba8d04dd37ecf627d20042fe91cd7e6192ff9d71422129b0ea54a9eec6046f505af550548bd450998924f37ee
 AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
-DIST kubernetes-1.24.11.tar.gz 37867002 BLAKE2B 3972a049b1549cb1ed147763f09d20b656243814a91d701a1171c171a19721aef2b8393121160edbd75e6f11978b355ce8e97ef6e9d007634428753d7cc1499e SHA512 ceaa5ca883d208e8f80d4d2628195256df697ce5ebedf2524af7cd94ffd783c055c47797cf76f6d4893e2392b652a89f55999251feda196b96b9df4c27215adc
 DIST kubernetes-1.24.12.tar.gz 37883841 BLAKE2B 7c43ce255a647a128a74e294a1d1ad7f48063b6a4ce0da7697654dd05739c9915b45933640b041e5e0de075bbf0138175ce158e4790d531eb9d87a0823af87f9 SHA512 f171ef7ddc72f81172685061ffa1c8e4cd074d94c3185b0586485639cc9ea12c58a6d66985d7ff745da90d14f3be5d3f8a3a958135be6ba198edb1a78559e7d5
 DIST kubernetes-1.24.13.tar.gz 37889804 BLAKE2B d10f0bae7747700f2e995ea4829d219820360d92068ba8c3a656d15d411ea5892068cb925620cb506c9e171340b3f39427bc2c948dafcc3703a5668bf24163c0 SHA512 0519f2149a5ad675de2b5bfdfad1160bedc03d1b0a14280606388f526bf7558955917204604d949bcb650923016e35bad2b772220d01db55c8e463d992c12f6f
-DIST kubernetes-1.25.7.tar.gz 38169376 BLAKE2B d324e823be2efc3d19892313ed2a7daa0a3c1384f4f03e18a703f63f32609e1a594a8fd3fc49cb78330848fd42ae1d629339a967ab973e73ddff2be8c6a1eb73 SHA512 d164496df03223cab4d1754ab42f88f0e5d5cc95e1e5995442183aa739d583078c6b7ea1febdc92e2bf8b76820857cd8973d8364f452c2e576b7168a32578419
 DIST kubernetes-1.25.8.tar.gz 38188305 BLAKE2B 5c1cc06121243e54ceb42364995ac77f8d6190fb8d8f1198284120d134295c5ff660565c3ec45a416d3231c9d32bb96338c291b6373c1405aa260f5ce6601650 SHA512 30f1815de4d5bf3a091f1937c94e0e6cf0abc0f527488b72ec4a7d72c014bb8fef450abbf4c908f8a5b791e8d4ab501edb3f5c55af4e370359a952a6228362be
 DIST kubernetes-1.25.9.tar.gz 38197577 BLAKE2B f90e8e6fff4ada4b36b16623463e99de2818343c4206ada7c230799a01df189c196dc9d8f747517465606958f84b49bbf6a84d759590763ebf3079fa8e2f87c7 SHA512 6966e4246715c358ea60bd581ae9706d002d7463ab5466984a099249e8bd8aebf4929715ece255e3975a60aa4639912d0776ba86d6095438a0788517765cb61c
-DIST kubernetes-1.26.2.tar.gz 38192706 BLAKE2B ca14778ab5a1d1bdfb935d80eea269adb0414b5613d8e70b9c790711a284b79c8f89cdd22af73b9127fbf9f036b0aa317fbd97bc1df735aead0903d951fe5f4a SHA512 c14f3ba25ae3608ca8d28ab75c2f6a3636970d5851ef1c09259d6be4bce17af131f9adcc0be8e51f4197dc16650461bac8faae7b7ef24f899c1a0ad193ed0a6b
 DIST kubernetes-1.26.3.tar.gz 38215855 BLAKE2B 1bc1b4e9aeebc41e3e7a519f097b886d0cdede91f0cbbabc7c26db1c75d87220f2e8a5aa5ac85ad0c01486abd5806e74d2b09aa1a0281364b70417d3daea503e SHA512 7a8aa29ea282aec99046d231d4c6756e36ba74eca4c2300b3b1f5a1362d211ffe712957746044168b254ba7332e324e341a2e4d56be7bb6a58de953fa630ac14
 DIST kubernetes-1.26.4.tar.gz 38229656 BLAKE2B 1da5b7c380d27d57f6c6200f5b65b9a469c9d6663713742bc2f32746bad2eea17bb8265df009d625011f1e036d768e26bda514634aacc13b2997bb7c70684f3e SHA512 185d21368f84a1e1829578c7552922db098d2caecd2c1d95c5da259a107009960ef44c2dd42eec4dab50c4c59a8d5ae0b4dd45fc6f106b27138e1a1d7391626d
 DIST kubernetes-1.27.1.tar.gz 38048443 BLAKE2B c5475209ef4bcad704a6075392180496e4ec9f63af26038cb22b0f28effeab8eafe734c330c80e86d0aaabf125bec5f134cd1479ce54fd6437b3aeeaec8fb352 SHA512 20d2b8f3c892884a1abd5e30320f3cf50ada79c3b68409c6d626278e42d031e960057b042aade93b55b3185623c5bdcfef9a16602e7f3c4a71be8cee517e7ba1
-EBUILD kube-apiserver-1.24.11.ebuild 993 BLAKE2B f6fa68cba4436ed9491bc8a65918f2406542f8bf35a7eb04cf70fa65717d3bc8f570ee4e5d1591209a2dcd71898060f2a18e63eba5edcda2cfeb141c92c86aac SHA512 745d5ffff353ff250f13a86e903a262ec8585353354664135cd3bf60f52b6bc79b66e61d918b98d6e4a6d6d7ca797dba90ca645e47b35b6181bf9c1d08404d76
 EBUILD kube-apiserver-1.24.12.ebuild 993 BLAKE2B f6fa68cba4436ed9491bc8a65918f2406542f8bf35a7eb04cf70fa65717d3bc8f570ee4e5d1591209a2dcd71898060f2a18e63eba5edcda2cfeb141c92c86aac SHA512 745d5ffff353ff250f13a86e903a262ec8585353354664135cd3bf60f52b6bc79b66e61d918b98d6e4a6d6d7ca797dba90ca645e47b35b6181bf9c1d08404d76
-EBUILD kube-apiserver-1.24.13.ebuild 994 BLAKE2B 30356d78a7ddd1ea5eebf7efe9c41bdac0d56565a27420d4efd560b445ca7045045c366bf1964ca8422093b830ee463c6d09ca5a6dda188009d08e17df13da3e SHA512 1e4234fabe0376bbcc6377d73b35efe983ee3f0453f221cb8f30bc7c41a9fdc912b0fd7cbdea39d137945d67f6051e8ccfd151fdc239f51dc4a32ea069944909
-EBUILD kube-apiserver-1.25.7.ebuild 991 BLAKE2B 27a5563d75bb7c818335c8d019b63c2371a7c72d679bb237d79cc699ffd7e5f4f5f11a4197cdd086c4162d2af3fcb5c252a4effcd2fdc7ddf95fc0c1c2784946 SHA512 4dcce5a68b1f97d9f13191677fb21324317f38d5b4b2f15d4514b83ea96e097d5bbe86260c1f8ad462373d234cbe361ef9e2b3b615ee4cb86d984b83b5acddd8
+EBUILD kube-apiserver-1.24.13.ebuild 993 BLAKE2B f6fa68cba4436ed9491bc8a65918f2406542f8bf35a7eb04cf70fa65717d3bc8f570ee4e5d1591209a2dcd71898060f2a18e63eba5edcda2cfeb141c92c86aac SHA512 745d5ffff353ff250f13a86e903a262ec8585353354664135cd3bf60f52b6bc79b66e61d918b98d6e4a6d6d7ca797dba90ca645e47b35b6181bf9c1d08404d76
 EBUILD kube-apiserver-1.25.8.ebuild 991 BLAKE2B 27a5563d75bb7c818335c8d019b63c2371a7c72d679bb237d79cc699ffd7e5f4f5f11a4197cdd086c4162d2af3fcb5c252a4effcd2fdc7ddf95fc0c1c2784946 SHA512 4dcce5a68b1f97d9f13191677fb21324317f38d5b4b2f15d4514b83ea96e097d5bbe86260c1f8ad462373d234cbe361ef9e2b3b615ee4cb86d984b83b5acddd8
-EBUILD kube-apiserver-1.25.9.ebuild 992 BLAKE2B b30918ad020cf26fb16d4a528e860370101cbf1086cc02c843a87b91fe5d85c8ae4adfdc35eb4001f680679ee9c63a6ebcf9dda01641add837ce84da66eebd34 SHA512 0459c3a30a6633a367fd69c421e7566080994cbade440ee438b91f628c4acc7b68c00c273a027eb01850df32a80cfa33cad678559661e06893b08098ee1cb726
-EBUILD kube-apiserver-1.26.2.ebuild 991 BLAKE2B 27a5563d75bb7c818335c8d019b63c2371a7c72d679bb237d79cc699ffd7e5f4f5f11a4197cdd086c4162d2af3fcb5c252a4effcd2fdc7ddf95fc0c1c2784946 SHA512 4dcce5a68b1f97d9f13191677fb21324317f38d5b4b2f15d4514b83ea96e097d5bbe86260c1f8ad462373d234cbe361ef9e2b3b615ee4cb86d984b83b5acddd8
+EBUILD kube-apiserver-1.25.9.ebuild 991 BLAKE2B 27a5563d75bb7c818335c8d019b63c2371a7c72d679bb237d79cc699ffd7e5f4f5f11a4197cdd086c4162d2af3fcb5c252a4effcd2fdc7ddf95fc0c1c2784946 SHA512 4dcce5a68b1f97d9f13191677fb21324317f38d5b4b2f15d4514b83ea96e097d5bbe86260c1f8ad462373d234cbe361ef9e2b3b615ee4cb86d984b83b5acddd8
 EBUILD kube-apiserver-1.26.3.ebuild 991 BLAKE2B 27a5563d75bb7c818335c8d019b63c2371a7c72d679bb237d79cc699ffd7e5f4f5f11a4197cdd086c4162d2af3fcb5c252a4effcd2fdc7ddf95fc0c1c2784946 SHA512 4dcce5a68b1f97d9f13191677fb21324317f38d5b4b2f15d4514b83ea96e097d5bbe86260c1f8ad462373d234cbe361ef9e2b3b615ee4cb86d984b83b5acddd8
-EBUILD kube-apiserver-1.26.4.ebuild 992 BLAKE2B b30918ad020cf26fb16d4a528e860370101cbf1086cc02c843a87b91fe5d85c8ae4adfdc35eb4001f680679ee9c63a6ebcf9dda01641add837ce84da66eebd34 SHA512 0459c3a30a6633a367fd69c421e7566080994cbade440ee438b91f628c4acc7b68c00c273a027eb01850df32a80cfa33cad678559661e06893b08098ee1cb726
+EBUILD kube-apiserver-1.26.4.ebuild 991 BLAKE2B 27a5563d75bb7c818335c8d019b63c2371a7c72d679bb237d79cc699ffd7e5f4f5f11a4197cdd086c4162d2af3fcb5c252a4effcd2fdc7ddf95fc0c1c2784946 SHA512 4dcce5a68b1f97d9f13191677fb21324317f38d5b4b2f15d4514b83ea96e097d5bbe86260c1f8ad462373d234cbe361ef9e2b3b615ee4cb86d984b83b5acddd8
 EBUILD kube-apiserver-1.27.1.ebuild 992 BLAKE2B 2220811e7ac652e6fe35de874d2b22d2c1bbed04d79b44625f044d07f081f2c11c34d6bc213b225f1face82fe5ac30b9c5e273ff718cbfb164c88cdca8fa03d5 SHA512 9c8fce637e8dae24fc85ecf79a2d8a21196d45e5dd70cabedfd34dc49be4ab369ff59e93f0c73db13347dc5ef8b6521903cc47a8c1cca46809ea9a10b0c52f01
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.24.11.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.24.11.ebuild
deleted file mode 100644
index d173c8d9825d..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.24.11.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.18.1"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.24.13.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.24.13.ebuild
index 80549a7af0d5..d173c8d9825d 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.24.13.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.24.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.25.7.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.25.7.ebuild
deleted file mode 100644
index 732d08517b60..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.25.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.19"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.25.9.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.25.9.ebuild
index 467da4d39d0b..732d08517b60 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.25.9.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.25.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.26.2.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.26.2.ebuild
deleted file mode 100644
index 732d08517b60..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.26.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.19"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.26.4.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.26.4.ebuild
index 467da4d39d0b..732d08517b60 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.26.4.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.26.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index f881765cb1a9..7c17a4582898 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,24 +1,18 @@
 AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2cf815b25ac4e91354e3fce756a1955e71ec762fab1091074ef4233fff22667aba50417c0d6a896055f8f52b6630bb4e SHA512 b0227a7431018a6742b3931fda0f14b4a040107ecd6821c84593180919ba8a5af9b99b7a507645a5488792f14accd686acc4cc6f70a5084bbdfcdd494021aafc
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
-DIST kubernetes-1.24.11.tar.gz 37867002 BLAKE2B 3972a049b1549cb1ed147763f09d20b656243814a91d701a1171c171a19721aef2b8393121160edbd75e6f11978b355ce8e97ef6e9d007634428753d7cc1499e SHA512 ceaa5ca883d208e8f80d4d2628195256df697ce5ebedf2524af7cd94ffd783c055c47797cf76f6d4893e2392b652a89f55999251feda196b96b9df4c27215adc
 DIST kubernetes-1.24.12.tar.gz 37883841 BLAKE2B 7c43ce255a647a128a74e294a1d1ad7f48063b6a4ce0da7697654dd05739c9915b45933640b041e5e0de075bbf0138175ce158e4790d531eb9d87a0823af87f9 SHA512 f171ef7ddc72f81172685061ffa1c8e4cd074d94c3185b0586485639cc9ea12c58a6d66985d7ff745da90d14f3be5d3f8a3a958135be6ba198edb1a78559e7d5
 DIST kubernetes-1.24.13.tar.gz 37889804 BLAKE2B d10f0bae7747700f2e995ea4829d219820360d92068ba8c3a656d15d411ea5892068cb925620cb506c9e171340b3f39427bc2c948dafcc3703a5668bf24163c0 SHA512 0519f2149a5ad675de2b5bfdfad1160bedc03d1b0a14280606388f526bf7558955917204604d949bcb650923016e35bad2b772220d01db55c8e463d992c12f6f
-DIST kubernetes-1.25.7.tar.gz 38169376 BLAKE2B d324e823be2efc3d19892313ed2a7daa0a3c1384f4f03e18a703f63f32609e1a594a8fd3fc49cb78330848fd42ae1d629339a967ab973e73ddff2be8c6a1eb73 SHA512 d164496df03223cab4d1754ab42f88f0e5d5cc95e1e5995442183aa739d583078c6b7ea1febdc92e2bf8b76820857cd8973d8364f452c2e576b7168a32578419
 DIST kubernetes-1.25.8.tar.gz 38188305 BLAKE2B 5c1cc06121243e54ceb42364995ac77f8d6190fb8d8f1198284120d134295c5ff660565c3ec45a416d3231c9d32bb96338c291b6373c1405aa260f5ce6601650 SHA512 30f1815de4d5bf3a091f1937c94e0e6cf0abc0f527488b72ec4a7d72c014bb8fef450abbf4c908f8a5b791e8d4ab501edb3f5c55af4e370359a952a6228362be
 DIST kubernetes-1.25.9.tar.gz 38197577 BLAKE2B f90e8e6fff4ada4b36b16623463e99de2818343c4206ada7c230799a01df189c196dc9d8f747517465606958f84b49bbf6a84d759590763ebf3079fa8e2f87c7 SHA512 6966e4246715c358ea60bd581ae9706d002d7463ab5466984a099249e8bd8aebf4929715ece255e3975a60aa4639912d0776ba86d6095438a0788517765cb61c
-DIST kubernetes-1.26.2.tar.gz 38192706 BLAKE2B ca14778ab5a1d1bdfb935d80eea269adb0414b5613d8e70b9c790711a284b79c8f89cdd22af73b9127fbf9f036b0aa317fbd97bc1df735aead0903d951fe5f4a SHA512 c14f3ba25ae3608ca8d28ab75c2f6a3636970d5851ef1c09259d6be4bce17af131f9adcc0be8e51f4197dc16650461bac8faae7b7ef24f899c1a0ad193ed0a6b
 DIST kubernetes-1.26.3.tar.gz 38215855 BLAKE2B 1bc1b4e9aeebc41e3e7a519f097b886d0cdede91f0cbbabc7c26db1c75d87220f2e8a5aa5ac85ad0c01486abd5806e74d2b09aa1a0281364b70417d3daea503e SHA512 7a8aa29ea282aec99046d231d4c6756e36ba74eca4c2300b3b1f5a1362d211ffe712957746044168b254ba7332e324e341a2e4d56be7bb6a58de953fa630ac14
 DIST kubernetes-1.26.4.tar.gz 38229656 BLAKE2B 1da5b7c380d27d57f6c6200f5b65b9a469c9d6663713742bc2f32746bad2eea17bb8265df009d625011f1e036d768e26bda514634aacc13b2997bb7c70684f3e SHA512 185d21368f84a1e1829578c7552922db098d2caecd2c1d95c5da259a107009960ef44c2dd42eec4dab50c4c59a8d5ae0b4dd45fc6f106b27138e1a1d7391626d
 DIST kubernetes-1.27.1.tar.gz 38048443 BLAKE2B c5475209ef4bcad704a6075392180496e4ec9f63af26038cb22b0f28effeab8eafe734c330c80e86d0aaabf125bec5f134cd1479ce54fd6437b3aeeaec8fb352 SHA512 20d2b8f3c892884a1abd5e30320f3cf50ada79c3b68409c6d626278e42d031e960057b042aade93b55b3185623c5bdcfef9a16602e7f3c4a71be8cee517e7ba1
-EBUILD kube-controller-manager-1.24.11.ebuild 990 BLAKE2B 92eed848da224757f008ce11565aba6967fbc82d5fcc5b3354db6f2bb6e75f3f4150b7ba352f4b3e8ff52100d81973ae417a89c58dbb5b8b8cb4dbe4fccb4a80 SHA512 51603722a1ad80474366a31c81f2ab9f4e4c679e1dafa9e64442f9de0c004e3f10e5f1f980e7ee2ed95308dc6f37425689d9e3daf14b79eab9469e4d63743f57
 EBUILD kube-controller-manager-1.24.12.ebuild 990 BLAKE2B 92eed848da224757f008ce11565aba6967fbc82d5fcc5b3354db6f2bb6e75f3f4150b7ba352f4b3e8ff52100d81973ae417a89c58dbb5b8b8cb4dbe4fccb4a80 SHA512 51603722a1ad80474366a31c81f2ab9f4e4c679e1dafa9e64442f9de0c004e3f10e5f1f980e7ee2ed95308dc6f37425689d9e3daf14b79eab9469e4d63743f57
-EBUILD kube-controller-manager-1.24.13.ebuild 991 BLAKE2B 86150c0db0f8ebdbbb9f5a601ccfadcf5e65a5dc4f6d54303bb35018cc44c2dff99b1e210e05fd58ed5b2a6b5eb62bf860bc8f83dc3d9f7492c836d16fae24bd SHA512 063140c51d829c3822b3038df026a2541bed8fa3bdc5fb1db664bfd951cd413b21afacb90098712eceea3dddb8d479e7cfe79ed0800e6a842164d3d101f0a4e4
-EBUILD kube-controller-manager-1.25.7.ebuild 988 BLAKE2B c0ef8c338ce9b85ea7f875158058fb09f6946862f32983f478638842b4b30e5eb43c5f82f0799f3f47491f19fba4475e9ca29b5630ef5e0b91bc4da472951c5a SHA512 02b9a4c1b5d8d0c4eb4ce3de6a2fcf99ca6d08c3b6bd51574f717a123ffd2499d77905af5a501f32df9b06ebf12e9757d87a61942fd9bb1b8210083321311b97
+EBUILD kube-controller-manager-1.24.13.ebuild 990 BLAKE2B 92eed848da224757f008ce11565aba6967fbc82d5fcc5b3354db6f2bb6e75f3f4150b7ba352f4b3e8ff52100d81973ae417a89c58dbb5b8b8cb4dbe4fccb4a80 SHA512 51603722a1ad80474366a31c81f2ab9f4e4c679e1dafa9e64442f9de0c004e3f10e5f1f980e7ee2ed95308dc6f37425689d9e3daf14b79eab9469e4d63743f57
 EBUILD kube-controller-manager-1.25.8.ebuild 988 BLAKE2B c0ef8c338ce9b85ea7f875158058fb09f6946862f32983f478638842b4b30e5eb43c5f82f0799f3f47491f19fba4475e9ca29b5630ef5e0b91bc4da472951c5a SHA512 02b9a4c1b5d8d0c4eb4ce3de6a2fcf99ca6d08c3b6bd51574f717a123ffd2499d77905af5a501f32df9b06ebf12e9757d87a61942fd9bb1b8210083321311b97
-EBUILD kube-controller-manager-1.25.9.ebuild 989 BLAKE2B 7000dabd11b273b370c7f0b6b607962579e796d3de369f251df983f8b30a4db21e2e84fed99de11ff5530d1b58a5ef9d89fcf6040556adda9cb91bb230368067 SHA512 81a3f57b5495aedbb4f305dc476b15685461347393441d2c99f59759e24655dcd615299eb8ac7af87d46887f1c7a46a072350d1e0cfdbbedd0ea2677424c0e8d
-EBUILD kube-controller-manager-1.26.2.ebuild 988 BLAKE2B c0ef8c338ce9b85ea7f875158058fb09f6946862f32983f478638842b4b30e5eb43c5f82f0799f3f47491f19fba4475e9ca29b5630ef5e0b91bc4da472951c5a SHA512 02b9a4c1b5d8d0c4eb4ce3de6a2fcf99ca6d08c3b6bd51574f717a123ffd2499d77905af5a501f32df9b06ebf12e9757d87a61942fd9bb1b8210083321311b97
+EBUILD kube-controller-manager-1.25.9.ebuild 988 BLAKE2B c0ef8c338ce9b85ea7f875158058fb09f6946862f32983f478638842b4b30e5eb43c5f82f0799f3f47491f19fba4475e9ca29b5630ef5e0b91bc4da472951c5a SHA512 02b9a4c1b5d8d0c4eb4ce3de6a2fcf99ca6d08c3b6bd51574f717a123ffd2499d77905af5a501f32df9b06ebf12e9757d87a61942fd9bb1b8210083321311b97
 EBUILD kube-controller-manager-1.26.3.ebuild 988 BLAKE2B c0ef8c338ce9b85ea7f875158058fb09f6946862f32983f478638842b4b30e5eb43c5f82f0799f3f47491f19fba4475e9ca29b5630ef5e0b91bc4da472951c5a SHA512 02b9a4c1b5d8d0c4eb4ce3de6a2fcf99ca6d08c3b6bd51574f717a123ffd2499d77905af5a501f32df9b06ebf12e9757d87a61942fd9bb1b8210083321311b97
-EBUILD kube-controller-manager-1.26.4.ebuild 989 BLAKE2B 7000dabd11b273b370c7f0b6b607962579e796d3de369f251df983f8b30a4db21e2e84fed99de11ff5530d1b58a5ef9d89fcf6040556adda9cb91bb230368067 SHA512 81a3f57b5495aedbb4f305dc476b15685461347393441d2c99f59759e24655dcd615299eb8ac7af87d46887f1c7a46a072350d1e0cfdbbedd0ea2677424c0e8d
+EBUILD kube-controller-manager-1.26.4.ebuild 988 BLAKE2B c0ef8c338ce9b85ea7f875158058fb09f6946862f32983f478638842b4b30e5eb43c5f82f0799f3f47491f19fba4475e9ca29b5630ef5e0b91bc4da472951c5a SHA512 02b9a4c1b5d8d0c4eb4ce3de6a2fcf99ca6d08c3b6bd51574f717a123ffd2499d77905af5a501f32df9b06ebf12e9757d87a61942fd9bb1b8210083321311b97
 EBUILD kube-controller-manager-1.27.1.ebuild 989 BLAKE2B fb2b9997a42d14c19b8a5a7e4c2c174b113e24f2e2f124bc2a7e65c77f41d0134e458c08b3dc333c7bb775f1e2a6142202ff54d997a74e7cfdf9c129ddef45cb SHA512 2d9dd0addd090f60b695056f82649573e1c86b97f65bd1ae85cf90265124e96ae2334fd1a01056eb7f60655baf1ab18f145c7f4257b41f3a5b3df275751db3f9
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.11.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.11.ebuild
deleted file mode 100644
index 4d4b42ffff8d..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.11.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.18.1"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.13.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.13.ebuild
index 2d00c0ea6648..4d4b42ffff8d 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.13.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.25.7.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.25.7.ebuild
deleted file mode 100644
index a5b017f18d03..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.25.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.19"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.25.9.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.25.9.ebuild
index c4863b6e8840..a5b017f18d03 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.25.9.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.25.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.26.2.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.26.2.ebuild
deleted file mode 100644
index a5b017f18d03..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.26.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.19"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.26.4.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.26.4.ebuild
index c4863b6e8840..a5b017f18d03 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.26.4.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.26.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 3b00fdb6c503..622e49188109 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,24 +1,18 @@
 AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8810268f894e3466cea4d82c7882e56d6a0bf425311adbf6a55e3e3fe351b9a1a7ce1d9e1e087018b SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
-DIST kubernetes-1.24.11.tar.gz 37867002 BLAKE2B 3972a049b1549cb1ed147763f09d20b656243814a91d701a1171c171a19721aef2b8393121160edbd75e6f11978b355ce8e97ef6e9d007634428753d7cc1499e SHA512 ceaa5ca883d208e8f80d4d2628195256df697ce5ebedf2524af7cd94ffd783c055c47797cf76f6d4893e2392b652a89f55999251feda196b96b9df4c27215adc
 DIST kubernetes-1.24.12.tar.gz 37883841 BLAKE2B 7c43ce255a647a128a74e294a1d1ad7f48063b6a4ce0da7697654dd05739c9915b45933640b041e5e0de075bbf0138175ce158e4790d531eb9d87a0823af87f9 SHA512 f171ef7ddc72f81172685061ffa1c8e4cd074d94c3185b0586485639cc9ea12c58a6d66985d7ff745da90d14f3be5d3f8a3a958135be6ba198edb1a78559e7d5
 DIST kubernetes-1.24.13.tar.gz 37889804 BLAKE2B d10f0bae7747700f2e995ea4829d219820360d92068ba8c3a656d15d411ea5892068cb925620cb506c9e171340b3f39427bc2c948dafcc3703a5668bf24163c0 SHA512 0519f2149a5ad675de2b5bfdfad1160bedc03d1b0a14280606388f526bf7558955917204604d949bcb650923016e35bad2b772220d01db55c8e463d992c12f6f
-DIST kubernetes-1.25.7.tar.gz 38169376 BLAKE2B d324e823be2efc3d19892313ed2a7daa0a3c1384f4f03e18a703f63f32609e1a594a8fd3fc49cb78330848fd42ae1d629339a967ab973e73ddff2be8c6a1eb73 SHA512 d164496df03223cab4d1754ab42f88f0e5d5cc95e1e5995442183aa739d583078c6b7ea1febdc92e2bf8b76820857cd8973d8364f452c2e576b7168a32578419
 DIST kubernetes-1.25.8.tar.gz 38188305 BLAKE2B 5c1cc06121243e54ceb42364995ac77f8d6190fb8d8f1198284120d134295c5ff660565c3ec45a416d3231c9d32bb96338c291b6373c1405aa260f5ce6601650 SHA512 30f1815de4d5bf3a091f1937c94e0e6cf0abc0f527488b72ec4a7d72c014bb8fef450abbf4c908f8a5b791e8d4ab501edb3f5c55af4e370359a952a6228362be
 DIST kubernetes-1.25.9.tar.gz 38197577 BLAKE2B f90e8e6fff4ada4b36b16623463e99de2818343c4206ada7c230799a01df189c196dc9d8f747517465606958f84b49bbf6a84d759590763ebf3079fa8e2f87c7 SHA512 6966e4246715c358ea60bd581ae9706d002d7463ab5466984a099249e8bd8aebf4929715ece255e3975a60aa4639912d0776ba86d6095438a0788517765cb61c
-DIST kubernetes-1.26.2.tar.gz 38192706 BLAKE2B ca14778ab5a1d1bdfb935d80eea269adb0414b5613d8e70b9c790711a284b79c8f89cdd22af73b9127fbf9f036b0aa317fbd97bc1df735aead0903d951fe5f4a SHA512 c14f3ba25ae3608ca8d28ab75c2f6a3636970d5851ef1c09259d6be4bce17af131f9adcc0be8e51f4197dc16650461bac8faae7b7ef24f899c1a0ad193ed0a6b
 DIST kubernetes-1.26.3.tar.gz 38215855 BLAKE2B 1bc1b4e9aeebc41e3e7a519f097b886d0cdede91f0cbbabc7c26db1c75d87220f2e8a5aa5ac85ad0c01486abd5806e74d2b09aa1a0281364b70417d3daea503e SHA512 7a8aa29ea282aec99046d231d4c6756e36ba74eca4c2300b3b1f5a1362d211ffe712957746044168b254ba7332e324e341a2e4d56be7bb6a58de953fa630ac14
 DIST kubernetes-1.26.4.tar.gz 38229656 BLAKE2B 1da5b7c380d27d57f6c6200f5b65b9a469c9d6663713742bc2f32746bad2eea17bb8265df009d625011f1e036d768e26bda514634aacc13b2997bb7c70684f3e SHA512 185d21368f84a1e1829578c7552922db098d2caecd2c1d95c5da259a107009960ef44c2dd42eec4dab50c4c59a8d5ae0b4dd45fc6f106b27138e1a1d7391626d
 DIST kubernetes-1.27.1.tar.gz 38048443 BLAKE2B c5475209ef4bcad704a6075392180496e4ec9f63af26038cb22b0f28effeab8eafe734c330c80e86d0aaabf125bec5f134cd1479ce54fd6437b3aeeaec8fb352 SHA512 20d2b8f3c892884a1abd5e30320f3cf50ada79c3b68409c6d626278e42d031e960057b042aade93b55b3185623c5bdcfef9a16602e7f3c4a71be8cee517e7ba1
-EBUILD kube-proxy-1.24.11.ebuild 905 BLAKE2B 7e89200da172e73843babec97cb9b2022d280ffbedfb295e5d280f623f26a0eaf8f29a68d1828c76c933e51c7e333ef10193612a0300bbc752be72d624161ca9 SHA512 19bb1f3e56b65de0345656c3cc82092f8f0fc97bcfa80acbdfc8fa830790b0df55d8c862e2ed41471042560a81bad7b6323d87fce631d4f3f58d8f7b54a9be7e
 EBUILD kube-proxy-1.24.12.ebuild 905 BLAKE2B 7e89200da172e73843babec97cb9b2022d280ffbedfb295e5d280f623f26a0eaf8f29a68d1828c76c933e51c7e333ef10193612a0300bbc752be72d624161ca9 SHA512 19bb1f3e56b65de0345656c3cc82092f8f0fc97bcfa80acbdfc8fa830790b0df55d8c862e2ed41471042560a81bad7b6323d87fce631d4f3f58d8f7b54a9be7e
-EBUILD kube-proxy-1.24.13.ebuild 906 BLAKE2B f942fbc27444fa5fbe4ef591a2b299423d068a588c1186acd182540f0d4b41b0c52330bf573e9e08377d818004d0407fc57c1391d7559c5ec5aaac419b7eaa9d SHA512 132a7a0356f0367cb5fb077dcd4da28ddfde21e59356b5ed05c96e0b618d11f8b7083351fa89aa0958234be5b19c53a6236085df66ca6dfea73d917a5e883868
-EBUILD kube-proxy-1.25.7.ebuild 903 BLAKE2B 1aa153095ce5f8bb28c12717c62936aac24b73b7e0780a4736c59a9c7c7a492c1c3bfc15343575bd4243c02a44ba2c73ec78fa064feed192c2410df575bae4af SHA512 cb2e2a9c28cce3b178ff30e08da842a75e8dee62c72d1243c503824ed180a31f5e27c76c885c248f2760e5ba1a7a009bf30d8706bbdbd07a609914a5b924f07d
+EBUILD kube-proxy-1.24.13.ebuild 905 BLAKE2B 7e89200da172e73843babec97cb9b2022d280ffbedfb295e5d280f623f26a0eaf8f29a68d1828c76c933e51c7e333ef10193612a0300bbc752be72d624161ca9 SHA512 19bb1f3e56b65de0345656c3cc82092f8f0fc97bcfa80acbdfc8fa830790b0df55d8c862e2ed41471042560a81bad7b6323d87fce631d4f3f58d8f7b54a9be7e
 EBUILD kube-proxy-1.25.8.ebuild 903 BLAKE2B 1aa153095ce5f8bb28c12717c62936aac24b73b7e0780a4736c59a9c7c7a492c1c3bfc15343575bd4243c02a44ba2c73ec78fa064feed192c2410df575bae4af SHA512 cb2e2a9c28cce3b178ff30e08da842a75e8dee62c72d1243c503824ed180a31f5e27c76c885c248f2760e5ba1a7a009bf30d8706bbdbd07a609914a5b924f07d
-EBUILD kube-proxy-1.25.9.ebuild 904 BLAKE2B abb12e72e4582a9d56311cfa78e81df9abce2ba772cd4f20465f18b66c0c1d1a0531fec677f06467342a5c20725f0f9fe3e5f83ef736893f15cd5bc3af85fc31 SHA512 6dba638ed80bbc7454392f06b79c056c2edbb12ed94dd46883942ecd448ad53c0e13faf56c6ea5d9be4cbf35ab935f0e062657edbe2bc2da0b2582b28dda8867
-EBUILD kube-proxy-1.26.2.ebuild 903 BLAKE2B 1aa153095ce5f8bb28c12717c62936aac24b73b7e0780a4736c59a9c7c7a492c1c3bfc15343575bd4243c02a44ba2c73ec78fa064feed192c2410df575bae4af SHA512 cb2e2a9c28cce3b178ff30e08da842a75e8dee62c72d1243c503824ed180a31f5e27c76c885c248f2760e5ba1a7a009bf30d8706bbdbd07a609914a5b924f07d
+EBUILD kube-proxy-1.25.9.ebuild 903 BLAKE2B 1aa153095ce5f8bb28c12717c62936aac24b73b7e0780a4736c59a9c7c7a492c1c3bfc15343575bd4243c02a44ba2c73ec78fa064feed192c2410df575bae4af SHA512 cb2e2a9c28cce3b178ff30e08da842a75e8dee62c72d1243c503824ed180a31f5e27c76c885c248f2760e5ba1a7a009bf30d8706bbdbd07a609914a5b924f07d
 EBUILD kube-proxy-1.26.3.ebuild 903 BLAKE2B 1aa153095ce5f8bb28c12717c62936aac24b73b7e0780a4736c59a9c7c7a492c1c3bfc15343575bd4243c02a44ba2c73ec78fa064feed192c2410df575bae4af SHA512 cb2e2a9c28cce3b178ff30e08da842a75e8dee62c72d1243c503824ed180a31f5e27c76c885c248f2760e5ba1a7a009bf30d8706bbdbd07a609914a5b924f07d
-EBUILD kube-proxy-1.26.4.ebuild 904 BLAKE2B abb12e72e4582a9d56311cfa78e81df9abce2ba772cd4f20465f18b66c0c1d1a0531fec677f06467342a5c20725f0f9fe3e5f83ef736893f15cd5bc3af85fc31 SHA512 6dba638ed80bbc7454392f06b79c056c2edbb12ed94dd46883942ecd448ad53c0e13faf56c6ea5d9be4cbf35ab935f0e062657edbe2bc2da0b2582b28dda8867
+EBUILD kube-proxy-1.26.4.ebuild 903 BLAKE2B 1aa153095ce5f8bb28c12717c62936aac24b73b7e0780a4736c59a9c7c7a492c1c3bfc15343575bd4243c02a44ba2c73ec78fa064feed192c2410df575bae4af SHA512 cb2e2a9c28cce3b178ff30e08da842a75e8dee62c72d1243c503824ed180a31f5e27c76c885c248f2760e5ba1a7a009bf30d8706bbdbd07a609914a5b924f07d
 EBUILD kube-proxy-1.27.1.ebuild 904 BLAKE2B dd6a4ee3a1feff0f1250a81af3ed98a930e3814fc6ed496c3ebb5fb6f166e7649c6934e19f96a78a9f10c8bedff2dbfe6d8bf4d4b5406372f14e417f7aaf2112 SHA512 42fa664d157356844ade5f3ef4e477abc550cc9913d647643ce59618d5a2e4d4a3a0e3cd7b57cf6d0619aa7fef26e8c83963c02a8fe8106f0ee46cc06276375e
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.24.11.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.24.11.ebuild
deleted file mode 100644
index d228a4990b81..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.24.11.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="net-firewall/conntrack-tools"
-BDEPEND=">=dev-lang/go-1.18.1"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.24.13.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.24.13.ebuild
index 0cc8ca0574f5..d228a4990b81 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.24.13.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.24.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools"
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.25.7.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.25.7.ebuild
deleted file mode 100644
index 15eeeeea2dcb..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.25.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="net-firewall/conntrack-tools"
-BDEPEND=">=dev-lang/go-1.19"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.25.9.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.25.9.ebuild
index c2bf8bb7da7f..15eeeeea2dcb 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.25.9.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.25.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools"
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.26.2.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.26.2.ebuild
deleted file mode 100644
index 15eeeeea2dcb..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.26.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="net-firewall/conntrack-tools"
-BDEPEND=">=dev-lang/go-1.19"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.26.4.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.26.4.ebuild
index c2bf8bb7da7f..15eeeeea2dcb 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.26.4.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.26.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools"
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 15ab48373b4e..39ce3e4bb1af 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -1,24 +1,18 @@
 AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c269129b483d650fd7dd63376e366825f483178c26e931db226478ce9d0b85412fc264d4d600a8232d0bac149e7 SHA512 d7326f34b26aaebf4b5c25a03abcff3bc3d397382ad4fed0f4718ee425e71399febf6fec6dc817813490671692d3f1b454fd5d14d9c47c3d41b0d3405a01a6c2
 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
-DIST kubernetes-1.24.11.tar.gz 37867002 BLAKE2B 3972a049b1549cb1ed147763f09d20b656243814a91d701a1171c171a19721aef2b8393121160edbd75e6f11978b355ce8e97ef6e9d007634428753d7cc1499e SHA512 ceaa5ca883d208e8f80d4d2628195256df697ce5ebedf2524af7cd94ffd783c055c47797cf76f6d4893e2392b652a89f55999251feda196b96b9df4c27215adc
 DIST kubernetes-1.24.12.tar.gz 37883841 BLAKE2B 7c43ce255a647a128a74e294a1d1ad7f48063b6a4ce0da7697654dd05739c9915b45933640b041e5e0de075bbf0138175ce158e4790d531eb9d87a0823af87f9 SHA512 f171ef7ddc72f81172685061ffa1c8e4cd074d94c3185b0586485639cc9ea12c58a6d66985d7ff745da90d14f3be5d3f8a3a958135be6ba198edb1a78559e7d5
 DIST kubernetes-1.24.13.tar.gz 37889804 BLAKE2B d10f0bae7747700f2e995ea4829d219820360d92068ba8c3a656d15d411ea5892068cb925620cb506c9e171340b3f39427bc2c948dafcc3703a5668bf24163c0 SHA512 0519f2149a5ad675de2b5bfdfad1160bedc03d1b0a14280606388f526bf7558955917204604d949bcb650923016e35bad2b772220d01db55c8e463d992c12f6f
-DIST kubernetes-1.25.7.tar.gz 38169376 BLAKE2B d324e823be2efc3d19892313ed2a7daa0a3c1384f4f03e18a703f63f32609e1a594a8fd3fc49cb78330848fd42ae1d629339a967ab973e73ddff2be8c6a1eb73 SHA512 d164496df03223cab4d1754ab42f88f0e5d5cc95e1e5995442183aa739d583078c6b7ea1febdc92e2bf8b76820857cd8973d8364f452c2e576b7168a32578419
 DIST kubernetes-1.25.8.tar.gz 38188305 BLAKE2B 5c1cc06121243e54ceb42364995ac77f8d6190fb8d8f1198284120d134295c5ff660565c3ec45a416d3231c9d32bb96338c291b6373c1405aa260f5ce6601650 SHA512 30f1815de4d5bf3a091f1937c94e0e6cf0abc0f527488b72ec4a7d72c014bb8fef450abbf4c908f8a5b791e8d4ab501edb3f5c55af4e370359a952a6228362be
 DIST kubernetes-1.25.9.tar.gz 38197577 BLAKE2B f90e8e6fff4ada4b36b16623463e99de2818343c4206ada7c230799a01df189c196dc9d8f747517465606958f84b49bbf6a84d759590763ebf3079fa8e2f87c7 SHA512 6966e4246715c358ea60bd581ae9706d002d7463ab5466984a099249e8bd8aebf4929715ece255e3975a60aa4639912d0776ba86d6095438a0788517765cb61c
-DIST kubernetes-1.26.2.tar.gz 38192706 BLAKE2B ca14778ab5a1d1bdfb935d80eea269adb0414b5613d8e70b9c790711a284b79c8f89cdd22af73b9127fbf9f036b0aa317fbd97bc1df735aead0903d951fe5f4a SHA512 c14f3ba25ae3608ca8d28ab75c2f6a3636970d5851ef1c09259d6be4bce17af131f9adcc0be8e51f4197dc16650461bac8faae7b7ef24f899c1a0ad193ed0a6b
 DIST kubernetes-1.26.3.tar.gz 38215855 BLAKE2B 1bc1b4e9aeebc41e3e7a519f097b886d0cdede91f0cbbabc7c26db1c75d87220f2e8a5aa5ac85ad0c01486abd5806e74d2b09aa1a0281364b70417d3daea503e SHA512 7a8aa29ea282aec99046d231d4c6756e36ba74eca4c2300b3b1f5a1362d211ffe712957746044168b254ba7332e324e341a2e4d56be7bb6a58de953fa630ac14
 DIST kubernetes-1.26.4.tar.gz 38229656 BLAKE2B 1da5b7c380d27d57f6c6200f5b65b9a469c9d6663713742bc2f32746bad2eea17bb8265df009d625011f1e036d768e26bda514634aacc13b2997bb7c70684f3e SHA512 185d21368f84a1e1829578c7552922db098d2caecd2c1d95c5da259a107009960ef44c2dd42eec4dab50c4c59a8d5ae0b4dd45fc6f106b27138e1a1d7391626d
 DIST kubernetes-1.27.1.tar.gz 38048443 BLAKE2B c5475209ef4bcad704a6075392180496e4ec9f63af26038cb22b0f28effeab8eafe734c330c80e86d0aaabf125bec5f134cd1479ce54fd6437b3aeeaec8fb352 SHA512 20d2b8f3c892884a1abd5e30320f3cf50ada79c3b68409c6d626278e42d031e960057b042aade93b55b3185623c5bdcfef9a16602e7f3c4a71be8cee517e7ba1
-EBUILD kube-scheduler-1.24.11.ebuild 963 BLAKE2B fafedf71e3dd0935060f9dfba79dab3daaeb4931e24eeb90b054ba734ad0d0709c984a9705ac3582e0b2b94120dca7da6ce237c2e4dcef90e95dcc39350c9867 SHA512 d1ff91ec5189ca994d09074cd0bb8208bb704ed595fcf9d7ee4a1d3a2d8176c184dab79afdbd902728949f0ef98acde2f0c2b2de548c671bd077bbfdf1545b0f
 EBUILD kube-scheduler-1.24.12.ebuild 963 BLAKE2B fafedf71e3dd0935060f9dfba79dab3daaeb4931e24eeb90b054ba734ad0d0709c984a9705ac3582e0b2b94120dca7da6ce237c2e4dcef90e95dcc39350c9867 SHA512 d1ff91ec5189ca994d09074cd0bb8208bb704ed595fcf9d7ee4a1d3a2d8176c184dab79afdbd902728949f0ef98acde2f0c2b2de548c671bd077bbfdf1545b0f
-EBUILD kube-scheduler-1.24.13.ebuild 964 BLAKE2B 6ebf9d3cc795d291f681e03b787513afea79b283691d6e0bcebaf60c6c8be51a0bb583731ef9ed5a24bfbd8abf527c24124957f25b16f17365c7a4c3ffeeef99 SHA512 a3628ce8b65ab4baa01d60bccd75a8d4a272fcf8c137bd10f3e63e8bc155ba0028449dd170dafc65a4b37d136248494f979f604e037787c1bea0ce2c4bae5241
-EBUILD kube-scheduler-1.25.7.ebuild 961 BLAKE2B 1bf7855312c5044b5ea261baf2f35689b20e5009609e9a57b85aeaab0704502c152652128206c1e938f32f6b8171d1f639eb5e84956949142954963182540d97 SHA512 deab86ef065c7c468bacac9587f44fdefca43a44d7a5badea823d512ad74e90b960d607ea2deb943cf7335479b46ffe1ab5b3262b8f97f52935dcab6060d5976
+EBUILD kube-scheduler-1.24.13.ebuild 963 BLAKE2B fafedf71e3dd0935060f9dfba79dab3daaeb4931e24eeb90b054ba734ad0d0709c984a9705ac3582e0b2b94120dca7da6ce237c2e4dcef90e95dcc39350c9867 SHA512 d1ff91ec5189ca994d09074cd0bb8208bb704ed595fcf9d7ee4a1d3a2d8176c184dab79afdbd902728949f0ef98acde2f0c2b2de548c671bd077bbfdf1545b0f
 EBUILD kube-scheduler-1.25.8.ebuild 961 BLAKE2B 1bf7855312c5044b5ea261baf2f35689b20e5009609e9a57b85aeaab0704502c152652128206c1e938f32f6b8171d1f639eb5e84956949142954963182540d97 SHA512 deab86ef065c7c468bacac9587f44fdefca43a44d7a5badea823d512ad74e90b960d607ea2deb943cf7335479b46ffe1ab5b3262b8f97f52935dcab6060d5976
-EBUILD kube-scheduler-1.25.9.ebuild 962 BLAKE2B a2e246d283872bb91cf2db3ed38d5758d244a6b48fb2815b732659dc9132a04920d3349bda2828dd508ac00770e15655494e2e35c837ee890a1b124e238b2216 SHA512 8550424b4a34bcd3207de78e045b6c63b6859d8910b578a84f01b0d1b1c40c5fec79f770ee92685e660807422380bfdaf25c25310e9a3af24c45f46bbba3a1ef
-EBUILD kube-scheduler-1.26.2.ebuild 961 BLAKE2B 1bf7855312c5044b5ea261baf2f35689b20e5009609e9a57b85aeaab0704502c152652128206c1e938f32f6b8171d1f639eb5e84956949142954963182540d97 SHA512 deab86ef065c7c468bacac9587f44fdefca43a44d7a5badea823d512ad74e90b960d607ea2deb943cf7335479b46ffe1ab5b3262b8f97f52935dcab6060d5976
+EBUILD kube-scheduler-1.25.9.ebuild 961 BLAKE2B 1bf7855312c5044b5ea261baf2f35689b20e5009609e9a57b85aeaab0704502c152652128206c1e938f32f6b8171d1f639eb5e84956949142954963182540d97 SHA512 deab86ef065c7c468bacac9587f44fdefca43a44d7a5badea823d512ad74e90b960d607ea2deb943cf7335479b46ffe1ab5b3262b8f97f52935dcab6060d5976
 EBUILD kube-scheduler-1.26.3.ebuild 961 BLAKE2B 1bf7855312c5044b5ea261baf2f35689b20e5009609e9a57b85aeaab0704502c152652128206c1e938f32f6b8171d1f639eb5e84956949142954963182540d97 SHA512 deab86ef065c7c468bacac9587f44fdefca43a44d7a5badea823d512ad74e90b960d607ea2deb943cf7335479b46ffe1ab5b3262b8f97f52935dcab6060d5976
-EBUILD kube-scheduler-1.26.4.ebuild 962 BLAKE2B a2e246d283872bb91cf2db3ed38d5758d244a6b48fb2815b732659dc9132a04920d3349bda2828dd508ac00770e15655494e2e35c837ee890a1b124e238b2216 SHA512 8550424b4a34bcd3207de78e045b6c63b6859d8910b578a84f01b0d1b1c40c5fec79f770ee92685e660807422380bfdaf25c25310e9a3af24c45f46bbba3a1ef
+EBUILD kube-scheduler-1.26.4.ebuild 961 BLAKE2B 1bf7855312c5044b5ea261baf2f35689b20e5009609e9a57b85aeaab0704502c152652128206c1e938f32f6b8171d1f639eb5e84956949142954963182540d97 SHA512 deab86ef065c7c468bacac9587f44fdefca43a44d7a5badea823d512ad74e90b960d607ea2deb943cf7335479b46ffe1ab5b3262b8f97f52935dcab6060d5976
 EBUILD kube-scheduler-1.27.1.ebuild 962 BLAKE2B 40d3f7dff63e91693048e534600ce3147608761d50e50a31c37929b2977fc5f8bef3b2e3561315c821ea51f3366bd4ffc2f16fe5f1bbf9e10892b2d9c4b9ca1c SHA512 85680650665c5ef1ac0092e6ec0071513d9017779ab7275d1b80d2aa78c6d905ad928f26d7f36b2ed4524f84b47ce68fcbe79a53096ff3159cb2304fdd266b5e
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.24.11.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.24.11.ebuild
deleted file mode 100644
index 25f887df0345..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.24.11.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.18.1"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.24.13.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.24.13.ebuild
index 4d29f574fe61..25f887df0345 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.24.13.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.24.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.25.7.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.25.7.ebuild
deleted file mode 100644
index 524876afc4d5..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.25.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.19"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.25.9.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.25.9.ebuild
index b9b95df178b2..524876afc4d5 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.25.9.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.25.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.26.2.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.26.2.ebuild
deleted file mode 100644
index 524876afc4d5..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.26.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.19"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.26.4.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.26.4.ebuild
index b9b95df178b2..524876afc4d5 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.26.4.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.26.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 2d6a29051865..134ed081a7ea 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,21 +1,15 @@
-DIST kubernetes-1.24.11.tar.gz 37867002 BLAKE2B 3972a049b1549cb1ed147763f09d20b656243814a91d701a1171c171a19721aef2b8393121160edbd75e6f11978b355ce8e97ef6e9d007634428753d7cc1499e SHA512 ceaa5ca883d208e8f80d4d2628195256df697ce5ebedf2524af7cd94ffd783c055c47797cf76f6d4893e2392b652a89f55999251feda196b96b9df4c27215adc
 DIST kubernetes-1.24.12.tar.gz 37883841 BLAKE2B 7c43ce255a647a128a74e294a1d1ad7f48063b6a4ce0da7697654dd05739c9915b45933640b041e5e0de075bbf0138175ce158e4790d531eb9d87a0823af87f9 SHA512 f171ef7ddc72f81172685061ffa1c8e4cd074d94c3185b0586485639cc9ea12c58a6d66985d7ff745da90d14f3be5d3f8a3a958135be6ba198edb1a78559e7d5
 DIST kubernetes-1.24.13.tar.gz 37889804 BLAKE2B d10f0bae7747700f2e995ea4829d219820360d92068ba8c3a656d15d411ea5892068cb925620cb506c9e171340b3f39427bc2c948dafcc3703a5668bf24163c0 SHA512 0519f2149a5ad675de2b5bfdfad1160bedc03d1b0a14280606388f526bf7558955917204604d949bcb650923016e35bad2b772220d01db55c8e463d992c12f6f
-DIST kubernetes-1.25.7.tar.gz 38169376 BLAKE2B d324e823be2efc3d19892313ed2a7daa0a3c1384f4f03e18a703f63f32609e1a594a8fd3fc49cb78330848fd42ae1d629339a967ab973e73ddff2be8c6a1eb73 SHA512 d164496df03223cab4d1754ab42f88f0e5d5cc95e1e5995442183aa739d583078c6b7ea1febdc92e2bf8b76820857cd8973d8364f452c2e576b7168a32578419
 DIST kubernetes-1.25.8.tar.gz 38188305 BLAKE2B 5c1cc06121243e54ceb42364995ac77f8d6190fb8d8f1198284120d134295c5ff660565c3ec45a416d3231c9d32bb96338c291b6373c1405aa260f5ce6601650 SHA512 30f1815de4d5bf3a091f1937c94e0e6cf0abc0f527488b72ec4a7d72c014bb8fef450abbf4c908f8a5b791e8d4ab501edb3f5c55af4e370359a952a6228362be
 DIST kubernetes-1.25.9.tar.gz 38197577 BLAKE2B f90e8e6fff4ada4b36b16623463e99de2818343c4206ada7c230799a01df189c196dc9d8f747517465606958f84b49bbf6a84d759590763ebf3079fa8e2f87c7 SHA512 6966e4246715c358ea60bd581ae9706d002d7463ab5466984a099249e8bd8aebf4929715ece255e3975a60aa4639912d0776ba86d6095438a0788517765cb61c
-DIST kubernetes-1.26.2.tar.gz 38192706 BLAKE2B ca14778ab5a1d1bdfb935d80eea269adb0414b5613d8e70b9c790711a284b79c8f89cdd22af73b9127fbf9f036b0aa317fbd97bc1df735aead0903d951fe5f4a SHA512 c14f3ba25ae3608ca8d28ab75c2f6a3636970d5851ef1c09259d6be4bce17af131f9adcc0be8e51f4197dc16650461bac8faae7b7ef24f899c1a0ad193ed0a6b
 DIST kubernetes-1.26.3.tar.gz 38215855 BLAKE2B 1bc1b4e9aeebc41e3e7a519f097b886d0cdede91f0cbbabc7c26db1c75d87220f2e8a5aa5ac85ad0c01486abd5806e74d2b09aa1a0281364b70417d3daea503e SHA512 7a8aa29ea282aec99046d231d4c6756e36ba74eca4c2300b3b1f5a1362d211ffe712957746044168b254ba7332e324e341a2e4d56be7bb6a58de953fa630ac14
 DIST kubernetes-1.26.4.tar.gz 38229656 BLAKE2B 1da5b7c380d27d57f6c6200f5b65b9a469c9d6663713742bc2f32746bad2eea17bb8265df009d625011f1e036d768e26bda514634aacc13b2997bb7c70684f3e SHA512 185d21368f84a1e1829578c7552922db098d2caecd2c1d95c5da259a107009960ef44c2dd42eec4dab50c4c59a8d5ae0b4dd45fc6f106b27138e1a1d7391626d
 DIST kubernetes-1.27.1.tar.gz 38048443 BLAKE2B c5475209ef4bcad704a6075392180496e4ec9f63af26038cb22b0f28effeab8eafe734c330c80e86d0aaabf125bec5f134cd1479ce54fd6437b3aeeaec8fb352 SHA512 20d2b8f3c892884a1abd5e30320f3cf50ada79c3b68409c6d626278e42d031e960057b042aade93b55b3185623c5bdcfef9a16602e7f3c4a71be8cee517e7ba1
-EBUILD kubeadm-1.24.11.ebuild 966 BLAKE2B db15d79a99cda7d4af9bc1e0ddbf91e17d2f94db50e62e60f45ed4b15ae70ccb8efee7df7b1f2aacce9a5bc7a60f58b852300b2eb80d44a5d28985a4bd223916 SHA512 58f98a1dd45ede91842e09d53d5f8c9c1c98f11e531b22db61abe3abfba4c2b005f255cf0fae6963546caf582dcaee7c9c0afc1ac585025c9cbe46d0a7337bc8
 EBUILD kubeadm-1.24.12.ebuild 966 BLAKE2B db15d79a99cda7d4af9bc1e0ddbf91e17d2f94db50e62e60f45ed4b15ae70ccb8efee7df7b1f2aacce9a5bc7a60f58b852300b2eb80d44a5d28985a4bd223916 SHA512 58f98a1dd45ede91842e09d53d5f8c9c1c98f11e531b22db61abe3abfba4c2b005f255cf0fae6963546caf582dcaee7c9c0afc1ac585025c9cbe46d0a7337bc8
-EBUILD kubeadm-1.24.13.ebuild 967 BLAKE2B de2052aa407f8dcb0f6ae01710bd880bcb848ec1199ecd72ec04f087df013d75ec122687b16a731274870458966bab2eb0064f46677dd47eaeabde2568bcfd7d SHA512 ba64e4f6be6ef92275f7f6dcc6d57c7349e41cef182a940c0c979a51245a440086c9437f74d20c71cf0f64d924b1d46b6a09f08a1451a20080458c52609ea130
-EBUILD kubeadm-1.25.7.ebuild 964 BLAKE2B 98417244686292bceab7268358757606d233d5b17f1cff311969993ee9f7a78c80449dd0bc3a22e08eabba9fa1a9e9865edfaaa158103dc7df9211a60a3b8ee3 SHA512 9f7348c3c1a7a1f16a523af7243b08570102e953c692aed930ecbfd2307577eb2f0cb61f3df6dfb5ab79fd162bad6c1f2b430ac6d1ba013d2b1f05c5c6e31e79
+EBUILD kubeadm-1.24.13.ebuild 966 BLAKE2B db15d79a99cda7d4af9bc1e0ddbf91e17d2f94db50e62e60f45ed4b15ae70ccb8efee7df7b1f2aacce9a5bc7a60f58b852300b2eb80d44a5d28985a4bd223916 SHA512 58f98a1dd45ede91842e09d53d5f8c9c1c98f11e531b22db61abe3abfba4c2b005f255cf0fae6963546caf582dcaee7c9c0afc1ac585025c9cbe46d0a7337bc8
 EBUILD kubeadm-1.25.8.ebuild 964 BLAKE2B 98417244686292bceab7268358757606d233d5b17f1cff311969993ee9f7a78c80449dd0bc3a22e08eabba9fa1a9e9865edfaaa158103dc7df9211a60a3b8ee3 SHA512 9f7348c3c1a7a1f16a523af7243b08570102e953c692aed930ecbfd2307577eb2f0cb61f3df6dfb5ab79fd162bad6c1f2b430ac6d1ba013d2b1f05c5c6e31e79
-EBUILD kubeadm-1.25.9.ebuild 965 BLAKE2B c7e336fce62d7c2d996efd34456f6bde2eaad7cec7a87e07cb6d565791f69d138c04c9d4f0f30ec1a144024ee7ec0b788b66fb2189c08df6053274ab18afb9c9 SHA512 169e04f793eebc40f6d4427c2d0f7698b1ac9c3002172e70750c27fc27f81ea310d3ab7818abe093b02c283ba47061725c40855d58af86e8c0f682d92a8d019d
-EBUILD kubeadm-1.26.2.ebuild 964 BLAKE2B 98417244686292bceab7268358757606d233d5b17f1cff311969993ee9f7a78c80449dd0bc3a22e08eabba9fa1a9e9865edfaaa158103dc7df9211a60a3b8ee3 SHA512 9f7348c3c1a7a1f16a523af7243b08570102e953c692aed930ecbfd2307577eb2f0cb61f3df6dfb5ab79fd162bad6c1f2b430ac6d1ba013d2b1f05c5c6e31e79
+EBUILD kubeadm-1.25.9.ebuild 964 BLAKE2B 98417244686292bceab7268358757606d233d5b17f1cff311969993ee9f7a78c80449dd0bc3a22e08eabba9fa1a9e9865edfaaa158103dc7df9211a60a3b8ee3 SHA512 9f7348c3c1a7a1f16a523af7243b08570102e953c692aed930ecbfd2307577eb2f0cb61f3df6dfb5ab79fd162bad6c1f2b430ac6d1ba013d2b1f05c5c6e31e79
 EBUILD kubeadm-1.26.3.ebuild 964 BLAKE2B 98417244686292bceab7268358757606d233d5b17f1cff311969993ee9f7a78c80449dd0bc3a22e08eabba9fa1a9e9865edfaaa158103dc7df9211a60a3b8ee3 SHA512 9f7348c3c1a7a1f16a523af7243b08570102e953c692aed930ecbfd2307577eb2f0cb61f3df6dfb5ab79fd162bad6c1f2b430ac6d1ba013d2b1f05c5c6e31e79
-EBUILD kubeadm-1.26.4.ebuild 965 BLAKE2B c7e336fce62d7c2d996efd34456f6bde2eaad7cec7a87e07cb6d565791f69d138c04c9d4f0f30ec1a144024ee7ec0b788b66fb2189c08df6053274ab18afb9c9 SHA512 169e04f793eebc40f6d4427c2d0f7698b1ac9c3002172e70750c27fc27f81ea310d3ab7818abe093b02c283ba47061725c40855d58af86e8c0f682d92a8d019d
+EBUILD kubeadm-1.26.4.ebuild 964 BLAKE2B 98417244686292bceab7268358757606d233d5b17f1cff311969993ee9f7a78c80449dd0bc3a22e08eabba9fa1a9e9865edfaaa158103dc7df9211a60a3b8ee3 SHA512 9f7348c3c1a7a1f16a523af7243b08570102e953c692aed930ecbfd2307577eb2f0cb61f3df6dfb5ab79fd162bad6c1f2b430ac6d1ba013d2b1f05c5c6e31e79
 EBUILD kubeadm-1.27.1.ebuild 965 BLAKE2B b01c28f2f677fd2741a8ec1686b25ced5f4617178f6cdbac60c0f8221d42e4cb2955e3f2b3b29d15e2ee0b424c7ead4d1ae1e6001170a581bd982ba656796166 SHA512 1f512b75f72f3872144a22db7a8bc0fafd942d69ba35615c3ac83f2eea5f14bd9f5ea2400873095fd229d80955a45ac65092d18d39331b8c709814018dbc3207
 MISC metadata.xml 918 BLAKE2B 487a711e9aebe9d4d8f2c3a03664990aa544a4c0b969dbb60d10ebf42ca64cb9b21f822f92e774f3a813b409d5df905c8ecf02f186218f925a69f70b2960d53c SHA512 392d1cdf4179bc2aa14598e41e38e364518f0c71c34d61280729ae2cdab37c247112b48fcea58c792f6f7148e3979dfbff174bac3a3a00b7084168332112f5d3
diff --git a/sys-cluster/kubeadm/kubeadm-1.24.11.ebuild b/sys-cluster/kubeadm/kubeadm-1.24.11.ebuild
deleted file mode 100644
index 75b9826b1578..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.24.11.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened selinux"
-
-BDEPEND=">=dev-lang/go-1.18.1"
-RDEPEND="app-containers/cri-tools
-	selinux? ( sec-policy/selinux-kubernetes )"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.24.13.ebuild b/sys-cluster/kubeadm/kubeadm-1.24.13.ebuild
index 9d1d7af21421..75b9826b1578 100644
--- a/sys-cluster/kubeadm/kubeadm-1.24.13.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.24.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened selinux"
 
 BDEPEND=">=dev-lang/go-1.18.1"
diff --git a/sys-cluster/kubeadm/kubeadm-1.25.7.ebuild b/sys-cluster/kubeadm/kubeadm-1.25.7.ebuild
deleted file mode 100644
index c428b054727b..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.25.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened selinux"
-
-BDEPEND=">=dev-lang/go-1.19"
-RDEPEND="app-containers/cri-tools
-	selinux? ( sec-policy/selinux-kubernetes )"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.25.9.ebuild b/sys-cluster/kubeadm/kubeadm-1.25.9.ebuild
index f9b83313a772..c428b054727b 100644
--- a/sys-cluster/kubeadm/kubeadm-1.25.9.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.25.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened selinux"
 
 BDEPEND=">=dev-lang/go-1.19"
diff --git a/sys-cluster/kubeadm/kubeadm-1.26.2.ebuild b/sys-cluster/kubeadm/kubeadm-1.26.2.ebuild
deleted file mode 100644
index c428b054727b..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.26.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened selinux"
-
-BDEPEND=">=dev-lang/go-1.19"
-RDEPEND="app-containers/cri-tools
-	selinux? ( sec-policy/selinux-kubernetes )"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.26.4.ebuild b/sys-cluster/kubeadm/kubeadm-1.26.4.ebuild
index f9b83313a772..c428b054727b 100644
--- a/sys-cluster/kubeadm/kubeadm-1.26.4.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.26.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened selinux"
 
 BDEPEND=">=dev-lang/go-1.19"
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 353866d85023..5312a4e1f273 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,21 +1,15 @@
-DIST kubernetes-1.24.11.tar.gz 37867002 BLAKE2B 3972a049b1549cb1ed147763f09d20b656243814a91d701a1171c171a19721aef2b8393121160edbd75e6f11978b355ce8e97ef6e9d007634428753d7cc1499e SHA512 ceaa5ca883d208e8f80d4d2628195256df697ce5ebedf2524af7cd94ffd783c055c47797cf76f6d4893e2392b652a89f55999251feda196b96b9df4c27215adc
 DIST kubernetes-1.24.12.tar.gz 37883841 BLAKE2B 7c43ce255a647a128a74e294a1d1ad7f48063b6a4ce0da7697654dd05739c9915b45933640b041e5e0de075bbf0138175ce158e4790d531eb9d87a0823af87f9 SHA512 f171ef7ddc72f81172685061ffa1c8e4cd074d94c3185b0586485639cc9ea12c58a6d66985d7ff745da90d14f3be5d3f8a3a958135be6ba198edb1a78559e7d5
 DIST kubernetes-1.24.13.tar.gz 37889804 BLAKE2B d10f0bae7747700f2e995ea4829d219820360d92068ba8c3a656d15d411ea5892068cb925620cb506c9e171340b3f39427bc2c948dafcc3703a5668bf24163c0 SHA512 0519f2149a5ad675de2b5bfdfad1160bedc03d1b0a14280606388f526bf7558955917204604d949bcb650923016e35bad2b772220d01db55c8e463d992c12f6f
-DIST kubernetes-1.25.7.tar.gz 38169376 BLAKE2B d324e823be2efc3d19892313ed2a7daa0a3c1384f4f03e18a703f63f32609e1a594a8fd3fc49cb78330848fd42ae1d629339a967ab973e73ddff2be8c6a1eb73 SHA512 d164496df03223cab4d1754ab42f88f0e5d5cc95e1e5995442183aa739d583078c6b7ea1febdc92e2bf8b76820857cd8973d8364f452c2e576b7168a32578419
 DIST kubernetes-1.25.8.tar.gz 38188305 BLAKE2B 5c1cc06121243e54ceb42364995ac77f8d6190fb8d8f1198284120d134295c5ff660565c3ec45a416d3231c9d32bb96338c291b6373c1405aa260f5ce6601650 SHA512 30f1815de4d5bf3a091f1937c94e0e6cf0abc0f527488b72ec4a7d72c014bb8fef450abbf4c908f8a5b791e8d4ab501edb3f5c55af4e370359a952a6228362be
 DIST kubernetes-1.25.9.tar.gz 38197577 BLAKE2B f90e8e6fff4ada4b36b16623463e99de2818343c4206ada7c230799a01df189c196dc9d8f747517465606958f84b49bbf6a84d759590763ebf3079fa8e2f87c7 SHA512 6966e4246715c358ea60bd581ae9706d002d7463ab5466984a099249e8bd8aebf4929715ece255e3975a60aa4639912d0776ba86d6095438a0788517765cb61c
-DIST kubernetes-1.26.2.tar.gz 38192706 BLAKE2B ca14778ab5a1d1bdfb935d80eea269adb0414b5613d8e70b9c790711a284b79c8f89cdd22af73b9127fbf9f036b0aa317fbd97bc1df735aead0903d951fe5f4a SHA512 c14f3ba25ae3608ca8d28ab75c2f6a3636970d5851ef1c09259d6be4bce17af131f9adcc0be8e51f4197dc16650461bac8faae7b7ef24f899c1a0ad193ed0a6b
 DIST kubernetes-1.26.3.tar.gz 38215855 BLAKE2B 1bc1b4e9aeebc41e3e7a519f097b886d0cdede91f0cbbabc7c26db1c75d87220f2e8a5aa5ac85ad0c01486abd5806e74d2b09aa1a0281364b70417d3daea503e SHA512 7a8aa29ea282aec99046d231d4c6756e36ba74eca4c2300b3b1f5a1362d211ffe712957746044168b254ba7332e324e341a2e4d56be7bb6a58de953fa630ac14
 DIST kubernetes-1.26.4.tar.gz 38229656 BLAKE2B 1da5b7c380d27d57f6c6200f5b65b9a469c9d6663713742bc2f32746bad2eea17bb8265df009d625011f1e036d768e26bda514634aacc13b2997bb7c70684f3e SHA512 185d21368f84a1e1829578c7552922db098d2caecd2c1d95c5da259a107009960ef44c2dd42eec4dab50c4c59a8d5ae0b4dd45fc6f106b27138e1a1d7391626d
 DIST kubernetes-1.27.1.tar.gz 38048443 BLAKE2B c5475209ef4bcad704a6075392180496e4ec9f63af26038cb22b0f28effeab8eafe734c330c80e86d0aaabf125bec5f134cd1479ce54fd6437b3aeeaec8fb352 SHA512 20d2b8f3c892884a1abd5e30320f3cf50ada79c3b68409c6d626278e42d031e960057b042aade93b55b3185623c5bdcfef9a16602e7f3c4a71be8cee517e7ba1
-EBUILD kubectl-1.24.11.ebuild 875 BLAKE2B 562c1b24345307c6ad28ddc28a12b75b7a46b2f19906fa58c9a8898d286cecd402fd71148453583603f58c4bd534111bd492234090d1539ec4c4340b3c42092b SHA512 8e0c708f7fa34b4d4ce68af1f1c88e53fdd54875aca71b79c7af9c00a08f2b29ddb302a3159ee5b6975400b7fc4f51ac3b9e33b3e34fdce66f9f36e1b4ae7e30
 EBUILD kubectl-1.24.12.ebuild 875 BLAKE2B 562c1b24345307c6ad28ddc28a12b75b7a46b2f19906fa58c9a8898d286cecd402fd71148453583603f58c4bd534111bd492234090d1539ec4c4340b3c42092b SHA512 8e0c708f7fa34b4d4ce68af1f1c88e53fdd54875aca71b79c7af9c00a08f2b29ddb302a3159ee5b6975400b7fc4f51ac3b9e33b3e34fdce66f9f36e1b4ae7e30
-EBUILD kubectl-1.24.13.ebuild 876 BLAKE2B c21d5dd586fddc8853b2ad9349fcaf09074b35158ad280280f757660cca4723e172f1a476bfc1d7a241d01c39d076728b21af7e84c687b104b6755b7baabfa46 SHA512 6d38e9df2b65cabbeb8aa8b634271dec571ddf729629b3724a6a8a85e433494ba725e06fda1052be02a4e06dbe0da0d26b82f2a600698815e62c839cad062bbb
-EBUILD kubectl-1.25.7.ebuild 873 BLAKE2B b4e63afdf9235f8890d11764f0779540685f007f4a5a1db4c319a8a66d6308549fa764624d99170088c7f82fab9e82173f04f18303b33272bbbc08764be86738 SHA512 9931017dc27ff974a94bff3ee60b3741e24bac819a38ead32d68d96ff08a04a113b22752f9f4076f7b850f7f3c0ca1790c362b89c31963e07617241c1903f602
+EBUILD kubectl-1.24.13.ebuild 875 BLAKE2B 562c1b24345307c6ad28ddc28a12b75b7a46b2f19906fa58c9a8898d286cecd402fd71148453583603f58c4bd534111bd492234090d1539ec4c4340b3c42092b SHA512 8e0c708f7fa34b4d4ce68af1f1c88e53fdd54875aca71b79c7af9c00a08f2b29ddb302a3159ee5b6975400b7fc4f51ac3b9e33b3e34fdce66f9f36e1b4ae7e30
 EBUILD kubectl-1.25.8.ebuild 873 BLAKE2B b4e63afdf9235f8890d11764f0779540685f007f4a5a1db4c319a8a66d6308549fa764624d99170088c7f82fab9e82173f04f18303b33272bbbc08764be86738 SHA512 9931017dc27ff974a94bff3ee60b3741e24bac819a38ead32d68d96ff08a04a113b22752f9f4076f7b850f7f3c0ca1790c362b89c31963e07617241c1903f602
-EBUILD kubectl-1.25.9.ebuild 874 BLAKE2B eadc263a13607118043c218d4d69d8e2c6a01c19719358af019dfe15ca396b2bc8e1be4e49855ffbc6f4cd9eb43f5bd7c9d8e60ed45d85ade7c833e04008e30d SHA512 8d82593d7820ae864a3db4f64b139ffac451793a51eb8939901acdaf20f3c0c72b712314fc12c52cfe29556fbf98efc77c5f3a5dfcd09415bbd7152f01f0e923
-EBUILD kubectl-1.26.2.ebuild 873 BLAKE2B b4e63afdf9235f8890d11764f0779540685f007f4a5a1db4c319a8a66d6308549fa764624d99170088c7f82fab9e82173f04f18303b33272bbbc08764be86738 SHA512 9931017dc27ff974a94bff3ee60b3741e24bac819a38ead32d68d96ff08a04a113b22752f9f4076f7b850f7f3c0ca1790c362b89c31963e07617241c1903f602
+EBUILD kubectl-1.25.9.ebuild 873 BLAKE2B b4e63afdf9235f8890d11764f0779540685f007f4a5a1db4c319a8a66d6308549fa764624d99170088c7f82fab9e82173f04f18303b33272bbbc08764be86738 SHA512 9931017dc27ff974a94bff3ee60b3741e24bac819a38ead32d68d96ff08a04a113b22752f9f4076f7b850f7f3c0ca1790c362b89c31963e07617241c1903f602
 EBUILD kubectl-1.26.3.ebuild 873 BLAKE2B b4e63afdf9235f8890d11764f0779540685f007f4a5a1db4c319a8a66d6308549fa764624d99170088c7f82fab9e82173f04f18303b33272bbbc08764be86738 SHA512 9931017dc27ff974a94bff3ee60b3741e24bac819a38ead32d68d96ff08a04a113b22752f9f4076f7b850f7f3c0ca1790c362b89c31963e07617241c1903f602
-EBUILD kubectl-1.26.4.ebuild 874 BLAKE2B eadc263a13607118043c218d4d69d8e2c6a01c19719358af019dfe15ca396b2bc8e1be4e49855ffbc6f4cd9eb43f5bd7c9d8e60ed45d85ade7c833e04008e30d SHA512 8d82593d7820ae864a3db4f64b139ffac451793a51eb8939901acdaf20f3c0c72b712314fc12c52cfe29556fbf98efc77c5f3a5dfcd09415bbd7152f01f0e923
+EBUILD kubectl-1.26.4.ebuild 873 BLAKE2B b4e63afdf9235f8890d11764f0779540685f007f4a5a1db4c319a8a66d6308549fa764624d99170088c7f82fab9e82173f04f18303b33272bbbc08764be86738 SHA512 9931017dc27ff974a94bff3ee60b3741e24bac819a38ead32d68d96ff08a04a113b22752f9f4076f7b850f7f3c0ca1790c362b89c31963e07617241c1903f602
 EBUILD kubectl-1.27.1.ebuild 874 BLAKE2B b131bf977a6af040012cb71c43578ec1d0d2cb7183f1e03778c59aef3c0186bc5055f382cebddd19c5878035503a081277bf19abedaff5e7cbdf595810f232bc SHA512 c48ab0fdaed8d0b742879ac963dc40bfe92d0607d2a507b68edd25cc35bcbc0d6ebadd1f48112b31d3d263b8c9f21072d06f4b8c32b00a1941df5ca7ef8ec82b
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kubectl/kubectl-1.24.11.ebuild b/sys-cluster/kubectl/kubectl-1.24.11.ebuild
deleted file mode 100644
index f5eaa1f9ddd8..000000000000
--- a/sys-cluster/kubectl/kubectl-1.24.11.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-BDEPEND=">=dev-lang/go-1.18.1"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/kubectl-1.24.13.ebuild b/sys-cluster/kubectl/kubectl-1.24.13.ebuild
index cb0239165ac7..f5eaa1f9ddd8 100644
--- a/sys-cluster/kubectl/kubectl-1.24.13.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.24.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.18.1"
diff --git a/sys-cluster/kubectl/kubectl-1.25.7.ebuild b/sys-cluster/kubectl/kubectl-1.25.7.ebuild
deleted file mode 100644
index da2fb28a9977..000000000000
--- a/sys-cluster/kubectl/kubectl-1.25.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-BDEPEND=">=dev-lang/go-1.19"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/kubectl-1.25.9.ebuild b/sys-cluster/kubectl/kubectl-1.25.9.ebuild
index 0a6d3b7c65b8..da2fb28a9977 100644
--- a/sys-cluster/kubectl/kubectl-1.25.9.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.25.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.19"
diff --git a/sys-cluster/kubectl/kubectl-1.26.2.ebuild b/sys-cluster/kubectl/kubectl-1.26.2.ebuild
deleted file mode 100644
index da2fb28a9977..000000000000
--- a/sys-cluster/kubectl/kubectl-1.26.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-BDEPEND=">=dev-lang/go-1.19"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/kubectl-1.26.4.ebuild b/sys-cluster/kubectl/kubectl-1.26.4.ebuild
index 0a6d3b7c65b8..da2fb28a9977 100644
--- a/sys-cluster/kubectl/kubectl-1.26.4.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.26.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.19"
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index d19e5228f0c1..e6774f49aaf8 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -3,24 +3,18 @@ AUX kubelet.env 547 BLAKE2B db9144a0e155450f08a665700edbb05f3fa093d209f72320fdbc
 AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a00585489864c262d90ad8347763753f99eccec6fe6670c6fa016674dee4dea0fa838991abb503db97bd983a SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
-DIST kubernetes-1.24.11.tar.gz 37867002 BLAKE2B 3972a049b1549cb1ed147763f09d20b656243814a91d701a1171c171a19721aef2b8393121160edbd75e6f11978b355ce8e97ef6e9d007634428753d7cc1499e SHA512 ceaa5ca883d208e8f80d4d2628195256df697ce5ebedf2524af7cd94ffd783c055c47797cf76f6d4893e2392b652a89f55999251feda196b96b9df4c27215adc
 DIST kubernetes-1.24.12.tar.gz 37883841 BLAKE2B 7c43ce255a647a128a74e294a1d1ad7f48063b6a4ce0da7697654dd05739c9915b45933640b041e5e0de075bbf0138175ce158e4790d531eb9d87a0823af87f9 SHA512 f171ef7ddc72f81172685061ffa1c8e4cd074d94c3185b0586485639cc9ea12c58a6d66985d7ff745da90d14f3be5d3f8a3a958135be6ba198edb1a78559e7d5
 DIST kubernetes-1.24.13.tar.gz 37889804 BLAKE2B d10f0bae7747700f2e995ea4829d219820360d92068ba8c3a656d15d411ea5892068cb925620cb506c9e171340b3f39427bc2c948dafcc3703a5668bf24163c0 SHA512 0519f2149a5ad675de2b5bfdfad1160bedc03d1b0a14280606388f526bf7558955917204604d949bcb650923016e35bad2b772220d01db55c8e463d992c12f6f
-DIST kubernetes-1.25.7.tar.gz 38169376 BLAKE2B d324e823be2efc3d19892313ed2a7daa0a3c1384f4f03e18a703f63f32609e1a594a8fd3fc49cb78330848fd42ae1d629339a967ab973e73ddff2be8c6a1eb73 SHA512 d164496df03223cab4d1754ab42f88f0e5d5cc95e1e5995442183aa739d583078c6b7ea1febdc92e2bf8b76820857cd8973d8364f452c2e576b7168a32578419
 DIST kubernetes-1.25.8.tar.gz 38188305 BLAKE2B 5c1cc06121243e54ceb42364995ac77f8d6190fb8d8f1198284120d134295c5ff660565c3ec45a416d3231c9d32bb96338c291b6373c1405aa260f5ce6601650 SHA512 30f1815de4d5bf3a091f1937c94e0e6cf0abc0f527488b72ec4a7d72c014bb8fef450abbf4c908f8a5b791e8d4ab501edb3f5c55af4e370359a952a6228362be
 DIST kubernetes-1.25.9.tar.gz 38197577 BLAKE2B f90e8e6fff4ada4b36b16623463e99de2818343c4206ada7c230799a01df189c196dc9d8f747517465606958f84b49bbf6a84d759590763ebf3079fa8e2f87c7 SHA512 6966e4246715c358ea60bd581ae9706d002d7463ab5466984a099249e8bd8aebf4929715ece255e3975a60aa4639912d0776ba86d6095438a0788517765cb61c
-DIST kubernetes-1.26.2.tar.gz 38192706 BLAKE2B ca14778ab5a1d1bdfb935d80eea269adb0414b5613d8e70b9c790711a284b79c8f89cdd22af73b9127fbf9f036b0aa317fbd97bc1df735aead0903d951fe5f4a SHA512 c14f3ba25ae3608ca8d28ab75c2f6a3636970d5851ef1c09259d6be4bce17af131f9adcc0be8e51f4197dc16650461bac8faae7b7ef24f899c1a0ad193ed0a6b
 DIST kubernetes-1.26.3.tar.gz 38215855 BLAKE2B 1bc1b4e9aeebc41e3e7a519f097b886d0cdede91f0cbbabc7c26db1c75d87220f2e8a5aa5ac85ad0c01486abd5806e74d2b09aa1a0281364b70417d3daea503e SHA512 7a8aa29ea282aec99046d231d4c6756e36ba74eca4c2300b3b1f5a1362d211ffe712957746044168b254ba7332e324e341a2e4d56be7bb6a58de953fa630ac14
 DIST kubernetes-1.26.4.tar.gz 38229656 BLAKE2B 1da5b7c380d27d57f6c6200f5b65b9a469c9d6663713742bc2f32746bad2eea17bb8265df009d625011f1e036d768e26bda514634aacc13b2997bb7c70684f3e SHA512 185d21368f84a1e1829578c7552922db098d2caecd2c1d95c5da259a107009960ef44c2dd42eec4dab50c4c59a8d5ae0b4dd45fc6f106b27138e1a1d7391626d
 DIST kubernetes-1.27.1.tar.gz 38048443 BLAKE2B c5475209ef4bcad704a6075392180496e4ec9f63af26038cb22b0f28effeab8eafe734c330c80e86d0aaabf125bec5f134cd1479ce54fd6437b3aeeaec8fb352 SHA512 20d2b8f3c892884a1abd5e30320f3cf50ada79c3b68409c6d626278e42d031e960057b042aade93b55b3185623c5bdcfef9a16602e7f3c4a71be8cee517e7ba1
-EBUILD kubelet-1.24.11.ebuild 1032 BLAKE2B e9a9609c579c9c1e095e92c163311b71ae588dec6174f6f8c9ef3d7a060437e8903ba06cb0e494e5d7e976705c9900bda126a22799e7e243158d142ee32d3383 SHA512 cdb13abfd4a4bd0787ee8e54a1f03cf002d5aecafda79294e5789be3704b04561111cd4dfecb2b90c036202dc9e65faf85014fc67e8e5f3cee555bfae2a80423
 EBUILD kubelet-1.24.12.ebuild 1032 BLAKE2B e9a9609c579c9c1e095e92c163311b71ae588dec6174f6f8c9ef3d7a060437e8903ba06cb0e494e5d7e976705c9900bda126a22799e7e243158d142ee32d3383 SHA512 cdb13abfd4a4bd0787ee8e54a1f03cf002d5aecafda79294e5789be3704b04561111cd4dfecb2b90c036202dc9e65faf85014fc67e8e5f3cee555bfae2a80423
-EBUILD kubelet-1.24.13.ebuild 1033 BLAKE2B 9daf33cb6909f6d792fe857e6f742b63df03df30444a09a22579d5cc4b2953cc0502d293ccccd3716193f78431e9e945ae6af70f8b7bb9559623e24f581f82c0 SHA512 58d8d97efc8e4b7afd364b58ecc5de3e3984d5b4fde49ac64ac40be72a471248f459103d4ec0e927863175158721d8159fcfdf890d3ae23cbfa478748f04086e
-EBUILD kubelet-1.25.7.ebuild 1030 BLAKE2B 2f979623733f7f34b8f562572e1ac9b39c67d0ddb72ea366abd2e8eb7dc9fbbf655707374c479fdeb183739f06ed75bcf00732ab58eaed86db7c7c1db9ff10ef SHA512 0efd37f41d1e79af8e7febd651e532e17b3c04b1462d016131d4d5f75766928ed7b43bbef7a7728a3af4b0e6a948684ac63bc054794d2f6cfa32bbaddd46aa90
+EBUILD kubelet-1.24.13.ebuild 1032 BLAKE2B e9a9609c579c9c1e095e92c163311b71ae588dec6174f6f8c9ef3d7a060437e8903ba06cb0e494e5d7e976705c9900bda126a22799e7e243158d142ee32d3383 SHA512 cdb13abfd4a4bd0787ee8e54a1f03cf002d5aecafda79294e5789be3704b04561111cd4dfecb2b90c036202dc9e65faf85014fc67e8e5f3cee555bfae2a80423
 EBUILD kubelet-1.25.8.ebuild 1030 BLAKE2B 2f979623733f7f34b8f562572e1ac9b39c67d0ddb72ea366abd2e8eb7dc9fbbf655707374c479fdeb183739f06ed75bcf00732ab58eaed86db7c7c1db9ff10ef SHA512 0efd37f41d1e79af8e7febd651e532e17b3c04b1462d016131d4d5f75766928ed7b43bbef7a7728a3af4b0e6a948684ac63bc054794d2f6cfa32bbaddd46aa90
-EBUILD kubelet-1.25.9.ebuild 1031 BLAKE2B 81a7dec1302b00fbd5be0fc2233fccd5af6186c06dafaf423d26bb21b9c5c5c19a9152d0fc8f4765820f6d60ea8833d1eae21e1cf1cc81a9fd2315990592b665 SHA512 c81bbb12cce15e01cfba4f219c4578bf2a4deb8f775cf8b07b1763c1552cf05191bc5358453d1d9f381d13a63c999b5c6ac082e51e0fef6b82309e4d44656e93
-EBUILD kubelet-1.26.2.ebuild 1030 BLAKE2B 2f979623733f7f34b8f562572e1ac9b39c67d0ddb72ea366abd2e8eb7dc9fbbf655707374c479fdeb183739f06ed75bcf00732ab58eaed86db7c7c1db9ff10ef SHA512 0efd37f41d1e79af8e7febd651e532e17b3c04b1462d016131d4d5f75766928ed7b43bbef7a7728a3af4b0e6a948684ac63bc054794d2f6cfa32bbaddd46aa90
+EBUILD kubelet-1.25.9.ebuild 1030 BLAKE2B 2f979623733f7f34b8f562572e1ac9b39c67d0ddb72ea366abd2e8eb7dc9fbbf655707374c479fdeb183739f06ed75bcf00732ab58eaed86db7c7c1db9ff10ef SHA512 0efd37f41d1e79af8e7febd651e532e17b3c04b1462d016131d4d5f75766928ed7b43bbef7a7728a3af4b0e6a948684ac63bc054794d2f6cfa32bbaddd46aa90
 EBUILD kubelet-1.26.3.ebuild 1030 BLAKE2B 2f979623733f7f34b8f562572e1ac9b39c67d0ddb72ea366abd2e8eb7dc9fbbf655707374c479fdeb183739f06ed75bcf00732ab58eaed86db7c7c1db9ff10ef SHA512 0efd37f41d1e79af8e7febd651e532e17b3c04b1462d016131d4d5f75766928ed7b43bbef7a7728a3af4b0e6a948684ac63bc054794d2f6cfa32bbaddd46aa90
-EBUILD kubelet-1.26.4.ebuild 1031 BLAKE2B 81a7dec1302b00fbd5be0fc2233fccd5af6186c06dafaf423d26bb21b9c5c5c19a9152d0fc8f4765820f6d60ea8833d1eae21e1cf1cc81a9fd2315990592b665 SHA512 c81bbb12cce15e01cfba4f219c4578bf2a4deb8f775cf8b07b1763c1552cf05191bc5358453d1d9f381d13a63c999b5c6ac082e51e0fef6b82309e4d44656e93
+EBUILD kubelet-1.26.4.ebuild 1030 BLAKE2B 2f979623733f7f34b8f562572e1ac9b39c67d0ddb72ea366abd2e8eb7dc9fbbf655707374c479fdeb183739f06ed75bcf00732ab58eaed86db7c7c1db9ff10ef SHA512 0efd37f41d1e79af8e7febd651e532e17b3c04b1462d016131d4d5f75766928ed7b43bbef7a7728a3af4b0e6a948684ac63bc054794d2f6cfa32bbaddd46aa90
 EBUILD kubelet-1.27.1.ebuild 1031 BLAKE2B 73020b5c8a932f632fda1f65b566bf79adca8e448ccdb20bc73167c01cc524673b4dd81e7d07f0cf135803ec994d20e2e8f4d0138c7a890b38b7791e4c9e720b SHA512 6eec003a78eac972c8f01f1228a2282ba632e8d62317706f1bafc4f1213b548cf479a551b75835d01dbee9679bfb5d7c3f346db1b98ba4fcbabeb343876192a1
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kubelet/kubelet-1.24.11.ebuild b/sys-cluster/kubelet/kubelet-1.24.11.ebuild
deleted file mode 100644
index 547382fb6c70..000000000000
--- a/sys-cluster/kubelet/kubelet-1.24.11.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened selinux"
-
-BDEPEND=">=dev-lang/go-1.18.1"
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-
-RESTRICT+=" test "
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.24.13.ebuild b/sys-cluster/kubelet/kubelet-1.24.13.ebuild
index c855f8434257..547382fb6c70 100644
--- a/sys-cluster/kubelet/kubelet-1.24.13.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.24.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened selinux"
 
 BDEPEND=">=dev-lang/go-1.18.1"
diff --git a/sys-cluster/kubelet/kubelet-1.25.7.ebuild b/sys-cluster/kubelet/kubelet-1.25.7.ebuild
deleted file mode 100644
index cff3013eb950..000000000000
--- a/sys-cluster/kubelet/kubelet-1.25.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened selinux"
-
-BDEPEND=">=dev-lang/go-1.19"
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-
-RESTRICT+=" test "
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.25.9.ebuild b/sys-cluster/kubelet/kubelet-1.25.9.ebuild
index ea082c4400a5..cff3013eb950 100644
--- a/sys-cluster/kubelet/kubelet-1.25.9.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.25.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened selinux"
 
 BDEPEND=">=dev-lang/go-1.19"
diff --git a/sys-cluster/kubelet/kubelet-1.26.2.ebuild b/sys-cluster/kubelet/kubelet-1.26.2.ebuild
deleted file mode 100644
index cff3013eb950..000000000000
--- a/sys-cluster/kubelet/kubelet-1.26.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened selinux"
-
-BDEPEND=">=dev-lang/go-1.19"
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-
-RESTRICT+=" test "
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.26.4.ebuild b/sys-cluster/kubelet/kubelet-1.26.4.ebuild
index ea082c4400a5..cff3013eb950 100644
--- a/sys-cluster/kubelet/kubelet-1.26.4.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.26.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened selinux"
 
 BDEPEND=">=dev-lang/go-1.19"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 9c943c7346f8..21bf481217f9 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/exfatprogs/Manifest b/sys-fs/exfatprogs/Manifest
index aba9a6542ffe..f01f28c1b0b2 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 612 BLAKE2B 81d04af6eeeae8f92c9aa3d7e7d5bbcc491bc1d9af4d74b6bd59174510e62e6ce53ad9ec5ddaffa0f19a42243d81e47650a93eb11dcac9d62954136ac7670e9d SHA512 2b0471c374d9d1281745f9bf5387b79baa70d4ba8a9d6ebec01ff100e1ca8ac9be62662fdc0a2aaecf5f40e1121f22dcda976be98ce8ad897bc920d54aaa05e8
+EBUILD exfatprogs-1.2.0.ebuild 619 BLAKE2B 4bacee75d18dc5a60b85082de9bb3264ace66425d1874c47f802a77ff38098c96f5eae357fca42489df6b8ccebaff759d0b43c16b339fcd05f2e1461b5a96f66 SHA512 98f50ae22ec440cd2f795e12e48178432a1bbf0e4adba917322dcaa8487d6ff115feb05bfcd755462dc9a6b94d1e769c452f61b42b8b83a81d63716fac004b65
 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 0e556a14bed4..d48989b37991 100644
--- a/sys-fs/exfatprogs/exfatprogs-1.2.0.ebuild
+++ b/sys-fs/exfatprogs/exfatprogs-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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 ~arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index b8a0ee473b66..9169eb2b454d 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 1fdd9215c74c..fce2e2e82c82 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -9,6 +9,7 @@ DIST linux-firmware-20230117.tar.xz 301424540 BLAKE2B 84a1d1f9d745434f6497cb4e82
 DIST linux-firmware-20230210.tar.xz 287648576 BLAKE2B d6ccbaa060df7c7752e93014baead7158d99bff05476581c954f6e97d9d97741d3b1a48fcba556c5befa6857ea9151beffbd1e0df6fc5e2cec850d11d411a5e6 SHA512 6356e1b6ee79e2108c994c91b922eb07b8eb69024b2d9fcea0ee6fe4094849465e292147d2e168930eb90f2f054727ab1f343cb76d5b604739262fd1f57e9ee6
 DIST linux-firmware-20230310.tar.xz 271812128 BLAKE2B 5e2b9db035e48a3da6e07401e0b7687b79b8206a3c54ab35aed39de83eea0ccc7b7a94c3b3b0d9cd418a9bffbc30decb7e6cd68984ecda9483ff82ca326c6865 SHA512 817e99cc4a5fab36314b3f7449796721d524bc1c0f95cf8e78ce65dbb548a75d7ff9d5bee5370be315da73c26c9e6f93dd421b3cda4b2938ff4f2b4a2a629f3e
 DIST linux-firmware-20230404.tar.xz 273105092 BLAKE2B 3bf6c4d5e501362613bdcb01c416a4ed8f818c48bc5875040aec05b63b570d156200ed85c7206d2075b9b0998aa4a358c0bcd5fa3abd3efcee145492b602db52 SHA512 815ee4c72396d9dcebd1e8a66cd63a523e3dcf623a06cb6d5d4df63a0830532c66f5c4564dd3c258ebe5072830a103800b7159d39d7a68cbb40d76abed399f9c
+DIST linux-firmware-20230515.tar.xz 274489272 BLAKE2B 5563a89d39e127433f726f0b67b656e46d7ed00f2ff10e3e075d85cbfda25ba5c48fc688df3466b7910a599764faa7eb49b7565b5feeaeca9d40516d9ef59880 SHA512 9060dde164203516fb01d4920ce245acf17f33b5e707093bd5cfbc18193fd6e91e4a9b721fe46d12420c499254d287d5c1e211ae7c576e450820e8e085d646bd
 EBUILD linux-firmware-20220610.ebuild 9779 BLAKE2B 680b376ab7bf5e5fdb7acb7bd349f4420deb5135a34437c2fdad8d3afca2cc826a741dda681eca4de3a61212b322f0ce8d3a1b9120bf5ea860a92ade87bdf738 SHA512 5c0d79ede039b22870c46a9e1e1f721d11f7c42b03b4c731505a3173b23fa0dcbc68b494c5306a3d2465b9e77579171dd21963b2132e01929da82434273721da
 EBUILD linux-firmware-20220708.ebuild 9714 BLAKE2B 188efe09b69f66b94144dda5d092031eb100ab6d5c8cd90bc05d502f9be7b3be712b0aaded102e55b1b06e0c90b257d54b405f8edf89b129bda4a847f14b1ec7 SHA512 90cd916aa32ad9c1e53ddc782faf19a42bb16a818453a889e48326f8eff43e5fda624db78bb0ebcdb775ef016353d52ce5928ec5430b81f993a04601160b8acf
 EBUILD linux-firmware-20220815.ebuild 9714 BLAKE2B 188efe09b69f66b94144dda5d092031eb100ab6d5c8cd90bc05d502f9be7b3be712b0aaded102e55b1b06e0c90b257d54b405f8edf89b129bda4a847f14b1ec7 SHA512 90cd916aa32ad9c1e53ddc782faf19a42bb16a818453a889e48326f8eff43e5fda624db78bb0ebcdb775ef016353d52ce5928ec5430b81f993a04601160b8acf
@@ -23,5 +24,6 @@ EBUILD linux-firmware-20230310-r1.ebuild 11323 BLAKE2B e86079a186416213908bbf944
 EBUILD linux-firmware-20230310-r2.ebuild 11204 BLAKE2B 066c6a8347a4e9ab45c06a584172ee91f88c3459032602021f62c8a1cff5262ec5c7e03e649d339cb6fbcb2bd7af3cff9a4dbbf010b53c7449d0371413e04cf5 SHA512 83db43336064c576d5d5be7929a23ed906f8ee593f89e69280d0375895e6a7fb9ca274ed5fac63e4af15b6ae468ec394b20d7f2345b65825f027754b78130884
 EBUILD linux-firmware-20230310.ebuild 10368 BLAKE2B 0e13109bdcb3554a3ca34c56f9ac5aa3ce7628c01db4f49b6d865512b003011b728d2d398efc64ab447a2ef9626849f0ca73bf3af5cbbc3d4d56d16c672d26aa SHA512 bd5e91e98d085d55696be27ec13fc3f9f99c8ea8a3ca929bcb925bea0257d0109e048a313c24aaf1b3f1fcc21df950ffd736c2e13fdb5e25298a489990f59fac
 EBUILD linux-firmware-20230404.ebuild 11196 BLAKE2B 2ba77bdaba0758932889c2fbc04df410f10a7535f482490779545445e1af06448a467b40ca6c32f36bba870bd482685facfb0d4d2bfcebfba6b043a1167c053e SHA512 8c51e94c77cb3500fbf02adf5472e40702e09bf93ba5f1cc78b02f984bbcedba393a12c55ba11c2acdbc5b270c0ce5f7c07ca8dd6fb4a058f782ebed504cf88a
+EBUILD linux-firmware-20230515.ebuild 11204 BLAKE2B 066c6a8347a4e9ab45c06a584172ee91f88c3459032602021f62c8a1cff5262ec5c7e03e649d339cb6fbcb2bd7af3cff9a4dbbf010b53c7449d0371413e04cf5 SHA512 83db43336064c576d5d5be7929a23ed906f8ee593f89e69280d0375895e6a7fb9ca274ed5fac63e4af15b6ae468ec394b20d7f2345b65825f027754b78130884
 EBUILD linux-firmware-99999999.ebuild 11204 BLAKE2B 066c6a8347a4e9ab45c06a584172ee91f88c3459032602021f62c8a1cff5262ec5c7e03e649d339cb6fbcb2bd7af3cff9a4dbbf010b53c7449d0371413e04cf5 SHA512 83db43336064c576d5d5be7929a23ed906f8ee593f89e69280d0375895e6a7fb9ca274ed5fac63e4af15b6ae468ec394b20d7f2345b65825f027754b78130884
 MISC metadata.xml 1300 BLAKE2B 075ac0595a6408aa708224e79109b4b542f77c63841d600a89a8cc94bd13eefda3d7c6db416f16814ae67426b0d16cff48ac88bb76b692e3c4524bd3ac3cad6e SHA512 bc946c219e24b905c55004323fc7bf213a5e012bdd6b20cfc1203680a7e6460dd56e30c2735da0f94f3c95aa96b3afbbd532e3e3215da9597a512c4d448b8de7
diff --git a/sys-kernel/linux-firmware/linux-firmware-20230515.ebuild b/sys-kernel/linux-firmware/linux-firmware-20230515.ebuild
new file mode 100644
index 000000000000..feed015c3e3e
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20230515.ebuild
@@ -0,0 +1,403 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit linux-info mount-boot savedconfig multiprocessing
+
+# In case this is a real snapshot, fill in commit below.
+# For normal, tagged releases, leave blank
+MY_COMMIT=""
+
+if [[ ${PV} == 99999999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
+else
+	if [[ -n "${MY_COMMIT}" ]]; then
+		SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${MY_COMMIT}"
+	else
+		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
+	fi
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux firmware files"
+HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
+
+LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
+	redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
+	unknown-license? ( all-rights-reserved )"
+SLOT="0"
+IUSE="compress-xz compress-zstd initramfs +redistributable savedconfig unknown-license"
+REQUIRED_USE="initramfs? ( redistributable )
+	?? ( compress-xz compress-zstd )"
+
+RESTRICT="binchecks strip test
+	unknown-license? ( bindist )"
+
+BDEPEND="initramfs? ( app-arch/cpio )
+	compress-xz? ( app-arch/xz-utils )
+	compress-zstd? ( app-arch/zstd )"
+
+#add anything else that collides to this
+RDEPEND="!savedconfig? (
+		redistributable? (
+			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
+			!sys-block/qla-fc-firmware
+			!sys-firmware/iwl1000-ucode
+			!sys-firmware/iwl6005-ucode
+			!sys-firmware/iwl6030-ucode
+			!sys-firmware/iwl3160-ucode
+			!sys-firmware/iwl7260-ucode
+			!sys-firmware/iwl3160-7260-bt-ucode
+			!sys-firmware/raspberrypi-wifi-ucode
+		)
+		unknown-license? (
+			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
+			!sys-firmware/alsa-firmware[alsa_cards_maestro3]
+			!sys-firmware/alsa-firmware[alsa_cards_sb16]
+			!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
+		)
+	)"
+
+QA_PREBUILT="*"
+
+pkg_setup() {
+	if use compress-xz || use compress-zstd ; then
+		local CONFIG_CHECK
+
+		if kernel_is -ge 5 19; then
+			use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS_XZ"
+			use compress-zstd && CONFIG_CHECK="~FW_LOADER_COMPRESS_ZSTD"
+		else
+			use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS"
+			if use compress-zstd; then
+				eerror "Kernels <5.19 do not support ZSTD-compressed firmware files"
+			fi
+		fi
+		linux-info_pkg_setup
+	fi
+}
+
+pkg_pretend() {
+	use initramfs && mount-boot_pkg_pretend
+}
+
+src_unpack() {
+	if [[ ${PV} == 99999999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		# rename directory from git snapshot tarball
+		if [[ ${#GIT_COMMIT} -gt 8 ]]; then
+			mv ${PN}-*/ ${P} || die
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	find . -type f -not -perm 0644 -print0 \
+		| xargs --null --no-run-if-empty chmod 0644 \
+		|| die
+
+	chmod +x copy-firmware.sh || die
+
+	if use initramfs; then
+		if [[ -d "${S}/amd-ucode" ]]; then
+			local UCODETMP="${T}/ucode_tmp"
+			local UCODEDIR="${UCODETMP}/kernel/x86/microcode"
+			mkdir -p "${UCODEDIR}" || die
+			echo 1 > "${UCODETMP}/early_cpio"
+
+			local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin"
+			cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode"
+
+			if [[ ! -s "${amd_ucode_file}" ]]; then
+				die "Sanity check failed: '${amd_ucode_file}' is empty!"
+			fi
+
+			pushd "${UCODETMP}" &>/dev/null || die
+			find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img
+			popd &>/dev/null || die
+			if [[ ! -s "${S}/amd-uc.img" ]]; then
+				die "Failed to create '${S}/amd-uc.img'!"
+			fi
+		else
+			# If this will ever happen something has changed which
+			# must be reviewed
+			die "'${S}/amd-ucode' not found!"
+		fi
+	fi
+
+	# whitelist of misc files
+	local misc_files=(
+		copy-firmware.sh
+		WHENCE
+		README
+	)
+
+	# whitelist of images with a free software license
+	local free_software=(
+		# keyspan_pda (GPL-2+)
+		keyspan_pda/keyspan_pda.fw
+		keyspan_pda/xircom_pgs.fw
+		# dsp56k (GPL-2+)
+		dsp56k/bootstrap.bin
+		# ath9k_htc (BSD GPL-2+ MIT)
+		ath9k_htc/htc_7010-1.4.0.fw
+		ath9k_htc/htc_9271-1.4.0.fw
+		# pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
+		cis/LA-PCM.cis
+		cis/PCMLM28.cis
+		cis/DP83903.cis
+		cis/NE2K.cis
+		cis/tamarack.cis
+		cis/PE-200.cis
+		cis/PE520.cis
+		cis/3CXEM556.cis
+		cis/3CCFEM556.cis
+		cis/MT5634ZLX.cis
+		cis/RS-COM-2P.cis
+		cis/COMpad2.cis
+		cis/COMpad4.cis
+		# serial_cs (GPL-3)
+		cis/SW_555_SER.cis
+		cis/SW_7xx_SER.cis
+		cis/SW_8xx_SER.cis
+		# dvb-ttpci (GPL-2+)
+		av7110/bootcode.bin
+		# usbdux, usbduxfast, usbduxsigma (GPL-2+)
+		usbdux_firmware.bin
+		usbduxfast_firmware.bin
+		usbduxsigma_firmware.bin
+		# brcmfmac (GPL-2+)
+		brcm/brcmfmac4330-sdio.Prowise-PT301.txt
+		brcm/brcmfmac43340-sdio.meegopad-t08.txt
+		brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
+		brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
+		brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
+		"brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
+		brcm/brcmfmac43430-sdio.AP6212.txt
+		brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
+		brcm/brcmfmac43430-sdio.MUR1DX.txt
+		brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
+		brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
+		brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
+		# isci (GPL-2)
+		isci/isci_firmware.bin
+		# carl9170 (GPL-2+)
+		carl9170-1.fw
+		# atusb (GPL-2+)
+		atusb/atusb-0.2.dfu
+		atusb/atusb-0.3.dfu
+		atusb/rzusb-0.3.bin
+		# mlxsw_spectrum (dual BSD/GPL-2)
+		mellanox/mlxsw_spectrum-13.1420.122.mfa2
+		mellanox/mlxsw_spectrum-13.1530.152.mfa2
+		mellanox/mlxsw_spectrum-13.1620.192.mfa2
+		mellanox/mlxsw_spectrum-13.1702.6.mfa2
+		mellanox/mlxsw_spectrum-13.1703.4.mfa2
+		mellanox/mlxsw_spectrum-13.1910.622.mfa2
+		mellanox/mlxsw_spectrum-13.2000.1122.mfa2
+	)
+
+	# blacklist of images with unknown license
+	local unknown_license=(
+		korg/k1212.dsp
+		ess/maestro3_assp_kernel.fw
+		ess/maestro3_assp_minisrc.fw
+		yamaha/ds1_ctrl.fw
+		yamaha/ds1_dsp.fw
+		yamaha/ds1e_ctrl.fw
+		ttusb-budget/dspbootcode.bin
+		emi62/bitstream.fw
+		emi62/loader.fw
+		emi62/midi.fw
+		emi62/spdif.fw
+		ti_3410.fw
+		ti_5052.fw
+		mts_mt9234mu.fw
+		mts_mt9234zba.fw
+		whiteheat.fw
+		whiteheat_loader.fw
+		cpia2/stv0672_vp4.bin
+		vicam/firmware.fw
+		edgeport/boot.fw
+		edgeport/boot2.fw
+		edgeport/down.fw
+		edgeport/down2.fw
+		edgeport/down3.bin
+		sb16/mulaw_main.csp
+		sb16/alaw_main.csp
+		sb16/ima_adpcm_init.csp
+		sb16/ima_adpcm_playback.csp
+		sb16/ima_adpcm_capture.csp
+		sun/cassini.bin
+		acenic/tg1.bin
+		acenic/tg2.bin
+		adaptec/starfire_rx.bin
+		adaptec/starfire_tx.bin
+		yam/1200.bin
+		yam/9600.bin
+		ositech/Xilinx7OD.bin
+		qlogic/isp1000.bin
+		myricom/lanai.bin
+		yamaha/yss225_registers.bin
+		lgs8g75.fw
+	)
+
+	if use !unknown-license; then
+		einfo "Removing files with unknown license ..."
+		rm -v "${unknown_license[@]}" || die
+	fi
+
+	if use !redistributable; then
+		# remove files _not_ in the free_software or unknown_license lists
+		# everything else is confirmed (or assumed) to be redistributable
+		# based on upstream acceptance policy
+		einfo "Removing non-redistributable files ..."
+		local OLDIFS="${IFS}"
+		local IFS=$'\n'
+		set -o pipefail
+		find ! -type d -printf "%P\n" \
+			| grep -Fvx -e "${misc_files[*]}" -e "${free_software[*]}" -e "${unknown_license[*]}" \
+			| xargs -d '\n' --no-run-if-empty rm -v
+
+		[[ ${?} -ne 0 ]] && die "Failed to remove non-redistributable files"
+
+		IFS="${OLDIFS}"
+	fi
+
+	restore_config ${PN}.conf
+}
+
+src_install() {
+	./copy-firmware.sh -v "${ED}/lib/firmware" || die
+
+	pushd "${ED}/lib/firmware" &>/dev/null || die
+
+	# especially use !redistributable will cause some broken symlinks
+	einfo "Removing broken symlinks ..."
+	find * -xtype l -print -delete || die
+
+	if use savedconfig; then
+		if [[ -s "${S}/${PN}.conf" ]]; then
+			local files_to_keep="${T}/files_to_keep.lst"
+			grep -v '^#' "${S}/${PN}.conf" 2>/dev/null > "${files_to_keep}" || die
+			[[ -s "${files_to_keep}" ]] || die "grep failed, empty config file?"
+
+			einfo "Applying USE=savedconfig; Removing all files not listed in config ..."
+			find ! -type d -printf "%P\n" \
+				| grep -Fvx -f "${files_to_keep}" \
+				| xargs -d '\n' --no-run-if-empty rm -v
+
+			if [[ ${PIPESTATUS[0]} -ne 0 ]]; then
+				die "Find failed to print installed files"
+			elif [[ ${PIPESTATUS[1]} -eq 2 ]]; then
+				# grep returns exit status 1 if no lines were selected
+				# which is the case when we want to keep all files
+				die "Grep failed to select files to keep"
+			elif [[ ${PIPESTATUS[2]} -ne 0 ]]; then
+				die "Failed to remove files not listed in config"
+			fi
+		fi
+	fi
+
+	# remove empty directories, bug #396073
+	find -type d -empty -delete || die
+
+	# sanity check
+	if ! ( shopt -s failglob; : * ) 2>/dev/null; then
+		eerror "No files to install. Check your USE flag settings"
+		eerror "and the list of files in your saved configuration."
+		die "Refusing to install an empty package"
+	fi
+
+	# create config file
+	echo "# Remove files that shall not be installed from this list." > "${S}"/${PN}.conf || die
+	find * ! -type d >> "${S}"/${PN}.conf || die
+	save_config "${S}"/${PN}.conf
+
+	if use compress-xz || use compress-zstd; then
+		einfo "Compressing firmware ..."
+		local target
+		local ext
+		local compressor
+
+		if use compress-xz; then
+			ext=xz
+			compressor="xz -T1 -C crc32"
+		elif use compress-zstd; then
+			ext=zst
+			compressor="zstd -15 -T1 -C -q --rm"
+		fi
+
+		# rename symlinks
+		while IFS= read -r -d '' f; do
+			# skip symlinks pointing to directories
+			[[ -d ${f} ]] && continue
+
+			target=$(readlink "${f}")
+			[[ $? -eq 0 ]] || die
+			ln -sf "${target}".${ext} "${f}" || die
+			mv -T "${f}" "${f}".${ext} || die
+		done < <(find . -type l -print0) || die
+
+		find . -type f ! -path "./amd-ucode/*" -print0 | \
+			xargs -0 -P $(makeopts_jobs) -I'{}' ${compressor} '{}' || die
+
+	fi
+
+	popd &>/dev/null || die
+
+	if use initramfs ; then
+		insinto /boot
+		doins "${S}"/amd-uc.img
+	fi
+}
+
+pkg_preinst() {
+	if use savedconfig; then
+		ewarn "USE=savedconfig is active. You must handle file collisions manually."
+	fi
+
+	# Fix 'symlink is blocked by a directory' Bug #871315
+	if has_version "<${CATEGORY}/${PN}-20220913-r2" ; then
+		rm -rf "${EROOT}"/lib/firmware/qcom/LENOVO/21BX
+	fi
+
+	# Make sure /boot is available if needed.
+	use initramfs && mount-boot_pkg_preinst
+}
+
+pkg_postinst() {
+	elog "If you are only interested in particular firmware files, edit the saved"
+	elog "configfile and remove those that you do not want."
+
+	local ver
+	for ver in ${REPLACING_VERSIONS}; do
+		if ver_test ${ver} -lt 20190514; then
+			elog
+			elog 'Starting with version 20190514, installation of many firmware'
+			elog 'files is controlled by USE flags. Please review your USE flag'
+			elog 'and package.license settings if you are missing some files.'
+			break
+		fi
+	done
+
+	# Don't forget to umount /boot if it was previously mounted by us.
+	use initramfs && mount-boot_pkg_postinst
+}
+
+pkg_prerm() {
+	# Make sure /boot is mounted so that we can remove /boot/amd-uc.img!
+	use initramfs && mount-boot_pkg_prerm
+}
+
+pkg_postrm() {
+	# Don't forget to umount /boot if it was previously mounted by us.
+	use initramfs && mount-boot_pkg_postrm
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 752690730a48..99b123ae5453 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 5bcd65be5237..ed0b1fd57654 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -45,7 +45,7 @@ EBUILD glibc-2.33-r14.ebuild 48433 BLAKE2B c6e2a9fec30af2011d2b46d1dabf7b726964f
 EBUILD glibc-2.34-r14.ebuild 49648 BLAKE2B 413b8d411ab4936d31f873d2cca8f5701ccbb09b2d00f12613be9e7679235973445214fa09ff43c5a0e3b5976d6e864799abef3d331de11043a627f554b633d0 SHA512 9f200435cc29209fbacb45278ea0855337f5b081bd3cc4aae295f3ef4663028930fb74744a3e7390ca7f4bc2cad47e19dc1061187d574e04f4167802bbfcc885
 EBUILD glibc-2.35-r11.ebuild 50189 BLAKE2B 0b6f1b54e6e02c9ae1bb41ee4c070271c0e5bf7bc697df44bd03e2ce37a32bd4fbd5dda1f5adb02899982cb688d9b553547ab4218cf9169854b560c78be9bd8b SHA512 dfb7d31a64320d24269bda56676a7b9972f3886093ee47c9b10a5a3f1e142ac49206403fbf0b93435220a0a03c337e35fb7a48a1231a59a6329170c682d53140
 EBUILD glibc-2.36-r7.ebuild 52466 BLAKE2B a9b0c1449e2a49de001d3ace56cd56d715ed46a7a7e6a1180ad32660d1dde54a78027b7b655feba84a1c0a5f012a267c7b3086bbe609e6f0ce20ac4311164094 SHA512 cfd78e1a365340dfd730a9554b781f4c01b0d8773fb5ec72de092bc6adb4d419ca511ea767c2f18cb732001778538244ad3760239e5bac72259da332bf0dbb3d
-EBUILD glibc-2.36-r8.ebuild 52474 BLAKE2B 6b185cb128182d5f8af72d2504901be285ba54fbd8e8b6d35e83797aac0fd3717c80971656aef2ccf813587fb769969fdf65cf2eb9cd888a773b55cce832590b SHA512 a645fab148a71b9b0e33cdc1375b2010c515592c071210ad20a187cf0e2b48b97dc0bed88d48585bf3fd60a4baa4f398facf73972b136a9ea28e98ca4bf48d54
+EBUILD glibc-2.36-r8.ebuild 52473 BLAKE2B ac0197e21723108c79f00fbdccabb115d18710fb10785703cbf5b023dd8a535cce1e3b7a410eaa72f5a7169b0a6b849ef334ddd77330dac75b153b8be9f67c6e SHA512 63da1c151b7851ee95e0d3754b08fccaf8af92f91d1ba8576b1b4777576d32c390f4a7e233448f7d6b34dbdec00360b3f41cb9cd4266e2b7ca1862a2f9a1fc11
 EBUILD glibc-2.37-r2.ebuild 52536 BLAKE2B 946253d8783f8671f5fd317f39d5b92bc7cf908e8615ef8645fb314894611a1e73e77c2fd64faae59c9e7727d936ce296cf49a9cdf349b58911adbe9baecf69d SHA512 0f70c4b1811f4eb697804a29b10c96b6b7428c77e31830f71a3666b197bd2f7a931607f86d639e592af3e9f67071d6f63d1293730918d6cda753395e89addb3d
 EBUILD glibc-2.37-r3.ebuild 51881 BLAKE2B 1c91f8d75945fe76853b6136aa37864e46a931b06dd5d63c624986e38c53487ab1fe4d52b668c82abb23f0747578a75eaee0bf5f2ba7a67b9c7676096eb753b2 SHA512 39bdc61247ea0218c3be31d2f04ba016513da16a0cd240127f318497ff72b04ae779077e13bba5023748fec3e5952a36bdff2e294c82c157383c982e3b1f37c0
 EBUILD glibc-9999.ebuild 51882 BLAKE2B d341bdf80a0575dd4f932cf54d5b807543fc0baea2fcc80f545ea07de7b1c9a2e41771c1a0da77eadab112545ac7b66bc009e7c785f3af7f482efe48225d37a5 SHA512 ca36052146f759dcff1036a44b8987b7367446cf5f659b83cd1f196d0f2f919b385c6adb7b782c9e618579272043c0fa9dc335f5b83304de81da120d604bdcf0
diff --git a/sys-libs/glibc/glibc-2.36-r8.ebuild b/sys-libs/glibc/glibc-2.36-r8.ebuild
index 2b3e5bc268e7..e042679aed82 100644
--- a/sys-libs/glibc/glibc-2.36-r8.ebuild
+++ b/sys-libs/glibc/glibc-2.36-r8.ebuild
@@ -26,7 +26,7 @@ PATCH_DEV=dilfridge
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 fi
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index f0e0c521164d..95bcf855999c 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -1,4 +1,4 @@
-AUX libcap-2.62-ignore-RAISE_SETFCAP-install-failures.patch 901 BLAKE2B 8b4795bfff00f3c42d22bfb748c60109c9fb210082bd0553d5d12c098008900d478a07455251228041be3448cf547ee4ec61217b1fa302feb86175592972bb08 SHA512 c6338a21bd66a4248ea3d35c0c39f864a9cd9c0cb0dd26860739fe3828282ff7e068888b3e39b1439f75f8f57db64cfd3a88542dfbb27ed04f65677e7f8ce632
+AUX libcap-2.62-ignore-RAISE_SETFCAP-install-failures.patch 724 BLAKE2B 39b2924071c9c6b1ffba3acf2fbeea6196c20da175ed4a5ddd6fac5375d604df3823bf183c36da6eb03e1b9cd918d107fd7e5b30f2f3746ce17b589a77f3dec5 SHA512 11ca33d7f1a352cce9dad179be415b6282efdbb9049a92ba945cbfbee2b6c263af39adb3a93f62e5077d9b33e0f098f9125362432bd333601345d8c3671d40bd
 DIST libcap-2.68.tar.xz 188824 BLAKE2B 659ee2b0f92ab7490e7f4c9ccd6aafa02ae36c509654fdb53a0b9da4d5ba8be2d1b5afd2073b2b1c75f9585a0593a9d3e70af59fe0c213e178782bbd11cd3b3d SHA512 ede3e1356aef22e18a46dc8ff0727500ab023bea698cf2bb822abb06625e272940afea52ad6457d0cd8cf1c7f435f1b568baf0a6bf0a08ae96fbf6d7502f9de2
 DIST libcap-2.69.tar.xz 189200 BLAKE2B 94d1fef7666a1c383a8b96f1f6092bd242164631532868b628d2f5de71b42a371d041a978ef7fbadfee3eeb433165444995d1078cd790275bc0433a7875a697e SHA512 647c307dc451517da9d089495ab959b4a6fbbe41c79f4e1e9bb663569dad630ead0c2e413dfb393319e3ea14dc9848c81b392107fe3382ce1813d278c3394a7f
 EBUILD libcap-2.68.ebuild 2243 BLAKE2B 429e44f61da99bdf3ca07e0282a191fff0db4c4c572850e6815a28cf1e6cb36b1ff571986ce1a5f048e089fb3f46a986edd3dc5501addf790e717670a91d9c04 SHA512 4ccc020e0b500fc7f4616e4499e69cb1bcc4eff8d1958c48a07ef0be4c67034b37be35b1ec3fce9d7a066847bd30abf6ac5dfbf6f173cddcbf0ba34f1e777d4b
diff --git a/sys-libs/libcap/files/libcap-2.62-ignore-RAISE_SETFCAP-install-failures.patch b/sys-libs/libcap/files/libcap-2.62-ignore-RAISE_SETFCAP-install-failures.patch
index 04c59357c45f..bd1c22fcad5a 100644
--- a/sys-libs/libcap/files/libcap-2.62-ignore-RAISE_SETFCAP-install-failures.patch
+++ b/sys-libs/libcap/files/libcap-2.62-ignore-RAISE_SETFCAP-install-failures.patch
@@ -8,11 +8,6 @@ due to the fs not supporting it) shouldn't impair the default install.
 
 Signed-off-by: Mike Frysinger <vapier@gentoo.org>
 
-Forward ported from libcap-2.20 to libcap-2.25
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
-diff --git a/progs/Makefile b/progs/Makefile
-index 2cb7520..6d417de 100644
 --- a/progs/Makefile
 +++ b/progs/Makefile
 @@ -39,7 +39,7 @@ install: all
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index f56afc48ed0e..faf6c5c31dc2 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 4a8d87b6449c..8319b1a8d095 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -23,9 +23,11 @@ AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9
 DIST chromium-112-gcc-13-patches.tar.xz 8036 BLAKE2B 71347593c57f0ec8a32de3764359227ae7e8d666ef78f2676f939f7e07cb787f54ad57f8583504285ea84cc0c9cc99255873e28473468b30d5e66f3e0b0496ff SHA512 67dfa89ebbaba2c1d8ecb8471096c6c1b691cba4b5e68b7ee35ac2d6b65b560da39b4b2bb2eb0f6b6a3f2cc6bd8894c4d0e58ca51bc32a7f429aa1feed0571e5
 DIST chromium-112.0.5615.165.tar.xz 1730146076 BLAKE2B 710f5490a48f9e268690bac1bdf86bac9f0968639c3b9250b3b821433afdaa37af532a1607579206848c47ceb24cebef96b1a8dbdba11c9b4b4eb7af7518fe11 SHA512 51cd011a612bbd83c31f69666d87597dbf0d277cbb043855623afd5d3d1f26326201251ca8aa18d891a6ca0c7daf177d07bd56a2969ba390318348077636ed7c
 DIST chromium-113.0.5672.63.tar.xz 1556641240 BLAKE2B d52a8eec055f289eafd829db6dceaae5c08132d73015870ff51d5bc7856e79ad0f3feb976b1dc5b8b43302f843394bf312ab6ddf55bf547c79f56d69cdce370f SHA512 b99ce267ecfaf497b99262a243f43eab9b170563227b407ef17dd85f8f6d892d9c264df83b166a52683156ee33e8504f9fcf09db68c6edb29b6588d870833711
+DIST chromium-113.0.5672.92.tar.xz 1556728164 BLAKE2B d3f4b61213710cb98856ac91a1fb167883d6031958bfe930b7087f4b135bc0e7a8db09595f6d0e27f00bd3bf10479076dbc7e8a373817de972c0d3cf68efb8bb SHA512 30de7a92063feeb7217108b1065d34e44cd73c28cf9982820093ba8fed7a818a62ea65e1b6ea1bdad601da819c2fe00df3eb28ffa226eb1bd564577d959332c5
 DIST chromium-ppc64le-gentoo-patches-1.tar.xz 5636 BLAKE2B 1d898939df023c59285b27bee552470483ea06375d1ee8d6947b89c5927c23cc7bfec6b49f3b376ece931d11a56f8e2a45791e0f92ad61974fc8c34c1082d89c SHA512 8a71cb007e47cda8e5fe5d185729389e65c48bd322c8ee8b3986bee8571427b959628f2666bda646a3f89ae64197c0957d3626845ff03461dbd5dee4c964d07c
 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
 DIST chromium_112.0.5615.49-2raptor0~deb11u1.debian.tar.xz 780000 BLAKE2B 2aa91c689b634f51978428f5992f41190e7c9b7d4009ee2f34a55e0666caf8ce02f5c5b6297702fe7ecb3a7961d5c84102ebda5189f3c513576a83f3c94dafa1 SHA512 b92b2a76a9ef6fc23ef06ae1d428f6755d9c8551230926a1c422c8c560ec95b1aa53a5a578519ba7426e6985c234cfd30573d8bb482499dd1532163975af293f
 EBUILD chromium-112.0.5615.165.ebuild 39118 BLAKE2B a95859acca060aeb1b4546ec69ac488603f61c5d0d82bd94e2a6dcc035345081df37c2e3e63bfd44a35294d14be759ccbd2dd24fee91fd32dac87d59885beaec SHA512 d80d67361e6467917a2d0bc01b05ffa65b052cca94dfa124b2981fcd447829255a5eab8ce7f12f0e2a881ccecc49294f9a8132f3da42b707a367519b686fc49f
 EBUILD chromium-113.0.5672.63.ebuild 39431 BLAKE2B 457a704768d25c63727ee44e22d070ca87a5ccb8df8ee626e6752762d378b63ee85544a33c78ea0ccc1833b61bfa4d63519f83ed51b40c68231ec6fb44da3a0f SHA512 175d2e4d2af3508409e15cbb179322721bed6a948e2c3386f243e6329a25c4fe31790a8eabdc2b49c590b0a551716ebd0557b1f6f3633a80538c9e81ac78c439
+EBUILD chromium-113.0.5672.92.ebuild 39431 BLAKE2B 457a704768d25c63727ee44e22d070ca87a5ccb8df8ee626e6752762d378b63ee85544a33c78ea0ccc1833b61bfa4d63519f83ed51b40c68231ec6fb44da3a0f SHA512 175d2e4d2af3508409e15cbb179322721bed6a948e2c3386f243e6329a25c4fe31790a8eabdc2b49c590b0a551716ebd0557b1f6f3633a80538c9e81ac78c439
 MISC metadata.xml 2167 BLAKE2B 3ad0af16da80ea03ce1deb54468b5668d1565742773e583f44688df3f7ea58a72271ccb58f467f0424bd601f4c7256ef6dc340a31a9a66547c3860069c812492 SHA512 6671a247003dae4accf588e2e62242286caf2310869a5ed5b327f46b484848a25d03baaf179a740ca8f7b2c30bf3095cf72c166fae8f0a15c63dad9174fa28ca
diff --git a/www-client/chromium/chromium-113.0.5672.92.ebuild b/www-client/chromium/chromium-113.0.5672.92.ebuild
new file mode 100644
index 000000000000..8753ab2649e2
--- /dev/null
+++ b/www-client/chromium/chromium-113.0.5672.92.ebuild
@@ -0,0 +1,1265 @@
+# Copyright 2009-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+LLVM_MAX_SLOT=16
+
+CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk ur vi zh-CN zh-TW"
+
+VIRTUALX_REQUIRED="pgo"
+
+inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils
+inherit python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://chromium.org/"
+PATCHSET_URI_PPC64="https://quickbuild.io/~raptor-engineering-public"
+PATCHSET_NAME_PPC64="chromium_112.0.5615.49-2raptor0~deb11u1.debian"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	https://dev.gentoo.org/~sam/distfiles/www-client/chromium/chromium-112-gcc-13-patches.tar.xz
+	ppc64? (
+		${PATCHSET_URI_PPC64}/+archive/ubuntu/chromium/+files/${PATCHSET_NAME_PPC64}.tar.xz
+		https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-ppc64le-gentoo-patches-1.tar.xz
+	)
+	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
+
+LICENSE="BSD"
+SLOT="0/stable"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless kerberos libcxx lto +official pax-kernel pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
+REQUIRED_USE="
+	component-build? ( !suid !libcxx )
+	screencast? ( wayland )
+	!headless? ( || ( X wayland ) )
+	pgo? ( X !wayland )
+"
+
+COMMON_X_DEPEND="
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXtst:=
+	x11-libs/libxshmfence:=
+"
+
+COMMON_SNAPSHOT_DEPEND="
+	system-icu? ( >=dev-libs/icu-71.1:= )
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	!libcxx? ( >=dev-libs/re2-0.2019.08.01:= )
+	dev-libs/libxslt:=
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2.11.0-r1:=
+	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
+	media-libs/libjpeg-turbo:=
+	system-png? ( media-libs/libpng:=[-apng(-)] )
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/mesa:=[gbm(+)]
+	>=media-libs/openh264-1.6.0:=
+	system-av1? (
+		>=media-libs/dav1d-1.0.0:=
+		>=media-libs/libaom-3.4.0:=
+	)
+	sys-libs/zlib:=
+	x11-libs/libdrm:=
+	!headless? (
+		dev-libs/glib:2
+		>=media-libs/alsa-lib-1.0.19:=
+		pulseaudio? ( media-sound/pulseaudio:= )
+		sys-apps/pciutils:=
+		kerberos? ( virtual/krb5 )
+		vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] )
+		X? (
+			x11-libs/libX11:=
+			x11-libs/libXext:=
+			x11-libs/libxcb:=
+		)
+		x11-libs/libxkbcommon:=
+		wayland? (
+			dev-libs/libffi:=
+			screencast? ( media-video/pipewire:= )
+		)
+	)
+"
+
+COMMON_DEPEND="
+	${COMMON_SNAPSHOT_DEPEND}
+	app-arch/bzip2:=
+	dev-libs/expat:=
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4.3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		>=media-libs/opus-1.3.1:=
+	)
+	net-misc/curl[ssl]
+	sys-apps/dbus:=
+	media-libs/flac:=
+	sys-libs/zlib:=[minizip]
+	!headless? (
+		X? ( ${COMMON_X_DEPEND} )
+		>=app-accessibility/at-spi2-core-2.46.0:2
+		media-libs/mesa:=[X?,wayland?]
+		cups? ( >=net-print/cups-1.3.11:= )
+		virtual/udev
+		x11-libs/cairo:=
+		x11-libs/gdk-pixbuf:2
+		x11-libs/pango:=
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtwidgets:5
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!headless? (
+		|| (
+			x11-libs/gtk+:3[X?,wayland?]
+			gui-libs/gtk:4[X?,wayland?]
+		)
+		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
+	)
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+"
+DEPEND="${COMMON_DEPEND}
+	!headless? (
+		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
+		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
+	)
+"
+
+depend_clang_llvm_version() {
+	echo "sys-devel/clang:$1"
+	echo "sys-devel/llvm:$1"
+	echo "=sys-devel/lld-$1*"
+}
+
+depend_clang_llvm_versions() {
+	local _v
+	if [[ $# -gt 1 ]]; then
+		echo "|| ("
+		for _v in "$@"; do
+			echo "("
+			depend_clang_llvm_version "${_v}"
+			echo ")"
+		done
+		echo ")"
+	elif [[ $# -eq 1 ]]; then
+		depend_clang_llvm_version "$1"
+	fi
+}
+
+BDEPEND="
+	${COMMON_SNAPSHOT_DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	>=app-arch/gzip-1.7
+	!headless? (
+		qt5? ( dev-qt/qtcore:5 )
+	)
+	libcxx? ( >=sys-devel/clang-16 )
+	lto? ( $(depend_clang_llvm_versions 16) )
+	pgo? (
+		>=dev-python/selenium-3.141.0
+		>=dev-util/web_page_replay_go-20220314
+		$(depend_clang_llvm_versions 16)
+	)
+	dev-lang/perl
+	>=dev-util/gn-0.1807
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	dev-vcs/git
+	>=net-libs/nodejs-7.6.0[inspector]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+# These are intended for ebuild maintainer use to force clang if GCC is broken.
+: ${CHROMIUM_FORCE_CLANG=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-16"
+fi
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
+in /etc/chromium/default.
+"
+
+python_check_deps() {
+	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+needs_clang() {
+	[[ ${CHROMIUM_FORCE_CLANG} == yes ]] || use libcxx || use lto || use pgo
+}
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if ( use lto || use pgo ) && ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
+		einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+pre_build_checks() {
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="4G"
+	CHECKREQS_DISK_BUILD="12G"
+	tc-is-cross-compiler && CHECKREQS_DISK_BUILD="14G"
+	if use lto || use pgo; then
+		CHECKREQS_MEMORY="9G"
+		CHECKREQS_DISK_BUILD="13G"
+		tc-is-cross-compiler && CHECKREQS_DISK_BUILD="16G"
+		use pgo && CHECKREQS_DISK_BUILD="20G"
+	fi
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		if use custom-cflags || use component-build; then
+			CHECKREQS_DISK_BUILD="25G"
+		fi
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	check-reqs_${EBUILD_PHASE_FUNC}
+}
+
+pkg_pretend() {
+	pre_build_checks
+
+	if use headless; then
+		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "vaapi" "wayland")
+		for myiuse in ${headless_unused_flags[@]}; do
+			use ${myiuse} && ewarn "Ignoring USE=${myiuse} since USE=headless is set."
+		done
+	fi
+}
+
+pkg_setup() {
+	if use lto || use pgo; then
+		llvm_pkg_setup
+	fi
+
+	pre_build_checks
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 12; then
+			die "At least gcc 12 is required"
+		fi
+		if use pgo && tc-is-cross-compiler; then
+			die "The pgo USE flag cannot be used when cross-compiling"
+		fi
+		if needs_clang && ! tc-is-clang; then
+			if tc-is-cross-compiler; then
+				CPP="${CBUILD}-clang++ -E"
+			else
+				CPP="${CHOST}-clang++ -E"
+			fi
+			if ! ver_test "$(clang-major-version)" -ge 16; then
+				die "At least clang 16 is required"
+			fi
+		fi
+	fi
+
+	chromium_suid_sandbox_check_kernel_config
+
+	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
+	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
+		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
+		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# disable global media controls, crashes with libstdc++
+	sed -i -e \
+		"/\"GlobalMediaControlsCastStartStop\",/{n;s/ENABLED/DISABLED/;}" \
+		"chrome/browser/media/router/media_router_feature.cc" || die
+
+	rm "${WORKDIR}/chromium-112-gcc-13-patches/chromium-112-gcc-13-0002-perfetto.patch" || die
+	rm "${WORKDIR}/chromium-112-gcc-13-patches/chromium-112-gcc-13-0012-webrtc-base64.patch" || die
+	rm "${WORKDIR}/chromium-112-gcc-13-patches/chromium-112-gcc-13-0013-quiche.patch" || die
+
+	local PATCHES=(
+		#"${WORKDIR}/patches"
+		"${FILESDIR}/chromium-98-gtk4-build.patch"
+		"${FILESDIR}/chromium-108-EnumTable-crash.patch"
+		"${FILESDIR}/chromium-109-system-zlib.patch"
+		"${FILESDIR}/chromium-109-system-openh264.patch"
+		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
+		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
+		"${FILESDIR}/chromium-cross-compile.patch"
+		"${FILESDIR}/chromium-113-compiler.patch"
+		"${WORKDIR}/chromium-112-gcc-13-patches"
+		"${FILESDIR}/chromium-113-swiftshader-cstdint.patch"
+		"${FILESDIR}/chromium-113-system-zlib.patch"
+		"${FILESDIR}/chromium-113-web_view_impl-cstring.patch"
+		"${FILESDIR}/chromium-113-std-monospace.patch"
+		"${FILESDIR}/chromium-113-gcc-13-0001-vulkanmemoryallocator.patch"
+	)
+
+	if use ppc64 ; then
+		local p
+		for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series | grep "^ppc64le" || die); do
+			if [[ ! $p =~ "fix-breakpad-compile.patch" ]]; then
+				eapply "${WORKDIR}/debian/patches/${p}"
+			fi
+		done
+		PATCHES+=( "${WORKDIR}/ppc64le" )
+	fi
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	# adjust python interpreter version
+	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
+	sed -i -e "s|vpython3|${EPYTHON}|g" testing/xvfb.py || die
+
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/double_conversion
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/ceval
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/systeminfo
+		third_party/angle/src/third_party/volk
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/blink
+		third_party/bidimapper
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4-4.9.3
+		third_party/catapult/third_party/html5lib-1.1
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jpeg-js
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/content_analysis_sdk
+		third_party/cpuinfo
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/dawn
+		third_party/dawn/third_party/gn/webgpu-cts
+		third_party/dawn/third_party/khronos
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
+		third_party/devtools-frontend/src/front_end/third_party/axe-core
+		third_party/devtools-frontend/src/front_end/third_party/chromium
+		third_party/devtools-frontend/src/front_end/third_party/codemirror
+		third_party/devtools-frontend/src/front_end/third_party/diff
+		third_party/devtools-frontend/src/front_end/third_party/i18n
+		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
+		third_party/devtools-frontend/src/front_end/third_party/lighthouse
+		third_party/devtools-frontend/src/front_end/third_party/lit
+		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
+		third_party/devtools-frontend/src/front_end/third_party/marked
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt
+		third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data
+		third_party/devtools-frontend/src/front_end/third_party/wasmparser
+		third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
+		third_party/devtools-frontend/src/third_party
+		third_party/distributed_point_functions
+		third_party/dom_distiller_js
+		third_party/eigen3
+		third_party/emoji-segmenter
+		third_party/farmhash
+		third_party/fdlibm
+		third_party/fft2d
+		third_party/flatbuffers
+		third_party/fp16
+		third_party/freetype
+		third_party/fusejs
+		third_party/fxdiv
+		third_party/highway
+		third_party/liburlpattern
+		third_party/libzip
+		third_party/gemmlowp
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/ipcz
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libaddressinput
+		third_party/libavif
+		third_party/libevent
+		third_party/libgav1
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libva_protected_content
+		third_party/libvpx
+		third_party/libvpx/source/libvpx/third_party/x86inc
+		third_party/libwebm
+		third_party/libx11
+		third_party/libxcb-keysyms
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lottie
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mako
+		third_party/maldoca
+		third_party/maldoca/src/third_party/tensorflow_protos
+		third_party/maldoca/src/third_party/zlibwrapper
+		third_party/markupsafe
+		third_party/material_color_utilities
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/minigbm
+		third_party/modp_b64
+		third_party/nasm
+		third_party/nearby
+		third_party/neon_2_sse
+		third_party/node
+		third_party/omnibox_proto
+		third_party/one_euro_filter
+		third_party/openscreen
+		third_party/openscreen/src/third_party/mozilla
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/perfetto
+		third_party/perfetto/protos/third_party/chromium
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private-join-and-compute
+		third_party/private_membership
+		third_party/protobuf
+		third_party/pthreadpool
+		third_party/pyjson5
+		third_party/pyyaml
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/securemessage
+		third_party/selenium-atoms
+		third_party/shell-encryption
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/snappy
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/astc-encoder
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/subzero
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
+		third_party/swiftshader/third_party/SPIRV-Tools
+		third_party/tensorflow_models
+		third_party/tensorflow-text
+		third_party/tflite
+		third_party/tflite/src/third_party/eigen3
+		third_party/tflite/src/third_party/fft2d
+		third_party/ruy
+		third_party/six
+		third_party/ukey2
+		third_party/unrar
+		third_party/utf
+		third_party/vulkan
+		third_party/wayland
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webgpu-cts
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/ooura
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/wuffs
+		third_party/x11proto
+		third_party/xcbproto
+		third_party/xnnpack
+		third_party/zxcvbn-cpp
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/glibc
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if ! use system-png; then
+		keeplibs+=( third_party/libpng )
+	fi
+	if ! use system-av1; then
+		keeplibs+=(
+			third_party/dav1d
+			third_party/libaom
+			third_party/libaom/source/libaom/third_party/fastfeat
+			third_party/libaom/source/libaom/third_party/SVT-AV1
+			third_party/libaom/source/libaom/third_party/vector
+			third_party/libaom/source/libaom/third_party/x86inc
+		)
+	fi
+	if ! use system-harfbuzz; then
+		keeplibs+=( third_party/harfbuzz-ng )
+	fi
+	if use libcxx; then
+		keeplibs+=( third_party/re2 )
+	fi
+	if use arm64 || use ppc64 ; then
+		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
+	fi
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	# it has to be done before unbundling.
+	if use ppc64; then
+		pushd third_party/libvpx >/dev/null || die
+		mkdir -p source/config/linux/ppc64 || die
+		# requires git and clang, bug #832803
+		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g" \
+			generate_gni.sh || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+
+		pushd third_party/ffmpeg >/dev/null || die
+		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
+		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
+		popd >/dev/null || die
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+
+	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
+	mkdir -p buildtools/third_party/eu-strip/bin || die
+	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
+}
+
+chromium_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if needs_clang && ! tc-is-clang; then
+		# Force clang since gcc is either broken or build is using libcxx.
+		if tc-is-cross-compiler; then
+			CC="${CBUILD}-clang -target ${CHOST} --sysroot ${ESYSROOT}"
+			CXX="${CBUILD}-clang++ -target ${CHOST} --sysroot ${ESYSROOT}"
+			BUILD_CC=${CBUILD}-clang
+			BUILD_CXX=${CBUILD}-clang++
+		else
+			CC=${CHOST}-clang
+			CXX=${CHOST}-clang++
+		fi
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Force lld for lto or pgo builds only, otherwise disable, bug 641556
+	if use lto || use pgo; then
+		myconf_gn+=" use_lld=true"
+	else
+		myconf_gn+=" use_lld=false"
+	fi
+
+	if use lto || use pgo; then
+		AR=llvm-ar
+		NM=llvm-nm
+		if tc-is-cross-compiler; then
+			BUILD_AR=llvm-ar
+			BUILD_NM=llvm-nm
+		fi
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
+		myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
+
+		# setup cups-config, build system only uses --libs option
+		if use cups; then
+			mkdir "${T}/cups-config" || die
+			cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
+			export PATH="${PATH}:${T}/cups-config"
+		fi
+
+		# Don't inherit PKG_CONFIG_PATH from environment
+		local -x PKG_CONFIG_PATH=
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# Create dummy pkg-config file for libsystemd, only dependency of installer
+	mkdir "${T}/libsystemd" || die
+	cat <<- EOF > "${T}/libsystemd/libsystemd.pc"
+		Name:
+		Description:
+		Version:
+	EOF
+	local -x PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+"${PKG_CONFIG_PATH}:"}${T}/libsystemd"
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
+	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
+	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
+	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libwebp
+		libxml
+		libxslt
+		openh264
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-png; then
+		gn_system_libraries+=( libpng )
+	fi
+	if use system-av1; then
+		gn_system_libraries+=( dav1d libaom )
+	fi
+	# re2 library interface relies on std::string and std::vector
+	if ! use libcxx; then
+		gn_system_libraries+=( re2 )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
+
+	# Disable deprecated libgnome-keyring dependency, bug #713012
+	myconf_gn+=" use_gnome_keyring=false"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+
+	if use headless; then
+		myconf_gn+=" use_cups=false"
+		myconf_gn+=" use_kerberos=false"
+		myconf_gn+=" use_pulseaudio=false"
+		myconf_gn+=" use_vaapi=false"
+		myconf_gn+=" rtc_use_pipewire=false"
+	else
+		myconf_gn+=" use_cups=$(usex cups true false)"
+		myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
+		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
+		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
+	fi
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" disable_fieldtrial_testing_config=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false"
+	myconf_gn+=" use_custom_libcxx=$(usex libcxx true false)"
+
+	# Disable pseudolocales, only used for testing
+	myconf_gn+=" enable_pseudolocales=false"
+
+	# Disable code formating of generated files
+	myconf_gn+=" blink_enable_generated_code_formatting=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info. The OAuth2 credentials, however, have been left out.
+	# Those OAuth2 credentials have been broken for quite some time anyway.
+	# Instead we apply a patch to use the --oauth2-client-id= and
+	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
+	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
+	# Chromium without baked-in values.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		if ! use component-build || use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a
+		fi
+
+		if tc-is-gcc; then
+			# https://bugs.gentoo.org/904455
+			append-cxxflags "$(test-flags-CXX -fno-tree-vectorize)"
+		fi
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Disable external code space for V8 for ppc64. It is disabled for ppc64
+	# by default, but cross-compiling on amd64 enables it again.
+	if tc-is-cross-compiler; then
+		if ! use amd64 && ! use arm64; then
+			myconf_gn+=" v8_enable_external_code_space=false"
+		fi
+	fi
+
+	# Only enabled for clang, but gcc has endian macros too
+	myconf_gn+=" v8_use_libm_trig_functions=true"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	# Disable unknown warning message from clang.
+	if tc-is-clang; then
+		append-flags -Wno-unknown-warning-option
+		if tc-is-cross-compiler; then
+			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
+			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
+		fi
+	fi
+
+	# Explicitly disable ICU data file support for system-icu/headless builds.
+	if use system-icu || use headless; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Enable ozone wayland and/or headless support
+	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+	myconf_gn+=" ozone_platform_headless=true"
+	if use headless; then
+		myconf_gn+=" ozone_platform=\"headless\""
+		myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"
+		myconf_gn+=" use_glib=false use_gio=false"
+		myconf_gn+=" use_pangocairo=false use_alsa=false"
+		myconf_gn+=" use_libpci=false use_udev=false"
+		myconf_gn+=" enable_print_preview=false"
+		myconf_gn+=" enable_remoting=false"
+	else
+		myconf_gn+=" use_system_libdrm=true"
+		myconf_gn+=" use_system_minigbm=true"
+		myconf_gn+=" use_xkbcommon=true"
+		if use qt5; then
+			local moc_dir="$(qt5_get_bindir)"
+			if tc-is-cross-compiler; then
+				# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+				local cbuild_libdir=$($(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libxslt)
+				cbuild_libdir=${cbuild_libdir:2}
+				moc_dir="${EPREFIX}"/${cbuild_libdir/% }/qt5/bin
+			fi
+			export PATH="${PATH}:${moc_dir}"
+		fi
+		myconf_gn+=" use_qt=$(usex qt5 true false)"
+		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
+		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
+		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
+		use wayland && myconf_gn+=" use_system_libffi=true"
+	fi
+
+	# Results in undefined references in chrome linking, may require CFI to work
+	if use arm64; then
+		myconf_gn+=" arm_control_flow_integrity=\"none\""
+	fi
+
+	# Enable official builds
+	myconf_gn+=" is_official_build=$(usex official true false)"
+	myconf_gn+=" use_thin_lto=$(usex lto true false)"
+	myconf_gn+=" thin_lto_enable_optimizations=$(usex lto true false)"
+	if use official; then
+		# Allow building against system libraries in official builds
+		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+			tools/generate_shim_headers/generate_shim_headers.py || die
+		# Disable CFI: unsupported for GCC, requires clang+lto+lld
+		myconf_gn+=" is_cfi=false"
+		# Don't add symbols to build
+		myconf_gn+=" symbol_level=0"
+	fi
+
+	if use pgo; then
+		myconf_gn+=" chrome_pgo_phase=${1}"
+		if [[ "$1" == "2" ]]; then
+			myconf_gn+=" pgo_data_path=\"${2}\""
+		fi
+	else
+		# Disable PGO, because profile data is only compatible with >=clang-11
+		myconf_gn+=" chrome_pgo_phase=0"
+	fi
+
+	# user CXXFLAGS might overwrite -march=armv8-a+crc+crypto, bug #851639
+	if use arm64 && tc-is-gcc; then
+		sed -i '/^#if HAVE_ARM64_CRC32C/a #pragma GCC target ("+crc+crypto")' \
+			third_party/crc32c/src/src/crc32c_arm64.cc || die
+	fi
+
+	# skipping typecheck is only supported on amd64, bug #876157
+	if ! use amd64; then
+		myconf_gn+=" devtools_skip_typecheck=false"
+	fi
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	chromium_configure $(usex pgo 1 0)
+}
+
+chromium_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
+	local -x PYTHONPATH=
+
+	# Build mksnapshot and pax-mark it.
+	if use pax-kernel; then
+		local x
+		for x in mksnapshot v8_context_snapshot_generator; do
+			if tc-is-cross-compiler; then
+				eninja -C out/Release "host/${x}"
+				pax-mark m "out/Release/host/${x}"
+			else
+				eninja -C out/Release "${x}"
+				pax-mark m "out/Release/${x}"
+			fi
+		done
+	fi
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+}
+
+# This function is called from virtx, and must always return so that Xvfb
+# session isn't left running. If we return 1, virtx will call die().
+chromium_profile() {
+	einfo "Profiling for PGO"
+
+	pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
+
+	# Remove old profdata in case profiling was interrupted.
+	rm -rf "${1}" || return 1
+
+	if ! "${EPYTHON}" ./chromium_profiler.py \
+		--chrome-executable "${S}/out/Release/chrome" \
+		--chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
+		--add-arg no-sandbox --add-arg disable-dev-shm-usage \
+		--profile-output "${1}"; then
+		eerror "Profiling failed"
+		return 1
+	fi
+
+	popd >/dev/null || return 1
+}
+
+src_compile() {
+	if use pgo; then
+		local profdata
+
+		profdata="${WORKDIR}/chromium.profdata"
+
+		if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
+			chromium_compile
+			virtx chromium_profile "$profdata"
+
+			touch "${WORKDIR}/.pgo-profiled" || die
+		fi
+
+		if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
+			# Remove phase 1 output
+			rm -r out/Release || die
+
+			chromium_configure 2 "$profdata"
+
+			touch "${WORKDIR}/.pgo-phase-2-configured" || die
+		fi
+
+		if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
+			chromium_compile
+			touch "${WORKDIR}/.pgo-phase-2-compiled" || die
+		fi
+	else
+		chromium_compile
+	fi
+
+	mv out/Release/chromedriver{.unstripped,} || die
+
+	rm -f out/Release/locales/*.pak.info || die
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
+
+	# Build vk_swiftshader_icd.json; bug #827861
+	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
+		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
+		out/Release/vk_swiftshader_icd.json || die
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+	doexe out/Release/chrome_crashpad_handler
+
+	ozone_auto_session () {
+		use X && use wayland && ! use headless && echo true || echo false
+	}
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so out/Release/*.so.[0-9])
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
+
+	# Install bundled xdg-utils, avoids installing X11 libraries with USE="-X wayland"
+	doins out/Release/xdg-{settings,mime}
+
+	if ! use system-icu && ! use headless; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/MEIPreload
+
+	# Install vk_swiftshader_icd.json; bug #827861
+	doins out/Release/vk_swiftshader_icd.json
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+
+	if ! use headless; then
+		if use vaapi; then
+			elog "VA-API is disabled by default at runtime. You have to enable it"
+			elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
+			elog "in /etc/chromium/default."
+		fi
+		if use screencast; then
+			elog "Screencast is disabled by default at runtime. Either enable it"
+			elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
+			elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
+			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+		fi
+		if use gtk4; then
+			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
+			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
+			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+		fi
+	fi
+}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 44ce1ce8b3a7..f301bba66699 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 07fb77b2e009..1b75d60b6d72 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -8,6 +8,6 @@ DIST xterm-380.tgz 1537369 BLAKE2B ef4114ef3e9a2c731839689f62a7aab9549302c4d8646
 DIST xterm-380.tgz.asc 729 BLAKE2B 1dda140314e7f08c961f697f0fa17454d4dab2c909b3b21203503ee295ac17aa91b91c27eff38b81586b89ccbafef543cface7f6c600e62f89a9c35a4dbde4a6 SHA512 c3ce95c6b93daecab419b50c4bdb5576599ba1ba291e24217264ff88c42d6c46bb91d10bdb8b990168814c5c771bfe2b4e2879e2ce9d279cab73baac6c2addad
 EBUILD xterm-377-r1.ebuild 2968 BLAKE2B 60773e746e2ed4711edf3733b4f47af402d363a47c1f437e4dd17e41f16434901b265117deff120d149ee58957bdee808e008b15174a9e7197cf7cd2986e8c90 SHA512 f17060a11775ce57a822596cd6560566ddac01e424e0b641bc1d63b1b475f0d5243fecc422cad7d2d6c8fa56ed42eac24919d78a8e3ba8d1cc787ef91e487db1
 EBUILD xterm-378.ebuild 2968 BLAKE2B 60773e746e2ed4711edf3733b4f47af402d363a47c1f437e4dd17e41f16434901b265117deff120d149ee58957bdee808e008b15174a9e7197cf7cd2986e8c90 SHA512 f17060a11775ce57a822596cd6560566ddac01e424e0b641bc1d63b1b475f0d5243fecc422cad7d2d6c8fa56ed42eac24919d78a8e3ba8d1cc787ef91e487db1
-EBUILD xterm-379.ebuild 2970 BLAKE2B 58540062a8edccb5befc607d1c1266e2e8791a70f9e72fa4f260a71b4d480355e7748ef5459135f74b62b5e6c6c8d4898654c741a75ee85c5678f7cad575f50a SHA512 793201811b1b80ae0129e8ff2ce7464cfc730ba75a36b0be42eb23cd3459133ff9fb8b60df3fba677c3d6e6b49d90c4bba6e1c13ba840090ee5b1a91363c0e11
+EBUILD xterm-379.ebuild 2968 BLAKE2B 60773e746e2ed4711edf3733b4f47af402d363a47c1f437e4dd17e41f16434901b265117deff120d149ee58957bdee808e008b15174a9e7197cf7cd2986e8c90 SHA512 f17060a11775ce57a822596cd6560566ddac01e424e0b641bc1d63b1b475f0d5243fecc422cad7d2d6c8fa56ed42eac24919d78a8e3ba8d1cc787ef91e487db1
 EBUILD xterm-380.ebuild 2975 BLAKE2B f9239afb2da97d6ca1dda8b48fbc8a0df5b3d9a495252851e7b76b02d50d44c06d5b394fb82cf8a0ae2da869b23dce5fa15a58ef32a999853dfa75313a4cb72d SHA512 e561b4c6d25c2e277ea3733297f09141ef5105b18e8b17a99700bab39b413bdda5bb8283f1e89c736b024174a2682db41b6b644ee9a501d75d33acaa72b49773
 MISC metadata.xml 552 BLAKE2B 1de52230aa9b681cee30dd4ee4651521bf9474cb2a99168fd6c8f13e0918cf185dbddd3dc6f97e0c81118680294e9c4d74137378763b021a07d8ce0a1430e18c SHA512 019a08f2f03a270da7a33bf1b0e9bb42864b806990884b9f2c19110238ad5d5fd18bc896e9fa7cde130b4ccf3f7003db43f6b485caf5b021f5d5e36f279f9d36
diff --git a/x11-terms/xterm/xterm-379.ebuild b/x11-terms/xterm/xterm-379.ebuild
index da16144976ee..4bda42aad115 100644
--- a/x11-terms/xterm/xterm-379.ebuild
+++ b/x11-terms/xterm/xterm-379.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 DEPEND="
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index c8e29d9326d7..a5fb8ee3ade2 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/gentoo-artwork/Manifest b/x11-themes/gentoo-artwork/Manifest
index 2e0bfb2c9539..ed0b44861655 100644
--- a/x11-themes/gentoo-artwork/Manifest
+++ b/x11-themes/gentoo-artwork/Manifest
@@ -6,5 +6,5 @@ DIST gentoo-artwork-0.4.1.tar.bz2 2794643 BLAKE2B 9798517f1f6c2260a7735499e90f73
 DIST gentoo-artwork-0.4.2.tar.bz2 612218 BLAKE2B d99af474be50469d17ebe60570ba86bbf2b1605dccb40bc60527a53826ebed63588340e899682c8da6df7807522b6acab5181cc2ce964f40d4453cc5303e6a08 SHA512 cf8283f0743ff8ab8b39b7c39cc12c74d5c3ff7b8b0e84f2b3ba34657b16ed3657e155aa17ec1602b0e70f57e30fae5869c9f3405f825a1c67a0e7b48c73edd1
 DIST gentoo-artwork-0.4.tar.bz2 26804896 BLAKE2B fd146c388cb2b91ef6564f1075ee70eee5483c01a79c17e18d79b6b8609cb8f7cf11fe696ab8f1ddf24c8e8a96b2882fdbf350cc709ebe7189236686262d9cea SHA512 62b0e3043fad711acef01aefb5e56a216e890bb99eaa31b78e3b37c3d0495eeffbf19b1b332febfd5f791a7098225816f729f4159b945d2466e91ef78db668c4
 DIST gentoo-bubble-icons-20060811.tar.gz 2340198 BLAKE2B 1d54be19bcb3ce3edafbf07cacf23ac7d179f12789c31027035c9d983be40ae45d328e511ad1500d153103ec80f3ba06021e144dfe18ca18939fcf9cd539059a SHA512 5a208fb82240f13edeb87019977cc4788a2f9b84465b298133a717e589c483e91fcb40b9c8a9a459d6030fc984a8855059edf5f774233e8142ecfc39473d5850
-EBUILD gentoo-artwork-0.4.2-r1.ebuild 4544 BLAKE2B dc29b6d00e8db0e121138de7ca67bd6abec1bbb41f36b4762da72a2d5dff92896275354404064c09d4f1e95edee01952afb06593680dd6aec28d96a936f8d016 SHA512 73a428afccdab938166383dd9876361947af51e3c6be6e966f9f23d191af89aa8aa465fff0496dea393e27659d45b048c966f50920ab65e20388ddcd1ac8af33
+EBUILD gentoo-artwork-0.4.2-r1.ebuild 4551 BLAKE2B 1c8415eb12eec68fdcba4e94e724a9d569302620613ed470326eead96af349e3c8be196bdcfea250b3dadfc4651efd4f128fb655b24953a91ddc5a3032b845b4 SHA512 b9592ef9a5ad2758f71f8ed75e4c5fa2dcab3f7ca22036b8bae5137c7b5ed6210f5fbc6e318cdb7e3bc5400c72b252ec7490d7a36de45dab1119a3944810f35d
 MISC metadata.xml 410 BLAKE2B 2afcb0ea69fd11ff380365bf62dc4d8244842af2676e56f01231a2ee81a0855c74d31a2bf384f22885e01dbcf68b74a3a563f5e495d5b37c5e8ee2152c303bd1 SHA512 02928097b158d062ea183b64641cb4a5712e26a0b907164b0d2e049804a59e3e3eab0fc4cb58f117e03ce5987af7a2b66d8c3b48f2502683c2586da9409818e2
diff --git a/x11-themes/gentoo-artwork/gentoo-artwork-0.4.2-r1.ebuild b/x11-themes/gentoo-artwork/gentoo-artwork-0.4.2-r1.ebuild
index 274e05b862ba..7da211b69ba5 100644
--- a/x11-themes/gentoo-artwork/gentoo-artwork-0.4.2-r1.ebuild
+++ b/x11-themes/gentoo-artwork/gentoo-artwork-0.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,7 +33,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~mips ppc ppc64 sparc x86"
 IUSE="+grub +icons kde lilo offensive +pixmaps"
 RESTRICT="binchecks strip"