gentoo auto-resync : 27:04:2023 - 12:17:07

author: V3n3RiX <venerix@koprulu.sector> 2023-04-27 12:17:07 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-04-27 12:17:07 +0100
commit: c8e8719ce75120aeba1784b5edbe919b2e5e3dc3 (patch)
tree: 7945df945695274ce144a17413a1560dd350a60c
parent: 4936e2350e0b4aae482b12c7ce02aaa3c7e64842 (diff)
166 files changed, 1425 insertions, 1534 deletions
diff --git a/Manifest b/Manifest
index 9a3964afa4c7..8ea43f4c0222 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29483 BLAKE2B dca4d37d62fe7afbdc673a597288b18bf1df2ecadc5a6b6a61aef1820a99fcf1a5d2f0c772da56a853a5913cbe599e85d80d25341661517881cdbf539bceb6ff SHA512 6e3e25016bb35be6b316209f0b22912024d4588a94aa550d955fe559f9d880e3f3f1aabec2b9dbd511e16a05c3c8ffe858277d51c5b9e47ceac9471c206e23c4
-TIMESTAMP 2023-04-27T04:39:46Z
+MANIFEST Manifest.files.gz 29464 BLAKE2B 7e0fd4ed152f1c5bbace2765877ca556037b111669e1282f3e24a910216da60d1f1e537648fe1e2a4cd66a6825f0efb6d833e8918c5bf9bea44286ea53af40ba SHA512 793089a389e878aed369779cec4ebb030e7f835b07810ee3545bae16b80ee94db20f877a430110901bc939b28d1b652eaceb9e8f5b15b8f2dda754854dda03e4
+TIMESTAMP 2023-04-27T10:39:43Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRJ/JJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRKUO9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAgNRAAtuPySslaoWMh5roAEbIW+EMOdp5HxiQDdVpZWqJ9+n74l2qRb39J3MNK
-sm+4VLZv06iyHAiNzz8Q+jvlBXBBKZupHJOSmVtUo4S+expyV/H4XKGil9J8pEJQ
-hjhxGwyNpbckEgNYcOQRgxXVyGhjZHZPIT2N1mFvMP9PntZYO7Ofe6Q1V3AsP53E
-NaBzoBfUoltleE6HElKtryhCQEpBVK1mgJEFqoAX/btmZr9h1WcypuGXH3YNUv83
-uh5YA3705RSEiBJk31RDf0frA/9y24kbWWiZw1qPNuUW6nk5yBWdY0qccc9Bmr+f
-I3KuZpiIFjD1g81jPuroT23UCL9r3d1OPxzRL/Veq5Yr8+VbbSfmS3RTNBnKRKc6
-IZmc1nNRPmsuNPbB/hweieC0+3Em/WbXDCMB++6bvVZ17Ip6qcm54k4bkuaDCJJl
-wLV/tiLNLS0lLUewIbLNiACFUg2Y38gns8ulYGWiO5qZ3Jmu6BGdkszd9ZIx+fle
-bosNJk4EU/GcYQiDESFvrHM7IN/KF7nyE5FGsBkJvWStKxWSmIXsRh9lqc4gRmtE
-XZmyTxKJssqyPoW7bqRe/60K56Jg+Q2z7ol0i93GErKFtoI/QJt5+60Lpv0DCzCw
-nQ3/vcsL9sW+ddsowvRgt6uaKBEu81klKhPdDxfRKoGCLXpy4UM=
-=CyPS
+klD7pBAAozOJQdbNzgvyu6UtWb5qSn/HotVUdRWdTT3oFlO4gcK46dIrDa5WLvAb
+MOkUWzhwYoIxrR4crTPop6CtORbpiRlMxzB33HgW2LzGyLWIABGZfOwlvScbEHrZ
+HQA/0TPLb/nOYp45Jd1djxhI5tFJp0zR2Js//d2+0KO7nKuGtuRrMUuwzsV/6XDx
+KBMBF6arOmLteLy+a1spib5ojpTqxHBQOVxSx/5OobVxj7Mrzy+yi03CtsHt1Po/
+Eyt5Z7Dcp1mSc8zGhU4OgY1WGHLcHWlE00FyxiyJj+TQg8DedKVNXhIRz79y6riq
+l1zJhuOafTg773fwtGw4OAPIeVKt50LozjyA4O+SqSebIL9JvhWIcDhzX5VDLEoT
+YC/EiH/uNphs0CR96IH/CPPbOYYehCbrvB+frIMlw6QF4rZKsCnKtun641z/sIe8
+d2TWw434xRwCxEYb2nzofLejKfC2BxvYT6XmUUGS4DclxUHlROIQcWz+mh1kAI0F
+2JpiE/C0Jk9ieCVgFNFX3mrr+q7tvBC+8JjOk0AtnYOuX617QLJioO+NmOvNBlv8
+iHJYnAlqpCI29wlYLHOB4SqqweYXrrHmyl/lktFI1MyFWvmYX7dJycgXTG+FfpQN
+9+qCWg5W+MQ/flvB47eO4+oTD3OTu1qku2ho8SY+TeYcpfKVwyE=
+=D0Pr
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index a2c45d9a6133..7311702b7101 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index f033f835046e..a5b0320a022d 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/command-t/Manifest b/app-vim/command-t/Manifest
index 8a70eddc202b..3dfefe912797 100644
--- a/app-vim/command-t/Manifest
+++ b/app-vim/command-t/Manifest
@@ -1,3 +1,3 @@
 DIST command-t-5.0.3.tar.gz 84019 BLAKE2B fec893aa698a1d1bfc86cf7bd08562f19b54e58d81b7650e50acdf17bfcec54f78aae38d05ca5f93ae60c981a6e606d5c68c008be3508c7d41e74aa9f064943a SHA512 588ee1516039e6cd45210de43307c02259fed29cc7610c222fe705cdf1d5938f51f823d41b546a36320da31db12e902363867da91b18fe56ea09c1efe2bb51fb
-EBUILD command-t-5.0.3-r1.ebuild 1231 BLAKE2B 9afdf59212b3d02bc2a898ed31f2acd619242badef9823c8dda2e0135bf4b65a509e22a4a4e03b650f78fb2fee304ee9e8dc341f543ac6b2d0d3581c83792331 SHA512 76fbed23a6e345342a236311051ebdcf3c2330a8b5dec7a8e34d43d9eed2ed3aab334f4b13c6dc03f45405a49c102925ed1d5067ab8068ece73ab36ae89f22a0
+EBUILD command-t-5.0.3-r1.ebuild 1231 BLAKE2B 5c07956b963071d4927f6c8eaba6166efee743a14ee3f949e1c860faebeafba23322d8a7b4e1c29e72bba0ac572922b33107c904aa20f45af3afa139419841cd SHA512 7508cb2600931feeae91ce9638963ca11578d47f7055f24933ede2250bf8d11ea9081271590e770bbe5dc03d519c2b8dece9bde0a2382d20339b8728cde2d5c7
 MISC metadata.xml 332 BLAKE2B 2cb0014bbfdaad5ce956789dfe9da16946df23b6141576d766b45c1f2fec538b67528fa0b424310bf0b57ddb27a923ff1b8bd286288a4beaa7ace02a9f91278a SHA512 fe0ee1fca7681866403add9a498f9a46f3a33186fc3c3fe40d96234def8b46cf1f9b7b03cbce3944286725da600e4d8b7b73464ad458c222c16137d0490e4ea2
diff --git a/app-vim/command-t/command-t-5.0.3-r1.ebuild b/app-vim/command-t/command-t-5.0.3-r1.ebuild
index 88a26579c200..d5cf40b7a988 100644
--- a/app-vim/command-t/command-t-5.0.3-r1.ebuild
+++ b/app-vim/command-t/command-t-5.0.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 inherit vim-plugin ruby-ng
 
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 453205e2194c..243d8885d3ac 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index bbf508491731..22b1794eb52e 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -13,5 +13,5 @@ DIST R-4.2.3.tar.gz 34010655 BLAKE2B 688403c693de348bdc404c0ebc2df08d3415db216f6
 DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06
 EBUILD R-4.2.1.ebuild 7216 BLAKE2B 2aaa42ab58b3408d544d6902ae4629a473aacf04802474296aad08a4c489cfa3312ca7a4464b3679f6670015356d0a54a1a0d9e55dcaf53638a0c9a3ae89e158 SHA512 7100728db02324e66ca3d2b7c597abdeddedabfde503dd62770dfc1912b9eff0f6dc3ace463fbab5c9141d5fb8ba303ee0dab200cdcdd82df8d9940cad8923be
 EBUILD R-4.2.2.ebuild 7207 BLAKE2B 9f39262165aef3b16147413a0247811d0ade7928cdc782eaa836da3687d11bd6c3ac10d83f31fa84ad456e969f2c7620b54ca7e542cf3a108ac573d2b8dc367f SHA512 bab1ea536c51b2a3e738dbd49d26dc38b978581ced9882e67c88fc1dbbfb6ed8e11b283fbd87c7459ab068db8c8a6982064df7f16985072236e9da9840306901
-EBUILD R-4.2.3.ebuild 7201 BLAKE2B 3e8bd6dce0a95f69e0008f186339757e3e3532ad44e7eca9e54cda8d4acfb2f573bc216d9b27639b79723873d03e8918413b30aee8bdffcbbc758ffe41526628 SHA512 d30c4391289226cc1e1083d6a0fb16fa3699cca53ef39b64a837ede53de73b054ba3e0f8b94b0b2c8915d2cfa38bf96ff0e09f00aba946bd3f79ce117e66d3d4
+EBUILD R-4.2.3.ebuild 7200 BLAKE2B 3402ca2b92da081ca7b59285bbae8e7c1299d09492a3b622c81046a90e1c83a0c099faab64cd1c3696aaacd95e1dfad7a16f3cc00c85a6aaa06a3dd2370fe593 SHA512 6043569b9ec0836d2f0889c95cc053638aa23fc4dca5aaaed30e56656651f8f7f337b0ebc73954938255b43c4c0ca6df33f994f78db29637c8def418ce2d4798
 MISC metadata.xml 1344 BLAKE2B c47085197e990eecc6d316980dddcd2f6b2a5f5cfeae4a92b2de2ee5733de56f1aaa182f0c4e8b1b62207518123b60150685edb2ee5b734098121f09e6d963f6 SHA512 d959b84becffe57ac8d49aef9d2d7a294a7428972a8e4e438e26f99c09b4515db3723a09f7a75a6c5649c5cff38898fa13d2f894181060a8eaff1ee4a12dd07d
diff --git a/dev-lang/R/R-4.2.3.ebuild b/dev-lang/R/R-4.2.3.ebuild
index 5fa0d6b05b51..3f7cb8f4f773 100644
--- a/dev-lang/R/R-4.2.3.ebuild
+++ b/dev-lang/R/R-4.2.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~loong ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ~loong ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cairo doc icu java jpeg lapack lto minimal nls openmp perl png prefix profile readline test tiff tk X"
 
 REQUIRED_USE="
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index f7281ab6b6fe..98f1ac4766f4 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/bemenu/Manifest b/dev-libs/bemenu/Manifest
index 673165752e30..f611c5ca8b2e 100644
--- a/dev-libs/bemenu/Manifest
+++ b/dev-libs/bemenu/Manifest
@@ -1,4 +1,4 @@
 DIST bemenu-0.6.10.tar.gz 129568 BLAKE2B f81e84e6457175abf11b9dc6c426cb02121b4f101bdef55361c539f6d51144539129d2e2898e506c12f32d8f45a27fb0159083b5b964b33a0fc73485ebe41b00 SHA512 b8aadbe2cd11f7cc713ce683fcc9ce4779cd0050ee8cf41c4d3bca9f299ac99b9cd3b7611d87d27d7f7439f16fc2618671f2bec8878ad2ab65fade54f24ca92f
-EBUILD bemenu-0.6.10.ebuild 1219 BLAKE2B c2b9647b022ddf59b393e213048dcb9151c627bb463b525d881e4f2c8e194302fe82b72c73e5d902e6bab416b92bfdf035bfd6820d9b21b8336fa9565a686c05 SHA512 e7669e63c85b80da2d3a5579adac66d90b598f71a09557b8d168398a70086e28756630628c24c6f0d7e5e4251144519681da6fe07d0e151af3e8f0de22e994ea
-EBUILD bemenu-9999.ebuild 1221 BLAKE2B 33e686ff01e95ee482efeb79882a8163547ed830d48ee2924f3694f743c6e35d6ef209abbeb0cbfcc5b13429536b64404d719a89da05d014a53fa83cbffff26b SHA512 4e8755cd9f99854f9da90d419d462b60a409dfd166a0ed27a2ba82ea54e90453b845a3fc893d2a516d8af19d4dfe7b69595b45af7e3198002859d6e764af3bd9
-MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
+EBUILD bemenu-0.6.10-r1.ebuild 1222 BLAKE2B a9052036e76aabf8596ec612e495a852f399b9834ab489b992a8b7189ac9b4ece7a5b94869e4f758f49e9726ea5d11317f8ad711498387275f04287af2383e47 SHA512 d0c074c86cea9fa146cd9c86fe1160293c4f2b28689f995c4cdc365a44079130a258e73d88316305cb4d0b2be7239d13c41e6357ea6dec3e6c728b9d615b0319
+EBUILD bemenu-9999.ebuild 1224 BLAKE2B 26079dcaeb2b9d5f9d55af38b8ac7ecc71b3a13cda95c6f082e38da42b72fc0f47751239807e16f3618e7285b3fde0c064f9539e5290da63fc4456e64a2b555c SHA512 e936673543f1aeb95f7539154bd36d30857b834594a1705a49f3a85c038f0fbd3f461b5f07bc3c0650cdc3292baf5c26a733e2941401cbdfc7719989b0342c7a
+MISC metadata.xml 334 BLAKE2B 73ec7fbdc3c6c36315a3231521ec9bd3fc8670761c8ced346baae17f65444d795031e0a545e4071c81d14453c4c697ce37ac23205fb2b5fdc5adca655a2316cc SHA512 9b019876ddabff4228604deb56e9effae8ba0edab3476029655411c031a026180ac7b07cf37535e628dab81e1141c643ca3400a5da2a84233bbc3a2d2931817f
diff --git a/dev-libs/bemenu/bemenu-0.6.10.ebuild b/dev-libs/bemenu/bemenu-0.6.10-r1.ebuild
index bdb1770c6583..ef3592428ff4 100644
--- a/dev-libs/bemenu/bemenu-0.6.10.ebuild
+++ b/dev-libs/bemenu/bemenu-0.6.10-r1.ebuild
@@ -22,7 +22,7 @@ IUSE="doc ncurses wayland X"
 # Require at least one backend be built
 REQUIRED_USE="|| ( ncurses wayland X )"
 
-DEPEND="
+RDEPEND="
 	ncurses? ( sys-libs/ncurses:= )
 	wayland? (
 		dev-libs/wayland
@@ -39,7 +39,8 @@ DEPEND="
 		x11-libs/libXinerama
 	)
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	wayland? (
 		dev-libs/wayland-protocols
 	)
diff --git a/dev-libs/bemenu/bemenu-9999.ebuild b/dev-libs/bemenu/bemenu-9999.ebuild
index 9110f1a404b0..1c57d8e71681 100644
--- a/dev-libs/bemenu/bemenu-9999.ebuild
+++ b/dev-libs/bemenu/bemenu-9999.ebuild
@@ -22,7 +22,7 @@ IUSE="doc ncurses wayland X"
 # Require at least one backend be built
 REQUIRED_USE="|| ( ncurses wayland X )"
 
-DEPEND="
+RDEPEND="
 	ncurses? ( sys-libs/ncurses:= )
 	wayland? (
 		dev-libs/wayland
@@ -39,7 +39,8 @@ DEPEND="
 		x11-libs/libXinerama
 	)
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	wayland? (
 		dev-libs/wayland-protocols
 	)
diff --git a/dev-libs/bemenu/metadata.xml b/dev-libs/bemenu/metadata.xml
index 5c76f7a3fc67..e96918bf65fc 100644
--- a/dev-libs/bemenu/metadata.xml
+++ b/dev-libs/bemenu/metadata.xml
@@ -5,4 +5,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">Cloudef/bemenu</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 8ef26e8c18fc..0412ec4a99ed 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -14,6 +14,6 @@ DIST libgcrypt-1.9.4.tar.bz2 3239704 BLAKE2B b8244bc12a68955797b0c2b474ac5c95df1
 DIST libgcrypt-1.9.4.tar.bz2.sig 119 BLAKE2B 4012c22259a9fd56f9da6c87d60077cea0dbfef85d4d4ad1ff6a2375ddefafc4cd03ee9083d18e080c14c95887b495062af886732a9593bcf1b8f187d21073fe SHA512 4aee16449b4b50dac62bd80217e769f32f43fb7cd994402b7d9cffbb1934b2771041c8c0c41a63ced9c8d9408025f9c5608ffc7f00e5e9a9b92a07cb5118a98a
 EBUILD libgcrypt-1.10.1-r2.ebuild 6237 BLAKE2B 0246702c6936eeb86f380b1e1757d7e98b25a88f0e287a68286d141fd085372b4b2b89a512be141db66edfc8117a918fb18d0e8958f91b7528a56e3db5487f45 SHA512 251f1389ffe471a63674bcc9329d6291dcf4cca5a0771a5b7748082efebd76f0247b433a460dae74630acb140a122708fc222e140c3d82e1d906ea5efb0849ea
 EBUILD libgcrypt-1.10.1-r3.ebuild 6355 BLAKE2B d481767c4dc662eaf221eaff7ae2d7f7bbcf724ec75ab3f9e67171522e20a6df124abc150d45cac99556afb371a28531520e166d36997b55f4df0e2a1ae89a53 SHA512 7a9cbdfef5eac7f3cb320e97e873e069cb36c423f557aa3936808068b1eeff9cc06cc7c097a41da52177e680f49e8e79bdd999cfb5042c52b628434dd78040fe
-EBUILD libgcrypt-1.10.2.ebuild 6248 BLAKE2B ea5f326ed859f152413ab6da37958c10b39c9b5d43f13dc4021ad557c206b8525c7ada09524d1f504cec0873ad08a24f5bedcd8df71bbadf0676a07a614bd7a9 SHA512 2933f0bb98badf7bd2eda9807301cebce5d12843c6a4c052a3ff5ad0b2c60e2211c4ae7c4df3c3c38c1c3b5a62f4c719c942f4a31955c515ba5f1eb48cb232eb
+EBUILD libgcrypt-1.10.2.ebuild 6261 BLAKE2B d2799e6e204d3b71d40a7dedcb59ed0cb32573452198086869e491f2f0269f54bf68e9dc39bcc31fcd9f8e19284437f2c3bb3f8f19afe4d2e33e168ce6cf1eed SHA512 8b6af5f5d664af72d640520f4e5338439698fe27a403cc5d7dbc1bf4e26782e6e424d3dbbeb439d177e5c42c4f7980f8e077cb8529516fb4db10316c13583243
 EBUILD libgcrypt-1.9.4-r2.ebuild 5295 BLAKE2B 6684e3673496ecc786a73911d289842059c426d9e412c3a60a8a34e01ca6542bc1f7c16bd9445da65960ebfef15874d8cbe4c0a498145752aa4edbb21097e273 SHA512 bc8e76d703c7041a3dc59bddde9464f8078a762136b5fc6e2da60c10ab9ce960ce2324274f75e04e4bdc4114ac8b2a6181447fae9ba905ed57a45839a2b0b200
 MISC metadata.xml 510 BLAKE2B 1c3a524d74fb388a17465acdeb777872600347779635e33b8f235b59a464690cfd2ecd690b8fc0080600f1180e98255fe367dbb0dab70d04bf546ad7839de72a SHA512 2d1f11194b5ee566ed7a787fa7e40ee2e14511e9f94467ea84b4b3a8395a908c0f95044bda0714dc7426f47d81b0ff977d15654bd06316cfd4a00424242ae900
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
index 41cdeeafe307..fa948f336017 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-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 ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc +getentropy static-libs"
 
 # Build system only has --disable-arm-crypto-support right now
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 95a51b3f4fae..20cb6866c1b6 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index 922daff3c569..63f8e9314916 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -52,7 +52,7 @@ DIST windows_i686_msvc-0.42.2.crate 724951 BLAKE2B b084286cd4927efd2889b149abf8a
 DIST windows_x86_64_gnu-0.42.2.crate 699373 BLAKE2B 01c70809d564b16b268656e47295e99c992d8f9839fac8a51338a0e7c3b9cdcd0429c456ca8c1c139a8c687ed7ed6c43a82250889d881aadaa65bd037223e0a6 SHA512 5767af3c86e717f93137a89d442230e6b60a649057edb3ab104b1f82c0bcd64fe089dcdf2f4fd486a799bece1ddb5f0449641536b678211945e749ae24f35c1f
 DIST windows_x86_64_gnullvm-0.42.2.crate 364068 BLAKE2B 64bc53e98eb3fc649c9b43a6e734de4e65088e41edacabd49f7afcc5dc6e1065c563ecfc682747dda05978dea2dba4f45c16fcc18c3b00684c3d93681e5a7deb SHA512 d39a8bc948110fe612d3f8d6628b3f0d56620df11d8a49e0fabb6c90389ad407582b3af10e4eab46c79b3d11d2e10753d73d9e55963fbeac085f41e9749bdba3
 DIST windows_x86_64_msvc-0.42.2.crate 666936 BLAKE2B bc3a456e7f8bc272f8978ec69506ec9d89f97b7582ebbe05d8bd57bdf8156ef62d0d2dc6137a97e81d54059d70db97a24af9a038adff357f5dfd28805d6193b5 SHA512 53a35f438903fceb59e36bd2ac331773fb8e6c8c5a6d984e79021761f91b3b4a23efe49d219667a4d0d23dcdbf906da9c24e74fb1cff93395b5c55ff524e3788
-EBUILD jellyfish-0.10.0.ebuild 590 BLAKE2B 31367a0641192eefd31c243941ee0ca7752c922bbff2ffaf287913a6b1ef93b1717fe39a75a726dbf37d20931bec08a6a31224699a91b0ef959ba4525161af06 SHA512 85da1692f81fee1a990d2d6d39617154b02a2b35a5509ef669697b3ecb4023e4e0b06bc9426dfe792052a2cb708a33e67d46cd9927044e970286e8335e711d00
+EBUILD jellyfish-0.10.0.ebuild 589 BLAKE2B e936d169efc4416200a8c3b0d84d85a5f65a70a6127759c6f689984efda16c030b10b803d75e570beb3c8cf78fb016387faafc9e6f628503471026add5f649f5 SHA512 069981f3b2019cdee2960375926dd0ddc3498291168e565756815f63043068d42335a00f8a943d1b20388b2ba15e909392563f1c9358abd5997acca379fbfa9c
 EBUILD jellyfish-0.11.0.ebuild 1545 BLAKE2B f925b0b2a2a2300940f1935135935f15cb5c521f69538885acda89a55eb51541d2efbfa16d06c198692d270a80b37ca3f48ea8d910f17393dff9164d11d13da5 SHA512 c5afbd125892bb05a7199da3ea505884d03943f9cad4aa17402b38ed2b7acc23fd7319ddac6c40128840f3f7326dc7fa5cd9cb806825a5b4c4e4585e11a0905a
 EBUILD jellyfish-0.11.1.ebuild 1557 BLAKE2B 966af820ced6ccdec56b727f06b8c56ca2e75919214570f3f0a07be7273de921b95731dceb5f8e7299897ba3190e8b5ce1f6c1522ad84b1e70177a0b7a0644bc SHA512 4218e9bc8d75bc14d5e8f25fd68c0e21751a3769f9f144d05220a37f4c547540f38a0325ad48a8466a761343940de0d442a6b8a72770f9852d7ddbfeb7b99e8c
 EBUILD jellyfish-0.11.2.ebuild 1644 BLAKE2B 570700136776bbbeb9dfd5cd2971a735b1343d480c09a9e84c0fe6d994ea479f74a2b1b8ed15770c703ac029031de405d600f0057d457715eb54ea6128cde2e5 SHA512 039aa93708c5fc25e111069973748da045ad852e2b371ab41bde072ba0c25bf642d83345df4867b2840b004137495b8c94bc06e19b9caa50ab21cd5483e83545
diff --git a/dev-python/jellyfish/jellyfish-0.10.0.ebuild b/dev-python/jellyfish/jellyfish-0.10.0.ebuild
index e4c6a65a9484..300c9fdaf1a0 100644
--- a/dev-python/jellyfish/jellyfish-0.10.0.ebuild
+++ b/dev-python/jellyfish/jellyfish-0.10.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc64 ~riscv ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index cc5360feca16..fe8e3ecb199e 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -5,5 +5,5 @@ DIST pytz-2023.3.tar.gz 317095 BLAKE2B dd2fe27471f641382667ddac77216f9e0e22dd005
 EBUILD pytz-2022.7.1.ebuild 779 BLAKE2B 385bd8561698a862d2c897b0efb2b1217e9966ec7b07cc8c8757fed57e033326534b54cc5dd182c989cd4c18ee908c053e95179379643c56c73644c6a6411987 SHA512 f274dc7caabb2aaeca437931b3100bf1d2b8824ef9e94d1bf2bc27eddf3078b99c4cb2d97a45eeb4794107322bd2b15a0ebb58162fea2c16c1ddd3ddfe6d04f6
 EBUILD pytz-2023.2-r2.ebuild 1181 BLAKE2B bf265f98c94ec1e736985ca43093ea7165d4c2244a80e9fa041b9f3cd3488319467af0f971054509aff00434bfb95ddb6229ed80a1e01a1d4cf3c7ffb35d95d1 SHA512 1b55ce4c86663dbd18e3f4f16dd4276d823309d54acc752f7642e7049e67a8f0bbd38d3aca217c71c7da6112c4da288c0ecfec0834e23d24fead2372c49dc2d1
 EBUILD pytz-2023.2.ebuild 787 BLAKE2B 5bb9d1edc4b62b13a44008a63456e84ff83c00b1eb40139e4cb59f8315f84e6f7fe15ec0ca17c66e86862d2c69724258f3f86feb85ced5648768702d0180c539 SHA512 8d551fe07bb7e33c2fb301c2d37ddc70904c58821cfe548ed64cf673db5648ce8bc1b06b16063b5a06b1cc8fbbd2d026367ca36f46be09948c8f3c22bb957738
-EBUILD pytz-2023.3-r1.ebuild 1176 BLAKE2B ac27c0be3495f5d6a76cc2d9cc13e629532a42b4ff680aeb144437aad1606b2c4f674cc313a8abb4425569653ce639cf589417af22edda977a2bd480e966eb68 SHA512 04c860372cead268b0df2f9eba8077f7e0aeb1969013bdefa1b4ff4544f9ac6eb50c6428912c832b08d18f572d4974122ceef7116b1476e837a117df947457f7
+EBUILD pytz-2023.3-r1.ebuild 1175 BLAKE2B f90d5a392899bc5b867800c49b6f032b6ba594180cd4925e343b26a11366c5454a96bdfce141897f6f0a47de4792eb217cf28215a73871ddad3dc2f61fbae4f4 SHA512 15e45d00bc21218b96f3a078985532904cb7bc34dd4c9112203beb7fac4f111c8a465507600c989399f4d8b83b3efcf6ac04afd0af07f1d9d04e1bc8b9491283
 MISC metadata.xml 820 BLAKE2B 224acaf3f2b85e717829a59108a4053e9a60bc710c330b12dc3f181685d5c8ab1b090105796f092004b1a70781882438b0c0a27bc96ef0116b33fe7051cc6ad5 SHA512 c9a677d89a9f831f3a9833b02e6cec36adbb27688e117b66caad32d3be10fca19787dd85eb14e21eb95d6ed8ba6ff02122ad9f54aa175252834dc4c219b7c219
