gentoo auto-resync : 28:03:2023 - 21:51:31

380 files changed, 2249 insertions, 7605 deletions

diff --git a/Manifest b/Manifest
index ebd2db84c78c..3d5245eaa68c 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29460 BLAKE2B 77ffdb3fa0fe80528ae53ba302c424860b36115e787a6523a5ff6bb8c36c4f265bac6aaeb2100a8bb1e64eae2c0f6cf0a2f630de4e18901b4dfb6e1c77d6fa5b SHA512 1cd5ddcfafc23791021e4710b3def83e52c95654c0712ade19f7453bac4ba9320d93e15c76136cf9f43e7dd33d97b8f73fc437c12316f770e1f35dd6ace5eb26
-TIMESTAMP 2023-03-28T14:09:52Z
+MANIFEST Manifest.files.gz 29442 BLAKE2B 7d32999e4eec537531995ee20e0cc4e47a27b35abd7fbd5d2191a6a8a1cd94ff0615749df497c946321cb80ad660269366f31be99f8f3c1272d55d3f65265a0f SHA512 b91991eef140fcf8e3a0111bb74a44bde913ccab07934a24334c0c29bf4ec97d5f143fdc9f693c8d9ed150806238dbba2b072a376199216d76158f36a2f56f79
+TIMESTAMP 2023-03-28T20:09:51Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQi9TBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQjSY9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC/Qw/+NrOXZImcO4JZAh9XBv096NbC2W4y8aThpcR72gVRQbzOt+Hx29hHaxC1
-ko2JhfG6IQi6Z7xANULwNaezHcs/akZnWy3uLcWywwoufUWrppkqihOqftUKTEqu
-IA8Q+Qbo5PxHG+syy391v+vcrc6dc4AQ9RjbObQZzvgwefQAUHjIeZ4dsk+4LWZE
-MImcK8FJWVfwBbw8lEyWJD3O5jKqfdhCuYbqIs270ALIqr8W3+F49R8jaSjqb4F6
-gYx45Ts2IR0yykOo8L0eWfqXIRCbSbPf/O5avcM1OJalFb6wA9y5wAw1wdNrKL7q
-ocWSk0pl/yObWdwpVLlFkC3fLQacA9NQ2ChYOKsg8oNcvHkAEo+7FaG4hXzvQO9A
-Fu9eEOAnG+ktabx/97K+VNc6P6lIkXob4jV6RWOtgVXAtAuGBAMMJr+APu5C22LH
-5VbTX4s9ztuWDRdOCg8WAM0QgDh5Ov7B2goN0FhJhc/s3Nz7c3/ibhgAtoP/1jDW
-+TD/WwZ/dkpvmrd0XBkPURihjgG6Npb01lOoNrkRruGzaKFJKKUxdWHDhSyqSEtH
-5mHIME190RwephIy8yzw6sCMTAy+YEfnzLwlDZjGo8X2jeemY0AYcjocpyOsW7WT
-kcv0ZA40HO7BMuAvz8cpcr5P6WrQ4E33RWMRkVM6VrxtjidqLRM=
-=E3Yt
+klAleQ/+JYyHwfe1z/vA/b2du/xiDsusURsr96CPQinWidJ0f5v++xo6ialYLwYt
+fFkyhcFHt8VYL5oC8i47zE2SQTpJUC25DhThlMpdMoSkfYwdeL9Uvh3PozTTgKtP
+XI3kPmDgguxc5lsMGGbzQZC5hPSi2i+4yWgSUef8vJfOVMjjFzXkYwpUAFW7ItPx
+T7aIL+eENWVtPs09yB2qS5BONw08yrP9lFbnZuwblb0RrPq7grNSiISPQU4yQtE7
+rPOq14Fzuvqnd6zJ9YtCLEgL6u8+60LPrqkoLMBrb1l5paIp8muSd1j4sTgjS+iq
+8bFbfIWzwFrr2+KAfiKd6k/eIJydd/Kq1f3c5cVeZRKUGVcY32G1pjNi4TbG0m3r
+b6eMM2faVwsmznDgL8KWF2QFsfTH6I5Dl307Af9YeG9+rKEcIE5t4RYN/11arL4L
+DwVgxCUMxhBRPHW3PXkQd238plBDW4t+Qlh5g+s6xESxEe4X9ed9/rFyJsPvu56S
+S0aRTGSOhH3CmlpwdlwAtAfz02YsxZugOaso8IHLuqnD2Uy9j96O7sL1BwBhdhiJ
+N/O5tGSJyLUaxlbSBUgGChWSVge3UOc/zzsSE/i2mO9Nw6+twtfvEmYSB3iUAHwu
+ljKIikLiHMXW2YsIoai1v7iZ2PRPklQbmpDING16AOpu4r+teW8=
+=ZfBg
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index b0369847befc..514fec074e92 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index e367c0ea5d2d..7a229d224643 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/mkosi/Manifest b/app-admin/mkosi/Manifest
index eb1711960e2a..591c02aeef3b 100644
--- a/app-admin/mkosi/Manifest
+++ b/app-admin/mkosi/Manifest
@@ -1,3 +1,3 @@
-DIST mkosi-12.tar.gz 164750 BLAKE2B b4b43e3cd64bc75eaa1993504baa02cc7f35c77fc76d24a88ccc06d4ab566477aa9febca58ac1c397cd32057aa2da8545480e89a1c9b4bd4d4fa516d812237b0 SHA512 ae59789e3b4855400d130714fac0b3b599b3e69631bc6a5267916697d0722c05a6c788cd70d224917261c931fe93fa287d3d23f6f00849cb80ff9794a13dc04e
-EBUILD mkosi-12-r1.ebuild 609 BLAKE2B a242ce4035fa20aa9345ce02afa363e02f7f6232ff1d66555a976d5ca5feb3b51a9e2ed9c77ac06ed314e891c279fb0915b1bbcf70c8f5eed8dbdac1a11c7a5d SHA512 047d276ca662359d5ce027c8d1ef4d8784fdd019719f28129b2bdec743500c35f7dd10b09b1d2d70f55f8dd018bbf27ff3f8db4badba203aebaca872369623fc
-MISC metadata.xml 401 BLAKE2B 88dc1b12a7e5c71499df6b5193786afa3902ffae824d7eeb129c2c50a37b3424ba29754ec0885524635898c87919bb8a8b9dc01e83335ca5690d66ebf2e38255 SHA512 db2c566969a6605bad5e013f6958039712d69d575491519dbfdfb1412b4d788b9b71740925833b4cb44131618391f9a293baed3a769dc6ec52f605476e8bf388
+DIST mkosi-14_p20230313.tar.gz 129298 BLAKE2B eae4f3c10c7118fa939d56cd043b3f24deb457465265c2ca8b30577193fa7f35a84d6826962a273a6e33e6f32d0aa5101db4df508da97219a8081f2e9550269b SHA512 27edfa7a7f2ebb70364ce3bdece75629e9f20060e59c2fd3bff0be6950a0042ec04fd4d09285e1080b9cf0d0b2cc8bfa66787b86be18dbb473f14cf019fc5be4
+EBUILD mkosi-14_p20230313.ebuild 736 BLAKE2B e9923af25832af765878a6a2eac9690f67441c64f91a787c679deb39c63734d61c79fa3504394545e8724b76eb70bfcaa871eb4ad5afab1f8db5e49ff9f25d8a SHA512 bc6cff24649072643b45b3a1c77c433799b2912e02409dd94c5c5d60ff24e1b9fb0dc529165ff9a5badf954fcbd56687bf39904807f0586825ad5d966f35a31d
+MISC metadata.xml 485 BLAKE2B 158b9349efac1afa1bfc621499582238a7b9c8c7bdc1bd580fcebb9d9c60f0d3182665df4a92dd3e259a72996af614927f3e33e7d8c4f240aab7581b06340346 SHA512 5e4bd0be37734de4a8ed778935b864df992ffe5c5369b81cd21d9a94724a1b4e599ae2cc132ee60b845de97941844787f86087ff250e1ffb4c4ddcfdd18291b2
diff --git a/app-admin/mkosi/metadata.xml b/app-admin/mkosi/metadata.xml
index 4d83ae8b4b54..4c486f7537ae 100644
--- a/app-admin/mkosi/metadata.xml
+++ b/app-admin/mkosi/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">webcamoid/webcamoid</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/mkosi/mkosi-12-r1.ebuild b/app-admin/mkosi/mkosi-14_p20230313.ebuild
index 42cff127c935..815dd1509bbe 100644
--- a/app-admin/mkosi/mkosi-12-r1.ebuild
+++ b/app-admin/mkosi/mkosi-14_p20230313.ebuild
@@ -3,22 +3,26 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+COMMIT='33a33967819443ee03137459eec85cd5db6c4bad'
 
 inherit distutils-r1 optfeature
 
 DESCRIPTION="Build Bespoke OS Images"
 HOMEPAGE="https://github.com/systemd/mkosi"
-SRC_URI="https://github.com/systemd/mkosi/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/systemd/mkosi/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64"
 RDEPEND="
+	app-emulation/qemu
 	dev-vcs/git
+	sys-apps/bubblewrap
 	sys-apps/portage
 	sys-apps/systemd
-	app-emulation/qemu
 	sys-firmware/edk2-ovmf"
 
 distutils_enable_tests pytest
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index a5e9bb938cd5..1e1f25561c6d 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ronn-ng/Manifest b/app-text/ronn-ng/Manifest
index 6440f89b0c37..8866eb0b8a0d 100644
--- a/app-text/ronn-ng/Manifest
+++ b/app-text/ronn-ng/Manifest
@@ -1,3 +1,3 @@
 DIST ronn-ng-0.9.1.gem 69120 BLAKE2B 9da30156104ef448c458199ee33fb5369f7d97c7bbeac8072567127b964456a34226bcc15f72d6f2875f524175d31ec9652a282b369e818748790cd07f290786 SHA512 5ad7dc426d9bc77bca86fbb06775a3b19f1b8d79f5a4331d117e9fa394e7a9c3b0440b70b993672d77a24f56f5da3ebd0e41a5183f4330707b7ddb83c9108bdf
-EBUILD ronn-ng-0.9.1-r2.ebuild 1109 BLAKE2B 69257ca88f547efeaac6de443e5c01e52a2214f227c77b0fac8d98ec0938507279cafbebbf982dcc8768c7d419df034cc927103bb3591fd8f4b13de21c237460 SHA512 0c7baa5a46223346e9f1513c9d1dde915c871fa067ff1688bfd067e97a2eb9bb69e0ab69365f08985ac4fee81f5bf52502b5698ef2edc83605630a55164695d2
+EBUILD ronn-ng-0.9.1-r2.ebuild 1102 BLAKE2B f930055b9b8692e62a180c99995b4b5287897d310cbec3fbbcaafa48e99a70e09e3b0882e46f4ac42ee8b7530a64c0c1fc4426e9fa41a56118cf19154ea0f455 SHA512 3b2c1a1227160f4ad52957df4a100ffa067c0d50f8b12c592e3b8e64a4a221e3381172260e4e61a44dbaf76bd649d4649e1284aa1d8b0336f6a590b9e9119252
 MISC metadata.xml 342 BLAKE2B 71ab5a2d2a9e2d20165f54c1cf79f483768c3637cc87a32acf80708d79b3be9d24408a330ed23ad837848933b0a40f1165f60d7b7e08146a28088a4d9d558630 SHA512 92e6778f8a2f44a81dfdbbd6699ce2186cc48b801f5c462c99b4bc35f79806ff154d72bec2916d79dc7435c1a9b75f2bf3842b7dba2b132335afc38d00d22780
diff --git a/app-text/ronn-ng/ronn-ng-0.9.1-r2.ebuild b/app-text/ronn-ng/ronn-ng-0.9.1-r2.ebuild
index 52501cd297aa..6e449818f541 100644
--- a/app-text/ronn-ng/ronn-ng-0.9.1-r2.ebuild
+++ b/app-text/ronn-ng/ronn-ng-0.9.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/apjanke/ronn-ng"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 IUSE=""
 
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index b822b59b8b01..e7445df1fd77 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/javax-el-api/Manifest b/dev-java/javax-el-api/Manifest
index 8457f9d7cd7f..93f203b25858 100644
--- a/dev-java/javax-el-api/Manifest
+++ b/dev-java/javax-el-api/Manifest
@@ -1,3 +1,3 @@
 DIST el-api-2.2-sources.jar 77708 BLAKE2B 4d31cf6ee76954fb4b16128e6cf162bcc5abe446500713a33010850bc9d416c754a1c61544dabfb1423cb3aed1f7fe06fbd367000679c04ab0f88beaf082dd4a SHA512 83db61c50735f33e6895a0ebb1f0198e4dad7868a35997180e86c68e4f833a202882120fda2f9657b3698faff852bba40affa29daa818e0dcd00a4caa6fc1c65
-EBUILD javax-el-api-2.2.ebuild 729 BLAKE2B 5f82db857853829e7fcd9a710790d7e67fca2ed410328b9e9f2cec0167f6c95656b49ded1d3e3e31f8cf7eb945efc3bdaed1d3c7fb95983c9cc3db978e4d0021 SHA512 35672c55e6ba55115e9026f61771cb9e471af833019c363a147266900f166b06da2a5754cd2fbf682c5f697b8cfc92b01cc32474b03d8c6ad791732f5982188c
+EBUILD javax-el-api-2.2.ebuild 728 BLAKE2B 5cd89c458d1cefd500495ca3c1fd39f91f1163329ab5ab4aa10d0741e7132183eabae98f01ade8e65f4b13167be086ab236dfc79aa39491ca39167b8c20d85df SHA512 9b79b3622e5ac05d10af85137f74079ef038f82c7402d0cf814e12246694ac98ab9993801e1af02120890682c3fb23bd9b9d44f945549afb3275802f1fabef35
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/javax-el-api/javax-el-api-2.2.ebuild b/dev-java/javax-el-api/javax-el-api-2.2.ebuild
index 2bd0a3f73432..164895534df4 100644
--- a/dev-java/javax-el-api/javax-el-api-2.2.ebuild
+++ b/dev-java/javax-el-api/javax-el-api-2.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://repo1.maven.org/maven2/javax/el/el-api/${PV}/el-api-${PV}-sourc
 # https://repo1.maven.org/maven2/javax/el/el-api/2.2/el-api-2.2.pom
 LICENSE="CDDL GPL-2"
 SLOT="2.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/javax-jsp-api/Manifest b/dev-java/javax-jsp-api/Manifest
index 0d4f6ce32522..8ef53a68b23d 100644
--- a/dev-java/javax-jsp-api/Manifest
+++ b/dev-java/javax-jsp-api/Manifest
@@ -1,5 +1,5 @@
 DIST jsp-api-2.0-sources.jar 118348 BLAKE2B d9f615961a6ef2afb1447477d44e4f49eaf9137f62ba596c40d7437c8d4973a68f689189255bcc6bae5e5970b23c8e93fbabcad2fb230f54963dad55eef2a8f7 SHA512 4f38ed56e9e51a979488a26fde36905748674e225a10df82259891fa85f8493575a58babb7620b27a96ab7e83002433ae4ee60f700a866e330642c7dd0a0f7a8
 DIST jsp-api-2.2-sources.jar 163137 BLAKE2B 8bac5428393518cb3edb8488eaaab772d37db51dfbc5b466eabcb5b8ccd90cfa4869ebe65d861c64a6c588c8ede3ab1f5ab0c2e9080dde16c0585a7f774abb05 SHA512 ff79c34904372b722501b4479cbf88796017839d636a31b9343ef9104d93e3554154b3124f366295d05a41dc8320ff8bc83e9f8ee971df35c791220065b70647
 EBUILD javax-jsp-api-2.0.ebuild 886 BLAKE2B fcf523d59fa6348a3e9268c9d0ee4e8e335829348d41349145e8e126f9b6617a4144f79f884e8e9a21059d24f4dfd91d24f154e409e900ec316bcb1a33a9af68 SHA512 6b435443f9d980706f613dffca7914e0d7ac1c927319b80e2ce1783d185985b06b46b2c6111650990500ff4fc6f7e0f6921d09dfea1b606ed81e31aada9c0351
-EBUILD javax-jsp-api-2.2.ebuild 680 BLAKE2B 1514d4292c0773b0399278b4ef429daf6a8905a642cab40db51294615dc436b8d46cf5bce6e2a5ffc44427affc025b908f6f2d76ed25fa1a16f1a1a5c885cdb3 SHA512 f72a7e8abb70be349f07c250f07918e3b0d3d9424f244012785db10780860128760f454d3b65654a697673ef5b797c8f628cb0d47028ed1e462dab81894eee2b
+EBUILD javax-jsp-api-2.2.ebuild 679 BLAKE2B c20e6970c1cb992cf863004ee1bf737096d82720456f5d34bb35882df7360690dae0e4d7b9c03ec6e47c485da3ffab53db87e8aa155e3ce7b58255ad64942fee SHA512 62a1aa63b240ad7aa0be21e289b23742c074889faca4c73786be95bc6613966b58c8503e6bef665dc55177610d6aded53c5312088144055efbe5278a6e6d63fb
 MISC metadata.xml 401 BLAKE2B 40264e86d6dff5d7213a7fc268e24ae9ac46766871898ddc6f1bf0ec071b6d15d3440f3b8d4670b9d04699d29c02bd31398b760b9c23ede325a30d2eb12d6c8a SHA512 9d2ed45cc0db1fb816a8efa0540beb092ef9598f044db6352c2b703085bf07c3d82f46fdef3f81bd5784f10db84e86e19821292cb638c0e000293f48def2b999
diff --git a/dev-java/javax-jsp-api/javax-jsp-api-2.2.ebuild b/dev-java/javax-jsp-api/javax-jsp-api-2.2.ebuild
index a4d45d389408..bd949201c1c8 100644
--- a/dev-java/javax-jsp-api/javax-jsp-api-2.2.ebuild
+++ b/dev-java/javax-jsp-api/javax-jsp-api-2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/javax/servlet/jsp/jsp-api/${PV}/jsp-api-
 
 LICENSE="CDDL GPL-2-with-classpath-exception"
 SLOT="2.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 CP_DEPEND="
 	dev-java/javax-el-api:2.2
diff --git a/dev-java/javax-servlet-api/Manifest b/dev-java/javax-servlet-api/Manifest
index 6e9b73184ad5..ab3e891c5528 100644
--- a/dev-java/javax-servlet-api/Manifest
+++ b/dev-java/javax-servlet-api/Manifest
@@ -3,7 +3,7 @@ DIST javax.servlet-api-3.1.0-sources.jar 223386 BLAKE2B ca472d1312e3ebb86ac1f0d1
 DIST servlet-api-2.2-sources.jar 124718 BLAKE2B e9b79dafd1e858935215bf53e70f6e7d6eca226659c50abf6922e895c037ca23c5592da557cb53e649024e59dc56392535ca174dc96130d95e4b8ee98bff790e SHA512 62335089d991e05ba463bc7d976dcc51861e03d0ff350c4de9b63a508e0a8adf043764a7935c7c5c4b64baa2853f8163a78ab8609ee9d5a6001a7e6acb81e16e
 DIST servlet-api-2.5-sources.jar 158114 BLAKE2B 84997b9cc2122f49a850ac32089eb484bc4f68c4e73c7541cf70f453f0a0eaa0c037d6f2b8c8270d4122502f224a6943011f6a964da406093d0ad4bb173dc71e SHA512 6590adea214ba7f59e033b8f450ca8fd3a0764ac6aaf2789d5824ddeecc4c520d004242e42e3a058517d5f556a41a970f782dfde35b2cf184874a77063dc0fef
 EBUILD javax-servlet-api-2.2.ebuild 915 BLAKE2B 3bab0c314c1373e4f55d1035c34eaa8bc02df316d19f23b0b2ecb7d8819a03ef8a65ac643cd71a5a210a70719da39e7fe0b44837e23bc2b14f7908c130555d4f SHA512 ca3ba15c530254f15fa201f134b85e3dcb0b2a89a8ae1080d59f7d38dad807d431fcb1190d8bc950082c7af35dc3b65f6f7ccd1681e65038d125656b8c8d44fb
-EBUILD javax-servlet-api-2.5.ebuild 827 BLAKE2B b8dfafdf2bc1537acfb941d323b7cf93dfb5987c90161ce1ca0283258b7d400e740ff80daacb271ecb5d23840b954a8c4e9e91d4abc4d67b90f2fa614e3a5ced SHA512 f48c0780a2d792890e1ba48c586c67af2da055771a2519f814dd91b6f1d486318a5adaf554da483c3607e2b90d900dfc3c95a96e6ffe386089ee2ccb697c922c
+EBUILD javax-servlet-api-2.5.ebuild 823 BLAKE2B bcaf0319d4c3850eafad51d759445aca57ff37912167e606749ee17d201b8e08e6e6516868643dc9a4150389357b3332456f6edfbe7bb6846a7e99de4a9af317 SHA512 5d6002c43e7e2bacc55303615610e18d176257f0fd1a74e937b5f57952208ebc1b64c03060dd8bcf1c9680cdb3ee13eb0c0b17c601a3b21588634ca6523f004a
 EBUILD javax-servlet-api-3.0.1.ebuild 940 BLAKE2B fbec8f7bddfce3dadc7df788c8f65bb71760e2ddff6afffe155e12e984319d504078643ad1d5b139fcdfea23c476a776f96cc8a0ace230b7d6e4251fdec8cbf8 SHA512 3bce74b77a92102085eb6e5243af6aa17e6767fc8649542cf81f73e2c6406c55969e1dee5e1a63f27b12d412daf9ae67781f87dc0b88d6ec589fdc0d123035a8
 EBUILD javax-servlet-api-3.1.0.ebuild 946 BLAKE2B be00c47d8d6c922af92b1f9e65483f0959437180e88d3d0386a3d49742ed56fb4478f60dfa496d2aa635d39d879a7f225ccad7ef27679a996568ca1517a2d8c4 SHA512 1fff69bbd79ef7d4f08d6b971fdb8b28829507cf77c5b2f8d5222137d093bf529a0e4b0884f0cf16f1e1dd63b2ced819432f52953b7b1405f41736a4b7156d38
 MISC metadata.xml 805 BLAKE2B 1659a31c44ce401f65c117482a31b28da3e065f5b2f5ef9c0343e14e9151899b1c49838d1135ce5b0faab49082424d440c125f6a312d8c07366e0e54bd4d5386 SHA512 7b5386f0415198641ee8c4d93a1d0607f376f836297559cc361ab428be1ad02c02b700d465a69bd6ceb98f9e77118dc45d4542aa872018c7b2f910c2d7adc05a
diff --git a/dev-java/javax-servlet-api/javax-servlet-api-2.5.ebuild b/dev-java/javax-servlet-api/javax-servlet-api-2.5.ebuild
index 4964c46c94c5..75c0e7178cc5 100644
--- a/dev-java/javax-servlet-api/javax-servlet-api-2.5.ebuild
+++ b/dev-java/javax-servlet-api/javax-servlet-api-2.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/javax/servlet/servlet-api/${PV}/servlet-
 
 LICENSE="CDDL GPL-2"
 SLOT="2.5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/jstl-api/Manifest b/dev-java/jstl-api/Manifest
index 268a38974b3f..521c210271be 100644
--- a/dev-java/jstl-api/Manifest
+++ b/dev-java/jstl-api/Manifest
@@ -1,3 +1,3 @@
 DIST jstl-1.2.7.tar.gz 291252 BLAKE2B 37383f519615f41e4247b1e2207cf1cc57df3a3d01f939bb41cc400dbdb49b331fc0bc3e5ee26c3d9d1e361bd4ec11efd5b6e6a9cc6cafee2b196c1d9491d07f SHA512 2b52869fe5f6d586b8505a2a417790ffad7112db17af667cd52fb567fb6c7ee4a3b3906a072d0d4e7ef463b56a1e5cf9a955b9fbaab97c91a1a286e05add23c3
-EBUILD jstl-api-1.2.7.ebuild 851 BLAKE2B e555cd11400fa10c0ce4b5e9d60e00d5c59c259af99cc46e7163f9f4b49a37febda2b3a5b76631a4136aac27ec35a7809c2975ea8df40fc48c52fe6796e3df65 SHA512 e8178c82cc9d08ae9a9d088342e712644b8af02e303ad157f899494d19b2edbea71e672f4ff7e9886683fc0344920f5e2257de040df2c198515f620beedf8e13
+EBUILD jstl-api-1.2.7.ebuild 850 BLAKE2B 10de2e3ffd8da7e7dededf9fd5cf50d7e81a230f1522f5b34c6d2b91621b0725392b505cd329fe706e923316f7891836be32ea864a9109babaaab1c19f178444 SHA512 e0e8e82e1f2e12c4ade18c8c45d635e11d495b2da336ac2b1c96c54081cb7f1ef4aeae41d19e9908d546449741627821dedb0ef2213f5faf6d4e3acac510fb80
 MISC metadata.xml 296 BLAKE2B c4f4176e9ee4c9e6c8e09729b24e84d4319a71d7059b6939c6ad8f4bac9fa0e7ede0b4e73e31068a5c3fea631beba2e6c362a6bfa4f28a6289e14a4197797cc1 SHA512 f07cf674ac741524af3baed5535a3e1dc7f8668a42783fb81ec22f823d91e58ae944992e9d65603a967bda36afcebe1bf91a6a97878cb2c82b2f1b4087c598ba
diff --git a/dev-java/jstl-api/jstl-api-1.2.7.ebuild b/dev-java/jstl-api/jstl-api-1.2.7.ebuild
index 1818a42cc5da..2d1f36d7caa3 100644
--- a/dev-java/jstl-api/jstl-api-1.2.7.ebuild
+++ b/dev-java/jstl-api/jstl-api-1.2.7.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/tags-${PV}-RELEASE"
 
 LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 CP_DEPEND="
 	dev-java/javax-el-api:2.2
diff --git a/dev-java/jstl/Manifest b/dev-java/jstl/Manifest
index 1a8e0c8479e3..4798c920bda5 100644
--- a/dev-java/jstl/Manifest
+++ b/dev-java/jstl/Manifest
@@ -1,3 +1,3 @@
 DIST jstl-1.2.7.tar.gz 291252 BLAKE2B 37383f519615f41e4247b1e2207cf1cc57df3a3d01f939bb41cc400dbdb49b331fc0bc3e5ee26c3d9d1e361bd4ec11efd5b6e6a9cc6cafee2b196c1d9491d07f SHA512 2b52869fe5f6d586b8505a2a417790ffad7112db17af667cd52fb567fb6c7ee4a3b3906a072d0d4e7ef463b56a1e5cf9a955b9fbaab97c91a1a286e05add23c3
-EBUILD jstl-1.2.7.ebuild 1307 BLAKE2B 751f54ec528a46a34326ad67d153f17a01afe62a9e80347bc3f2c9d698b39cd81a8c8a7ca3726292a4c60ec0015636aa77a9908a896f77c0b043b2923f467ac5 SHA512 6cc68cebb6941f32288ac8e0ea41344d3e29f9e5941e55b54128ece098f7e15220ae7eb1cca99bb1f6c15be680b5ec2c376e5a5ce84056dfa2d2a00fa62eca36
+EBUILD jstl-1.2.7.ebuild 1306 BLAKE2B 03481db52426e4fb05b7447beb165856621486e395e1606d97a7115522b29196c38d3be8e593c8c3f050e40db15e3fe646c5aeddd97695c48c6d1c7817ef61c9 SHA512 ad000787ea44b2f07a229e93f1c01a790b7a404017a23951b00a393fceb3c87604a4ed7f4592e27094b8dc466edffeace56cb4e30395d13f0bda976829e2951e
 MISC metadata.xml 296 BLAKE2B c4f4176e9ee4c9e6c8e09729b24e84d4319a71d7059b6939c6ad8f4bac9fa0e7ede0b4e73e31068a5c3fea631beba2e6c362a6bfa4f28a6289e14a4197797cc1 SHA512 f07cf674ac741524af3baed5535a3e1dc7f8668a42783fb81ec22f823d91e58ae944992e9d65603a967bda36afcebe1bf91a6a97878cb2c82b2f1b4087c598ba
diff --git a/dev-java/jstl/jstl-1.2.7.ebuild b/dev-java/jstl/jstl-1.2.7.ebuild
index 351e0735dbe7..a7312416c603 100644
--- a/dev-java/jstl/jstl-1.2.7.ebuild
+++ b/dev-java/jstl/jstl-1.2.7.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/tags-${PV}-RELEASE"
 
 LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 CP_DEPEND="
 	dev-java/javax-el-api:2.2
diff --git a/dev-java/osgi-enterprise-api/Manifest b/dev-java/osgi-enterprise-api/Manifest
index cc0e364463cd..5a05c5ffdad9 100644
--- a/dev-java/osgi-enterprise-api/Manifest
+++ b/dev-java/osgi-enterprise-api/Manifest
@@ -1,4 +1,4 @@
 DIST osgi.enterprise-5.0.0.jar 479506 BLAKE2B 2bd53b50e469388d132a6d3ebd78d4040093f8c1d79299fd87412853d959f7559f04287567eeea47635fe287a3e9d3812ac9303a5d39ec35135ab3c58bd0b010 SHA512 0404c05afd8cb3ef8b826b0f08deeb03b0027ca99e091953d39ef69674809c5b899e0f2c8efb685df5fce070c2aafcf813e470fbb538d4ec3b480a8060351144
 EBUILD osgi-enterprise-api-5.0.0-r2.ebuild 731 BLAKE2B 94046964b7c1366dd905ea998ed7ffd2bb41b73dbe20817bc2a66565e7c5b79c9ea18eae9c5b98030e40fe67c19ca4691b2f48ff320974e21e73ee7ec31df200 SHA512 dc97f6aeafbd54deb4939b80a94d1e8a1d4335f0fc0abfee2ae858fd0707504159e1b37095dd7e3502fe57adae4d05d9dd94c76eddd9e28274aa905b1dc21b08
-EBUILD osgi-enterprise-api-5.0.0-r3.ebuild 734 BLAKE2B a35a86cdba8a7e91adb45e0873f49e826d755511830ae7070896043b9ab6a5b9b3c3cc43129a32d0bf47f9a0dac18e63dbfd2f776c141ff7c0c57af9b63f8242 SHA512 4dd4a5cc62e48fbd028a64bf624ac76c30986965707f799885ece9058df6a6291aee44f6e2fd06edd5c008db493b381b68ed16a42183fadae87c69dbaa5be91e
+EBUILD osgi-enterprise-api-5.0.0-r3.ebuild 730 BLAKE2B f6ed2a4cd12a88f042b0df66c03609c9ca8a446d87a5bfa6b36d6cbfffcf59c2e4a866b4e5b775793da103e42c6f3842355e9cbbe2e8c35a57e911db28979c50 SHA512 9634a3e8a06b67c88113804572fd8e5eedb71290e4a7c1fdd963e2506553051f2afe0fdd07e8c2f71aef63f778c79f80e6256f67a45c18793e8db64456fc080b
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r3.ebuild b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r3.ebuild
index f9ae58282ad4..bf8943b5ed02 100644
--- a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r3.ebuild
+++ b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://docs.osgi.org/download/r5/osgi.enterprise-${PV}.jar"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 RESTRICT="bindist"
 
diff --git a/dev-java/reflections/Manifest b/dev-java/reflections/Manifest
index 28fec1b7f1bb..0892fb293c7e 100644
--- a/dev-java/reflections/Manifest
+++ b/dev-java/reflections/Manifest
@@ -1,4 +1,4 @@
 DIST reflections-0.9.12.tar.gz 48235 BLAKE2B c82bd69f4433d8db738fcd32dd7fbf643984917622853b1886e15b906a91579de0193daf0fc1a9642c12d13de8236acf3e1f1409a18713b37c6e705a3cae34bd SHA512 8f8c7603ab73b599c6e2160f42b61c4e0eedef9981c06124bba0437d6636e7bf8a916784e266754562dc17f4d3ccf8df6c9ba707d1a7c38d97dc5eea9138064f
 EBUILD reflections-0.9.12-r4.ebuild 3795 BLAKE2B a601a07600dc3a69158f7614e53ecdd1af1213042031fcf747320f5673e769f0d93ee8f1eb8f3c9cb00245e776a948bf3e9f8acaa1b614c58c888124f9965647 SHA512 f2c52934f7abff3dbdef4f22afec72dbcf2397e8b97817e8c9ceab0a6a3280da767d737add076ff74cd21c66bed18cb0493281e4e8dc1da533adb007012a8796
-EBUILD reflections-0.9.12-r5.ebuild 3797 BLAKE2B 8228c7a9acf209ab6b85097272e9e58f31eaa983f1677e7484ff5a2c41a61db40171c5cbabcabc471ee95d1ca5ed7cb34b0622e81ce5b8fa25242de02d543a1c SHA512 e31659ed34fd3b7b795d9c05b3374271165ec4810af27ebaf0ad54cfdbf9c3b9effaee01493ff29d1b82c2d994bf859f8320b9d85c53a2f2cd6962f3ef429415
+EBUILD reflections-0.9.12-r5.ebuild 3793 BLAKE2B 14b4a6b3ffaf9e2cda4b81489aac2e9f81b63ab38b1f3c838af74a861e52e44009a9f85cfac645ef9430496f0fd538eb2fc302de10bb96debba16273efec97fe SHA512 c7e5450942cedb8b779fadc09acde59e09e7e6ea76aa7cb7d1954dccc86f69c0abec2f2d9a7f1ed835ed04596b200117da8fdc0e2ee994192d8a42f3d32f627c
 MISC metadata.xml 527 BLAKE2B 92b0ca46422b8b0107bef220664c0079db47a3c8f306f59d5b681b653e5bcb835a192c8018d719447ebc864ead58f3844340bf3f84ff5bbef0ab126b7d314efe SHA512 a7ad6c598f83a911b20f5b31573127433d2bd756ac15d4a29de907ce102a5fb77de2426035a8255125446128b8ef13ed1f9fa002bff285cddbaf9043bd71dddc
diff --git a/dev-java/reflections/reflections-0.9.12-r5.ebuild b/dev-java/reflections/reflections-0.9.12-r5.ebuild
index 3ca2b5f13dd3..4b2b9ab7668c 100644
--- a/dev-java/reflections/reflections-0.9.12-r5.ebuild
+++ b/dev-java/reflections/reflections-0.9.12-r5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ronmamo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="WTFPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 580f8c0a2c5a..96100d25a4b6 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/execline/Manifest b/dev-lang/execline/Manifest
index 7a15ec0ebcfb..aca88db1cfb3 100644
--- a/dev-lang/execline/Manifest
+++ b/dev-lang/execline/Manifest
@@ -5,5 +5,5 @@ DIST execline-2.9.2.1.tar.gz 109290 BLAKE2B 55eeed28e9663f9a13ee31c4117436ad03c8
 EBUILD execline-2.9.0.1.ebuild 995 BLAKE2B 4dff28e6d49a1429ed2bd17ea4a92c70031341303ab6dcb82b1b27f178b264196f10aea179b8df769a62580d82b710cbfaede8aca1a4a26dd4f594622f43cd38 SHA512 f5099e61df22c921ec2a2a1dbd8a0dd905db42fd28817d5aba1945530c983828ed3b95b93bda0446bd245e910e476af09fed94484e768caab6baa27e27986f65
 EBUILD execline-2.9.1.0.ebuild 1024 BLAKE2B f16b1a0d19807a74c61aca7a1678b72bc08394133ce145acde2facb4fb0fd19e51d93a8f26ca9bad4874e0e2895ac2f6240180614c15572518d3d5fe463e4576 SHA512 c977d255eec2286972debe5c61f349bd413106cdefaada7b37684081e290b2b740050ddd4e5d16c08ad8cf48edc0273089ef8f5d13c77b8941dc1c52d7273fca
 EBUILD execline-2.9.2.0.ebuild 1025 BLAKE2B e90c87129edd6fc8c71d6c41b8e41ecfd801b3986dcf018c6806fb476784c8d12b2c8bdeae57e0f891bdcd73e34e2d6ac1839da4b435db3eed0b06f3195a06d4 SHA512 276a81bc7b492f4a75336fe5f51dd7f829d564b1d6c58aba7987f82a461d9c23abf2dbdb1ac38eb1453fc6e05a211e5f289532e93a44c5f8011056c4e37d780b
-EBUILD execline-2.9.2.1.ebuild 1026 BLAKE2B 16d004e701c72887b7c7052467a755388369e68d6481bc570606c01abb04cfd36f766af6077514bd9b9e6714407c5df7abf0d42d1283f69a149594a9e97c992f SHA512 de94c2d3f83bb6e1ba6295660b8ff8e67545253ea808262cff721ac5044452cd4b1b898f27f107e78d9fdd52dec1df1f809807007e87719f4621b21df1ecd6d6
+EBUILD execline-2.9.2.1.ebuild 1025 BLAKE2B e90c87129edd6fc8c71d6c41b8e41ecfd801b3986dcf018c6806fb476784c8d12b2c8bdeae57e0f891bdcd73e34e2d6ac1839da4b435db3eed0b06f3195a06d4 SHA512 276a81bc7b492f4a75336fe5f51dd7f829d564b1d6c58aba7987f82a461d9c23abf2dbdb1ac38eb1453fc6e05a211e5f289532e93a44c5f8011056c4e37d780b
 MISC metadata.xml 730 BLAKE2B 6a6ad73cc84538d29b5fb47ac5a560aa524aad0ad87c1fafed91a6b28c64e27d78f6eabce0ea9308f4c48c4143bb1dc5384cbf1ff0d01c8d8863053085f87bb8 SHA512 86d1d324fbdb15cae2d64c0cc2970c0ef0d03c047b20b3c793ed66c92502a1a8a83ddeea7d82c11b7534fc7886bfaf45d4fba37f9d5456cb1f6398164473780b
diff --git a/dev-lang/execline/execline-2.9.2.1.ebuild b/dev-lang/execline/execline-2.9.2.1.ebuild
index 99842e4ae590..fd780a03f32c 100644
--- a/dev-lang/execline/execline-2.9.2.1.ebuild
+++ b/dev-lang/execline/execline-2.9.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~riscv x86"
 
 RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
 DEPEND="${RDEPEND}"
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index fc78b0f2aee8..4d6109c48b28 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,11 +1,7 @@
 AUX go-sets.conf 313 BLAKE2B 03e94776e317d34b72bfb8385b8b0dfa6a599a6086e4d0c9214e7b49293768947c21d9afb323ffcc7fd85ba0af72d9cb243dbb571eee9eb81de9400fd5f5e79c SHA512 7d01b98bc8d1b609183682dd942bd4c9fa757a98243c7de3cf6c497c7bc20b8cdbe59dd669ce4bb11f914a0e9b6d100e65cea2dffd99f38be50b18e0ecf66315
-DIST go1.19.6.src.tar.gz 26549360 BLAKE2B cbf17c3dc744aec67b440718488e6acdcf6385bce2654584c273995bb72871642488ad3ea972c6ba07914028a778341d27904402647deab879bd1bbc08b3dd8d SHA512 f817ea6bcd83b60d9bf2ae9d0afdaa21651ac6cf5a32c260f40a691cd0ccce556ec9a483e10fa1a5dc244d6ea512407f5dae9c99ac004393b196a80284e63977
 DIST go1.19.7.src.tar.gz 26550385 BLAKE2B 282e9e62bd78a7678cfbf18d0134a766e1aa283f9304def537c9feaf9deca406a5ffe775050b17a916143466824067bb26431fb5ae3cc42cdf7131971f474af3 SHA512 e6f0df2d381a424cf43e8ea0306a58a46a96464cff4665ca3da73f713d4f039687a6c9659cef577000b1fadca7c1a2114fac34ffb2017d6335f537ac235de823
-DIST go1.20.1.src.tar.gz 26172675 BLAKE2B d6daccbebfe3dc014675499ad319eb9a6ae1382feaa42e7fe80d2e4a49bd7b3eccc3144f7cbd18c7c478e557d0e512eb1030d654a894929803838f192d551214 SHA512 57453419fafac8af10f4037b0162326555aab0e87cd1d246d5e977246c075a0504c23022d5c14bfcae9ca1c3250652ddd7c6fcf2209a926525e5f7d0d40ab52d
 DIST go1.20.2.src.tar.gz 26178725 BLAKE2B 2c896bab60d301b7a01df48a20e16726c50cd1df528092022a33ab11c543c8c5c7e54c6235ccc776de74ead08aaf7496a016b829fa51f96ae2b32beeafb44cb2 SHA512 ba8f894b1baa6b3c1bdaafa113feff8d16c25d91f8e44bd4e7ffb46d7b329309290f27385804399baa9834691290a209fc7a193b24fd197ea11a16ce4a1b9d39
-EBUILD go-1.19.6.ebuild 5233 BLAKE2B 86b49ba0ccc71624134e67f3e97db2b58460835459080228ccaa6a6b043123bc4592cf8ac180d8e67eebfe0b6aaef0bd48c5e9358246099c20668181301b7842 SHA512 10577e3953f04e5998acce259355643455dab7e67bd42efa5fbc4d2aeb91d0807acdb3c59813f2d69acb853e7f6d6d2fcb3cb72e2ec9834dec5ccc6f6a50a7ba
-EBUILD go-1.19.7.ebuild 5235 BLAKE2B feec7ff92b8e32271235bd796c71f78f52e3c90c754d85496742564b4ff0b37fcf21fdf692f097c4298b36e5a3932349dace9ea3e1e91e4f6e632484ee2fb75c SHA512 63f5f1ae9a0f26e400d847df01ca9dad27dfa937e027b826098b63fc83e89665565e1308e7832eab2bd6e04eacf49d8704d2af2b2624db6b7782784d86957cad
-EBUILD go-1.20.1.ebuild 5137 BLAKE2B 65b652825d854dd1306058fb1696d59bcf0161d9d986be037b70446a41df8b6bdaa0ca8ac4c776a5aaf4aa3c800914138bf0a3e7cb6d1588f1dc553a11436e19 SHA512 56c9ed026879b9992344416a56e3891eea77f3eae901f9497e3eb72053fbf132bf51d6d344f51a5d2c60138eae4aef8fcc619e9f1802f97e80b431afc0eec7e6
-EBUILD go-1.20.2.ebuild 5137 BLAKE2B 65b652825d854dd1306058fb1696d59bcf0161d9d986be037b70446a41df8b6bdaa0ca8ac4c776a5aaf4aa3c800914138bf0a3e7cb6d1588f1dc553a11436e19 SHA512 56c9ed026879b9992344416a56e3891eea77f3eae901f9497e3eb72053fbf132bf51d6d344f51a5d2c60138eae4aef8fcc619e9f1802f97e80b431afc0eec7e6
+EBUILD go-1.19.7.ebuild 5233 BLAKE2B 86b49ba0ccc71624134e67f3e97db2b58460835459080228ccaa6a6b043123bc4592cf8ac180d8e67eebfe0b6aaef0bd48c5e9358246099c20668181301b7842 SHA512 10577e3953f04e5998acce259355643455dab7e67bd42efa5fbc4d2aeb91d0807acdb3c59813f2d69acb853e7f6d6d2fcb3cb72e2ec9834dec5ccc6f6a50a7ba
+EBUILD go-1.20.2.ebuild 5233 BLAKE2B 86b49ba0ccc71624134e67f3e97db2b58460835459080228ccaa6a6b043123bc4592cf8ac180d8e67eebfe0b6aaef0bd48c5e9358246099c20668181301b7842 SHA512 10577e3953f04e5998acce259355643455dab7e67bd42efa5fbc4d2aeb91d0807acdb3c59813f2d69acb853e7f6d6d2fcb3cb72e2ec9834dec5ccc6f6a50a7ba
 EBUILD go-9999.ebuild 4798 BLAKE2B 50daca174e8bc89f747432e96bc7d66e6c7dd50320d0b4c97754bb90267d62b700d34c250a892fdf60c907fa5eb881dd7adb3e64eba7ceb240740bd90c399f83 SHA512 051671c9a99efe554f9ed66423a20d053546ba68fdbf8a900e4ef0a365622bf8fcc976c678e393ade4a5475e01ccc53668d61d98e1b976e69de030662498273a
 MISC metadata.xml 590 BLAKE2B 56da63bdc350df5c6ef3b511a386627f4020f655027ca88da6a83ecb09581d3c3055c836eb8fe98a383412b3d431a77a9935ad753fe2d8392afa37cd613c15b0 SHA512 5d78adbae30c3a805194567bbb1af2ad59b78487819e7841a040d2a4d5db02f5b5d1d58f7cfc7a37f39e5e9bcf332dda4d336456e33e36c33caef792ac45d48b
diff --git a/dev-lang/go/go-1.19.6.ebuild b/dev-lang/go/go-1.19.6.ebuild
deleted file mode 100644
index b6862ea87040..000000000000
--- a/dev-lang/go/go-1.19.6.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-		;;
-	esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://go.dev"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="abi_mips_o32 abi_mips_n64 cpu_flags_x86_sse2"
-
-RDEPEND="
-arm? ( sys-devel/binutils[gold] )
-arm64? ( sys-devel/binutils[gold] )"
-BDEPEND="|| (
-		dev-lang/go
-		dev-lang/go-bootstrap )"
-
-# the *.syso files have writable/executable stacks
-QA_EXECSTACK='*.syso'
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# This package triggers "unrecognized elf file(s)" notices on riscv.
-# https://bugs.gentoo.org/794046
-QA_PREBUILT='.*'
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-	CONTRIBUTING.md
-	PATENTS
-	README.md
-	SECURITY.md
-)
-
-go_arch() {
-	# By chance most portage arch names match Go
-	local tc_arch=$(tc-arch $@)
-	case "${tc_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		loong)	echo loong64;;
-		mips) if use abi_mips_o32; then
-				[[ $(tc-endian $@) = big ]] && echo mips || echo mipsle
-			elif use abi_mips_n64; then
-				[[ $(tc-endian $@) = big ]] && echo mips64 || echo mips64le
-			fi ;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		riscv) echo riscv64 ;;
-		s390) echo s390x ;;
-		*)		echo "${tc_arch}";;
-	esac
-}
-
-go_arm() {
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os() {
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple() {
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile() {
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-src_compile() {
-	if has_version -b dev-lang/go; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
-	elif has_version -b dev-lang/go-bootstrap; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
-	else
-		eerror "Go cannot be built without go or go-bootstrap installed"
-		die "Should not be here, please report a bug"
-	fi
-
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="${PWD}"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	use arm && export GOARM=$(go_arm)
-	use x86 && export GO386=$(usex cpu_flags_x86_sse2 '' 'softfloat')
-
-	cd src
-	bash -x ./make.bash || die "build failed"
-}
-
-src_test() {
-	go_cross_compile && return 0
-
-	cd src
-
-	# https://github.com/golang/go/issues/42005
-	rm cmd/link/internal/ld/fallocate_test.go || true
-
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-	cd ..
-	rm -fr pkg/*_race || die
-	rm -fr pkg/obj/go-build || die
-}
-
-src_install() {
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# The use of cp is deliberate in order to retain permissions
-	# [1] https://golang.org/issue/2775
-	dodir /usr/lib/go
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	einstalldocs
-
-	# testdata directories are not needed on the installed system
-	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-
-	local bin_path
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	local f x
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-
-	# install the @golang-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/go-sets.conf go.conf
-}
-
-pkg_postinst() {
-	[[ -z ${REPLACING_VERSIONS} ]] && return
-	elog "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
-	elog "all packages compiled with previous versions of ${CATEGORY}/${PN}"
-	elog "due to the static linking nature of go."
-	elog "If this is not done, the packages compiled with the older"
-	elog "version of the compiler will not be updated until they are"
-	elog "updated individually, which could mean they will have"
-	elog "vulnerabilities."
-	elog "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
-	elog "See https://bugs.gentoo.org/752153 for more info"
-}
diff --git a/dev-lang/go/go-1.19.7.ebuild b/dev-lang/go/go-1.19.7.ebuild
index 5fb93c0e9487..b6862ea87040 100644
--- a/dev-lang/go/go-1.19.7.ebuild
+++ b/dev-lang/go/go-1.19.7.ebuild
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm ~arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-lang/go/go-1.20.1.ebuild b/dev-lang/go/go-1.20.1.ebuild
deleted file mode 100644
index 651b35d6f5f0..000000000000
--- a/dev-lang/go/go-1.20.1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* amd64 arm ~arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-		;;
-	esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://go.dev"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="abi_mips_o32 abi_mips_n64 cpu_flags_x86_sse2"
-
-RDEPEND="
-arm? ( sys-devel/binutils[gold] )
-arm64? ( sys-devel/binutils[gold] )"
-BDEPEND="|| (
-		dev-lang/go
-		dev-lang/go-bootstrap )"
-
-# the *.syso files have writable/executable stacks
-QA_EXECSTACK='*.syso'
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# This package triggers "unrecognized elf file(s)" notices on riscv.
-# https://bugs.gentoo.org/794046
-QA_PREBUILT='.*'
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-	CONTRIBUTING.md
-	PATENTS
-	README.md
-	SECURITY.md
-)
-
-go_arch() {
-	# By chance most portage arch names match Go
-	local tc_arch=$(tc-arch $@)
-	case "${tc_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		loong)	echo loong64;;
-		mips) if use abi_mips_o32; then
-				[[ $(tc-endian $@) = big ]] && echo mips || echo mipsle
-			elif use abi_mips_n64; then
-				[[ $(tc-endian $@) = big ]] && echo mips64 || echo mips64le
-			fi ;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		riscv) echo riscv64 ;;
-		s390) echo s390x ;;
-		*)		echo "${tc_arch}";;
-	esac
-}
-
-go_arm() {
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os() {
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple() {
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile() {
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-src_compile() {
-	if has_version -b dev-lang/go; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
-	elif has_version -b dev-lang/go-bootstrap; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
-	else
-		eerror "Go cannot be built without go or go-bootstrap installed"
-		die "Should not be here, please report a bug"
-	fi
-
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="${PWD}"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	use arm && export GOARM=$(go_arm)
-	use x86 && export GO386=$(usex cpu_flags_x86_sse2 '' 'softfloat')
-
-	cd src
-	bash -x ./make.bash || die "build failed"
-}
-
-src_test() {
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-	cd ..
-	rm -fr pkg/*_race || die
-	rm -fr pkg/obj/go-build || die
-}
-
-src_install() {
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# The use of cp is deliberate in order to retain permissions
-	# [1] https://golang.org/issue/2775
-	dodir /usr/lib/go
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	einstalldocs
-
-	# testdata directories are not needed on the installed system
-	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-
-	local bin_path
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	local f x
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-
-	# install the @golang-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/go-sets.conf go.conf
-}
-
-pkg_postinst() {
-	[[ -z ${REPLACING_VERSIONS} ]] && return
-	elog "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
-	elog "all packages compiled with previous versions of ${CATEGORY}/${PN}"
-	elog "due to the static linking nature of go."
-	elog "If this is not done, the packages compiled with the older"
-	elog "version of the compiler will not be updated until they are"
-	elog "updated individually, which could mean they will have"
-	elog "vulnerabilities."
-	elog "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
-	elog "See https://bugs.gentoo.org/752153 for more info"
-}
diff --git a/dev-lang/go/go-1.20.2.ebuild b/dev-lang/go/go-1.20.2.ebuild
index 651b35d6f5f0..b6862ea87040 100644
--- a/dev-lang/go/go-1.20.2.ebuild
+++ b/dev-lang/go/go-1.20.2.ebuild
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm ~arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
@@ -153,6 +153,10 @@ src_test() {
 	go_cross_compile && return 0
 
 	cd src
+
+	# https://github.com/golang/go/issues/42005
+	rm cmd/link/internal/ld/fallocate_test.go || true
+
 	PATH="${GOBIN}:${PATH}" \
 	./run.bash -no-rebuild || die "tests failed"
 	cd ..
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 1ad44df56838..b9a4da6b4091 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index ba4ae54f5ebb..497c7dd3befc 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -3,9 +3,15 @@ AUX gentoo.config-1.0.4 5624 BLAKE2B 3db6ca219dae54bb33abfec0b91b17b453222d50884
 AUX openssl-1.1.0j-parallel_install_fix.patch 515 BLAKE2B a1bcffce4dc9e0566e21e753cf1a18ee6eac92aca5880c50b33966d8ecb391f7430e1db6ea5a30ee4e3a9d77fb9e5542e864508b01c325011e368165e079a96c SHA512 0badd29ec8cffd95b2b69a4b8f8eecfc9ea0c00a812b298a650ee353e3965147fd2da1f9058d2d51744838f38168257b89aaf317287c55a7b76f16a69c781828
 AUX openssl-1.1.1i-riscv32.patch 2557 BLAKE2B 97e51303706ee96d3fae46959b91d1021dcbb3efa421866f6e09bbee6287aae95c6f5d9498bd9d8974b0de747ef696242691cfebec90b31dc9e2cc31b41b81ec SHA512 f75ae1034bb9dda7f4959e8a5d6d0dae21200723d82aebfbea58bd1d7775ef4042e49fdf49d5738771d79d764e44a1b6e0da341d210ea51d21516bb3874b626a
 AUX openssl-1.1.1t-CVE-2023-0464.patch 8500 BLAKE2B 6956aa4545d63337154e654d584eed1acbcc90eeeee60120fc567a24f839d8046b5d69d5d5de380a783580bf7c10590f45954018f2e26bdc1cd4a79e45bc1662 SHA512 5842316bf9cd38fb496adc6681542afbf7c2f8899f3952b61f1502da61b0c74f7aac3f27851be9d027642f3d2fcd1dc69fc11f14dcdb9af43f0e0d16c7de6736
+AUX openssl-1.1.1t-CVE-2023-0465.patch 1735 BLAKE2B add7bf0bda8802259b2fc3bb2c815b7e3bb04226d5effd3c98e60aae0b0aa140c26a05467eb7384147032f67ad9ef347b42012d1dfe05d2404f2feed692c6dd2 SHA512 a63883bc773faceded24c47d3246ce2c8e9ad10426a953e575ec0a6f315e0e9b789d31de912ed5015e7e97bf205870fb16b6f4353807dd00c4d1396586a35935
+AUX openssl-1.1.1t-CVE-2023-0466.patch 1719 BLAKE2B 77294d1820a935e653f254600eb219a1da1409d2e4a161fcce1fd44ce0bc96ca61516a929ee6dd9016ea07374a412ce8d6e65f570941e325e0f7fa79759dd364 SHA512 d6fc7d5a5420b6de96e0fec34175259a7f34acae0d34347980972bdc999b8d57ddb1aac6b4063a7eb4aab759b5afaeb7fa010133df8e1b57efeb23df56ac6b67
 AUX openssl-3.0.8-CVE-2023-0464.patch 8888 BLAKE2B 4a4c71e3dc3264ee2da59c9848bd79f700d9923cfc4d0fe26b740625263a1f47d0ad1a6dc3ecc060e6e7f94a3ddb90e80deb16850471d166b335107c48c3a7d0 SHA512 dd22e945312604f45bb55f2e8cfe485f4c7a47d7c07d746117baa580d61d25679d410043ff4243b62390176159ef4e3f40f0e2d28191329d3ad11f3bceb67294
+AUX openssl-3.0.8-CVE-2023-0465.patch 1725 BLAKE2B a226cc9f74188da651b910e6bbb56f9bfe445ecb09cb094dcfb182874470c5562a00959dc38ccbed2f0d48fd672491b4b423ce7252e2bc5d334c8c8ba999f655 SHA512 f7cdebce1af1cd89e8d1cc17834cf998f2b1a7587807b06887036abd5a134c79f25adacc94b9f2c5e4cda634fbdbdc7f76256e4653f5ef278fa18ea7c5023f8d
+AUX openssl-3.0.8-CVE-2023-0466.patch 1839 BLAKE2B e9a573317c92abe5e084a1c301f87443f54d47a96967f66e2dba103f8ff88f3452b5926254bbc4fdfb249b0dac530d6382504f77c0e81fea13e30398a3f8561a SHA512 35d64774eb784753ca90e55c72978e01e1b21b13255a51f27d4c8b34865a9509d24e9712abc42ef597b496a44a8ec6c17cd92768ebd335e721f4da0f7b40a45d
 AUX openssl-3.0.8-mips-cflags.patch 1104 BLAKE2B 39b3698ce27758504aa64b3059fdb51876971f085850719c4ece9e068c975624c04a39652cc77446de1241aa1d816eb282cd969efd70dd5c5d682c84f6a9224a SHA512 ec0a860ee504281fbbc33dbe35f9f31b3c8943a144ccbddc75c36c89260793760b42efd6b7c27c51fbab059588fc784dbad39c5b5f77202bf13a263441766216
 AUX openssl-3.1.0-CVE-2023-0464.patch 8888 BLAKE2B ef5c66bc6c06fd6e9d69ceff9f204e5944a1e73760e42bfc8550b197b674b34d273fcc9efa8a5f1b21577e8acc849548595a845a7f569a9ebce8ae0223ebb56a SHA512 e6b8f7f855ef880fcedba6e93971b1f894981e81e830d600446d560c2d83a8f8b2595a30ec0f7f0fdf1fc787b817d1d44700aa72203027a157beafdc0ec6ef19
+AUX openssl-3.1.0-CVE-2023-0465.patch 1725 BLAKE2B 7fbf508304c257ca5fc58c6b80b567326895d5b86a25fcfbdc058c6d21d9244b3a55150436084b15184fac267c001520664c02bb7f7151b61acd8da47113df27 SHA512 5e1525dff539eb06f3772166cbb6f20162b2c7de12633616663beeb75f5e8e5d964b66364b82dbf993d0622b741dba1930f27ca44f9563c0d1ff5915e6be93ca
+AUX openssl-3.1.0-CVE-2023-0466.patch 1839 BLAKE2B 166c660e40f3a7e6f7a87d673e1c94ff93494a6bfa9c061ed8e1ffc8d396d83043803c9ee4f277ffacab9132c9a941c5d51b7079cd07264d20724e2f83e54ed2 SHA512 e7cfb530fcec4712f076cf70b44d20576cd9a56e7904499f6f8d7413bf2565ba591317ee843c1ee074ae0eae61c26178689677dc3b0261af1426986812f9016e
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
 DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
@@ -21,8 +27,11 @@ EBUILD openssl-1.0.2u-r1.ebuild 9980 BLAKE2B 0017b72acb2eb86f2927845903c93aacfc9
 EBUILD openssl-1.1.1s.ebuild 10244 BLAKE2B d82db58beebd3eba272016b0484a148591c9d273b520dabd27c80e2f078a8a86beb0374ac2a19a6237fecd0e3e8d2a6d2a387edad4344865ead73869ae8f198b SHA512 3705eb236ead5c896ccb0e0165b48027bf6bd6bedcee148dc7d1ad53e2a787bad4e430c1d3868c05fb866628fb40675bef8bcf64e377e81ae601f3fa7ca4956b
 EBUILD openssl-1.1.1t-r1.ebuild 7977 BLAKE2B e09b33a43ad161ee6f44853fe66056f4cd9f2c9c724275909fafa3a19fbccd42251fb25c45cd7fda308b6e77c78660f0d4763b358dc39b7e07f0ac04faf1d6ec SHA512 dae563abf4b0a8096a3c4e6543eba47766802d700739d2649e652c41f00b642b35271d440e553ba6300e765bd7eb10215274c12fdfb6fae80d04b1cec17fc8cb
 EBUILD openssl-1.1.1t-r2.ebuild 8033 BLAKE2B 1a65763e419a1c14afc6a6c82fe9867f338483943b6136280e99de78924685f54956e2fccf1e858278b76bf927227b7654810e1e9d26aa313862e4787ac410b6 SHA512 2415d6a83bc10dbad48ca47f9a25742c0c1400fe6a248017865a0c4f73c63b66ab18953ec42e129e337287685b660d5c465278851b0435476c612705b5b8d67a
+EBUILD openssl-1.1.1t-r3.ebuild 8133 BLAKE2B ccabb4632f06caf2d1768623b019cba1ce7edbbefb87fa0bf3055f95449d1de90c5345802f07d3c22a2b0a8b4b38883f77d883d7fd852dfb173829ef41170ce2 SHA512 cd54aa6377bd2cd976ae6c809b32d7fe7b55ce0759703123be31e3f385b39365ca1ab03aa2acba9cca6d3d64544a0086eba111a1dea63b9fc31177642694b32d
 EBUILD openssl-3.0.8-r1.ebuild 7789 BLAKE2B a5a3eed08b0c4196e38849abd2f37c90f177f7c350f83064632934c379038e977e7519da2aadb62b7d15dc634cf26c8cf5bdae9aab0a4ddb6f4d1f0dbd693025 SHA512 b5e20150d2b93214303d70f73f7593f098bda3876e21d46e49c72000bd7161a29c3166908ae9f0e8af8efb4e127801dc0c7c962391499f9d46e74370ead17d2a
 EBUILD openssl-3.0.8-r2.ebuild 7838 BLAKE2B 437496ddf1bf7d36c83e40f86e41d5ba5d0ce210f0162521c3df5d2011ccefb94c42021ba7d326824fc64f1b30fe0edc569f586552f43ce054a57aa82b9d4290 SHA512 2dc102202843d437fda0f2121ddfac2b15504129878bb40e2354638ad0b1b8c7e1fa81800491147961af6237022672f9ee47457cae0da0e62da3a6802f709398
+EBUILD openssl-3.0.8-r3.ebuild 7936 BLAKE2B 8d32dcb3110f304f0c4c381a702fbb3e97577f4a4aa55e532dd5bf2af87dabe8ef649f8d3d2cbc2f35fb138dec4c663fe6b54e6f0b8898af4eef89efe722677f SHA512 1bdbab0eed43010676855709d9c6c35e63841abfdf6fcc9c44fba51d0f1f8b1d1f3161da051284cf0b2466a44d5fea588f6d8a0e0601fc453048a67f063df06e
 EBUILD openssl-3.1.0-r1.ebuild 7885 BLAKE2B bc101a34ee46f11314a0c55810c7d5444db5d2d2c18fce9ba9c78e3d68356f49c017aece7578f3a714fcc758288a427e989a93f2bf7f3c336c2b4b3a9d0a843e SHA512 f62450c598a35fe55a544ae9255fadd8f0376e40fe7a21f9f5cb9df47c3ef30297e77da50679841c47f69338e68ba52bbb97e9f5705fe54d9b5dea7f15fb2e2e
+EBUILD openssl-3.1.0-r2.ebuild 7983 BLAKE2B 3a57e0a0f79f97c55844329388cca7e939beef3c316cb96f6f66dbf36273d775f4187b756ea5ac3868e2af3edad40ce12bbb81cd2eae215051305c9e3cc1d876 SHA512 ba9a82a53ffcd0d1f0b04f5612beceac3e1dba8d4bfaee6eb2a6161051a365f80b3c2822b58db7bd40c4d3dc70149c3277bb6bfc897638543b15e0156eb0e280
 EBUILD openssl-3.1.0.ebuild 7836 BLAKE2B 98a3e069f68c4e67cc905021d0857f1d3ed487a71abae6705b38bea79285d78f298b5ce3e85cd4834d3d18158a7a47d9c44adb37c72bb5043a6228a66a9c01d1 SHA512 67d916b42bae7512cd2633fe473233fb7630089a26fcb203dff265a1afa7636f93e9fe5b152082f243bacec7833b12e0137c461ff07031700ac45916f828db1f
 MISC metadata.xml 1664 BLAKE2B cf9d4613e5387e7ec0787b1a6c137baa71effb8458fa63b5dea0be4d5cf7c8607257262dbf89dcc0c3db7b17b10232d32902b7569827bd4f2717b3ef7dffaaa9 SHA512 01deef1de981201c14101630d2a4ae270abcac9a4b27b068359d76f63aeb6075aceb33db60175c105294cb7045aae389168f4cf1edf0f6e3656ccc2fe92e9c92
diff --git a/dev-libs/openssl/files/openssl-1.1.1t-CVE-2023-0465.patch b/dev-libs/openssl/files/openssl-1.1.1t-CVE-2023-0465.patch
new file mode 100644
index 000000000000..c332e0bd2c9f
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.1t-CVE-2023-0465.patch
@@ -0,0 +1,48 @@
+commit b013765abfa80036dc779dd0e50602c57bb3bf95
+Author: Matt Caswell <matt@openssl.org>
+Date:   Tue Mar 7 16:52:55 2023 +0000
+
+    Ensure that EXFLAG_INVALID_POLICY is checked even in leaf certs
+    
+    Even though we check the leaf cert to confirm it is valid, we
+    later ignored the invalid flag and did not notice that the leaf
+    cert was bad.
+    
+    Fixes: CVE-2023-0465
+    
+    Reviewed-by: Hugo Landau <hlandau@openssl.org>
+    Reviewed-by: Tomas Mraz <tomas@openssl.org>
+    (Merged from https://github.com/openssl/openssl/pull/20588)
+
+diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
+index 925fbb5412..1dfe4f9f31 100644
+--- a/crypto/x509/x509_vfy.c
++++ b/crypto/x509/x509_vfy.c
+@@ -1649,18 +1649,25 @@ static int check_policy(X509_STORE_CTX *ctx)
+     }
+     /* Invalid or inconsistent extensions */
+     if (ret == X509_PCY_TREE_INVALID) {
+-        int i;
++        int i, cbcalled = 0;
+ 
+         /* Locate certificates with bad extensions and notify callback. */
+-        for (i = 1; i < sk_X509_num(ctx->chain); i++) {
++        for (i = 0; i < sk_X509_num(ctx->chain); i++) {
+             X509 *x = sk_X509_value(ctx->chain, i);
+ 
+             if (!(x->ex_flags & EXFLAG_INVALID_POLICY))
+                 continue;
++            cbcalled = 1;
+             if (!verify_cb_cert(ctx, x, i,
+                                 X509_V_ERR_INVALID_POLICY_EXTENSION))
+                 return 0;
+         }
++        if (!cbcalled) {
++            /* Should not be able to get here */
++            X509err(X509_F_CHECK_POLICY, ERR_R_INTERNAL_ERROR);
++            return 0;
++        }
++        /* The callback ignored the error so we return success */
+         return 1;
+     }
+     if (ret == X509_PCY_TREE_FAILURE) {
diff --git a/dev-libs/openssl/files/openssl-1.1.1t-CVE-2023-0466.patch b/dev-libs/openssl/files/openssl-1.1.1t-CVE-2023-0466.patch
new file mode 100644
index 000000000000..9a59d2846a48
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.1t-CVE-2023-0466.patch
@@ -0,0 +1,41 @@
+commit 0d16b7e99aafc0b4a6d729eec65a411a7e025f0a
+Author: Tomas Mraz <tomas@openssl.org>
+Date:   Tue Mar 21 16:15:47 2023 +0100
+
+    Fix documentation of X509_VERIFY_PARAM_add0_policy()
+    
+    The function was incorrectly documented as enabling policy checking.
+    
+    Fixes: CVE-2023-0466
+    
+    Reviewed-by: Matt Caswell <matt@openssl.org>
+    Reviewed-by: Paul Dale <pauli@openssl.org>
+    (Merged from https://github.com/openssl/openssl/pull/20564)
+
+diff --git a/doc/man3/X509_VERIFY_PARAM_set_flags.pod b/doc/man3/X509_VERIFY_PARAM_set_flags.pod
+index f6f304bf7b..aa292f9336 100644
+--- a/doc/man3/X509_VERIFY_PARAM_set_flags.pod
++++ b/doc/man3/X509_VERIFY_PARAM_set_flags.pod
+@@ -92,8 +92,9 @@ B<trust>.
+ X509_VERIFY_PARAM_set_time() sets the verification time in B<param> to
+ B<t>. Normally the current time is used.
+ 
+-X509_VERIFY_PARAM_add0_policy() enables policy checking (it is disabled
+-by default) and adds B<policy> to the acceptable policy set.
++X509_VERIFY_PARAM_add0_policy() adds B<policy> to the acceptable policy set.
++Contrary to preexisting documentation of this function it does not enable
++policy checking.
+ 
+ X509_VERIFY_PARAM_set1_policies() enables policy checking (it is disabled
+ by default) and sets the acceptable policy set to B<policies>. Any existing
+@@ -377,6 +378,10 @@ and has no effect.
+ 
+ The X509_VERIFY_PARAM_get_hostflags() function was added in OpenSSL 1.1.0i.
+ 
++The function X509_VERIFY_PARAM_add0_policy() was historically documented as
++enabling policy checking however the implementation has never done this.
++The documentation was changed to align with the implementation.
++
+ =head1 COPYRIGHT
+ 
+ Copyright 2009-2020 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/dev-libs/openssl/files/openssl-3.0.8-CVE-2023-0465.patch b/dev-libs/openssl/files/openssl-3.0.8-CVE-2023-0465.patch
new file mode 100644
index 000000000000..852706d8aa92
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-3.0.8-CVE-2023-0465.patch
@@ -0,0 +1,46 @@
+commit 1dd43e0709fece299b15208f36cc7c76209ba0bb
+Author: Matt Caswell <matt@openssl.org>
+Date:   Tue Mar 7 16:52:55 2023 +0000
+
+    Ensure that EXFLAG_INVALID_POLICY is checked even in leaf certs
+    
+    Even though we check the leaf cert to confirm it is valid, we
+    later ignored the invalid flag and did not notice that the leaf
+    cert was bad.
+    
+    Fixes: CVE-2023-0465
+    
+    Reviewed-by: Hugo Landau <hlandau@openssl.org>
+    Reviewed-by: Tomas Mraz <tomas@openssl.org>
+    (Merged from https://github.com/openssl/openssl/pull/20587)
+
+diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
+index 9384f1da9b..a0282c3ef1 100644
+--- a/crypto/x509/x509_vfy.c
++++ b/crypto/x509/x509_vfy.c
+@@ -1654,15 +1654,23 @@ static int check_policy(X509_STORE_CTX *ctx)
+         goto memerr;
+     /* Invalid or inconsistent extensions */
+     if (ret == X509_PCY_TREE_INVALID) {
+-        int i;
++        int i, cbcalled = 0;
+ 
+         /* Locate certificates with bad extensions and notify callback. */
+-        for (i = 1; i < sk_X509_num(ctx->chain); i++) {
++        for (i = 0; i < sk_X509_num(ctx->chain); i++) {
+             X509 *x = sk_X509_value(ctx->chain, i);
+ 
++            if ((x->ex_flags & EXFLAG_INVALID_POLICY) != 0)
++                cbcalled = 1;
+             CB_FAIL_IF((x->ex_flags & EXFLAG_INVALID_POLICY) != 0,
+                        ctx, x, i, X509_V_ERR_INVALID_POLICY_EXTENSION);
+         }
++        if (!cbcalled) {
++            /* Should not be able to get here */
++            ERR_raise(ERR_LIB_X509, ERR_R_INTERNAL_ERROR);
++            return 0;
++        }
++        /* The callback ignored the error so we return success */
+         return 1;
+     }
+     if (ret == X509_PCY_TREE_FAILURE) {
diff --git a/dev-libs/openssl/files/openssl-3.0.8-CVE-2023-0466.patch b/dev-libs/openssl/files/openssl-3.0.8-CVE-2023-0466.patch
new file mode 100644
index 000000000000..c71665d82e18
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-3.0.8-CVE-2023-0466.patch
@@ -0,0 +1,41 @@
+commit 51e8a84ce742db0f6c70510d0159dad8f7825908
+Author: Tomas Mraz <tomas@openssl.org>
+Date:   Tue Mar 21 16:15:47 2023 +0100
+
+    Fix documentation of X509_VERIFY_PARAM_add0_policy()
+    
+    The function was incorrectly documented as enabling policy checking.
+    
+    Fixes: CVE-2023-0466
+    
+    Reviewed-by: Matt Caswell <matt@openssl.org>
+    Reviewed-by: Paul Dale <pauli@openssl.org>
+    (Merged from https://github.com/openssl/openssl/pull/20563)
+
+diff --git a/doc/man3/X509_VERIFY_PARAM_set_flags.pod b/doc/man3/X509_VERIFY_PARAM_set_flags.pod
+index 75a1677022..43c1900bca 100644
+--- a/doc/man3/X509_VERIFY_PARAM_set_flags.pod
++++ b/doc/man3/X509_VERIFY_PARAM_set_flags.pod
+@@ -98,8 +98,9 @@ B<trust>.
+ X509_VERIFY_PARAM_set_time() sets the verification time in B<param> to
+ B<t>. Normally the current time is used.
+ 
+-X509_VERIFY_PARAM_add0_policy() enables policy checking (it is disabled
+-by default) and adds B<policy> to the acceptable policy set.
++X509_VERIFY_PARAM_add0_policy() adds B<policy> to the acceptable policy set.
++Contrary to preexisting documentation of this function it does not enable
++policy checking.
+ 
+ X509_VERIFY_PARAM_set1_policies() enables policy checking (it is disabled
+ by default) and sets the acceptable policy set to B<policies>. Any existing
+@@ -400,6 +401,10 @@ The X509_VERIFY_PARAM_get_hostflags() function was added in OpenSSL 1.1.0i.
+ The X509_VERIFY_PARAM_get0_host(), X509_VERIFY_PARAM_get0_email(),
+ and X509_VERIFY_PARAM_get1_ip_asc() functions were added in OpenSSL 3.0.
+ 
++The function X509_VERIFY_PARAM_add0_policy() was historically documented as
++enabling policy checking however the implementation has never done this.
++The documentation was changed to align with the implementation.
++
+ =head1 COPYRIGHT
+ 
+ Copyright 2009-2023 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/dev-libs/openssl/files/openssl-3.1.0-CVE-2023-0465.patch b/dev-libs/openssl/files/openssl-3.1.0-CVE-2023-0465.patch
new file mode 100644
index 000000000000..a98f7cba13bd
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-3.1.0-CVE-2023-0465.patch
@@ -0,0 +1,46 @@
+commit facfb1ab745646e97a1920977ae4a9965ea61d5c
+Author: Matt Caswell <matt@openssl.org>
+Date:   Tue Mar 7 16:52:55 2023 +0000
+
+    Ensure that EXFLAG_INVALID_POLICY is checked even in leaf certs
+    
+    Even though we check the leaf cert to confirm it is valid, we
+    later ignored the invalid flag and did not notice that the leaf
+    cert was bad.
+    
+    Fixes: CVE-2023-0465
+    
+    Reviewed-by: Hugo Landau <hlandau@openssl.org>
+    Reviewed-by: Tomas Mraz <tomas@openssl.org>
+    (Merged from https://github.com/openssl/openssl/pull/20586)
+
+diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
+index 9384f1da9b..a0282c3ef1 100644
+--- a/crypto/x509/x509_vfy.c
++++ b/crypto/x509/x509_vfy.c
+@@ -1654,15 +1654,23 @@ static int check_policy(X509_STORE_CTX *ctx)
+         goto memerr;
+     /* Invalid or inconsistent extensions */
+     if (ret == X509_PCY_TREE_INVALID) {
+-        int i;
++        int i, cbcalled = 0;
+ 
+         /* Locate certificates with bad extensions and notify callback. */
+-        for (i = 1; i < sk_X509_num(ctx->chain); i++) {
++        for (i = 0; i < sk_X509_num(ctx->chain); i++) {
+             X509 *x = sk_X509_value(ctx->chain, i);
+ 
++            if ((x->ex_flags & EXFLAG_INVALID_POLICY) != 0)
++                cbcalled = 1;
+             CB_FAIL_IF((x->ex_flags & EXFLAG_INVALID_POLICY) != 0,
+                        ctx, x, i, X509_V_ERR_INVALID_POLICY_EXTENSION);
+         }
++        if (!cbcalled) {
++            /* Should not be able to get here */
++            ERR_raise(ERR_LIB_X509, ERR_R_INTERNAL_ERROR);
++            return 0;
++        }
++        /* The callback ignored the error so we return success */
+         return 1;
+     }
+     if (ret == X509_PCY_TREE_FAILURE) {
diff --git a/dev-libs/openssl/files/openssl-3.1.0-CVE-2023-0466.patch b/dev-libs/openssl/files/openssl-3.1.0-CVE-2023-0466.patch
new file mode 100644
index 000000000000..9a315f4c00fd
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-3.1.0-CVE-2023-0466.patch
@@ -0,0 +1,41 @@
+commit fc814a30fc4f0bc54fcea7d9a7462f5457aab061
+Author: Tomas Mraz <tomas@openssl.org>
+Date:   Tue Mar 21 16:15:47 2023 +0100
+
+    Fix documentation of X509_VERIFY_PARAM_add0_policy()
+    
+    The function was incorrectly documented as enabling policy checking.
+    
+    Fixes: CVE-2023-0466
+    
+    Reviewed-by: Paul Dale <pauli@openssl.org>
+    Reviewed-by: Matt Caswell <matt@openssl.org>
+    (Merged from https://github.com/openssl/openssl/pull/20562)
+
+diff --git a/doc/man3/X509_VERIFY_PARAM_set_flags.pod b/doc/man3/X509_VERIFY_PARAM_set_flags.pod
+index 20aea99b5b..fcbbfc4c30 100644
+--- a/doc/man3/X509_VERIFY_PARAM_set_flags.pod
++++ b/doc/man3/X509_VERIFY_PARAM_set_flags.pod
+@@ -98,8 +98,9 @@ B<trust>.
+ X509_VERIFY_PARAM_set_time() sets the verification time in B<param> to
+ B<t>. Normally the current time is used.
+ 
+-X509_VERIFY_PARAM_add0_policy() enables policy checking (it is disabled
+-by default) and adds B<policy> to the acceptable policy set.
++X509_VERIFY_PARAM_add0_policy() adds B<policy> to the acceptable policy set.
++Contrary to preexisting documentation of this function it does not enable
++policy checking.
+ 
+ X509_VERIFY_PARAM_set1_policies() enables policy checking (it is disabled
+ by default) and sets the acceptable policy set to B<policies>. Any existing
+@@ -400,6 +401,10 @@ The X509_VERIFY_PARAM_get_hostflags() function was added in OpenSSL 1.1.0i.
+ The X509_VERIFY_PARAM_get0_host(), X509_VERIFY_PARAM_get0_email(),
+ and X509_VERIFY_PARAM_get1_ip_asc() functions were added in OpenSSL 3.0.
+ 
++The function X509_VERIFY_PARAM_add0_policy() was historically documented as
++enabling policy checking however the implementation has never done this.
++The documentation was changed to align with the implementation.
++
+ =head1 COPYRIGHT
+ 
+ Copyright 2009-2023 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/dev-libs/openssl/openssl-1.1.1t-r3.ebuild b/dev-libs/openssl/openssl-1.1.1t-r3.ebuild
new file mode 100644
index 000000000000..1c29542e9287
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.1t-r3.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
+inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
+
+MY_P=${P/_/-}
+DESCRIPTION="Full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+if [[ ${PV} != *_pre* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		kernel_linux? ( sys-process/procps )
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 )"
+PDEPEND="app-misc/ca-certificates"
+
+# force upgrade to prevent broken login, bug #696950
+RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+PATCHES=(
+	# General patches which are suitable to always apply
+	# If they're Gentoo specific, add to USE=-vanilla logic in src_prepare!
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch # bug #671602
+	"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
+	"${FILESDIR}"/openssl-3.0.8-mips-cflags.patch
+	"${FILESDIR}"/openssl-1.1.1t-CVE-2023-0464.patch
+	"${FILESDIR}"/openssl-1.1.1t-CVE-2023-0465.patch
+	"${FILESDIR}"/openssl-1.1.1t-CVE-2023-0466.patch
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl doesn't work with userpriv!
+	if use test && use sctp; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_unpack() {
+	# Can delete this once test fix patch is dropped
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+	fi
+
+	default
+}
+
+src_prepare() {
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		PATCHES+=(
+			# Add patches which are Gentoo-specific customisations here
+		)
+	fi
+
+	default
+
+	if use test && use sctp && has network-sandbox ${FEATURES}; then
+		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
+		rm test/recipes/80-test_ssl_new.t || die
+	fi
+
+
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+
+	if use prefix && [[ ${CHOST} == *-solaris* ]] ; then
+		# use GNU ld full option, not to confuse it on Solaris
+		sed -i \
+			-e 's/-Wl,-M,/-Wl,--version-script=/' \
+			-e 's/-Wl,-h,/-Wl,--soname=/' \
+			Configurations/10-main.conf || die
+
+		# fix building on Solaris 10
+		# https://github.com/openssl/openssl/issues/6333
+		sed -i \
+			-e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \
+			Configurations/10-main.conf || die
+	fi
+
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+}
+
+src_configure() {
+	# Keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (bug #417795 again)
+	tc-is-clang && append-flags -Qunused-arguments
+
+	# We really, really need to build OpenSSL w/ strict aliasing disabled.
+	# It's filled with violations and it *will* result in miscompiled
+	# code. This has been in the ebuild for > 10 years but even in 2022,
+	# it's still relevant:
+	# - https://github.com/llvm/llvm-project/issues/55255
+	# - https://github.com/openssl/openssl/issues/18225
+	# - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057
+	# Don't remove the no strict aliasing bits below!
+	filter-flags -fstrict-aliasing
+	append-flags -fno-strict-aliasing
+
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# bug #197996
+	unset APPS
+	# bug #312551
+	unset SCRIPTS
+	# bug #311473
+	unset CROSS_COMPILE
+
+	tc-export AR CC CXX RANLIB RC
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths, bug #460790.
+	#local ec_nistp_64_gcc_128
+	#
+	# Disable it for now though (bug #469976)
+	# Do NOT re-enable without substantial discussion first!
+	#
+	#echo "__uint128_t i;" > "${T}"/128.c
+	#if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#	ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#fi
+
+	local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4")
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config=( perl "${S}/Configure" )
+	[[ -z ${sslout} ]] && config=( sh "${S}/config" -v )
+
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	local myeconfargs=(
+		${sslout}
+
+		$(use cpu_flags_x86_sse2 || echo "no-sse2")
+		enable-camellia
+		enable-ec
+		enable-ec2m
+		enable-sm2
+		enable-srp
+		$(use elibc_musl && echo "no-async")
+		${ec_nistp_64_gcc_128}
+		enable-idea
+		enable-mdc2
+		enable-rc5
+		$(use_ssl sslv3 ssl3)
+		$(use_ssl sslv3 ssl3-method)
+		$(use_ssl asm)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use test || echo "no-tests")
+		$(use_ssl tls-compression zlib)
+		$(use_ssl tls-heartbeat heartbeats)
+		$(use_ssl weak-ssl-ciphers)
+
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+
+		shared
+		threads
+	)
+
+	edo "${config[@]}" "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install_sw
+
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install_ssldirs
+		emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} MANSUFFIX=ssl install_docs
+	fi
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs. But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# Create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# bug #254521
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)"
+	openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-3.0.8-r3.ebuild b/dev-libs/openssl/openssl-3.0.8-r3.ebuild
new file mode 100644
index 000000000000..ad4ca4f3b019
--- /dev/null
+++ b/dev-libs/openssl/openssl-3.0.8-r3.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
+inherit edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig
+
+DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
+HOMEPAGE="https://www.openssl.org/"
+
+MY_P=${P/_/-}
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
+
+	inherit git-r3
+else
+	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0/3" # .so version of libssl/libcrypto
+IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		sys-process/procps
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 )"
+
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/openssl/configuration.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/openssl-3.0.8-mips-cflags.patch
+	"${FILESDIR}"/openssl-3.0.8-CVE-2023-0464.patch
+	"${FILESDIR}"/openssl-3.0.8-CVE-2023-0465.patch
+	"${FILESDIR}"/openssl-3.0.8-CVE-2023-0466.patch
+)
+
+pkg_setup() {
+	if use ktls ; then
+		if kernel_is -lt 4 18 ; then
+			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
+		else
+			CONFIG_CHECK="~TLS ~TLS_DEVICE"
+			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
+			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
+			use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER"
+
+			linux-info_pkg_setup
+		fi
+	fi
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl doesn't work with userpriv!
+	if use test && use sctp ; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_unpack() {
+	# Can delete this once test fix patch is dropped
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+	fi
+
+	default
+}
+
+src_prepare() {
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		PATCHES+=(
+			# Add patches which are Gentoo-specific customisations here
+		)
+	fi
+
+	default
+
+	if use test && use sctp && has network-sandbox ${FEATURES} ; then
+		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
+		rm test/recipes/80-test_ssl_new.t || die
+	fi
+}
+
+src_configure() {
+	# Keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (bug #417795 again)
+	tc-is-clang && append-flags -Qunused-arguments
+
+	# We really, really need to build OpenSSL w/ strict aliasing disabled.
+	# It's filled with violations and it *will* result in miscompiled
+	# code. This has been in the ebuild for > 10 years but even in 2022,
+	# it's still relevant:
+	# - https://github.com/llvm/llvm-project/issues/55255
+	# - https://github.com/openssl/openssl/issues/18225
+	# - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057
+	# Don't remove the no strict aliasing bits below!
+	filter-flags -fstrict-aliasing
+	append-flags -fno-strict-aliasing
+
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# bug #197996
+	unset APPS
+	# bug #312551
+	unset SCRIPTS
+	# bug #311473
+	unset CROSS_COMPILE
+
+	tc-export AR CC CXX RANLIB RC
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths, bug #460790.
+	#local ec_nistp_64_gcc_128
+	#
+	# Disable it for now though (bug #469976)
+	# Do NOT re-enable without substantial discussion first!
+	#
+	#echo "__uint128_t i;" > "${T}"/128.c
+	#if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#       ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#fi
+
+	local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4")
+	einfo "Using configuration: ${sslout:-(openssl knows best)}"
+
+	# https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features
+	local myeconfargs=(
+		${sslout}
+
+		$(use cpu_flags_x86_sse2 || echo "no-sse2")
+		enable-camellia
+		enable-ec
+		enable-ec2m
+		enable-sm2
+		enable-srp
+		$(use elibc_musl && echo "no-async")
+		enable-idea
+		enable-mdc2
+		enable-rc5
+		$(use fips && echo "enable-fips")
+		$(use_ssl asm)
+		$(use_ssl ktls)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use test || echo "no-tests")
+		$(use_ssl tls-compression zlib)
+		$(use_ssl weak-ssl-ciphers)
+
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+
+		shared
+		threads
+	)
+
+	edo perl "${S}/Configure" "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake build_sw
+
+	if multilib_is_native_abi; then
+		emake build_docs
+	fi
+}
+
+multilib_src_test() {
+	# VFP = show subtests verbosely and show failed tests verbosely
+	# Normal V=1 would show everything verbosely but this slows things down.
+	emake HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install_sw
+	if use fips; then
+		emake DESTDIR="${D}" install_fips
+		# Regen this in pkg_preinst, bug 900625
+		rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die
+	fi
+
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install_ssldirs
+		emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} install_docs
+	fi
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs. But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs ; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
+
+	# Create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# bug #254521
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_preinst() {
+	if use fips; then
+		# Regen fipsmodule.cnf, bug 900625
+		ebegin "Running openssl fipsinstall"
+		"${ED}/usr/bin/openssl" fipsinstall -quiet \
+			-out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \
+			-module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so"
+		eend $?
+	fi
+}
+
+pkg_postinst() {
+	ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)"
+	openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-3.1.0-r2.ebuild b/dev-libs/openssl/openssl-3.1.0-r2.ebuild
new file mode 100644
index 000000000000..b5a3fe7adebf
--- /dev/null
+++ b/dev-libs/openssl/openssl-3.1.0-r2.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
+inherit edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig
+
+DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
+HOMEPAGE="https://www.openssl.org/"
+
+MY_P=${P/_/-}
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
+
+	inherit git-r3
+else
+	SRC_URI="
+		mirror://openssl/source/${MY_P}.tar.gz
+		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )
+	"
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto
+IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	!<net-misc/openssh-9.2_p1-r3
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		sys-process/procps
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 )"
+
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/openssl/configuration.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/openssl-3.0.8-mips-cflags.patch
+	"${FILESDIR}"/openssl-3.1.0-CVE-2023-0464.patch
+	"${FILESDIR}"/openssl-3.1.0-CVE-2023-0465.patch
+	"${FILESDIR}"/openssl-3.1.0-CVE-2023-0466.patch
+)
+
+pkg_setup() {
+	if use ktls ; then
+		if kernel_is -lt 4 18 ; then
+			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
+		else
+			CONFIG_CHECK="~TLS ~TLS_DEVICE"
+			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
+			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
+			use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER"
+
+			linux-info_pkg_setup
+		fi
+	fi
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl doesn't work with userpriv!
+	if use test && use sctp ; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_unpack() {
+	# Can delete this once test fix patch is dropped
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+	fi
+
+	default
+}
+
+src_prepare() {
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		PATCHES+=(
+			# Add patches which are Gentoo-specific customisations here
+		)
+	fi
+
+	default
+
+	if use test && use sctp && has network-sandbox ${FEATURES} ; then
+		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
+		rm test/recipes/80-test_ssl_new.t || die
+	fi
+}
+
+src_configure() {
+	# Keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (bug #417795 again)
+	tc-is-clang && append-flags -Qunused-arguments
+
+	# We really, really need to build OpenSSL w/ strict aliasing disabled.
+	# It's filled with violations and it *will* result in miscompiled
+	# code. This has been in the ebuild for > 10 years but even in 2022,
+	# it's still relevant:
+	# - https://github.com/llvm/llvm-project/issues/55255
+	# - https://github.com/openssl/openssl/issues/18225
+	# - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057
+	# Don't remove the no strict aliasing bits below!
+	filter-flags -fstrict-aliasing
+	append-flags -fno-strict-aliasing
+
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# bug #197996
+	unset APPS
+	# bug #312551
+	unset SCRIPTS
+	# bug #311473
+	unset CROSS_COMPILE
+
+	tc-export AR CC CXX RANLIB RC
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths, bug #460790.
+	#local ec_nistp_64_gcc_128
+	#
+	# Disable it for now though (bug #469976)
+	# Do NOT re-enable without substantial discussion first!
+	#
+	#echo "__uint128_t i;" > "${T}"/128.c
+	#if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#       ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#fi
+
+	local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4")
+	einfo "Using configuration: ${sslout:-(openssl knows best)}"
+
+	# https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features
+	local myeconfargs=(
+		${sslout}
+
+		$(use cpu_flags_x86_sse2 || echo "no-sse2")
+		enable-camellia
+		enable-ec
+		enable-ec2m
+		enable-sm2
+		enable-srp
+		$(use elibc_musl && echo "no-async")
+		enable-idea
+		enable-mdc2
+		enable-rc5
+		$(use fips && echo "enable-fips")
+		$(use_ssl asm)
+		$(use_ssl ktls)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use test || echo "no-tests")
+		$(use_ssl tls-compression zlib)
+		$(use_ssl weak-ssl-ciphers)
+
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+
+		shared
+		threads
+	)
+
+	edo perl "${S}/Configure" "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake build_sw
+
+	if multilib_is_native_abi; then
+		emake build_docs
+	fi
+}
+
+multilib_src_test() {
+	# VFP = show subtests verbosely and show failed tests verbosely
+	# Normal V=1 would show everything verbosely but this slows things down.
+	emake HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install_sw
+	if use fips; then
+		emake DESTDIR="${D}" install_fips
+		# Regen this in pkg_preinst, bug 900625
+		rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die
+	fi
+
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install_ssldirs
+		emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} install_docs
+	fi
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs. But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs ; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
+
+	# Create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# bug #254521
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_preinst() {
+	if use fips; then
+		# Regen fipsmodule.cnf, bug 900625
+		ebegin "Running openssl fipsinstall"
+		"${ED}/usr/bin/openssl" fipsinstall -quiet \
+			-out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \
+			-module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so"
+		eend $?
+	fi
+}
+
+pkg_postinst() {
+	ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)"
+	openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
+	eend $?
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 7f79ce88f26a..d9428cb2c4f9 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index f0831e1847ae..095f4d63917a 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,11 +1,5 @@
-DIST aws-sam-translator-1.59.0.gh.tar.gz 1688806 BLAKE2B 66e63f5d008b120d95b2258552ba7ea531b6dc2d0090360c3777bcac167f95a0167cf200a8b29d798699e87a060befee71f7e8316ed395eded073960b4f1a18b SHA512 558b5dfe586c0badb7b5b5f35a6b841ffe94f2e6fb68acf7c492529abfe3756760fc5d8cdb16550ebbc47671fa12e09620b445d086f008d05f80606710ec67a9
-DIST serverless-application-model-1.60.1.gh.tar.gz 4600439 BLAKE2B fabd84e66da433410ff7d54a9db9ae6aed5dd67de16669450146adb5f86ef3b0b90a1c6165b935eb1aef0df0c116a687da6c43e75f332a8a5f3f93c79338f2e4 SHA512 75e3aca9248ce599837f87bdc633fc48e9f5980f878884aef7e3b1b41a2cbe1d982d9eb6b5bd41a2057fc53b9edc4ce6fd9e016750d0757f58feaeb08f02fe3a
-DIST serverless-application-model-1.61.0.gh.tar.gz 5166263 BLAKE2B 9f787dac4761974e4114e4d3477eaf050e92d722111fef65cad3ebda1f265420aa62fc068140e102a0963679f20485e3f53968da74ba804b70a131df9535dbe7 SHA512 0d12c1b0d83c2824177a68c544177e2d80ec2e670ab469069621553745850a88e5c6143f7f529e8227c576d72e37ba007ab06ad0302282266170e0c33096b626
 DIST serverless-application-model-1.62.0.gh.tar.gz 5177544 BLAKE2B ad0fdca32821e9b5dab86d03e65ad1a458493ecba0e75f6b2dc8b9978a6085ae5269496e231a2f09cd228e6bd2a66b3803953d2ca5aa7c265fa1019305aa1a9c SHA512 42f1d3ff352a02ab73f5a16cfeb800a80852986b09f71d9468b23c22b8dafff3a20e8ac92956020280884e4318bd80369b5b04ea6e9f0a28067dd792f1623747
 DIST serverless-application-model-1.63.0.gh.tar.gz 5213667 BLAKE2B b75315d1c28789e9f0b8aa4774292ff2531806c1d59a8c16ab683fee439d188025c9cc62c2de037f2d947ad3b7eaa8bb4fbe8a5507ef1a4f3619f758cdf2eadc SHA512 eb6dc0f545550f726b59a2ea1994f8dfcc8eaf7a1fbca6ab12bfbe891813b208d869e25c0b320411aa6476dcf8c86fb19db9e13ddf0419d90d3c3403bd57485c
-EBUILD aws-sam-translator-1.59.0.ebuild 1431 BLAKE2B 1b7660cbdd772eb805b1ac58121f9c29ca02cd71a0d009a609ed4a3547d0280d5ce6312a07d06a6f74bfce5e9e3c210ef6bdf254bf79efaa3ba4ae55a8f4d88c SHA512 bec6bfe53df77c7dcdfeada9c1ea3030bae5f096b2628022c9a4a34f499a382a1e750ea61926bc3670cf293b269468e5616a593ab2a4aefcd5918650eae7c740
-EBUILD aws-sam-translator-1.60.1.ebuild 1447 BLAKE2B a02b63bf23efed53753bb4e775305e1fa04382241257382c23d47b54eb2a37d887fb19eddb4407f93f1e6701845979620092d4cd4786cbb97a62512db391d42d SHA512 0360076a43b8f88e60b9deacfd3de8dc3bf35d10eeeab71d94ade2c7225aff1021aa9d97a1cdddf6e75ce19b08f77d47feb43ebb111807d81d0a86f5f2d2f41b
-EBUILD aws-sam-translator-1.61.0.ebuild 1546 BLAKE2B ad6e5889df4bcddb45b7c19b46a2d29b4e58be32c5e2e7642713309a6962b870af65dad07437b2b5167481b4cbde6638c235a1928b930a8a50c1943e33364ccb SHA512 5b80e19e8592c98a0121af922addf5c0904d21164d1411459a5a96cf2ce54c3b728f6a7eaeb3a3629f24eac9f805d34548f9aeddb8d552d8a185599b23f0e124
-EBUILD aws-sam-translator-1.62.0.ebuild 1546 BLAKE2B ad6e5889df4bcddb45b7c19b46a2d29b4e58be32c5e2e7642713309a6962b870af65dad07437b2b5167481b4cbde6638c235a1928b930a8a50c1943e33364ccb SHA512 5b80e19e8592c98a0121af922addf5c0904d21164d1411459a5a96cf2ce54c3b728f6a7eaeb3a3629f24eac9f805d34548f9aeddb8d552d8a185599b23f0e124
+EBUILD aws-sam-translator-1.62.0.ebuild 1544 BLAKE2B 9572110682a5bfaeee90d69c6026a0130cacda3efb2d2da2952d675f5764745fb8fa7e7b1e586b2b029f5d8b955d9934228210734b060af23abdde9b2e18c487 SHA512 48956aabc1cd71db9d3cddb180c37387c8e5e4e314411a41f3ad791bbe6b2435208c9e045dead45d6e10944271b7f9954e2d1ae9290a3078d1e35391c0f52512
 EBUILD aws-sam-translator-1.63.0.ebuild 1546 BLAKE2B ad6e5889df4bcddb45b7c19b46a2d29b4e58be32c5e2e7642713309a6962b870af65dad07437b2b5167481b4cbde6638c235a1928b930a8a50c1943e33364ccb SHA512 5b80e19e8592c98a0121af922addf5c0904d21164d1411459a5a96cf2ce54c3b728f6a7eaeb3a3629f24eac9f805d34548f9aeddb8d552d8a185599b23f0e124
 MISC metadata.xml 603 BLAKE2B 89556267393186cf69a585c58efeb6fa599bfb42ef221bea955ea807a28edee89036a2ee0d0ca81ae55d96702a01b171b837754dabf38047ecc2789157bb7116 SHA512 106b6d241eadf7807dadf03329073703f8b51e7443eddc4db8752878b6dd84cc4357689cd4b796b3a083192e9d98eacbe9e7b8af0273160c7b89846e78230a88
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.59.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.59.0.ebuild
deleted file mode 100644
index f65e4e172608..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.59.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="
-	https://github.com/aws/serverless-application-model/
-	https://pypi.org/project/aws-sam-translator/
-"
-SRC_URI="
-	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/serverless-application-model-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/boto3-2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
-	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# so much noise...
-	sed -i -e '/log_cli/d' pytest.ini || die
-
-	# deps are installed by ebuild, don't try to reinstall them via pip
-	truncate --size=0 requirements/*.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x AWS_DEFAULT_REGION=us-east-1
-	epytest -o addopts=
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.60.1.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.60.1.ebuild
deleted file mode 100644
index 2fa677eb180f..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.60.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-MY_P=serverless-application-model-${PV}
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="
-	https://github.com/aws/serverless-application-model/
-	https://pypi.org/project/aws-sam-translator/
-"
-SRC_URI="
-	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/boto3-2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
-	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# so much noise...
-	sed -i -e '/log_cli/d' pytest.ini || die
-
-	# deps are installed by ebuild, don't try to reinstall them via pip
-	truncate --size=0 requirements/*.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x AWS_DEFAULT_REGION=us-east-1
-	epytest -o addopts=
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.61.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.61.0.ebuild
deleted file mode 100644
index 5a83e871d7a8..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.61.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-MY_P=serverless-application-model-${PV}
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="
-	https://github.com/aws/serverless-application-model/
-	https://pypi.org/project/aws-sam-translator/
-"
-SRC_URI="
-	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/boto3-2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
-	<dev-python/pydantic-2[${PYTHON_USEDEP}]
-	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
-	<dev-python/typing-extensions-5[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.4[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# so much noise...
-	sed -i -e '/log_cli/d' pytest.ini || die
-
-	# deps are installed by ebuild, don't try to reinstall them via pip
-	truncate --size=0 requirements/*.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x AWS_DEFAULT_REGION=us-east-1
-	epytest -o addopts=
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.62.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.62.0.ebuild
index 5a83e871d7a8..9e1f18c5dab3 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.62.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.62.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/boto3-2[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 74e0d7df3856..4df746c578e1 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,17 +1,7 @@
-DIST cfn-lint-0.73.2.gh.tar.gz 3343513 BLAKE2B 48ec085ec1d4c6fcee57d44915b65760481cd753805de3817c63aa093480aef15c81583cfa5f61f62407002c0d82cb9f36f146afffcc6f30dc0043f4f6fa991b SHA512 f85909cefb0882d4b36c26542c9ec65af520797e25b849bdbeb2e7e18b4f1675f0ede1b7cb19c529d8d393345ed48d98cc67e7e5d752790c3d9829bd6d69c052
-DIST cfn-lint-0.74.0.gh.tar.gz 3633749 BLAKE2B 68ba32c66a6cc4ddf1260523679565e7074e159c1d63b8e408a40426e0c3e7ec60159075b8dc91bb40d2fbdb8fb5a5fd55c0f70d02c165900a64a0d032285492 SHA512 635621995b74068ec2be9fcda0b710ab975e8aea428317d254fd6e93b2602071b985a6d80c12321b8245c2569b84b6c7c46e4cacfd59f0d0e21926ad6782e2f0
-DIST cfn-lint-0.74.1.gh.tar.gz 3465800 BLAKE2B eb142f07f8a49fe52d7263ecbd359f6c31d89b8895ce97a816dfe2fd14fec4f82a8da708e0ed43734ae8c5184ba718da32dd517dae3068aac7ee8deeff230fbb SHA512 5b792919553292f40018d968bdb5049e07d95f7ee9e40dded439ed6ef3ab778b64d3b964d075e60c7b513f221e0e5b49fa0daa3a20135b765cdbfe3c495d2fc2
-DIST cfn-lint-0.74.2.gh.tar.gz 3455745 BLAKE2B 0ca6f9d6e13264180ae2948858acdc3deab0135bfa7ddd16711b49cf7cce651257c7ba26ae155bec091d69aecc33903bd4098f23207aec5d7d414b5b826c7ccf SHA512 9aa918232214f5f0e165bcf8b4e3e7c5aaad1703825befc5347000f7ad143630220fdf9369015d449be4abf593380510b405d04dfe27d6615602c4a725b06681
 DIST cfn-lint-0.74.3.gh.tar.gz 3456672 BLAKE2B 9cc68ddefda86ee26e900989e40c7ded067fecb35cf077d559ebcacd6838378028010630e340dd52f04750dcc12094fb800e8e48a4c9e0607645463d3ca55827 SHA512 aad2209fa16f717d20127b2cf47d9aba586b85ccd41caf3ad8a50a6894cc3402d929be4cf9f76530223a3d69d79d843ef0edf802e53984b5c34563cf766f8189
-DIST cfn-lint-0.75.0.gh.tar.gz 3457050 BLAKE2B 440b7e03cfc40bbea6a7a6f55c7bed854e73f4d2a7f7ff05e11dfa88d4824f17f488517cf735bc453076e1d77f13c110183dc44a39ebd539609d7aae2a2553af SHA512 9ee87ccaef5b39abdb14814eec3516ae94e532df53de3d3930540ec9ec474e0291971fa7a4a40ca70fe4b1a943a32c12d867e23ce97c7aa0e585bfe49ec03055
 DIST cfn-lint-0.75.1.gh.tar.gz 3487870 BLAKE2B 26aaf3b24023260d7a7d8f2b89fc9135e0c34786540c21d1c1763decad42167f1a29b01859bfcb17fe5ac1fbbb08aebf04191c6d1b21b335c92e2424c986cada SHA512 d4dfa9331c77f7c323b217203c470e15b4a62a86b42497934a4f9609d54a499211058cba4c561034f6c3dd6ba52ade30084e9a9d25da135289f783ed972a14ae
 DIST cfn-lint-0.76.1.gh.tar.gz 3631194 BLAKE2B 95d395369fc230fe4e6c5d5e2a0e4bf246f1f312c6595e998004d43a7662e43ed0612a56893956fbb15e99ed197d9af2723fc1c2ea9b14fc27d8b4ff7b29e484 SHA512 5c65111fa7f57b268f2f3f52157d464de467cfdf16cd672e399ab7b2d23d648346c6754c45cd169f993ae15180ffafc710c9f2fa0675a7ecb1d8fc5b3d0ec5ce
-EBUILD cfn-lint-0.73.2.ebuild 1520 BLAKE2B 9b7d54274c25c75cc8bbf5aca09082480268ff4e7d38c03218114bb60ad22c171687621a384c7cad5b39ede4e5d08b68528bdc0fbb96693216d2e4e057e9aaf2 SHA512 c68e1715af5dd9a6593e27a18787b75bb2ba3b10a55699d534a9d62b14d1169aa255714aee731d8ffe7f14f01c06e3fa80557138f1c9a408bd25f1f5c7fa128f
-EBUILD cfn-lint-0.74.0.ebuild 1522 BLAKE2B 02db0ae567e725776e140495637c85e783550923d1176cd5b80b18ca1f047c299a9818f688f3b14b9ca6962b27a3d82078788b81d18e439017ba12e56894ac32 SHA512 46c65084c8bfcb823aa738406d1008a9acf4a07f28169febe41e0a8b618f2720c59a26cd7ae9bc6d6e648cbb2acf89ce21c5d961ee8ebb628840b55575c7b271
-EBUILD cfn-lint-0.74.1.ebuild 1522 BLAKE2B 9b527ac1f8d5c063dfa69b7b886e4def7b7b6ac1821a1a6f1e1c4803f923d3cad9ef899f01dbeae42d411837387d371b35c37f2d1c8a2d876dd5ce54b3033418 SHA512 420770562e8694d3b5ec7a82a35e36daf585493e9a58b731e682921dd519035dbbc1c807054690f341463972a8edcd07b5ebde5271b4abfb516129d74af71e35
-EBUILD cfn-lint-0.74.2.ebuild 1522 BLAKE2B 9b527ac1f8d5c063dfa69b7b886e4def7b7b6ac1821a1a6f1e1c4803f923d3cad9ef899f01dbeae42d411837387d371b35c37f2d1c8a2d876dd5ce54b3033418 SHA512 420770562e8694d3b5ec7a82a35e36daf585493e9a58b731e682921dd519035dbbc1c807054690f341463972a8edcd07b5ebde5271b4abfb516129d74af71e35
-EBUILD cfn-lint-0.74.3.ebuild 1625 BLAKE2B 22541f210143e50b731ad2234f300f8175a3626288cb0d8358e6d690d81a56eac4c34521c5ea0468e6fef9a95e4c0bbbba1d8792c1e8490c4b787413730088e7 SHA512 4a2d0db8bc62e0041ee27fc776e3a75e7839333ff3c58affd65128a45e615ba2037d8b819972d584f67afcd18a5b85f2c4ff8c46b32676b6db70c81f6cd347ef
-EBUILD cfn-lint-0.75.0.ebuild 1625 BLAKE2B 22541f210143e50b731ad2234f300f8175a3626288cb0d8358e6d690d81a56eac4c34521c5ea0468e6fef9a95e4c0bbbba1d8792c1e8490c4b787413730088e7 SHA512 4a2d0db8bc62e0041ee27fc776e3a75e7839333ff3c58affd65128a45e615ba2037d8b819972d584f67afcd18a5b85f2c4ff8c46b32676b6db70c81f6cd347ef
+EBUILD cfn-lint-0.74.3.ebuild 1623 BLAKE2B 07a514b96d3f3b0084e82698f7c50c57d7c592573c964aa5cad35681347b31035bac3ba580764b5538bf71b35622fd697e782162fb4796cb60afb69d8f3bf11f SHA512 5b8ae5749d2bcf6faa296cb046185888b6e42213341d990839a3de496b0cd3dce699a0a7fd318537b9405a5a6b7a2104ea7b40adfbdf1f4f63721a28e32a5988
 EBUILD cfn-lint-0.75.1.ebuild 1625 BLAKE2B 22541f210143e50b731ad2234f300f8175a3626288cb0d8358e6d690d81a56eac4c34521c5ea0468e6fef9a95e4c0bbbba1d8792c1e8490c4b787413730088e7 SHA512 4a2d0db8bc62e0041ee27fc776e3a75e7839333ff3c58affd65128a45e615ba2037d8b819972d584f67afcd18a5b85f2c4ff8c46b32676b6db70c81f6cd347ef
 EBUILD cfn-lint-0.76.1.ebuild 2157 BLAKE2B 57d16cabb2460f7161933f9ca3814baccad5e3c0ebedc0332e07574db35c4432a916415fba17e063da1d71f09436663450b0ab42d19eefcf16c7b24f940fe71f SHA512 511eecc772689a9e13a80070c96670ac0b45bc207ca90b228e8b0acd36c73cc9df7a33ff4714512f59e0221e36be9ba3099c1711402bc39eacd5e0a7415d7b92
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.73.2.ebuild b/dev-python/cfn-lint/cfn-lint-0.73.2.ebuild
deleted file mode 100644
index a8d6bacd111b..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.73.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.59.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	test/unit/module/test_template.py::TestTemplate::test_build_graph
-	# requires git repo
-	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	# Internet
-	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.74.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.74.0.ebuild
deleted file mode 100644
index 5d67809f6acd..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.74.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.59.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	test/unit/module/test_template.py::TestTemplate::test_build_graph
-	# requires git repo
-	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	# Internet
-	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.74.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.74.1.ebuild
deleted file mode 100644
index 926923d7f09f..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.74.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.60.1[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	test/unit/module/test_template.py::TestTemplate::test_build_graph
-	# requires git repo
-	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	# Internet
-	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.74.2.ebuild b/dev-python/cfn-lint/cfn-lint-0.74.2.ebuild
deleted file mode 100644
index 926923d7f09f..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.74.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.60.1[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	test/unit/module/test_template.py::TestTemplate::test_build_graph
-	# requires git repo
-	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	# Internet
-	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.74.3.ebuild b/dev-python/cfn-lint/cfn-lint-0.74.3.ebuild
index 8354055752aa..d861b6dcc3db 100644
--- a/dev-python/cfn-lint/cfn-lint-0.74.3.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.74.3.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.60.1[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-lint/cfn-lint-0.75.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.75.0.ebuild
deleted file mode 100644
index 8354055752aa..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.75.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-# pypi sdist is missing tests, as of 0.74.3
-# https://github.com/aws-cloudformation/cfn-lint/pull/2630
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.60.1[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	test/unit/module/test_template.py::TestTemplate::test_build_graph
-	# requires git repo
-	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	# Internet
-	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 1ac75222591e..7feca6fccdad 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/abstract/Manifest b/dev-ruby/abstract/Manifest
index 4bb61d2c75bd..d6303362fc63 100644
--- a/dev-ruby/abstract/Manifest
+++ b/dev-ruby/abstract/Manifest
@@ -1,4 +1,4 @@
 DIST abstract-1.0.0.gem 12288 BLAKE2B c61fe73f5a5b765296e4a61acfa14b39468878a442a1ce8689e846089da9a3d6c8f5425a791040865d5aadd435ac78de6f48f809f081ca0883c71f733e4cbe5c SHA512 7c6fffc012baf704a27470fecf44dc97e6ca9f5bf9db47c20f23e59376af1262c4618ad70a70faa446339a79f94bbce04c2f5a6c506bd010c60a0fa5f60f346c
 EBUILD abstract-1.0.0-r4.ebuild 658 BLAKE2B a0566404785323ab9ae9196e4d49ca4cb6f57d9e7810440e700d9c5c26b838dfd8f2caecd753b033fee23d310f26aa727dce76537ac9bc2596c341d16b945399 SHA512 5b73f22d6dacca61a161088cd49ac89faf16f2d9eae8bad4f926a365a9445fbeb3122a0b7dcbc59575ad7628024aba22fa65132265b3c1839837c8f7f43abee4
-EBUILD abstract-1.0.0-r5.ebuild 664 BLAKE2B a1c6570c9345c67ba502061de50b60c77ecd39e08399b3da8e26ff97b59e30eaf963e151136c04df1ffbefa9d02f2d58902213a108d4e8acce2ae8e314b96ad7 SHA512 b66239b83d518531da0eb09901c6d7003f519b6b4ec4ca806bed8a32d996ed425866b72e9010c4c4988b93f0bbdda6ee3d15b5f666e016ac2013afb9f11e977b
+EBUILD abstract-1.0.0-r5.ebuild 658 BLAKE2B e60d73d008e7a9799ff60afc6ad274cb3305188022a785b0e7022e36297cafd998f4ed860e6a42ed2e7188588b6882f5c76c26f78510f8e01a712e7c88255100 SHA512 fa934100c7b39245ab0d109bd581690ae673933a03b056a54a00a256128049c14bda8ea21f42e20db55beb7c962c1f27b0f1274d08cc73a21485e2e6ecffab32
 MISC metadata.xml 327 BLAKE2B 4e4c1da9174d2f1b69ac7de0df4b0a1d5fe2c87ea1b0b51d4286a3765c400a25d590ae1518103e1c014c6a660ab3813b435b32c8de149209777082a784f55812 SHA512 a9745b079df7aa8a9e171de738970d50edc6191661f3168a26c670e6d492e4ba4ceaf447967cc3262505b33233b48bce160bcb3c180f4d422266ee6e72ceada0
diff --git a/dev-ruby/abstract/abstract-1.0.0-r5.ebuild b/dev-ruby/abstract/abstract-1.0.0-r5.ebuild
index 55f461b68201..9fb6e992d104 100644
--- a/dev-ruby/abstract/abstract-1.0.0-r5.ebuild
+++ b/dev-ruby/abstract/abstract-1.0.0-r5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://rubygems.org/gems/abstract"
 
 LICENSE="Ruby-BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 each_ruby_test() {
diff --git a/dev-ruby/addressable/Manifest b/dev-ruby/addressable/Manifest
index 88c7739e8f3c..235c0ed82948 100644
--- a/dev-ruby/addressable/Manifest
+++ b/dev-ruby/addressable/Manifest
@@ -1,5 +1,5 @@
 DIST addressable-2.8.0.gem 105984 BLAKE2B 82f053c9ad052ce1ed1b6927674bd5bcda86a3f70d46b63bfc1185d51b402996fd446647d705418791c5443a1767b4ecd0b891f26de63fbe737c62f7586bd57c SHA512 c684f17940f717c2a65f9716ab9b3659948d6d51a60c38a7295fcf6fdc1c5785d2d315d2de7dab9f66a6c31f62247177d78d5d6eb556f5bb49926d4f00f8e4c8
 DIST addressable-2.8.1.gem 105984 BLAKE2B 9ba6fffe2af965be57ef7b2f86c5c86c672e0037c41996d78a3b8f31a9b5a5818e06d7e119733cff3d5469bc985186fac6fa978740f107876a975b5ac662171f SHA512 ae0b7cb5fdc0b5b8717637e9589ab9167aa3924253f4c9102134b1e5aee07c7f5e3e92e2e32ca872b4a72a3a70c8086c7073cbbddf7cbb6e1948ed97de2c9108
 EBUILD addressable-2.8.0.ebuild 1292 BLAKE2B 5d10917b745b2881d6cc8777781cace7bb5c0a9953245ffd9700401b47c77e226e9af10437216d01237a4e7dd4d56d93b21cb7bef92445237445b66b7675b4ce SHA512 f4159e1500a82373eac97b5a69b3ccaca9b6090a10a3f78411843bc63b22dcd09db6dc2c12a906720d99bf9bdf7b556835255cbcce0c294149dd741a0889cbfe
-EBUILD addressable-2.8.1.ebuild 1330 BLAKE2B 4c61a89c14ec3ba295b90d79cba85c94dbc7ac52f5df57460a8a95f4d4304113865f4552a4ffbe6e51f2536dc5b43a28b56777b38f8ab849cc6f27a7e9bb884f SHA512 bc829e6b4428c9dd64acbca0eafb096b33d74ca1d38f84104d9e6e0054e8307a8caa0b410a6192250b983e6899392d395b21916995d673d29ecc5dade1e6f7ed
+EBUILD addressable-2.8.1.ebuild 1324 BLAKE2B d767cf2fee7f7cd63ed69e7c81f20338858f8e98417687a6b9a26a988a3974b4a0a34c7dad1a1b696bfc5391dc0665ad6eca8cfbb5afc8ca3aa5f617be034413 SHA512 33fd7097dcfcb39269469e91525665c1fa2ec73d00e0c0f004d95a507713c2401ae394e3d9bad4ebaa25a1dee777a6ec18237889a627e110f0bbbfc26cf99363
 MISC metadata.xml 405 BLAKE2B bcbba1d9880e5abe377fe1e7fb1e1c732f1fd00bc32fcc48f69e5529749900d89dbe0e69de4477d4e0984d780b02164d812407951cb2bc3f9cf052e9ad5d0217 SHA512 2f270c88c5a807840b8165ab65bd6de51a878d218ab71ff0f7de18f60be298b6d048dacb8601605c0b1960852ba9b841de742e3bc64d74b96fb88d8338ca33fb
diff --git a/dev-ruby/addressable/addressable-2.8.1.ebuild b/dev-ruby/addressable/addressable-2.8.1.ebuild
index f81a5ff2c1a3..37381417781f 100644
--- a/dev-ruby/addressable/addressable-2.8.1.ebuild
+++ b/dev-ruby/addressable/addressable-2.8.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/a
 LICENSE="Apache-2.0"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "|| ( dev-ruby/public_suffix:5 dev-ruby/public_suffix:4 )"
diff --git a/dev-ruby/asciidoctor/Manifest b/dev-ruby/asciidoctor/Manifest
index 3b81a2ddbaf9..cf60befdb07f 100644
--- a/dev-ruby/asciidoctor/Manifest
+++ b/dev-ruby/asciidoctor/Manifest
@@ -1,5 +1,5 @@
 DIST asciidoctor-2.0.16.tar.gz 1651396 BLAKE2B 6da2971c38e48497b482ca1bc22916a10c3505d7bd4fa802ffd4939a0c0986d650a30b5870fea7979046c4b61c6e97aec08d9ba345ce350de6721d545c2923b5 SHA512 95003640632cc99f1edd2447156135267ad78f24983418817f19256fab6e313b8faab9f676317e7cc610728abb8b047f2d2f481f4700009a2d6bdd3b9efcc463
 DIST asciidoctor-2.0.18.tar.gz 1690964 BLAKE2B 5e14371c7201f83529fa28a63b031599ebf53fda62b4701942f134e7f1dae923a07676aafeac4c5e1fc3c25b6e9044b34b9b2e5b07491f1ca8e68076aa02301b SHA512 b47b377520046d95101fc9bcd3defdf7219714ebadc0d069cb108d39a349fcf1abd1e61178e1515f75bb69e9e3d0f8cb2de67de5a0f8aa75fdd139d693c0e437
 EBUILD asciidoctor-2.0.16.ebuild 1093 BLAKE2B fff21e41970fc829c63d8ee52384db33713724132957762ae88b8e398d9370c18c5eb2eeddc9c13daa067befcc60a6f6718d9d7bdffd13c8b9ec3d8e99a836a3 SHA512 aae9d8041caaf36ab23c6a3c72f1f7408a6bbb56ca8e01a94c5f855a9748f06f648835d2c6ab54c421cd4c1417fa7e11430683da7ab4ba78371aeef1567c004c
-EBUILD asciidoctor-2.0.18.ebuild 1203 BLAKE2B e6d3ebd49cc98bc3b928f658c01498dd8d1ac617e4e9e64c7e0c51089d82a2764b8239b1d2fe7b60c7a934b2ae8d045794c5a389fa7e6f567b29f9c79a05e2cf SHA512 99553bca0e831328ac8608d8727a6aa92497020be65cc5fc425c7188f6dba51d70cbdf0eb7e9d40165fcd8dcefebaa6fbf830571d6b6a5ff3c5fb90a749e7583
+EBUILD asciidoctor-2.0.18.ebuild 1197 BLAKE2B c437f1b0f511902587d6b2a63ee4d70c0346589e68cb6f4fa4fbb1bc2cdfe5cd76059dcdec0e4546cd2e9032c9da97b529814642d239cc121b283c406550e27d SHA512 44238308ea5c18018d5909a6cd83def48d4a710e553373dd4b6f6b4f5ae229a10eb9888e4ccfb975393db718553b030808031149b8f5aa3f3857b45f7d53325b
 MISC metadata.xml 350 BLAKE2B c70c7bdd08d3c12de9192349bb765e3f0a03e5124128b77d4e4cbd266ddc84d72aa4502751bbaaef2562c4d8b78a4ecc28bdf656ecb56c74168999c92dd294b1 SHA512 beaf7f42c6804df34ce8d1ec28e08bdb5dff9ed9ed023247a464e7531ab8fcc41563133cc2bdb6385d5527a78f5e4a6f11063b72c567a015b8517ea09cf5ca17
diff --git a/dev-ruby/asciidoctor/asciidoctor-2.0.18.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.18.ebuild
index 2b122dc2ee85..459e77a3e9a5 100644
--- a/dev-ruby/asciidoctor/asciidoctor-2.0.18.ebuild
+++ b/dev-ruby/asciidoctor/asciidoctor-2.0.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/asciimath/Manifest b/dev-ruby/asciimath/Manifest
index 0934fbc061a1..e2eed99031b5 100644
--- a/dev-ruby/asciimath/Manifest
+++ b/dev-ruby/asciimath/Manifest
@@ -3,5 +3,5 @@ DIST asciimath-2.0.3.gem 59392 BLAKE2B 7d1d373c5d80172e88ba5737ea2244c384f274c20
 DIST asciimath-2.0.4.gem 60416 BLAKE2B 9a5d6bf967962d37e620d0b49204ba8dafadf65e95a613924c7c169fee98f00203861fbbb1c06db1ee833e401f9a2141566dc693237e1cb7e797e639c63dccfa SHA512 28ab7fd7f43320112c0e7166fb2a6ef269eb91314940deb88606443bec055792cf3c49bc2d9b75c1e5ee5690c3071e66f15f817c4539fc6246da7a8d792f1803
 EBUILD asciimath-1.0.9.ebuild 449 BLAKE2B 48ac5e3d9b3d9b81b5adbf9a639d9641ef34bdffcd6938470a2f6f9b4e4d66c36e6ea7db28d611499e6103b621a779d59575ba1e431048b50a380e7cacf259f0 SHA512 57438599e82c51c2150f24022e4d90b00450a2c9649fa92f23f919ecbadcd2e69cf7c8637246b6b7891ab33bec7809d53286b437ba9d9d74111f8bc4c94d5813
 EBUILD asciimath-2.0.3.ebuild 517 BLAKE2B 3c21de7e43e386a56d7f5932cfa67f3950a7f006dbf29854eddf35b708bef8dd4929de100d843519195a175616bec3de82cabf734f0ff9684dd9c2f957ca08ff SHA512 ba5d0a80f7084ca356ca0cf6689e320ceaca995a63b31c52512de1b5a5cc9acdfeac232c86f4947ac8bec918e58c8f03883618197cc855296a0f53ba78908870
-EBUILD asciimath-2.0.4.ebuild 524 BLAKE2B 929d5aa9b19c26b7adee7592306f03e865fdb4885232bdf2f491da1ad120f6e5768237917eadbc16c940e4421541f9f3cdeb67aea3b6a40783c8830e0e1f8e25 SHA512 ed125688a7531c6e7df89968d8a84e9d817c3023c72d913d0597331220cf64a5ed683e3659078a071c9741eaed4189b07980104c7308f3218192d0cb1eb044b0
+EBUILD asciimath-2.0.4.ebuild 518 BLAKE2B 884ba7026c8503c88e95ac38e331c1d851eb61745d16c31a49e1c70c98c0cd0af3de88d14f801b13e2ca7d00dab94d2b699ad8c6049cb4f89573dbf007440bb3 SHA512 c07d2b2c3a2812b23d8b985ad1bccfaf4d19bbd370013a0c7ede78ae84546b32a3721d81764419ce6939edbc93b360f3ce821abe8790cbd05bbfa871f75693ab
 MISC metadata.xml 345 BLAKE2B ef3c44119073cf7d78c3d16ffbe42f3e1e9868efe1c0c5cba6e2fc83f57b3347db85e8357d8011eeea76fe9c90dfe5870dfea389183567a1c5728c047b168ae7 SHA512 8e1dfce281e0a933b8813407546a8d49ef4d529a5090f59d04ae289f4980d9e4ea8c2e3be4088c6b8a3219af88342e820e2a1bbac5fbd5552089ce71e3c5d766
diff --git a/dev-ruby/asciimath/asciimath-2.0.4.ebuild b/dev-ruby/asciimath/asciimath-2.0.4.ebuild
index 420dc8983a5e..5bef48f31f09 100644
--- a/dev-ruby/asciimath/asciimath-2.0.4.ebuild
+++ b/dev-ruby/asciimath/asciimath-2.0.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/pepijnve/asciimath"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/nokogiri )"
diff --git a/dev-ruby/backports/Manifest b/dev-ruby/backports/Manifest
index 359453bcc89f..cf978e700286 100644
--- a/dev-ruby/backports/Manifest
+++ b/dev-ruby/backports/Manifest
@@ -3,5 +3,5 @@ DIST backports-3.21.0.tar.gz 178706 BLAKE2B b895655fbbd15e99021f3d9d4f5efe84957c
 DIST backports-3.23.0.tar.gz 181501 BLAKE2B ef9841366b27b19837e61177f727cbd0acd58650cebab03329c174d699147fadfe51b4ac404d11332e681285c5f0ddcf387bdf6304237ff32c77048a1f5670b6 SHA512 b5b16b78c4dfbadbd60735b29541268cc6446f283ad686add208974fb861b270ffc46ec3cb6702c2ecf760e0de83d31025dbeba90e79383ffda6b4ca0b52a06c
 EBUILD backports-3.20.2-r1.ebuild 792 BLAKE2B ae1508b983697efd7b4e7291a4700cb49c94bb02a43c574568283b09e73b7d592941fd05cb6f93cd879d52c3e0e7e572cad936f918a0a9e00f31f97ae34bd678 SHA512 85e46a36b524194839f3c4250382993c0fc69653ac8339666bd196ed0c48a544df369b7d3a3c885682ad70f676ee2296ac7d27007c971f8beaef1b9bb96afd1d
 EBUILD backports-3.21.0.ebuild 792 BLAKE2B 0c9e5d2b2f54c1e5c7965bd4267e4ee1e13a459753f047ced428342fe299910350ed0c75552db811a12129bead6f1478bb5a8c1f16b7d82735610c24368850ad SHA512 d147eddd18ee7abc4b630bc298141bbea1fd38e24bb2ad1b12228e943d79fba7d70296999ce2236a7d2485b2715c028e43110a8808e1486e3532bfd56fc896d6
-EBUILD backports-3.23.0.ebuild 799 BLAKE2B 8655ea61ab77d4a07f40c3ad34b705768d66f9babb61c025d8f87e3a6d277bc9aef388b60295ece8eeb6e5a4982ba04a1bd45b699f4c4f30f2100bbb6cf4fbb9 SHA512 75cffd19bcdd2b74a93f296a7bbf6ccbfabe008d98108c4d566be178f4b793b06aee9d9d2a2dd04b51a02d704e9f9227b3e79c0781d51588e664e6f21399778c
+EBUILD backports-3.23.0.ebuild 792 BLAKE2B 28c883f7289b3fd8de077287d5340a3a32b4c5cbb5c3b619695198f1795b49db45981836c15fa9a2defa134c6dcc38c880d4d6b71d9655b775154a5b4871c2a9 SHA512 96a072fdd8b5f29baa5ba46967c39d8501cab6770a2ac6fe4d26686cb8a87a09483b4a374b3fa3b696489cfeaa9a99bebbfc2876c3e1ca956cd1a73e0b4c8e9b
 MISC metadata.xml 336 BLAKE2B fb9482efc94ceedae0a44003dfe8a539ed8f728b93cd5e924f5e44778049598f14874908e3ccf0b393809fe35eab9027533ddb0407c16a767012c6f04962d8ac SHA512 848ee492c5952bbc00d5cce3f17f5d68e56ee0235c23f0eec19cf0a85cf097e20484ce6ac209d4fed6fb0dcd5323b45bdc662cb9ed6fd9a9bf50321724df3c5f
diff --git a/dev-ruby/backports/backports-3.23.0.ebuild b/dev-ruby/backports/backports-3.23.0.ebuild
index 555ca131979d..4553a218312a 100644
--- a/dev-ruby/backports/backports-3.23.0.ebuild
+++ b/dev-ruby/backports/backports-3.23.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/marcandre/backports/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/bacon/Manifest b/dev-ruby/bacon/Manifest
index be892fb821af..8d403431a877 100644
--- a/dev-ruby/bacon/Manifest
+++ b/dev-ruby/bacon/Manifest
@@ -1,4 +1,4 @@
 DIST bacon-1.2.0.gem 18432 BLAKE2B 7b5870a4cb2b4340eb16dfde4649049def3f19e9a3202a6040c26fe0b3ad82b04e14d47380f9d08d1a8640e38244e7ca89f897a12b382cbb2cf368e414d5af41 SHA512 ce7a9171be67b872c8a95dbf93a45fd79574796c694769e9c87a35257e85eff98187c8ee76429124ab475e90fc619eebd30e672f3dcd4f8280e139ecc469f907
 EBUILD bacon-1.2.0-r3.ebuild 600 BLAKE2B 612029156eed1c637264fd5332d66ea0999dd9f47a02dfd6c1375759a3f9dcdcfb5038ead4348ca694f0f2c9406623d578e4a8ada801ccab7c8b3162abff32ab SHA512 3fab20cc4555e539e5671061436bda9ae7f1e59b3992f2af418f10511d2e2b1d9ab4ef3c03ee845fe572a3742123a802d37df597fc177ea9db984efd51231e58
-EBUILD bacon-1.2.0-r4.ebuild 611 BLAKE2B 428709bbb82148e6adfcc55e1736394fe84c9ede2a0076bc9fcbbcf55a531011b1239a63ba1528b63116d454a6029ca273aefaef6e50660ba3eea03442490b59 SHA512 cecbf5d0ee97f5961b8691419ff20b3c0d4067e646afab5b79169ee3a513b945883cef57c619bcc222323a0d9dc40007cc72152ed97a0f23ffe09e3136cd2db1
+EBUILD bacon-1.2.0-r4.ebuild 604 BLAKE2B 8b227aaf1363be51004e11ee909089feca260178ea8c57ed5d4651d2ea3946dc9ed345226c8526e41f558940fd5f161f5ff4edcd5094c1acc65e84d7b1682ec0 SHA512 6dc25898afb804d9382cf96c1de02759148f19797461ebd879bc3f92b7ab784ae09b3908a4276290710c697c4009c404becb9f07cec33a13e025f39a0b2320b2
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/bacon/bacon-1.2.0-r4.ebuild b/dev-ruby/bacon/bacon-1.2.0-r4.ebuild
index 77c78d49d2fe..88a487979236 100644
--- a/dev-ruby/bacon/bacon-1.2.0-r4.ebuild
+++ b/dev-ruby/bacon/bacon-1.2.0-r4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://leahneukirchen.org/repos/bacon/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/bcrypt-ruby/Manifest b/dev-ruby/bcrypt-ruby/Manifest
index e08ddfe04708..65ff1ac09ed1 100644
--- a/dev-ruby/bcrypt-ruby/Manifest
+++ b/dev-ruby/bcrypt-ruby/Manifest
@@ -1,5 +1,5 @@
 DIST bcrypt-3.1.17.gem 55808 BLAKE2B e2e3d6ebeaf3d52fa69eb2da340c9558c09f526cc29a1230e2f439f32952a916ba6c2336a134ed0a2ca5210dbb8d2f0818c9ec56283e20f25cb9f891b07bdc60 SHA512 527103e758387031cd6153f5806eb161642547e89dda359929d88b0cc676175e4b3c63905fc8ed724914d2f8b152ecc7f6e7cf5d0c66b7c6fbf7b899bade16a7
 DIST bcrypt-3.1.18.gem 55808 BLAKE2B 03e4082f451b8410ae88c1d920625cf3249094ba2d6fc04429d5f9cd60d7e29fa1c3170e2409ba16fa8fd8c341c7471047a382ee89cb2b04dab9bbdaadc3554a SHA512 b0b44f49ac2ef7a6a75a8949943291b7d37fc80be6a4dbbbcbbf117feaa4ff09b0670c14879c358fc2dadd22866cad6e26d07cfdcbb9423d0c52a6f54ae3f8f5
 EBUILD bcrypt-ruby-3.1.17.ebuild 1532 BLAKE2B 0d1966f1d0090b0394464d8ef6fc6fee82effba8cf5607d17b6a9e2a84bfab046d862435d22c126c626503940dcbabff53c1765ca4905dd1501932cb16a7f0b9 SHA512 2dbced71f103acde4b6661a62d19a62ab72fc743d9975355d9d31c4fdaf1a00e49bf86e7e1e3008d6a108d71196eb5e4beb89b637234bf4ea4dbf8ed73a23a66
-EBUILD bcrypt-ruby-3.1.18.ebuild 1524 BLAKE2B c36636590e3bc6546b3ea9f3149fe0d729425c9c83ccd012e1f42498203604391a37b0abc058ad5219b8c82b367439dfde38bee2d555dbe595e4b7c50a6f7caf SHA512 6c2cfed5369a6bfbdab35092da174ef81cee8efebb0dff20324c415d116c500099571476876e067e70ea2e08ab86a48d8bc05df31c83a5010bf6a97b3aa3e8f8
+EBUILD bcrypt-ruby-3.1.18.ebuild 1523 BLAKE2B 446bae95696529e406b940d7386fcbadf89c5bec9fbf8a0ee8d17302b2c11101573767c08cc3f37c686e7996368fcd9236bb2aba3ac210a146ef04ba683bad07 SHA512 16aa0c61387d6c493cf890111ab8d325a9ed4686cd3686e10200f24df2d99b68b4609ebbf6ea0431fab7ad7ba7520047ca2c606fd156389126fb8991225fefa0
 MISC metadata.xml 347 BLAKE2B 5430c9a624d1e922507758954755b4b7e29ffc5c9bec8a78bb9a726b17fb50e492fbf7476964cba269b80d1c6d34ab4ad9d482115825b6c18a25d61fa6dead89 SHA512 901e5c0b9da6c30ae04a0976010dff1faef88fb07d190ecea9eee06abaa1204280176b94dca90e0b5bc5af6423bb72a0657d8460eacd22b8aaf48fbf30b9f2c8
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.18.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.18.ebuild
index f12cf5ad4e33..c7938cd7693d 100644
--- a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.18.ebuild
+++ b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ DESCRIPTION="An easy way to keep your users' passwords secure"
 HOMEPAGE="https://github.com/codahale/bcrypt-ruby"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 2a74da3d5140..7fd15f62bea5 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,5 +1,5 @@
 DIST capybara-3.36.0.gem 374272 BLAKE2B 51579941b95ab317fa0f7d9a21d3ad40a130a60c457f9a5d9921dac5b17bb339a423a21aa16d350da57602b22b0001c6ed2b1b5b038bb16cf56d268bd5a38ead SHA512 7ffc9d3e4058b08acd1cb223eb0313112354783cc4464f8f0747561caa45425f8623be7052f331677a66a7b9f5e645e48ae0118fe78c2d185408e5279e66f169
 DIST capybara-3.38.0.gem 379392 BLAKE2B e1ba89daa08e43e5f97ed5c649a3ea82c27e2ee7a737844f83ba68f0379cc4ef2a0349bc2ae9af76a5cca3659c11f1ed0d1b7dcae7f7701305ca3644e40a4dee SHA512 530db1102e8bc1bfa1ac55d28a725a26a7c6c98baf89655bb15436217e99c7131edb204638f51831c416e4898b9e7c653b83c74abf8aa644eb4da0ad8cddd44c
 EBUILD capybara-3.36.0.ebuild 1805 BLAKE2B fad68642ab6aca312d62af4aa40d9ce9082de991509c55d5c8c361991a939fcd25d758184e61bc4474341773fed05c4c12eb5ba23d2e4b8c39b36dae01ea88bd SHA512 3a9787309e6c5ef812062edf417d5bcbf3e1558d37e1ea49dc20f742e4fe052aa507c73e1b0a3c20a04d38111aae95f0e3b455b109e819ab3c0fbd93a87fbfcf
-EBUILD capybara-3.38.0.ebuild 1832 BLAKE2B abcba9a2974c611c678e912458a1cea32c46c418333d5ebac294f96cbe438260b301b98f838bb4833df2bd8de911a3054d764bda62ce086fbfbc55b6ee5725ea SHA512 1de9d2782cb82563c221f3d762504615fd0eeb5ddf1e2ee878ca904f547202d946fb4570c54acec67c3eb3c777026829841d73d58d2a319f5a772ff7a7c81b31
+EBUILD capybara-3.38.0.ebuild 1831 BLAKE2B 5d6340331a0bfaccce476f8b1a1fc060a0de11d3cbd4601f37326d5d698dc3722cbb8bdd8dd15b63af51d61c9abaed7268743338760f21d009600c94f541c1eb SHA512 c3eef527dcf786987fb191c0a17ddac3c98306f561c1ded71e9e078105f861a2eabfea9aa7324991f5b92b4324269b6115af7db2ee8c9aebecedc399d6e5fbe5
 MISC metadata.xml 344 BLAKE2B cc8fd629cca0ed4f66836cefd43f13a45baa7bb13d157fa7f90c61cdd4a12d71ef773ef9daa8dc6e5b07dcadd1b52a258995136a0792ec1870eb93fbb90cd61d SHA512 dae769c0ee80ebfdbd8b86b471fc13c3ac656bf556e554d3d5ce80108f6f6ab79dfe7a54f51b78af3d29f22807fa5ac5be48bfcf8655c60309bef7e3f80cea5d
diff --git a/dev-ruby/capybara/capybara-3.38.0.ebuild b/dev-ruby/capybara/capybara-3.38.0.ebuild
index 12fa15e581ae..dce37b75f3b3 100644
--- a/dev-ruby/capybara/capybara-3.38.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.38.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/certificate_authority/Manifest b/dev-ruby/certificate_authority/Manifest
index 3ee654cc12c4..bfd44fdbe2cd 100644
--- a/dev-ruby/certificate_authority/Manifest
+++ b/dev-ruby/certificate_authority/Manifest
@@ -1,5 +1,5 @@
 DIST certificate_authority-1.0.0.tar.gz 57104 BLAKE2B e585b19b6740349e520e021d4981c3941bca9e6c9b11867c9484e98b4e74e4ebafb47c648564c3e8b89e3591414a90ee404bab83cafd5a3354354b36b3002436 SHA512 e5f05d3df86ae7e7e6ed8937667b14229cda884996c30d9a39f1ad7db781e58abb3f61c251c21174b4988adf0ecdecb1b0f22ed97ddae071ba12c78379524785
 DIST certificate_authority-1.1.0.tar.gz 57457 BLAKE2B 6714359fd869cce2a0b43aa6321e95229dead04ed761f6239ecb7b988548aabf13c62a3c61e20d539a6003395886e5e4ff2366fabaa395bfd4b4761c55d56555 SHA512 52c79acaaacf471206912165d2b07464158b61acd8b65ad73614900baa208694f9d29107cc0e275d09baa580ecfbc95458ac7772370b423762d4e80ddf0237ca
 EBUILD certificate_authority-1.0.0.ebuild 987 BLAKE2B 7edc468007f93baf79c286438cd139c287e7819677860d2c3caf1272a25e39f6aef7eef76970cad95a6bd31ceab255a2b936e2cc3aa7fdd607f1140cae022bc0 SHA512 803f9a868d3c9eaf42ca80a13201669574b69cac707be83b741fae98c63f9a642e48245602cac64b42f51d0bebdda417c8de47871b1aa9a4af01d1b9437e70bc
-EBUILD certificate_authority-1.1.0.ebuild 988 BLAKE2B 55f19e34c31464e7f0883a931a98d5e93990782c2622714febe56e6eb506e90ec44aefded7dbf92b90feaa2853daac0dd5c7564ace944d791ff2632b93371a5e SHA512 2274f2f3f1a9ea807ffa1587bd636a1feca79b6717ddbc1dbb1af3833c0fb53271046b4a5a7c2bc912f845f00456aed940281ea15b7a02f2c8c777624baeb363
+EBUILD certificate_authority-1.1.0.ebuild 987 BLAKE2B b09218eae0046814c914f625984c1c41b91f4f4504eb1544de299f78fdbe2a3771075b47a1e8c9f26872ce947cf30678bc74909001f49ace7afa9974fe1a34c2 SHA512 59bd09cf31a5d2f7a702eae41334730141b6ce2631a62c6de6512348ffa7f0362a9c06f01f3ff13479b90685d9f51f5b1778b1272ac0d6ee59314203d390bf8f
 MISC metadata.xml 358 BLAKE2B 9481f4365e35e21c255c572608085070dacffd97b9a66ca3a530096792cac609d9e357bd69e44a094d16edfe1c772835cef2f9d28d0dc9430b28c3eec6870d54 SHA512 00880faf802e45165b1d4e4eac5ecfe197a02bbc15a797eff0f008bf5a88389283702814a1a65677152a529c3b6353d0845f45b3fa0a72ef6cfc08bf12331dc2
diff --git a/dev-ruby/certificate_authority/certificate_authority-1.1.0.ebuild b/dev-ruby/certificate_authority/certificate_authority-1.1.0.ebuild
index 64770fbd1db8..e81eeba2b82e 100644
--- a/dev-ruby/certificate_authority/certificate_authority-1.1.0.ebuild
+++ b/dev-ruby/certificate_authority/certificate_authority-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/cchandler/certificate_authority/archive/v${PV}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/concurrent-ruby/Manifest b/dev-ruby/concurrent-ruby/Manifest
index 9c35b045526b..4415153c8495 100644
--- a/dev-ruby/concurrent-ruby/Manifest
+++ b/dev-ruby/concurrent-ruby/Manifest
@@ -4,6 +4,6 @@ DIST concurrent-ruby-1.2.0.tar.gz 1160662 BLAKE2B e05df20596930d46781d718ebcd90c
 DIST concurrent-ruby-1.2.2.tar.gz 1161215 BLAKE2B 42f42022e469a1131d40e96a04dacb0ac49d94e96b6a8c58348d34402319ea0abff53b8b1312a274a34c332301ca17a007b685d8d9fe8c229350177abac0a285 SHA512 e2b26de147468b09403cd1727750922526ba240ad0cfe7889b722b357a3c71e709b12958cc4dad1a0d2d2c10d4dd2c67be1fe23053b98c35c7a50722fecb24b0
 EBUILD concurrent-ruby-1.1.10.ebuild 1396 BLAKE2B 15974663f6284c0f4e430be9b3e87cfdc9b77b8edf8a0f1a4e163a774ad2f343f8a8b2d62067fe34ee34c0172be70b3cc6881574c1c09ebadd05ea37be6ee034 SHA512 9d67ecbbc1a06dbbfd3c68cefb87a002182fdb2e242c07f999d8043dcf3e990a1488c0640e544a03676cd3ab5308f3b35e3f5547cbdfc7d0e5982cf915bda18c
 EBUILD concurrent-ruby-1.1.9.ebuild 1369 BLAKE2B d8cf99b8b1d9111d543188ebd016aa609ade7127cff9fa5ff09d3d4937d3fd49a1b0a3b512199c8b8e855b0a003072283bf58bd2e22c3520ac1b4ec9433ee2c4 SHA512 57b2a1eaf4ac68757cde40e68cb445dcdd56c6ecdac76cfc4174a063565ac91366568a7e9b38d8904a0caf922ae638d6c66bddfac24479a9816e95e4eb3d40d6
-EBUILD concurrent-ruby-1.2.0.ebuild 1400 BLAKE2B aaeb752d5eb915a31daf1f25e332efbadc63ec439a1a0960eea2be438adf33966cdf1c36a305f14c99d522c92175954a3de1fcea1e19fd72c6b0fcee2d999bb3 SHA512 7f4053e5f869f80caf23ae909e27f715ec98ef31a05a8a0ef90cbdbb05816d98b710f9c59bb195a2ba56be85eeaf3c8532780fec0d78bb102ba4491be8367c00
+EBUILD concurrent-ruby-1.2.0.ebuild 1394 BLAKE2B cfb9de21b5da46c296af2f58fca7b2f1b43f3da6e73a8fb136e96627bd34cf48a004f9711f1dbbc6ed25adda07ed767477cab03650ecb3a8d14732dc2d49d5c0 SHA512 137dc87f334cb878dc193447c2e6f0dcc3ca613febe1e2d8a7b1cf73031f77cada4e4a093aaef68566573325bf24b9f1f89cfe4d316ca66228c300ca44454900
 EBUILD concurrent-ruby-1.2.2.ebuild 1405 BLAKE2B eb7aa45f1d4bfa116923152af059b05b1c0e52d2d386cc431120f9fff8c02c7945430f26c22606aba29396e29e5f76826273c0150857f2ed98699f386ef9f8af SHA512 f9155efe3394c270dfc8e5e279a5fcca27228bde91be05c9650ddc7427cce79993b0721afcb36fefdf25d2bef585875338bc9cc4a3c1caaf99aa827c4a779518
 MISC metadata.xml 359 BLAKE2B 2db8e9c1e575575ead6e6f86d5c883e356dbd84d3def08d6d2b9473e8cb10951268bd85208f56b14047b6bf57388e025f4ad626555d001d266bb0a87db954f45 SHA512 39f31f985f90fb6514f2c282c01a0d38e325371ec18671dda808372891caa83eb28a6eaf0a3090999a0427e5ca6cf3ba5f75b59e86b0e8713dc85ff3a6eacb68
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.2.0.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.2.0.ebuild
index 98089791617f..28e49bada8e0 100644
--- a/dev-ruby/concurrent-ruby/concurrent-ruby-1.2.0.ebuild
+++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.2.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.7.4 )"
diff --git a/dev-ruby/crack/Manifest b/dev-ruby/crack/Manifest
index 867ea7609be6..a82aada48287 100644
--- a/dev-ruby/crack/Manifest
+++ b/dev-ruby/crack/Manifest
@@ -2,6 +2,6 @@ AUX crack-0.4.4-psych4.patch 1053 BLAKE2B 280da92d42ad5c4138b7f4293cbd9efafb0033
 DIST crack-0.4.4.tar.gz 586633 BLAKE2B 26e2cda6e9447fb3c9fe02092a6e9d6a8097c7bca6a483a3af42aa8ba491b737bc0dc3ae1936ef8ffb5c5d5cbbed3fde69c9641f05b9e3eb3beab87c375f68fd SHA512 3f86c76718a3c2a65ee11b15434035396c2355a8562bdb642432a659b52c3e811e930318e0dc2df3ff06bd53ac14d0694471e425420ae3b7971f5d4f818bba87
 EBUILD crack-0.4.4-r1.ebuild 1249 BLAKE2B b57c7a0e4a8d6c540d959f5a0ca86fec9e8295fe1cdfb494a82e1f63df3348027ca3677076e7b7d3cd4e82afd9e66f062cc4e950cda1a81be61ace746d8a6ae7 SHA512 d29fc1362fb146cbebdf87e24ead8cc581a8a14b21ef5cc033aea50f4326323dfb1ee6bb493aeb3eda0cbb2d1e7b621fdcba94001938f5177f15a182ab9d2453
 EBUILD crack-0.4.4-r2.ebuild 1278 BLAKE2B 86ac1450d72aead82dbaeac8e12b8e666d19bf280db1e7a01f1e2a6f30db146191b0c03b3e65b16179253c5bdd2c8f117fb35d336d1cb5c99e2d08b60b8b344c SHA512 9eb75d02a75cfd67f4628c5059ee571e90755f17ee5922e6c3e455d5ca0cfbee8c79604365e231042faa38749ab4c10e2149ee83d45a69d8e2c27660da5b0840
-EBUILD crack-0.4.4-r3.ebuild 1468 BLAKE2B 72ecd5b1e02d438e8dbaad75333425da3d4c82c710e3494a0bfaff2858928b6340f7abe1cfa271137377ccc21e510fe5be46b3f87bd6333890700580ee61ae79 SHA512 901dbbea1b15c1995270c76b33d122668f196fa5686b62644be19251dff409cc3c4dd4be5143f9f3d1af5bf7ecabd13dccbbe3220a52953fc6e8b3e518787f6f
+EBUILD crack-0.4.4-r3.ebuild 1462 BLAKE2B 4304e776a1d55db12e13ae304976c811834800467f1a8da6cd09e6a83d9cd1861b31c555aef8ef95491e12356d6320c45dbd5affbe33d92f8f26e590960edf61 SHA512 58d16f4d9e147a7db2f3a6fd8b7f5ece5f6ed8a9d0dad4ddb5ee3d2f9cf49549718c386cc7b9f9d28fffd49b8412e08fbc5cc077da0377c1eb35201b473e0632
 EBUILD crack-0.4.4.ebuild 1107 BLAKE2B f6d10256b74eb122f990f3e458836edafd5099ea60173b606437743dffe46cf7156a674f172de403aafb509a41b681d05306afe5fd36a9a8fbcf4bcb65f2439c SHA512 ee73b8ef85924d2a1c0cd210f2b6ce9ff3f8c773220fa561982b29a6accf4b2e22535dc2f6905c206a1b4b554326dafd974b8a0ca8323ae49b70cba3bd6a8245
 MISC metadata.xml 343 BLAKE2B e98d01493c40195b22fa423e30e512b5f4b5ef08676138f4c5c3b7d18aae166fdc5fbb11ea465370de681fc85ded672dabefe34546f2b3140379984a187399f0 SHA512 44de19ae2a745da9ef90d7300e56efc80f892f0a7173ea6967c1bd079a24d0b50fa5de6eb1565254d7db84b5875679c9e70d2f3a87a60c31c9aa33f7bb4d6616
diff --git a/dev-ruby/crack/crack-0.4.4-r3.ebuild b/dev-ruby/crack/crack-0.4.4-r3.ebuild
index 2716426caefb..cc76105e11d8 100644
--- a/dev-ruby/crack/crack-0.4.4-r3.ebuild
+++ b/dev-ruby/crack/crack-0.4.4-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/jnunemaker/crack/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-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"
+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=""
 
 PATCHES=( "${FILESDIR}/${P}-psych4.patch" )
diff --git a/dev-ruby/crass/Manifest b/dev-ruby/crass/Manifest
index 934d45ab8de4..fe1b7d18b352 100644
--- a/dev-ruby/crass/Manifest
+++ b/dev-ruby/crass/Manifest
@@ -1,4 +1,4 @@
 DIST crass-1.0.6.tar.gz 89443 BLAKE2B 2721cc6f5419a36c122c63c59804da84791e70d522ee01ff2ff06fed67a74ab187d0b601cd85e031fd33a84315fbc4cd092c14de110053c94ff0e50d4feab5fc SHA512 de98dea48d0cff148b3000d7388256552d1bf5a014ecbc074efc909473bc6edf2cf1db36179aaa4284eb810618dafc346757ac61708c9659045e013e6c6d4e36
-EBUILD crass-1.0.6-r1.ebuild 853 BLAKE2B 34f5620ea01927143f93bd352f5aa933cc23fa2408b972eafbc708a64f332d3c2d3d6d7d2a6bc4afc996cec0701fa6fcd0d4e6ef3bbaf4b0ebe069fcd555a0e1 SHA512 3a62e8461c2bbb1c72024c85634b58423f84f0a43424c34f63d4a590204d06909be251ef444da0bc28350161fc4380f10d9984c5631897a69753b9cf15de09a9
+EBUILD crass-1.0.6-r1.ebuild 852 BLAKE2B 884685826c1b4acee13fb1908af2647d8e01d09448bc0325713166e622d786bfdc89743fd66fb9fe0db5b3f45a93b9e0baca736013c8656bc0367f6109df3f5a SHA512 b1f0a3bbdd82bcdf6ee6fcbe67bfc34c37865b4f169eca2b68617179e0dc51dfa0be7b14ec2b6b5944d7bfafa8f44ef0a5036f9d6f3611a4633ff4ff2982b3c4
 EBUILD crass-1.0.6.ebuild 850 BLAKE2B 5dcd001e61a36700b78ed46272747c367d4f7d372e6698e5d6dabb03269019af71b76d6885f7a09bd2ae296c047c4dcd23a72d3207c39a83fb01e6bbdb453447 SHA512 ad658f267b74edb27250a950025477d15693d6bb466b6b7caa6e8929e6a5d012654f0a2fe17b6e83ecace426ccad09192d275f80dadd0d87da2b8e5646639bf5
 MISC metadata.xml 339 BLAKE2B 7a382dbc019c8a1b2ba77baefc7b9dc247d194daa10d3216045ec0894eee0761189e7c18db66f4aa758f386abb85e4fc6aa9620fdf4e2de668ad10f88fd85c32 SHA512 8b543debffa7d0075dc6987204c74365ea4968c45024e5e184a2a6716e002f3eaab5f10c8b4b187b64eedab5a1e61b167a4380b5d8fbbb95928788219d6af2fa
diff --git a/dev-ruby/crass/crass-1.0.6-r1.ebuild b/dev-ruby/crass/crass-1.0.6-r1.ebuild
index ff15460fdf3f..ac742e79e1d4 100644
--- a/dev-ruby/crass/crass-1.0.6-r1.ebuild
+++ b/dev-ruby/crass/crass-1.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rgrove/crass/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend ">=dev-ruby/minitest-5.0.8:5"
diff --git a/dev-ruby/dalli/Manifest b/dev-ruby/dalli/Manifest
index 8efc7fed4f86..c20a712f4f84 100644
--- a/dev-ruby/dalli/Manifest
+++ b/dev-ruby/dalli/Manifest
@@ -1,5 +1,5 @@
 DIST dalli-3.2.3.tar.gz 71163 BLAKE2B cdb205f39dce8e7c64da808a5da8b0c295ca938b21d1a42f16a7fda06d47b11c9d357240d633b17ec140e90a1838d4e28da6333971eaad043ffd04508ffb7537 SHA512 43729fa6f7ee92d886e113c6c04f1334c74bcb189e5c75205cc955a94fe1e0d834f94b69d1e9408609f4039018417da74f9b80fc8851ed33ee3fd60fb77df224
 DIST dalli-3.2.4.tar.gz 71999 BLAKE2B bb4ea91328e60740d8be0664b2a359007230efcc87611e620b08cc18292e85384780afcc09de575314f3bd39d261b8d26c558f4329ba55f13f1306681ce0ec71 SHA512 5f5f802a76b1d611b42251c8eb70538cb1da6b43bb681fb7e0b4a7124bf46ab4d89be4ab31bb071d7205c897ba940ef523384efa18b5723d57d8edaea2198350
 EBUILD dalli-3.2.3.ebuild 1127 BLAKE2B 20be6f1ae48304062fd120fac0aaefc110b526581ecfd469c830b32a8e5c595b79636d9655a55e1be09110983c58eaa5b05011fdb0cc570d36ec89862f5d2602 SHA512 a37d56677060ef146f95a92d0c50bc91c9689608b54b437361143fb052013705f9376734b863b016e4c4d0d83b2117409af08477d973e8c21eae7e177d20abec
-EBUILD dalli-3.2.4.ebuild 1153 BLAKE2B 8093f8c02dacf43ecb10d81367ab478398da51d3eca2f65e6289095964977bd7fba4692332c6cd3d3fb1186257cfdcc34490ed8dcf9cced05dd5fd3ee8f0af2f SHA512 909f3eae95436a32dd57382c4aa55e5f2a4f96701f1a30847df5900bfb633ee60b958248ad104ceb22620263938369280d9d50069a625fb8b1ff7aa54c2682f3
+EBUILD dalli-3.2.4.ebuild 1151 BLAKE2B 0bca555b2b2a6766d902c5d3a9e24badf0cd215b436714e922b3030b09c141ec5ccb8775cabbacc2e1f6da4eb54ddcbebb3dbd3ddcf62ac5ee5d03ef5a706365 SHA512 c211a950ab5b1ed0279fbfc4262c687b8d5d6fe907ce8bb81e69a5e8e36a857ba5b05c4ee4f590f672934da094f04affaacb63e26a6c1e330a10dc34e412a0ce
 MISC metadata.xml 347 BLAKE2B f1e7c89c18e4fb1a02714796274401469ee66687a98d56445ed894024667a9bb277d0d1c1f6cc4ddfd90c3d3b3cd2f826bad7dda8fc5f3d6111b8326865228bd SHA512 7645efc96c6c7d275946260d28055c704f3fb45674e864b60a4a60e7265c8c61e82105373a243ecad18101c850ec47ea3c9a5a2a0538b4f9c99232ba1fa36c6e
diff --git a/dev-ruby/dalli/dalli-3.2.4.ebuild b/dev-ruby/dalli/dalli-3.2.4.ebuild
index 204696f2dc97..066a4a7cbab2 100644
--- a/dev-ruby/dalli/dalli-3.2.4.ebuild
+++ b/dev-ruby/dalli/dalli-3.2.4.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/petergoldstein/dalli"
 SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 x86"
 IUSE=""
 
 DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4[ssl(-)] )"
diff --git a/dev-ruby/dbf/Manifest b/dev-ruby/dbf/Manifest
index 0449b0e9f041..ff55542a947c 100644
--- a/dev-ruby/dbf/Manifest
+++ b/dev-ruby/dbf/Manifest
@@ -7,5 +7,5 @@ EBUILD dbf-4.1.3.ebuild 455 BLAKE2B 408a076c0dea34fbb85a6a823c4065bfbd11594924f9
 EBUILD dbf-4.1.6.ebuild 470 BLAKE2B 4c0514f6c14572f0d1f5808ff32caf98f1cf66c540c854cf0950afb4b821a70f4e6d4eb08996dd54f18b3641d2e3b7b28461a9dc1cc38e9164a1e1e7afcbb8dc SHA512 e5db2374fd246b896c495b37d788db442879b3493d092a44d190eb1e1180b4dd8bd08186ea8c8a381324f9e36e82a91a7aa77d5aacace6cb799c930a51e489cc
 EBUILD dbf-4.2.0.ebuild 477 BLAKE2B 9af2bc736ac0727fbd56711d0151d3718a096bff46af17f4099f9002fd98eb2252e8d9b2f907b1e03743983290848d5a36bf80f61384d094fdda45d617f7e6f0 SHA512 901d1f0265a9bd816f033bc5a8c6b2fdc838bb1abd7988cd4af701c5e4b0959a20164a4711f051d1b289c0bdcc5dc27db5ecb1e1a910fe306a46183a8ecfedd4
 EBUILD dbf-4.2.1.ebuild 470 BLAKE2B c75794dd0b02688196da76f60068fd5f46b501913487db83cf369d4d5e29543b75fcc493da47f841b6e693b4fa83b639929b39d3e0b3b9362b508f82b2bbba1b SHA512 c44647f8778a995e7acbf19e62d4217461d6df28e97d1e3c0eada324f23146cd72baa2c9c4c87f575a87bedefa4ac422966ca396ded158e58ee23a05b264b08e
-EBUILD dbf-4.2.2.ebuild 470 BLAKE2B c75794dd0b02688196da76f60068fd5f46b501913487db83cf369d4d5e29543b75fcc493da47f841b6e693b4fa83b639929b39d3e0b3b9362b508f82b2bbba1b SHA512 c44647f8778a995e7acbf19e62d4217461d6df28e97d1e3c0eada324f23146cd72baa2c9c4c87f575a87bedefa4ac422966ca396ded158e58ee23a05b264b08e
+EBUILD dbf-4.2.2.ebuild 468 BLAKE2B faf7cbe1eed84dd63ec0b6d0b8d3926ab448cc52c9c0ba7c4800fb42c5a0437cb4a2a0b8af43e6430c35890d10748921a0e896623e42a436c5d8a97e4d13235b SHA512 788bbe197da30f0c9ea4b21f3c8b2d53397a17eb3a89d756202a47d9f5e658175d9dd63a1f13e32df503344d454921d42b91c08ecc2dda03abd74191bdce6e20
 MISC metadata.xml 474 BLAKE2B a8bc2fe69db29e3a1d22deeb896e5f161cd4511f0687c229b3ebffa0fea1bdf0b4cbbf7636c9955275b1f53ec79538b26de24547b88b8a274fdc182729051a5a SHA512 16d3345d2d5e205aedeb24bdd1a4d80af014035ac817f9933840ea005f945905ae4c059f76b90b73cf040c71a0d4f1b98c9c95609316b34c25db1c565adb5f63
diff --git a/dev-ruby/dbf/dbf-4.2.2.ebuild b/dev-ruby/dbf/dbf-4.2.2.ebuild
index c4941b9074a9..7551350c38c0 100644
--- a/dev-ruby/dbf/dbf-4.2.2.ebuild
+++ b/dev-ruby/dbf/dbf-4.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/infused/dbf"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/dev-ruby/deep_merge/Manifest b/dev-ruby/deep_merge/Manifest
index f65923df455d..5ed714019bca 100644
--- a/dev-ruby/deep_merge/Manifest
+++ b/dev-ruby/deep_merge/Manifest
@@ -1,5 +1,5 @@
 DIST deep_merge-1.2.1.gem 14336 BLAKE2B c122eddaf63fd885f82b292ea7d1f2b6a9a9dd50731e77b856fd02284634a699b7897a12c1856732c77b4d8ffc9f6efe06f792f42d53236a521279bff13b6dce SHA512 ef93e0c4c6a8f389338ea30b2b53271f089b0b8275adf6fc74e7d15a2faf32d62a1b297af9d31c42cb5d816066428c8407a82d874fad14d64384098fc3c5c70c
 DIST deep_merge-1.2.2.gem 14848 BLAKE2B cb79bfd2c4499b3578cb493e4a9d664a44672f01941c88f559aa110732f6fb19d3e18e32274e666a5021e35995a3f0afcdea57fcefd9ff0eb675aafdb5d6eb8d SHA512 58c6dd789812c5010a4019ec731a21dac70c135fcf54701c82fca7b43842199d8eb41c3dec3926cd953d3e5ed14039384dc270e06de5922bc438f98c6d1132a1
 EBUILD deep_merge-1.2.1.ebuild 540 BLAKE2B a7e1839562227995f2642f3881abaa44e54c52bebfd609ab51345ec369160763907942018491cb42776a5209c9d88eaac41908f3392e2143bb1f57584ff026ec SHA512 831392a167cc6945435a4504a61ca7e0314ffd112bd65984632e8dad6ff6ecfd58c2ffd37f41f6c1c7fb5b88feebdd6f0688310094533f2f1d77e786143fa3f9
-EBUILD deep_merge-1.2.2.ebuild 554 BLAKE2B 1bbb2c2c31a8f3221f6fdc7bf4b1151ceecfbd7121f323f4eba8f00a43455d6fee5c10ca83d0ed8d8afaf9b7d2cddd00fd24480afc1065d8aa87fbf7586b80ca SHA512 a9593d7031cea3d63a5f3751b72049564587faf8c9910ffe35d6f9f59ee7b9d96320477dac9cad27ff373d489be15bab2482b39409e1bf30ccef804ea11a83fa
-MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
+EBUILD deep_merge-1.2.2.ebuild 551 BLAKE2B 6d6c3bbef6c32acb5d03d13f2d2b902388d52845eccbfc3acf4f5bf8663f988a9798b144a4c78e65dc385a7ba876d5d85ddd4620b1a470499963df6c9b0c1e25 SHA512 5e28292fb1815d7e2871e60ea2b7b6d355bb86dde7a3af036b79bf3665e4ad7f21ee7f08b5213d1dc80fe7a4f0ada22f051a10adef4faebdf2e6067bad14427a
+MISC metadata.xml 333 BLAKE2B b04bc9013eafaee47fe7b0ea845e67f04c5c8246789387dbeb24819dc8c88a96572ece8318f5c32f84f4900284c5bceb4a83e073859c9ba8d2fedfac26d7538e SHA512 d5f550e7a439550f1346ce7436c3472e528003c9e89d0c395d46e986a5165c4193c61898307b0971463434de5cb06d4b57dcb85e32afd36ee6abe8cd0166c1dc
diff --git a/dev-ruby/deep_merge/deep_merge-1.2.2.ebuild b/dev-ruby/deep_merge/deep_merge-1.2.2.ebuild
index 7a74603357bd..e22a79b74d7d 100644
--- a/dev-ruby/deep_merge/deep_merge-1.2.2.ebuild
+++ b/dev-ruby/deep_merge/deep_merge-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/danielsdeleo/deep_merge"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 each_ruby_test() {
diff --git a/dev-ruby/deep_merge/metadata.xml b/dev-ruby/deep_merge/metadata.xml
index 658c72b1920d..439ca4bac0b7 100644
--- a/dev-ruby/deep_merge/metadata.xml
+++ b/dev-ruby/deep_merge/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">danielsdeleo/deep_merge</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/diff-lcs/Manifest b/dev-ruby/diff-lcs/Manifest
index 53f12fce4187..bda1c49e07e3 100644
--- a/dev-ruby/diff-lcs/Manifest
+++ b/dev-ruby/diff-lcs/Manifest
@@ -1,5 +1,5 @@
 DIST diff-lcs-1.4.4.gem 50688 BLAKE2B 0b72890b147696425120f2dc71f8d741d993411bd8e76d130d3c12e3b4f451b0812a3cd34b09e653ec7024c616d7ffb4bd1c40303b66ca4a13e26c397d5913b6 SHA512 fcc6c86f392697c4b3690827f7c20d50fe68e367626b85a56446356d7bb21b4020bdb2bc5c2faf4e82807cd9f3049d71c94d166c85a1a4231f0fd9fc032f41c7
 DIST diff-lcs-1.5.0.gem 52736 BLAKE2B ff405fd3ed5238af3eba2ab4fa277edca0eec66df93b0e8d6fba1a52980d484623e57f70587de31fec1696e556f2ae90d82af4b856a9bd4a248de12aa74ada4a SHA512 5cef9dc1d143217cc402173e2b84ffdcbb8d5a4d05716bdbca732ac00d73591e4cab2f7e792382a3686d8e72fdc32269fd7100941d602ca6d683e7645229ef8d
 EBUILD diff-lcs-1.4.4.ebuild 753 BLAKE2B 906c0a00d3bafaaf0c4c52ae4b0de296b4082ec203612a6f27570ef51a44025334559200d903c70281f7deed785c5fcbee551632e383c4b9ab7adb7cb1106025 SHA512 6447f4ac2b9d11e2188f4f52267136c315e7fd3ed29bc19b66d85177d767507fa0f55732e1df6cdb6c3203b5c883fdecfe21d4318adae213d1126aa7e6709f17
-EBUILD diff-lcs-1.5.0.ebuild 625 BLAKE2B 6af7012ed736f23de8ccc7b805d1c06b8860aef8ba4f56ccb0ca27611c4b3ea7abd4fe6833fa98d5c1be3123bf0f2dc364e8d2804538e093916516523b90b50d SHA512 8944fb37ef33cf3bc5b0f61e0aad0901d22af3bc8988be7545c717261eea3f9fe8739b7ce50577dfa72ced1f7a86caa34bfb1d95c3133e326be57bf1de609f72
+EBUILD diff-lcs-1.5.0.ebuild 619 BLAKE2B 0091294258dc2acfb1cd8ec2c5862c7aa2757f5253d128e2e2597931cccd3d72646606e1100a9f7177ed807c8291bf2741f656575d485f52d3e7cfec89ccd0ce SHA512 0665b6107e7ef08f722f2fd7d2f9f2c6ad45e8f8d9f4a9589b5a4f9bd9a0d8053e6ff41f4f846dc7aee259e3d7093f945ce789692aed45902ccaf11a0a8ea5c9
 MISC metadata.xml 346 BLAKE2B 2f30df61a72a09bd4d12a5adaed82179b86b78d84beb8406478fac7c98b25958cd6feafc72389b454542771e4e836eee8b757223d100264edd984db918c70144 SHA512 632730a4ff8486ca00126bd2933198c5ece0b38361fccf2ca3a7b79e4d0f78c801a86218d3c545e3aa62102e5a7e31ff14524bcd3f40001f81ce44693631e0ae
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.5.0.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.5.0.ebuild
index 7f23a1723182..fb22b8ef00d3 100644
--- a/dev-ruby/diff-lcs/diff-lcs-1.5.0.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.5.0.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="https://github.com/halostatue/diff-lcs"
 
 LICENSE="|| ( Artistic MIT GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-ruby/ed25519/Manifest b/dev-ruby/ed25519/Manifest
index 3d04d2d50fb7..38f1a3bcd848 100644
--- a/dev-ruby/ed25519/Manifest
+++ b/dev-ruby/ed25519/Manifest
@@ -1,5 +1,5 @@
 DIST ed25519-1.2.4.tar.gz 136685 BLAKE2B d0fd78f16df2b09f5835fca4b0963cee930e17ece2c4eea2cbf4544ed1a5e30c7dc63525b285f4e1e150e5e70d1e8207ca07ce985c27441a903c69875fd92dee SHA512 cf2de7781848d804f3a279baef26f887846d7d846d225293c74dc3f4e301d18518c9edc8b721f9637fff8f087703e91d2376119f2d8185ef19be5862f99801b3
 DIST ed25519-1.3.0.tar.gz 137160 BLAKE2B 520ffa6bd0a801faa9f5f63873d705a211c3dba0e5319246b77bd455585e60baf7c7829ddebb892a896c1ae763e6df732115675307451c33bb20f56bb7c89be4 SHA512 dbd108769e131d15e4f31eaf7f4a46530769f279ccbbe4a10b5fe9e1d394bafb0ea6af95b6b1da2d66db00072576ff9d6d5c9156d949d79daf929a9dbd22eea8
 EBUILD ed25519-1.2.4-r1.ebuild 699 BLAKE2B d9e6ff84082a9aa7c0661f79f5867e9e2f3e35ec1924dd253dcafa9007759403fb19966214eb4c21f4bfc516a56b82634d9065aa4c5d6310dbc78267add62c39 SHA512 c78937ffc2aa9650990cb991e88bea0acca84d3ad0540838ac51dd87754bbaec096aed0cbd60f0137c7032a6e7829533d9d9d45eb0620e92bb4f0684a78c6605
-EBUILD ed25519-1.3.0.ebuild 725 BLAKE2B 0d6c28ff4655741226bf9be49d9caef0a10352691c735561e1d79c160f47c38e94a02d61803ff2b88d36b48e71d1120a2408eda3966995db6c60f7582c30c343 SHA512 cbbfd8e2892717997f0b89afd2d364fa1f4064cbdac804fda3c48bead44f42f9999cec8ad746940de03a3196eb9367e8ab6e9038333aff6e9330ad8efe2516be
+EBUILD ed25519-1.3.0.ebuild 722 BLAKE2B 8d0232a3070c67403f89ca69dec61e148e7a06dadde2c7f16f2f09cc50fb3b37b7029a3a762351afa79a374ef7fe476632aa7874222777d18a32b92248389e38 SHA512 28f66cc9c079281b0aabf2db097a66718e922a2133408277ff509bdcfcea8cfa0e408bcc7ba4c63243f25c399c69c6f26eb1cbb565b9aef1e3b8d939f6edad1a
 MISC metadata.xml 344 BLAKE2B f217757eb80df9d9c454509c710832b5db19b897af04a0e3c7af5b096c57b4bad153a7369c698479160542df569d8008e861bffe1fabe7082d8ed533fc35d2e9 SHA512 7b437dd29237939c019b1760f65533a80c39f11176736276a612e4a616fe10f890b45b891791b18e06802f53dd208ae82cc37f4c317f4fdee25c012b2681b317
diff --git a/dev-ruby/ed25519/ed25519-1.3.0.ebuild b/dev-ruby/ed25519/ed25519-1.3.0.ebuild
index a5f5e1ad7e42..89bd57db8640 100644
--- a/dev-ruby/ed25519/ed25519-1.3.0.ebuild
+++ b/dev-ruby/ed25519/ed25519-1.3.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/crypto-rb/ed25519/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/erubi/Manifest b/dev-ruby/erubi/Manifest
index b25c94605065..fb7d20415ffe 100644
--- a/dev-ruby/erubi/Manifest
+++ b/dev-ruby/erubi/Manifest
@@ -2,6 +2,6 @@ DIST erubi-1.10.0.tar.gz 11212 BLAKE2B 1a31994bc02a6acd0a5ec025c71961422dc8850de
 DIST erubi-1.11.0.tar.gz 12202 BLAKE2B aa543d102f6176f4876099cfa4b478db684fcaa8607e63a747a06348b35e773aec6385de44f36f49a6e81ad36341953d21ed7d6b13fcc86133791409eb1db761 SHA512 6e1a044a8468b6cd0262e4058a45415b9a4e1f230bbd7256956d5416674feb4af6a1dea290733a3dbaeab92394625664a1e61cbe36e7278e1e030c6a9b16d692
 DIST erubi-1.12.0.tar.gz 12384 BLAKE2B 0299cec2a8a79492fed06105f7570aabfe7d16fd1755185fbefdd43f125c383a98a1942c9b09df3dcd0b4b20bd15c2a7e6666bf3b2ef92c579a7bb7c39b5eae5 SHA512 6243b6e1c4360ceb1eb4bc3ce4492cebcf071e526be43f7393a789e4b0eaf43b6ed770b5baec7cbab4b6a563d4dc821e56a8e4222ad7a13a852d74dcb7c5552a
 EBUILD erubi-1.10.0-r1.ebuild 680 BLAKE2B 8a5b86c0ab18124b417d0131472676aa6fc0d98bf3ba614eaadc2178817255799c6db42bfe4a9193d4f60dc147cdb40ffcda6b52bba1ebb132e99af260233f5d SHA512 4a38894f89b461fe1051776ef9c7fb23c9d3ebd341ae498690da944c139879f9a110e3e0e85cb027f66876af2a0ec625c3dfaaeacc2986ec9a1bd75bcb7fd0e2
-EBUILD erubi-1.11.0.ebuild 680 BLAKE2B 65da6fe2bef13c9a2d18636fccea0eab7edb1bfbe777d206bf84ef2b02dbf37a10e569cb8841dc360bd129f82de9877d706f0faa74beabe85666a63df9ef05f3 SHA512 2690b6046027e997005b747e66ee47992a16be20aa335915171ffd758971e32234a8b3975b1af5ddcc3972057b2a14992c2857390617d606f55c3e01ed25183e
+EBUILD erubi-1.11.0.ebuild 674 BLAKE2B 6cd1b557826c62101e971c150ff3403af55474d81e575ee56c9f0af3909fac7f39fd807faed5a7fb014c775087c86dcdebdc16a13ff4fcf18781c71d479d87ab SHA512 9cc4cec8c3998b3a79a45e75ded835f38f946d243893c9dc5d15f27a43939dab9357b578aa19c3f08e2be608f22c8d0d1be5f3ac60771c5d22188a0c637de891
 EBUILD erubi-1.12.0.ebuild 688 BLAKE2B 568bf7a64eab4f312764229b042be5c2b864142980e8b631db5ba5f05d46a7746e17ba34edf7129ea5231cf14fec6cd0c7b585ff99473bfba67ebd59276f182d SHA512 f823c41bfc9598d47dd9dbbe9a7a187275beb59fe855a424b034ee197de8d33e6ad88dfb6de679ec133e52d55285162d6900bf54fc072bbf5c25e076f3d25afa
 MISC metadata.xml 393 BLAKE2B 9471b64d59937408d5e1c68e23ed6ce5aa116c2eb141afbce293064755410b38daa6c35dd72412fbc71477923189caa094017769544db6cc489ef2cc2af8e95b SHA512 41bb4dcb0c47bb0ba8f4156ee3790f451decc3427afbfda092c77068117672dd6c701e501c7a94e6e76802766a572423b81416b4e5f9561129df50d9eb119c9d
diff --git a/dev-ruby/erubi/erubi-1.11.0.ebuild b/dev-ruby/erubi/erubi-1.11.0.ebuild
index c1ebbadb550c..fbd7840db7ea 100644
--- a/dev-ruby/erubi/erubi-1.11.0.ebuild
+++ b/dev-ruby/erubi/erubi-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jeremyevans/erubi/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/minitest-global_expectations )"
diff --git a/dev-ruby/erubis/Manifest b/dev-ruby/erubis/Manifest
index 5cda948a148f..bc74855b3233 100644
--- a/dev-ruby/erubis/Manifest
+++ b/dev-ruby/erubis/Manifest
@@ -1,4 +1,4 @@
 DIST erubis-2.7.0.gem 173056 BLAKE2B b1059469b5d75dd71be32eabfae0f1715dca11b9c5eb79499a5a8835a4db44e8c2163386af1e4ef9cab8cecf4ae6f2eb57b5105d53d56e5784b06d65398b22fb SHA512 49b08b28656acaf3b0c88fe064bb0d5f79fd08b834d7eba9294217b0893c5a0244ac5dd54de0e52dd17e828a0110e54b29e8c2d75171d527da957917344a0f27
 EBUILD erubis-2.7.0-r3.ebuild 1100 BLAKE2B 74405a8073fb3a523ad3f772e9b2b4132a797875445e1086d79cbba467efad412b0d00edb9cd8b483c28e4d9f4379ee0cefea9101ef1275ef3dd0e68e0e07db8 SHA512 69a93a894424af4ecf6191bec906bde42b9da00469d3557afb9248247c78d7033a8f5d629710718ea26e84db2dc8fc4404ca88ef025c91be4d09b3d88e9be899
-EBUILD erubis-2.7.0-r4.ebuild 1106 BLAKE2B d3cec6efa3721f0caec4a06790538271597ae783af36defa37ff6a3990df4b63512772ee5ef2d710ec7268db458e2f9300be816650ae2ac0cb0e686be47465dc SHA512 beaa274e760f00354727bb5d36b89a28cd6543f8b8ea16002171e56b32301f90d51a1d5df4e878311a912bbf12530ec23aff0549e8c873016e73e18482e88a93
+EBUILD erubis-2.7.0-r4.ebuild 1100 BLAKE2B bd6b273c506da15a2ec89acf1302be0ce6fd36018f3a905527a60b9a51004395cd092e36659fab5329cdb2182d527258961b59e4ad21a661a6d677fa0a41b1bb SHA512 6b4b1513e307fb3752c271b2beb7f607b45b41b1632afe726730ebac6e2e49881def857c0b731c84199d1216868f46968b07bbc657cdfe2099b0c6ec1ec439a3
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/erubis/erubis-2.7.0-r4.ebuild b/dev-ruby/erubis/erubis-2.7.0-r4.ebuild
index 92f69e6d44fe..641e68e73286 100644
--- a/dev-ruby/erubis/erubis-2.7.0-r4.ebuild
+++ b/dev-ruby/erubis/erubis-2.7.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.kuwata-lab.com/erubis/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # http://rubyforge.org/tracker/index.php?func=detail&aid=29484&group_id=1320&atid=5201
diff --git a/dev-ruby/execjs/Manifest b/dev-ruby/execjs/Manifest
index 6346383c94db..25a4a8bab707 100644
--- a/dev-ruby/execjs/Manifest
+++ b/dev-ruby/execjs/Manifest
@@ -1,3 +1,4 @@
 DIST execjs-2.8.1.tar.gz 425838 BLAKE2B e81c2cfb803e3ffcfb9fbde3ce907147e577f81563500dd74a6a6aa560f13a0318246530a4e54c7139f86c8fe76fe79c9a2961c3b0d685e65c5e7d9d395ba82d SHA512 ec808d3feccf1cfa2500f4ce17a497a31e5886cdd7482c56fdc0cc952aa8967ca50f09c33eb83545713e04aa73fbb8a201459cdb72647e8f8c291f8846f3f230
+EBUILD execjs-2.8.1-r1.ebuild 1036 BLAKE2B eddea8a32dc032ee317ca05b7374c2b2402ec4534990a34dd4bdc757240249f79e21f407f9c301b4009b0c951bffb5d5eceacdf5fdb306cf98b81a729efd79df SHA512 646138bb3f73f11ccbdcb009906723e288ad991cfaeda1b388203090b18fb64c2407c680ea1ead59c047732645b247aab685feb647d7a0158941e2af6eecdd32
 EBUILD execjs-2.8.1.ebuild 1030 BLAKE2B cfeacff2f4d86050e82b112f150968276f77d0c932e3a895939381cbc73a248f9ec6aecca902795d319710775aab8107639e22ff0456b2c22160289518f5fd73 SHA512 6f4581f5672735a52e2c717a0604a7064cae45b6726245d3854bc62202ad6d1b921570b3ab815b0ed59f49c0c4174d9b0192b9b2d4acd7025194dd9695c4fbbc
 MISC metadata.xml 339 BLAKE2B c570f6191f5de8c4aabc788863f8543fa3cc298d6a86653c3be02ad26c7648232ca2f6d53fbcad6efcb2b7443626885c76b4755a36d1d7835dc164388f3db0bb SHA512 b9032df75adc4978d11fbc0d62dec6a9c26c86369c0debe38b0c9e1656b9a6d7c166398ba3e4628ae4eb4d4a3e75307e2e5780cec81db0e3b05183b1037080e4
diff --git a/dev-ruby/execjs/execjs-2.8.1-r1.ebuild b/dev-ruby/execjs/execjs-2.8.1-r1.ebuild
new file mode 100644
index 000000000000..c7be19c05ace
--- /dev/null
+++ b/dev-ruby/execjs/execjs-2.8.1-r1.ebuild
@@ -0,0 +1,35 @@
+# 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_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+inherit ruby-fakegem
+
+DESCRIPTION="ExecJS lets you run JavaScript code from Ruby"
+HOMEPAGE="https://github.com/rails/execjs"
+SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+
+IUSE="test"
+
+# execjs supports various javascript runtimes. They are listed in order
+# as per the documentation. For now only include the ones already in the
+# tree.
+
+RDEPEND+=" || ( dev-ruby/duktape-rb net-libs/nodejs )"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" Rakefile || die
+	# Avoid test requiring network connectivity. We could potentially
+	# substitute dev-ruby/coffee-script-source for this.
+	sed -i -e '/test_coffeescript/,/end/ s:^:#:' test/test_execjs.rb || die
+}
diff --git a/dev-ruby/forwardable/Manifest b/dev-ruby/forwardable/Manifest
index e87b225747ad..2787ed29dee4 100644
--- a/dev-ruby/forwardable/Manifest
+++ b/dev-ruby/forwardable/Manifest
@@ -1,5 +1,5 @@
 DIST forwardable-1.3.2.tar.gz 16904 BLAKE2B 858068489c9c76e3a711d3b7338f948ac44ef9af9f1792f3fe37fcf3cd7c03201146c7a9f0e2aa7022bca1d705fc285fb9377175e688a500ceb38ee1697b964b SHA512 332eae2ee23fa6c5db334511e79a4d09ee168244420fce718cfd90944fbd03694cf9d2c94b9ad9935deb900a285c8ebf679184c8bdc10de563466d026c9794f7
 DIST forwardable-1.3.3.tar.gz 18044 BLAKE2B 41e3299698d6c48c18a2d5468fd446154eb2813d90d05b1e2531ad48cfe2a3bc27a8b33cf7818c3c46d25ddbc1c0e61ee6d755019d68363e31fae469c3b696a0 SHA512 fe388c3377aea76d350da1a140a09a522a405307ce2566160f1dbe7d2bb46612b57fe9d3c516684402586f20a4b510ada762809192ca81dedb7a251906e56ed7
 EBUILD forwardable-1.3.2.ebuild 1006 BLAKE2B bb03666659fb2e9a9e50d4d14227ff09a00437854078cf1aeae3d67f06e29c6861d1050fd5dee58ec56098635b597633260259fed4ed142c446a91ae7a7373a1 SHA512 f987cffdc5203784f3d96a2332120af2f9d91d691c7e76270af6038b67f15cc6cc0bdc3293ee75aca95625270d3604f21729b03af8bd48d1633257ae45654ba8
-EBUILD forwardable-1.3.3.ebuild 1013 BLAKE2B 1448a556e1268932e8cc61f4dcca0dd7a1b41e290b2d5c70a0692aa1cce5f760c29a2b67308f7f791c62a68dba1b318ec04ff4f29bb381542e328216c741d74e SHA512 a299e187829c0ae50618d1d09b9a5c8395b36ce04ec0065ee8f96d885806c86960508c48981773459a348df7a13483fb2eede553aad505ef4f283cf2e3df3571
+EBUILD forwardable-1.3.3.ebuild 1006 BLAKE2B d576c54d199a11894a79f4948d72772e56fbb5be25e06f36e1062cc2372126d66859e321f3fcf1d725cea2825ed99c3831713c20dde4c16d398602b0815d212f SHA512 38ab824923a81126336cb22cf167eba3451b61dfa21f4f3aac03154ef63a0afc8524163d9c6965245aa195581e87a3a4a6ddbd4e04d0cb98e87b51e6115b8073
 MISC metadata.xml 343 BLAKE2B 2cfaba492c6cd348ea1615949014be2fa221948adb53ccdba20df9dc232aa3953179518ead8b24e6d2254137df0d9829652eeb42032abbcb1cf258f2296b3b48 SHA512 f418ef27f0cadcdeee72c820fa5602b07f033c0be05fdf7f38a12f66045fec7e3c9c6aa2fe6bd202ebbac705c08b91bfec6f4f3aa7c262ed2661190794ec16c3
diff --git a/dev-ruby/forwardable/forwardable-1.3.3.ebuild b/dev-ruby/forwardable/forwardable-1.3.3.ebuild
index c107a607c55c..03cd2e9499db 100644
--- a/dev-ruby/forwardable/forwardable-1.3.3.ebuild
+++ b/dev-ruby/forwardable/forwardable-1.3.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/forwardable/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/kramdown/Manifest b/dev-ruby/kramdown/Manifest
index b255543e8aac..1c8ff8b38ef3 100644
--- a/dev-ruby/kramdown/Manifest
+++ b/dev-ruby/kramdown/Manifest
@@ -1,4 +1,4 @@
 DIST kramdown-2.4.0.gem 122368 BLAKE2B 86b1232583dc88f8a576fb17e3e2ee756f109700634783815e8ba1f722dd8c872f2f6a978d33e1970814530090665eba3693206e57d3f274bb39655a7ac2d208 SHA512 8e52c5cc53d2f0085e30188aa7bf67f92dfe7f0801297c6a45293cca307e3442baa06443638c1161dad4a4aa332cbc5b4f9b6281ba4c6346122a9fff5a3743c7
-EBUILD kramdown-2.4.0-r1.ebuild 1455 BLAKE2B ecc4f208ee159d177fdc775a3e9c723d733ed8675ff3baa083292577b5c58c436bf8a694ff708334cf0dff426af50dea864e09c867033c6156c3956898aa461b SHA512 774efaf7f8e0fc6c776f784360c61d295a4ba31b6e1a8c94ba1f76eb9a4c51f21d0931f1b891e03cc2fe504688aa4aabc3017764aafc77882b88ac562a705040
+EBUILD kramdown-2.4.0-r1.ebuild 1448 BLAKE2B fd7fb5ffadd76b1c8016adc157d0c66083cfe2633d091f4cb97a015f7ee4c16b00018750690236b5fc3d86404966134ed6a6308c10f5817a491f921c17a0a2ee SHA512 cee50d94e88814e53e2465c8e350ddcee0c63a40cb5bb5477c4da85462ac7cb5949d024364253e135bbbec75fd1fafe1683b63fb2a18917824ef6f1e4ab2f95e
 EBUILD kramdown-2.4.0.ebuild 1323 BLAKE2B 418dfd66b4013cf738bc614bb8a66b2a5284d6c1fc3893333b8fe772f835e1a2f9636156a1d0258392a30e5cee6ce50add378a5397588542603ee2a860693534 SHA512 7ab113097d2ca8adad61ee5fd029536823e1892380a1a9d09ffc12d6e4bddf052284ce20984226241ed2974a11de7e33b2ae93e35663bf49b9b852b668a52d34
 MISC metadata.xml 335 BLAKE2B 10892c2abb34e3a13cdf4f0642202977a1ebd810bac1e25bd1afb202fd062a4da0be7c474afaad7436e2fac2608bd92f199452e70e9710a96435eca10d82545a SHA512 96b15db162c6988f7f62c23c2df2e3059c494d7a8210c69651d6473738d263df8d711ce98df62320a7021ff47ddca51ae1786990a8a778645fc1907aed1d4e06
diff --git a/dev-ruby/kramdown/kramdown-2.4.0-r1.ebuild b/dev-ruby/kramdown/kramdown-2.4.0-r1.ebuild
index c10ae258fb49..ba30cdc1662c 100644
--- a/dev-ruby/kramdown/kramdown-2.4.0-r1.ebuild
+++ b/dev-ruby/kramdown/kramdown-2.4.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kramdown.gettalong.org/"
 LICENSE="MIT"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="latex unicode"
 
 LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
diff --git a/dev-ruby/minitest-power_assert/Manifest b/dev-ruby/minitest-power_assert/Manifest
index 1b9d6b4fc037..672c15b16147 100644
--- a/dev-ruby/minitest-power_assert/Manifest
+++ b/dev-ruby/minitest-power_assert/Manifest
@@ -1,3 +1,3 @@
 DIST minitest-power_assert-0.3.1.gem 8192 BLAKE2B d5b9a862d19776d673fb510d2cc52b6741ac20c9b286228a672e49f681d37d2d2c3517253c70b5d1a8d8dc08ca2ac35f8105717edb74a28b6a2ed8667d94a9c3 SHA512 178c70dbe0db2b2248fa83437241d80c7054bf51e21afce74c61bc178907b98ae5b691e0cb644d5754a497d4944520e1ebf7727f1d7f286b4aa28b4560a54cbc
-EBUILD minitest-power_assert-0.3.1-r1.ebuild 557 BLAKE2B 8f43a33e2ca8e3095d423384d066481e0882d7a050f1d5e25e98feb0e16f73cd64b65616d677bf2fb0ba778100542e0e6b5e85ce2f00efb4ff671b46051752c4 SHA512 d8b547336c3ca0a1e6ca062bf44f6ae02157abb5e381bb05c7713bd26644553cdd6f7d387ab544f1a98950214c55391f9479e956f7c2b5e3efa315d7aef2d05c
+EBUILD minitest-power_assert-0.3.1-r1.ebuild 555 BLAKE2B 11c3e8fd43b0ec3439b775eb2745d1b18de85372581db6bac3adc00e92db52840a9279f08b71e4ec81e3d4f324c251f65a6c4e1a619f8df3287a7db38bd0b9ee SHA512 e50a459e9fa3c01bf704dacc8a7bc786f106767faef05a6bdd2bd7e357a265c4e17c8ee271157546b439d4e2873ef762b98384cf9659e008f25706870c8f56a9
 MISC metadata.xml 353 BLAKE2B 485abd838ba0c44f8b0c80f09709e240efc2e4922f86fd2c8100a90bcc9668c8e712dbc04844a24a9de84ee67652f2ac9ba608b95ed89cdef160b57cd52183dd SHA512 2835a0301c1b16b3ad23bdc05b43cfa9abfd0f17ad2daa008b417753d56ed4f1e80bbdf22b1045374200483acaf73a6348628d1ab3731ebbdabc8c44f13f22bf
diff --git a/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1-r1.ebuild b/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1-r1.ebuild
index a7d65714a016..98788f0c3b20 100644
--- a/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1-r1.ebuild
+++ b/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/hsbt/minitest-power_assert"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/mustache/Manifest b/dev-ruby/mustache/Manifest
index a00c3b7f6ef6..aab6a219e2fd 100644
--- a/dev-ruby/mustache/Manifest
+++ b/dev-ruby/mustache/Manifest
@@ -1,5 +1,5 @@
 AUX mustache-1.1.1-test-ordering.patch 1206 BLAKE2B 7797403a81ed860b9bc940d07196f235722e7dd83aa42c3a8ac9200f8179284c2a6a996621f2f6332ef53fa2654772eacdbd14ce5ca0019fca54bd082a3e0155 SHA512 bb122077fa486acd9b737dcf961baeae53b766a48bc635ac48b11e675923885c8110b0095a2600f1655adb034938b04c979c1f5a5d7064d040c207f47eb4d2cc
 DIST mustache-1.1.1.gem 42496 BLAKE2B bd1becb1c296abf03cdd6c7d5a6f29b71dc6328c126dbb27420872088b3b6988ac56d91c13f669cca94932f23f4290277d9ca6597ff842ff226e092c2532dccb SHA512 91a18a374a0348317d0801d6784fedd0782d7a08f128d3ab7050e631b34e45cecd49c4b1e2a9e17204f70bf169c107a92a1e210532bd3faa98edf8b1b5e8e43c
-EBUILD mustache-1.1.1-r1.ebuild 974 BLAKE2B 79d1f69914210443e89b92da8ebdc29fc8290c84ba34d6130efc4bfd5a40b58d1cd40126496d1c827e1b504e727f0d1c6b7a464ef08764cf45c9966890c51bcb SHA512 b7e65030da58f8ea6a49c6e91e477dd423f8789ccd8f84ba82852068ea2871e6725de6742a7e662421141a3cef47671716cdb619d35b617e37a816039d499fe4
+EBUILD mustache-1.1.1-r1.ebuild 967 BLAKE2B 48bfecf59a21ee46be9505e6b324d9e7993957d51290c206657eed94cee0ea387160214480c662dc5fd91222779a1cef749e49450d0508250d0dda8f71844f2a SHA512 92b5cbeeebee94eaee357543ea589270eeac301ddea980eb0e70f5c610655dd83868921455876ab63ade7e8877396b4da0a458fa78fd19bf4a3ca4a012aaa891
 EBUILD mustache-1.1.1.ebuild 957 BLAKE2B dccc7c1be8e194f015a6f143151c559d33b36fca0984b6f58f0915dd075dcab4662869faceca55f8d52c121fced7853cc02cd9dfa23cbc620b709a814a0fa3f5 SHA512 21c5e60d6f0ad7d29dd5dc359cdabcaa7d85f6b61a9961431112246100994739688e168bc4da1223290ed94c027e9eaae129d687f40c5248aa91cfc393007f8b
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/mustache/mustache-1.1.1-r1.ebuild b/dev-ruby/mustache/mustache-1.1.1-r1.ebuild
index a926f1fe1c9d..ca025f284097 100644
--- a/dev-ruby/mustache/mustache-1.1.1-r1.ebuild
+++ b/dev-ruby/mustache/mustache-1.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ HOMEPAGE="https://mustache.github.com/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 PATCHES=( "${FILESDIR}/${P}-test-ordering.patch" )
diff --git a/dev-ruby/prime/Manifest b/dev-ruby/prime/Manifest
index f7205fd4a35c..12511e86bc57 100644
--- a/dev-ruby/prime/Manifest
+++ b/dev-ruby/prime/Manifest
@@ -1,4 +1,4 @@
 DIST prime-0.1.2.tar.gz 9485 BLAKE2B 88db1d22a33405de0bd216baa0a8fa28abc61fe031ae6042a19f0a5c66cf7733b946a52f94165112b45b23331dc68e3168541ec89329ad8d2c016bbf1e33f425 SHA512 a766426884d6b3cd7a586676799db146974ec9a4a7c30ca53b5f279ad55ee9960c9b5bb26988cb66253b4fe974f9b5087f48ef5b216772464d03b8ed78a817d6
-EBUILD prime-0.1.2-r1.ebuild 939 BLAKE2B eb6adea272b9bf5dbdf7d46edc85123cb68bf5815368b34fdf0fe407b71eeb7a9aecbb6b6436d5288ed2cfd6a5dfaeaa504af333523635e95dd598beacf853ba SHA512 daa3120a133a664c1d8835f16dece34a9b53b5bd9c8ac015e068baac2870eba71b8cfbdb02e4ed7866b47a52a78e01cd2a00b82c85f336ac770c2414c33b6f9d
+EBUILD prime-0.1.2-r1.ebuild 932 BLAKE2B 7bed7336b97c6af6ec889fb22b4c17b6598829a14a61880afd6948448065cfb606353512d7edc8890654f834d0edec309a0ab7095908ca1c38da5fb78ab402b0 SHA512 4bdb52847f5458ac2c2d2a4a8ca2bdd2e7cde29e951916902083999103bb7f7e838039bd737473e301109725e6df4b7e6c082f0597c2019f439528454df60267
 EBUILD prime-0.1.2.ebuild 868 BLAKE2B a71c119a7c7d3e744f157282e7e9d26c35239306125b6065843f79342bfd2f4ac3e4b1c9a34924fde24119640ef580d57483df51f6ec20be3dcfa35d02686d32 SHA512 9d3fe677d573c44fcd7bbb7cb66d6e94c8d91f01c166d12d12209a770a0a65525a3dadf38feb2ed94c862022fefbd162178dbf06a497569a03b0eba327835bc7
 MISC metadata.xml 337 BLAKE2B 652f251b8ae0979a74ed4552d31240480949dc062aa5d861ae068eab6a223be3d5649d0eeffc6b3e2a9e8ac4cc5c480f3db729595372db9c3bf6173d6a2586ff SHA512 c42e3ff93bad56e8f586de51971a56a4f355f673487818093dcb7c1f71e1dfa86d207b2afd4fc2beef06327957a24d72412a72c1be6b7e10e4558aaad68b9690
diff --git a/dev-ruby/prime/prime-0.1.2-r1.ebuild b/dev-ruby/prime/prime-0.1.2-r1.ebuild
index 232551f4a7bc..f32c35dbc001 100644
--- a/dev-ruby/prime/prime-0.1.2-r1.ebuild
+++ b/dev-ruby/prime/prime-0.1.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/prime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/rbs/Manifest b/dev-ruby/rbs/Manifest
index 14f06b866348..9a3f4faca5a7 100644
--- a/dev-ruby/rbs/Manifest
+++ b/dev-ruby/rbs/Manifest
@@ -5,7 +5,7 @@ DIST rbs-2.8.4.tar.gz 1069703 BLAKE2B a7b97e2ba7b8bd5afca303d69262cd54169bfad8e7
 DIST rbs-3.0.4.tar.gz 1123563 BLAKE2B 335ba5d438b74ef36a65c1bd5d41508bb4d89a5273d413899f96684e6d97a6911ab157ad5b8acde97e23b832ebd2bd04517c37a3edc2fd66703442333d3fa5b1 SHA512 17dff709693c2b554178a31580ed48e863490fc527c86a8d823928379483665076c498e402c1dcb85c0ba401e6754e9c2d8cb9a48655952136521e6e7b47025f
 EBUILD rbs-1.5.1.ebuild 1180 BLAKE2B 01b55d7b617aef6141a955fc59ac2bda2dee8415ae3f7f89dd9ebf2d161ed8f39c95004b18ab8d3764bb29662cedaf6de42bd19fb8311084a45c6dff1f05633a SHA512 1634a3de02711d2fe1a5f7674df3cd9169689304a10d9f59720e8bc80630a2d2d8d905db69e191d7a6a09a6f5ec79b2c9ab4cc678be99dc8e3efacfda4186a45
 EBUILD rbs-2.3.2.ebuild 1868 BLAKE2B b0b276a68cffceb3e6dbd12a5205043b155af78e945c1b191633a29415e39b650735cf46147ce777a9660e271580e3ff4afefbe92e99091908be00845566bbb1 SHA512 012929a95f0a0843d3037a4a696606686d9aac630b99e10dfee6ab283a71534ce0089c3bf9fe44565a1a21336b3d64b39b7584beef283c4dcdc62eeaf6776dc9
-EBUILD rbs-2.5.1.ebuild 1868 BLAKE2B b0b276a68cffceb3e6dbd12a5205043b155af78e945c1b191633a29415e39b650735cf46147ce777a9660e271580e3ff4afefbe92e99091908be00845566bbb1 SHA512 012929a95f0a0843d3037a4a696606686d9aac630b99e10dfee6ab283a71534ce0089c3bf9fe44565a1a21336b3d64b39b7584beef283c4dcdc62eeaf6776dc9
+EBUILD rbs-2.5.1.ebuild 1861 BLAKE2B 3cfa5cb2b4286dfefb4a676e05966d736aa090a4953826014978cbbcd005117b53b0c8d70412ad46de9d0ef98c340afb699e6cab3a81faef622e1fd7e02b35ff SHA512 89800fbdec06baa9b9a64a29be97f80b916dc00889d257dc3b47ef04d046f51cc6829075e6f5c0ca903983931852c10d8362de8ac82300b84ea40d2eb1fe18ae
 EBUILD rbs-2.8.4.ebuild 1922 BLAKE2B 0812e3fe9bbe37a4d25fb148c40779e872151fd64ff89deed6c684f125a006d0bc8c3f28cb8691b089eeab7f91605e22bdf0e7ac4ba3f93fba274a0f2bae0602 SHA512 08f2d09f115ceb5a85f6d65c7320bb09582ea143cc00044c2f8ee2d58d278e0c4735da934823502b47aa70b95f1f91012cac88f5dc6c467fb53a2bd268108f07
 EBUILD rbs-3.0.4.ebuild 1922 BLAKE2B 0812e3fe9bbe37a4d25fb148c40779e872151fd64ff89deed6c684f125a006d0bc8c3f28cb8691b089eeab7f91605e22bdf0e7ac4ba3f93fba274a0f2bae0602 SHA512 08f2d09f115ceb5a85f6d65c7320bb09582ea143cc00044c2f8ee2d58d278e0c4735da934823502b47aa70b95f1f91012cac88f5dc6c467fb53a2bd268108f07
 MISC metadata.xml 335 BLAKE2B 287ad52f77f7c62c6fa58fcdb9b1c1498cf39010ab26b6f98655beef9719ee5803844b1ab084788af70087e342a02806a8619a8dee472bf6d4d0b2ea54d2152f SHA512 75703ccbe3a15813f6fd3fca2489a9b39e586f59ff2cd89ec8d7a6293760a8789aed715565520f0f623746932bd756820eef960e45fea5f130d34cf4cd586cb5
diff --git a/dev-ruby/rbs/rbs-2.5.1.ebuild b/dev-ruby/rbs/rbs-2.5.1.ebuild
index 038f8bc8983e..4e7f4970b3a7 100644
--- a/dev-ruby/rbs/rbs-2.5.1.ebuild
+++ b/dev-ruby/rbs/rbs-2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/ruby/rbs"
 SRC_URI="https://github.com/ruby/rbs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/redcarpet/Manifest b/dev-ruby/redcarpet/Manifest
index 95dfa4e58f00..e641174a4406 100644
--- a/dev-ruby/redcarpet/Manifest
+++ b/dev-ruby/redcarpet/Manifest
@@ -1,5 +1,5 @@
 DIST redcarpet-3.5.1.tar.gz 106950 BLAKE2B 2f84e0dbadaa79827d9d244988b19161996e249e493208b20b6339f0eccf73160fe84d79f11a23419573693bbc9c1faae61e690ffe5ec133f8a0baddb69d92b5 SHA512 348ee8fc56b89bb1b9fe0b004cab08e9542f3806a885fb5fb0ff58c9a0fa704ad37611484e071951ad00d1d337988d5dae6d240cd65df890f8fe0865e242608d
 DIST redcarpet-3.6.0.tar.gz 108308 BLAKE2B 0dc15dc6ee17fdc8a0a171eb268315c4682b95145c5e79168e004c38cd856bd68f78e48b1b0c14a1d20676630d197fce86905cf15be5a1af0a83103855a63e6b SHA512 6d20340b10ee495319c6d3d24a42daf6ce78d5daafd1a650793f6743cc06b0523a560f2dd3d13030025e3592bbf05663e4b9393607b81b1d76b8a0da5be2dbce
-EBUILD redcarpet-3.5.1-r1.ebuild 915 BLAKE2B 4fff83755f86b076cf063a5fb953c8f69202922b5253e8bb858a866e14dfef91f7aae410a6a47321c93e587aa003d6c301259d51c268c5d3c9e76d59bca2e37a SHA512 75276b0ed23089e911ed5815124dc361280dd4decf05ee8f8356443cc3551ba8133857ce2196bccfea718e8bb73d74f6dff81e46447b69741de32ed956059b37
+EBUILD redcarpet-3.5.1-r1.ebuild 914 BLAKE2B 9f0d6c8ed7b534771ac9568c30ecd875f42642ec67d597b6f5abd033a77322ab7105daad279f1af6b0fc02c25f360a7bd0b45bbc131e59d8aababcb9cd30dd38 SHA512 d6bf3e8e6c0c87a9e13a4209d300f6fee4b45ce7687f28d94b9fdcebdb923eef7140f848a61d7f46fe3828a28fd328638acb8bb0c31b5d4957310fe35a7f2d57
 EBUILD redcarpet-3.6.0.ebuild 912 BLAKE2B 7ed5e2b245a8faf3fedd553c84a97dbc4c35d34d26d7e4febf146e6d0dd25ca9449643916dbe5c0e03cde3ea077deb3f26d62c20480b5382096e92826080c77d SHA512 11c7080efe02a7f64e265a26c82b9ab7cd5d89d53bcb8ed8c5aed5bfad164922688a346cd56af63140673a2c68fff9ecd8fcf4d4fd5e592a2db95d7e4e4ed000
 MISC metadata.xml 340 BLAKE2B 6ecd160f3358aa991ab52f178132bb246abc153b05448664b38685281b3dc29704b99324e33bce621cb11266b673dc67928df1e7ea8866c382c1611b25ed4168 SHA512 aead34aa25b18b54c3348282bd72f3ea5672dc49593f34c0e59ee8a10e5c6d2043dd2c24f7e9e4ad8086931b70f67c0e041d2e78c91fea25906a3adb68b83998
diff --git a/dev-ruby/redcarpet/redcarpet-3.5.1-r1.ebuild b/dev-ruby/redcarpet/redcarpet-3.5.1-r1.ebuild
index b8adfc4cfe8b..915681b5bbca 100644
--- a/dev-ruby/redcarpet/redcarpet-3.5.1-r1.ebuild
+++ b/dev-ruby/redcarpet/redcarpet-3.5.1-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/vmg/redcarpet"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index 48d0d7bbbfc1..24089229026d 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -7,5 +7,5 @@ EBUILD regexp_parser-2.4.0.ebuild 946 BLAKE2B 1c488c5a84b6d816c9a57bcfdf9e20e6cc
 EBUILD regexp_parser-2.6.0.ebuild 940 BLAKE2B aef5d5bbf029567c80b3cf91ed733818383bb74a0ae9ca52832b111453a561936607e8dfa416a105a5e06f5c32fe5cade4d66913e43a41c400eaafe14ccbaf8e SHA512 564331c0ce7aa7a42fadee21374e74fe29b3bcd5a19414df67d64c944eabad1e3b800f45f0a16f66f50258c3f01167451f06b1571c06988cbb4a4ca738eaf8b1
 EBUILD regexp_parser-2.6.1.ebuild 940 BLAKE2B aef5d5bbf029567c80b3cf91ed733818383bb74a0ae9ca52832b111453a561936607e8dfa416a105a5e06f5c32fe5cade4d66913e43a41c400eaafe14ccbaf8e SHA512 564331c0ce7aa7a42fadee21374e74fe29b3bcd5a19414df67d64c944eabad1e3b800f45f0a16f66f50258c3f01167451f06b1571c06988cbb4a4ca738eaf8b1
 EBUILD regexp_parser-2.6.2.ebuild 939 BLAKE2B 0c19bc71956b4012d79dcb2c2e62aaf620e4d7782eb7acfd0ea9d2c121461d9aca0abd4d2e3bf27a7290c26d731621dd4d1c1c1f81e77f5ae1a8346ebf88e0bf SHA512 6c35172640b540a612a5716cf4b6ec813b54aef44a867df990754791017b9b9157649a8374afceac0ee891639ddf5959bcec0601e4286a86330dddbad5d82fc1
-EBUILD regexp_parser-2.7.0.ebuild 955 BLAKE2B 01d32470d3ba7497df24fc6d7b410dd72a29b3d9f78ac1aee5b0bfd534fde8094b26ca15ea1430d3f776bb4f7a06808d53afec811cf9764ff2c56f5e08ac1d48 SHA512 3f2487afe55e21b5fcfbff117107a500a37ee518d5923973e60780d44d43646dc4e40422af5a368ae6d93ee7f411495790b75202decce14616d18c9a04bd5949
+EBUILD regexp_parser-2.7.0.ebuild 954 BLAKE2B 25af7ea4b9df6d4a40805be19c32d1d0dc65344734a644f6d4743b4fccbe02ae1e4c43810f5a3afe411c3e77fd0e34db4184a95dd8203b5b719702388613d98c SHA512 3c8776fdd4c198254d13372fa2ad8fc6fa0c1e481a96c1742f38fb1d62a1878e7885e04ab2569eaa4a460c33f7278783f127a00398a24fba27abd568a1251a40
 MISC metadata.xml 346 BLAKE2B 91c8aefa1a1d1f9f8b70a36b65524b8e9bc41fb22d7e411e1501d74dde8abdf1fec981340832046edce885ee296cf1beea48fa57678bb5af2c39f957670a5f82 SHA512 15b3c9a8a7fdbbd2f782308687f6551cb626732c0858c2cc88640b8ac2246e453667dfe6e12ff3547c2d7e267304cfdf70fe913ade8d802c321a3df12b699a6a
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.7.0.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.7.0.ebuild
index 1fdced8fb9b4..5f3538a2f491 100644
--- a/dev-ruby/regexp_parser/regexp_parser-2.7.0.ebuild
+++ b/dev-ruby/regexp_parser/regexp_parser-2.7.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index 838c07a5cde5..ae6f84745107 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -5,7 +5,7 @@ DIST rouge-4.0.1.tar.gz 1041393 BLAKE2B f2c26a918b0365a1b65d938e8835fbe96cdedaea
 DIST rouge-4.1.0.tar.gz 1045005 BLAKE2B 4cbff8d855d36e2d4ab79bc7c125eb2e757f11dabfc5501f59687d7203d3ca1ac503a44caa938de05a99676b4fbe885dd7c012139dbbbfe110d5409e7d3ffc1a SHA512 02bcdcf57d3eb896a006513439930791e4a7486c83e1124fff8d8d2abe211d151b238b52dac1a14019dfed061a44ab249ce7979b94602df730c5684522320252
 EBUILD rouge-3.29.0.ebuild 996 BLAKE2B 8e158583c47d3be31c4f5b1af2dc3b585da5fa26c97bc1d6a58c20f658fe3df10356a093a5d86bafa6fab32970858cc87055ea5944fd6fb2d88322e7a225e603 SHA512 2f928af0f85af7e7b09fa4d0cffdb1a63d8a900a822663cd98b25b478a88d089246536c6c3313b4b0bbd3746918154bdea5ced9991eda83a509511dc7e8cce57
 EBUILD rouge-3.30.0-r1.ebuild 1025 BLAKE2B 04edbb92744037b8281a351096c8d6ebaf9236989730e1b102208217f94382f93c43155f08a485735fb0af661f6f854461c860e247706eb4d67f8d75e4dcbd57 SHA512 5903cc11f8252db6befbeb1e9e2252bbbb442f68fec1e2fa5e4b5d3d38110a55de0da9a3127a9709dc5ffa2fe39e04d47d044727b6f8da71a62529183366d810
-EBUILD rouge-3.30.0.ebuild 996 BLAKE2B 8e158583c47d3be31c4f5b1af2dc3b585da5fa26c97bc1d6a58c20f658fe3df10356a093a5d86bafa6fab32970858cc87055ea5944fd6fb2d88322e7a225e603 SHA512 2f928af0f85af7e7b09fa4d0cffdb1a63d8a900a822663cd98b25b478a88d089246536c6c3313b4b0bbd3746918154bdea5ced9991eda83a509511dc7e8cce57
+EBUILD rouge-3.30.0.ebuild 994 BLAKE2B 77391fc2ed5031cc149cad80a186421bf6c11e1a699123f4d04253e45deb7c3acd38965e6138923a1783fd509ab3f9ca53b43381d67559e03a3e1bdf995756df SHA512 aa95c26a6692b601816b56332247575c564bbeebba82dbfee56e5cc3b7371c112cb47e4407b7a15c14f08d6ba5084446b591ef3542f9f58d9e2ffeda39cce08a
 EBUILD rouge-4.0.0.ebuild 1032 BLAKE2B 97a7e01d220cf2168865a89b96c2a5cb48ce769810070b2f15e7c38c78f0808cca2fe80d3f504a3dfa0e4f1d0d9b2bfb66a70b626c4a0e39e565347aacccd19b SHA512 7fd8ace7bb1575ddac7fcbc839295d3bda7c7527c290daf73303a590f22a0a5dff6b9211730bc5089bb90988a54a8b1610913cbc9994da12ce8b5745ba38b400
 EBUILD rouge-4.0.1.ebuild 1032 BLAKE2B 97a7e01d220cf2168865a89b96c2a5cb48ce769810070b2f15e7c38c78f0808cca2fe80d3f504a3dfa0e4f1d0d9b2bfb66a70b626c4a0e39e565347aacccd19b SHA512 7fd8ace7bb1575ddac7fcbc839295d3bda7c7527c290daf73303a590f22a0a5dff6b9211730bc5089bb90988a54a8b1610913cbc9994da12ce8b5745ba38b400
 EBUILD rouge-4.1.0.ebuild 1049 BLAKE2B eca416f95f67735b25e44f1b6cda3f7abb1d59c448e6eb8957401e689e0c3b52627d378854e40068be97706f7ec05e0afdf8951d669e74a52e50da140bd88d09 SHA512 c7dd0330efb21a6070438142bedf90a82bf0a62b176311b4f5b6469922cd5e9643435fa5373058067aa1bd95e13d52dc50b4bc65fecd655c83f9d18bc5753bfd
diff --git a/dev-ruby/rouge/rouge-3.30.0.ebuild b/dev-ruby/rouge/rouge-3.30.0.ebuild
index 7650a50485e4..87576fcd19e2 100644
--- a/dev-ruby/rouge/rouge-3.30.0.ebuild
+++ b/dev-ruby/rouge/rouge-3.30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
 SLOT="2"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 39b82398264d..596f90bfb32d 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -7,5 +7,5 @@ EBUILD rspec-support-3.10.2.ebuild 1765 BLAKE2B fcde701c0554886322c31ddf8b8b84e6
 EBUILD rspec-support-3.10.3.ebuild 1765 BLAKE2B 7890f1d241eece860ba86de1d889539a8917aa8065b44e6caf83cfaad782da16ee7970db4575b023a333caf72fcf86a1ffaf89e10a607209a8b713530b00536b SHA512 746a264e2774ebde5fab2903db7b7f78e7154ec76899e1fa774640efbc800d92bd7f978db1c2d0bcb822d9c301cdcd7dc7dee873ed847d58cc5ae751e47395be
 EBUILD rspec-support-3.11.0.ebuild 2131 BLAKE2B e7a389de27cd9918d1d9ab0185f4f563bcba6907657e91293bfaef46893c522f46a198ab08c249789f8c02e7104c60c218e2ae84d37c162c240ec8f98c286fc6 SHA512 86a8a690d41c668476d5a6def290f48fca72418d310e5b0c9ba099b6effebecde94a13bf27344a4c0b88d6f94938694651eedd061f5a96cfffe2153bd8f1e924
 EBUILD rspec-support-3.11.1.ebuild 2117 BLAKE2B fa3617d0aba4c5d29ebae35cd007cda01c04c32cdfb3267102e07f2ea0bfd976e777f56b1cdb5331f6095e2d057091123a45097ba26aadc2d7a89697d35bd2c7 SHA512 9da54c092c16d087d5eadbfb4208785292ebe2c3b362c62f57f721fd00e6789d39d2ee4165cfbc5d743ac968a68c6aa64bbbadad86d5783cf2a37b5e3502c44c
-EBUILD rspec-support-3.12.0.ebuild 2268 BLAKE2B 030eb662cce4acbb514f759f8cdb74225a9d1d411ea57312d54e06c442c4f6657872d825c4b187aa8dd69d98872ddb6b7481d21718a03fac2f55c62a020fc8f7 SHA512 0cd3599c3e57d244139c80913583ec0c40b3ada4f9bd2c65b2ce01fbd54902ec8cb1d82b100c8d4b99b9bca03bf4ea1479559b026f8d17458e834fcb12a2c7cc
+EBUILD rspec-support-3.12.0.ebuild 2267 BLAKE2B 73030008a512fc307397e9f3e3b4b5220e7a1903da6676be20e9ee65ce31b821f7c174572c396c7a7f0efa7e3b9f4a1d8dfbf7ff353d4f149bae19d6ec3388ca SHA512 d862a6d8bb160fabc92178fdb0dcb8d9b7cb520af481189c3f08d1e158cd5f183c5bb90e9e3352dbff0f9570afaeca43987e9da6dfb3332f13f847d1f237ed2c
 MISC metadata.xml 346 BLAKE2B 74d62cfe1930a3bfaad9b1b14ce55b0de81a0963f1e4e5ba0f104ea51adac0ba86c7cbc38831630029a8e487623df0d279028b5d1b2391eb2bdf060582c80be4 SHA512 60c7dd2d3d9d103b3c0e505d62975571eab89bdbc92203c2bff8cd9b854dda3020490f9592464760798b8e5d973ab3be7b142dca2d03583b822fb0a83761a225
diff --git a/dev-ruby/rspec-support/rspec-support-3.12.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.12.0.ebuild
index c85aefbaa89e..c5e9c32493f4 100644
--- a/dev-ruby/rspec-support/rspec-support-3.12.0.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.12.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index ee30d3b45968..d673e772cd11 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -3,5 +3,5 @@ DIST gettext-3.4.1.gem 231936 BLAKE2B c225a3b0239f01fade9406d4e7704905971369bb37
 DIST gettext-3.4.3.gem 233472 BLAKE2B d1edc1e4a004412b21ca4aa9e0e1df2000626ffde42e81f092f3a19c3ce080ee4660e5cbcce6d3f9a77e30cccf5f942ef1fa7d12e8680f0a50d67f69ad3ac41a SHA512 144c7d0964660ef671494272138a29abc3b51de1a7d6f8ee920a73cefe05657eda77024c59009179f4880003bd45eeaae7a82ac57b387fb0b924bc0f6eb553ea
 EBUILD ruby-gettext-3.3.7.ebuild 1739 BLAKE2B 0e0fef41129ff2d14d6d6c42fd18aa590270a6df3d8db9bd728d6c1916410c3a1afa8bd09808e6222008da72eaad96fca18902dc33357473cb032ad3c4bf9fe6 SHA512 9c4d612a4a414150860c16f5aa93dac227cf1979645b77826c52b77e380691efee74c6782f9307b04e07912a76b3854438aee67446c50e78599f31d93ed58319
 EBUILD ruby-gettext-3.4.1.ebuild 1517 BLAKE2B 7a5356b377183db44db83a64d56e6980c8caa4cd71a589223ecbc8c4a23c2c49a53537eb7116a2cca7ef03892fdca9bcdefa1cae48a85d7d3128f8d6d4a8dfd9 SHA512 2dce800023a55559037be9877ce3a8cb5acc25d1925df5b9be96e8944c0abbe0107f7f21ba2522112287f7a2c4ac4a3ad368e50f3475a0a32531fbe0f8045431
-EBUILD ruby-gettext-3.4.3.ebuild 1560 BLAKE2B bdcf6f80ffe79a0df3b0df8e9ba52f6e1982a97ba4b9a90a7b0984f7bb3bf75a7ccd6ebc63bf945a6794852ab59c6c7984d34f2a81ad736a9b35616560ef9a7d SHA512 db36539d2be69ac5a6e79a17a25bb529f871dfc421be7b46effa6848467d32c012a695bdbe7ac3aa6c0916966979190d0f3d9b0d9bb812c8a4e97f6a3c7b9f3d
+EBUILD ruby-gettext-3.4.3.ebuild 1553 BLAKE2B 28c971fb90ed8832a4e3f2b749d13ef2ff571e1ac0b6f0070fc784e27837ffdb37c239a17c72ec08c8c3f12fdf60eda48d6b3e70c89cf9d9b6d3a88383c14eea SHA512 5fd5161089e403119bc613ffae05b202e4c36d17976662779756acba373ee4e56130acd033d5439978272fe18a2fa62b283137ddf573a45a68c4a0172c82683f
 MISC metadata.xml 330 BLAKE2B 240cd8ccd772b34535a5a8c79c30dbee969d061a6d70f388c89bcaac95a01ccb65be239f68314fb0f5aed655978f87be7eb34756633a7f42794077bb45e271e5 SHA512 8657b613372f01a686fe9861ac6285e79b1b90fc8d948f7631094f686a72a61df87df7dbeaabe41fda96a39cd5b013468532a494555e9cc787cf653c2dca1fbd
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.4.3.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.4.3.ebuild
index 36f8196d8724..6101983998fa 100644
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.4.3.ebuild
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ inherit ruby-fakegem
 DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
 HOMEPAGE="https://ruby-gettext.github.io/"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE="doc test"
 SLOT="0"
 LICENSE="|| ( GPL-2 Ruby-BSD LGPL-3+ )"
diff --git a/dev-ruby/ruby2_keywords/Manifest b/dev-ruby/ruby2_keywords/Manifest
index 8caad8bfda3f..520eea9bfcca 100644
--- a/dev-ruby/ruby2_keywords/Manifest
+++ b/dev-ruby/ruby2_keywords/Manifest
@@ -2,5 +2,5 @@ DIST ruby2_keywords-0.0.4.gem 5632 BLAKE2B 1d2d4a71823e61a14fdf15edc2ad8ed8df70e
 DIST ruby2_keywords-0.0.5.gem 10752 BLAKE2B 430ddd02ed59c73c8dfff7762a2f4bbee2b4514d7c8c38a9bf34928a254799cc9e7401672d92b926e4284b005ed6ce59eb2f4503cabe76c5200626b89055bfa1 SHA512 f6b9078b111e68c0017e0025ecdccb976c7a32f35c1a8adf9fd879db0c91f89eb9bd799f9527a846e28056f2a5fbf0f3610cda9538570288c493613c35c83a6f
 EBUILD ruby2_keywords-0.0.4.ebuild 468 BLAKE2B b63c734da0d841ffb4b14df5eb2909c29fa21f5d105cb76fd4ef3eb3b3b157fc3f9c5798bcba793988cbae8d10ea3df3f0d64e96d618ea0aa3b425ce42051792 SHA512 233ba002300fa6b246e52792acb48382219c768cc46639bd573f7f3a1261fd712febfad0662f8ffaa35e557db83c959a77b9d238a7069a9a3f4008324496fd4f
 EBUILD ruby2_keywords-0.0.5-r1.ebuild 489 BLAKE2B 11608c93ee048b0f5d2c55cd142f36a02ed55d32c20206771f5d3d6bcc7d6aba51ed5392fdb8783ab49bca535ea59a95022a88f540a16bf14589f8bf5dfe251a SHA512 e238c2ef0f30b0cd2a5e2dae59be25433d1afdabe4bd58781bcdb6b7c5082cb6588dea551d7f9a8931912cf3a531932844ca7279dc15ea22fb5a7cf5be19ed80
-EBUILD ruby2_keywords-0.0.5.ebuild 489 BLAKE2B 432726330f13a592ebbb983a7d06d6292cae9a594bf14fb575d0dbac230c810ce59532aec62aba08ca6c988fa4176abc8c4456418cf4901f4605d30778056946 SHA512 305a63d54ac2c5cf7d343a972d3c01041e08ca60039229db6aef5d180c9e3837061eadf1481b6548934423b3205a73621b2b975b7d655e41242b45d652f886d5
+EBUILD ruby2_keywords-0.0.5.ebuild 488 BLAKE2B e7a349dae7323f05c02ca000f0636b4a60de43ed45b543bc3fd1339d70019f8b3a8ab19f4c1e7224e6725446eef78f276b84c446bce9ea5e06e8934356b597ea SHA512 8de5743e86b56b4b2029e2b42cd40a335ead209a7b86551b8906a86cbd4a822eb48528b8e305c7a99996d48507e7f4148a08bbcfc68217ac84e37a9f8fbe0f7c
 MISC metadata.xml 404 BLAKE2B c3f2395aead0cca31763565c2ae30c6bc814915d2d402fae9506be9eddc279d41204eff59359aa5bf4fb67e0a8896d51936eb7c3ebbec97e32e2323008a4a34d SHA512 83d6d3df19864603c64ff832c9399ed6764b7bbb31f96b04c82d776e1e023cd25faf63fcfc2b6e91f1449b8729e723194eb8de7684efe5e23bb2af75f694f53f
diff --git a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5.ebuild b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5.ebuild
index 391ccd8d8d76..97083b750f15 100644
--- a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5.ebuild
+++ b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,5 +16,5 @@ HOMEPAGE="https://github.com/ruby/ruby2_keywords"
 
 LICENSE="|| ( BSD-2 Ruby-BSD )"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest
index 6dd30f38f8ad..5189e7bc1f5c 100644
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@@ -3,5 +3,5 @@ DIST ruby_parser-3.19.1.gem 777728 BLAKE2B 883c945e0b151ec937a710b1092ee72e8796b
 DIST ruby_parser-3.19.2.gem 778240 BLAKE2B b9a136f8aa93fe915eedc5ca16a54a8c21446a48db89e86f7936dbbd4ee913f7bc61fcbaf136cd1965bbbd6601634a6832a09f0226647cf2ea802689251946c6 SHA512 c71e7e76e37ebe6e9489e9f0bb963b7b34adc8f4afa73ea4ad90356579725bd1a234f6e015a9c19b2c294c1ffe0d6b093be838ec0059a61fb5866cfe9e04f18b
 EBUILD ruby_parser-3.18.1.ebuild 1061 BLAKE2B efe144589f1aab56609601e20777d3436ffe9dfe5e574c5b1633960889337ee5776aca705b45e768649fd48d30306883d1b51394ec7d8382e27664296abc3ec2 SHA512 1b42a3a4ad45cdad9c6ddd8648b794dea7f28f3728b88b00253a99cb0f1b604d66d0447578b3f0c34e3459176448f4299b17288e4e937b16bb27fa6887c595bd
 EBUILD ruby_parser-3.19.1.ebuild 1061 BLAKE2B ee62fc086503f91cd9cd208b780428c1865b320baf9385a23e6113f57d3cba5a57cd047f5554ef73b3b039415e7bb7909a74b64d079fc1ba5f0680467face1c1 SHA512 951d7d698a9cd0c3a8ee44f59abfa2fd59e4a9f53efe134381def013a159fd0c61ec8bcc5ec3094adb561c0ba259b304b3dee9b139551fcc5820c637115275ba
-EBUILD ruby_parser-3.19.2.ebuild 1070 BLAKE2B d4766b97c97a1847e92f9378282c1b7458d529bacbb0eebfda1a6a70d4cdc6280101f636cb68b475bbd3e7e433a055f5b36ba050efbf21c69ae9ba6bae4eb891 SHA512 f7d2b5b25cc0a5a3ea82addd45ab2a2ff1feec1689b3abed64dfafc44824ec478903efe4e99a3d199e717ee816d119353e712c520f5089425df97dd934421dd9
+EBUILD ruby_parser-3.19.2.ebuild 1068 BLAKE2B c7fe67eff68eb8697d6c0dcdf2e194bac55e311db760f10a00aec15dd4aa1171731028190222f66f9cb2230f200948405b9bb2337d7a19ddc94cb47e0fd40d34 SHA512 f65651d9168b3e12fa60ec6667bc110e58b9ea4692c178408d42420b6014a442f6c794baf5e31bd01000cf3b01993dda32524ccff1803b24661f63f5aee070f7
 MISC metadata.xml 348 BLAKE2B 10262df68f010eaed20fa390ed4feff5d619e168319f6477d9d70ef15a91219af5b4f49f89316c0350f3cedee9a47eb46a67c9837d22ce58ac190c55a747ac21 SHA512 66eb4ff6e49c3249c2a952b39d3738f3c66252203b16cd635aa04d59eed907cfe9c11197a4e104fd8cf0585b9f3d60c639e4ffbe7ddabb211266f60a9e348bdb
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.19.2.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.19.2.ebuild
index de8a1445f68a..7794b48ad2a7 100644
--- a/dev-ruby/ruby_parser/ruby_parser-3.19.2.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.19.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby_parser"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/sexp_processor-4.16.0:4"
diff --git a/dev-ruby/singleton/Manifest b/dev-ruby/singleton/Manifest
index ecdedf3624a1..3b4c122b19b6 100644
--- a/dev-ruby/singleton/Manifest
+++ b/dev-ruby/singleton/Manifest
@@ -1,3 +1,3 @@
 DIST singleton-0.1.1.tar.gz 4975 BLAKE2B 3957c7d622aaad6a71b5675ad950b2a4622ec520b59075df25a966609e54c2f47581ba35c5a004c67a1a36f50de13dacadbc96ee1fd113790e6793e97131787c SHA512 a0817b42e8b056488b999eca8de09d75efe79e5624f4817289164d90051c92279dc9f8a087e69df89bec913127c460b8b6586fde17b73e08d4ec5b6da4dec18d
-EBUILD singleton-0.1.1.ebuild 988 BLAKE2B 4ec6db8f4f9594e57f506d6c334eb4ff4506612e29c846c41d43a6e02cb8317a5ddfc4ffbf6d5979099dc78459f7b0f569ca60d86bceaa1ee081a7f6b5c88635 SHA512 9a1ab0767be87ca17961f65ddc51728b162150bb41437aa3d672cd051c1e6a19ac15e9d688bb91ac44cdedebf631bcdce272fea2b36e0e5a6d90e180a82c4b74
+EBUILD singleton-0.1.1.ebuild 981 BLAKE2B eb6d231adc127c149cbe919c845113fd66ae8c4fd4ef9befb2437164bb8677a02bfd904ab31910e52b63bd35708cda521f1377ddcae35c4122447c4f4260d281 SHA512 51422276a180e9052ba17d0ba4dcd609dcc0a3889f543c96b902ffb0a2f1f2ad1c2f4da113e02c1a3b4b6c0a310ef89b30c47a472cfc19abac8ef48be97c8d55
 MISC metadata.xml 341 BLAKE2B e45d6753c4c9675cbb363078ea6614bcaccab98915bd3dcaaf7215c8ad608eba313c81f3bb90ce05e4b19981c408c44acfb09f1856652bd09bc459fa1c977d9e SHA512 572ab9227b892081aa5b43a60b4cdd50a4ab0953e7e820403836d7c1f61ac011df9506ef3bc036aa32fbdd8752f0693478d02d02a938558b2a46650aa2c1a0f3
diff --git a/dev-ruby/singleton/singleton-0.1.1.ebuild b/dev-ruby/singleton/singleton-0.1.1.ebuild
index 880206c38d3b..44584adfc2e7 100644
--- a/dev-ruby/singleton/singleton-0.1.1.ebuild
+++ b/dev-ruby/singleton/singleton-0.1.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/singleton/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/sqlite3/Manifest b/dev-ruby/sqlite3/Manifest
index b15ddecc791d..50dae25431a1 100644
--- a/dev-ruby/sqlite3/Manifest
+++ b/dev-ruby/sqlite3/Manifest
@@ -4,6 +4,6 @@ DIST sqlite3-1.5.3.gem 3134976 BLAKE2B feece4cb67e898b9dd1d77cf229632bf87a083ff8
 DIST sqlite3-1.6.1.gem 3194368 BLAKE2B f06fc82454730ad136c0824258d4f0fba75d2e2e2aa160f3e2b928d128f0649292a42bacac19330d485695db7c833b3ab7396833ada427bbf35cc90120f54a78 SHA512 e0e25dd5b5d98cd1e8e1e7721d300ddb75138d68e9fd3d1a062d6eb1ee7ce580cf15585f086123027f11bd7325f41eba44e5a4bf20500ce14c0cd8d191577a79
 EBUILD sqlite3-1.4.2-r1.ebuild 2339 BLAKE2B dc4a27912d5f2eb983c99fa5899c46ffbfe6bf63ab888d28567108841b7053a5993339bd5b6637e1afe926d3440c376fb6db713e481b129a4063dfd66352b714 SHA512 84d013557f52120f323d655b1ee210698585507acfea8e21f3e1b39ae0ff96ce7e9da6a52b5d6f02c96751fbd2da6805bd15259374e131784901a011d7dba94d
 EBUILD sqlite3-1.4.4.ebuild 2360 BLAKE2B b91e2e50a6353d3880e9e426ef9c876849155e3b4c3a3ec64730eb866fda6894c4b8ba90817facad831d471685a85c99942319794c4d15a2b7e5c38d169cfd25 SHA512 a86e8770e1f61c5aa0f0707739ec6a111435acd3f503837b926509e00105a8abda453772f300a940a27ed08e63ddfb99d6dba400654e93c82e07518437baf696
-EBUILD sqlite3-1.5.3.ebuild 1315 BLAKE2B cd1daad8e1a67056741e66496422319213d94ca3c33ba1aab25d9d26a7ae8f5b32480b42da69e4adbd2b966383e2f760f8255387a596cae28df8e7f49c4d8453 SHA512 c57b470a9ce1dc77e2ac04caacc7d75c90b76a2766290ef8a73533c93da4349f97b857984917641460a3ab78b63daed0df5aaf8c1113e66e5bc8f98511ee3ac2
+EBUILD sqlite3-1.5.3.ebuild 1311 BLAKE2B 2d254a0510179f397f33ef79b02943e8952b89a633e927169be79f1aa788ce3de16bc7c7415f88f420cfb61492274a5cfb8cbd0bd2dcc739a342704ffd4b3dc4 SHA512 8a71d4b867020de20f9e2295eca37f176c55efafd1dc29c23b1a1651ae0e1293af70b111e3301ce9e9f17f36f39296c58806ae3fd4ef127a9570e43d7edb2181
 EBUILD sqlite3-1.6.1.ebuild 1362 BLAKE2B 4d6f2286a848bada833eab93fbf0bd95b3fcae9ab5a8cc2bdeebd576b3cbfbe5d227fa7409fcd8fa34be789c72d3d44430f0d696f12b3b5af532cadd7851ac5c SHA512 1edc2c9b694a762adc9732a8632227609e4789d47315780c3953239c666e33b0e3923a6a90f6d52112f7cae615f86b2699ccd5c82a599f7838d1b1d41c53bde2
 MISC metadata.xml 343 BLAKE2B 8246e0b7df67080839741f0258357ae19da18bd7ad8615bb77b943bc89db7560d58f95a8cba4e770070efc477ba56ee1f5c9ba098674ffc01dd5fdd9b912189a SHA512 541f2db81c9383013da74a8a54f318ff7535ffe5c6ea789f8ddc451f629a121e56b322d8b3a0730e0b27b111e16e27d8fa49bc5805a7c61fcf91ac7110ca712b
diff --git a/dev-ruby/sqlite3/sqlite3-1.5.3.ebuild b/dev-ruby/sqlite3/sqlite3-1.5.3.ebuild
index e585be1fa146..e398355d63b3 100644
--- a/dev-ruby/sqlite3/sqlite3-1.5.3.ebuild
+++ b/dev-ruby/sqlite3/sqlite3-1.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ DESCRIPTION="An extension library to access a SQLite database from Ruby"
 HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
 LICENSE="BSD"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/stringio/Manifest b/dev-ruby/stringio/Manifest
index 7a6d1ef598fb..b45d81399df6 100644
--- a/dev-ruby/stringio/Manifest
+++ b/dev-ruby/stringio/Manifest
@@ -2,6 +2,6 @@ DIST stringio-3.0.2.tar.gz 43051 BLAKE2B 06d3f5c64a1550969f8c8abdc0cfeec8fe89adb
 DIST stringio-3.0.4.tar.gz 43654 BLAKE2B 08f0d41577cae1acba36acc3823218649342c45fde58fd4a2455a40e3f80859e405db541f1f3a55b222083b2e30efb8d6a2396edb208b1cfd802b5b85c196a4c SHA512 835fa9861e2446512715315ecd44ea192f6209ab5a12f10d91f11ad156ba896737531a5074e7f10f6cd5d3500fd07036de7a9d0bcbce4c2ffe75822fbb28a2f8
 DIST stringio-3.0.5.tar.gz 43822 BLAKE2B 5b79def3cb154f4bb1f4a50b8eeb95e0841279d8500b0ad0cdae1f3029c2b53e8e3f46583ed0b5e289afe6636bb4610bc27a25e24acba5c7c1e679c5e4283f3b SHA512 d881dea34738e46fffaceb9a5e88fa3148979eff3571a6693d1d80bd01fbe236c0eb65bd8b2003abc0241bceff93d87fd3acd27b038b3a7bf6da65d492047153
 EBUILD stringio-3.0.2.ebuild 931 BLAKE2B 00a5f0c8b8f1b8959475980a4beeb9249cd8e2bbab917a7e2d71fd001a3821fe67dd48347eff553e2178f651c4a00c00558019b0db6bbebcba4434625d59b7e9 SHA512 f447057a01da8dd3b4a343cbab916d03d580ae40937538bc402daa9a742b5b7100bec6cbd39977d22479efe9ac32c5f147a198884e792d3aa9151ced23bfc4c0
-EBUILD stringio-3.0.4.ebuild 931 BLAKE2B 75ca644202463ac89dc4057e889480eeba9d66c22ff6b38e85320f6fecf76cd33560f34f840c7d46f88dc14b92d1b141f43226c84f5e6399e74bf2dc2acf73c1 SHA512 fc9aba5b3b2a55d8fe23ade8bc48d1df490af2a61dd30002067fbb9fe47577f0876c1ce8edf2fd6a14b2a716f2f94083ee97be499557300918a657a09bd4c06b
+EBUILD stringio-3.0.4.ebuild 924 BLAKE2B 54e75640e57d7bc1cde3c0afc2be47a9733427e6ab93393c75434cd9cfae651d0e188d2b2159f28452caf4f2e27f224a4c7f783ee7b9050d5a9ce14890cd991b SHA512 2a43fe8be2b0e790f48bfad716599960a3793e7e69b2bd34083e4af2d949b29a7ac22d7f58c2d282561624ae8c46784be6b03766f682e42c697fa66ec4b2f16a
 EBUILD stringio-3.0.5.ebuild 938 BLAKE2B a700529d42d41918b981e8c651914b3711d912df40cbb516b84c58748445127a57e11e0f9cec1db477b9683fb767ed1b884d248f43f51ed673911acbe56919d7 SHA512 b5d41b439adda8b668fdba4d1ca6e1d2c754c014b8b2fb049c5fb446b05ce013c11c969d8584d78ca460dc4e2aa53045f12784d727ed74d7ab0b361c209a6571
 MISC metadata.xml 340 BLAKE2B bd5f8222a43eb391d2d14a1b878fadefd9f8a322e87b5058d482df79d95d70f7ef19c54e7ae12dc29e7ffc84c72e630f0ca46ac095059263cdcf6047cb4fa4d9 SHA512 f1f32d2c4c13e19500a7ff23b684b180d3dba8a79e49b8cb57b80e265d09e06cb8b7a9e6b743158a140967b7ccbb991fdf51cb3a6e95be4e24378a5f85efcbb2
diff --git a/dev-ruby/stringio/stringio-3.0.4.ebuild b/dev-ruby/stringio/stringio-3.0.4.ebuild
index 5294b8d5dd24..402c9fb7a111 100644
--- a/dev-ruby/stringio/stringio-3.0.4.ebuild
+++ b/dev-ruby/stringio/stringio-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/ruby/stringio"
 SRC_URI="https://github.com/ruby/stringio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/temple/Manifest b/dev-ruby/temple/Manifest
index f4fea845b915..233680bb921f 100644
--- a/dev-ruby/temple/Manifest
+++ b/dev-ruby/temple/Manifest
@@ -3,5 +3,5 @@ DIST temple-0.8.2.gem 39424 BLAKE2B a56db910d1d4d52495806e907c74052c04e6b4843d04
 DIST temple-0.9.1.gem 40960 BLAKE2B f9c87bc713b934980cebaf79737eea89c82d845027cabcd67f3420da621f6797bd99481b1bb624a8894d71f4843ee3ac612f1da661991b8adcc002e2a12f32a9 SHA512 2d7c0c64fb51356599ecbd9119314f954341acf66d5ad729b7e19058628118509e14ef116d4ed549996d7119cf9a1f38de5818b46ef5a9a19473b0d007131e6a
 EBUILD temple-0.10.0.ebuild 556 BLAKE2B 298291251d45421f9b909fd677dfe0cb2ebbc66bceb829d45cb7a24aab2eeabfaf891c04acbf553af5329dc8fbd232ae72bcb9d402780644b65522e330ce69d6 SHA512 848d9f4d3d9aedf216a9cf23125cae205f771a358288557ab240d9a150d3737dcafb319d05ec67d763080392a91e26f5394167acb16fe47dabf83a0c33cad51a
 EBUILD temple-0.8.2-r1.ebuild 639 BLAKE2B caeb9de5f6c80b02538814d707379b5f4c626a65b7244e47aea2295a2823aa87a4efea4e76ed7b4bea31c70167dc59901d6d2f3ff27b39b42daee228d94e21ff SHA512 d2aff5073dee1825b439fcb52a9a25a8550057130939bcc01798dee1fdc5b2560b0ae5f7ab7c7c7bf071609c4586c1a2ebdbefde7abb1c294aa034caa1bfe690
-EBUILD temple-0.9.1.ebuild 549 BLAKE2B 099bef1e613725cf766f667e1b7cda7f56c5490902a256119872d283b81fbfeecd02a149057966b60ff5c0c168e4106458b6fd15249eb7272c981598a18fd978 SHA512 6d49a1038dbed5fb4b85dd63cc1dc92a7bb499680b67e650220199cd55e43b1ea482155a9164d28f9b00e5ef3527b61d7564ec2c5d82fcf5d4d2436e8717954e
+EBUILD temple-0.9.1.ebuild 544 BLAKE2B c69e16f64db184b4d6e05f6f907ce3df18a400dfd187910a5caa4b1f08d68abcaae2a326b1ce706813410519c3cda5129da0e8b8e8a17a7cb847474b5308c602 SHA512 9b2f75d58e32d624cf6f0a0fcdd7e6aeaf22007f07d95e28c3cc900fcd240dddc65703823e96ddf6d0aaa4e9542bdd6d8f6b86bfe69aec6bcf61b9b3ad6dd223
 MISC metadata.xml 341 BLAKE2B bb4b05f83022291b67e3d322192b7deaa8f2c7ef07990014ff3c1cbe82295beb599d649b90971b9ddbf972c1296211e2d829f14efc1d48b2bde6f1164e1ae290 SHA512 a9ab79fa9ff13f53b6634cd86efcf57df5810946275dd12a34fdf8eadac12153743cca92e98dd8ff4bc792f912cb9c72a08abf33a68b5849fe67776937e933c5
diff --git a/dev-ruby/temple/temple-0.9.1.ebuild b/dev-ruby/temple/temple-0.9.1.ebuild
index b03b25cbe6aa..f20e53581729 100644
--- a/dev-ruby/temple/temple-0.9.1.ebuild
+++ b/dev-ruby/temple/temple-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/judofyr/temple"
 
 LICENSE="MIT"
 SLOT="0.7"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv x86"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index 67a564452533..99406818b154 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -9,5 +9,5 @@ EBUILD test-unit-3.3.9.ebuild 877 BLAKE2B 861f609a2f8e291a5d42b7629583213271d08a
 EBUILD test-unit-3.4.9.ebuild 1012 BLAKE2B c50f36fbda2ba0908e7ad97cac30bcb05581259d8bcd2ae8bc57ec4861b0769a3b0d71ce321815b1ab75ef0e1bc554d928132920ca7a75947ff7bb252848b5b8 SHA512 faa7a1d74285fcae32ec2866b5f275b5f1a38e8486900e2f7d8204fcc7698c56fec5259c616b1d7acabf00ee0c7c9b2016f763b5728a93a3c6c6be15742e3f09
 EBUILD test-unit-3.5.3.ebuild 1026 BLAKE2B 6141b313c70165bedc81c103e89525042e4de959968f3d053864692aff3f2402eecfcf4bbf3440968e6325d3a517397736e950a379dd6d4f0d20946c4aa41395 SHA512 f639e3cc89be92f53118c48aec3992f17d8f20c9533ee8d3458ed86ddfbb8bbe856420ec989799da8af4c39cf01569fef14e4bdeac404f6f92059ce5e1d0372a
 EBUILD test-unit-3.5.5.ebuild 1019 BLAKE2B 91276046e497c0dd06f74d14add6e9fd64ecdb106a0f3472d847a6736efd85e52a9308a7972d44072d4dc1d7b4ee6167b1bd7011087f882c66372abb1b4fc67c SHA512 82375734294606c8af37dfacb91096ff5951d96e70db3e12394ce16386fe9e098406bc55c18874226d251714db6cbbc4127bbeb3528b3fc7a542f194cf7ab1b5
-EBUILD test-unit-3.5.7.ebuild 1026 BLAKE2B d9c7bd8f98fee39dcc13d01ecd17f60108f004daa74fd8709e2446e266c7736cc9e8984ff5eec370fe9638d708a53c62d7ba23483cc3586be473a5809bf3e4c7 SHA512 802cc51ae45fd35f4b94f9bab7c9c552387d75b99a2dccea4e2bab222a00e73182ed2fe9e28cbe8d32aa969814be02c4ab3377136dae34faf454e7ce8222a755
-MISC metadata.xml 338 BLAKE2B 3c26fa7de127d5d67019ecf239e8b98a56fe497b5b1ee5c0e43ae1f41c5032993ba4c8db5a22283058130ebd199cca1eccc8f0eb3d2927b1c69e1f8b55e93285 SHA512 42f8ada79c01ff6259be33dafc34529636a769bda5bd017b49c6c9af667665d5031aeafbedad6c1fd59c9b8d04a1a12a9b1da7f278bfe1b5e427eb0bebacb6a4
+EBUILD test-unit-3.5.7.ebuild 1019 BLAKE2B bc515f0a764837784ac99a562d6706c8597557f78bf6475de2db39840a0776faf14446868c0c43934c7db344a1c4e83a2d77645ef42c78f3d8529b8ad04a926b SHA512 b27cac29b5bba07ab4685a26b7aeb453bee65bc3178bab0b4ab9aec5eebbe88f7e594f833013c4e4b89feea51e9b2c3c7fae04dfb8818b3608e902b1234d1fba
+MISC metadata.xml 399 BLAKE2B 2603ce47ba731ac6f9a822859bf3216a1839716f833a87cf614fd4d4978204bcce30fd05acf0850f75fb17c7b35684607f3efe9e7dbfaa984b0e176e8be138a6 SHA512 40911471efcf83b2a4cf802732883ea3ecbcd639a6462c0609c91a473b50d2a6f79b7067fbadd701e16f78d3ef4a8418e3d6a4e40c90bfad1d4ac3b6faac2579
diff --git a/dev-ruby/test-unit/metadata.xml b/dev-ruby/test-unit/metadata.xml
index be9bb8e7b571..4b7391de962e 100644
--- a/dev-ruby/test-unit/metadata.xml
+++ b/dev-ruby/test-unit/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="rubygems">test-unit</remote-id>
+    <remote-id type="github">test-unit/test-unit</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/test-unit/test-unit-3.5.7.ebuild b/dev-ruby/test-unit/test-unit-3.5.7.ebuild
index 8bce777f6e24..8ca11d8617de 100644
--- a/dev-ruby/test-unit/test-unit-3.5.7.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.5.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/test-unit/test-unit/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="|| ( Ruby-BSD BSD-2 ) PSF-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "dev-ruby/power_assert"
diff --git a/dev-ruby/timecop/Manifest b/dev-ruby/timecop/Manifest
index 1a9c467b86d2..d26309ea2bb2 100644
--- a/dev-ruby/timecop/Manifest
+++ b/dev-ruby/timecop/Manifest
@@ -2,6 +2,6 @@ DIST timecop-0.9.4.gem 16896 BLAKE2B a8280726c8c46573eb0bc72af7b8c6f64ba4a3898a8
 DIST timecop-0.9.5.gem 17408 BLAKE2B e6234759af1b3bcdf8fa5403594498507a7ddb8f652e8698ab7ce0e4879fc99828953120ccb80c3cfd555b63bbb957b0fd2f25758c4add1803d288b1807360be SHA512 4b3aa4d2fe5b95b51119be61faf0c85539d56e1ad2b507a1df182f5d7882390b37bc8b9984ef54e1b0b42bfb0d205ff4f863d016e423d4499cf3b21f2eaed7ff
 DIST timecop-0.9.6.gem 17408 BLAKE2B 53afa8313be94fb8774812b014f11d9a134b51b7dafcc0fd8d91d10756e042bfd6d56b10f8072c1d606519e532beb2e02032bd4e3f6d45b4cf41dd968ba86224 SHA512 a5cbdf38caa5bccb9887a6abb5d99bdd1470c9ff8d52d19f0c46f116dc73b62512f76021adc1ec98ca4abe85ca61a4ab1e821d80980fa7ab3c821abd13b9695a
 EBUILD timecop-0.9.4.ebuild 1012 BLAKE2B 9dbe7e7c08fb40e4c133d79467163013df4fd1e6682dd0b470277bac86e523d262c088915c06d4a966a60505c7a8aad75eccba3c89c304b5bc7d424246ed776c SHA512 a0800c4abfa60d330c1dce81e0a7aff43fd0c337ef2818390533166d1ed550bf22e156bc69e3b90cfd41aec4c2bca5662109876f310dc2f1aae09b22720b48aa
-EBUILD timecop-0.9.5.ebuild 1032 BLAKE2B 962f59e879ec63ce6d146ca4d2c7c05993361a190d23528f06d9b6849f9d25282849f73e146690cc444a9061b4cdcdf70bdb019f0e118f772d675b89bee27b34 SHA512 bb060b39383f151ec9a2909a5e238b70ca509a891c965b87150e118c8ae4c81aca44a2171975faeec6d352f7a61254cb2689cb7f02bfd031a42b6571d5c3d232
+EBUILD timecop-0.9.5.ebuild 1025 BLAKE2B c1a0ba1550ac783fc0701f1fd1f15a524c4bbc3f460d2e5a4f901a5a549a8cd30ddbbb7bb6706461592afb569cf2c399843e9a5e3e0ffe0e98a30d42359e85cb SHA512 41552d7765f8cc6b53e23f7ecaf3569caa5c85b913ae7593d910d836f8285d91249359a1f1785fc271ac61c2397ddc8946675144a6067ff70e94cafffdba1478
 EBUILD timecop-0.9.6.ebuild 1032 BLAKE2B 962f59e879ec63ce6d146ca4d2c7c05993361a190d23528f06d9b6849f9d25282849f73e146690cc444a9061b4cdcdf70bdb019f0e118f772d675b89bee27b34 SHA512 bb060b39383f151ec9a2909a5e238b70ca509a891c965b87150e118c8ae4c81aca44a2171975faeec6d352f7a61254cb2689cb7f02bfd031a42b6571d5c3d232
 MISC metadata.xml 348 BLAKE2B bba76a39d1feb832ddef50069d8a62e8449ecb1db1aecf3388e281d908447f0d61cb8dbe0a41b08ee68e11293778cd3a9b150cd5da705e2f56f1559a5147e7d3 SHA512 86bd1dc85754e017925b4a527b459260d8cda42ceee3dedef549d415bdc5326705e9eda325af5761876297d0beb6210633ce1445cd2745565ee720852d86d13f
diff --git a/dev-ruby/timecop/timecop-0.9.5.ebuild b/dev-ruby/timecop/timecop-0.9.5.ebuild
index af40e7129a40..6dee71de2de0 100644
--- a/dev-ruby/timecop/timecop-0.9.5.ebuild
+++ b/dev-ruby/timecop/timecop-0.9.5.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/travisjeffery/timecop"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 # Missing testdep activesupport
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index bb4d2e2aa4ed..fdb2fc0c1335 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -7,5 +7,5 @@ EBUILD tins-1.29.1.ebuild 843 BLAKE2B 2abacbf3cf8e1afc0dff0b5f9f6602225d6f82f242
 EBUILD tins-1.31.0.ebuild 765 BLAKE2B 1d356161b176ebb86eb363a5ec19eb43b99e21ba9cefa20197a1c8ee95e47bcb1ca8ecca70e4c80c6aff5904e2ec2451bb76f7345a5b264bdbd1ddf99d47b29a SHA512 7f0462e9a04636b0db6a300aa928e4fff3778b6918d28a9014c5df1afbe517d45c15fc9c64c48843e24869f790b270d4800e36ac4195dcc65e2d6f72f8802a96
 EBUILD tins-1.31.1.ebuild 646 BLAKE2B a5caf9a791a0611a78cc5900634a8fa7f4dd219234f33103c2e74e6e15348c1948616944d6a8a7c25aec743a8a09d4144d45c4e5f5649f2f381530ce0d5d94ac SHA512 e90ec8ec08c2c843a4113cd36bcd5172e9fdf2122aab5a2e1c20fd892bd38e9989f2200d04eca9b140c3addf62a628a9c6ac7d8b6e0d97fc330b6e48b824a612
 EBUILD tins-1.32.0.ebuild 639 BLAKE2B c5cb154a0030e4963de6f08389ccf1c6900a3f7867030fb5efb7ba9aa11ad80a8ca2b3d9b47fab20722f64e3d09754f421aff43de4f37782126b11d2f6fa4e3f SHA512 3bcadad4b61284be5c9b81b5ff48a860e40542125b493728157bc8da96bd53f44b593e636f0fb582e2b0c17991ae726c1b1daef2a1f7e20ddb0d2e703e51e595
-EBUILD tins-1.32.1.ebuild 646 BLAKE2B e8a05bb17a9c026b9ba141e496e8d33195ace604d6fd575acaa267d88c9cc71ace1a0dee622b9d99faae5c3a09d259817bd6c5e4db9ca0d9bb26329fb7cdadcf SHA512 300ff3545b5be5ec9fae7b868bfa94991c9564bfae67036e708482eb517714d423a01182bae6837aeead35f05d0fb6329f90dba9dc67162350c1483731f5a5c6
+EBUILD tins-1.32.1.ebuild 641 BLAKE2B 2baac3c59aca4e1b3d8017cc7de683c80e85a2f618071a4d8884476dbe63cfae59e75a359f51e9b364a64e1e5bbd0753169173092e3d0d6b925bf690ddc5ba89 SHA512 e05e052a4c4b53855376a9d5eb10410b076aaaeb68fc0313d607ad537467446c2458cedd0589766fbcd634aa3211c5ce0acb7ebe4e40540714148bf03bbfc1f8
 MISC metadata.xml 337 BLAKE2B 488c14119bb23c3d78d6e3ea71ea808cd398fead5dcf2e2dde61c1ce7de8985b6bc440387a19378f5e123dc64b71e3561fbfe0303e87ff8a4cd79a7923183078 SHA512 e08cba10144c2eb80069fd8d8826053293e9d8d5f1ffce97048c4100af31cac83e672af0945284ba0e1bb169d4e9fad3c0eebb369cb35823b42e5dd4454cd79e
diff --git a/dev-ruby/tins/tins-1.32.1.ebuild b/dev-ruby/tins/tins-1.32.1.ebuild
index 5f245167c7c1..b00dfece4318 100644
--- a/dev-ruby/tins/tins-1.32.1.ebuild
+++ b/dev-ruby/tins/tins-1.32.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/flori/tins"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/sync"
diff --git a/dev-ruby/tzinfo/Manifest b/dev-ruby/tzinfo/Manifest
index ab169c1041cd..5645cc3d98a7 100644
--- a/dev-ruby/tzinfo/Manifest
+++ b/dev-ruby/tzinfo/Manifest
@@ -5,9 +5,9 @@ DIST tzinfo-2.0.4.tar.gz 224673 BLAKE2B 0c7ef231767b6fc00cf95b3e1c2037894b14dfe8
 DIST tzinfo-2.0.5.tar.gz 226225 BLAKE2B 44e6d65dadc4828e4b8803c0badf381e18afe7412e090c4d91147b144f300a8c0e3189bc8e8325625678a57ea6a1179a1ed277f5fb54230ce77c46ba6b0100c7 SHA512 a3c59b1f390b186356b9219b0fb18bb762d2123936553738e1068ba46bf0206c5a0394b1d46b5c7b891aa55b8afa839858837511f53e3ef0eb0e85fe3f23b57a
 DIST tzinfo-2.0.6.tar.gz 226143 BLAKE2B 8a7918c0edc1e70f3b805dfcdc351d9ec78f42a66973ec7cb0a8bfad31d9ccdadefe93b941aca5c15510ff857bd8282046e8d20d02f308934e087de541c26383 SHA512 88af68b13becc4b6b85b4653df95e19e24d8804ac2b2393ef03cfe551b5eaee827a5aecd2156a56572d554dd5239ae828a65e5c49854671aa1989f5c31ba320d
 EBUILD tzinfo-1.2.10.ebuild 1030 BLAKE2B 6667c23496b066d35f5a07840db39a6a59dace75ba283493fefb150f7020e533486a13016986a9d6d5984fa8c5b1f871b3e5aa4321544d57dc7a39001c5f80d6 SHA512 b5235a70fb5d8a370e9e2c57d93b96db53bceb77d1fa12ccdc9fb1e25f2f97f49d1f95ff31219b5c409ec259f4694d8f0331db9685afe6b76db2ac621e448955
-EBUILD tzinfo-1.2.11.ebuild 1030 BLAKE2B 51d592c907eea517d3d3ee59a94c26ee8e530a75ddd18b2708e9ab23a668eb29f8a99f830dbc788a3f48885ed7734feae7b2c086079397f1f8edd98aa900cd87 SHA512 b5283295bf0a796e4eec9c17c3868ba3399da9649344cd830afe24599f701164fc0b19a9553e8c5695543fbbec409c3faf7b21e433332c8f0f19b80f0d77d102
+EBUILD tzinfo-1.2.11.ebuild 1027 BLAKE2B b1cb6c45a3786d6e32e89fa7075d480f5b16b529f5d1547e0b72987f5d4cc99891060a61d86177c5f1bb0813e45515bdcb12fba51b2f3a7ed48721690eba3da9 SHA512 339a96ffdff0c843300103cbabc2bdfeebf1276ed228bb7ab74cb2d391055394cccb36ebe69876023c8878d827482540c34423f340917bd514735a8a8d994ff5
 EBUILD tzinfo-1.2.9.ebuild 1027 BLAKE2B 3d499bc4a9c72c6d840d1143d2333cd0b62b12ca0ec0264abedec95346fb7c272e9e2fda576e072dbd141fc61b669d99476479b1b9ff54e9e34187f58034cfb3 SHA512 753812b51b74e65c769e77bac182506c6d7ebc4670fe7fb25e1080215ffade7350f93b401eb3f61de7a2c6a52f7e74172b8257ba7e82510403b67cf7aa218f25
 EBUILD tzinfo-2.0.4.ebuild 1442 BLAKE2B 6dadae626081a2746c2df00cc70e9c3217a66cce36adb3badbdfcaea7a8cf59a8f34f12525a38eb5b629627167e1511bf64f252271bf29e99749d1178f9056b7 SHA512 039f1f569a05b3553cd75bc3f4c3020de84fdac559f39df78124dbb10a68e6835aa8a16e0ac22ec70e30bf798debab66e78f8bb75b02e9592d97814cd6486ef2
 EBUILD tzinfo-2.0.5.ebuild 1438 BLAKE2B 450c75d0c3f184a194fcefdb492fb05b7d0ac4651732fce913ac4bb8aeff743165b7e8aa50cf02d5712a938a408703e70237142286d2a7263ab9ae4623f73e73 SHA512 53fa4328a3abbf530f4f8c41832a1df91ec7aab5a8b761cb81ac3f6ad11595f96c36c418b7942f9cb7ca086ad1cc8a68655b36fb0635f36b01bc118e1eb50a75
-EBUILD tzinfo-2.0.6.ebuild 1438 BLAKE2B 5b3ec51de4ae2ac13df40d9a74df53a655707da67400a40757860a765a7fb51134f9c723d3ab74b3cb5ce794263f1e14418bf09b7f2050576600a273d0ec2c3b SHA512 d7dbf1cd395a7a0fdba13ad8d431a0690ef8111a282bdb7756bace24237bf322f40afaed905707c6b59f41836cc5d543209d33470b5ab803cfab94557dadc1a6
+EBUILD tzinfo-2.0.6.ebuild 1435 BLAKE2B bf2ccc0836e95cd112aeed4ec411bb60478a9010d0b2adbaaf003a5adc99507c456a0235d93caca5de452880325ef874cb998ba3c5a6cff19d0936ce1de8d420 SHA512 9d2c7c5e4161163601e375463a864cec670a8b4e78d718a0a24fa38f0365ba9aef94c97ffe30dba96e79c0904858010b117e238aff42326ce6aaa237e7f6f10b
 MISC metadata.xml 390 BLAKE2B 899629cf25c7046c47e5e6349fa812c5a0e68dfb3cc73df69c1492729992a4fb70c927671cd8847211fc1a3b86fa97844561dc97a442867c3181541824753ff7 SHA512 2b5ef8fce5c3f34ed25d124d0997fe20c1bb9a1ad880e5729a1d6ddb59a8e378fcead77155d4d81f39293d582eff9e8b32fb5f811b508a6764fe5bcc654ba926
diff --git a/dev-ruby/tzinfo/tzinfo-1.2.11.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.11.ebuild
index e1825e3ec024..57ef649c13d1 100644
--- a/dev-ruby/tzinfo/tzinfo-1.2.11.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-1.2.11.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://tzinfo.github.io/"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/timezone-data"
diff --git a/dev-ruby/tzinfo/tzinfo-2.0.6.ebuild b/dev-ruby/tzinfo/tzinfo-2.0.6.ebuild
index 18d779bdbc52..36d94a853920 100644
--- a/dev-ruby/tzinfo/tzinfo-2.0.6.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-2.0.6.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/tzinfo/tzinfo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/timezone-data"
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index 808c2231eca8..a4eb85e049ad 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -6,5 +6,5 @@ EBUILD webmock-3.14.0-r1.ebuild 2208 BLAKE2B 844a2c2e80e49ac585198d4c9f367f9c33c
 EBUILD webmock-3.14.0.ebuild 1993 BLAKE2B 3859ccfeb43a7a4a895b2a3c3b49cf1a8c5f0fd5f9dd2374d90393e8c8828a0206e2da676046069560ee6c9526c33e351e7e1271dcdbc4b46ea9f57d21294eac SHA512 03186e23bee7308be8291d9f673f8ab1ba5f1db7f8feceb11a59b1fd7aa60aa3f32052106e946e7b569629c343cd8fef7d0d0ca44eb4299e717ee0000127dad1
 EBUILD webmock-3.15.0.ebuild 1999 BLAKE2B 62a8abc749c77b2afed5a742295419fe1a6fb96d8c7f587c8057ce71b8ee7ec088e47d59e3631ea2ff5a5770a5adbf1b3efc6b367e5b503e3d9837778b02f897 SHA512 0a2d98ae3ad282b4c18855acd8e5c16e9cf60687cabb79c3ce605f25e4804e5f3e9ba4379241b6aa3240889b1bb2f3f0eab9d1bd3d13bac6ac55017ef27c927f
 EBUILD webmock-3.17.1.ebuild 1999 BLAKE2B 62a8abc749c77b2afed5a742295419fe1a6fb96d8c7f587c8057ce71b8ee7ec088e47d59e3631ea2ff5a5770a5adbf1b3efc6b367e5b503e3d9837778b02f897 SHA512 0a2d98ae3ad282b4c18855acd8e5c16e9cf60687cabb79c3ce605f25e4804e5f3e9ba4379241b6aa3240889b1bb2f3f0eab9d1bd3d13bac6ac55017ef27c927f
-EBUILD webmock-3.18.1.ebuild 2006 BLAKE2B b3e10324b52077b8322fc17b7e9203eaa27ea6bf3d2819606964e5e9c461648473344862d407842bd54abf0f357f11fd9fd60689c5e11d2422d4b1dd51de873f SHA512 b8418de404aef6caa1434e2d20ebe61b8cc4866236476fcef5af38a0d11cdf33a43155200365923448ed604ef85b5b01f9cb180c470148b37702c380d55a5e88
+EBUILD webmock-3.18.1.ebuild 2000 BLAKE2B 0013c6e4f1b321df238a679fa3f870d1f3f0490828458710469b99f92ea0db75d37cf803650afa4e8fa6603dd87de57de22016cf828115e6510d68c0ee490747 SHA512 fcb9d3e649157cff6a002d66df6aa072faa45f993c140dcc7ad42fe314db316107feef1617b427940d0a3d0af767f9579fcc023051ab22b3223f8e78d9273dbc
 MISC metadata.xml 342 BLAKE2B 0f0b9d59bb3519e6da06fe5d57cc9ce3cc1f3a1f516006a3d43a6cd3c416b3b5d9d2955a7800a588010b9672f3a03fb6a74bc62c3ead8b2e0f0b3ce0f5af5456 SHA512 0c4f9ce8deb018a77c7ec77417a22d3b95d0701263acc1ff07081e4e7ef995051ad2eba387962ee06b4bd810db5da7e2294e1ca7bb9a50704f7d7265b8462997
diff --git a/dev-ruby/webmock/webmock-3.18.1.ebuild b/dev-ruby/webmock/webmock-3.18.1.ebuild
index 9ea2b1c6e9bf..66ca71ffe25d 100644
--- a/dev-ruby/webmock/webmock-3.18.1.ebuild
+++ b/dev-ruby/webmock/webmock-3.18.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/bblimke/webmock"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/webrick/Manifest b/dev-ruby/webrick/Manifest
index e038096bc969..d2f0796c001b 100644
--- a/dev-ruby/webrick/Manifest
+++ b/dev-ruby/webrick/Manifest
@@ -3,6 +3,6 @@ DIST webrick-1.8.0.tar.gz 91072 BLAKE2B 9275458772048d68d5275e19e6c1e2c13bbedaf7
 DIST webrick-1.8.1.tar.gz 91111 BLAKE2B eff3f2dff64d017fa0ef5370b07d97bfcd39f1df426a3b04ffdd0b5b0ea43cdd5d267420ea64bd0c3e4de3f1ee88df2f09959fd17b2b158b5ce0ddc16995b2bb SHA512 21cb396887025f85cfe04868e7fa7ef039809ca42a3acadfe1decb4dcd02eeeb3c9163e970324b56a9e0eb6202d971370af56e200c69de2d224c1941f866400c
 EBUILD webrick-1.7.0-r1.ebuild 770 BLAKE2B 830abe14988a2a8464b162425ddae89f3bcde8f03616982859b01a91947a793049fc40e1f8a84a93028890ebfe6c7ce25015ba4228b4a63d9fc737c43b5bb369 SHA512 c7162592ba23a1ab1fe3d5b0c56561d4f1ed07bb29c88908cb5bec2f36a4666afe815d18c47f64ba70c29751128d5f70c9c0b64781cd4b0aec5ee2b4f6521fd6
 EBUILD webrick-1.7.0.ebuild 755 BLAKE2B e0ea0a032e26ee51dea80db46f60df4ad19e82a30d0192e69bea26bd2704a496a89e8fbd9b1e197357c852b1423830a9b6a71ccf5cdbdc74fa1dd9d88cf0be32 SHA512 0ddbc1917d25e88e6b61bb3797269e22a076b1d27e5b2e068d6cb6f921146a8efafd264fafdd92bc637eeee5403453a8b2a14a95ffa013a6e49bffe9bd103815
-EBUILD webrick-1.8.0.ebuild 763 BLAKE2B 7ad3d1e2420871eae3f80ea58287e7e92118dd3eeb00ab5f5da359752964084021b6012555368c98650be0b98ea9ac4c8f0448c7c5ff928568c81c3ec2b8f806 SHA512 f4ea8d3fd29e76b422d274c345f3ed3f63ace84a3e78e31aecf119246a6b31266b01d24b7a987e1bdb80d3422fd8afc6d0e1b1b234d4df320e4f47a4cdfe949f
+EBUILD webrick-1.8.0.ebuild 756 BLAKE2B 25ba53cbe596c54069bd471949beaddfcd3521a0e33e35c870de9d6aa1f20841af41b28f602693f93dcd6920798d409cb25c89d37184ffdbe4845f1214665c42 SHA512 2d07b5875e006990871618450bf6a64649f2f9d78f30cb27387b58c363c6234d012a6e4d8c425cc279ee52bb85f756ff6f4356e258313100841f9258539f32f5
 EBUILD webrick-1.8.1.ebuild 770 BLAKE2B 830abe14988a2a8464b162425ddae89f3bcde8f03616982859b01a91947a793049fc40e1f8a84a93028890ebfe6c7ce25015ba4228b4a63d9fc737c43b5bb369 SHA512 c7162592ba23a1ab1fe3d5b0c56561d4f1ed07bb29c88908cb5bec2f36a4666afe815d18c47f64ba70c29751128d5f70c9c0b64781cd4b0aec5ee2b4f6521fd6
 MISC metadata.xml 339 BLAKE2B 818ee09423c4ed53677cff830ae592234879035757260fa554871e0180d47780056eb8c301678428928a841638059507ea2b170abd758f8c73546fcabd675b49 SHA512 4abab733deab5e4609430f0d51f7634fda1879be7694720e683b0d9972691f41dbfe7fe9e7d252cddb9ac5a449bdf521b0d3b10acdf510e02c3b3a8bad578b71
diff --git a/dev-ruby/webrick/webrick-1.8.0.ebuild b/dev-ruby/webrick/webrick-1.8.0.ebuild
index 968dc189a545..ed238f2df4b9 100644
--- a/dev-ruby/webrick/webrick-1.8.0.ebuild
+++ b/dev-ruby/webrick/webrick-1.8.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/ruby/webrick"
 SRC_URI="https://github.com/ruby/webrick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/x25519/Manifest b/dev-ruby/x25519/Manifest
index df4c9b6659a2..6a859887f390 100644
--- a/dev-ruby/x25519/Manifest
+++ b/dev-ruby/x25519/Manifest
@@ -1,5 +1,5 @@
 DIST x25519-1.0.10.tar.gz 44353 BLAKE2B 5ad7a7b68af8bdc5e64692b9b650504df3d152c63c6044cea6978e42cef856dfbd3c0bc9261b014eab80a3bfcfaaf6c7a85675806aa9529e6978228ce2956497 SHA512 10a2baeff5be2eca31ae96893f08877ae351f6c7d30d0cc5d2a9b63ada74733ab30ed7dd709b26802d3f1a130aa513747a32c370d031fc95b136e3a699eb2987
 DIST x25519-1.0.9.tar.gz 44042 BLAKE2B 65129fdfc0c40099487da3eacbd91436b625fd1224d58139a09d2ec571cb063f69767d468c89af512b0bef81912786b44b6923afaeb4a14f97a47034b702d848 SHA512 48349960b69f88177b772f431a1751ad190a9d71ebb01e0aced7dcc278a18c2e7cb1dbb621524950685b974f2f63d23039973accf067720ce1b74c5bb1eb4f77
-EBUILD x25519-1.0.10.ebuild 1150 BLAKE2B 1233321acdb854fe4275c8f002abce54d37fea032ec6f0709701f3f433c254591e551d3570e39259b4426dcba2aeb4d7a50e2a5dcd45e1f7648b3901227e37fe SHA512 ff6fa82d9174db788d7414a0f86277745a1283e79c036beb8cbda8f6977f4bdd0d17a6eaacfc1f4a94c027031787fc3600bf013bbe06c107ae285fac666580dc
+EBUILD x25519-1.0.10.ebuild 1146 BLAKE2B fb382068ae5d86931e6305cb1d8a06c241bc581248e5ff4675fe303c49327715750f513c713307cdde20cf43a38f65aa51a273b9a19acc68ad9fb6fa2a58581a SHA512 334d559191f1e0aee7184f44fd02228348b31bb20fb360d09a7bec5835bdf3c13db7aac0aa68453762127f912205d20748a5f29ea451c3f269fa9cf016b43b79
 EBUILD x25519-1.0.9.ebuild 1146 BLAKE2B 49fe6ea18a69fcbc721d24dd6c35d641bdba7a01ace8e1cee0c6e5435503a7b947883c104f601a38a9772d540327496fdb3da093dc3e2597dd9a99d56be9611b SHA512 67901427c0a1c4f7ff54d9523c8d535d8e4010e41b6f2a575e8ef16169f575f97dcfff9f8a3a8e9ced5462b707c5abdd042bc28cc95256205d9f715a182077b3
 MISC metadata.xml 343 BLAKE2B 631f98e650ab9501279546967a0b1370ffef39804a457f6c1a212c3c266390b14e29f36b7ccf83821511eb5b37d14e0fbc59f6111603ce12915898aa93b47668 SHA512 d488f02aff4b6c4e860e65782a7bafe647b84288076a4ca4bd8c8ec537151fd26b4baa7fa34e4ac34c46199d4a3416658c0c638996a15967ccd41cd6dce27bf5
diff --git a/dev-ruby/x25519/x25519-1.0.10.ebuild b/dev-ruby/x25519/x25519-1.0.10.ebuild
index adf56b6d6bbf..069cd7396995 100644
--- a/dev-ruby/x25519/x25519-1.0.10.ebuild
+++ b/dev-ruby/x25519/x25519-1.0.10.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/crypto-rb/x25519/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/yajl-ruby/Manifest b/dev-ruby/yajl-ruby/Manifest
index 453fb91082af..3834b200ef68 100644
--- a/dev-ruby/yajl-ruby/Manifest
+++ b/dev-ruby/yajl-ruby/Manifest
@@ -1,5 +1,5 @@
 DIST yajl-ruby-1.4.2.gem 558592 BLAKE2B 620db8f9c5ef4b010143382a2641793bc7a59f30d35a759470aa85b50e8b0e587e7442cb0727e2fe03a98c7aa3cd1f5bb05d173294743bc8fdf2d646176e11b8 SHA512 faf775367eb3143fe659064569a235b34557b84b21bf55f9e9fc6f815dce04c8c1b58832056f367fc4c9ebc0e4389d1e55dd79b5fbb773f845860e4652269d4e
 DIST yajl-ruby-1.4.3.gem 558592 BLAKE2B f4ea86014ed7570530e77ba4a2c67bf39c998b816f6100a526406b62ee8c30bb3b7be61853432cd1f6febdc19b20596915a242b2f47645da734b21f2a2c879c3 SHA512 8cfde677f11ad80a468dce7876b97aa87fa35d78fcd727d4542e00c09cc28d1cca3301cf7c4e1f773edf2192262ec8d6ffab93b11d488d2b048d8013f6c7645a
 EBUILD yajl-ruby-1.4.2.ebuild 1082 BLAKE2B 7c53fdb2995b33b53a2d6b0c374ffb09d13824af0bd7fbf09e86acee411e9222350ad8bd761a168dd91507edff4e525231dbdbd87cbaab48a4be4a2a82db408b SHA512 fdca44a44eafbf621566dbdc6383932ec0121d16931e2c2fff403b58cab17cc8330e05a31a800d3173924cea050da5b6185900bda40baeb1ac4972a550bb359f
-EBUILD yajl-ruby-1.4.3.ebuild 1089 BLAKE2B 735c27f85c0f61f2afcc94152bd683416a414b13e1d4c3692ed1c4d378f6fc78457915894ce3566f096af7ba44b1048bd1049b0d3b350ca858b7d53e49274b3b SHA512 94cd37c18b37b93b75eeaa63b304b49bcc1c9ae16e973e17419840636a586018bd411db4ab0a00fbec9d2baa6fefacd0122d4e7636f2723850246d4fe6c33728
+EBUILD yajl-ruby-1.4.3.ebuild 1082 BLAKE2B d8c7f8b6bec4544045d86600de82d75f2e2b8de9071a060b434e7507ffbb8ccd48d73ea8ee7cea2fe20f71c6330c2e36b116bb567ba2ad0cb952a48dd7a224da SHA512 855308cab1eea9b8b8066b0008f9985d95b2251d5f4c06a669f91f4122b02c2bce8f12472ffa6e5c99444fc72450f8e65ba1841361fedbdc48a5d2f5a9cdac44
 MISC metadata.xml 347 BLAKE2B 30c40d137c44f1f3e97af535260d3078329e3194bbdcaebeeb63e5c4f21ee6b6282349d0d32fbdf8e9c624a6dddef4a1393b67c4cdfd90bd1856c67d8c255a7a SHA512 3973f86d3ad549282ef3bd9e23e7a2e03451f6c4886824e845fb075f2162db1dbb96db4de2ab5850ac24c6955ebbd4ed4376f45d89c657b645df54ffb8d47111
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.4.3.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.4.3.ebuild
index e1ae1fa3528c..964bae773bac 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.4.3.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.4.3.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://github.com/brianmario/yajl-ruby"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="${RDEPEND} dev-libs/yajl"
diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index c47eba066a8d..4f7e96dc2b47 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -3,5 +3,5 @@ DIST yard-0.9.27-git.tgz 932022 BLAKE2B 7390e81081c6785cd7174b9ece57dafc27a9762f
 DIST yard-0.9.28-git.tgz 932436 BLAKE2B 7340f6815698ddb85aa16752266af75ecd3e1f1a5f328e147dd8ea01a750c48259e6f3413bb5d00777d4e983b340b36b21110e058cf6b326973c0a7c3d756836 SHA512 f57ce1f63ab1763729c85121cf1ac5927d4f7c53eed2fb58b1ea7d700db22481e767926845558d3db31bcef50d0181f0b6cf449e558a5548243256cdda0cd355
 EBUILD yard-0.9.26.ebuild 2058 BLAKE2B 4950a872e570df40aadad0bf13a59ab99bfe09684dbc8eb5146f0dad2ce9bd7512cdd576abc1e3b7cfd9db512c08b9ed0629bffd828d40c7cb91bfdf561b54a3 SHA512 efba53869ead017865a1f44e904343c3b5878d8e53d1323a1e9bd6e348d4235557ab8fbeaad40ed9b715d76e239dbdd70a394275880e139e2b2e4b48c6e328cd
 EBUILD yard-0.9.27.ebuild 2107 BLAKE2B 310fadf5ef71df24d357e26413cc57de82edabd99da37f74c0eccb26ad4d41bf182ea726ece7313d11d396a6a6c5c3ac533bf5ebb2d69d8b3eaf9951be3504bb SHA512 afe104124991871f3e0be67d8acf79abb9af269ff1f52d6a5f81b0a1b1ec74a563b81f4321af255118584d4b49acc93ed92ea362262f30bad9609cfc31db3228
-EBUILD yard-0.9.28.ebuild 2601 BLAKE2B 20c2332ca52fce35463b44502790a459058e0a364532a91ba77cdfab8a0079e96e59ef885f5cb45abb1985786d8480a0ce3da3f58ebf11453148c566a1098b6a SHA512 e670b5fddf85b36a6f384ff756219c426f079052f12b304d42a808663805e97a3496edfc53170d32faf4c2d8dfd30753685e394ca1f66a7d0862db5ad8a3e111
+EBUILD yard-0.9.28.ebuild 2594 BLAKE2B ddfc39712bbab8d6b1d2817ce17da545685221ca41d801f2fb4cfdc902acc60d5f1806738d90b7b07e4526ceac66d8b893f43aa007413a90f5537bd20544a6fa SHA512 8a35ef3afe06dbf6cbbfb71b3f216a7a661333f26e5fc74f054cd3b56e146cf45cf113f1c827ecf247359a03795be062865394c679aa59561238cdf62ce4df12
 MISC metadata.xml 338 BLAKE2B 17efe658faab09d5935ba472a803a1267f7606a44b157f29bcdecc8cea8af90902ae47012fdd4426357a8ceba5526ca24d737be8fe161c34e28e5362ccc94f16 SHA512 d1f45e2202c86b247b1b872ada72fef392d20260bc3ccc78164c26614dc80b8fe05518356248e3e7f15e2c70b29a9c0909bc738267261eb808965bcb0ed4ebc9
diff --git a/dev-ruby/yard/yard-0.9.28.ebuild b/dev-ruby/yard/yard-0.9.28.ebuild
index 4d0ef4ff8c9e..7b5037d2ffc3 100644
--- a/dev-ruby/yard/yard-0.9.28.ebuild
+++ b/dev-ruby/yard/yard-0.9.28.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 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/webrick-1.7*"
diff --git a/dev-ruby/zeitwerk/Manifest b/dev-ruby/zeitwerk/Manifest
index 4ce09029e836..803a7b210456 100644
--- a/dev-ruby/zeitwerk/Manifest
+++ b/dev-ruby/zeitwerk/Manifest
@@ -6,6 +6,6 @@ DIST zeitwerk-2.6.7.tar.gz 122658 BLAKE2B 7435f8fb117be8186d56262c0aa8832132105d
 EBUILD zeitwerk-2.4.2.ebuild 900 BLAKE2B f944c93347913374c6f1d50e4cc48d2c499fd6fce7b10f411795fb5bb2708262fda6ede489ae3c32e6b8aa03f3f933d3f878ffc6e928c491d5ced3c203e87e98 SHA512 99dffffb4ed0dff209f0930224cd63b552ed3a3c8f229976d2887ce0cefd4132851e0aff0bcdbd1d8635c1cd35a255d13ce77824a802ceb217a7b1a62dea3748
 EBUILD zeitwerk-2.5.4.ebuild 914 BLAKE2B 7f6775c8e6cdec0f018d65c0870adb2efef1fb3e106cb49d466869e8b30a31a86652ddf486d0d7555c4e3c00503bbfe851d05d1d1cbe8bfd8cda7c0263cd4011 SHA512 09d444e6014319ac58be4a4a2dd5c41a4d0c8a44069ceaa62e97c503b062b62222e94c1e1bc6965ca9a1c76103c077ef32ade09af1d608449e7b710e051990af
 EBUILD zeitwerk-2.6.3.ebuild 908 BLAKE2B 1b1e83eb5cb7291921d18dd162c5c023030ca179627d8af01971c9d455cd77c7c367c3c7858c3ead8c3e9a8c1e6b265e344d2c7904c422171af54c5cada522b3 SHA512 99686b85847980f08a6be0a7f3745ad16579d75f4657b5655f40cc065fe6230a01f4923f744117b25d7f2316c30e7f3fccf46563f1195d9159b679b416138efa
-EBUILD zeitwerk-2.6.6.ebuild 915 BLAKE2B 49ff0bcd648d41bc1398c25ca8a83ce86698d784547d211c7482d8004949d4ba5dcbae5cea1d4a91d518968f581f77f7b8f72843d5155209f1606951442c567b SHA512 d7108ad2099c5f757f98fc77aba06c10b22e0a283ee09877cd63478881b4ccad7b23c58c5d017b3499c9430ac99e7dd5499b82253052abfc6698cc9f8cc6f0d0
+EBUILD zeitwerk-2.6.6.ebuild 913 BLAKE2B f1019e005d7b6014abd1f113abf9dbb9308f2042e0becce02c5788c4f00ca7f04ff58d1c416684702cfe8aad3275d127532da59e80b9dd6fca211e36768a69ab SHA512 b8bf0450d522033e0bad3ce57a0b33e330bf1cc808c8fa5590671ad13a8d0120541515a599675f21a45d2301c91f330fafa45dd57d5f1c28f0baf2a565aa36ca
 EBUILD zeitwerk-2.6.7.ebuild 1088 BLAKE2B 30f8ea7ef31f1da7a30390bee5e975f2f18c912b3cdca6d196c2292f5cd0ec6d810b4b9241685715e16191075051367dd2ec216bc177a73d4fcb2708253671c8 SHA512 badb2f6ba8cdd6332a773d139c50507c3fe77cd7c6af35407c93752a000f471e70c784be33b752e01d808087456217a4b8b585340e7a432d17556c433f14f0f4
 MISC metadata.xml 641 BLAKE2B 27f5d9950eee9945425ab5606b78e7c745345e49dcfc201b55bf52693b3882d44206a82af09134696e694e524202d9c43f642c0854bdcf640356db8f8c84972a SHA512 b744fa895c31a93a5566151b3b3d73308ad41a7b43638ccd9aa00c9fceda495279d32f56e9c68cf44adea06f0e6842e38324c2f20b412e46f05b78c35288869c
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.6.6.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.6.6.ebuild
index 28662ff8033a..d42e0878bd90 100644
--- a/dev-ruby/zeitwerk/zeitwerk-2.6.6.ebuild
+++ b/dev-ruby/zeitwerk/zeitwerk-2.6.6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/bundler )"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 945fb0e57c5a..2d1500ee1dae 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/gitlab-cli/Manifest b/dev-util/gitlab-cli/Manifest
index d0ef1c895c9d..1598bce25718 100644
--- a/dev-util/gitlab-cli/Manifest
+++ b/dev-util/gitlab-cli/Manifest
@@ -2,6 +2,9 @@ DIST gitlab-cli-1.24.1-deps.tar.xz 34979684 BLAKE2B 238ac4e1a4182cc2dd83a4a49f93
 DIST gitlab-cli-1.24.1.tar.bz2 16630772 BLAKE2B 61f618ef8cee468904457d8ac8a992ce45dd0e354296e24e4176c9f22acc26d33d9672e47542b017bdd515fb9c17bb11b9ba17cafabe66d739b9c6414a640a34 SHA512 aa92f3edbc490fe3fede9a65dda9267475f0f15a3265de31a00dc62719f7ba36d75573a7cee807e013b9218ea3497c3b6e8663bcb1a872e91a15000a2d16f386
 DIST gitlab-cli-1.25.3-deps.tar.xz 35966236 BLAKE2B 63fbcccacd6df665219d5196983cb7082424f7e87c4e58f962b73d185983a5b2a73e267fd2837a39c11eb9765f63f749a9dd61cdf901e90f0b648fd4d13faa20 SHA512 b2d73f16529ada87804ec948e7dc014c0c3309fa4ebd260e94ffd24a40f58fd1bf327c652adf74a4503bd63d685b1506b90c53230f75586107d5ec559320d47b
 DIST gitlab-cli-1.25.3.tar.bz2 16771835 BLAKE2B e36003e41649b3fc5289033892525130f9965a02095e30baf93dc7179a61ee336e12b57a3892c94259acb68717bb9fea3074985a29cf51afd28596cfcc3d864d SHA512 f916ab28d10e851a0fa389487fca4650bd0ea5b612213a26497838d45c77efcfcccbd6dc6500debedc8cd869afec0c3f0b2bf95cf3d5151ecbd0b9c793af1063
+DIST gitlab-cli-1.26.0-deps.tar.xz 35962880 BLAKE2B 895a442b5a8d259fccb58a04374d8abe88792392744ad748bf448ae5cbf5cb5927ad69dee6def59afc781ce6aa477c84d3ea219f79f069b98b09140f11cfccd2 SHA512 69e16358c60a0a71564943a2095b2055a11d6028021a77734f8b06b5348ac848a6a4bdf1f08b8b7af5bf344a66042fa7d8c9fa0061212b3cc4c1b2802c36f551
+DIST gitlab-cli-1.26.0.tar.bz2 16777071 BLAKE2B 51cab57139b11ea1d4b1834b1c9efdb061099c494441243e8acc2608f05cd17d7968d6602d46c4a8aa6e8cb6ef2ae3c9cbf03019214fe77d593bce8c9a030540 SHA512 70f02bf28c01a47dacc5282d9a20211f686a8f099579be10b6f180002ff5bd4e53c70cd25828eb148c190b0f58e1569625535fe842f70a919059350187352e65
 EBUILD gitlab-cli-1.24.1.ebuild 761 BLAKE2B 261e2cebd808f585e3c98f8d14b3f5286c62dce03a116c90eba4c69216683ce9dc2847efa59c14689ec00624c358ab0e40aff602d4f945b92231cb5efef3d121 SHA512 3cad1befdb9ea097c2ea0f0167756ce091753b32f94f690fcb1f1ce019d20e202a2c49a1f97dcc89b26af8e370ca22026c4543b786198aa8f86bda6e320ce3f6
 EBUILD gitlab-cli-1.25.3.ebuild 761 BLAKE2B 33652ab55e51df4696f4ff3693bd1a1f1320ed8993cb4a8d682f29be6df786b1dcced99e6b46de2ca3a7557b31ffc050875656b68098751695de2cd0d5b588bf SHA512 2b3d6b86b99f5ded06edeeb5630aa74e4c54a7f28483ab678326d7d5bef35deaea526c43a59ff8470c4c4a97c7c5368e83c268676ecb930c8e173be29819dc4a
+EBUILD gitlab-cli-1.26.0.ebuild 754 BLAKE2B fc56e55faebb3f4127d3e32d066a6d0f6b5e24b21a919a898495cbc0ea8189fb8b1af4a2fdceb367e9768cc2a691947e9dc30d5b12fe90961295649206debb7a SHA512 04415709ae960428d9598ba556c1332c20dc36fb946b85a7c7d67bcfdbc3d175b88da84499a573969c0867a055b2bff87544c36e4450f211142928bd32b61907
 MISC metadata.xml 328 BLAKE2B c15cee65978853695fcc911a6beb02ac29f8e82d7a82417989e497a0c014a2c5c2c22503cf2c099600e0885399496d0e7ce3b3590c8b8cfa0f6ecc6a63988d46 SHA512 4df241882ef7e722711132110271b672ef49913a92e9d70972857968e7d12a8403f5b19b5079fd78f3f08fb4aab8e615b51a6073db2c460aa2ae3ec31d8e3a28
diff --git a/dev-util/gitlab-cli/gitlab-cli-1.26.0.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.26.0.ebuild
new file mode 100644
index 000000000000..ff656b6ec855
--- /dev/null
+++ b/dev-util/gitlab-cli/gitlab-cli-1.26.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+GIT_COMMIT=ef363646f539ed785d29e2b07c20b5f8f00c4d45
+
+DESCRIPTION="the official gitlab command line interface"
+HOMEPAGE="https://gitlab.com/gitlab-org/cli"
+SRC_URI="https://gitlab.com/gitlab-org/cli/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# tests communicate with gitlab.com and require a personal access token
+RESTRICT="test"
+
+S="${WORKDIR}/cli-${GIT_COMMIT}"
+
+src_compile() {
+	emake \
+		GLAB_VERSION=v${PV} \
+		build manpage
+}
+
+src_install() {
+	dobin bin/glab
+	dodoc README.md
+	doman share/man/man1/*
+}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 6e9e050e879e..eeb83433080b 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/seahorse-nautilus/Manifest b/gnome-extra/seahorse-nautilus/Manifest
deleted file mode 100644
index 0edcf4c760fb..000000000000
--- a/gnome-extra/seahorse-nautilus/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX seahorse-nautilus-3.11.92-remove-libgnome-keyring.patch 837 BLAKE2B fa8d92171af088031804beab1356d4e43249da21d977fd33a524150cce8d3d0fd9180e9d8bcd5d96954b5821e40bc211a53d1be690836018a850ebcdda4e52ad SHA512 eabcde1d066c3e3d1ce95a437043b84ce387e2f81eb1137c6b6e4db96b89e7a30c61e792b0221625277106f8d5f1d19f22527c61a70026d3230f11aebda29eb8
-DIST seahorse-nautilus-3.11.92.tar.xz 395304 BLAKE2B f7c741a2d0ae06636ed380c3b8f0006e183bd2eacae87f0c1bfa0d4f1fa0834401a86b7a2b2b21df268ec18b57fbeb6805f30dc20ae43e5456eb05635fda150b SHA512 d3815bfaaf2a5e96beb94abe01fb3f7733e867a04681d4bed540fce58f6556c62534d3217ec0bf1452e848551a42ec703ec241029486d3dcd966c16ff27b87f2
-DIST seahorse-nautilus-3.11.92_p20220906.tar.bz2 177572 BLAKE2B b07fc05ec4b4e04006ce3613bc5847b1540c008604bea90d8972c5a68c335438ada201e5bfae47e46bd8ca274a603fb9dc671ae2ac521c7fcbbef5e4c54e2b7a SHA512 4dd4e3225c6085dbe4b60efeff84c815139e521bb9ba5adb1fe7d33abc815f87045297dce8d4531923e619b3a59f79e92eba8f966bedf2bb6306422f4b8680ec
-EBUILD seahorse-nautilus-3.11.92-r1.ebuild 1402 BLAKE2B 3be2d7ff7d77133f5616657058fe98596274c3412572a437b8897a55715c2c088fd66aa8f8d246b75289d20e864fd7d8ea7bea31db93cc83d957646e7dbdc270 SHA512 f341223c77baf646f67aa2476851d84dfe08d6fa8b7536141b649df6d143574f5554dd7991e8707339db19a448c04b46f560e750b09839855bc075bcb3a58cad
-EBUILD seahorse-nautilus-3.11.92_p20220906.ebuild 1199 BLAKE2B 31a798563b2d38282be4394e0597710817a2e12b80c3ac4a1a5f6c97cbca7e948f70ad7a4b1bc3df54101664016d6ed0df1ba7a9c9d396497ff24b170bd3bb6f SHA512 9d13ba284a731684b57f7f16f696a87f40e8451abc582d7508f440833a68c6f7cfcdf3270bd6d65c057535061eb02cf496705ab5e2fa89f487c74697aa99d13b
-MISC metadata.xml 358 BLAKE2B 14e1c78ac1cd0385eddb0b0797185f1a1d02691f64cdb65ad61f5ad33a4b0d5a0481eab56dd1cb145108898a9c997faa60760bd51213186f62a39899fe1f3696 SHA512 a3d7bba0861b219455cd0725023247a394fd6ded2da7376e2f69bc1c3f72d26b7cdbd9354c9b407bcb34ed76249a543b769feba033d4e4a46b5cbe8011cb92c2
diff --git a/gnome-extra/seahorse-nautilus/files/seahorse-nautilus-3.11.92-remove-libgnome-keyring.patch b/gnome-extra/seahorse-nautilus/files/seahorse-nautilus-3.11.92-remove-libgnome-keyring.patch
deleted file mode 100644
index 5044cd7f26b2..000000000000
--- a/gnome-extra/seahorse-nautilus/files/seahorse-nautilus-3.11.92-remove-libgnome-keyring.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8193f85dc3caeae23e5931c10f52ac9c5324d9d9 Mon Sep 17 00:00:00 2001
-From: Stef Walter <stefw@redhat.com>
-Date: Fri, 8 Jun 2018 12:40:09 +0200
-Subject: [PATCH] Remove libgnome-keyring dependency
-
-It's not needed by seahorse-nautilus
----
- configure.ac | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 471b34d..8d1f39f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -146,13 +146,6 @@ else
- fi
- AC_SUBST(NAUTILUS_EXTENSION_DIR)
- 
--# -----------------------------------------------------------------------------
--# Keyring
--
--PKG_CHECK_MODULES([GNOME_KEYRING], [gnome-keyring-1])
--SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GNOME_KEYRING_CFLAGS"
--SEAHORSE_LIBS="$SEAHORSE_LIBS $GNOME_KEYRING_LIBS"
--
- # -----------------------------------------------------------------------------
- # DBus
- 
--- 
-2.14.4
-
diff --git a/gnome-extra/seahorse-nautilus/metadata.xml b/gnome-extra/seahorse-nautilus/metadata.xml
deleted file mode 100644
index bb1a1d68e00c..000000000000
--- a/gnome-extra/seahorse-nautilus/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="gnome-gitlab">GNOME/seahorse-nautilus</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92-r1.ebuild b/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92-r1.ebuild
deleted file mode 100644
index 7b598f4c6bd7..000000000000
--- a/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="Nautilus extension for encrypting and decrypting files with GnuPG"
-HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.0.0
-	>=app-crypt/gcr-3.4:0=[gtk]
-	>=dev-libs/dbus-glib-0.35
-	>=dev-libs/glib-2.28:2
-	gnome-base/gnome-keyring
-	>=gnome-base/nautilus-3
-	x11-libs/gtk+:3
-	>=x11-libs/libcryptui-3.9.90
-	>=x11-libs/libnotify-0.3:=
-	>=app-crypt/gnupg-1.4
-"
-# seahorse-nautilus was formerly part of seahorse-plugins
-RDEPEND="${COMMON_DEPEND}
-	!app-crypt/seahorse-plugins[nautilus]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Do not let configure mangle CFLAGS
-	sed -e '/^[ \t]*CFLAGS="$CFLAGS \(-g\|-O0\)/d' -i configure.ac configure ||
-		die "sed failed"
-
-	# Fix icon location, upstream bug #719763
-	sed -i 's/pixmaps\/seahorse-plugins\/48x48/pixmaps\/cryptui\/48x48/' \
-		tool/seahorse-notification.c || die
-
-	# Doesn't really need libgnome-keyring (from Fedora, fixed in
-	# 'master')
-	eapply "${FILESDIR}"/${P}-remove-libgnome-keyring.patch # needs eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-gpg-check \
-		--enable-libnotify
-}
diff --git a/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92_p20220906.ebuild b/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92_p20220906.ebuild
deleted file mode 100644
index 45d538289f70..000000000000
--- a/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92_p20220906.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit meson xdg
-
-DESCRIPTION="Nautilus extension for encrypting and decrypting files with GnuPG"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/seahorse-nautilus"
-COMMIT="2cc2a06148604b2f118ef460527b03d27530f6d4"
-SHORT_COMMIT="2cc2a06"
-SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${COMMIT}/${PN}-${SHORT_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=app-crypt/gpgme-1.0.0
-	>=app-crypt/gcr-3.4:0=[gtk]
-	>=dev-libs/dbus-glib-0.35
-	>=dev-libs/glib-2.28:2
-	gnome-base/gnome-keyring
-	>=gnome-base/nautilus-43
-	x11-libs/gtk+:3
-	>=x11-libs/libcryptui-3.9.90
-	>=x11-libs/libnotify-0.3:=
-	>=app-crypt/gnupg-1.4
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_prepare() {
-	default
-	# Fix icon location, https://gitlab.gnome.org/GNOME/seahorse-nautilus/-/issues/10
-	sed -i 's/pixmaps\/seahorse-plugins\/48x48/pixmaps\/cryptui\/48x48/' \
-		tool/seahorse-notification.c || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcheck-compatible-gpg=false
-		-Dlibnotify=true
-	)
-	meson_src_configure
-}
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index e001584532f6..737454fe8d5e 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/ipamonafont/Manifest b/media-fonts/ipamonafont/Manifest
index bb5d26b2e467..a6e3054141e4 100644
--- a/media-fonts/ipamonafont/Manifest
+++ b/media-fonts/ipamonafont/Manifest
@@ -1,3 +1,3 @@
 DIST opfc-ModuleHP-1.1.1_withIPAMonaFonts-1.0.8.tar.gz 11563203 BLAKE2B 74d9501a47730ea651d05b6de973926c9c78b3fb61640eeac023a68b99a71684d934a17a54eebb8cb4b19d1c16f8fccb794dbb6f582f9e0853bf6328d3de9ddd SHA512 b46b09bb44497275d8949bcd6d0c472c7bc8a26f20113e97f6379a10e8f4d5d072e4c517aa1c69e24efd980644d8298d220abbcccb6e9af3c65794dc31f7ec7b
-EBUILD ipamonafont-1.0.8.ebuild 690 BLAKE2B a8f55cbcdebbfc803ecc6e406e47818cd5ba666d9f33077ef705ad1739bd5ecda59b9070cf4210653e74a8def7ffdcc64a39f586d57d8fb07c5c9d5f0efabfd1 SHA512 fd867e3e4df528a4e5c04d6ad63cccee6eae5ef2126fa0171518aad5c5ae95f04e9fc8ec6066ef924f5092cd5b14fb44dbc88e16873bf2d14b460c0d362339a3
+EBUILD ipamonafont-1.0.8.ebuild 655 BLAKE2B 30f1b8898134b04582d7c63f77a14dd944c1681143678dd13791f1da841cf0310002d67d6cf8e1c6d9913b629d9d8e1ae99a4277a8479903eb95e42bdb431d46 SHA512 3202c8f208e3d5e8a66f1a20c860ad8413ac1cc8e107e47db283452d0db249926f441ca20c32b6727173172e21f3896ff66b3d84341ca4f4e48b40bed7f2a046
 MISC metadata.xml 326 BLAKE2B 8ee0f43a1770af568dc66b8bf6b593822a2118984264f0433db8d80d92e15ccf630dccb5bc75f450362a22f67193d90428e8321fea5f640bf0a892f9d7cf6af8 SHA512 1f38180854ea9bb8b419b54c6d4c1487ee804fab1d551e306fb87a8d1d19db28302ffcf63da276a66a100bb6306f2946e52fea622aff8fd3982afe0f1d3d0610
diff --git a/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild b/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
index 3fabbd4f5caa..7918fd0cc18e 100644
--- a/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
+++ b/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
@@ -1,15 +1,16 @@
-# Copyright 2005-2022 Gentoo Authors
+# Copyright 2005-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit font
 
-MY_PN="opfc-ModuleHP-1.1.1_withIPAMonaFonts"
+MY_P="opfc-ModuleHP-1.1.1_withIPAMonaFonts-${PV}"
 
 DESCRIPTION="Hacked version of IPA fonts, which is suitable for browsing 2ch"
 HOMEPAGE="https://web.archive.org/web/20190326123924/http://www.geocities.jp/ipa_mona/"
-SRC_URI="http://freebsd.sin.openmirrors.asia/pub/FreeBSD/ports/local-distfiles/hrs/${MY_PN}-${PV}.tar.gz"
+SRC_URI="http://distcache.freebsd.org/local-distfiles/hrs/${MY_P}.tar.gz"
+S="${WORKDIR}"
 
 LICENSE="grass-ipafonts mplus-fonts public-domain"
 SLOT="0"
@@ -17,7 +18,5 @@ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv ~s390 spa
 IUSE=""
 RESTRICT="mirror"
 
-S="${WORKDIR}"
-
 FONT_SUFFIX="ttf"
-FONT_S="${S}/${MY_PN}-${PV}/fonts"
+FONT_S="${S}/${MY_P}/fonts"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 665d73f5a719..7e1157bb2fb3 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/qmidiroute/Manifest b/media-sound/qmidiroute/Manifest
index 2ef30a9dd179..02ac547a343f 100644
--- a/media-sound/qmidiroute/Manifest
+++ b/media-sound/qmidiroute/Manifest
@@ -1,4 +1,4 @@
 AUX qmidiroute-0.4.0-drop-qtopengl.patch 1031 BLAKE2B 5491b8f59590f44165753cf3d5a845bbb5e36f037cb637dca109c660bf2a2be0f0fe6252f292d4920f9580a1d205f44694e967bbdef7b37823f2d03c3c2866b0 SHA512 e7fb53f481818912646502fa84ab32e2f115443f662f9a3442aa63f04794847d4be7973e4e5d2d7d718825ca5b5bf9c099d1ffecd8e90a0adbd7ba7edef1a501
 DIST qmidiroute-0.4.0.tar.bz2 121625 BLAKE2B b538f405debb33e16d505075b9fc2b53f0b1d993670bfc5b0fdcd5d76d06ee8c81b8357b3435266f8b0f7d1609a4835450cd664bc73470ab1a3ba9e60e5476bb SHA512 b3b5ded66c0e226848a3181d67f61ea9e4e76c253400dac63592e4f462f4cf06760b3f2d24a33bbc836f4fe29950a4d702adc048ad80c9b6d673ade8c1a88342
-EBUILD qmidiroute-0.4.0.ebuild 672 BLAKE2B d75043fd92c39c6f16c1e85c44fa7697931c084c53176cb956ec21fb36c9bbce6cf8269c50608e51138d95b154c82fb241d0817a1e0b6a06d36bdadddcf271a3 SHA512 f69758a46729cf35dc5348c0c4c812f68f30413e7c9ce8797ca7ee8e53d131518bc689a654dbeeab95a3648b7acbecba355bb9b2c080672d7dfbcaf9e23f589d
+EBUILD qmidiroute-0.4.0-r1.ebuild 693 BLAKE2B 7448bcc076fa3630b59861cbebf10c00edc01e6b1a16fd76f593e5d83be73c6e4ca3636255ab7f60de22a2a89acb7b32d5c75d0fd378f0a8f09a3d4d0997a232 SHA512 e29c6b7f55e89f411fc1a308c80515d69f80b3d4c1ba3db8ac894a56cf29fec9a77cd3d148ffe81eed83a71eac6bf6f80f09a58ac8a337f2e16fd34b11d7f5d9
 MISC metadata.xml 335 BLAKE2B 7fbfa39aabf5ca6229eb32ebc0cc70ff98ef0c8322df29ff6f28c48791c2cd4c09ca6cedb67c874146eff7805da7067e2ad683dd3f19810fc0d242b2b46db954 SHA512 1e8fedd36e948449771ba44f3fb3f2a60160ac1e6e0da5de090b58a7d19e0c8a761e353d4bce5935b3052504dcd01da3c00fcc7b428bdacdf8eb11f942e3f39c
diff --git a/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild b/media-sound/qmidiroute/qmidiroute-0.4.0-r1.ebuild
index c432b7d42dba..892317d824ba 100644
--- a/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild
+++ b/media-sound/qmidiroute/qmidiroute-0.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,9 @@ BDEPEND="
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	media-libs/alsa-lib"
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 944bb92820f8..bd63820ff222 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index c0b90834f0d8..2243f4bf9420 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 28 Mar 2023 14:09:47 +0000
+Tue, 28 Mar 2023 20:09:48 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index f9081dc7f48a..4f343457ef20 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-03-28T14:09:52Z
+TIMESTAMP 2023-03-28T20:09:50Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQi9TBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQjSY5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDNpA/+LMqjp0cehs2DdIVle9gltTphdnTbpnQXSZBrrt31mCdQa8SbsUZmLQiF
-+7vYpgo6gJNwhbinApRWDF1njZzPX6efll2nopQKWkzrivLUroVc5HMmUz8Nsjq9
-Mcb24b8S0TsZUc28+b/bCUb3t8cPjK2dmLpWuri2qxiEV//QVS1VlK7s1w0j4uoZ
-G/ZxHdfXeCtp15e2eIAri+c+d04FqZAVWjt+nEba9ddoHfbXotPDlOok1jY/LmN5
-mdDi+/aoTmQb1KRNWxcZOZRoUFpqXqb/eeaDjNIHowJPHgjXH/gJyXTkJWsm3VZr
-q0mtNVwPPIF22fTkz+luNWeq0HC5+kcFR74KmcnsujQz3t1Gro4a3zSreCpJBnkv
-t3Ntot9nPpZVTuM/r0yEtu8IbKvJeWO/sY9jzXVywQvcxnnuxwz9crWVnA8ft7nA
-LMkuTRYtMGKZgffmjGYFaZUANuk4ieCjmc4XhOTNJ79EbSsW8vNOBqiaC+47uH/5
-mL96bFtNn9HihGH6lB/v4jAAqBSzmvq3df5NQ1LM/1IYEFoY8PqYdw+z8m9O0wCN
-UyS3xPyvQiPPDUWMolGD6tasN8twyhh+aVlhcN9OFFwPFfGf9ij2N44r11eorYva
-vf7pr2ZZBpTSk0d8FN3cC3xfnu7W138f4IGWa7PUfeFNhzOCBpc=
-=awX3
+klButg/7BgYXcODjWRRbJvsOaDKQr0ZF/cod/VRG5p+u4wsSI8lJZo0mLJz5NlRw
+G58SDJcHuTHYWXzvzub3oB0p7lmSe/QqmmvbVm7NMuaUuYZx0A6geai2lz57aH4d
+HgebrIEs2U9znlSAo6u9zumLCUSWuUV7/G6tv3CUoXTJZ59QuOUqwsbsdqRu999B
+Fak1JQqL8wboirc5GMyiuqh43zXrKhrAmzMLosW31QfSawEinuY9/PNJJ7ehxLyZ
+YZPflbd8KZRVBpa9AYhkQC+LFXMCzNEdcHmWiyE2icQs+MbvPaQFXjODEoNBjz9J
+gosYGBL+tCE+y95bUTWzLfW1zKvX2jzlGvPp7xbDLkw1V+eK0BmbfBNHkSp9dx6t
+3zka1QdY4+TBrrPEq3tI5+PsmZMWSv1Vz0mr6aNaajw6tO+7j/o8gwz5v7h3WQ8g
+aMsmw2LE1senWRESz8UqSo3/nPN3mg+XCnqfpyOFe8/fL0XnMuXhYF+8LexWANth
+gu3RW5EQldNgwGrlVCrPcIKJUvR56fMIBXmhFwPL7LExQqXp1y/XDbwIhevJSBGa
+cfCPGXBeHnK39Bk0o/JWny13fLuBxJ5ybBX4yNqXz+Glk90oxqoiycsqi9MpGjxc
+GDpmPSELw+u16GgR0XrfHTEexUS0mg83c2mWiOQcqxKuqzGiBZI=
+=lVk+
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index c0b90834f0d8..2243f4bf9420 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 28 Mar 2023 14:09:47 +0000
+Tue, 28 Mar 2023 20:09:48 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 821ad0e79383..0154e63d521f 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 39bfa8f5d6b1..b15714a7306d 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/mkosi-12-r1 b/metadata/md5-cache/app-admin/mkosi-12-r1
deleted file mode 100644
index 72c700e53e03..000000000000
--- a/metadata/md5-cache/app-admin/mkosi-12-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-vcs/git sys-apps/portage sys-apps/systemd app-emulation/qemu sys-firmware/edk2-ovmf >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Build Bespoke OS Images
-EAPI=8
-HOMEPAGE=https://github.com/systemd/mkosi
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=dev-vcs/git sys-apps/portage sys-apps/systemd app-emulation/qemu sys-firmware/edk2-ovmf 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 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/systemd/mkosi/archive/refs/tags/v12.tar.gz -> mkosi-12.tar.gz
-_eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2b03a221a5f277de6ae99f21f1bcc2fd
diff --git a/metadata/md5-cache/app-admin/mkosi-14_p20230313 b/metadata/md5-cache/app-admin/mkosi-14_p20230313
new file mode 100644
index 000000000000..89f290ae3e5e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/mkosi-14_p20230313
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-emulation/qemu dev-vcs/git sys-apps/bubblewrap sys-apps/portage sys-apps/systemd sys-firmware/edk2-ovmf >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) 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 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Build Bespoke OS Images
+EAPI=8
+HOMEPAGE=https://github.com/systemd/mkosi
+INHERIT=distutils-r1 optfeature
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=app-emulation/qemu dev-vcs/git sys-apps/bubblewrap sys-apps/portage sys-apps/systemd sys-firmware/edk2-ovmf 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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/systemd/mkosi/archive/33a33967819443ee03137459eec85cd5db6c4bad.tar.gz -> mkosi-14_p20230313.tar.gz
+_eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=399fbd0a45deef6d06522daa632ceb54
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 2eb8b9446d7e..ed9b551fc760 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/ronn-ng-0.9.1-r2 b/metadata/md5-cache/app-text/ronn-ng-0.9.1-r2
index f772c043ce46..d45c895643b8 100644
--- a/metadata/md5-cache/app-text/ronn-ng-0.9.1-r2
+++ b/metadata/md5-cache/app-text/ronn-ng-0.9.1-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/apjanke/ronn-ng
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=!app-text/ronn ruby_targets_ruby27? ( =dev-ruby/mustache-1*[ruby_targets_ruby27(-)] >=dev-ruby/kramdown-2.1:2[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.9.0:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/mustache-1*[ruby_targets_ruby30(-)] >=dev-ruby/kramdown-2.1:2[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.9.0: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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ronn-ng-0.9.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a71adb8041a0974accec1639e82b3093
+_md5_=11ef5cbdde6bfc1481c0b6399ffc47e5
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 1b755af0dc2b..677625d70631 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/javax-el-api-2.2 b/metadata/md5-cache/dev-java/javax-el-api-2.2
index cc5b1ace6693..26fb997c6bd8 100644
--- a/metadata/md5-cache/dev-java/javax-el-api-2.2
+++ b/metadata/md5-cache/dev-java/javax-el-api-2.2
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=CDDL GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.2
 SRC_URI=https://repo1.maven.org/maven2/javax/el/el-api/2.2/el-api-2.2-sources.jar
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	7dacd744ab3fb5ec581318fefaa7a9e5	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
-_md5_=bf8ae79c6a6d295513194249a983696b
+_md5_=34ea57cbe7c32d0ba938baf7e024f944
diff --git a/metadata/md5-cache/dev-java/javax-jsp-api-2.2 b/metadata/md5-cache/dev-java/javax-jsp-api-2.2
index 4d81e9f71827..cc1e574a66e1 100644
--- a/metadata/md5-cache/dev-java/javax-jsp-api-2.2
+++ b/metadata/md5-cache/dev-java/javax-jsp-api-2.2
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=CDDL GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* dev-java/javax-el-api:2.2 dev-java/javax-servlet-api:2.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.2
 SRC_URI=https://repo1.maven.org/maven2/javax/servlet/jsp/jsp-api/2.2/jsp-api-2.2-sources.jar
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	7dacd744ab3fb5ec581318fefaa7a9e5	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
-_md5_=22a7968e64ab038619d5daa2575a980d
+_md5_=7f90fe0b658c1a131aa73c781bdc45c7
diff --git a/metadata/md5-cache/dev-java/javax-servlet-api-2.5 b/metadata/md5-cache/dev-java/javax-servlet-api-2.5
index 0b68c1a4ef03..ca8b6d191b8c 100644
--- a/metadata/md5-cache/dev-java/javax-servlet-api-2.5
+++ b/metadata/md5-cache/dev-java/javax-servlet-api-2.5
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://javaee.github.io/servlet-spec/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=CDDL GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=https://repo1.maven.org/maven2/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	7dacd744ab3fb5ec581318fefaa7a9e5	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
-_md5_=5b31379ed2103461f60945e3a677d88e
+_md5_=c7d63c74182bce03ec8ccc4014935b54
diff --git a/metadata/md5-cache/dev-java/jstl-1.2.7 b/metadata/md5-cache/dev-java/jstl-1.2.7
index 8f0f938a1eec..be1fbcafaac8 100644
--- a/metadata/md5-cache/dev-java/jstl-1.2.7
+++ b/metadata/md5-cache/dev-java/jstl-1.2.7
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.jstl
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=dev-java/javax-el-api:2.2 dev-java/javax-jsp-api:2.2 dev-java/javax-servlet-api:2.5 dev-java/jstl-api:0 dev-java/xalan:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/tags/archive/1.2.7-RELEASE.tar.gz -> jstl-1.2.7.tar.gz
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	7dacd744ab3fb5ec581318fefaa7a9e5	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
-_md5_=3a0e28ac455feedad0092e2af7622b2c
+_md5_=55b57419323bb2e550dfd040871f3dc9
diff --git a/metadata/md5-cache/dev-java/jstl-api-1.2.7 b/metadata/md5-cache/dev-java/jstl-api-1.2.7
index 3405a2768ecb..1f624469b6d0 100644
--- a/metadata/md5-cache/dev-java/jstl-api-1.2.7
+++ b/metadata/md5-cache/dev-java/jstl-api-1.2.7
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.jstl
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=dev-java/javax-el-api:2.2 dev-java/javax-jsp-api:2.2 dev-java/javax-servlet-api:2.5 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/tags/archive/1.2.7-RELEASE.tar.gz -> jstl-1.2.7.tar.gz
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	7dacd744ab3fb5ec581318fefaa7a9e5	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
-_md5_=2e5ad26438d02c84c4d5188dc61e6abe
+_md5_=09c4213112f7456560ae54fee70e5805
diff --git a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r3 b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r3
index ecdcf41badcb..269e1a5daf1e 100644
--- a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r3
+++ b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://www.osgi.org/Main/HomePage
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 dev-java/javax-servlet-api:2.5 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=bindist
 SLOT=0
 SRC_URI=https://docs.osgi.org/download/r5/osgi.enterprise-5.0.0.jar
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	7dacd744ab3fb5ec581318fefaa7a9e5	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
-_md5_=38ddbfe10015659edb474e7788a0c025
+_md5_=5205bc9e089f764abff3238ad44fe4c9
diff --git a/metadata/md5-cache/dev-java/reflections-0.9.12-r5 b/metadata/md5-cache/dev-java/reflections-0.9.12-r5
index 68f08d7a313c..3c08703ccdf8 100644
--- a/metadata/md5-cache/dev-java/reflections-0.9.12-r5
+++ b/metadata/md5-cache/dev-java/reflections-0.9.12-r5
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ronmamo/reflections
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=WTFPL-2 BSD-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/dom4j:1 dev-java/gson:2.6 dev-java/javassist:3 dev-java/slf4j-api:0 dev-java/slf4j-simple:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ronmamo/reflections/archive/0.9.12.tar.gz -> reflections-0.9.12.tar.gz
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	7dacd744ab3fb5ec581318fefaa7a9e5	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
-_md5_=2494bd189d9b308ebb5f128355bfb030
+_md5_=16b177ef67dfd0e007897d2742742acb
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 0e05a76d4180..f783ed5a1f42 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/execline-2.9.2.1 b/metadata/md5-cache/dev-lang/execline-2.9.2.1
index ae954965ed02..b61a56a97b5e 100644
--- a/metadata/md5-cache/dev-lang/execline-2.9.2.1
+++ b/metadata/md5-cache/dev-lang/execline-2.9.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=A non-interactive scripting language
 EAPI=8
 HOMEPAGE=https://www.skarnet.org/software/execline/
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~arm ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~riscv x86
 LICENSE=ISC
 RDEPEND=>=dev-libs/skalibs-2.13.0.0:=
 SLOT=0/2.9
 SRC_URI=https://www.skarnet.org/software/execline/execline-2.9.2.1.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=377bd6a09fe80d0d6c306302c0a4e4db
+_md5_=85e6ae4e2b8675325c47156b1ba16a33
diff --git a/metadata/md5-cache/dev-lang/go-1.19.6 b/metadata/md5-cache/dev-lang/go-1.19.6
deleted file mode 100644
index 420d5973be98..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.19.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
-DEFINED_PHASES=compile install postinst test
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://go.dev
-INHERIT=toolchain-funcs
-IUSE=abi_mips_o32 abi_mips_n64 cpu_flags_x86_sse2
-KEYWORDS=-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=arm? ( sys-devel/binutils[gold] ) arm64? ( sys-devel/binutils[gold] )
-RESTRICT=strip
-SLOT=0/1.19.6
-SRC_URI=https://storage.googleapis.com/golang/go1.19.6.src.tar.gz
-_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ff3f5c1a028d9d615c93dd2679faf1aa
diff --git a/metadata/md5-cache/dev-lang/go-1.19.7 b/metadata/md5-cache/dev-lang/go-1.19.7
index be7b29ef4be6..6cc49275bd7d 100644
--- a/metadata/md5-cache/dev-lang/go-1.19.7
+++ b/metadata/md5-cache/dev-lang/go-1.19.7
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://go.dev
 INHERIT=toolchain-funcs
 IUSE=abi_mips_o32 abi_mips_n64 cpu_flags_x86_sse2
-KEYWORDS=-* amd64 arm ~arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=arm? ( sys-devel/binutils[gold] ) arm64? ( sys-devel/binutils[gold] )
 RESTRICT=strip
 SLOT=0/1.19.7
 SRC_URI=https://storage.googleapis.com/golang/go1.19.7.src.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bb1675d42cb0bec2025a6935d44dec94
+_md5_=ff3f5c1a028d9d615c93dd2679faf1aa
diff --git a/metadata/md5-cache/dev-lang/go-1.20.1 b/metadata/md5-cache/dev-lang/go-1.20.1
deleted file mode 100644
index ece063fc04a2..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.20.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
-DEFINED_PHASES=compile install postinst test
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://go.dev
-INHERIT=toolchain-funcs
-IUSE=abi_mips_o32 abi_mips_n64 cpu_flags_x86_sse2
-KEYWORDS=-* amd64 arm ~arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=arm? ( sys-devel/binutils[gold] ) arm64? ( sys-devel/binutils[gold] )
-RESTRICT=strip
-SLOT=0/1.20.1
-SRC_URI=https://storage.googleapis.com/golang/go1.20.1.src.tar.gz
-_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d468ce7e80783ab7ec78e4a303640200
diff --git a/metadata/md5-cache/dev-lang/go-1.20.2 b/metadata/md5-cache/dev-lang/go-1.20.2
index 3dce934f545e..f2ef353a1e8c 100644
--- a/metadata/md5-cache/dev-lang/go-1.20.2
+++ b/metadata/md5-cache/dev-lang/go-1.20.2
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://go.dev
 INHERIT=toolchain-funcs
 IUSE=abi_mips_o32 abi_mips_n64 cpu_flags_x86_sse2
-KEYWORDS=-* amd64 arm ~arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=arm? ( sys-devel/binutils[gold] ) arm64? ( sys-devel/binutils[gold] )
 RESTRICT=strip
 SLOT=0/1.20.2
 SRC_URI=https://storage.googleapis.com/golang/go1.20.2.src.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d468ce7e80783ab7ec78e4a303640200
+_md5_=ff3f5c1a028d9d615c93dd2679faf1aa
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 723baadd2f9c..d9e934c0546a 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/openssl-1.1.1t-r3 b/metadata/md5-cache/dev-libs/openssl-1.1.1t-r3
new file mode 100644
index 000000000000..5e635d72c4fd
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1t-r3
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc kernel_linux? ( sys-process/procps ) ) verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=tls-compression? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] )
+DESCRIPTION=Full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=8
+HOMEPAGE=https://www.openssl.org/
+INHERIT=edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
+IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=tls-compression? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) !<net-misc/openssh-8.0_p1-r3
+RESTRICT=!test? ( test )
+SLOT=0/1.1
+SRC_URI=mirror://openssl/source/openssl-1.1.1t.tar.gz verify-sig? ( mirror://openssl/source/openssl-1.1.1t.tar.gz.asc )
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=8e59f7020b400627b103aa93dab79680
diff --git a/metadata/md5-cache/dev-libs/openssl-3.0.8-r3 b/metadata/md5-cache/dev-libs/openssl-3.0.8-r3
new file mode 100644
index 000000000000..710c11c32086
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-3.0.8-r3
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc sys-process/procps ) verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=tls-compression? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] )
+DESCRIPTION=Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)
+EAPI=8
+HOMEPAGE=https://www.openssl.org/
+INHERIT=edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig
+IUSE=+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers 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
+LICENSE=Apache-2.0
+PDEPEND=app-misc/ca-certificates
+RDEPEND=tls-compression? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=mirror://openssl/source/openssl-3.0.8.tar.gz verify-sig? ( mirror://openssl/source/openssl-3.0.8.tar.gz.asc )
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	54fa9b732d29075cfacc3c3091b38747	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=ca73c1ff4831f6e48426655596eb3e5f
diff --git a/metadata/md5-cache/dev-libs/openssl-3.1.0-r2 b/metadata/md5-cache/dev-libs/openssl-3.1.0-r2
new file mode 100644
index 000000000000..eae7a432f2a7
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-3.1.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc sys-process/procps ) verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=!<net-misc/openssh-9.2_p1-r3 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] )
+DESCRIPTION=Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)
+EAPI=8
+HOMEPAGE=https://www.openssl.org/
+INHERIT=edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig
+IUSE=+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers 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
+LICENSE=Apache-2.0
+PDEPEND=app-misc/ca-certificates
+RDEPEND=!<net-misc/openssh-9.2_p1-r3 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=mirror://openssl/source/openssl-3.1.0.tar.gz verify-sig? ( mirror://openssl/source/openssl-3.1.0.tar.gz.asc )
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	54fa9b732d29075cfacc3c3091b38747	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=2021982c96abbf8a80c64ea0b190d2c9
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index ea6c6d8b3d4a..27f819d5f000 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/aws-sam-translator-1.59.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.59.0
deleted file mode 100644
index 87c4d8f17db2..000000000000
--- a/metadata/md5-cache/dev-python/aws-sam-translator-1.59.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/boto3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydantic-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library that transform SAM templates into AWS CloudFormation templates
-EAPI=8
-HOMEPAGE=https://github.com/aws/serverless-application-model/ https://pypi.org/project/aws-sam-translator/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=<dev-python/boto3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydantic-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/serverless-application-model/archive/v1.59.0.tar.gz -> aws-sam-translator-1.59.0.gh.tar.gz
-_eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=98d0f6c9d573dec47a2d5841a2a6df6f
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.60.1 b/metadata/md5-cache/dev-python/aws-sam-translator-1.60.1
deleted file mode 100644
index 4599b7297118..000000000000
--- a/metadata/md5-cache/dev-python/aws-sam-translator-1.60.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/boto3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydantic-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library that transform SAM templates into AWS CloudFormation templates
-EAPI=8
-HOMEPAGE=https://github.com/aws/serverless-application-model/ https://pypi.org/project/aws-sam-translator/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=<dev-python/boto3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydantic-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/serverless-application-model/archive/v1.60.1.tar.gz -> serverless-application-model-1.60.1.gh.tar.gz
-_eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=93b9f6b31f5ee2225a52287cf112e661
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.61.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.61.0
deleted file mode 100644
index 229357929856..000000000000
--- a/metadata/md5-cache/dev-python/aws-sam-translator-1.61.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/boto3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pydantic-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydantic-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/typing-extensions-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library that transform SAM templates into AWS CloudFormation templates
-EAPI=8
-HOMEPAGE=https://github.com/aws/serverless-application-model/ https://pypi.org/project/aws-sam-translator/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=<dev-python/boto3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pydantic-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydantic-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/typing-extensions-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/serverless-application-model/archive/v1.61.0.tar.gz -> serverless-application-model-1.61.0.gh.tar.gz
-_eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3b51212bb788567e5b2f86181133b284
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.62.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.62.0
index 61772b3ba758..5f8be0724a92 100644
--- a/metadata/md5-cache/dev-python/aws-sam-translator-1.62.0
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.62.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/aws/serverless-application-model/ https://pypi.org/project/aws-sam-translator/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/boto3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pydantic-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydantic-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/typing-extensions-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws/serverless-application-model/archive/v1.62.0.tar.gz -> serverless-application-model-1.62.0.gh.tar.gz
 _eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3b51212bb788567e5b2f86181133b284
+_md5_=69ed6a06837e9b0f13b9e93d5a6f2fbd
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.73.2 b/metadata/md5-cache/dev-python/cfn-lint-0.73.2
deleted file mode 100644
index 9895b3d46221..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.73.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.59.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.59.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.73.2.tar.gz -> cfn-lint-0.73.2.gh.tar.gz
-_eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=48a74d0665da285c63b17d1a96311702
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.74.0 b/metadata/md5-cache/dev-python/cfn-lint-0.74.0
deleted file mode 100644
index 25b4f5a53517..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.74.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.59.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.59.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.74.0.tar.gz -> cfn-lint-0.74.0.gh.tar.gz
-_eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=980b799b466db223b903b9794dd861a7
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.74.1 b/metadata/md5-cache/dev-python/cfn-lint-0.74.1
deleted file mode 100644
index 3ac8d69c4c33..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.74.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.60.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.60.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.74.1.tar.gz -> cfn-lint-0.74.1.gh.tar.gz
-_eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=89fe670b58e32590b101c0b2880adfe2
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.74.2 b/metadata/md5-cache/dev-python/cfn-lint-0.74.2
deleted file mode 100644
index 02ec61274000..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.74.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.60.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.60.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.74.2.tar.gz -> cfn-lint-0.74.2.gh.tar.gz
-_eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=89fe670b58e32590b101c0b2880adfe2
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.74.3 b/metadata/md5-cache/dev-python/cfn-lint-0.74.3
index 15e6d26203ae..929397b49a2a 100644
--- a/metadata/md5-cache/dev-python/cfn-lint-0.74.3
+++ b/metadata/md5-cache/dev-python/cfn-lint-0.74.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-python/aws-sam-translator-1.60.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.74.3.tar.gz -> cfn-lint-0.74.3.gh.tar.gz
 _eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=36b30ca7542b1d93ec44135c8f20732f
+_md5_=7a827bb37a9dbed62c2bf5f750c50b75
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.75.0 b/metadata/md5-cache/dev-python/cfn-lint-0.75.0
deleted file mode 100644
index aa653886926d..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.75.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.60.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.60.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.75.0.tar.gz -> cfn-lint-0.75.0.gh.tar.gz
-_eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=36b30ca7542b1d93ec44135c8f20732f
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 370955a1326f..dc818e04b366 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/abstract-1.0.0-r5 b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r5
index 2dd7632c0d84..97ffa4c0a740 100644
--- a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r5
+++ b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://rubygems.org/gems/abstract
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby-BSD
 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/abstract-1.0.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a9f430d18c89b104256abdd2c5fd26aa
+_md5_=a36ed1d8fcaed73254ea8c317e5dfda5
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.8.1 b/metadata/md5-cache/dev-ruby/addressable-2.8.1
index 60856beed83f..18905d134802 100644
--- a/metadata/md5-cache/dev-ruby/addressable-2.8.1
+++ b/metadata/md5-cache/dev-ruby/addressable-2.8.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable
 INHERIT=ruby-fakegem
 IUSE=doc test 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby27? ( || ( dev-ruby/public_suffix:5[ruby_targets_ruby27(-)] dev-ruby/public_suffix:4[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( || ( dev-ruby/public_suffix:5[ruby_targets_ruby30(-)] dev-ruby/public_suffix:4[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( || ( dev-ruby/public_suffix:5[ruby_targets_ruby31(-)] dev-ruby/public_suffix:4[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( || ( dev-ruby/public_suffix:5[ruby_targets_ruby32(-)] dev-ruby/public_suffix:4[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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/addressable-2.8.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=cc23c7c48ae589404f44ab4ca1c9ed53
+_md5_=f9b1c21f50ae4d8239b0281c10a10210
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.18 b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.18
index 52e403abd21b..3b4cccd72777 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.18
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.18
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/asciidoctor/asciidoctor
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v2.0.18.tar.gz -> asciidoctor-2.0.18.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=83d2f8214eaa5c850331f60d729f869f
+_md5_=0cd47de4b881a16d3a5891f6d48edb1e
diff --git a/metadata/md5-cache/dev-ruby/asciimath-2.0.4 b/metadata/md5-cache/dev-ruby/asciimath-2.0.4
index fd7b43ff3459..a94727196ab4 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-2.0.4
+++ b/metadata/md5-cache/dev-ruby/asciimath-2.0.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pepijnve/asciimath
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 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_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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/asciimath-2.0.4.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a40a47b2b0e5fa9feec1e72b9ca9019c
+_md5_=4fda576e38fd3d450731ee494b2cb290
diff --git a/metadata/md5-cache/dev-ruby/backports-3.23.0 b/metadata/md5-cache/dev-ruby/backports-3.23.0
index 8409590f8b25..6964d5063563 100644
--- a/metadata/md5-cache/dev-ruby/backports-3.23.0
+++ b/metadata/md5-cache/dev-ruby/backports-3.23.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/marcandre/backports
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/marcandre/backports/archive/v3.23.0.tar.gz -> backports-3.23.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=78d5a74e29e7c3de1f1b2fdb04d0b6c2
+_md5_=51486b1df2edf11fb2d36422bd6654a2
diff --git a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r4 b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r4
index 7a36e7855c0b..91a1971dea08 100644
--- a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r4
+++ b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://leahneukirchen.org/repos/bacon/
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bacon-1.2.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0072d4dc4e7ca37ec703ba1f32ddc09b
+_md5_=18a855ee65a233d0c487262c692f90ed
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.18 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.18
index 6645cbaefed0..f88cc2d9c8cc 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.18
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.18
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/codahale/bcrypt-ruby
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bcrypt-3.1.18.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=601360ad39e17b43da2b365c6ec7ad24
+_md5_=cfc854ea2e8e35cb43c57eeedc5047ab
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.38.0 b/metadata/md5-cache/dev-ruby/capybara-3.38.0
index 920605e08a51..2a4233134cbc 100644
--- a/metadata/md5-cache/dev-ruby/capybara-3.38.0
+++ b/metadata/md5-cache/dev-ruby/capybara-3.38.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jnicklas/capybara
 INHERIT=virtualx ruby-fakegem
 IUSE=test test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/addressable[ruby_targets_ruby27(-)] dev-ruby/matrix[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby27(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] dev-ruby/regexp_parser:2[ruby_targets_ruby27(-)] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/addressable[ruby_targets_ruby30(-)] dev-ruby/matrix[ruby_targets_ruby30(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby30(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] dev-ruby/regexp_parser:2[ruby_targets_ruby30(-)] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/addressable[ruby_targets_ruby31(-)] dev-ruby/matrix[ruby_targets_ruby31(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby31(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby31(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby31(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby31(-)] dev-ruby/regexp_parser:2[ruby_targets_ruby31(-)] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capybara-3.38.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=6a22f7f7368c38ec97df01a872987896
+_md5_=a9308e8096cc015d45de2ba3349e6d01
diff --git a/metadata/md5-cache/dev-ruby/certificate_authority-1.1.0 b/metadata/md5-cache/dev-ruby/certificate_authority-1.1.0
index 1fc2071db870..ba1e5b150215 100644
--- a/metadata/md5-cache/dev-ruby/certificate_authority-1.1.0
+++ b/metadata/md5-cache/dev-ruby/certificate_authority-1.1.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/cchandler/certificate_authority
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cchandler/certificate_authority/archive/v1.1.0.tar.gz -> certificate_authority-1.1.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a3d2585ca0a69fe2e224974fecbc24c8
+_md5_=c74c5e463d3503f61de49598939345f3
diff --git a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.2.0 b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.2.0
index 8b15f4dae803..e5a108d3ff59 100644
--- a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.2.0
+++ b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.2.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby-concurrency/concurrent-ruby
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.2.0.tar.gz -> concurrent-ruby-1.2.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=24d492c35b10daf6f9572c679b93497b
+_md5_=d098af787772ef2065311d96b14578a4
diff --git a/metadata/md5-cache/dev-ruby/crack-0.4.4-r3 b/metadata/md5-cache/dev-ruby/crack-0.4.4-r3
index 3ee218e96691..eea4ca1d447a 100644
--- a/metadata/md5-cache/dev-ruby/crack-0.4.4-r3
+++ b/metadata/md5-cache/dev-ruby/crack-0.4.4-r3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jnunemaker/crack
 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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_ruby27? ( dev-ruby/rexml[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rexml[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/rexml[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/rexml[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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jnunemaker/crack/archive/v0.4.4.tar.gz -> crack-0.4.4.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6db06ed66beb40b076cf11754219167b
+_md5_=593f281e4e4f80b75456283f78a66dec
diff --git a/metadata/md5-cache/dev-ruby/crass-1.0.6-r1 b/metadata/md5-cache/dev-ruby/crass-1.0.6-r1
index 47d132e85cf2..e41f77339ed1 100644
--- a/metadata/md5-cache/dev-ruby/crass-1.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/crass-1.0.6-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rgrove/crass/
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rgrove/crass/archive/v1.0.6.tar.gz -> crass-1.0.6.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e88a9abcee2d9ab06811baeb691f092d
+_md5_=92b3a22da902af4806e622af170ff95e
diff --git a/metadata/md5-cache/dev-ruby/dalli-3.2.4 b/metadata/md5-cache/dev-ruby/dalli-3.2.4
index 829e91566fff..7ad6cb60ac42 100644
--- a/metadata/md5-cache/dev-ruby/dalli-3.2.4
+++ b/metadata/md5-cache/dev-ruby/dalli-3.2.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/petergoldstein/dalli
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/petergoldstein/dalli/archive/v3.2.4.tar.gz -> dalli-3.2.4.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=131295e241f2df3e7d7f117187c442de
+_md5_=2ae493f9c62726dba08cb26ef4da2b79
diff --git a/metadata/md5-cache/dev-ruby/dbf-4.2.2 b/metadata/md5-cache/dev-ruby/dbf-4.2.2
index 30f11eeaf911..18bbf7986c5c 100644
--- a/metadata/md5-cache/dev-ruby/dbf-4.2.2
+++ b/metadata/md5-cache/dev-ruby/dbf-4.2.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/infused/dbf
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dbf-4.2.2.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=db81f81496d051a89913694ad2602736
+_md5_=d029a75c07444898967350f65b54b081
diff --git a/metadata/md5-cache/dev-ruby/deep_merge-1.2.2 b/metadata/md5-cache/dev-ruby/deep_merge-1.2.2
index c84c7116e18f..0e267812cd02 100644
--- a/metadata/md5-cache/dev-ruby/deep_merge-1.2.2
+++ b/metadata/md5-cache/dev-ruby/deep_merge-1.2.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/danielsdeleo/deep_merge
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/deep_merge-1.2.2.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9bc8fe931d2c8279960bc4ea6fdd8abe
+_md5_=81f5e0b884fba2f6ab1ed8787d7a04d0
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.5.0 b/metadata/md5-cache/dev-ruby/diff-lcs-1.5.0
index 75624ae453c8..b90b5d8cd097 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.5.0
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.5.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/halostatue/diff-lcs
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic MIT GPL-2+ )
 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/diff-lcs-1.5.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=41f898378d713f460ee1c74e79233314
+_md5_=c2230dca14905e33d959ce6c977fc1ef
diff --git a/metadata/md5-cache/dev-ruby/ed25519-1.3.0 b/metadata/md5-cache/dev-ruby/ed25519-1.3.0
index 14660f7088af..834b60795cc6 100644
--- a/metadata/md5-cache/dev-ruby/ed25519-1.3.0
+++ b/metadata/md5-cache/dev-ruby/ed25519-1.3.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/crypto-rb/ed25519
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86
 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_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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/crypto-rb/ed25519/archive/v1.3.0.tar.gz -> ed25519-1.3.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6ad640d68815b384fb198ddfc9d2019c
+_md5_=f8141d77eda8f9940ae62c9981169abf
diff --git a/metadata/md5-cache/dev-ruby/erubi-1.11.0 b/metadata/md5-cache/dev-ruby/erubi-1.11.0
index 39149c638976..dcc14ee830d1 100644
--- a/metadata/md5-cache/dev-ruby/erubi-1.11.0
+++ b/metadata/md5-cache/dev-ruby/erubi-1.11.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jeremyevans/erubi
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jeremyevans/erubi/archive/1.11.0.tar.gz -> erubi-1.11.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7467ee2a21ab976351178964707af256
+_md5_=976e54d8e6e6fc7dcf0d3d73d056ad4c
diff --git a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r4 b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r4
index b3dc87a49d10..e041699510d7 100644
--- a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r4
+++ b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://www.kuwata-lab.com/erubis/
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/abstract-1.0.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 )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/erubis-2.7.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5c97ed461ef047a868716e45b4067c3a
+_md5_=fefde6d86ec94b2536f3c487e014a8a7
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.8.1-r1 b/metadata/md5-cache/dev-ruby/execjs-2.8.1-r1
new file mode 100644
index 000000000000..045653da5f24
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/execjs-2.8.1-r1
@@ -0,0 +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_ruby32? ( dev-lang/ruby:3.2 ) 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=ExecJS lets you run JavaScript code from Ruby
+EAPI=8
+HOMEPAGE=https://github.com/rails/execjs
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+LICENSE=MIT
+RDEPEND=|| ( dev-ruby/duktape-rb net-libs/nodejs ) 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://github.com/rails/execjs/archive/v2.8.1.tar.gz -> execjs-2.8.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=df6a2be0b94177dab2038e7dc67571a4
diff --git a/metadata/md5-cache/dev-ruby/forwardable-1.3.3 b/metadata/md5-cache/dev-ruby/forwardable-1.3.3
index bc8864a1f594..e3ab8b938f10 100644
--- a/metadata/md5-cache/dev-ruby/forwardable-1.3.3
+++ b/metadata/md5-cache/dev-ruby/forwardable-1.3.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/forwardable
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/forwardable/archive/v1.3.3.tar.gz -> forwardable-1.3.3.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=779ee0e67e725bcc42bdc9e2743e438c
+_md5_=062c41193a055a3bb5406a4be8b896a4
diff --git a/metadata/md5-cache/dev-ruby/kramdown-2.4.0-r1 b/metadata/md5-cache/dev-ruby/kramdown-2.4.0-r1
index 5bd68c67c02f..cc0bdc6a7804 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-2.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/kramdown-2.4.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://kramdown.gettalong.org/
 INHERIT=ruby-fakegem
 IUSE=latex unicode test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby_targets_ruby27? ( dev-ruby/rexml[ruby_targets_ruby27(-)] >=dev-ruby/rouge-3.26.0:2[ruby_targets_ruby27(-)] unicode? ( >=dev-ruby/stringex-1.5.1[ruby_targets_ruby27(-)] ) !!<dev-ruby/kramdown-1.17.0-r2:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rexml[ruby_targets_ruby30(-)] >=dev-ruby/rouge-3.26.0:2[ruby_targets_ruby30(-)] unicode? ( >=dev-ruby/stringex-1.5.1[ruby_targets_ruby30(-)] ) !!<dev-ruby/kramdown-1.17.0-r2:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/rexml[ruby_targets_ruby31(-)] >=dev-ruby/rouge-3.26.0:2[ruby_targets_ruby31(-)] unicode? ( >=dev-ruby/stringex-1.5.1[ruby_targets_ruby31(-)] ) !!<dev-ruby/kramdown-1.17.0-r2: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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/kramdown-2.4.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=737bf6d661732e34b5938973d9a16cfa
+_md5_=f416ed1ce20b04fb3205c7f3c215f857
diff --git a/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1-r1 b/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1-r1
index 68ade05951f1..16bfa1eaea74 100644
--- a/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/hsbt/minitest-power_assert
 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
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/minitest:*[ruby_targets_ruby27(-)] >=dev-ruby/power_assert-1.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/minitest:*[ruby_targets_ruby30(-)] >=dev-ruby/power_assert-1.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/minitest:*[ruby_targets_ruby31(-)] >=dev-ruby/power_assert-1.1[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/minitest:*[ruby_targets_ruby32(-)] >=dev-ruby/power_assert-1.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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minitest-power_assert-0.3.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4acea29f0c2fb081ebd746a7d883c28c
+_md5_=f4f72ab23de2bf78cfc00c733f52e7c4
diff --git a/metadata/md5-cache/dev-ruby/mustache-1.1.1-r1 b/metadata/md5-cache/dev-ruby/mustache-1.1.1-r1
index 4ca6eaae71a6..a91b5088ef44 100644
--- a/metadata/md5-cache/dev-ruby/mustache-1.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/mustache-1.1.1-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://mustache.github.com/
 INHERIT=multilib ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mustache-1.1.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ac1ff99407334ba71522875601f734b0
+_md5_=7d479e85194ad3f4cc637aad51d80c94
diff --git a/metadata/md5-cache/dev-ruby/prime-0.1.2-r1 b/metadata/md5-cache/dev-ruby/prime-0.1.2-r1
index 6eb79a100d13..7b2adf340e6b 100644
--- a/metadata/md5-cache/dev-ruby/prime-0.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/prime-0.1.2-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/prime
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/forwardable[ruby_targets_ruby27(-)] dev-ruby/singleton[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/forwardable[ruby_targets_ruby30(-)] dev-ruby/singleton[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/forwardable[ruby_targets_ruby31(-)] dev-ruby/singleton[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/forwardable[ruby_targets_ruby32(-)] dev-ruby/singleton[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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/prime/archive/v0.1.2.tar.gz -> prime-0.1.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a6a84c2c85e9ed5fd4a3e99e1dfed50f
+_md5_=fc5d0f358d79413ebe358cecf5ab1c3c
diff --git a/metadata/md5-cache/dev-ruby/rbs-2.5.1 b/metadata/md5-cache/dev-ruby/rbs-2.5.1
index 46f5f277587b..6c9ab8d5834a 100644
--- a/metadata/md5-cache/dev-ruby/rbs-2.5.1
+++ b/metadata/md5-cache/dev-ruby/rbs-2.5.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/rbs
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby-BSD BSD-2 )
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rbs/archive/v2.5.1.tar.gz -> rbs-2.5.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=24281d85286c8d15f39fc365471b3e11
+_md5_=311ea3eb6d6da34b8e5f7f9c436091fd
diff --git a/metadata/md5-cache/dev-ruby/redcarpet-3.5.1-r1 b/metadata/md5-cache/dev-ruby/redcarpet-3.5.1-r1
index e6c599648636..cbfa44dbf033 100644
--- a/metadata/md5-cache/dev-ruby/redcarpet-3.5.1-r1
+++ b/metadata/md5-cache/dev-ruby/redcarpet-3.5.1-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/vmg/redcarpet
 INHERIT=multilib ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vmg/redcarpet/archive/v3.5.1.tar.gz -> redcarpet-3.5.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a611166d53290f3ae2ea4302a1e3b56c
+_md5_=2094b2c3970b661ceff98b3171d79d05
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.7.0 b/metadata/md5-cache/dev-ruby/regexp_parser-2.7.0
index c1ca57a4c12f..3ddfab7db6fc 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-2.7.0
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-2.7.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ammar/regexp_parser
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 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_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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.7.0.tar.gz -> regexp_parser-2.7.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9c6c540cd33526349cadef2d63b994c2
+_md5_=64cec28488ba6c18177819de8821f996
diff --git a/metadata/md5-cache/dev-ruby/rouge-3.30.0 b/metadata/md5-cache/dev-ruby/rouge-3.30.0
index bac1a81d11ea..5073a41db972 100644
--- a/metadata/md5-cache/dev-ruby/rouge-3.30.0
+++ b/metadata/md5-cache/dev-ruby/rouge-3.30.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jneen/rouge
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/redcarpet[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/redcarpet[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/redcarpet[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jneen/rouge/archive/v3.30.0.tar.gz -> rouge-3.30.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=87aa126548dffd202bf1d34c07343996
+_md5_=30f33d4cd06d8b89a48ecc5d4e18d95c
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.12.0 b/metadata/md5-cache/dev-ruby/rspec-support-3.12.0
index d80af3a0bbc4..77b73216e91a 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.12.0
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.12.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rspec/rspec-support
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.12.0.tar.gz -> rspec-support-3.12.0-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=58069237a648554240735a3aa9f41e2e
+_md5_=b5bc041a04350f04d1f43755d7aa942b
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.3
index 27d8465d77ab..78aa00a8f6a6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://ruby-gettext.github.io/
 INHERIT=ruby-fakegem
 IUSE=doc test test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
 LICENSE=|| ( GPL-2 Ruby-BSD LGPL-3+ )
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/erubi[ruby_targets_ruby27(-)] >=dev-ruby/locale-2.0.5[ruby_targets_ruby27(-)] dev-ruby/prime[ruby_targets_ruby27(-)] >=dev-ruby/text-1.3.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/erubi[ruby_targets_ruby30(-)] >=dev-ruby/locale-2.0.5[ruby_targets_ruby30(-)] dev-ruby/prime[ruby_targets_ruby30(-)] >=dev-ruby/text-1.3.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/erubi[ruby_targets_ruby31(-)] >=dev-ruby/locale-2.0.5[ruby_targets_ruby31(-)] dev-ruby/prime[ruby_targets_ruby31(-)] >=dev-ruby/text-1.3.0[ruby_targets_ruby31(-)] ) sys-devel/gettext ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gettext-3.4.3.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=78adf3c42be503afc3cc9b504f4c3d34
+_md5_=b979cb2e62b8ddf9a3fd676452bfb579
diff --git a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5 b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5
index 098753f1e574..e2c40e56e192 100644
--- a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5
+++ b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://github.com/ruby/ruby2_keywords
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( BSD-2 Ruby-BSD )
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0.0
 SRC_URI=https://rubygems.org/gems/ruby2_keywords-0.0.5.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=11565ac43998959c80a17907f2033f5c
+_md5_=99854dd4e6b8efb4d610d109582aab17
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.19.2 b/metadata/md5-cache/dev-ruby/ruby_parser-3.19.2
index c59cd44be6cc..70657215a19f 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.19.2
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.19.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/seattlerb/ruby_parser
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/sexp_processor-4.16.0:4[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/sexp_processor-4.16.0:4[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/sexp_processor-4.16.0:4[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/sexp_processor-4.16.0:4[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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/ruby_parser-3.19.2.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=63716ded8febb105a70ad2d1fdf503a3
+_md5_=d1463f9e894c192c65c16b60f8eff50a
diff --git a/metadata/md5-cache/dev-ruby/singleton-0.1.1 b/metadata/md5-cache/dev-ruby/singleton-0.1.1
index 737b844ae37d..42531dccb904 100644
--- a/metadata/md5-cache/dev-ruby/singleton-0.1.1
+++ b/metadata/md5-cache/dev-ruby/singleton-0.1.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/singleton
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/singleton/archive/v0.1.1.tar.gz -> singleton-0.1.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7e03e63f5bb6ea32c1096e753a431ec3
+_md5_=698f6715931564c6e119597a3279b5c3
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.5.3 b/metadata/md5-cache/dev-ruby/sqlite3-1.5.3
index 0411863455dd..9f5ac83781c9 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.5.3
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.5.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/sparklemotion/sqlite3-ruby
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-db/sqlite-3.39.4: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_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sqlite3-1.5.3.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=328bfbd2be6c8284b3e222529508dafd
+_md5_=992a899cbbe69fd6fdd080dcd9283bc3
diff --git a/metadata/md5-cache/dev-ruby/stringio-3.0.4 b/metadata/md5-cache/dev-ruby/stringio-3.0.4
index 85b635bd59b3..2ce53e939366 100644
--- a/metadata/md5-cache/dev-ruby/stringio-3.0.4
+++ b/metadata/md5-cache/dev-ruby/stringio-3.0.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/stringio
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/stringio/archive/v3.0.4.tar.gz -> stringio-3.0.4.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0fa6f5c3197a2c567a3afcd296d8e6e1
+_md5_=3527da55e7c16bb22a81a0909c9c0189
diff --git a/metadata/md5-cache/dev-ruby/temple-0.9.1 b/metadata/md5-cache/dev-ruby/temple-0.9.1
index 64dd8ad2f83e..ffe74417300c 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.9.1
+++ b/metadata/md5-cache/dev-ruby/temple-0.9.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/judofyr/temple
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.7
 SRC_URI=https://rubygems.org/gems/temple-0.9.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=998655c03da13004b1db8866d0553c31
+_md5_=b35d7e39aeae0943433b618b5947dd00
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.5.7 b/metadata/md5-cache/dev-ruby/test-unit-3.5.7
index 8e23ca188c38..c59b9991a7c6 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.5.7
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.5.7
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://rubygems.org/gems/test-unit
 INHERIT=ruby-fakegem
 IUSE=doc test test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby-BSD BSD-2 ) PSF-2
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/power_assert[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/power_assert[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/power_assert[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/power_assert[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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/test-unit/test-unit/archive/3.5.7.tar.gz -> test-unit-3.5.7.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c95c6f1722b96a455688c01740cdb2e4
+_md5_=6a6b3ce38549e7b28e209093bc62f405
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.9.5 b/metadata/md5-cache/dev-ruby/timecop-0.9.5
index 2f3cd33b3ad4..db6cfff6b126 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.9.5
+++ b/metadata/md5-cache/dev-ruby/timecop-0.9.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/travisjeffery/timecop
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86
 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_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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/timecop-0.9.5.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6b56b78b157ba5234a758dfd3bbc3e25
+_md5_=e3179b6f7424150f30fd6694b1e1b634
diff --git a/metadata/md5-cache/dev-ruby/tins-1.32.1 b/metadata/md5-cache/dev-ruby/tins-1.32.1
index a92df8b63165..2651aab350d2 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.32.1
+++ b/metadata/md5-cache/dev-ruby/tins-1.32.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/flori/tins
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/sync[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/sync[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/sync[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/sync[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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tins-1.32.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0ad8c9e610e4126f3a03f67c5e9c98db
+_md5_=70a55c6eaa5c5f32efeb3755931972c2
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.11 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.11
index d520d1e4fac4..7a56feed1069 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-1.2.11
+++ b/metadata/md5-cache/dev-ruby/tzinfo-1.2.11
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://tzinfo.github.io/
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=sys-libs/timezone-data ruby_targets_ruby27? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/thread_safe-0.1: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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/tzinfo-1.2.11.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=86c3fc0cdc6dd1645bf9bcadae49c2df
+_md5_=eabb6f625bc693a5e66827789aa63bfe
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-2.0.6 b/metadata/md5-cache/dev-ruby/tzinfo-2.0.6
index f7749e7447d4..0f4f7c334d31 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-2.0.6
+++ b/metadata/md5-cache/dev-ruby/tzinfo-2.0.6
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://tzinfo.github.io/
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=sys-libs/timezone-data ruby_targets_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/tzinfo/tzinfo/archive/v2.0.6.tar.gz -> tzinfo-2.0.6.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=281bd62490cdf846477a1c17b80eb7f1
+_md5_=6d0cb928f8e0b669e7408021b6dbc38c
diff --git a/metadata/md5-cache/dev-ruby/webmock-3.18.1 b/metadata/md5-cache/dev-ruby/webmock-3.18.1
index ef11151e2886..96c363b3382b 100644
--- a/metadata/md5-cache/dev-ruby/webmock-3.18.1
+++ b/metadata/md5-cache/dev-ruby/webmock-3.18.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/bblimke/webmock
 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/addressable-2.8.0[ruby_targets_ruby27(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby27(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/addressable-2.8.0[ruby_targets_ruby30(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby30(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/addressable-2.8.0[ruby_targets_ruby31(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby31(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/addressable-2.8.0[ruby_targets_ruby32(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby32(-)] >=dev-ruby/hashdiff-0.4.0:0[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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/webmock-3.18.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c298175ec182253007340a4c5fe5619c
+_md5_=ba2d33d646343a2601e5809cf8d1b6fd
diff --git a/metadata/md5-cache/dev-ruby/webrick-1.8.0 b/metadata/md5-cache/dev-ruby/webrick-1.8.0
index 20d494387c98..49e0e37397c0 100644
--- a/metadata/md5-cache/dev-ruby/webrick-1.8.0
+++ b/metadata/md5-cache/dev-ruby/webrick-1.8.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/webrick
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby-BSD BSD-2 )
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/webrick/archive/v1.8.0.tar.gz -> webrick-1.8.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6ed5868f39a3e09a708b402511f46f6e
+_md5_=57e0d91e231caa53d91dec6d9c00a703
diff --git a/metadata/md5-cache/dev-ruby/x25519-1.0.10 b/metadata/md5-cache/dev-ruby/x25519-1.0.10
index 3f48237f2409..609b1819bfb5 100644
--- a/metadata/md5-cache/dev-ruby/x25519-1.0.10
+++ b/metadata/md5-cache/dev-ruby/x25519-1.0.10
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/crypto-rb/x25519
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=BSD
 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/crypto-rb/x25519/archive/v1.0.10.tar.gz -> x25519-1.0.10.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3cea5007a9f310d02bb63d0c7a9480ca
+_md5_=c144ec577124f3828ed7bb6c6a6ce73d
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.3 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.3
index d275974f9d77..6740d9b2934f 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.3
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/brianmario/yajl-ruby
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-libs/yajl 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/yajl-ruby-1.4.3.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9c3a29c8a2b901cf1525823e44734cec
+_md5_=0689008bdb8c61279901ea324803327c
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.28 b/metadata/md5-cache/dev-ruby/yard-0.9.28
index 9392d04ed73a..b9ecc30dab66 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.9.28
+++ b/metadata/md5-cache/dev-ruby/yard-0.9.28
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://yardoc.org/
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~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 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( =dev-ruby/webrick-1.7*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/webrick-1.7*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( =dev-ruby/webrick-1.7*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( =dev-ruby/webrick-1.7*[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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/v0.9.28.tar.gz -> yard-0.9.28-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0b705ca2aa6970bbcc641ccc34668df2
+_md5_=7eb0a7bb333d84f68b54def80eb4c658
diff --git a/metadata/md5-cache/dev-ruby/zeitwerk-2.6.6 b/metadata/md5-cache/dev-ruby/zeitwerk-2.6.6
index 18f97ff5600f..ac63a1a5c34b 100644
--- a/metadata/md5-cache/dev-ruby/zeitwerk-2.6.6
+++ b/metadata/md5-cache/dev-ruby/zeitwerk-2.6.6
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/fxn/zeitwerk
 INHERIT=ruby-fakegem
 IUSE=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
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 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_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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fxn/zeitwerk/archive/v2.6.6.tar.gz -> zeitwerk-2.6.6.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	378d61ff0c0fe75e24cc380111c71424	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=391be7d3132c8aab37f39235e85fb0e0
+_md5_=eca9b4f8e7b8b2808e6afb97793e7a5f
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 31276315650c..280e83d5ec58 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/gitlab-cli-1.26.0 b/metadata/md5-cache/dev-util/gitlab-cli-1.26.0
new file mode 100644
index 000000000000..4e3916d96295
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gitlab-cli-1.26.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=the official gitlab command line interface
+EAPI=8
+HOMEPAGE=https://gitlab.com/gitlab-org/cli
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://gitlab.com/gitlab-org/cli/-/archive/v1.26.0/gitlab-cli-v1.26.0.tar.bz2 -> gitlab-cli-1.26.0.tar.bz2 https://dev.gentoo.org/~williamh/dist/gitlab-cli-1.26.0-deps.tar.xz
+_eclasses_=go-module	f9700c7efec1fd4955363169e9930c1c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=52083d19e8b166e8fd896c927fecb6b1
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 33e49baf61c6..dede667539ce 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/seahorse-nautilus-3.11.92-r1 b/metadata/md5-cache/gnome-extra/seahorse-nautilus-3.11.92-r1
deleted file mode 100644
index 9d231a5d2595..000000000000
--- a/metadata/md5-cache/gnome-extra/seahorse-nautilus-3.11.92-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-crypt/gpgme-1.0.0 >=app-crypt/gcr-3.4:0=[gtk] >=dev-libs/dbus-glib-0.35 >=dev-libs/glib-2.28:2 gnome-base/gnome-keyring >=gnome-base/nautilus-3 x11-libs/gtk+:3 >=x11-libs/libcryptui-3.9.90 >=x11-libs/libnotify-0.3:= >=app-crypt/gnupg-1.4 >=dev-util/intltool-0.35 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Nautilus extension for encrypting and decrypting files with GnuPG
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Seahorse
-INHERIT=gnome2
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-crypt/gpgme-1.0.0 >=app-crypt/gcr-3.4:0=[gtk] >=dev-libs/dbus-glib-0.35 >=dev-libs/glib-2.28:2 gnome-base/gnome-keyring >=gnome-base/nautilus-3 x11-libs/gtk+:3 >=x11-libs/libcryptui-3.9.90 >=x11-libs/libnotify-0.3:= >=app-crypt/gnupg-1.4 !app-crypt/seahorse-plugins[nautilus]
-SLOT=0
-SRC_URI=mirror://gnome/sources/seahorse-nautilus/3.11/seahorse-nautilus-3.11.92.tar.xz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	gnome.org	6c78a619c14b62c2dbdae52e6c25087f	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7663e2a68dcc2877041f22527e3da3d2
diff --git a/metadata/md5-cache/gnome-extra/seahorse-nautilus-3.11.92_p20220906 b/metadata/md5-cache/gnome-extra/seahorse-nautilus-3.11.92_p20220906
deleted file mode 100644
index 08a5b92517e0..000000000000
--- a/metadata/md5-cache/gnome-extra/seahorse-nautilus-3.11.92_p20220906
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-crypt/gpgme-1.0.0 >=app-crypt/gcr-3.4:0=[gtk] >=dev-libs/dbus-glib-0.35 >=dev-libs/glib-2.28:2 gnome-base/gnome-keyring >=gnome-base/nautilus-43 x11-libs/gtk+:3 >=x11-libs/libcryptui-3.9.90 >=x11-libs/libnotify-0.3:= >=app-crypt/gnupg-1.4
-DESCRIPTION=Nautilus extension for encrypting and decrypting files with GnuPG
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/seahorse-nautilus
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=meson xdg
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-crypt/gpgme-1.0.0 >=app-crypt/gcr-3.4:0=[gtk] >=dev-libs/dbus-glib-0.35 >=dev-libs/glib-2.28:2 gnome-base/gnome-keyring >=gnome-base/nautilus-43 x11-libs/gtk+:3 >=x11-libs/libcryptui-3.9.90 >=x11-libs/libnotify-0.3:= >=app-crypt/gnupg-1.4
-SLOT=0
-SRC_URI=https://gitlab.gnome.org/GNOME/seahorse-nautilus/-/archive/2cc2a06148604b2f118ef460527b03d27530f6d4/seahorse-nautilus-2cc2a06.tar.bz2 -> seahorse-nautilus-3.11.92_p20220906.tar.bz2
-_eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=60316a005ab72632edfd788e13ada367
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 9e9b4a53277d..5e3a7cfc3312 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/ipamonafont-1.0.8 b/metadata/md5-cache/media-fonts/ipamonafont-1.0.8
index 08dcf2c53aa8..d3aa3da9b7b0 100644
--- a/metadata/md5-cache/media-fonts/ipamonafont-1.0.8
+++ b/metadata/md5-cache/media-fonts/ipamonafont-1.0.8
@@ -9,6 +9,6 @@ KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv ~s390 spar
 LICENSE=grass-ipafonts mplus-fonts public-domain
 RESTRICT=mirror
 SLOT=0
-SRC_URI=http://freebsd.sin.openmirrors.asia/pub/FreeBSD/ports/local-distfiles/hrs/opfc-ModuleHP-1.1.1_withIPAMonaFonts-1.0.8.tar.gz
+SRC_URI=http://distcache.freebsd.org/local-distfiles/hrs/opfc-ModuleHP-1.1.1_withIPAMonaFonts-1.0.8.tar.gz
 _eclasses_=font	aa113a3df9cd0a9693a1c1ee7c34a6eb
-_md5_=1930afe4c258cacf19f7711d04475e22
+_md5_=a75c50eed40e4b3019af23e918a71948
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index a5d5e645d965..d483fc20cb52 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/qmidiroute-0.4.0 b/metadata/md5-cache/media-sound/qmidiroute-0.4.0-r1
index f7bb93802fa2..fcea7afd5790 100644
--- a/metadata/md5-cache/media-sound/qmidiroute-0.4.0
+++ b/metadata/md5-cache/media-sound/qmidiroute-0.4.0-r1
@@ -1,14 +1,14 @@
 BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=configure prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 media-libs/alsa-lib
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/alsa-lib
 DESCRIPTION=QMidiRoute is a filter/router for MIDI events
 EAPI=7
 HOMEPAGE=http://alsamodular.sourceforge.net
 INHERIT=autotools qmake-utils
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 media-libs/alsa-lib
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/alsa-lib
 SLOT=0
 SRC_URI=mirror://sourceforge/alsamodular/qmidiroute-0.4.0.tar.bz2
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=608f8c808778eb5c44f8a8dcc10cf282
+_md5_=3a356b8229050fc079ab49bd40f76601
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index b652aa217fee..8de4f1a35986 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/weechat-3.6 b/metadata/md5-cache/net-irc/weechat-3.6
deleted file mode 100644
index 55c0de9bcb94..000000000000
--- a/metadata/md5-cache/net-irc/weechat-3.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-weechat ) virtual/pkgconfig doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) nls? ( >=sys-devel/gettext-0.15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=app-arch/zstd:= dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) 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 ) ) ruby? ( || ( dev-lang/ruby:3.1 dev-lang/ruby:3.0 dev-lang/ruby:2.7 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
-DESCRIPTION=Portable and multi-interface IRC client
-EAPI=7
-HOMEPAGE=https://weechat.org/
-INHERIT=cmake lua-single python-single-r1 xdg-utils verify-sig
-IUSE=doc man nls selinux test guile lua +perl +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer +irc lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 verify-sig
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=app-arch/zstd:= dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) 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 ) ) ruby? ( || ( dev-lang/ruby:3.1 dev-lang/ruby:3.0 dev-lang/ruby:2.7 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) test? ( nls )
-RESTRICT=!test? ( test )
-SLOT=0/3.6
-SRC_URI=https://weechat.org/files/src/weechat-3.6.tar.xz verify-sig? ( https://weechat.org/files/src/weechat-3.6.tar.xz.asc )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b470922f90021059f18eb532748471ae
diff --git a/metadata/md5-cache/net-irc/weechat-3.8 b/metadata/md5-cache/net-irc/weechat-3.8
index 7c15a1966870..582613b53c1a 100644
--- a/metadata/md5-cache/net-irc/weechat-3.8
+++ b/metadata/md5-cache/net-irc/weechat-3.8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://weechat.org/
 INHERIT=cmake lua-single python-single-r1 xdg-utils verify-sig
 IUSE=doc enchant man nls selinux test guile lua +perl +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer +irc lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 verify-sig
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=app-arch/zstd:= dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) 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 ) ) ruby? ( || ( dev-lang/ruby:3.1 dev-lang/ruby:3.0 dev-lang/ruby:2.7 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( enchant? ( app-text/enchant:* ) !enchant? ( app-text/aspell ) ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
 REQUIRED_USE=enchant? ( spell ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) test? ( nls )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3.8
 SRC_URI=https://weechat.org/files/src/weechat-3.8.tar.xz verify-sig? ( https://weechat.org/files/src/weechat-3.8.tar.xz.asc )
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=099a14e7940232a0d25237f666310379
+_md5_=6827acf569141ef7bd3fff052b1f8a96
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 7b791decfdb5..b639e905f882 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/accountsservice-23.13.9 b/metadata/md5-cache/sys-apps/accountsservice-23.13.9
new file mode 100644
index 000000000000..5b5a7efcef3e
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/accountsservice-23.13.9
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/libxslt dev-util/gdbus-codegen dev-util/glib-utils sys-devel/gettext virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/python-dbusmock[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/python-dbusmock[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/python-dbusmock[python_targets_python3_9(-)] ) ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install setup test
+DEPEND=>=dev-libs/glib-2.63.5:2 sys-auth/polkit virtual/libcrypt:= elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) systemd? ( >=sys-apps/systemd-186:0= )
+DESCRIPTION=D-Bus interfaces for querying and manipulating user account information
+EAPI=8
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/AccountsService/
+INHERIT=meson python-any-r1 systemd
+IUSE=doc elogind gtk-doc +introspection selinux systemd test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.63.5:2 sys-auth/polkit virtual/libcrypt:= elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) systemd? ( >=sys-apps/systemd-186:0= ) selinux? ( sec-policy/selinux-accountsd )
+REQUIRED_USE=^^ ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.freedesktop.org/software/accountsservice/accountsservice-23.13.9.tar.xz
+_eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=61ce74fbe680707bba603fec2f757c06
diff --git a/metadata/md5-cache/sys-apps/s6-linux-utils-2.6.1.1 b/metadata/md5-cache/sys-apps/s6-linux-utils-2.6.1.1
index 66cb9f1c0fbd..91aac70ad298 100644
--- a/metadata/md5-cache/sys-apps/s6-linux-utils-2.6.1.1
+++ b/metadata/md5-cache/sys-apps/s6-linux-utils-2.6.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Set of tiny linux utilities
 EAPI=8
 HOMEPAGE=https://www.skarnet.org/software/s6-linux-utils/
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 x86
 LICENSE=ISC
 RDEPEND=>=dev-libs/skalibs-2.13.0.0:=
 SLOT=0
 SRC_URI=https://www.skarnet.org/software/s6-linux-utils/s6-linux-utils-2.6.1.1.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9d02bdb2a3489681f0554575b74e40b1
+_md5_=1279a5eb720750de621722c44b3452b1
diff --git a/metadata/md5-cache/sys-apps/s6-portable-utils-2.3.0.1 b/metadata/md5-cache/sys-apps/s6-portable-utils-2.3.0.1
index 6a6f7bed0e73..44f4666055a2 100644
--- a/metadata/md5-cache/sys-apps/s6-portable-utils-2.3.0.1
+++ b/metadata/md5-cache/sys-apps/s6-portable-utils-2.3.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Set of tiny portable unix utilities
 EAPI=8
 HOMEPAGE=https://www.skarnet.org/software/s6-portable-utils/
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm x86
 LICENSE=ISC
 RDEPEND=>=dev-libs/skalibs-2.13.0.0:=
 SLOT=0
 SRC_URI=https://www.skarnet.org/software/s6-portable-utils/s6-portable-utils-2.3.0.1.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c131a4d098ee2b6c35219a9a60051b9d
+_md5_=b141c824001ddb455698de79b7b2690d
diff --git a/metadata/md5-cache/sys-apps/s6-rc-0.5.4.1 b/metadata/md5-cache/sys-apps/s6-rc-0.5.4.1
index f57bc288a2bd..a69d2160bba2 100644
--- a/metadata/md5-cache/sys-apps/s6-rc-0.5.4.1
+++ b/metadata/md5-cache/sys-apps/s6-rc-0.5.4.1
@@ -4,10 +4,10 @@ DESCRIPTION=Service manager for the s6 supervision suite
 EAPI=8
 HOMEPAGE=https://www.skarnet.org/software/s6-rc/
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm x86
 LICENSE=ISC
 RDEPEND=dev-lang/execline:= dev-libs/skalibs:= >=sys-apps/s6-2.11.3.0:=[execline]
 SLOT=0/0.5
 SRC_URI=https://www.skarnet.org/software/s6-rc/s6-rc-0.5.4.1.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f6a502fc5699b271b9c03da606e1c2e1
+_md5_=14d5cc246b846fb5c08fef6958e26f85
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index bfc6ee699b59..ad487da4c76e 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/autoconf-2.72c-r1 b/metadata/md5-cache/sys-devel/autoconf-2.72c-r2
index 5256edaa5dc7..721010a2d5e9 100644
--- a/metadata/md5-cache/sys-devel/autoconf-2.72c-r1
+++ b/metadata/md5-cache/sys-devel/autoconf-2.72c-r2
@@ -8,7 +8,7 @@ IUSE=emacs
 LICENSE=GPL-3+
 PDEPEND=emacs? ( app-emacs/autoconf-mode )
 RDEPEND=>=dev-lang/perl-5.10 >=sys-devel/m4-1.4.16 >=sys-devel/autoconf-wrapper-15 sys-devel/gnuconfig !~sys-devel/autoconf-2.72c:2.5
-SLOT=2.72c
+SLOT=2.72
 SRC_URI=mirror://gnu/autoconf/autoconf-2.72c.tar.xz https://alpha.gnu.org/pub/gnu/autoconf/autoconf-2.72c.tar.xz https://meyering.net/ac/autoconf-2.72c.tar.xz
 _eclasses_=toolchain-autoconf	bec412910d3b00ec440ae33fcb4dbceb
-_md5_=3793fc5cdc91c3615541bcce97dc9b7c
+_md5_=b945d5b7d6843c28a39f7af43239cd41
diff --git a/metadata/md5-cache/sys-devel/autoconf-9999 b/metadata/md5-cache/sys-devel/autoconf-9999
index dff571f42b9d..61d84d223b3e 100644
--- a/metadata/md5-cache/sys-devel/autoconf-9999
+++ b/metadata/md5-cache/sys-devel/autoconf-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=>=dev-lang/perl-5.10 >=sys-devel/m4-1.4.16 >=sys-devel/autoconf-wrapper-15 sys-devel/gnuconfig !~sys-devel/autoconf-9999:2.5
 SLOT=9999
 _eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	toolchain-autoconf	bec412910d3b00ec440ae33fcb4dbceb
-_md5_=3793fc5cdc91c3615541bcce97dc9b7c
+_md5_=b945d5b7d6843c28a39f7af43239cd41
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 421ffd219f28..a00e3d8d99a5 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/chromium-109.0.5414.119 b/metadata/md5-cache/www-client/chromium-109.0.5414.119
deleted file mode 100644
index 70a8ba1cb57a..000000000000
--- a/metadata/md5-cache/www-client/chromium-109.0.5414.119
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) || ( ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] dev-python/setuptools[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ) >=app-arch/gzip-1.7 !headless? ( qt5? ( dev-qt/qtcore:5 ) ) libcxx? ( >=sys-devel/clang-13 ) lto? ( || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre ) pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) ) !headless? ( gtk4? ( gui-libs/gtk:4[X?,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) ) !!sys-devel/llvm:0
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=8
-HOMEPAGE=https://chromium.org/
-INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
-IUSE=+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine custom-cflags +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=BSD
-RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) qt5? ( dev-qt/qtgui:5[X?,wayland?] ) x11-misc/xdg-utils ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
-REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
-SLOT=0/stable
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-109.0.5414.119.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-109-patchset-2/chromium-109-patchset-2.tar.xz ppc64? ( https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_109.0.5414.119-1raptor0~deb11u1.debian.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-ppc64le-gentoo-patches-1.tar.xz ) pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	54fa9b732d29075cfacc3c3091b38747	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=08b821ec98dccd8abbb9e82d00a7e3d6
diff --git a/metadata/md5-cache/www-client/chromium-109.0.5414.74-r1 b/metadata/md5-cache/www-client/chromium-109.0.5414.74-r1
deleted file mode 100644
index d1e334d28333..000000000000
--- a/metadata/md5-cache/www-client/chromium-109.0.5414.74-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) || ( ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] dev-python/setuptools[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ) >=app-arch/gzip-1.7 !headless? ( qt5? ( dev-qt/qtcore:5 ) ) libcxx? ( >=sys-devel/clang-13 ) lto? ( || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre ) pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) ) !headless? ( gtk4? ( gui-libs/gtk:4[X?,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) ) !!sys-devel/llvm:0
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=8
-HOMEPAGE=https://chromium.org/
-INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
-IUSE=+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine custom-cflags +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW pgo
-KEYWORDS=amd64 arm64 ~ppc64
-LICENSE=BSD
-RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) qt5? ( dev-qt/qtgui:5[X?,wayland?] ) x11-misc/xdg-utils ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
-REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
-SLOT=0/stable
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-109.0.5414.74.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-109-patchset-2/chromium-109-patchset-2.tar.xz ppc64? ( https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_109.0.5414.74-2raptor0~deb11u1.debian.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-ppc64le-gentoo-patches-1.tar.xz ) pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	54fa9b732d29075cfacc3c3091b38747	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=905a4287f5fa6733f33d445305773eb1
diff --git a/metadata/md5-cache/www-client/chromium-110.0.5481.38 b/metadata/md5-cache/www-client/chromium-110.0.5481.38
deleted file mode 100644
index d969d9c7969d..000000000000
--- a/metadata/md5-cache/www-client/chromium-110.0.5481.38
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) || ( ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] dev-python/setuptools[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ) >=app-arch/gzip-1.7 !headless? ( qt5? ( dev-qt/qtcore:5 ) ) libcxx? ( >=sys-devel/clang-13 ) lto? ( || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre ) pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) ) !headless? ( gtk4? ( gui-libs/gtk:4[X?,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) ) !!sys-devel/llvm:0
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=8
-HOMEPAGE=https://chromium.org/
-INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
-IUSE=+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine custom-cflags +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=BSD
-RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) qt5? ( dev-qt/qtgui:5[X?,wayland?] ) x11-misc/xdg-utils ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
-REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
-SLOT=0/beta
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-110.0.5481.38.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-110-patchset-4/chromium-110-patchset-4.tar.xz ppc64? ( https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_110.0.5481.77-1raptor0~deb11u1.debian.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-ppc64le-gentoo-patches-1.tar.xz ) pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	54fa9b732d29075cfacc3c3091b38747	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=688a558f6cc8e9ae0d2b80b9f80fd9eb
diff --git a/metadata/md5-cache/www-client/chromium-111.0.5545.6 b/metadata/md5-cache/www-client/chromium-111.0.5545.6
deleted file mode 100644
index 2eb794fc6b6d..000000000000
--- a/metadata/md5-cache/www-client/chromium-111.0.5545.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) || ( ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] dev-python/setuptools[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ) >=app-arch/gzip-1.7 !headless? ( qt5? ( dev-qt/qtcore:5 ) ) libcxx? ( >=sys-devel/clang-13 ) lto? ( || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre ) pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) ) !headless? ( gtk4? ( gui-libs/gtk:4[X?,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) ) !!sys-devel/llvm:0
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=8
-HOMEPAGE=https://chromium.org/
-INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
-IUSE=+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine custom-cflags +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64
-LICENSE=BSD
-RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) qt5? ( dev-qt/qtgui:5[X?,wayland?] ) ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
-REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
-SLOT=0/dev
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-111.0.5545.6.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-111-patchset-2/chromium-111-patchset-2.tar.xz pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	54fa9b732d29075cfacc3c3091b38747	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=595fd6b537251fee55fcb750112a424c
diff --git a/metadata/md5-cache/www-client/chromium-110.0.5481.177-r1 b/metadata/md5-cache/www-client/chromium-111.0.5563.110
index b4db6a7fbb4c..93f48907b964 100644
--- a/metadata/md5-cache/www-client/chromium-110.0.5481.177-r1
+++ b/metadata/md5-cache/www-client/chromium-111.0.5563.110
@@ -1,16 +1,16 @@
-BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) || ( ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] dev-python/setuptools[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ) >=app-arch/gzip-1.7 !headless? ( qt5? ( dev-qt/qtcore:5 ) ) libcxx? ( >=sys-devel/clang-13 ) lto? ( || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre ) pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) || ( ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] dev-python/setuptools[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ) >=app-arch/gzip-1.7 !headless? ( qt5? ( dev-qt/qtcore:5 ) ) libcxx? ( >=sys-devel/clang-13 ) lto? ( || ( ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
 DEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) ) !headless? ( gtk4? ( gui-libs/gtk:4[X?,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) ) !!sys-devel/llvm:0
 DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=8
 HOMEPAGE=https://chromium.org/
 INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
-IUSE=+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine custom-cflags +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW pgo
+IUSE=+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless kerberos libcxx lto +official pax-kernel pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine custom-cflags +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW pgo
 KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=BSD
-RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) qt5? ( dev-qt/qtgui:5[X?,wayland?] ) x11-misc/xdg-utils ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
+RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) qt5? ( dev-qt/qtgui:5[X?,wayland?] ) ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
 REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
 SLOT=0/stable
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-110.0.5481.177.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-110-patchset-4/chromium-110-patchset-4.tar.xz ppc64? ( https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_110.0.5481.77-1raptor0~deb11u1.debian.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-ppc64le-gentoo-patches-1.tar.xz ) pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-111.0.5563.110.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-111-patchset-2/chromium-111-patchset-2.tar.xz ppc64? ( https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_111.0.5563.64-1raptor0~deb11u1.debian.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-ppc64le-gentoo-patches-1.tar.xz ) pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )
 _eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	54fa9b732d29075cfacc3c3091b38747	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=21b8103fb8e168a9431856c12643ac44
+_md5_=366784f02cda9856b56f2dd411d7996e
diff --git a/metadata/md5-cache/www-client/google-chrome-111.0.5563.110 b/metadata/md5-cache/www-client/google-chrome-111.0.5563.146
index 42ff0e6c662b..d7a831b89afc 100644
--- a/metadata/md5-cache/www-client/google-chrome-111.0.5563.110
+++ b/metadata/md5-cache/www-client/google-chrome-111.0.5563.146
@@ -10,6 +10,6 @@ LICENSE=google-chrome
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_111.0.5563.110-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_111.0.5563.146-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	54fa9b732d29075cfacc3c3091b38747	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	79b8360df7fa828892dd5c4dfc23242d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=832f633722d2fe1864b0c2632e551f52
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-112.0.5615.29 b/metadata/md5-cache/www-client/google-chrome-beta-112.0.5615.39
index de022284d600..f3ee5816e6b1 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-112.0.5615.29
+++ b/metadata/md5-cache/www-client/google-chrome-beta-112.0.5615.39
@@ -10,6 +10,6 @@ LICENSE=google-chrome
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_112.0.5615.29-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_112.0.5615.39-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	54fa9b732d29075cfacc3c3091b38747	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	79b8360df7fa828892dd5c4dfc23242d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=af0793b63d0070684d513c0045380acb
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-113.0.5653.0 b/metadata/md5-cache/www-client/google-chrome-unstable-113.0.5668.0
index 8c980a3f37a9..2c9ca53dfea3 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-113.0.5653.0
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-113.0.5668.0
@@ -10,6 +10,6 @@ LICENSE=google-chrome
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_113.0.5653.0-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_113.0.5668.0-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	54fa9b732d29075cfacc3c3091b38747	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	79b8360df7fa828892dd5c4dfc23242d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=af0793b63d0070684d513c0045380acb
diff --git a/metadata/md5-cache/www-client/microsoft-edge-111.0.1661.44 b/metadata/md5-cache/www-client/microsoft-edge-111.0.1661.54
index 37f312f83d9f..875cd81b9edb 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-111.0.1661.44
+++ b/metadata/md5-cache/www-client/microsoft-edge-111.0.1661.54
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_111.0.1661.44-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_111.0.1661.54-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	54fa9b732d29075cfacc3c3091b38747	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	79b8360df7fa828892dd5c4dfc23242d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e3faf660236342ed84650dbc4c099195
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-111.0.1661.41 b/metadata/md5-cache/www-client/microsoft-edge-beta-112.0.1722.15
index 24db88b0fe4c..a08bcf559fb7 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-111.0.1661.41
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-112.0.1722.15
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_111.0.1661.41-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_112.0.1722.15-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	54fa9b732d29075cfacc3c3091b38747	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	79b8360df7fa828892dd5c4dfc23242d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c35de9f6a641eab8e5a8a8dc008143f6
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-112.0.1702.3 b/metadata/md5-cache/www-client/microsoft-edge-dev-113.0.1754.0
index 6f5330cbb03e..6e94d0363f8e 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-112.0.1702.3
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-113.0.1754.0
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_112.0.1702.3-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_113.0.1754.0-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	54fa9b732d29075cfacc3c3091b38747	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	79b8360df7fa828892dd5c4dfc23242d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c35de9f6a641eab8e5a8a8dc008143f6
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 72651bdc0b1f..78eb7687f763 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-111.0.5563.110 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-111.0.5563.146
index 27551030afdc..fd021bd54333 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-111.0.5563.110
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-111.0.5563.146
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=stable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_111.0.5563.110-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_111.0.5563.146-1_amd64.deb
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	79b8360df7fa828892dd5c4dfc23242d
 _md5_=56740527e70db7fbbcef87ad68552159
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-112.0.5615.29_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-112.0.5615.39_beta
index 5ee4a33eee41..3cc69b97cad9 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-112.0.5615.29_beta
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-112.0.5615.39_beta
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_112.0.5615.29-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_112.0.5615.39-1_amd64.deb
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	79b8360df7fa828892dd5c4dfc23242d
 _md5_=eaa785838d85936e9a01ebeaaf056ec1
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-113.0.5653.0_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-113.0.5668.0_alpha
index e39dbe595996..3137d3ccd542 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-113.0.5653.0_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-113.0.5668.0_alpha
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_113.0.5653.0-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_113.0.5668.0-1_amd64.deb
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	79b8360df7fa828892dd5c4dfc23242d
 _md5_=eaa785838d85936e9a01ebeaaf056ec1
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 9c67401ebd4f..6f35c98061d1 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/libcryptui-3.12.2-r2 b/metadata/md5-cache/x11-libs/libcryptui-3.12.2-r2
deleted file mode 100644
index 38e3620a0842..000000000000
--- a/metadata/md5-cache/x11-libs/libcryptui-3.12.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3:3[introspection?] >=dev-libs/dbus-glib-0.72 >=app-crypt/gcr-3:0=[gtk] x11-libs/libICE x11-libs/libSM >=app-crypt/gpgme-1:1= >=app-crypt/gnupg-1.4 introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) app-text/rarian >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=User interface components for OpenPGP
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Seahorse
-INHERIT=gnome2
-IUSE=debug +introspection libnotify
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86
-LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1
-RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3:3[introspection?] >=dev-libs/dbus-glib-0.72 >=app-crypt/gcr-3:0=[gtk] x11-libs/libICE x11-libs/libSM >=app-crypt/gpgme-1:1= >=app-crypt/gnupg-1.4 introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) !<app-crypt/seahorse-3.1.4
-SLOT=0
-SRC_URI=mirror://gnome/sources/libcryptui/3.12/libcryptui-3.12.2.tar.xz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	gnome.org	6c78a619c14b62c2dbdae52e6c25087f	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d0c95fecf258380b02f90c310bebf41a
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 5cd47e66a658..9b2c1766f836 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/mutter-44.0 b/metadata/md5-cache/x11-wm/mutter-44.0-r1
index 8a88ddf78fd1..1301d63b56bf 100644
--- a/metadata/md5-cache/x11-wm/mutter-44.0
+++ b/metadata/md5-cache/x11-wm/mutter-44.0-r1
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/12
 SRC_URI=mirror://gnome/sources/mutter/44/mutter-44.0.tar.xz
 _eclasses_=gnome.org	6c78a619c14b62c2dbdae52e6c25087f	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=230cb8ca43fb1519bd75045239b610a4
+_md5_=c7b4de25adb9f4248b27679d643e0773
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 252fac999f43..48861d180a48 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/garcon-4.18.1 b/metadata/md5-cache/xfce-base/garcon-4.18.1
new file mode 100644
index 000000000000..3cedfd52cd77
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/garcon-4.18.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig introspection? ( >=dev-libs/gobject-introspection-1.66 )
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/libxfce4ui-4.15.7:=[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.66:= )
+DESCRIPTION=Xfce's freedesktop.org specification compatible menu implementation library
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/xfce/garcon/start https://gitlab.xfce.org/xfce/garcon/
+INHERIT=xdg-utils
+IUSE=introspection
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2+ FDL-1.1+
+RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/libxfce4ui-4.15.7:=[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.66:= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/garcon/4.18/garcon-4.18.1.tar.bz2
+_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=089e29b7d274e04cb5a14e9714bac946
diff --git a/metadata/md5-cache/xfce-base/libxfce4ui-4.18.3 b/metadata/md5-cache/xfce-base/libxfce4ui-4.18.3
new file mode 100644
index 000000000000..9e7271822d0e
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/libxfce4ui-4.18.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) )
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3[introspection?,X] x11-libs/libX11 x11-libs/libICE x11-libs/libSM >=xfce-base/libxfce4util-4.17.2:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.66:= ) startup-notification? ( x11-libs/startup-notification ) system-info? ( dev-libs/libgudev gnome-base/libgtop >=media-libs/libepoxy-1.2 )
+DESCRIPTION=Unified widget and session management libs for Xfce
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/xfce/libxfce4ui/start https://gitlab.xfce.org/xfce/libxfce4ui/
+INHERIT=xdg-utils vala
+IUSE=glade +introspection startup-notification system-info vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2+ GPL-2+
+RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3[introspection?,X] x11-libs/libX11 x11-libs/libICE x11-libs/libSM >=xfce-base/libxfce4util-4.17.2:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.66:= ) startup-notification? ( x11-libs/startup-notification ) system-info? ( dev-libs/libgudev gnome-base/libgtop >=media-libs/libepoxy-1.2 )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/libxfce4ui/4.18/libxfce4ui-4.18.3.tar.bz2
+_eclasses_=vala	1343f639cc74d2aa8b36fc08677da58d	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=2941b9535e91093c9292e2b1d791ba25
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.18.3 b/metadata/md5-cache/xfce-base/xfce4-panel-4.18.3
new file mode 100644
index 000000000000..5b775bbbd443
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.18.3
@@ -0,0 +1,16 @@
+BDEPEND=vala? ( || ( dev-lang/vala:0.56 ) ) dev-lang/perl dev-util/gdbus-codegen dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/cairo-1.16.0 >=x11-libs/gtk+-3.24.0:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-4.17.0:= >=xfce-base/libxfce4ui-4.17.1:= >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( >=dev-libs/gobject-introspection-1.66:= )
+DESCRIPTION=Panel for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/xfce/xfce4-panel/start https://gitlab.xfce.org/xfce/xfce4-panel/
+INHERIT=vala xdg-utils
+IUSE=+dbusmenu introspection vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/cairo-1.16.0 >=x11-libs/gtk+-3.24.0:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-4.17.0:= >=xfce-base/libxfce4ui-4.17.1:= >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( >=dev-libs/gobject-introspection-1.66:= )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.18/xfce4-panel-4.18.3.tar.bz2
+_eclasses_=vala	1343f639cc74d2aa8b36fc08677da58d	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=4efe05a01c6bfba07e855a5ad0bf81b8
diff --git a/metadata/md5-cache/xfce-base/xfce4-session-4.18.2 b/metadata/md5-cache/xfce-base/xfce4-session-4.18.2
new file mode 100644
index 000000000000..718f439dd37c
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfce4-session-4.18.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 x11-libs/libSM x11-libs/libwnck:3 x11-libs/libX11 >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/libxfce4ui-4.18.2:= >=xfce-base/xfconf-4.12:= policykit? ( >=sys-auth/polkit-0.102 )
+DESCRIPTION=A session manager for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/xfce/xfce4-session/start https://gitlab.xfce.org/xfce/xfce4-session
+INHERIT=xdg-utils
+IUSE=nls policykit +xscreensaver
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 x11-libs/libSM x11-libs/libwnck:3 x11-libs/libX11 >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/libxfce4ui-4.18.2:= >=xfce-base/xfconf-4.12:= policykit? ( >=sys-auth/polkit-0.102 ) x11-apps/iceauth x11-apps/xrdb nls? ( x11-misc/xdg-user-dirs ) xscreensaver? ( || ( xfce-extra/xfce4-screensaver >=x11-misc/xscreensaver-5.26 x11-misc/light-locker ) )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-session/4.18/xfce4-session-4.18.2.tar.bz2
+_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=1eaa9455bef7711fb84c44182c9b2c09
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index df3eacbc3a7b..5cff03fbbc8c 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15147 BLAKE2B 2c4c571707fdb227917c89e9b9afd066ef57a4c4a5733f9e0bd312bde898ad2c787e5fdd95390bbe65e3042ef30a31dc1ffc0259d39d9264056c7ee69c430e1b SHA512 f7881b725be5eaf311afb8ce8a9e58e914a0a5ecccd11d1711d85d5764d380c44bf0c932faab0700ad330cc79871007b2877ef7a19ddc143a6e3db99bde6afaf
-TIMESTAMP 2023-03-28T14:09:52Z
+TIMESTAMP 2023-03-28T20:09:50Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQi9TBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQjSY5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA7GA//Y4oC4GSxK2rdvyHp4DwqwGt3G9K1hOa4ExBk7ccDsRDoH7r9r3dtRFxq
-XPQSXy8d1d5Zu4pxDdWHqlAxm/Vw3PGgBktjXHjhbL79A1RwObJcpkGg+C7lKjc1
-JBPn20ZmHz1IkicjTsy9NbseaGOex33Sed3wfdlOjXJHDwFfbLELk/7iAd4Xa14y
-DiwJ1xXAe0UAVmdX7v6QSKUyp7NBmzqQBkDPPQ8q84Zqf3Re5uUKNX3uqVBZ6Sv0
-iZYH1N5RgD1qxj1+HbieawmsEMwASYFXN3kFcCMvepl0nfbeGz37UlRvsiuWFDvz
-WJkC4cq25LFxlHp06JkvAGMlk/qIWFonwwvww9BiOBXO+G2Tf8ZNFmnBq0POuomz
-ZyY7mybtBu4gt5TM2oM90tHFiMuoV8JCKdjytOR60HMBs1bEw10lvhiYZJ0eallJ
-EBDL9p7imjrgzCwmgzofhs5IFro6KFmhILrrwQTmNrKYTXYO4tksczRigDGxeZk4
-+A+R/ekd5JrpiFvAupYC17qSSXUtzywBYaBgdMcox65zMw5YmvZShLyvv9kckWVN
-arAx1/dI7MsUTfMbtAOEGubJW35oIMEEcSLr+aR6rshi0x9Gsvj80yTZaS739w8L
-e5Dzy8+7HE3X/lCmWifBA8fodFPc32PjgmCOIcq+z7Y3D53eCbk=
-=V5xl
+klBfbw/5Ab/VyyyPqTnLuXbxo880AQo/2fnqN+wOeAC7D2g0u1PvaYbPr0cSXW4y
+sr4WVj6GOyugF9NYhRmIFTcCCL9tQF6vG/eXZ1iFTALMp5nWfDQMgVS3GrawsbfO
+OMn9kapRDKww/ZZCICNTWUcspkJPIixAFA7NmJNH8R7lnhYp5BKyJeAvo5s6LHzS
+duQSZHScpp6FzZyolHc2LSAyEQ1ON04AfwrpZyYPCmXn+MZaPglYONIOFnsBt0l/
+YQiv4vV1XZJx68y1G9RMYo5vGj/aWJhEsaYqoExWuJ+L/GyBZj97mvVALBp/HGVA
+Z+C4wzYBA2upID43pnCELVD4FsMUItGE1GLte1C/4+3igzRFMse0iy1tlx5cALrx
+1McTnhZh3Q9e8jdJKODHegJLVZLa88SIphq6Vsh0lnPs4vBQ+F739JfDQOndSOLv
+rXlGET3Gw+lZWySVoPoWO63UV6aha0FCevlrs2KouviratPO415nRD++pFmMuNwu
+CDflODbxGPOK5mqS7vTJ/mgm8dYQtyCCej2vEbSX+pkad4bYpk4Wo9avytUQFKjR
+VldwpyVI4ftThrsLzJfVpX3nnhHTecKN/dZnLV0ZI3gUZtqjBSJb9vH2hWFekyll
+txDaWyXAINahsxdxdJ8rTr4hdUKMEBXEvD8jvESZGsqWIppOuSo=
+=Dl9i
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index c0b90834f0d8..2243f4bf9420 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 28 Mar 2023 14:09:47 +0000
+Tue, 28 Mar 2023 20:09:48 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index d3e14f83fc8b..a91397afc5f2 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Mar 28 02:09:47 PM UTC 2023
+Tue Mar 28 08:09:47 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 011b69dc7400..10d146ff0326 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 28 Mar 2023 14:15:01 +0000
+Tue, 28 Mar 2023 20:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index a2086965214e..76522a59ff98 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-5fa5ce630662959438ef033f8dbefb720c0a85db 1680011890 2023-03-28T13:58:10+00:00
+1dd0c846294dcb78a7d16ae2922c9b24b28474c3 1680033862 2023-03-28T20:04:22+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3a4fe440bbdc..fcb0402ffa5f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1680012601 Tue 28 Mar 2023 02:10:01 PM UTC
+1680034201 Tue 28 Mar 2023 08:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index c0b90834f0d8..2243f4bf9420 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 28 Mar 2023 14:09:47 +0000
+Tue, 28 Mar 2023 20:09:48 +0000
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 80f5c23db123..ffd76806e309 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index b807e2e5c356..0f16c86ccb84 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,12 +1,9 @@
 AUX weechat-3.3-cmake_lua_version.patch 292 BLAKE2B 1eb735429ece6431ad190e63beea3e036659ee7c2c1462601ed102f1f5e7df982807df741ee49eb1a3e9dc37de415ae927e59c8204d3735af8c593489ae3b13c SHA512 c8bced50df1119311d8db38f586d99d805a3f13d5bf8e4e3098c486906bb847a67446ec60f0819c410e7f57d33c5789ab8f948ba62d4caf0b25b8afe59d48821
-DIST weechat-3.6.tar.xz 2716044 BLAKE2B b96cc6a8c352ff6c03429b0ef06164f02cf67c54cd2d86d9dcf9cba8620b3f190c036b02abff359f2bff640748cb29b12393ce4e92156ce6d213e570b0690e8b SHA512 a6451e821244d47cbd10255287d67815d8d37b000ee031c1f1ebb3af6a42c6997ee7b8468bf42530d8b3162b7f9e8e557a549ce4059668c3a94ff9dc1d70ad06
-DIST weechat-3.6.tar.xz.asc 833 BLAKE2B d0d9952095fd7c8d5548dd56b8a3b79e6fd1c4042b8e72c91eb3d4447d5082a983852251cc6100fd7d973ddee9a9bc739c837914dd4bb1b31d3481da6b80817b SHA512 8ea778e440d5c8dab28714b4a0a8b5e1f2009a782dfdf446c1428c5c4e41564e2d98b8e1dff55c370f1195ee233b6aaafbf46bd23c89719a73df3340200a34ec
 DIST weechat-3.7.1.tar.xz 2745164 BLAKE2B 021ce5dc0a0199e820cdc06d44b25157435121ae6702a6922f0950f340896a451c21a7acd81bfc88f28ad5f6b8e0ce746fb58409ee368826ab8738f628140bb1 SHA512 998ebc0a6c423bca03eeacda1eca98f2edf28687635231718c2de1e2da4fb5cb07ed5f97745b68e318668d1afec9daf27b140143d2d3f6934b26f785a6db7d49
 DIST weechat-3.7.1.tar.xz.asc 833 BLAKE2B 66b324267bd654cea90032479fd66b616d54a44b4f66df36e94035a26b3afefa1104258149e2536c501967af01fc786978311a8eeacba9fee97bad973116fc86 SHA512 861b1510cb89d337f6816563eb36f32f150288e8bda20e7c34c2533d88b149a65ff9b94d607551e7f21c78320968debed6dfa0659288a58ae0e17924f948a359
 DIST weechat-3.8.tar.xz 2777420 BLAKE2B 46a2c2c5f14f1c47c0ef2c7591549e4568c1777a70c571ab6d0e5938685262a0806c1fd301eb0d840245b7df2c42a69b089d6eac82706ae5b2a8e590a910080a SHA512 f2fe125d03e9c8f8b5b03e2cdd340c6cd65c463187bd213c9128a3df19da56ae38f1a6d20a47c09606d1504448e3d554de042e33cc57b73753ce8491595ef516
 DIST weechat-3.8.tar.xz.asc 833 BLAKE2B 3db6467d5a47b86df7eca237bf2def812666fed42b9c1b968760e4999f785ba65fe84be61ae152ac5d5a3fa85953b5442f515afc244249fbc15ff94ca2a06147 SHA512 61154ef33aeb1155004975ee6688d5dcb427e0670e7463549ed0157de7be61309abb5dbad419bceb596e11f494e41a00b72e6f908ed9f02525660f7155dcc2ec
-EBUILD weechat-3.6.ebuild 4581 BLAKE2B 16ba8da43d3ff579f382f0dca475e3d5f936e21c422f07ea9dcd5ad0b183652ce65a13b4b5b6845e4a1303a93c1f956a2d44f9c72431985b3a72e261488fd139 SHA512 0bcc6047be3776b3a35873a5462d8d40bb7092c0634ead8160be64e6bd23e18289085937977eb89101790d2e661f9bc097f1b17549b7af0643734cff09e64c09
 EBUILD weechat-3.7.1.ebuild 4582 BLAKE2B 8f6010bd95c38c80e80ad48c9bd8216f449947c5bc842c2b979b8626555aece90fa8088e3bb0228dd42fdebbee2c80c5eabba78f36ad65847d917f9106ee6472 SHA512 939a437a94c81a8b813ce5fb64f5c2d93467ea48431e308549443ef9caaed5190fb699389d6a3217119c30ee523815bef4741ab63a52d636175417959cac27e6
-EBUILD weechat-3.8.ebuild 4697 BLAKE2B 52b0c018889fede896b7c89c5fc80acdcba6e5339a336da4a3654f794145aa3be02a20bcfa8504cdf52eb2fb51f3af56f3e05cabe1ce2482812dbfdc2832ed39 SHA512 02dc82a79ac76809a1840e7796582fb4712165bbf3d0ee3369ef8049bf2cf124ffa64074e158d9113cf1ee4debdc6a5544bf4ac1c29d9a4c5c2b71f40f8125ca
+EBUILD weechat-3.8.ebuild 4696 BLAKE2B 2f15db7adb7c27313cfde43b0d53e37f8ff9ab0377a50c04a099e85a3fdbad60de10aabb89a1ea974c15be08d1d8a95076bda5f52a9318643482ef4bb8dd2a44 SHA512 f0db9f58d002110ffde35e443a0743f687b03dd9d8525a2b9470021de436b2ccf552947583e4a9107805f151d4e5cd26b93310af11b4803e27f2e21290ab1087
 EBUILD weechat-9999.ebuild 4698 BLAKE2B 69c9244864665db4e4a4121d24287d7ea5160c2ab5c1ce0e0f28754ec77bac6ed15c69d550da9437fe1ac78e25a94ba720d0576f74e21263b0524eace74c8939 SHA512 9edac02831a3c9e3893a29f7f6f652a323dfcf27b0310909406618d9611dc5aa9b9a8592b842c07d43c92f0975eaa26502b75b2d766c7cb79bace4110832f7d9
 MISC metadata.xml 1282 BLAKE2B dd0da572f2ebdf7ae47b943136060fbe32bb24998e732dc6040b902a87e8178abfa5b2ff4e3792e2273de832da5aa75c908d6826d4caf30b6798d0802386f0bf SHA512 b3027bf372bc1f13c6e07184d2761c24f5f39b9400adef41568b4b2366b02ec5da97842275ea5c6d4752ea6634cebb9653af866e8e3128b867932172515f96e5
diff --git a/net-irc/weechat/weechat-3.6.ebuild b/net-irc/weechat/weechat-3.6.ebuild
deleted file mode 100644
index b8c647ee3f18..000000000000
--- a/net-irc/weechat/weechat-3.6.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake lua-single python-single-r1 xdg-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
-else
-	inherit verify-sig
-	SRC_URI="https://weechat.org/files/src/${P}.tar.xz
-		verify-sig? ( https://weechat.org/files/src/${P}.tar.xz.asc )"
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/weechat.org.asc
-	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-weechat )"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~x64-macos"
-fi
-
-DESCRIPTION="Portable and multi-interface IRC client"
-HOMEPAGE="https://weechat.org/"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer"
-# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
-# dev-lang/php eclass support is lacking, php plugins don't work. bug #705702
-SCRIPT_LANGS="guile lua +perl +python ruby tcl"
-LANGS=" cs de es fr it ja pl ru"
-IUSE="doc man nls selinux test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( nls )
-"
-
-RDEPEND="
-	app-arch/zstd:=
-	dev-libs/libgcrypt:0=
-	net-libs/gnutls:=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:=
-	net-misc/curl[ssl]
-	charset? ( virtual/libiconv )
-	guile? ( >=dev-scheme/guile-2.0 )
-	lua? ( ${LUA_DEPS} )
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? (
-		|| (
-			dev-lang/ruby:3.1
-			dev-lang/ruby:3.0
-			dev-lang/ruby:2.7
-		)
-	)
-	selinux? ( sec-policy/selinux-irc )
-	spell? ( app-text/aspell )
-	tcl? ( >=dev-lang/tcl-8.4.15:0= )
-"
-
-DEPEND="${RDEPEND}
-	test? ( dev-util/cpputest )
-"
-
-BDEPEND+="
-	virtual/pkgconfig
-	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
-	man? ( >=dev-ruby/asciidoctor-1.5.4 )
-	nls? ( >=sys-devel/gettext-0.15 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch
-)
-
-DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# install only required translations
-	local i
-	for i in ${LANGS} ; do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e "/${i}.po/d" \
-				po/CMakeLists.txt || die
-		fi
-	done
-
-	# install only required documentation ; en always
-	for i in $(grep add_subdirectory doc/CMakeLists.txt \
-			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e '/add_subdirectory('${i}')/d' \
-				doc/CMakeLists.txt || die
-		fi
-	done
-
-	# install docs in correct directory
-	sed -i "s#\${DATAROOTDIR}/doc/\${PROJECT_NAME}#\0-${PVR}/html#" doc/*/CMakeLists.txt || die
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# fix linking error on Darwin
-		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
-			cmake/FindPython.cmake || die
-		# allow to find the plugins by default
-		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
-			src/core/wee-config.c || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		-DENABLE_JAVASCRIPT=OFF
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_NCURSES=ON
-		-DENABLE_PHP=OFF
-		-DENABLE_ALIAS=$(usex alias)
-		-DENABLE_BUFLIST=$(usex buflist)
-		-DENABLE_CHARSET=$(usex charset)
-		-DENABLE_DOC=$(usex doc)
-		-DENABLE_EXEC=$(usex exec)
-		-DENABLE_FIFO=$(usex fifo)
-		-DENABLE_FSET=$(usex fset)
-		-DENABLE_GUILE=$(usex guile)
-		-DENABLE_IRC=$(usex irc)
-		-DENABLE_LOGGER=$(usex logger)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_MAN=$(usex man)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PERL=$(usex perl)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_RELAY=$(usex relay)
-		-DENABLE_RUBY=$(usex ruby)
-		-DENABLE_SCRIPT=$(usex scripts)
-		-DENABLE_SCRIPTS=$(usex scripts)
-		-DENABLE_SPELL=$(usex spell)
-		-DENABLE_TCL=$(usex tcl)
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_TRIGGER=$(usex trigger)
-		-DENABLE_TYPING=$(usex typing)
-		-DENABLE_XFER=$(usex xfer)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	if $(locale -a | grep -iq "en_US\.utf.*8"); then
-		cmake_src_test -V
-	else
-		eerror "en_US.UTF-8 locale is required to run ${PN}'s ${FUNCNAME}"
-		die "required locale missing"
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-irc/weechat/weechat-3.8.ebuild b/net-irc/weechat/weechat-3.8.ebuild
index 4055cde06f0d..21e766d3b2a5 100644
--- a/net-irc/weechat/weechat-3.8.ebuild
+++ b/net-irc/weechat/weechat-3.8.ebuild
@@ -17,7 +17,7 @@ else
 		verify-sig? ( https://weechat.org/files/src/${P}.tar.xz.asc )"
 	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/weechat.org.asc
 	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-weechat )"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index bc52184e7f65..498b297e4133 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 5d83daf49844..60446f00f8f9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,37 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2023-03-28)
+# Unfetchable, the homepage is gone.  Last updated in 2020.
+# Removal on 2023-04-27.  Bug #831304.
+net-analyzer/netio
+
+# Michał Górny <mgorny@gentoo.org> (2023-03-28)
+# Unfetchable due to untrusted TLS certificate.  The game doesn't seem
+# to work anyway (displays blank window).
+# Removal on 2023-04-27.  Bug #835858.
+games-rpg/coe2
+
+# Michał Górny <mgorny@gentoo.org> (2023-03-28)
+# No upstream activity since Jan 2019.  The current version fails
+# to build.  Multiple other bugs reported.
+# Removal on 2023-04-27.  Bug #902069.
+acct-group/shellinaboxd
+acct-user/shellinaboxd
+www-misc/shellinabox
+
+# Michał Górny <mgorny@gentoo.org> (2023-03-28)
+# Unmaintained.  The current Gentoo version is from 2017 and has
+# multiple build failures reported.
+# Removal on 2023-04-27.  Bug #721816.
+app-editors/le
+
+# Michał Górny <mgorny@gentoo.org> (2023-03-28)
+# No py3.11 support, package already patched for 3.10.  Last release
+# in 2018.  No revdeps.
+# Removal on 2023-04-27.  Bug #894604.
+dev-python/picobox
+
 # Sam James <sam@gentoo.org> (2023-03-27)
 # The upstream tzinfo maintainers recommend using 2023a for now because of the
 # disruption regarding Lebanon's DST change. See https://lore.kernel.org/distributions/87cz4u2gmj.fsf@gentoo.org/T/#u.
@@ -252,12 +283,6 @@ sys-power/dptfxtract
 # Masked for further testing.
 >=dev-python/cython-3
 
-# Matt Turner <mattst88@gentoo.org> (2023-02-25)
-# Packages are unmaintained and archived upstream.
-# Removal on 2023-03-27. Bug #897748
-gnome-extra/seahorse-nautilus
-x11-libs/libcryptui
-
 # Ben Kohler <bkohler@gentoo.org> (2023-01-30)
 # Breaks too many revdeps for now
 =app-text/discount-3*
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 649db37133b6..93fc606db824 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -8572,7 +8572,6 @@ www-client/chromium:debug - Enable DCHECK feature with severity configurable at
 www-client/chromium:gtk4 - Build with GTK4 headers.
 www-client/chromium:hangouts - Enable support for Google Hangouts features such as screen sharing
 www-client/chromium:headless - Build Ozone only with headless backend, NOT RECOMMENDED for general use.
-www-client/chromium:js-type-check - Enable JavaScript type-checking for Chrome's web technology-based UI. Requires Java.
 www-client/chromium:libcxx - Use bundled libc++ instead of libstdc++ for building.
 www-client/chromium:lto - Build with Link Time Optimizations (via clang's ThinLTO)
 www-client/chromium:official - Enable Official build instead of Developer build.
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 3f68ae14b180..d4a1bca8ff0a 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index 769fcc447a60..e799f8068ba8 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -1,5 +1,7 @@
 AUX accountsservice-22.04.62-gentoo-system-users.patch 1318 BLAKE2B 69c74ad620cebd6864efff7ad87401a72ea5f644a773a682653b45584e34755aaf12a0e79ba816c990b0af2784d01fec5e8b657699ecfc7c38343330a36fda57 SHA512 a85a6ca785a3863d96eae39bc3eee5fe89bedd0bdae40cd6bc2e077bb88f72d73d0be63dcf0e0a788f0f5d69ed39801c9ede623afe8ed08c94372314b1fddd09
 AUX accountsservice-22.08.8-configure-clang16.patch 1247 BLAKE2B 2a4a99498f9ae1b6e6e84824918f0961719ef4ea9e2b18171e12b263a51953dcd1be055dfc0b3824821eebd863b33a9ac29b3f619be179d529901e117ca69b88 SHA512 08b409cb8b2a5301a98ca9986b3f33c9cd46ca98a24f273c6d495967a69af447c85bdfd25e5de28adcefc99b8141b9dd77d393bb92d758bf6c7fff1e1ad982ce
 DIST accountsservice-22.08.8.tar.xz 102672 BLAKE2B 7c9436d3845fc1883772b434c4f9e2fba934d17e6d4452a6be65e1d790a23b331eaaa64b0e6eff6fefe79587a40cf1749a0f3de09f323b10740046bd9d145c9d SHA512 2ca3ceb1b44338d9924b86788256d4eef7ec10e0c2197bfb8cc6c31ae224fab3051f03cb406a526f90057684965bef4ba0f2cc01b26198ec1fc6baec36ad3ff8
+DIST accountsservice-23.13.9.tar.xz 636064 BLAKE2B 74dbbe816937e626ba0f6524b4293466ac2905f474396f5d23633e966d46e013de110671abcbfe2911fffa1e98872e2525b61594a967f917975ebf18d39b8547 SHA512 c6eb543ce2e07b61bbdfa454e388949bc688517be0536b14f30c66383ed105b15d3fab8b6c62b1eaa08f67d9bdc29b928729d9f7c704f47de4decf0de8e12f89
 EBUILD accountsservice-22.08.8-r1.ebuild 2093 BLAKE2B aef50eeec0f7500936836141024054eceb407e7e5e5ccb6a501d9958ec9236c62fe15dc00a96372b5ac7b27edf299f37f32d1ff7a62c88e8038a7e53fd175193 SHA512 b930685ec21e1344411c139499f271011ca1a92b71248f720aa4149727cfe82eff8ffc7e3602ff0d11d1ad359a9cba8d4b55f30d941ae2a082417b5bd223f170
+EBUILD accountsservice-23.13.9.ebuild 2055 BLAKE2B a44430c3a5faaf18c3ab06ac3249c20de14319d81c0ab03bfc34631dd2acefed4dcb5910cb52e2db8158463216cc0b228452fdd09543f585737f55f344e688c0 SHA512 892f2d8649b802bc0bbcb262e563ec9ca7287746a656fb0133272dc83767258e890034b5a63ee9b30324f745e3e31da6713cd714b3897c628aa5a21c5e97000e
 MISC metadata.xml 559 BLAKE2B c43012a95ec8ddd3ce687f69b4dc1889c82f31828f8e1f53bded7723b82c2a8faff594674fbd819370078dc13f48f51df45a3a280563c6a00080e5332128498c SHA512 6c1e1e291bcd11a06fe4e7b73031accdf0fe839cb7372f96d1cc52e5c1a1a1b032adcf0da7dde016331fefcb1ae1402386ba3ab2713b4256e9e60dd2b73f76f5
diff --git a/sys-apps/accountsservice/accountsservice-23.13.9.ebuild b/sys-apps/accountsservice/accountsservice-23.13.9.ebuild
new file mode 100644
index 000000000000..6d190354fc83
--- /dev/null
+++ b/sys-apps/accountsservice/accountsservice-23.13.9.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2011-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+inherit meson python-any-r1 systemd
+
+DESCRIPTION="D-Bus interfaces for querying and manipulating user account information"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/AccountsService/"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="doc elogind gtk-doc +introspection selinux systemd test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="^^ ( elogind systemd )"
+
+CDEPEND="
+	>=dev-libs/glib-2.63.5:2
+	sys-auth/polkit
+	virtual/libcrypt:=
+	elogind? ( >=sys-auth/elogind-229.4 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	systemd? ( >=sys-apps/systemd-186:0= )
+"
+DEPEND="${CDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	)
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3
+	)
+	test? (
+		$(python_gen_any_dep '
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-accountsd )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-22.04.62-gentoo-system-users.patch
+)
+
+python_check_deps() {
+	if use test; then
+		python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+		-Dadmin_group="wheel"
+		$(meson_use elogind)
+		$(meson_use introspection)
+		$(meson_use doc docbook)
+		$(meson_use gtk-doc gtk_doc)
+		-Dvapi=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# https://gitlab.freedesktop.org/accountsservice/accountsservice/-/issues/90
+	if use doc; then
+		mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	# This directories are created at runtime when needed
+	rm -r "${ED}"/var/lib || die
+}
diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index 1cc6c53edd4c..86c7d2fb52e7 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -6,6 +6,6 @@ DIST s6-linux-utils-2.6.1.2.tar.gz 42886 BLAKE2B 8c25472c0c1d9c47fef2d210fa1d4ab
 EBUILD s6-linux-utils-2.6.0.0.ebuild 966 BLAKE2B a34447f3a84d3eed78eefc5f3c3e7fecc17d3b04ca198c4564e953b1194ef55e9f298338bd4e1e853af4151ba0b95c9208a484c6685c76499cfb28ea61317932 SHA512 9f0f3612ac4a528ccdeb03e7a73c5044a091faf486774c7a5996dd75dd0bd1890be1ee65424c5125879489c538529952438810a97a4abf100a2100ca8d087d71
 EBUILD s6-linux-utils-2.6.0.1.ebuild 988 BLAKE2B bf3af15622b397afc52ce8579c52948bd5bc3b66c50fad8a0b0811829617f62b53d954f56b7c5f3cfbd6e22d840b67fa3f133dd1687669b0ae5447c96016973f SHA512 1c739301b8066ba67624d094af453415702657c4928eae6fe83dceef8789129e873d212c37329d63425ae58be7ac22f4d1535da13f998a77063aa02b9616121e
 EBUILD s6-linux-utils-2.6.1.0.ebuild 989 BLAKE2B 57e48765540cdad42a17c8b7c01faf956e8ba7fa75f6156c51e77496bec4c25aa26b3b2dd3d7eb3d34ee7e9e1cc5ad42e40a43057ddb3b46bcc1e8b0edc9ba9d SHA512 24f4c7293160fbd86bebd84bdab0bb91e0d801d864d4a870cf352bab3b9800505fdc9c6463889f9c319dc1892650f090e6bcec1ee6993e2154085fc69d094868
-EBUILD s6-linux-utils-2.6.1.1.ebuild 990 BLAKE2B 482ec79b9d2b931e968fd1617119773763d8354df95fc79f76ce94d95b10a462c4e5c835b4ace9a345722673646fd427069ad3f3c4c6fccc80ec284ae0b5d1e5 SHA512 33e61eaeea16c99b784df48b76048f1b1ce3456be6c9d99454eadf015bbaf897550f744d42eec39a3b4efde9483f24a1f2bc65bc6ca6b65814bde2745f426209
+EBUILD s6-linux-utils-2.6.1.1.ebuild 989 BLAKE2B 57e48765540cdad42a17c8b7c01faf956e8ba7fa75f6156c51e77496bec4c25aa26b3b2dd3d7eb3d34ee7e9e1cc5ad42e40a43057ddb3b46bcc1e8b0edc9ba9d SHA512 24f4c7293160fbd86bebd84bdab0bb91e0d801d864d4a870cf352bab3b9800505fdc9c6463889f9c319dc1892650f090e6bcec1ee6993e2154085fc69d094868
 EBUILD s6-linux-utils-2.6.1.2.ebuild 990 BLAKE2B 482ec79b9d2b931e968fd1617119773763d8354df95fc79f76ce94d95b10a462c4e5c835b4ace9a345722673646fd427069ad3f3c4c6fccc80ec284ae0b5d1e5 SHA512 33e61eaeea16c99b784df48b76048f1b1ce3456be6c9d99454eadf015bbaf897550f744d42eec39a3b4efde9483f24a1f2bc65bc6ca6b65814bde2745f426209
 MISC metadata.xml 624 BLAKE2B 6bb21b1df5c53a8811ff8a98d86fc5c12343ea057c772ec1f287d38b9ae50a0e758179f7f17ba6f3b243853e0ede843b424803d46a47c4cf359f2026c8305e05 SHA512 6848575ab57d2e24f8efcd0d30e8226574098c4c01d751ed7a9a307a029fb5c6812ddece36c7f8c296c933f0e2fab4ded376bb1d9f6132803ceba0fb3ce70f07
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild
index 43ea27b14a6a..95ed5191e052 100644
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 
 RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index 9af59e760f6f..7d23b148e99b 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -5,5 +5,5 @@ DIST s6-portable-utils-2.3.0.1.tar.gz 51746 BLAKE2B 50190c7c55a4e5d79a55a7a9edfa
 EBUILD s6-portable-utils-2.2.5.0.ebuild 970 BLAKE2B db0e01d27af55c7790a0704819648ddfa12ff7378e408b93f740090605e0d9c2a66a6bfbc6c5e6eff3427144dac4555641019b0edf0b6f2e0cb0204e1833d2c1 SHA512 62c7aff22c7ae80799ae3a46e2d83c3e6cb296f97892980244d34d971cb37998f4716effe158cd2475e84b42991446ddebe7e065b18c41070b066ae647eda4ef
 EBUILD s6-portable-utils-2.2.5.1.ebuild 992 BLAKE2B 014e826b0dd2af2bc51120e75a89d162cdc0b2836c6446ff0e8aa4312e0b27d5b943bb069b2aba678f83c6d90f00779b1cd383431241dfbac6d19ca2465206d4 SHA512 3c82d15f5fec8e08e5c766fc790548b4ed32d7bf24a3279645080941bcdf77b622fe15a2594d1b1c6c29813b8008916b7188ab3e02d8ca51c271a2c494b75443
 EBUILD s6-portable-utils-2.3.0.0.ebuild 993 BLAKE2B fbcccc4e52f03a742a3ca991bcd3b0315c7d4fa6f6be7cab0e14825c6f4c2fdb61722dccca719e2cee867b38f3cf6dae0adc6585e34210de9227f73dabef4d6f SHA512 5f82c28067d2c4a1b2ac4a321260d6254993b8fbb14a779d8bbca6b54be313a2d01d966ed189a91b20730df6b21a4a879404c5fbec5818fffc670d8ad0d01800
-EBUILD s6-portable-utils-2.3.0.1.ebuild 994 BLAKE2B 7b2c678672b91cfd59de582900ebc76fcc6dc792323789ec5ff166abfa07657de10281f91e9aa186ea3bb2399321b517840ee495379740663f8d94b62380dd9e SHA512 f442fedab4fade4fc2846e0755bebf0099b88f87c4cb7a7c023e530d80a41edf218768c4c2c6a54bd84bcb65d5a159b16cfaa74dec4ce5cd773081ca65bbf2c6
+EBUILD s6-portable-utils-2.3.0.1.ebuild 993 BLAKE2B fbcccc4e52f03a742a3ca991bcd3b0315c7d4fa6f6be7cab0e14825c6f4c2fdb61722dccca719e2cee867b38f3cf6dae0adc6585e34210de9227f73dabef4d6f SHA512 5f82c28067d2c4a1b2ac4a321260d6254993b8fbb14a779d8bbca6b54be313a2d01d966ed189a91b20730df6b21a4a879404c5fbec5818fffc670d8ad0d01800
 MISC metadata.xml 624 BLAKE2B 6bb21b1df5c53a8811ff8a98d86fc5c12343ea057c772ec1f287d38b9ae50a0e758179f7f17ba6f3b243853e0ede843b424803d46a47c4cf359f2026c8305e05 SHA512 6848575ab57d2e24f8efcd0d30e8226574098c4c01d751ed7a9a307a029fb5c6812ddece36c7f8c296c933f0e2fab4ded376bb1d9f6132803ceba0fb3ce70f07
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild
index 84d119227fea..a80dcbdabfef 100644
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 
 RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index df4e7af24944..028b4f58b2b5 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -5,5 +5,5 @@ DIST s6-rc-0.5.4.1.tar.gz 101078 BLAKE2B d85a194712ab63369cb71cbe4c59efd8cbe507a
 EBUILD s6-rc-0.5.3.2.ebuild 1497 BLAKE2B fd9d5b56b05c9f1b44625b3af94e8740f41094924e2e398e83858fac3e50022ba8aca12eb95997b3b42d1a77a44a101300bf6c0827ad8f0d17dfd964574d62e1 SHA512 775808ecfe3c2a577fd9bbab7371d9b1a912e0bdd54d37d1f77cf55391ece8edc63acc373b74324e79a9ee583a494ebea68f6002a7ffb5a4706ee9dc5f999963
 EBUILD s6-rc-0.5.3.3.ebuild 1530 BLAKE2B 7804a8eb8ccccf4f80fa7d540622d4b138df5b1c4cadf4a96c299f3a567c285d551b2141d7c3cfdb941cc460eef1b3986bbc034962b2d233821dac2ab074e45f SHA512 efa73a1c1016a9ec8fa8dee910ad36b9ce372991e1b057d08eebee98d9401fee83905660a4e411f082ac4f10fe6336cc8da6cc6713ce00b7dbd25dd7649265d3
 EBUILD s6-rc-0.5.4.0.ebuild 1558 BLAKE2B 49de1f8b32ccc11b3ac4ea95b5ba1d6fe47a64c2033ff2a316110dfe64e31314faf4cee50ae673590e28c83e2cb81dc91a53b6484281778134d18c3208edac06 SHA512 279a12348e4cabe7ccdb945f7c1a70745cd1240a608c98fc92c476196da7ec86b0c85018b06a57c81b77a6c2bb031fc524be9ad35cf225d32965d7efc4a14823
-EBUILD s6-rc-0.5.4.1.ebuild 1559 BLAKE2B e890a4cea424776f5ad320d9672b522dd26af218c100ae4076e7b677cb2e6200314399a9c3521137c1295d627f3bb5cfc9eed8b66c8292f8e0fe2d6d42c0cfa5 SHA512 06597688ad3b06f1b0d46e90bf37953926df9617404c677084c82a95b5f1b578c09465d2b659f3a447a3a05cfae33fd741e685883f52154cc1a05184052d2f09
+EBUILD s6-rc-0.5.4.1.ebuild 1558 BLAKE2B 49de1f8b32ccc11b3ac4ea95b5ba1d6fe47a64c2033ff2a316110dfe64e31314faf4cee50ae673590e28c83e2cb81dc91a53b6484281778134d18c3208edac06 SHA512 279a12348e4cabe7ccdb945f7c1a70745cd1240a608c98fc92c476196da7ec86b0c85018b06a57c81b77a6c2bb031fc524be9ad35cf225d32965d7efc4a14823
 MISC metadata.xml 624 BLAKE2B 6bb21b1df5c53a8811ff8a98d86fc5c12343ea057c772ec1f287d38b9ae50a0e758179f7f17ba6f3b243853e0ede843b424803d46a47c4cf359f2026c8305e05 SHA512 6848575ab57d2e24f8efcd0d30e8226574098c4c01d751ed7a9a307a029fb5c6812ddece36c7f8c296c933f0e2fab4ded376bb1d9f6132803ceba0fb3ce70f07
diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild b/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild
index 30a021e291ff..9e9118dc6ea2 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 
 RDEPEND="
 	dev-lang/execline:=
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 66d5bd0e543c..fddf852a4d34 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index b61f563575b5..ba7197d8242e 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -31,6 +31,6 @@ EBUILD autoconf-2.69-r9.ebuild 1780 BLAKE2B eafe4f07ef7186569f4a901a0efdd2a690af
 EBUILD autoconf-2.71-r1.ebuild 2253 BLAKE2B 0254aa5a49e75ead216889dc9bd1b38ef986a7e740472de946dce7049527ddc83a49962fed0d7495797d23857ad216192f5a0a7416fcc32851b2d55221cd6660 SHA512 8b7be4f8a612c54e0d4eb3da2a903cb80a4fb99c4d6bf51b2f63229bb449dac5cb44cd21e81ae5169ff0f0f0dedbb54d687ec180982da18ab637d26814204fa9
 EBUILD autoconf-2.71-r5.ebuild 2469 BLAKE2B 41260e87b4e350d19ac64534a5344363b5c6aefed22cbd98098493e66f001ac3f9200771f4437047696f5c0e95c146fee0ae402e14a3b18d4315df53d122179b SHA512 6ab0fc9ff74edacb38120bff01c85c4bb19e39a29be1b380bb891016d6209e41bc0c7d0848841f00be613f0491ec5b0e8b4807d92b101be03c8cbafe46b21d31
 EBUILD autoconf-2.71-r6.ebuild 2448 BLAKE2B 0ecac4a2d2768bcf250710f66dfb1154ca07dd778b1bb3e72898874dc0f58498a83011bac83b71bf6bc3c35281a925020df600ae9852f924dd6af9e4e0b6545b SHA512 b84c4d6c8c606cad0698ea652bbf18a7cb39aa6149e4d2dce3fe5c5dd14c59c131e5f5e545cebe177781633c813738bd80094375d8e09070408d4b8e47517bb7
-EBUILD autoconf-2.72c-r1.ebuild 2082 BLAKE2B f3e6b4227668bdc6ecc1d320b893d4c5d389888aebd6c9ef6db6c54d00c6eae5fabf2fa4a503634e7c400f2232251b40bf792ca71abea18eca4f1c16311e6dca SHA512 e2f177a60641731ddaa801e61ebad6b7f6eaf5dea98578c01e045fc0da283b51b5b15a309e2537d017908eee3ac8a2a168cd947c59c10b48e19d15d19b89c345
-EBUILD autoconf-9999.ebuild 2082 BLAKE2B f3e6b4227668bdc6ecc1d320b893d4c5d389888aebd6c9ef6db6c54d00c6eae5fabf2fa4a503634e7c400f2232251b40bf792ca71abea18eca4f1c16311e6dca SHA512 e2f177a60641731ddaa801e61ebad6b7f6eaf5dea98578c01e045fc0da283b51b5b15a309e2537d017908eee3ac8a2a168cd947c59c10b48e19d15d19b89c345
+EBUILD autoconf-2.72c-r2.ebuild 2259 BLAKE2B a37c5136f498970294be2da0ff7cfb8e68bf1a47b3121ef7d532be129e381966c47392c57682f29e65e8b30a999a019502a0122eff9b241be97e36b3866e5530 SHA512 2d19dd56c67ddf2dddce7b32a019230239bcc4e62de24bb57e9f2e34aa4b5954e289793fa922140d34a6c66211f5c859c13cee74d58b4b915f2df5abf3ac754f
+EBUILD autoconf-9999.ebuild 2259 BLAKE2B a37c5136f498970294be2da0ff7cfb8e68bf1a47b3121ef7d532be129e381966c47392c57682f29e65e8b30a999a019502a0122eff9b241be97e36b3866e5530 SHA512 2d19dd56c67ddf2dddce7b32a019230239bcc4e62de24bb57e9f2e34aa4b5954e289793fa922140d34a6c66211f5c859c13cee74d58b4b915f2df5abf3ac754f
 MISC metadata.xml 343 BLAKE2B e5fd0138606384a4d646b618c096693858ddc94d09e0bb4dd3ecc6ef064a1edf9586f62a5cc753f680d73b2a6c72ed00739b21e54d490dd8edc97aa32dd05309 SHA512 6b06b7e7a5e47a4de92b2032ba3af669916818038802309e4db26917aa536387d2227feb33c29976179fb3cbb10d4b2f975d1055308e6db81a734baf1e8c1e5e
diff --git a/sys-devel/autoconf/autoconf-2.72c-r1.ebuild b/sys-devel/autoconf/autoconf-2.72c-r2.ebuild
index 1bd34bcdca1a..d343e10dd0fe 100644
--- a/sys-devel/autoconf/autoconf-2.72c-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.72c-r2.ebuild
@@ -30,7 +30,7 @@ DESCRIPTION="Used to create autoconfiguration files"
 HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
 
 LICENSE="GPL-3+"
-SLOT="${PV/_*}"
+SLOT="$(ver_cut 1-2)"
 IUSE="emacs"
 
 BDEPEND="
@@ -47,6 +47,15 @@ RDEPEND="
 PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 
 src_prepare() {
+	if [[ ${PV} == *9999 ]] ; then
+		# Avoid the "dirty" suffix in the git version by generating it
+		# before we run later stages which might modify source files.
+		local ver=$(./build-aux/git-version-gen .tarball-version)
+		echo "${ver}" > .tarball-version || die
+
+		autoreconf -f -i || die
+	fi
+
 	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		PATCHES+=( "${FILESDIR}"/${PN}-2.71-darwin.patch )
@@ -55,13 +64,6 @@ src_prepare() {
 	# Save timestamp to avoid later makeinfo call
 	touch -r doc/{,old_}autoconf.texi || die
 
-	local pdir
-	for pdir in "${WORKDIR}"/{upstream_,}patches ; do
-		if [[ -d "${pdir}" ]] ; then
-			eapply ${pdir}
-		fi
-	done
-
 	toolchain-autoconf_src_prepare
 
 	# Restore timestamp to avoid makeinfo call
diff --git a/sys-devel/autoconf/autoconf-9999.ebuild b/sys-devel/autoconf/autoconf-9999.ebuild
index 1bd34bcdca1a..d343e10dd0fe 100644
--- a/sys-devel/autoconf/autoconf-9999.ebuild
+++ b/sys-devel/autoconf/autoconf-9999.ebuild
@@ -30,7 +30,7 @@ DESCRIPTION="Used to create autoconfiguration files"
 HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
 
 LICENSE="GPL-3+"
-SLOT="${PV/_*}"
+SLOT="$(ver_cut 1-2)"
 IUSE="emacs"
 
 BDEPEND="
@@ -47,6 +47,15 @@ RDEPEND="
 PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 
 src_prepare() {
+	if [[ ${PV} == *9999 ]] ; then
+		# Avoid the "dirty" suffix in the git version by generating it
+		# before we run later stages which might modify source files.
+		local ver=$(./build-aux/git-version-gen .tarball-version)
+		echo "${ver}" > .tarball-version || die
+
+		autoreconf -f -i || die
+	fi
+
 	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		PATCHES+=( "${FILESDIR}"/${PN}-2.71-darwin.patch )
@@ -55,13 +64,6 @@ src_prepare() {
 	# Save timestamp to avoid later makeinfo call
 	touch -r doc/{,old_}autoconf.texi || die
 
-	local pdir
-	for pdir in "${WORKDIR}"/{upstream_,}patches ; do
-		if [[ -d "${pdir}" ]] ; then
-			eapply ${pdir}
-		fi
-	done
-
 	toolchain-autoconf_src_prepare
 
 	# Restore timestamp to avoid makeinfo call
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 8caf3a0ff867..c241ec23c8d3 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 5b99ea19c131..f96cd15eb18f 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,36 +1,19 @@
 AUX chromium-108-EnumTable-crash.patch 2974 BLAKE2B b2d58b6b2b67b3bc2f04662749c3fd77b019356a6f9eaaad154cdae03e63f52c3bfa8bb0ed90467ac0806c58f6a2e7a351fd48c7e7a5e9b7ab317b4b8e2a75cb SHA512 3419e3dd6da21c8791d1335170547b3ac9fca593fe8eb01e17dd3eb916e6795a32848c4762051558cf98d0379592910ff9b267f05fd6b3c83d5e1c1073ba717c
-AUX chromium-109-system-icu.patch 2096 BLAKE2B 8c220e94a3a13e39527d8573e3f102e2ff442b593e7a1d2782a0265cf8160ffec3642b7b69118584364b887f6cfaec1fd2ac17e3f4c287dba6afa3f492662b64 SHA512 8668a3fc29338c63382d98dea5cf68a908e3bff60d0044265817d427988cfcca515b54390443d28db243504ebc090a2617186b03d2cd867bc3c6f22d8e34cdb8
 AUX chromium-109-system-openh264.patch 577 BLAKE2B ec83d9a72a163683d791893e6b72fd5a6ffaa18d611bc6e6785819292370cc9f4fd37d8d3a33ecb5621beb33a3271df00d7a1b629300fdfa8db6e4e4eb196f1e SHA512 5ea73c8522619d83047fcd429988b24687e928e01c2915ef4145469fbb1238ef4a72beca73493794e2275b855f95412355700579a31649d64d74133ed815f1cb
 AUX chromium-109-system-zlib.patch 440 BLAKE2B 95bb1099055e3e0e122d4d8a77cddec0a3417b3d87ef252d7a475f6be23b16f587ec627c90bac41d743bd9dc07488edccb0946ed465f2244b61adc44cd19761d SHA512 b4e386613eb2a0dd61af40bb29621356085e183b97d830661e5157e4f22c2ada5606d80e56d5a65fb2985cdffb505a878c32bdafb081b1fa24cbe976c7b60b86
-AUX chromium-109-v8-icu72.patch 4212 BLAKE2B 0b9e784f4f4939152770d91124976e1f2fadd223fdd32e087fd782554f7c798ffb2b508780f67597781e0864adb7a456f1470d67eb260ac5da3a0abc97250773 SHA512 351a8a9a696c37d04fb0a0efc3c4b1356e253074c88bc703ab3c87aaf3e709f88ad9c43a5795ff6f3bed0c855ff9b2689b426dc96be2a388f9e571b99ed777f2
 AUX chromium-111-ozone-platform.patch 1482 BLAKE2B 613e233697fbd569a135ec1d4d92a8c6962cdbbeb8a478a53a8be3d80f0797a846c46d590443aa2f5b1350b4d586fa9c5f29ee85600bd292deaffa44bb9987ce SHA512 0befdf3757517fed2e37d58b1b6a86d113289f8f506333c1be244f583b638fd39da90f5021322856d98e0f535f766d6f1d17301e99dd451c727f61ea8f9f3532
-AUX chromium-93-InkDropHost-crash.patch 1134 BLAKE2B 1593c406c48b629ea3170a518cf86e936af36c554bc97a380324ab6fc930e49a359dc3ef6787ab08314a6a8f5da85714b0fa9d8589d6a46b1d06cbbd7e401f22 SHA512 474d7f55505e1275238d71d1723d74a66fc9f27a16ed293aa80ffefbe5500cd65a0bf13ec76a9bca0334a245f22120099fb367d12b93adc14500104d11cd3bff
 AUX chromium-98-gtk4-build.patch 3044 BLAKE2B 782dfd31a3a82d62dc0b8ffbb85cf2dbbef1c6cc47dbd8409dc0777be8d019c4ca082d75e6114b09f880f4f3e886d0f4b9631e66d46a3129e41468b70d71404c SHA512 e8acbf85274813ec81d575727b0e5d107749242d1df80e05035c9273ca0466d7358a8d7cece16c09f6996cb49ad3b1e0dcdf052af45023236f53fa6262b4e441
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
 AUX chromium-cross-compile.patch 323 BLAKE2B 8d5091ce5287422c9688ede2563360a96b8bd34b9750dc1c8f0b6ca9aeff2c066fac2da169396baa131d971c087c78f9af53999df0e102d1f57176f5e8d3dd57 SHA512 06d3afc1aa19e57daac0e4bad37e1f365a68408240430e5e818e5a4f12e3b7519214eafa463633e447e7029f4ae13ea864ca347ad1fac117702a0be88718a954
 AUX chromium-launcher-r7.sh 1631 BLAKE2B ae28d758264446511fd2b64ba69fe920144b351e8833e0e98f43d00633e850094c288b5d97d1a84801ea13aceb294623692c86c1b9be5811b7b97fa8a07a1ecd SHA512 1e97f8394bd8bb4b29570b1b85176efe6258314a596f079bee1c4018113e0023aa54a93690ba8de2a00d127af10dbe2cc3fb3127b72b841c6f28f9e7bed820e0
-AUX chromium-shim_headers.patch 1510 BLAKE2B 9716cd250b249c6255aca01a385ef8a2a6f1df9ea3cf7499715543c14f8be62fd323b6048b890aa2be45891e7a765d92de3f41c3b3a88c08dae4b806c048e20f SHA512 c74bcf690a41b4f9b364477d23408d493aa674e3bd014940098a594471297c2a425241f908510061b5f11c9cfe009c4a803370edd757d3c0ab8d9c0cc128135c
 AUX chromium-use-oauth2-client-switches-as-default.patch 1085 BLAKE2B baf3c463305934c126af4f7c5be305863edc7eec3add5b5ada30565b49b5944021eb40f1a9643e7eec3f973c502d9b02426f00b760570fcea5f1509219e41c6f SHA512 fe2878ee45778bac894ea17a668511d27ad2ca40988d5f11439790b700bfefd6560f3931415b4e6c543fcbbfc7cfef55cc757ed4ace1d111039ae78c46b81945
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
-DIST chromium-109-patchset-2.tar.xz 7280 BLAKE2B b7f86dbb6c40005df67764a7dea57c845010a97ed52e542da0c91182b828d74b2b7266db9b9d21bb9349c83a6c56f4721bbf9fd440e83d3356155ff5f6337719 SHA512 3ec55aa9031cd2c82f99233700c9d3a62eeaef792724254b2d0605f597ba7446fffa0afa81166145aa0ff6e64c78136fe18b7231afe49dd2f33de2c7ae27de15
-DIST chromium-109.0.5414.119.tar.xz 1747968612 BLAKE2B 9090fcb60165a8e4ba990df4c90cf0252798718407951947d50c35778f62bbbc91f588604af4e3de6cbcc069e7eea340379c450e28532f4b4bae29f3ab393c7c SHA512 3942b282072489134a70e85c60669c8360b35ffdd64fb310f75306cffa4d1117db78fed7b04659d90d13b62c45922503cb31022e1ca9b29a2872c3c445023104
-DIST chromium-109.0.5414.74.tar.xz 1747778008 BLAKE2B dc2893c59398caf72546c42ada961215ce1b25785da66272b72fe14ac0db00ac4282b0de5ee65cca932e273fe69f41704b4ee2aa173d21da535708e8d0aab633 SHA512 79ff744b813e833ab4f257361a2f1847a57df579b9c925bad7575484f079c4c1b0b1c59c2c48e683bcee27a79e4bfd87f96c83fa28e0209ba4d3a71340842579
-DIST chromium-110-patchset-4.tar.xz 13584 BLAKE2B 8ed3d438375ceabc02552ff66874ba8f15687fefa96239866cb2f86c57db72c162daafad6e1944df6117e792ca9d992b101c17d35132d429fc6edcf49db29940 SHA512 898416453e129e83dcd70728e382a2916e741b013887e8ec9b4d2737a4ef2738d83d4a868f9260c3906c4934bb9a7b3104a50cfc3d94064eb71a341279e9fcb9
-DIST chromium-110.0.5481.177.tar.xz 1703390456 BLAKE2B d9ee898090ea04bff72a5d6278e4aec5b36c8c160c310997835dbcaf963647645949a0d4fa3bc34573e362bb4ead63e4c21fa25c241c93493544e541c8ab5142 SHA512 542125f7530409ae37950a0870c0349d5bea218ebd8deb6bf9929b14f8b1f31ab8a4d910fbb66e5b6fc1e4a1a41c01d12a36dc2d4005d8dcd2b8f1724e7d570b
-DIST chromium-110.0.5481.38.tar.xz 1703266068 BLAKE2B 8b990eef533f8469afc6ea88c9fc70f316ccf33381fbbe30b43c89cde476a0487b201d7b07e8202bfdf94b44c2c5b184627f27225bb12ad7cef9fb505e608206 SHA512 4ad20231ce1c42d30886cfa179b154f1bd09efb61b971dc55a2aa70538a39141199f9a799c09b546c3e3501cf1981b6dd850e92e44aaa8f816ddb294fc194231
 DIST chromium-111-patchset-2.tar.xz 21480 BLAKE2B e59d67d261df23c110c2db0644250c20d9e1cd6b99cb9513dbd12463faad8aea8520c5b5dbbfd2187a7795f7e34ebd3379fac4c3b2b01e30ffb4451b45084866 SHA512 7a2e660a9271b9b643dce5f7522570182eb895935312446775bf7c03a4c2d50d7f95c2082cac2dd477060d03f68e5424c990f535e0b1de9f0d12ac248806d043
-DIST chromium-111.0.5545.6.tar.xz 1721481252 BLAKE2B 22f0d9386a5ea8b473e85324b448f4789f9d6365c723ef254b42db3d059b972bb3e620a4e331ce935805d2b22be867d0e6f923264268fce828fe29394f59c09c SHA512 a52a4e4ebac1cd05bbe08763e4c4cd3e48efd37f8bb60cb6e1d8119e698ddecdc96741d3d4f97ee74d87fb8f27bdc4a60dbe2d09d84c223576983c65bb9fb6b4
+DIST chromium-111.0.5563.110.tar.xz 1740800700 BLAKE2B 77563b784d2a84a5c5b83779b54c633dcb38e25d3523c2254c07dcb7a3daedc352a48ffe4cb43d04569a10f98654da347bd463221755b492507d70183f8c28a9 SHA512 1274b14ef9b1eb418a87589979703731eb4907a90eb8ea58f343344f1e6c2bee1c88b3cb290485c833c0bda79a7c8ae59ba425c492e8738d19740cb0514e8ac5
 DIST chromium-111.0.5563.64.tar.xz 1740670460 BLAKE2B 325cd15ebc5eeac2e51ebf754c71e090369a1063421d5e294d5704655d782fc02006f6eed4b284a2dc49fab9b7077144179db6887ce4652b6e88846174de79c3 SHA512 3ba60778031a2015cff4f1944a466102923cb2b455d3333abdd3ee077ac3a8717c4fa4090c7d950ffd5ad5a77f139f68640fb5032b7afcae36012e4a34485bcc
 DIST chromium-ppc64le-gentoo-patches-1.tar.xz 5636 BLAKE2B 1d898939df023c59285b27bee552470483ea06375d1ee8d6947b89c5927c23cc7bfec6b49f3b376ece931d11a56f8e2a45791e0f92ad61974fc8c34c1082d89c SHA512 8a71cb007e47cda8e5fe5d185729389e65c48bd322c8ee8b3986bee8571427b959628f2666bda646a3f89ae64197c0957d3626845ff03461dbd5dee4c964d07c
 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
-DIST chromium_109.0.5414.119-1raptor0~deb11u1.debian.tar.xz 438932 BLAKE2B 1405965668248b53a6c79f6d648900725f5db727379e7893b639aebef3cc333099ebc4259face3625ed080bd281fa4f307336c1e8da8c68b737368254dbdac83 SHA512 2baad609b88acc0d16d0f6bff39292d7bd3fff06a9d074b219a89011c1c02fb8f429282aaebc2a0fe79619f38de324140c6d6ad2d2d2a35475e6965e8a9e0a42
-DIST chromium_109.0.5414.74-2raptor0~deb11u1.debian.tar.xz 445284 BLAKE2B 838df6439816d36df2e9bb9224745aa0c0a3f6c3e19ec2b29b78b8e2be8c59e8df9dde7fdba49a73ee7bdd2282016f0366500f5bd1579b870a6aab25f4bb115f SHA512 6e6523d5f2aed2d931074af1dddea7312d5c8ed09d2b143dd9309db634547c37b67ba3c905fefa67097fb44c64f4d45431eedeed7b33d8b07eb2bae73bdc7f16
-DIST chromium_110.0.5481.77-1raptor0~deb11u1.debian.tar.xz 445576 BLAKE2B 10795b53e75fb7d17fa143329228f0d642d365f56e0cd905dcf1dc2b17140c65eb4cf269807c571a7213a3fac0c0ac9546e47ab4b170dfe7c518902ad0ff3c50 SHA512 dcd781286ce7f41a5cf65ea4d02b80c865e032c45677f37097f46263c03100169c401a089a41b560749599a2b42fa8ef3a4b89d096ea86fbd861d4b2add7d1bb
 DIST chromium_111.0.5563.64-1raptor0~deb11u1.debian.tar.xz 442300 BLAKE2B ceb6691169073e1420daebba1eea1c00ab0f60786a276d116f02d8f693c542f853cc69083bb2f1dba4b2802413ba4d40591b04284a0816cbc814af99b0b9df38 SHA512 21525147a9c61de746c736b44007e57316155acdb71ba139d1b0f2f8d99ca1df7bf5087e736726f4062203e4dd20302ce3c523b9cb32309fb7ae017866f1f137
-EBUILD chromium-109.0.5414.119.ebuild 38953 BLAKE2B 91783ffb8b0bf3044474218d9d77c006f456c23eedd27d1c5c4585cfa8081108bd2591a44e550445240562f562c6309086459ec2aa3684a4e1c7cea5362ae97f SHA512 a3c61c77d473fa8ec73fba795210f166edb013b3587c14be1792fc814fd35c12b8755bc7b708565839533f936e79380faffd4cf0f69b4ba8529c1b128f7ef9e9
-EBUILD chromium-109.0.5414.74-r1.ebuild 38906 BLAKE2B 2ed6420f5535b27d9951b129243bdf721dac71bde3cf311ff9ca170525d37667d7a40d3dd5a29d1234cd921d9cf6cd6ac83dfcf1d16f6bfdac2927f0c85b0ca7 SHA512 7c8790bfc8a0c89e4706b59ee5fa68e52d837c7609ebd1f1fd28ba20d07f83cc52e908c4c213abcf68908ee9be85d3050647fd6d36f9be8463ff9a13e07b391f
-EBUILD chromium-110.0.5481.177-r1.ebuild 38753 BLAKE2B 7c5560e2d5c4ede3b4a8d4810c58c181ef14498fe4e4817f3b448a74e1076659d0b0f7c638679a5ec638837d2883c2d167d0aed41cc42fdb0ed0ed5397365e4c SHA512 ae8f158dabbeb3a6e4933b5ae0bb70f955407a0bd251b01f0f44df27dd631a45730cf3d7f26894fa464d0f10ade1a20459bd6cb1fcad0e43f92643faf33696cd
-EBUILD chromium-110.0.5481.38.ebuild 38751 BLAKE2B ca5f7c87f5acae8be4d8db1298aea9a50f660ee0af113ee43387f325ab1a3379be8700f0bc496e4ee6e9f92541d3009344f82ba9f477f6e56bccc57bb2111d54 SHA512 664940edd7f710f9acab5491547ca5a355d935562f71ec79aa7b3b7d059cfd396a5f1b0ce338f362cc770d30e0efd73358a861fc76d034bd8ddc750a44cc004c
-EBUILD chromium-111.0.5545.6.ebuild 38410 BLAKE2B 22e2ed4c9335b026e95c0f6cee60c525c3cec10f6b5e7a0da60bdae6468c5dca8cf1476c762893ed027d50d9f0803a5c763b91fdb278c879383de7fa41830352 SHA512 ed3d33a23b4e1343dcdf3e5e46f34c3c071b254971a3b14d6a1fd2a332281a02ab0012b07d0751c6dd662c7ec7cabcd7a58a2e03351e56070b2b2ef57efece95
+EBUILD chromium-111.0.5563.110.ebuild 38994 BLAKE2B 808dcb739d4a9f8b046b690f3beee5d481c139ec5c4b9485a4ce164b8b00e5f70c8b59cff67877e68be6ae23bb24c9dbe560be8023934aa4df38cc4d72cbc005 SHA512 8e75986eaef9e2a824ad0ef2762f9f5d35da898cf3bbc5fe4f94d8d93552fcbd2a7b1e4c82a7b4af566150c44072fd63f7d5c0cbd07b038d94289a22e9b7444b
 EBUILD chromium-111.0.5563.64.ebuild 38992 BLAKE2B a48b79ba64e4d04ec413b0b7369af14887726823358218adb4cdbe039af67e3a5c87efdef17556649d581f2280edfc01d31b1b4d4e23a5e20d35a5f8af018729 SHA512 d0e2550b9a2ee76afeab5478b7f3effe69d23a50d994aa2c1e2268c5eff14019aafdd0e9b007a409843b3060417980a2dc6d33ea9b24650901f4bd6191ee7f29
-MISC metadata.xml 2288 BLAKE2B 03dbb351d028d2546bcfd2461401923b72ada6ef60d47beb03368d157aefcbe3dffc4128e5fac30003ceaab2ee87792e0f4d7abbfeca973560b29dbab2667a79 SHA512 11a244f440fbae9ac89ec759ea2598d568e70d7e4bba7a4eeb8da0d1f8a4c86e797db49c9b29d8c8f1691f18693ff8173f997de521a808fcda6d16ff3d79bba1
+MISC metadata.xml 2167 BLAKE2B 3ad0af16da80ea03ce1deb54468b5668d1565742773e583f44688df3f7ea58a72271ccb58f467f0424bd601f4c7256ef6dc340a31a9a66547c3860069c812492 SHA512 6671a247003dae4accf588e2e62242286caf2310869a5ed5b327f46b484848a25d03baaf179a740ca8f7b2c30bf3095cf72c166fae8f0a15c63dad9174fa28ca
diff --git a/www-client/chromium/chromium-109.0.5414.119.ebuild b/www-client/chromium/chromium-109.0.5414.119.ebuild
deleted file mode 100644
index 82c5e2287dba..000000000000
--- a/www-client/chromium/chromium-109.0.5414.119.ebuild
+++ /dev/null
@@ -1,1250 +0,0 @@
-# Copyright 2009-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-LLVM_MAX_SLOT=15
-
-CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk ur vi zh-CN zh-TW"
-
-VIRTUALX_REQUIRED="pgo"
-
-inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils
-inherit python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://chromium.org/"
-PATCHSET="2"
-PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
-PATCHSET_URI_PPC64="https://quickbuild.io/~raptor-engineering-public"
-PATCHSET_NAME_PPC64="chromium_109.0.5414.119-1raptor0~deb11u1.debian"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
-	ppc64? (
-		${PATCHSET_URI_PPC64}/+archive/ubuntu/chromium/+files/${PATCHSET_NAME_PPC64}.tar.xz
-		https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-ppc64le-gentoo-patches-1.tar.xz
-	)
-	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
-
-LICENSE="BSD"
-SLOT="0/stable"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
-REQUIRED_USE="
-	component-build? ( !suid !libcxx )
-	screencast? ( wayland )
-	!headless? ( || ( X wayland ) )
-	pgo? ( X !wayland )
-"
-
-COMMON_X_DEPEND="
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXtst:=
-	x11-libs/libxshmfence:=
-"
-
-COMMON_SNAPSHOT_DEPEND="
-	system-icu? ( >=dev-libs/icu-71.1:= )
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	!libcxx? ( >=dev-libs/re2-0.2019.08.01:= )
-	dev-libs/libxslt:=
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2.11.0-r1:=
-	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
-	media-libs/libjpeg-turbo:=
-	system-png? ( media-libs/libpng:=[-apng(-)] )
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/mesa:=[gbm(+)]
-	>=media-libs/openh264-1.6.0:=
-	system-av1? (
-		>=media-libs/dav1d-1.0.0:=
-		>=media-libs/libaom-3.4.0:=
-	)
-	sys-libs/zlib:=
-	x11-libs/libdrm:=
-	!headless? (
-		dev-libs/glib:2
-		>=media-libs/alsa-lib-1.0.19:=
-		pulseaudio? ( media-sound/pulseaudio:= )
-		sys-apps/pciutils:=
-		kerberos? ( virtual/krb5 )
-		vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] )
-		X? (
-			x11-libs/libX11:=
-			x11-libs/libXext:=
-			x11-libs/libxcb:=
-		)
-		x11-libs/libxkbcommon:=
-		wayland? (
-			dev-libs/wayland:=
-			screencast? ( media-video/pipewire:= )
-		)
-	)
-"
-
-COMMON_DEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	app-arch/bzip2:=
-	dev-libs/expat:=
-	system-ffmpeg? (
-		>=media-video/ffmpeg-4.3:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		>=media-libs/opus-1.3.1:=
-	)
-	net-misc/curl[ssl]
-	sys-apps/dbus:=
-	media-libs/flac:=
-	sys-libs/zlib:=[minizip]
-	!headless? (
-		X? ( ${COMMON_X_DEPEND} )
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		media-libs/mesa:=[X?,wayland?]
-		cups? ( >=net-print/cups-1.3.11:= )
-		virtual/udev
-		x11-libs/cairo:=
-		x11-libs/gdk-pixbuf:2
-		x11-libs/pango:=
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtwidgets:5
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!headless? (
-		|| (
-			x11-libs/gtk+:3[X?,wayland?]
-			gui-libs/gtk:4[X?,wayland?]
-		)
-		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
-		x11-misc/xdg-utils
-	)
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-"
-DEPEND="${COMMON_DEPEND}
-	!headless? (
-		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
-		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
-	)
-"
-
-depend_clang_llvm_version() {
-	echo "sys-devel/clang:$1"
-	echo "sys-devel/llvm:$1"
-	echo "=sys-devel/lld-$1*"
-}
-
-depend_clang_llvm_versions() {
-	local _v
-	if [[ $# -gt 1 ]]; then
-		echo "|| ("
-		for _v in "$@"; do
-			echo "("
-			depend_clang_llvm_version "${_v}"
-			echo ")"
-		done
-		echo ")"
-	elif [[ $# -eq 1 ]]; then
-		depend_clang_llvm_version "$1"
-	fi
-}
-
-BDEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	>=app-arch/gzip-1.7
-	!headless? (
-		qt5? ( dev-qt/qtcore:5 )
-	)
-	libcxx? ( >=sys-devel/clang-13 )
-	lto? ( $(depend_clang_llvm_versions 13 14 15) )
-	pgo? (
-		>=dev-python/selenium-3.141.0
-		>=dev-util/web_page_replay_go-20220314
-		$(depend_clang_llvm_versions 13 14 15)
-	)
-	dev-lang/perl
-	>=dev-util/gn-0.1807
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	dev-vcs/git
-	>=net-libs/nodejs-7.6.0[inspector]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	js-type-check? ( virtual/jre )
-"
-
-# These are intended for ebuild maintainer use to force clang if GCC is broken.
-: ${CHROMIUM_FORCE_CLANG=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-13"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-needs_clang() {
-	[[ ${CHROMIUM_FORCE_CLANG} == yes ]] || use libcxx || use lto || use pgo
-}
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if ( use lto || use pgo ) && ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-		einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && ( use lto || use pgo ) && llvm_pkg_setup
-
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 10.4; then
-			die "At least gcc 10.4 is required"
-		fi
-		if use pgo && tc-is-cross-compiler; then
-			die "The pgo USE flag cannot be used when cross-compiling"
-		fi
-		if needs_clang || tc-is-clang; then
-			tc-is-cross-compiler && CPP=${CBUILD}-clang++ || CPP=${CHOST}-clang++
-			CPP+=" -E"
-			if ! ver_test "$(clang-major-version)" -ge 13; then
-				die "At least clang 13 is required"
-			fi
-			# bug #889374
-			if ! use libcxx; then
-				die "Builds using clang fail with USE=-libcxx"
-			fi
-		fi
-		if [[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && use js-type-check; then
-			"${BROOT}"/usr/bin/java -version 2>1 > /dev/null || die "Java VM not setup correctly"
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="4G"
-	CHECKREQS_DISK_BUILD="12G"
-	tc-is-cross-compiler && CHECKREQS_DISK_BUILD="14G"
-	if use lto || use pgo; then
-		CHECKREQS_MEMORY="9G"
-		CHECKREQS_DISK_BUILD="13G"
-		tc-is-cross-compiler && CHECKREQS_DISK_BUILD="16G"
-		use pgo && CHECKREQS_DISK_BUILD="20G"
-	fi
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		if use custom-cflags || use component-build; then
-			CHECKREQS_DISK_BUILD="25G"
-		fi
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
-	pre_build_checks
-
-	if use headless; then
-		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "vaapi" "wayland")
-		for myiuse in ${headless_unused_flags[@]}; do
-			use ${myiuse} && ewarn "Ignoring USE=${myiuse} since USE=headless is set."
-		done
-	fi
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	chromium_suid_sandbox_check_kernel_config
-
-	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
-	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
-		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
-		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
-	fi
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# disable global media controls, crashes with libstdc++
-	sed -i -e \
-		"/\"GlobalMediaControlsCastStartStop\",/{n;s/ENABLED/DISABLED/;}" \
-		"chrome/browser/media/router/media_router_feature.cc" || die
-
-	local PATCHES=(
-		"${WORKDIR}/patches"
-		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-98-gtk4-build.patch"
-		"${FILESDIR}/chromium-108-EnumTable-crash.patch"
-		"${FILESDIR}/chromium-109-system-zlib.patch"
-		"${FILESDIR}/chromium-109-system-openh264.patch"
-		"${FILESDIR}/chromium-109-system-icu.patch"
-		"${FILESDIR}/chromium-109-v8-icu72.patch"
-		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
-		"${FILESDIR}/chromium-shim_headers.patch"
-		"${FILESDIR}/chromium-cross-compile.patch"
-	)
-
-	if use ppc64 ; then
-		local p
-		for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series | grep "^ppc64le" || die); do
-			if [[ ! $p =~ "fix-breakpad-compile.patch" ]]; then
-				eapply "${WORKDIR}/debian/patches/${p}"
-			fi
-		done
-		PATCHES+=( "${WORKDIR}/ppc64le" )
-	fi
-
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	# adjust python interpreter version
-	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/double_conversion
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/smhasher
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/trace_event
-		third_party/angle/src/third_party/volk
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/blink
-		third_party/bidimapper
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4-4.9.3
-		third_party/catapult/third_party/html5lib-1.1
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jpeg-js
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/content_analysis_sdk
-		third_party/cpuinfo
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/dawn
-		third_party/dawn/third_party/gn/webgpu-cts
-		third_party/dawn/third_party/khronos
-		third_party/depot_tools
-		third_party/devscripts
-		third_party/devtools-frontend
-		third_party/devtools-frontend/src/front_end/third_party/acorn
-		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
-		third_party/devtools-frontend/src/front_end/third_party/axe-core
-		third_party/devtools-frontend/src/front_end/third_party/chromium
-		third_party/devtools-frontend/src/front_end/third_party/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/diff
-		third_party/devtools-frontend/src/front_end/third_party/i18n
-		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		third_party/devtools-frontend/src/front_end/third_party/lit-html
-		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
-		third_party/devtools-frontend/src/front_end/third_party/marked
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
-		third_party/devtools-frontend/src/third_party
-		third_party/distributed_point_functions
-		third_party/dom_distiller_js
-		third_party/eigen3
-		third_party/emoji-segmenter
-		third_party/farmhash
-		third_party/fdlibm
-		third_party/fft2d
-		third_party/flatbuffers
-		third_party/fp16
-		third_party/freetype
-		third_party/fusejs
-		third_party/fxdiv
-		third_party/highway
-		third_party/liburlpattern
-		third_party/libzip
-		third_party/gemmlowp
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/ipcz
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libaddressinput
-		third_party/libavif
-		third_party/libevent
-		third_party/libgav1
-		third_party/libjingle
-		third_party/libjxl
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libudev
-		third_party/libva_protected_content
-		third_party/libvpx
-		third_party/libvpx/source/libvpx/third_party/x86inc
-		third_party/libwebm
-		third_party/libx11
-		third_party/libxcb-keysyms
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/llvm
-		third_party/lottie
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/mako
-		third_party/maldoca
-		third_party/maldoca/src/third_party/tensorflow_protos
-		third_party/maldoca/src/third_party/zlibwrapper
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/minigbm
-		third_party/modp_b64
-		third_party/nasm
-		third_party/nearby
-		third_party/neon_2_sse
-		third_party/node
-		third_party/omnibox_proto
-		third_party/one_euro_filter
-		third_party/openscreen
-		third_party/openscreen/src/third_party/mozilla
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/skia_shared
-		third_party/perfetto
-		third_party/perfetto/protos/third_party/chromium
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/private-join-and-compute
-		third_party/private_membership
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/pthreadpool
-		third_party/pyjson5
-		third_party/pyyaml
-		third_party/qcms
-		third_party/rnnoise
-		third_party/s2cellid
-		third_party/securemessage
-		third_party/selenium-atoms
-		third_party/shell-encryption
-		third_party/simplejson
-		third_party/skia
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/snappy
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/astc-encoder
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/marl
-		third_party/swiftshader/third_party/subzero
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
-		third_party/swiftshader/third_party/SPIRV-Tools
-		third_party/tensorflow_models
-		third_party/tensorflow-text
-		third_party/tflite
-		third_party/tflite/src/third_party/eigen3
-		third_party/tflite/src/third_party/fft2d
-		third_party/ruy
-		third_party/six
-		third_party/ukey2
-		third_party/unrar
-		third_party/utf
-		third_party/vulkan
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webgpu-cts
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/ooura
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/wuffs
-		third_party/x11proto
-		third_party/xcbproto
-		third_party/xnnpack
-		third_party/zxcvbn-cpp
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		v8/src/third_party/valgrind
-		v8/src/third_party/utf8-decoder
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if ! use system-png; then
-		keeplibs+=( third_party/libpng )
-	fi
-	if ! use system-av1; then
-		keeplibs+=(
-			third_party/dav1d
-			third_party/libaom
-			third_party/libaom/source/libaom/third_party/fastfeat
-			third_party/libaom/source/libaom/third_party/SVT-AV1
-			third_party/libaom/source/libaom/third_party/vector
-			third_party/libaom/source/libaom/third_party/x86inc
-		)
-	fi
-	if ! use system-harfbuzz; then
-		keeplibs+=( third_party/harfbuzz-ng )
-	fi
-	if use libcxx; then
-		keeplibs+=( third_party/re2 )
-	fi
-	if use wayland && ! use headless ; then
-		keeplibs+=( third_party/wayland )
-	fi
-	if use arm64 || use ppc64 ; then
-		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
-	fi
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	# it has to be done before unbundling.
-	if use ppc64; then
-		pushd third_party/libvpx >/dev/null || die
-		mkdir -p source/config/linux/ppc64 || die
-		# requires git and clang, bug #832803
-		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g" \
-			generate_gni.sh || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-
-		pushd third_party/ffmpeg >/dev/null || die
-		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
-		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
-		popd >/dev/null || die
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-
-	if use js-type-check; then
-		ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
-	fi
-
-	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
-	mkdir -p buildtools/third_party/eu-strip/bin || die
-	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
-}
-
-chromium_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	if needs_clang && ! tc-is-clang; then
-		# Force clang since gcc is either broken or build is using libcxx.
-		if tc-is-cross-compiler; then
-			CC="${CBUILD}-clang -target ${CHOST} --sysroot ${ESYSROOT}"
-			CXX="${CBUILD}-clang++ -target ${CHOST} --sysroot ${ESYSROOT}"
-			BUILD_CC=${CBUILD}-clang
-			BUILD_CXX=${CBUILD}-clang++
-		else
-			CC=${CHOST}-clang
-			CXX=${CHOST}-clang++
-		fi
-		strip-unsupported-flags
-	fi
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Force lld for lto or pgo builds only, otherwise disable, bug 641556
-	if use lto || use pgo; then
-		myconf_gn+=" use_lld=true"
-	else
-		myconf_gn+=" use_lld=false"
-	fi
-
-	if use lto || use pgo; then
-		AR=llvm-ar
-		NM=llvm-nm
-		if tc-is-cross-compiler; then
-			BUILD_AR=llvm-ar
-			BUILD_NM=llvm-nm
-		fi
-	fi
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
-		myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
-
-		# setup cups-config, build system only uses --libs option
-		if use cups; then
-			mkdir "${T}/cups-config" || die
-			cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
-			export PATH="${PATH}:${T}/cups-config"
-		fi
-
-		# Don't inherit PKG_CONFIG_PATH from environment
-		local -x PKG_CONFIG_PATH=
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
-	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
-	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
-	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libwebp
-		libxml
-		libxslt
-		openh264
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-png; then
-		gn_system_libraries+=( libpng )
-	fi
-	if use system-av1; then
-		gn_system_libraries+=( dav1d libaom )
-	fi
-	# re2 library interface relies on std::string and std::vector
-	if ! use libcxx; then
-		gn_system_libraries+=( re2 )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
-
-	# Disable deprecated libgnome-keyring dependency, bug #713012
-	myconf_gn+=" use_gnome_keyring=false"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-
-	if use headless; then
-		myconf_gn+=" use_cups=false"
-		myconf_gn+=" use_kerberos=false"
-		myconf_gn+=" use_pulseaudio=false"
-		myconf_gn+=" use_vaapi=false"
-		myconf_gn+=" rtc_use_pipewire=false"
-	else
-		myconf_gn+=" use_cups=$(usex cups true false)"
-		myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
-		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
-		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
-	fi
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" disable_fieldtrial_testing_config=true"
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false"
-	myconf_gn+=" use_custom_libcxx=$(usex libcxx true false)"
-
-	# Disable pseudolocales, only used for testing
-	myconf_gn+=" enable_pseudolocales=false"
-
-	# Disable code formating of generated files
-	myconf_gn+=" blink_enable_generated_code_formatting=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info. The OAuth2 credentials, however, have been left out.
-	# Those OAuth2 credentials have been broken for quite some time anyway.
-	# Instead we apply a patch to use the --oauth2-client-id= and
-	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
-	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
-	# Chromium without baked-in values.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		if ! use component-build || use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a
-		fi
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-
-		# This is normally defined by compiler_cpu_abi in
-		# build/config/compiler/BUILD.gn, but we patch that part out.
-		append-flags -msse2 -mfpmath=sse -mmmx
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Disable external code space for V8 for ppc64. It is disabled for ppc64
-	# by default, but cross-compiling on amd64 enables it again.
-	if tc-is-cross-compiler; then
-		if ! use amd64 && ! use arm64; then
-			myconf_gn+=" v8_enable_external_code_space=false"
-		fi
-	fi
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	#if ! use system-ffmpeg; then
-	if false; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	# Disable unknown warning message from clang.
-	if tc-is-clang; then
-		append-flags -Wno-unknown-warning-option
-		if tc-is-cross-compiler; then
-			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
-			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
-		fi
-	fi
-
-	# Explicitly disable ICU data file support for system-icu/headless builds.
-	if use system-icu || use headless; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Enable ozone wayland and/or headless support
-	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-	myconf_gn+=" ozone_platform_headless=true"
-	if use headless; then
-		myconf_gn+=" ozone_platform=\"headless\""
-		myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"
-		myconf_gn+=" use_glib=false use_gio=false"
-		myconf_gn+=" use_pangocairo=false use_alsa=false"
-		myconf_gn+=" use_libpci=false use_udev=false"
-		myconf_gn+=" enable_print_preview=false"
-		myconf_gn+=" enable_remoting=false"
-	else
-		myconf_gn+=" use_system_libdrm=true"
-		myconf_gn+=" use_system_minigbm=true"
-		myconf_gn+=" use_xkbcommon=true"
-		if use qt5; then
-			local moc_dir="$(qt5_get_bindir)"
-			if tc-is-cross-compiler; then
-				# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-				local cbuild_libdir=$($(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libxslt)
-				cbuild_libdir=${cbuild_libdir:2}
-				moc_dir="${EPREFIX}"/${cbuild_libdir/% }/qt5/bin
-			fi
-			export PATH="${PATH}:${moc_dir}"
-		fi
-		myconf_gn+=" use_qt=$(usex qt5 true false)"
-		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
-		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
-		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
-		if use wayland; then
-			myconf_gn+=" use_system_libwayland=true"
-			myconf_gn+=" use_system_wayland_scanner=true"
-		fi
-	fi
-
-	# Results in undefined references in chrome linking, may require CFI to work
-	if use arm64; then
-		myconf_gn+=" arm_control_flow_integrity=\"none\""
-	fi
-
-	# Enable official builds
-	myconf_gn+=" is_official_build=$(usex official true false)"
-	myconf_gn+=" use_thin_lto=$(usex lto true false)"
-	myconf_gn+=" thin_lto_enable_optimizations=$(usex lto true false)"
-	if use official; then
-		# Allow building against system libraries in official builds
-		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-			tools/generate_shim_headers/generate_shim_headers.py || die
-		# Disable CFI: unsupported for GCC, requires clang+lto+lld
-		myconf_gn+=" is_cfi=false"
-		# Don't add symbols to build
-		myconf_gn+=" symbol_level=0"
-	fi
-
-	if use pgo; then
-		myconf_gn+=" chrome_pgo_phase=${1}"
-		if [[ "$1" == "2" ]]; then
-			myconf_gn+=" pgo_data_path=\"${2}\""
-		fi
-	else
-		# Disable PGO, because profile data is only compatible with >=clang-11
-		myconf_gn+=" chrome_pgo_phase=0"
-	fi
-
-	# user CXXFLAGS might overwrite -march=armv8-a+crc+crypto, bug #851639
-	if use arm64 && tc-is-gcc; then
-		sed -i '/^#if HAVE_ARM64_CRC32C/a #pragma GCC target ("+crc+crypto")' \
-			third_party/crc32c/src/src/crc32c_arm64.cc || die
-	fi
-
-	# skipping typecheck is only supported on amd64, bug #876157
-	if ! use amd64; then
-		myconf_gn+=" devtools_skip_typecheck=false"
-	fi
-
-	einfo "Configuring Chromium..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	chromium_configure $(usex pgo 1 0)
-}
-
-chromium_compile() {
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
-	local -x PYTHONPATH=
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-}
-
-# This function is called from virtx, and must always return so that Xvfb
-# session isn't left running. If we return 1, virtx will call die().
-chromium_profile() {
-	einfo "Profiling for PGO"
-
-	pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
-
-	# Remove old profdata in case profiling was interrupted.
-	rm -rf "${1}" || return 1
-
-	if ! "${EPYTHON}" ./chromium_profiler.py \
-		--chrome-executable "${S}/out/Release/chrome" \
-		--chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
-		--add-arg no-sandbox --add-arg disable-dev-shm-usage \
-		--profile-output "${1}"; then
-		eerror "Profiling failed"
-		return 1
-	fi
-
-	popd >/dev/null || return 1
-}
-
-src_compile() {
-	if use pgo; then
-		local profdata
-
-		profdata="${WORKDIR}/chromium.profdata"
-
-		if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
-			chromium_compile
-			virtx chromium_profile "$profdata"
-
-			touch "${WORKDIR}/.pgo-profiled" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
-			# Remove phase 1 output
-			rm -r out/Release || die
-
-			chromium_configure 2 "$profdata"
-
-			touch "${WORKDIR}/.pgo-phase-2-configured" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
-			chromium_compile
-			touch "${WORKDIR}/.pgo-phase-2-compiled" || die
-		fi
-	else
-		chromium_compile
-	fi
-
-	mv out/Release/chromedriver{.unstripped,} || die
-
-	rm -f out/Release/locales/*.pak.info || die
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-
-	# Build desktop file; bug #706786
-	sed -e 's|@@MENUNAME@@|Chromium|g;
-		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-		s|@@PACKAGE@@|chromium-browser|g;
-		s|\(^Exec=\)/usr/bin/|\1|g;' \
-		chrome/installer/linux/common/desktop.template > \
-		out/Release/chromium-browser-chromium.desktop || die
-
-	# Build vk_swiftshader_icd.json; bug #827861
-	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
-		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
-		out/Release/vk_swiftshader_icd.json || die
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-	doexe out/Release/chrome_crashpad_handler
-
-	ozone_auto_session () {
-		use X && use wayland && ! use headless && echo true || echo false
-	}
-	local sedargs=( -e
-			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	(
-		shopt -s nullglob
-		local files=(out/Release/*.so out/Release/*.so.[0-9])
-		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
-	)
-
-	if ! use system-icu && ! use headless; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/MEIPreload
-
-	# Install vk_swiftshader_icd.json; bug #827861
-	doins out/Release/vk_swiftshader_icd.json
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	# Install desktop entry
-	domenu out/Release/chromium-browser-chromium.desktop
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-
-	if ! use headless; then
-		if use vaapi; then
-			elog "VA-API is disabled by default at runtime. You have to enable it"
-			elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
-			elog "in /etc/chromium/default."
-		fi
-		if use screencast; then
-			elog "Screencast is disabled by default at runtime. Either enable it"
-			elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
-			elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-		if use gtk4; then
-			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
-			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-	fi
-}
diff --git a/www-client/chromium/chromium-109.0.5414.74-r1.ebuild b/www-client/chromium/chromium-109.0.5414.74-r1.ebuild
deleted file mode 100644
index 4af75deaaaca..000000000000
--- a/www-client/chromium/chromium-109.0.5414.74-r1.ebuild
+++ /dev/null
@@ -1,1249 +0,0 @@
-# Copyright 2009-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-LLVM_MAX_SLOT=15
-
-CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk ur vi zh-CN zh-TW"
-
-VIRTUALX_REQUIRED="pgo"
-
-inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils
-inherit python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://chromium.org/"
-PATCHSET="2"
-PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
-PATCHSET_URI_PPC64="https://quickbuild.io/~raptor-engineering-public"
-PATCHSET_NAME_PPC64="chromium_109.0.5414.74-2raptor0~deb11u1.debian"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
-	ppc64? (
-		${PATCHSET_URI_PPC64}/+archive/ubuntu/chromium/+files/${PATCHSET_NAME_PPC64}.tar.xz
-		https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-ppc64le-gentoo-patches-1.tar.xz
-	)
-	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
-
-LICENSE="BSD"
-SLOT="0/stable"
-KEYWORDS="amd64 arm64 ~ppc64"
-IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
-REQUIRED_USE="
-	component-build? ( !suid !libcxx )
-	screencast? ( wayland )
-	!headless? ( || ( X wayland ) )
-	pgo? ( X !wayland )
-"
-
-COMMON_X_DEPEND="
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXtst:=
-	x11-libs/libxshmfence:=
-"
-
-COMMON_SNAPSHOT_DEPEND="
-	system-icu? ( >=dev-libs/icu-71.1:= )
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	!libcxx? ( >=dev-libs/re2-0.2019.08.01:= )
-	dev-libs/libxslt:=
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2.11.0-r1:=
-	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
-	media-libs/libjpeg-turbo:=
-	system-png? ( media-libs/libpng:=[-apng(-)] )
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/mesa:=[gbm(+)]
-	>=media-libs/openh264-1.6.0:=
-	system-av1? (
-		>=media-libs/dav1d-1.0.0:=
-		>=media-libs/libaom-3.4.0:=
-	)
-	sys-libs/zlib:=
-	x11-libs/libdrm:=
-	!headless? (
-		dev-libs/glib:2
-		>=media-libs/alsa-lib-1.0.19:=
-		pulseaudio? ( media-sound/pulseaudio:= )
-		sys-apps/pciutils:=
-		kerberos? ( virtual/krb5 )
-		vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] )
-		X? (
-			x11-libs/libX11:=
-			x11-libs/libXext:=
-			x11-libs/libxcb:=
-		)
-		x11-libs/libxkbcommon:=
-		wayland? (
-			dev-libs/wayland:=
-			screencast? ( media-video/pipewire:= )
-		)
-	)
-"
-
-COMMON_DEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	app-arch/bzip2:=
-	dev-libs/expat:=
-	system-ffmpeg? (
-		>=media-video/ffmpeg-4.3:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		>=media-libs/opus-1.3.1:=
-	)
-	net-misc/curl[ssl]
-	sys-apps/dbus:=
-	media-libs/flac:=
-	sys-libs/zlib:=[minizip]
-	!headless? (
-		X? ( ${COMMON_X_DEPEND} )
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		media-libs/mesa:=[X?,wayland?]
-		cups? ( >=net-print/cups-1.3.11:= )
-		virtual/udev
-		x11-libs/cairo:=
-		x11-libs/gdk-pixbuf:2
-		x11-libs/pango:=
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtwidgets:5
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!headless? (
-		|| (
-			x11-libs/gtk+:3[X?,wayland?]
-			gui-libs/gtk:4[X?,wayland?]
-		)
-		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
-		x11-misc/xdg-utils
-	)
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-"
-DEPEND="${COMMON_DEPEND}
-	!headless? (
-		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
-		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
-	)
-"
-
-depend_clang_llvm_version() {
-	echo "sys-devel/clang:$1"
-	echo "sys-devel/llvm:$1"
-	echo "=sys-devel/lld-$1*"
-}
-
-depend_clang_llvm_versions() {
-	local _v
-	if [[ $# -gt 1 ]]; then
-		echo "|| ("
-		for _v in "$@"; do
-			echo "("
-			depend_clang_llvm_version "${_v}"
-			echo ")"
-		done
-		echo ")"
-	elif [[ $# -eq 1 ]]; then
-		depend_clang_llvm_version "$1"
-	fi
-}
-
-BDEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	>=app-arch/gzip-1.7
-	!headless? (
-		qt5? ( dev-qt/qtcore:5 )
-	)
-	libcxx? ( >=sys-devel/clang-13 )
-	lto? ( $(depend_clang_llvm_versions 13 14 15) )
-	pgo? (
-		>=dev-python/selenium-3.141.0
-		>=dev-util/web_page_replay_go-20220314
-		$(depend_clang_llvm_versions 13 14 15)
-	)
-	dev-lang/perl
-	>=dev-util/gn-0.1807
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	dev-vcs/git
-	>=net-libs/nodejs-7.6.0[inspector]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	js-type-check? ( virtual/jre )
-"
-
-# These are intended for ebuild maintainer use to force clang if GCC is broken.
-: ${CHROMIUM_FORCE_CLANG=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-13"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-needs_clang() {
-	[[ ${CHROMIUM_FORCE_CLANG} == yes ]] || use libcxx || use lto || use pgo
-}
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if ( use lto || use pgo ) && ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-		einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && ( use lto || use pgo ) && llvm_pkg_setup
-
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 10.4; then
-			die "At least gcc 10.4 is required"
-		fi
-		if use pgo && tc-is-cross-compiler; then
-			die "The pgo USE flag cannot be used when cross-compiling"
-		fi
-		if needs_clang || tc-is-clang; then
-			tc-is-cross-compiler && CPP=${CBUILD}-clang++ || CPP=${CHOST}-clang++
-			CPP+=" -E"
-			if ! ver_test "$(clang-major-version)" -ge 13; then
-				die "At least clang 13 is required"
-			fi
-			# bug #889374
-			if ! use libcxx; then
-				die "Builds using clang fail with USE=-libcxx"
-			fi
-		fi
-		if [[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && use js-type-check; then
-			"${BROOT}"/usr/bin/java -version 2>1 > /dev/null || die "Java VM not setup correctly"
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="4G"
-	CHECKREQS_DISK_BUILD="12G"
-	tc-is-cross-compiler && CHECKREQS_DISK_BUILD="14G"
-	if use lto || use pgo; then
-		CHECKREQS_MEMORY="9G"
-		CHECKREQS_DISK_BUILD="13G"
-		tc-is-cross-compiler && CHECKREQS_DISK_BUILD="16G"
-		use pgo && CHECKREQS_DISK_BUILD="20G"
-	fi
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		if use custom-cflags || use component-build; then
-			CHECKREQS_DISK_BUILD="25G"
-		fi
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
-	pre_build_checks
-
-	if use headless; then
-		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "vaapi" "wayland")
-		for myiuse in ${headless_unused_flags[@]}; do
-			use ${myiuse} && ewarn "Ignoring USE=${myiuse} since USE=headless is set."
-		done
-	fi
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	chromium_suid_sandbox_check_kernel_config
-
-	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
-	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
-		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
-		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
-	fi
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# disable global media controls, crashes with libstdc++
-	sed -i -e \
-		"/\"GlobalMediaControlsCastStartStop\",/{n;s/ENABLED/DISABLED/;}" \
-		"chrome/browser/media/router/media_router_feature.cc" || die
-
-	local PATCHES=(
-		"${WORKDIR}/patches"
-		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-98-gtk4-build.patch"
-		"${FILESDIR}/chromium-108-EnumTable-crash.patch"
-		"${FILESDIR}/chromium-109-system-zlib.patch"
-		"${FILESDIR}/chromium-109-system-openh264.patch"
-		"${FILESDIR}/chromium-109-system-icu.patch"
-		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
-		"${FILESDIR}/chromium-shim_headers.patch"
-		"${FILESDIR}/chromium-cross-compile.patch"
-	)
-
-	if use ppc64 ; then
-		local p
-		for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series | grep "^ppc64le" || die); do
-			if [[ ! $p =~ "fix-breakpad-compile.patch" ]]; then
-				eapply "${WORKDIR}/debian/patches/${p}"
-			fi
-		done
-		PATCHES+=( "${WORKDIR}/ppc64le" )
-	fi
-
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	# adjust python interpreter version
-	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/double_conversion
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/smhasher
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/trace_event
-		third_party/angle/src/third_party/volk
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/blink
-		third_party/bidimapper
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4-4.9.3
-		third_party/catapult/third_party/html5lib-1.1
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jpeg-js
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/content_analysis_sdk
-		third_party/cpuinfo
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/dawn
-		third_party/dawn/third_party/gn/webgpu-cts
-		third_party/dawn/third_party/khronos
-		third_party/depot_tools
-		third_party/devscripts
-		third_party/devtools-frontend
-		third_party/devtools-frontend/src/front_end/third_party/acorn
-		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
-		third_party/devtools-frontend/src/front_end/third_party/axe-core
-		third_party/devtools-frontend/src/front_end/third_party/chromium
-		third_party/devtools-frontend/src/front_end/third_party/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/diff
-		third_party/devtools-frontend/src/front_end/third_party/i18n
-		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		third_party/devtools-frontend/src/front_end/third_party/lit-html
-		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
-		third_party/devtools-frontend/src/front_end/third_party/marked
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
-		third_party/devtools-frontend/src/third_party
-		third_party/distributed_point_functions
-		third_party/dom_distiller_js
-		third_party/eigen3
-		third_party/emoji-segmenter
-		third_party/farmhash
-		third_party/fdlibm
-		third_party/fft2d
-		third_party/flatbuffers
-		third_party/fp16
-		third_party/freetype
-		third_party/fusejs
-		third_party/fxdiv
-		third_party/highway
-		third_party/liburlpattern
-		third_party/libzip
-		third_party/gemmlowp
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/ipcz
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libaddressinput
-		third_party/libavif
-		third_party/libevent
-		third_party/libgav1
-		third_party/libjingle
-		third_party/libjxl
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libudev
-		third_party/libva_protected_content
-		third_party/libvpx
-		third_party/libvpx/source/libvpx/third_party/x86inc
-		third_party/libwebm
-		third_party/libx11
-		third_party/libxcb-keysyms
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/llvm
-		third_party/lottie
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/mako
-		third_party/maldoca
-		third_party/maldoca/src/third_party/tensorflow_protos
-		third_party/maldoca/src/third_party/zlibwrapper
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/minigbm
-		third_party/modp_b64
-		third_party/nasm
-		third_party/nearby
-		third_party/neon_2_sse
-		third_party/node
-		third_party/omnibox_proto
-		third_party/one_euro_filter
-		third_party/openscreen
-		third_party/openscreen/src/third_party/mozilla
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/skia_shared
-		third_party/perfetto
-		third_party/perfetto/protos/third_party/chromium
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/private-join-and-compute
-		third_party/private_membership
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/pthreadpool
-		third_party/pyjson5
-		third_party/pyyaml
-		third_party/qcms
-		third_party/rnnoise
-		third_party/s2cellid
-		third_party/securemessage
-		third_party/selenium-atoms
-		third_party/shell-encryption
-		third_party/simplejson
-		third_party/skia
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/snappy
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/astc-encoder
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/marl
-		third_party/swiftshader/third_party/subzero
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
-		third_party/swiftshader/third_party/SPIRV-Tools
-		third_party/tensorflow_models
-		third_party/tensorflow-text
-		third_party/tflite
-		third_party/tflite/src/third_party/eigen3
-		third_party/tflite/src/third_party/fft2d
-		third_party/ruy
-		third_party/six
-		third_party/ukey2
-		third_party/unrar
-		third_party/utf
-		third_party/vulkan
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webgpu-cts
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/ooura
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/wuffs
-		third_party/x11proto
-		third_party/xcbproto
-		third_party/xnnpack
-		third_party/zxcvbn-cpp
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		v8/src/third_party/valgrind
-		v8/src/third_party/utf8-decoder
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if ! use system-png; then
-		keeplibs+=( third_party/libpng )
-	fi
-	if ! use system-av1; then
-		keeplibs+=(
-			third_party/dav1d
-			third_party/libaom
-			third_party/libaom/source/libaom/third_party/fastfeat
-			third_party/libaom/source/libaom/third_party/SVT-AV1
-			third_party/libaom/source/libaom/third_party/vector
-			third_party/libaom/source/libaom/third_party/x86inc
-		)
-	fi
-	if ! use system-harfbuzz; then
-		keeplibs+=( third_party/harfbuzz-ng )
-	fi
-	if use libcxx; then
-		keeplibs+=( third_party/re2 )
-	fi
-	if use wayland && ! use headless ; then
-		keeplibs+=( third_party/wayland )
-	fi
-	if use arm64 || use ppc64 ; then
-		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
-	fi
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	# it has to be done before unbundling.
-	if use ppc64; then
-		pushd third_party/libvpx >/dev/null || die
-		mkdir -p source/config/linux/ppc64 || die
-		# requires git and clang, bug #832803
-		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g" \
-			generate_gni.sh || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-
-		pushd third_party/ffmpeg >/dev/null || die
-		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
-		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
-		popd >/dev/null || die
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-
-	if use js-type-check; then
-		ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
-	fi
-
-	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
-	mkdir -p buildtools/third_party/eu-strip/bin || die
-	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
-}
-
-chromium_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	if needs_clang && ! tc-is-clang; then
-		# Force clang since gcc is either broken or build is using libcxx.
-		if tc-is-cross-compiler; then
-			CC="${CBUILD}-clang -target ${CHOST} --sysroot ${ESYSROOT}"
-			CXX="${CBUILD}-clang++ -target ${CHOST} --sysroot ${ESYSROOT}"
-			BUILD_CC=${CBUILD}-clang
-			BUILD_CXX=${CBUILD}-clang++
-		else
-			CC=${CHOST}-clang
-			CXX=${CHOST}-clang++
-		fi
-		strip-unsupported-flags
-	fi
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Force lld for lto or pgo builds only, otherwise disable, bug 641556
-	if use lto || use pgo; then
-		myconf_gn+=" use_lld=true"
-	else
-		myconf_gn+=" use_lld=false"
-	fi
-
-	if use lto || use pgo; then
-		AR=llvm-ar
-		NM=llvm-nm
-		if tc-is-cross-compiler; then
-			BUILD_AR=llvm-ar
-			BUILD_NM=llvm-nm
-		fi
-	fi
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
-		myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
-
-		# setup cups-config, build system only uses --libs option
-		if use cups; then
-			mkdir "${T}/cups-config" || die
-			cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
-			export PATH="${PATH}:${T}/cups-config"
-		fi
-
-		# Don't inherit PKG_CONFIG_PATH from environment
-		local -x PKG_CONFIG_PATH=
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
-	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
-	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
-	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libwebp
-		libxml
-		libxslt
-		openh264
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-png; then
-		gn_system_libraries+=( libpng )
-	fi
-	if use system-av1; then
-		gn_system_libraries+=( dav1d libaom )
-	fi
-	# re2 library interface relies on std::string and std::vector
-	if ! use libcxx; then
-		gn_system_libraries+=( re2 )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
-
-	# Disable deprecated libgnome-keyring dependency, bug #713012
-	myconf_gn+=" use_gnome_keyring=false"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-
-	if use headless; then
-		myconf_gn+=" use_cups=false"
-		myconf_gn+=" use_kerberos=false"
-		myconf_gn+=" use_pulseaudio=false"
-		myconf_gn+=" use_vaapi=false"
-		myconf_gn+=" rtc_use_pipewire=false"
-	else
-		myconf_gn+=" use_cups=$(usex cups true false)"
-		myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
-		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
-		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
-	fi
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" disable_fieldtrial_testing_config=true"
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false"
-	myconf_gn+=" use_custom_libcxx=$(usex libcxx true false)"
-
-	# Disable pseudolocales, only used for testing
-	myconf_gn+=" enable_pseudolocales=false"
-
-	# Disable code formating of generated files
-	myconf_gn+=" blink_enable_generated_code_formatting=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info. The OAuth2 credentials, however, have been left out.
-	# Those OAuth2 credentials have been broken for quite some time anyway.
-	# Instead we apply a patch to use the --oauth2-client-id= and
-	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
-	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
-	# Chromium without baked-in values.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		if ! use component-build || use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a
-		fi
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-
-		# This is normally defined by compiler_cpu_abi in
-		# build/config/compiler/BUILD.gn, but we patch that part out.
-		append-flags -msse2 -mfpmath=sse -mmmx
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Disable external code space for V8 for ppc64. It is disabled for ppc64
-	# by default, but cross-compiling on amd64 enables it again.
-	if tc-is-cross-compiler; then
-		if ! use amd64 && ! use arm64; then
-			myconf_gn+=" v8_enable_external_code_space=false"
-		fi
-	fi
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	#if ! use system-ffmpeg; then
-	if false; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	# Disable unknown warning message from clang.
-	if tc-is-clang; then
-		append-flags -Wno-unknown-warning-option
-		if tc-is-cross-compiler; then
-			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
-			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
-		fi
-	fi
-
-	# Explicitly disable ICU data file support for system-icu/headless builds.
-	if use system-icu || use headless; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Enable ozone wayland and/or headless support
-	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-	myconf_gn+=" ozone_platform_headless=true"
-	if use headless; then
-		myconf_gn+=" ozone_platform=\"headless\""
-		myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"
-		myconf_gn+=" use_glib=false use_gio=false"
-		myconf_gn+=" use_pangocairo=false use_alsa=false"
-		myconf_gn+=" use_libpci=false use_udev=false"
-		myconf_gn+=" enable_print_preview=false"
-		myconf_gn+=" enable_remoting=false"
-	else
-		myconf_gn+=" use_system_libdrm=true"
-		myconf_gn+=" use_system_minigbm=true"
-		myconf_gn+=" use_xkbcommon=true"
-		if use qt5; then
-			local moc_dir="$(qt5_get_bindir)"
-			if tc-is-cross-compiler; then
-				# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-				local cbuild_libdir=$($(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libxslt)
-				cbuild_libdir=${cbuild_libdir:2}
-				moc_dir="${EPREFIX}"/${cbuild_libdir/% }/qt5/bin
-			fi
-			export PATH="${PATH}:${moc_dir}"
-		fi
-		myconf_gn+=" use_qt=$(usex qt5 true false)"
-		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
-		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
-		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
-		if use wayland; then
-			myconf_gn+=" use_system_libwayland=true"
-			myconf_gn+=" use_system_wayland_scanner=true"
-		fi
-	fi
-
-	# Results in undefined references in chrome linking, may require CFI to work
-	if use arm64; then
-		myconf_gn+=" arm_control_flow_integrity=\"none\""
-	fi
-
-	# Enable official builds
-	myconf_gn+=" is_official_build=$(usex official true false)"
-	myconf_gn+=" use_thin_lto=$(usex lto true false)"
-	myconf_gn+=" thin_lto_enable_optimizations=$(usex lto true false)"
-	if use official; then
-		# Allow building against system libraries in official builds
-		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-			tools/generate_shim_headers/generate_shim_headers.py || die
-		# Disable CFI: unsupported for GCC, requires clang+lto+lld
-		myconf_gn+=" is_cfi=false"
-		# Don't add symbols to build
-		myconf_gn+=" symbol_level=0"
-	fi
-
-	if use pgo; then
-		myconf_gn+=" chrome_pgo_phase=${1}"
-		if [[ "$1" == "2" ]]; then
-			myconf_gn+=" pgo_data_path=\"${2}\""
-		fi
-	else
-		# Disable PGO, because profile data is only compatible with >=clang-11
-		myconf_gn+=" chrome_pgo_phase=0"
-	fi
-
-	# user CXXFLAGS might overwrite -march=armv8-a+crc+crypto, bug #851639
-	if use arm64 && tc-is-gcc; then
-		sed -i '/^#if HAVE_ARM64_CRC32C/a #pragma GCC target ("+crc+crypto")' \
-			third_party/crc32c/src/src/crc32c_arm64.cc || die
-	fi
-
-	# skipping typecheck is only supported on amd64, bug #876157
-	if ! use amd64; then
-		myconf_gn+=" devtools_skip_typecheck=false"
-	fi
-
-	einfo "Configuring Chromium..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	chromium_configure $(usex pgo 1 0)
-}
-
-chromium_compile() {
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
-	local -x PYTHONPATH=
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-}
-
-# This function is called from virtx, and must always return so that Xvfb
-# session isn't left running. If we return 1, virtx will call die().
-chromium_profile() {
-	einfo "Profiling for PGO"
-
-	pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
-
-	# Remove old profdata in case profiling was interrupted.
-	rm -rf "${1}" || return 1
-
-	if ! "${EPYTHON}" ./chromium_profiler.py \
-		--chrome-executable "${S}/out/Release/chrome" \
-		--chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
-		--add-arg no-sandbox --add-arg disable-dev-shm-usage \
-		--profile-output "${1}"; then
-		eerror "Profiling failed"
-		return 1
-	fi
-
-	popd >/dev/null || return 1
-}
-
-src_compile() {
-	if use pgo; then
-		local profdata
-
-		profdata="${WORKDIR}/chromium.profdata"
-
-		if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
-			chromium_compile
-			virtx chromium_profile "$profdata"
-
-			touch "${WORKDIR}/.pgo-profiled" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
-			# Remove phase 1 output
-			rm -r out/Release || die
-
-			chromium_configure 2 "$profdata"
-
-			touch "${WORKDIR}/.pgo-phase-2-configured" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
-			chromium_compile
-			touch "${WORKDIR}/.pgo-phase-2-compiled" || die
-		fi
-	else
-		chromium_compile
-	fi
-
-	mv out/Release/chromedriver{.unstripped,} || die
-
-	rm -f out/Release/locales/*.pak.info || die
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-
-	# Build desktop file; bug #706786
-	sed -e 's|@@MENUNAME@@|Chromium|g;
-		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-		s|@@PACKAGE@@|chromium-browser|g;
-		s|\(^Exec=\)/usr/bin/|\1|g;' \
-		chrome/installer/linux/common/desktop.template > \
-		out/Release/chromium-browser-chromium.desktop || die
-
-	# Build vk_swiftshader_icd.json; bug #827861
-	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
-		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
-		out/Release/vk_swiftshader_icd.json || die
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-	doexe out/Release/chrome_crashpad_handler
-
-	ozone_auto_session () {
-		use X && use wayland && ! use headless && echo true || echo false
-	}
-	local sedargs=( -e
-			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	(
-		shopt -s nullglob
-		local files=(out/Release/*.so out/Release/*.so.[0-9])
-		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
-	)
-
-	if ! use system-icu && ! use headless; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/MEIPreload
-
-	# Install vk_swiftshader_icd.json; bug #827861
-	doins out/Release/vk_swiftshader_icd.json
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	# Install desktop entry
-	domenu out/Release/chromium-browser-chromium.desktop
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-
-	if ! use headless; then
-		if use vaapi; then
-			elog "VA-API is disabled by default at runtime. You have to enable it"
-			elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
-			elog "in /etc/chromium/default."
-		fi
-		if use screencast; then
-			elog "Screencast is disabled by default at runtime. Either enable it"
-			elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
-			elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-		if use gtk4; then
-			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
-			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-	fi
-}
diff --git a/www-client/chromium/chromium-110.0.5481.38.ebuild b/www-client/chromium/chromium-110.0.5481.38.ebuild
deleted file mode 100644
index 8aaf2bfec27b..000000000000
--- a/www-client/chromium/chromium-110.0.5481.38.ebuild
+++ /dev/null
@@ -1,1244 +0,0 @@
-# Copyright 2009-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-LLVM_MAX_SLOT=15
-
-CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk ur vi zh-CN zh-TW"
-
-VIRTUALX_REQUIRED="pgo"
-
-inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils
-inherit python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://chromium.org/"
-PATCHSET="4"
-PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
-PATCHSET_URI_PPC64="https://quickbuild.io/~raptor-engineering-public"
-PATCHSET_NAME_PPC64="chromium_110.0.5481.77-1raptor0~deb11u1.debian"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
-	ppc64? (
-		${PATCHSET_URI_PPC64}/+archive/ubuntu/chromium/+files/${PATCHSET_NAME_PPC64}.tar.xz
-		https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-ppc64le-gentoo-patches-1.tar.xz
-	)
-	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
-
-LICENSE="BSD"
-SLOT="0/beta"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
-REQUIRED_USE="
-	component-build? ( !suid !libcxx )
-	screencast? ( wayland )
-	!headless? ( || ( X wayland ) )
-	pgo? ( X !wayland )
-"
-
-COMMON_X_DEPEND="
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXtst:=
-	x11-libs/libxshmfence:=
-"
-
-COMMON_SNAPSHOT_DEPEND="
-	system-icu? ( >=dev-libs/icu-71.1:= )
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	!libcxx? ( >=dev-libs/re2-0.2019.08.01:= )
-	dev-libs/libxslt:=
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2.11.0-r1:=
-	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
-	media-libs/libjpeg-turbo:=
-	system-png? ( media-libs/libpng:=[-apng(-)] )
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/mesa:=[gbm(+)]
-	>=media-libs/openh264-1.6.0:=
-	system-av1? (
-		>=media-libs/dav1d-1.0.0:=
-		>=media-libs/libaom-3.4.0:=
-	)
-	sys-libs/zlib:=
-	x11-libs/libdrm:=
-	!headless? (
-		dev-libs/glib:2
-		>=media-libs/alsa-lib-1.0.19:=
-		pulseaudio? ( media-sound/pulseaudio:= )
-		sys-apps/pciutils:=
-		kerberos? ( virtual/krb5 )
-		vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] )
-		X? (
-			x11-libs/libX11:=
-			x11-libs/libXext:=
-			x11-libs/libxcb:=
-		)
-		x11-libs/libxkbcommon:=
-		wayland? (
-			dev-libs/libffi:=
-			screencast? ( media-video/pipewire:= )
-		)
-	)
-"
-
-COMMON_DEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	app-arch/bzip2:=
-	dev-libs/expat:=
-	system-ffmpeg? (
-		>=media-video/ffmpeg-4.3:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		>=media-libs/opus-1.3.1:=
-	)
-	net-misc/curl[ssl]
-	sys-apps/dbus:=
-	media-libs/flac:=
-	sys-libs/zlib:=[minizip]
-	!headless? (
-		X? ( ${COMMON_X_DEPEND} )
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		media-libs/mesa:=[X?,wayland?]
-		cups? ( >=net-print/cups-1.3.11:= )
-		virtual/udev
-		x11-libs/cairo:=
-		x11-libs/gdk-pixbuf:2
-		x11-libs/pango:=
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtwidgets:5
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!headless? (
-		|| (
-			x11-libs/gtk+:3[X?,wayland?]
-			gui-libs/gtk:4[X?,wayland?]
-		)
-		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
-		x11-misc/xdg-utils
-	)
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-"
-DEPEND="${COMMON_DEPEND}
-	!headless? (
-		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
-		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
-	)
-"
-
-depend_clang_llvm_version() {
-	echo "sys-devel/clang:$1"
-	echo "sys-devel/llvm:$1"
-	echo "=sys-devel/lld-$1*"
-}
-
-depend_clang_llvm_versions() {
-	local _v
-	if [[ $# -gt 1 ]]; then
-		echo "|| ("
-		for _v in "$@"; do
-			echo "("
-			depend_clang_llvm_version "${_v}"
-			echo ")"
-		done
-		echo ")"
-	elif [[ $# -eq 1 ]]; then
-		depend_clang_llvm_version "$1"
-	fi
-}
-
-BDEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	>=app-arch/gzip-1.7
-	!headless? (
-		qt5? ( dev-qt/qtcore:5 )
-	)
-	libcxx? ( >=sys-devel/clang-13 )
-	lto? ( $(depend_clang_llvm_versions 13 14 15) )
-	pgo? (
-		>=dev-python/selenium-3.141.0
-		>=dev-util/web_page_replay_go-20220314
-		$(depend_clang_llvm_versions 13 14 15)
-	)
-	dev-lang/perl
-	>=dev-util/gn-0.1807
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	dev-vcs/git
-	>=net-libs/nodejs-7.6.0[inspector]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	js-type-check? ( virtual/jre )
-"
-
-# These are intended for ebuild maintainer use to force clang if GCC is broken.
-: ${CHROMIUM_FORCE_CLANG=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-13"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-needs_clang() {
-	[[ ${CHROMIUM_FORCE_CLANG} == yes ]] || use libcxx || use lto || use pgo
-}
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if ( use lto || use pgo ) && ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-		einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && ( use lto || use pgo ) && llvm_pkg_setup
-
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 10.4; then
-			die "At least gcc 10.4 is required"
-		fi
-		if use pgo && tc-is-cross-compiler; then
-			die "The pgo USE flag cannot be used when cross-compiling"
-		fi
-		if needs_clang || tc-is-clang; then
-			tc-is-cross-compiler && CPP=${CBUILD}-clang++ || CPP=${CHOST}-clang++
-			CPP+=" -E"
-			if ! ver_test "$(clang-major-version)" -ge 13; then
-				die "At least clang 13 is required"
-			fi
-			# bug #889374
-			if ! use libcxx; then
-				die "Builds using clang fail with USE=-libcxx"
-			fi
-		fi
-		if [[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && use js-type-check; then
-			"${BROOT}"/usr/bin/java -version 2>1 > /dev/null || die "Java VM not setup correctly"
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="4G"
-	CHECKREQS_DISK_BUILD="12G"
-	tc-is-cross-compiler && CHECKREQS_DISK_BUILD="14G"
-	if use lto || use pgo; then
-		CHECKREQS_MEMORY="9G"
-		CHECKREQS_DISK_BUILD="13G"
-		tc-is-cross-compiler && CHECKREQS_DISK_BUILD="16G"
-		use pgo && CHECKREQS_DISK_BUILD="20G"
-	fi
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		if use custom-cflags || use component-build; then
-			CHECKREQS_DISK_BUILD="25G"
-		fi
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
-	pre_build_checks
-
-	if use headless; then
-		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "vaapi" "wayland")
-		for myiuse in ${headless_unused_flags[@]}; do
-			use ${myiuse} && ewarn "Ignoring USE=${myiuse} since USE=headless is set."
-		done
-	fi
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	chromium_suid_sandbox_check_kernel_config
-
-	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
-	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
-		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
-		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
-	fi
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# disable global media controls, crashes with libstdc++
-	sed -i -e \
-		"/\"GlobalMediaControlsCastStartStop\",/{n;s/ENABLED/DISABLED/;}" \
-		"chrome/browser/media/router/media_router_feature.cc" || die
-
-	local PATCHES=(
-		"${WORKDIR}/patches"
-		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-98-gtk4-build.patch"
-		"${FILESDIR}/chromium-108-EnumTable-crash.patch"
-		"${FILESDIR}/chromium-109-system-zlib.patch"
-		"${FILESDIR}/chromium-109-system-openh264.patch"
-		"${FILESDIR}/chromium-109-system-icu.patch"
-		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
-		"${FILESDIR}/chromium-shim_headers.patch"
-		"${FILESDIR}/chromium-cross-compile.patch"
-	)
-
-	if use ppc64 ; then
-		local p
-		for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series | grep "^ppc64le" || die); do
-			if [[ ! $p =~ "fix-breakpad-compile.patch" ]]; then
-				eapply "${WORKDIR}/debian/patches/${p}"
-			fi
-		done
-		PATCHES+=( "${WORKDIR}/ppc64le" )
-	fi
-
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	# adjust python interpreter version
-	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-	sed -i -e "s|vpython3|${EPYTHON}|g" testing/xvfb.py || die
-
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/double_conversion
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/volk
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/blink
-		third_party/bidimapper
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4-4.9.3
-		third_party/catapult/third_party/html5lib-1.1
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jpeg-js
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/content_analysis_sdk
-		third_party/cpuinfo
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/dawn
-		third_party/dawn/third_party/gn/webgpu-cts
-		third_party/dawn/third_party/khronos
-		third_party/depot_tools
-		third_party/devscripts
-		third_party/devtools-frontend
-		third_party/devtools-frontend/src/front_end/third_party/acorn
-		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
-		third_party/devtools-frontend/src/front_end/third_party/axe-core
-		third_party/devtools-frontend/src/front_end/third_party/chromium
-		third_party/devtools-frontend/src/front_end/third_party/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/diff
-		third_party/devtools-frontend/src/front_end/third_party/i18n
-		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		third_party/devtools-frontend/src/front_end/third_party/lit
-		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
-		third_party/devtools-frontend/src/front_end/third_party/marked
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
-		third_party/devtools-frontend/src/third_party
-		third_party/distributed_point_functions
-		third_party/dom_distiller_js
-		third_party/eigen3
-		third_party/emoji-segmenter
-		third_party/farmhash
-		third_party/fdlibm
-		third_party/fft2d
-		third_party/flatbuffers
-		third_party/fp16
-		third_party/freetype
-		third_party/fusejs
-		third_party/fxdiv
-		third_party/highway
-		third_party/liburlpattern
-		third_party/libzip
-		third_party/gemmlowp
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/ipcz
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libaddressinput
-		third_party/libavif
-		third_party/libevent
-		third_party/libgav1
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libudev
-		third_party/libva_protected_content
-		third_party/libvpx
-		third_party/libvpx/source/libvpx/third_party/x86inc
-		third_party/libwebm
-		third_party/libx11
-		third_party/libxcb-keysyms
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/llvm
-		third_party/lottie
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/mako
-		third_party/maldoca
-		third_party/maldoca/src/third_party/tensorflow_protos
-		third_party/maldoca/src/third_party/zlibwrapper
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/minigbm
-		third_party/modp_b64
-		third_party/nasm
-		third_party/nearby
-		third_party/neon_2_sse
-		third_party/node
-		third_party/omnibox_proto
-		third_party/one_euro_filter
-		third_party/openscreen
-		third_party/openscreen/src/third_party/mozilla
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg
-		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/skia_shared
-		third_party/perfetto
-		third_party/perfetto/protos/third_party/chromium
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/private-join-and-compute
-		third_party/private_membership
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/pthreadpool
-		third_party/pyjson5
-		third_party/pyyaml
-		third_party/qcms
-		third_party/rnnoise
-		third_party/s2cellid
-		third_party/securemessage
-		third_party/selenium-atoms
-		third_party/shell-encryption
-		third_party/simplejson
-		third_party/skia
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/snappy
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/astc-encoder
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/marl
-		third_party/swiftshader/third_party/subzero
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
-		third_party/swiftshader/third_party/SPIRV-Tools
-		third_party/tensorflow_models
-		third_party/tensorflow-text
-		third_party/tflite
-		third_party/tflite/src/third_party/eigen3
-		third_party/tflite/src/third_party/fft2d
-		third_party/ruy
-		third_party/six
-		third_party/ukey2
-		third_party/unrar
-		third_party/utf
-		third_party/vulkan
-		third_party/wayland
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webgpu-cts
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/ooura
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/wuffs
-		third_party/x11proto
-		third_party/xcbproto
-		third_party/xnnpack
-		third_party/zxcvbn-cpp
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		v8/src/third_party/valgrind
-		v8/src/third_party/utf8-decoder
-		v8/third_party/glibc
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if ! use system-png; then
-		keeplibs+=( third_party/libpng )
-	fi
-	if ! use system-av1; then
-		keeplibs+=(
-			third_party/dav1d
-			third_party/libaom
-			third_party/libaom/source/libaom/third_party/fastfeat
-			third_party/libaom/source/libaom/third_party/SVT-AV1
-			third_party/libaom/source/libaom/third_party/vector
-			third_party/libaom/source/libaom/third_party/x86inc
-		)
-	fi
-	if ! use system-harfbuzz; then
-		keeplibs+=( third_party/harfbuzz-ng )
-	fi
-	if use libcxx; then
-		keeplibs+=( third_party/re2 )
-	fi
-	if use arm64 || use ppc64 ; then
-		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
-	fi
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	# it has to be done before unbundling.
-	if use ppc64; then
-		pushd third_party/libvpx >/dev/null || die
-		mkdir -p source/config/linux/ppc64 || die
-		# requires git and clang, bug #832803
-		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g" \
-			generate_gni.sh || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-
-		pushd third_party/ffmpeg >/dev/null || die
-		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
-		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
-		popd >/dev/null || die
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-
-	if use js-type-check; then
-		ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
-	fi
-
-	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
-	mkdir -p buildtools/third_party/eu-strip/bin || die
-	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
-}
-
-chromium_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	if needs_clang && ! tc-is-clang; then
-		# Force clang since gcc is either broken or build is using libcxx.
-		if tc-is-cross-compiler; then
-			CC="${CBUILD}-clang -target ${CHOST} --sysroot ${ESYSROOT}"
-			CXX="${CBUILD}-clang++ -target ${CHOST} --sysroot ${ESYSROOT}"
-			BUILD_CC=${CBUILD}-clang
-			BUILD_CXX=${CBUILD}-clang++
-		else
-			CC=${CHOST}-clang
-			CXX=${CHOST}-clang++
-		fi
-		strip-unsupported-flags
-	fi
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Force lld for lto or pgo builds only, otherwise disable, bug 641556
-	if use lto || use pgo; then
-		myconf_gn+=" use_lld=true"
-	else
-		myconf_gn+=" use_lld=false"
-	fi
-
-	if use lto || use pgo; then
-		AR=llvm-ar
-		NM=llvm-nm
-		if tc-is-cross-compiler; then
-			BUILD_AR=llvm-ar
-			BUILD_NM=llvm-nm
-		fi
-	fi
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
-		myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
-
-		# setup cups-config, build system only uses --libs option
-		if use cups; then
-			mkdir "${T}/cups-config" || die
-			cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
-			export PATH="${PATH}:${T}/cups-config"
-		fi
-
-		# Don't inherit PKG_CONFIG_PATH from environment
-		local -x PKG_CONFIG_PATH=
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
-	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
-	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
-	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libwebp
-		libxml
-		libxslt
-		openh264
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-png; then
-		gn_system_libraries+=( libpng )
-	fi
-	if use system-av1; then
-		gn_system_libraries+=( dav1d libaom )
-	fi
-	# re2 library interface relies on std::string and std::vector
-	if ! use libcxx; then
-		gn_system_libraries+=( re2 )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
-
-	# Disable deprecated libgnome-keyring dependency, bug #713012
-	myconf_gn+=" use_gnome_keyring=false"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-
-	if use headless; then
-		myconf_gn+=" use_cups=false"
-		myconf_gn+=" use_kerberos=false"
-		myconf_gn+=" use_pulseaudio=false"
-		myconf_gn+=" use_vaapi=false"
-		myconf_gn+=" rtc_use_pipewire=false"
-	else
-		myconf_gn+=" use_cups=$(usex cups true false)"
-		myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
-		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
-		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
-	fi
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" disable_fieldtrial_testing_config=true"
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false"
-	myconf_gn+=" use_custom_libcxx=$(usex libcxx true false)"
-
-	# Disable pseudolocales, only used for testing
-	myconf_gn+=" enable_pseudolocales=false"
-
-	# Disable code formating of generated files
-	myconf_gn+=" blink_enable_generated_code_formatting=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info. The OAuth2 credentials, however, have been left out.
-	# Those OAuth2 credentials have been broken for quite some time anyway.
-	# Instead we apply a patch to use the --oauth2-client-id= and
-	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
-	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
-	# Chromium without baked-in values.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		if ! use component-build || use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a
-		fi
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-
-		# This is normally defined by compiler_cpu_abi in
-		# build/config/compiler/BUILD.gn, but we patch that part out.
-		append-flags -msse2 -mfpmath=sse -mmmx
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Disable external code space for V8 for ppc64. It is disabled for ppc64
-	# by default, but cross-compiling on amd64 enables it again.
-	if tc-is-cross-compiler; then
-		if ! use amd64 && ! use arm64; then
-			myconf_gn+=" v8_enable_external_code_space=false"
-		fi
-	fi
-
-	# Only enabled for clang, but gcc has endian macros too
-	myconf_gn+=" v8_use_libm_trig_functions=true"
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	#if ! use system-ffmpeg; then
-	if false; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	# Disable unknown warning message from clang.
-	if tc-is-clang; then
-		append-flags -Wno-unknown-warning-option
-		if tc-is-cross-compiler; then
-			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
-			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
-		fi
-	fi
-
-	# Explicitly disable ICU data file support for system-icu/headless builds.
-	if use system-icu || use headless; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Enable ozone wayland and/or headless support
-	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-	myconf_gn+=" ozone_platform_headless=true"
-	if use headless; then
-		myconf_gn+=" ozone_platform=\"headless\""
-		myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"
-		myconf_gn+=" use_glib=false use_gio=false"
-		myconf_gn+=" use_pangocairo=false use_alsa=false"
-		myconf_gn+=" use_libpci=false use_udev=false"
-		myconf_gn+=" enable_print_preview=false"
-		myconf_gn+=" enable_remoting=false"
-	else
-		myconf_gn+=" use_system_libdrm=true"
-		myconf_gn+=" use_system_minigbm=true"
-		myconf_gn+=" use_xkbcommon=true"
-		if use qt5; then
-			local moc_dir="$(qt5_get_bindir)"
-			if tc-is-cross-compiler; then
-				# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-				local cbuild_libdir=$($(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libxslt)
-				cbuild_libdir=${cbuild_libdir:2}
-				moc_dir="${EPREFIX}"/${cbuild_libdir/% }/qt5/bin
-			fi
-			export PATH="${PATH}:${moc_dir}"
-		fi
-		myconf_gn+=" use_qt=$(usex qt5 true false)"
-		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
-		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
-		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
-		use wayland && myconf_gn+=" use_system_libffi=true"
-	fi
-
-	# Results in undefined references in chrome linking, may require CFI to work
-	if use arm64; then
-		myconf_gn+=" arm_control_flow_integrity=\"none\""
-	fi
-
-	# Enable official builds
-	myconf_gn+=" is_official_build=$(usex official true false)"
-	myconf_gn+=" use_thin_lto=$(usex lto true false)"
-	myconf_gn+=" thin_lto_enable_optimizations=$(usex lto true false)"
-	if use official; then
-		# Allow building against system libraries in official builds
-		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-			tools/generate_shim_headers/generate_shim_headers.py || die
-		# Disable CFI: unsupported for GCC, requires clang+lto+lld
-		myconf_gn+=" is_cfi=false"
-		# Don't add symbols to build
-		myconf_gn+=" symbol_level=0"
-	fi
-
-	if use pgo; then
-		myconf_gn+=" chrome_pgo_phase=${1}"
-		if [[ "$1" == "2" ]]; then
-			myconf_gn+=" pgo_data_path=\"${2}\""
-		fi
-	else
-		# Disable PGO, because profile data is only compatible with >=clang-11
-		myconf_gn+=" chrome_pgo_phase=0"
-	fi
-
-	# user CXXFLAGS might overwrite -march=armv8-a+crc+crypto, bug #851639
-	if use arm64 && tc-is-gcc; then
-		sed -i '/^#if HAVE_ARM64_CRC32C/a #pragma GCC target ("+crc+crypto")' \
-			third_party/crc32c/src/src/crc32c_arm64.cc || die
-	fi
-
-	# skipping typecheck is only supported on amd64, bug #876157
-	if ! use amd64; then
-		myconf_gn+=" devtools_skip_typecheck=false"
-	fi
-
-	einfo "Configuring Chromium..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	chromium_configure $(usex pgo 1 0)
-}
-
-chromium_compile() {
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
-	local -x PYTHONPATH=
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-}
-
-# This function is called from virtx, and must always return so that Xvfb
-# session isn't left running. If we return 1, virtx will call die().
-chromium_profile() {
-	einfo "Profiling for PGO"
-
-	pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
-
-	# Remove old profdata in case profiling was interrupted.
-	rm -rf "${1}" || return 1
-
-	if ! "${EPYTHON}" ./chromium_profiler.py \
-		--chrome-executable "${S}/out/Release/chrome" \
-		--chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
-		--add-arg no-sandbox --add-arg disable-dev-shm-usage \
-		--profile-output "${1}"; then
-		eerror "Profiling failed"
-		return 1
-	fi
-
-	popd >/dev/null || return 1
-}
-
-src_compile() {
-	if use pgo; then
-		local profdata
-
-		profdata="${WORKDIR}/chromium.profdata"
-
-		if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
-			chromium_compile
-			virtx chromium_profile "$profdata"
-
-			touch "${WORKDIR}/.pgo-profiled" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
-			# Remove phase 1 output
-			rm -r out/Release || die
-
-			chromium_configure 2 "$profdata"
-
-			touch "${WORKDIR}/.pgo-phase-2-configured" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
-			chromium_compile
-			touch "${WORKDIR}/.pgo-phase-2-compiled" || die
-		fi
-	else
-		chromium_compile
-	fi
-
-	mv out/Release/chromedriver{.unstripped,} || die
-
-	rm -f out/Release/locales/*.pak.info || die
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-
-	# Build desktop file; bug #706786
-	sed -e 's|@@MENUNAME@@|Chromium|g;
-		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-		s|@@PACKAGE@@|chromium-browser|g;
-		s|\(^Exec=\)/usr/bin/|\1|g;' \
-		chrome/installer/linux/common/desktop.template > \
-		out/Release/chromium-browser-chromium.desktop || die
-
-	# Build vk_swiftshader_icd.json; bug #827861
-	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
-		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
-		out/Release/vk_swiftshader_icd.json || die
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-	doexe out/Release/chrome_crashpad_handler
-
-	ozone_auto_session () {
-		use X && use wayland && ! use headless && echo true || echo false
-	}
-	local sedargs=( -e
-			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	(
-		shopt -s nullglob
-		local files=(out/Release/*.so out/Release/*.so.[0-9])
-		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
-	)
-
-	if ! use system-icu && ! use headless; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/MEIPreload
-
-	# Install vk_swiftshader_icd.json; bug #827861
-	doins out/Release/vk_swiftshader_icd.json
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	# Install desktop entry
-	domenu out/Release/chromium-browser-chromium.desktop
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-
-	if ! use headless; then
-		if use vaapi; then
-			elog "VA-API is disabled by default at runtime. You have to enable it"
-			elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
-			elog "in /etc/chromium/default."
-		fi
-		if use screencast; then
-			elog "Screencast is disabled by default at runtime. Either enable it"
-			elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
-			elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-		if use gtk4; then
-			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
-			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-	fi
-}
diff --git a/www-client/chromium/chromium-111.0.5545.6.ebuild b/www-client/chromium/chromium-111.0.5545.6.ebuild
deleted file mode 100644
index ff2e0d3567e4..000000000000
--- a/www-client/chromium/chromium-111.0.5545.6.ebuild
+++ /dev/null
@@ -1,1235 +0,0 @@
-# Copyright 2009-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-LLVM_MAX_SLOT=15
-
-CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk ur vi zh-CN zh-TW"
-
-VIRTUALX_REQUIRED="pgo"
-
-inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils
-inherit python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://chromium.org/"
-PATCHSET="2"
-PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
-	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
-
-LICENSE="BSD"
-SLOT="0/dev"
-KEYWORDS="~amd64 ~arm64"
-IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
-REQUIRED_USE="
-	component-build? ( !suid !libcxx )
-	screencast? ( wayland )
-	!headless? ( || ( X wayland ) )
-	pgo? ( X !wayland )
-"
-
-COMMON_X_DEPEND="
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXtst:=
-	x11-libs/libxshmfence:=
-"
-
-COMMON_SNAPSHOT_DEPEND="
-	system-icu? ( >=dev-libs/icu-71.1:= )
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	!libcxx? ( >=dev-libs/re2-0.2019.08.01:= )
-	dev-libs/libxslt:=
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2.11.0-r1:=
-	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
-	media-libs/libjpeg-turbo:=
-	system-png? ( media-libs/libpng:=[-apng(-)] )
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/mesa:=[gbm(+)]
-	>=media-libs/openh264-1.6.0:=
-	system-av1? (
-		>=media-libs/dav1d-1.0.0:=
-		>=media-libs/libaom-3.4.0:=
-	)
-	sys-libs/zlib:=
-	x11-libs/libdrm:=
-	!headless? (
-		dev-libs/glib:2
-		>=media-libs/alsa-lib-1.0.19:=
-		pulseaudio? ( media-sound/pulseaudio:= )
-		sys-apps/pciutils:=
-		kerberos? ( virtual/krb5 )
-		vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] )
-		X? (
-			x11-libs/libX11:=
-			x11-libs/libXext:=
-			x11-libs/libxcb:=
-		)
-		x11-libs/libxkbcommon:=
-		wayland? (
-			dev-libs/libffi:=
-			screencast? ( media-video/pipewire:= )
-		)
-	)
-"
-
-COMMON_DEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	app-arch/bzip2:=
-	dev-libs/expat:=
-	system-ffmpeg? (
-		>=media-video/ffmpeg-4.3:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		>=media-libs/opus-1.3.1:=
-	)
-	net-misc/curl[ssl]
-	sys-apps/dbus:=
-	media-libs/flac:=
-	sys-libs/zlib:=[minizip]
-	!headless? (
-		X? ( ${COMMON_X_DEPEND} )
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		media-libs/mesa:=[X?,wayland?]
-		cups? ( >=net-print/cups-1.3.11:= )
-		virtual/udev
-		x11-libs/cairo:=
-		x11-libs/gdk-pixbuf:2
-		x11-libs/pango:=
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtwidgets:5
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!headless? (
-		|| (
-			x11-libs/gtk+:3[X?,wayland?]
-			gui-libs/gtk:4[X?,wayland?]
-		)
-		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
-	)
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-"
-DEPEND="${COMMON_DEPEND}
-	!headless? (
-		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
-		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
-	)
-"
-
-depend_clang_llvm_version() {
-	echo "sys-devel/clang:$1"
-	echo "sys-devel/llvm:$1"
-	echo "=sys-devel/lld-$1*"
-}
-
-depend_clang_llvm_versions() {
-	local _v
-	if [[ $# -gt 1 ]]; then
-		echo "|| ("
-		for _v in "$@"; do
-			echo "("
-			depend_clang_llvm_version "${_v}"
-			echo ")"
-		done
-		echo ")"
-	elif [[ $# -eq 1 ]]; then
-		depend_clang_llvm_version "$1"
-	fi
-}
-
-BDEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	>=app-arch/gzip-1.7
-	!headless? (
-		qt5? ( dev-qt/qtcore:5 )
-	)
-	libcxx? ( >=sys-devel/clang-13 )
-	lto? ( $(depend_clang_llvm_versions 13 14 15) )
-	pgo? (
-		>=dev-python/selenium-3.141.0
-		>=dev-util/web_page_replay_go-20220314
-		$(depend_clang_llvm_versions 13 14 15)
-	)
-	dev-lang/perl
-	>=dev-util/gn-0.1807
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	dev-vcs/git
-	>=net-libs/nodejs-7.6.0[inspector]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	js-type-check? ( virtual/jre )
-"
-
-# These are intended for ebuild maintainer use to force clang if GCC is broken.
-: ${CHROMIUM_FORCE_CLANG=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-13"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-needs_clang() {
-	[[ ${CHROMIUM_FORCE_CLANG} == yes ]] || use libcxx || use lto || use pgo
-}
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if ( use lto || use pgo ) && ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-		einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && ( use lto || use pgo ) && llvm_pkg_setup
-
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 10.4; then
-			die "At least gcc 10.4 is required"
-		fi
-		if use pgo && tc-is-cross-compiler; then
-			die "The pgo USE flag cannot be used when cross-compiling"
-		fi
-		if needs_clang || tc-is-clang; then
-			tc-is-cross-compiler && CPP=${CBUILD}-clang++ || CPP=${CHOST}-clang++
-			CPP+=" -E"
-			if ! ver_test "$(clang-major-version)" -ge 13; then
-				die "At least clang 13 is required"
-			fi
-		fi
-		if [[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && use js-type-check; then
-			"${BROOT}"/usr/bin/java -version 2>1 > /dev/null || die "Java VM not setup correctly"
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="4G"
-	CHECKREQS_DISK_BUILD="12G"
-	tc-is-cross-compiler && CHECKREQS_DISK_BUILD="14G"
-	if use lto || use pgo; then
-		CHECKREQS_MEMORY="9G"
-		CHECKREQS_DISK_BUILD="13G"
-		tc-is-cross-compiler && CHECKREQS_DISK_BUILD="16G"
-		use pgo && CHECKREQS_DISK_BUILD="20G"
-	fi
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		if use custom-cflags || use component-build; then
-			CHECKREQS_DISK_BUILD="25G"
-		fi
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
-	pre_build_checks
-
-	if use headless; then
-		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "vaapi" "wayland")
-		for myiuse in ${headless_unused_flags[@]}; do
-			use ${myiuse} && ewarn "Ignoring USE=${myiuse} since USE=headless is set."
-		done
-	fi
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	chromium_suid_sandbox_check_kernel_config
-
-	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
-	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
-		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
-		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
-	fi
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# disable global media controls, crashes with libstdc++
-	sed -i -e \
-		"/\"GlobalMediaControlsCastStartStop\",/{n;s/ENABLED/DISABLED/;}" \
-		"chrome/browser/media/router/media_router_feature.cc" || die
-
-	local PATCHES=(
-		"${WORKDIR}/patches"
-		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-98-gtk4-build.patch"
-		"${FILESDIR}/chromium-108-EnumTable-crash.patch"
-		"${FILESDIR}/chromium-109-system-zlib.patch"
-		"${FILESDIR}/chromium-109-system-openh264.patch"
-		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
-		"${FILESDIR}/chromium-cross-compile.patch"
-	)
-
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	# adjust python interpreter version
-	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-	sed -i -e "s|vpython3|${EPYTHON}|g" testing/xvfb.py || die
-
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/double_conversion
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/ceval
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/systeminfo
-		third_party/angle/src/third_party/volk
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/blink
-		third_party/bidimapper
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4-4.9.3
-		third_party/catapult/third_party/html5lib-1.1
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jpeg-js
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/content_analysis_sdk
-		third_party/cpuinfo
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/dawn
-		third_party/dawn/third_party/gn/webgpu-cts
-		third_party/dawn/third_party/khronos
-		third_party/depot_tools
-		third_party/devscripts
-		third_party/devtools-frontend
-		third_party/devtools-frontend/src/front_end/third_party/acorn
-		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
-		third_party/devtools-frontend/src/front_end/third_party/axe-core
-		third_party/devtools-frontend/src/front_end/third_party/chromium
-		third_party/devtools-frontend/src/front_end/third_party/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/diff
-		third_party/devtools-frontend/src/front_end/third_party/i18n
-		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		third_party/devtools-frontend/src/front_end/third_party/lit
-		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
-		third_party/devtools-frontend/src/front_end/third_party/marked
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
-		third_party/devtools-frontend/src/third_party
-		third_party/distributed_point_functions
-		third_party/dom_distiller_js
-		third_party/eigen3
-		third_party/emoji-segmenter
-		third_party/farmhash
-		third_party/fdlibm
-		third_party/fft2d
-		third_party/flatbuffers
-		third_party/fp16
-		third_party/freetype
-		third_party/fusejs
-		third_party/fxdiv
-		third_party/highway
-		third_party/liburlpattern
-		third_party/libzip
-		third_party/gemmlowp
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/ipcz
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libaddressinput
-		third_party/libavif
-		third_party/libevent
-		third_party/libgav1
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libudev
-		third_party/libva_protected_content
-		third_party/libvpx
-		third_party/libvpx/source/libvpx/third_party/x86inc
-		third_party/libwebm
-		third_party/libx11
-		third_party/libxcb-keysyms
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/llvm
-		third_party/lottie
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/mako
-		third_party/maldoca
-		third_party/maldoca/src/third_party/tensorflow_protos
-		third_party/maldoca/src/third_party/zlibwrapper
-		third_party/markupsafe
-		third_party/material_color_utilities
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/minigbm
-		third_party/modp_b64
-		third_party/nasm
-		third_party/nearby
-		third_party/neon_2_sse
-		third_party/node
-		third_party/omnibox_proto
-		third_party/one_euro_filter
-		third_party/openscreen
-		third_party/openscreen/src/third_party/mozilla
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg
-		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/skia_shared
-		third_party/perfetto
-		third_party/perfetto/protos/third_party/chromium
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/private-join-and-compute
-		third_party/private_membership
-		third_party/protobuf
-		third_party/pthreadpool
-		third_party/pyjson5
-		third_party/pyyaml
-		third_party/qcms
-		third_party/rnnoise
-		third_party/s2cellid
-		third_party/securemessage
-		third_party/selenium-atoms
-		third_party/shell-encryption
-		third_party/simplejson
-		third_party/skia
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/snappy
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/astc-encoder
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/marl
-		third_party/swiftshader/third_party/subzero
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
-		third_party/swiftshader/third_party/SPIRV-Tools
-		third_party/tensorflow_models
-		third_party/tensorflow-text
-		third_party/tflite
-		third_party/tflite/src/third_party/eigen3
-		third_party/tflite/src/third_party/fft2d
-		third_party/ruy
-		third_party/six
-		third_party/ukey2
-		third_party/unrar
-		third_party/utf
-		third_party/vulkan
-		third_party/wayland
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webgpu-cts
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/ooura
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/wuffs
-		third_party/x11proto
-		third_party/xcbproto
-		third_party/xnnpack
-		third_party/zxcvbn-cpp
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		v8/src/third_party/valgrind
-		v8/src/third_party/utf8-decoder
-		v8/third_party/glibc
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if ! use system-png; then
-		keeplibs+=( third_party/libpng )
-	fi
-	if ! use system-av1; then
-		keeplibs+=(
-			third_party/dav1d
-			third_party/libaom
-			third_party/libaom/source/libaom/third_party/fastfeat
-			third_party/libaom/source/libaom/third_party/SVT-AV1
-			third_party/libaom/source/libaom/third_party/vector
-			third_party/libaom/source/libaom/third_party/x86inc
-		)
-	fi
-	if ! use system-harfbuzz; then
-		keeplibs+=( third_party/harfbuzz-ng )
-	fi
-	if use libcxx; then
-		keeplibs+=( third_party/re2 )
-	fi
-	if use arm64 || use ppc64 ; then
-		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
-	fi
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	# it has to be done before unbundling.
-	if use ppc64; then
-		pushd third_party/libvpx >/dev/null || die
-		mkdir -p source/config/linux/ppc64 || die
-		# requires git and clang, bug #832803
-		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g" \
-			generate_gni.sh || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-
-		pushd third_party/ffmpeg >/dev/null || die
-		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
-		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
-		popd >/dev/null || die
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-
-	if use js-type-check; then
-		ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
-	fi
-
-	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
-	mkdir -p buildtools/third_party/eu-strip/bin || die
-	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
-}
-
-chromium_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	if needs_clang && ! tc-is-clang; then
-		# Force clang since gcc is either broken or build is using libcxx.
-		if tc-is-cross-compiler; then
-			CC="${CBUILD}-clang -target ${CHOST} --sysroot ${ESYSROOT}"
-			CXX="${CBUILD}-clang++ -target ${CHOST} --sysroot ${ESYSROOT}"
-			BUILD_CC=${CBUILD}-clang
-			BUILD_CXX=${CBUILD}-clang++
-		else
-			CC=${CHOST}-clang
-			CXX=${CHOST}-clang++
-		fi
-		strip-unsupported-flags
-	fi
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Force lld for lto or pgo builds only, otherwise disable, bug 641556
-	if use lto || use pgo; then
-		myconf_gn+=" use_lld=true"
-	else
-		myconf_gn+=" use_lld=false"
-	fi
-
-	if use lto || use pgo; then
-		AR=llvm-ar
-		NM=llvm-nm
-		if tc-is-cross-compiler; then
-			BUILD_AR=llvm-ar
-			BUILD_NM=llvm-nm
-		fi
-	fi
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
-		myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
-
-		# setup cups-config, build system only uses --libs option
-		if use cups; then
-			mkdir "${T}/cups-config" || die
-			cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
-			export PATH="${PATH}:${T}/cups-config"
-		fi
-
-		# Don't inherit PKG_CONFIG_PATH from environment
-		local -x PKG_CONFIG_PATH=
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# Create dummy pkg-config file for libsystemd, only dependency of installer
-	mkdir "${T}/libsystemd" || die
-	cat <<- EOF > "${T}/libsystemd/libsystemd.pc"
-		Name:
-		Description:
-		Version:
-	EOF
-	local -x PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+"${PKG_CONFIG_PATH}:"}${T}/libsystemd"
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
-	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
-	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
-	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libwebp
-		libxml
-		libxslt
-		openh264
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-png; then
-		gn_system_libraries+=( libpng )
-	fi
-	if use system-av1; then
-		gn_system_libraries+=( dav1d libaom )
-	fi
-	# re2 library interface relies on std::string and std::vector
-	if ! use libcxx; then
-		gn_system_libraries+=( re2 )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
-
-	# Disable deprecated libgnome-keyring dependency, bug #713012
-	myconf_gn+=" use_gnome_keyring=false"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-
-	if use headless; then
-		myconf_gn+=" use_cups=false"
-		myconf_gn+=" use_kerberos=false"
-		myconf_gn+=" use_pulseaudio=false"
-		myconf_gn+=" use_vaapi=false"
-		myconf_gn+=" rtc_use_pipewire=false"
-	else
-		myconf_gn+=" use_cups=$(usex cups true false)"
-		myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
-		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
-		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
-	fi
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" disable_fieldtrial_testing_config=true"
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false"
-	myconf_gn+=" use_custom_libcxx=$(usex libcxx true false)"
-
-	# Disable pseudolocales, only used for testing
-	myconf_gn+=" enable_pseudolocales=false"
-
-	# Disable code formating of generated files
-	myconf_gn+=" blink_enable_generated_code_formatting=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info. The OAuth2 credentials, however, have been left out.
-	# Those OAuth2 credentials have been broken for quite some time anyway.
-	# Instead we apply a patch to use the --oauth2-client-id= and
-	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
-	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
-	# Chromium without baked-in values.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		if ! use component-build || use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a
-		fi
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-
-		# This is normally defined by compiler_cpu_abi in
-		# build/config/compiler/BUILD.gn, but we patch that part out.
-		append-flags -msse2 -mfpmath=sse -mmmx
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Disable external code space for V8 for ppc64. It is disabled for ppc64
-	# by default, but cross-compiling on amd64 enables it again.
-	if tc-is-cross-compiler; then
-		if ! use amd64 && ! use arm64; then
-			myconf_gn+=" v8_enable_external_code_space=false"
-		fi
-	fi
-
-	# Only enabled for clang, but gcc has endian macros too
-	myconf_gn+=" v8_use_libm_trig_functions=true"
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	#if ! use system-ffmpeg; then
-	if false; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	# Disable unknown warning message from clang.
-	if tc-is-clang; then
-		append-flags -Wno-unknown-warning-option
-		if tc-is-cross-compiler; then
-			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
-			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
-		fi
-	fi
-
-	# Explicitly disable ICU data file support for system-icu/headless builds.
-	if use system-icu || use headless; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Enable ozone wayland and/or headless support
-	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-	myconf_gn+=" ozone_platform_headless=true"
-	if use headless; then
-		myconf_gn+=" ozone_platform=\"headless\""
-		myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"
-		myconf_gn+=" use_glib=false use_gio=false"
-		myconf_gn+=" use_pangocairo=false use_alsa=false"
-		myconf_gn+=" use_libpci=false use_udev=false"
-		myconf_gn+=" enable_print_preview=false"
-		myconf_gn+=" enable_remoting=false"
-	else
-		myconf_gn+=" use_system_libdrm=true"
-		myconf_gn+=" use_system_minigbm=true"
-		myconf_gn+=" use_xkbcommon=true"
-		if use qt5; then
-			local moc_dir="$(qt5_get_bindir)"
-			if tc-is-cross-compiler; then
-				# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-				local cbuild_libdir=$($(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libxslt)
-				cbuild_libdir=${cbuild_libdir:2}
-				moc_dir="${EPREFIX}"/${cbuild_libdir/% }/qt5/bin
-			fi
-			export PATH="${PATH}:${moc_dir}"
-		fi
-		myconf_gn+=" use_qt=$(usex qt5 true false)"
-		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
-		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
-		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
-		use wayland && myconf_gn+=" use_system_libffi=true"
-	fi
-
-	# Results in undefined references in chrome linking, may require CFI to work
-	if use arm64; then
-		myconf_gn+=" arm_control_flow_integrity=\"none\""
-	fi
-
-	# Enable official builds
-	myconf_gn+=" is_official_build=$(usex official true false)"
-	myconf_gn+=" use_thin_lto=$(usex lto true false)"
-	myconf_gn+=" thin_lto_enable_optimizations=$(usex lto true false)"
-	if use official; then
-		# Allow building against system libraries in official builds
-		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-			tools/generate_shim_headers/generate_shim_headers.py || die
-		# Disable CFI: unsupported for GCC, requires clang+lto+lld
-		myconf_gn+=" is_cfi=false"
-		# Don't add symbols to build
-		myconf_gn+=" symbol_level=0"
-	fi
-
-	if use pgo; then
-		myconf_gn+=" chrome_pgo_phase=${1}"
-		if [[ "$1" == "2" ]]; then
-			myconf_gn+=" pgo_data_path=\"${2}\""
-		fi
-	else
-		# Disable PGO, because profile data is only compatible with >=clang-11
-		myconf_gn+=" chrome_pgo_phase=0"
-	fi
-
-	# user CXXFLAGS might overwrite -march=armv8-a+crc+crypto, bug #851639
-	if use arm64 && tc-is-gcc; then
-		sed -i '/^#if HAVE_ARM64_CRC32C/a #pragma GCC target ("+crc+crypto")' \
-			third_party/crc32c/src/src/crc32c_arm64.cc || die
-	fi
-
-	# skipping typecheck is only supported on amd64, bug #876157
-	if ! use amd64; then
-		myconf_gn+=" devtools_skip_typecheck=false"
-	fi
-
-	einfo "Configuring Chromium..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	chromium_configure $(usex pgo 1 0)
-}
-
-chromium_compile() {
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
-	local -x PYTHONPATH=
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-}
-
-# This function is called from virtx, and must always return so that Xvfb
-# session isn't left running. If we return 1, virtx will call die().
-chromium_profile() {
-	einfo "Profiling for PGO"
-
-	pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
-
-	# Remove old profdata in case profiling was interrupted.
-	rm -rf "${1}" || return 1
-
-	if ! "${EPYTHON}" ./chromium_profiler.py \
-		--chrome-executable "${S}/out/Release/chrome" \
-		--chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
-		--add-arg no-sandbox --add-arg disable-dev-shm-usage \
-		--profile-output "${1}"; then
-		eerror "Profiling failed"
-		return 1
-	fi
-
-	popd >/dev/null || return 1
-}
-
-src_compile() {
-	if use pgo; then
-		local profdata
-
-		profdata="${WORKDIR}/chromium.profdata"
-
-		if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
-			chromium_compile
-			virtx chromium_profile "$profdata"
-
-			touch "${WORKDIR}/.pgo-profiled" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
-			# Remove phase 1 output
-			rm -r out/Release || die
-
-			chromium_configure 2 "$profdata"
-
-			touch "${WORKDIR}/.pgo-phase-2-configured" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
-			chromium_compile
-			touch "${WORKDIR}/.pgo-phase-2-compiled" || die
-		fi
-	else
-		chromium_compile
-	fi
-
-	mv out/Release/chromedriver{.unstripped,} || die
-
-	rm -f out/Release/locales/*.pak.info || die
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-
-	# Build desktop file; bug #706786
-	sed -e 's|@@MENUNAME@@|Chromium|g;
-		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-		s|@@PACKAGE@@|chromium-browser|g;
-		s|\(^Exec=\)/usr/bin/|\1|g;' \
-		chrome/installer/linux/common/desktop.template > \
-		out/Release/chromium-browser-chromium.desktop || die
-
-	# Build vk_swiftshader_icd.json; bug #827861
-	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
-		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
-		out/Release/vk_swiftshader_icd.json || die
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-	doexe out/Release/chrome_crashpad_handler
-
-	ozone_auto_session () {
-		use X && use wayland && ! use headless && echo true || echo false
-	}
-	local sedargs=( -e
-			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	(
-		shopt -s nullglob
-		local files=(out/Release/*.so out/Release/*.so.[0-9])
-		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
-	)
-
-	# Install bundled xdg-utils, avoids installing X11 libraries with USE="-X wayland"
-	doins out/Release/xdg-{settings,mime}
-
-	if ! use system-icu && ! use headless; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/MEIPreload
-
-	# Install vk_swiftshader_icd.json; bug #827861
-	doins out/Release/vk_swiftshader_icd.json
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	# Install desktop entry
-	domenu out/Release/chromium-browser-chromium.desktop
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-
-	if ! use headless; then
-		if use vaapi; then
-			elog "VA-API is disabled by default at runtime. You have to enable it"
-			elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
-			elog "in /etc/chromium/default."
-		fi
-		if use screencast; then
-			elog "Screencast is disabled by default at runtime. Either enable it"
-			elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
-			elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-		if use gtk4; then
-			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
-			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-	fi
-}
diff --git a/www-client/chromium/chromium-110.0.5481.177-r1.ebuild b/www-client/chromium/chromium-111.0.5563.110.ebuild
index 99452165df2b..d41b4c6b4d15 100644
--- a/www-client/chromium/chromium-110.0.5481.177-r1.ebuild
+++ b/www-client/chromium/chromium-111.0.5563.110.ebuild
@@ -17,10 +17,10 @@ inherit python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg-
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
-PATCHSET="4"
+PATCHSET="2"
 PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
 PATCHSET_URI_PPC64="https://quickbuild.io/~raptor-engineering-public"
-PATCHSET_NAME_PPC64="chromium_110.0.5481.77-1raptor0~deb11u1.debian"
+PATCHSET_NAME_PPC64="chromium_111.0.5563.64-1raptor0~deb11u1.debian"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
 	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
 	ppc64? (
@@ -32,7 +32,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0/stable"
 KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
+IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless kerberos libcxx lto +official pax-kernel pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
 REQUIRED_USE="
 	component-build? ( !suid !libcxx )
 	screencast? ( wayland )
@@ -131,7 +131,6 @@ RDEPEND="${COMMON_DEPEND}
 			gui-libs/gtk:4[X?,wayland?]
 		)
 		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
-		x11-misc/xdg-utils
 	)
 	virtual/ttf-fonts
 	selinux? ( sec-policy/selinux-chromium )
@@ -175,11 +174,11 @@ BDEPEND="
 		qt5? ( dev-qt/qtcore:5 )
 	)
 	libcxx? ( >=sys-devel/clang-13 )
-	lto? ( $(depend_clang_llvm_versions 13 14 15) )
+	lto? ( $(depend_clang_llvm_versions 14 15) )
 	pgo? (
 		>=dev-python/selenium-3.141.0
 		>=dev-util/web_page_replay_go-20220314
-		$(depend_clang_llvm_versions 13 14 15)
+		$(depend_clang_llvm_versions 14 15)
 	)
 	dev-lang/perl
 	>=dev-util/gn-0.1807
@@ -190,7 +189,6 @@ BDEPEND="
 	>=sys-devel/bison-2.4.3
 	sys-devel/flex
 	virtual/pkgconfig
-	js-type-check? ( virtual/jre )
 "
 
 # These are intended for ebuild maintainer use to force clang if GCC is broken.
@@ -256,32 +254,6 @@ llvm_check_deps() {
 }
 
 pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && ( use lto || use pgo ) && llvm_pkg_setup
-
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 10.4; then
-			die "At least gcc 10.4 is required"
-		fi
-		if use pgo && tc-is-cross-compiler; then
-			die "The pgo USE flag cannot be used when cross-compiling"
-		fi
-		if needs_clang || tc-is-clang; then
-			tc-is-cross-compiler && CPP=${CBUILD}-clang++ || CPP=${CHOST}-clang++
-			CPP+=" -E"
-			if ! ver_test "$(clang-major-version)" -ge 13; then
-				die "At least clang 13 is required"
-			fi
-			# bug #889374
-			if ! use libcxx; then
-				die "Builds using clang fail with USE=-libcxx"
-			fi
-		fi
-		if [[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && use js-type-check; then
-			"${BROOT}"/usr/bin/java -version 2>1 > /dev/null || die "Java VM not setup correctly"
-		fi
-	fi
-
 	# Check build requirements, bug #541816 and bug #471810 .
 	CHECKREQS_MEMORY="4G"
 	CHECKREQS_DISK_BUILD="12G"
@@ -315,8 +287,32 @@ pkg_pretend() {
 }
 
 pkg_setup() {
+	if use lto || use pgo; then
+		llvm_pkg_setup
+	fi
+
 	pre_build_checks
 
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 10.4; then
+			die "At least gcc 10.4 is required"
+		fi
+		if use pgo && tc-is-cross-compiler; then
+			die "The pgo USE flag cannot be used when cross-compiling"
+		fi
+		if needs_clang && ! tc-is-clang; then
+			if tc-is-cross-compiler; then
+				CPP="${CBUILD}-clang++ -E"
+			else
+				CPP="${CHOST}-clang++ -E"
+			fi
+			if ! ver_test "$(clang-major-version)" -ge 13; then
+				die "At least clang 13 is required"
+			fi
+		fi
+	fi
+
 	chromium_suid_sandbox_check_kernel_config
 
 	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
@@ -335,16 +331,18 @@ src_prepare() {
 		"/\"GlobalMediaControlsCastStartStop\",/{n;s/ENABLED/DISABLED/;}" \
 		"chrome/browser/media/router/media_router_feature.cc" || die
 
+	rm "${WORKDIR}"/patches/chromium-110-dpf-arm64.patch || die
+	rm "${WORKDIR}"/patches/chromium-111-v8-std-layout1.patch || die
+	rm "${WORKDIR}"/patches/chromium-111-v8-std-layout2.patch || die
+
 	local PATCHES=(
 		"${WORKDIR}/patches"
-		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
 		"${FILESDIR}/chromium-98-gtk4-build.patch"
 		"${FILESDIR}/chromium-108-EnumTable-crash.patch"
 		"${FILESDIR}/chromium-109-system-zlib.patch"
 		"${FILESDIR}/chromium-109-system-openh264.patch"
-		"${FILESDIR}/chromium-109-system-icu.patch"
+		"${FILESDIR}/chromium-111-ozone-platform.patch"
 		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
-		"${FILESDIR}/chromium-shim_headers.patch"
 		"${FILESDIR}/chromium-cross-compile.patch"
 	)
 
@@ -389,7 +387,9 @@ src_prepare() {
 		third_party/abseil-cpp
 		third_party/angle
 		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/ceval
 		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/systeminfo
 		third_party/angle/src/third_party/volk
 		third_party/apple_apsl
 		third_party/axe-core
@@ -444,6 +444,7 @@ src_prepare() {
 		third_party/devtools-frontend/src/front_end/third_party/marked
 		third_party/devtools-frontend/src/front_end/third_party/puppeteer
 		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt
+		third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data
 		third_party/devtools-frontend/src/front_end/third_party/wasmparser
 		third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
 		third_party/devtools-frontend/src/third_party
@@ -503,6 +504,7 @@ src_prepare() {
 		third_party/maldoca/src/third_party/tensorflow_protos
 		third_party/maldoca/src/third_party/zlibwrapper
 		third_party/markupsafe
+		third_party/material_color_utilities
 		third_party/mesa
 		third_party/metrics_proto
 		third_party/minigbm
@@ -534,7 +536,6 @@ src_prepare() {
 		third_party/private-join-and-compute
 		third_party/private_membership
 		third_party/protobuf
-		third_party/protobuf/third_party/six
 		third_party/pthreadpool
 		third_party/pyjson5
 		third_party/pyyaml
@@ -650,10 +651,6 @@ src_prepare() {
 	# Remove most bundled libraries. Some are still needed.
 	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
 
-	if use js-type-check; then
-		ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
-	fi
-
 	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
 	mkdir -p buildtools/third_party/eu-strip/bin || die
 	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
@@ -727,6 +724,15 @@ chromium_configure() {
 		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
 	fi
 
+	# Create dummy pkg-config file for libsystemd, only dependency of installer
+	mkdir "${T}/libsystemd" || die
+	cat <<- EOF > "${T}/libsystemd/libsystemd.pc"
+		Name:
+		Description:
+		Version:
+	EOF
+	local -x PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+"${PKG_CONFIG_PATH}:"}${T}/libsystemd"
+
 	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
 	myconf_gn+=" is_debug=false"
 
@@ -788,7 +794,7 @@ chromium_configure() {
 	myconf_gn+=" use_gnome_keyring=false"
 
 	# Optional dependencies.
-	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
+	myconf_gn+=" enable_js_type_check=false"
 	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
 	myconf_gn+=" enable_widevine=$(usex widevine true false)"
 
@@ -1030,16 +1036,18 @@ chromium_compile() {
 	local -x PYTHONPATH=
 
 	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
+	if use pax-kernel; then
+		local x
+		for x in mksnapshot v8_context_snapshot_generator; do
+			if tc-is-cross-compiler; then
+				eninja -C out/Release "host/${x}"
+				pax-mark m "out/Release/host/${x}"
+			else
+				eninja -C out/Release "${x}"
+				pax-mark m "out/Release/${x}"
+			fi
+		done
+	fi
 
 	# Even though ninja autodetects number of CPUs, we respect
 	# user's options, for debugging with -j 1 or any other reason.
@@ -1173,6 +1181,9 @@ src_install() {
 		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
 	)
 
+	# Install bundled xdg-utils, avoids installing X11 libraries with USE="-X wayland"
+	doins out/Release/xdg-{settings,mime}
+
 	if ! use system-icu && ! use headless; then
 		doins out/Release/icudtl.dat
 	fi
diff --git a/www-client/chromium/files/chromium-109-system-icu.patch b/www-client/chromium/files/chromium-109-system-icu.patch
deleted file mode 100644
index ea1be01d9270..000000000000
--- a/www-client/chromium/files/chromium-109-system-icu.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 4885090741554be61cb2ed10194cefb29bf8be64 Mon Sep 17 00:00:00 2001
-From: Yoshisato Yanagisawa <yyanagisawa@chromium.org>
-Date: Wed, 11 Jan 2023 23:51:39 +0000
-Subject: [PATCH] Fix the way to handle codecs in the system icu.
-
-The previous code does not register codecs whose standard name is
-different from the bundled ICU.  As a result, looking up such codecs
-seems to fail unexpectedly.
-
-Bug: 1382032
-Change-Id: I8a61f77d0f70104415d24dd954b3b7061ffca556
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4154277
-Reviewed-by: Kent Tamura <tkent@chromium.org>
-Commit-Queue: Yoshisato Yanagisawa <yyanagisawa@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1091571}
----
-
-diff --git a/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc b/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
-index a70b359..33ce43f 100644
---- a/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
-+++ b/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
-@@ -116,6 +116,10 @@
-       continue;
-     }
- #endif
-+    // Avoid codecs supported by `TextCodecCJK`.
-+    if (is_text_codec_cjk_enabled && TextCodecCJK::IsSupported(standard_name)) {
-+      continue;
-+    }
- 
- // A number of these aliases are handled in Chrome's copy of ICU, but
- // Chromium can be compiled with the system ICU.
-@@ -144,12 +148,13 @@
-     }
- #endif
- 
--    if (is_text_codec_cjk_enabled && TextCodecCJK::IsSupported(standard_name)) {
--      continue;
-+    // Avoid registering codecs registered by
-+    // `TextCodecCJK::RegisterEncodingNames`.
-+    if (!is_text_codec_cjk_enabled ||
-+        !TextCodecCJK::IsSupported(standard_name)) {
-+      registrar(standard_name, standard_name);
-     }
- 
--    registrar(standard_name, standard_name);
--
-     uint16_t num_aliases = ucnv_countAliases(name, &error);
-     DCHECK(U_SUCCESS(error));
-     if (U_SUCCESS(error))
-@@ -289,6 +294,7 @@
-       continue;
-     }
- #endif
-+    // Avoid codecs supported by `TextCodecCJK`.
-     if (is_text_codec_cjk_enabled && TextCodecCJK::IsSupported(standard_name)) {
-       continue;
-     }
diff --git a/www-client/chromium/files/chromium-109-v8-icu72.patch b/www-client/chromium/files/chromium-109-v8-icu72.patch
deleted file mode 100644
index 1de11c8cd1d6..000000000000
--- a/www-client/chromium/files/chromium-109-v8-icu72.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 2ada52cffbff11074abfaac18938bf02d85454f5 Mon Sep 17 00:00:00 2001
-From: Frank Tang <ftang@chromium.org>
-Date: Wed, 16 Nov 2022 09:18:45 -0800
-Subject: [PATCH] [intl] Enhance Date parser to take Unicode SPACE
-
-This is needed to prepare for the landing of ICU72.
-Allow U+202F in the Date String, which the toLocaleString("en-US")
-will generate w/ ICU72.
-
-Bug: v8:13494
-Change-Id: I41b83c4094ce3d0737a72dcd6310b52c68fdcdca
-Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4027341
-Reviewed-by: Yang Guo <yangguo@chromium.org>
-Reviewed-by: Jungshik Shin <jshin@chromium.org>
-Commit-Queue: Frank Tang <ftang@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#84308}
----
-
-diff --git a/src/date/dateparser-inl.h b/src/date/dateparser-inl.h
-index 623986d..b45479d 100644
---- a/v8/src/date/dateparser-inl.h
-+++ b/v8/src/date/dateparser-inl.h
-@@ -192,7 +192,7 @@
-   if (in_->Skip('+')) return DateToken::Symbol('+');
-   if (in_->Skip('.')) return DateToken::Symbol('.');
-   if (in_->Skip(')')) return DateToken::Symbol(')');
--  if (in_->IsAsciiAlphaOrAbove()) {
-+  if (in_->IsAsciiAlphaOrAbove() && !in_->IsWhiteSpaceChar()) {
-     DCHECK_EQ(KeywordTable::kPrefixLength, 3);
-     uint32_t buffer[3] = {0, 0, 0};
-     int length = in_->ReadWord(buffer, 3);
-diff --git a/src/date/dateparser.h b/src/date/dateparser.h
-index 1a0a0b1..59b2f3c 100644
---- a/v8/src/date/dateparser.h
-+++ b/v8/src/date/dateparser.h
-@@ -91,7 +91,8 @@
-     // Return word length.
-     int ReadWord(uint32_t* prefix, int prefix_size) {
-       int len;
--      for (len = 0; IsAsciiAlphaOrAbove(); Next(), len++) {
-+      for (len = 0; IsAsciiAlphaOrAbove() && !IsWhiteSpaceChar();
-+           Next(), len++) {
-         if (len < prefix_size) prefix[len] = AsciiAlphaToLower(ch_);
-       }
-       for (int i = len; i < prefix_size; i++) prefix[i] = 0;
-@@ -115,6 +116,7 @@
-     bool IsEnd() const { return ch_ == 0; }
-     bool IsAsciiDigit() const { return IsDecimalDigit(ch_); }
-     bool IsAsciiAlphaOrAbove() const { return ch_ >= 'A'; }
-+    bool IsWhiteSpaceChar() const { return IsWhiteSpace(ch_); }
-     bool IsAsciiSign() const { return ch_ == '+' || ch_ == '-'; }
- 
-     // Return 1 for '+' and -1 for '-'.
-diff --git a/test/intl/regress-13494.js b/test/intl/regress-13494.js
-new file mode 100644
-index 0000000..d1446af
---- /dev/null
-+++ b/v8/test/intl/regress-13494.js
-@@ -0,0 +1,47 @@
-+// Copyright 2022 the V8 project authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+// Test the new Date( date.toLocaleString("en-US")) is not invalid.
-+// This is not guaranteed by the standard but many code use that to set the
-+// timezone as suggested in
-+// https://stackoverflow.com/questions/15141762/how-to-initialize-a-javascript-date-to-a-particular-time-zone
-+
-+let d = new Date();
-+
-+// https://tc39.es/ecma262/#sec-todatestring
-+// 21.4.4.41.4 ToDateString ( tv )
-+// 1. If tv is NaN, return "Invalid Date".
-+let invalid = "Invalid Date";
-+let largestDiff = 25*60*60*1000;
-+
-+let garbage = new Date("garbage");
-+assertTrue(invalid == garbage);
-+assertEquals(NaN, garbage.getTime());
-+
-+let d1 = new Date(d.toLocaleString("en-US"));
-+assertTrue(d1 != invalid);
-+assertTrue(d1.getTime() != NaN);
-+// The milliseconds are different between d1 and d.
-+assertTrue(Math.abs(d1-d) < 1000);
-+
-+// Force a version of date string which have  U+202f before AM
-+let nnbsp_am = new Date("11/16/2022, 9:04:55\u202fAM");
-+assertTrue(nnbsp_am  != invalid);
-+assertTrue(nnbsp_am.getTime() != NaN);
-+// Force a version of date string which have  U+202f before PM
-+let nnbsp_pm = new Date("11/16/2022, 9:04:55\u202fPM");
-+assertTrue(nnbsp_pm  != invalid);
-+assertTrue(nnbsp_pm.getTime() != NaN);
-+
-+let d2 = new Date(d.toLocaleString("en-US", {timeZone: "Asia/Taipei"}));
-+assertTrue(d2 != invalid);
-+assertTrue(d2.getTime() != NaN);
-+// The differences should be within 25 hours.
-+assertTrue(Math.abs(d2-d) < largestDiff);
-+
-+let d3 = new Date(d.toLocaleString("en-US", {timeZone: "Africa/Lusaka"}));
-+assertTrue(d3 != invalid);
-+assertTrue(d3.getTime() != NaN);
-+// The differences should be within 25 hours.
-+assertTrue(Math.abs(d3-d) < largestDiff);
diff --git a/www-client/chromium/files/chromium-93-InkDropHost-crash.patch b/www-client/chromium/files/chromium-93-InkDropHost-crash.patch
deleted file mode 100644
index 54d16db56cc2..000000000000
--- a/www-client/chromium/files/chromium-93-InkDropHost-crash.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/ui/views/animation/ink_drop_host_view.h b/ui/views/animation/ink_drop_host_view.h
-index bd0975b..e5df288 100644
---- a/ui/views/animation/ink_drop_host_view.h
-+++ b/ui/views/animation/ink_drop_host_view.h
-@@ -238,6 +238,11 @@ class VIEWS_EXPORT InkDropHost {
-   // Used to observe View and inform the InkDrop of host-transform changes.
-   ViewLayerTransformObserver host_view_transform_observer_;
- 
-+  // Declared before |ink_drop_|, because InkDropImpl may call
-+  // RemoveInkDropLayer on partly destructed InkDropHost. In
-+  // that case |ink_drop_mask_| must be still valid.
-+  std::unique_ptr<views::InkDropMask> ink_drop_mask_;
-+
-   // Should not be accessed directly. Use GetInkDrop() instead.
-   std::unique_ptr<InkDrop> ink_drop_;
- 
-@@ -261,8 +266,6 @@ class VIEWS_EXPORT InkDropHost {
-   int ink_drop_small_corner_radius_ = 2;
-   int ink_drop_large_corner_radius_ = 4;
- 
--  std::unique_ptr<views::InkDropMask> ink_drop_mask_;
--
-   base::RepeatingCallback<std::unique_ptr<InkDrop>()> create_ink_drop_callback_;
-   base::RepeatingCallback<std::unique_ptr<InkDropRipple>()>
-       create_ink_drop_ripple_callback_;
diff --git a/www-client/chromium/files/chromium-shim_headers.patch b/www-client/chromium/files/chromium-shim_headers.patch
deleted file mode 100644
index 9372632a3cc5..000000000000
--- a/www-client/chromium/files/chromium-shim_headers.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From e273172bbafedca36984fc40f4aa6c44b79ac2ef Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Fri, 25 Dec 2020 09:10:32 +0000
-Subject: [PATCH] shim_headers: fix outputs generation
-
----
- build/shim_headers.gni | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/build/shim_headers.gni b/build/shim_headers.gni
-index 0900cba..5138647 100644
---- a/build/shim_headers.gni
-+++ b/build/shim_headers.gni
-@@ -6,6 +6,8 @@ template("shim_headers") {
-   action_name = "gen_${target_name}"
-   config_name = "${target_name}_config"
-   shim_headers_path = "${root_gen_dir}/shim_headers/${target_name}"
-+  shim_root_path    = rebase_path(invoker.root_path)
-+  shim_rel_path     = rebase_path("${shim_root_path}", rebase_path("//"))
- 
-   config(config_name) {
-     include_dirs = [ shim_headers_path ]
-@@ -16,7 +18,7 @@ template("shim_headers") {
-     args = [
-       "--generate",
-       "--headers-root",
--      rebase_path(invoker.root_path),
-+      "${shim_root_path}",
-       "--output-directory",
-       rebase_path(shim_headers_path),
-     ]
-@@ -27,9 +29,10 @@ template("shim_headers") {
-       ]
-     }
-     args += invoker.headers
--
--    outputs = process_file_template(invoker.headers,
--                                    "${shim_headers_path}/{{source_file_part}}")
-+    outputs = []
-+    foreach(shim_header, invoker.headers) {
-+      outputs += [ "${shim_headers_path}/${shim_rel_path}/" + shim_header ]
-+    }
-   }
- 
-   group(target_name) {
--- 
-2.26.2
-
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index 405120c15e3e..fef22ca7b2ca 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Chromium in Gentoo Project</name>
 	</maintainer>
 	<use>
-		<flag name="js-type-check">Enable JavaScript type-checking for Chrome's web technology-based UI. Requires Java.</flag>
 		<flag name="component-build">Split build into more shared libraries to speed up linking. Mostly intended for debugging and development, NOT RECOMMENDED for general use.</flag>
 		<flag name="debug">Enable DCHECK feature with severity configurable at runtime. Mostly intended for debugging and development, NOT RECOMMENDED for general use.</flag>
 		<flag name="gtk4">Build with GTK4 headers.</flag>
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 6c05b9f0c78a..d75e8c079261 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_112.0.5615.29-1_amd64.deb 93846352 BLAKE2B a67ca59ddb3bd3a7880bc715c7dad37142325daf9de536e94936630ee5630e506de7e66765074d4e9cec61e27b05e71bc53f891e26365b7a8735cbd56762ad7a SHA512 4530cfe42a476b5e59104de405835e983087253dcc5c71b7b48142d9323a412b89c0046360e58a97cb8d3796e186c35e76f97e285f4a8026d05c348eb80d6bde
-EBUILD google-chrome-beta-112.0.5615.29.ebuild 2872 BLAKE2B 9643117a41620cd3c953e32c14ce636e6ee81fdfd7112704020af97e843cc09df30115d8612be664cc2db4d890ead759ebd83ebe7c85f948a1234b76047eb7ad SHA512 9299a45facde8b860825af0c020d0f1b69a54b4db393aac444437870fbbae920a69599e23ba1b332383b01b1ef8e9a1aee70cc08dcf7323df15d76bb66579005
+DIST google-chrome-beta_112.0.5615.39-1_amd64.deb 93733500 BLAKE2B a924e350e4192ee6cf0eed0d179b64489ef695745886d1f35337522189f1a52431c33575f56c8afac48f4c453151dedd6cba45bcd90ed51ccc6f3443d2193ad1 SHA512 74971024dd56aa120bc9c0ab0bc31884021d69c20225eb634ab48349117d113215fd4ee530049494fa531145fdf1f305eaf014321c72ad8dfa7f217d942bd907
+EBUILD google-chrome-beta-112.0.5615.39.ebuild 2872 BLAKE2B 9643117a41620cd3c953e32c14ce636e6ee81fdfd7112704020af97e843cc09df30115d8612be664cc2db4d890ead759ebd83ebe7c85f948a1234b76047eb7ad SHA512 9299a45facde8b860825af0c020d0f1b69a54b4db393aac444437870fbbae920a69599e23ba1b332383b01b1ef8e9a1aee70cc08dcf7323df15d76bb66579005
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-beta/google-chrome-beta-112.0.5615.29.ebuild b/www-client/google-chrome-beta/google-chrome-beta-112.0.5615.39.ebuild
index 0989c02308b9..0989c02308b9 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-112.0.5615.29.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-112.0.5615.39.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 5763ed94a856..04b915462535 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_113.0.5653.0-1_amd64.deb 94724264 BLAKE2B 958c079f7dfd119c6b19f0c6aae97e6c777feaf037c05a85438e45482f4587e3dc0cec3349d119c272bf305817a4510b4555c5448acc1eab68d6ed236d8e31e7 SHA512 a7c31449338d6c5d3c6ae7fa087e088f5cc67ff814c0f4ab99253d5c2b23d63e4d86b8ef29d74093492693f640e6ccc1b44bcc2b57f2a65d062fdc6a4654ac39
-EBUILD google-chrome-unstable-113.0.5653.0.ebuild 2872 BLAKE2B 9643117a41620cd3c953e32c14ce636e6ee81fdfd7112704020af97e843cc09df30115d8612be664cc2db4d890ead759ebd83ebe7c85f948a1234b76047eb7ad SHA512 9299a45facde8b860825af0c020d0f1b69a54b4db393aac444437870fbbae920a69599e23ba1b332383b01b1ef8e9a1aee70cc08dcf7323df15d76bb66579005
+DIST google-chrome-unstable_113.0.5668.0-1_amd64.deb 94358992 BLAKE2B 5c46ce6bf842f3df9b8cf7463272e5695d76f64cf45a81581289fa25eba0ab69b2425638825c87cbb201281f2efca6909b00291add32c05038146e6c5f2989b9 SHA512 2bdb1ea801585190c61c205bcb90572da2a13a9712a9437b5b9af48326b6b53f6d4352fbbb82f1cfa7de8b4aa75d5490a752057f5c3d769ac1c1e92f637bca25
+EBUILD google-chrome-unstable-113.0.5668.0.ebuild 2872 BLAKE2B 9643117a41620cd3c953e32c14ce636e6ee81fdfd7112704020af97e843cc09df30115d8612be664cc2db4d890ead759ebd83ebe7c85f948a1234b76047eb7ad SHA512 9299a45facde8b860825af0c020d0f1b69a54b4db393aac444437870fbbae920a69599e23ba1b332383b01b1ef8e9a1aee70cc08dcf7323df15d76bb66579005
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-113.0.5653.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-113.0.5668.0.ebuild
index 0989c02308b9..0989c02308b9 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-113.0.5653.0.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-113.0.5668.0.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 51cf685bc7ea..7401a82d15d1 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_111.0.5563.110-1_amd64.deb 93863468 BLAKE2B 30d5f369ab2b63b23debb8c512564ee394dae958c3fd2474262ca0ad187304d324950e81e6d8220db283659c22b67cb88394c7ddf7fb9f0c9bcc7cd742f2bd1a SHA512 241d5de4508f9ad77bca704c9458fd241e2aee3339eac0fc95ab0e9d2953a332969dc688427dbfdc55a223fe4605f0a205ca59795dcac9a0a8e23b4811879078
-EBUILD google-chrome-111.0.5563.110.ebuild 2871 BLAKE2B d33eb944632227ca2807d300b1e606fc4bd3e3943b6b0dbc8a0a67e01cc153f81aed8bf2622e6d4289eca3d1f17d9c70a76de09dc87936238c50808c04b787d1 SHA512 5aa0d3739495372ce9b7b5cdf3b6de2befe7953f2e6b982a8e09b809fa1a6f768820676c36bbe08a39ab753439bf382dd779bcb25a6e3ed1231cb6c8ef0eac38
+DIST google-chrome-stable_111.0.5563.146-1_amd64.deb 93863956 BLAKE2B 4be4be2e38942fb616dd8db7285dd67abe12582c78f1ec9ae3b699e9e76e26cfbb45b0e9b779459aacba9215d3ed5237b33864779bbf592af83e9dea53d84970 SHA512 6e2255cf028c68d14527e70e41ca79e7d41cfd0ddc4df860a5df2206371c2bce84de014fd54dd2d2e4812fa106368e34922032d1155e98bab1c1993a9aa96c0d
+EBUILD google-chrome-111.0.5563.146.ebuild 2871 BLAKE2B d33eb944632227ca2807d300b1e606fc4bd3e3943b6b0dbc8a0a67e01cc153f81aed8bf2622e6d4289eca3d1f17d9c70a76de09dc87936238c50808c04b787d1 SHA512 5aa0d3739495372ce9b7b5cdf3b6de2befe7953f2e6b982a8e09b809fa1a6f768820676c36bbe08a39ab753439bf382dd779bcb25a6e3ed1231cb6c8ef0eac38
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome/google-chrome-111.0.5563.110.ebuild b/www-client/google-chrome/google-chrome-111.0.5563.146.ebuild
index e467ec7ecdbf..e467ec7ecdbf 100644
--- a/www-client/google-chrome/google-chrome-111.0.5563.110.ebuild
+++ b/www-client/google-chrome/google-chrome-111.0.5563.146.ebuild
diff --git a/www-client/microsoft-edge-beta/Manifest b/www-client/microsoft-edge-beta/Manifest
index 07c7188ed9ac..d798dcee2bc6 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-beta_111.0.1661.41-1_amd64.deb 140250902 BLAKE2B 8ad0b70705b582b6210ae0c59d102f4f51b1d6e112ced3c5c9589f376c37dbba2ae71343e257b566bbab395c6248c20a8ce63e29820f2b64afeb741cdcb2d614 SHA512 84ddad529c5bc3546a0a2a65204d0d73fc020c648c638619caa0277f62fd2b283fd28e4d0b21bf40028a662d6b4f549ec5235d23e80d43c6ce111f8960ec7fb3
 DIST microsoft-edge-beta_111.0.1661.43-1_amd64.deb 140270234 BLAKE2B 7f0b6e0f9a5d6aed442dae12ef64b2cf2131892d93fe61cf94c5a6ccb669dde60e9d17d3a781c42504ee1d93d46cb1f55d831e26a5c18321639899a828983de3 SHA512 ef56443235e52233144f05bcd6c514f5d7e345e80803a9386fabaff20678af65eb3f289547ee07df888c94fc51d5de066172bccb9c9a9755896912bc538f63e7
 DIST microsoft-edge-beta_112.0.1722.11-1_amd64.deb 141195930 BLAKE2B 26899977e7630e943bd631cd85f70da33d4485750197fc87d63f4a58acf5f927ceb2b5c2966d5eac34636421f36724c8464b47893d8e94feeeb271dc3efd4da7 SHA512 c904cbc2ea1a070eff51bd5ad9f05f497b951a2205ecf9a7a1a8f1fdfb783e1dac035a5627d913562aa340e212c88eeb0dcb0962360a78c84793dc2803f3dc5e
-EBUILD microsoft-edge-beta-111.0.1661.41.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
+DIST microsoft-edge-beta_112.0.1722.15-1_amd64.deb 141159202 BLAKE2B 1284a21bc9239a90931c9e30599e28b83fd423008082cdb3d5f17531bcb7aef02145f36a00101823bbb25b63de7f194d04353856bc13e2689d8505eb2b155a27 SHA512 ba8d0e3fa98af8929d96eb28ab3c693f22c181b7edb1b0bb699d2b2377f7a01d2819c4091657d536c72d12e6eed6cb984a5ec3bde62c54842d5926572be77241
 EBUILD microsoft-edge-beta-111.0.1661.43.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
 EBUILD microsoft-edge-beta-112.0.1722.11.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
+EBUILD microsoft-edge-beta-112.0.1722.15.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-111.0.1661.41.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-112.0.1722.15.ebuild
index ebc23fabaa28..ebc23fabaa28 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-111.0.1661.41.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-112.0.1722.15.ebuild
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index a103c0380e89..10e754a1dc0a 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-dev_112.0.1702.3-1_amd64.deb 140951746 BLAKE2B adb5e8e48c6f507f274975383b71ab3660ede24b5f7394b03ac984ffa893784a648f525e42d82648f83d030453635839c89d2f1e35b242313c9a641e65714aa3 SHA512 683eeb4034c7fb67bd6390661b16340048ffade4b1ee10d6904af543300a10412ab8a78aea8bddc05c171c1708ed8d096873908dd1b5a2db2e96bf8bdacff658
 DIST microsoft-edge-dev_112.0.1722.7-1_amd64.deb 141180218 BLAKE2B 07d41e0989ad4e76b902f8b5e5fb49a73a7b3e4a3cd63f4c0cb4012641feadb517338b1a9f31a80b70861cf1dea7618b9d672b7692b45fdf667254af40f12889 SHA512 6299dcb907d9d9595009513946a644e0efbaf6895d2c292d85a65c7c327ca77e2ae6d98d03ad2d066673f565e2a288a80ded84d2a7c868a72aafc95dd3819d0a
 DIST microsoft-edge-dev_113.0.1741.1-1_amd64.deb 143864670 BLAKE2B 673cbc4ec1406fe25a435d0dbabd3bcd804a9b6f3b23a21536616df52da328aeca594b885d5b067d9be156f3965228d69d55d516eba93b783b1788d26e6672ab SHA512 7f1d35ced0978208cee0b26cb911f671e0b88f95cdb97d03ef8eb93fb527f7a99ce4f99b4dfc78b22d4964c8585912ab82af8c5abad6fabcca967db31f193e50
-EBUILD microsoft-edge-dev-112.0.1702.3.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
+DIST microsoft-edge-dev_113.0.1754.0-1_amd64.deb 144562006 BLAKE2B 39b11557a1c7cbec416c828d94b414d872bc42a96c7a2f299269b110d72598140757b8d049f4c7d75f6a645ef9a71cb8f7655fda40773a997eb5a8259c56bd67 SHA512 795dd6fb689c6eda31809ad731e397d93bf9e42c12ad592211a9e9a346a2a25659d2979c8e5f71094b28e9b60d38b0fb190c735a16a9d39f23294dd685f3c797
 EBUILD microsoft-edge-dev-112.0.1722.7.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
 EBUILD microsoft-edge-dev-113.0.1741.1.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
+EBUILD microsoft-edge-dev-113.0.1754.0.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-112.0.1702.3.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-113.0.1754.0.ebuild
index ebc23fabaa28..ebc23fabaa28 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-112.0.1702.3.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-113.0.1754.0.ebuild
diff --git a/www-client/microsoft-edge/Manifest b/www-client/microsoft-edge/Manifest
index d47a9924ede2..03c6a9de2772 100644
--- a/www-client/microsoft-edge/Manifest
+++ b/www-client/microsoft-edge/Manifest
@@ -1,3 +1,3 @@
-DIST microsoft-edge-stable_111.0.1661.44-1_amd64.deb 140209546 BLAKE2B f5f9dc141337cda0a9b54542362726a98e63754ab3856c7b8ee95c7b79f651e961da170a7fb5c7ef7cfdada48a92d56dd68f6cdff99ea9679d266da76ee7ece7 SHA512 5ea473be32fd9b1a9604bb3a4c2d56b73b8f2badd817ce1fe19b21210154a701834752f228673af3569c92d9dd6d28fab1991db485775edbb77fe3719474f767
-EBUILD microsoft-edge-111.0.1661.44.ebuild 2609 BLAKE2B 90b177b603961701034cce74e7157913a700d5d0e3c656cb920a4dfcd8bcdea12f4233a7e18d5ed5fc8e07eafa559328c8ffbd6f3a601462f6ae2e668484130d SHA512 4ae9b77a6442058170f4b72ed5b953559617a2baa6449497879b9742367dc465b15cf2a4202cee7d073d1a459faa8d984084559f14bcc52a1354929e3047ae49
+DIST microsoft-edge-stable_111.0.1661.54-1_amd64.deb 140303794 BLAKE2B f266cc539f22c433eeb7eac488d2407d38c765eff2d35d37b682f5cb5cf664fbe4a552aa342452b53f89f1f2c62395d8ad8eaefaa5b7a737d3db7645e689e8ee SHA512 0204805a55825d59d5526c9db60f3e3a387255d0769bfb1ce41abb031bf8adc91e50883a22af44eb16db00a439a947a94e41480dd637bc9bcb251e655c2f6bc5
+EBUILD microsoft-edge-111.0.1661.54.ebuild 2609 BLAKE2B 90b177b603961701034cce74e7157913a700d5d0e3c656cb920a4dfcd8bcdea12f4233a7e18d5ed5fc8e07eafa559328c8ffbd6f3a601462f6ae2e668484130d SHA512 4ae9b77a6442058170f4b72ed5b953559617a2baa6449497879b9742367dc465b15cf2a4202cee7d073d1a459faa8d984084559f14bcc52a1354929e3047ae49
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge/microsoft-edge-111.0.1661.44.ebuild b/www-client/microsoft-edge/microsoft-edge-111.0.1661.54.ebuild
index 40e3af0e1470..40e3af0e1470 100644
--- a/www-client/microsoft-edge/microsoft-edge-111.0.1661.44.ebuild
+++ b/www-client/microsoft-edge/microsoft-edge-111.0.1661.54.ebuild
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index d020261a9a21..5a99bce6175d 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 1df371eb34cf..1cdbfcdaf17f 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_112.0.5615.29-1_amd64.deb 93846352 BLAKE2B a67ca59ddb3bd3a7880bc715c7dad37142325daf9de536e94936630ee5630e506de7e66765074d4e9cec61e27b05e71bc53f891e26365b7a8735cbd56762ad7a SHA512 4530cfe42a476b5e59104de405835e983087253dcc5c71b7b48142d9323a412b89c0046360e58a97cb8d3796e186c35e76f97e285f4a8026d05c348eb80d6bde
-DIST google-chrome-stable_111.0.5563.110-1_amd64.deb 93863468 BLAKE2B 30d5f369ab2b63b23debb8c512564ee394dae958c3fd2474262ca0ad187304d324950e81e6d8220db283659c22b67cb88394c7ddf7fb9f0c9bcc7cd742f2bd1a SHA512 241d5de4508f9ad77bca704c9458fd241e2aee3339eac0fc95ab0e9d2953a332969dc688427dbfdc55a223fe4605f0a205ca59795dcac9a0a8e23b4811879078
-DIST google-chrome-unstable_113.0.5653.0-1_amd64.deb 94724264 BLAKE2B 958c079f7dfd119c6b19f0c6aae97e6c777feaf037c05a85438e45482f4587e3dc0cec3349d119c272bf305817a4510b4555c5448acc1eab68d6ed236d8e31e7 SHA512 a7c31449338d6c5d3c6ae7fa087e088f5cc67ff814c0f4ab99253d5c2b23d63e4d86b8ef29d74093492693f640e6ccc1b44bcc2b57f2a65d062fdc6a4654ac39
-EBUILD chrome-binary-plugins-111.0.5563.110.ebuild 1178 BLAKE2B 4144d89038f8f70136a77d57c3b14e83ed1be4674ab11104bbf41d822fd28325d207b4d8a7543eff856aa943dc11e3a9185683e704640ef626a0c61652e91d84 SHA512 fd6ea3e0a93e2e848c2e4dd23618c37a2b656c6c05f31fc28440888196e02226fdd272887abddf4a6b78d46befc3aa13b81c7df499d693accc04a1d771a4bca3
-EBUILD chrome-binary-plugins-112.0.5615.29_beta.ebuild 1179 BLAKE2B 22b12632b6411257f42e355b4cfd59ec1432b3b52e386d23c5254bbfbf02d34500982549db4d5eb145def8b2a4265d359b1e466e0b3fbb5d5bad31b9c2618212 SHA512 a6ccf2da3030d77c2aab71edbeebf62af1d91b3fe9f805d255902491f17ab62062e3fe389af865716edcbdb559b64632452ca698e126bab949b885309f8a48f1
-EBUILD chrome-binary-plugins-113.0.5653.0_alpha.ebuild 1179 BLAKE2B 22b12632b6411257f42e355b4cfd59ec1432b3b52e386d23c5254bbfbf02d34500982549db4d5eb145def8b2a4265d359b1e466e0b3fbb5d5bad31b9c2618212 SHA512 a6ccf2da3030d77c2aab71edbeebf62af1d91b3fe9f805d255902491f17ab62062e3fe389af865716edcbdb559b64632452ca698e126bab949b885309f8a48f1
+DIST google-chrome-beta_112.0.5615.39-1_amd64.deb 93733500 BLAKE2B a924e350e4192ee6cf0eed0d179b64489ef695745886d1f35337522189f1a52431c33575f56c8afac48f4c453151dedd6cba45bcd90ed51ccc6f3443d2193ad1 SHA512 74971024dd56aa120bc9c0ab0bc31884021d69c20225eb634ab48349117d113215fd4ee530049494fa531145fdf1f305eaf014321c72ad8dfa7f217d942bd907
+DIST google-chrome-stable_111.0.5563.146-1_amd64.deb 93863956 BLAKE2B 4be4be2e38942fb616dd8db7285dd67abe12582c78f1ec9ae3b699e9e76e26cfbb45b0e9b779459aacba9215d3ed5237b33864779bbf592af83e9dea53d84970 SHA512 6e2255cf028c68d14527e70e41ca79e7d41cfd0ddc4df860a5df2206371c2bce84de014fd54dd2d2e4812fa106368e34922032d1155e98bab1c1993a9aa96c0d
+DIST google-chrome-unstable_113.0.5668.0-1_amd64.deb 94358992 BLAKE2B 5c46ce6bf842f3df9b8cf7463272e5695d76f64cf45a81581289fa25eba0ab69b2425638825c87cbb201281f2efca6909b00291add32c05038146e6c5f2989b9 SHA512 2bdb1ea801585190c61c205bcb90572da2a13a9712a9437b5b9af48326b6b53f6d4352fbbb82f1cfa7de8b4aa75d5490a752057f5c3d769ac1c1e92f637bca25
+EBUILD chrome-binary-plugins-111.0.5563.146.ebuild 1178 BLAKE2B 4144d89038f8f70136a77d57c3b14e83ed1be4674ab11104bbf41d822fd28325d207b4d8a7543eff856aa943dc11e3a9185683e704640ef626a0c61652e91d84 SHA512 fd6ea3e0a93e2e848c2e4dd23618c37a2b656c6c05f31fc28440888196e02226fdd272887abddf4a6b78d46befc3aa13b81c7df499d693accc04a1d771a4bca3
+EBUILD chrome-binary-plugins-112.0.5615.39_beta.ebuild 1179 BLAKE2B 22b12632b6411257f42e355b4cfd59ec1432b3b52e386d23c5254bbfbf02d34500982549db4d5eb145def8b2a4265d359b1e466e0b3fbb5d5bad31b9c2618212 SHA512 a6ccf2da3030d77c2aab71edbeebf62af1d91b3fe9f805d255902491f17ab62062e3fe389af865716edcbdb559b64632452ca698e126bab949b885309f8a48f1
+EBUILD chrome-binary-plugins-113.0.5668.0_alpha.ebuild 1179 BLAKE2B 22b12632b6411257f42e355b4cfd59ec1432b3b52e386d23c5254bbfbf02d34500982549db4d5eb145def8b2a4265d359b1e466e0b3fbb5d5bad31b9c2618212 SHA512 a6ccf2da3030d77c2aab71edbeebf62af1d91b3fe9f805d255902491f17ab62062e3fe389af865716edcbdb559b64632452ca698e126bab949b885309f8a48f1
 MISC metadata.xml 263 BLAKE2B 63f20710af1b20f01824544c06058c4bef7c4b6e1b66a2bcd17c2dde8f48e6b30a074ec6c3940976d652bb8885a80495914a3ddf4de5766c04f5913780c85668 SHA512 85a03d35084d8d81e038c8065fe58a36f3dd1f5355aaf62033ba590636fa4855ee993ec5f3d10645a55754debddf0b57b4403172f3808e4575b3b2d8d7f180c0
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-111.0.5563.110.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-111.0.5563.146.ebuild
index d94dd5bfe69b..d94dd5bfe69b 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-111.0.5563.110.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-111.0.5563.146.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-112.0.5615.29_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-112.0.5615.39_beta.ebuild
index 238a410c5c55..238a410c5c55 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-112.0.5615.29_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-112.0.5615.39_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-113.0.5653.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-113.0.5668.0_alpha.ebuild
index 238a410c5c55..238a410c5c55 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-113.0.5653.0_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-113.0.5668.0_alpha.ebuild
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index f25e3ced2e87..c9f82486d55d 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libcryptui/Manifest b/x11-libs/libcryptui/Manifest
deleted file mode 100644
index dc5e7ff572ad..000000000000
--- a/x11-libs/libcryptui/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX libcryptui-3.12.2-fix-return-types.patch 1049 BLAKE2B 6bba9b2e80acac3226b78d52dda0223bf2067a7541519dcc789a35c5d45d787cbdb989b925441ce741d681427e68a88b968e045529a6444a82c23ad59e693b7c SHA512 2c29a7213d620be54f00f8b753b429c3f87f3986f8b024274b0c8758b7207e05591820abb7f896f441b3097d3cb24baabadc7542c536a6db2d1d1c71df28de5d
-AUX libcryptui-3.12.2-gnupg-2.1.patch 702 BLAKE2B 99b0b054ab4c0901deaca2f59ae622679cdcedd4d6171b9f3b3bf167669ff6db2dbde61d7e984023cf0995778285d0d3d97eab5f753b08cc39dac1eb332e615f SHA512 9207081483604b115ec6ca5dd920b6396e2ad3c00ad41e1f354f10e43d144ce110431b34a895baa9ea22702aa22210eee3ba83e78083216d720d43ec0e4cdc7e
-AUX libcryptui-3.12.2-gnupg-2.2.patch 708 BLAKE2B 29f7a7b19f9267c1aa43835b5992543558a3ae0be251a48212cc07a7daca6d4e3d0b37bbc73c93b09d653e9be99c33e6d36f5641351c23da5385b83b94485864 SHA512 7acf4770f9382e574822bf54defa48e817f40459a50fd5fd2b6794d61ef82329bbe1bfe013fb3ce0880bfc3f97d556c103e3685ead86772fd04e0119f70bc103
-AUX libcryptui-3.12.2-gnupg-2.3.patch 676 BLAKE2B fa00d44c06c063f81cbc4136247e85862306efc5b8225cd65f4cc7c8a3461e878f033efcc6a9e3c7a63fe73d385c738f6f660d0775e449ba8d17c94450439e5e SHA512 f87c45d7ecd9a35d440f8e840542bb60d56b8848a2a4a1e5bf97425a6b7d46c77b0c971273ef2310b3dfea877026ee147fa915d390bb1b62b65fc571f2d1b704
-AUX libcryptui-3.12.2-port-gcr-3.patch 4932 BLAKE2B f711e6f0c6c8dec3c84d47e2ecc931dfaff197529028ffdca1ff8bec3d4e3ac75b2feda56de3ed9f0a78fe17ee2918e2d888ac863cd40f746b185f4b1ee7590b SHA512 3ffa45e6a2636bb4e6933082c92b83a2eedee927ad6a7d214df1bdb1b4c5ca41ca22c0c06469f3a6fe1c81e94888a3a5adca56e6354a00bebdc68faaa009e4c6
-AUX libcryptui-3.12.2-prompt-recipient.patch 1447 BLAKE2B b36b71220a48540ff2a4dc2ac2de2368ab9a4ea2f12721ec84d3f4459e3e8cf348fb1d51318064e40137aab2f424c881bd3f17d25ae988c0e95826cd87c52393 SHA512 4e38c0f2e813bf0ab76f2205045a3b5240d0ccb9701de8c7a73adc4edc3540ff49eff6fcd5bb011c9e91984c9b82eab8a6bef32d099501895eaf9d6187874c43
-DIST libcryptui-3.12.2.tar.xz 1163784 BLAKE2B 4a13f5dbe4229673da293115dd0d57added87f0522d6ed41d3072780e738b64bfee7c1b9af5872e9877ae22117492a5e3e1b119d4842536c2e762870fe8de85e SHA512 50ef407f0a9fe2ac8f4ab075e125fe8eabc55160b9b96a852d34e52c46be04e04b2a7c8288d2669e24865a89dc179af6bb0da8f6799e8b07fff7bc667c8eb1f0
-EBUILD libcryptui-3.12.2-r2.ebuild 1920 BLAKE2B 30bbdc274f761d7ac3c76f9b24af4285afbaaecc2c990f0ebe2649102a8169b6f2b300a5ccb62d3fa8109c812bdb385777f1a65291611eadac9f3ed839d45b46 SHA512 b326adad392092dd4c1e2b182ccb9a854c62bd0c3a7dcb0fa5ffcdd89c10a84f985540462449d563ededb649ca887ca4bbebe2c4795b7719c8096633819944a3
-MISC metadata.xml 351 BLAKE2B 017b5d88dd76f4a1dc9af426e77a65454bd77a2f1acf1b4d4f596419a43320d669010ef984f1efc977cbc6146346869a930bf79c8dca2483b50ec6d639b55426 SHA512 334daf51e145670d9ffb5d8c1645a2312ded9cf0953dec27d3f17d8f42856a6056d4d4d8bd0d26117e3ac69e56afd8b882ea9844af83467cc405248a32d6ba90
diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-fix-return-types.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-fix-return-types.patch
deleted file mode 100644
index d3fdf3c408d0..000000000000
--- a/x11-libs/libcryptui/files/libcryptui-3.12.2-fix-return-types.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a576e407d913b35804f838d615da52899681d61d Mon Sep 17 00:00:00 2001
-From: Andreas Henriksson <andreas@fatal.se>
-Date: Mon, 15 Aug 2016 18:12:06 +0200
-Subject: [PATCH 2/3] daemon: fix conflicting return types
-
-... in functions seahorse_dbus_server_{init,cleanup}
-
-Reported-by: Michael Tautschnig <mt@debian.org>
-Bug-Debian: https://bugs.debian.org/749001
-
-https://bugzilla.gnome.org/show_bug.cgi?id=769943
----
- daemon/seahorse-daemon.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/daemon/seahorse-daemon.h b/daemon/seahorse-daemon.h
-index 93c0c452..09716bb5 100644
---- a/daemon/seahorse-daemon.h
-+++ b/daemon/seahorse-daemon.h
-@@ -24,9 +24,9 @@
- /* seahorse-dbus-server.c --------------------------------------------------- */
- 
- 
--gboolean            seahorse_dbus_server_init ();
-+void                seahorse_dbus_server_init ();
- 
--gboolean            seahorse_dbus_server_cleanup ();
-+void                seahorse_dbus_server_cleanup ();
- 
- DBusGConnection*    seahorse_dbus_server_get_connection ();
- 
--- 
-2.14.1
-
diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.1.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.1.patch
deleted file mode 100644
index d968dd367a11..000000000000
--- a/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 183d7619c29482a5d4ae8019692899f87f198171 Mon Sep 17 00:00:00 2001
-From: Antoine Jacoutot <ajacoutot@gnome.org>
-Date: Sat, 17 Oct 2015 08:52:35 +0200
-Subject: [PATCH] Allow building with gnupg 2.1.
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 406b9f3f..b621b236 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -95,7 +95,7 @@ AC_ARG_ENABLE(gpg-check,
- 	DO_CHECK=$enableval, DO_CHECK=yes)
- 
- if test	"$DO_CHECK" = "yes"; then
--	accepted_versions="1.2 1.4 2.0"
-+	accepted_versions="1.2 1.4 2.0 2.1"
- 	AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
- 	AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
- 	ok="no"
--- 
-2.14.1
-
diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.2.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.2.patch
deleted file mode 100644
index 4feaf2b18265..000000000000
--- a/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 98afc46861678162aad8cae1c4c01dc4d6780bef Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 2 Sep 2017 17:48:44 +0200
-Subject: [PATCH] Allow building with gnupg 2.2
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4486e7b2..be5b28b4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -95,7 +95,7 @@ AC_ARG_ENABLE(gpg-check,
- 	DO_CHECK=$enableval, DO_CHECK=yes)
- 
- if test	"$DO_CHECK" = "yes"; then
--	accepted_versions="1.2 1.4 2.0 2.1"
-+	accepted_versions="1.2 1.4 2.0 2.1 2.2"
- 	AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
- 	AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
- 	ok="no"
--- 
-2.14.1
-
diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.3.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.3.patch
deleted file mode 100644
index 5582b02fb552..000000000000
--- a/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://gitlab.gnome.org/GNOME/libcryptui/-/merge_requests/1
-https://bugs.gentoo.org/820143
-
-From fa3b8fd3b55768e0e02b30948c29a9504d02522e Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar@opensuse.org>
-Date: Tue, 31 Aug 2021 13:46:10 +0000
-Subject: [PATCH]  Accept GnuPG 2.3.x as supported version
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -95,7 +95,7 @@ AC_ARG_ENABLE(gpg-check,
- 	DO_CHECK=$enableval, DO_CHECK=yes)
- 
- if test	"$DO_CHECK" = "yes"; then
--	accepted_versions="1.2 1.4 2.0 2.1 2.2"
-+	accepted_versions="1.2 1.4 2.0 2.1 2.2 2.3"
- 	AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
- 	AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
- 	ok="no"
-GitLab
diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-port-gcr-3.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-port-gcr-3.patch
deleted file mode 100644
index 5ca31f664136..000000000000
--- a/x11-libs/libcryptui/files/libcryptui-3.12.2-port-gcr-3.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From 728aceb6defd4e6e4f07fa49ca76f5e745230fee Mon Sep 17 00:00:00 2001
-From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-Date: Fri, 16 Sep 2016 11:46:55 +0200
-Subject: [PATCH 3/3] daemon: port to gcr-3
-
-This removes the dependency on libgnome-keyring and adds a dependency
-on libgcr instead.
-
-Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-Signed-off-by: Stef Walter <stefw@redhat.com>
- * Updated commit message
-
-https://bugzilla.gnome.org/show_bug.cgi?id=771522
----
- configure.ac                    | 14 +++++++-------
- daemon/seahorse-secure-buffer.c |  7 ++++---
- daemon/seahorse-secure-memory.c | 21 +++++++++++----------
- 3 files changed, 22 insertions(+), 20 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index b621b236..4486e7b2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -252,18 +252,18 @@ if test "$enable_fatal_messages" = "yes" && test "$enable_debug" = "yes"; then
- fi
- 
- dnl ****************************************************************************
--dnl GNOME-KEYRING
-+dnl GCR
- dnl ****************************************************************************
- 
--PKG_CHECK_MODULES([GNOME_KEYRING], gnome-keyring-1 >= 2.25.5,
--                  [enable_gnome_keyring=yes],[enable_gnome_keyring=no])
-+PKG_CHECK_MODULES([GCR], gcr-3,
-+                  [enable_gcr=yes],[enable_gcr=no])
- 
--if test "$enable_gnome_keyring" = "no"; then
--	AC_MSG_ERROR([gnome-keyring library or headers not found.])
-+if test "$enable_gcr" = "no"; then
-+	AC_MSG_ERROR([gcr library or headers not found.])
- fi
- 
--SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GNOME_KEYRING_CFLAGS"
--SEAHORSE_LIBS="$SEAHORSE_LIBS $GNOME_KEYRING_LIBS"
-+SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GCR_CFLAGS"
-+SEAHORSE_LIBS="$SEAHORSE_LIBS $GCR_LIBS"
- 
- dnl ****************************************************************************
- dnl LIBCRYPTUI
-diff --git a/daemon/seahorse-secure-buffer.c b/daemon/seahorse-secure-buffer.c
-index 0db87961..63f87cd3 100644
---- a/daemon/seahorse-secure-buffer.c
-+++ b/daemon/seahorse-secure-buffer.c
-@@ -20,7 +20,8 @@
- #include "config.h"
- 
- #include "seahorse-secure-buffer.h"
--#include <gnome-keyring-memory.h>
-+#define GCR_API_SUBJECT_TO_CHANGE 1
-+#include <gcr/gcr.h>
- 
- #include <string.h>
- 
-@@ -92,7 +93,7 @@ seahorse_secure_buffer_real_insert_text (GtkEntryBuffer *buffer, guint position,
- 			}
- 		}
- 
--		pv->text = gnome_keyring_memory_realloc (pv->text, pv->text_size);
-+		pv->text = gcr_secure_memory_realloc (pv->text, pv->text_size);
- 	}
- 
- 	/* Actual text insertion */
-@@ -158,7 +159,7 @@ seahorse_secure_buffer_finalize (GObject *obj)
- 	SeahorseSecureBufferPrivate *pv = self->priv;
- 
- 	if (pv->text) {
--		gnome_keyring_memory_free (pv->text);
-+		gcr_secure_memory_free (pv->text);
- 		pv->text = NULL;
- 		pv->text_bytes = pv->text_size = 0;
- 		pv->text_chars = 0;
-diff --git a/daemon/seahorse-secure-memory.c b/daemon/seahorse-secure-memory.c
-index 3d94a674..f201d1df 100644
---- a/daemon/seahorse-secure-memory.c
-+++ b/daemon/seahorse-secure-memory.c
-@@ -23,7 +23,8 @@
-   
- #include <glib.h>
-   
--#include <gnome-keyring-memory.h>
-+#define GCR_API_SUBJECT_TO_CHANGE 1
-+#include <gcr/gcr.h>
-   
- #include "seahorse-secure-memory.h"
-   
-@@ -47,7 +48,7 @@ switch_malloc (gsize size)
-     if (size == 0)
-         return NULL;
-     if (seahorse_use_secure_mem)
--        p = gnome_keyring_memory_try_alloc (size);
-+        p = gcr_secure_memory_try_alloc (size);
-     else
-         p = malloc (size);
-     return p;
-@@ -71,7 +72,7 @@ switch_calloc (gsize num, gsize size)
-     if (size == 0 || num == 0)
-         return NULL;
-     if (seahorse_use_secure_mem)
--        p = gnome_keyring_memory_try_alloc (size * num);
-+        p = gcr_secure_memory_try_alloc (size * num);
-     else
-         p = calloc (num, size);
-     return p;
-@@ -99,11 +100,11 @@ switch_realloc (gpointer mem, gsize size)
- 
-     if (!mem) {
-         if (seahorse_use_secure_mem)
--            p = gnome_keyring_memory_alloc (size);
-+            p = gcr_secure_memory_alloc (size);
-         else
-             p = malloc (size);
--    } else if (gnome_keyring_memory_is_secure (mem))
--        p = gnome_keyring_memory_try_realloc (mem, size);
-+    } else if (gcr_secure_memory_is_secure (mem))
-+        p = gcr_secure_memory_try_realloc (mem, size);
-     else
-         p = realloc (mem, size);
-     return p;
-@@ -120,8 +121,8 @@ static void
- switch_free (gpointer mem)
- {
-     if (mem) {
--        if (gnome_keyring_memory_is_secure (mem))
--            gnome_keyring_memory_free (mem);
-+        if (gcr_secure_memory_is_secure (mem))
-+            gcr_secure_memory_free (mem);
-         else
-             free (mem);
-     }
-@@ -138,9 +139,9 @@ seahorse_try_gk_secure_memory ()
- {
-     gpointer p;
- 
--    p = gnome_keyring_memory_try_alloc (10);
-+    p = gcr_secure_memory_try_alloc (10);
-     if (p != NULL) {
--        gnome_keyring_memory_free (p);
-+        gcr_secure_memory_free (p);
-         return TRUE;
-     }
- 
--- 
-2.14.1
-
diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-prompt-recipient.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-prompt-recipient.patch
deleted file mode 100644
index 0a172a635107..000000000000
--- a/x11-libs/libcryptui/files/libcryptui-3.12.2-prompt-recipient.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 7c805b5d4eca798a03ac56b40e53cb335e30c187 Mon Sep 17 00:00:00 2001
-From: Vlad Orlov <monsta@inbox.ru>
-Date: Mon, 15 Aug 2016 18:23:31 +0200
-Subject: [PATCH 1/3] libcryptui: fix logic flaw in the prompt recipients
- dialog
-
-The prompt recipients dialog has been broken in commit
-https://github.com/GNOME/libcryptui/commit/cd74aa6bf810a5ce0935d2ec89d6db64dbbde24d#diff-f0ea8a1eef5386b0149314d2a1743e85L202
-
-The patch fixes the logic there and makes seahorse-tool's
-encrypt command work again. Therefore, seahorse plugins for both
-Nautilus and Nemo should start working as well.
-
-Bug-Debian: https://bugs.debian.org/770436
-
-https://bugzilla.gnome.org/show_bug.cgi?id=769944
-
-Reviewed-by: Stef Walter <stefw@gnome.org>
----
- libcryptui/cryptui.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libcryptui/cryptui.c b/libcryptui/cryptui.c
-index 92f0d5d4..2bbfa409 100644
---- a/libcryptui/cryptui.c
-+++ b/libcryptui/cryptui.c
-@@ -211,7 +211,7 @@ cryptui_prompt_recipients_with_symmetric (CryptUIKeyset *keyset,
-             *symmetric = cryptui_key_chooser_get_symmetric (chooser);
-         }
-         
--        if (symmetric != NULL && !*symmetric) {
-+        if (symmetric == NULL || *symmetric == FALSE) {
-             recipients = cryptui_key_chooser_get_recipients (chooser);
-             keys = g_new0(gchar*, g_list_length (recipients) + 1);
-             for (l = recipients, i = 0; l; l = g_list_next (l), i++)
--- 
-2.14.1
-
diff --git a/x11-libs/libcryptui/libcryptui-3.12.2-r2.ebuild b/x11-libs/libcryptui/libcryptui-3.12.2-r2.ebuild
deleted file mode 100644
index 2650427cff47..000000000000
--- a/x11-libs/libcryptui/libcryptui-3.12.2-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="User interface components for OpenPGP"
-HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
-
-LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1"
-SLOT="0"
-IUSE="debug +introspection libnotify"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
-
-# Pull in libnotify-0.7 because it's controlled via an automagic ifdef
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3:3[introspection?]
-	>=dev-libs/dbus-glib-0.72
-	>=app-crypt/gcr-3:0=[gtk]
-	x11-libs/libICE
-	x11-libs/libSM
-
-	>=app-crypt/gpgme-1:1=
-	>=app-crypt/gnupg-1.4
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# Before 3.1.4, libcryptui was part of seahorse
-RDEPEND="${COMMON_DEPEND}
-	!<app-crypt/seahorse-3.1.4
-"
-
-PATCHES=(
-	# Support GnuPG 2.1, in master
-	# https://bugzilla.gnome.org/show_bug.cgi?id=745843
-	"${FILESDIR}"/${PN}-3.12.2-gnupg-2.1.patch
-	# from master, in Debian as well
-	"${FILESDIR}"/${PN}-3.12.2-prompt-recipient.patch
-	"${FILESDIR}"/${PN}-3.12.2-fix-return-types.patch
-	"${FILESDIR}"/${PN}-3.12.2-port-gcr-3.patch
-	# Support GnuPG 2.2
-	# https://bugs.gentoo.org/629572
-	"${FILESDIR}"/${PN}-3.12.2-gnupg-2.2.patch
-	# Support GnuPG 2.3
-	# https://bugs.gentoo.org/820143
-	"${FILESDIR}"/${PN}-3.12.2-gnupg-2.3.patch
-)
-
-src_prepare() {
-	# FIXME: Do not mess with CFLAGS with USE="debug"
-	sed -e '/CFLAGS="$CFLAGS -g -O0/d' \
-		-e 's/-Werror//' \
-		-i configure.ac configure || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--disable-update-mime-database \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_enable libnotify)
-}
diff --git a/x11-libs/libcryptui/metadata.xml b/x11-libs/libcryptui/metadata.xml
deleted file mode 100644
index fe5700dfee3c..000000000000
--- a/x11-libs/libcryptui/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="gnome-gitlab">GNOME/libcryptui</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index b080fa1de75d..aff79c22ec86 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index d15d21c8c1e0..ea4a66a958e8 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -6,7 +6,7 @@ DIST mutter-44.0.tar.xz 2838932 BLAKE2B 0a5ea5a45a8074face45727af5d332ef61d69180
 DIST mutter-44.rc.tar.xz 2837848 BLAKE2B 7590afd00f6e6e65062675fd2478a8b7f41e7199f0ea0f77ccd8e62ba6e07bdefea57f8206a1f57cef101c97abe9f621cd4bf3cabca0d2bd0249f330c104072d SHA512 1d7659f9b4bb96ea50c32f122a8e621639007d023970cfeeb2afe5351abc38b9a697163019e26c85cad611f65eccbcd9f940ff1ff5ab10509fda8122c43f9a66
 EBUILD mutter-43.2.ebuild 5790 BLAKE2B 07e491948f860c2d14f483bfb411e0e66ca17c1d418493745fc6fa670a5f64551f61178e8f9ceda91d0a5df7a475cd765fbae7bd821410da9cd182c339ba2d50 SHA512 82452dc041323ecd47ed843d330ef0d69a62e362ebea6b7947b192634dbb1fc5bbb97f4e0f26ebd60e1eadb4d59210dd0e90d170f57b96148a893b34649dfefb
 EBUILD mutter-43.3.ebuild 5793 BLAKE2B 98ebc3adbb9f1da7d3324e71672895f6f58bed985272840c2b5413fcf12b205ce99269a8ad111bee253938a5f8f55b0a607c316c327bf2254dbef746a1971069 SHA512 b4a94e29d42de754c15c0f002639cb7eba82cccdc7ab498a62c2532e5e034713376ebf9df3e05bce6b43f12e03c0df20a99c77213af6393ccbf8650c89bf42ff
-EBUILD mutter-44.0.ebuild 5947 BLAKE2B 243753f7ca5043fd947203a843ac55af3ad260502b15526514f2d692504e77cd48a5615e9322796fd4e7c11532f4748f9de756ad1d26f050dab7dd5912585f24 SHA512 1992005382c57426b907a96b8fc729dc7f252143fc9aaa6817c4a151afc79d65e6fe57a4d1abe0513baab1a833cb05dfb356abbccb0859618f7b8053e4c1c29a
+EBUILD mutter-44.0-r1.ebuild 6376 BLAKE2B 820f2afaf60485b0e0a42133ce08515ba4f3d2bd054f7460bd8d09f70508dcb6bae541ac4bff0cb4a9d1a5c6014a8f9a7e7bcf72408fab6209fa350998f7e64d SHA512 e091bbf0323377a6357b4a3206961ae5bc770ff2b3e88531b03d8d2be3b9f59ef4c44767372b78a7e3e48a83764bf3deb0844ca6a879c3706d74c226c86e9cc4
 EBUILD mutter-44_rc.ebuild 5995 BLAKE2B 7112f6446602d3de9cf0f5ebabf1bc97769f98f3283889e2cca9d60d2d53a5e62c1094c3e3fccadc209eefa2d82c47954ce62a26667fa5ac6368b69c11bcc3dd SHA512 a9837f70a7f330805e1b4faff9c248da67b44dc494ec81bc9a0f82702cf6f95a835012a97adb04be6e09cef5e03be6089d05705440223490eff765e1fb7ff5d1
 EBUILD mutter-9999.ebuild 6020 BLAKE2B 1ec3d11b595b9f20ee6f1ad10a719c35f7c5afbbf15072f60361a9ca25690872eeb4abb82ad1ff797128c9c35d0837f0aa16a1af3e8999235f261ec011200a60 SHA512 640926507981f62c4f5beab8378c43b7cffd49674ddb8f261a9c50de96c03f83e55a36a81786971bf344c735173060dd3294b9921b5ba91a61bdf7b364e2f04e
 MISC metadata.xml 584 BLAKE2B 8c15ff1bc0bbadd7fe37f4a903d90c49f10aee6fd8cd83bcd81d486113397607f30b0a9c3aa43ee0b0f8e0cea8e8caaebac8560da70090fd0dbfbba8f8c0250d SHA512 924fc21a5378dc447e36c21f09ce45ebb61ea4de1dc1f541cb45ce139352616983141e8e1466fcc34dceaf1a5ea0f8e87023b25291e6796ef3f2163777e00a87
diff --git a/x11-wm/mutter/mutter-44.0.ebuild b/x11-wm/mutter/mutter-44.0-r1.ebuild
index b53a43637e87..3ca6e7a5b72e 100644
--- a/x11-wm/mutter/mutter-44.0.ebuild
+++ b/x11-wm/mutter/mutter-44.0-r1.ebuild
@@ -145,9 +145,21 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
+		# Mutter X11 renderer only supports gles2 and GLX, thus do NOT pass
+		#
+		#   -Dopengl_libname=libOpenGL.so.0
+		#
+		# while we build the x11 renderer, as we currently enable gles2 only
+		# with USE=wayland and x11 renderer wouldn't find the needed GLX symbols
+		# in a configuration where wayland is disabled, as libOpenGL doesn't
+		# include them.
+		#
+		# See
+		# - https://bugs.gentoo.org/835786
+		# - https://forums.gentoo.org/viewtopic-p-8695669.html
+
 		--buildtype $(usex debug debug plain)
 		-Dopengl=true
-		-Dopengl_libname=libOpenGL
 		$(meson_use wayland gles2)
 		#gles2_libname
 		-Degl=true
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index c4c97d188245..3432c8cb1072 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/garcon/Manifest b/xfce-base/garcon/Manifest
index 6b65e26019b9..61bc18b69001 100644
--- a/xfce-base/garcon/Manifest
+++ b/xfce-base/garcon/Manifest
@@ -1,3 +1,5 @@
 DIST garcon-4.18.0.tar.bz2 550674 BLAKE2B 93bc218c4455c61109ee7086a8cb822aaa154aaebd082c10ae9fd551019bce0fe68a117552c05fbe3a97c671036b5306703ba3c320d9b886715a83fb038c95b0 SHA512 c4b49ba47ac33823199a68ef9bdcba3acfcedde62a96a8a8b3af2bb1f28b3a5fe3e960ee93bdb964fbc01b039047d77f58fbe5b1f9fbd2ccd3d3f968e416a55c
+DIST garcon-4.18.1.tar.bz2 554562 BLAKE2B 395cc8f7c7029196f25ecb52d393989ab0df0d9ddd34ec1fc4b0a2ee46b1a059a87c75797adb84d7557523e8e0c464278344fe3d793f05941a90874bdc8e036d SHA512 8e6d091beaf1aaa85cc16cd5e562191e0e6858a47444a23d95066f9afa3f8a70f7a61bc9fec33fe401945637e810441cbd6f961f41b40e2d2ce7a1ce4fce78a0
 EBUILD garcon-4.18.0.ebuild 1228 BLAKE2B 02bfa8dbe013024d4db5347ba7b7fee2d152315da16998814b992cad860b42c3ba690c6a1f1447515c200cb9207afa7ae56f6650cf616edc774d232f255dba0a SHA512 853e1960b3dfe645d5df7b35ce709975f87996a20eb22a24712fcfcfefad4e2905395d6439498a04559cffc17993b973f2e00ceb9148258707b9b2a10cc5948c
+EBUILD garcon-4.18.1.ebuild 1234 BLAKE2B 8848741b6f2562c6ea24987802bcc3003413c83d5e534944c2edec503c0cd220d98b0a7b8fcb2293514c68f7f2bdf6ee2337f5072b01a702e78fd2b2fb5a11b5 SHA512 0b14f2f533fafe7bd79609c361b89f737de882541215267070fc8ac42a6598bab7c05c236a181ddc9276f6a7176a35a9dacab3e05ef9f255dae81f7c4e2ea323
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-base/garcon/garcon-4.18.1.ebuild b/xfce-base/garcon/garcon-4.18.1.ebuild
new file mode 100644
index 000000000000..1ab860690142
--- /dev/null
+++ b/xfce-base/garcon/garcon-4.18.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/garcon/start
+	https://gitlab.xfce.org/xfce/garcon/
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="introspection"
+
+DEPEND="
+	>=dev-libs/glib-2.66.0
+	>=x11-libs/gtk+-3.24.0:3
+	>=xfce-base/libxfce4util-4.15.6:=[introspection?]
+	>=xfce-base/libxfce4ui-4.15.7:=[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	introspection? ( >=dev-libs/gobject-introspection-1.66 )
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index dbb7526bb725..8ddd7e6daf6e 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,3 +1,5 @@
 DIST libxfce4ui-4.18.2.tar.bz2 901949 BLAKE2B 17bf0541646735ec54da5f322d858896fa2fd132fe93864372a67d4936b4467def749f4a0dd4f3d23ecb7a2b3843367f88ccf74b7e040e7ad6f6c15fec45055f SHA512 758466e2e3096791b99e1a00c9f499d95327581ad336fc1ab0d51e3d150206d522f44c2e6053b0032499dd0cb337510cf6940dc77499cef3ecbb484de7787457
+DIST libxfce4ui-4.18.3.tar.bz2 905070 BLAKE2B 0ed4bdaa1135d22d5155e22d8ecaaca2b2be714a097f26fc0388ea4bfdf39d8bf854e85ee1ace590000000d81034e414a7a0782ba3218e09901a1e0afdaf5fbe SHA512 697d883352189426b36d6c06254404b1dd2ba5f9630691b7dfddb2496d7b0233e807485155ead02dfaa73dc543eee7d8e459dc72ec56f646ec020fc9142edd28
 EBUILD libxfce4ui-4.18.2.ebuild 1733 BLAKE2B 77e3722a235e09c5e802fb57b648030baa054b269788c6f661492ecb27b08ef4e9893b491495ae5c7d14d559a32b8823f45827897a2e72f16ee21ac2286d3b5b SHA512 94534883d35f2dd5458cf58de698eb3b7596c8e032fdc60584a6bb7ec563cc2eb1607b1056876cdf19db4f99afacd52824a0f9451425da1a2a5f04ba1054394f
+EBUILD libxfce4ui-4.18.3.ebuild 1739 BLAKE2B 0da39cc9521bddbe924e82d216e2f2834daf2f0762b0c0c7e2ee6eaf0bf7f30c3a458f161f29a7a68d8b710dcbf02dcd45b7ba29e91c85ff34acccd78f658042 SHA512 c496066821e64e30df458642b5e316e569693b2589257c326f96ebef7077dca8d77e03ebd837a85406c06fab6c3b76ef7ec3fc0e1c8937cdf05d0af9f4e81c61
 MISC metadata.xml 415 BLAKE2B 96ab20930d257e21f8cb46d95f24e7d0fe7568aba5cc097ffb9ec46a5341d58dcf366522de79d8c04b575cd0cf6b96724ed969b8d6338cb842bd50787620ea9b SHA512 9712241bf2f9bb14ac6969f02768e7c4a159f7349eff4a7c9bc8fb779955a555b4cb5770ed32203933e603acb2fa9456cd989a62e274c94320e81e820555644e
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.18.3.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.18.3.ebuild
new file mode 100644
index 000000000000..31a8ab010145
--- /dev/null
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.18.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils vala
+
+DESCRIPTION="Unified widget and session management libs for Xfce"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/libxfce4ui/start
+	https://gitlab.xfce.org/xfce/libxfce4ui/
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="glade +introspection startup-notification system-info vala"
+REQUIRED_USE="vala? ( introspection )"
+
+DEPEND="
+	>=dev-libs/glib-2.66.0
+	>=x11-libs/gtk+-3.24.0:3[introspection?,X]
+	x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM
+	>=xfce-base/libxfce4util-4.17.2:=[introspection?]
+	>=xfce-base/xfconf-4.12:=
+	glade? ( dev-util/glade:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
+	startup-notification? ( x11-libs/startup-notification )
+	system-info? (
+		dev-libs/libgudev
+		gnome-base/libgtop
+		>=media-libs/libepoxy-1.2
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-lang/perl
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable system-info glibtop)
+		$(use_enable system-info epoxy)
+		$(use_enable system-info gudev)
+		$(use_enable startup-notification)
+		$(use_enable vala)
+		$(use_enable glade gladeui2)
+		--with-vendor-info=Gentoo
+	)
+
+	use vala && vala_setup
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 243eec69aa72..413121fe813f 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,5 +1,7 @@
 DIST xfce4-panel-4.18.2.tar.bz2 1448776 BLAKE2B 5c6f0f3eb85348c6181a94d19331a42ba02e36fd32c747c2dd1d8d762b795e5c8f7a21d4c54765fe498f1d0604ef7229c40f625cb3350dff41c7ec32caa49072 SHA512 8f8aa29a3dc1133477bc7075a2bbb7e7811ebd26f94e9771e4b6987e4aaa2733295e3260cf5b9052545181195ddac50e93c421e4518cdd1ccf18c39c4c972712
+DIST xfce4-panel-4.18.3.tar.bz2 1452647 BLAKE2B 40545b13fa0b8d7178fc9753cb3b1b00b0729956155a1321ba7570f83d53eecc528ddaf47cb5653a25d9df1da45d9f586311426df75471c7a6c15f5b28dc6367 SHA512 d85a7540b11c4e9ed9c99b9660d12a14ae665c6c496dd0674dc4aa048d0f043dc3659a42af862ec9409d2181c3b0ae588750373530b4c9f42d4427e08e91de19
 DIST xfce4-panel-4.19.0.tar.bz2 1485117 BLAKE2B a70654a1d8633f04310a1a9fb8554254de2f272f6fbbfede3c709a9bdc9b7d6138d5ab26ea83ccc75c9152ee0fb9d2ce7e7b174ace6369eb7d60e14db0828cec SHA512 a1c3c5f535581332c1b5e93bfecabae32cbe610d168f4452bed321466b73e4ca9ca09ca2e7c7f54cb82fe45a6102022bb30f77b57841a9bba03809b703bddf91
 EBUILD xfce4-panel-4.18.2.ebuild 1590 BLAKE2B cc1136060fcb7cfdfcf51523efee9c17af783e95ec410fe5818a22ec9a439e96afc5fabd0a54c9c26d875c5e4a0efd8bcdb26e97ef0f1f47de1b0a851ae61537 SHA512 123a616f309295e5a3a199d90c209bd22ecc7f33820bf8577976c719d872bd54a05aebb69952230784cb1270c90d3540a849e616e9e06ad7f1e4d037cfa426fb
+EBUILD xfce4-panel-4.18.3.ebuild 1596 BLAKE2B c3a1b270c82b55831e96da1a09ca5b7a4d0bc3f94968ec59619ba085bbc802bed69e1a7135d0f4dfefdb601390e90550cf67d9a56032eaf46ef18209140e4422 SHA512 66035ad611a7c795d5f362f30539bc8868b703775c9431297b37c89710f72f99fd918b15088092137e01dddafaed31599334b779f01208358f49d65b25f5a7fb
 EBUILD xfce4-panel-4.19.0.ebuild 1826 BLAKE2B 0a8407966507b07e8c34073d3c88e8d46f713b8e5bf24a14a007a3f51e108468b1eefe1aac65f7b45321480debfe371bd19bec2951f2a01cde3c59354a83a46b SHA512 f20c5910fc8c732e3db02ae9f57a5f58356bfec42767d9943f6deee803ebdaee414553f202fd3fb1f7f18c1100ef5a7350b040485de633dba73c92b68f7cdb88
 MISC metadata.xml 377 BLAKE2B a9ab246bf0acb1731905d6f7aaa6d558204ca06138e0f531b76570f1477353a636b504ccab11ed861044faa5d02fefa43c5cc08f8d6c742851f1e8976e08f3d6 SHA512 9269670fb22fc1179cbc6f4a3f7f160bd1164ab470f6bbfa4875d85d7c0fb29ac7ae05d46daaaba097a418890961e568ce249e60329ed0325ba3f5dc976946f8
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.18.3.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.18.3.ebuild
new file mode 100644
index 000000000000..7d772282a7b2
--- /dev/null
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.18.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vala xdg-utils
+
+DESCRIPTION="Panel for the Xfce desktop environment"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/xfce4-panel/start
+	https://gitlab.xfce.org/xfce/xfce4-panel/
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+dbusmenu introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+DEPEND="
+	>=dev-libs/glib-2.66.0
+	>=x11-libs/cairo-1.16.0
+	>=x11-libs/gtk+-3.24.0:3[introspection?]
+	x11-libs/libX11
+	x11-libs/libwnck:3
+	>=xfce-base/exo-0.11.2:=
+	>=xfce-base/garcon-4.17.0:=
+	>=xfce-base/libxfce4ui-4.17.1:=
+	>=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?]
+	>=xfce-base/xfconf-4.13:=
+	dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] )
+	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	vala? ( $(vala_depend) )
+	dev-lang/perl
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable dbusmenu dbusmenu-gtk3)
+		$(use_enable vala)
+	)
+
+	use vala && vala_setup
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index f157f83bbeb9..3c4675d5b926 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,5 +1,7 @@
 DIST xfce4-session-4.18.1-mem1.patch 6533 BLAKE2B 2ba8b073e4ac8d38b452f65c6b7b481bf40313a9e6590f6c78ee663d176d7ebb627ce3b26a856a69b0a32e608cd2b31bb97c2f98a816cfa4b8fe0dbcd8298bce SHA512 17cdab96b509e6a7ecac16b9a7c4924b2fa8795e9e0db9cf619d264e15c66686be0456fdb6afd02bbdffb79ee47de74ee05a3ea37e63859c5e933addefe24ee6
 DIST xfce4-session-4.18.1-mem2.patch 2363 BLAKE2B 509f69e9f440aec41c4ef9366af5152469862b0e6ff3e20588f0ffec9a360bf22ff16cfb202ccbb9cff62db1a0c568a35e0e8cdaae7913d2af12b3a243818bb1 SHA512 0b8f693ceebd0c6f292ee244fc97e8e2a1a7c1008b651ac078336a2356d4c604546bb9a1220981fd00076aabbf16e9aeb73789d0b6f1306d2f104c421f99b82b
 DIST xfce4-session-4.18.1.tar.bz2 872771 BLAKE2B e9c0b972e1dc2b324d15c17dd317f151d7d4d169533752222f8347be36c1d070f888993be8ef8f590fda5632f66c5a6c973ed91dd95afe06418656c8ec129d54 SHA512 6e6a55138380b6e7ce98508f4d3a52a596882b2f244a1ebd0d1a4b7dd1814c93e6e27453b500cb9178889790f067e28c7c4479b39963511d8e579831a44ef973
+DIST xfce4-session-4.18.2.tar.bz2 874616 BLAKE2B 2d5f34774bc369b6931951f4ddfa75fbad81428c5d4a10312fa17d21ef110ff2ba7ac2d10d3d6e2f23f8f6fce7cefd2c313716460ef245569101066969fcafc0 SHA512 1f8ed6a2474761197f67cf12ad5dac47c0122cb384fe9d8c2ada45bd8d94ca61b9c3c1d5c088972c676b0f2edb20f66444ab3b2a0021063160daa4eaab6a2e17
 EBUILD xfce4-session-4.18.1-r1.ebuild 1829 BLAKE2B 254edaa91fa8b9d0115442ff5fb65e816f644369ef2405cfb09663de85910bbdfcb0044e62b9192e7fe05b963e15e981d485bacfb8c1093b1847233e9f346e1a SHA512 fe07d88f0f1b72a3ce03ef301aad22b20026a2821fe531c64f74a7c918f734c0180dae5b480ffce4ffed4dd794ffed300e3db378a721e120eb24dd9f2f732616
+EBUILD xfce4-session-4.18.2.ebuild 1517 BLAKE2B ce0c77fcb148fc8c6768356840ccf61543aea92f4d8de746c983562255abbdb901ec3ac72d5737f4c0e9e938a338f5327c8c71840cfbabd4efd4e6ec463d1625 SHA512 9dea443db1c4f04845fbb527c3895e40e9a1f20c7128c752ed4f78672c40437062496d5e55031ca205ae983d196b3e7d24948bfaa9acf31d8d619bbbc1a42be4
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/xfce4-session/xfce4-session-4.18.2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.18.2.ebuild
new file mode 100644
index 000000000000..d46f926906e5
--- /dev/null
+++ b/xfce-base/xfce4-session/xfce4-session-4.18.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="A session manager for the Xfce desktop environment"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/xfce4-session/start
+	https://gitlab.xfce.org/xfce/xfce4-session
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls policykit +xscreensaver"
+
+DEPEND="
+	>=dev-libs/glib-2.66.0
+	>=x11-libs/gtk+-3.24.0:3
+	x11-libs/libSM
+	x11-libs/libwnck:3
+	x11-libs/libX11
+	>=xfce-base/libxfce4util-4.15.2:=
+	>=xfce-base/libxfce4ui-4.18.2:=
+	>=xfce-base/xfconf-4.12:=
+	policykit? ( >=sys-auth/polkit-0.102 )
+"
+RDEPEND="
+	${DEPEND}
+	x11-apps/iceauth
+	x11-apps/xrdb
+	nls? ( x11-misc/xdg-user-dirs )
+	xscreensaver? (
+		|| (
+			xfce-extra/xfce4-screensaver
+			>=x11-misc/xscreensaver-5.26
+			x11-misc/light-locker
+		)
+	)
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable policykit polkit)
+		--with-xsession-prefix="${EPREFIX}"/usr
+		ICEAUTH="${EPREFIX}"/usr/bin/iceauth
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	exeinto /etc/X11/Sessions
+	newexe - Xfce4 <<-EOF
+		startxfce4
+	EOF
+	dosym Xfce4 /etc/X11/Sessions/Xfce
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}