diff --git a/dev-python/pytz/pytz-2023.3-r1.ebuild b/dev-python/pytz/pytz-2023.3-r1.ebuild
index b1010be26c20..bb05dca55ffc 100644
--- a/dev-python/pytz/pytz-2023.3-r1.ebuild
+++ b/dev-python/pytz/pytz-2023.3-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 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 ~x64-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 ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index a2f962edbd40..461203c7f5ce 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 9e119bd7c8e2..d31fc7ad9602 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -7,9 +7,12 @@ DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e914817
 DIST rails-7.0.4.3.tgz 11063764 BLAKE2B 389fd3a00bfff4ebda70cf5ec473942883048783b716ede1787a510d3b7b91f4e844dce4dde5ef643cb9611b1b3aa712f1ba5ebefb9e5a84e307a151b2e40bcf SHA512 2c817a0a58ae52f99686d8cd0de84f01e3d7ec05afc95d07910b3b5bf86d8162b06102893b2cbc14859b95a07eca6882a707956c87d437794697df7a18fa3c16
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD activesupport-6.0.6.1-r1.ebuild 2674 BLAKE2B 0612d7adcdb34b65c962f8c9633e9f1661e76c905b91d7dd6a5e21493672b321682f7c5c01e994f27b2ed151dcca0c7ce598def736334bde5877ff6fc4ac600e SHA512 1a4b866c193f22a642ff15241e3901373352bc0324e8e72663762c762e57a1237ef848a8736d29591dde16b14f1612bace27c1e34ba238e675e1e3d2ee6f612e
+EBUILD activesupport-6.0.6.1-r2.ebuild 2620 BLAKE2B 6bf0fe8c91ea3cb3d1e75dc9bf01790bda03cb45114d507333130bd2490f6e413bb8f11d0beafee9b688109f1379ffbf00b3e3f4e2bc9f688a4adcf90b9d265d SHA512 fd144bedbb0dd70c60c53e5ae7a6f0031fba0e9b335c141f191a9954824ac4de9b8f9b1f4d2c25c0aca420e97e0069a07e450777d7a355fb6dfd7dcfacc7293c
 EBUILD activesupport-6.1.7.2-r1.ebuild 2770 BLAKE2B 83beaf70b79efebc86b00c02305e49424608b4af6eb59642e9a7e4e334c7619678735656a571e186ba8052ed9344249096adb1b13c48ef84b2b2a32a77bb0bb7 SHA512 94e9993ad79aa992a9e91cee1935e61929d9f9ffb9343e2d62aa855113b81cd3d38d5cac01addffab4f0a456a6e2f5cde7de5c02d202f3a5e7367aeb5af85968
 EBUILD activesupport-6.1.7.3-r1.ebuild 2851 BLAKE2B 85ccf814786b3084ef629ca4f915a0cd3b9414747f4a0136889110d38c6b192f56bd492e117cf5c7f366e27ad3b7d82e46a86eba99b597e066a0835bfa6c5aac SHA512 ae79febc9220e3ea25dbb032f66f4509c3608f28115d89a1ac3ac835695d85746e75101eddebcfb5896394a761e5b66bcdbf331ee540bfb0be56d4b5835d478f
+EBUILD activesupport-6.1.7.3-r2.ebuild 2795 BLAKE2B 2c9feaf6d347f92576326ae2e6814cecb7fe8da1bb996ce1818d95257bee55a2fa5812dda613ee7265fbd8c29dfd6ea2a10550696f14fa6a2de618663ead7b2a SHA512 8c3b205917fd8026c8a800a2a66e6e85910826e61d873917e0533fdb71473d05c6723117aa5c2894bd3f9f7e0d106d9770f59a19a277fc6394628dd6a26d4819
 EBUILD activesupport-7.0.4-r1.ebuild 2761 BLAKE2B e88e7cd2bc22a9da8bbd43d807fac807cf118b2a13f1648fba8f9ed31e5fcc11a785e520e49dfc3c92af1a200d3a0e2f0c67becaed5f171d4545e02b30dd5a43 SHA512 52c9dae526bdf53e2265c092269c588a10e091e5da196d114fa817a78e09b70df749e850e7f6032da567bf2e692ad48ecdaea6beeb685a522fa602387473076f
 EBUILD activesupport-7.0.4.2-r1.ebuild 2761 BLAKE2B e88e7cd2bc22a9da8bbd43d807fac807cf118b2a13f1648fba8f9ed31e5fcc11a785e520e49dfc3c92af1a200d3a0e2f0c67becaed5f171d4545e02b30dd5a43 SHA512 52c9dae526bdf53e2265c092269c588a10e091e5da196d114fa817a78e09b70df749e850e7f6032da567bf2e692ad48ecdaea6beeb685a522fa602387473076f
 EBUILD activesupport-7.0.4.3-r1.ebuild 2823 BLAKE2B 4709d04d3c8b30b883b40c667cb996640465a95463e3e645d4b40c32c47ccf13660b46b011dd3421785a923d5958be4b08765a180f1222f9c0fb56b334e4dad1 SHA512 bccdf1203c705128b782ebbd8510c68f8ddc61939ed1325e2893c6c056eab3ab3e1fe48cf24f7cca9c3fc99b9092740c17fd055486306f0fbbb31594582ed088
+EBUILD activesupport-7.0.4.3-r2.ebuild 2767 BLAKE2B 309bdac4a8f7bf3d5cdaef18285b702f51d428d7680c256953f755b23b3cb7f40bdf55ccfccd32248a8abe2bd0bdcbba2cd3445c1b7528d84dbb3e67746bb28a SHA512 2882adaefea553d3216adf0d6cc4c251eb5e355888f578542cdf5a8b3f0c4053c01fd0a3c0cf92d54a3f21740caf10df23d5dd901bc6dc1d2b61664f0f4e98ee
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activesupport/activesupport-6.0.6.1-r2.ebuild b/dev-ruby/activesupport/activesupport-6.0.6.1-r2.ebuild
new file mode 100644
index 000000000000..1d733a0a5147
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-6.0.6.1-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	>=dev-ruby/concurrent-ruby-1.0.2:1
+	dev-ruby/i18n:1
+	>=dev-ruby/minitest-5.1
+	>=dev-ruby/tzinfo-1.1:1
+	>=dev-ruby/zeitwerk-2.2:2
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-2.2.1
+	>=dev-ruby/nokogiri-1.4.5
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/listen-3.0.5:3
+	dev-ruby/rack
+	dev-ruby/mocha
+	<dev-ruby/minitest-5.16:*
+	)"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' \
+		-e 's/gemspec/gemspec path: "activesupport"/' \
+		-e '5igem "builder"; gem "rack"' ../Gemfile || die
+	rm ../Gemfile.lock || die
+	sed -i -e '1igem "tzinfo", "~> 1.1"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
+
+	# Avoid test that depends on timezone
+	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions.
+	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid test that generates filename that is too long
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+	# Avoid tests requiring a live redis running
+	rm -f test/cache/stores/redis_cache_store_test.rb || die
+	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+}
diff --git a/dev-ruby/activesupport/activesupport-6.1.7.3-r2.ebuild b/dev-ruby/activesupport/activesupport-6.1.7.3-r2.ebuild
new file mode 100644
index 000000000000..63697e571763
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-6.1.7.3-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	>=dev-ruby/concurrent-ruby-1.0.2:1
+	>=dev-ruby/i18n-1.6:1
+	>=dev-ruby/minitest-5.1
+	dev-ruby/tzinfo:2
+	>=dev-ruby/zeitwerk-2.3:2
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-3.0.1
+	dev-ruby/connection_pool
+	>=dev-ruby/nokogiri-1.8.1
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/listen-3.3:3
+	dev-ruby/rack
+	dev-ruby/rexml
+	dev-ruby/mocha
+	<dev-ruby/minitest-5.16:*
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.7.3-ruby-thread-noise.patch
+)
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\|rack-test\)/ s:^:#:" \
+		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\) do/,/^end/ s:^:#:' \
+		-e 's/gemspec/gemspec path: "activesupport"/' \
+		-e '5igem "builder"; gem "rack"' ../Gemfile || die
+	rm ../Gemfile.lock || die
+#	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
+
+	# Avoid test that depends on timezone
+	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions.
+	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid test that generates filename that is too long
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+	# Avoid tests requiring a live redis running
+	rm -f test/cache/stores/redis_cache_store_test.rb || die
+	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+}
diff --git a/dev-ruby/activesupport/activesupport-7.0.4.3-r2.ebuild b/dev-ruby/activesupport/activesupport-7.0.4.3-r2.ebuild
new file mode 100644
index 000000000000..268187519b61
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-7.0.4.3-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	>=dev-ruby/concurrent-ruby-1.0.2:1
+	>=dev-ruby/i18n-1.6:1
+	dev-ruby/tzinfo:2
+	>=dev-ruby/minitest-5.1
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-3.0.1
+	dev-ruby/connection_pool
+	>=dev-ruby/nokogiri-1.8.1
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/listen-3.3:3
+	dev-ruby/rack
+	dev-ruby/rexml
+	dev-ruby/mocha
+	<dev-ruby/minitest-5.16:*
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.4.3-ruby32.patch
+)
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\|propshaft\|rack-test\|terser\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\|view\) do/,/^end/ s:^:#:' \
+		-e 's/gemspec/gemspec path: "activesupport"/' \
+		-e '5igem "builder"; gem "rack"' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid test that depends on timezone
+	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions.
+	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid test that generates filename that is too long
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+	# Avoid tests requiring a live redis running
+	rm -f test/cache/stores/redis_cache_store_test.rb || die
+	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+}
diff --git a/dev-ruby/dependor/Manifest b/dev-ruby/dependor/Manifest
index 39abb1b26f95..d42e236cb49e 100644
--- a/dev-ruby/dependor/Manifest
+++ b/dev-ruby/dependor/Manifest
@@ -1,3 +1,3 @@
 DIST dependor-1.0.1.gem 12288 BLAKE2B 728cb4a1ec8e2b7d8e770dc7c2b997f8a474963530cd2b3e8209babacf16aad8f69f1fab64aa1e932b477922c6eef8c3c46073421966285204a49c00f3a3bab5 SHA512 4233a270d8fc956a530008121fcb0110c2c66f77f51aa98a5db75b857c83f80f90b8e8ae67d098aa2363c21deaf1dbbba146c09b83fe6fa8004832249acea9e7
-EBUILD dependor-1.0.1-r1.ebuild 539 BLAKE2B 652f3ecff1c49054e391118f0a41201bee460c530399a264bf01ccda3517caf6eb6ef95382da4a3e2522b173d6393909b49c22ba2a95a0ea45fe5994fea6eeb6 SHA512 0a82d188ad41a31e91048beb292120a3cfebf06ff33f082d70b338f6beec2d48ff50ba9c57b6ad21cbf262815aa7d86b4a51554d7c18aca67f84ce0c71210468
+EBUILD dependor-1.0.1-r1.ebuild 539 BLAKE2B 8cd9c0fb49558a3228fdc747de4520c40d13ba1df2dd363fe4e15756655ee437dc86638eb991c1a6b2bf7edc024a74c68d41ba588c393cb0b8549bd72c3bc839 SHA512 0f0beaec6a53aff47305483f777c27198c1298915beccabcd22129ec66ca3d821b2b9d6a79f082c5b493da5bf018df5786020804cff7bbfe808ffa1477e1e613
 MISC metadata.xml 341 BLAKE2B f58ae1d6a405615ab758b4b042ea6aefaa8503c0f23c5025710407901456f3191053ff36f6f543cebf8cdfd1f7e475c62825509f7551ad2c683cd3d392d7c04c SHA512 d230ba6ec5f4a5ddac80679b10c600d64f3d10c879d576a97065d3fe64f2ab638012178fd69c5d6d913c86ee7ce987cdc5d500c2802365efa217607f69b9ddf9
diff --git a/dev-ruby/dependor/dependor-1.0.1-r1.ebuild b/dev-ruby/dependor/dependor-1.0.1-r1.ebuild
index 2fc78ef81b5f..a357d2d83d0a 100644
--- a/dev-ruby/dependor/dependor-1.0.1-r1.ebuild
+++ b/dev-ruby/dependor/dependor-1.0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/descendants_tracker/Manifest b/dev-ruby/descendants_tracker/Manifest
index f7938301521c..ccc4c599df63 100644
--- a/dev-ruby/descendants_tracker/Manifest
+++ b/dev-ruby/descendants_tracker/Manifest
@@ -1,3 +1,3 @@
 DIST descendants_tracker-0.0.4.gem 11264 BLAKE2B 65557a3e4859eb589ee468611f6d29b97ea96897711ce8fcb70c8da6d54849eb4e84fc999db4def4b6e6d5a56a84724b7319e47aee5ef739b23763b1c74f9dc5 SHA512 e079b0ba9b14056707780f1752297c22e81c144fcc7903bc0ef4aa5ad8f343628f493d6d87cc1d5c61cbf8f69066914210eb407b5492aa414949ad799f9a9b69
-EBUILD descendants_tracker-0.0.4-r1.ebuild 792 BLAKE2B d04f52094bc181243def672cb97f08427544095e400ab2ce2798cb954335571ae2420e89c938ee8257862dc4ca6b55fb546668128c2009fc590c60348e91778d SHA512 552d7e9bcfb86dcce9c3654b31fed040d4fb3968890788bd7bf5856927f814b3f4826e5610510308428033e9f090c146e18154fd8d29e5b8919039f72173fe51
+EBUILD descendants_tracker-0.0.4-r1.ebuild 792 BLAKE2B 558bcd4263a4decfdae8c1d10b6a5a251075989de280ff696292056052f8cc274e09f79093ef0102348807c6a9b52b5c8ce58500175c1c3c011e66d585175b86 SHA512 b6dd71515c9b579caf6a5dcd8d4b115cf7675e3615447fa0a5a956675d9d83777634f3a69f0a7eb95b0304dd80740219feefc2417ba61f0094c5e676313cc402
 MISC metadata.xml 352 BLAKE2B 683a1aa5a249b28bb7b78f3a6ac1068764adb46b24fbf099d05c134f12f59222bd206ca32375539496f65520dfe2c81aa81717cd2f09d10e47029c8fe1bdf160 SHA512 21ae246254f724681ff10df49a8d10ef60241c971947aafd08d0d61a656131a11dbbd496398c485103b3338e3d020009930dc1dfe819bc7501959657cdb2ee26
diff --git a/dev-ruby/descendants_tracker/descendants_tracker-0.0.4-r1.ebuild b/dev-ruby/descendants_tracker/descendants_tracker-0.0.4-r1.ebuild
index 57def8104230..46f3b3233e02 100644
--- a/dev-ruby/descendants_tracker/descendants_tracker-0.0.4-r1.ebuild
+++ b/dev-ruby/descendants_tracker/descendants_tracker-0.0.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/hashicorp-checkpoint/Manifest b/dev-ruby/hashicorp-checkpoint/Manifest
index 051fdb29664a..bbb709f3b42b 100644
--- a/dev-ruby/hashicorp-checkpoint/Manifest
+++ b/dev-ruby/hashicorp-checkpoint/Manifest
@@ -1,4 +1,3 @@
 DIST hashicorp-checkpoint-0.1.5.gem 13312 BLAKE2B 4318cc7748797732ea3719965debd9621136a097bdc6a9bc6577d563eb69c4bbabe8451396bd9281874c1b4adca690fe443f0a98eb10857b1f6b561aa732b508 SHA512 77effab526b798da1739c19021f3832bea7aab9503a159909a712f18da7a0cc6d750dd0783c2bc5a31f650f00f0a65dad706e2159882bae70dcf7425fdb35a40
-EBUILD hashicorp-checkpoint-0.1.5-r1.ebuild 604 BLAKE2B 905c5fe7b7288e3cef3166591e62da7238ec7ee1bd63a3a05b91e9fba4ddae37885ed1d2f0d71ad05bfae3273a96f73ab51dda857996008190621c8627f03d49 SHA512 005383f3b54ff48b33cd2b1df93827ebfb8578591aed08467629c9a3f53cfa8fa41003b362d83e775c019811778b894bc55c7e8ffdf93b303f1c1695599a72e3
 EBUILD hashicorp-checkpoint-0.1.5-r2.ebuild 720 BLAKE2B 7ff41c592434fbd04f68b579eb0a5671d8361eedec936df805b9cb530d1bbdfeb3d3cb4c79d419719a5c9ebb22ea64c79178d01d5bcdfab9cb17fdf6db61a98d SHA512 dabf720a2874b30e9fecadcb3919cacc9f6173be5a5b3a4c266ec553de617b221443edf0a90270843dcd055d34d1c24bd8d5507de3e9a2a67dfaf98f5d44fb33
 MISC metadata.xml 605 BLAKE2B 937bea9911209843d0b56439254061666420ee1fb0b0701915a3f4bd21da836915190cd1b4c0fa314d7f924412b3abd4a927542d46662d4b409e5e8a38928183 SHA512 c4f663167658edc14233365f0211da43323937080c457fb26e611c4b476a0b3585c0887738c0ee6419a48cb9fd47dac8e48a282400874b0aed1fc416ef9e60d2
diff --git a/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5-r1.ebuild b/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5-r1.ebuild
deleted file mode 100644
index f4f184d7e2a4..000000000000
--- a/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Internal HashiCorp service to check version information"
-HOMEPAGE="https://www.hashicorp.com"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-
-# Tests require network
-RESTRICT="test"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/rspec-its )
-"
-
-all_ruby_prepare() {
-	# remove bundler support
-	sed -i '/[Bb]undler/d' Rakefile || die
-}
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index 9a7084303261..7cea3abc7693 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -1,3 +1,5 @@
 DIST i18n-1.12.0.tar.gz 72883 BLAKE2B 6818e5bdea156e9b6f7b33e319e5b5a5c3c9e7a799b56ded87ab2e27efa4effe730e23a8736b7374b8072c7ba4237a92619aeaad3a16c0bfe10fe73bf9c588d6 SHA512 616db5b15febc7a8716ceafef6c51a24e2d050f8e27e389ef96d94cdc95f9704942079d1e6b502666a015a99deee169342482c9a808164700401c47f96da8f0d
+DIST i18n-1.13.0.tar.gz 74591 BLAKE2B e8b2a624c6ea02f030eacbbdf1ca9722d23785e51f31f5dd4a640f8ab74dfafc99131773619a5e2af724c7bcdbc0e63989b1552c148137bf15cf436f340c3c96 SHA512 4c2dc75ccb09ace90a5845f4c1325f0cb144c69b06b72a35728674deea5d869ed94fa5b18cf6b56d434cbad7e528150dedbb10ed91a6d15b7e05758117cf427e
 EBUILD i18n-1.12.0.ebuild 1651 BLAKE2B 0bf128a78306fa591c315ed71e92004c20147b53ce0c0c700840454e70da04132a0489f3f142667a01b12a85256faede745177b013f24f7b69f42fb038c4372b SHA512 306c211987e3c929c007a0f0594f024265a17a155c380c249a4f2584b70da91a947668670c1b4197043f3bec198fc4c60b467c6c1c3bdcc644aa771e51cad925
-MISC metadata.xml 341 BLAKE2B 88504d4f80239252fd3d4d82c5636bd4656f1063e337fbdf37baf23bd109abe7aa74090b07f90e27d9350c8eee2c342b4d1bdd38feb438ce2236c9c9b094d606 SHA512 86b7231bcadd93247b82ef706ad9ba12f77306d7c6f08065ed3f95bc46c2662a8e1535364fa25419612359d11cd84d26da818e2d9be5e931fa6203b6e63f2f73
+EBUILD i18n-1.13.0.ebuild 1643 BLAKE2B 77d18b506d0092c2fa3e93b2e347c477de4b9f827d566405eef2f36fbfc72da2a6ba108bf9452fc912006b796c8d687801efdf30f6196bf407e641dfca1a1f2c SHA512 989ddbdb091efda19576a311fc1ca9e21100fa73299928c5f4790449cd9492885785853fe06df49af91038f62b802cbd9cb61a5d77d13ecc2e2e506eca7f735c
+MISC metadata.xml 341 BLAKE2B 71b36ea4e85348d38b1eafe8a235485a9dd9cac8a62961f041a98f4ac94d1a67ad33997aa796baabbfcc4cdbed8a66aa401b96d0d3b61dcb0546ca3d75f66e18 SHA512 819e827fb7d63f46970810acbb8a94f40cd3d72563a1b2e013d34041b78bee73e74634b3c6b2ef791da624a091af0ebdeb4d816b8697914b72c70fb087775d63
diff --git a/dev-ruby/i18n/i18n-1.13.0.ebuild b/dev-ruby/i18n/i18n-1.13.0.ebuild
new file mode 100644
index 000000000000..adaed616d7e2
--- /dev/null
+++ b/dev-ruby/i18n/i18n-1.13.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add Internationalization support to your Ruby application"
+HOMEPAGE="http://rails-i18n.org/"
+SRC_URI="https://github.com/ruby-i18n/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
+
+# We need mocha:1.0 which corresponds to the Gemfiles used in each_ruby_test
+ruby_add_bdepend "test? (
+	>=dev-ruby/activesupport-5.1
+	dev-ruby/bundler
+	>=dev-ruby/minitest-5.14:5
+	>=dev-ruby/mocha-1.7.0:1.0
+	dev-ruby/test_declarative )"
+
+all_ruby_prepare() {
+	rm -f gemfiles/*.lock || die
+
+	# Remove optional unpackaged oj gem
+	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
+
+	# Update old test dependencies
+	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' -e '3igem "json"' gemfiles/* || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby32)
+			versions="6.1 7.0"
+			;;
+		*ruby31)
+			versions="6.1 7.0"
+			;;
+		*ruby30)
+			versions="6.0 6.1 7.0"
+			;;
+	esac
+
+	for version in ${versions} ; do
+		if has_version "dev-ruby/activesupport:${version}" ; then
+			einfo "Running tests with activesupport ${version}"
+			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
+		fi
+	done
+}
diff --git a/dev-ruby/i18n/metadata.xml b/dev-ruby/i18n/metadata.xml
index dfd527c89211..3df4becf0365 100644
--- a/dev-ruby/i18n/metadata.xml
+++ b/dev-ruby/i18n/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">svenfuchs/i18n</remote-id>
+    <remote-id type="github">ruby-i18n/i18n</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/maildir/Manifest b/dev-ruby/maildir/Manifest
index 00fa9554b182..318d2e2628fb 100644
--- a/dev-ruby/maildir/Manifest
+++ b/dev-ruby/maildir/Manifest
@@ -1,4 +1,3 @@
 DIST maildir-2.2.3.gem 15360 BLAKE2B 915abb1ee50a4151f22e0de4e92ff42d3f06b059478f6a4193866714e170cc88740a714bef54a530d3b85bf318c7f46dda6f42b48b7ceadf09c55eea31f5f5c2 SHA512 5dea021c49711f744429c6e5ea78bbb10e3aae1338f780107a1784f6ae8d3c598f9d17b8e0fa555dde4058041dbc7905d62f9d49375d6c4b822a7e88ca065a77
 EBUILD maildir-2.2.3-r1.ebuild 926 BLAKE2B bf4287c0b858f753d4262fa367aa7fd3d60be757f4f265dbefd014fa4fc7e19cbf25be9f0ee7a88c5ad8c8819652a2d3fe392ca270313e35efae02ef5be2963b SHA512 dfda54a35384a5ce35df6dcb9cad01f0be9ff969850e81e8023f0cb509aa317cb2d41e05ae87fb19a3e705957d31c92801aba282ac342d9f8d86104e2f9c46b6
-EBUILD maildir-2.2.3.ebuild 933 BLAKE2B a60c83ea234b82e83d8b165a8610a57b1c14a830265569dad729a6a59bb06a66273e19ea96d92e603bbf96b276c57fa3903542d10338cdd7c0a5cc4dee7b01b7 SHA512 e1dfc8d553d623be3e3405fb3cb2b756064c143ef0f9918b8f15690e09b0aad65f2455301dda0f8966d1e2ddf00328ab98c4d259e15bbf5408e3490e5864fc2e
 MISC metadata.xml 342 BLAKE2B dd433dccf8efe7c9c0dbe73d2b5f9bfef1a3c074fd6b2a1109754492c3c9b701483abf3cde5188a4800e2489fa297774328154e158c10cbf938d8a68d9a3f998 SHA512 41d8024859cf511ec93f2e16cf09d1e87e46943d2435928ab9625d128091650495d5e89b2faa9b9bf477e629d0a2e11d182a0eac4f69265efa7bd328d20e6c57
diff --git a/dev-ruby/maildir/maildir-2.2.3.ebuild b/dev-ruby/maildir/maildir-2.2.3.ebuild
deleted file mode 100644
index 70359bdf5d60..000000000000
--- a/dev-ruby/maildir/maildir-2.2.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRAINSTALL="README.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for reading and writing arbitrary messages in DJB's maildir format"
-HOMEPAGE="https://github.com/ktheory/maildir"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="2"
-IUSE="test"
-
-ruby_add_bdepend "
-	test? ( >=dev-ruby/fakefs-0.3.2 dev-ruby/mail dev-ruby/shoulda-context dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile test/helper.rb || die
-	sed -i -e 's/shoulda/shoulda-context/' test/helper.rb || die
-
-	# Avoid tests that appear to need activesupport for .blank? support
-	sed -i -e '/add and remove flags/,/^    end/ s:^:#:' test/test_message.rb || die
-	sed -i -e '/be removed from flag list/,/^    end/ s:^:#:' test/test_maildir.rb || die
-}
diff --git a/dev-ruby/sawyer/Manifest b/dev-ruby/sawyer/Manifest
index 287cef645a2b..525b44c48652 100644
--- a/dev-ruby/sawyer/Manifest
+++ b/dev-ruby/sawyer/Manifest
@@ -1,5 +1,3 @@
-DIST sawyer-0.9.1.tar.gz 15406 BLAKE2B c368aea98b85c55327b7874a75e6e652bddc9a2765a8ef7af3e5ac9bfabd3a4c7900f58c4ab1397d6737b17a11089fa04d1ee60e7beeb96fc8f638c88407328f SHA512 b8703223b46af9972dc57c6f65f3131246bafb88d4ef82b4c5beecc436c2180019b2e6e57ed7c8a5edbcf9a20cc12d85a1115c2f39cd5993aca48efed8f08868
 DIST sawyer-0.9.2.tar.gz 15545 BLAKE2B 83fc7b6776e888ed4f26a21febc93edf954a1d926c14311078b5ecf7db57614472ed42d33ffc30bceb23c4ea1f1b1047cf3c1a0be9feecb4a3c92458938c6c03 SHA512 560c5bb6fd8f73f68b4dc1151608bc3b1f60aec511fef449cd6361a1307e2c1bf64cfa6cc7ad951ce92db22ce90f3318668af31708f0c1ee5909db3684566c72
-EBUILD sawyer-0.9.1.ebuild 707 BLAKE2B 482dd7ab2468bafdfd6da02086f5b1997e826ce4171b0ad772f8533916198a789cb6795986d51e5b2d567aaa7aca9422e155e99639e6d6e940ca8b3369ce396d SHA512 d3211afdb3fb4b70f0de772d27b355609728996ae8005c9843ec1ef373fead3de178258f0a20c493ad0a2ddef581014dcc297f7b02787e3afa56e88b430a049a
 EBUILD sawyer-0.9.2.ebuild 706 BLAKE2B 0da03d3c51da9a24acfd07cc5656646d9843697be8f0ef7e902f02dc2b848552db1627ad399164f748a2877a244cff8c805624d7ab13f3915e974f88e94fa8ad SHA512 6ab60442e23555a105deefb530fdfd93e4adb496e97e5f381e519813025cf3b8e90dc07b8735f7ffe540725db50fb257550663c65f269482e4357446d78b56d2
 MISC metadata.xml 344 BLAKE2B 2fd48b8dd0cbda058db996df9a2eb78059dbee18f2f55053df724c29e336f11c6177e4ced45805464c833da30bdbb3fa451604459768f2f0f04acef5f4608add SHA512 06a2e070d29fc940208c64bba0d16add2fd24a4bd80adfc763a2bf925942f8dde700641fc7ff6ac1b3e77d17571aeccc8af21ecb313e3772aca2461835123d2e
diff --git a/dev-ruby/sawyer/sawyer-0.9.1.ebuild b/dev-ruby/sawyer/sawyer-0.9.1.ebuild
deleted file mode 100644
index 97e52a84ddef..000000000000
--- a/dev-ruby/sawyer/sawyer-0.9.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="sawyer.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Secret User Agent of HTTP"
-HOMEPAGE="https://github.com/lostisland/sawyer"
-SRC_URI="https://github.com/lostisland/sawyer/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	<dev-ruby/faraday-2.0:*
-	>=dev-ruby/addressable-2.3.5"
-
-all_ruby_prepare() {
-	# Avoid tests that require network acces
-	sed -i -e '/test_blank_response_doesnt_raise/,/^    end/ s:^:#:' test/agent_test.rb || die
-}
diff --git a/dev-ruby/sprockets/Manifest b/dev-ruby/sprockets/Manifest
index 4b51ba5aeecf..8ab1c5414bb9 100644
--- a/dev-ruby/sprockets/Manifest
+++ b/dev-ruby/sprockets/Manifest
@@ -2,14 +2,9 @@ AUX sprockets-3.7.2-erb-deprecation.patch 1073 BLAKE2B 12821e697afb59cdfc4a05fa6
 AUX sprockets-3.7.2-kwargs.patch 829 BLAKE2B 406a79b455e18464e4f8e1028785f0c4d399430ce2fcbce83ffc4a66274e75f2d6e5fac3bfc49656aee35ebfcae5bbc59ca5770f5ddd961c8c4f0632467069c3 SHA512 1df64a17fae52832459ff2eb0a33e1bb3622d645037b035f5414179e2358c0a7306bdcfd8c7a80f4700d72983987d8febe7e5f0d4fb9875c9d8bf880476206f4
 AUX sprockets-3.7.2-ruby31-host-uri.patch 3066 BLAKE2B 7bb5149577e44500a75ffda5c85d7f3490ad686f683430d477c4c09313453a91f9f4337a9dc9427fea1b035a7a167754784043498e9c5deb889fe0ab58403c9e SHA512 da5cb0c5177000a028711f32dce1dcd44542e547ccd709bb06b812002a37ce0634b5151ab77e8feeba5c61f4e18178605b0abddef81683bb98fb608492c3f5d7
 DIST sprockets-3.7.2-git.tgz 369053 BLAKE2B 3c40de921d82b2f5c71e3ecaa114576293946352415da1195e60cdda6363066a6be05474eb7842ab1122e29fa6c19fd2f7a38fb0a7cf9972de0640eeb29d03f0 SHA512 bc7d79ba696a072644852b7a3a73ce086d297662309deb1d00318ad453f50ac6e494e6489632cb282795de2f334700155cfd21cc80be638dc471a3215422591f
-DIST sprockets-4.0.2-git.tgz 418502 BLAKE2B 0ae8d0e47708967a4208af852f21baf9d00c4216660b081170d7f68631ee1129fb78341e6012664fc519a0f330fac23203e314c1831d7031af50844e6b91c1f0 SHA512 f733b96c78be6466b63999aa7dc900af653a5b35f6482d84c41edf47f22b093231003f8874eee2ab31e2a2cfb7049a8109a314b51a0ef36ba30d5f6e8bd81f66
-DIST sprockets-4.1.0-git.tgz 421796 BLAKE2B 8544f8299a5abe8ef89a47d7849fd54f5a04eb623cacc316c2c4656b291c55879f1519d2f3628921af1eee64e67451a15d50d68d1dd93e84a95a833e76994667 SHA512 af964e614f414886cd737888119449b6d2829a41965ba7ab82806e3887ec6eadacc947a19e34568c5f418da7cf47175bd0cb0f4f402bd6e2db41f684ed0cc8e4
 DIST sprockets-4.1.1-git.tgz 421833 BLAKE2B 9e3280c9746245c9f40137e020f1f96d6337e3354efe285f68e94f5dd2aaf158f7e1ec174c610f244386fc554b52d07636492979e2adfee19433cbb1c8cdb330 SHA512 128c96861020d6c30699da584ff8d7bb06eabfc59a520471b2fcdaa06200c6d975a7b267686bb26833ccce0ff581e9be7fa261ff71cc532fb4cb1a84036563a1
 DIST sprockets-4.2.0-git.tgz 422096 BLAKE2B 466e328895e318b9e0eecf46e91e0c6b3c04cf5dcc2b6004de2b81b6d2ab4745b9bb8b2a14bc6b9927f169e0b936c19005aa01aa01e805007d37f297750c253e SHA512 8b22cafcb439dee7f4397fae64108854047ea21d7b8faf80d60b2907d8318f28d168014645b48f35f6a765a7ec925697c3755e4ed8d7724f453cbfae1f10880b
-EBUILD sprockets-3.7.2-r2.ebuild 1736 BLAKE2B 12f784b4877082a54e1f52dc43e4e152b3052dfe1f623c2d1bd2b00d73952878222680112aa61e0030f030ed7a31c1ad84165b17e633293a400a35942ccd647a SHA512 bcad6e5fe0a4d5b4e7ac62ecb4e237432303e1d4cf1885ddeaac9fc05caf994853b9c3e49e0e4409dff74bf8487dec3f048fb62f359a9d6f516e4296e3c4ba48
 EBUILD sprockets-3.7.2-r3.ebuild 1778 BLAKE2B d9d86036d950e27d1b1edb85c170de7f60366897b9fb766eed6ea81f4a2dca86080c75b8f321c86470023622b51852df4e16b14f0526f4f98a275f60f09ca6e5 SHA512 a5da10280d5aa9565c8e234d79c71cafec33f6f9152b4a35ad485a1a105e50e8f8b7924f6d070d1bb21304ccd8cd150af5f1d2ffad5dac022771d67e6860f5c7
-EBUILD sprockets-4.0.2.ebuild 2073 BLAKE2B 83ca1f1c975ec2f0e84dbdd3b988da08f767ae7773989fc0bed64c75c95e9b8f8dd6ac2f32c53da642b50f1c74bd16d2297e7c9e1622cb33d9e70f1eb872d546 SHA512 934e726b1b3711301bdbe0783d87239965270371b0f80fa910b7483fac24829faf98880b1ef1e205371127e7e629495240f243cba2ee77774cec364063ed5f1f
-EBUILD sprockets-4.1.0.ebuild 2090 BLAKE2B cc6c680b76936346259b71f6d06478dfb242f49a90156f7e9836e4115f27d3c715676d8d8cb93c937f8d0b4d3b1095b75e2d652acb479205671d45d4c0678d2a SHA512 b1892932bdcfd23820bf43bcb269684f89c906fb17883baf27ae4178f8a5d48dbef3abf2685328b3ef156c0613daf30867279dc2c1a068f73e3066b70d87110b
 EBUILD sprockets-4.1.1.ebuild 2090 BLAKE2B c0130e4d7b4b2c476189fd0970485cc416a52776ecbe0e18b1a98c6a3e1b721031c4f1dcd6a491c1520894ea46e3cb9c5cd5bb1f36982e6ed477a86901ea4cc0 SHA512 6aae3a8175e999770ef3ce619b60d5aa2213658b74238f2916980eef3ddff6a0aeb99328d5e97ed25a8ec1327d8901ec48a311ccdf65a0f0fe5c172da3132c44
 EBUILD sprockets-4.2.0-r1.ebuild 2059 BLAKE2B ff48222f87a0913f6c3ef4f70b7071578acd04a27ac8d0209da1324ba87d131d46c988e4916c2d45bb8b5a0a7b2e3eedf0ac80fa364b499b61b5625489e0a7ad SHA512 b3faee6b0601110353265b193ac07002b5b12b76bc25fd12798fbf838796039f4d4820fb5fe45d660246999c92a5b5ec9126a25e2a97c0abffe111e25d230eb6
 MISC metadata.xml 342 BLAKE2B 227ac77350fe458144d05c09bef5156a9f7c06154b8aba9902f1611b7f3e22b5409231cfb0a44af0d6f5d87138a0d71eb230d8827773830b508d91848f5a8cb0 SHA512 ee0cc0cfbfed5e9e61386b885714cf26a3ca1e2e94b820859ea1b08f82fe3ab5bf13c5a4764dd2b4ca48d668f22e493d76a39cb48a8d3c784b55b78cbfc02ec3
diff --git a/dev-ruby/sprockets/sprockets-3.7.2-r2.ebuild b/dev-ruby/sprockets/sprockets-3.7.2-r2.ebuild
deleted file mode 100644
index de73a55d6b0f..000000000000
--- a/dev-ruby/sprockets/sprockets-3.7.2-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby library for compiling and serving web assets"
-HOMEPAGE="https://github.com/rails/sprockets"
-SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-erb-deprecation.patch" "${FILESDIR}/${P}-kwargs.patch" )
-
-ruby_add_rdepend "
-	dev-ruby/concurrent-ruby:1
-	>=dev-ruby/rack-1:* <dev-ruby/rack-3:*"
-
-ruby_add_bdepend "test? (
-		dev-ruby/json
-		dev-ruby/rack-test
-		=dev-ruby/coffee-script-2*
-		=dev-ruby/execjs-2*
-		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
-		dev-ruby/uglifier
-	)"
-
-all_ruby_prepare() {
-	# Avoid tests for template types that we currently don't package:
-	# eco and ejs.
-	sed -i -e '/eco templates/,/end/ s:^:#:' \
-		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
-	sed -i -e '/.ejs/ s:^:#:' test/test_asset.rb || die
-	rm -f test/test_require.rb test/test_{closure,eco,ejs,yui}_{compressor,processor}.rb || die
-	sed -i -e "/bundler/d" Rakefile || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
-}
-
-each_ruby_test() {
-	# Make sure we have completely separate copies. Hardlinks won't work
-	# for this test suite.
-	cp -R test test-new || die
-	rm -rf test || die
-	mv test-new test || die
-
-	each_fakegem_test
-}
diff --git a/dev-ruby/sprockets/sprockets-4.0.2.ebuild b/dev-ruby/sprockets/sprockets-4.0.2.ebuild
deleted file mode 100644
index 4f3532deaa62..000000000000
--- a/dev-ruby/sprockets/sprockets-4.0.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby library for compiling and serving web assets"
-HOMEPAGE="https://github.com/rails/sprockets"
-SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/concurrent-ruby:1
-	>=dev-ruby/rack-1:* <dev-ruby/rack-3:*
-	!<dev-ruby/sprockets-3.7.2-r1:3"
-
-ruby_add_bdepend "test? (
-		dev-ruby/json
-		dev-ruby/rack-test
-		=dev-ruby/coffee-script-2*
-		=dev-ruby/execjs-2*
-		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
-		dev-ruby/uglifier
-	)"
-
-all_ruby_prepare() {
-	# Avoid tests for template types that we currently don't package:
-	# eco and ejs.
-	sed -i -e '/eco templates/,/end/ s:^:#:' \
-		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
-	sed -i -e '/.ejs/ s:^:#:' -e '/\(es6_asset.js\|traceur.es6\)/ s:^:#:' test/test_asset.rb || die
-	sed -i -e '/compile babel source map/askip' test/test_source_maps.rb || die
-	sed -e '/change jst template namespace/askip' \
-		-e '/find_asset. does not raise an exception/askip' \
-		-e '/es6 asset/askip' \
-		-i test/test_environment.rb || die
-	rm -f test/test_require.rb test/test_{babel,closure,eco,ejs,jsminc,yui}_{compressor,processor}.rb || die
-	# Fails only within Gentoo test environment, not clear why
-	sed -i -e '/extension exporters/a skip' test/test_exporting.rb || die
-	sed -i -e "/bundler/d" Rakefile || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
-}
-
-each_ruby_test() {
-	# Make sure we have completely separate copies. Hardlinks won't work
-	# for this test suite.
-	cp -R test test-new || die
-	rm -rf test || die
-	mv test-new test || die
-
-	each_fakegem_test
-}
diff --git a/dev-ruby/sprockets/sprockets-4.1.0.ebuild b/dev-ruby/sprockets/sprockets-4.1.0.ebuild
deleted file mode 100644
index 8af84e6a868d..000000000000
--- a/dev-ruby/sprockets/sprockets-4.1.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby library for compiling and serving web assets"
-HOMEPAGE="https://github.com/rails/sprockets"
-SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/concurrent-ruby:1
-	>=dev-ruby/rack-1:* <dev-ruby/rack-3:*
-	!<dev-ruby/sprockets-3.7.2-r1:3"
-
-ruby_add_bdepend "test? (
-		dev-ruby/json
-		dev-ruby/rack-test
-		=dev-ruby/coffee-script-2*
-		=dev-ruby/execjs-2*
-		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
-		dev-ruby/sassc
-		dev-ruby/uglifier
-	)"
-
-all_ruby_prepare() {
-	# Avoid tests for template types that we currently don't package:
-	# eco and ejs.
-	sed -i -e '/eco templates/,/end/ s:^:#:' \
-		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
-	sed -i -e '/.ejs/ s:^:#:' -e '/\(es6_asset.js\|traceur.es6\)/ s:^:#:' test/test_asset.rb || die
-	sed -i -e '/compile babel source map/askip' test/test_source_maps.rb || die
-	sed -e '/change jst template namespace/askip' \
-		-e '/find_asset. does not raise an exception/askip' \
-		-e '/es6 asset/askip' \
-		-i test/test_environment.rb || die
-	rm -f test/test_require.rb test/test_{babel,closure,eco,ejs,jsminc,yui}_{compressor,processor}.rb || die
-	# Fails only within Gentoo test environment, not clear why
-	sed -i -e '/extension exporters/a skip' test/test_exporting.rb || die
-	sed -i -e "/bundler/d" Rakefile || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
-}
-
-each_ruby_test() {
-	# Make sure we have completely separate copies. Hardlinks won't work
-	# for this test suite.
-	cp -R test test-new || die
-	rm -rf test || die
-	mv test-new test || die
-
-	each_fakegem_test
-}
diff --git a/dev-ruby/web-console/Manifest b/dev-ruby/web-console/Manifest
index 3448fef1f848..1c9aa16c0633 100644
--- a/dev-ruby/web-console/Manifest
+++ b/dev-ruby/web-console/Manifest
@@ -1,3 +1,3 @@
 DIST web-console-4.2.0.tar.gz 53991 BLAKE2B 8145e5bf2e13230c7411a49af34129130fb99c8a65afc7b628d77572723cdfcb2afbdc9f3be63a9bad0d3d92013cc291882bbe228058e2b84595566a48b5cdba SHA512 3a9fd5c7a184fd28961a4d8d0e4ad9850d8a4fe39a9c97f13cbd78b34a69be49a78ad94570fcd45e8af6ef523948ead3fb4350a4e49fbbe76855b4115a9afc61
-EBUILD web-console-4.2.0.ebuild 1129 BLAKE2B d66260dd463d1646fb12723c1548699e837816493aad70d778618f5c1c4eb3e2f1d94c348b0ea94a9d417bdecba20c00db270fe1cdb2dff1af1780cba2d7c2bb SHA512 fbbc4fdf57de339ab35022d1842d38a24324644f8ed1c6c8097e76e1a6a1a2689483662d62745af0f2f6cceb4a4c9735d2eb611b146ff5d14f2b8c472b4bfe6f
+EBUILD web-console-4.2.0.ebuild 1129 BLAKE2B 5e05da5ab6ead489dd5a0993c4a5a35c66f33ac1a0a03d169422d111d46937d99824cac335655043dfb19472480bf9eed9302521f3a6b2a14d7ebb312912e11d SHA512 38219e458a342dc42245f7c942ff7ccc5b1b21fb3bfd6438a2f158949fe2ab8c81eda74f69d74365f55cd956331873810755d3415b2770c70b708a6249c0bc27
 MISC metadata.xml 344 BLAKE2B d5b911693b30a2c4fe1df46f9431361cf230591937203cdd2b0597c09ec2e2f407d95150de2e733a66cb306adaa4f25d844197cbb76dbaa41de929bc17c62f33 SHA512 9b18d9f6378be5b56d5c8ee8f50c2add982e833bfbe228a15851bd19378ec1b1986e9ee802b14fa929b8fbf676665dba82589103273678397ff3222404d59c20
diff --git a/dev-ruby/web-console/web-console-4.2.0.ebuild b/dev-ruby/web-console/web-console-4.2.0.ebuild
index 0f4c0b146834..4948c90f97ac 100644
--- a/dev-ruby/web-console/web-console-4.2.0.ebuild
+++ b/dev-ruby/web-console/web-console-4.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 55a716e7661d..96d2b41c73ca 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/patchelf/Manifest b/dev-util/patchelf/Manifest
index 6d28bcb5d6b6..fc728be7c4e7 100644
--- a/dev-util/patchelf/Manifest
+++ b/dev-util/patchelf/Manifest
@@ -1,7 +1,8 @@
+AUX patchelf-glibc-dt-mips-xhash.patch 250 BLAKE2B da297064604c0258ff10515e6ad55b22803ac0c8da215da782ca46433c703a67c3b91dbe573e211886aaa54b1921dfd24a35e395f73cf90935ec456e6607e14f SHA512 d76b9b137c182b5541576834f54d9c89033c4ec1cf7d08fd910eb0d091da32c3a5d8719966c5a7547b77325210bf8696b14bc17a60b2fac608d2eb62208989f6
 DIST patchelf-0.17.0.tar.gz 143684 BLAKE2B ef32baae1d1e07c77442878977693849e2dd3d5c1c1b8d53eb54ee7b1b78eb77ebcf87cbd7caa683f0043e6d7b90ca2593968e9c95b0902e45c4634823be196b SHA512 0db2294cc16a919a84a1bb71194b3ed7a87bb669f684e4cc0943b33899d69690097c59d5c9f8e631bc1b4136db7f10f7cb0fbb1c96912aee567a0fd7dc9c9588
 DIST patchelf-0.17.2.tar.gz 143954 BLAKE2B 7ed684c63955a0b9cfe293fb966f7f08a90c76e8efb2b493eaf3705c57767b31b31e48ab59f39ff1d91b7a4501e6d203e32a40040625a44a7d44113b1320530c SHA512 e5545416d32248d023759457d0a5cd4841d69f39366eb0aa9cfd8a43d2ce372c6e05995bf60ba62bd85c6d98fdece2dbd1e20872e338ef5ac75f11b82ae091b3
 DIST patchelf-0.18.0.tar.gz 331312 BLAKE2B e6ce4ec3bd89c280bb37230dbeb566b803f09900006e79f7dba74f138f66e17746d331baea4def6a43163024b3d86aa8dbac9b2c6545ac146298a8b84373d03b SHA512 6a917d7336b1e8c59f42d4cd1dc725df1378d77657fce13cb31547da1d4805b9df8a834a7b8408fda8aa1dbeb37d0cdca74d8698844ea2f44149f800b802dea6
 EBUILD patchelf-0.17.0.ebuild 594 BLAKE2B 029d3c714b64216953a3688c4c9d0d28066bf46c436949a6537251ef59d99dd64475b85154d3a63c89f91bde4613938240f69f2c2026177506f1f9f6d0dc42aa SHA512 d3802dd03f4da721e2b50fd1245d418418ecbb706c05e19831e869884faa02db3506847420c4162dc0b9c1973c1fbb5f0dd67537c3aa17af508cf833aba3adfc
 EBUILD patchelf-0.17.2.ebuild 600 BLAKE2B 4f472b56c8021bf9ab7a50d0b9ade888ef0d116096e885bb88362b5259350b77070015666b26892bbbffa966bb21c33b5271586ef14840873fe84237af1b1651 SHA512 2d51ffd0b08da7cf184ad35b8c37ef305cce289fee9d176f1f4b438e4ba8ec9e36e28adbd5c3e375c952100ca1ba732d0e0e09202d71ec2ea37c7205852f8907
-EBUILD patchelf-0.18.0.ebuild 600 BLAKE2B 6a741f30950f93ca1b43ee6109459e164122a999c7c1aba4db0e9d7d0df30904bbbd10799350abc281fa55548313c3ec0d723fc64f782903c2bbefc8619137cb SHA512 067c7ca9a62872266115b8b3fda011a33e42d4cce1125d7219b8164076ebca3062a748bbc748a6ebcbce63b5f427193c186ab0650a862522e1952bb1871d35a9
+EBUILD patchelf-0.18.0.ebuild 660 BLAKE2B 1ade27aa6b0d27a14f23cd987260233cbc2a5722d2cde7e378caff90fb87b8e30e21dda9ad3112118c76ca5ca8082170adb43a37db7d181b43f9144a6ebc36d0 SHA512 3454f12f8ab3b03ad2260cc079a2c1c2269434ae5a321bbaf612f0ae780a69379e5de401ee48b53fb72d4ae87dfea0b22ef639d1b440c26b3120089f17162db4
 MISC metadata.xml 304 BLAKE2B f3c4f3a80192390cdeff546ea23f4a03454f17e4900799e10740420f2e158146a6fd8e02b8f77d07fe38646e23eff734d4a7a8571fa23d738e6c000fbe347ec3 SHA512 4a52dc190d6576ddf580830240cbe20c826b609228cc3ca8014f94ff1759a2b1382294b7d5a0c8e3160e7e7e26d055f82855e40076de3b7e410290e119333927
diff --git a/dev-util/patchelf/files/patchelf-glibc-dt-mips-xhash.patch b/dev-util/patchelf/files/patchelf-glibc-dt-mips-xhash.patch
new file mode 100644
index 000000000000..fd92c803ac7c
--- /dev/null
+++ b/dev-util/patchelf/files/patchelf-glibc-dt-mips-xhash.patch
@@ -0,0 +1,9 @@
+Add define for DT_MIPS_XHASH (MIPS gnu hash support) using system elf.h header.
+Bug: https://bugs.gentoo.org/860888
+--- /dev/null
++++ b/src/elf.h
+@@ -0,0 +1,4 @@
++#include_next <elf.h>
++#ifndef DT_MIPS_XHASH
++#define DT_MIPS_XHASH 0x70000036
++#endif
diff --git a/dev-util/patchelf/patchelf-0.18.0.ebuild b/dev-util/patchelf/patchelf-0.18.0.ebuild
index cbc25bb40a74..b0778e8b721b 100644
--- a/dev-util/patchelf/patchelf-0.18.0.ebuild
+++ b/dev-util/patchelf/patchelf-0.18.0.ebuild
@@ -12,9 +12,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux"
 LICENSE="GPL-3"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-glibc-dt-mips-xhash.patch
+)
+
 src_prepare() {
-	default
 	rm src/elf.h || die
+	default
 
 	sed -i \
 		-e 's:-Werror::g' \
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 6db1258d7967..54689cbca019 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 946c9bffd06d..3260810bd650 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,7 +1,5 @@
 DIST graphviz-7.1.0.tar.xz 21477976 BLAKE2B d99a3dcf2b502e92df44552b0b2f8971b4dc13afd642a8ccb7d6c8e34c81c49fd7bc49971a38f71c80c5c4b6c7ef6ffe75dcf2b8954da57cb8f606eb14388786 SHA512 9ff5facadd923300f47f569c568620371e75b7518661bb0f375ada9b0b82189033cec6c124d5691c875e292cef28c51230c6d6c44365c6e4a9e3dcf5b4dd1ee9
-DIST graphviz-8.0.1.tar.xz 21436456 BLAKE2B edd83ce285d6c88be4a2e1d7666956b797790632f8857781902dfec90e52a32c7dbf78026f8cdb82c9181d2d01cbc6bc8bb1ec75ec3f859abbe18aa5b461248e SHA512 e8859710b026ae799d1fc73709faf97623cfcd2285bf0ca3563d0c138657f338ffe91585f750a0c081b806b5efd1247760d2b590e21bfb32e78d6436efd86ee7
 DIST graphviz-8.0.3.tar.xz 21429040 BLAKE2B 31f66c5ee6c201ab632d42c5f25e083d52c58428b5c5b681fea72f4487eaf008fd7d0e85ff0733223afdb6a4c0814fdd0a7428c80b3d4fc319f197a99425f254 SHA512 bd6eccac54d6de82e29bed69cf2b7a21b7a3d66648f3711f805324017a271f3c5f04ed8522d7ee23425918b074f444eca28e1d34dd7d273c89579514ccf17153
 EBUILD graphviz-7.1.0.ebuild 6130 BLAKE2B 1603e05e5b3d8d3d2ad596b29d78285303b0ccc8d8089533cbd8170e9a0d8df3edcb0c603e33dc0aea184be90ee0d7688b79c55e0e0d0fb51264b47652bf157f SHA512 6885431e28d7730b6e0afa6b69a59743293bbe67bf5130228aeacc6b688c786b2199f831ed1c32c361d395829cb3786c87e09b5a24eb330577d02fb315b70191
-EBUILD graphviz-8.0.1.ebuild 6053 BLAKE2B 1af82a0bc413683113d2673e6fb7e1ef95da8567beeada7103ddb95f1e8dbc57e72f1eb88590c43d27fd7c4ebce2bddc357ac20240049107c2aef977f570d4e6 SHA512 1651a7a503e304a8a39a3980d0b61ae28d4df05fbdb81b52e1f1e81c51a8116c45b2728d84495453105dae8dcc5e2e3f1b458945ae341d357ba14dcce0ca0d9a
 EBUILD graphviz-8.0.3.ebuild 6053 BLAKE2B 1af82a0bc413683113d2673e6fb7e1ef95da8567beeada7103ddb95f1e8dbc57e72f1eb88590c43d27fd7c4ebce2bddc357ac20240049107c2aef977f570d4e6 SHA512 1651a7a503e304a8a39a3980d0b61ae28d4df05fbdb81b52e1f1e81c51a8116c45b2728d84495453105dae8dcc5e2e3f1b458945ae341d357ba14dcce0ca0d9a
 MISC metadata.xml 2324 BLAKE2B 206e5312317fb7bf8f4bba64196a6fa89a8a9e30be3b5e0bf598485cdc2a862e1cc302024b9d170aa6c8ebbbd429ab839d296076bc6f1ac3b154678773cd4d5f SHA512 8eb9a1508823a06fbb180755a7dd173cb2365d7d90e25ad211d56645ee213ee825a991ba56b3f1c8d952c0a7baaa1ea3f8d8d35bdedbffbdce608d66645dd2b0
diff --git a/media-gfx/graphviz/graphviz-8.0.1.ebuild b/media-gfx/graphviz/graphviz-8.0.1.ebuild
deleted file mode 100644
index 753e129cbe0a..000000000000
--- a/media-gfx/graphviz/graphviz-8.0.1.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-single-r1
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/"
-# Unfortunately upstream uses an "artifact" store for the pre-generated
-# tarball now, which makes predictable URLs impossible.
-SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PV}/${P}.tar.xz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X"
-
-REQUIRED_USE="
-	!cairo? ( !X !gtk2 !postscript !lasi )
-	pdf? ( cairo )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Requires ksh, tests against installed package, missing files and directory
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/expat-2
-	>=dev-libs/glib-2.11.1:2
-	dev-libs/libltdl
-	>=media-libs/freetype-2.1.10
-	>=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
-	media-libs/libjpeg-turbo:=
-	>=media-libs/libpng-1.2:=
-	sys-libs/zlib
-	virtual/libiconv
-	cairo? (
-		>=x11-libs/cairo-1.1.10[svg(+)]
-		>=x11-libs/pango-1.12
-	)
-	devil? ( media-libs/devil[png,jpeg] )
-	gtk2? (
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2
-	)
-	gts? ( sci-libs/gts )
-	guile? ( dev-scheme/guile )
-	lasi? ( media-libs/lasi )
-	pdf? ( app-text/poppler )
-	perl? ( dev-lang/perl:= )
-	postscript? ( app-text/ghostscript-gpl )
-	python? ( ${PYTHON_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-	)
-	ruby? ( dev-lang/ruby:* )
-	svg? ( gnome-base/librsvg )
-	tcl? ( >=dev-lang/tcl-8.3:= )
-	webp? ( media-libs/libwebp:= )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-BDEPEND="
-	sys-devel/flex
-	sys-devel/libtool
-	virtual/pkgconfig
-	doc? (
-		app-text/ghostscript-gpl
-		sys-apps/groff
-	)
-	guile? (
-		dev-lang/swig
-		dev-scheme/guile
-	)
-	nls? ( >=sys-devel/gettext-0.14.5 )
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	ruby? ( dev-lang/swig )
-	tcl? ( dev-lang/swig )"
-
-# Dependency description / Maintainer info:
-
-# Rendering is done via the following plugins (/plugins):
-# - core, dot_layout, neato_layout, gd , dot
-#   the ones which are always compiled in, depend on zlib, gd
-# - gtk
-#   Directly depends on gtk-2.
-#   needs 'pangocairo' enabled in graphviz configuration
-#   gtk-2 depends on pango, cairo and libX11 directly.
-# - gdk-pixbuf
-#   Directly depends on gtk-2 and gdk-pixbuf.
-#   needs 'pangocairo' enabled in graphviz configuration
-# - ming
-#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
-#   incomplete.
-# - cairo/pango:
-#   Needs pango for text layout, uses cairo methods to draw stuff
-# - xlib:
-#   needs cairo+pango,
-#   can make use of gnomeui and inotify support (??? unsure),
-#   needs libXaw for UI
-#   UI also links directly against libX11, libXmu, and libXt
-#   and uses libXpm if available so we make sure it always is
-
-# There can be swig-generated bindings for the following languages (/tclpkg/gv):
-# - c-sharp (disabled)
-# - scheme (enabled via guile) ... no longer broken on ~x86
-# - go (disabled)
-# - io (disabled)
-# - lua (enabled via lua)
-# - ocaml (enabled via ocaml)
-# - perl (enabled via perl) *1
-# - php (enabled via php) *2
-# - python (enabled via python) *1
-# - ruby (enabled via ruby) *1
-# - tcl (enabled via tcl)
-# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
-# *2 = Those bindings don't build because the paths for the headers/libs aren't
-#      detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
-
-# There are several other tools in /tclpkg:
-# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
-# tkspline, tkstubs ; enabled with: --with-tk
-
-# And the commands (/cmd):
-# - dot, gvedit, gvpr, smyrna, tools/* :)
-#   sci-libs/gts can be used for some of these
-# - gvedit (via 'qt5'):
-#   based on ./configure it needs qt-core and qt-gui only
-# - smyrna : experimental opengl front-end (via 'smyrna')
-#   currently disabled -- it segfaults a lot
-#   needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
-#   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
-#   with flags enabled at configure time
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myconf=(
-		# Speeds up the libltdl configure
-		--cache-file="${S}"/config.cache
-		--enable-ltdl
-		$(use_enable doc man-pdfs)
-		$(use_with cairo pangocairo)
-		$(use_with examples demos '$(docdir)/examples')
-		$(use_with devil)
-		$(use_with gtk2 gdk)
-		$(use_with gtk2 gdk-pixbuf)
-		$(use_with gtk2)
-		$(use_with gts)
-		$(use_with qt5 qt)
-		$(use_with lasi)
-		$(use_with pdf poppler)
-		$(use_with postscript ghostscript)
-		$(use_with svg rsvg)
-		$(use_with webp)
-		$(use_with X x)
-		--with-digcola
-		--with-freetype2
-		--with-ipsepcola
-		--with-libgd
-		--with-sfdp
-		--without-ming
-		# New/experimental features, to be tested, disable for now
-		--without-ipsepcola
-		--without-smyrna
-		# Bindings
-		$(use_enable guile)
-		$(use_enable perl)
-		$(use_enable python python3)
-		$(use_enable ruby)
-		$(use_enable tcl)
-		--disable-go
-		--disable-lua
-		--disable-java
-		--disable-ocaml
-		--disable-php
-		--disable-python
-		--disable-r
-		--disable-sharp
-		# libtool file collision, bug #276609
-		--without-included-ltdl
-		--disable-ltdl-install
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-
-	use python && python_optimize \
-		"${D}"$(python_get_sitedir) \
-		"${ED}"/usr/$(get_libdir)/graphviz/python3
-}
-
-pkg_postinst() {
-	# We need to register all plugins before they become usable
-	dot -c || die
-}
-
-pkg_postrm() {
-	# Remove cruft, bug #547344
-	rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die
-}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 502abac5b7c4..763a2a42a176 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index ee83807173b7..8a025e94a7c4 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -8,6 +8,6 @@ DIST fontconfig-2.14.1.tar.xz 1447044 BLAKE2B 4bee654f4196922fb07673f588b4bf8a65
 DIST fontconfig-2.14.2.tar.xz 1440844 BLAKE2B 4efeeb7f9a6705d493128d00b60e681a20a47556f4c0d7787a5c7a6d2cbbc22f150cad7988a9836a9e72aeb61e2b6a196c00a071c7042c62283c7720cdbb743d SHA512 23483e0ae6aa7589fd37f9949a4cf951c5bff981739dbb446881e4cea86a208c0ab31e2358666eac724af1dc6a689a42733a7ce91cd3e76d8d91eacedb318085
 EBUILD fontconfig-2.14.0-r1.ebuild 6742 BLAKE2B 27a4b527cadce296d9e221c395cacc4ab22ee3fa20edbe8a736d88971e655cdd1381dc02879bae0935d0c5d97d1128a89d969b9bd764d67475d1fb185934e0c7 SHA512 b0989ef1f9365d433422ba3c2cee6d817ae0654702d59aa5ffdd05bb16e61e063fdbab912d734a7e350da5559f9f35d33d86583a00ce2748a3dab550e28cb73f
 EBUILD fontconfig-2.14.1-r1.ebuild 6669 BLAKE2B 15edcc9a23bf962f2de32be9afd712c846859bcd5969155f8d739d91e409f0ca0f540c0a9708d01053c13ad3512b6f64bbeef01a1f8c19167bbebf03f68fdc50 SHA512 28c1238f9128b0d058e92dcb749fcda4ff0b873b7e3c48c13da548a264202170a2d05e1150d555d2437ff9252b60ca0e41d7f1e3d7c4461e732d9d688a5d9548
-EBUILD fontconfig-2.14.2-r1.ebuild 6757 BLAKE2B 58cdfed0b488137d5695366c2fcd9357913e9a84563d4683e2e0906e98e25e311a46cbb51ddd978f0591431391feaa6ed06071906d3e37216cb0f2714d9c49d3 SHA512 01bf062eb83eb7c38faf493a809dc02e0222629851ba5d78f1e3e9a800b7ac615123aee151bcbf0a3a534bb8447b1c1cd18a2a09bf11c9da19ae47fe7a8c71d1
+EBUILD fontconfig-2.14.2-r2.ebuild 7185 BLAKE2B 5fb469d21eea54e6b5f03eccc56f2328e58d741d02f536fcef10641b4741a04d30e4169adb59c08123a08c13b99bc05272000ee723608c2e9384ed6beab916e6 SHA512 74405e5cf62d20901909b274102613a556713f42c56277c7cc850acbc29e0ac77c53eddfb435fd752e34e978d71770ac29ccddd932615d1c6aa9b7de6bc57825
 EBUILD fontconfig-2.14.2.ebuild 6575 BLAKE2B 4fcaba1dd4d5a643a4b6e83080bf108667da2cb000581f05da4f4f1a0b6596c3571205002533992ddb02b3443435798dc30d7533e7f9ab6c259fe516e4f3f9c5 SHA512 6c138bfb68062dfd8737b949b21afacdc1a1abf0f2df99c0ef1d9ada970c5591c9a66164e5d9d3de8ed0c31c4484640595f1381eb6e49a2ffd9fae68bec7980a
 MISC metadata.xml 599 BLAKE2B c83a7da35bf49bd9bdbcc0adbeed83781250873abf67a927a63fbeb76c4013582cc2363068380b95cb021368bbc0ce92e4dc101f75eb6e3405f07a14d6dc97c3 SHA512 9cc70ac770d70ceef0a24acea4089a949456e229242a2f33f35230505cfa7dc5d20fbf1f2b066c6a1bae53013db6dbabbd22304a3f2a358ec43b6843b22e0a66
diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r1.ebuild b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
index 025d4099fc68..ceae1d19f3e5 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
@@ -208,6 +208,17 @@ pkg_postinst() {
 
 	readme.gentoo_print_elog
 
+	local ver
+	for ver in ${REPLACING_VERSIONS} ; do
+		# 2.14.2 and 2.14.2-r1 included the bad 10-sub-pixel-none.conf
+		if ver_test ${ver} -lt 2.14.2-r2 && ver_test ${ver} -ge 2.14.2 ; then
+			if [[ -e "${EROOT}"/etc/fonts/conf.d/10-sub-pixel-none.conf ]] ; then
+				einfo "Deleting 10-sub-pixel-none.conf from bad fontconfig-2.14.2 (bug #900681)"
+				rm "${EROOT}"/etc/fonts/conf.d/10-sub-pixel-none.conf || die
+			fi
+		fi
+	done
+
 	if [[ -z ${ROOT} ]] ; then
 		multilib_pkg_postinst() {
 			ebegin "Creating global font cache for ${ABI}"
diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest
index 691694001fe8..8193f1e32358 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -2,6 +2,6 @@ AUX liblscp-0.9.6-conditional.patch 275 BLAKE2B 4ce887eb210c4e32d16a8b0300d7a039
 DIST liblscp-0.9.8.tar.gz 98451 BLAKE2B 6b353f322194ee4fa13a3b916982b5fed25eda746c40d1efde28e407a7c5dda943f331bd25a130976b6410a16c6a6a95e055bdcdbd6846bb7d522fcbf600074a SHA512 b46ac3407fca12fe3d330041bcdca72e481ab1a1149faf31aed8f41e5b153b788678c2cd595a22eb7ec9ce285225f451f7b8fecaf60d31695a9c308dc506ed83
 DIST liblscp-0.9.9.tar.gz 98483 BLAKE2B 7fccc9846629d94d31ea5b4474dd59a23699c7ded911393c6e395dcc28a34b07a129cbd2e2f8b5e4fcd99230ed801cf1be3af8b2503e896bcb87d93a0875ea9d SHA512 514cf2ff33456beca6dde057a6db47c7c338647e9724a7f13bbfa878aaa606347b9b4fd7c432c545aa9d1a0fff7873ed46b28b82e6cf959c4ed81b1115e92caa
 EBUILD liblscp-0.9.8.ebuild 748 BLAKE2B 0d001b0d06c800f1f0a404e5ce07708c4e7e3c7333089430b1f2ccc866f983e65937b4d41c3d45b323c618e9a0ec7a1b7b1d86462b472315c7a8caa900cf3070 SHA512 9e377d3a7aead12fe991dce44d91446f9da73fe4c9d0ada58dab1a6f770d48416e5ccfda886998e18585fb4b65d8952059f1ee2f5b81c377013c8ff9c22a3a84
-EBUILD liblscp-0.9.9.ebuild 750 BLAKE2B da15f8dd1035a9120e1fb92ef027e6dcb3196443e78cf9b1449f6a10a42c2f77392a9b93dfb18ccf79cf6833723cf2e465939513799948c737ecaa35a772e1ff SHA512 229a934f489d28fd98674fb9887ab52cb65fe03f79a100cb58c243c44135c85d3da08621c39711743a1b87a573fffe4ea140f153ab02cf769415b12ec21ad539
+EBUILD liblscp-0.9.9.ebuild 748 BLAKE2B 0d001b0d06c800f1f0a404e5ce07708c4e7e3c7333089430b1f2ccc866f983e65937b4d41c3d45b323c618e9a0ec7a1b7b1d86462b472315c7a8caa900cf3070 SHA512 9e377d3a7aead12fe991dce44d91446f9da73fe4c9d0ada58dab1a6f770d48416e5ccfda886998e18585fb4b65d8952059f1ee2f5b81c377013c8ff9c22a3a84
 EBUILD liblscp-9999.ebuild 750 BLAKE2B 4ec1fd94a04806df5a2c8ec18f12a21cb53159a933be39253bbf2ad3d2e505e8cc71d8bfcb8bfeb751da7fc60c18437d63c74c05e4a723f94106f1d4717bb4c7 SHA512 fdcb708593aec437922f534f90a1bee1040d68c5659d56645052f933f7dec512767d70b359f535db3d7fec4dd6677dda306e0c205be565b25a48d470290e687f
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-libs/liblscp/liblscp-0.9.9.ebuild b/media-libs/liblscp/liblscp-0.9.9.ebuild
index abf96900d91a..f58f229f36be 100644
--- a/media-libs/liblscp/liblscp-0.9.9.ebuild
+++ b/media-libs/liblscp/liblscp-0.9.9.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
 		https://download.linuxsampler.org/packages/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86"
+	KEYWORDS="amd64 ~ppc x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/libva-intel-media-driver/Manifest b/media-libs/libva-intel-media-driver/Manifest
index 70aaf47ae231..08fd79028d4b 100644
--- a/media-libs/libva-intel-media-driver/Manifest
+++ b/media-libs/libva-intel-media-driver/Manifest
@@ -3,7 +3,11 @@ AUX libva-intel-media-driver-20.4.5_testing_in_src_test.patch 1724 BLAKE2B a4820
 AUX libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch 1473 BLAKE2B d3303d8cf11e99fc08b01cb4a12b1500afba27920e52a47cdf2d3cacc0b2cbea72e417ca4c118793c1149659cf1e51b619c0a81ca5103505a25994d9a0fee00a SHA512 41cd3cefd7a6aa6482c4d06b912cf441879e6fd14cee93380b081021e344d6555791e80d0925f66f59178d1b2d5ee15ff1f2deb4835d72f7fb74673912fc6b9e
 DIST intel-media-22.6.6.tar.gz 28599397 BLAKE2B 3a3449f0af37c431ff1224bb919de3382767044a728603b9fb3343f6a2ed92ec8f9c30796623a17fe64de617816d0961507171c06e41739c9c650145b93439e2 SHA512 8013ecadfc827a89eea6c72e262c220fe05fc11348ab23d46fb703f170d927739b46b21bad5e79fdebde86b646609339d2333eafb7f0798d77f9c64f20203f90
 DIST intel-media-23.1.5.tar.gz 28640412 BLAKE2B 5b9e1d3aebb63bd0164a1fa09c33583d4b41ce5dc509b49218e370f9bcbce42ff58872fa5fcdfcca9cd4c9c08e9d744aa22fe084af71970fefa1f70cc936d859 SHA512 b758871618e86487af026df27aa44ccc4dd28ee6cbd3b863fc076052428b7a05a0ad104297e4da50edf298e8ee067959389e283d7479b852315371094a475bc5
+DIST intel-media-23.1.6.tar.gz 28641715 BLAKE2B 5f0ad615c95347dc2be95280b225345aec35c88c5b7560c86221c004d0b66a9ac929d68a38252fcf66a4a798bf733794c315683ce239e7946ba285b3dbaed462 SHA512 4068aafb45c5dc7877aeaad5343701ba490c0a369fb3d4d26a2732d8d92e1e39cadd7c662184190bbcecece5dd65271f02a3e260b607ccda3ff7f47dbc798af1
+DIST intel-media-23.2.0.tar.gz 28619615 BLAKE2B 15d6438671454fccacd82dc226c3fe30e3e651146360895f23dc5131f7a6b146e72d77ed5bb2e9acef1d3a573cf3dd032a4690ee2465e99ad2c09545888edc11 SHA512 3c45246c1db3f1be15297a8ce5ec805632761a3dd7ff5f603bbe143e4426cf16779187bfd1a72013f9f2f0e3fbaffbe1d0bb68e34fb781f35ea658b8e30ffee1
 EBUILD libva-intel-media-driver-22.6.6.ebuild 1348 BLAKE2B 42c27e60a9177174c731466ed0d8a7385d97d1f3dfe607dcb08f486b10891d45adaeae518caecba24d7b6bb3727cea1612216daa65398e3a8cfeea7f25bea90a SHA512 9f24af8b9b5e5ca765972d2afa4ba13d48d173450a5e229409ef16273c9d322a4acf47d42f9df151207cc4953be46a203f17426dceba8018c85af2b4e041350c
 EBUILD libva-intel-media-driver-23.1.5.ebuild 1512 BLAKE2B 8eb90fd1290e2ac8bdbc22c23456372e17c11c1a076a4a9a0fa6216ef56e836768735e6743ec64cb629684db5a44efc5cc8c0d4b6c67d6a6e31f3e0807fb4580 SHA512 184bac022aba9b2cb2e6cfe28973a1bde7d066891cd17b3d20b417f472de85788ebb3f8e9207610fb3e977a5889655f68594f6bd8cb953c2767332ac7228d5cf
+EBUILD libva-intel-media-driver-23.1.6.ebuild 1512 BLAKE2B 8eb90fd1290e2ac8bdbc22c23456372e17c11c1a076a4a9a0fa6216ef56e836768735e6743ec64cb629684db5a44efc5cc8c0d4b6c67d6a6e31f3e0807fb4580 SHA512 184bac022aba9b2cb2e6cfe28973a1bde7d066891cd17b3d20b417f472de85788ebb3f8e9207610fb3e977a5889655f68594f6bd8cb953c2767332ac7228d5cf
+EBUILD libva-intel-media-driver-23.2.0.ebuild 1512 BLAKE2B 8eb90fd1290e2ac8bdbc22c23456372e17c11c1a076a4a9a0fa6216ef56e836768735e6743ec64cb629684db5a44efc5cc8c0d4b6c67d6a6e31f3e0807fb4580 SHA512 184bac022aba9b2cb2e6cfe28973a1bde7d066891cd17b3d20b417f472de85788ebb3f8e9207610fb3e977a5889655f68594f6bd8cb953c2767332ac7228d5cf
 EBUILD libva-intel-media-driver-9999.ebuild 1535 BLAKE2B 3e0c6af2ce30282f4e5358dbb91d82a23a02090afc2cf4b823e3c5c01f389276fb2bcbfa5731e9c471903a733606f6226ac9cee73a9f286826fb35127829eec8 SHA512 306aac23e618b1c2a43f816e3114f54136478a7c770f18784f0dc549706d911064dfdc5453be89c1065baeac20408f7bf777eb2e3ef9e14584e6e2f109811c82
 MISC metadata.xml 565 BLAKE2B e630d474342839898d53aef1849b002ef651c9f4fe3bfcfe72e809012e6c65153b1a6c14db922a45440ffd5717b90dddd6973185f8a625906e9d5571e50728d9 SHA512 22227f8a9cc39fff74f0bf2cdc8953f110e94ce0ab107076269d604c3cf8ae46c8496c9bcf47598e351cb9714e427f213ade5e446a5e8c67acfc87db5530b370
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.1.6.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.1.6.ebuild
new file mode 100644
index 000000000000..4e88c88c1c0a
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.1.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	MY_PV="${PV%_pre}"
+	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
+	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~amd64"
+	fi
+fi
+
+DESCRIPTION="Intel Media Driver for VA-API (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD redistributable? ( no-source-code )"
+SLOT="0"
+IUSE="+redistributable test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-22.3.0:=[${MULTILIB_USEDEP}]
+	>=media-libs/libva-2.14.0[X?,${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
+	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
+)
+
+multilib_src_configure() {
+	# https://github.com/intel/media-driver/issues/356
+	append-cxxflags -D_FILE_OFFSET_BITS=64
+
+	local mycmakeargs=(
+		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
+		-DMEDIA_RUN_TEST_SUITE=$(usex test)
+		-DBUILD_TYPE=Release
+		-DPLATFORM=linux
+		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
+		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
+		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+	)
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.2.0.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.2.0.ebuild
new file mode 100644
index 000000000000..4e88c88c1c0a
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.2.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	MY_PV="${PV%_pre}"
+	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
+	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~amd64"
+	fi
+fi
+
+DESCRIPTION="Intel Media Driver for VA-API (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD redistributable? ( no-source-code )"
+SLOT="0"
+IUSE="+redistributable test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-22.3.0:=[${MULTILIB_USEDEP}]
+	>=media-libs/libva-2.14.0[X?,${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
+	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
+)
+
+multilib_src_configure() {
+	# https://github.com/intel/media-driver/issues/356
+	append-cxxflags -D_FILE_OFFSET_BITS=64
+
+	local mycmakeargs=(
+		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
+		-DMEDIA_RUN_TEST_SUITE=$(usex test)
+		-DBUILD_TYPE=Release
+		-DPLATFORM=linux
+		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
+		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
+		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+	)
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 29c696b7c70f..88c5c5c07312 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,6 +1,8 @@
+AUX mesa-23.0.2-wayland-crash-warnings-2.patch 1854 BLAKE2B e0aaa149f3a3c45dc4ea57b28146b19774d386bfd070ad22344596caa8fbba1eaed37ce6938792be448bb1adb1a37fc3c004bdca486592db84aea26dacf4d167 SHA512 762f2917aead5ead4586a0875cb79f56c5a1becc80fa37e15e46bfb432a679f8e31025cca55c1d5068efebb60367eb11223e24c729406a9ce56ba536796acb0d
+AUX mesa-23.0.2-wayland-crash-warnings.patch 1430 BLAKE2B a7c7ef4a34ac9c76c4c5af783510887705a1d6acbc62978b2cc8a021534e215404de3d5828d9c052dccc85808da5b0553f9172fa8edccb40ed7fdc6bc1df35c3 SHA512 98b8a3de99c96474a07615b225b00773c9988a05e25a70cc6586c60762bea8d1a0bbbb47d45e8a38d780951a83abd2c6bbda19180b2457a686625b140b570014
 DIST mesa-22.3.7.tar.xz 17136476 BLAKE2B 291e94302d3a177f842def9339d1ba012bf10de792b7120985255168faac6b87a73d1d59d8b430f56ea2a2640ca0890a5c3721188b70c528b9aad9788d7e139d SHA512 c37bbcb3c0be1908726d6f83bfe98126d681935e401e03946e8b540611f832d2f272a2ac470600c2b77caa5b9a3a9059eb34bd9a93fcf88df114bedf8c39bf5a
 DIST mesa-23.0.3.tar.xz 17627728 BLAKE2B e716d9ddce3da649239c1bc37ec208b9669f316f6b547ca0c69937043f371f0d59ead34fec427297171916045061ddb8783d126f6dec5ece90a0719003fe2c40 SHA512 52c778de61daa406c6a1e96a657e9b6fdcc71c8cfda80b7f53acc6470556c7d502c057b9481bb0c3d57ef0263263413fd0d25d53ebf5aa0246fbcc3309de64ae
 EBUILD mesa-22.3.7-r1.ebuild 12130 BLAKE2B a735afabb891b4b8600c5f00046496b12f845670b461f7fa078987368a2e0600729d45031dab04a7ad65a877df37445d33b25111ad43a65c0847f5a241bdf3d0 SHA512 c115092f8a8583f5f5bd71791541a6ff989b78b612a90ed95b9c189acb4ba9e3676269ad19e68df24b78dde8f84ad549e4976da7d50d9e6ca5c963d4c163192f
-EBUILD mesa-23.0.3.ebuild 12152 BLAKE2B 29d5a5df3e9222d41402b7a530264178d6c786b99334dca52b198a3ae0c49e5d1bb6d562fe3df718d78936b76592eebec5803efd5da2120d0ff464a0bcc69ffc SHA512 aa422813ae441467a77bc3e8af3c69a371788c80691f7e120b017b4a1cb0a609846c3661506d6ccce469ad1315c78f7431e479e703661ab0c8b59c3db7bc21dd
+EBUILD mesa-23.0.3-r1.ebuild 12281 BLAKE2B ee33a702a829d5d4e06c6e13999cd9e1778eb5a97d8ca38a319173b4bfb9f369f1936cfbb2efdd30a48faffe4c824f0252bd57eb0773ee79d1ab528d620b30ec SHA512 2cd60b52f55fb0cbcfd5ac0c27942ae3671ac85b27d6fbf2fb968fd0ed064ca74ab57a4bbd83d942bb68d4408662bfda62436e948d8e98184952d0dedb48d66b
 EBUILD mesa-9999.ebuild 12152 BLAKE2B 29d5a5df3e9222d41402b7a530264178d6c786b99334dca52b198a3ae0c49e5d1bb6d562fe3df718d78936b76592eebec5803efd5da2120d0ff464a0bcc69ffc SHA512 aa422813ae441467a77bc3e8af3c69a371788c80691f7e120b017b4a1cb0a609846c3661506d6ccce469ad1315c78f7431e479e703661ab0c8b59c3db7bc21dd
 MISC metadata.xml 1606 BLAKE2B 0f0d0be785aef5042a0a0ae6ce0855dea4ff0105db96339f6f81ac8e3e956f363a90d08bf087924e33873e9bf0182487cdd7ba7baa72b97d17db8afdc375b7e5 SHA512 cf6fe4938eef2e6bccbea43e63b271b5f55ad73b3201a36c484b0f72cd56efb70df6502296828a778477d72848474d8bdbf5ab270dc1dbe96b7464716a1bdc82
diff --git a/media-libs/mesa/files/mesa-23.0.2-wayland-crash-warnings-2.patch b/media-libs/mesa/files/mesa-23.0.2-wayland-crash-warnings-2.patch
new file mode 100644
index 000000000000..5992583a1fa0
--- /dev/null
+++ b/media-libs/mesa/files/mesa-23.0.2-wayland-crash-warnings-2.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/904072
+https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21647
+
+From 689ce66a4332524b4eb98877de6f75d05dd05c60 Mon Sep 17 00:00:00 2001
+From: Alexandros Frantzis <alexandros.frantzis@collabora.com>
+Date: Thu, 2 Mar 2023 10:10:42 +0200
+Subject: [PATCH] vulkan/wsi/wayland: Fix destruction of event queue with
+ proxies still attached.
+
+Destroy the surface dmabuf feedback proxy before destroying the event
+queue that the proxy is attached to.
+
+This silences a warning that libwayland 1.22 emits for programs that use
+Vulkan/Wayland:
+
+warning: queue 0x557a4efbcf70 destroyed while proxies still attached:
+  zwp_linux_dmabuf_feedback_v1@18 still attached
+
+Signed-off-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21647>
+--- a/src/vulkan/wsi/wsi_common_wayland.c
++++ b/src/vulkan/wsi/wsi_common_wayland.c
+@@ -1157,18 +1157,18 @@ wsi_wl_surface_destroy(VkIcdSurfaceBase *icd_surface, VkInstance _instance,
+    struct wsi_wl_surface *wsi_wl_surface =
+       wl_container_of((VkIcdSurfaceWayland *)icd_surface, wsi_wl_surface, base);
+ 
+-   if (wsi_wl_surface->surface)
+-      wl_proxy_wrapper_destroy(wsi_wl_surface->surface);
+-
+-   if (wsi_wl_surface->display)
+-      wsi_wl_display_destroy(wsi_wl_surface->display);
+-
+    if (wsi_wl_surface->wl_dmabuf_feedback) {
+       zwp_linux_dmabuf_feedback_v1_destroy(wsi_wl_surface->wl_dmabuf_feedback);
+       dmabuf_feedback_fini(&wsi_wl_surface->dmabuf_feedback);
+       dmabuf_feedback_fini(&wsi_wl_surface->pending_dmabuf_feedback);
+    }
+ 
++   if (wsi_wl_surface->surface)
++      wl_proxy_wrapper_destroy(wsi_wl_surface->surface);
++
++   if (wsi_wl_surface->display)
++      wsi_wl_display_destroy(wsi_wl_surface->display);
++
+    vk_free2(&instance->alloc, pAllocator, wsi_wl_surface);
+ }
+ 
+-- 
+GitLab
diff --git a/media-libs/mesa/files/mesa-23.0.2-wayland-crash-warnings.patch b/media-libs/mesa/files/mesa-23.0.2-wayland-crash-warnings.patch
new file mode 100644
index 000000000000..537d070c091e
--- /dev/null
+++ b/media-libs/mesa/files/mesa-23.0.2-wayland-crash-warnings.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/904072
+https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21646
+
+From ee5d2250fd159689aae3f7d632a6226971bea85c Mon Sep 17 00:00:00 2001
+From: Alexandros Frantzis <alexandros.frantzis@collabora.com>
+Date: Thu, 2 Mar 2023 09:35:08 +0200
+Subject: [PATCH] egl/wayland: Fix destruction of event queue with proxies
+ still attached.
+
+Destroy the display wrapper proxy before destroying the event queue that
+the proxy is attached to.
+
+This silences a warning that libwayland 1.22 emits for programs that use
+EGL/Wayland:
+
+warning: queue 0x562a5ed2cd20 destroyed while proxies still attached:
+  wl_display@1 still attached
+
+Signed-off-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21646>
+--- a/src/egl/drivers/dri2/platform_wayland.c
++++ b/src/egl/drivers/dri2/platform_wayland.c
+@@ -2865,10 +2865,10 @@ dri2_teardown_wayland(struct dri2_egl_display *dri2_dpy)
+       wl_shm_destroy(dri2_dpy->wl_shm);
+    if (dri2_dpy->wl_registry)
+       wl_registry_destroy(dri2_dpy->wl_registry);
+-   if (dri2_dpy->wl_queue)
+-      wl_event_queue_destroy(dri2_dpy->wl_queue);
+    if (dri2_dpy->wl_dpy_wrapper)
+       wl_proxy_wrapper_destroy(dri2_dpy->wl_dpy_wrapper);
++   if (dri2_dpy->wl_queue)
++      wl_event_queue_destroy(dri2_dpy->wl_queue);
+ 
+    if (dri2_dpy->own_device)
+       wl_display_disconnect(dri2_dpy->wl_dpy);
+-- 
+GitLab
diff --git a/media-libs/mesa/mesa-23.0.3.ebuild b/media-libs/mesa/mesa-23.0.3-r1.ebuild
index 1d4bb730495f..767e5341ebf6 100644
--- a/media-libs/mesa/mesa-23.0.3.ebuild
+++ b/media-libs/mesa/mesa-23.0.3-r1.ebuild
@@ -206,6 +206,11 @@ x86? (
 	usr/lib/libGLX_mesa.so.0.0.0
 )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-23.0.2-wayland-crash-warnings.patch
+	"${FILESDIR}"/${PN}-23.0.2-wayland-crash-warnings-2.patch
+)
+
 llvm_check_deps() {
 	local flags=${MULTILIB_USEDEP}
 	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index ba3732978f58..0b154407443f 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 2e915ff38823..a1ee7bbc83ad 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Apr 2023 04:39:41 +0000
+Thu, 27 Apr 2023 10:39:40 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 9460c8eae8eb..cd5d74e79648 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-04-27T04:39:45Z
+TIMESTAMP 2023-04-27T10:39:43Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRJ/JFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRKUO9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD1jw//XDBV5EH5Z3cV2OoczfQxsjJJrukH7WmWkPAfUh2pofOsXKcown+Jktxw
-v9s2obhmboucwdgT/pcT7PypD9jUsyO9NVLrN7w0+UdLbiKToMNVlj9TOXb4YiYF
-Cz5qPNyTer5yU9FAX7J1/bmf+YdZmbfXGsjFX10BbePXzM+JhiZB0qEHM9B26MtD
-pqkXbU0WfuU+XJ0vDfEl7MXPBSMklWbW9DK01G7+d+q3924HNjXhunVNvwOA2z3F
-XItLCPeNpRnO+hmkti/7GkcbhNYGBSzZKV5hGvU/VhLj7szwm00vO9iiFF8U3m24
-YTinlnTxYWx3AMOMa7h7DZJlUDduZQFqqUmVnVx+fNeviVUVb3Y9KLL6Ytqvz/p1
-RvuBP3wiGc/a+KdElPaaro09anfyElDYVhklt81X2seWPvZ7X34usaGaIDoFYEZ0
-v8d2iKG+Xl60fcwB1CNF+1X/c4euRHx8NFh/A6+W/RUPi7lKLsCtGjLjjdGN0Yu7
-2bDrw6U+PteghmtUpLR5JTaEaq8/0Up97Lywn6ukc+/LAD1K3nPwlSmoGE8TBqSs
-494qZe1YyjX33roWsnWKIUnb7HFSfwAaJsNGN52Wkz8+fMxakMwobPAvOvcz0YIz
-n/+l/uluaL2PB2MpSbPo2Q8b57K6Pwt5VqL5/Ft1oHPax6Pb8Ys=
-=2z1j
+klAdPRAAtCp32Jnpl5pC4nOdoQFlqwZLWhZb4sGqBn5uZtNRIJr1E9Tuc0/CnX4p
+l8D79RuM1/ZsGkfYYJiL/D9/LpVw8xfndkZ0vSHz52KspLSPWXcENBBxCtLA+/KI
+AkNjCfcrUJ2JbVMAbJp3Gby8G3HEBRN1N+Jz7s8S58Ae/xCjWx5y1cZ0AwLexG53
+E2S0ZApQHdjgz5co6TFrXABxd32CRDrghOeBHVNGcLELIPG0EbE/MQo+ZE+ycBes
+O3LPldgxKj73wxXakguTrIy0cgBXnkkqqhvwFBR5/WDrv/ZVTOB2sWSWtkdd8Y0l
+rCTSbcnvvthbTFYAzwJ4uswKZmEZbs44PgPuYDfmFrT16WcS1HIfgDNLnurcguMw
+Y2sg/As2VAkeOA444lvot67iKz8F6iwmuwTLZxLcG4iNMMqLdrNBqoOC/T8iQQPS
+77WFnHU2Nf1yV7L+sammojLbSS88zK04x7a8qjlClrd1fJHuxgyMq/3bujqqOCBJ
+rwh4EZEyJPAp4ks1OpvPk9PtygvsK6J21pV3MqSEQiDiDX9dYH/eps2WL7AevYmA
+pogQ4Mif3CqWfUHjywUbxt16Hf4xs3pRj/6bhTFAFVB//zHC3qWDAP5JQipXdP58
+R3AvVaC2EQ2BRkq7EXs9Q1M3qYgE+s+TW7xxqTv0OUBte+eLZsY=
+=KqYS
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 2e915ff38823..a1ee7bbc83ad 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Apr 2023 04:39:41 +0000
+Thu, 27 Apr 2023 10:39:40 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index b65f755ec1a2..c6c85b1db4a3 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index ff8d2f060e54..ad8b6120d780 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/command-t-5.0.3-r1 b/metadata/md5-cache/app-vim/command-t-5.0.3-r1
index d386c4d67219..9e5c2e3eb88e 100644
--- a/metadata/md5-cache/app-vim/command-t-5.0.3-r1
+++ b/metadata/md5-cache/app-vim/command-t-5.0.3-r1
@@ -1,16 +1,16 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 )
 DESCRIPTION=vim plugin: fast file navigation for vim
 EAPI=7
 HOMEPAGE=https://vim.sourceforge.io/scripts/script.php?script_id=3025 https://github.com/wincent/command-t
 INHERIT=vim-plugin ruby-ng
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
-RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 SLOT=0
 SRC_URI=https://github.com/wincent/command-t/archive/5.0.3.tar.gz -> command-t-5.0.3.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=31081c81d39e742467c4372c3739ca6d
+_md5_=12c94594854f6e2e72cf5ad061d941ed
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 72bac12e0906..55a4cd4ad962 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/R-4.2.3 b/metadata/md5-cache/dev-lang/R-4.2.3
index 4c295174911b..da1052a8f9da 100644
--- a/metadata/md5-cache/dev-lang/R-4.2.3
+++ b/metadata/md5-cache/dev-lang/R-4.2.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.r-project.org/
 INHERIT=bash-completion-r1 autotools flag-o-matic fortran-2 toolchain-funcs
 IUSE=cairo doc icu java jpeg lapack lto minimal nls openmp perl png prefix profile readline test tiff tk X
-KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~loong ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~hppa ~ia64 ~loong ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 GPL-3 ) LGPL-2.1
 RDEPEND=app-arch/bzip2 app-arch/xz-utils app-text/ghostscript-gpl dev-libs/libpcre2:= >=dev-libs/tre-0.8.0_p20210321[approx] net-misc/curl virtual/blas sys-libs/zlib[minizip] || ( sys-apps/coreutils app-misc/realpath ) cairo? ( x11-libs/cairo:=[X=] x11-libs/pango:= ) icu? ( dev-libs/icu:= ) jpeg? ( media-libs/libjpeg-turbo:= ) kernel_linux? ( net-libs/libtirpc ) lapack? ( virtual/lapack ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:= ) readline? ( sys-libs/readline:= ) tiff? ( media-libs/tiff:= ) tk? ( dev-lang/tk:= ) X? ( x11-libs/libXmu x11-libs/libXt ) java? ( >=virtual/jre-1.8:* ) virtual/fortran
 REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )
@@ -14,4 +14,4 @@ RESTRICT=minimal? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-4/R-4.2.3.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	bash-completion-r1	59cf54afadd3b37d31d9d85c7d7d8067	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=db5a0a5a884f159c1f1d5eb01fdaa8ab
+_md5_=5d2f0d0b482bf49cc3850b7174d5464f
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 5f0d81c3c3d6..7401947cd050 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/bemenu-0.6.10 b/metadata/md5-cache/dev-libs/bemenu-0.6.10
deleted file mode 100644
index 4df9f999c4b5..000000000000
--- a/metadata/md5-cache/dev-libs/bemenu-0.6.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile install
-DEPEND=wayland? ( dev-libs/wayland-protocols )
-DESCRIPTION=dmenu clone for wayland
-EAPI=8
-HOMEPAGE=https://github.com/Cloudef/bemenu
-INHERIT=toolchain-funcs
-IUSE=doc ncurses wayland X
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-3
-REQUIRED_USE=|| ( ncurses wayland X )
-SLOT=0
-SRC_URI=https://github.com/Cloudef/bemenu/archive/0.6.10.tar.gz -> bemenu-0.6.10.tar.gz
-_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1970df9d59eee3c8d3bcd452d98e00cb
diff --git a/metadata/md5-cache/dev-libs/bemenu-0.6.10-r1 b/metadata/md5-cache/dev-libs/bemenu-0.6.10-r1
new file mode 100644
index 000000000000..fa9233b763f8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/bemenu-0.6.10-r1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile install
+DEPEND=ncurses? ( sys-libs/ncurses:= ) wayland? ( dev-libs/wayland x11-libs/cairo x11-libs/pango x11-libs/libxcb ) X? ( x11-libs/libxcb x11-libs/libXext x11-libs/libX11 x11-libs/cairo[X] x11-libs/pango[X] x11-libs/libXinerama ) wayland? ( dev-libs/wayland-protocols )
+DESCRIPTION=dmenu clone for wayland
+EAPI=8
+HOMEPAGE=https://github.com/Cloudef/bemenu
+INHERIT=toolchain-funcs
+IUSE=doc ncurses wayland X
+KEYWORDS=amd64 ~arm64 x86
+LICENSE=GPL-3
+RDEPEND=ncurses? ( sys-libs/ncurses:= ) wayland? ( dev-libs/wayland x11-libs/cairo x11-libs/pango x11-libs/libxcb ) X? ( x11-libs/libxcb x11-libs/libXext x11-libs/libX11 x11-libs/cairo[X] x11-libs/pango[X] x11-libs/libXinerama )
+REQUIRED_USE=|| ( ncurses wayland X )
+SLOT=0
+SRC_URI=https://github.com/Cloudef/bemenu/archive/0.6.10.tar.gz -> bemenu-0.6.10.tar.gz
+_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=effee07192c141098d758bd795f06e2c
diff --git a/metadata/md5-cache/dev-libs/bemenu-9999 b/metadata/md5-cache/dev-libs/bemenu-9999
index 6853be400c25..e5966c86ce09 100644
--- a/metadata/md5-cache/dev-libs/bemenu-9999
+++ b/metadata/md5-cache/dev-libs/bemenu-9999
@@ -1,6 +1,6 @@
 BDEPEND=doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install unpack
-DEPEND=wayland? ( dev-libs/wayland-protocols )
+DEPEND=ncurses? ( sys-libs/ncurses:= ) wayland? ( dev-libs/wayland x11-libs/cairo x11-libs/pango x11-libs/libxcb ) X? ( x11-libs/libxcb x11-libs/libXext x11-libs/libX11 x11-libs/cairo[X] x11-libs/pango[X] x11-libs/libXinerama ) wayland? ( dev-libs/wayland-protocols )
 DESCRIPTION=dmenu clone for wayland
 EAPI=8
 HOMEPAGE=https://github.com/Cloudef/bemenu
@@ -8,7 +8,8 @@ INHERIT=toolchain-funcs git-r3
 IUSE=doc ncurses wayland X
 LICENSE=GPL-3
 PROPERTIES=live
+RDEPEND=ncurses? ( sys-libs/ncurses:= ) wayland? ( dev-libs/wayland x11-libs/cairo x11-libs/pango x11-libs/libxcb ) X? ( x11-libs/libxcb x11-libs/libXext x11-libs/libX11 x11-libs/cairo[X] x11-libs/pango[X] x11-libs/libXinerama )
 REQUIRED_USE=|| ( ncurses wayland X )
 SLOT=0
 _eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1b4a5b5248af97870891683a8ddc8584
+_md5_=18eb5fef261e14e34c8bed2fa95e10a8
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.10.2 b/metadata/md5-cache/dev-libs/libgcrypt-1.10.2
index 8dad6a40093a..8cb754099469 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.10.2
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.10.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gnupg.org/
 INHERIT=autotools flag-o-matic linux-info multilib-minimal toolchain-funcs verify-sig
 IUSE=+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc +getentropy 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 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 ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] getentropy? ( kernel_linux? ( elibc_glibc? ( >=sys-libs/glibc-2.25 ) elibc_musl? ( >=sys-libs/musl-1.1.20 ) ) )
 REQUIRED_USE=cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 ) cpu_flags_arm_sha1? ( cpu_flags_arm_aes cpu_flags_arm_sha2 ) cpu_flags_arm_sha2? ( cpu_flags_arm_aes cpu_flags_arm_sha1 ) cpu_flags_ppc_vsx3? ( cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_altivec )
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.10.2.tar.bz2 verify-sig? ( mirror://gnupg/libgcrypt/libgcrypt-1.10.2.tar.bz2.sig )
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=6cfe1936eca9221ae5b298a53788ba0c
+_md5_=4b5575bf32e064015cf48a2846915fec
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 13db96121ca0..67d3162ce6cd 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/jellyfish-0.10.0 b/metadata/md5-cache/dev-python/jellyfish-0.10.0
index 8bf4cbb31047..b15e8d809d42 100644
--- a/metadata/md5-cache/dev-python/jellyfish-0.10.0
+++ b/metadata/md5-cache/dev-python/jellyfish-0.10.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jamesturk/jellyfish/ https://pypi.org/project/jellyfish/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~ppc64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) 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_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jellyfish/jellyfish-0.10.0.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=dbdf36394abe11fbedf45f7c0f6be1c2
+_md5_=a5fe7b9b2a521daedeefb7f9ed3e1920
diff --git a/metadata/md5-cache/dev-python/pytz-2023.3-r1 b/metadata/md5-cache/dev-python/pytz-2023.3-r1
index 9853b046cf92..c518d7a2cae0 100644
--- a/metadata/md5-cache/dev-python/pytz-2023.3-r1
+++ b/metadata/md5-cache/dev-python/pytz-2023.3-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pythonhosted.org/pytz/ https://github.com/stub42/pytz/ https://pypi.org/project/pytz/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-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 ~x64-solaris
 LICENSE=MIT
 RDEPEND=|| ( >=sys-libs/timezone-data-2023b sys-libs/glibc[vanilla] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[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_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pytz/pytz-2023.3.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6a5318a8179e4ea511ae481771b2e2ba
+_md5_=db363877a0445330b290c1c12ce9c63f
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 5e04f8a47875..ce334e7cefdb 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.0.6.1-r2 b/metadata/md5-cache/dev-ruby/activesupport-6.0.6.1-r2
new file mode 100644
index 000000000000..02c9cb69ddca
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.0.6.1-r2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] dev-ruby/i18n:1[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1[ruby_targets_ruby27(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby30(-)] dev-ruby/i18n:1[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.1[ruby_targets_ruby30(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby30(-)] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Utility Classes and Extension to the Standard Library
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] dev-ruby/i18n:1[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1[ruby_targets_ruby27(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby30(-)] dev-ruby/i18n:1[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.1[ruby_targets_ruby30(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=28631218740fcae4126247819c896e56
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.1.7.3-r2 b/metadata/md5-cache/dev-ruby/activesupport-6.1.7.3-r2
new file mode 100644
index 000000000000..80c9f574391f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.1.7.3-r2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1[ruby_targets_ruby27(-)] dev-ruby/tzinfo:2[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby30(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.1[ruby_targets_ruby30(-)] dev-ruby/tzinfo:2[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby31(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby31(-)] >=dev-ruby/minitest-5.1[ruby_targets_ruby31(-)] dev-ruby/tzinfo:2[ruby_targets_ruby31(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby32(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby32(-)] >=dev-ruby/minitest-5.1[ruby_targets_ruby32(-)] dev-ruby/tzinfo:2[ruby_targets_ruby32(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/dalli-3.0.1[ruby_targets_ruby27(-)] dev-ruby/connection_pool[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.1[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rexml[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/dalli-3.0.1[ruby_targets_ruby30(-)] dev-ruby/connection_pool[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.1[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby30(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] dev-ruby/rexml[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/dalli-3.0.1[ruby_targets_ruby31(-)] dev-ruby/connection_pool[ruby_targets_ruby31(-)] >=dev-ruby/nokogiri-1.8.1[ruby_targets_ruby31(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby31(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby31(-)] dev-ruby/rack[ruby_targets_ruby31(-)] dev-ruby/rexml[ruby_targets_ruby31(-)] dev-ruby/mocha[ruby_targets_ruby31(-)] <dev-ruby/minitest-5.16:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( >=dev-ruby/dalli-3.0.1[ruby_targets_ruby32(-)] dev-ruby/connection_pool[ruby_targets_ruby32(-)] >=dev-ruby/nokogiri-1.8.1[ruby_targets_ruby32(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby32(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby32(-)] dev-ruby/rack[ruby_targets_ruby32(-)] dev-ruby/rexml[ruby_targets_ruby32(-)] dev-ruby/mocha[ruby_targets_ruby32(-)] <dev-ruby/minitest-5.16:*[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=Utility Classes and Extension to the Standard Library
+EAPI=8
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1[ruby_targets_ruby27(-)] dev-ruby/tzinfo:2[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby30(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.1[ruby_targets_ruby30(-)] dev-ruby/tzinfo:2[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby31(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby31(-)] >=dev-ruby/minitest-5.1[ruby_targets_ruby31(-)] dev-ruby/tzinfo:2[ruby_targets_ruby31(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby32(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby32(-)] >=dev-ruby/minitest-5.1[ruby_targets_ruby32(-)] dev-ruby/tzinfo:2[ruby_targets_ruby32(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby32(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.1
+SRC_URI=https://github.com/rails/rails/archive/v6.1.7.3.tar.gz -> rails-6.1.7.3.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=a5f216aece984621e93034bf8bb93d45
diff --git a/metadata/md5-cache/dev-ruby/activesupport-7.0.4.3-r2 b/metadata/md5-cache/dev-ruby/activesupport-7.0.4.3-r2
new file mode 100644
index 000000000000..a0f5f33a039a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activesupport-7.0.4.3-r2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] dev-ruby/tzinfo:2[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby30(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby30(-)] dev-ruby/tzinfo:2[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby31(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby31(-)] dev-ruby/tzinfo:2[ruby_targets_ruby31(-)] >=dev-ruby/minitest-5.1[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby32(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby32(-)] dev-ruby/tzinfo:2[ruby_targets_ruby32(-)] >=dev-ruby/minitest-5.1[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/dalli-3.0.1[ruby_targets_ruby27(-)] dev-ruby/connection_pool[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.1[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rexml[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/dalli-3.0.1[ruby_targets_ruby30(-)] dev-ruby/connection_pool[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.1[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby30(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] dev-ruby/rexml[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/dalli-3.0.1[ruby_targets_ruby31(-)] dev-ruby/connection_pool[ruby_targets_ruby31(-)] >=dev-ruby/nokogiri-1.8.1[ruby_targets_ruby31(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby31(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby31(-)] dev-ruby/rack[ruby_targets_ruby31(-)] dev-ruby/rexml[ruby_targets_ruby31(-)] dev-ruby/mocha[ruby_targets_ruby31(-)] <dev-ruby/minitest-5.16:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( >=dev-ruby/dalli-3.0.1[ruby_targets_ruby32(-)] dev-ruby/connection_pool[ruby_targets_ruby32(-)] >=dev-ruby/nokogiri-1.8.1[ruby_targets_ruby32(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby32(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby32(-)] dev-ruby/rack[ruby_targets_ruby32(-)] dev-ruby/rexml[ruby_targets_ruby32(-)] dev-ruby/mocha[ruby_targets_ruby32(-)] <dev-ruby/minitest-5.16:*[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=Utility Classes and Extension to the Standard Library
+EAPI=8
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] dev-ruby/tzinfo:2[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby30(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby30(-)] dev-ruby/tzinfo:2[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby31(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby31(-)] dev-ruby/tzinfo:2[ruby_targets_ruby31(-)] >=dev-ruby/minitest-5.1[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby32(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby32(-)] dev-ruby/tzinfo:2[ruby_targets_ruby32(-)] >=dev-ruby/minitest-5.1[ruby_targets_ruby32(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=7.0
+SRC_URI=https://github.com/rails/rails/archive/v7.0.4.3.tar.gz -> rails-7.0.4.3.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=3cab96788a4a7183e680a9a4f9a5d15d
diff --git a/metadata/md5-cache/dev-ruby/dependor-1.0.1-r1 b/metadata/md5-cache/dev-ruby/dependor-1.0.1-r1
index 60514830200a..97d8b7383169 100644
--- a/metadata/md5-cache/dev-ruby/dependor-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/dependor-1.0.1-r1
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=Reduces duplication when doing manual dependency injection
 EAPI=8
 HOMEPAGE=https://github.com/psyho/dependor
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dependor-1.0.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b5347dce55e409a1aaef07ae3ba20a69
+_md5_=0223742a3d525b7883f636b1e8107c2f
diff --git a/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4-r1 b/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4-r1
index bdd29df551f4..32273a4aa8b8 100644
--- a/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4-r1
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/thread_safe[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/thread_safe[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/thread_safe[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/thread_safe[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/thread_safe[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/thread_safe[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/thread_safe[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=Module that adds descendant tracking to a class
 EAPI=8
 HOMEPAGE=https://github.com/dkubb/descendants_tracker
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-ruby/thread_safe[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/thread_safe[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/thread_safe[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby27? ( dev-ruby/thread_safe[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/thread_safe[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/thread_safe[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/thread_safe[ruby_targets_ruby32(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/descendants_tracker-0.0.4.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ede7c969368ebbd63fb4bb1874cd9fdc
+_md5_=2816fe8a39e728f9691a7b78bc37206d
diff --git a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r1 b/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r1
deleted file mode 100644
index 076350c13a38..000000000000
--- a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Internal HashiCorp service to check version information
-EAPI=7
-HOMEPAGE=https://www.hashicorp.com
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://rubygems.org/gems/hashicorp-checkpoint-0.1.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a23bab997651015f331e7f5a45f0d41c
diff --git a/metadata/md5-cache/dev-ruby/i18n-1.13.0 b/metadata/md5-cache/dev-ruby/i18n-1.13.0
new file mode 100644
index 000000000000..5e9d2bf2d4ce
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/i18n-1.13.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby30? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/activesupport-5.1[ruby_targets_ruby30(-)] dev-ruby/bundler[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.14:5[ruby_targets_ruby30(-)] >=dev-ruby/mocha-1.7.0:1.0[ruby_targets_ruby30(-)] dev-ruby/test_declarative[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/activesupport-5.1[ruby_targets_ruby31(-)] dev-ruby/bundler[ruby_targets_ruby31(-)] >=dev-ruby/minitest-5.14:5[ruby_targets_ruby31(-)] >=dev-ruby/mocha-1.7.0:1.0[ruby_targets_ruby31(-)] dev-ruby/test_declarative[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( >=dev-ruby/activesupport-5.1[ruby_targets_ruby32(-)] dev-ruby/bundler[ruby_targets_ruby32(-)] >=dev-ruby/minitest-5.14:5[ruby_targets_ruby32(-)] >=dev-ruby/mocha-1.7.0:1.0[ruby_targets_ruby32(-)] dev-ruby/test_declarative[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=Add Internationalization support to your Ruby application
+EAPI=8
+HOMEPAGE=http://rails-i18n.org/
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby30? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby32(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=https://github.com/ruby-i18n/i18n/archive/v1.13.0.tar.gz -> i18n-1.13.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=943d6d0d7ca3c21557c2da678d939946
diff --git a/metadata/md5-cache/dev-ruby/maildir-2.2.3 b/metadata/md5-cache/dev-ruby/maildir-2.2.3
deleted file mode 100644
index b5ca9fb00b72..000000000000
--- a/metadata/md5-cache/dev-ruby/maildir-2.2.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby27? ( test? ( >=dev-ruby/fakefs-0.3.2[ruby_targets_ruby27(-)] dev-ruby/mail[ruby_targets_ruby27(-)] dev-ruby/shoulda-context[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/fakefs-0.3.2[ruby_targets_ruby30(-)] dev-ruby/mail[ruby_targets_ruby30(-)] dev-ruby/shoulda-context[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=A library for reading and writing arbitrary messages in DJB's maildir format
-EAPI=7
-HOMEPAGE=https://github.com/ktheory/maildir
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://rubygems.org/gems/maildir-2.2.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4d3d43843b826bed2f28dc0f88476b41
diff --git a/metadata/md5-cache/dev-ruby/sawyer-0.9.1 b/metadata/md5-cache/dev-ruby/sawyer-0.9.1
deleted file mode 100644
index 8bfb8b835a54..000000000000
--- a/metadata/md5-cache/dev-ruby/sawyer-0.9.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( <dev-ruby/faraday-2.0:*[ruby_targets_ruby27(-)] >=dev-ruby/addressable-2.3.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( <dev-ruby/faraday-2.0:*[ruby_targets_ruby30(-)] >=dev-ruby/addressable-2.3.5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Secret User Agent of HTTP
-EAPI=8
-HOMEPAGE=https://github.com/lostisland/sawyer
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( <dev-ruby/faraday-2.0:*[ruby_targets_ruby27(-)] >=dev-ruby/addressable-2.3.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( <dev-ruby/faraday-2.0:*[ruby_targets_ruby30(-)] >=dev-ruby/addressable-2.3.5[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/lostisland/sawyer/archive/v0.9.1.tar.gz -> sawyer-0.9.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=fc98a47d777d105639d9319cf4778742
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.7.2-r2 b/metadata/md5-cache/dev-ruby/sprockets-3.7.2-r2
deleted file mode 100644
index 2c05eaf4854f..000000000000
--- a/metadata/md5-cache/dev-ruby/sprockets-3.7.2-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] >=dev-ruby/rack-1:*[ruby_targets_ruby27(-)] <dev-ruby/rack-3:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby30(-)] >=dev-ruby/rack-1:*[ruby_targets_ruby30(-)] <dev-ruby/rack-3:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/json[ruby_targets_ruby27(-)] dev-ruby/rack-test[ruby_targets_ruby27(-)] =dev-ruby/coffee-script-2*[ruby_targets_ruby27(-)] =dev-ruby/execjs-2*[ruby_targets_ruby27(-)] =dev-ruby/sass-3*[ruby_targets_ruby27(-)] >=dev-ruby/sass-3.1[ruby_targets_ruby27(-)] dev-ruby/uglifier[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/json[ruby_targets_ruby30(-)] dev-ruby/rack-test[ruby_targets_ruby30(-)] =dev-ruby/coffee-script-2*[ruby_targets_ruby30(-)] =dev-ruby/execjs-2*[ruby_targets_ruby30(-)] =dev-ruby/sass-3*[ruby_targets_ruby30(-)] >=dev-ruby/sass-3.1[ruby_targets_ruby30(-)] dev-ruby/uglifier[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Ruby library for compiling and serving web assets
-EAPI=8
-HOMEPAGE=https://github.com/rails/sprockets
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] >=dev-ruby/rack-1:*[ruby_targets_ruby27(-)] <dev-ruby/rack-3:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby30(-)] >=dev-ruby/rack-1:*[ruby_targets_ruby30(-)] <dev-ruby/rack-3:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://github.com/rails/sprockets/archive/v3.7.2.tar.gz -> sprockets-3.7.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4c76576cfaaa4f21d17a12ca5974f273
diff --git a/metadata/md5-cache/dev-ruby/sprockets-4.0.2 b/metadata/md5-cache/dev-ruby/sprockets-4.0.2
deleted file mode 100644
index de0ade46cd88..000000000000
--- a/metadata/md5-cache/dev-ruby/sprockets-4.0.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] >=dev-ruby/rack-1:*[ruby_targets_ruby27(-)] <dev-ruby/rack-3:*[ruby_targets_ruby27(-)] !<dev-ruby/sprockets-3.7.2-r1:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby30(-)] >=dev-ruby/rack-1:*[ruby_targets_ruby30(-)] <dev-ruby/rack-3:*[ruby_targets_ruby30(-)] !<dev-ruby/sprockets-3.7.2-r1:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/json[ruby_targets_ruby27(-)] dev-ruby/rack-test[ruby_targets_ruby27(-)] =dev-ruby/coffee-script-2*[ruby_targets_ruby27(-)] =dev-ruby/execjs-2*[ruby_targets_ruby27(-)] =dev-ruby/sass-3*[ruby_targets_ruby27(-)] >=dev-ruby/sass-3.1[ruby_targets_ruby27(-)] dev-ruby/uglifier[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/json[ruby_targets_ruby30(-)] dev-ruby/rack-test[ruby_targets_ruby30(-)] =dev-ruby/coffee-script-2*[ruby_targets_ruby30(-)] =dev-ruby/execjs-2*[ruby_targets_ruby30(-)] =dev-ruby/sass-3*[ruby_targets_ruby30(-)] >=dev-ruby/sass-3.1[ruby_targets_ruby30(-)] dev-ruby/uglifier[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Ruby library for compiling and serving web assets
-EAPI=7
-HOMEPAGE=https://github.com/rails/sprockets
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] >=dev-ruby/rack-1:*[ruby_targets_ruby27(-)] <dev-ruby/rack-3:*[ruby_targets_ruby27(-)] !<dev-ruby/sprockets-3.7.2-r1:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby30(-)] >=dev-ruby/rack-1:*[ruby_targets_ruby30(-)] <dev-ruby/rack-3:*[ruby_targets_ruby30(-)] !<dev-ruby/sprockets-3.7.2-r1:3[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=4
-SRC_URI=https://github.com/rails/sprockets/archive/v4.0.2.tar.gz -> sprockets-4.0.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6046e4a518378e292889724241a933ae
diff --git a/metadata/md5-cache/dev-ruby/sprockets-4.1.0 b/metadata/md5-cache/dev-ruby/sprockets-4.1.0
deleted file mode 100644
index a3349b17052d..000000000000
--- a/metadata/md5-cache/dev-ruby/sprockets-4.1.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] >=dev-ruby/rack-1:*[ruby_targets_ruby27(-)] <dev-ruby/rack-3:*[ruby_targets_ruby27(-)] !<dev-ruby/sprockets-3.7.2-r1:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby30(-)] >=dev-ruby/rack-1:*[ruby_targets_ruby30(-)] <dev-ruby/rack-3:*[ruby_targets_ruby30(-)] !<dev-ruby/sprockets-3.7.2-r1:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/json[ruby_targets_ruby27(-)] dev-ruby/rack-test[ruby_targets_ruby27(-)] =dev-ruby/coffee-script-2*[ruby_targets_ruby27(-)] =dev-ruby/execjs-2*[ruby_targets_ruby27(-)] =dev-ruby/sass-3*[ruby_targets_ruby27(-)] >=dev-ruby/sass-3.1[ruby_targets_ruby27(-)] dev-ruby/sassc[ruby_targets_ruby27(-)] dev-ruby/uglifier[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/json[ruby_targets_ruby30(-)] dev-ruby/rack-test[ruby_targets_ruby30(-)] =dev-ruby/coffee-script-2*[ruby_targets_ruby30(-)] =dev-ruby/execjs-2*[ruby_targets_ruby30(-)] =dev-ruby/sass-3*[ruby_targets_ruby30(-)] >=dev-ruby/sass-3.1[ruby_targets_ruby30(-)] dev-ruby/sassc[ruby_targets_ruby30(-)] dev-ruby/uglifier[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Ruby library for compiling and serving web assets
-EAPI=8
-HOMEPAGE=https://github.com/rails/sprockets
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] >=dev-ruby/rack-1:*[ruby_targets_ruby27(-)] <dev-ruby/rack-3:*[ruby_targets_ruby27(-)] !<dev-ruby/sprockets-3.7.2-r1:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby30(-)] >=dev-ruby/rack-1:*[ruby_targets_ruby30(-)] <dev-ruby/rack-3:*[ruby_targets_ruby30(-)] !<dev-ruby/sprockets-3.7.2-r1:3[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=4
-SRC_URI=https://github.com/rails/sprockets/archive/v4.1.0.tar.gz -> sprockets-4.1.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9efc7003dd1d9b6c8f871952e39c152f
diff --git a/metadata/md5-cache/dev-ruby/web-console-4.2.0 b/metadata/md5-cache/dev-ruby/web-console-4.2.0
index 8b681f4528fb..43e529f126b0 100644
--- a/metadata/md5-cache/dev-ruby/web-console-4.2.0
+++ b/metadata/md5-cache/dev-ruby/web-console-4.2.0
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby27(-)] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby27(-)] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby27(-)] >=dev-ruby/railties-6.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby30(-)] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby30(-)] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby30(-)] >=dev-ruby/railties-6.0:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/rails-6.0[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] >=dev-ruby/rails-6.0[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] www-servers/puma[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby27(-)] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby27(-)] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby27(-)] >=dev-ruby/railties-6.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby30(-)] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby30(-)] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby30(-)] >=dev-ruby/railties-6.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby31(-)] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby31(-)] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby31(-)] >=dev-ruby/railties-6.0:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/rails-6.0[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] >=dev-ruby/rails-6.0[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] www-servers/puma[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] >=dev-ruby/rails-6.0[ruby_targets_ruby31(-)] dev-ruby/rack[ruby_targets_ruby31(-)] dev-ruby/sqlite3[ruby_targets_ruby31(-)] dev-ruby/mocha[ruby_targets_ruby31(-)] www-servers/puma[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=A debugging tool for your Ruby on Rails applications
 EAPI=8
 HOMEPAGE=https://github.com/rails/web-console
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby27(-)] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby27(-)] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby27(-)] >=dev-ruby/railties-6.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby30(-)] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby30(-)] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby30(-)] >=dev-ruby/railties-6.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby27(-)] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby27(-)] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby27(-)] >=dev-ruby/railties-6.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby30(-)] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby30(-)] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby30(-)] >=dev-ruby/railties-6.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby31(-)] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby31(-)] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby31(-)] >=dev-ruby/railties-6.0:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rails/web-console/archive/v4.2.0.tar.gz -> web-console-4.2.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=498142a8a0c9c38e2a172b5c6ca1c093
+_md5_=804431c5545400dd99e049d969a7ef69
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 52bbd7714006..de6dd7d2e21f 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/patchelf-0.18.0 b/metadata/md5-cache/dev-util/patchelf-0.18.0
index 4329192b5603..87970b6e3017 100644
--- a/metadata/md5-cache/dev-util/patchelf-0.18.0
+++ b/metadata/md5-cache/dev-util/patchelf-0.18.0
@@ -9,4 +9,4 @@ LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/NixOS/patchelf/archive/0.18.0.tar.gz -> patchelf-0.18.0.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5699d0176b1e83c08c335481917ddf31
+_md5_=abf2beb4925adb01e6db380bb62b7d91
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 478b3c2d8bd9..221e89668d1a 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/graphviz-8.0.1 b/metadata/md5-cache/media-gfx/graphviz-8.0.1
deleted file mode 100644
index b48f4064c101..000000000000
--- a/metadata/md5-cache/media-gfx/graphviz-8.0.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/flex sys-devel/libtool virtual/pkgconfig doc? ( app-text/ghostscript-gpl sys-apps/groff ) guile? ( dev-lang/swig dev-scheme/guile ) nls? ( >=sys-devel/gettext-0.14.5 ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig )
-DEFINED_PHASES=configure install postinst postrm setup
-DEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] media-libs/libjpeg-turbo:= >=media-libs/libpng-1.2:= sys-libs/zlib virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg(+)] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk2? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) guile? ( dev-scheme/guile ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:= ) webp? ( media-libs/libwebp:= ) X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto )
-DESCRIPTION=Open Source Graph Visualization Software
-EAPI=8
-HOMEPAGE=https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/
-INHERIT=python-single-r1
-IUSE=+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris
-LICENSE=CPL-1.0
-RDEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] media-libs/libjpeg-turbo:= >=media-libs/libpng-1.2:= sys-libs/zlib virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg(+)] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk2? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) guile? ( dev-scheme/guile ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:= ) webp? ( media-libs/libwebp:= ) X? ( x11-libs/libX11 )
-REQUIRED_USE=!cairo? ( !X !gtk2 !postscript !lasi ) pdf? ( cairo ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/8.0.1/graphviz-8.0.1.tar.xz
-_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=410e240e16804578bac4a355e4a52827
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index d022d36d384b..c51ddc238ee2 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/fontconfig-2.14.2-r1 b/metadata/md5-cache/media-libs/fontconfig-2.14.2-r2
index 8d97e93dd530..e66763b5b6cc 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.14.2-r1
+++ b/metadata/md5-cache/media-libs/fontconfig-2.14.2-r2
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://fontconfig.org/release/fontconfig-2.14.2.tar.xz
 _eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=884948c331c89d4638b9ab6521350c59
+_md5_=0e744d4ad95b08df6579a47f6050712a
diff --git a/metadata/md5-cache/media-libs/liblscp-0.9.9 b/metadata/md5-cache/media-libs/liblscp-0.9.9
index 1ed0360d02b7..a49c5a9a46cc 100644
--- a/metadata/md5-cache/media-libs/liblscp-0.9.9
+++ b/metadata/md5-cache/media-libs/liblscp-0.9.9
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://www.linuxsampler.org
 INHERIT=cmake
 IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://www.rncbc.org/archive/liblscp-0.9.9.tar.gz https://download.linuxsampler.org/packages/liblscp-0.9.9.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=15bbf4e9469aa394ee34d8dcedb6e89f
+_md5_=2985ee371c59f6b2eb76575d6036adef
diff --git a/metadata/md5-cache/media-libs/libva-intel-media-driver-23.1.6 b/metadata/md5-cache/media-libs/libva-intel-media-driver-23.1.6
new file mode 100644
index 000000000000..4e7b29cbe458
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libva-intel-media-driver-23.1.6
@@ -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=>=media-libs/gmmlib-22.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libva-2.14.0[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Intel Media Driver for VA-API (iHD)
+EAPI=8
+HOMEPAGE=https://github.com/intel/media-driver
+INHERIT=cmake-multilib flag-o-matic
+IUSE=+redistributable test X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=MIT BSD redistributable? ( no-source-code )
+RDEPEND=>=media-libs/gmmlib-22.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libva-2.14.0[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/intel/media-driver/archive/intel-media-23.1.6.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=61f46f375f5a4540a001c08ad73f8fd3
diff --git a/metadata/md5-cache/media-libs/libva-intel-media-driver-23.2.0 b/metadata/md5-cache/media-libs/libva-intel-media-driver-23.2.0
new file mode 100644
index 000000000000..ba07bab98e44
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libva-intel-media-driver-23.2.0
@@ -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=>=media-libs/gmmlib-22.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libva-2.14.0[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Intel Media Driver for VA-API (iHD)
+EAPI=8
+HOMEPAGE=https://github.com/intel/media-driver
+INHERIT=cmake-multilib flag-o-matic
+IUSE=+redistributable test X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=MIT BSD redistributable? ( no-source-code )
+RDEPEND=>=media-libs/gmmlib-22.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libva-2.14.0[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/intel/media-driver/archive/intel-media-23.2.0.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=61f46f375f5a4540a001c08ad73f8fd3
diff --git a/metadata/md5-cache/media-libs/mesa-23.0.3 b/metadata/md5-cache/media-libs/mesa-23.0.3-r1
index 56a5b7965eab..17edb43a4fed 100644
--- a/metadata/md5-cache/media-libs/mesa-23.0.3
+++ b/metadata/md5-cache/media-libs/mesa-23.0.3-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-23.0.3.tar.xz
 _eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1994b7528a3a9cfccbabf580dab84a55
+_md5_=cc5b8a65f448fcb79868daf62c62931d
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 6c302876732b..1bf3d4a49fcc 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/zabbix-6.0.14 b/metadata/md5-cache/net-analyzer/zabbix-6.0.14-r1
index b5e0210769df..a221e93f2504 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.14
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.14-r1
@@ -14,4 +14,4 @@ RESTRICT=test strip
 SLOT=0/6.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.14.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.14-go-deps.tar.xz )
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=db11d917da5f7f812530bd5a6ad31dd6
+_md5_=f038b0dcecf73464ec3bb806df22c5a2
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.15 b/metadata/md5-cache/net-analyzer/zabbix-6.0.15-r1
index 0c9f3397bc00..21a8ce6a3667 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.15
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.15-r1
@@ -14,4 +14,4 @@ RESTRICT=test strip
 SLOT=0/6.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.15.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.15-go-deps.tar.xz )
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=33a048596fcccf3bfd46f4fd45e87ec6
+_md5_=460057717176687538a938935a258e1f
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.16 b/metadata/md5-cache/net-analyzer/zabbix-6.0.16-r1
index e6a71fb0922c..ebfb795c0abc 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.16
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.16-r1
@@ -14,4 +14,4 @@ RESTRICT=test strip
 SLOT=0/6.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.16.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.16-go-deps.tar.xz )
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=33a048596fcccf3bfd46f4fd45e87ec6
+_md5_=460057717176687538a938935a258e1f
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.17 b/metadata/md5-cache/net-analyzer/zabbix-6.0.17-r1
index 118a3c1be204..f6abea3c69ff 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.17
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.17-r1
@@ -14,4 +14,4 @@ RESTRICT=test strip
 SLOT=0/6.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.17.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.17-go-deps.tar.xz )
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=33a048596fcccf3bfd46f4fd45e87ec6
+_md5_=460057717176687538a938935a258e1f
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.4.0 b/metadata/md5-cache/net-analyzer/zabbix-6.4.0-r1
index 60e0998f9b7e..fbced9dc0392 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.4.0
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.4.0-r1
@@ -14,4 +14,4 @@ RESTRICT=test strip
 SLOT=0/6.4
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.0.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.4.0-go-deps.tar.xz )
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=db11d917da5f7f812530bd5a6ad31dd6
+_md5_=ed6801e5d04ccfd18c063f7701e73245
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.4.1 b/metadata/md5-cache/net-analyzer/zabbix-6.4.1-r1
index 905f23382b24..66fb8abbc623 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.4.1
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.4.1-r1
@@ -14,4 +14,4 @@ RESTRICT=test strip
 SLOT=0/6.4
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.1.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.4.1-go-deps.tar.xz )
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=33a048596fcccf3bfd46f4fd45e87ec6
+_md5_=8004e29306a635e40ece83afe571c104
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.4.2 b/metadata/md5-cache/net-analyzer/zabbix-6.4.2-r1
index 4303bba104fb..3613306dc079 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.4.2
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.4.2-r1
@@ -14,4 +14,4 @@ RESTRICT=test strip
 SLOT=0/6.4
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.2.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.4.2-go-deps.tar.xz )
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=33a048596fcccf3bfd46f4fd45e87ec6
+_md5_=8004e29306a635e40ece83afe571c104
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 3de34d69e1b8..646d841548b3 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/skypeforlinux-8.97.0.204 b/metadata/md5-cache/net-im/skypeforlinux-8.97.0.204
new file mode 100644
index 000000000000..08b863dca663
--- /dev/null
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.97.0.204
@@ -0,0 +1,16 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DESCRIPTION=Instant messaging client, with support for audio and video
+EAPI=8
+HOMEPAGE=https://www.skype.com/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=chromium-2 desktop pax-utils unpacker multilib-build xdg
+IUSE=abi_x86_64
+KEYWORDS=-* ~amd64
+LICENSE=Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
+RDEPEND=app-crypt/libsecret[abi_x86_64(-)?] app-accessibility/at-spi2-core:2[abi_x86_64(-)?] dev-libs/expat[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr[abi_x86_64(-)?] dev-libs/nss[abi_x86_64(-)?] media-libs/alsa-lib[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] media-libs/libv4l[abi_x86_64(-)?] net-print/cups[abi_x86_64(-)?] sys-apps/dbus[abi_x86_64(-)?] sys-devel/gcc[cxx] sys-libs/glibc virtual/ttf-fonts x11-libs/cairo[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:3[abi_x86_64(-)?] x11-libs/libX11[abi_x86_64(-)?] x11-libs/libXScrnSaver[abi_x86_64(-)?] x11-libs/libXcomposite[abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_64(-)?] x11-libs/libXdamage[abi_x86_64(-)?] x11-libs/libXext[abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_64(-)?] x11-libs/libXi[abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_64(-)?] x11-libs/libXrender[abi_x86_64(-)?] x11-libs/libXtst[abi_x86_64(-)?] x11-libs/libxcb[abi_x86_64(-)?] x11-libs/libxkbcommon[abi_x86_64(-)?] x11-libs/libxkbfile[abi_x86_64(-)?] x11-libs/pango[abi_x86_64(-)?]
+REQUIRED_USE=|| ( abi_x86_64 )
+RESTRICT=mirror bindist strip
+SLOT=0
+SRC_URI=https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_8.97.0.204_amd64.deb
+_eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=66cdb40d18f5e4ad7b1f0ee1126970ff
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 415de08cd75e..047abcfc178e 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/nodejs-16.20.0 b/metadata/md5-cache/net-libs/nodejs-16.20.0
index 89ce07f5152a..4a78ee54a56e 100644
--- a/metadata/md5-cache/net-libs/nodejs-16.20.0
+++ b/metadata/md5-cache/net-libs/nodejs-16.20.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://nodejs.org/
 INHERIT=bash-completion-r1 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 systemtap test
-KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 arm arm64 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.40.0:= >=net-dns/c-ares-1.17.2:= >=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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/16
 SRC_URI=https://nodejs.org/dist/v16.20.0/node-v16.20.0.tar.xz
 _eclasses_=bash-completion-r1	59cf54afadd3b37d31d9d85c7d7d8067	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9106d8e20b64669d2331010e5ba74290
+_md5_=ffce966275c3d863cf00a27c59ddef2b
diff --git a/metadata/md5-cache/net-libs/nodejs-18.15.0 b/metadata/md5-cache/net-libs/nodejs-18.15.0
deleted file mode 100644
index 708623d3f702..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-18.15.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] >=dev-lang/python-3.10.9-r1:3.10[threads(+)] >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) 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.17.2:= >=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 systemtap 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.17.2:= >=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 )
-RESTRICT=!test? ( test )
-SLOT=0/18
-SRC_URI=https://nodejs.org/dist/v18.15.0/node-v18.15.0.tar.xz
-_eclasses_=bash-completion-r1	59cf54afadd3b37d31d9d85c7d7d8067	check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0b78cb007a0ec34288ae35eed8eb2e99
diff --git a/metadata/md5-cache/net-libs/nodejs-18.16.0 b/metadata/md5-cache/net-libs/nodejs-18.16.0
index f2d2e70d19f3..74284f2741cb 100644
--- a/metadata/md5-cache/net-libs/nodejs-18.16.0
+++ b/metadata/md5-cache/net-libs/nodejs-18.16.0
@@ -6,7 +6,7 @@ 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 systemtap test
-KEYWORDS=amd64 arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+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.17.2:= >=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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/18
 SRC_URI=https://nodejs.org/dist/v18.16.0/node-v18.16.0.tar.xz
 _eclasses_=bash-completion-r1	59cf54afadd3b37d31d9d85c7d7d8067	check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=99a0ce7b9bc5b5d0b6a23c1b5a674ee1
+_md5_=aa0d320076cc5297074defe192a479e1
diff --git a/metadata/md5-cache/net-libs/nodejs-20.0.0 b/metadata/md5-cache/net-libs/nodejs-20.0.0
index 1ef19fee0bf7..b5bdb58172cd 100644
--- a/metadata/md5-cache/net-libs/nodejs-20.0.0
+++ b/metadata/md5-cache/net-libs/nodejs-20.0.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/20
 SRC_URI=https://nodejs.org/dist/v20.0.0/node-v20.0.0.tar.xz
 _eclasses_=bash-completion-r1	59cf54afadd3b37d31d9d85c7d7d8067	check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3e0d0b64d273dd8bbdad0d9265156c31
+_md5_=49623b908293c991853ec4d731942266
diff --git a/metadata/md5-cache/net-libs/nodejs-99999999 b/metadata/md5-cache/net-libs/nodejs-99999999
index cfddf710b0ce..ff8fb778bfad 100644
--- a/metadata/md5-cache/net-libs/nodejs-99999999
+++ b/metadata/md5-cache/net-libs/nodejs-99999999
@@ -1,11 +1,11 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] >=dev-lang/python-3.10.9-r1:3.10[threads(+)] >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] >=dev-lang/python-3.10.9-r1:3.10[threads(+)] >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) sys-apps/coreutils virtual/pkgconfig test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.44.0:= >=net-dns/c-ares-1.17.2:= >=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 git-r3
-IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test
+IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 PROPERTIES=live
 RDEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.44.0:= >=net-dns/c-ares-1.17.2:= >=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:*
@@ -13,4 +13,4 @@ REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl?
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	59cf54afadd3b37d31d9d85c7d7d8067	check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ba65c6a6b602920d846cae6ac7bb034c
+_md5_=bf1d86bafdbf06164d7ced9002fcec58
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 3b8081412790..d79c4285211c 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 a5a3edbd1589..dcb3069186f1 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	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=34ebb68289fa37d07f393c2067a0db4f
+_md5_=afd5fa8cf54df89e1079d2f7edf5f266
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index c0617f785ce9..a265e9e93d6f 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/make-4.4.1 b/metadata/md5-cache/sys-devel/make-4.4.1
index e23a96b80746..0a62a180f005 100644
--- a/metadata/md5-cache/sys-devel/make-4.4.1
+++ b/metadata/md5-cache/sys-devel/make-4.4.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/make/make.html
 INHERIT=flag-o-matic verify-sig
 IUSE=guile nls static 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=GPL-3+
 RDEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/make/make-4.4.1.tar.gz verify-sig? ( mirror://gnu/make/make-4.4.1.tar.gz.sig )
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=8d4012292b4929532e94d97990652d1a
+_md5_=c41db638c7e03cb1611b6990590b3ebb
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 82cb403845c6..a6d3df5582a3 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/timezone-data-2023c b/metadata/md5-cache/sys-libs/timezone-data-2023c
index 445a27f1116e..9c0cd194748e 100644
--- a/metadata/md5-cache/sys-libs/timezone-data-2023c
+++ b/metadata/md5-cache/sys-libs/timezone-data-2023c
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.iana.org/time-zones
 INHERIT=toolchain-funcs flag-o-matic
 IUSE=nls leaps-timezone zic-slim
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD public-domain
 RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
 SLOT=0
 SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2023c.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2023c.tar.gz
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b96c8f8fa8d704fc5735b4032bfffdfb
+_md5_=543bc5507859b51e387432dd9ae768d8
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 7484687234cf..01ebf6fe27f7 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15493 BLAKE2B ec5ea168778a79b147975de4177e6e700a7d37e6ee037cb43e8a2fb5109fe7703b6271a466b25edb7a1f6a61aa9467b69f02382396560dc259c3acdd5e880f30 SHA512 24314abdcaad22302e8e4885bab38f0250026f6284cc14fc2d6d81378bea47d1c1e985134c2fc0d63a8bc88f3563b53ea9e7b90d1e24f24b6733a9cc9fe4c83a
-TIMESTAMP 2023-04-27T04:39:45Z
+TIMESTAMP 2023-04-27T10:39:43Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRJ/JFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRKUO9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCkLhAAnDzMCtIMF0FNrsIOEv0HctfSMs4Ry3fQDr37+FkPKCPbDmojmUnbXFWG
-xMn93M1O6EnjwW8QtVvqgpFEUdYO0Bc/Zw/a50AgFT+KWx7ipmK5erYv9fSxqpez
-mulSfvdHWiGVLQG0b/qeuRPbAbwr51PIuL9SZDIbAp8KygH+5atDcOXAxjZ0ce0p
-IEePY/W5hkpGV83/20UhKVnMMMIUNV25wEDMLFOk075V187AI4mK3b1B8sS7whHI
-r6Btkot9qpnzreFdlRkTlmfj92Cgm5arDCxpOOM+B3ijCPuWqC6BKtny2AmdaSQ3
-L9CujMIwVblsHi5x5S4vHnYDoFzz1hW5i+22R15P8G3ky/pD27I8DHs5mKQ8OxhF
-SbkFfwIHJDqogVnLFMZrmAG7Me+OWgJk3zJAswoimBW8ZfblLNdtsZbQmVyx9YKT
-Nm92kOK4TRnJqcxEsn8op/uGKq//pcOgr9vRcTXxiKAbauhldQfDHqQQbgpDgzAr
-ujtnI4fYrryfVlR96qFUFo83MIJ8XIaDRNLyE1bk5zDHSjox/x4+Lq9SLegTwhpk
-sALBqThuTp35dozBE0bpeTgeoS3XouXK7S00fEl9J7JlsAdbW1qVweVPJ+GJ4/IT
-GB/oWAfXUbhjZlZhh2c+eO4ALE3MOS+AFBntaUzAa7AjX9uyKZE=
-=SCTM
+klCYfg//emAhgnGE9DkkvDHN+NZrgaYfuf8Vdtg0av+2xwbnrIJoPfZ1IM+wdS7k
+oEYg+8OObK8be+ihBglVuqjq/sy8nncrpPQ76aww7tnK2OtygGj7fb8JeMZPgJdf
+WCI5l8oWDkC7p33OtFshoepwErp7Zm75fRVDFQUUAPp0I9qHhT6sPKKwFEeb93Ge
+0ClEXoHV9IRFWXU8eE7Z4ApIBK305fKfw4PFjFytT0WQE5PW/XIawALh3yY4hXpz
+Rz2g2ivqJRVgQHE+gPpMC3ak7QUHTc192lGIgeXTqzxgNkH1wFMzjvsX2jXK5nnA
+2wBvn84w3q2y7SjhNdkBeUT6gVoW0QYxAxDppVZtbODzviefNCI/6bDmjL4B16Q+
+sz7qLnYbkRN3SQbSHk1ksyiYhEwfDHKnPVUC1psERZht53YTHRRmj2QnIQpFT+Ql
+3wZgqbCyZ/hYxpnjYNBlRS2Dp7mleg/14lNW3dllmrddyMmtGhaI3uNcPlpN3DPf
+YrH6+tBLhD6QXH11Z19cjYY0wrExFzDXJ1KT2zn7khKt6/oSk259Tf1fI94EUUAL
+57hyOO7q/kmNSIVYHqGEzL7RH7NQp9IdzwmEgm8ib0S6u+UTIxx9Mg8WjULDmcEA
+F0mD3D91pgO9pXFkJO8KAyxkAgyKLoC0fi1qqQR0nTDkAxasRt0=
+=VP5b
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 2e915ff38823..a1ee7bbc83ad 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Apr 2023 04:39:41 +0000
+Thu, 27 Apr 2023 10:39:40 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index cc1370d9f400..e19b9c4614e2 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Apr 27 04:39:41 AM UTC 2023
+Thu Apr 27 10:39:39 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 86f5427c21c6..b18ad87a0e1e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Apr 2023 04:45:01 +0000
+Thu, 27 Apr 2023 10:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 248cbd24109a..aed7d7748d20 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-d2351cff97ffeda00c4960eaf7dd6774d4f81428 1682570059 2023-04-27T04:34:19+00:00
+67b3c82c7943e73f410e089797e4c961bace64a8 1682591240 2023-04-27T10:27:20+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index d54853e6db54..c54c547bb6e4 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1682570401 Thu 27 Apr 2023 04:40:01 AM UTC
+1682592001 Thu 27 Apr 2023 10:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 2e915ff38823..a1ee7bbc83ad 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Apr 2023 04:39:41 +0000
+Thu, 27 Apr 2023 10:39:40 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 95028f50c104..6f26a852f07f 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index d9072dc41af1..5673ff6ca473 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -2,6 +2,7 @@ AUX zabbix-3.0.30-security-disable-PidFile.patch 1012 BLAKE2B 4327b4af0e62e1b519
 AUX zabbix-4.0.18-modulepathfix.patch 258 BLAKE2B d799f91c72a0f184a425d38af9ea45373ff3647f6302822ae3dda06d5117b28da82a59bab1ccc5aeaad9a9464ea073b9eecc382ce8c7a749feb8dfd1895fdf05 SHA512 767e6a5586a0d3f3714532b605dfe366decc9470234725dc5597b39f628dbd1e165436fe9668491425e9749f3f49dd8575aeaca0c19c4f6df815b955725c2c49
 AUX zabbix-5.0.22-system.sw.packages.patch 1204 BLAKE2B 6f0381abf86b07827bb8f90a30390e2818b083aee8b2e9f9786377406c6c893baedab20f9e8b16487167eb37e04f0a48ed9aac6e18b2bfd6b667c1384def632c SHA512 79832e266d2e13737a263fdc2d832a95da40ee4ccd9ac80642d1c6e466335f26730512a26e97e033a784c54dc8847e80037205c52c3018d751b689fe925fccd8
 AUX zabbix-6.0.3-system.sw.packages.patch 1204 BLAKE2B 07326c6762c2cf8655f0555628f42b89826881cfa246923aab181f7c491ddfeada7f2c1091fe63869c46a131aaf795af77aac8c78fcd8bea3d745af654519669 SHA512 e929586d74e5f77644ec03476bd78203bae405d37257ebd7c128f5d95433ac600175b2b1dfa6d0e32442600dc5ce8a931d5eb7d818c39a001924b1321b052a97
+AUX zabbix-6.4.0-configure-sscanf.patch 305 BLAKE2B 1a1a7f47e75f0f21ec313ce785acd6af2cf8790774b5dc058c83e6f55104b6740ecf55f00e62d1beb3b88e22f7549fc009a45d538c68b39784308299238538d2 SHA512 c659ef9e257d90cbe5c7050bb9e31ccb2591c377d00ae0e5ef250fb516e36d11830134be7473dabf1a5cee70e3b91819d588f452d2049dcb33fe76726b8a170d
 AUX zabbix-agent2.init 507 BLAKE2B 6235831aca66cb2b097c0260ba8c0151c4a98fadc836cff14a248a77f5a0d013b5e6cf56605f63c9b41541daad4f842da74d80658f0a20b38be507909605af77 SHA512 91eaac170c9234229f2969b0d899dc7ffc21aa99aa8b3593b91f52afe786f6cc81c1279bf78b4456c8e462cea924630ee87e4ce7d6f2128c42e778907751e98e
 AUX zabbix-agent2.service 277 BLAKE2B 46ec792441c57c6fb7cad391d736672a3d93cbb9c92c5e3d90de3a5c7502a789359bd9752b8740fd73a626e4ed96272231730a87b179a4e0d13f8fb48571f606 SHA512 8f467e9d7a4ce82dc387ef1ef6ac8c39e943d0bbce938e186bdfa7e207959d9159a9d446b30d39d627b7400ceeb9c4d322b06ad063b42d0edc5bbef4043230f7
 AUX zabbix-agent2.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
@@ -43,11 +44,11 @@ EBUILD zabbix-4.0.45.ebuild 9427 BLAKE2B 55a59585793b3217720c9a2c44b6371feb9e465
 EBUILD zabbix-5.0.32.ebuild 10142 BLAKE2B ffd5ab5a402b325ba940def36626cb3c8e6484ae8648010dde643921a793a07850b29c57c5f0b73f74d0fdd0c68c758327906696e4813f5c032cbbc761843bbc SHA512 50a9cfeb2756b2ec52f072566cc906a1bf15b0b9c96c0842dfd8d56e0e1ec26dcc0c170c0d304b8113e086545041aaa6e7acd83d2bba172e280d75f59933c619
 EBUILD zabbix-5.0.33.ebuild 10144 BLAKE2B 408ca81f3217efbed52c461cf7a17b228dde32b1f9d15625341202f01fbdb79c48d265f85cda2bbb366d5cf926c1a55b040f6a3670475bbda81b1e806d743ab7 SHA512 2d8d472f1e529384e0bd7ec5de6e774628f20e78a6db94ad449f5e22c2f55a1558777523bb20d00a30c31926b9ec3709000bbbe287522184bfab117587409d42
 EBUILD zabbix-5.0.34.ebuild 10144 BLAKE2B 408ca81f3217efbed52c461cf7a17b228dde32b1f9d15625341202f01fbdb79c48d265f85cda2bbb366d5cf926c1a55b040f6a3670475bbda81b1e806d743ab7 SHA512 2d8d472f1e529384e0bd7ec5de6e774628f20e78a6db94ad449f5e22c2f55a1558777523bb20d00a30c31926b9ec3709000bbbe287522184bfab117587409d42
-EBUILD zabbix-6.0.14.ebuild 10207 BLAKE2B 083d2f1350ad83bd6011a28dba9229a1403f2fa5b2f92559a8bdeb32a7c6b7cc167ad8d64dfae717dee251cd9de696607dd5adc21626409e019e28c7d307dcc2 SHA512 76e6db0eb214a0fb87326f2b96093bab7f70de7b1f6b66c25d559da1db704f08653d31e2dfa3671bab180eb54d088edf8512992e4a9f20d75752d0562e6d21bc
-EBUILD zabbix-6.0.15.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
-EBUILD zabbix-6.0.16.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
-EBUILD zabbix-6.0.17.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
-EBUILD zabbix-6.4.0.ebuild 10207 BLAKE2B 083d2f1350ad83bd6011a28dba9229a1403f2fa5b2f92559a8bdeb32a7c6b7cc167ad8d64dfae717dee251cd9de696607dd5adc21626409e019e28c7d307dcc2 SHA512 76e6db0eb214a0fb87326f2b96093bab7f70de7b1f6b66c25d559da1db704f08653d31e2dfa3671bab180eb54d088edf8512992e4a9f20d75752d0562e6d21bc
-EBUILD zabbix-6.4.1.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
-EBUILD zabbix-6.4.2.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
+EBUILD zabbix-6.0.14-r1.ebuild 10235 BLAKE2B 129b343d0fcc9dfa5be311a53df26d54b26837f78afa6aee8406c767526219908c97416de0bfb5fdde3c4a66279d9deaeb6384a2557459610c7f741d559f81e5 SHA512 bfaf11251a04debe03e6273cb31e92dcf9fe9e94ac1945271fe84ab710a2c3e9146b8196227656cc2959674fceec2f1c6e3187104ea3e7a90ea91d4809e00b63
+EBUILD zabbix-6.0.15-r1.ebuild 10237 BLAKE2B a0a85c490e7435ccb6e5b09c680492b01753fd5485fface0266ba8c8fdcea5255f9db33b9af7c758edd76034f4bd4840d6af5bae02578526deea837917eb526a SHA512 a29049bfb5da89e7cf92a4a471f81274b6a5e29a6b45eee43c838eb4ccf94b078a7d1c9073dc50d5d6e7e14a37abe5c54dd846f74fdf0c51dcd5434dbb8ad2ad
+EBUILD zabbix-6.0.16-r1.ebuild 10237 BLAKE2B a0a85c490e7435ccb6e5b09c680492b01753fd5485fface0266ba8c8fdcea5255f9db33b9af7c758edd76034f4bd4840d6af5bae02578526deea837917eb526a SHA512 a29049bfb5da89e7cf92a4a471f81274b6a5e29a6b45eee43c838eb4ccf94b078a7d1c9073dc50d5d6e7e14a37abe5c54dd846f74fdf0c51dcd5434dbb8ad2ad
+EBUILD zabbix-6.0.17-r1.ebuild 10237 BLAKE2B a0a85c490e7435ccb6e5b09c680492b01753fd5485fface0266ba8c8fdcea5255f9db33b9af7c758edd76034f4bd4840d6af5bae02578526deea837917eb526a SHA512 a29049bfb5da89e7cf92a4a471f81274b6a5e29a6b45eee43c838eb4ccf94b078a7d1c9073dc50d5d6e7e14a37abe5c54dd846f74fdf0c51dcd5434dbb8ad2ad
+EBUILD zabbix-6.4.0-r1.ebuild 10233 BLAKE2B 56c70004858959aa6c72ccdb9c35821877ee599a57dbecf78720206a180d09e2c2b0aa3dadec3520d386dff8aeddb3cfffaa8571d678000eebf5f8b6b0b04a8f SHA512 dc28d64c532c303f30d42e975f28ab1ee6679122776e83e0121984c51c64ed752a015167075301de84dd041db42de411a3e4682a54fc35fdcdda67b712bc923a
+EBUILD zabbix-6.4.1-r1.ebuild 10235 BLAKE2B 7d9e8144ebeb89090c3866ef306252767d429cec8789832852911edb70e79fdda10295f2ba54f0a4cae78304d96e44273ecff366f73853b0017244d0fcf533a1 SHA512 bae102da1bd6b07f27864bb082f5aca750c3b989db92ab89e31a58d71c311fecc63d08848d6add1f355008886fcde58952d645ce9bf876177a768a0148fc162c
+EBUILD zabbix-6.4.2-r1.ebuild 10235 BLAKE2B 7d9e8144ebeb89090c3866ef306252767d429cec8789832852911edb70e79fdda10295f2ba54f0a4cae78304d96e44273ecff366f73853b0017244d0fcf533a1 SHA512 bae102da1bd6b07f27864bb082f5aca750c3b989db92ab89e31a58d71c311fecc63d08848d6add1f355008886fcde58952d645ce9bf876177a768a0148fc162c
 MISC metadata.xml 1655 BLAKE2B 46ab1f5adaff6069890380b23a6edaf8f0f7380ffc4a320f17df52f2e59867bdcf09633d9c6e242434919d3512d557c2f623d2826b1453424c43dc0b0ee0a262 SHA512 62e5a8853c13dac034360bd1a7b61987b548641b76860f05a8f75181b8d8029e06bc9cbf136d42836e714cf0c193b04a589d214a7864d607bf93dd97066f1a70
diff --git a/net-analyzer/zabbix/files/zabbix-6.4.0-configure-sscanf.patch b/net-analyzer/zabbix/files/zabbix-6.4.0-configure-sscanf.patch
new file mode 100644
index 000000000000..0a95780c4505
--- /dev/null
+++ b/net-analyzer/zabbix/files/zabbix-6.4.0-configure-sscanf.patch
@@ -0,0 +1,12 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -952,8 +952,9 @@ dnl Check for %qu format (FreeBSD 4.x)
+ dnl FreeBSD 4.x does not support %llu
+ AC_MSG_CHECKING(for long long format)
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
++#include <stdio.h>
+ #include <sys/types.h>
+-int main()
++int main(void)
+ {
+         uint64_t i;
diff --git a/net-analyzer/zabbix/zabbix-6.4.0.ebuild b/net-analyzer/zabbix/zabbix-6.0.14-r1.ebuild
index 21333f63c79d..402ad60fb8dd 100644
--- a/net-analyzer/zabbix/zabbix-6.4.0.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.14-r1.ebuild
@@ -143,6 +143,10 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
+src_prepare() {
+	default
+}
+
 src_configure() {
 	local econf_args=(
 		--with-libpcre2
diff --git a/net-analyzer/zabbix/zabbix-6.0.17.ebuild b/net-analyzer/zabbix/zabbix-6.0.15-r1.ebuild
index f3edadcff0ce..1404fe7a2c48 100644
--- a/net-analyzer/zabbix/zabbix-6.0.17.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.15-r1.ebuild
@@ -143,6 +143,10 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
+src_prepare() {
+	default
+}
+
 src_configure() {
 	local econf_args=(
 		--with-libpcre2
diff --git a/net-analyzer/zabbix/zabbix-6.0.15.ebuild b/net-analyzer/zabbix/zabbix-6.0.16-r1.ebuild
index f3edadcff0ce..1404fe7a2c48 100644
--- a/net-analyzer/zabbix/zabbix-6.0.15.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.16-r1.ebuild
@@ -143,6 +143,10 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
+src_prepare() {
+	default
+}
+
 src_configure() {
 	local econf_args=(
 		--with-libpcre2
diff --git a/net-analyzer/zabbix/zabbix-6.0.16.ebuild b/net-analyzer/zabbix/zabbix-6.0.17-r1.ebuild
index f3edadcff0ce..1404fe7a2c48 100644
--- a/net-analyzer/zabbix/zabbix-6.0.16.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.17-r1.ebuild
@@ -143,6 +143,10 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
+src_prepare() {
+	default
+}
+
 src_configure() {
 	local econf_args=(
 		--with-libpcre2
diff --git a/net-analyzer/zabbix/zabbix-6.0.14.ebuild b/net-analyzer/zabbix/zabbix-6.4.0-r1.ebuild
index 21333f63c79d..0c7469cad01a 100644
--- a/net-analyzer/zabbix/zabbix-6.0.14.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.4.0-r1.ebuild
@@ -117,7 +117,7 @@ RESTRICT="test"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
 	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
+	"${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch"
 )
 
 S=${WORKDIR}/${MY_P}
@@ -143,6 +143,10 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
+src_prepare() {
+	default
+}
+
 src_configure() {
 	local econf_args=(
 		--with-libpcre2
diff --git a/net-analyzer/zabbix/zabbix-6.4.1.ebuild b/net-analyzer/zabbix/zabbix-6.4.1-r1.ebuild
index f3edadcff0ce..e43f9f4d55ac 100644
--- a/net-analyzer/zabbix/zabbix-6.4.1.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.4.1-r1.ebuild
@@ -117,7 +117,7 @@ RESTRICT="test"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
 	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
+	"${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch"
 )
 
 S=${WORKDIR}/${MY_P}
@@ -143,6 +143,10 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
+src_prepare() {
+	default
+}
+
 src_configure() {
 	local econf_args=(
 		--with-libpcre2
diff --git a/net-analyzer/zabbix/zabbix-6.4.2-r1.ebuild b/net-analyzer/zabbix/zabbix-6.4.2-r1.ebuild
new file mode 100644
index 000000000000..e43f9f4d55ac
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.4.2-r1.ebuild
@@ -0,0 +1,401 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# To create the go modules tarball:
+#   cd src/go
+#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? (
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	server? (
+		app-admin/webapp-config
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	local econf_args=(
+		--with-libpcre2
+		"$(use_enable agent)"
+		"$(use_enable agent2)"
+		"$(use_enable ipv6)"
+		"$(use_enable java)"
+		"$(use_enable proxy)"
+		"$(use_enable server)"
+		"$(use_enable static)"
+		"$(use_with curl libcurl)"
+		"$(use_with gnutls)"
+		"$(use_with ldap)"
+		"$(use_with libxml2)"
+		"$(use_with mysql)"
+		"$(use_with odbc unixodbc)"
+		"$(use_with openipmi openipmi)"
+		"$(use_with openssl)"
+		"$(use_with oracle)"
+		"$(use_with postgres postgresql)"
+		"$(use_with snmp net-snmp)"
+		"$(use_with sqlite sqlite3)"
+		"$(use_with ssh ssh2)"
+	)
+
+	econf ${econf_args[@]}
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-6.4.2.ebuild b/net-analyzer/zabbix/zabbix-6.4.2.ebuild
deleted file mode 100644
index f3edadcff0ce..000000000000
--- a/net-analyzer/zabbix/zabbix-6.4.2.ebuild
+++ /dev/null
@@ -1,397 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-#   cd src/go
-#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	?? ( gnutls openssl )
-	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) !sqlite )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls:=
-		net-nds/openldap:=
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	server? (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? (
-		dev-libs/libpcre2:=
-		net-analyzer/fping[suid]
-	)
-	server? (
-		app-admin/webapp-config
-		dev-libs/libpcre2:=
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	agent2? (
-		>=dev-lang/go-1.12
-		app-arch/unzip
-	)
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_configure() {
-	local econf_args=(
-		--with-libpcre2
-		"$(use_enable agent)"
-		"$(use_enable agent2)"
-		"$(use_enable ipv6)"
-		"$(use_enable java)"
-		"$(use_enable proxy)"
-		"$(use_enable server)"
-		"$(use_enable static)"
-		"$(use_with curl libcurl)"
-		"$(use_with gnutls)"
-		"$(use_with ldap)"
-		"$(use_with libxml2)"
-		"$(use_with mysql)"
-		"$(use_with odbc unixodbc)"
-		"$(use_with openipmi openipmi)"
-		"$(use_with openssl)"
-		"$(use_with oracle)"
-		"$(use_with postgres postgresql)"
-		"$(use_with snmp net-snmp)"
-		"$(use_with sqlite sqlite3)"
-		"$(use_with ssh ssh2)"
-	)
-
-	econf ${econf_args[@]}
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.2.9.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.9.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.32.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		tmpfiles_process zabbix-server.conf
-
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		tmpfiles_process zabbix-agent2.conf
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 184ef2a72272..0df2398fd9eb 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index e46c89447ab6..b93946fa1b2a 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -2,8 +2,10 @@ DIST skypeforlinux_8.94.0.428-1.x86_64.rpm 126374668 BLAKE2B e90c5207c1ec0d28351
 DIST skypeforlinux_8.95.0.408-1.x86_64.rpm 126523292 BLAKE2B 5e6018b7a2aef8a8cf4311cb50475af7f7799e93d2a1e8b4755428b0ce670819db9c106ac830121b75543c03fed7fc08c910544eb7d3dfb57c11fd7f30df9319 SHA512 c4acdb94e962753e61386e0c0ff18e217a395d5f919ed70ef83e655ca5bd7758f53391dbe977f0b0ffc27c5ea7ec465bf168fec557de3040db425cc365e8eff7
 DIST skypeforlinux_8.96.0.207-1.x86_64.rpm 124580688 BLAKE2B 8bd2dfecee6730d4aeb49bef0e08fd1fd17aecf31a8cd81b5d0ba3d4a8bc6808bd6e08d7c91d39aa46982502b23c8e37c5f4ce2ae87da963cc0df8a8b8ed430d SHA512 27406615892a12a390d47e2a2087149c29a195e942d9fb1748ad1f7cb39012fdad0836b01c4bfe6e690e1a27f67ccdd6d0da2f4baa3cf6567733d95b5a35be17
 DIST skypeforlinux_8.96.0.408_amd64.deb 124565400 BLAKE2B 56f8e20c3f192322267afb308fb211bb1af13f144c19e4d42ea2df3ac6a4f1648f47738ca9f1f44ed13f8f20b796726ffc41d9a658431bbd12ecb92579ae3d04 SHA512 b7aa70435c6d0f2b821a8f33b5b33ef6204dafe1467f92024389498c013260ea86649928d93c10ad3a29ffe5b277f0c57b2732d4ed6efe93568b7053ecdfbf44
+DIST skypeforlinux_8.97.0.204_amd64.deb 124991858 BLAKE2B 0b56817a9c181546348a9b34ef746be1040574709a127a8d421bbc698ac9f1e34aa1594dfc292c0c23459719aaedee6ba30bbac0d3f8aeef13b3894448c4f87a SHA512 4dbf16491d6a63d9c20c24a8d80671e968ca1fe7d7fa5cee700c3b411341b9432ee69fa723a231f4e992a5cacac69ad7700da06068a9e4a648c8d7e7b3924b8d
 EBUILD skypeforlinux-8.94.0.428.ebuild 3250 BLAKE2B 760f4a7ffe0493541d0b941ee83cf0ce99150ee90aadcbe4ad2f244fad2b0df5218e240500428f4da3d40ca7a586e135878083d2c4173fd00009f50fa91641b7 SHA512 cdacf86cd0534a1f2d204dbeaf689f2e62903308561fe68b88d981f5c985eaa16d1057226e786e243c87d48619a77cc2828a0701d749ef328b577ba2f6e924d0
 EBUILD skypeforlinux-8.95.0.408.ebuild 3196 BLAKE2B c1b6996e82bc414acfbf6850ba4a9c17a72d12dd10f82fbc081d8740152bcf694f451e5010a5568145b229b2ac8c080dbf773102b8cc033e585e7cf2d944b4d2 SHA512 d4d3a99227d967bea5dcd4c89fc52cf737cfa056bebc3244acf4121971308871576af48ef5344f070e1e165eac88fe425bb44ddfef29ab52db967a1664619ed9
 EBUILD skypeforlinux-8.96.0.207.ebuild 3196 BLAKE2B c1b6996e82bc414acfbf6850ba4a9c17a72d12dd10f82fbc081d8740152bcf694f451e5010a5568145b229b2ac8c080dbf773102b8cc033e585e7cf2d944b4d2 SHA512 d4d3a99227d967bea5dcd4c89fc52cf737cfa056bebc3244acf4121971308871576af48ef5344f070e1e165eac88fe425bb44ddfef29ab52db967a1664619ed9
 EBUILD skypeforlinux-8.96.0.408.ebuild 3213 BLAKE2B 4fc27cac27364a037d25a1baee0b60caef291968df48356766c463a729df7a68e3b1dd1ded650092fec2b4d898de4d78e2775ccd1fddb86644e3cd4610beaf3f SHA512 72ffd827f647e3e6749a24e8f8dbf6831afbd10353c2590d88f9ad8a03ba413d31024dfd2212a381709a8a8848ef1ae7e47219c1eb858c590891a1dce7e4ea11
+EBUILD skypeforlinux-8.97.0.204.ebuild 3213 BLAKE2B 4fc27cac27364a037d25a1baee0b60caef291968df48356766c463a729df7a68e3b1dd1ded650092fec2b4d898de4d78e2775ccd1fddb86644e3cd4610beaf3f SHA512 72ffd827f647e3e6749a24e8f8dbf6831afbd10353c2590d88f9ad8a03ba413d31024dfd2212a381709a8a8848ef1ae7e47219c1eb858c590891a1dce7e4ea11
 MISC metadata.xml 461 BLAKE2B 9bcbfe1d6892c40ce917a76c600baad338b5b86967e5656f79b9bf29e75c3ba474dc11444d8e347769f37934610a971097f96b22ae171ea46cd3f1aef2e9f3e5 SHA512 81df3ef175eafabad357f3d5792c71534b85ffd2c1bd9280ea7ef9cbea17aceb396bc7ac65abdb09e5fba8c3d98384c0d67c58a8daa2d42a657e1a7b150b52e7
diff --git a/net-im/skypeforlinux/skypeforlinux-8.97.0.204.ebuild b/net-im/skypeforlinux/skypeforlinux-8.97.0.204.ebuild
new file mode 100644
index 000000000000..aa8b927e61ba
--- /dev/null
+++ b/net-im/skypeforlinux/skypeforlinux-8.97.0.204.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit chromium-2 desktop pax-utils unpacker multilib-build xdg
+
+DESCRIPTION="Instant messaging client, with support for audio and video"
+HOMEPAGE="https://www.skype.com/"
+SRC_URI="https://repo.skype.com/deb/pool/main/s/skypeforlinux/${PN}_${PV}_amd64.deb"
+S="${WORKDIR}"
+
+LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+QA_PREBUILT="*"
+RESTRICT="mirror bindist strip" #299368
+
+RDEPEND="
+	app-crypt/libsecret[${MULTILIB_USEDEP}]
+	app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}]
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	dev-libs/nspr[${MULTILIB_USEDEP}]
+	dev-libs/nss[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib[${MULTILIB_USEDEP}]
+	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
+	media-libs/freetype:2[${MULTILIB_USEDEP}]
+	media-libs/libv4l[${MULTILIB_USEDEP}]
+	net-print/cups[${MULTILIB_USEDEP}]
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-devel/gcc[cxx]
+	sys-libs/glibc
+	virtual/ttf-fonts
+	x11-libs/cairo[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
+	x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXdamage[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	x11-libs/libXtst[${MULTILIB_USEDEP}]
+	x11-libs/libxcb[${MULTILIB_USEDEP}]
+	x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+	x11-libs/libxkbfile[${MULTILIB_USEDEP}]
+	x11-libs/pango[${MULTILIB_USEDEP}]"
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	default
+	sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
+		-i usr/bin/skypeforlinux || die
+	sed -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
+		-e "/^OnlyShowIn=/d" \
+		-i usr/share/applications/skypeforlinux.desktop || die
+}
+
+src_install() {
+	dodir /opt
+	cp -a usr/share/skypeforlinux "${ED}"/opt || die
+
+	# remove chrome-sandbox binary, users should use kernel namespaces
+	# https://bugs.gentoo.org/692692#c18
+	rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die
+
+	dobin usr/bin/skypeforlinux
+
+	dodoc usr/share/skypeforlinux/*.html
+	dodoc -r usr/share/doc/skypeforlinux/.
+	# symlink required for the "Help->3rd Party Notes" menu entry  (otherwise frozen skype -> xdg-open)
+	dosym ${PF} usr/share/doc/skypeforlinux
+
+	doicon usr/share/pixmaps/skypeforlinux.png
+
+	local res
+	for res in 16 32 256 512; do
+		newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
+	done
+
+	domenu usr/share/applications/skypeforlinux.desktop
+
+	pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
+	pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index f567c9b25936..22687405bb09 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 289bc01426e4..fac5a17533f1 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -11,15 +11,13 @@ DIST node-v14.21.3.tar.xz 34508116 BLAKE2B 6fa001be10499ff2dfc920690dda9df25423f
 DIST node-v16.19.1.tar.xz 35465252 BLAKE2B 717cf15ab6fa5a2a643138959c4e539ef541783061605d0670564579bb43c89db0972228d42e529fb4104396ce7e1ed33486b6f28356752709a196924894b9f6 SHA512 7274ae1c7c92a4db9f8df9762f363cd9fb252c51142b98a25e718d749d10989d4228bc8d5fc864b83a4fe0c7f9541f59190b47374673a6ab4654a6366a373a48
 DIST node-v16.20.0.tar.xz 35546884 BLAKE2B 5bdb1fb7365e07f13d0a58a8d052d11efaadcf1b0792af0517b78b1ecf01e50eabe26e31588ae410ee63b7494a4eb9d23f70d4dd157a452d0bbf8bd548865255 SHA512 b155acdff0244307afcc334844f113b5c321f7764ebb69326d60a6a79d0e0d38d55257a38b815f5933aa4071e6a788e01c466476ef012cec648c84d74adda406
 DIST node-v18.14.2.tar.xz 40330824 BLAKE2B d18cf6a23f091633e5298727eeee15dec65ca83e688ff9fbed78385102aa44707ff4b33bcb034f6d10aab9a81a646ad7e8c28a239de151b816ff7072977df0de SHA512 72bb788b40d83bc42850dd9e2d00ffc06d9bcb17d24280d4721038038d1632846f859864328c849498255d1095296402b9b3c6b8910bbd399f7f516a43b9c86f
-DIST node-v18.15.0.tar.xz 40355624 BLAKE2B 56337de0b6e3c2421e6d9add81d30ada821525e0bb05fc977c91b7162f6dc075610ec53af50d6596cab6c0f647d61fb243896b25f0a768eeeefedf1a8bde1c05 SHA512 e41fcda469809186fd724ef4691e25f4a5bd81357ee99acf3d7faa1190a69c19cb62bd14aea199ca6f8b5cf9687af7d898cdf605ea2414d2c04db87ddb3b4dc8
 DIST node-v18.16.0.tar.xz 40467860 BLAKE2B b16749c0212f3aa196ec9fc0f999a023adeb9031b3332939330ba5a3edb5bc2ed6dc21bf861509696e19ed0cc5d5c54bb882018f0e54eb1ad8e9b0ba3bb64bff SHA512 608ce5db97ce2d851f381c7991f635c5e0927ae79037649b482c7e197479341b7c6560644e25f4d65ece8aa80c5763a0e044349a5be210fa33fbbf97a96462bd
 DIST node-v20.0.0.tar.xz 41279796 BLAKE2B 1df8785ca22dea15c6c1f19ec2d3b3d704f9cda6cf13d6e8e8fbbf853515871f18a11a4bbe5ed765434f6f5606975c5254e1826f2e506165ff937ef16d326262 SHA512 cda981227398c1a9023a2212c0d5351eadfedd19d58776dcc470e3ba0213a178b626c37d48fa52548ddd5a70d26a18b66c266856321a0af9ada2b1eac7ee9fd8
 EBUILD nodejs-14.21.3.ebuild 7089 BLAKE2B 5a039629b268d5b88ecb324d1a39415c9ebd810264aaae3c699a8a28333d2330fa904d7ba6295f53db6beb8941f7568415d5af576c7c289a2837f7f53596a4c2 SHA512 c51e35fd2936f3397e14dfab0aea7ac0db20734f4358d2cf804bfaa3173683ed58e47feb71f1c647467e1f69a1be5cf88893899263af0192c9613038c3ae55e1
 EBUILD nodejs-16.19.1.ebuild 6703 BLAKE2B 9b4ec4b35cd13bf388b9e04d15386500d784445786b053e9cf9e1f1ef53250f48b9f1f013bfe768667d7ff3fde4ed0c0bd3ef14d76c945dcb9566a8a10a6d03c SHA512 ef0caf342f6a79b050c4d63fd4c701bbf0e7b5daf2eb3aa6d3d510d99d561df447d9f786f9d4a8296ef7d2b3ec9e6164a98530accaae640d0847b7b25b3afc9f
-EBUILD nodejs-16.20.0.ebuild 6909 BLAKE2B 697566d5b590d055f4aa2a62142af700ec78c8f6870076eda53f955535f4656e4302bcae5c7aa197e1cd506be993512f2de733a0d3e56a041a5b7f81f791ee1c SHA512 dbd2f42e1822fe383fd6defcfca836d6e19999355f3634c47718f010ffe58ca242463e5057396ad16c888777b67047350edee7c0b7574658cffda826698ebe55
+EBUILD nodejs-16.20.0.ebuild 6589 BLAKE2B 55087b5a858a7df5db8869e6b629cf5d6f7aa4f2fb59c9d3373da97946452cc9d2b60355c124300533f47671eeec5911633f3d6acba373eb21c69f54d7489f3e SHA512 0f09e4fdf52970cddaeb5691d03d74d725db498a6b104a9882286966a4aee251d10a87efe2658fb232f47675b36c494ca73a2fe3356e14d9513fd8b0651abfa1
 EBUILD nodejs-18.14.2.ebuild 7606 BLAKE2B 41a54764b744802268b2b06f09264edfbcb9b1998b032ab689643441ce4d6dc49609c6169a9e61445730ba4224ba141bc93cb7241486c72a2703e442d4efe1ab SHA512 3175d47941fda7b3b031d7a993043248fafa73d763f8cf7b37b0dd1a0b02d8776b83023e4f35b133c701bc42fcc99dce3f41d0fe3005a8dbfbc94c9ce7b5acf4
-EBUILD nodejs-18.15.0.ebuild 7676 BLAKE2B 0892f8116fec6f9b7a0e2e68d64b6ac007bff9377ca5ed1b143739be90cd6d6a7d8bfc520df7ecac9372f1d7947be847d3667d27bcbc4e54894ad65a660d3bfb SHA512 56f7c35e31a07275f062fa471a483eeed34182da8d94220e9f3a2ff7fb50294ce875bbb7c36a905edd4293f9630f72e4fc0a65eb3b5143e4df6f1603b6a50b54
-EBUILD nodejs-18.16.0.ebuild 7725 BLAKE2B 8da88a2ef0e16b2dee744341ceaed44a0602ff4fe7fb3b4ad0eef8481026b19e46757daa890eda65db21dc503a5b05f1b9d1eb98f5c9823ca8fc5ab66327cab8 SHA512 f6253abe933c7aefc98d989e422e5a863917c551fa9a7c7e9d2e5bbf8f5561eb9e72b22ee8afcdc76ff7e3d731401b1bbfa76fa605b0e33fdc6f834eb6283513
-EBUILD nodejs-20.0.0.ebuild 7267 BLAKE2B 781a6103231d671854df94f91bd6988c6dc2fef61e1f6c4ef687bc23f8057685e784f66d36f4404515c662e9ac91b6ef2ba7f778104467c744e799cbaa983497 SHA512 0f160d5e8bffacac320c71059f0e22f83d526b2d475522d5e9be269ef98afaa5f105702449310edaca73bc2e2b78d2495b634f401617b1e79f14609d81a1c859
-EBUILD nodejs-99999999.ebuild 7611 BLAKE2B 1ba337fd68332a379cd174a81d1c0d6e8284c8292a0575c793f2ad9015d74f697a4b04def9bee226eaec1380c65272e070cdd29ad9d001428fb5056db4205ba4 SHA512 909e3366aee9b1b87a7fdb1d12aa834700cfde6dfa3bd3de2d399dc25609f328dd61111be85b7f8590bada73565f5005ec35880b27cc460e3b746012c7fe8fcd
+EBUILD nodejs-18.16.0.ebuild 7340 BLAKE2B 89a1e2aac7a624bc46c9a89e7be3d84b3de8e7829bd8fa4ab5657f0365ad5ed2f443885c3c11573e6da25bdcdcc6a8e0e743dac8418ac7f10c8d92af9f401259 SHA512 0c7a4e7c3bed8a05ed87a75ee6a5af3d0c8191ae954da48f45c5a8e805584ba4db61fd18c51828bea1ceaae639e7f6bf74ef1a56aab2bf45576384c7f82e8d7e
+EBUILD nodejs-20.0.0.ebuild 7275 BLAKE2B cf845e10bda6b1b0e51cee80d31bd88b96b4288acd04ec29e0b8c4ddbad0627ae6bd4dc2146eff3be6c7c0f6f016c9b7240fb4ad992bb069281ad31564ff2d8a SHA512 9726f7a3c93f9a9db42e0478d9fb30532b236296f2818b55aa449e15abf7f0276922deee46da95f7e86fd489d2de7ab7de23e5a17c5acb06781b775ef8bf9592
+EBUILD nodejs-99999999.ebuild 7215 BLAKE2B 979eb0315c6acd1c93842d09752ac793d5386197c67991158f52918620ac0b7ac3e98a3e8cd087918a43bdd94251f5851bcc8cb7757dda08193e912748c9bd34 SHA512 9f804d7707910731176e2f04850af52092158a9d732cc5e82df278d5323536ca86bc401dd3527886f08c19821ddc2c76e446ccb05b7352b07460b8003529d08e
 MISC metadata.xml 898 BLAKE2B a67e85ea95c272b8d18746254894b058433267a74b5bad66bac7d78c7db4cec297e06bc87fad3ee836fc91749aaee2c11c88b48b6ba033c36fa79132552faa81 SHA512 d498b288058e7282c5e9a28d4ba192a2ac5ef796eb1edf644aea41cab2d0eb6036426b188dd9af7eeb2eaf04b84011460cb3c3695ca8dde5667add21d9963c97
diff --git a/net-libs/nodejs/nodejs-16.20.0.ebuild b/net-libs/nodejs/nodejs-16.20.0.ebuild
index b5937a82e94c..674133fd6675 100644
--- a/net-libs/nodejs/nodejs-16.20.0.ebuild
+++ b/net-libs/nodejs/nodejs-16.20.0.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
@@ -93,13 +93,6 @@ src_prepare() {
 	# We need to disable mprotect on two files when it builds Bug 694100.
 	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-16.4.2-paxmarking.patch )
 
-	# All this test does is check if the npm CLI produces warnings of any sort,
-	# failing if it does. Overkill, much? Especially given one possible warning
-	# is that there is a newer version of npm available upstream (yes, it does
-	# use the network if available), thus making it a real possibility for this
-	# test to begin failing one day even though it was fine before.
-	rm -f test/parallel/test-release-npm.js
-
 	default
 }
 
@@ -222,11 +215,16 @@ src_install() {
 }
 
 src_test() {
-	if has usersandbox ${FEATURES}; then
-		rm -f "${S}"/test/parallel/test-fs-mkdir.js
-		ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
-			"For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
-	fi
+	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
diff --git a/net-libs/nodejs/nodejs-18.15.0.ebuild b/net-libs/nodejs/nodejs-18.15.0.ebuild
deleted file mode 100644
index a91643fe8d0d..000000000000
--- a/net-libs/nodejs/nodejs-18.15.0.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# 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 systemtap test"
-REQUIRED_USE="inspector? ( icu ssl )
-	npm? ( ssl )
-	system-icu? ( icu )
-	system-ssl? ( ssl )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-arch/brotli-1.0.9:=
-	>=dev-libs/libuv-1.44.0:=
-	>=net-dns/c-ares-1.17.2:=
-	>=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}
-	sys-apps/coreutils
-	virtual/pkgconfig
-	systemtap? ( dev-util/systemtap )
-	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() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	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.3.0-paxmarking.patch )
-
-	# All this test does is check if the npm CLI produces warnings of any sort,
-	# failing if it does. Overkill, much? Especially given one possible warning
-	# is that there is a newer version of npm available upstream (yes, it does
-	# use the network if available), thus making it a real possibility for this
-	# test to begin failing one day even though it was fine before.
-	rm -f test/parallel/test-release-npm.js
-
-	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=(
-		--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} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-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() {
-	rm -f "${S}"/tests/parallel/test-dns-setserver-when-querying.js
-	if has usersandbox ${FEATURES}; then
-		rm -f "${S}"/test/parallel/test-fs-mkdir.js
-		ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
-			"For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
-	fi
-
-	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-libs/nodejs/nodejs-18.16.0.ebuild b/net-libs/nodejs/nodejs-18.16.0.ebuild
index 8491233b3189..8d12026d01b2 100644
--- a/net-libs/nodejs/nodejs-18.16.0.ebuild
+++ b/net-libs/nodejs/nodejs-18.16.0.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 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"
+	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
@@ -110,13 +110,6 @@ src_prepare() {
 	# We need to disable mprotect on two files when it builds Bug 694100.
 	use pax-kernel && PATCHES+=( "${FILESDIR}"/${P}-paxmarking.patch )
 
-	# All this test does is check if the npm CLI produces warnings of any sort,
-	# failing if it does. Overkill, much? Especially given one possible warning
-	# is that there is a newer version of npm available upstream (yes, it does
-	# use the network if available), thus making it a real possibility for this
-	# test to begin failing one day even though it was fine before.
-	rm -f test/parallel/test-release-npm.js
-
 	default
 }
 
@@ -240,12 +233,16 @@ src_install() {
 }
 
 src_test() {
-	rm -f "${S}"/tests/parallel/test-dns-setserver-when-querying.js
-	if has usersandbox ${FEATURES}; then
-		rm -f "${S}"/test/parallel/test-fs-mkdir.js
-		ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
-			"For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
-	fi
+	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
diff --git a/net-libs/nodejs/nodejs-20.0.0.ebuild b/net-libs/nodejs/nodejs-20.0.0.ebuild
index 48030328556a..e8cb570919ab 100644
--- a/net-libs/nodejs/nodejs-20.0.0.ebuild
+++ b/net-libs/nodejs/nodejs-20.0.0.ebuild
@@ -108,6 +108,7 @@ src_prepare() {
 
 	# 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
 }
 
@@ -233,11 +234,11 @@ 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
-	test/parallel/test-release-npm.js
-	test/parallel/test-socket-write-after-fin-error.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
+		test/sequential/test-util-debug.js
 	)
 	rm "${drop_tests[@]}" || die "disabling tests failed"
 
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index ef61e71e60d6..9277dca7ff05 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -24,7 +24,7 @@ else
 	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 systemtap test"
+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 )
@@ -43,7 +43,6 @@ RDEPEND=">=app-arch/brotli-1.0.9:=
 BDEPEND="${PYTHON_DEPS}
 	sys-apps/coreutils
 	virtual/pkgconfig
-	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 	pax-kernel? ( sys-apps/elfix )"
 DEPEND="${RDEPEND}"
@@ -104,14 +103,7 @@ src_prepare() {
 	fi
 
 	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.3.0-paxmarking.patch )
-
-	# All this test does is check if the npm CLI produces warnings of any sort,
-	# failing if it does. Overkill, much? Especially given one possible warning
-	# is that there is a newer version of npm available upstream (yes, it does
-	# use the network if available), thus making it a real possibility for this
-	# test to begin failing one day even though it was fine before.
-	rm -f test/parallel/test-release-npm.js
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.16.0-paxmarking.patch )
 
 	default
 }
@@ -172,7 +164,6 @@ src_configure() {
 	"${EPYTHON}" configure.py \
 		--prefix="${EPREFIX}"/usr \
 		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
 		"${myconf[@]}" || die
 }
 
@@ -236,11 +227,16 @@ src_install() {
 }
 
 src_test() {
-	if has usersandbox ${FEATURES}; then
-		rm -f "${S}"/test/parallel/test-fs-mkdir.js
-		ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
-			"For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
-	fi
+	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
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 77836f6343b4..b2afa54925c8 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 90c755e133d1..ee5e1cfda1a7 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 8774 BLAKE2B 04d6c3b5109e49bbb6ee4673e309f83383de8aae0cffab375345d9b338b4d96be9ff27b161411d506276ca8d6b59a62b8d6aa69f4c1259440fb2b19602cf70da SHA512 3cf17e1df8c75c5c38dc4e1c600e254990d320c9c010f420db46100953e5d43b9d61dcf368ec52e61b7a9c7feb653dc63ed1bff470f7b49b7c628cc38a940563
+EBUILD curl-8.0.1.ebuild 8770 BLAKE2B a00fac73a23c98fac0e88cf4228be377c3c1dd5520a803d9f2762b73737c1bca983af3ec6a273f533e9bc59e93f172e3bf53b9b5f21ef8b95a60825302e20ee6 SHA512 d15b181cf3840e563436fad5200f7e88a7b5f48fffdb00bd9610862318a1c3acb8fd906ed1f8fd66f644dfc8c1cfb481f135752dbec3f7cae21fa0f1448d914f
 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 098b942395f6..66122eea62bb 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/profiles/Manifest.gz b/profiles/Manifest.gz
index 38672b01c77d..351d1e3acdcf 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 9a0d1bb85d5e..e7433a2676a2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -399,12 +399,6 @@ app-editors/le
 # Removal on 2023-04-25.  Bug #896762.
 dev-python/collective-checkdocs
 
-# Hans de Graaff <graaff@gentoo.org> (2023-03-26)
-# Mask ruby27-only version of puppet for removal. Please upgrade to
-# puppetserver 7 and either puppet-agent 7 or puppet 7.
-# Masked for removal on 2023-04-26.
-=app-admin/puppet-5*
-
 # Sam James <sam@gentoo.org> (2023-03-24)
 # Please upgrade to make-4.4.1 as make-4.4 has a bunch of issues.
 =sys-devel/make-4.4
diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index 65c385e7abde..454b5a7599c3 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -1,2 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
+# Fabian Groffen <grobian@gentoo.org> (2023-04-27)
+# https://bugs.gentoo.org/905152
+# breaks behaviour with -stdlib=libc++, masked for now
+=sys-devel/gcc-12.2.0
+=sys-devel/gcc-12.2.0-r1
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index eb4e423a44f0..84a9cdba61c6 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index ac4219e77303..7bcffbfd2b28 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -6,6 +6,6 @@ DIST make-4.3.tar.gz.sig 566 BLAKE2B 75bf71602e60f97ec8efa81676329047746d960257e
 DIST make-4.4.1.tar.gz 2348200 BLAKE2B 09a4ad8060259e36854b525ab610fd317a86f4926e44e3ab8adba75dccc8d4b445df9dd25ccfb4c25a54bc0e98238a9127e36401d74cbc3503a329eadcdf4995 SHA512 145260cbd6a8226cef3dfef0c8baba31847beaebc7e6b65d39d02715fd4f4cab9b139b6c3772e550088d4f9ae80c6d3ed20b9a7664c693644dfb96b4cb60e67c
 DIST make-4.4.1.tar.gz.sig 833 BLAKE2B d5f9a33b0262d4a9216f47718f6596884852662a692e708191a7007964007940da1c06549db28ae1d13683c4a949b9ee86da9dedd9a80da8f8b09e71e659e9a1 SHA512 d7a5531c10f216d690ec036f3875c7f314fa53006e138568c60132d506db48d1a59201623e168091dafa4465b005991019e42f81ff1a96a44610b6b18de08b09
 EBUILD make-4.3.ebuild 1944 BLAKE2B 875fb1c002402057904152c634ee5e588b02bee4149ab4a5a19d6fbf0f5bc1faecd19e14209951ff5908cc40f7791030d66cf8c03392c8eab62d748272b5dca3 SHA512 37e56423a20def1b5c4f929ae92fcb84988edb55799dfd17634d76ae57cf454cb26649d2c3a25a80b8c0ff3e3447cac7b01ad20f4bea262e17812b5c2ceca87a
-EBUILD make-4.4.1.ebuild 1919 BLAKE2B 3f9296fbdad81fd3685f3630053f0728ae64325ca4048d5137901ee3ed987ab7c336e921f4a98c36ba49baf3cb965e95f190d111c574ff3ccb997a499dfa76dc SHA512 f3a2527c436de16d70d91d69c5bcc6dfa18c77de20cb16c425325ac30d28ea28c22a8cdff7422f50fd5bb73377b21f904739d2521c3ad8eb646c7aed9383e78f
+EBUILD make-4.4.1.ebuild 1911 BLAKE2B 93732d4fa5c6310032e40af0066b19c5b712b185967772c3f0032ee0b1660601c6d594d0a991ceba6be1f2256a4629087045acf49402c8566197b7119e27d66d SHA512 f26e4832bc33fffb4dfc9495568a6b305b40083da2d50ad34feb6a226324abced3e1849fd408fcc028f6e525c436181f1a82e9a0c64196da2daf1f66f2e8e99c
 EBUILD make-9999.ebuild 1919 BLAKE2B 3f9296fbdad81fd3685f3630053f0728ae64325ca4048d5137901ee3ed987ab7c336e921f4a98c36ba49baf3cb965e95f190d111c574ff3ccb997a499dfa76dc SHA512 f3a2527c436de16d70d91d69c5bcc6dfa18c77de20cb16c425325ac30d28ea28c22a8cdff7422f50fd5bb73377b21f904739d2521c3ad8eb646c7aed9383e78f
 MISC metadata.xml 335 BLAKE2B 5b17214450a474af84b5015059fed4edc919e53bfd407cedf0816746d95a3258aa90fb851a7d013f1ef10b61d689ead735f8ed35b109e12b45e7a4efab22abe3 SHA512 72ff31b31e5d9bf55124d570d8ff4911eecd2272492988919fc073e5864d4282e4acc3101c367076c1009e3af086792993fa96562c25699f1b537b88fed40a1f
diff --git a/sys-devel/make/make-4.4.1.ebuild b/sys-devel/make/make-4.4.1.ebuild
index de7a808ae4c1..8d425cc7108a 100644
--- a/sys-devel/make/make-4.4.1.ebuild
+++ b/sys-devel/make/make-4.4.1.ebuild
@@ -17,7 +17,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
 else
 	SRC_URI="mirror://gnu/make/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.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"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 5312961f1b1f..a29f34a849ec 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 8ae87ae7d906..09a182c51184 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -7,5 +7,5 @@ DIST tzdata2023a.tar.gz 442875 BLAKE2B 33dd386d37a6349c9f9e60694c43323e97c9ba2cc
 DIST tzdata2023c.tar.gz 443902 BLAKE2B 8a50aa5f338565d86b8fa5428c138b251bd8dcc3ea66c144b49625d02c5c7aa27f1ace66babd36f10f75cf5eb832ec327b9c2e8adb0384c450130d1ee8c45562 SHA512 608bd286ebcbd0004cfdc1da183273f08aff61f90c8867661154453d77a05d421e4c46ad6d066a1fe2e87d5c82ec0f1c0224667a3b35f3180a3eb7f6ff84cbf5
 EBUILD timezone-data-2022g.ebuild 5403 BLAKE2B 862aec93a7deeb88a370cb8799fcc2d4ffd81d6efa3d728f53bfe0145bc4494e6a90508fe4af07ee8b8046ecdd53ad8931e7d82e804c2ce9e64d2d4052332456 SHA512 ecd20530fe1e0058d71a9a50c89c4d19b5d2c6685561def8a5e8a32121514a39966c6156fe0dc8dc7123b3c991a1fbb7ae8079fd6eb838ff14752ae554e88657
 EBUILD timezone-data-2023a.ebuild 5368 BLAKE2B 143697057587c94b0c29077ee6f155da71ff1c86fbd0ef4f976767f8af6a8880e7e5bac32200e67ccfa06de690eefd96224dad12e53ee0ff1ab4bb7985904663 SHA512 e734283b7eedcf94f43611e01ee366781f4e359e2dd3a20601121adece3442148f009a71f3ef44882010ad30456e0cbbbe9bc90236bd44bc52af1092b5432cf9
-EBUILD timezone-data-2023c.ebuild 5363 BLAKE2B 3f92d7b491d121a09445335e3c711196a80e83c5429f6b3c9d286bc84db6b01a69c8ab9b21866c7f538da71a709aae986aa8d660166b1caf90706290c8601aba SHA512 bcbb108c3bb3fe5b0add48024c0bead8bd1a95239d1fc4d2036b023cc984c554c4bba7f1584d54de7e604d8b113fa0179e6297b8142406905f77f2924f6dcf2f
+EBUILD timezone-data-2023c.ebuild 5362 BLAKE2B 90f2aa04c3878334d1ca5bae8d6013b4887e59ad28e05d51cdb6caa5bddedfc324bc126ad50f9b12494fbdf33d77b32fc17b2ee03040d5645ab00fd93c988722 SHA512 be6aa7a8009a9dabf90ee156611d0c604e741b20e6e25dfde5b108e5f8317df91d3a2503ab01d7f99273020497df1a80bf0f49b5809a390f89af7f88ded256a9
 MISC metadata.xml 807 BLAKE2B 24b09c4228c232b607e6e6c165a20e364136d77aa970e72c70124636a038cd3b672bad16ddd68c0b75373be6a09f969e59bc38f7e451bb2869cd46c521e2ca82 SHA512 0b95b32d79651493a04032f175f3320d8975cea714b43fa56aa528f10f51a7c52b58a934828f98a770855485af6f8db048bd2bfa3010802cff8c26ae05bb16e2
diff --git a/sys-libs/timezone-data/timezone-data-2023c.ebuild b/sys-libs/timezone-data/timezone-data-2023c.ebuild
index 27557d50c8ae..eacbb3e2b768 100644
--- a/sys-libs/timezone-data/timezone-data-2023c.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2023c.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${MY_DATA_VER
 
 LICENSE="BSD public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls leaps-timezone zic-slim"
 
 DEPEND="nls? ( virtual/libintl )"
author	V3n3RiX <venerix@koprulu.sector>	2023-04-27 12:17:07 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-04-27 12:17:07 +0100
commit	c8e8719ce75120aeba1784b5edbe919b2e5e3dc3 (patch)
tree	7945df945695274ce144a17413a1560dd350a60c
parent	4936e2350e0b4aae482b12c7ce02aaa3c7e64842 (diff)