gentoo auto-resync : 08:04:2023 - 23:33:13

564 files changed, 2143 insertions, 3478 deletions

diff --git a/Manifest b/Manifest
index 032b741fad84..4535a57cbbf8 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29459 BLAKE2B 828e1d0933c0da67dd8b2388d670d3eae555ae8097cb55d1d983904143c844014401782d3487bf48dc44937cd47d2ce7d9cb275c1ed98572865e61e0122c937d SHA512 4c011357decc005b334e35415a0e482c90a97f4437bc56ca15f505829730d25a7c177a64ef643277aa6ae7bd25ae77fa4b9d72da2e48e5cc152685a9cc8d7c18
-TIMESTAMP 2023-04-08T16:10:01Z
+MANIFEST Manifest.files.gz 29439 BLAKE2B 7013c6f7f2fdadf34dddc7cba48e5b78945537605eaa168d301e3344497e047f05dffdedb90abd822039edeab284acc3c9a763fd0b044df0f7a2b83aa0554c4b SHA512 8296b9a35467dfa5cde3efce6b9bed9d0cd76c18d9972eec220fc5fa7886f424dda99498c1a57a6d48cef6be49629475aea1a642ff82cae763c7ee086bb6b921
+TIMESTAMP 2023-04-08T22:10:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQxkdlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQx5jxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCzMQ/9HXilN4AUr17pjKX68L+pCCvdeKWVX2akito+rR0mH1KwRhx6bzlqMuT8
-5nQ7FNlk9ugeW2G2cBTXES2KIDwiAsunuGTf7fuGqgPlXqdzTe7M0DCsOBPtmJhC
-EZa0HgOptlTnreVR2gcB39+okRI0cy61IdYqaQestZTGeAde0migXAFfHHm3xO7v
-V4IfdDkoGJo2pjCS6vbxi54WUf7V3IdoF5xWQZb6x2ZE1WO1yNWcVOgXFNS9e6kL
-tjc4mLylBqAwm5mNo9J0MU9IK6OusEY1Mb6JVR6djEfJFqIODR7rQs1NGxiaakcS
-RKzEY0apmJKIY4ao+5o2ziredwxK7UUzsmiLgROqhKOumlX+uB2Xz2PBIJbP4D7L
-uEiOzXMIEXNpg6OKq379eC//f7O/pqbh2j7KBxzLlKZ4kaGJD7rn0N9iXBlMwPOw
-WfLW3mO45/UQucYO1hbJIigeygTHLHHJCIVAsUhboC9ko/zQZ8fKt8EcfxA+psrL
-JO9kHe3VqlC6NujvuxT2uq+bJfWhPAme3Cb6SgurThSvQeQ1htFN7TAp6LUnwHFM
-GoUhYucfZe6z2KhNpb3hQSRo51yvGHF0jMZHY9QpiXs/+7623pc6urvcZIQsUehT
-JNhLvCxsx6A5cE7qfjwa3Vcu3R00tubcNhwiPM0yBuzyJ0eXrug=
-=zCxW
+klD7iw//VGQxD1qXdx4xCqgsIrHR9LVG8j2Th3PZayuTa8SDEssV0n4KpuoPGVU6
+RS3KRYdcXMUF/h5AiE9468unSbi5n+rR1AheK1OdRKiCr3dfbs/AZA1Phx9XojWu
+EaHK6F8YDonaxSJq+U89lS0aQ/jqk+kqKl1k8Xp7dPZzLuFfKFBfHkCtuZFZHEwU
+7NVG8N+AnK/Lwhyyhfx2RWzDLsDtoj+f3w6OPjOi1idqEwKvS9SJQnrhoaIJjtLE
+8BlbAM0FbqDlOZbzDZkBn9GQSgV/l3ELcrbDJdKO4xsgwdzalkYpTF6LbUoyI692
+JfI0fzyWzqI4N3a6D3DuN7iBLUpH9AaN5qiM+NF+3Ozd/dOkUeXr1AhYcJlcbuoj
+Gtq+88k7jFioGxHFZTiIbwUSK4cDudx2BuBudX2Rfos3FVureUDMxnDy8L6vhTmr
+FvQKmEOx/TwmO1RITTih2EdZu/7Wbowtun9HxAvAp5aErcsIcZ+ZkWjgp97DGXgd
+4dtZEFHz3rcWim39zXCRol7pM3E5IOBPI5H7+SmJ7MCU844WQhUokh3NrVRF9l4V
+UdhNgvemdX4pGLa7vqpF4I62MHZ0uS51L69RMYUz/6xmrMScJRNvOj2eTJw+uQiB
+FBOPAFMX6vhZ2MRybbioSb6k1k2WnSlPErWnDoA0rLM2CdKylUw=
+=HrsG
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index dbdb482f65a8..37afbf374c81 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 2376a5134338..505027ec63a2 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index 19d542a1a792..7b7475164eb5 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -1,10 +1,4 @@
-DIST helm-3.10.1-deps.tar.xz 125283080 BLAKE2B 3a7354a910174a2b6e80da90da37c7e5884273cdec2657e101e444587f92fcdda243e3539c481a1339bc1c20314ded1126b7953064758756d590bd82fb9bca42 SHA512 99ad12cc7b7b873f3b1988e5f9d53c55b8d54a29081804e6d4f9b233aebaeb9d0454c7e5aff9ca4a370fda96f4fda8f40e5fade3af4075da15340e44ee8f3973
 DIST helm-3.11.2-deps.tar.xz 125570640 BLAKE2B 7dd267c0070add0bd9ce70bc115cf9d2b427e32c5040f900ff750218aafcee331712ddc8da8c9655f06522696c5f4923a73ba8b94a13f16d09b8973d447817ad SHA512 4223461fa3d0032826387a4170492df561f828546fd4f4307ec5f2006e2abb77275382ebab57baea81767de97bcaa3642d88a022b07448e452e151d83fc04652
-DIST helm-3.9.4-deps.tar.xz 126444776 BLAKE2B b506593f17afcc1c4e70b99eed44c2142c114503c92f01c19ae7bbf92867899a9058d80806bb16ff470e1c81bf2490183651d522a242487aa1c5ce29d7f63ad3 SHA512 ed07887c740d74b66d489eb5e0419a3e61cfc575684a8c02b507cb297bdbc12d80beb6a13b502349c3fc9806db16e0d2625d3f13747baf68d108cca22eb9c7c7
-DIST k8s-helm-3.10.1.tar.gz 701955 BLAKE2B 869e93ffdedbfd0dc405b287ca6fcd7dc3943f6d51b13c5482a48589235ada7e080aa8d0fcbd3b640e486c90e795bf563a5c6367f4f6116be6357a6cd1052113 SHA512 5d72ef0031b9988ad3d263ed349dd0e1770ccdbeb0e05e057f375a5b6c3bdf5d214f8d7bd004b8500846269e4acdde6f51206d8c422a4a4af7341baa6cdd348e
 DIST k8s-helm-3.11.2.tar.gz 733884 BLAKE2B 2077927a61b8dcbf5907f8b2760445c8f846c186d504fc9bc9037fdafa4ad15cd8ccaaed3033be7d96cc3e05c74c283bf84c69d666721fef43198c44529db681 SHA512 32b251abf520692490e5dc9affa33b73955540a90854c84cc645364be8a4ca7afa1a9bf356a19be1efba6d35d36ef69f7b420402f73b96790f04635e9e881756
-DIST k8s-helm-3.9.4.tar.gz 704880 BLAKE2B c96e474ca882fe0b7ba5d9045f04a4e6af62f4d9d3c735f0ae89d03eac06c0c8118ba1b7ffcb7594ad23707c88c7e10d781de4701b8300e124ae767f8917dae1 SHA512 8a02d094744036bcbfeefdd369b2e5e725c0e08cc2891e07aaebf4656fc62030e91ea00b97c1f8ebe33f2e436927d380b24e416509c944468165d35c892bf846
-EBUILD helm-3.10.1.ebuild 1031 BLAKE2B 364d32f2d84dec2869bdba218d77b2e370cde815d42324c32391167ec154ecbffae91e2c73e073e62d8e1f1c68ab541df98b8a9d1c6f2653cbf38c24999f61ce SHA512 7ac3cbbb723ca05163ceb7c2cff5c69490eeb3f4e5945a825fe6333886d83445b9c8af3c86e5f8f48665bd683244eb22fe322d17e1ea03a83c362ab7d0629476
 EBUILD helm-3.11.2.ebuild 1030 BLAKE2B 09ae66be54ef7c2e7cd416069b62385ffe162998d4a04555ac700cdc3b2b26005a93dbf193c3538ab40ce3acb372e6258a782423da47c814ba56b8eaaf6ae40d SHA512 7239b3d8fea590d062b0d00737c7fd632588c8e618b64c0cdd92e2c0e6782a197eb0aef78e0a2a8c6d73e5bf0f2e8034915027451e9471421337a1b06d087158
-EBUILD helm-3.9.4.ebuild 1023 BLAKE2B 8f8240b78db8ce74791d313c41ba0c48b9a806b7cfbb65a090f3f3ac286799111b83cbce4db91d521b41bdc89d292b496df3089b7b180a7b8b243c1229abb944 SHA512 f87df213df0f7d43f12996972c54b58941b235c0ef081c852a5c52ec7aff0c49a7a577c01758ff5b0b9504d2532246d8e4fee21133a8a01ede034fcf3c22e19e
 MISC metadata.xml 323 BLAKE2B 5001082c76e55c24c27deced68a33a8fc8c9514b65116aa076ade0bacab00103a19e0807af8187b7bd8b761e64f20c4fab74b998e0f9ec473fb8d2bc9cbe4412 SHA512 a039551d398af15db8fb487b058ad569731376c51f8a23c245e4c14cd8924b960a2dcb286618c9365d21d219a271f1e0c6bcab712cf88920f4fc7fded832d800
diff --git a/app-admin/helm/helm-3.10.1.ebuild b/app-admin/helm/helm-3.10.1.ebuild
deleted file mode 100644
index bc68205d21a4..000000000000
--- a/app-admin/helm/helm-3.10.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-GIT_COMMIT=9f88ccb6aee40b9a0535fcc7efea6055e1ef72c9
-GIT_SHA=9f88ccb6
-MY_PV=${PV/_rc/-rc.}
-
-DESCRIPTION="Kubernetes Package Manager"
-HOMEPAGE="https://github.com/helm/helm https://helm.sh"
-SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> k8s-${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 ISC MIT ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
-
-RESTRICT=" test"
-
-src_compile() {
-	emake \
-		GOFLAGS="${GOFLAGS}" \
-		LDFLAGS="" \
-		GIT_COMMIT=${GIT_COMMIT} \
-		GIT_SHA=${GIT_SHA} \
-		GIT_TAG=v${MY_PV} \
-		GIT_DIRTY=clean \
-		build
-	bin/${PN} completion bash > ${PN}.bash || die
-	bin/${PN} completion zsh > ${PN}.zsh || die
-}
-
-src_install() {
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	dobin bin/${PN}
-	dodoc README.md
-}
diff --git a/app-admin/helm/helm-3.9.4.ebuild b/app-admin/helm/helm-3.9.4.ebuild
deleted file mode 100644
index 68afbf1f982b..000000000000
--- a/app-admin/helm/helm-3.9.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-GIT_COMMIT=dbc6d8e20fe1d58d50e6ed30f09a04a77e4c68db
-GIT_SHA=dbc6d8e2
-MY_PV=${PV/_rc/-rc.}
-
-DESCRIPTION="Kubernetes Package Manager"
-HOMEPAGE="https://github.com/helm/helm https://helm.sh"
-SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> k8s-${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 ISC MIT ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
-
-RESTRICT=" test"
-
-src_compile() {
-	emake \
-		GOFLAGS="${GOFLAGS}" \
-		LDFLAGS="" \
-		GIT_COMMIT=${GIT_COMMIT} \
-		GIT_SHA=${GIT_SHA} \
-		GIT_TAG=v${MY_PV} \
-		GIT_DIRTY=clean \
-		build
-	bin/${PN} completion bash > ${PN}.bash || die
-	bin/${PN} completion zsh > ${PN}.zsh || die
-}
-
-src_install() {
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	dobin bin/${PN}
-	dodoc README.md
-}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index a26e96aa4f53..e7ca8601901b 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest
index 6b1aad103a72..491e2651e790 100644
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@@ -1,5 +1,3 @@
-DIST advancecomp-2.4.tar.gz 1315369 BLAKE2B fba921473efb54493590cc225a7ece2d05a5e7a047e38cebdd14ec6141856b5f7efe0aafd279d399bca7bb836f73a586cd4711e75f2a11047e063bf72d67f15a SHA512 667e0e898208df578a676b6084ca6c8dae119a6006f716b1dfa29cd0ec5b022f7b5fd099d09c25e520bdf90bc5531a7e36ed120472ca732303b719818cc5b712
 DIST advancecomp-2.5.tar.gz 1315529 BLAKE2B 6d5844e64595f611ecf5a1ae69fa0208d324745fde91e63e2d934ca7c7ea6ce67da88063563ccfb67d8762eccff0723bc8f0e47b9322691a67bc7cc80a2039b0 SHA512 3beb26e9afdafb62ab13c3c56902b71b5dabccfa458c9930bdfd0a835149c46bed22bfac7b529c341f241bb8f7670c4cda4c50fd34df31b9a3902f8b8b655049
-EBUILD advancecomp-2.4.ebuild 881 BLAKE2B 4f51e115905cb47422c6f267f92304bb3b011deaa933bcf26ce20eb9cd92a1ddc1e369c5514700a15c91fb18e07d8e3e88efc5f51fc7c91b8c3ab0d91c981d54 SHA512 40c86ca82a557b79d1f86605f8da74e58c28891ae2ebd450df50218f482f9bf92aa4084a2621da3da9cdec5ac79d3bcd7ac948f0e43e928c32656b6e4eb55ba0
-EBUILD advancecomp-2.5.ebuild 886 BLAKE2B c75a61e371f68e9f6adb9fb83272bc8a9f3e9087fea174d3120d5a6e9d10d38f92ef088a248ba7a40abf0260b783d6686681627157d4dda71eb237866b430054 SHA512 fc4f526e623369c3dc8db9a7532261a099711a7c8175da61b606f2fc59a8d2220a71ac05398545a0c38c706f564c17cd9fb6aa255233e8b8da1546f3bb34a060
+EBUILD advancecomp-2.5.ebuild 881 BLAKE2B 8b1fbc2cbaa15a40f99fc014a726a40c02256e0f14f052f1d57ada0fb63435e390694eaf9bb303eaaa38d8965c36610c18645587f61aa632111bcdf2d174bed9 SHA512 173779ebfebd62acc8b94dd3ef36bb754c1cc02f4a2b81a951cfa1b3c56d6b2e0de2b85e60ad41c666b6c74ceb476aed65b308fac2aad869fdd948906ddf0aba
 MISC metadata.xml 390 BLAKE2B ff0e188cad31daa60b4298b09a40fbbeb0d2b95ef7bf7a78df9c3acba7421ceea5511b1654c2c15acd59efd53dc6e2f222037201bf2f66c2d8abd9d888c4138f SHA512 5f2bdc25546d01a5a3b785fc5b659dc1d0f53a12f992cab12bc14790f82b6401bb8dd65f5bddb32f59ea458fa2cc913f7b1641cf36827207f7aa2875d9488ef8
diff --git a/app-arch/advancecomp/advancecomp-2.4.ebuild b/app-arch/advancecomp/advancecomp-2.4.ebuild
deleted file mode 100644
index 6d75cd55c107..000000000000
--- a/app-arch/advancecomp/advancecomp-2.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Recompress ZIP, PNG and MNG, considerably improving compression"
-HOMEPAGE="
-	https://www.advancemame.it/comp-readme.html
-	https://github.com/amadvance/advancecomp/
-"
-SRC_URI="
-	https://github.com/amadvance/advancecomp/releases/download/v${PV}/${P}.tar.gz
-"
-
-LICENSE="GPL-2+ Apache-2.0 LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86"
-
-RDEPEND="
-	app-arch/bzip2:=
-	sys-libs/zlib:=
-"
-DEPEND="
-	${RDEPEND}
-"
-
-# Tests seem to rely on exact output:
-# https://sourceforge.net/p/advancemame/bugs/270/
-RESTRICT="test"
-
-src_configure() {
-	local myconf=(
-		--enable-bzip2
-		# (--disable-* arguments are mishandled)
-		# --disable-debug
-		# --disable-valgrind
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dodoc HISTORY
-}
diff --git a/app-arch/advancecomp/advancecomp-2.5.ebuild b/app-arch/advancecomp/advancecomp-2.5.ebuild
index 5c05f17047f0..a16f10bdcec2 100644
--- a/app-arch/advancecomp/advancecomp-2.5.ebuild
+++ b/app-arch/advancecomp/advancecomp-2.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ Apache-2.0 LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	app-arch/bzip2:=
diff --git a/app-arch/bzip3/Manifest b/app-arch/bzip3/Manifest
index 754da3ad7cd7..029ff99831a7 100644
--- a/app-arch/bzip3/Manifest
+++ b/app-arch/bzip3/Manifest
@@ -1,9 +1,3 @@
-DIST bzip3-1.1.8.tar.xz 269668 BLAKE2B fe85ba2ecca8e2433501c13e57856720da731b6c959340a68dd4654a516c12e034a90ff6cd6aed55dd2160c3860fdc3e60cddd47ffd00737a657a2e6c73704af SHA512 36141a48f0d5b35de4b06117ceca3c5d5cdc3df6be187856f1436751984b0154942e0eece531ee7b191cc0cd7056960de6a1ca3ec0fc2bcc7ff1d50444cd1e3e
-DIST bzip3-1.2.2.tar.xz 275872 BLAKE2B 601f0b150dee756d204c186f6ace5106fbc90189862cb1bcba7d4f2a2dd093ded64bb8feba0f214aac39ad138a23e6ef430a5e75829dd2ebab77c79d85342197 SHA512 476876f3949ac285e86625a9a83741308910ddce5b9449c0ca02b41d9c336f759b9702f2ce6b61243f1fde59a9ef8cf926fb2e94911828d5f39e207319bf522d
-DIST bzip3-1.2.3.tar.xz 276568 BLAKE2B 08f762174ea565e4115cd7ee0e8d22bf5aae3f060955715cf7e0f22f388b99976baa571db501cc973fe93bcd5245e991ca149f097929336817169ea488bf8907 SHA512 cd83092c5f84d9491209a15a002def26bd1b1043631e4c6e90eb8e28d977da696a24c9e80994383943e104766d120acd5a7f6dc2f6892b16661ea1fe57745c53
 DIST bzip3-1.3.0.tar.xz 276724 BLAKE2B 4b9ddd4da193cc784265eb2584804cfe7ddb55947634dab9068f7df8d0f7ee8684b3ce1cc50df355780aa8514462d23e93ff637ce2ca552f3d09b32bf1edcde2 SHA512 3777f6f0c337b5014b510c97ca3d19c77e7e474482d9e83143186ab593967fcec3e19163b32b03e6d8243838091f24e45eca245e35f0a6e5e713f29873ad62c4
-EBUILD bzip3-1.1.8.ebuild 780 BLAKE2B 40c5d480da40010a89acd6f33a35048bdf5983017b9701840b917ff2fc56ffff93da2189cc783f1009d2de3063a41892bba33d3a59bf5a1d9d0c4104075dc71b SHA512 2b3d5355ca469a43563a54ffc1bc8f3e1378955e955e5e603659f7367296c68cbf0392550df77c2ae29f919b01ab33505371ed0a871e98ede7174eb7bf15c6f5
-EBUILD bzip3-1.2.2.ebuild 780 BLAKE2B c0beeaff4442ba49098444f5b0c04625180a4529776ac9c3b73cf5c9cdde95229c5e42b6db53cae58952b83c7aef907f83ab366e80958f24ba5f3bb3697640f9 SHA512 f68707c80a45818b97de6210cb137b26129ae5e90d57aded24c99a83817ce3e67c6b77b90bbd4a5b8329140dc76754b48d60503e50df16f26f11b944fca25440
-EBUILD bzip3-1.2.3.ebuild 782 BLAKE2B e2e032db4b8b2a8ec53f240c3dd78e9863ee88d9ee9cef1b48fa7f573b0d0510b3426d4d6fd56ee969aceeeb8351990e7e9d701ee0572baec969c4ae8b0ea3b3 SHA512 e9ecd0a9932d41902bb232d4b6e6862a627b15f50d48bf70450e4b55341dde203fc22327894faf41f09bd0711ebe4bdda2d324ece79f1deedd6070dfd9d10ba2
-EBUILD bzip3-1.3.0.ebuild 782 BLAKE2B e2e032db4b8b2a8ec53f240c3dd78e9863ee88d9ee9cef1b48fa7f573b0d0510b3426d4d6fd56ee969aceeeb8351990e7e9d701ee0572baec969c4ae8b0ea3b3 SHA512 e9ecd0a9932d41902bb232d4b6e6862a627b15f50d48bf70450e4b55341dde203fc22327894faf41f09bd0711ebe4bdda2d324ece79f1deedd6070dfd9d10ba2
+EBUILD bzip3-1.3.0.ebuild 780 BLAKE2B c0beeaff4442ba49098444f5b0c04625180a4529776ac9c3b73cf5c9cdde95229c5e42b6db53cae58952b83c7aef907f83ab366e80958f24ba5f3bb3697640f9 SHA512 f68707c80a45818b97de6210cb137b26129ae5e90d57aded24c99a83817ce3e67c6b77b90bbd4a5b8329140dc76754b48d60503e50df16f26f11b944fca25440
 MISC metadata.xml 879 BLAKE2B eacb925ae4939be72ae25f0f333d8c8e1c08b2fd7946e27dfadd214b8fd5f27eef3f141f9ca911cf89151245f2fa11c7a8c5459c63badbfaf71e62aaca6d67f4 SHA512 963eae34b110b883993959f97a84c5fbaae914e009d024379d8b83ad02b335f3d7404ecd9020e291a38e78cb358dd4d0ff1b4b8f3604a2cc719e9d82ebee1e50
diff --git a/app-arch/bzip3/bzip3-1.1.8.ebuild b/app-arch/bzip3/bzip3-1.1.8.ebuild
deleted file mode 100644
index 4bbe2c3cdb5b..000000000000
--- a/app-arch/bzip3/bzip3-1.1.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A better and stronger spiritual successor to BZip2"
-HOMEPAGE="https://github.com/kspalaiologos/bzip3"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kspalaiologos/${PN}.git"
-else
-	SRC_URI="https://github.com/kspalaiologos/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~loong ~x86"
-fi
-
-LICENSE="LGPL-3+"
-SLOT="0"
-
-src_configure() {
-	# ./configure script will default to Clang if it is found on the system,
-	# force the use of CC selected by the user with CC=$(tc-getCC)
-	econf CC=$(tc-getCC)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-arch/bzip3/bzip3-1.2.2.ebuild b/app-arch/bzip3/bzip3-1.2.2.ebuild
deleted file mode 100644
index 5a859349b58a..000000000000
--- a/app-arch/bzip3/bzip3-1.2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A better and stronger spiritual successor to BZip2"
-HOMEPAGE="https://github.com/kspalaiologos/bzip3"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kspalaiologos/${PN}.git"
-else
-	SRC_URI="https://github.com/kspalaiologos/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~loong ~x86"
-fi
-
-LICENSE="LGPL-3+"
-SLOT="0"
-
-src_configure() {
-	# ./configure script will default to Clang if it is found on the system,
-	# force the use of CC selected by the user with CC=$(tc-getCC)
-	econf CC=$(tc-getCC)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-arch/bzip3/bzip3-1.2.3.ebuild b/app-arch/bzip3/bzip3-1.2.3.ebuild
deleted file mode 100644
index 33aa6e59599d..000000000000
--- a/app-arch/bzip3/bzip3-1.2.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A better and stronger spiritual successor to BZip2"
-HOMEPAGE="https://github.com/kspalaiologos/bzip3"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kspalaiologos/${PN}.git"
-else
-	SRC_URI="https://github.com/kspalaiologos/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~x86"
-fi
-
-LICENSE="LGPL-3+"
-SLOT="0"
-
-src_configure() {
-	# ./configure script will default to Clang if it is found on the system,
-	# force the use of CC selected by the user with CC=$(tc-getCC)
-	econf CC=$(tc-getCC)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-arch/bzip3/bzip3-1.3.0.ebuild b/app-arch/bzip3/bzip3-1.3.0.ebuild
index 33aa6e59599d..5a859349b58a 100644
--- a/app-arch/bzip3/bzip3-1.3.0.ebuild
+++ b/app-arch/bzip3/bzip3-1.3.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/kspalaiologos/${PN}.git"
 else
 	SRC_URI="https://github.com/kspalaiologos/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~x86"
+	KEYWORDS="amd64 arm64 ~loong ~x86"
 fi
 
 LICENSE="LGPL-3+"
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 79a011f526a4..1f54fd3ee703 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,9 +1,4 @@
-AUX libarchive-3.6.1-CVE-2022-36227.patch 1124 BLAKE2B 2c92c81409acded94372e93f020098b6c0c6256e0d4c414a971870303d46f0b0dc98b3282b69af066c2089ac3b81a8adb2bc978fa8819767cd4ab99dc613ea74 SHA512 76e34e646dd0550ad04ebd789134c8e7ac02c95222c55f02afe5a8e74552209fd59c02873ac1230086f92ec7a67ddca23be607e0c60d944b215bdf49018a2761
-AUX libarchive-3.6.1-glibc-2.36.patch 1145 BLAKE2B 41d1d8cd22baf02810e9b405562a1d6ae696cea58352d35c5dc09f5691d6b9e0ad422477049cb3c7c18048fb92e83020100595a848ee0b56ee8fb5a26e96c822 SHA512 fd6060c67ae2ed509fb96218bb828c75065c8d8571bfce4e1c4ccd349eb58c6e38ccc3cee5ba7a8560f967d302113b2b8b7787e1bcc6d966c98162596c140c4c
-DIST libarchive-3.6.1.tar.xz 5241148 BLAKE2B e7b79e97545dabeac164069e87adbd2081d3bd75c22f80b3797c6e487a477b3f6347b6fc14c76668eb69f2f2e5dcdd5a33a694e0a292ce426b8d0d93435218cf SHA512 2e5a72edc468080c0e8f29e07d9c33826ffb246fa040ec42399bedeecf698b7555f69ffd15057ad79c0f50cd4926d43174599d99632b1b99ec6cd159c43a70b8
-DIST libarchive-3.6.1.tar.xz.asc 833 BLAKE2B 8a1ca13491f3b29b322ab281a80eaef9ca2cca680e18a0ed5ff626e8808b6c9a5eb4cdd6eaf00fb771f361d84d7785c103a9a0665d812f1f27ac66f5d1a2e1da SHA512 0411a9bdc9bb058b289b5cc102a220216420bf01ea213e771a16246ed48e670f3426e8555bac27262b686b40b7b2239907c4eef2bf43d812d73a69ccb2a5b00c
 DIST libarchive-3.6.2.tar.xz 5213196 BLAKE2B 355b5d402e352dee802513485ce7e047af58d6de5b9bf6a49f3fd8d7b94117007598820ac979585c0da79747e8b63b70ab151131182368a11f97a047cf9029d4 SHA512 a12bb6839e13a0be1099f42c650fc90fbfe62d32ce38bcbb4794206d29b2c782ae1115124d0e5f6b9716514213af32b05e4a42eb196447674a5f9a2a32bee043
 DIST libarchive-3.6.2.tar.xz.asc 659 BLAKE2B a4b0035ab2bda4129cdf0c99266cd1e5f4772d90de6e348c75958bc803f369d6abea85d9730c6c9a216466b35697faad8d265fb2c285545887eafde27d828887 SHA512 403e5f7dec14d8b1cc01fad5a249e7b7618a7b45bcb3361ea80d67d76b591b12ce97f2c88b23d5486505dd3b34c1f1643e02235a3e5fc5150ee5735946092efe
-EBUILD libarchive-3.6.1-r1.ebuild 3756 BLAKE2B 1d375f08a69115a510772f08756ea089034c353be78d92e6a425967299c8f0b9c04d0bb1edb64af95357c7f52ccfbec7934c9d8c2d75d0b5775f79cd95aef5a3 SHA512 adb9473db5b876a3fd55401cc5d25de0951996becf868c423f352c6a1703b5add58a01040ae68ac17ccaea46d9e07c23ee690754bb9ba29a2c5a30c892079461
-EBUILD libarchive-3.6.2-r1.ebuild 3894 BLAKE2B 543d2a1802ca7da9b773a381f120f68fe1612e2768efcb1a07cfae23860dc76e7d4eb219733903c8b3fed98ab44e00a7ee8e67362fd519af84701e03aba3b61f SHA512 92605f9ca5d9b52e288144e689a7db522a2603fa5b217c4781297dd15031ce255e6a67cd9273ed6153a3c62e0a44eef71777ec6129d450371f3a18d4fb1780b4
+EBUILD libarchive-3.6.2-r1.ebuild 3886 BLAKE2B 57958de1b1a9f0c473ec973234df1a1fa35985df9d036ed285e3722c052d7744b84d33443f4e2a8fe56065853f4b978da75732e406f4e29ed63771b1e16cac9e SHA512 48cd37eca3eee11eaaf262c225b33fcf636373d8f59b347cc42d5b71d484c4e7b0231ac0cb885258d9d078a22ff4bb5823e916cb9a0077042fc898671ac65981
 MISC metadata.xml 1224 BLAKE2B 538433528de5543ad8e912ce0d072340be3f6eeefe16320ef48b3c30a35ebdff4a32055edf89f36e4479ab1468c620871fcb5ba91bd66e81798093b4d0345949 SHA512 9f53d623a02334f675c06edea2829ce52e78d85e3894e684ae920a678eb47046393b7a93808c7e1761d30a69faa5986cd4922ae7ef8f1e2ef221de39869bd12b
diff --git a/app-arch/libarchive/files/libarchive-3.6.1-CVE-2022-36227.patch b/app-arch/libarchive/files/libarchive-3.6.1-CVE-2022-36227.patch
deleted file mode 100644
index da71a196b875..000000000000
--- a/app-arch/libarchive/files/libarchive-3.6.1-CVE-2022-36227.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From bff38efe8c110469c5080d387bec62a6ca15b1a5 Mon Sep 17 00:00:00 2001
-From: obiwac <obiwac@gmail.com>
-Date: Fri, 22 Jul 2022 22:41:10 +0200
-Subject: [PATCH] libarchive: Handle a `calloc` returning NULL (fixes #1754)
-
----
- libarchive/archive_write.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
-index 66592e826..27626b541 100644
---- a/libarchive/archive_write.c
-+++ b/libarchive/archive_write.c
-@@ -201,6 +201,10 @@ __archive_write_allocate_filter(struct archive *_a)
- 	struct archive_write_filter *f;
- 
- 	f = calloc(1, sizeof(*f));
-+
-+	if (f == NULL)
-+		return (NULL);
-+
- 	f->archive = _a;
- 	f->state = ARCHIVE_WRITE_FILTER_STATE_NEW;
- 	if (a->filter_first == NULL)
-@@ -548,6 +552,10 @@ archive_write_open2(struct archive *_a, void *client_data,
- 	a->client_data = client_data;
- 
- 	client_filter = __archive_write_allocate_filter(_a);
-+
-+	if (client_filter == NULL)
-+		return (ARCHIVE_FATAL);
-+
- 	client_filter->open = archive_write_client_open;
- 	client_filter->write = archive_write_client_write;
- 	client_filter->close = archive_write_client_close;
diff --git a/app-arch/libarchive/files/libarchive-3.6.1-glibc-2.36.patch b/app-arch/libarchive/files/libarchive-3.6.1-glibc-2.36.patch
deleted file mode 100644
index e45d891e2a17..000000000000
--- a/app-arch/libarchive/files/libarchive-3.6.1-glibc-2.36.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://github.com/libarchive/libarchive/pull/1761
-https://bugs.gentoo.org/863227
-
-From a2f68263a1da5ad227bcb9cd8fa91b93c8b6c99f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 25 Jul 2022 10:56:53 -0700
-Subject: [PATCH] libarchive: Do not include sys/mount.h when linux/fs.h is
- present
-
-These headers are in conflict and only one is needed by
-archive_read_disk_posix.c therefore include linux/fs.h if it exists
-otherwise include sys/mount.h
-
-It also helps compiling with glibc 2.36
-where sys/mount.h conflicts with linux/mount.h see [1]
-
-[1] https://sourceware.org/glibc/wiki/Release/2.36
---- a/libarchive/archive_read_disk_posix.c
-+++ b/libarchive/archive_read_disk_posix.c
-@@ -34,9 +34,6 @@ __FBSDID("$FreeBSD$");
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
- #endif
--#ifdef HAVE_SYS_MOUNT_H
--#include <sys/mount.h>
--#endif
- #ifdef HAVE_SYS_STAT_H
- #include <sys/stat.h>
- #endif
-@@ -54,6 +51,8 @@ __FBSDID("$FreeBSD$");
- #endif
- #ifdef HAVE_LINUX_FS_H
- #include <linux/fs.h>
-+#elif HAVE_SYS_MOUNT_H
-+#include <sys/mount.h>
- #endif
- /*
-  * Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h.
-
diff --git a/app-arch/libarchive/libarchive-3.6.1-r1.ebuild b/app-arch/libarchive/libarchive-3.6.1-r1.ebuild
deleted file mode 100644
index 38a8df5f833c..000000000000
--- a/app-arch/libarchive/libarchive-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools multilib-minimal toolchain-funcs verify-sig
-
-DESCRIPTION="Multi-format archive and compression library"
-HOMEPAGE="https://www.libarchive.org/"
-SRC_URI="
-	https://www.libarchive.de/downloads/${P}.tar.xz
-	verify-sig? ( https://www.libarchive.de/downloads/${P}.tar.xz.asc )
-"
-
-LICENSE="BSD BSD-2 BSD-4 public-domain"
-SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libarchive.org.asc
-
-RDEPEND="
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
-	blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
-	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	kernel_linux? (
-		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	)
-	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.2.5-r1[${MULTILIB_USEDEP}] )
-	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
-	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	kernel_linux? (
-		virtual/os-headers
-		e2fsprogs? ( sys-fs/e2fsprogs[${MULTILIB_USEDEP}] )
-	)
-"
-BDEPEND="
-	verify-sig? ( <sec-keys/openpgp-keys-libarchive-20221209 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-glibc-2.36.patch
-	# https://github.com/libarchive/libarchive/pull/1759
-	"${FILESDIR}"/${P}-CVE-2022-36227.patch
-)
-
-src_prepare() {
-	# regenerate configure script to fix implicit includes
-	# https://bugs.gentoo.org/898360
-	eautoconf
-	default
-}
-
-multilib_src_configure() {
-	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
-
-	local myconf=(
-		$(use_enable acl)
-		$(use_enable static-libs static)
-		$(use_enable xattr)
-		$(use_with blake2 libb2)
-		$(use_with bzip2 bz2lib)
-		$(use_with expat)
-		$(use_with !expat xml2)
-		$(use_with iconv)
-		$(use_with lz4)
-		$(use_with lzma)
-		$(use_with lzo lzo2)
-		$(use_with nettle)
-		--with-zlib
-		$(use_with zstd)
-
-		# Windows-specific
-		--without-cng
-	)
-	if multilib_is_native_abi ; then
-		myconf+=(
-			--enable-bsdcat="$(tc-is-static-only && echo static || echo shared)"
-			--enable-bsdcpio="$(tc-is-static-only && echo static || echo shared)"
-			--enable-bsdtar="$(tc-is-static-only && echo static || echo shared)"
-		)
-	else
-		myconf+=(
-			--disable-bsdcat
-			--disable-bsdcpio
-			--disable-bsdtar
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		emake libarchive.la
-	fi
-}
-
-src_test() {
-	mkdir -p "${T}"/bin || die
-	# tests fail when lbzip2[symlink] is used in place of ref bunzip2
-	ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
-	local -x PATH=${T}/bin:${PATH}
-	multilib-minimal_src_test
-}
-
-multilib_src_test() {
-	# sandbox is breaking long symlink behavior
-	local -x SANDBOX_ON=0
-	local -x LD_PRELOAD=
-	# some locales trigger different output that breaks tests
-	local -x LC_ALL=C
-	emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		emake DESTDIR="${D}" install
-	else
-		local install_targets=(
-			install-includeHEADERS
-			install-libLTLIBRARIES
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${install_targets[@]}"
-	fi
-
-	# Libs.private: should be used from libarchive.pc instead
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/app-arch/libarchive/libarchive-3.6.2-r1.ebuild b/app-arch/libarchive/libarchive-3.6.2-r1.ebuild
index 513c6d16e2f5..83dafd346a0d 100644
--- a/app-arch/libarchive/libarchive-3.6.2-r1.ebuild
+++ b/app-arch/libarchive/libarchive-3.6.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd"
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libarchive.org.asc
 
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 8f0905b29846..30887a2be12b 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
index 2b60521781bb..1e99db53bded 100644
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@@ -1,5 +1,3 @@
-DIST mousepad-0.5.10.tar.bz2 959696 BLAKE2B bd21145f23f1e92d67489a3ffcdca0afd977aa639706dece5aefd2f5417d2b2122accc1a5c727ec13a4c2f311ec479612953006d78b5509e836f360566d0d320 SHA512 144e72abce8e5fb66a345fb59efe48f136dd9cf9cdcd72496dcee05b08781bdbba036f4ab5af04dbccd38dc52a8e8dd67b5b7434867881a1114de692a012b076
 DIST mousepad-0.6.0.tar.bz2 969433 BLAKE2B 690046e80f5cc74d928a8ea4d1ebcb513cf56dcaa3b295d5da528cbd139c36bc464a63a1c72acb833bcbb6f92c56b7f50f8222a3e2422d12b1f08188c12d75e0 SHA512 dad3488c973d767759a8b9752f83cc45d339064d34c19ee51f576af13f8db441f7234982c09e85f4032d553ee8df4f50ce8e0aa66c921a60ddb5c262a1c93702
-EBUILD mousepad-0.5.10.ebuild 990 BLAKE2B 9b497dfeb0898cb8e3b5f6d181fad7dfbf157bd0db010e62d4e5f9c2fccaa718ba03be8a49d920014a65eb9343c4813b42333a9945591ac2c344c632b8bb9c72 SHA512 ba1adda317e4ff03e37b633f142ba97855d2eca542bde1b100fa7d82b61c96ad94c8d9d90b6fb0154c5b0b6b6285d65d9180eed48da5f293bf2fc4e42ce2b819
-EBUILD mousepad-0.6.0.ebuild 994 BLAKE2B 2a89932a29398f2f3ff38025eb3faf1ce78962972bf151972760dd29424931505ed7aac505e0dc1e7fb0c741a4f2e600e63a95527b5e378497a064047addb831 SHA512 bf85da9aa6017c5cb7a6fe5b91eb9fcff2f6a915918323e4cc6560f388addc163c2f6fc99bca4a1212467b3459a43822dc391450a77a439565e7b48284ea9db2
+EBUILD mousepad-0.6.0.ebuild 992 BLAKE2B f6aa66dfc99dda03b970bbcb4697aa71bbaef52d02c2e02ea64879232a7038e8621f732098878a4e205dac0efc5c0c627e1f6b4f7a74b54087a89da1b2ef5414 SHA512 047ee99f743c89b58d6e84680024b9c6ab95b45c7c77141dadaf66a4a1a73f552dcfdb9ee7cf4036347b158c797467eb6a1e00dd68385a5b2787030259556382
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/app-editors/mousepad/mousepad-0.5.10.ebuild b/app-editors/mousepad/mousepad-0.5.10.ebuild
deleted file mode 100644
index 1dfbf301d5f2..000000000000
--- a/app-editors/mousepad/mousepad-0.5.10.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
-HOMEPAGE="
-	https://docs.xfce.org/apps/mousepad/start
-	https://gitlab.xfce.org/apps/mousepad/
-"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.52
-	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/gtksourceview-4.0.0:4
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		--enable-gtksourceview4
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-editors/mousepad/mousepad-0.6.0.ebuild b/app-editors/mousepad/mousepad-0.6.0.ebuild
index 7867506e677b..b2ebc8f4dbb6 100644
--- a/app-editors/mousepad/mousepad-0.6.0.ebuild
+++ b/app-editors/mousepad/mousepad-0.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.56.2
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 5acc993ef0d0..a7faa045b99c 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/afflib/Manifest b/app-forensics/afflib/Manifest
index 5c0171a89f7f..7d94b306696f 100644
--- a/app-forensics/afflib/Manifest
+++ b/app-forensics/afflib/Manifest
@@ -2,5 +2,5 @@ AUX afflib-3.7.19-search-path.patch 1132 BLAKE2B 8314c7591277658c704f0e82105ecb2
 DIST afflib-3.7.19.tar.gz 540165 BLAKE2B dea0998741121d2c1ae0e42ced9652ec46816282128469af75e0a32f9e4e2d09ac4afb4888ee7925366a03a867932f2446bfcd3800ab4dc021939ab6c38c797b SHA512 6e0df7477bf7dbd3814099d94e3fce122e0cf9b714a425521b7458f4eedc6e8b8e7283fd37926b7c992cdf21d3adec620df29a79a6a5311bf1d1b5d4930768bc
 DIST afflib-3.7.20.tar.gz 560441 BLAKE2B 6934efc30566b4b72e55e5727c46657362237872acae9d161f2625439d3d6e12da702b3ed82e3442b7015d8cb707097152cc73a6d0cc31d1ad61467f4022f7d4 SHA512 1ac623cb8462fc929a8ad1c014e92d319a3ebf5226ef07aa0777e4cbb77a9ee20adf570f39c960c9186ac2a477e861dfd5565d3364fdff22f9870f8c9ab30479
 EBUILD afflib-3.7.19-r1.ebuild 1614 BLAKE2B ffbefa9d7189c08cf9ce9d8b58c48aaafaae308a7874917d7c35d03b9f2cee92cf2b68bdddccee3761c48e03b38e319af3d4f65c28877cec52a7024a49d29e17 SHA512 71bdef8bb1ef8e2dadb8880e272f0eba3425a390a7065c56bf91842f559f553bb232ef2f1db7cbc363cb3da7ddf79ba623af81dc11c752c08835242de3081f71
-EBUILD afflib-3.7.20.ebuild 1662 BLAKE2B 434e7b128688a713ae3baf2e3436cfd423d520aabc3521b09790ffd1e4d1de4e1c76a89b3e6283d81e17f1de9a2aee034a091adac98fefbbbb6bee407e6145dc SHA512 c1d7827a98ba354c3d9222c1c3a28faa0c6b8d8b024635cef591ccb322e4652438d7690c7ad24f8cf9936c9d1ac958198972b99217754258d8135b692f3658be
+EBUILD afflib-3.7.20.ebuild 1659 BLAKE2B 7fb58e5bff061b995b1cec717deb6b28a0b245412f9c46f10aa7c7452acbc96fe46d2c44515415bc04306f9f1e2717d87787db09461e4babcfae1cd766987fc7 SHA512 70f48908737ee3fe51974ef1bd1406a0a27294ffa4e78b74291d913a0b5cbc26e3b98be049cda017c0f7dbf33537f319139ee6fdaeb20e1fa2e836e3b768dc96
 MISC metadata.xml 429 BLAKE2B be342119faa9c24cda33611a66e94a2bd2490b642fa3fcae47af7ae88690fd3059fa4df33fa7856179b8ce5704e042a2dfa831da6055d771f2dbef9b236fa3b1 SHA512 1240b7941d35a219be5adec75a3fae222dd17d1f5e9bb1a0476b779ac4869f9d7d1c985a60a20580d8cb375297ec9dea39e4597a4c462cac31faa5039be3d34a
diff --git a/app-forensics/afflib/afflib-3.7.20.ebuild b/app-forensics/afflib/afflib-3.7.20.ebuild
index 7a9a46d498cf..a8d20b77ec2b 100644
--- a/app-forensics/afflib/afflib-3.7.20.ebuild
+++ b/app-forensics/afflib/afflib-3.7.20.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~hppa ppc x86 ~x64-macos"
 IUSE="fuse ncurses python qemu readline s3 static-libs threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # Tests don't play well with sandbox
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index ceb8eed88530..cd23883eef23 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/carbonapi-booking/Manifest b/app-metrics/carbonapi-booking/Manifest
new file mode 100644
index 000000000000..a364387c1323
--- /dev/null
+++ b/app-metrics/carbonapi-booking/Manifest
@@ -0,0 +1,5 @@
+AUX carbonapi-booking.confd 213 BLAKE2B 2a23f23f102c0f20a988d9a8d3da8f06494c1292de1fa26f500e5614b196b012129aae492f6e377ea4e0e092a01fed8888563e2958c2cdfcca3ecd7023ab7cbd SHA512 a014879eaa49accf7004d696dc5a46c157fdf07dce9dd0427e103ddbf524611036f48cadcf5875af00a22c2b2c14627435af3d835aa4bcdfcb5504bfcd89b1a9
+AUX carbonapi-booking.initd 884 BLAKE2B 52a3c46c3c3820091eccbf71a3ca2b4349840a318b0d04ea4e441377cc401a2d86e5b31f00670a034a447dafe67441b19ce2b0b78a8db9715cbdda43b5c87fc2 SHA512 f9ade9168520b1a128d156693d9093d7808bdf6976dd12cf2fc919218f2616743d64920bf56b70b1a00a023d55ada3bd981ddce23f44006a5a6510efd5918a60
+DIST carbonapi-booking-0.3.0.tar.gz 1395080 BLAKE2B e5ebe20a4833f17919f0a14e091b06b5270d7dd8880fa87600454ac33b7df7600d1428f0b2e06c65a1a36796e2eb026e8c47b98444dce168cec0e965ebee9d69 SHA512 327af89fd86661ccca9d7250e70b66f03089841b20e3c51128bcbb835a91d553d952928d991424f9bbe1fea235cd9e6242784d8cbd828725ba5b2cfb64328487
+EBUILD carbonapi-booking-0.3.0.ebuild 698 BLAKE2B 47a06501e897ecb34cf3d1b4c25755c58778806890cf82da687206ed3f007265e331517bf39a9e30ceb749b07edbff00ce9dcb0b2bfb587952838a0a3b42e594 SHA512 a8b44953b7a37f0cef5ea3bc30d949a7b2ebac0ed223e56f7fa0a58f750ceb14f3abb24e0d2b25b3b6296e35867e0601a11024bf0d49849c81506430aadf9501
+MISC metadata.xml 334 BLAKE2B 81ff9b6976e8c05afd1a70cb03b1e3d14adf26df09883f21b13ad7368d527aea5aacaa1222e427a34c5b39922d0b4ab568d06846fb80381ed3c1e83e9c301e6d SHA512 a73a32986d738bef2d5ea5e479cd626c14c4bf7222e1b6b1918fd9232574975e1d002d479080a55ea02c40c129650093133da3b2eb1b8d658bff3f26d476cb27
diff --git a/app-metrics/carbonapi-booking/carbonapi-booking-0.3.0.ebuild b/app-metrics/carbonapi-booking/carbonapi-booking-0.3.0.ebuild
new file mode 100644
index 000000000000..1e309c4d679b
--- /dev/null
+++ b/app-metrics/carbonapi-booking/carbonapi-booking-0.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+MY_PN=${PN%-booking}
+DESCRIPTION="High-performance Graphite front-end, Booking.com fork"
+HOMEPAGE="https://github.com/bookingcom/carbonapi"
+SRC_URI="https://github.com/bookingcom/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	acct-group/carbon
+	acct-user/carbon"
+BDEPEND=""
+
+src_install() {
+	insinto /etc/carbonapi
+	doins -r "${S}"/config/*
+	dobin carbonapi carbonzipper
+
+	newinitd "${FILESDIR}"/${PN}.initd carbonapi
+	newconfd "${FILESDIR}"/${PN}.confd carbonapi
+}
diff --git a/app-metrics/carbonapi-booking/files/carbonapi-booking.confd b/app-metrics/carbonapi-booking/files/carbonapi-booking.confd
new file mode 100644
index 000000000000..2f9ca1ba6bd5
--- /dev/null
+++ b/app-metrics/carbonapi-booking/files/carbonapi-booking.confd
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+#CONFIG_FILE=/etc/carbonapi/carbonapi.yaml
+
+# user and group to run carbonapi as
+#USER=carbon
+#GROUP=carbon
diff --git a/app-metrics/carbonapi-booking/files/carbonapi-booking.initd b/app-metrics/carbonapi-booking/files/carbonapi-booking.initd
new file mode 100644
index 000000000000..c52069a77666
--- /dev/null
+++ b/app-metrics/carbonapi-booking/files/carbonapi-booking.initd
@@ -0,0 +1,43 @@
+#!/sbin/openrc-run
+# Copyright 1999-2023 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Graphite whisper metrics renderer."
+
+carbonapi_config=${CONFIG_FILE:-/etc/carbonapi/${SVCNAME}.yaml}
+
+command="/usr/bin/carbonapi"
+command_args="-config ${carbonapi_config}"
+pidfile="/run/carbonapi/${SVCNAME}.pid"
+user=${USER:-carbon}
+group=${GROUP:-carbon}
+
+depend() {
+	need net
+	use dns
+}
+
+start_pre() {
+	mkdir -p "${pidfile%/*}"
+	chown ${user}:${group} "${pidfile%/*}"
+}
+
+stop_post() {
+	rm -f "${pidfile}"
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --pidfile "${pidfile}" \
+		--make-pidfile --background \
+		--user ${user} --group ${group} \
+		--exec ${command} -- \
+		${command_args}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --exec ${command} --pidfile "${pidfile}"
+	eend $?
+}
diff --git a/app-metrics/carbonapi-booking/metadata.xml b/app-metrics/carbonapi-booking/metadata.xml
new file mode 100644
index 000000000000..054109ad0a1e
--- /dev/null
+++ b/app-metrics/carbonapi-booking/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grobian@gentoo.org</email>
+		<name>Fabian Groffen</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">bookingcom/carbonapi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-metrics/go-carbon/Manifest b/app-metrics/go-carbon/Manifest
new file mode 100644
index 000000000000..603f81a290f0
--- /dev/null
+++ b/app-metrics/go-carbon/Manifest
@@ -0,0 +1,5 @@
+AUX go-carbon.confd 213 BLAKE2B 75976af8c09afa4832f824199c8d2bd5efd27b1760dfe1160907761156c06fc7b4f51f32544b6c9b60121bdb88d61fdf100bb2a36c5ae767145728d09db88973 SHA512 ace9f07e58e9194c1723ab3c65cf90844f8cbc61b63b62354d13d134e016078f3fd987e055c91461b70f65c879ecabce9655070e9c77f31758ba1cb28f7abe4d
+AUX go-carbon.initd 952 BLAKE2B df48543888134efbc7153e6175953cb349128f8f820ed3d85b745755e3ee4f79ed94b74302f3d93f5e3ed3195372d544ef1fc4d9d03444c24de88d87fc9b23d1 SHA512 a935bdd026d41fd78963f31af251abf0dc86c0f8053f844ade0a234ed07c46794142a6fc80b7a65efbbcc63abd51fd1da1dbc3be5591092a62b2cf8783e0b41a
+DIST go-carbon-0.17.1.tar.gz 5074817 BLAKE2B 59b708ee2eeea486e3f4612efbe94e0592f920de3a194f7d89b4c92df88c65027373871a1503f9ce1027bc1695f19d86503de6da4789b7277780a08871f1c893 SHA512 d18e5768fa8942d3ad8039f2c8304797c488d892aae2d3bca64e2659d7bd432e9c8db14dae22eae86be9e6217b0ea567e2f40b4395c7123a7871f75afed82fc0
+EBUILD go-carbon-0.17.1.ebuild 638 BLAKE2B 2db80d66145c939d1300fdc04d0ff46de8d5662fa542e9a0ae5e6f501fd08d93843f717c1934b8be9ed9817a66d2de869e5f9627cf1511f48a81fa060ba9a4b2 SHA512 76774df15b712a6645b953dde98306705c2bd9cab596cb2b52aa03348f266b7d9d1ab5bea8d5f796b5c53d4d5ceec7ebc5e89dcfffeae9111cc3860f3ccc5913
+MISC metadata.xml 335 BLAKE2B defc9b32fd23cac009be14b7fcd637cdc55b156531ee2f1e1169ecc0bdd6f2259d67e3b19552e31a518f5ad8369c23184cf38aea06fd38e9737e5f9a2da361c1 SHA512 d9a6006c42886a891ccb76c9b7e7fc49444d761f8d63b73e9b4950a36a5b0da85649e066c5dff68998ad8ced47e2d9c38819fce4c810e2fbf9d217e4c0aa6c15
diff --git a/app-metrics/go-carbon/files/go-carbon.confd b/app-metrics/go-carbon/files/go-carbon.confd
new file mode 100644
index 000000000000..41e5838dd249
--- /dev/null
+++ b/app-metrics/go-carbon/files/go-carbon.confd
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+#CONFIG_FILE=/etc/go-carbon/go-carbon.conf
+
+# user and group to run go-carbon as
+#USER=carbon
+#GROUP=carbon
diff --git a/app-metrics/go-carbon/files/go-carbon.initd b/app-metrics/go-carbon/files/go-carbon.initd
new file mode 100644
index 000000000000..b45a1a5a5d17
--- /dev/null
+++ b/app-metrics/go-carbon/files/go-carbon.initd
@@ -0,0 +1,44 @@
+#!/sbin/openrc-run
+# Copyright 1999-2023 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Graphite whisper metrics storage and retrieval server."
+
+carbonapi_config=${CONFIG_FILE:-/etc/go-carbon/${SVCNAME}.conf}
+
+command="/usr/bin/go-carbon"
+command_args="-config ${carbonapi_config}"
+pidfile="/run/go-carbon/${SVCNAME}.pid"
+user=${USER:-carbon}
+group=${GROUP:-carbon}
+
+depend() {
+	need net
+	use dns
+}
+
+start_pre() {
+	mkdir -p "${pidfile%/*}"
+	mkdir -p /var/log/go-carbon
+	chown ${user}:${group} "${pidfile%/*}" /var/log/go-carbon
+}
+
+stop_post() {
+	rm -f "${pidfile}"
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --pidfile "${pidfile}" \
+		--make-pidfile --background \
+		--user ${user} --group ${group} \
+		--exec ${command} -- \
+		${command_args}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --exec ${command} --pidfile "${pidfile}"
+	eend $?
+}
diff --git a/app-metrics/go-carbon/go-carbon-0.17.1.ebuild b/app-metrics/go-carbon/go-carbon-0.17.1.ebuild
new file mode 100644
index 000000000000..5b808efaa023
--- /dev/null
+++ b/app-metrics/go-carbon/go-carbon-0.17.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Golang implementation of Graphite/Carbon server"
+HOMEPAGE="https://github.com/go-graphite/go-carbon"
+SRC_URI="https://github.com/go-graphite/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	acct-group/carbon
+	acct-user/carbon"
+BDEPEND=""
+
+src_install() {
+	insinto /etc/go-carbon
+	doins "${S}"/go-carbon.conf.example
+	dobin go-carbon
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-metrics/go-carbon/metadata.xml b/app-metrics/go-carbon/metadata.xml
new file mode 100644
index 000000000000..2a184bd0de98
--- /dev/null
+++ b/app-metrics/go-carbon/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grobian@gentoo.org</email>
+		<name>Fabian Groffen</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">go-graphite/go-carbon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 678de3d507dc..85cc47107b42 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/tmate/Manifest b/app-misc/tmate/Manifest
index c91506516da2..f9ec1fde7808 100644
--- a/app-misc/tmate/Manifest
+++ b/app-misc/tmate/Manifest
@@ -1,5 +1,5 @@
 AUX tmate-2.4.0-msgpack-6.patch 638 BLAKE2B 60a4779b292fc62d312ff0109cb86908773748f8c76dbd17286d4d169b86366e331e383a967a433b9e306279ef2adec52c9cdc8842e487040aa9eaa294a97846 SHA512 bcd45b70b7302ed86030e707f719aa645822dd08d22e271f82dbf4f95c1308da6a91562bea6e13f4e16a9d4dfaf1f039c04a2efb5a12ff44cf8a425d7ad910db
 DIST tmate-2.4.0.tar.gz 614179 BLAKE2B 9864f71255ceafb10cfd622346ef7d2db2a124d13599a7c8ae81e83950ba56216193e02633a9becd90fd430c6ddff66df763fe2733d58f45b02c74c8fb8f7fc4 SHA512 92d2ca354b295678bfc2747ca83a45ebafeaec40ebac94bd94c4926af4f820b3f3a087f365147f41c80d1c8ad032f52c697a2421839c39315d84f98f7eccada6
 EBUILD tmate-2.4.0-r1.ebuild 682 BLAKE2B 185aaca5848ee568a47f5b53c4540c193ecfe9de0e305652bc8dadd707b412352562c89e04095b43b333063e571e92c6d8cce3dd2cb351c718d931392039d397 SHA512 4da65cc1f9a8eb57fd93b996ef742784dec3055725f550536252da41fd359097325a98faad3674837d6fe6dfa1fe2c6458e6117c52b78a08475460db2157e24d
-EBUILD tmate-2.4.0-r2.ebuild 730 BLAKE2B dcd6d278b6773f81f21837dcd011bad502ff2ec9a0fd8c1d75e5c4c5ae556c93f99ed3ffbf35de33228d7a8627ae068c9100f26bcfbadaf0a474c9eac42c55a1 SHA512 b073e2f867e4752ec30f414334843f6e90318acaa6523a77bcab84cddf280c20455d1dfa4fd8fc99fc266c6d299797f54bcccd395d745d722a6114de9bb26096
+EBUILD tmate-2.4.0-r2.ebuild 729 BLAKE2B 5f4d6f7aedb83788a7d0bec8598ba714a492d31541654e0bb2e411681332384d03f48f4c10761c15a4cbf2e99294fd49c50f014ccfbaca94405d8d7ba73e6121 SHA512 7dd40564299f536ec1b1bf9ae8be33dea8abe05a473b6a0849758f211f79c6c43a6cf78c89c16b48681948bb49a80d524bdb16b5eefea78776cfcc3bb3d6bdbe
 MISC metadata.xml 330 BLAKE2B 70515c3c92cafb3eab48dcfc5a8dd5ab13f672b5d648202ed8c4022867b973c2f26e42cb4b4901bb7797d85c329dd4831804103f26d9ce492f72e6ea171d858a SHA512 b4b51f04cefbde53b8214be6cca9611b20f8caca391433a657c304da3eebc61a8df5e1dc3e1f840ee1667e27c67e1da56969df4055f48b3fbfaa5f90c546d68d
diff --git a/app-misc/tmate/tmate-2.4.0-r2.ebuild b/app-misc/tmate/tmate-2.4.0-r2.ebuild
index 43708efa23c3..3b27ffa1aa08 100644
--- a/app-misc/tmate/tmate-2.4.0-r2.ebuild
+++ b/app-misc/tmate/tmate-2.4.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tmate-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC BSD BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 15c26d45ba75..a5ac56d5c97e 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/ledger/Manifest b/app-office/ledger/Manifest
index 50b6be64104c..79c780dd5783 100644
--- a/app-office/ledger/Manifest
+++ b/app-office/ledger/Manifest
@@ -1,6 +1,6 @@
 AUX ledger-3.2.1-fix-build-boost-1-76.patch 650 BLAKE2B 7bdd5200cc8facf7a233ea4cab60159da586dea55694cb993494747b8fbe849f197c1cde9d471a8ed1a2c6734480bb0dc8af0ee4dc07afe78ca18bc6b5a60a15 SHA512 3255474d916c6f1e9faf3acd3f113ff8c9c4e44367be644d83bb5a7c5d0fbcd890e95f6d2d649ed639afc32498969a3ed996d1ce1e59a6a0b924b9d4ab6bb548
-DIST ledger-3.2.1.tar.gz 790959 BLAKE2B a25b08f37c6bcf409fb60e0bcc6e11021515fe17f7eb6f23781bd7a7c16b58ac92d4684e5936901ed87f2f5be4df427bd95fe856f8e7eff1e2609329866de71a SHA512 526c60cee354c9d2ead38cef3b89b349467e41fa3ec0927b51e7246a3352f19f0f81574211f20ba9bac5915590b870b9f9478a103ab661d3d9a10f41c52f4512
 DIST ledger-3.3.1.tar.gz 825005 BLAKE2B 72207dd53e8e8a201511cf9ca245c505e953fee4dc88e2be46753f4037be46dbd882ed94327f502622c1a23f332ddf9a94d2dfa60986fd82f192103612da6ca8 SHA512 6271f5beb0d0b9f157c06bf701f302b229bea1db5343f9d9239a8723039f248920d545bcc4fbea35646fdbcffb960f7830266b141a58ba88496ed34ee7d770a1
-EBUILD ledger-3.2.1-r1.ebuild 2472 BLAKE2B 5068c712254c1c248a86da5cbca4fc9a19a173aac40aec936e1d11a09269a7e6f9a3c49f51da1c08dce02adf0565a586443855fded8216ae0e647f861255bc05 SHA512 6a374859c60866e1af658b3db7f7960b0e8eda4bd1d70080c6ceeda5461e9484d06ef529a653d4be89e01e92167cb321f6dfd2cbb1adb15197825af125ec0abb
-EBUILD ledger-3.3.1.ebuild 2396 BLAKE2B 01f711493f2960840a1ece642a8a0c8c13703f549ac0aee9759bfd47215e2067dd2ab981b2a74f6bb9492a6118e86b0a5708e02e0df4a22ce9bd41fe71a72ce4 SHA512 09f736adfe0dbc111aba490b51681abea61535d4bcd560d4ea1250faad63a51438109c60d223f29550ae6c3d4f4a0d5c96286baa8d6046a232656a0a978ca414
+DIST ledger-3.3.2.tar.gz 825274 BLAKE2B ee0901eaba234688cc36e399bd86118269d8691162feacf25e70ffaf28e8d572f47a62fb014126f5dce65c73135f21ad4364a642637a80d2577bf20b657fc9a4 SHA512 d5d7058f0e9a02ad1d46e6780675d446070824b321f0f4c1ea6ac0c3dd4f11f259113bc36cbc796e4bb6d0a7898d6a68a25cce639e27a2b2434eec11a612ecb0
+EBUILD ledger-3.3.1.ebuild 2392 BLAKE2B 0ca2fb25ab9bc07ad8da27d6800115c0791aa8d9c658f75fbe74a5743c2d9dd07f6d058cdd9fe23659a4fcdf72d1bd1ef44d44bc379b97d0d8f59c286a85492f SHA512 1bfff76995e6c3fbb6146d836e0399612baade304bd8b800575b880567e7dc0560fd17339537e7a55df30c336b098df564e165ef483015a8ef6be3f0fd95f957
+EBUILD ledger-3.3.2.ebuild 2396 BLAKE2B 01f711493f2960840a1ece642a8a0c8c13703f549ac0aee9759bfd47215e2067dd2ab981b2a74f6bb9492a6118e86b0a5708e02e0df4a22ce9bd41fe71a72ce4 SHA512 09f736adfe0dbc111aba490b51681abea61535d4bcd560d4ea1250faad63a51438109c60d223f29550ae6c3d4f4a0d5c96286baa8d6046a232656a0a978ca414
 MISC metadata.xml 307 BLAKE2B f3dac05e0bf7b2902ba20eb344829c1b835ff3847c71aaf1c53d28c5045b350fbf140e2f6b3cdb80f3be99b9fa3afffdd2c52d5081c6500c42233a402ce25a54 SHA512 db8c5c551a20e1e19151f31188fb1e61642591dbb01ad4e52b4542dabde3fd374ed234b7de6c9fdd11cf57477acc8dda07e26bc5ae8f251ab306309bf3772668
diff --git a/app-office/ledger/ledger-3.3.1.ebuild b/app-office/ledger/ledger-3.3.1.ebuild
index d0356531b28f..c9108199104d 100644
--- a/app-office/ledger/ledger-3.3.1.ebuild
+++ b/app-office/ledger/ledger-3.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 IUSE="debug doc python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-office/ledger/ledger-3.2.1-r1.ebuild b/app-office/ledger/ledger-3.3.2.ebuild
index f69e8b3b7799..d0356531b28f 100644
--- a/app-office/ledger/ledger-3.2.1-r1.ebuild
+++ b/app-office/ledger/ledger-3.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="debug doc python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -27,7 +27,7 @@ RDEPEND="
 	dev-libs/mpfr:0=
 	python? (
 		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-libs/boost:=[${PYTHON_USEDEP}]
 			dev-python/cheetah3:=[${PYTHON_USEDEP}]
 		')
 		${PYTHON_DEPS}
@@ -36,16 +36,12 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-libs/utfcpp
 	doc? (
-		dev-texlive/texlive-fontsrecommended
+		app-text/texlive[extra]
 		sys-apps/texinfo
 		virtual/texi2dvi
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.1-fix-build-boost-1-76.patch
-)
-
 pkg_pretend() {
 	if use python; then
 		check-reqs_pkg_pretend
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index bd8a237e5c1e..787e85bede70 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 87ea41d8301b..7cd2f8d40664 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,5 +1,3 @@
-DIST eix-0.36.5.tar.xz 640132 BLAKE2B b997be82e21e3316abc6f06bd120434f2a027d62a3bd97e54e7c6298ee201d9998fb0fda91955f88b1b9bbf15b3c6c0c1d821280508215131cde16d1eef621e7 SHA512 fb86367f34ae30dac10f0ba68a649c8e737f0f66fefb2933e100c63c57b778567753759f28a6b4afd0155430b050ff59297821c7b54fa73c6cd65b0231806d89
 DIST eix-0.36.6.tar.xz 640216 BLAKE2B 40f1d247f6a00ecc9e034f272e73346535724e1b0cf304ea990ae849414adb4490d181db1f781bf7825f18c12cee47e03921a3e43054631d2422e0a6c8a915b8 SHA512 4dbea2a0ac66b15061b491a8da15337894ef4ae18bfb2e77eaf74c6741a45487ca7378c80620341ccf4b335592c121ab55755f0562425a9dbf9a16a9c4aa3554
-EBUILD eix-0.36.5.ebuild 2552 BLAKE2B e94b7a44857440c2a9f2423c1e27cfe8eb020ae89f9be58291f03769a4716f3c0787c3caad72742ea835c7977cc9d94c9473e09811c3a8cd52f52f9f3e1dee45 SHA512 e1862471ad658e566c031ae219011eb53c190666289707965f2ca9ddaca0315a89002b0f4cb0a1e756ab51962ffc2104f9ca6fae9b25f0e428bbc3713b971a40
-EBUILD eix-0.36.6.ebuild 2560 BLAKE2B 0ed5d512b076c1e54173b90687d25d40a20daf23ac71eeaeb6bb35f393032292eaec3226a4437ef8a35bbb058799fbe75a21beef388fd7601cef42553c7b0a9a SHA512 23308c4a3047af9b323dc75986c8e51c70ba3eabed8849067141f4e96dbb9dbcb7ccb66e85a7bbb8e9b93b21fa228dfb55c0772cca35cb5f7c8efad54ec5a17b
+EBUILD eix-0.36.6.ebuild 2552 BLAKE2B b71e4457152fb183efb7464f5fb3aa6b219269edd3a559324e72027910e30eeb1e259ddd69e1cbfe7372a1ce4ea16603edc103e117fc73765d816c700405ec6e SHA512 c1610f5e30306c670f135cfca3ed263e3a4c0c021375433482687ef1f1f1d8c8b31af91c93142e616eec7aeaf681fe2fb306aef22163c87dddb5721fe168b6a0
 MISC metadata.xml 952 BLAKE2B ef76318a2bef5560870b4c4e48ca3122ccf67f5951f8cd4a5423b6a667a39311c9725aa99a115d18e0035106f4ebc2d2679987feea91c477d5f19d6244f885cd SHA512 823873a3a87bf0ff3cbb8ab6bd2eebdf45b1f5541aa13cd4a1411def808e03b5c961050a6fc10fa5210694fac9736e0acb4917df75e7d238391dffdbb2094cd9
diff --git a/app-portage/eix/eix-0.36.5.ebuild b/app-portage/eix/eix-0.36.5.ebuild
deleted file mode 100644
index a62f25bdbeb2..000000000000
--- a/app-portage/eix/eix-0.36.5.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools bash-completion-r1 tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc nls sqlite"
-
-DEPEND="
-	nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${DEPEND}
-	>=app-shells/push-2.0-r1
-	>=app-shells/quoter-3.0_p2-r1"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# remove stale cache file to prevent collisions
-	local old_cache=${EROOT}/var/cache/${PN}
-	if [[ -f ${old_cache} ]]; then
-		rm "${old_cache}" || die
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
-		-i src/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug paranoic-asserts)
-		$(use_enable nls)
-		$(use_with doc extra-doc)
-		$(use_with sqlite)
-		--without-protobuf
-
-		# default configuration
-		$(use_with prefix always-accept-keywords)
-		--with-dep-default
-		--with-required-use-default
-
-		# paths
-		--with-portage-rootpath="${ROOTPATH}"
-		--with-eprefix-default="${EPREFIX}"
-
-		# build a single executable with symlinks
-		--disable-separate-binaries
-		--disable-separate-tools
-
-		# used purely to control/disrespect *FLAGS
-		--disable-debugging
-		--disable-new_dialect
-		--disable-optimization
-		--disable-strong-optimization
-		--disable-security
-		--disable-nopie-security
-		--disable-strong-security
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	dotmpfiles tmpfiles.d/eix.conf
-
-	rm -r "${ED}"/usr/bin/eix-functions.sh || die
-}
-
-pkg_postinst() {
-	tmpfiles_process eix.conf
-
-	local obs=${EROOT}/var/cache/eix.previous
-	if [[ -f ${obs} ]]; then
-		ewarn "Found obsolete ${obs}, please remove it"
-	fi
-}
-
-pkg_postrm() {
-	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
-		rm -rf "${EROOT}/var/cache/${PN}" || die
-	fi
-}
diff --git a/app-portage/eix/eix-0.36.6.ebuild b/app-portage/eix/eix-0.36.6.ebuild
index 94125b74cd60..129b81b9a364 100644
--- a/app-portage/eix/eix-0.36.6.ebuild
+++ b/app-portage/eix/eix-0.36.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc nls sqlite"
 
 DEPEND="
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 07138745ebab..c9a61af6eeaa 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,8 +1,4 @@
-DIST gemato-19.0.gh.tar.gz 86174 BLAKE2B b13e17f3b4388df4c0b6980db8347d68f9e6cb2657cdbcb28a8466bcdebed9e986ecac2f0f88e549741eb62accd91ed48a8ee4a714a5decce68e1529174a4c90 SHA512 3a8dfc94770e4063da8f1bf42ffc4c261345af89edd223bbf64033a82c2e31cb3369b98467fdbe9bf911b76e5ef964b676b94803579525697ddc31be1b83017b
-DIST gemato-20.0.gh.tar.gz 86296 BLAKE2B 663a479650fa6b7a989882c9233ba1cf11b5a528ef4ccc14aed2c32c7a52d877fd1efe9af29c5ed61ee0f8c846e89a52547a2cb6d0256ede5816527defe876ef SHA512 e8b3c515e7dcf32b34101d644ba658b3c534b117407f3b65543dfb684f9569969468c6a5d0290e698d204de6c4a2a18baf722c8e7a6d24d079319310e82e6803
 DIST gemato-20.1.gh.tar.gz 86394 BLAKE2B c8f8f855a5b56dbf06eef0c99e33d4ad04c8151fa121d152c9f918059436e21dafc98d3931465cc27f4c489c8e4f576abe73efd810df09896e4fe91e9aa21814 SHA512 d4395f95b5807473511cfc9631dc9db3cff610d3f3b12c8360ee452b964ea6610c76f7f1687b6b21f44fde93d6921731b1791ff51d908d3e7fd154beef6ac596
-EBUILD gemato-19.0.ebuild 1106 BLAKE2B 66ae2706dac6276b75fdc1a102a01d0ddd1d496427956f34eb12e5b2dde1f39337318f0eec7882b059d3927244c46a610e26d6731662854d52a72681c3c6beaa SHA512 42b6bfad2c8acba3adbf0b47c7e36743f48aa44e635b6d97887a10dc4c7da34028cb7c6643ec03bf6522907309294a018803b3c0b5fef4d78d2985128a390d88
-EBUILD gemato-20.0.ebuild 1114 BLAKE2B c3d5d8f9b1a8034c7799c6f2d413738201cc70f455c101e1647679eb56da50400844277fa68baf58e3a4975d69ae6fbb6dd4bbdda544c55a389b68e40d112f28 SHA512 a8cf5b5443eadf1742877fbc9acf9c5a21b584227d9f8ee1066cf14491044768387859f914ea3bae352ad3a4c6d8d473965178549b5aa7ee9a7219d24b93b35a
-EBUILD gemato-20.1.ebuild 1114 BLAKE2B c3d5d8f9b1a8034c7799c6f2d413738201cc70f455c101e1647679eb56da50400844277fa68baf58e3a4975d69ae6fbb6dd4bbdda544c55a389b68e40d112f28 SHA512 a8cf5b5443eadf1742877fbc9acf9c5a21b584227d9f8ee1066cf14491044768387859f914ea3bae352ad3a4c6d8d473965178549b5aa7ee9a7219d24b93b35a
+EBUILD gemato-20.1.ebuild 1106 BLAKE2B 66ae2706dac6276b75fdc1a102a01d0ddd1d496427956f34eb12e5b2dde1f39337318f0eec7882b059d3927244c46a610e26d6731662854d52a72681c3c6beaa SHA512 42b6bfad2c8acba3adbf0b47c7e36743f48aa44e635b6d97887a10dc4c7da34028cb7c6643ec03bf6522907309294a018803b3c0b5fef4d78d2985128a390d88
 EBUILD gemato-9999.ebuild 957 BLAKE2B 361e57ab1a563727eaaec872d9c427a9935ab5c2863996ae72869a8b6817824f81755ad7fb033ac782a71b09bfdb6c4e8e6290645b3d904647836b4705558ae3 SHA512 9383726e8c7be060b8537477733eb93cece38ed04b375455db0cb907d10647018f9a6021f6fd1e4388f66f6f4c6c80ff192c2e5b7f1e7132e63d99410ea39258
 MISC metadata.xml 805 BLAKE2B 039ea9810f2c76d69bdfa5823994be4aa012746032a8c1e01aa7a11a05e4c4e0b278ff5633a519ad8e7398f3328480128c7d9d621dc7911d1ed1d827175c7dac SHA512 1fb3ec26e41b912cdd6ca289acadc50f2d73adf4e9cf9cae40c197ecfa10c19e17716e7153c9be82684ae35580d03ae296586b062f2d54641ab2738c338f1626
diff --git a/app-portage/gemato/gemato-19.0.ebuild b/app-portage/gemato/gemato-19.0.ebuild
deleted file mode 100644
index b9fde110b002..000000000000
--- a/app-portage/gemato/gemato-19.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=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit distutils-r1
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="
-	https://github.com/projg2/gemato/
-	https://pypi.org/project/gemato/
-"
-SRC_URI="
-	https://github.com/projg2/gemato/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE="+gpg pretty-log tools"
-
-RDEPEND="
-	gpg? (
-		>=app-crypt/gnupg-2.2.20-r1
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-	pretty-log? (
-		dev-python/rich[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		>=app-crypt/gnupg-2.2.20-r1
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use tools; then
-		exeinto /usr/share/gemato
-		doexe utils/*.{bash,py}
-	fi
-}
diff --git a/app-portage/gemato/gemato-20.0.ebuild b/app-portage/gemato/gemato-20.0.ebuild
deleted file mode 100644
index 7e02cc9bba9d..000000000000
--- a/app-portage/gemato/gemato-20.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=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit distutils-r1
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="
-	https://github.com/projg2/gemato/
-	https://pypi.org/project/gemato/
-"
-SRC_URI="
-	https://github.com/projg2/gemato/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE="+gpg pretty-log tools"
-
-RDEPEND="
-	gpg? (
-		>=app-crypt/gnupg-2.2.20-r1
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-	pretty-log? (
-		dev-python/rich[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		>=app-crypt/gnupg-2.2.20-r1
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use tools; then
-		exeinto /usr/share/gemato
-		doexe utils/*.{bash,py}
-	fi
-}
diff --git a/app-portage/gemato/gemato-20.1.ebuild b/app-portage/gemato/gemato-20.1.ebuild
index 7e02cc9bba9d..b9fde110b002 100644
--- a/app-portage/gemato/gemato-20.1.ebuild
+++ b/app-portage/gemato/gemato-20.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="+gpg pretty-log tools"
 
 RDEPEND="
diff --git a/app-portage/gentoopm/Manifest b/app-portage/gentoopm/Manifest
index 7f4412118141..9ef6668b7837 100644
--- a/app-portage/gentoopm/Manifest
+++ b/app-portage/gentoopm/Manifest
@@ -1,6 +1,4 @@
-DIST gentoopm-0.4.tar.gz 39123 BLAKE2B c8ea81e2d1aa09d3aa838ccb2a1d221e29ba6cf20c5539435a36da058733ee6814864f11a5a96742b371c6d0f2e1ffa269edf197cd30cf4bc7d517f9fa6623cc SHA512 7af0d4d8b3562b009d8897b70b8621d2004e22a16006ec84144544174724757b39e09cbde98ee876adc166947a58e4afa85f752c66d4dbb03ff1d3a52074720f
 DIST gentoopm-0.5.0.gh.tar.gz 36710 BLAKE2B 12819b645154fd9ea68cd2b4f605c8ea3fcbec5005754acfd0e96081527c66a04d37ab73c8c967f5989abf97f155263c98ccb3ce6e0bc1fe9d9e5dbbc639c902 SHA512 b5ff3f79c54028b8d1442414353e4872fb0249c75ce9dedff9c907bd1307841996c254b502d18f32469d938a62add2acdd77080c693069a4b01afecca382a67e
-EBUILD gentoopm-0.4.ebuild 986 BLAKE2B e495637fec94129d3cab5f5b9497e8109aac8a05cb8d5df56999079a74e2b1fa9dd7f60463dcf7b141f7d9364ca5709bb307c3c942be1499817370796a1f14de SHA512 f19b2c9f0a55bd359960fe62552e8f3274c61fe1059f115488788d44ca2fbefbcd191a1854376edcf2d1f9cb7a77be42cd977a3ec79dd45268565cbaf9131825
-EBUILD gentoopm-0.5.0.ebuild 740 BLAKE2B 87c1cf4ed2d9dc3e51fd7cb64ddf897456c7184ce976ff13dbd56456aec0e70205361e08d91e130113efdb84f94761bc60c0b603087f5e6de119c3e8aeeea8b4 SHA512 3905797e1cc4f45cf23aec38f376e7d5133ac3573489a51745fecc04292a582807fbd13fdf4a54a1762e2acdd37c7455b652b41abd0b1b7cea5f8280b1687c24
+EBUILD gentoopm-0.5.0.ebuild 735 BLAKE2B c0c9fb62f8bb64f07f157261985728f610f23f9ad2584595d8e53edbda2b7caaa4d10b3c451797d29eada062eb70a4b38056a056354b5e59a31fbf93d199cb14 SHA512 de5013a0637c69f24f5636c85cc410a8efb4ba1932b691fff3ce3a6ecbcae6844e990488a58787b11cdf2dd62bb222ad7fb61bb2ff01d540d220690a90c069d4
 EBUILD gentoopm-9999.ebuild 633 BLAKE2B 349479829770c1506b2e91365183e41eadb95a54cfe9dc655866567511d1e62ffad81cdf3aa1705a0009726310399e4184ba9f835d98446172b653aaf4b1ae8a SHA512 41087a539e2b2bc1813a12eb0a8ec8ee3b1f68ecaa1e744c47b0b2d7276e65626162aa78054977ca861c307c162abff544f53a49c7300ff89ed07889dafd8e35
 MISC metadata.xml 601 BLAKE2B d0b8ff6fbeff832d028c1b42a73c33ee4a66c915b054c90976a3b6b53cb68bb62b39ef6d2462781df24cbe56f0232cb2234640c56e6ba3c10adbff1f312c39d4 SHA512 82dd932cccccc873beed8c20e080591221d9fb2247deddc068828799638154eb4bd18736e27edff7fd323e9d2af5fd7eff42fa1a8fea9cedadff658a93c20c4e
diff --git a/app-portage/gentoopm/gentoopm-0.4.ebuild b/app-portage/gentoopm/gentoopm-0.4.ebuild
deleted file mode 100644
index aafcbb89d307..000000000000
--- a/app-portage/gentoopm/gentoopm-0.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A common interface to Gentoo package managers"
-HOMEPAGE="https://github.com/projg2/gentoopm/"
-SRC_URI="
-	https://github.com/projg2/gentoopm/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~mips ~ppc64 ~sparc x86 ~x64-macos"
-
-RDEPEND="
-	|| (
-		>=sys-apps/pkgcore-0.9.4[${PYTHON_USEDEP}]
-		>=sys-apps/portage-2.1.10.3[${PYTHON_USEDEP}] )"
-PDEPEND="app-eselect/eselect-package-manager"
-
-distutils_enable_tests pytest
-
-python_test() {
-	if has_version ">=sys-apps/pkgcore-0.9.4[${PYTHON_USEDEP}]"; then
-		einfo "Testing against pkgcore ..."
-		PACKAGE_MANAGER=pkgcore epytest
-	fi
-	if has_version ">=sys-apps/portage-2.1.10.3[${PYTHON_USEDEP}]"; then
-		einfo "Testing against portage ..."
-		PACKAGE_MANAGER=portage epytest
-	fi
-}
diff --git a/app-portage/gentoopm/gentoopm-0.5.0.ebuild b/app-portage/gentoopm/gentoopm-0.5.0.ebuild
index 894c7a5d658f..205ea02e02ee 100644
--- a/app-portage/gentoopm/gentoopm-0.5.0.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.5.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~mips ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	|| (
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index aa7fae23802d..7ddc79c49a6f 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,8 +1,4 @@
 AUX implementations.txt 863 BLAKE2B 1393ce40ffb145e6d90cf53d100c7ddc57fff31667cd2cafdef4e398e11b01aecbfcbe2ac46ad98d149ce48f6775e85d1d09c3c8c4a4af4565583ca59b86287d SHA512 de2e9d9213f720d186d2dec7d52c489b243890fb809cf9e00e16036447a6a459bb6e1037fc7fe56cc25ef45892bcbb3c9bb9e56d45e67137d8cc9474e124cead
-DIST gpyutils-0.8.2.gh.tar.gz 20247 BLAKE2B acbde89975e233ebd7d7dcaba629d35c09a9064be48ae1d529e9f5f814b9486e9a208506ff194894dcf827069cf24faa81efa14258866fb32cf5946dafadaf6f SHA512 932500c730635ed1f8f529012f7c65c48385d92db4a673abc0145fdbb14edf8c8b5a5ed4a4c7f892e7df310b92cd8fa0532af95340096f2bd4ef7047d6b6163b
-DIST gpyutils-0.8.3.gh.tar.gz 20277 BLAKE2B b91f51ec4315238fdc7e69d3c7f551ecde72f57b960578846d50721d345487650e4e08c7faed54eb22e9423909ac541b092a23b6ac82e9f71a2aaa79a4eb2639 SHA512 0b3f9ef166f9d7e55b8335381bfa04dcccc37d5966f381f57ff555f2a2f5accda46a7fc2a713289d5ba94c0fa107436d593af9eb1d2d3a6f3957b94a1589cfe9
 DIST gpyutils-0.8.4.gh.tar.gz 20477 BLAKE2B 661ec8c9ae595daa112de2171331a5791fa4a10b50f9ebf76589c4c6ff4d6b8e618657dd9f3dd6cf573871ab6e0a9d017d87e03066fa60ba8b9d4e4617f68306 SHA512 f87a087464ca8e1118232227d2e6ad66aa021caabf0307c153b442fc4467bd124eb918c16104bdd1b42866acde16fdde4b99312a8c047ecf379ed10a74d27541
-EBUILD gpyutils-0.8.2.ebuild 573 BLAKE2B e314655e2eb935449cb2472e174fca91222da62bb5538c73977718d20ac9b7ac7f695e9a02dffa94357ba7a7d91d023ecd180bb76a5e1693ffc10ca73197c8fa SHA512 7ed975c1955ac8c5c09347844237a4073bdce2a845941ba93244f0826dcd789cfd42f03c562c0128fa2a61fc82ea933c8ee9e5d11b44b8536e4566e55aa65244
-EBUILD gpyutils-0.8.3-r1.ebuild 615 BLAKE2B 8b6287dcc8376a51a0f63516538dd3eadc7484171a6c1f25af75f77af5a70ad394443f2c15d5910f7806be2d1b2b0b7dd775a2891a02f0be07525d7f85f1e053 SHA512 4b78a48dde6380c8de07687e8b95de867c69184794b93ce8a62074403972764df935bd4942b5fb05f1f05f414154c15ea1638143fe3841a2082c6d1a48c49c3c
-EBUILD gpyutils-0.8.4.ebuild 615 BLAKE2B 8b6287dcc8376a51a0f63516538dd3eadc7484171a6c1f25af75f77af5a70ad394443f2c15d5910f7806be2d1b2b0b7dd775a2891a02f0be07525d7f85f1e053 SHA512 4b78a48dde6380c8de07687e8b95de867c69184794b93ce8a62074403972764df935bd4942b5fb05f1f05f414154c15ea1638143fe3841a2082c6d1a48c49c3c
+EBUILD gpyutils-0.8.4.ebuild 613 BLAKE2B fd58f9d3b037ab48da03739a772dfb8067ccde5713d4c7733cb0b6be1ae3eaf9f4937723adc486bee14a76f83b4876c10842e0c0fed114e0d2918398c7174d9b SHA512 a369a8a7389d049d0969efe949775b289b16b8fc884038384f3036c8e0cd41f30b32142188dcdddcfad4ed60d296778e71dbb79bcf531215dd46aa2dd36dda9e
 MISC metadata.xml 601 BLAKE2B 3a90fccb93c2acd9e02c847f5a9170c6a7b976561d02e76ec0f58906b4b514b352bd621fe5a64ae6c8653253417a90fcce5b10e13bda2218b9b7bc29a86b9b8d SHA512 ce7bded5842dfd2dec8f0db875d8b302726f42deec340efaacdf4c6f99cde9daf18365f3edb9367b6a77f7690442b14a0b925bb2265c58f833a0937d6325dcfa
diff --git a/app-portage/gpyutils/gpyutils-0.8.2.ebuild b/app-portage/gpyutils/gpyutils-0.8.2.ebuild
deleted file mode 100644
index 1d7e79e44ee8..000000000000
--- a/app-portage/gpyutils/gpyutils-0.8.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utitilies for maintaining Python packages"
-HOMEPAGE="
-	https://github.com/projg2/gpyutils/
-	https://pypi.org/project/gpyutils/
-"
-SRC_URI="
-	https://github.com/projg2/gpyutils/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/app-portage/gpyutils/gpyutils-0.8.3-r1.ebuild b/app-portage/gpyutils/gpyutils-0.8.3-r1.ebuild
deleted file mode 100644
index b458fe6df37d..000000000000
--- a/app-portage/gpyutils/gpyutils-0.8.3-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utitilies for maintaining Python packages"
-HOMEPAGE="
-	https://github.com/projg2/gpyutils/
-	https://pypi.org/project/gpyutils/
-"
-SRC_URI="
-	https://github.com/projg2/gpyutils/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/app-portage/gpyutils/gpyutils-0.8.4.ebuild b/app-portage/gpyutils/gpyutils-0.8.4.ebuild
index b458fe6df37d..0c99b3659be4 100644
--- a/app-portage/gpyutils/gpyutils-0.8.4.ebuild
+++ b/app-portage/gpyutils/gpyutils-0.8.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 43e06a440f23..d0f2a4f3d86b 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,9 +1,3 @@
-DIST mgorny-dev-scripts-34.tar.gz 11957 BLAKE2B d277bbfdddd81b5b0c27d1c318c9dc33393f91ac86b0c6768124e72ad688586f099c6e4c965eb29d027e26d931ac9a4e15ee3d1e17d9e736d61e543c3fab7c38 SHA512 f9651ae5c3707dc8794d300b2c049cbaf286d48f50c25a8ad4570623b8b8271925cec08d97babe3eb8331dc658ed49b77f0e8d0a4de0215b3bdff732d2cf8a60
-DIST mgorny-dev-scripts-35.tar.gz 12300 BLAKE2B f621ddbfe73f6b5b7e80d61a8ffe667d58ba4d99d3e1d7fbbd29ac4dcc32d3d2afa7acc64c7aa71b23f38615b8d839012b4402f211758d6bef0d8649a4a17507 SHA512 170ed437a33b3dd8e01af73890e809cba213b070f7ecbf9831fdc6b582cf2d6d499a5d84a579af324cb9e48ff4792b267628dd44fe760f38b6fe3020fb72f473
-DIST mgorny-dev-scripts-36.tar.gz 12385 BLAKE2B 79310b3730fccb938e5865e551af0e0ceb90b60feb4dba91880398a1db80d03780a54fcde64a83389e96c80a26aa00ff098d373128ac36a7c82a07c56422d0a3 SHA512 8f00fa3b4fd6c1f0f0c1b3fe60e392dd271575968df0de1099050ded3d85b36b80d5c5bc52f30cc742eec870e9943172148316acfcb881290d45fb4f1e45efeb
 DIST mgorny-dev-scripts-37.tar.gz 12407 BLAKE2B 49e01dc5318c473fdf99b046c7bf8e9939aa3bcade8a481f1418878733c55777fea5a6a471bedd1b1af8009a32ec94ce3cc904f278382fd5060b69a8e276e734 SHA512 c5fc03f0e5fe0f491ada2c4eb1305f215ca33f7d0778a0423cb8e4973a5370b7da2153c0b86acfec1a7672c290acc77782f37fe95ebeb3d6b86436435eda2c95
-EBUILD mgorny-dev-scripts-34.ebuild 695 BLAKE2B b410554da320824b048f1875bfb16b4c2602565228d370e5652f2ebd7fd924bfe02ccb7f0fe8963a8690bae3b3d7d51813ec0749473653c5d51f0cc9ef973e6c SHA512 f5280de950ee5d20f4cad98de0d1d4906c8bf3d235aba574d7f76a7dc103cc30af9d6697cd0ec96391f292c8604266889a15d8b4c27e0c722596873317e186c6
-EBUILD mgorny-dev-scripts-35.ebuild 699 BLAKE2B 23aaccbdcff9f10ea8128c0c34d51abc98f22243ac00d096343427427325bba639de36b2577293bb0db13b771b6e05bc13c1afec7a8f95ea3cbb20f8720ddc46 SHA512 06a4e281a292eafab7c2bd7755bb51e3c20e0929110ad76688d19b3e44e8d3fd10f2c9cd298c51ee3f665bc64a0b317f9b82a85ce7d4a598295806cd253a8ef4
-EBUILD mgorny-dev-scripts-36.ebuild 699 BLAKE2B 23aaccbdcff9f10ea8128c0c34d51abc98f22243ac00d096343427427325bba639de36b2577293bb0db13b771b6e05bc13c1afec7a8f95ea3cbb20f8720ddc46 SHA512 06a4e281a292eafab7c2bd7755bb51e3c20e0929110ad76688d19b3e44e8d3fd10f2c9cd298c51ee3f665bc64a0b317f9b82a85ce7d4a598295806cd253a8ef4
-EBUILD mgorny-dev-scripts-37.ebuild 680 BLAKE2B 150e6343070bef8b5a34e7bef1bbe8779ca04a5fbe9f97f3ab1bd32797dd92017ebe7f530c97deec0bfd1085e866f448e787017fd97833d27c6eea2c664a41aa SHA512 5d8723b9e58295b1db57c5a83dd692fd16655a69b1c6c1311ff45d4190b777e1e8c439d3d32d615eb62b45ff91ee44c1f8976388de87a419e6b02ca2d7001c2d
+EBUILD mgorny-dev-scripts-37.ebuild 676 BLAKE2B 2b3199410a620b4d21e10bda7234e3323388907506cc1a3678eadc71dbf110d17f95a923b956503ae693082e283ba1bdbe62065392abc22e3619fcc35808ba5f SHA512 c74d7fedb8fc66af0c3d43325358ab0a8a99eccd3f28347e49059c616c0a6bb081d12aff3b9afb4950e5827c15376bdfbfa4b73775210a310814ae06fd33e771
 MISC metadata.xml 362 BLAKE2B 9f7873c2b1dea8abe84daabea4db33438b730c92487220d28af391e411f58b15f7eaa7aedffab8849a8d0cf4c032db04e48cbf9be28f0ee7602b6a05f0e430be SHA512 d7d44e67c952a00cda52b223975c1c48ca8283d55ccc084edbed956633e8f2a04ede1553f16a3b673485ce433b9067d35c1459f0ef392ddf6d4d03ab02d339a2
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-34.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-34.ebuild
deleted file mode 100644
index 931592a8a97e..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-34.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts/"
-SRC_URI="
-	https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
-
-RDEPEND="
-	app-portage/gentoolkit
-	app-portage/portage-utils
-	dev-perl/URI
-	dev-util/pkgcheck
-	dev-vcs/git
-	net-misc/wget
-	sys-apps/portage
-	x11-misc/xdg-utils
-	!dev-util/pkgdiff
-"
-
-src_install() {
-	dodoc README.rst
-	rm -f COPYING README.rst || die
-	dobin *
-}
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-35.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-35.ebuild
deleted file mode 100644
index 4d51b8b82ec1..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-35.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts/"
-SRC_URI="
-	https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	app-portage/gentoolkit
-	app-portage/portage-utils
-	dev-perl/URI
-	dev-util/pkgcheck
-	dev-vcs/git
-	net-misc/wget
-	sys-apps/portage
-	x11-misc/xdg-utils
-	!dev-util/pkgdiff
-"
-
-src_install() {
-	dodoc README.rst
-	rm -f COPYING README.rst || die
-	dobin *
-}
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-36.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-36.ebuild
deleted file mode 100644
index 4d51b8b82ec1..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-36.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts/"
-SRC_URI="
-	https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	app-portage/gentoolkit
-	app-portage/portage-utils
-	dev-perl/URI
-	dev-util/pkgcheck
-	dev-vcs/git
-	net-misc/wget
-	sys-apps/portage
-	x11-misc/xdg-utils
-	!dev-util/pkgdiff
-"
-
-src_install() {
-	dodoc README.rst
-	rm -f COPYING README.rst || die
-	dobin *
-}
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-37.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-37.ebuild
index c1910af26af4..8258b26dca25 100644
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-37.ebuild
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-37.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	app-portage/gentoolkit
diff --git a/app-portage/pycargoebuild/Manifest b/app-portage/pycargoebuild/Manifest
index b2e63142d683..85d43d4c8f68 100644
--- a/app-portage/pycargoebuild/Manifest
+++ b/app-portage/pycargoebuild/Manifest
@@ -1,7 +1,3 @@
-DIST pycargoebuild-0.6.1.gh.tar.gz 20233 BLAKE2B a680f0b446554797f82f5903b8f51631d4026329de79327c788338ddafecdcc47b7f1d0ca3b0c81a909cde6ba24eece576f3f591ea08ad1d7adf90d545ab0869 SHA512 00183b2cedddb0c47be3e709250e679184f45af16575a5b94efc5a1598379f5c02246fd303e26b7e53ebf858c039552c7802329b0ee62c67cc15c42b39c00f09
-DIST pycargoebuild-0.6.2.gh.tar.gz 21846 BLAKE2B d9e13a9335b0c3a1d68fad1860afee608c6c5c48cef1d7a098669f7e8811280c240b63319372b80b2d6d7cba21b9715e7a8e1063cbc4aa6c8f75039d40cce3e4 SHA512 f38ee34f54312fd98b064af43efb45da480cf0d4d8fc977a4bd1e59d58ef161969043088d23e9031448ae6f3e78af32abb40a72f26e195426868559feba436d5
 DIST pycargoebuild-0.6.3.gh.tar.gz 23545 BLAKE2B f5c13947d1b03a4ef1c48eca82fe3c1104f9407d06abd035c3997ee57dcb92d5066f1c976a176058d7ead4332930789d93b38dbe52faf4c42ca7b4b7e6603098 SHA512 96c2c3e2a4715b922b28c8af4fe5031be6fd224780d06ee9c38f1611c384804b0d870b7680b3e88911cf34e64bd38354ccabfcf8d5c693a83f1d8b45924dceff
-EBUILD pycargoebuild-0.6.1.ebuild 673 BLAKE2B ae9fc7925c4f1d756d18a0b232daefee2c6c86f39988a69db742b98debff787e0e7e051ca993ae4dd5206aff153e25cfc9c8aeb9622184a546dbcab570e9cedf SHA512 41f1e56f546f896ab88994e715b5b6f409e40de175466f370fa0ef20349c69184572805ff2d7a0d34d28b728de223edd4bbfcd182e0b5a92781d9de537062437
-EBUILD pycargoebuild-0.6.2.ebuild 674 BLAKE2B c006e62e932db3d580c335815479dad7465805b36ef04e5f0e27acc20bb1b225142720f8e7842b2251868d1d171e55ff64c039786bf008fe2a85ec0c4090133e SHA512 d95db3cbf43a6b4f931044f8dcdf94cc4e5e3151064126a045956a2ceb887b30b2f90be47bf3d97370936f429a10392fc3a1da0b99fa42013dfdb7bc24bb90b0
-EBUILD pycargoebuild-0.6.3.ebuild 681 BLAKE2B 34d07e4ba7aae2a2a180e2b4d5ee4533a8cbc54a076a99cf7572d4f3baf71abf450999fd89792ba59e2159c00edfcd65f3fdf9b15b71c94cd1ba5bf9897f34f0 SHA512 570ed63baec96f4f4e2db2e8f32ac0305e9a08176bb96e9bda505128595a31272666980221980cd8649d698f11077436af365ea0061575ef3ddb54115d5399b5
+EBUILD pycargoebuild-0.6.3.ebuild 680 BLAKE2B 615cd9f63d3d772e131387b519f87838bd1c6800881e528e1d6a7daca6167e589b638c013a18f62b16e9cb4944d5cdc9f703a83120b43f008ecbf5a34b4c1349 SHA512 816669aaa2a09ab843d4297159eeb1c97f31f2040584c8845a10639aab9a8a0eda83074b21a9c85b2c0f11a59ca78777e404393f8c04fc77231ad7d24b781fc2
 MISC metadata.xml 384 BLAKE2B a5c91cf81989cb7f2ff504cd9931e89cb85a2b17721818efbc436d13e68d673c4f384839c67eeec8fe24c1a78b112c3fe37ee1722d2d28f44c5a075ec8fe18ba SHA512 76ffa916e9630225aadb9a0d2073087fcb848b782f6e44c28c354533c5329ed337e609666ee7eba90ef1191be2a34e968d3bc06556cfafce32a43a22100cc6f0
diff --git a/app-portage/pycargoebuild/pycargoebuild-0.6.1.ebuild b/app-portage/pycargoebuild/pycargoebuild-0.6.1.ebuild
deleted file mode 100644
index 878feefad882..000000000000
--- a/app-portage/pycargoebuild/pycargoebuild-0.6.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A generator for Rust/Cargo ebuilds written in Python"
-HOMEPAGE="
-	https://github.com/projg2/pycargoebuild/
-	https://pypi.org/project/pycargoebuild/
-"
-SRC_URI="
-	https://github.com/projg2/pycargoebuild/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	dev-python/license-expression[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-
-distutils_enable_tests pytest
diff --git a/app-portage/pycargoebuild/pycargoebuild-0.6.2.ebuild b/app-portage/pycargoebuild/pycargoebuild-0.6.2.ebuild
deleted file mode 100644
index 509b3840a625..000000000000
--- a/app-portage/pycargoebuild/pycargoebuild-0.6.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A generator for Rust/Cargo ebuilds written in Python"
-HOMEPAGE="
-	https://github.com/projg2/pycargoebuild/
-	https://pypi.org/project/pycargoebuild/
-"
-SRC_URI="
-	https://github.com/projg2/pycargoebuild/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/license-expression[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-
-distutils_enable_tests pytest
diff --git a/app-portage/pycargoebuild/pycargoebuild-0.6.3.ebuild b/app-portage/pycargoebuild/pycargoebuild-0.6.3.ebuild
index 129da3cd2026..83eb3a530338 100644
--- a/app-portage/pycargoebuild/pycargoebuild-0.6.3.ebuild
+++ b/app-portage/pycargoebuild/pycargoebuild-0.6.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 
 RDEPEND="
 	dev-python/license-expression[${PYTHON_USEDEP}]
diff --git a/app-portage/smart-live-rebuild/Manifest b/app-portage/smart-live-rebuild/Manifest
index f8f10b63ff15..2f92d45f3cc3 100644
--- a/app-portage/smart-live-rebuild/Manifest
+++ b/app-portage/smart-live-rebuild/Manifest
@@ -1,6 +1,4 @@
-DIST smart-live-rebuild-1.4.0.tar.gz 17630 BLAKE2B 84faabbe702dc05dbd895961dba83b8b8968bafcc5e35bd1b7dc8644f98a904651168aaee081ecb0c101761def2f5d49046116179156e75f6b335a79595d82e6 SHA512 add82ac413c698a430afbb48a7d4c7d0dae26b9d37f01dcbe7f71ee2e2fbc1686ff63c6ea9ae1c24dbc3662d27247bec2ccc002841bd42c4c11729873a49617f
 DIST smart-live-rebuild-1.4.1.tar.gz 17759 BLAKE2B c45825fffc3e30e3fdb02d16c8998bafe492462bdbff9fd5d4c67ca297ecb4da6828a9c0b6c98262f92a518482b0dc99d3022a769e22bdeaf4270ee34b1a5d5a SHA512 401222564b9920a5c8b08c0bad393f18ffbb2d3eabea6aa1a0c04bc728ffd362ec7fccb8884023ff183398085c0017d2f59d86b293ed91cc3a2bcb185aef239e
-EBUILD smart-live-rebuild-1.4.0.ebuild 823 BLAKE2B 6f979177ca66de5588ec7b865131d3e1e357ea5cdc6e38a224188340f7f7f71e54584f95ca76823ea553f517caed6bb82ebb9717f3483e430f089b7bd32052d1 SHA512 f04f420c8413655ebd6f359b529d97048fc93d77b452418fcf8ff31827e6d4c4fd29d727c7c8b4d792b6a2c8c99e93897d3b69023494f469c731036f1c807124
-EBUILD smart-live-rebuild-1.4.1.ebuild 835 BLAKE2B b1cdd898d519620b0c2bf55cd7ec75704c134994414ba5d2cd043bcf601f3ffa8ce3f81d32562e89c0eed7fb1f6ff7adb0d228cdc7aff0fe94ee258b2ddeaebb SHA512 7ba721bec3afd4cb2a3be4e56d82f16bf5cb36b126682d7a6204f3d3565bf4ece445f83d2a7d8842d509c610d5a343d82cd4655765f5c9386c7173d643e53e44
+EBUILD smart-live-rebuild-1.4.1.ebuild 830 BLAKE2B 35ccddee6375cd6133420c9434dc72ff89df4a0d526ee067fdbe6691c9f85f10b6bc2c7301e512e0dc2a521ba0bc442870ebf0a3d7cde667811419f6777fc671 SHA512 de6b486aa97898d89e9db4ebfaaa421e669289cf8dd2d2ebc94389e27930add50f8dff603f283c36c08f47e2d29a6cd52b1c97daed511a57ee7a1a52384d44ec
 EBUILD smart-live-rebuild-9999.ebuild 723 BLAKE2B 83da83e5d27b1bddc9b9a523e3f42163190b77803722df22e2b2ff3a45ac0890a76869b07c90254db5df4e08c99cdcf055a086b18c81fc0fd5b13d3f0d2d1e86 SHA512 5e3dc4a66a0a303d684ca69ac9b56c0102392cb1e738aeca2c8b4a856865550d8fbe5c8e1d12de18700fb2228f9dd27071fbbf5d25ea3581aa77d3b14e5cf051
 MISC metadata.xml 794 BLAKE2B 782678608fa8406a1f0cc82d6c121f69c11d6f5cfad96ede40f8d50203fc1ca5f74c8b3f17bdd98d007843387cc7ef67aaec2e70b21f8d032a82d7b5ef5341bb SHA512 30a2d57a354ed9ca5e61a08cd08d122c7d29058b967ddbb61b3bbea6ff14ac35c5ebac490ea7116d486c16a80d458d66619a8dae417d3af727437e2edd8a139c
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.4.0.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.4.0.ebuild
deleted file mode 100644
index a451489bd68f..000000000000
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-1.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Check live packages for updates and emerge them as necessary"
-HOMEPAGE="https://github.com/projg2/smart-live-rebuild/"
-SRC_URI="https://github.com/projg2/smart-live-rebuild/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~mips ~ppc64 ~sparc x86 ~x64-macos"
-
-RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/portage
-	newins smart-live-rebuild.conf{.example,}
-	insinto /usr/share/portage/config/sets
-	newins sets.conf.example smart-live-rebuild.conf
-}
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.4.1.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.4.1.ebuild
index f9c6ecc1fe24..ac0c9ad3adf1 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-1.4.1.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-1.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/projg2/smart-live-rebuild/archive/v${PV}.tar.gz -> $
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~mips ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
 
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 7ad6ef26a565..11483d79b137 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/exheres-syntax/Manifest b/app-vim/exheres-syntax/Manifest
index 3616cbbc6c29..4e42336263bc 100644
--- a/app-vim/exheres-syntax/Manifest
+++ b/app-vim/exheres-syntax/Manifest
@@ -1,4 +1,4 @@
-DIST exheres-syntax-20090310.tar.bz2 3670 BLAKE2B 27a6f075f80b7fc2e172b9586211a248f8075affd6a20ea52cafe06cda4f6d489a56a539e6a7619b3f7ce7fd29084ea990e66efbbdef7198a6857912eb9288c8 SHA512 616ef17367c68157d715321e457aaf0c65c97329f0848cb964d8974b6a85b4147f2e192b2ea3fcbfa3970e095bd9874203ce9723c73d1ef8350200732198c79f
-EBUILD exheres-syntax-20090310.ebuild 428 BLAKE2B 439e309b11ea2127485ef5d2c0525da507e4479b757e2ee18a6e379d3ee7a26e483c9c452e99c0e2748ff8ae5d1c69de0a719b6628ebfe46e1bc9749969629b4 SHA512 3f179920aae04f25709b0f458b04854b64565f0f3622a89b768301106583f2e753f2c66d92417c8a6ced5a80486051e90c51541c82a665e1f2155a4022f0a3ff
-EBUILD exheres-syntax-99999999.ebuild 417 BLAKE2B e26343752690ffb9bd0a4e37c8f847e820c54d0295300bb79ecf844d5ddcdce8f9ae1c8b5c30643c8cfbf1db493cce99190b31355a215ed99954437db990703c SHA512 3c7c135ac3b6078360bd2ba377b69aa47199bd9850bed5cf6bf6f25e29fb1466055ddb48ebc6252f0072241f3db5f539649dbb0be113b69b406d71b7e71a5001
+DIST exheres-syntax-20201115.tar.xz 3892 BLAKE2B bae8a26a66ae0bf5642bb438bccee7d803b8eebf67d875d070ee7208304e76e0ed6803d29d7361e09efcc6a53d86e9c7dc5b0a1df61247911d1d8a220235973e SHA512 def7d0701535a2ab325b633b4a08be9ea9e4aa8ce78dd9858ab9d56d944b579ec19c98c24410decdbe202e9fc4f3dce95845b5eab6dfdf6c223dbc0479b7a890
+EBUILD exheres-syntax-20201115.ebuild 402 BLAKE2B d8cd090a2a8888ddda96cb0a594591c5c05d6f29aec4de67d0d7bd67f6fddcb9300e94c11f5dd17abed9f2a738252ef7fcd082ba01dbe2c5cfa342e2373c7c9c SHA512 99e9aca79afaceeced347475d2f6e2ad1fa05c5216b368551ae51e214f1ad01c6473abca627f5ad3d0bc45b4b6efd00686c45334e5af94d73b97d127ac7edca8
+EBUILD exheres-syntax-99999999.ebuild 409 BLAKE2B c87ff2e6826e181423da26dffd16b95d7a67f805f05431d8b37f2af10a411782a8e34d638145c6db2aa2696f70b8b7b136151ed037d8640f4127e1a4b32a3dc9 SHA512 8fc9c25b9f84cf58f7adccb822ac74e334e3f0e2ca36c1bb9b5bf86b13e11200b678191c0c649d8f99d852be80ba793b7d508ee378906da4aa3a08732baa30a3
 MISC metadata.xml 252 BLAKE2B ff7c78adf80becc74e34bfe13b8d16e033b7bcf212885598d74e041efa61fb423d1cccf92144d5264d086f723b633a5381740acbfd5f7fc60db0f3eaf0bd4dd4 SHA512 5f74e8444702396f1d55cfaaddef867535f2b4de3fabbefdc6105fb962ff60695ca690a39590e3393293969e4691ee8634d27b7d2c36c5de42a9c103c827f85b
diff --git a/app-vim/exheres-syntax/exheres-syntax-20090310.ebuild b/app-vim/exheres-syntax/exheres-syntax-20201115.ebuild
index 7a014b993ceb..5d89218c02ac 100644
--- a/app-vim/exheres-syntax/exheres-syntax-20090310.ebuild
+++ b/app-vim/exheres-syntax/exheres-syntax-20201115.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: exheres format highlighting"
 HOMEPAGE="https://www.exherbo.org/"
-SRC_URI="https://dev.exherbo.org/~ahf/pub/software/releases/${PN}/${P}.tar.bz2"
+SRC_URI="https://dev.exherbo.org/distfiles/${PN}/${P}.tar.xz"
 
 LICENSE="vim"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 VIM_PLUGIN_HELPFILES="exheres-syntax"
 VIM_PLUGIN_MESSAGES="filetype"
diff --git a/app-vim/exheres-syntax/exheres-syntax-99999999.ebuild b/app-vim/exheres-syntax/exheres-syntax-99999999.ebuild
index 0038d7a3921f..74c1403f0642 100644
--- a/app-vim/exheres-syntax/exheres-syntax-99999999.ebuild
+++ b/app-vim/exheres-syntax/exheres-syntax-99999999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit vim-plugin git-r3
 
@@ -11,7 +11,6 @@ EGIT_REPO_URI="https://git.exherbo.org/git/exheres-syntax.git"
 
 LICENSE="vim"
 SLOT="0"
-IUSE=""
 
 VIM_PLUGIN_HELPFILES="exheres-syntax"
 VIM_PLUGIN_MESSAGES="filetype"
diff --git a/app-vim/fugitive/Manifest b/app-vim/fugitive/Manifest
index 657357a1c4d7..66401051e509 100644
--- a/app-vim/fugitive/Manifest
+++ b/app-vim/fugitive/Manifest
@@ -1,4 +1,6 @@
 DIST fugitive-3.4.tar.gz 80677 BLAKE2B 7cb341851248eb05a8094617f349e382cb8704f69116d8a00f07db40d96b4cc86b98515a59c489116fe7fdadb9a73a65819bf792005bda316f1a0bca311e6938 SHA512 313f1b06c843f85cfdbee059f1470b1ed062c2055e552fa1e05b01e59d9950c181b19e7553cbbca575b1951949970691081582128be7148885485d4fbed0a4d2
+DIST fugitive-3.7.tar.gz 84271 BLAKE2B 1c00272174bd76a2b4d34aa54a7498b2f75a5322d587e3436d82f21d6188027768bea0475c99fcbc50a82b89d9a9a7697d18106cb1eb2f9788afa81848fe2de8 SHA512 8252b69c6183f5b710739eb68ecb3fbdfad52df3dbee0a3a04ad33f410b489d7fcf1c0bde0cb2d53995a6b4e34191c165c652d08e6145789a88f8c46bfcddf56
 EBUILD fugitive-3.4.ebuild 623 BLAKE2B fcc6f0d03de813c484835ec024214307b05f0f19693cedadb3c462937fd5802265002ee94360a15a844466a66067e4cf04e567f15060ae64538589d73f160424 SHA512 433673db4c18480be1e4bf863d344f957353c84c1596cd2107202b24fcb6073cfa99cf0505bf9e7a3585ffbf2f40237ae4fb342dc687cbba7fd33835e7facaa4
-EBUILD fugitive-9999.ebuild 625 BLAKE2B d429d4e0ea98e6d35c91c17cef0c59f1bf27a0fa6adcb120d808cae0e7cec60dd2e438e83a07ed40c401423fbde4ed4f2fe016f54d21ec52ceddd32223d82a84 SHA512 ddc4ccdb0f6e345ef5d20fb53e5e34e02d451934b51c0db99048e4718ca71532a9d842337513f6d897f2b7d84465fd717f90779c7a7f5b2e0803ab9b8addd284
+EBUILD fugitive-3.7.ebuild 636 BLAKE2B b96e40e319f06e9b527c8290ec707d6047ddfe1fe1b8f26c8cd58c8cf57cf43b60ae6775fc7b8edc712cf7c6c5a2e194be85a08efed955d9fd5b2fe376d73797 SHA512 5a39e9f04d72ce81f97d6fdb12b20efc49b168e9f37983b1dcdf94a6e4e17c3a44359ef3ca97118f9f6958bf7265943f6361aa308f2bb654fbe824615aec45cb
+EBUILD fugitive-9999.ebuild 636 BLAKE2B b96e40e319f06e9b527c8290ec707d6047ddfe1fe1b8f26c8cd58c8cf57cf43b60ae6775fc7b8edc712cf7c6c5a2e194be85a08efed955d9fd5b2fe376d73797 SHA512 5a39e9f04d72ce81f97d6fdb12b20efc49b168e9f37983b1dcdf94a6e4e17c3a44359ef3ca97118f9f6958bf7265943f6361aa308f2bb654fbe824615aec45cb
 MISC metadata.xml 343 BLAKE2B 14d84b683c5ba0998876e7711a4afb8d5f23bfe72cd54b80d73dfb05eb5fb19dbd9e1927cb9fb56a4eda13292343a8cce56d67476daa4b5262193279517a159b SHA512 00c0719b8ea84f7aac1ea31b852ea2ebb6c724999329f3d0693f447aa1c278924318c0eca12c183340b19e848ce40873f7ec9c3bdf9a3f1c9f7a15fa98d78bd9
diff --git a/app-vim/fugitive/fugitive-3.7.ebuild b/app-vim/fugitive/fugitive-3.7.ebuild
new file mode 100644
index 000000000000..e0e4ec9939dc
--- /dev/null
+++ b/app-vim/fugitive/fugitive-3.7.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tpope/vim-fugitive.git"
+else
+	SRC_URI="https://github.com/tpope/vim-fugitive/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos"
+	S="${WORKDIR}/vim-${P}"
+fi
+
+DESCRIPTION="vim plugin: a git wrapper for vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/"
+
+LICENSE="vim"
+SLOT="0"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="dev-vcs/git"
diff --git a/app-vim/fugitive/fugitive-9999.ebuild b/app-vim/fugitive/fugitive-9999.ebuild
index 0d4da8993529..e0e4ec9939dc 100644
--- a/app-vim/fugitive/fugitive-9999.ebuild
+++ b/app-vim/fugitive/fugitive-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit vim-plugin
 
 if [[ ${PV} == 9999 ]]; then
@@ -15,7 +16,9 @@ fi
 
 DESCRIPTION="vim plugin: a git wrapper for vim"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/"
+
 LICENSE="vim"
+SLOT="0"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 
diff --git a/app-vim/vim-flake8/Manifest b/app-vim/vim-flake8/Manifest
index 0160829e1c32..f3765229dce1 100644
--- a/app-vim/vim-flake8/Manifest
+++ b/app-vim/vim-flake8/Manifest
@@ -1,3 +1,5 @@
 DIST vim-flake8-1.6.tar.gz 5345 BLAKE2B dd726798a49231841f9fcb915999cf965a42b8b5f593a66f97268bc6d7993584d5f9ed0cfc50508bc57d60c5dcd19c8476e86ae26fb8be9c1dcf7007db2d0323 SHA512 a4208478f9754ef2d188a51e3262c449ef16b48fc0208425795d71c304118c129ae20a723fff96863291bae66237f1479a591cc23e5ec90222e0614d2dcccce9
+DIST vim-flake8-1.7.tar.gz 6080 BLAKE2B bf78e2c4e9976fc148cf18fc5ec58c2807a9c82a6893160ca4a107664d438fc955c2eac3e41373529cc1dc5295acab06c7c9007c1ad72095548362e903d7d31a SHA512 c29cfc00e4fd94128be02e003116647819cd3b39916527b70a7684c19ef4184bce1c1556051fc269bde4696a98b752fb7b4e081c2aac46cdcdfdf35735ec76b0
 EBUILD vim-flake8-1.6.ebuild 402 BLAKE2B eb5c93251f30ef79ce9d76954d24f739e7dc4465ffdf9d6fae92747b065e058b5bb0e89961d77d526039f0bc023d47d19e8bfb50b3c7d07a02877c7c6b5e825e SHA512 e597905db4f37dc796bdd01cb6d2e5e5c121c6483347a7189dcfd16e36445636bbd8cadb3182fb3be9e14493bb9a44a8cf1569d9587e6a8806412698b76d8c6f
+EBUILD vim-flake8-1.7.ebuild 413 BLAKE2B d940e67b222ef326c55f1727fe42c0153b4dfed512bd7f06ac18a8f4586953c0108d8994f5acdae41adfcbea502e967a25c54108e0e7d0466d0d75b02028ae72 SHA512 ba8775d537bf774de4c053f07cbc63aaf65d52fec7bf71eb3639608d3e581af2b6f566f2e4c8ca753d8805b47c19729b35b9a987cbe01338609d7b8a1fb044d4
 MISC metadata.xml 425 BLAKE2B fe6405fddd4b3528e2ff64a024a5a2ddc8eda7bededdf26b1a6067cb87a806bcd0bec9fbc135538353095e89826e4a695e0ccd8bca127c3a7985b4779c64f21f SHA512 c877d1d17104e63075f9459f856d4b381a2b7b1fbae0476a3f393cb03912f7d1118da99d8dcb341453394a2ec92ed8098c5c4e1818c1ef80e67bfc65bd010dd4
diff --git a/app-vim/vim-flake8/vim-flake8-1.7.ebuild b/app-vim/vim-flake8/vim-flake8-1.7.ebuild
new file mode 100644
index 000000000000..b8772d16ea7d
--- /dev/null
+++ b/app-vim/vim-flake8/vim-flake8-1.7.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: runs the currently open file through flake8"
+HOMEPAGE="https://github.com/nvie/vim-flake8"
+SRC_URI="https://github.com/nvie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="dev-python/flake8"
diff --git a/app-vim/vimclojure/Manifest b/app-vim/vimclojure/Manifest
index 8408eb01e037..6eede8c03adf 100644
--- a/app-vim/vimclojure/Manifest
+++ b/app-vim/vimclojure/Manifest
@@ -1,4 +1,4 @@
 DIST vimclojure-2.3.6.tar.gz 32456 BLAKE2B 7c80611516cf7e1d46400c8cc8c9f9f8146ce8f1ce2fc7458ad9e5a7c778f54496f3a1b2fe47a6cc9cb28cb8f6f0e0e67ace77a09c7258f1585cb76758d6e908 SHA512 186fd5607ccaa4b4344aed4d165d257d0518b3fe19d7b9d858b11a672f68c601bbd453fde7189dd61c3fc2f0b8517c3481579355bf5405ab90517dc48900fd51
 EBUILD vimclojure-2.3.6-r3.ebuild 1105 BLAKE2B 12f9a1593d373fa19bada0dd78d2bed453fd21c7bfd086e2e44794a39f7a25ebf66f8313e901442cd30bd75da3874817f199f91382014f4a66eb47adfe154627 SHA512 2bc86d694c2d13431d35b72da865447c4d6b9e82b0d1f4d8f9759a4f09d4e5870e856bc581e72c23feee448095217e7d7106beec3681f12f7f16987e7e3ea6c3
-EBUILD vimclojure-2.3.6-r4.ebuild 1107 BLAKE2B e20e0459922efb61dd75559c32e8326ad0861064b01361010d6989d04126661f5f49ed9e9f4e1203896c446035bdb80809f5db15d3223655c4c9597649c8556f SHA512 df5352a2006be88d9e001ff68ec8a91d8ab6dd3108b5170523adc96a0c6ee91ba9fa56636a68e01e3b53e71d9687f7b1bade862846d456a17ba04abf0ca60678
+EBUILD vimclojure-2.3.6-r4.ebuild 1105 BLAKE2B 52668d47a31eaa70531fba3858024663aacc4da75b99b9dfd8ab3df3563c56e35b25f2751c7b79462a2b391690835cad2671d896d06119728e6f124c19f43aae SHA512 2e49ba47c3a239b750380c094efcfe82ba2b032733bbe0cc4e76923ff6bcfb3933b9f9870750416f112eef99b555ccbd40bdc5b6b4179683e67fa8577db1c781
 MISC metadata.xml 405 BLAKE2B f74c6ead8f1ea1deec1973c062f5a1034b98406ea4b73f2e8366601ddfe13b9fb31966eaf54a21b007edceeffd88966a2631cfa819e09f0549a98cecca4cec55 SHA512 ae2db42ed5786b3241e0c76cc66d6b9c22f7ac4eb15ab6f2c2040985358a9b453bff442ff8d458cbe8d4d9bb7b603ade7302aeb62eabee9e2e73e1d7f9f022e3
diff --git a/app-vim/vimclojure/vimclojure-2.3.6-r4.ebuild b/app-vim/vimclojure/vimclojure-2.3.6-r4.ebuild
index c34730afe916..9b7fa3568c64 100644
--- a/app-vim/vimclojure/vimclojure-2.3.6-r4.ebuild
+++ b/app-vim/vimclojure/vimclojure-2.3.6-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
@@ -11,7 +11,7 @@ DESCRIPTION="vim plugin: Clojure syntax highlighting, filetype and indent settin
 HOMEPAGE="https://github.com/vim-scripts/VimClojure"
 SRC_URI="https://github.com/vim-scripts/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="BSD"
 SLOT="0"
 
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index e55fb193c076..049c28f6e6c7 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/irrlicht-mt-headers/Manifest b/dev-games/irrlicht-mt-headers/Manifest
index 7e884872c4a3..df7c0701021f 100644
--- a/dev-games/irrlicht-mt-headers/Manifest
+++ b/dev-games/irrlicht-mt-headers/Manifest
@@ -1,3 +1,5 @@
+DIST irrlicht-mt-1.9.0.10.tar.gz 898774 BLAKE2B 2b11aead4556127bff7c7f06d16a57632cf1758ad0ddf12e6d9346d80d13c0cd437ccade268db5bec25f8d62cfa61e9ecda07a98d0a82c18b548a1b520dccee2 SHA512 216221b5073d2b234b2d19658b30517c3abb2677c16e3a9b7fd31c15431bd2ffc047a68851c5bebf94aeb178d6b761a80c2f5744a7498cdac1d7b65fed139cc0
 DIST irrlicht-mt-1.9.0.8.tar.gz 909733 BLAKE2B 6c85377b5e426a9f4ba06ea60fb0414fb9598c3b66d01d80da8461d53b16bc1c74ea5f949d0419d01f2d4dccabff20410840dc9380cac3cf5b656b2e073a4636 SHA512 3a5cbcd8d13730e08f24a72b4ceb2a6d3ba1cfa4292475915da6413ab8084d0b7f0b5dc34edc152d5bf516730faf43d983433619b0a1fb15540adb5cab00ca10
+EBUILD irrlicht-mt-headers-1.9.0.10.ebuild 754 BLAKE2B 7cd399021813849944d26ecee8c9cedb88182d69bb6660ded7734e9ab2be2f652af612be1337d1652a7b34f004be99e8a3dcb840385e69b94b302ca7f7d31490 SHA512 e3689ece70eb861784175b763b1193fba4c3bc22174965a58c6a4da57cfa56afa94c7deb7fe2ad0ced39dc7fb39a7ee1e0099d8133cfbc2a1e9a467a2ed82262
 EBUILD irrlicht-mt-headers-1.9.0.8.ebuild 754 BLAKE2B 82533b71b4dee184373642086df9d4a934c60293453102635a8e430e0af9a931dc9878c33047d66d52955287bc3e12d4464601cdc553994754c19584cbe2d239 SHA512 a7bb5b25a96242497fcc7c63f5022f93e0da8f7c8e7a0809ffc767892ada10cb79694180b6bfb8150ac5be987b48a479d7bcc2b2e04661792bdc8cdd05206386
 MISC metadata.xml 328 BLAKE2B 65f1524f204dce6e817727e3870a3154eb1333d68d92241b17ea9a9089081d56947e7cd0dae6e4addd55594953cf27661e02774814f814465363df184842d37d SHA512 dddf11f78c1fcc61b3b98246ed7c73ae7c0e3f1765b60fbbc8513d706edec666c405479f45a2259c513f3bf298bd1d0810f756110aa7757b393045c4c18e17d8
diff --git a/dev-games/irrlicht-mt-headers/irrlicht-mt-headers-1.9.0.10.ebuild b/dev-games/irrlicht-mt-headers/irrlicht-mt-headers-1.9.0.10.ebuild
new file mode 100644
index 000000000000..ca22218f7ec1
--- /dev/null
+++ b/dev-games/irrlicht-mt-headers/irrlicht-mt-headers-1.9.0.10.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${PN%-mt-headers}"
+MY_PV="$(ver_rs 3 'mt')"
+MY_P="${MY_PN}-${MY_PV}"
+# These two should be kept in sync with dev-games/irrlicht-mt
+SRC_PN="${PN%-headers}"
+SRC_P="${SRC_PN}-${PV}"
+
+DESCRIPTION="Header files for Minetest's fork of dev-games/irrlicht"
+HOMEPAGE="https://github.com/minetest/irrlicht"
+SRC_URI="https://github.com/minetest/${MY_PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${SRC_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="!<dev-games/irrlicht-mt-1.9.0.4-r1"
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/include/${SRC_PN/-/}
+	doins include/*
+}
diff --git a/dev-games/irrlicht-mt/Manifest b/dev-games/irrlicht-mt/Manifest
index 4d31a6b38390..e36b9c2b06da 100644
--- a/dev-games/irrlicht-mt/Manifest
+++ b/dev-games/irrlicht-mt/Manifest
@@ -1,3 +1,5 @@
+DIST irrlicht-mt-1.9.0.10.tar.gz 898774 BLAKE2B 2b11aead4556127bff7c7f06d16a57632cf1758ad0ddf12e6d9346d80d13c0cd437ccade268db5bec25f8d62cfa61e9ecda07a98d0a82c18b548a1b520dccee2 SHA512 216221b5073d2b234b2d19658b30517c3abb2677c16e3a9b7fd31c15431bd2ffc047a68851c5bebf94aeb178d6b761a80c2f5744a7498cdac1d7b65fed139cc0
 DIST irrlicht-mt-1.9.0.8.tar.gz 909733 BLAKE2B 6c85377b5e426a9f4ba06ea60fb0414fb9598c3b66d01d80da8461d53b16bc1c74ea5f949d0419d01f2d4dccabff20410840dc9380cac3cf5b656b2e073a4636 SHA512 3a5cbcd8d13730e08f24a72b4ceb2a6d3ba1cfa4292475915da6413ab8084d0b7f0b5dc34edc152d5bf516730faf43d983433619b0a1fb15540adb5cab00ca10
+EBUILD irrlicht-mt-1.9.0.10.ebuild 853 BLAKE2B adc1af9e744420210fd23067371591812ef273aa0a54d50bacccbd769aaa8ec689f17e26f48aa7606f561d0b2d36737fad30812c0d08751489986b7ff024613c SHA512 669da66c3413606a05aad7aa81f6e8196c80703bd83c4734df5ae95b394ae671e28f98febdb739f11d3eb51ee0fb6c7d17b10330ff004c669533b99cfa1e5e20
 EBUILD irrlicht-mt-1.9.0.8.ebuild 853 BLAKE2B 04905b27c2016e298375d6629302de15392423a83fca5bab83c17fdebd2a57d2627a87de976b89c887f436d634438b80ebc0ad40bed68edd4b035ef4e3ab8555 SHA512 460dac8dd600ae9b146f9f3a373a44e91b1df01abcefe67fd8a33201fb0c15a467ec8cfe079f845a0858cdfecf5a1ceb0c559c8a2870a2ec56499c1f7f81658f
 MISC metadata.xml 328 BLAKE2B 65f1524f204dce6e817727e3870a3154eb1333d68d92241b17ea9a9089081d56947e7cd0dae6e4addd55594953cf27661e02774814f814465363df184842d37d SHA512 dddf11f78c1fcc61b3b98246ed7c73ae7c0e3f1765b60fbbc8513d706edec666c405479f45a2259c513f3bf298bd1d0810f756110aa7757b393045c4c18e17d8
diff --git a/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.10.ebuild b/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.10.ebuild
new file mode 100644
index 000000000000..9e3cff77d488
--- /dev/null
+++ b/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.10.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN="${PN%-mt}"
+MY_PV="$(ver_rs 3 'mt')"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Minetest's fork of dev-games/irrlicht"
+HOMEPAGE="https://github.com/minetest/irrlicht"
+SRC_URI="https://github.com/minetest/${MY_PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="~dev-games/irrlicht-mt-headers-${PV}
+	media-libs/libpng:0=
+	sys-libs/zlib
+	media-libs/libjpeg-turbo
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXxf86vm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+S="${WORKDIR}"/${MY_P}
+
+src_install() {
+	cmake_src_install
+
+	# We package these separately
+	rm -r "${ED}"/usr/include/${PN/-/} || die "Failed to exclude header files from installation"
+}
diff --git a/dev-libs/FBGEMM/FBGEMM-2023.02.10.ebuild b/dev-libs/FBGEMM/FBGEMM-2023.02.10.ebuild
index 27388ddaa17b..d0bf065049d7 100644
--- a/dev-libs/FBGEMM/FBGEMM-2023.02.10.ebuild
+++ b/dev-libs/FBGEMM/FBGEMM-2023.02.10.ebuild
@@ -39,10 +39,12 @@ RESTRICT="!test? ( test )"
 S="${WORKDIR}"/${PN}-${CommitId}
 
 python_check_deps() {
-	python_has_version \
-		"dev-python/sphinx[${PYTHON_USEDEP}]" \
-		"dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" \
-		"dev-python/breathe[${PYTHON_USEDEP}]"
+	if use doc; then
+		python_has_version \
+			"dev-python/sphinx[${PYTHON_USEDEP}]" \
+			"dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" \
+			"dev-python/breathe[${PYTHON_USEDEP}]"
+	fi
 }
 
 PATCHES=(
diff --git a/dev-libs/FBGEMM/Manifest b/dev-libs/FBGEMM/Manifest
index d95a94776eb3..ce7d38f4c1be 100644
--- a/dev-libs/FBGEMM/Manifest
+++ b/dev-libs/FBGEMM/Manifest
@@ -1,5 +1,5 @@
 AUX FBGEMM-2022.01.13-gentoo.patch 2260 BLAKE2B c3c690490b200e1191013259872ef826b63012161cb5664f11f2e838a632fd010a17d6913bd89c7fc45850c5e3273a0d087081b63964483fefd21f02fee60403 SHA512 f4c7c58e45568303aa2d9308586adb544185f30f72d989928889ef46c9ec44342272a865185cdeef761e5ce4e44299a08de4aff2a7b30efa4cc90a26cca14861
 AUX FBGEMM-2022.07.16-gcc13.patch 230 BLAKE2B f90e3efc20dee725ca1f6b93180b0176090fd314b7049d90285e7d7634af8cacc588560f593d475db73c04c9f14ae620d2ab27ee974e7a473b806254cfb5f923 SHA512 abd30f206bba3104c0b675a52c3320a251b769e9f1ea58a79de351d0d2e57e81265c554e7e8cb505014a1b5d7f7edd77d838eec33bb0fd932dfbc795b1d732e4
 DIST FBGEMM-2023.02.10.tar.gz 854918 BLAKE2B 2af11baf95c1f33e1b1dd6f2a51dde2c991ff0f606402a7aaa539b7bc505c3707cafaa96d8f742c91672ec09a1f18a69f0e69c012b6db11d5297d602b8f4860c SHA512 a59d928150d674c56b5d38f73e62b5f4e2b527ea1f7ebb891ea1d3356e4183e0f469d145fca37fcb1c85f8773cf54226a8e41389fe9783474c457a7bd31846d6
-EBUILD FBGEMM-2023.02.10.ebuild 1552 BLAKE2B 943cd1087f398f6b4fb234ed53db2d8d51f4f7a7a181d27830bc79581e17f5a23482de527b32e0658b0bb8cad5abbcb99993338ec608e64755ef972658af7e80 SHA512 c93dd5064468b2822416229e291ec9856eb900d1c28ff0cdfcb416329d8b193b0023dab6f681a5c4cf30a34ef83b80c751af730fd9aaf6e56227c1ba7ac37ff9
+EBUILD FBGEMM-2023.02.10.ebuild 1578 BLAKE2B 407d9f23a51242ee47727662c0f9c4d5ef0108cadf3ca1bf146cfcca8da345cb50d3a32a312b9c8ccd76b95294e27428ceaf888dd44856f034e20e04edf3fe1b SHA512 c7ca489b0d9f89f59935caac7cbe1074c1611884bc98c066f9c044ee3c4b9579b1da02b0ca307111e9c2e31b198b5fa301d7102a684e2140a835e953d0407eac
 MISC metadata.xml 327 BLAKE2B 860b9c0ecb3b0029c855db0a0054590135f3bd6ec9dad20cdf433fc70c119354518eea50fdbb2a204eb8cc6621de23e6928a2f9ec961ac0c51fd9dae22fa8488 SHA512 3a0d5a69421a41e62ce134636025e0024010c1938ee35f7489d8d870d915a66cd526aa60d107a378dc4522ff71b7f10486e20867c8b424b1b47e458988ebff58
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0f22e8e6bedd..5a2e484d9728 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/clhpp/Manifest b/dev-libs/clhpp/Manifest
index e8a36692aa91..e72ff5532f95 100644
--- a/dev-libs/clhpp/Manifest
+++ b/dev-libs/clhpp/Manifest
@@ -1,5 +1,3 @@
-DIST clhpp-2.0.19.tar.gz 106871 BLAKE2B e8c94f3e242d272a7eedbb13f7ead89cacaffdeca8b837fab29eb023e60efc7eb730b3966702474168071e7c884801fa24f0eedad95f6ea866f27dddb3af4a4e SHA512 f2d37eaee7a46b505844ddf45ae94f5f94241dea0b8f03f6bf4ba7524d7556c9ed19cc2f702cdd9becc469816ffa3d8371ae3561aebff5486cae9b623a10f58b
 DIST clhpp-2023.02.06.tar.gz 106874 BLAKE2B c57cdff048fe80b8fd95f14a77883f0d3eb7a64f7b9fea2661e0127172783ece911f908d7b6597e1b1b2cdfc86c1d841a3047d295a85408ba4c25cb5c8a262f8 SHA512 30252a832287375d550a5e184779881d5b22207a636298c7f52f277c219d3a1ae6983259cfea7bf4f90f0840fec114ee0e7a8c1e6a6fe48c24fd3b5119e7a7f8
-EBUILD clhpp-2.0.19.ebuild 1198 BLAKE2B 70ed65f97b5413e01ac34a7ab9a728f8cf4d81d452879da5e8083dd99099ba8bccb4a0c7b55d293672cca009f8b3b385cd2c7650a5574547efeaad94e11c1a20 SHA512 81b9bea394f9b411266a75aa8ee6068f143e01292ef653464333f83be1fbeef07e5026ac93e3c079ce4303502a73d41d903a9cfeb3a9a7327c735d0620224207
 EBUILD clhpp-2023.02.06.ebuild 1170 BLAKE2B 432565101ba3a3488246e919bd547289e52425566a7de04813d09f980f3ab7a86e1bb1bc6656c17d17ff03aeb919b03d2adf221481990d75a7c3f6ef78d47354 SHA512 b210a9aa237713ce28df0d8e3fa84271ab7197e79f26597f8232c0301de8f2115b79107f446c43544eb7e41d32d443e1a5efa08261af88e052bb3868dd82e76b
 MISC metadata.xml 346 BLAKE2B acef91691221b9b27c8153b22470984b76fb92c720b9017da5cbae9464839c9625ea1d8902d18bf711ef7fcb435a07e7baf781d998881fe8179780d68e4c505e SHA512 78da9f326b7064b15eaf832bda21362f0a6eb495ed6a63c01cafb961d4ec7791c0806bd5f14d774092783fb55bb57012dc5ed74c04d445fce38cf72bc3998f73
diff --git a/dev-libs/clhpp/clhpp-2.0.19.ebuild b/dev-libs/clhpp/clhpp-2.0.19.ebuild
deleted file mode 100644
index 419b89e9488e..000000000000
--- a/dev-libs/clhpp/clhpp-2.0.19.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-RUBY_OPTIONAL="yes"
-
-inherit cmake ruby-ng
-
-MY_PN="OpenCL-CLHPP"
-MY_PV="2022.09.30"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Khronos OpenCL C++ bindings"
-HOMEPAGE="https://github.com/KhronosGroup/OpenCL-CLHPP/"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Khronos-CLHPP"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-# Tests require CMock (NOT cmocka), which is currently unpackaged
-RESTRICT="test"
-
-RDEPEND="virtual/opencl"
-DEPEND="${RDEPEND}
-	>=dev-util/opencl-headers-${MY_PV}"
-BDEPEND="test? ( $(ruby_implementations_depend) )"
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	use test && ruby-ng_pkg_setup
-}
-
-src_unpack() {
-	# suppress ruby-ng export
-	default
-}
-
-src_prepare() {
-	# suppress ruby-ng export
-	cmake_src_prepare
-}
-
-src_compile() {
-	# suppress ruby-ng export
-	cmake_src_compile
-}
-
-src_install() {
-	# suppress ruby-ng export
-	cmake_src_install
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCS=OFF
-		-DBUILD_EXAMPLES=OFF
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 8a8c8864d3fd..e876bbb0f71f 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -1,5 +1,5 @@
 DIST librelp-1.10.0.tar.gz 543414 BLAKE2B 3c7bace3c7892755c943dc4fc9bee7962e6891f5200ac184555da5f552d19d65f5604c745653d06a87210152af9b57f7234636e59257dd29dc83b5dc566c9680 SHA512 a38840231902bec034edb497166deded7577c989e4f735e406c8488384972925de1ca6132b3080472f7919d2439559c8774c02a49c356e90ad791dfbba2a4865
 DIST librelp-1.11.0.tar.gz 546841 BLAKE2B 3645675f7300cca72847973e2414c7ead560f4dcf6d3eb92ae53ce2b279d6a19b792f6fa6b4e9f837710681f0a224c4a85f90091dd45d46aae5ef16180f4a1ee SHA512 e93cbc12fb6e596762c351cdfa3293fea89dd8cf90de4f890771216b56c3f66e3578fefea447d4ca9f754f146712481e7bab9a831f16fcf0cd15b10d475925bc
 EBUILD librelp-1.10.0-r1.ebuild 1422 BLAKE2B 2903609264d612632f564ef0f91afb2880b634bffea7ea1f5472c98a0b6bac96eb37855807271cc4cc5804bd6fa346c977042af6a18b5fe8316089b911a7292c SHA512 e8cee29e74d4d11c06b6ebbe3e627377ab11d6b88f383e6a88d68823f55805d1ed56b7b47ec3325379246928aa1001f47438ed307fee3d8de72dd961ddf606e0
-EBUILD librelp-1.11.0.ebuild 1426 BLAKE2B c89b1469f877e9303d2426a98e6a51404493bc2f73e1b14c0c5e861dec6c7a7b14efd6262060ebead674b43a8b030c153ee5f78ba2e6017a58e4af3142dac9ca SHA512 4f73b94729b3be1141c4091540db43d94c77517fd40b35ce25861427eeb112ec28c54af313c720bc3c580f91d183a75da0ce50758b79878ca71bf1e27344d176
+EBUILD librelp-1.11.0.ebuild 1422 BLAKE2B 13c6c385af5b528a5fd6c5e639aa67c39a7509151c2b9300f0bedc3b7ad500ccdd5a3b1f02eb2751f72d073ed14aa3ca0479d3e18be1299b0a64e70a2f4f8155 SHA512 28d65b94aba799ca96476c9c79be7162d29e83de88953a6edc08d11959036efefe4c2a11605ed623dc49574fe2949f6266dbfcac5e26589cb6c48f6ffae297b7
 MISC metadata.xml 265 BLAKE2B cf265e8518b92ad42867e1f3ca408b8322012281c007b55885d9b530efbd8b5be78c80c6e666975ca445af9340e666e3ecd204636cc6e63c3c6ead8eb13a9ad6 SHA512 6f369b519e83fb49fcb942e69f468d3d0dcbb55e67c9ecf065d6abf88fe1676921761d8297ac55a928110c42b35bf81cb1c9edc5c41d84e45b2c123e8df8a814
diff --git a/dev-libs/librelp/librelp-1.11.0.ebuild b/dev-libs/librelp/librelp-1.11.0.ebuild
index babc703c374f..6f4cf576be1a 100644
--- a/dev-libs/librelp/librelp-1.11.0.ebuild
+++ b/dev-libs/librelp/librelp-1.11.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.rsyslog.com/${PN}/${P}.tar.gz"
 LICENSE="GPL-3+ doc? ( FDL-1.3 )"
 # subslot = soname version
 SLOT="0/0.5.1"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv sparc x86"
 IUSE="debug doc +ssl +gnutls openssl static-libs test"
 REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index 3c7962ec7a39..483c15a829ef 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -1,7 +1,9 @@
 AUX libvterm-0.1.4-slibtool.patch 2251 BLAKE2B d8484447c8a7e352514b298634d3e39bf606a5669cda67ef906f29b4a411737d81277e060fdd01cb14d1d04d329af1207dbeee475baff5cabc7afe9b5573ac78 SHA512 dd8d3b8c192bd6f6b357f7c5849a0b2a94661410e7f3cf5f6301a3cd34884362a54dc3ac593895f186ce3ce3628c2a8804f555107fb57d9a82a91ddd8cdca39e
 DIST libvterm-0.1.4.tar.gz 69122 BLAKE2B 4f0acc9ec6755c4a840e5df6c32c44e12c5316b5c5918d0e8eada19d819736c3e5b9090b468e32b3141a7fbb5ba226e365be27d6d1d9ca22f9f5e365fc3971c2 SHA512 90b5d47417e3f469df5c6574a27d12bd6bd1571d17cab7c4ac0ee61b1dbcb6361987f6fdfd11e314ea32f8958ec165c319a34d0f77288947c7cbc11de697d524
+DIST libvterm-0.3.1.tar.gz 79344 BLAKE2B 2732bc477fb339945c1a9242a8265d182891d507c0dec71371a9e7010434dad0d35152fdeaa32bbf50fdd4bd138bb42e8d95a9771c704d693032e32d37a87452 SHA512 1f4bbee8847a9c8cfab3831a3512b866eb0f90f7d3600c4583d2e1eac18458f21bf5ca4fe4b067b27920a04aa7eac5dd2d4a62f6b7ebd56a417fed60d421853d
 DIST libvterm-0.3.tar.gz 83861 BLAKE2B a2e8e9d80698880d87f9d26977a4e3dec7b520c3096d0ca6f7823254eeebe51666380ed2a5c05c923dd8b138f15c87e671fdfb03e5511c01711e112cdda9867a SHA512 2a7b6831476465d6a9f7c792406f4e3c4eca0c3dbce4b7031f2646c87e33692128a3d3ce27e1541403772cc0b5eface7bd41325e1e5300c3915bfc0bac97a896
 EBUILD libvterm-0.1.4-r1.ebuild 728 BLAKE2B 463cd2bf20ef1c8eba98789969bb2dab24599a2923c13e204d73ddbe407cd957ed37938f388603b4a542b71b369eed2aab249f3061c0c7b417f1e365b4fd5085 SHA512 45bdbde642172c252b94375f44207a1a011cdc5fd36a2330ced3434c9059dcb27277f076ba5d82542b7851f4699f3f673da3c85295c0e4c2ef1cfd77050f3f05
 EBUILD libvterm-0.1.4.ebuild 882 BLAKE2B e4f2e22e191ce35883e9fa2700222e55b8c5d482251aa5dd9f35d982fa18d20371ff3781a5962a07aeade487ee0c0e4df474023894c035154aa79425e477dc81 SHA512 70201223cdcad83064d87b949525040294d925002e4b12faf318353a211171a596d3992413731c8d71b377bc866095d9811a4bb110d03b414022b1bcf64b33e3
+EBUILD libvterm-0.3.1.ebuild 784 BLAKE2B 6386264c52295290847282f278913f16d28e997086b4f3b71aeff79fe0119e45abf1ba18ebf484ad36d2feb7de5002eeff470b5c5109b3f3b8e4a0e2b1895916 SHA512 7280f10d4d6639ddb83479c405aa752dbd0d9c3a875f77c2615d6f5142bda1ce4688f1032ac1124c9131500994959deac3b34e3395dc2c6855ea1e4fb04560ae
 EBUILD libvterm-0.3.ebuild 781 BLAKE2B e682022ece50942097978bc495d829f08f4ab90f7db260a248e5d66320793d9c518baceeb7cd25bb8aaf09c472c6a045788ca5151c9e4f34afe55a74f452ecd8 SHA512 5e4fe08cc4a84591aaf4c417de03f270ab727e5955e36b80f5aa85cb3bc3e29c76cfda6ecd9dccd85f886e153ab9efc24dcd3340630d3b37b0c009108c0bd75b
 MISC metadata.xml 326 BLAKE2B 1ede96c6ed5288e9f8603f2c1fd2daad8bf48384c09b01de355628fd970e3f252b6d064cff58d70fb5838cdf0edaa71c6d83e65f240e0ce48559ef74cbff43b3 SHA512 951e8795d8482cd230a256c4084f5d0e28d9cfb7fdae75f239f72b7d67d900c9545b47bdafc8260eec393c302eed4fdd70912e965521312705fcb4ddb281d814
diff --git a/dev-libs/libvterm/libvterm-0.3.1.ebuild b/dev-libs/libvterm/libvterm-0.3.1.ebuild
new file mode 100644
index 000000000000..25cc462c9ff5
--- /dev/null
+++ b/dev-libs/libvterm/libvterm-0.3.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
+HOMEPAGE="https://www.leonerd.org.uk/code/libvterm/"
+SRC_URI="https://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-lang/perl
+	sys-devel/libtool
+"
+
+src_compile() {
+	emake VERBOSE=1 PREFIX="${EPREFIX}"/usr LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake VERBOSE=1 DESTDIR="${D}" PREFIX="${EPREFIX}"/usr LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+
+	find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
+	find "${ED}" -name '*.a' -delete || die
+}
diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest
index 4bcc5326c67d..f6ba201d854d 100644
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@@ -1,5 +1,3 @@
-DIST opencl-icd-loader-2022.09.30.tar.gz 87782 BLAKE2B 78d4c19d71c212dbe43a22d9e9504f9d22c3c5b5d078b9aa5625462c5591b87fdd472532d80e594b2a4e7dca1f10a5093bd4dbe661a23c3dbe254868b07e7b40 SHA512 0e7161f61c58f4d05f2a5f611560da1e57dfcc95184d25676cdc19f6e2136eca11cad4a87c769f2bff416928efa168220300749dc7607151a0e34a6c1b751295
 DIST opencl-icd-loader-2023.02.06.tar.gz 92484 BLAKE2B f86264a57533e67816711dba86e4f34920d5b1a605a6c0fdb01314b09eb9ced2022b1d25a88dfff58356ec8cdcf8ff8b1c857d49ddf196a4506e4e3420e3ace3 SHA512 e418b8f3cccb4716ed44acd0677afb96705f8b40a7714d483f1efe1a9b835f4a823c5a80f8457e72c8004f76d8a07c45d9cca55b699dd2fdaa6fe9f8cc863cbd
-EBUILD opencl-icd-loader-2022.09.30.ebuild 856 BLAKE2B 8bb3eb90e665678e6a13d08fc2ed9553fdc2d7f08f915da342b02f435074408d3934fb29cc4da4bf5929d75f445fa8c0b8d9cc5d109e09a7cee98452a08468e5 SHA512 debc5c067ba27e3da735ddd6eaf4abcd5db5dc864ab2299c3b9aecaf78cd3abf4926a361bc8fb0e139394f7795675af0d4fbf8220c2041b5c32a512467ed5407
 EBUILD opencl-icd-loader-2023.02.06.ebuild 856 BLAKE2B 8bb3eb90e665678e6a13d08fc2ed9553fdc2d7f08f915da342b02f435074408d3934fb29cc4da4bf5929d75f445fa8c0b8d9cc5d109e09a7cee98452a08468e5 SHA512 debc5c067ba27e3da735ddd6eaf4abcd5db5dc864ab2299c3b9aecaf78cd3abf4926a361bc8fb0e139394f7795675af0d4fbf8220c2041b5c32a512467ed5407
 MISC metadata.xml 341 BLAKE2B b49a18b36fbbf0c978ad2445ee4688f32cafd66001f04e02256a420b9dd1e808f85c32e43adb15e5814957f5273a135f82c5fdfe37baf7e6fa73abe2c8fcd990 SHA512 5dcf111b1e5ec3e7532258ed2e29946cab993051193bec1413096b52148117c935b028e071c501863620c4a51e81aee333b9e4375caa14fdab3701524da99268
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.09.30.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.09.30.ebuild
deleted file mode 100644
index 9475bd7ad873..000000000000
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.09.30.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-MY_PN="OpenCL-ICD-Loader"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Official Khronos OpenCL ICD Loader"
-HOMEPAGE="https://github.com/KhronosGroup/OpenCL-ICD-Loader"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="!dev-libs/ocl-icd"
-DEPEND="${RDEPEND}
-	>=dev-util/opencl-headers-${PV}"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	local -x OCL_ICD_FILENAMES="${BUILD_DIR}/test/driver_stub/libOpenCLDriverStub.so"
-	local -x OCL_ICD_VENDORS="/dev/null"
-	cmake_src_test
-}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 4c459c8a1ac7..ba93d5479ff7 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/calver/Manifest b/dev-python/calver/Manifest
index 75e27f54e56c..cbd6db05722d 100644
--- a/dev-python/calver/Manifest
+++ b/dev-python/calver/Manifest
@@ -1,3 +1,3 @@
 DIST calver-2022.06.26.gh.tar.gz 7601 BLAKE2B e4bea1dc8954b4f65003cb06dadebfa6a7ad0554d64c23e5339652955d2e4659ffc093b8d11d284e03bc74267059a10043a45dd1eb7717378fb22327d6409428 SHA512 4d436cead8930cae1a71eddef9f0ecd2881f8cb632c3814dc75390b061a909e7ca969a604a5fded1c66647947856d540e2180bd3ce4bed5087b4dbc9d5edb393
-EBUILD calver-2022.06.26.ebuild 632 BLAKE2B da4b5dc2e0de8c6d35f86aed61675eadbd7d9b340a766e9fb59496961d840d736ae7b33236d0772d728a8932df949b95098e044fd965d83ae3087888012652b4 SHA512 802fa539814f0998a4291b698a29237df34a9b1313e2e3a39a2b764c4a702c9d6f37cf2871b727cd9b0772d77b57ae4caeafa3dd0dec13a50c33cd53c01d3c77
+EBUILD calver-2022.06.26.ebuild 638 BLAKE2B a3054434b1a9f06c52da4e1ab487f6213d88cf1216db87bc19d6b9a6e32274dafcec70772e5d7f3ea98a7a43304542b0234698f255204429fb205a490784dcac SHA512 11976c785de901d8a4fe6b4e27a8e0f9753834569d0ddd3c8f48e87423e38307bd22334b6149b335ce9992b0ff8fe7a5df6f526ef064f2bac3fced670cc2109b
 MISC metadata.xml 337 BLAKE2B d1215a2b0ec479b37caa4b8474201c18ad555e344d49ce25ff7c2cab6f117ec3b2b3d14320e8d91706be93f6dfd09f87df4794a729512ac5f88cf70b4f158fd9 SHA512 d37ecb1686abb7257053e2ec74b26f00d9640c63f590776a3c43c440d7ec7ecf9733506f95ce096439f44030f172307d3624d5e9c825a776ee6d8d04c455a4c3
diff --git a/dev-python/calver/calver-2022.06.26.ebuild b/dev-python/calver/calver-2022.06.26.ebuild
index af54f4001d70..1cf6989fa971 100644
--- a/dev-python/calver/calver-2022.06.26.ebuild
+++ b/dev-python/calver/calver-2022.06.26.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 4a867432aa1c..95dda8a01ef0 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,3 +1,3 @@
 DIST cliff-4.2.0.tar.gz 83168 BLAKE2B ac2d288ac3728f4266d61edb9b6aedc897e9020d3f8a74ebba4721530942a27335564c2a95406a4d6b5374df49e38bc0aa303d3aff12f83c91e48c59f13aa45f SHA512 6f0c31b49603be5289e6d4c9b2572862e977264df21dc14d976289c627909102d672ee8ffa5b6cd79b3a349158ff8f36444a2d2061e18eeb7121ce79b2d5719b
 EBUILD cliff-4.2.0.ebuild 1120 BLAKE2B cc270e274c76f5621069615eb3f00889d8138b0dbc69067371de88fae57b8c5e526d0891c2c5e6d3a2e81edca76952cc7f6959c113957b252dd10972883dac6c SHA512 0fd472d4464740f7b6dfcaf932d386809baf1c8f97a7f6e35b161f7c669e364fe7236c3663a346400919ffa3c1e8b6177d24c8938336ba8a14b7fd43ab9da409
-MISC metadata.xml 767 BLAKE2B d9d994960046172167f20f59073011b2defe84e94144386db5465a973050e48e05abccff88d7f84cbe9f20615eddc5b61a46920f8b27c4dc9b2587f762f3e368 SHA512 018a0bfac3f0126341207d16203fab4a666b17d8a5dcf9f101335c396797f2e724e2250910fca39e12cb6616614983a756a42dac03aa215d2a1b51af5246269b
+MISC metadata.xml 712 BLAKE2B 367482d2ee04af7b55c217aaa49b5784333f66b1a25dffc0bcf5b639c90d69df0002feac780e36ca7a7c40fd40be424c8116389fbaf9ad5547ffb7f2f5f34697 SHA512 dfcdcdb8f473a5f9caaf281f3c408b21c15dee411c71f45ac0c2f79d2ce2ab5aa29bc59d5fcb1ee13db033509b38c27a3b9d5c07b6bd20a10e9933632f9f5657
diff --git a/dev-python/cliff/metadata.xml b/dev-python/cliff/metadata.xml
index 5742627c8671..d77f98508ed6 100644
--- a/dev-python/cliff/metadata.xml
+++ b/dev-python/cliff/metadata.xml
@@ -17,7 +17,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">cliff</remote-id>
-		<remote-id type="github">dreamhost/cliff</remote-id>
 		<remote-id type="github">openstack/cliff</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/ensurepip-wheels/Manifest b/dev-python/ensurepip-wheels/Manifest
index e097dc22ca11..70bc8479eb32 100644
--- a/dev-python/ensurepip-wheels/Manifest
+++ b/dev-python/ensurepip-wheels/Manifest
@@ -1,2 +1,2 @@
 EBUILD ensurepip-wheels-100.ebuild 417 BLAKE2B fde456b6497fb25a0741fe04002795f9385a2317c6d7cde6740301dfa5f8d169ece108d5d07adf6eebe7c97531ae2b7c613d70e4f757c951c1289e9a41910fed SHA512 9773f450fbc8eed24169d7753f09a38b661fce0856567c9618ffc2a620babf7d4cc839b435e5b04f97dca9ad392b505c06b92da41ebd1eecbf6dd71bceb6264d
-MISC metadata.xml 357 BLAKE2B 2275bcbbf65269212f67a4524163fd07ae84c50ec48533b758e600c3d9e8e54db416d5e5a6d0b08f05a82b9c6adcf7df5ccb1ad3c760f79a615136c13235f7ed SHA512 0c30429f2ee7956f92537dcea88ed5e3598575a4b9b64935de0f437791e88ae3c9991c5759e670e7a1cba478a87be7675c4864a707d6a51d9b25540074f14963
+MISC metadata.xml 243 BLAKE2B 3c6936b8f9745e6fb81fda204eada4f73210288cdb19a90b1cf913ed01d6ee9155d4a69bc5dcaf8c69a21123339626610d7b57729981a9d10800b85501baa120 SHA512 50af947c4f1de2f27e6bd29010dda35e92d2e0477bfafcd4d44ab218d2a47788324aabad58b603ef5c30e69b382084e7dc3cecc581cc0ffbbdd71ed566772a44
diff --git a/dev-python/ensurepip-wheels/metadata.xml b/dev-python/ensurepip-wheels/metadata.xml
index 406eacd7f9fb..7d421671d884 100644
--- a/dev-python/ensurepip-wheels/metadata.xml
+++ b/dev-python/ensurepip-wheels/metadata.xml
@@ -5,8 +5,4 @@
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">pip</remote-id>
-		<remote-id type="pypi">setuptools</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-python/hatchling/Manifest b/dev-python/hatchling/Manifest
index b7aa48e3a44f..075f9079226d 100644
--- a/dev-python/hatchling/Manifest
+++ b/dev-python/hatchling/Manifest
@@ -1,5 +1,5 @@
 DIST hatch-hatchling-v1.13.0.gh.tar.gz 383610 BLAKE2B 0a3dc20f6c1c504c94c09897e23e6ade844318488093cf849e332cf08f7be178ddb3ae61d8ff01af93438c01216b056a3566e9d8758a0151e4d7498447a9524f SHA512 fb14e1d088676dfc2b76dda207aa514232c3c5b8472d7332c0d53e0bd4dbd1d0e3bd1ac9f261f72e1a32610c565485f5e382fc7071e80066735a04eb8cade13e
 DIST hatch-hatchling-v1.14.0.gh.tar.gz 378144 BLAKE2B e4fe0b22053e5be1ff330e96ad053e0461aa4e2ad1566313f03f265d42c7b63de8e3e7e7a52fa68639c4bdf4815e22e4040e8511eb43185cb3e7c8cf4d85ff92 SHA512 79a446c327022337c8c9e090c0aea0471fdad0a6c6d384797832bca09ece66c3b854c9626afccbb4fc49a9204ebb1e59a2ee55ff358b0eb1b10b16ddf7b4952a
 EBUILD hatchling-1.13.0.ebuild 2094 BLAKE2B 2e7a1d5a394a93f6d58a50b039fc9297393513803b0ae7bb551680a32321ed5940577acc02e6988865b0b026e0538f9b6efe24a9770e8c771ea5138e1de16aec SHA512 1cbe612df37be3a58213f1defd8df82469313a009cd77a9774e7ea16c615efe8fb0fd4127dc7e349daac0d9c1dd49fc3ff7629f14719f5d63dd4382c05514477
-EBUILD hatchling-1.14.0.ebuild 2119 BLAKE2B e9785c0348416045ebd818dc25d98fe7085ad2a20f8bdde09cf5d19417e2624455ab82e4b6aed6b3f31f3dbb7412670f35b52aaaeb4d3c87a88a8a329fc2042c SHA512 acf8bf13ae85c7bfc01bb7c4263ae13f8de837936558ab0a3af33399b11d8d00ceddb354b91cd2ee7ce665391b2fc030d42b28be5a8b37838e015d028f6ea494
+EBUILD hatchling-1.14.0.ebuild 2125 BLAKE2B 81c87009337bf2d4655ef0efe24ba948b7b5b2da2d8ea8501214a4afdf0b38efc857779e13337cafa11c82cf16ddf056495206945442f533cb2f8cc4011bc3bc SHA512 c2a0dc915c9734abbf02b94c5f2758ecaeabbd17462f706a4e2b4d1f5945f5f1fe0ff46b82278409ddce211182569e4955abb7172015c483158a93cb0843c18a
 MISC metadata.xml 365 BLAKE2B 5a40a6cf6df042e6e8387830babd0171c9d8bc5d490fe2175b83d1588d827e826b49044ef29de48553515996b742fc475bb9699dcfa8ec05229162b22e0ed317 SHA512 f11bb25bc12c2bb0b0a0a4691115b9a2af525d9e44b33e0d6db98c7fcef0b49b5989fb7574ee8b27bc88f1dd2543bfdd492a6614de172e2c4edabbee8bf6161e
diff --git a/dev-python/hatchling/hatchling-1.14.0.ebuild b/dev-python/hatchling/hatchling-1.14.0.ebuild
index 1b8a6db7d50b..905e8e72e009 100644
--- a/dev-python/hatchling/hatchling-1.14.0.ebuild
+++ b/dev-python/hatchling/hatchling-1.14.0.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}/backend
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 # deps are listed in backend/src/hatchling/ouroboros.py
 RDEPEND="
diff --git a/dev-python/trove-classifiers/Manifest b/dev-python/trove-classifiers/Manifest
index 5ad964d922e6..00d920f74a44 100644
--- a/dev-python/trove-classifiers/Manifest
+++ b/dev-python/trove-classifiers/Manifest
@@ -1,3 +1,3 @@
 DIST trove-classifiers-2023.3.9.tar.gz 15792 BLAKE2B 1b96dae0f4a141ab5a5e4f3ebe5fbede972b6d09cd289bded3192dfffb26dd68d85bdd46bec20c1b9fb83dc3f8c521e4512a995fe5950c07c9ccf8d53986aca3 SHA512 a94b4c6d7102934677c4debd55274770d4de7db9ad641a253e4718f65dd4b624a4b0c8f6e83cdaf5ea484cecc975baf8dcee0e50824fc373760b8c5cc2e25f89
-EBUILD trove-classifiers-2023.3.9.ebuild 649 BLAKE2B 6ab2b39559de1e0d8ba07544a0927054f19d36ef5574eda2698f22067ba4ce989a9333c397738b21045ce73f14efde08862915c1f17944315708e3004a5e2ef6 SHA512 192695d98cc276b047632c8ad6617b01d216ed51d2215676beb9abbfaa622e68da67d20212d3732e093f200076a450145adf40a66387277e568b2f4c4ad6d9bc
+EBUILD trove-classifiers-2023.3.9.ebuild 655 BLAKE2B 4a4d0f3f98335c88bac7be8aba66bbe73ebde3f4918910ac15528312d462430e8c52c6eae715baee5d3e5e8ad94b351c1fb9721fd00e9e52e3f9ead0f3ad74bf SHA512 170afc44cf017ef9ecd9b87e44e327b86a5c545b82c7a52f1061a4f3b01ba52e643914c25d37a95ac53026b32ec9e9c6ae46e93d4cb0208cc9e72137a9013578
 MISC metadata.xml 361 BLAKE2B fd91e587a440e18c3030c6ae2992cda3d70ddb506eb78dfdff7b3e8b2d6456fd0cb13b56a7cb360bb80cdb38686d52938b5d6e9d873071e20a0802b11836181e SHA512 d34a508b050c6f1148e8ff6175b7f5f3dfa8aace0be8c02a01dae94b3824e7c1995deef16e5ad518e4260f51814dcab5f2afbc8b13126b1babe117746bf99ab7
diff --git a/dev-python/trove-classifiers/trove-classifiers-2023.3.9.ebuild b/dev-python/trove-classifiers/trove-classifiers-2023.3.9.ebuild
index 12071149d8c1..b636b59115d4 100644
--- a/dev-python/trove-classifiers/trove-classifiers-2023.3.9.ebuild
+++ b/dev-python/trove-classifiers/trove-classifiers-2023.3.9.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 BDEPEND="
 	dev-python/calver[${PYTHON_USEDEP}]
diff --git a/dev-python/ytmusicapi/Manifest b/dev-python/ytmusicapi/Manifest
index 92dc7d85d3ef..49e6a2d16fab 100644
--- a/dev-python/ytmusicapi/Manifest
+++ b/dev-python/ytmusicapi/Manifest
@@ -1,7 +1,7 @@
 DIST ytmusicapi-0.25.0.tar.gz 61709 BLAKE2B 7a4f0cf52d8d1a5e3310c5df39435d317916562f7d0277b0518e03193daf7995333853c4baf026ed0331ac1ef294897f034b7c97765764a795f34b7581f1788e SHA512 6c131c7c6d808d5a3c02795d5d28e687d92223fed809701d76318a145c7c82c12266b04f37aacb78750a4249f53e759dc891611dcb2edf61fefb19f133072d24
-DIST ytmusicapi-0.25.1.tar.gz 63263 BLAKE2B 68d58cae804c0257e0a8e5b61326489d867da084349f386444c87ec06217e07b4861bdbb5d04407bdd5420867fba126ec23d458d9c90b169a11689004f76a709 SHA512 a178d3f954f1ce5e1ae9855508ccbbcb5be7ec51aedc8dec98f15cd8a8585da54282da4f93857abc009516edaba0ee0597f616c9907bd83ac29ec11d08b320ea
 DIST ytmusicapi-0.25.2.tar.gz 63496 BLAKE2B a3409c29165871a90aef7951e63bd676db0f37a1a027d43bd56a0caed2cfd708f4a402168566a45841e9c500b0c371031f6b470598dea5ca880b7f9029e62d96 SHA512 cbdf327f51f4b1836c7cb14966b6c88b7d1b3b338779131b75aa9c12e96a9bb1d9f232a0a2e732bd12758a0d90e4f0600848ea99bd11a456aca8be502724db07
+DIST ytmusicapi-1.0.0.tar.gz 67193 BLAKE2B c0d2a7580f734d8b34e90a004e9bad7d1fe55c53a22a8fc71399ffe80c0c56fef7d2c4ef99c7b3c97db5d0e087d5a9e4ce48df78e3b257b09d40ef281a953f5e SHA512 27b492d60dce637f2b9defb868c0fdeb270fb0eb4082adcafb5fc314b6fd505ea7e5a93a4596405cad6957caef96e92367dd9bb736cd98a6ebdeff2fc76cf3f7
 EBUILD ytmusicapi-0.25.0.ebuild 503 BLAKE2B 276d9472f84a0fb37daa93c00ae142aa7ed776bc98295bb627db2da26928e0c40c7a45d54bdc7769b3ca8bd4bd1ca80d86f79b46794579c3c8bf55feb6181eef SHA512 3f6c02ed0a5ebc92c48dffe7b54c7edc0a6983327617e5ae0139e0b59d77e1897f55a85d86c17a63ec3af558ae7693262966c064a2483f9fb87a7e84e5c508e2
-EBUILD ytmusicapi-0.25.1.ebuild 504 BLAKE2B ed64585f3d92a8034283d5516f454b8a99adb67d1c0067e4dc6e0e85be31a9392b1932b5d64487b1c0817f13607cf4ac16ee3c5d50d0316df93a89535d675cf9 SHA512 f9825708162f4661d96df20510350c10356d866338c67e7346359d6795c8ea34be7c1bdf3fdcd7a53257374b632c17d4db1c47d34113e642c976ec3d307d302b
 EBUILD ytmusicapi-0.25.2.ebuild 504 BLAKE2B ed64585f3d92a8034283d5516f454b8a99adb67d1c0067e4dc6e0e85be31a9392b1932b5d64487b1c0817f13607cf4ac16ee3c5d50d0316df93a89535d675cf9 SHA512 f9825708162f4661d96df20510350c10356d866338c67e7346359d6795c8ea34be7c1bdf3fdcd7a53257374b632c17d4db1c47d34113e642c976ec3d307d302b
+EBUILD ytmusicapi-1.0.0.ebuild 504 BLAKE2B ed64585f3d92a8034283d5516f454b8a99adb67d1c0067e4dc6e0e85be31a9392b1932b5d64487b1c0817f13607cf4ac16ee3c5d50d0316df93a89535d675cf9 SHA512 f9825708162f4661d96df20510350c10356d866338c67e7346359d6795c8ea34be7c1bdf3fdcd7a53257374b632c17d4db1c47d34113e642c976ec3d307d302b
 MISC metadata.xml 589 BLAKE2B bf51d5de92082a99ffb69839a9cadcea1d740f05d83194b951383713bcfbc4c95021ef27382cc6020298c3b8817553549ba150876c1398094dcc9a7de38bc04c SHA512 d34382f0041b2f74892661880ee7a318d7571254b18bf41d1152560e06f8d1b2da7432b4e9eb8a0d8b6cba645da9a3bf9c6a7c33002471a17d8c516c0aee8f70
diff --git a/dev-python/ytmusicapi/ytmusicapi-0.25.1.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.0.0.ebuild
index 3d685ec4c091..3d685ec4c091 100644
--- a/dev-python/ytmusicapi/ytmusicapi-0.25.1.ebuild
+++ b/dev-python/ytmusicapi/ytmusicapi-1.0.0.ebuild
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index b647dd71d644..cf5a32a79b5f 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index 3da644bf401a..4afcc702a728 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,5 +1,6 @@
 AUX backport-pr-962.patch 1773 BLAKE2B b4eb227a949136143a98e8a5ed9067599d3a4ec14376c52619e2f3db56906ed028f9be889aa6eea5abe7e7ca9c3196208ede7dc5768cba43ecf9d000f1e3e1da SHA512 dc6a17bccde42b3a64e7de3bed5fe0818a4bfe9e109b665ccf06963a4939fec2a77e3fcff073cf3a4feccb68d3dc05bbb4885ebe53c2060965e114041c9e3ce5
+AUX fix-regenerate-types-conf.patch 906 BLAKE2B dfeb2257e4cf63de918a194a74ac367bbe5755c6104a1c289adcaf04805623ffcad3ac553b07e063aea468fdc9cb3a904fa86f22b40f22a2a5d68b23aa01baae SHA512 6c6c8518e7bebe55a64ea4469b8649f13c4ac81266a1788ac88229438084a894d222907edcf9aeb28587531e95a33644c58f53890a1b3cbcde181365c4352875
 AUX pr-957-sparc.patch 1681 BLAKE2B e08a03d5e054ce030c04cb0645ed2683faa9d0ec8782313464112e3dd3adf0b8ee40f7fbea9aec15ee7590189e93f03617fe06b506e2ea049535e48bc33a8f23 SHA512 32bd488a3cc4b0c81d8f7f9f2875e591b8de7bf741b838aab3f20ea64025984b3d83c393e1e8f0b628f009b2473d381139655f965cc746dc9074cbe57171cb7d
 DIST ffi-git-1.15.5.tgz 168139 BLAKE2B 2ddd5bd7bfb7bcd39b6d740cbb1e0f4cd419ce6cb4ec12926f91f254b3f3142bc6166728a81a6f23dccfbf7aec911c63237c20fb0e2c70d30d48f4648e352585 SHA512 3668bafae936bf5010f014fbcf63258b023bcc318882775e7d2fcfc11334722ec2b6e8a8b9c910d406889fb173dd503c5c13f5af8e4f6927921f12f688461707
-EBUILD ffi-1.15.5-r1.ebuild 1813 BLAKE2B 1f46b8434f5fec974a489978e3134a347892aae7f05331b8366c1a836d2ee2349e50099145b42f756d16cb2088c60d7863dec475adb75c8adb72fee34c9a6394 SHA512 f9e05a5e626d78baff158a21d6850066e0accfa0f42934dc91a5812225e63b5b9987ef3be7b0dc06927a8211af95b071f966c1f05c9fb76a62ec75d2f1e7478d
+EBUILD ffi-1.15.5-r1.ebuild 1852 BLAKE2B a8888b6e45f06c3e45d347d9a057170acc1d06da9fddcc2816f96bc2da0488d852ce29c754c572a30db7ba7993a8db2da2043a5a0968a128d2ddd2f3c7669070 SHA512 5f67ec6e50b63fce07ed252a70f6e6088b25683ef3e8ab36132992d56460bd2616aa2f61c1822656979e0199fdbff1cd12852bdd2bed09c88424e74f1b952e80
 MISC metadata.xml 334 BLAKE2B 02ad2c909797d4aaf2a23497611777a790000683866cfbd9d12c4b19cca6de902e219584c4edc85c46b4b0dc51c63e770506a077a4c1052b46f8df19a9588c15 SHA512 e72dc6ce177ad3881f5465f10cd44ca6740b7603ab4e55cfa9e6088be3c6615abeefaee4b717e76fab2850c64d66eee626115544e10709f64c4187f1987bcfe3
diff --git a/dev-ruby/ffi/ffi-1.15.5-r1.ebuild b/dev-ruby/ffi/ffi-1.15.5-r1.ebuild
index aa69729ffc73..cadd0c23bbbc 100644
--- a/dev-ruby/ffi/ffi-1.15.5-r1.ebuild
+++ b/dev-ruby/ffi/ffi-1.15.5-r1.ebuild
@@ -18,23 +18,23 @@ inherit ruby-fakegem toolchain-funcs
 
 DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
 HOMEPAGE="https://wiki.github.com/ffi/ffi"
-
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
 
-IUSE=""
 LICENSE="BSD"
 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"
-PATCHES=(
-	"${FILESDIR}/backport-pr-962.patch"
-	"${FILESDIR}/pr-957-sparc.patch" # submitted upstream as https://github.com/ffi/ffi/pull/957
-)
 
 RDEPEND+=" dev-libs/libffi:="
 DEPEND+=" dev-libs/libffi:="
 
 ruby_add_bdepend "dev-ruby/rake"
 
+PATCHES=(
+	"${FILESDIR}/backport-pr-962.patch"
+	"${FILESDIR}/pr-957-sparc.patch" # submitted upstream as https://github.com/ffi/ffi/pull/957
+	"${FILESDIR}/fix-regenerate-types-conf.patch"
+)
+
 all_ruby_prepare() {
 	sed -i -e '/tasks/ s:^:#:' \
 		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
diff --git a/dev-ruby/ffi/files/fix-regenerate-types-conf.patch b/dev-ruby/ffi/files/fix-regenerate-types-conf.patch
new file mode 100644
index 000000000000..1c1cca1c7d4d
--- /dev/null
+++ b/dev-ruby/ffi/files/fix-regenerate-types-conf.patch
@@ -0,0 +1,23 @@
+https://github.com/ffi/ffi/commit/19348fe09e1aeb08424abdf331c3497159139f20
+
+From 19348fe09e1aeb08424abdf331c3497159139f20 Mon Sep 17 00:00:00 2001
+From: matoro <matoro@users.noreply.github.com>
+Date: Tue, 14 Mar 2023 21:03:33 -0400
+Subject: [PATCH] Update gen/Rakefile for Ruby 3 compat
+
+Ruby 3 changed the 'mode' argument from an option hash to keyword
+argument.  This change is backwards-compatible with Ruby 2.
+
+See: https://github.com/ruby/fileutils/commit/482de6d397742526d1111576e2791f9b7051e3c0
+--- a/gen/Rakefile
++++ b/gen/Rakefile
+@@ -9,7 +9,7 @@ logfile = File.join(File.dirname(__FILE__), 'log')
+ 
+ file types_conf do |task|
+   options = {}
+-  FileUtils.mkdir_p(File.dirname(task.name), { :mode => 0755 })
++  FileUtils.mkdir_p(File.dirname(task.name), mode: 0755)
+   File.open(task.name, File::CREAT|File::TRUNC|File::RDWR, 0644) do |f|
+     f.puts FFI::TypesGenerator.generate(options)
+   end
+
diff --git a/dev-ruby/http/Manifest b/dev-ruby/http/Manifest
index ca9ca9543aad..64597de71e37 100644
--- a/dev-ruby/http/Manifest
+++ b/dev-ruby/http/Manifest
@@ -1,5 +1,5 @@
 DIST http-4.4.1.gem 75776 BLAKE2B ab34a6a567842d52f9b7cbe3fc3fb8e4757f5cf1303deacdf2f2130a44e82fde64f0db561c3f8fc28100faea277a9c4a9352f95e6cb1359730b34e83a7b36d72 SHA512 6e43a8ae379d7c8a807a9a03c87bfb5ad1719f9838e26ac7a695220ee2bc50344accc2db268d30da175328fd5468b87ec8532d17ce42a5b74d6c2c4c281d1bc9
 DIST http-5.1.0.gem 81920 BLAKE2B cc80149b89eabd5c6b468ffe28b33e17845bd996fa3bf8b9c38c517fe79994412b376b3bac365e8debbeb272cf4333aebd398d1955a358faa27ba9f124671443 SHA512 b99da5318da54e7b64abd48df0b68cde9a02e1ae92b51fc43302e3dea28ba9672e2b7a25e31c342235835e16b2e1b98c94b6d4efa7916a0aa99258fc8290260f
 EBUILD http-4.4.1-r1.ebuild 1655 BLAKE2B b4aab0ac50e5c6a92b9380b94da5750df06123a143844edfb81ec999fc48abea0ed79eb3634694629ef2391592ce8701cd56be906c4c65ff2764626ed14cbef1 SHA512 831d09d20dc6f96f26bb47e89bc814f4f5947e755920d788b8fab0254bb471648fc95bff0feea19b439063896b81bca2db75d8d387eeaf0b8088ec7239fb2cc4
-EBUILD http-5.1.0.ebuild 1843 BLAKE2B 7d0ca726ee42179a1634526b378106d411476f97995d3f547df62c353ffb313c453a30b3a1ca2108f5acb9aeb5527f0c48b5a476a8faa8af4fdcd8c42c1fca4b SHA512 8bb0976f7d1d84ca993561a8bde57fd28b0501de034e85db5572c1e53679eb04ff919f662eb546ebb3bb676ca9f9ab3c10195cf7a7f1f6d3bfdc6c80ba1811f2
+EBUILD http-5.1.0.ebuild 1862 BLAKE2B 4b4cf02b4203738f83bbd83ec9c15cb370265781f0942ba7f3ae9b1db5db3f03a24cd1f22acac05779dc6c033513923d9d38f62c7cb89dc7b7d799d04e8c9169 SHA512 8f919abe5d81ca64d895aa893399c876a6f6a414bc1f6cd041b1d50b4147cc9ce149b4cd3d839d429a69e5f133ec7919827412b82fb90a02e364d14fc7eca4c4
 MISC metadata.xml 340 BLAKE2B 3f69f47d5faad39a2de9cce22c25a490645c3ca3b9bebca74e2c19bec16d5b05927e4d0a56a32d615c26d01513bd82ee09e13ab0b1b2fc9cd02f7e5723d8db34 SHA512 6cd51992e506d9df562267d357d7af6ff55aa2e9cfb8b1147b6544f12464a02c0c28b08bb5a4c00e3cb084b4f891f78b731c4bd1f8988f7d192d15986c5b2290
diff --git a/dev-ruby/http/http-5.1.0.ebuild b/dev-ruby/http/http-5.1.0.ebuild
index 213880e6d088..e47900e891b9 100644
--- a/dev-ruby/http/http-5.1.0.ebuild
+++ b/dev-ruby/http/http-5.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
@@ -27,6 +27,7 @@ ruby_add_bdepend "
 	test? (
 		=dev-ruby/certificate_authority-1*
 		dev-ruby/rspec-its
+		dev-ruby/webrick
 	)"
 
 all_ruby_prepare() {
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 42a919f7f9a2..803b8b858399 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 1598bce25718..5b992059f06d 100644
--- a/dev-util/gitlab-cli/Manifest
+++ b/dev-util/gitlab-cli/Manifest
@@ -4,7 +4,10 @@ DIST gitlab-cli-1.25.3-deps.tar.xz 35966236 BLAKE2B 63fbcccacd6df665219d5196983c
 DIST gitlab-cli-1.25.3.tar.bz2 16771835 BLAKE2B e36003e41649b3fc5289033892525130f9965a02095e30baf93dc7179a61ee336e12b57a3892c94259acb68717bb9fea3074985a29cf51afd28596cfcc3d864d SHA512 f916ab28d10e851a0fa389487fca4650bd0ea5b612213a26497838d45c77efcfcccbd6dc6500debedc8cd869afec0c3f0b2bf95cf3d5151ecbd0b9c793af1063
 DIST gitlab-cli-1.26.0-deps.tar.xz 35962880 BLAKE2B 895a442b5a8d259fccb58a04374d8abe88792392744ad748bf448ae5cbf5cb5927ad69dee6def59afc781ce6aa477c84d3ea219f79f069b98b09140f11cfccd2 SHA512 69e16358c60a0a71564943a2095b2055a11d6028021a77734f8b06b5348ac848a6a4bdf1f08b8b7af5bf344a66042fa7d8c9fa0061212b3cc4c1b2802c36f551
 DIST gitlab-cli-1.26.0.tar.bz2 16777071 BLAKE2B 51cab57139b11ea1d4b1834b1c9efdb061099c494441243e8acc2608f05cd17d7968d6602d46c4a8aa6e8cb6ef2ae3c9cbf03019214fe77d593bce8c9a030540 SHA512 70f02bf28c01a47dacc5282d9a20211f686a8f099579be10b6f180002ff5bd4e53c70cd25828eb148c190b0f58e1569625535fe842f70a919059350187352e65
+DIST gitlab-cli-1.27.1-deps.tar.xz 36052928 BLAKE2B afc415014e36bf5ccc0f454cff85719a2c7376c6a145471e3718ba7353fd5a5180473c55b9a802f369ac3a6d8afabf131bd49eeecdb54fa2b1eb7182f0951c79 SHA512 05bb6fc81e603aac2ea10d4ffb0669562988166c95a0e8d331845aeefbce2e324e3383e27b9908c92fde6c41bfa527bab975411d6067cad4579c5bbd3ae7a08f
+DIST gitlab-cli-1.27.1.tar.bz2 16780511 BLAKE2B d0baba9a6269deec6b98dd620e47c21eaa821fe3ef608478edb3e599ef13576f00e8f80424fa1ac42f894bf9d8c456f9e75d3d83899ac99754acec8e597c290a SHA512 74413f538b4983cbcdfa4a9197e38d6d52d4c675e708bc459d4460e61af4663394b2776d6568a294f1249fe7de21b882a95a68130100769fceb29ba725458d07
 EBUILD gitlab-cli-1.24.1.ebuild 761 BLAKE2B 261e2cebd808f585e3c98f8d14b3f5286c62dce03a116c90eba4c69216683ce9dc2847efa59c14689ec00624c358ab0e40aff602d4f945b92231cb5efef3d121 SHA512 3cad1befdb9ea097c2ea0f0167756ce091753b32f94f690fcb1f1ce019d20e202a2c49a1f97dcc89b26af8e370ca22026c4543b786198aa8f86bda6e320ce3f6
 EBUILD gitlab-cli-1.25.3.ebuild 761 BLAKE2B 33652ab55e51df4696f4ff3693bd1a1f1320ed8993cb4a8d682f29be6df786b1dcced99e6b46de2ca3a7557b31ffc050875656b68098751695de2cd0d5b588bf SHA512 2b3d6b86b99f5ded06edeeb5630aa74e4c54a7f28483ab678326d7d5bef35deaea526c43a59ff8470c4c4a97c7c5368e83c268676ecb930c8e173be29819dc4a
 EBUILD gitlab-cli-1.26.0.ebuild 754 BLAKE2B fc56e55faebb3f4127d3e32d066a6d0f6b5e24b21a919a898495cbc0ea8189fb8b1af4a2fdceb367e9768cc2a691947e9dc30d5b12fe90961295649206debb7a SHA512 04415709ae960428d9598ba556c1332c20dc36fb946b85a7c7d67bcfdbc3d175b88da84499a573969c0867a055b2bff87544c36e4450f211142928bd32b61907
+EBUILD gitlab-cli-1.27.1.ebuild 761 BLAKE2B ee81c7d528b40624c51c29b8b82f5d9f2305e78a9f6684c88bf337104f390c379c33a9a43b1bd1225e54b338363ebf3bc5205a0a2fc72753fa1b5b0ca00c6fd5 SHA512 8bcbbd10b4a9fbbe7e8492dfae6654d26da511fbc1be500a8e9ad613e2bc1f8bd754bd0636c4683c5b603828554efc63dce1725e60085de5ecb96a587bda591e
 MISC metadata.xml 328 BLAKE2B c15cee65978853695fcc911a6beb02ac29f8e82d7a82417989e497a0c014a2c5c2c22503cf2c099600e0885399496d0e7ce3b3590c8b8cfa0f6ecc6a63988d46 SHA512 4df241882ef7e722711132110271b672ef49913a92e9d70972857968e7d12a8403f5b19b5079fd78f3f08fb4aab8e615b51a6073db2c460aa2ae3ec31d8e3a28
diff --git a/dev-util/gitlab-cli/gitlab-cli-1.27.1.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.27.1.ebuild
new file mode 100644
index 000000000000..3d0bcc6253b9
--- /dev/null
+++ b/dev-util/gitlab-cli/gitlab-cli-1.27.1.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=af7cd633c15d6ec4eacf5a8fb6f8a0c494f7e9ed
+
+DESCRIPTION="the official gitlab command line interface"
+HOMEPAGE="https://gitlab.com/gitlab-org/cli"
+SRC_URI="https://gitlab.com/gitlab-org/cli/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# tests communicate with gitlab.com and require a personal access token
+RESTRICT="test"
+
+S="${WORKDIR}/cli-v${PV}-${GIT_COMMIT}"
+
+src_compile() {
+	emake \
+		GLAB_VERSION=v${PV} \
+		build manpage
+}
+
+src_install() {
+	dobin bin/glab
+	dodoc README.md
+	doman share/man/man1/*
+}
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
index 92fedd7e46c3..2c486da691f4 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -1,5 +1,3 @@
-DIST opencl-headers-2022.09.30.tar.gz 65371 BLAKE2B 3197f02e759fb885d353802ac065e53cc6ced32acb65f40a94a5dad2d4952d5838d6b0f70a46b184948dfc14324cdfa076329692135c5cd79f1eae2d8f50d04e SHA512 6a669258d0f2d50f5359aa21d4df1b8ee3d5b0068825dee2841521bec6aa32cb628f5ace7fccbce736276909983d18610d03a9b5a0d6ea6cc0f3c5b3cff778b3
 DIST opencl-headers-2023.02.06.tar.gz 66125 BLAKE2B 75018fab7e530c955b4a61dc40626751894cf9c471234f0d1d5346d1eb38d00b13df5f87cbd2af59bfa17d014bb20f9ed13727fb660bc79b3728c075b7b1c613 SHA512 41730e80b267de45db9d7a3bcf9e0f29bfc86b25475a86d50180a7258e1240fc8c8f2ad3e222b03b3ef50c10ef63fb5b1647c056fec615e87965aa3196e8ac60
-EBUILD opencl-headers-2022.09.30.ebuild 609 BLAKE2B 70eb498df294bf5532a83144deb0db94a249789a837737bfa042b53b852d52dfe08a5c0f2dce4fda1122916dc439092f4e5ba7399b4f9ae3ca5f27f97acbdf77 SHA512 1327990574f155aabbd2a8eed3afde3b4e6449d3637a0182258ca45b9d1f282c6e8ee330fd8f2ed3f378c5bf1028ccf2acf2ed49367dde0aa1aa70779344cae3
 EBUILD opencl-headers-2023.02.06.ebuild 609 BLAKE2B 70eb498df294bf5532a83144deb0db94a249789a837737bfa042b53b852d52dfe08a5c0f2dce4fda1122916dc439092f4e5ba7399b4f9ae3ca5f27f97acbdf77 SHA512 1327990574f155aabbd2a8eed3afde3b4e6449d3637a0182258ca45b9d1f282c6e8ee330fd8f2ed3f378c5bf1028ccf2acf2ed49367dde0aa1aa70779344cae3
 MISC metadata.xml 1055 BLAKE2B ac96e1bf07e353236170d3678541555b7d901984266dfd1356456db90effe430e6a042afc0b9b5a7f51d0e9cfbcef0fbf66fb46de82fdc8cc1cfa29c6cfd61d0 SHA512 6233610591851e415ab0354ca900dfdfa14fa2442e56094d547420ce710942be86c701820c3a63e2c6f070b74c0801f92bbe9ed6c7f2a5cae406f74b81acd86a
diff --git a/dev-util/opencl-headers/opencl-headers-2022.09.30.ebuild b/dev-util/opencl-headers/opencl-headers-2022.09.30.ebuild
deleted file mode 100644
index cf83a7816dd1..000000000000
--- a/dev-util/opencl-headers/opencl-headers-2022.09.30.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PN="OpenCL-Headers"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Unified C language headers for the OpenCL API"
-HOMEPAGE="https://github.com/KhronosGroup/OpenCL-Headers"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${MY_P}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 28fa1f309d39..ab6f6f3ae98c 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/pre-commit/Manifest b/dev-vcs/pre-commit/Manifest
index 7ce294af8e92..a13fd6916a43 100644
--- a/dev-vcs/pre-commit/Manifest
+++ b/dev-vcs/pre-commit/Manifest
@@ -2,6 +2,8 @@ AUX pre-commit-2.20.0-tests_git_file_transport.patch 2021 BLAKE2B 764b353d326817
 AUX pre-commit-3.1.1-tests_git_file_transport.patch 1527 BLAKE2B 18d047f3b8a6fdc3da77aa5b8d9f60970ab5b69adc3790489ceffc17839a4cd21ed46428c5e2e98b50278b2c4dc49e35a09dd778000546828327ae96f910f95b SHA512 36cb194250dc0fefad2900452447ab590f678e6cd5edf07a7f072363733c263b7cb1167297c465a9372d4a38ab77a6c057046c66b872a958132a97d1a937d029
 DIST pre-commit-3.0.4.gh.tar.gz 264952 BLAKE2B 3c45da675d5a1a1fc115db0ef7186c1ec1e5a6d6d9353c5a53dba85a14de2c94bafe0ef9e8d0b04bae55ded81890d726997e695c95889719096205e1b212a237 SHA512 d51aca29b50f67ae42aa70d849939e6af96ff64c6fb214cddbc5a35cacebb8a54a4911110d0615a1a499516fcc2a06bb47d7e11da84ef636c3fcfdc8d2cbe343
 DIST pre-commit-3.2.1.gh.tar.gz 267233 BLAKE2B 39843fa9f7529ee38670b3c7ebea1e29b080db47ae3db73d5a218455fd51b7bf86bb1ab1a979946a57bf6417f8a4e7050e8ba34f873bf4d76fa49fa76358964e SHA512 5e2c114049d84eae2ec6cbf123c8e3976d8e9e392a6e04f78d446ad85758a78fb912c0f6070b9c506f8c1bb87e1fd1ecbe763deb8d1430e1d3d8f296dd0cc389
+DIST pre-commit-3.2.2.gh.tar.gz 267269 BLAKE2B b3b245b2ac0f0f4012e2612515e376aaaf5b4de0b5494c02a2b38b1b9b8584ae3fa7d9ee482ee19bbf6eb5ac1d5f9ec187e44c4bb7bb6046488b178628af850e SHA512 bf2602508425482e57c2e1b1ca2b36085560fa0e51e5d559b6c715a0534f182897eb54831a17a60a713cea0301a7521bb75c03881e8cb8527fbc565259a23ddf
 EBUILD pre-commit-3.0.4.ebuild 1711 BLAKE2B 3c1f5768aedd958ed6a9ccbb9396076084255f645e7339cc04b73d3fd4e976f4b1562a405125a40c941bb02adfde3e1926700e45c1fd29d2fcda55aa64a41645 SHA512 8790c810a8dfb7fd489536e45ba148c22e106c8cdb6641cd7a936124a3777e907163ad801b0252707273320505dbb9233161d3a5d7fd60e6c2b1fe0d434e1c01
 EBUILD pre-commit-3.2.1.ebuild 1728 BLAKE2B e55f817324e23771d2d3d9ae8ea2bda01819844b55928ceba829afd6e21dd4f975b9c31ff2cdcba1ab4e087d5dd8ee31ecb08d6c3337f8968d592a89bf207269 SHA512 a9bbb524938132e475c4d74084c7f1527406d6c732a32e212ed672d9a3eee2ef907ad4bf6cc9989c14e6dffa55653f301fd4325768f9cb528f53d9108c10adb4
+EBUILD pre-commit-3.2.2.ebuild 1728 BLAKE2B e55f817324e23771d2d3d9ae8ea2bda01819844b55928ceba829afd6e21dd4f975b9c31ff2cdcba1ab4e087d5dd8ee31ecb08d6c3337f8968d592a89bf207269 SHA512 a9bbb524938132e475c4d74084c7f1527406d6c732a32e212ed672d9a3eee2ef907ad4bf6cc9989c14e6dffa55653f301fd4325768f9cb528f53d9108c10adb4
 MISC metadata.xml 380 BLAKE2B 99842a97367e91700c6f714f427b7b3d4b7212c401abae5ab715dfaa724776f02fe250184a33504d3433bb58cd5679af59a32ec21a7e7432481160dab36a4d95 SHA512 45330930d1e58fc1de0fd0ba55cd488dee96579ceab3be5073b91ff8f4f2b9adefff533dbfa5b0e8b23fbb648d45c0b7b4073a1ec57b586600cc2bf6347e0bbb
diff --git a/dev-vcs/pre-commit/pre-commit-3.2.2.ebuild b/dev-vcs/pre-commit/pre-commit-3.2.2.ebuild
new file mode 100644
index 000000000000..5f06fdcab423
--- /dev/null
+++ b/dev-vcs/pre-commit/pre-commit-3.2.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="A framework for managing and maintaining multi-language Git pre-commit hooks"
+HOMEPAGE="https://pre-commit.com/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="dev-vcs/git
+	$(python_gen_cond_dep '
+		>=dev-python/cfgv-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/identify-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/nodeenv-0.11.1[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-20.10.0[${PYTHON_USEDEP}]
+	')"
+# coreutils requirement: see Bug #885559
+BDEPEND="test? (
+	$(python_gen_cond_dep '
+		dev-python/pytest-env[${PYTHON_USEDEP}]
+		dev-python/re-assert[${PYTHON_USEDEP}]
+	')
+	sys-apps/coreutils[-multicall]
+)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.1-tests_git_file_transport.patch
+)
+
+DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )
+
+# The former two require a boatload of dependencies (e.g. Conda, Go, R and more) in order to run
+# and while some of them do include "skip if not found" logic, most of them do not.
+# The latter consistently fail with
+#     Calling "git rev-parse" fails with "fatal: not a git repository (or any of the parent directories): .git".
+# including with the sandbox disabled.
+EPYTEST_DESELECT=(
+	tests/languages/
+	tests/repository_test.py
+	tests/main_test.py::test_all_cmds
+	tests/main_test.py::test_hook_stage_migration
+	tests/main_test.py::test_try_repo
+)
+
+distutils_enable_tests pytest
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 21790e1a34b1..26dc688270f8 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -5,5 +5,5 @@ AUX svnserve.initd3 575 BLAKE2B 4bc540dd8693c792fca8fd1061a49608ce7ee9a82d79fc43
 AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa604a5eff8e0f34c8763056bf1ea92b11be4f4d4ac5af3fa191b24d4c2040c3a41458103015e24bf09e SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae
 DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
 DIST subversion-1.14.2.tar.bz2 8606570 BLAKE2B cf15c61b932823fb18b52f83d84907386f068d2d40e14dbab94c42ad9d4c0fdf35d82db78036d7c1f2be47c2d51cdd27bfb966eb7607a52a21e072aeff76fb38 SHA512 20ada4688ca07d9fb8da4b7d53b5084568652a3b9418c65e688886bae950a16a3ff37710fcfc9c29ef14a89e75b2ceec4e9cf35d5876a7896ebc2b512cfb9ecc
-EBUILD subversion-1.14.2-r1.ebuild 12414 BLAKE2B 300d330f3224691dd695d317c7427e862b5979b3544871e30288aa743ad997e560525387c9a83400fa7f0f8d220c82532d56cbe7264e0bca17fd276531099743 SHA512 b2ddfc04a4f173c1d4bbb2c057e5fe116a182231541373958f9f1eff7e04f4ea45198bfb494b5364d0ed82e052ce7d86b3be2093257fa8e905e75147ab49e4e5
+EBUILD subversion-1.14.2-r1.ebuild 12476 BLAKE2B 7c57efb352124c3caf6073b32cb4d858c9c6278d229a5efb9c647c26da4cab2047719185fc84d35966cfde5086ab97a1e8e85dd28dec928e63a801a80ac9882a SHA512 3a671fabf3268f3c38f65a3e0dbfb872106d4c5aa8e4bf7b03939f892dfa23c23092e4e885b51f544d07423a6a1977c5de83ec1e01457cd6d1661b930bfcab13
 MISC metadata.xml 819 BLAKE2B 1c4a8bd42cc1030719952aac2c72c40f175a22bd6eaf7e4d40638833d7a2d4c39f9da8a04bb57e1a6bcf99ade22fe7208e218f8f50d75501d835092d5ef4c105 SHA512 830789bd4225a2c5565466d8857c0cc184071962572e466bd8918ecd12b986d0017c2d6016d7d70d9a6dbbe15abce8497a2a31a5dd5e3feea5695533c417b11e
diff --git a/dev-vcs/subversion/subversion-1.14.2-r1.ebuild b/dev-vcs/subversion/subversion-1.14.2-r1.ebuild
index 863ce516964b..b5d43cf56b8c 100644
--- a/dev-vcs/subversion/subversion-1.14.2-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.14.2-r1.ebuild
@@ -78,7 +78,6 @@ BDEPEND="
 	virtual/pkgconfig
 	!!<sys-apps/sandbox-1.6
 	doc? ( app-doc/doxygen )
-	kwallet? ( kde-frameworks/kdelibs4support:5 )
 	nls? ( sys-devel/gettext )
 	perl? ( dev-lang/swig )
 	ruby? ( dev-lang/swig )
@@ -185,7 +184,6 @@ src_configure() {
 		$(use_with gnome-keyring)
 		$(use_enable java javahl)
 		$(use_with java jdk "${JAVA_HOME}")
-		$(use_with kwallet)
 		$(use_enable nls)
 		$(use_enable plaintext-password-storage)
 		$(use_with sasl)
@@ -199,6 +197,12 @@ src_configure() {
 		--enable-svnxx
 	)
 
+	if use kwallet ; then
+		myconf+=( "--with-kwallet=/usr/include/:/usr/$(get_libdir)/" )
+	else
+		myconf+=( --without-kwallet )
+	fi
+
 	if use perl || use ruby; then
 		myconf+=( --with-swig )
 	else
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 6c07982a83aa..a6648828e1f4 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/ruby-single.eclass b/eclass/ruby-single.eclass
index 035675c4810a..5f6cf9e46dce 100644
--- a/eclass/ruby-single.eclass
+++ b/eclass/ruby-single.eclass
@@ -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
 
 # @ECLASS: ruby-single.eclass
@@ -72,10 +72,13 @@ _ruby_single_implementations_depend() {
 	local depend
 	for _ruby_implementation in ${RUBY_TARGETS_PREFERENCE}; do
 		if [[ ${USE_RUBY} =~ ${_ruby_implementation} ]]; then
-			depend="${depend} $(_ruby_implementation_depend $_ruby_implementation)"
+			depend+=" ("
+			depend+=" $(_ruby_implementation_depend $_ruby_implementation)"
+			depend+=" virtual/rubygems[ruby_targets_${_ruby_implementation}(-)]"
+			depend+=" )"
 		fi
 	done
-	echo "|| ( ${depend} ) virtual/rubygems"
+	echo "|| ( ${depend} )"
 }
 
 _ruby_single_set_globals() {
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 4673e6ee37e6..62a96a45e287 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/xboing/Manifest b/games-arcade/xboing/Manifest
index 662955b774d0..511d219b6f0f 100644
--- a/games-arcade/xboing/Manifest
+++ b/games-arcade/xboing/Manifest
@@ -1,7 +1,8 @@
 AUX xboing-2.4-buffer.patch 356 BLAKE2B 7a027064739bf3fe51f4ecad262c5461877186de4fc922340a930339e34b484138897581d70c2f5a64b15305bd6f107bf636ad600077c6104d02bde4f4f2c1d1 SHA512 8cd226cf2058d44bfb9055dec90b75eae32d68be40bf4e6a97d51edb443d425fd6de18efd82a3f254a5cf5e4bf4a815e21f45b7f51620adacd65bbb44309c038
 AUX xboing-2.4-clang16.patch 965 BLAKE2B 400f7457eb54191cc5739b86c8d56f3c9f3c7d12956a678170bfbc7e93c1824cb97ce5c11db19e95a669747e0913bc477147317c36dbb8a0dcf1b5ede82dcf51 SHA512 795baeb0e1ad8db6557ca4915fbd8e88cca6f7a27350bceeeef76b1fb01cd921bf8aa2aaabf4cbceddb694cb36c5d61ff6abaec568f1cd9b89bb3bb949359603
+AUX xboing-2.4-musl.patch 304 BLAKE2B 8a2d74092ebf1359cf6ca59f50cac79bb30540c3cc63b9ec52b285867902c5971dce7a3d2922f43d690ca81c2abef767d08561522ba7f465e5362ac21a3874dc SHA512 fdd7eea6836b72485804a100a68d7fd0139bb9f5bfdb2828ae31658a13a0fac274d54b29a6e5fe1b389ea23cf23f9d7f1bc39cab3dd7969444249e5e3643db19
 AUX xboing-2.4-sleep.patch 397 BLAKE2B cb872777d74f62474c24e58c6cd84888620a761b55904763cb8d1d7efc5ce72596904798a526713129121bcb867b581292cb74c1e9f98c64d5c5b30b3d5e6423 SHA512 3d77c9ac4502c34e3a004b260e01a14f34115dfff7a73bcef0fcfe8e7bcc94cbb959e408d4c6ccc5329f1fb2b2b90500b5c8e51d4e8899a202754645e599f8c0
 DIST xboing-2.4-debian.patch.bz2 7740 BLAKE2B 284aedee90ca6bca940be405c10e5440d9df9237d6cc6f11c51204f3c1e2f383589a918997461c0399747d33e9f7142016323e101c4b48b1c3e35704cab20902 SHA512 bffd9b747b1e8840aef872988f9ef8b341a56e63d390e386a8ca71358318ba9c0b37bebd91b1f036b52c56e70acf98ec35f92f4c0fa1e19e2f8c4fcc83c1e7d9
 DIST xboing2.4.tar.gz 588811 BLAKE2B 1d29c457108c70608ec2c2ea7d4856553e3e174e7a8852f3da671c64e9e6a6349ee511841facc937bf6252cdd0e094ece7fe09e548835b7a288514aa7ece82d2 SHA512 4b6987329bfe79b3b9709ca02974d0043c6e35210aa73903940efbd09e94b1873ce09b1bea014646029b77e9bd063279935843adceb6635817f15c8025a0c454
-EBUILD xboing-2.4-r4.ebuild 1739 BLAKE2B ba4ecdb7b88473e67ba8888dd637ed5663956bea7e9ba7e78361f8ec27069f3aec9cb4c367e081a4e527b02daee4fb1267a6d5285ac8716b5f8f08303a658517 SHA512 1dd2945824962ac3c83df37ac11d25169b2cf0e735c007e47cd38fa034cb15fa87a02b512f09e4a930b02c29c60941e08de409b202d9ef3707603ec4a6a534f3
+EBUILD xboing-2.4-r4.ebuild 1770 BLAKE2B f534d2430d2d61bcb782383dc6013c7624bc9862becf8834dead093bae6bbe6003df56c85fdb54bca5c0dca448a00207c7425f1d132723a986c86632c16789bc SHA512 e6ca6397e92da062ec3e45303ed74274bdca0cba2e3410a9af2e4ca926fe838be0f69322abc7edbc615467da2af9976ee87ba5fc913a3bbdd5a0cb21e8917afe
 MISC metadata.xml 215 BLAKE2B 21dbc219b22dcdb28c593c910d843aa600a45348b6f1b12c16dc372f4cd5b3409a190bcaeb5d5030eb7ad444176460d94845878a9e2f907de4d5e4cf608e41bc SHA512 afecb44c8f9e03a93ba418d6cca431bcb0f0fa73fb43c7c375a9f656132955560495576d3d9a0c8bdd2a9724fd5b32b53e97cebeffa31f0ff64fb162a28f4a93
diff --git a/games-arcade/xboing/files/xboing-2.4-musl.patch b/games-arcade/xboing/files/xboing-2.4-musl.patch
new file mode 100644
index 000000000000..b24084e9206e
--- /dev/null
+++ b/games-arcade/xboing/files/xboing-2.4-musl.patch
@@ -0,0 +1,11 @@
+diff -ruN xboing.orig/include/file.h xboing/include/file.h
+--- xboing.orig/include/file.h	1996-11-22 02:28:34.000000000 +0100
++++ xboing/include/file.h	2023-04-08 20:27:45.157804561 +0200
+@@ -52,6 +52,7 @@
+ 
+ #include <stdio.h>
+ #include <time.h>
++#include <sys/types.h>
+ 
+ /*
+  *  Constants and macros:
diff --git a/games-arcade/xboing/xboing-2.4-r4.ebuild b/games-arcade/xboing/xboing-2.4-r4.ebuild
index c92635a96e67..d427db516466 100644
--- a/games-arcade/xboing/xboing-2.4-r4.ebuild
+++ b/games-arcade/xboing/xboing-2.4-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=7
@@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-buffer.patch
 	"${FILESDIR}"/${P}-sleep.patch
 	"${FILESDIR}"/${P}-clang16.patch
+	"${FILESDIR}"/${P}-musl.patch
 )
 
 src_prepare() {
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 91454272cb50..6f5c794ece70 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/encodings/Manifest b/media-fonts/encodings/Manifest
index f712b8089111..08db743d6631 100644
--- a/media-fonts/encodings/Manifest
+++ b/media-fonts/encodings/Manifest
@@ -1,5 +1,5 @@
 DIST encodings-1.0.6.tar.xz 312720 BLAKE2B 4649d8d12fcfcbb7de9e8bd8aa7e77514835a56990123549137b4bbe5615c1e9fcddccb13b6442d8a525efd147926801a5029cb10126462b29e31e3354da3683 SHA512 2d52486996939401121bc858ba23031f70eef857760db8da4c84f083e981868e4bc7a8c2ab6d59274a0cf95f592a0dbfad47bce6c9299bb45d115b48abc39134
 DIST encodings-1.0.7.tar.xz 299588 BLAKE2B 25c1be5e1bab85630617803eff63ad3a55ca865db5e5ffad98979986f2396e501d40736ebf90c9d9548bad79dff6ec53440c9e0e0bfe27e2f22acfe24a63bf5e SHA512 dc72982b14e5d89fe1eff1ab11f308796c89255a06337d8cd6bf65757f11dd0a5478b41d844793213db8fe9638389734f148abe9df9fb05027ea563dacde6ba8
 EBUILD encodings-1.0.6.ebuild 688 BLAKE2B 3fd065aa633c63beec5ca01550c3d93e28345fa9c4463a2a2df58c4cc806d8ffa3a81533fff9481f48bc00d12f2cc016023df033d3ec3cc670a7fb8fd7f31058 SHA512 dcd38396dda51aa217c1013ed322060125f09a472282d17e1b683af9139d315a4061bfacadef6212bcdee258e56e0f40e3c5512e7b100045f08b4efbbdcc44c4
-EBUILD encodings-1.0.7.ebuild 689 BLAKE2B 28d986f8d804ae0604bb32dd0f6b52e63023f2907a5bbdaa906b150d0f59ab8063de3da2ab8121f4a51efab230d0f9b45766d9e566276d86b771611a0b61030f SHA512 4e73af7c96687ad8881ffbf9dd0208a6201207caa3a907dabe629d0d975c907560c1950da154248f8ad5bbeebb60cc74e54a1e7e35189116eded40a5f8d16f82
+EBUILD encodings-1.0.7.ebuild 688 BLAKE2B 20997ddd4e9961e75b44f8a94ab1fd47eb2bb987b6f820e15e96cf332ed2da439d68935087ac1d82af6e2783a73ee9adcd34559944f9bd729d4b166d7036c214 SHA512 e97856c811623fdb1189e133bfcb91a6bb744cb18a0aadec58b3fd2e971eaa8c9cbd47907c6083871e4c7e17b8f87ffb33087bd8c515e96f3f85a3cae77d7f43
 MISC metadata.xml 341 BLAKE2B ff668fe646cbd5895866eef4178c3d51c0be0524644ce378ea0f798ccf78f6e54caee6ec4ddb48feb8f24c12fa580c9f3910f896e510ab5066223f68c19df9d5 SHA512 1ab7f8b64854de585079f24dea9a93a599acb701fa1ae9f93ae80f06d929dfcb46169f8639f0edb6d659aa6008f0f3686098e5764f91b2174c3c4273c76ce7ac
diff --git a/media-fonts/encodings/encodings-1.0.7.ebuild b/media-fonts/encodings/encodings-1.0.7.ebuild
index 7c30d8a9d20f..b74a82251442 100644
--- a/media-fonts/encodings/encodings-1.0.7.ebuild
+++ b/media-fonts/encodings/encodings-1.0.7.ebuild
@@ -10,7 +10,7 @@ inherit font xorg-3
 
 DESCRIPTION="X.Org font encodings"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="x11-apps/mkfontscale
 	>=media-fonts/font-util-1.1.1-r1"
diff --git a/media-fonts/font-adobe-100dpi/Manifest b/media-fonts/font-adobe-100dpi/Manifest
index 4e0afa6b48ee..c53f7ef259ed 100644
--- a/media-fonts/font-adobe-100dpi/Manifest
+++ b/media-fonts/font-adobe-100dpi/Manifest
@@ -1,5 +1,5 @@
 DIST font-adobe-100dpi-1.0.3.tar.bz2 1113104 BLAKE2B 055d8723af853126125eed181d3752c8aa58f5820f7835fab624917ed8bd1bf428064e472811f6538116b3dafd8984f4a651a4ee26924722394535b12e645aa6 SHA512 27ed98dcdbb9c174c7090cdd8fe230f7471d10b5dfc63e092640b5d0fc6ab351bc8ffa9a92bec1755f2780b3d9c1de3ad298c64b70a68b5e6879a8592ef32987
 DIST font-adobe-100dpi-1.0.4.tar.xz 886528 BLAKE2B fac12a9ab96fcc6053a2ffd491b4f98dcf82b278e191b5a28426ff9c87ef3b0663d3917e10c50a58e1e52b6f26b5b3ae6f63f757cbdedeb20a3230b09acce186 SHA512 fedb86672c3b9cb624ee5d74d1d710f21d92c2d48a1fcf0a45b54b3f992f6f5599fc271d38a7e25ef123b64d405fa60a3d46883fe7a9d71ebad83c9b418f8383
 EBUILD font-adobe-100dpi-1.0.3-r2.ebuild 304 BLAKE2B 0de2edd9466a6477d7bb0b2780f1941640691879aa838080808551a1923013608503fefff661703a6fe86a5b571b54242cf2ada88abbfbd52b035d3f13e4e6f5 SHA512 3261bc1da6fb558949e609e0987b57252aa76eb60156e287a18124ab939fc5994492192faf243d6e986f70f6f2fc04c604d7d6eb0924b83524d87daf21fab487
-EBUILD font-adobe-100dpi-1.0.4.ebuild 353 BLAKE2B f2496cff0906f86923df6d98e9bc305af8ed6082e769313966047882ad6f73db66af367e03b49663f800a70e116f80dc174889c3368280b2da524f098f4c132c SHA512 a9454f73cf0829a17f5facfaa32a1341be6d7c66a462916d6710251d3d06f562ff5b251505d481530a9d74b52bac7f639cece9936f201927998bae9afba211b6
+EBUILD font-adobe-100dpi-1.0.4.ebuild 352 BLAKE2B 40d558b372582f431282f1a731bcdcbd268797e99a5d206bdf466bee22d5ff58d80a3a6efacbe6ce85e4c14fb815e720beadb19fefffbe2c46e3a022b7fb317e SHA512 504f61e371e04ef27c8a1266685a9be4ed02a3df6b78ea45c8d1ced911780557c3124498cdbc441d4e19d7b2bde52eb1b5682492e426438d9cbd122e9f13698a
 MISC metadata.xml 344 BLAKE2B 0954178dff3df3a40cd5cc6ef0bb5ad5b7822d324472a53621ce6c061fd51fe96729abf317974be81f38d7434d2f9050f47ab148d69fc4891e61fca83f6256dc SHA512 93645580fd6d6be673913b2017644ee58e03246ac087cf0e4712e470ac999c342b4c1477e2cd25f8c768aedf2dc3e88723f54cfd86bfdced50caa97c9658d76c
diff --git a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.4.ebuild b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.4.ebuild
index 1f0311d156cd..c634fc85917a 100644
--- a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.4.ebuild
+++ b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.4.ebuild
@@ -9,5 +9,5 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Adobe bitmap fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="nls"
diff --git a/media-fonts/font-adobe-75dpi/Manifest b/media-fonts/font-adobe-75dpi/Manifest
index d535659fabd3..fce430118c3c 100644
--- a/media-fonts/font-adobe-75dpi/Manifest
+++ b/media-fonts/font-adobe-75dpi/Manifest
@@ -1,5 +1,5 @@
 DIST font-adobe-75dpi-1.0.3.tar.bz2 889542 BLAKE2B 5ca08b27bbf9880794862615af9e6e5b566fea6529523fa393136221690bb244c1a39ef90f939a0275fa8e176a84f9a4bfe0f464acb0549927bfecf6c6831e13 SHA512 c0d851df5732e81027e265370751a606c6e4f5eea546d802608988dde02de35fa28238f709f48567191090bf18814f671b1a7f9f0b528d54949b0aa9403f266d
 DIST font-adobe-75dpi-1.0.4.tar.xz 735140 BLAKE2B 1e9d833f750c4dd3841053aa16dea94fe2675cc4b7fce76680ceee4ec977ca29faba885ef26a6b0d20f240a478525d9c34e16925b4c9c114289917444a1ece03 SHA512 4e63c268525f21c03525870129c8d42cbd17a03d86d9c88bebdccb5094a1093acef1d2b6d4dde221559cb19f047b86baf58fa8ad65d28d4cb6c3064ec164836a
 EBUILD font-adobe-75dpi-1.0.3-r2.ebuild 309 BLAKE2B 36b0d9bea4bd68439b08fac4b8fa60a1deb2f54f0722659030cfd48622371af10a273db458e88495d2aa8c34f84b3679082f4a376bd0f3bf3102e65914d23157 SHA512 a49802eb13c92208f74c008df8a2e1f690888e5420ed04e2c7f81e9e4849ad9f64f13e6e32a7df2691a04d42359190c2c8a9960653f36683ba00ee8fa880a834
-EBUILD font-adobe-75dpi-1.0.4.ebuild 358 BLAKE2B 292dc7ce227123abc3fdd0764d053a4d4056e7e2914ab8fac4b3b504c688865df76c62f2af598edcd3b117f4d4a8f602d58cb194f842f8b99bbe79e51dfcdb2d SHA512 83c78991393781061205d7bd0d81d1ea83976870290ccbdda9afe2ece1007bee2af0f6900da9350cf9dcded4af5a9173b750da1e9756ac99515636ce9a2a905d
+EBUILD font-adobe-75dpi-1.0.4.ebuild 357 BLAKE2B 2bf80b8b70705ba55fc97b3a19aaf0f13d480da9b1d462801b69d087bed0e0564125cafd4ca68d7c0ae528c79fab3a2c1ef5e74b728d07155b23f41777282e54 SHA512 1ee72ceb023e087b8955c6116d45432f64dc74db2172fb9277cb83109c03531ecedc50f6eb9f557b991a62ee4346e1f3d6c5e02e2d72dfb81e38503046b52038
 MISC metadata.xml 343 BLAKE2B 7e7fe6ff2d453204e5f8cd28a1620f0c6d04920941af5f821cf15e68a156fe88205c6050f467e561bc439f2fcbffc4f9c889b53449ccf46a9c1562edb84967ea SHA512 7ae80ab0b1a0801e3af599de60f33a579334ead5fa82e900037692c3adfab54acbf1c526b193caef5c0e64c97cdf016fb7b8e10a823f993cc1bf7be167466323
diff --git a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.4.ebuild b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.4.ebuild
index bbab65a2da7f..8415b5a3ea85 100644
--- a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.4.ebuild
+++ b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.4.ebuild
@@ -9,5 +9,5 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Adobe bitmap fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="nls"
diff --git a/media-fonts/font-adobe-utopia-100dpi/Manifest b/media-fonts/font-adobe-utopia-100dpi/Manifest
index 2b9ca60f2b63..4f7991901271 100644
--- a/media-fonts/font-adobe-utopia-100dpi/Manifest
+++ b/media-fonts/font-adobe-utopia-100dpi/Manifest
@@ -1,5 +1,5 @@
 DIST font-adobe-utopia-100dpi-1.0.4.tar.bz2 353852 BLAKE2B e5d37b5608725ca36987999aad269e3ed5a988069cbe232ece934f2ed71dfaa94ed78499e911f16f7f6d8114e684d501920bf927ab3551cc211f27deace2f613 SHA512 fecb9a9bde99a82787d12779ea579c8696dcce168acd74b478a879ae24d421d5978d5f69da651e8ff3b25dca355960aaa19f69f2bf61e540464887e546a7b94b
 DIST font-adobe-utopia-100dpi-1.0.5.tar.xz 292184 BLAKE2B ab39ebaceadff69fe0254ec8818224628b83ba297b65106c587e9d56aced049742e0a0c284d013ec575c360676c6780ffc25de3aa28a9d76adfa96e1bb3942fa SHA512 9685d66de107ab3142aa9322bbded20f4f538d7bcd8c97bfb4db8eb1fc440724b0c7574ee8b4b5e96c81044c8ee4da175dd638f03dc3e1e650200fdf7b8a169b
 EBUILD font-adobe-utopia-100dpi-1.0.4-r2.ebuild 318 BLAKE2B 5730409a15543fb9a73256bdb2e9924b347bf50366c813fd78bf5920fd93dc1fe570dde5d0397219f184c509a9f037281843eb4aa07f9aa9ab1ad0b6b0edb965 SHA512 0e8ec8178b5a89472bc8a3f66b7f57d3066aa398db78b77c0080ea53f4eaa40ca622ff4987fec715ef779aeff8f7858f3ff0d19777e85f29e952af4d79583d06
-EBUILD font-adobe-utopia-100dpi-1.0.5.ebuild 367 BLAKE2B a8b641c0d0eaf330f69b50a513e93836e3fd594dd6c86852659a22ea3b7591ac02893c88925abe829439e5a6cf3c5ff143828a176900cb16339d5f2ee02f1c6d SHA512 e66e162674ed277cbbb9b9a33d56a3c51ab680f9254e41502b269f8521ab01e347e440ccee4946c75eb5a97b57f312da458f909c7e033eb1991ab39926a44798
+EBUILD font-adobe-utopia-100dpi-1.0.5.ebuild 366 BLAKE2B 46e933bf67af4c1d662afd0e5b7c443de96296efbd0ae639855e99c4772e0fb877670e5aba598bb799759355b82e52a912fa3a23f6df1c26e9cfe8a6e52b35fa SHA512 3e1669091f76868326e5cac7c1976af991da79ddfd120e3059c442d60eb06dc05e72e38c2bfebff8f5d8915d20122290c0b69a1ae65d0ffa6e67b51badc7c4d9
 MISC metadata.xml 351 BLAKE2B ff8d67016e3ef1870ce9203ae6e768c14287991ac01204fdf9adad84fc210ceefce57817fde30ae960f1927b8f6ba2eecda97e9e4378a1546b986963d6d146f8 SHA512 b2581978a8b9063a864947eff01c8236b035e7ddff697941a6ccb17c4655ec75501b8b1d25930c19991fe0eb06b4f0c8920efb104ef85f71b5667eaa2a2b7b6e
diff --git a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.5.ebuild b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.5.ebuild
index 4763b73755a1..2cd2a0fd9c7d 100644
--- a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.5.ebuild
+++ b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.5.ebuild
@@ -9,5 +9,5 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="nls"
diff --git a/media-fonts/font-adobe-utopia-75dpi/Manifest b/media-fonts/font-adobe-utopia-75dpi/Manifest
index cd2ff6794ef1..1bec309a2af5 100644
--- a/media-fonts/font-adobe-utopia-75dpi/Manifest
+++ b/media-fonts/font-adobe-utopia-75dpi/Manifest
@@ -1,5 +1,5 @@
 DIST font-adobe-utopia-75dpi-1.0.4.tar.bz2 273484 BLAKE2B a304d690de9727c5678dc1613cf7c8960594607a5f21fea15d03caade18df23ea83ff62fe7bd6c12750a0c9ffd11c28d4507e811eb271a1d1f874f0bcf0e3a92 SHA512 c569af760a62b00738be65546364587638e8c46e4a0765013747e9595d51bc0633908c72359e42e7ebf6240fdc6294b51512c0a096a5fe64b2bd300ccbff7b92
 DIST font-adobe-utopia-75dpi-1.0.5.tar.xz 247312 BLAKE2B 8ec3044fdeb6e5eae00994db5e7edfc108df71cd9ae19f5d89302e9ad152faae8d9e633001c4cbe42bdc4d4c84b341a34842018cf1a20dcf12bfa88a5aa1326b SHA512 9608698288fca47bf61cff911b8f081593807eed9f138ea22f05a7b6c26c481ec5144d79665cf509ba889df35ef5406e0de71710362bcf6de6b602c12158e22a
 EBUILD font-adobe-utopia-75dpi-1.0.4-r2.ebuild 317 BLAKE2B 7104d7fbe50cd9ee808d4a24f7bd375bd8a7b28ee19e95340f0a7e58edb5435fc387ce69ad7eb0ad861961bcc09ddb275915469d67360ac92c0c9d2d06bc04fc SHA512 ca72e1092b41fc9568378dbb9a8d9c8e5ca7178bd7c97ba88b1ee4bbf260294ee6fec670a61013f7063c20dbc6a1884e12302af5994d516daf375d542348017d
-EBUILD font-adobe-utopia-75dpi-1.0.5.ebuild 366 BLAKE2B 0565b0c28928f64ee1683a5b158ff2fb8c75ebcfa0fd893c77d140068c615dba0ba0eecad2aad75087bcf7af410b12ae5c6d8ff735344f65dd7a1faab8f9fbef SHA512 1717164e4063dee35887cfb9b9064a3607f65e0c1a9bad63d768bcf386d1c6ac221a2bc1266204cf5da24653dd6ceda7c3cdf36ba04a4b10f827596f402655b0
+EBUILD font-adobe-utopia-75dpi-1.0.5.ebuild 365 BLAKE2B 9641c282ae302dee4315fa967573682ca97fc39024660b19a1258f514cfeab148cd2355a5bcafd49e6d56189aefd17fbc76ab52ce23313199befbab470744248 SHA512 ff5cf921d5cceb2cad438476742c1ef4af2615aed0917c2b49ea9fdb7e03ccc92ef34922685cd6a49e6e756bafece58b53cc3b4e5a51637a4a7332d481064642
 MISC metadata.xml 350 BLAKE2B a41853dea3e43b6a86ea7a33573d4d39da5668bdafbddc77bf5c6ccf17429e10e2f906a930b008a27adb6e5d809e6527c4288639d925f55caf686a4691123d7b SHA512 18d198deeb929f2b964a763aad631ae83bbfc97788b8aa8bcfbc7d35958809664616d3a59a3d8a0b4c5e3aec43dfa4fc478a2624e95addc033f2c8b6a9073eda
diff --git a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.5.ebuild b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.5.ebuild
index de0b8023cdff..136fa905a4d5 100644
--- a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.5.ebuild
+++ b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.5.ebuild
@@ -9,5 +9,5 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="nls"
diff --git a/media-fonts/font-adobe-utopia-type1/Manifest b/media-fonts/font-adobe-utopia-type1/Manifest
index fbdf0356b20a..c68fc5f3a427 100644
--- a/media-fonts/font-adobe-utopia-type1/Manifest
+++ b/media-fonts/font-adobe-utopia-type1/Manifest
@@ -1,5 +1,5 @@
 DIST font-adobe-utopia-type1-1.0.4.tar.bz2 269159 BLAKE2B 0e23240a7b79a43c0508935b460e1f7f4cedc72e98dd903644b97d042983dde4c62610f53055d35717bdad56c5a9f52962bd11c4ee484cbb9b89b6c4c95752b5 SHA512 53ff2ce7b17824a0eed1be6c3e3386e51983389f5623e732ac898c4e08769c8720f6d6b7c75b6455e050ec5dc390376747ca4cdb9f831a218f9dd5ee5edcd0d6
 DIST font-adobe-utopia-type1-1.0.5.tar.xz 264312 BLAKE2B f1c3bb224ca165266938fe36c250daa87e94dbf4e5a92eecc2245526947a8992a388611f7d4a225f89201db33d1d7a454f15f33946b1eb6b8b0914bba7671949 SHA512 e30f4c7702f47a3a42206975fbcfec058317681956d246411e50e372b669bdc875c5d7fe28bad7d298bc61b71a997c7836fb6ac16effd223a96723a6e9ece649
 EBUILD font-adobe-utopia-type1-1.0.4-r2.ebuild 306 BLAKE2B dc2c2467ec0a02d64267b56b5b6dc53953f559dbec140cb3b95288c98515c46fcaf0b846dc77376d074b774d117438511c30db3611aca36c349d9b15d5391133 SHA512 4828def90ed63937980df5a62189535f7e81b40132e5b22f4852eb1d44be19b216474f17671985c894143e977b8be73e4c587ba8a2fa48b842802c1f28256afd
-EBUILD font-adobe-utopia-type1-1.0.5.ebuild 332 BLAKE2B 74f9f7fef738dfd83cf32ae7ab665414f4d77a2017c4a849f08a8bc928192da542a4340e8bad99ee6f44436d4830418c462225b2cfaccd9e40a48cd1899922ca SHA512 23a04d0373361800a4e233d37bff182199072c0b48c8207c6fbfb8572dda6ea66788bc31f21d26c1612f3d503cd0427a12be136885429f00f5d2822ad2f12307
+EBUILD font-adobe-utopia-type1-1.0.5.ebuild 331 BLAKE2B 0215ceafb8da535a045362ee519530456647a9248d436225ab95cc0d9b17c150bcd6c2fa121e236ffa2ffe8ed72539ed4e92f7c31791b6148248dcfd3aa47b7b SHA512 182571f65135af1b97ae1595db01bf254250b39bae009ada213542a19a460d81bff7781f20b9b48ec7e3da8b3b6996984661ad26f10a1bfcb8d65f7a1ae1d5fe
 MISC metadata.xml 350 BLAKE2B b5a231696c069a2bf0868547d1292f8d522237738e4dc05a703a3d81dbffb9ee9a6d1a62f7c84479585d06437d85fec288cff15ecefcf4ed5fdfb65031ba5414 SHA512 99e10e2ca4ab4306eb6b1478ff907d6c205e90de3038ea0eecf9e216b0f725121e129a46d2bcbe31cbbb085aaf6c18a1a1e477058d7571638af0f2e6c6dbdafd
diff --git a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.5.ebuild b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.5.ebuild
index 7136482b322e..e97439fe2deb 100644
--- a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.5.ebuild
+++ b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.5.ebuild
@@ -8,4 +8,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Adobe Utopia Type 1 fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/media-fonts/font-alias/Manifest b/media-fonts/font-alias/Manifest
index 7bbd00d202dd..a9d7fd227325 100644
--- a/media-fonts/font-alias/Manifest
+++ b/media-fonts/font-alias/Manifest
@@ -1,5 +1,5 @@
 DIST font-alias-1.0.4.tar.bz2 119248 BLAKE2B 40f4fbc7924c57d17cf7166d0d60c4231f83cbb85225c94e6387c0dc72aef106b1e665a1700ec857784047d9ee04eab422cc1f391a952dfdca1b7cd6af2a503a SHA512 c67ac2ee344a601fcc09471580214b30c3fd6acc4800702840de44f0733e6d18b3faeec2fa3f4e2314025cc1724d7d6796ebaf620398fe350710182fd2c4b07d
 DIST font-alias-1.0.5.tar.xz 96780 BLAKE2B dd8bfcf3de35babded89ce1b66af357292b5202bf981c44697cd637de026837ee17d5583f8a48b117190c700cf7137011f86d4b63a63e0eb9d2dfc95ed45d151 SHA512 86bffa6b9ff789eeba715c079965157806ed633d44cd3dbf5e2a4bba2b390a0f48db65edc8e3264acbc2368d78a8d7e05bc2e2e3a86ddbf6b08bfe7f5e862bcc
 EBUILD font-alias-1.0.4.ebuild 549 BLAKE2B 3ba56d2685b3a10f290b18723c1f2c7317e416f794f57ba14d50c3f6ad117c31554d50e039b254c6f4308148f3084b63378c83c6078cf41bd235f13bdb12de97 SHA512 6acf3b033bcb99672d7634cc636d183367c3a6c78fb0c2cf29243a860f82d86cac6aa2f3f04f2c802ed4edfa9bdb3bf77d47b41ee10b57c8ee47ac8267c147df
-EBUILD font-alias-1.0.5.ebuild 575 BLAKE2B 25206933fcd3821c7d91b20c3a3934fe4a7ed9a9a9ff45cb6bdbb5883051c77cb20e7707f12ade2d6c7e1bf39659919b6e73f6914a12f7bfa89083adf5ddc562 SHA512 ba8d4f7105d99693749ed72825ed1720710940075f2477c77250346ae823167c6c7ce0fad50fb17de5f47940db18983b01d33d621e7b6f536c37a4a92793cd4c
+EBUILD font-alias-1.0.5.ebuild 574 BLAKE2B 668b1e1db8e3c19fb09cf541f4b7298a8ba224463a70122b17432591ef44ad2a030576c7efdfc99d78788130b412d36e18453b36cb40f0a577a9a49c3712f34e SHA512 da25f8fd030363095a1135b66089ef28bfb41b66ea8f322fe1e1d6e798b93e2323596441d4aac58fd694aa4b36e822512d74f53244a62f02f886c377402ad2ec
 MISC metadata.xml 337 BLAKE2B 7a4202dbc763385b623ee16a9584407dda7da1011b2ec7f80678d75e7346563542475ba40f0a9a9f22c29fbc8130b01251783827dc3e021694f65beb4ca83533 SHA512 4737118a915f00bda509c6025c71e08796f3162d6901e670d44915663fbaac968d266d1324c5c459f70caf646973fd7cd7670edbef8ee4ac077238538e4d9d83
diff --git a/media-fonts/font-alias/font-alias-1.0.5.ebuild b/media-fonts/font-alias/font-alias-1.0.5.ebuild
index e4a0c0b878be..b8880872ac57 100644
--- a/media-fonts/font-alias/font-alias-1.0.5.ebuild
+++ b/media-fonts/font-alias/font-alias-1.0.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org font aliases"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="x11-apps/mkfontscale
 	>=media-fonts/font-util-1.1.1-r1"
diff --git a/media-fonts/font-arabic-misc/Manifest b/media-fonts/font-arabic-misc/Manifest
index 9f8a2d41a712..22098f117143 100644
--- a/media-fonts/font-arabic-misc/Manifest
+++ b/media-fonts/font-arabic-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-arabic-misc-1.0.3.tar.bz2 112136 BLAKE2B 7ccd19008955a016398afcbb1202b9df34e7cfe6937152d443f2ff381564ef1e91dc4bb7dbb4ba6e5931bd7071ac4f570f2d8167dbc58029ee9a88f5ab18a5fb SHA512 46a416bf888afdb54f5dda6c9a7207dc069d14089ba14b262c60cb9ad427784c46e2a61b32a79f1d745e73ea657bbc36b48aa5d4bbd79f73a2d997b027ddfbc0
 DIST font-arabic-misc-1.0.4.tar.xz 104644 BLAKE2B b58be869efd943b800989594d14cfd87e5f8b7add99ce27ce419eafe52e1dfb18724720116a962d0e7a67af13f1a41322f0a2b3d12f0d9ed8d2faed8d07c5555 SHA512 afd5fae32440b133c5ee0195af44ad1462d35c2f451dcf4b1c93e0ce245d009b120d39eb5f780b003ae2f572408965e6d149437e9ebbf5738cb69193aaa4d488
 EBUILD font-arabic-misc-1.0.3-r2.ebuild 293 BLAKE2B 95da8ad456b1ebcf9020a70e334867d771dcbd2744cd48026ec2725625f74289d8b2c6e7d01117e254d65ae4a6a5f300b4869e2b0cc0290c81cb39460b882ecd SHA512 5aed3f42f90c76f4029ad91469efa690a51cdbb1fc7de1925f17a3d2d7a7cab87ff6025bfecd54dd8653480f083feeb9c2deaa9392e239191443d5dc15c53c73
-EBUILD font-arabic-misc-1.0.4.ebuild 342 BLAKE2B cf2a5cd4587de130db7942889fa1220e547a07ba88dceca7e4111d55b1e155b7299460966b2563d6166bba47bc7c30134de6813a427c2651624a4c28e8438539 SHA512 32567f5c9bde0e6d0ae56295de6280bbf660a5ea575b8a42d3b34c5fdd063a7395dd065653a7f704094bca47d946add508982d45a92d0d5c114c4840ee5f0afe
+EBUILD font-arabic-misc-1.0.4.ebuild 341 BLAKE2B 35e0af6b151a1de5eab845e7cddadf277e482a80c18550613708ca19a4522df106694d8d1f0db749c5e3c040806b1b683140e8a419c5ae47bf8ab9e0d6d75dcd SHA512 73b1162f22c4d37481fdc8adb0be2b6e26d2d5e1eef0816e2bd19c170adfbf42676d3c0a0d6f986eb0f997a77a43fc2ae8d0b11070941e36e62d32970bcb5b8e
 MISC metadata.xml 343 BLAKE2B 77512014344483dae48adcde3acfda8f7a81e3226aa7bb8354ac637a98ce8f26ed16eb1162b57963941155d54073642b2fa8b7b43e936628ac11fe89ba7bac16 SHA512 d4b349e73b2ae30aa84261cc463d389b91c8aea932cce026164830c37efbea80fe277fa747e0588ccf540e62a85887f17b07e267e12918784b85b851a444f0a3
diff --git a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.4.ebuild b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.4.ebuild
index c0585eefc2f9..1e87d75a334c 100644
--- a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.4.ebuild
+++ b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org arabic bitmap fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/media-fonts/font-bh-100dpi/Manifest b/media-fonts/font-bh-100dpi/Manifest
index 207c6bb6af61..93975c02438e 100644
--- a/media-fonts/font-bh-100dpi/Manifest
+++ b/media-fonts/font-bh-100dpi/Manifest
@@ -1,5 +1,5 @@
 DIST font-bh-100dpi-1.0.3.tar.bz2 713206 BLAKE2B 3433efac96d56d91685cacf3a1ff93fae0378831164381b2e8f16dd216a042c8ed3d0ebd6c622b592b11cefe7822814df57c74e42ee846905a406af208616eca SHA512 60532fb3bd25bad08b1db65f96fdd1cdb2ae5fd580729d7851f5b619f1ed6bdef4fec30111ec408cec9ae5e94f92ad9cf214214c01ac684f3a4bd8d43bafd8a2
 DIST font-bh-100dpi-1.0.4.tar.xz 569512 BLAKE2B a27b289749b18c776b86bc270d6fbaa55ac1cbe50aef7e5467b7f64848742bb8ee1f0fb324c5359cf75e4cb5e3300cd7d3d25d61103e585d1158b8efadf6c1ce SHA512 5fe2a24df0d0e9109f1c1cb2556f4cdbf07cc16441e565333f01a00815dd4555b6ef0dd689ef3196ddb76db7480bca8f0b501d4244262d6c64d4751d75503b44
 EBUILD font-bh-100dpi-1.0.3-r2.ebuild 369 BLAKE2B 527eb0053cc89382e532d0a2477748936205faf8a8f97a38439e91d06e4bfc6482aec4372d2ab5bc0417bc7caa201f050b06efa4dd20c717dd575fe6273f886c SHA512 f0b09aed478990c7c302866037db72b3b5455da61a2fc1707c64adefea23e94eb643212a702b77286d8195e5fe67f0f31317773a904f7d16d6966c4688e41af3
-EBUILD font-bh-100dpi-1.0.4.ebuild 418 BLAKE2B 8c06e1c5ac8345d2df821f3225d824b48d2edccb866ae2475764911b488529017f417078b78e08adcd537e965e642849701edd20c1d7fb8d717819659a109e6a SHA512 35f1ffab7e978b34aa878528864a8a5ad547a98716a65af287d53eeba70ac9ebe161ad68d8e7905ed72515b1b0745e2d18a2dae3a1420c092d3ea5e4ab1a753a
+EBUILD font-bh-100dpi-1.0.4.ebuild 417 BLAKE2B 7119ab90b42fec6af69ede33a47c0c405f34049562b6280ddff1257d45a66126737a7c3fdd6aecd584a68abb9fa7957582de334c2158ae7fd6cc0b2eb32a1dfa SHA512 3f5e5c8eccdf7b0547f70126a4246064d79f8b21494b7ccd3dbe72f35fe915863e393db019735422cff3dd5090ae8726faddd94fc0ca1d1b3135db2880305e73
 MISC metadata.xml 341 BLAKE2B 1e1930e8e5dfd5eab79d0033ceba1296f6e64e617d98b8c639ff9d48c16d411ea8c8e958c05b4c159a08c52ffe5aa8925b41fa2977c2146457df44a9a3a38ad1 SHA512 832af6d13a7c9b59378c28e4a3307513be6b59dc66cfc95848e796387b33db04338886449ea47302d259b67af9b865597e08d8ac0832f684fae3e43b7ebc7ae8
diff --git a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.4.ebuild b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.4.ebuild
index 909110e560c6..aaa017d56bfd 100644
--- a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.4.ebuild
+++ b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.4.ebuild
@@ -10,5 +10,5 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
 
 LICENSE="public-domain" # bitmap font, not copyrightable
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="nls"
diff --git a/media-fonts/font-bh-75dpi/Manifest b/media-fonts/font-bh-75dpi/Manifest
index 36392bfaa1f4..ddadaaa03a0a 100644
--- a/media-fonts/font-bh-75dpi/Manifest
+++ b/media-fonts/font-bh-75dpi/Manifest
@@ -1,5 +1,5 @@
 DIST font-bh-75dpi-1.0.3.tar.bz2 553016 BLAKE2B c39213ad487d577763939507c24709413e56147901d4bda5957004ae4c9b53dba4769e93886a7827da4ea149303d92d780f7c745f7de6cd89b6d69770158a52b SHA512 fb19c7fe91b6cc0670b01d5b8165075866ad08796293650d6037d79211ca668decdcc1b3684774907c06073145919655690d78ccdcf2511db38b5879328a9f50
 DIST font-bh-75dpi-1.0.4.tar.xz 472540 BLAKE2B 4c3e5aaa5894b9c74ffb6c578bad7ec0c12c8f9592abb30be0586be555db18c062e689d93e854615138d5395cdfbce29a6f12667cd4e0f0cb451c2977bbfefa9 SHA512 8ccc5accdd43b4e1b8007c94e7916c6ee947ff0d57e3b0ce92154b718ef0ac2579659719738a50ef3ab0998a8bcea5b055e6a2e4d72b9fa5755b786143303955
 EBUILD font-bh-75dpi-1.0.3-r2.ebuild 374 BLAKE2B 61e9104abcb3992698267fd40300f20ebc36569818a20d5039bceb113be8d37f3ed7cdefa9bfe8e0bfcc6ee715d8f06fd9b446c725790163469433201bce3ec3 SHA512 8c77a34aedcfab9b555ffa068b6bf76a15200e999a15797efa29c263fd09601172a288a1d84c69b8abd17938cb6102bf4092f9407a05a07452cfbbb514b9f940
-EBUILD font-bh-75dpi-1.0.4.ebuild 423 BLAKE2B 0f928c24708dc870adaed323699c81eb8f5b0549600783aba18d36fc395210e503172235018162623c89f540f8f67b8590846e24a820c918d5f58e4c52c294a3 SHA512 a4fa32d08ea4021a27db30ca4c56eadb079ca82c5fd1cb76d772218723682f4ed49482a26263f2c0ed89de99ad0265a26024514616932063d0bb3d9ef1b91f53
+EBUILD font-bh-75dpi-1.0.4.ebuild 422 BLAKE2B 2d78a22ab1f3221275cfdfffb54bf41e71fe4eaad3dab1f74ea1493cc2fc750ee935dacb4efb7c24661a75bf19249a55723d6e09c3a3c9065f12c47998a15408 SHA512 ea939f98e8bdc5a7525fc8286b18776075ccc57f2307de9097576366e8c601340ac2e0f98263265f90e3eb884ebdcfa64a07532708e60720db6bdc17de52f159
 MISC metadata.xml 340 BLAKE2B 0a82149bb52ebecb0ed9156c87a60746fb59b62f9404e33465bf55022cee63871b4718fda5f09c9a20c24cd8903bc07ac6fd1cf7c354bb1c6237626f374a4afc SHA512 53a6cc6782a0530469d0ab7639d7df16250a51196daa3e904a5f941f2f5ed9fa93d6de152fb4ae2bfd2cc9b93ff8a7359e8980117d20c28ba9b4980623d2b7c1
diff --git a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.4.ebuild b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.4.ebuild
index fc15df4b240c..69ab977a744e 100644
--- a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.4.ebuild
+++ b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.4.ebuild
@@ -10,5 +10,5 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
 
 LICENSE="public-domain" # bitmap font, not copyrightable
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="nls"
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest b/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
index 43185ebd408b..0f84b008ee67 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
@@ -1,5 +1,5 @@
 DIST font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2 245807 BLAKE2B f2cd40b5621aa3940e8047bd6b2ca588fde367512da196ebfa32469be06ea15c87641da8f81f14191a65dd5eb791de1256e26c5cc20e0dab3883834028003665 SHA512 1862003c20aa7709ea07487a4326c619e2beb33b7069d644f438d64182b41a06039c69e2867921b4d12939612a4b8e1e1727fd15851aeab9a0361060183e3b0f
 DIST font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz 212808 BLAKE2B 569cf4990dc1eb318b7edc0dd8651fc4dbeaec9528657505d60bb3548c6a37a6e45802a2a73692d2c6aa924a2b12b7b958df551da52aac51711877531ac77d5b SHA512 31a4d061430089c5523815dde7d7cf73c9cba768ab79004eb65af8a1684fdd57d0829d9f4249c8e542e733266cc5f83e38eff403423a77a06af15008ce95d2ab
 EBUILD font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild 394 BLAKE2B fef91b918a13524fba62d00352bcbb1f4b1903ee2a4d86d18397ef397f3842ed2521eaf4993c06570232d8290e9b1c3454d1f0d21470c5e84561ea0767a195c5 SHA512 7f1657b3737de62517cd620c1c0a20bd261fa7c49ac2af2af93012127bab5b4770e3377d4ce514b0b76337eb6c94e3af62d657c4872d3292fdcf838b928c877b
-EBUILD font-bh-lucidatypewriter-100dpi-1.0.4.ebuild 443 BLAKE2B c31bf4c030650f8e23675603bb48f23422be6d7ffa8262d19c6f7261a3a1860ee61417454b2442a7020727f153c748738c3b7a9d01a73c16e86d9024a5f850a9 SHA512 2bed412e470353c199aae59b1c82695299c4df6d68529cdb33ed3515c12f86de9a03d428b63be49b7aefcd2f777fd9591277382823cd05bedb99be45aa3b75a5
+EBUILD font-bh-lucidatypewriter-100dpi-1.0.4.ebuild 442 BLAKE2B 941f1b374b7a28f157d502d8ee2eb01585878e2a9f66aca768057494e29ab7ea07b16a12e7ce6838e9ec306962002db504bb91e31b8ef2c9b0ee71d0f7ad2abf SHA512 da15bcb5fd7b9c35af04836a2abfd1740f288701eac314b9bdef1f33ef59fd17a04201aaa96a79bd05dba0fa881bb15eee46b5123113459dfca85fa7e1538642
 MISC metadata.xml 358 BLAKE2B 2242cb64886de970ab535d45c88efe309e5be0e7996352d989705718a5c13ff33d7820517c038766cd5726f5cf5bc775276d5a898ef94073f6f765ae0a7c7a17 SHA512 a4bb994e175612673e09a050a708adce009621e7c29f7bf6feb1d6bacc7e049fa27fc0cb8d4ce0093bb1f467890337669bdb9ee617fe8df8e3295f060072795f
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.4.ebuild b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.4.ebuild
index db331df5f9f0..7bba1708ba54 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.4.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.4.ebuild
@@ -10,5 +10,5 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
 
 LICENSE="public-domain"		# bitmap font, not copyrightable
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="nls"
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest b/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
index ebb4bf049ae1..0b7abb8ec861 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
@@ -1,5 +1,5 @@
 DIST font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2 219511 BLAKE2B fe05029295ef04414dd37fe80d023cfbf423fd3c314d53cb71dc2e4c623634e8e5b911f7a92851f49dd66cc9939d4998d4ec78f705a52908d01e1dcb91f08387 SHA512 2bba19c10df8e95f95d59d5fc7c15380c91a5140b0fa490497dbdf78a5574adae06a5566941c8c61e4a9850712fc9ca16974173aeee771f41976f472f0a2de13
 DIST font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz 189952 BLAKE2B 1347d53ed01622feeac38d578c39381d40e35e174b0cc6641cf7c4852c63077249a20d9da4fa1c5d98e12331d153815331d29c732ea4f634bc9666b79fda5590 SHA512 bfe2776b84533dd23648df42b2c74fb7f49e665e4f2128c6af529425a1569051c9ddadb696dfa7a6bd959a4929f8a75f7e4fbd7da7767d272a0a8a5424a879cf
 EBUILD font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild 399 BLAKE2B 78ca3e4a38b4bd84ef948daf34a49a56b4fa202cb25662647cb4f473453efe73d7fa74daa6a11f27d914e777acebcdb5d7b15ed496fad0cad6771b3b8ded61b1 SHA512 335dd0813c2fdd102906610f00945db0190c0db830ba20b9874a8822ecd525b2b97ff3ef45ad3cad38622a866ee250507303ea027915e6e0bb8a067b7555c182
-EBUILD font-bh-lucidatypewriter-75dpi-1.0.4.ebuild 448 BLAKE2B 4a164b14b9d2774d2ea633d91a1ce2ac6f982d1ebb23c74485fb131d4cbc31f0d3e221e1acb1ae703519e9acac8faefe3738228e8c5848103f434911ab3446c8 SHA512 937c7643dc21bc7509c9668c8ca3ba59e68049961ac664e2a2948baee5a432389469936b88eb1c0a2d61cf2dcfbc735f6a83fd88b473119ad806c2b01a52b945
+EBUILD font-bh-lucidatypewriter-75dpi-1.0.4.ebuild 447 BLAKE2B d8b4b2e2bca2ec340702bb7f7bd1aec2bb3b63965748e975193c6d644f8454dc3f6cdf3f62ca627f322ee3cabc467dfd52aa5301757c439fb122c499ebb1cc8d SHA512 4d055044e395f2a8f84cfcd4286d837992a8772df4d23d36685883a5eef0d96be081deb6fb018e901d6de8ae08fab0d9ecdeb01fb6ee18e139330f7d866760d2
 MISC metadata.xml 357 BLAKE2B 79343eb058fc9c8deaf7989fc99fd4dcf5921ddd69f39c6caa78af1b0965b539f3dc8b437ca95ecf2e167e531cf4ad278ef78043d9ffa5dc24f4666a0e7a916c SHA512 a4378a384920b13baf028f5836e114bee74b4b08c8a126ff3cb06b41e73bf1e0649d70b51a4f9a0751ce097a1ab47edc876f5ff68c5051a42ca8ac80e60bf3cf
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.4.ebuild b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.4.ebuild
index d91862d1c61f..edb879fce679 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.4.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.4.ebuild
@@ -10,5 +10,5 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
 
 LICENSE="public-domain"		# bitmap font, not copyrightable
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="nls"
diff --git a/media-fonts/font-bh-ttf/Manifest b/media-fonts/font-bh-ttf/Manifest
index 1d07d07bffe1..451ca5eb8b4c 100644
--- a/media-fonts/font-bh-ttf/Manifest
+++ b/media-fonts/font-bh-ttf/Manifest
@@ -1,5 +1,5 @@
 DIST font-bh-ttf-1.0.3.tar.bz2 465351 BLAKE2B 2d508265128262b479f184341862687235af0bec4098dec269f257ad3d2ec94de08ccee4701612c9b747214b38587840a4051dbca2fa1852e859482eb8cf6ecb SHA512 36b5b6bbc2894cd90a372e8131281a462b42d503be3e9af8565edbcd954b336690aa86a0b6fb162d865ba71b65669c5b911658c5b820effcea39d086d485be25
 DIST font-bh-ttf-1.0.4.tar.xz 372012 BLAKE2B c29459ba2ef8aa3821c8f6d500febc5d638ada726597236bbf76d468a12ccac4e23a0787e17af70be3e9eea0163d86846cf69f8eaf23bb2be91fac446a640dfa SHA512 d9d1cfdd3d73157d0253bebb76e91b92c5ffface42dd6aeca40f1deffe03f079a0f9a46d6fb368e5c213e413d0753766e9454ac4222baa3c9898dfcf92718fd0
 EBUILD font-bh-ttf-1.0.3-r2.ebuild 335 BLAKE2B 4499dc99020821c1ed13bb8fcc300012ce338fb8febcfa0efff804c37443e0b9322219074df440a6cbc746f5c7b168e8cdd115715cbbd2de6914462d45945b75 SHA512 e917876b8632a13a7ee91b48a77201a63c395ddf998635352176ddcdc10ed747d02a37aa5a5c10fa5f3427f5f3d7751e638ae493ce35b25c70b98cadcbb9dd10
-EBUILD font-bh-ttf-1.0.4.ebuild 361 BLAKE2B 94cae52102551d4f7c14ec443b3d82a6b3e900346dfe9efa0b8f042bd77f7ac3f2ca50cdff73a8d661c904c59a02eae76c47e835ae1db4f8cc95e922f762dab3 SHA512 26c5b47163a3ec71b47957b8fe0c8006a8813e6e88d8e16810ad157487171bae999a549fbfc2963101bcbccec3afa8f022f09e1e84d11ea4eedf992b13611126
+EBUILD font-bh-ttf-1.0.4.ebuild 360 BLAKE2B fc256038b5c42a9c6588a78f7fdb0990558e3144678db8a0ea0f7cbbb6aff54aa8fb69ff4218fe8208fec0a69f83af949d7e8d732bbce49b8d1d57681bd415e5 SHA512 3bb302bb21f48f2327abba0e5efecf6d678cfd7047ff061702fb10da1e0b1da445916bfb596016613de23c79d7d4819632c0b8d6d7254907e440fe39059e5021
 MISC metadata.xml 338 BLAKE2B 353df9a92cdb7dcd02b9b4dd447b2045d5c76116258cd33826bc5b4ffb1f5903e85e05abf782aef2f4a9b0affdfc34153420db0f7fd5c7bf04c1912867cc8ba5 SHA512 a9469ad9f013b3430745f90d9913d166948f199734b98635115a197648850aa6c66c0b3327db30b3da1a349cdb6bee9948daf3b73c5014e7f9df83ee5602368d
diff --git a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.4.ebuild b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.4.ebuild
index cf93652600a6..b1173e6ee976 100644
--- a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.4.ebuild
+++ b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes TrueType fonts"
 LICENSE="bh-luxi"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
diff --git a/media-fonts/font-bh-type1/Manifest b/media-fonts/font-bh-type1/Manifest
index 605932bcf66a..9f8a59533fa4 100644
--- a/media-fonts/font-bh-type1/Manifest
+++ b/media-fonts/font-bh-type1/Manifest
@@ -1,5 +1,5 @@
 DIST font-bh-type1-1.0.3.tar.bz2 637337 BLAKE2B 122df86566d86a8fa85cc1da3f7d1913a2df589c301540b2bdd73e96726dc5fdb16184f80d8a3a58e6bd1ca54e0f4a3a0f266a35747f500065746f0be209484f SHA512 dc6cfe7d78a549ae5368ddd2bb3edc6746648b32e1f22bce87f6adc0845ef4827cd3b2472d0afa17a16a2c384e84f74f1c7d807510798bc69089920fdc5486da
 DIST font-bh-type1-1.0.4.tar.xz 633212 BLAKE2B fa2b80703eaa86eb77726250c7f98af5271f4e24f224e8e88124dab80bc8988f0760d451c6ff9264ed1af083a2ceeec0fa8b8eee636351c44823a825cb92dc22 SHA512 06b0752b67a8109c0173be2ad4b9623940bc0c55e5854dddfd74c4abf96b4ab2f0e4446325c4d6971011231176f87a06b55e906b7472f371b9824d89e3cbee7f
 EBUILD font-bh-type1-1.0.3-r2.ebuild 335 BLAKE2B 1a58c83b29f4790ecb6a9be8f6a88d61e4c85497a33ee3ce9dd7c657f6046b73a37e7984a820bcacaa4e1e72bd4d44401853d7d6074c493276d2798afd002ed0 SHA512 36fad46a28a216703c0dac8f5fc1babf1a301e22fe0323dceef6262b84608fe6b8d5d73cf838be6b719aeb66c2816c11f627cbbb397c8ccbca13ce4cb62b5b48
-EBUILD font-bh-type1-1.0.4.ebuild 361 BLAKE2B 9a3204d6f8df0462baf34633ddd38891123c5b33cc06d8668124d5081e4629f7e47c549316b15e0c69bc4edcefa33d140310687c06a62051737774ddddd64fae SHA512 a50c428871fa097c43fc134cdd246c17cfced4e0e19a40a37c9a593e49adca9e694c7930b7074eaa3fd89263ac3c20f7bb6306cbddbe7c46615baaf35150a353
+EBUILD font-bh-type1-1.0.4.ebuild 360 BLAKE2B 0bafd43d10e0feb726b0ac71dcb0f0f327a8c8fdcbde918a4b203e038d762fe13aef70cba1d1797e3e5ce7e86077494c5013fd1fcdceb71318b2edd736a94ef1 SHA512 4e16ab0f91dbfd2c8e732609e33eb8f51af4be49c88b95aad7bf8d0c53ad8f25ecc5c8518d37f47aae17a3df4af1fc8f5bf5b69c609b9a5f020e1a82b5e4180a
 MISC metadata.xml 340 BLAKE2B 7745bd7b2bbea9711573d1f836fdb539165109f39234e0860d1a53c903d0cb20b0af4644908012a7cc6cbd72c71fe5e3ab970e1eb0d9e01020212e8e4c0b1b39 SHA512 5555e457025bd9b0086126bc8f3140d37292e30f48448decd18cddcf23d20c3bddd89894f1e8b1921d09e77b9cf2a6e5853bd5cfd0b54f91240e7f0d5f0a955b
diff --git a/media-fonts/font-bh-type1/font-bh-type1-1.0.4.ebuild b/media-fonts/font-bh-type1/font-bh-type1-1.0.4.ebuild
index decc8c3a4542..090482f0d531 100644
--- a/media-fonts/font-bh-type1/font-bh-type1-1.0.4.ebuild
+++ b/media-fonts/font-bh-type1/font-bh-type1-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes Type 1 fonts"
 LICENSE="bh-luxi"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
diff --git a/media-fonts/font-bitstream-100dpi/Manifest b/media-fonts/font-bitstream-100dpi/Manifest
index 973f10ccba7e..172b06b49a57 100644
--- a/media-fonts/font-bitstream-100dpi/Manifest
+++ b/media-fonts/font-bitstream-100dpi/Manifest
@@ -1,5 +1,5 @@
 DIST font-bitstream-100dpi-1.0.3.tar.bz2 200276 BLAKE2B c5e4584642f49c30d8a1a17f3384a9bec8c3363ff7bc2cc1cfea8d04e8ad39e3f44ccffb461cf1508b5dc96b8a7fa6612b754cee6214fc1c6e6689c68e650819 SHA512 10fd920d46d2cb1b314e8c2f05c202e9ffa74a4e5315f34790eba8bd8fcda865a6932eb712a7538624e69367647bcd6891e7015099e65463aeef772d0ba58bfd
 DIST font-bitstream-100dpi-1.0.4.tar.xz 176520 BLAKE2B 43dad919d77c6d28f918bd8851cd9f72f3a7622c761a861c00777671cf0c57abe602de8b8e8093a81b6c3ab03e8c6d42224d74f3faf4d0132a9834b671bb8216 SHA512 1389681eee8b9e2bbfe0293b0aa1add7c6fa86149ff3cb779195ddcc548b1a519336c2d43b6988c899dc09d44ca30de9ffb5daca24fc3906694ab0fd391eb437
 EBUILD font-bitstream-100dpi-1.0.3-r2.ebuild 301 BLAKE2B bbfafa012b8666a8039c382888633028cf3a12e39036a93daa15bb058d90a02c74cf69902ecae9a3515c17db97c0ac85a5f73a94b8e14a3a8aef786e6180f933 SHA512 a01f46abbaa75c0b92b790865eb246226e1fc7bbe1e680481dd04c81c06d11d8cf40c75bef2fb63de7d97f3c0f84f56d8e38589eef2bb4ac49d371385057cb76
-EBUILD font-bitstream-100dpi-1.0.4.ebuild 350 BLAKE2B 2f13204418168bf74e7f81177da985d775d8d88b737694a0f992cff4850737383bbefa89ffbfeba75fb0426678997102e7418b429e9795ba0699b7d126127c1d SHA512 a8e5e95438bfed119e07784538846ea9616fedb60b11f1e377badafcac303b52f170528a6d3d36df782046aacb20ca057924ecfd4ac33883a6a4807da985c44d
+EBUILD font-bitstream-100dpi-1.0.4.ebuild 349 BLAKE2B efb861d46997a6917adf134f032b338bfcaabc954d1ded953a8679f027686cc96ecc672877299851e8ba74a9760f2f8bd38858a9408c722019e86065adbbd0db SHA512 8fda5f1e80e02708dcfdc0cccb64a1ff6e9f685a65fef393bcd810e330643e7b78926be4555cdc657dfccb56c979a1c559e0b733004ff48d645033b805b3504b
 MISC metadata.xml 348 BLAKE2B 05d083d2e5a3a381a49ae04090a3a003c46a97212b76c53c558c9aa02f703b213bcb39cc7503d3a9d30f3db87888052d14fa848ea8e8888a32430628d13b101d SHA512 05405ca206ab3c7aba66085dea1e0f7d4672607d54976b6b9d950dec5d20cbef57349abbfce6933bfea85d33f3c020fb3ae69d1b8d7041e117d81765c21e571f
diff --git a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.4.ebuild b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.4.ebuild
index 0fc09edd8d00..149c32822105 100644
--- a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.4.ebuild
+++ b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Bitstream bitmap fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/media-fonts/font-bitstream-75dpi/Manifest b/media-fonts/font-bitstream-75dpi/Manifest
index 52a019951076..9111d4d01a8b 100644
--- a/media-fonts/font-bitstream-75dpi/Manifest
+++ b/media-fonts/font-bitstream-75dpi/Manifest
@@ -1,5 +1,5 @@
 DIST font-bitstream-75dpi-1.0.3.tar.bz2 174603 BLAKE2B a4d57cff621d57c27830e4ccf870d74fffe699d0ade6df32300a5f4de1237b263e449fca46879ac21329888820e48efd49f057192ce3ac11aae56243bcc3e1c3 SHA512 9311a5b0cbe1613aca87fdf7fd9ab263eb1129e3c3eacbce54547f2185e151fb1237128b1b6d39f716f28694a486909564ecc9a0aef061438622d11b5661d650
 DIST font-bitstream-75dpi-1.0.4.tar.xz 159708 BLAKE2B c9e240839f6365553df3061cb2113c939b3306d70ec321a1cafb232fce7f471a03029dc308370424d932fe6d39a27585fd48fa581486eb63153dc1ab3e0fe806 SHA512 d678c58493696b3a744878991838b329243e5ba7985b1a435b62e9b1a05b5609d0b66d5943d840479ce2c5fc1da1b0633c33f28e3613712d26802fc41ee22c22
 EBUILD font-bitstream-75dpi-1.0.3-r2.ebuild 300 BLAKE2B b570837682ec83b5aa5790a5a17ccf8fd37efc57cdeb3eef7ebc0f338ef74a51b1468a4982d4e8b9da6a2962a62c44bf3f519a27d4bf1fd5aec75e3d1362e908 SHA512 5af22181a6b9d648f684ecf16328180103e479d6d4fe84f3cf74783b35e24109a7cd8063705748903e7590ea7bce8f2cac077ee1170e747e5290a211c4bc3cfe
-EBUILD font-bitstream-75dpi-1.0.4.ebuild 349 BLAKE2B ad6b3c1db4d88ca249550a13e9103d18bd4327cc614ba1bd45ca0f28cc8eb78f0fcd8999e9426aa948b3632e8f55752ea3effd933ee38859a5f82708b7b20dca SHA512 a03998d6b1217a01c6a433e5102c93e2d56ac2ff651c65276c2b42d987bfc181c4f7bb5b1cdd75394543f4908c42895521271b69da759941ed1eecc1af2b2aa7
+EBUILD font-bitstream-75dpi-1.0.4.ebuild 348 BLAKE2B c2e988f909f4bd5a1c87d59e4e7650117877e90279706e876015cc7ef517f395b29c2645a3c8b7af4e1af5d2946f39abc031f61e5835a42b7b77c42668036d51 SHA512 0dd8109b67a8c108d8d8c5853ded833cf18d9a021e558bb0295eea8d48e587f0f4f8f785ed9e0eb0d30ce62c9986179f94d62fd1058d7fc5fad0ec3918dd9521
 MISC metadata.xml 347 BLAKE2B eb23f45d88568bb8a1680ca22a8b1d5015650bd40ec7f2dc3a93226000ffc65fecf4fed51bfb03ec0ca54e6b043d50554c6f36031711860922d5643b8a5730ec SHA512 64d9facb99cce7c754d0b2c8cd57c61b6498c9b33c0e34ac07fbf3a50095aba153bed7f6c18867cc52d453713020fc92897559dc21b3ce1210483e4aa2e99565
diff --git a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.4.ebuild b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.4.ebuild
index ca74c63fcc6a..c475ccdf22ea 100644
--- a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.4.ebuild
+++ b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Bitstream bitmap fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/media-fonts/font-bitstream-type1/Manifest b/media-fonts/font-bitstream-type1/Manifest
index e4045b111c2d..db48ee271b32 100644
--- a/media-fonts/font-bitstream-type1/Manifest
+++ b/media-fonts/font-bitstream-type1/Manifest
@@ -1,5 +1,5 @@
 DIST font-bitstream-type1-1.0.3.tar.bz2 415980 BLAKE2B 6877549e25cec38f46ef19ee3b34cc3c2b0f3aaaa497ab3d26e8514405ad09a384c87667e82a220d14a85f4ca448a1f939739b618e3ae62c1214b7c7de39a422 SHA512 71883f7fc0a68b4fb8ef30b8b8bdfd73ae1194b6d6495abde6c819eef7a91d6365ef1b4cae026d6c3fa7fddecc643b46b7ba1232cec404fcada49a92aaf1af61
 DIST font-bitstream-type1-1.0.4.tar.xz 393644 BLAKE2B 7d00778c7179e803ec5f5ffad80c845351bb9633a27b9d92fd82dbe61dac8e5b24c0df19d99533a1b0d064a767990d30a7df934e1f27c05f85e3bb50f3050e62 SHA512 f09d60abb88c9be6227c57f5519f08e5e3c59c916183d32a512d3c2ace0047eaad2b377c3725c8987e8b4c55468eb7821322ff5447f000d4c2be6cb909f6219b
 EBUILD font-bitstream-type1-1.0.3-r2.ebuild 306 BLAKE2B c326316eba8150d5a32e30f67445a37c085b6b2b0b1aa548b962e001d5c59dfd4950d6aebf04fc28b6fa98ce9b21f1cd6bcb3c4c0c786177c72d6b74263838f9 SHA512 5a2f1aa5878d341521395505e1df555943acea3018c6832fe3c2e5f4f7cddc206c1dac1933288997b77c03b71de36b10362dcb2d89d9f382265a50cc2034d001
-EBUILD font-bitstream-type1-1.0.4.ebuild 332 BLAKE2B d256e0f6c39f60b90f8d506bcfdce9678173963e96b3e086cdc6f8b62c7329febe81b5e3a882a2c6a71c92e21dd36e2515e2bf592dd95fee4f230732491c61ad SHA512 be0662c6e9a23465d23e05c17f22dd7191c4b8dd8732d84c71b1dfecd60b1ccbc6725ac57808cb435b1610526551f1d5f742c3c9548101a92f5bc983a28f5d9e
+EBUILD font-bitstream-type1-1.0.4.ebuild 331 BLAKE2B 7764cb45a6a9d8a330ae204fad2bad98661c1824665df2dac6819a96904f4ecba49b0d222b9d253bd089f29dadeedc641f2d62b80355ad9a581cef81990251d9 SHA512 71f35dcb6d4bbc9a21b8d55a73af70be5f0ea9ae4b27fe3bc99583a369e50fad9e2a809364117cac1bec59b783d5162c9ba6bc6b2fb0d6973081401b1ce77dd3
 MISC metadata.xml 347 BLAKE2B 579c49126358e7d6badf1e146fb4b2ee252332de9d2397b18bfd5e524c2194171394b9dedac9077f2d78b383d6704132a13e58f5944b57ed83ed2567d7789844 SHA512 f4986ee7bfbb3c9e15e2ed65c685d66e2be9fdc7fa9bec23a264b8af901996c81cb554f8afaedaec54e5e7555d2bf095c47f0c2f10c366038107050fa4e0b255
diff --git a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.4.ebuild b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.4.ebuild
index d429cf1d7bc4..25d296397330 100644
--- a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.4.ebuild
+++ b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.4.ebuild
@@ -8,4 +8,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Bitstream Type 1 fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/media-fonts/font-cronyx-cyrillic/Manifest b/media-fonts/font-cronyx-cyrillic/Manifest
index 885909702cd4..55070545f654 100644
--- a/media-fonts/font-cronyx-cyrillic/Manifest
+++ b/media-fonts/font-cronyx-cyrillic/Manifest
@@ -1,5 +1,5 @@
 DIST font-cronyx-cyrillic-1.0.3.tar.bz2 262896 BLAKE2B 928c67c3adcedc7e507d097bd522493f4f035e43037792f88e7c239f26b955734023c7c4686e51e9f001804f3f0bffc5025cfed50571bad19c27917fc4f92ef9 SHA512 b926c425644f94548ad831c38573009ae97d207a05c9d8a917018c2518911960280eb3861ae11d99bc8d001fb0dca1967712fb70ba4f413bc9d6ac8ef904b456
 DIST font-cronyx-cyrillic-1.0.4.tar.xz 235908 BLAKE2B afaaadfebc31b199ec7d1bfcb93c9041450d85a95f22a641dcaf0e3e06919a8ca46be48e9b34231976a3763810302630b49562fd7144ccf972879265a7de4a98 SHA512 39c0bfc08ac746fd98a668d7545da503e8413d5d66cdb1884489ed7221fa4f09dad8dc997ca39595113e2f12fd65de6d2bfd8eaf1480aa93d5eb961d2e2f7cff
 EBUILD font-cronyx-cyrillic-1.0.3-r2.ebuild 299 BLAKE2B 4cc69411e2d70de1192e496e9b808e8b37b610088ebab4445908e62b698df53eac7e9ee13a7722f1aeeafc7981e9a2fc5b6c69b20ac267e29ed766c6d4a2a58b SHA512 cabc9a3b822cf34b201ecdd9fdb1691f6e12b7fddd69c4cec9616e05138395267429815b070e56039c66ac5bec6c59c93a4b0e40ac992fbbf94bbb8f90dcbe26
-EBUILD font-cronyx-cyrillic-1.0.4.ebuild 348 BLAKE2B b1d5be10a8dd25d413f6bab2e9975d4405fade32901975e6147527c80c2e486ac9e759b50a081714b9d9129a13944816776475a363e7fc534f85bd8afb312854 SHA512 7c986f74ee60267bb1532ed283a151713ee2faf06bdc95016e95670d6537d14af238697a0b33d9efb79d955c28dc516e6acbdbbfd6ab45582e5ffa6c252045d2
+EBUILD font-cronyx-cyrillic-1.0.4.ebuild 347 BLAKE2B 26f4150443fdf443c66547c5eb300d0fcbb072314bc95811ddbf03ae9d9646795e6d39f118f2dc922c3ef1fa53dd68be26101d1ba1ee853e6683cd764c38fb99 SHA512 ad6e3121469941efe43c489fbd266150afd281738af3079d1d338dd3a2cae9c7f25beadc920ea6342c9bb734e00b24a70cdadf1cb908cbc8456aac0f277bcc7a
 MISC metadata.xml 347 BLAKE2B 1c687e90a236e88d541b564f14b9050e748399a17db8e2ff5a1b2de6508bf8266d0ce75995a7449bdf454cdd5943e25d830ef787c6fb107f5aadd9a2e6119512 SHA512 fe088a531729d6806cc0f6ffdad0bf1739c638c804d0c20a5d26e95a48fd9f7864cfc4bcd12cb93def22ab45a44a1b7adf1ae1eed3a6d59c8eae91b13f9b72da
diff --git a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.4.ebuild b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.4.ebuild
index e715454f1eda..c5687d22181e 100644
--- a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.4.ebuild
+++ b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Cronyx cyrillic fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/media-fonts/font-cursor-misc/Manifest b/media-fonts/font-cursor-misc/Manifest
index 2411b83e09ba..cad426531f58 100644
--- a/media-fonts/font-cursor-misc/Manifest
+++ b/media-fonts/font-cursor-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-cursor-misc-1.0.3.tar.bz2 102041 BLAKE2B 13ed204f19b64c0e392664665bf670a497b9ad9efaa748ff521787d8f3f0e170c9361dccf97c4e106be557743b57ebe61fbe346f7e0f71fe733df9c6aa378f14 SHA512 7ecb7f1c3c11da8b81fc0ff121fa6c1026b11f6c7878ffd0e4959df036511bc579d6b0552422ce13e26a8d188e3406631d2de55cab6b29bc7fce0416a8cffc83
 DIST font-cursor-misc-1.0.4.tar.xz 97384 BLAKE2B 080d34385b352241de6312554d8896926a761db24a58d3b5946e78f03c55fa246ca1a9750ce057b0f0a5d7edd3778951c05932615eb42be30458fa9e2422205f SHA512 22bd86a81cdfb1e17f885dc3961071c08920171a6f0736ae52d95c8e576b1debc7570aa3b7e1007f474b50435fba411f0eb1847894e8b52f6e6268d91cf9f2db
 EBUILD font-cursor-misc-1.0.3-r2.ebuild 295 BLAKE2B 99c862fa432241cc6553469fb4eb46574c5a582f3b1d22c877fcfeeefb5da0f6384710e54d4c5d6e86d42a07ad7ba488095dd3e98e1005bc564e472b8a2014f8 SHA512 b77a526a35af2e3a43e8ebf5e6cc4d94b50d6df10def5dea5c9069c92f71ae3700a17eb98699b8e4e1b0191bdbecd0a70e9762b90bcdb3534e2ab308c2d743bf
-EBUILD font-cursor-misc-1.0.4.ebuild 344 BLAKE2B 744cee3f8335c80ef0e7f1eb4101bcb50c85a270535696c6bbc85546f56c53cffc26b6adab344804bb522925327607472efc68b97ff60814e9949f743a05cc16 SHA512 8a122d2e706790b35d11edd6a4d41c038b6771ae37f27b4a877656c67097946e7569caffefb8427df9975064c6adde6ad61845e4bb103cf9a65aab59b201c2ad
+EBUILD font-cursor-misc-1.0.4.ebuild 343 BLAKE2B 2af4f55ba748272d4f5e6b35c486f653fbaf2fb6a9a1306f9b2632474b1de40e6a027cab2dc913e111b68a79b939a7ef490e2bf81bf6c675c0fd34594cb4c9ef SHA512 2c933c9186e7c8d99675b92df17d9890115f6967019e8d00b7859ea7a1a4719ce04412fec835e239db14353623c2d39e00b1c8e70ee3b5571efeb44f24d6390b
 MISC metadata.xml 343 BLAKE2B 2184430c19d6c6f239a17656dbb5f675508a47a2f80136b9dd2b00d689c038f896bc78557f95896919656b2574a68f6b21e910991bfb9410633109cf31aa040c SHA512 080a4b55aeb527f40581fcaff03f3d636893e50e731ed6c9289e922bd3da63f4ab262768b0b63375f12ee36710db656a56fc2625aec6744141311f06e74ce624
diff --git a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.4.ebuild b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.4.ebuild
index 56dcb0417687..0b1f5d9b9f68 100644
--- a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.4.ebuild
+++ b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org cursor font"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
diff --git a/media-fonts/font-daewoo-misc/Manifest b/media-fonts/font-daewoo-misc/Manifest
index be7839e5899e..78410fa47ddb 100644
--- a/media-fonts/font-daewoo-misc/Manifest
+++ b/media-fonts/font-daewoo-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-daewoo-misc-1.0.3.tar.bz2 723414 BLAKE2B 5edc33bb4b3e870158235bcefebde9bf0858e7c9ab766659e2859c69562338746186d9ff59bd2b6bf50abe2054b4f595cb7b55454cf671780f28a3245d208002 SHA512 7e97bc580f66a1316e366617d34e1dbefd576b47b9373ef34833aaaf2fdefc50befc2add5f038915db0b45fbdd56b77304a8a980bb72726479d429085c406f06
 DIST font-daewoo-misc-1.0.4.tar.xz 493896 BLAKE2B c9839e54fdc5a62c7615e98670e97d8112248294fbf98ac42116fa4ef19900c35637651a43298807cc6fda5a4a84414351f9f8c27f03614b1a0a27d4ec9aee50 SHA512 be9f550e8cb84f9e24afb6b739c357cb159da8a06f8bc2c26c9fbb62320427dd7522e04d10492cec91ab559b2e5dd5067012ff3225695a8337f1cd7db9801f57
 EBUILD font-daewoo-misc-1.0.3-r2.ebuild 286 BLAKE2B 3107f810b6fbce73dcd693d0bf2d9dc7ff9037ae9e84e8c9b697a92b532cacd86599145c31e4995e02e7139804f77d3d33eb46c12aa8e19fab30fc9d0de620e3 SHA512 cb950efbfbef72ba5a277f9665882278db23a9100a8360a4718097d0e5693d7aa60728b231e760f00b979207e26f1235b103f0f0d788c165fcbaaedc8c594951
-EBUILD font-daewoo-misc-1.0.4.ebuild 335 BLAKE2B 7a8773a5ad7bfb05aa142c05038cebbe1fc8aa618d3f50ea1a2897590b5dcd0680adffd94c119f0ced859c505c4869ddefa696604320f2770da4cddbb5dedeb5 SHA512 a047a88151af19e3bc94df89bf9de6c95ad83474c6dcf4b9094b3dd9e5b641fbe42400333442488db63f5e8114242a5491a0e5dd0ae0cd8138c23af064119dc7
+EBUILD font-daewoo-misc-1.0.4.ebuild 334 BLAKE2B 5f5ca5c66040675b60bab95ed9bb92747fb6ce3ff431d046d269640420ca59256fcb49e5dfa3c69599dcdf8fcf20b8dc632008b57eb3011abcd496fc032169f8 SHA512 c982bdaf9f38ac68a1a1d7014e8be2e605da8e8b6a93efe57ed84b3ae8a6e4fcdd26e67f152d5f1de383083216ff1ca559ec088fda9044f00f96cb36ed29476b
 MISC metadata.xml 343 BLAKE2B fb3b217983d1d157d59989d953203c041fbd302db820505d5b87a56701ec257684796ce6e4621c7d670f2e0d5e770239b23a713643d909d784fa9fac77905aee SHA512 184890d4a3cbb3f39ef24507ea93391e59d6b23afa30cdcaeb03adb39d377d57166c8ad3e746ee196b2d236e8c041c016a6017894ca9de8af82b50ae018ef5ba
diff --git a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.4.ebuild b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.4.ebuild
index 070a3e784889..5623ea3ec596 100644
--- a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.4.ebuild
+++ b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Daewoo fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/media-fonts/font-dec-misc/Manifest b/media-fonts/font-dec-misc/Manifest
index 0dcf3c41b4f7..1dec287d8f40 100644
--- a/media-fonts/font-dec-misc/Manifest
+++ b/media-fonts/font-dec-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-dec-misc-1.0.3.tar.bz2 99832 BLAKE2B 930c1435240a485c2bfb55234f767da4aafdccd2fe3d7c5a760acaefc4d145a68bd0cd5757d4daeed61d8f3ef4eb9bc473454402f6eda62d4a298c79bcbdac6c SHA512 af755d51c4c59cdbe5d3dccf37990bc787373958feb984bb037c8d8aba8a0eb410965a3600886b5123d89e85e1ea0498b84dfa384fccbbcbcaf3549b83c839c6
 DIST font-dec-misc-1.0.4.tar.xz 95284 BLAKE2B 2de5f171a67bbc2d37f49774d25058a4b3460a150c44b681aba194a60b4f7b3243ac8752f83bfc2260deecdf47175518060d3322002e9bd25c3129ddcc4591e7 SHA512 bf6c0e4924835346f1f7913a04fa3903a7c55d292317526dd8eaa799dfb3b52eb2157c34692d659b41a18123af8389785dcb4aa0c31fc387cb368642801c3335
 EBUILD font-dec-misc-1.0.3-r2.ebuild 280 BLAKE2B 2125637b9e2d2eb24b46907e00c1b13ac329abb34a5d6ef864f4c7d830777e7531f67c5927d051c94166b2e1d4f26c5a4de13081e1392c3c37f4b0f0e5cea285 SHA512 e95d0cc5653549491b667a4927821fa81a274cd3470d2df116691d2d48e8fb600a58290a874b51f38df8f4e90e5f8a4c7241eb694d74ec449a603a77d55eddb8
-EBUILD font-dec-misc-1.0.4.ebuild 329 BLAKE2B f413f2d11bd2b0bd13780ca1d81c7dff0ec7d617b85f71fd0905137e35da6fd84f1a76b0ef56c5cfd9dc3047c26d1876cfc3c5e62f416f36aab9c9d248f81310 SHA512 8e5ecc86a90f57779ee670736191bef05eda7662ea9c9c16290b6a350cb0a29f43bebd2ab8ce7f094b6c1b619669ce967ea0cae0ac3c8b8c1296bb245ea21aa4
+EBUILD font-dec-misc-1.0.4.ebuild 328 BLAKE2B 5c477a70bdddda9203f9907c5ce1bfe74ad8e035019eb607133d55ecab4fca301132beaccc1aaeaad19341244ee6775da4e9514ce83c9d2e575893c2cb9b87c0 SHA512 3a9edc53e7c2d8208a8a1e8ead4d60af2580939c90701474321bae0105cc2239db19c98e7bd5b1e1edbfecda614d1663f902529e32a82558c0341e3ae7d9d92c
 MISC metadata.xml 340 BLAKE2B 5f6fcb18d216dfefd3560892f553b5b32b80bfcf91660d535b0f353cf8f4bcf5374f1af2e48ab0a46bcbf006d7b2c25a9943dd5bd5499f417a9a76f90a72e461 SHA512 082629349694609620c800048e57e011f50001247ceb42078351961ef5cea0f4e183bc1ff24fc8a86d105ea9054dc935858f5a75a821d96d9628126556649e58
diff --git a/media-fonts/font-dec-misc/font-dec-misc-1.0.4.ebuild b/media-fonts/font-dec-misc/font-dec-misc-1.0.4.ebuild
index 0c0a9c4deb06..5ce254523f68 100644
--- a/media-fonts/font-dec-misc/font-dec-misc-1.0.4.ebuild
+++ b/media-fonts/font-dec-misc/font-dec-misc-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org DEC fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/media-fonts/font-ibm-type1/Manifest b/media-fonts/font-ibm-type1/Manifest
index 2d339fed672b..027f16f6df35 100644
--- a/media-fonts/font-ibm-type1/Manifest
+++ b/media-fonts/font-ibm-type1/Manifest
@@ -1,5 +1,5 @@
 DIST font-ibm-type1-1.0.3.tar.bz2 376985 BLAKE2B c8563fe5fb44975dc6d99f8ab106c3040276280969df6fd33db23470eaa49acffb10224fadf19867d71346d357bce96a2be898d256fa7adc9be66469dd822293 SHA512 cbd179522c936c4f956ff1fbdc48fc3a55990083b4f858c938c6a54c8526641b4f25eb3a6795d774630b75a0f4fbdf9c16e861e88b2cd95f04c524f95d40f90f
 DIST font-ibm-type1-1.0.4.tar.xz 378468 BLAKE2B ed741c5fd646383446073f22f4dae82c08f060ac8fa47c4ee0deb9322c448a7262d444b84e246a50aa153286a6c50b1574079d71e0de51f9f68435fffd3f76d7 SHA512 42ebc9f1b0726a9a1bf3d7c8a3b7102a448e7c6ff0c5ac1dd8a4861bf51c344ddb2e077df41b86e3e896100371a33f997d6df834b4d64b835d81a36dfddfbce3
 EBUILD font-ibm-type1-1.0.3-r2.ebuild 288 BLAKE2B b56ea5ad64cfadbbe4bac1a9ff101ed3db169411059b92d6232b0c12b8cad083d3c2c157a7787458f7c6acdcfc1e60e82cfda72d8e5d10bed45a31b35672f71c SHA512 263e59763b375c4ff09ef0e4ea36db4ecab03489488861a5cf529da0419762f22c8986fc1e79f7927da2290aa61c275028f9bc09d73a00e4a0546069ea43c807
-EBUILD font-ibm-type1-1.0.4.ebuild 314 BLAKE2B 9e10ec7ec76cdc0969fd6ee19de0e235df3589a70fc89d9d33aacb5b93312e3b48b60836ac2570d6c463c88a6993c2aa48d00e174af6d9d6bc9b79ba71311f16 SHA512 fd27994bd0deee2ca575f1fb3c3133b06d8d18a56a4af7c4ba65d3f4749fd9cfb86725ff0d842efd1a3f9c0de186044a2184ca33a2226d503af1233ad495f67f
+EBUILD font-ibm-type1-1.0.4.ebuild 313 BLAKE2B b65c1f90c90b5576c25207b6260917e109f163feb3f2806187d1fe934357a3f84eacaecf5832896c16decba4018116ed4d2e0f20eb4b5cff66189b4ada8f8ad1 SHA512 a68bfb6e4685dc42eb54607fe07626b7d5bd41ee3d8eacdfc741f0b78f3873bbd1cfd49ccefb0d2b131b96530f3dd8902b5600012b36fbd4b0f66e762d2d7df7
 MISC metadata.xml 341 BLAKE2B 7f736bf8fe43d9b933b0fa1084695d76065be906682627f1cb71a88dc55ddbb36c338d318f1bba04488d67a487b6e043217081e8cad5bb029292b7cbe58bdbde SHA512 bd06ca8b728936a267b5c31b386c2e405f317d2df5d694e098b2220798908edbf05e3ccebad08e77670d3231a785cf298412117e03e53718679cdb81ed1cec5d
diff --git a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.4.ebuild b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.4.ebuild
index 55784fa7aafc..05ac6ebf9533 100644
--- a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.4.ebuild
+++ b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.4.ebuild
@@ -8,4 +8,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org IBM Courier font"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/media-fonts/font-isas-misc/Manifest b/media-fonts/font-isas-misc/Manifest
index ddc70546c67f..7ca5bc5f3e7d 100644
--- a/media-fonts/font-isas-misc/Manifest
+++ b/media-fonts/font-isas-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-isas-misc-1.0.3.tar.bz2 845282 BLAKE2B 4c05c83b64617e1f0740d54c53b13b628affb8c9cef43e785f8101ab5a7fa730d9500f2af45a1c4de658e94e2d7c5e467b6e4761fbb27f4767fb8817e77272b1 SHA512 be6fb1d2c53550a462d1ab010fa7ac913990e83a22d4580c93b8f1f087aa6caa0e46bc87debca2b13b10e5611bd2fe7f6b4240367fb24f59b37f68ffb0e2586b
 DIST font-isas-misc-1.0.4.tar.xz 712068 BLAKE2B 0d42906968da4060a0d4adb38f53f08bdf530bcda6f18dbe03112e687304e063a75679589343e68d485668b89fafbfe7f83920338b5aeaf474c55b4fc3f607c4 SHA512 7c8cc9083600949fff4a0373f9f22df80f6a2c97d8d56bc2c4d03b102d16ad071b984b1ecf547d2d17ede9335e5c3a418512631a18938b7728c66b4339dcedd5
 EBUILD font-isas-misc-1.0.3-r2.ebuild 330 BLAKE2B 39c08b2a7e1a080560b827673e307744a2d48a5460ad2965b18789261467215fe3e35a381192796b5c8edb2c3fd132b0b630dee48c402c6fdb2d551320b2afab SHA512 e5a282b56621a082524deb2ce55b72789a00d875653a1bb5423c22069b127b40fb99ac74d7fc4fdc2d72f2f9cf812a7177c883766a714c574733b50f373a5995
-EBUILD font-isas-misc-1.0.4.ebuild 379 BLAKE2B 4ee49a783e17c08e011a1d9fb79b25f51c6da4b4bce87017d2aac1a6a6e9cbf72af2da8fe67acbd1d3d820a4643bc9c2819481b342a5a55b6c3e01e581853599 SHA512 dc80e58b3a3c88290e0fded0de17cfc584f690fa1f223854f4e0052af7e50f50e6db4b0ea358dda417a41dca08209ae963e3bf6481f6877190f9140d8f0b98cd
+EBUILD font-isas-misc-1.0.4.ebuild 378 BLAKE2B ceb580d437a71e592a2e19f87f0b9f413a7cd66763fc3288e4b713f781bf2d58e7a006254d856fe5fa4d992c765f0bc37b74b58f24b8a4c4ef8ac23a933b8825 SHA512 58006bb92966940556c7d243ba522d79701af108977060d0d90678a6347eef171ab49ea1cf60399b6cf9fa07ce3b16bd4a09738eade1e094a4116ef6b6cfc97f
 MISC metadata.xml 341 BLAKE2B 8d3e0e274660769f9b1c063415678d80999b811bb921fa4c19506754f2fe6c62514f59e4e9e0f27a4c94652e818c0b58e6b99ec53cca7237c40851addb576956 SHA512 be7960222dffede9786b15697a3322584be002cbad9790eeda019e154d23f5e43acdb4bd673d0ddd2442a38351a3c5db26b2319507ab9d2e24c4769c83327819
diff --git a/media-fonts/font-isas-misc/font-isas-misc-1.0.4.ebuild b/media-fonts/font-isas-misc/font-isas-misc-1.0.4.ebuild
index c51951f9c085..a8901b7b7d61 100644
--- a/media-fonts/font-isas-misc/font-isas-misc-1.0.4.ebuild
+++ b/media-fonts/font-isas-misc/font-isas-misc-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org the Institute of Software, Academia Sinica (chinese) fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/media-fonts/font-jis-misc/Manifest b/media-fonts/font-jis-misc/Manifest
index 621213fcb64e..67fa5ba7a35a 100644
--- a/media-fonts/font-jis-misc/Manifest
+++ b/media-fonts/font-jis-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-jis-misc-1.0.3.tar.bz2 621946 BLAKE2B e188c7f1d0e0b22912062dc94f1e9dba75c0990a497b88886e365d635621366af940d77ee2e7eb5f687e2ea6296cfbfed14ec45a0aa59c1d803010e7b8a6113c SHA512 3ce4c96d54440045e84f54f7d790e350c05b0c56a72491941f2cd9ed7e2d1735ff4b41667501cf08d5d81ee19c9de6d43f88a8b59a3c5c55de9fb1696cae208c
 DIST font-jis-misc-1.0.4.tar.xz 514704 BLAKE2B eef0d29fac663e3d60e38cc28e97312939478247071ca3dc592c6443deecbed54ddb0bc894b62bae10d3b02d151366544bfd589c6e964e13b026ae125ca99836 SHA512 c54034205e7bd7a01b311c25c890f9fd1abc25f842315812d5c83d4e4091e5e6c2125a43d4d532b88c79d51cb812b86cfa8e7e4c1a87175746f1bd4e38129440
 EBUILD font-jis-misc-1.0.3-r2.ebuild 290 BLAKE2B dede57359d016b428a4afc6a773d6a0f09fb3e0c913f43c5fcd7fae94b8f96879ea2efa95bdf5b1baaa0ecb27f15268460f8797c6467f3ff3c4a638ea740dbab SHA512 8aeba8cf556e64c0ed3656daacb9a7ddf75fd6abd1098d2d83b3c5f26d28c5d5b6063cc59af31f7766f994a94302f0607d61e04a72f83f2f38195a71ea3b2fb5
-EBUILD font-jis-misc-1.0.4.ebuild 339 BLAKE2B 202f6b55d0e9437a90905acb1cbb65dd30d264a9b17272be2455814b99c069ea4bad636b35c44b2bf44ef5d9bff5d98de7295356a65b17cbced36c9f74250835 SHA512 ba40a1ffd14e20d667959fe618850a3e5e9615e293a7f9b5d2a0a6a7526335a9ac418393f91a0723011c649654e916736a6235220199ebab077797c580180781
+EBUILD font-jis-misc-1.0.4.ebuild 338 BLAKE2B 08c1cd15b7e81337c9033865a737a654f19b773276404ceed656f8438ae22acbe0b3673013e015e55ccfa0b2bc8dea7964276502cd2ba4f04db8bfb48df8d06b SHA512 ac222a6f7929690d46aa744b07ef1576a279374035a3b250190636fc6fa70d8858ca464d7929d861f3ee66aa16c3db6a754c45d04980f7233d7fefa4b2183e7c
 MISC metadata.xml 340 BLAKE2B a44cb1d8db035442895e648f70877d133e8e7f51794d67e861956f92e1b02a1b1e7ea3f638f2b8959c5d81b8201398a35d0042a1e22e457c4820043b0d813e20 SHA512 6db86dce7e21b48a0326ab8fbd5a85300747e7c6473a6dfa3bc6684252684cc3772949d22f3d0d8ca920087ab8fe15f5aec7ec4ae58abc56bc73543f3c1ce235
diff --git a/media-fonts/font-jis-misc/font-jis-misc-1.0.4.ebuild b/media-fonts/font-jis-misc/font-jis-misc-1.0.4.ebuild
index 330394dde560..63387e0526b0 100644
--- a/media-fonts/font-jis-misc/font-jis-misc-1.0.4.ebuild
+++ b/media-fonts/font-jis-misc/font-jis-misc-1.0.4.ebuild
@@ -8,4 +8,4 @@ XORG_PACKAGE_NAME="jis-misc"
 inherit xorg-3
 
 DESCRIPTION="X.Org JIS (japanese) fonts"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/media-fonts/font-micro-misc/Manifest b/media-fonts/font-micro-misc/Manifest
index 92dfb34a938c..634725e21fed 100644
--- a/media-fonts/font-micro-misc/Manifest
+++ b/media-fonts/font-micro-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-micro-misc-1.0.3.tar.bz2 98366 BLAKE2B 98e6872807c35d6fb8bda2be46fbd0d23720af967d068a6abdbf20ac364484d8acd9f4217f739d853c9d373f3c86c1519ebc9854ff671adf955c603ede7f4c7a SHA512 7a546432225c22ae0aacf9ce88b617a7d1d6678ee1f5eb4b3a93e33764fb752f27bca3feda1312182517bbf7babd5f3700bb9b8de0ef6c35b1ae6e2ce7ab0b69
 DIST font-micro-misc-1.0.4.tar.xz 94544 BLAKE2B 347c58af6b699b0845129ee7a20c401f340417f0fa2945815f161037159c9dabb1f809d4234be87bba0f4dffac47b39310d0d01e12f47d583c5ce609d9fdeb85 SHA512 e9a402a5042eef0b618bc30b319256cae9f71f546c167c8b638a780f93cbdc2d61c472203efaee7077acedfac3b3981feefbc1017cfee8512077e61deff42ed3
 EBUILD font-micro-misc-1.0.3-r2.ebuild 312 BLAKE2B 03defb309a37e5bd4aeeda9f3e149fd15c0598aa53326d9d2e111533a5970129c73e3b3b72559e7e7d98858bdcdb1b0c25d3146d5542395961f399f209b5116d SHA512 8ace74d7707300d989bfa5c2828e1df8e8cd1603a1f6128f36ffdb918c9f8547c352ee99e39841a1e418f96fbbed3f7d255cf791946a4590cb911e24b7abea5b
-EBUILD font-micro-misc-1.0.4.ebuild 361 BLAKE2B 0c712598e0a3c6d9a75d52513d5df169f1582d33f72576877af414f47b589adcb612367b940a575300751db17d3d2586ce66be640e904f4c6e1a6818918e7726 SHA512 90095ef690b8262b655c0c507f998e9bc22675625bdf13c440aa01cc794bd282021881a470b8c1ac3bb497448826647f0263758ca36f882b5e93985263a5ed05
+EBUILD font-micro-misc-1.0.4.ebuild 360 BLAKE2B 05253b9ea645404443a865c6b653fb1d1ddc81e1ad542680c5b334d7eefa1177a1bea25c979fe262360a548e05266e14fc7ba3190837ad9925c12e410c9fbeb2 SHA512 3ffb88da01fc21f461cd2473ad09b2163ce2def05f30827f2d24a65aa55e76fd657de83d2655543e5699778a1d24aa54d808ad545c5ed99d411914ddb34e83af
 MISC metadata.xml 342 BLAKE2B de59111645d249e06f9f9a8a8d639d0eb1ae461c37839f57ee2826aad0dd9bd51ecf2e66d8807b88c4ba1d8b7670e0f74a8d47aaa8ef5084d481c2d538b1658b SHA512 505d32057a077a95832355d4ea08b768d8407b2cec11cbc47ed4f83323475ddb7d9a1a92934a0fb064d46442b78dfd79e3d916e54c390fe4677c242c3b133a43
diff --git a/media-fonts/font-micro-misc/font-micro-misc-1.0.4.ebuild b/media-fonts/font-micro-misc/font-micro-misc-1.0.4.ebuild
index c9e4ea80a4c6..f2326963288a 100644
--- a/media-fonts/font-micro-misc/font-micro-misc-1.0.4.ebuild
+++ b/media-fonts/font-micro-misc/font-micro-misc-1.0.4.ebuild
@@ -10,4 +10,4 @@ inherit xorg-3
 DESCRIPTION="X.Org micro-misc font"
 LICENSE="public-domain"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/media-fonts/font-misc-cyrillic/Manifest b/media-fonts/font-misc-cyrillic/Manifest
index 5ee8492a5d13..c932af6c7deb 100644
--- a/media-fonts/font-misc-cyrillic/Manifest
+++ b/media-fonts/font-misc-cyrillic/Manifest
@@ -1,5 +1,5 @@
 DIST font-misc-cyrillic-1.0.3.tar.bz2 125971 BLAKE2B 4b714d9254f00e88537597629944d906766c5f89729fd944a276bbce3c05cb13d5f538e7e046c3bc5651e2a230ccddcb249032228ca5837d04a245fd2a9987f2 SHA512 75e49cdb633f7ce5b9612d5adb0a85471c8fde5d55e8ccd9302f79f01e99e78b02449642c2cf785289f58d833bfa62042fce4253093fb17c87471559d1f9bdbf
 DIST font-misc-cyrillic-1.0.4.tar.xz 124252 BLAKE2B dd4b2f648f30a8ca48fc187e5b8b739cf8adcec25a4453bc4c749ea0dea4f5f954ce860569dda03c56493389730a64aaeda6b72732b4f9041da237cf3813c75f SHA512 fb2102805fedbd04b1533b85abcde79f432b97b72822bcfcdc09f525488d0d0c63815c8c25b79bab864bbe11fa1b72e2c34f5ba7b96eee1b6c84b841bb333353
 EBUILD font-misc-cyrillic-1.0.3-r2.ebuild 295 BLAKE2B 9dc23325c1d9afa52be90da4c92ed4fcfd0cfe878a043727c72d99adbd4e0b1e4c9b3137f2e0ef92318cbbf937fc386df2aae40133ca99d0917035632d8346a2 SHA512 b38e50c7b14450e9951fad0a4ed49af892061d3c9f5bf6cba4907891d428a4b79db4c0c6404ee75ed9fcd1a565986e084997955ca2284a83b35f2c3d2586215b
-EBUILD font-misc-cyrillic-1.0.4.ebuild 344 BLAKE2B f9356cc54204d9b0a03c23345aaca9c7c96b0c07c14ff7837b5121370f79d71a3f01667fbcbd6db6de29fda8e4f2cb8fcd6dc044431b66ed12202b0b606a911a SHA512 75fbbb3d73ee3bd3b5288ec667dac2ee3a2f017f4a199dd0b71c36fd183b0f63578cc672e7d2431d22bc0f7a5102efae585fdfa9922d18d53ea744c54ffdf884
+EBUILD font-misc-cyrillic-1.0.4.ebuild 343 BLAKE2B 4f5f0c2fc67c02f7916f786dcb61070cf12eba5f2002bf0bd90390460c5b300ebaae32a41b621793ca7c7fbdbe0727a1d117a077801aad969937bc22ccbb4f87 SHA512 82b67017604ca5991f2f77bca295c8196e99128c4758a8fe96c5a42ef938b63e3e25e74812b4b6bc45b69af1a677aba57870e8ad7f97a47832eaa23427c34831
 MISC metadata.xml 345 BLAKE2B de76977f8b8b33f8028373a807a1a3dbad59e0573d53841349e8f26a015a3fb4508b4eb35da502bbbb3aff07bcab7c8b5321d4b260b5f100ac2624b0e7a16442 SHA512 a3685291b8aaef1449f55259a73a587652bf21db10f14a8ade034ddc9e916ecf64397b53f978142a9c62289fe451fdacd5921d19365372e29c52ae3c86f665e9
diff --git a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.4.ebuild b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.4.ebuild
index c88b9ebda0fd..b3631ac53b33 100644
--- a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.4.ebuild
+++ b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org misc-cyrillic fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/media-fonts/font-misc-ethiopic/Manifest b/media-fonts/font-misc-ethiopic/Manifest
index f37a5e3c9479..056959078be6 100644
--- a/media-fonts/font-misc-ethiopic/Manifest
+++ b/media-fonts/font-misc-ethiopic/Manifest
@@ -1,5 +1,5 @@
 DIST font-misc-ethiopic-1.0.4.tar.bz2 270076 BLAKE2B b27d188fcb5be3e4e5fed810f26c0f5edf5a51a3532bd51b44e55283518bc1a353054da4f37c5535197eeb6958bfe1567ab54d1d9f428b046b84c5d1233aae21 SHA512 4fed9ff3782746898c56dac199e9ca89356f4967779937049b9ff4ffad202317c023859f92d44b371dfa5485d5368ccad648e64b12cde0ed21f7d4aee5affcd5
 DIST font-misc-ethiopic-1.0.5.tar.xz 222624 BLAKE2B 8184f7d6ebc72ac4524073670319ef26dcd09b1667973e46fb4756f61a4752104a974a44a8666d9bd011f56b3502746531ae8e608959e124068e4a3d5539ba16 SHA512 7732a828c005e3762b6383729134c5656fd575ac59288504d047fbe26e9965a80519a37b0cc4c6b89379a85a62160c5ea76017f790447a230c015aa7a9143ba0
 EBUILD font-misc-ethiopic-1.0.4.ebuild 744 BLAKE2B ef067207530c44e2b272a7b521da31bfe6f252ecc4b0ee51bdc5d9b106b74c861501cb1ff883ac1a1386042db8c09ddb856df8c15f2923dffc1498e84c24a699 SHA512 81b63081af7ed36f1003fbdb54713216e443f601924a3af08c9830b2ffbb1bb15577bc676f97d5bcd6fdd4a4fc8ab0b161364d8322afad9e7dbd3bbd288f3702
-EBUILD font-misc-ethiopic-1.0.5.ebuild 769 BLAKE2B 8b5e348e33a404f81ad2a7b0fcc5c827ae7cc277d78b7d05c8e81a1a3fca54b4d683aebf58356fdfb15ab818aad809f7b0d97e5085ae66afc1028ab3c590097b SHA512 e48d4d42082595d3bfafd07390fc2320326b922d32d7c760525d634ab68172529ca59b86b7f4660fe8a620211f10b72cae0d11987b0eb733efa42632143d3cb3
+EBUILD font-misc-ethiopic-1.0.5.ebuild 768 BLAKE2B 5cb4900cb808f01503c342fc8199894bce7b8d99b1e93b48802b05fe95d9421f30b88e0d1647e1a54d394c790b2a43bfcdd018fe68ac5ea1b296d0ce433ccd17 SHA512 4eaa7e46012fd2c908860372a7943396e442a138faa94005ad6a18a8ee22588084c050c2b69a89bc737c3bb1fc9f89d4a1b5284e7ceaed2732dfa5add36d1d06
 MISC metadata.xml 345 BLAKE2B fd2d91ddac540c448d4a5e6033255b74cf20e1cbd0f7116b62bcf93c91f21afbf7bde070b8c4b233fea1499636d6e4f34aa15c45e2a2c50cadddd64b0704d4cd SHA512 64522a3bb3a8dbdd636466b02d9740df8664950076ef72af3673ed57512b9ac1dc9d61f325cf809d25997b3092ace35c5dd15c0bb012046f5ae9fac4fda78387
diff --git a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.5.ebuild b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.5.ebuild
index 45c1013c4947..f2cb224eb28d 100644
--- a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.5.ebuild
+++ b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.5.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="Miscellaneous Ethiopic fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 XORG_CONFIGURE_OPTIONS=(
 	--with-fontrootdir="${EPREFIX}/usr/share/fonts"
diff --git a/media-fonts/font-misc-meltho/Manifest b/media-fonts/font-misc-meltho/Manifest
index 56112abaf1f4..cfa3a7f6b253 100644
--- a/media-fonts/font-misc-meltho/Manifest
+++ b/media-fonts/font-misc-meltho/Manifest
@@ -1,5 +1,5 @@
 DIST font-misc-meltho-1.0.3.tar.bz2 1578992 BLAKE2B e76691a76d1416c7e7188ca53e0ebb639269333f4078fc0de9c1b7ecde69a7985115f7a347e55a3bd86a268b0de36b7a02ebaae343743dd7cc934038928cd7ea SHA512 3f42fe3e127f74259d50754f4bb6d2560cb32d810fecf663bd09fddb34829d29b48f3cbfaf43d02dab70b559afb2f806f321076f83450ff3871604345a0cdb56
 DIST font-misc-meltho-1.0.4.tar.xz 831660 BLAKE2B fa0c8d19f8fe056ab3d9d17b00cf425f2c048253dcb919cc37e221c1b094d55fa297aba0ab55a1d2e14c7b52cc061d08b2e489e30f29828713d725ad90a38f63 SHA512 1391e24b0402f50dfa877d71305ef8c144c489b21db0fdab278668360eef7e5ebd4145d77f52b5fc7225895804f3fc7f0e67ad114d64cde073e642d7ae328a54
 EBUILD font-misc-meltho-1.0.3-r2.ebuild 308 BLAKE2B c9b10b6d34a95f91549be486b6322d38eaf82c0f82f0b0e129c556f411fa5189df15d07aa42cd0c80a739e2cd431fa99b130314b8d0754a29b3caba699974b27 SHA512 c4cedc0198a954aa758091075aaac7d5b8b4184941cd037385e7d372d79b237a7ffe6f0a595865c8c2f62cd70fdb9d5463e8deea755441da6629c50513ca6715
-EBUILD font-misc-meltho-1.0.4.ebuild 333 BLAKE2B 208fa5e6b5ceb6a9be2e513504ad8d2d920eea29e86ef44b5a3bdd9e67d843b423b003e19b464a415632878b88170c432a67eb75dc57af511ace1b6e388d205c SHA512 cf43ccc2d9d7ee6a3adc2dd7893c6e3834406928e8fcd9a88374822013fac89e0f3d9166b5ba69ec5ac2375a2c855863df5f8fac8196aa4b9d4c96c8b1b19fde
+EBUILD font-misc-meltho-1.0.4.ebuild 332 BLAKE2B 28c4ddb5754cbf96f594cdd9754985dacddd453e7ec0b0092805e46c073201248a1701a18a1028369aed60a725bde81d69e9473e2b2f86469ef38ec2d3cffffd SHA512 0b70400345ba7f0ea482dc4f629740b6f1ba402acfac2254c51666c7860be712f70cd38f5f14d9cfbea9d61284193c71efceaf3a039d73dd4f10289e37ddd64f
 MISC metadata.xml 343 BLAKE2B c5c02898b99cc9b63a5eb3cf8deed166a9bfdef3d6dddfbba50fa751df19b6d07b5015bf286cb89f5c822bfa1faa3ed2ee8d543d1a6571bf2dc9fa87449bc8cf SHA512 54388cefe78fed20e05d805374944f182b7d0879c5b889ed34a32c7fe8488d2f4a5ad890a2e97c16ae3caaaa3359d4387a7e9bed8915bb534a641018da0c9e35
diff --git a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.4.ebuild b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.4.ebuild
index 3fed502dd914..f58c92cd9237 100644
--- a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.4.ebuild
+++ b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Syriac fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/media-fonts/font-misc-misc/Manifest b/media-fonts/font-misc-misc/Manifest
index de9434bce03d..d94cdf48f76e 100644
--- a/media-fonts/font-misc-misc/Manifest
+++ b/media-fonts/font-misc-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-misc-misc-1.1.2.tar.bz2 1933789 BLAKE2B ec60ab2f9c18b5dfe272ea48f46d0af064b1d156bbb87e261a4c1ad60f5771e4a2b3464f054e6264c16e978083cfbb3dbc05a8f96f2041c1efc61f4bf4ee0ab6 SHA512 d0bf74142f9621746846ea7a6fe9ae298a303a09c65e05c7decb4f37b2f513a88d727bf3dc5a3566c30de83b83493f164be0118b41d704464f75700b55018c74
 DIST font-misc-misc-1.1.3.tar.xz 1563776 BLAKE2B 0b56e86ddcf11623a3e05da2571fec30fbc763fa1916fcbee8a2eac64fb5b1722d5a9da8f192655e88220077763121670618fee9878fa3174ea73fe6d50f6654 SHA512 fac4bfda0e4189d1a9999abc47bdd404f2beeec5301da190d92afc2176cd344789b7223c1b2f4748bd0efe1b9a81fa7f13f7037015d5d800480fa2236f369b48
 EBUILD font-misc-misc-1.1.2-r3.ebuild 417 BLAKE2B 8837f93c7a51c9cab7afa6e43a1e0bc224d1ab00f890bf8175415fec28de7fd8af90db64c2a6f96509b106d47f6778fe90aa8602d66968002967e9e4bdcc5100 SHA512 4d0995f125ba14ea292dea2daba16c816b738c9c41c974ac25911d6870f617c97ae46e3d893298ef3abf19d88734d54116043a4e1f217119ec71fa860c15dcd0
-EBUILD font-misc-misc-1.1.3.ebuild 443 BLAKE2B 7d8b2fe38162d43a451bf06957a2cae1be17e4407e84ce479a92d37514089a4b3e00e78cccfcabf519756052a80d8d0ade6a8d92e48b87abea1cdc01d4f58f0c SHA512 b8a8088966fe24e325ba53c388bd1bd14d4a6c4b167e7a1e011bd3724c2e08dfd55599dd684596c80f3483371b3d18a3406da5ef3127c09adbffcf3ad0a233e6
+EBUILD font-misc-misc-1.1.3.ebuild 442 BLAKE2B 18d98a26346f30393e5bd92bed53c259fa97b829cdce74bd308d5aebeeae8d1bb983b071b2cb8e4f8f349419cbb5787bf34d83404068735e3d9a60025f1b1334 SHA512 9f3536aca78ccccea451f13367c357c9b0fed758a39f5560bdbf4f387b6e9d6590bb0eb8f5fb47cc0acf70004e386fe6482701154c95c9116aa71df05b582861
 MISC metadata.xml 341 BLAKE2B ec40d561e4bc60a47a236bc238303bbbac93d36d2987ae720de78874d306137837937df8a255095effa0c877c59bb9c290c53a91cce853141fc6f61fe2d92f45 SHA512 a5c9b5511d9bca451bce77980a3af80d674c7b638300018754ef513ebf63a825d1b6ddd3ecdf3cc87291239f3c4b24db20ec71aedf3a7907177705919a1b9a59
diff --git a/media-fonts/font-misc-misc/font-misc-misc-1.1.3.ebuild b/media-fonts/font-misc-misc/font-misc-misc-1.1.3.ebuild
index 8650994abc4f..ca8cd13869f7 100644
--- a/media-fonts/font-misc-misc/font-misc-misc-1.1.3.ebuild
+++ b/media-fonts/font-misc-misc/font-misc-misc-1.1.3.ebuild
@@ -9,5 +9,5 @@ inherit xorg-3
 
 DESCRIPTION="X.Org miscellaneous fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
diff --git a/media-fonts/font-mutt-misc/Manifest b/media-fonts/font-mutt-misc/Manifest
index 5cdd3198e0a1..1abbb80570b1 100644
--- a/media-fonts/font-mutt-misc/Manifest
+++ b/media-fonts/font-mutt-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-mutt-misc-1.0.3.tar.bz2 266510 BLAKE2B b3e460b5837accf613c9a4b5285a40f160bbf1b791cd90534cfb58da4f1857c1c5ec659ff4b1b6268573574ce2f4ff7cf6bb5abd7512c27fffd9696fb579869c SHA512 7b152f6c1464d806b1f76664d9b619858c3cb3ea63027b6be1f69897e939e3a0b5312ddf230e0a42a8f3e3701e50f41917cac6ce566c05bc74dfa49bdf2ed4db
 DIST font-mutt-misc-1.0.4.tar.xz 220528 BLAKE2B a6e4a20c73638343f157ffb548a081c3b0b8358d23c2703742703dc4fb6d34a50c5e52a91d695f2216c2329041c5457581f754944a7d433b98fba87d5d5c65b2 SHA512 9cbc82e6a519572576cb60f4d6b9795468666d53ac7df17d6736ab04190cb5f58c8b57be61ab509fc9372e1114c6aaa5e0d098ec1fa63dc5d8638916614f7046
 EBUILD font-mutt-misc-1.0.3-r2.ebuild 286 BLAKE2B 47099820ab59fcf390d761e16688323ab4e3464eb977d990e83988f59471e6bb6441ad54314f375bfbaae9671fb9ec31620a3a6c6106e6aee945a1813e025c41 SHA512 5597072724a73f2e5dd9c5dba70c989e88647953de8a02509e44bd910c3750e8351b6a34b6c69536337d715edf6a2d0868b5bf045f2442e5eff4334ec850febf
-EBUILD font-mutt-misc-1.0.4.ebuild 335 BLAKE2B 0390e072747afa13d8ee9b62fcac6491e0c23c9f8540eb72dfee8060c4cea2b5b89dfe4c036416ce21e3f51804aefd2a5d59afc68548d766a825bac4aa0acfde SHA512 5dbfd88d96e6488805667e2c571d8af21c030909eeee9f6547fcf45111969c5714e95bf568808c3b1958e062c000b4739d670e58b50af690b0ff41cae44dbb13
+EBUILD font-mutt-misc-1.0.4.ebuild 334 BLAKE2B 37f777c474e9178590d997969b641639919ec46a3ac914f595391ce71a93ecf5d75edc3e90c0d3bbb5df3bfb0a0b4f3356fa6cad7aa56835195d6e41436cf94a SHA512 0efa7738b586b3b43863b3f29d1de6a84650961e5e2e5695738285deca7b04d44f7a6181d724e405e7a858a1be9d222050b8c97246a85a8bf2fc28bdad19489c
 MISC metadata.xml 341 BLAKE2B ba197b5d1010ddb46809a80ebff1455e91fa3930a7fba30e2e391fbbc0758084169db2d24649a8d4527dd4bd807bba9b804200de38f31a024eb4ca313af459f8 SHA512 e419842a037a546046c4b8318e4d20d24158728ee74c9f1e23d4c98638a8455d4589c3249377b06f67754867984fcc513a53e2062be74ec3612880abc7de5b0b
diff --git a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.4.ebuild b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.4.ebuild
index dd2e1ec18d1a..15b5b3ded5ed 100644
--- a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.4.ebuild
+++ b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org ClearlyU fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/media-fonts/font-schumacher-misc/Manifest b/media-fonts/font-schumacher-misc/Manifest
index 758f0e2dfa86..09a6e4a37d3f 100644
--- a/media-fonts/font-schumacher-misc/Manifest
+++ b/media-fonts/font-schumacher-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-schumacher-misc-1.1.2.tar.bz2 141170 BLAKE2B 4a71f13cbd81b50e4a71968561a621cb562172ab547f5dec65e28f610a1053067029e4ce5b7d10452ea3426c459049962da8855f9d4e111ff6331bf6e706041b SHA512 f37a2bfce95458b11376c89767b5adaea03dcecd7ed5b99a19a3d263f48e70b15bf679826a794c55da26b5f1635ea5fa5772ffe44c9f77a1daab0744ed92300a
 DIST font-schumacher-misc-1.1.3.tar.xz 128680 BLAKE2B 389cde6ea6f7e0155bdf5686b50e2a9bb4c1bccbbe94da5830a0ddadf6c7f8aaf33cf623d1fe45169b0460b74a771192acf010a27a724f197c07483a21c3f507 SHA512 83b25495535176a5e348269358ac34af8223023a55e2c5c599725ee90ec9ff3ea9ff19cca46b93eeae7ef985da325f9065c83d829a4a8c72d0c3c197242a1b64
 EBUILD font-schumacher-misc-1.1.2-r2.ebuild 305 BLAKE2B a7d600b6753b21695b922ba7e6cf53aeb29b199a056bd9d6abf4afd7d77f3ba914b2268fb779550ad3c95c9926d84f86902791f76ff8bf6d27195bb99e7d1ce7 SHA512 1bc145f02934df44842cc33db54293b3c46ee63ee50b57de0fe9563bb06aa6ff397cebcb59b7557041877279474f4b72b15a49ae9c58b283603a187d2f643b40
-EBUILD font-schumacher-misc-1.1.3.ebuild 354 BLAKE2B a1563b17a15852f25e940445804e096fc7da6f1e71cff92bdf310605108717fb2bb1046d211b6cb36c59c9f664059d51c5f5ac03a545ce554e241e73343c550e SHA512 4224debd4e8b74792261ce55e623fa94f5289d80f1334b40fb754548843d0ff037df4ef692a294fe6ef9745ae00057123bfde63a6b4f4d39c64a487c8b686e05
+EBUILD font-schumacher-misc-1.1.3.ebuild 353 BLAKE2B 798fd5c988af283efd1518b6bbab12ce507382ba5c74b46e44f0c5d7dc976f1e53b8e36bfc30dd4765108d8ba5f61588630911b9602f420a23ccb1b1498e7fea SHA512 efa0b71773ca728470d94204c873d4eca410265a14e342f3ca5c08677e1d6e7cd6f0dc4d0c74bc02cca2f1f8cba6362061c5b0c0ceadb9825d5d16888ab02748
 MISC metadata.xml 347 BLAKE2B 4fd3b82ae0d4f819d9121110a0e9c81a44ce499b390b9d94fa99e2fd21494218aa30c285198302ec53c50bbbbcf540ed06fa5a2d126ee643674cf68adc209116 SHA512 a3fb76f61271bce0986109d6ae0fe5d6ab2aa9a8ca5ebc71511d8e9fa0e7d91a4fc4397477a6694d31bdb44337802974b0aaf0aa715370a5517d1768b73b7ab0
diff --git a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.3.ebuild b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.3.ebuild
index 82826a666a06..bf732fe92567 100644
--- a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.3.ebuild
+++ b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.3.ebuild
@@ -9,5 +9,5 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Schumacher fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="nls"
diff --git a/media-fonts/font-screen-cyrillic/Manifest b/media-fonts/font-screen-cyrillic/Manifest
index 988dc93dad06..7c513dc09f08 100644
--- a/media-fonts/font-screen-cyrillic/Manifest
+++ b/media-fonts/font-screen-cyrillic/Manifest
@@ -1,5 +1,5 @@
 DIST font-screen-cyrillic-1.0.4.tar.bz2 103168 BLAKE2B 6ef447905bc848dc7e31aae0f0c7649e17dbc46ccbb8a09da60cbd1a232891f0777558febd6e91e7844b66cc25796ad54ad6600ce033ff7f493741099c67b52b SHA512 58f12a4cbd18e323daad75b32a01ab3980dca0046f8dd94ff4452606ab9316b8a208dda3bc8e9346c02993bd2b8bb2b3dfe3413ccf9fc6a907fc1ea5d236fa51
 DIST font-screen-cyrillic-1.0.5.tar.xz 98788 BLAKE2B 88c7b1640f4aaebe373107c76c935132d3efe87ed64f60002e4092c6d5ba3c07498c2815668d0fd95417fd1ca967fccb4bea4d572f1172d2f33c086ec39c2e82 SHA512 9f136fc6f6a3621c4b38302af5396789b1e6558b9b4b1b991624945eb9aac8497a6cd415460abc7dbcbaad1ef8ebd23cacfb3448c6e34cc9ba0726e7973c1a99
 EBUILD font-screen-cyrillic-1.0.4-r2.ebuild 299 BLAKE2B 7a1627c7dcd08ab348fda294e36f4c42306b6e7a4dd8c0159bd109ca0dc0816f78f005cba3d2bee81eca6bba1fe0e1f7d5c72aeb36cb6317b30580e72385ec2d SHA512 e69785c383ba58c73e77caa7667b553bcdb885f43ca78f32f292d8659dc1281250e31edbf29a171295265edcb79ff43ae58551eb19d26237437795b3e1521f28
-EBUILD font-screen-cyrillic-1.0.5.ebuild 348 BLAKE2B 4d809ff63e6c6b14a14ece4965a138cba4711c4ddc7cb3f04184505ad2f4fc7b26ebb12e6dcd9d7fc9d476c5e3beb564e9051c644e6da04049ad18986070749b SHA512 acb3b326a0ec47e7de922ef5fbef60360e5d8b389abb7d3ba27ef896afb586351fbe36ef347efd1844d73fd695c7654a7c5bd99de601a782d206b5cecb8f56d0
+EBUILD font-screen-cyrillic-1.0.5.ebuild 347 BLAKE2B eb4163bf537f1dbb7a833fcf6bc73484a547b54fe9dbde78d3acc1448e3538a18bbf3ed4772185bb4db541812886a3e3a9c46943f2995d1042d6cae54e8acf5d SHA512 0691464998e0c604de7713b3bcae0f9e07b29d41c14226138bfe3066075a3b2fa27349ae17f31562cb845755d2f9b457e4ed093bb52ccc563705881e64592635
 MISC metadata.xml 347 BLAKE2B 2ddd3b9945544506be2e2d16ce94110460bcb534b8f5a1b5c70ca1bf97d5474c1e614d9106d7a532a58b5296d7e26c7969e877be6deab1017a85efb9b1391431 SHA512 370e46a3430dbc0c4bc3fafe82a2b175a0c840b878c7b1b89ded4b93e9c2869354717ba3701f392c993fa3597839bf6fccad25f7e3cc43bd0be85e491a081335
diff --git a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.5.ebuild b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.5.ebuild
index eed04e4246fd..23869d125450 100644
--- a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.5.ebuild
+++ b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.5.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Screen cyrillic fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/media-fonts/font-sony-misc/Manifest b/media-fonts/font-sony-misc/Manifest
index c1dfe1b3efa4..8898e3841cdb 100644
--- a/media-fonts/font-sony-misc/Manifest
+++ b/media-fonts/font-sony-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-sony-misc-1.0.3.tar.bz2 108098 BLAKE2B 7e095c70f6f10e8fa8e65686622ba443ab49704727e8d9e4067f273e160cfd1c0a0a475c720405ac1a5df8e87cf17e8f5ab53ba5baef80f6145d795a2ed419a4 SHA512 c397b4e5081b2946799d701b8c48fca9fd2d55b8fa1dd96d2b29c5cd9996bb7356ae12671bf3bd964e6313bdc154020ed6377534e59ce53067e955e4b37aee1d
 DIST font-sony-misc-1.0.4.tar.xz 102428 BLAKE2B d78bf15716be7e4e24e42fa766c303e85073c25e94b9cd464d712a967d55bdae5a81402a9dd4f0485ec558a9d88cf28f550ca1006e1f996d08517e8398c83a6a SHA512 f361fca66db2ec80b1467fb6bff57bd2cfc6722473bd7ad119026a97552eef07ff77552c01eb8f98f3299d7fd40c8c2cb3e0d0b01adca2f81c2c2f75581dc113
 EBUILD font-sony-misc-1.0.3-r2.ebuild 282 BLAKE2B a59deb16ebd58dba6d497f42671790d326e25b9bdc205bf2000fdd2845618627636d0c9a845bcdbdf66b87d4759cf32452735a0fc61b2af61025ef4341505151 SHA512 a6b059b961e101b9920170adf083f37fcb6e20d6f48c0683831121e2a06ed6a81e96e38d05e3ff17bfea172ccd3ae13d35fead5b52a9b2d442827fc8d0197561
-EBUILD font-sony-misc-1.0.4.ebuild 331 BLAKE2B 56d06c174e983d2216b3170e40a52e16a12f912ba3241d167f768e49ebf7c1a54b18d8e0c14531505664a08a30e4c03b9daf2e48c7b651ddac52a435d0c675d3 SHA512 9ad519f234ebfe1bb62633b019a5835ba8d542dcb77e51eb3899055f14efe4b2bd8b8455f4c11575a10794663875c7f086b13190843d9ea78ee25a669404d382
+EBUILD font-sony-misc-1.0.4.ebuild 330 BLAKE2B cb419e19b4288f992156298fb31d5f3caf17dc3172f9b1300b7497a424b09cbe5eac855ed2472e0826c7fb129e0fbb68f0487edfb8d1de01f7c506c5067c5d91 SHA512 2937617db4c7caf7890f0520b6d4ef1e0a4aa40ac513fca15e8d4ee03e0451623331f0f6560dc44e460e9ac7255b28c75c084982bb817a5146f552386cd238bc
 MISC metadata.xml 341 BLAKE2B d32797229d3819a2bb0f432fc6499cf38437d905a04b243e65d38aacc7962115b7496bddb03686ad1a97c48d5245f2c20cb39ab6f8aaae75bc1de93e288453bc SHA512 1008e795a408f2d1e64c2a38ca1abae368eec607b337dcca87cc64482f1db854e18d50827b48ceab6c03568a8bdf5ebe4462ae5c7ec4dafb2010189ecfe8cfd8
diff --git a/media-fonts/font-sony-misc/font-sony-misc-1.0.4.ebuild b/media-fonts/font-sony-misc/font-sony-misc-1.0.4.ebuild
index 280754c46aad..a277df3238b4 100644
--- a/media-fonts/font-sony-misc/font-sony-misc-1.0.4.ebuild
+++ b/media-fonts/font-sony-misc/font-sony-misc-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Sony fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/media-fonts/font-sun-misc/Manifest b/media-fonts/font-sun-misc/Manifest
index 1613224f63bb..e4f5321d7a1d 100644
--- a/media-fonts/font-sun-misc/Manifest
+++ b/media-fonts/font-sun-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-sun-misc-1.0.3.tar.bz2 116360 BLAKE2B 16ed83ef2fc7007670ac91f8356c8bb75775f78cf0a308fd02c2f702d7d2727702ead24c83d843c267ef4ef636f4fd1f0a59d3ffd0883e55e78f87d9cfabd8a7 SHA512 52c4a38e49a94831999652d9830da841949c319083ea40492e83690e1e5c2d31ea1979046a420af0e51bc105b8697bb06b4a438485e82b130d7469ad4519e275
 DIST font-sun-misc-1.0.4.tar.xz 109832 BLAKE2B 8d1f67f71a604cd105052e97d0a5e2cdf26be6994f41bead83ec767f1c6e1e5ed81de3fa75e9bdb55603029a7f067ab9cbceca34d865fa8edf61771bee61b131 SHA512 9eeb330c1190557479636119af8aeb49917f1faeaa42d3a93e35d318348ee4247405544107ce9f5a244dbe2c0001c8d34b604b961bd9d92431f84b992fe9739e
 EBUILD font-sun-misc-1.0.3-r2.ebuild 304 BLAKE2B 6a10879295bdf287ca7f1c6feed768d9158826028d2be6f7457ad7bfd7c9164683785386a151a6931e81f893e6bb325b6e0c7903234172d6973be70d4cc952d2 SHA512 cd484e2aeb291be28c44e294e5c1ee19d5598c428974004fe6aa0873d9a7e16b2cbd159b4cae2d57cbe4a3f21d52502d7e0ddfbd5a5c343e6113729506b06002
-EBUILD font-sun-misc-1.0.4.ebuild 353 BLAKE2B 4f065b461d135d137e572ebfba5390b2fc450451b05107d3ccd476d06783cbc1cda974d08f0b302be2c2bc5853929ec0e206e34fa952bff664501e75f3c39eb1 SHA512 c92aa0e18ba0cc1ad52d0afcf1f4c3ba937a4a8c17d55f2ff8de58ef1a47c7caa187d44a983806cbe4870f2e16cca6abbe8c974cba05959358031a81f6b7bfc7
+EBUILD font-sun-misc-1.0.4.ebuild 352 BLAKE2B 8c61dfb30d54637930e6da1cbd6c529209b05d0201e72f51812e800042ca10779ff97b299a637334f3453268d643a72564120f9c0177f10a8ff01d32584abf22 SHA512 76d1c56f34f023c79b235dca23ce167a7313ed53f5312ef34b4ee235175fa39ca2715dca9d7c4a9ca799dfbfbe53f0e0789c7faf1ef1624f10fb73270b79a054
 MISC metadata.xml 340 BLAKE2B 46997a05c1628085c72c1c54239c12ed8acc4cf19a18f740317979127d7cbe9c98f7c217d70f2080d6c304569c8d68dfb7e161faa09ddc3cb5fd3efe2eea3f2e SHA512 1d7ec41e7efe5d2c9cf1160f8b41d4b5d0622b897cbbd27240e48869a910c5070f71d27f61fcfd316d8b2173a64e60d257b63eb0f30da5fe7752cfdc767e9816
diff --git a/media-fonts/font-sun-misc/font-sun-misc-1.0.4.ebuild b/media-fonts/font-sun-misc/font-sun-misc-1.0.4.ebuild
index fe71384dcfb6..f2899e061c06 100644
--- a/media-fonts/font-sun-misc/font-sun-misc-1.0.4.ebuild
+++ b/media-fonts/font-sun-misc/font-sun-misc-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Sun fonts"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/media-fonts/font-util/Manifest b/media-fonts/font-util/Manifest
index 3fd3206a2fa4..37905595ff96 100644
--- a/media-fonts/font-util/Manifest
+++ b/media-fonts/font-util/Manifest
@@ -1,5 +1,5 @@
 DIST font-util-1.3.3.tar.xz 142544 BLAKE2B b893159496fb242c33facda98597e200b41d05fbc28c9c1cf04f5214788f421472562a79ad24cffddad72ebf38f751858712a5c7c2904370ea77f501f78ccc77 SHA512 5e1cb8af44fe0bea72b1a6a4e455f50ca49b7531c2f4b605800c0b2b7578b9826ccf17fa195c505ab1d6339fd4ad697c01ba3b9777616f354ab62b23434d47c9
 DIST font-util-1.4.0.tar.xz 142396 BLAKE2B f4efd01c419684969826061b1721f38f477c0a2ee024cf5f5927edd2584061cfb335e1cef6481a1519c51a150a2e1f2e382a8c300e2b8af5d0114276d2f673f8 SHA512 05fff613019718a4bd8537ff7eb270bd85345ffb006c16f81b739d6e8cdbfaa9d6503aef9bc48d6c7f70330bf90ff1a46bacdff3c99e8017191d935c85f73d60
 EBUILD font-util-1.3.3.ebuild 554 BLAKE2B 61d4b30a09745b02e5929eab6fa61355cad610fa9baacb19c7e025aa72fc1f2ebf18043517910863be5dc1bbb221485174355f9b056325412efab4585fabca15 SHA512 cd3c315b3ca60621d209a1d98810c8e11e3d9913c5b22e2445314a1f14f654bd2c3569a349e9dc4bd9303d050490596f608f8a32d67b9e4de6401448fe0bbd15
-EBUILD font-util-1.4.0.ebuild 554 BLAKE2B edf452cdc45e979fbab09a37ffde5d1ebf5f395f6aa36a6c48c7aea6307cb9f0e2663061045023f44e1edd72e50446aa5707b36189f50b156beb112c7b2e0bde SHA512 82b4bd3ca64f98a74f266a7e7d4bf1be6e832dc0af83c6c6f0c2314df3493a642c990c38fd32aa687929b35b61c4596eeb1d86cafeca8c6e0aed785f32fa63d1
+EBUILD font-util-1.4.0.ebuild 553 BLAKE2B 4a20e9afbe0edd280d63ff42a43ca01227184225fdd43c15b8dc470dcb7ac86d9cc2891ed479f325d2249940e44bbedca3c4c9b86ba8f355afdf3d29adfa1f59 SHA512 0444aa614b76a2a7c51e411a6481fedf1b771cc00685ee969721b9f9fb898a8baf95ac6beb102fc72c85c863d86e9dfd857e9e2806782bc636bbff530e13523d
 MISC metadata.xml 336 BLAKE2B 2576d857840cc0742fee4e2656b24f38543339ccaeb105b6ae4c878b6a3d51642fe1917644338f2a1b6130315406fcf04eaa46ea0c55b8312cea061718c25c0a SHA512 d25c57a37506034155273892e20612dfbc5bbf5c3eff868416e08c96e0f5c00deed63fb89f5278f2a78c57151f8a54a146a223010ce7908b28df7edb9c1081a0
diff --git a/media-fonts/font-util/font-util-1.4.0.ebuild b/media-fonts/font-util/font-util-1.4.0.ebuild
index 54061b163e3c..3640b1bf99b9 100644
--- a/media-fonts/font-util/font-util-1.4.0.ebuild
+++ b/media-fonts/font-util/font-util-1.4.0.ebuild
@@ -8,7 +8,7 @@ XORG_PACKAGE_NAME="util"
 inherit xorg-3
 
 DESCRIPTION="X.Org font utilities"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 XORG_CONFIGURE_OPTIONS=(
 	--with-fontrootdir="${EPREFIX}"/usr/share/fonts
diff --git a/media-fonts/font-winitzki-cyrillic/Manifest b/media-fonts/font-winitzki-cyrillic/Manifest
index fc6816246dcb..df76b77e090f 100644
--- a/media-fonts/font-winitzki-cyrillic/Manifest
+++ b/media-fonts/font-winitzki-cyrillic/Manifest
@@ -1,5 +1,5 @@
 DIST font-winitzki-cyrillic-1.0.3.tar.bz2 100564 BLAKE2B cc2de32277e55a3f7a92be7deec895e23f75efea541e2dcd33a56e1911d7216af149234fe010bd6445952399e246a4bb7123ff2bd220d44874b065a56ac4155e SHA512 f98fa99c1b0e60160b362310a7fe5fd5798aaa686751a6784a697c546ed754e885537eeed39a1f973dbceabc962cb65b39af1d336649381a49feb6df9f23e2b7
 DIST font-winitzki-cyrillic-1.0.4.tar.xz 96564 BLAKE2B 0ba04018b630c4c73dd8562ffab2dd732d9ed8232d3296081a815b3c9308d18a16255e5185c81dfd1b13d057904d0c454f44b6169a358109fe959e45fdfbcddf SHA512 11e366f96abe65aed9fb6fd087b2bd90af9f60548de0cebfeb348262860957a63a997616e00092d312b8ae9c262a7bb52da69c704a27d34018a45b98a87eb158
 EBUILD font-winitzki-cyrillic-1.0.3-r2.ebuild 302 BLAKE2B 0d1e59a791f0eac795465564ca96f6befc60d7f2261d724728bc417287b6d7ec7c3851d4770807c9fcb9a3861fe8207c2314d852ccba4bc53946948d98c6f1d6 SHA512 a96ab27110b9201472930b61dd40cc2c67c8b09b7c9d9847bac11caf3790e05c27a490fab1c897ebf9be47b1792b26fe5df1969f1eb686c0634beb3e17dec554
-EBUILD font-winitzki-cyrillic-1.0.4.ebuild 351 BLAKE2B ff857ad29ede07a777f1de4ee976a5ef372173cf34a2f4d462958fa3541ea9e509c65c3ddea3e92cf851bc720b6442facff680bd1ca63813b4588464725fc053 SHA512 ef1973b5a57afee443510a2830545860324ac26db6bd7106c313b2caaa6935a540d9c9eadd812c4eef13b3dcf606b20c7a2ff61ddb71b53231f1ae7fd64a67a5
+EBUILD font-winitzki-cyrillic-1.0.4.ebuild 350 BLAKE2B f86780e0048d9840c45e95a2fba89967cfff055dd8df8b4227124f920f9ae579d62007d49ddccb4c4c68a01c9e7a73bb9e004ac2fa581dbf8c142faac7c31147 SHA512 596e89ac86a60790a94dfc50459fbc0307e9d47be63a47160efcc3894607b15219a86bfdb666f92cc8ac4cb6c699a0253a9aadc68396110fd0fe4adbde3577eb
 MISC metadata.xml 349 BLAKE2B c5f3fcfab465ba9c86f831889d3d9f95655aad88a1fbe9ecafb68a47601f4f74f1e8568dd0d9a0271324abfdf33a79c69ce909c32d6bf5f8acc8d4494dec6408 SHA512 fcdd8455ac32eb07dba4d64ab8a3a1261aeb01881ebc8046a531c516aea0871013a54b3ca70a8977b0364f9158183601423f1a597aa1ec1dc405a47949cb23d1
diff --git a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.4.ebuild b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.4.ebuild
index 43864c15c9b0..1357be67a967 100644
--- a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.4.ebuild
+++ b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Winitzki cyrillic font"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/media-fonts/font-xfree86-type1/Manifest b/media-fonts/font-xfree86-type1/Manifest
index 6ae8cb257470..adac9710e6c7 100644
--- a/media-fonts/font-xfree86-type1/Manifest
+++ b/media-fonts/font-xfree86-type1/Manifest
@@ -1,5 +1,5 @@
 DIST font-xfree86-type1-1.0.4.tar.bz2 126641 BLAKE2B 12588b7cc3a489854695cf0cc6a9edd18840e0048b4e35a76eb6f3642807e208823133368299d6ff65117699bb7312d3664ae9fe8264631051fdeaf8f157b516 SHA512 2b4afc6cbb7953f8ba4aab7862d16b7b988ea6a4df6de8d41c8340d35a1cd53d6fcc26479ff88189d1de9f42804e4f56d70e9dbd7e75820eab4ac6ae3a96840c
 DIST font-xfree86-type1-1.0.5.tar.xz 120500 BLAKE2B 2d5073241ba6d0f966edd1deeac8b5c31f67fb5c1aa9ae49b4447ceb027033dee0001ff9398aa28f98d13cce2f75aa19f746c2396c47c297823711188db76cea SHA512 0a92d911269c5c4d815dfb617bfcc57c3bd54e4cd308eba87f9ec49851369d99dea61950dbd6cdc0f85db92c0c24055da88063b083b4b0cafb3315051bb650ed
 EBUILD font-xfree86-type1-1.0.4-r2.ebuild 295 BLAKE2B 6e99c58f8ac805bf996b02731650c86b63a5cce29886e4506352fdb64d34a44f5fdf077be206b55567df45d80237ae86d7a9538eea7c8b9134d325e44b77fc8d SHA512 b3552ea233a2392dcea43d3915d417934adac3906d6a2b0f212ab3cc10c9aa1ea4612c984806c3060ce0412c6c2663ac2d1fe1aa863eeffc55af3ebb7727bb4a
-EBUILD font-xfree86-type1-1.0.5.ebuild 321 BLAKE2B 4b92c271f0a0d97637ed7e1bb663cfafeef4f22a4ccf371e192c7871443183b38b158f7a0459553f00e1b40aa7f80e23ca5365b77a889e9a04be7330a51ee714 SHA512 061814668a826bbf566768109f20ce0f1f5bcd566deee742a1ecd6dce01cf583d1fb9b24ffced6008fbcbffde249927e558d746bb60a81072f3036ef3c0cdfd1
+EBUILD font-xfree86-type1-1.0.5.ebuild 320 BLAKE2B 19e42da416f5af27dbf07a3211bbb3cb9f2ae6f7363cfccc6a6d88ab98fe974803d29dc4b3005c0533c86b7675c5d6bc5603299edc0ba48290d7aa5208d14d4d SHA512 dc632819a821f9395c8c3b698962a9a99daba3d0749a2b98c79c9bc48b1e1a421b98bea7ed3716d02861ab9959e7b30884f0c419fc1abfbd29bf6d4a55cd0807
 MISC metadata.xml 345 BLAKE2B 277a98b6f8a3db93936791d0c52bcce90a10aaa4486aa0f56f50f4bccff08fd927ab0e694f650113626c278b7f8f07959f5795bd7fe3086c4d79336bf15f014d SHA512 b4215b79610ef0ad68a59f0e970d2b409778b717ac95ecccd3cbd8c0a85c05cd007c55078884923068f1ec650213a4c57c7ac69dee40e8716f858a8c54a1b5ce
diff --git a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.5.ebuild b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.5.ebuild
index 2f4adfbfbdfb..8349bbd62089 100644
--- a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.5.ebuild
+++ b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.5.ebuild
@@ -8,4 +8,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org XFree86 Type 1 font"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 642d9ddad375..a37e24c0cf4f 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index ad74d943d167..a6e5c45c6d0d 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,5 +1,3 @@
-DIST ristretto-0.12.4.tar.bz2 619084 BLAKE2B c04d09b8475a46e89a2151cc46121ec9960f52ba8e861c474a46a8bda470c6620dfe2c38a35a80c075d830b7d4d3b80c435ebe1baf10bb913e20d26945d1701c SHA512 666e127646b9f30bed54d8605c4892d302b15dff39e8b532ebb3da22dc5700414e6d7bcb29d8d66f6a8a7d487cff50b0a0cc610d8b4616479397ebf987ff409b
 DIST ristretto-0.13.0.tar.bz2 624244 BLAKE2B ac0d6b391b17538e47a26f7643f083854f6654a7394f210fcc165d36a3d614b11354a81ab3a45a303e447c4221bf43ff92a913c64c425ef242810fdcdad584e1 SHA512 a8e25e0fdd2d31a904c616995438b47cf144557f589ed97a551fc5411cd7a3da9edab0c23c955e86c72ed0d10f1efccd61edf0aaf5a82cf601bf3333ea2b332b
-EBUILD ristretto-0.12.4.ebuild 899 BLAKE2B aac782b2f470476e31569056c436160caabb9c41166f8dfe02182fad70b209bdf925105e7229f6c4925092d62059798dd807beabb95633add6dac5cdb90d0b36 SHA512 e73bf19c0f18e55dba40807be7731c5d35669e8c89709f78c142beb18f96bb6a6dd8efa0bf95dc44b66678ae9820c8e4d9ff6199316d5a986323c186ca3ef637
-EBUILD ristretto-0.13.0.ebuild 936 BLAKE2B 91e709873450ac0ee76cce0423ecb04c8204165ae7f14c6717dbb6ccbbb6a430145ddd65b38112f9dfdf6de95057c696dd041d6fb14ab366c906c4bb364cf26f SHA512 e83145660285b7609667b417fb0b20e832fa583ca63315a2e2bd3f3c6325862845acd6a45779abbcbe2eb2b46ce680b11c490ed9b8e59042ea80f5a515868f0a
+EBUILD ristretto-0.13.0.ebuild 934 BLAKE2B 51ababd6db76721e6d299e202b7391931a8a2673479153b124d1ccabb373c933af5c7d3792cbbbfdea3c6c6c8c0427dab0e4d984c3fe49e1542f63cd130d1b03 SHA512 b511e67d9ad00c85f34465410b2407fea73dc85e88edbe8ed4f57ddaac98b279d7aa903eb9b1a6a337a53d8c2ff544113441e8ea0769bfa904028097aa579916
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/media-gfx/ristretto/ristretto-0.12.4.ebuild b/media-gfx/ristretto/ristretto-0.12.4.ebuild
deleted file mode 100644
index 5f3de2bbb668..000000000000
--- a/media-gfx/ristretto/ristretto-0.12.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="A fast and lightweight picture viewer for Xfce"
-HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.56:2
-	media-libs/libexif:0=
-	sys-apps/file
-	x11-libs/cairo:0
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11:0=
-	>=xfce-base/libxfce4ui-4.16:0=
-	>=xfce-base/libxfce4util-4.16:0=
-	>=xfce-base/xfconf-4.12.1:0=
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-gfx/ristretto/ristretto-0.13.0.ebuild b/media-gfx/ristretto/ristretto-0.13.0.ebuild
index 424f774a12a1..36ba13459078 100644
--- a/media-gfx/ristretto/ristretto-0.13.0.ebuild
+++ b/media-gfx/ristretto/ristretto-0.13.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.56:2
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 50cd10ce55e9..9fef41fb3a0e 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index 1b4f192f2154..f2e5c3635a76 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -2,5 +2,5 @@ AUX openh264-2.3.0-pkgconfig-pathfix.patch 2023 BLAKE2B 9d380302efe14b45959123f6
 AUX openh264-2.3.1-pr3630.patch 5566 BLAKE2B 06e6ff75ccbcb287413752283d3b192ccd9ff6172bf2245f28eb219b3c8384f900a54e0d0992589b234e14080dfcdc3c026635ba6070597197f93e8514a77fd8 SHA512 7acc909c8d78e8b9cb366d822b970d4e164d40e0224fe3a07d7750b3b7c3a30ac40afc1bbaac4844d6fbdb6c144830004b12dc3bd64d2574338cebea952648a0
 DIST gmp-api-Firefox39-3a01c086d1b0394238ff1b5ad22e76022830625a.tar.gz 10464 BLAKE2B db6990a55b4128c267ee5ffa4e38edd2551c862e549776b4092d5683818001366665830c6304642cdd9c2c0afe06035edebafde769693082ae7a5236cdc463e8 SHA512 a6383834391d98754177b54df31d006144b5cad952df60115fd12fb6f0c87e571a10f9ce7276b817e4137efd97ffa7bca5092e289b0eb7cde2a3ad923319e874
 DIST openh264-2.3.1.tar.gz 60290897 BLAKE2B b4480150cfe7c44b89c7b294698db06f93d96f5f9f3ef4345108c4e360e99bc6133407cead54e720e6e74aa17ab9f2e4342287a42f19463a54eb44c9d3141c80 SHA512 fd59c767794cdfb934d692d5929e4500d78606cbf1e403bc7c7dce048cc07e40daa0794357adb856d29479427a53460c76338e156b6bbeaa36139afcd603c8e1
-EBUILD openh264-2.3.1-r1.ebuild 3919 BLAKE2B 323b0d077810242541f73dd22a02d87ce3c56fdedac5e5bf49958524bbb66a8deb94470ae645c33938b8ac0f07e6b9913830b1c27986e1abec0aab1f740c93a9 SHA512 88bc1b4a9dc06e153ddc706cc3d99147d465bd88cfcc3e0e50345a3a1891ececa05bfa6bab78982d176572d22ff8e453ab1d0ea60f456e60d2ea45c19c0ae649
+EBUILD openh264-2.3.1-r1.ebuild 3925 BLAKE2B 3d0b73c310f1582ec7f010fd9104c44d3f4581ea8b806e2fe16d495ec29517f997e1f85b981bf0db3015bd939b3c57c34e8de97864b0faaa1ca40f4657fbc215 SHA512 118d32d0d888bdf614dbfd2ee42e27e2ec196653bcc4ef79c8bf673e87f8ce08c657a326b41f940ffc9b8e923380520ae84bf656706fe4e48ee13a26071a3d03
 MISC metadata.xml 569 BLAKE2B 14a021fba978f0156bab46178d05a6b9f8f67fdeba784d587759207fe60ea1d74a383eec3fc40662c39d33fcecb71d8cafe7eb6354383c253e0a3f7f1e94feae SHA512 ceb77117c6a50f16640b329368c86db26127b8e501475dbaca4c53ba41315b0fc7161f6d9268cb86d1f6dbf2cf867e2bb0e6b5f45240ab3227b99b734c344efd
diff --git a/media-libs/openh264/openh264-2.3.1-r1.ebuild b/media-libs/openh264/openh264-2.3.1-r1.ebuild
index bd16d2a68ecf..6c26bb488b3c 100644
--- a/media-libs/openh264/openh264-2.3.1-r1.ebuild
+++ b/media-libs/openh264/openh264-2.3.1-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # (2.2.0 needed a minor bump due to undocumented but breaking ABI changes, just to be sure.
 #  https://github.com/cisco/openh264/issues/3459 )
 SLOT="0/7"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin test utils"
 
 RESTRICT="bindist !test? ( test )"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 1e2df397a5fd..a10e19b0eb5e 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index 42c9384567b4..0a4f9f28e0a5 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -1,5 +1,7 @@
 DIST easyeffects-6.2.8.tar.gz 3063821 BLAKE2B d64952ff1e04f0013cb2548cc62d67f4013e9bd51dda2afe50170fc1ddbaabb967da5cb0b2cf6fde44cbdcf196b9656d19172595f6c527099a86b2dfc8ff34be SHA512 8a306308e783ed19fd5380a6b8d1e0ddba1400bca3447ddbf2954355f6d74229d0e750e5ce50b19c9ad1979ee88cda6ad4d1b2549eef7bb88cd29b6dc96dc33b
 DIST easyeffects-7.0.1.tar.gz 3208585 BLAKE2B 95d0c8948221bf8fec2e07e4dcfb664ed34065c9d5717aa76b91d3b42336cb989bfcf44a9adc0400898640f3e24dd379861140449fec00afca7dea9064055ba2 SHA512 6eec2020fd91e793caf9fca45eb51e7efc1c59f2bb0d4aca15178a51753258fc1990438eda26b8cb8622b7f51d47d28f184593f238c9ed072f4306be0af3f5a2
+DIST easyeffects-7.0.3.tar.gz 3229626 BLAKE2B 12eef03e875ae4c59a9085f9c1e5b8599ac27105829bdf96ee4378b454dbb32ed6839231955a9067b27f7ab674c4d13bfdbccbf5ae6f83d2301ebb6cd3747baa SHA512 68975c6e5f09987a57b6e6b0db56e7f02376a10aebd7e44311f0d92d04a93c5358fb835cdaeb4f7c193fdbf90833827eb31d38707ae4e75feeab7b04ba66fc39
 EBUILD easyeffects-6.2.8.ebuild 1993 BLAKE2B 50ab8c66c033fda75668c3a599a69dcbdfd3fd88348416c9c87c1d7a1d094f49e33d6dedb51fcd15029eef450d867ead2bbae47d8277fa3d37600ebcfa58f5fe SHA512 30abbfac388a12e399ca75fe1fd47790a77a48a8719f35bf034908545829e146b57d7791e92c695f425119763ba06e720f171ae124328cdd48e30a2592f7bcfb
 EBUILD easyeffects-7.0.1.ebuild 1989 BLAKE2B b086fb3ecbd875c5fe65d864e2d1893c6a9139f11e07460f5bdbed6130cc225a62e26e89e972bb65c743e8a8e4b9d3a05514c2775d7f50cb2f7a350e686407d8 SHA512 129306e79aa9018acbaeeaa67e809c400eb6b066007039f1004e4ede689b458608437063b7c8bdad22fc809ed6502ca875ded2082ca7fb31e62df08b6b950fbe
+EBUILD easyeffects-7.0.3.ebuild 1998 BLAKE2B 834185c4ce61da58f707cba3306c01ba6ad613faa9e1f3a8fca7c847e525c576cafdf89ff3f850604064e17f2f5785e7b86995c18ef602a4d35bd429335867ea SHA512 b20fe6d07c15aedaea5114680dc49ae71d14fca6db63985d2709a1f1aee511fe66a44ee9b418067aef981feef7f07b1d0d4e1ae2b3d47b581f662bab388beaba
 MISC metadata.xml 839 BLAKE2B d3fde7fe66f301f320a4fc3adb4a5fb5e5f84405b015209b696045eaffe251f7d1531efdb2d9fab6512647dac991290b622bf411dff36ecf304c9b063567c03c SHA512 fc68f37398082f885a2c7c5d117191fc37d1c1a51381439cefe1ae798b7b019598e81f5c5f1832950669cef340d418220024993b95aeb911dfd9fa1df0eb82fc
diff --git a/media-sound/easyeffects/easyeffects-7.0.3.ebuild b/media-sound/easyeffects/easyeffects-7.0.3.ebuild
new file mode 100644
index 000000000000..c785ab96e07b
--- /dev/null
+++ b/media-sound/easyeffects/easyeffects-7.0.3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson toolchain-funcs
+
+DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
+HOMEPAGE="https://github.com/wwmm/easyeffects"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
+else
+	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="calf +doc mda-lv2 zamaudio"
+
+COMMON="dev-cpp/nlohmann_json
+	dev-cpp/tbb
+	>=dev-libs/glib-2.56:2
+	dev-libs/libfmt
+	>=dev-libs/libsigc++-3.0.6:3
+	>=gui-libs/gtk-4.10.0:4
+	>=gui-libs/libadwaita-1.2.0:1
+	media-libs/libbs2b
+	>=media-libs/libebur128-1.2.0
+	media-libs/libsndfile
+	>=media-libs/lilv-0.22
+	>=media-libs/lv2-1.18.2
+	media-libs/rnnoise
+	media-libs/rubberband[ladspa]
+	media-libs/speex
+	media-libs/speexdsp
+	>=media-libs/zita-convolver-3.0.0
+	>=media-video/pipewire-0.3.41
+	sci-libs/gsl:=
+	sci-libs/fftw:3.0"
+# Only header files are used from libsamplerate
+DEPEND="${COMMON}
+	media-libs/libsamplerate"
+RDEPEND="${COMMON}
+	>=media-libs/lsp-plugins-1.1.24[lv2]
+	sys-apps/dbus
+	calf? ( >=media-plugins/calf-0.90.1[lv2] )
+	doc? ( gnome-extra/yelp )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	zamaudio? ( media-plugins/zam-plugins )"
+BDEPEND="dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if ! tc-is-gcc; then
+			die "Since version 6.3.0 ${PN} only supports GCC due to required level of C++20 support"
+		fi
+		if [[ $(gcc-major-version) -lt 11 ]] ; then
+			die "Since version 6.2.5 ${PN} requires GCC 11 or newer to build (Bug #848072)"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index dfef9cb94672..52be5d17da33 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -2,6 +2,6 @@ AUX hydrogen-1.1.0-gnuinstalldirs.patch 1879 BLAKE2B bf1563cbedc0b3a6d2aefcfe6bb
 DIST hydrogen-1.1.1.tar.gz 11417837 BLAKE2B 52f6f61fc6e247875688dcea2290d92eb7bc85910620f0adcb52506d587b02dcaec6e2ecb72c77cf4eb3134534c75fc64bc4dd76a63f886cc6ea07d9b8812089 SHA512 c5e6bd713a0f9ef3b30bf0ae00bc41fea7494c20342c14c9f41ec05d1fdd3be721ffc3ff92bacd011e3b39a68022ea04daf55e60d334f64a00abef17d892cd37
 DIST hydrogen-1.2.0.tar.gz 12911501 BLAKE2B 606bfd977e67a962933e331bd1d4985a898e14c3d72656aa38fc3d50fa1daeb301a00778114e46a4890af548816befc8deb598bbc65a122e8a36694ce7740776 SHA512 610dc292ab26880897030ee7e969caf11e2758e0cccdc15b21711a2114564e12af855b50f0cf13964689b6697255c5f2080e2114c916ea6fbe3909057e7de1df
 EBUILD hydrogen-1.1.1.ebuild 2086 BLAKE2B 41eb6d5b0064e0f3553ead000cbcffc917795e4776af202c7d52853b944225f9e45779584abfb96134c775bb6ee3d767960f0e91da9f560b4815fa1fbacf2e06 SHA512 bcad8cb18fe0ebff4a111ad234c4ebd66c73767430c50f793cbce6236fb7dbbfc8cb9f9e29cefb51937c20aa9ff0c898ce499ed00a603f49c20f84448ab93bd6
-EBUILD hydrogen-1.2.0.ebuild 2077 BLAKE2B 4b30d99b5b874485798bda42e28f9a267a69d375ed41f783cdaac84b3e4c692fb9e9b90149ff1e522bbd4441ac67e1c9351e7f334be0633954a630f644907e2e SHA512 c2c8c2a5ce47b3c5643cf989c6bfc6d81ac3dd9880a4237017a026f34c5efa33aea912115f3013ff3d94504602deaad86494a96e875d824147af4fcaeaef4964
-EBUILD hydrogen-9999.ebuild 2077 BLAKE2B 4b30d99b5b874485798bda42e28f9a267a69d375ed41f783cdaac84b3e4c692fb9e9b90149ff1e522bbd4441ac67e1c9351e7f334be0633954a630f644907e2e SHA512 c2c8c2a5ce47b3c5643cf989c6bfc6d81ac3dd9880a4237017a026f34c5efa33aea912115f3013ff3d94504602deaad86494a96e875d824147af4fcaeaef4964
+EBUILD hydrogen-1.2.0.ebuild 2093 BLAKE2B 446244d0aa4e297a0ae0991a6fbbb98e69975b6cae4a4d7d2bd0489117aa49a2c179decefaea34403a4b9768baff03bee32d950063fbbbc168bcd1495bfefd7a SHA512 cd4da8a14ed3730975769b8efe11a494591968537e45f378926da443b90ac37fc4f7a14b4092bd44a548f84133a5a543ec1d105ae0d885aa4343767c2881dfa1
+EBUILD hydrogen-9999.ebuild 2093 BLAKE2B 446244d0aa4e297a0ae0991a6fbbb98e69975b6cae4a4d7d2bd0489117aa49a2c179decefaea34403a4b9768baff03bee32d950063fbbbc168bcd1495bfefd7a SHA512 cd4da8a14ed3730975769b8efe11a494591968537e45f378926da443b90ac37fc4f7a14b4092bd44a548f84133a5a543ec1d105ae0d885aa4343767c2881dfa1
 MISC metadata.xml 478 BLAKE2B bd59feef45263e2f2440696d657c0845f70498b64dec764dc4fff3e0c837a725195f55a2a651498f5c38448ae7c45fdc50def9a8068fe58e93332ad66de7e1ab SHA512 757c7766697ad73293ed281df0079de5775068bc6b899a9dc6bd3a41a36ed024646e01d242177948be1756d407e44cacd2bb2ed7ec0e4698fd358ec0031db3c4
diff --git a/media-sound/hydrogen/hydrogen-1.2.0.ebuild b/media-sound/hydrogen/hydrogen-1.2.0.ebuild
index 7fc1c8c951be..f04da20e1552 100644
--- a/media-sound/hydrogen/hydrogen-1.2.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.0.ebuild
@@ -33,6 +33,7 @@ CDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index 7fc1c8c951be..f04da20e1552 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -33,6 +33,7 @@ CDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
diff --git a/media-sound/upmpdcli/Manifest b/media-sound/upmpdcli/Manifest
index cf88bebe5c6b..a89790ed503a 100644
--- a/media-sound/upmpdcli/Manifest
+++ b/media-sound/upmpdcli/Manifest
@@ -1,8 +1,8 @@
 AUX makefile.patch 957 BLAKE2B 82046ca5e88f093f322f7872d6987c17b9fd5f14d6d82e2fff8c75647cc24cc78feee1b61cb904c011d3464f2f80300c9b0a56b0c5d89c93c9e86ce97045e25a SHA512 76aadfe50ef84d9a926ddc92519da954e0d11c37032197af637f01fbc79c3d339f5b4002966b76665aab49267a52e78de438b251a21b6cb3e1ea3f968ac85c54
 AUX upmpdcli.confd 26 BLAKE2B 840eb6e9353266f3669c00dda2a317a6146780180ff0998641dd258806b8dce0a1c49caca570c2ce1fac97e0bf3a347536c147f1a38092ae745bddd728128a01 SHA512 3dd82c12d66aac4be69a98cf25098fdb9c377c4ad0559d07f99cfb4599b6454a6880486053091d55e30b45ac8d877cfa544b1f3dc617d11c32c058767ae6a64f
 AUX upmpdcli.initd 387 BLAKE2B 1cf2ab80c9447041b2b1d1a921c164a6c0436204909c4857db798ed9930d3c1f6e5957a4382cfa884e9fa296ac8d72cc5e3d4d8025234251b665fb5d85efc12f SHA512 fcbefe70aecd05f4fea6427734933344cd1f537fd187c14f05d809f8cf8bb720241aeddc526e9c5497f76e5e7cdcf14798a160b4e4303d1482b53b646dd2b03f
-DIST upmpdcli-1.6.3.tar.gz 598611 BLAKE2B bd4a3cf2fd54be48326d0588af5e334a4258e88f16d18f5706a8991d7677f06ded110ffe90ce6c1f02c3b265d3f046b74cb3ffd7c346b15a99e8abf88b70893c SHA512 1a33c0fca54f3291861e0228fd821f42fea0d92a496035e620103dbce1e06143946423b8951e3394654ebb365a93ca325714bd0aaf1cccc3ed3de7d7f8f4a7cf
 DIST upmpdcli-1.7.2.tar.gz 604605 BLAKE2B c5b5493d4ef9f13d6311b36927c3a97b77fee01a683d6af30ee317c67cbb3370e4743f8e59936d5e1f0e3961eff14dbb52b15fb5b54cf9d95ce98ad32487df6b SHA512 ab95f04d56925665d644e60532907f943a14dbf4cf760b1149ea071029077809e2d24e58ed41deee26b780d7cc53bad9815f3923c65e682f133d775c0608f0c5
-EBUILD upmpdcli-1.6.3.ebuild 1422 BLAKE2B bef2466e9756558133dffa6fcb0e23efd7fe5f7e11a783a71997d4e0272636b937d9df5fe5282a3fe635673d971aee5e3d45567b7ca8ed564b46e18e445c015c SHA512 d2d4a0858c2938b3892c77ebd343eae84dcfa7cdacdcb2d1cf018cf6cb9a457b49c282cf8f23007cad4bb3b9a319088b59a7e62a2b37d51de595cade098e1f38
-EBUILD upmpdcli-1.7.2.ebuild 1424 BLAKE2B eb8561c617618c7b7c2ce37e2602cdb0bacbf683d11b70172fdfa2f29ae71f08aa953eab4f60dc7565ca96d75e613c8c95d09ead7d6924125398f5076f03210a SHA512 56f9545e7f8b0009ead5c18650a4bed8d40761c9402714f49793f2bef34d91cbff005bc7fe08a89eca463278882f6380977aefefda44f6f345f0c0e342a306df
+DIST upmpdcli-1.7.7.tar.gz 606480 BLAKE2B 2be284a864bb93511553a248ec76df7203103d5be31025472dddd08f8b13451292e3254895d112071177bfeef49f9dfe71b6c98a82c7bda1b18f7ecac7526235 SHA512 764606805f413643e1432d27f407ab3020d55e6c374210d56708ddd94285e364fdb266739d6f5d406e8f8708669820e4841449aebd2ea966974144ae90bfa38c
+EBUILD upmpdcli-1.7.2.ebuild 1422 BLAKE2B bef2466e9756558133dffa6fcb0e23efd7fe5f7e11a783a71997d4e0272636b937d9df5fe5282a3fe635673d971aee5e3d45567b7ca8ed564b46e18e445c015c SHA512 d2d4a0858c2938b3892c77ebd343eae84dcfa7cdacdcb2d1cf018cf6cb9a457b49c282cf8f23007cad4bb3b9a319088b59a7e62a2b37d51de595cade098e1f38
+EBUILD upmpdcli-1.7.7.ebuild 1424 BLAKE2B eb8561c617618c7b7c2ce37e2602cdb0bacbf683d11b70172fdfa2f29ae71f08aa953eab4f60dc7565ca96d75e613c8c95d09ead7d6924125398f5076f03210a SHA512 56f9545e7f8b0009ead5c18650a4bed8d40761c9402714f49793f2bef34d91cbff005bc7fe08a89eca463278882f6380977aefefda44f6f345f0c0e342a306df
 MISC metadata.xml 324 BLAKE2B 53acf2369d1e3957218ea3634ed2fe10034b9d74109af9df7acfcf29a37697ade6488aefc5df3503754833b0f6dc5df777feb945355f633fa6e1a3ade8b13adf SHA512 871929dc11894dc91b3257a5e9e8f5164e3f5e1af0dce2cc7571dd106cc70bd777562bb56913ca45f3bf1cf0316938f7f2c0a8386bdcf408c0f834385db4d45d
diff --git a/media-sound/upmpdcli/upmpdcli-1.7.2.ebuild b/media-sound/upmpdcli/upmpdcli-1.7.2.ebuild
index d25f68706433..6f8f00af7075 100644
--- a/media-sound/upmpdcli/upmpdcli-1.7.2.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.7.2.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="thirdparty"
 
 DEPEND="
diff --git a/media-sound/upmpdcli/upmpdcli-1.6.3.ebuild b/media-sound/upmpdcli/upmpdcli-1.7.7.ebuild
index 6f8f00af7075..d25f68706433 100644
--- a/media-sound/upmpdcli/upmpdcli-1.6.3.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.7.7.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="thirdparty"
 
 DEPEND="
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 9956b2eba315..bceace2405f4 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/parole/Manifest b/media-video/parole/Manifest
index a7fa915bc665..589e892bd0fe 100644
--- a/media-video/parole/Manifest
+++ b/media-video/parole/Manifest
@@ -1,5 +1,3 @@
-DIST parole-4.16.0.tar.bz2 924955 BLAKE2B 7f5c9994e65ce66aa34211047228840e1747cbbaebe0f03d27501d54ef0372e55f294f37869bfaba378e3ab6447e9824798d0c9906549b7c822ce60c54ac81a5 SHA512 fe4723ce3e2106935b4577647920d6759ade3311ef92d5633a309aeb930b81974dd8e5f65958a304a117e614341cba032a54d0c81bdd386d592c64ed2aa31124
 DIST parole-4.18.0.tar.bz2 932686 BLAKE2B 49bbc93d1172daf29e73d5eacedfae2fb11f14684232e2c6cbcc84fcddfa65bcece6ef41c68fb58a0046e1a60280ff92e0890e5302f9e0751c1afce825bee7f3 SHA512 2988c8b6f9f0beab646a90116ee83f19d6e6689ea4d037ea643aa26d5716f7c452fa96ee1d4c6d01ee6c421b06cb5405f7256cfdb525ce1016c12f0a78cddb80
-EBUILD parole-4.16.0.ebuild 1342 BLAKE2B fb8b97521c55d8f1a1917dfff81a20ffe05129309b930885b44e6f910e62151728a068a6c56f10286265c5eddd2401aba80a6cf24d6c9b1ec6df10a3c97bca88 SHA512 5504fc93a5dd309be845b08a5bb12d6d6728a6513255938351557cd2b589805bada1d6942166c31409e14179b1a824f58bc18637127f1895d1ec620a1c909b89
-EBUILD parole-4.18.0.ebuild 1391 BLAKE2B 235e6b3a789a318922aa0221a49f33d26e3f991336afe635f86a6b3f6953461233cf018f1d90a85757e54f87eb0e450e9815e1f3971de04fec35097682f740b2 SHA512 6185f7463f8c8673fc97078065159eb87ae3a400d93f8a9666d06ce9749732df2686cd72c6d27c702a156a0b7888b104b4d4b52d37d34ed065c955a3ef0dbf18
+EBUILD parole-4.18.0.ebuild 1389 BLAKE2B eb0852fb6cd17b6228e5bb371a27ac7b47b55fc51fc9f60938c73b92431c52b53c4d3c13ee429cb3139b1b80332938971e8aa5290b7fd554c1d3b8bebb21ef55 SHA512 c515808f28b3928ea9bb5d79389bafa3e9b93b119a75c8beab8242614d78af5475a74eeb99be396d7b596d5b19c32431907e4059085eb5baf95e1fb24127ec3c
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/media-video/parole/parole-4.16.0.ebuild b/media-video/parole/parole-4.16.0.ebuild
deleted file mode 100644
index 185f0d300764..000000000000
--- a/media-video/parole/parole-4.16.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="A simple Xfce4 media player using GStreamer"
-HOMEPAGE="https://docs.xfce.org/apps/parole/start"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="libnotify taglib"
-
-DEPEND="
-	>=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.32:2
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	sys-apps/dbus
-	>=x11-libs/gtk+-3.20:3
-	x11-libs/libX11
-	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.11:=
-	>=xfce-base/xfconf-4.10:=
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	taglib? ( >=media-libs/taglib-1.6:0= )"
-RDEPEND="${DEPEND}
-	media-plugins/gst-plugins-meta:1.0"
-DEPEND+="
-	x11-base/xorg-proto"
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		# clutter backend does not work with new GTK+3 versions
-		--disable-clutter
-		$(use_enable taglib)
-		$(use_enable libnotify notify-plugin)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-video/parole/parole-4.18.0.ebuild b/media-video/parole/parole-4.18.0.ebuild
index 56773b4c0515..e8bff7cbe260 100644
--- a/media-video/parole/parole-4.18.0.ebuild
+++ b/media-video/parole/parole-4.18.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="amd64 ~mips x86"
 IUSE="libnotify taglib"
 
 DEPEND="
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 882e831cf049..2952f3e194c0 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 34d020fd9c29..e7c21668ac2c 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 08 Apr 2023 16:09:57 +0000
+Sat, 08 Apr 2023 22:10:00 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 02c47956cfc7..a5c28aaf80e2 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-04-08T16:10:00Z
+TIMESTAMP 2023-04-08T22:10:03Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQxkdhfFIAAAAAALgAo
+iQKSBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQx5jtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBppw//ayVJoj5GC8Nd5T3FL7ljbQWyGAvWn616RclSqvx3NbQYUCINfWTmP9J7
-5StlM18ITpa5Js93oBsobybRf93m1hfTaDDL5lIeX38Wb94I6EKAtx1oLtBenOsS
-WJV8gjy5L01LU4dKqf5Z1WAHN5FQQPixgPs0FnZ0P9U83vJ08xbe4h0W1EtoGHyz
-cZCBma26Ms8dRPB81GJMgH/sHzUkOwGyf3/J13Ui4DEtcPEQw/KgxdH4fK7TgW61
-QKKUzhePa6XZAAPo4Jkv5ocS2m8KdhtTHzaYKYAInGMZkKL+USIjFOy+uNdjXWoS
-Wdl6xtMp26d1DotE0LLMseCwAEEG0IKL0/Q5BJysO7vESfZGdxTU4DwDGyXV0c+s
-URE/lmoqFG2n0L7uK5iM5ad+Hzg4aVhUwECIbUrFDyNyYrgg4v3MrMCJE7dSZm07
-sZv/Z8abRh86t0YrPQ+IeK+rsJrZC5frlYLIwxohl7yCFlFL1EiDII2thXlk5in0
-kelUWauknTiUFTyFSBRREEthmAUhhNc7wgN0qh28d55GNc8g9CmnZR+qblFAHY+2
-qh0RU2FPBXijQ4lLh27jl3+Zd5Zk9rwsoieVKTXXOc/O1iNw96hOQjV0/DwEKZsU
-gO9omxfkRof16eLZ6vS+ocn9oLLrCd1U5DPqf9zaBkfn+Ju7xAs=
-=ePBp
+klAYcw/4qkHDmyFb65sbuqPRkktJY9rQutT7LF9tQ6BhMo2jZqeyJMv144XoxYeX
+EX6lMMJq2SDCo8ITVtB5CKre0QiOcansjt/GXtyg04SMy70JFe7iinWb2vw1I4IU
+p918mc+VpBwBjN2Be7S06WVQtMr1+nCAM0p9+TeP8kuIDe1oFsqF2Pq9XqnNUesB
+5fMOqbXt8yE7RmJQJrQdmAdLCi8e5Vlsud8aBlErYr/eIS5wVZ89ZvrXTDxmlZPJ
+atPk+jYb4E5ECfiMGxprFS6KPydMKBz0lMSaNtFZl/MfEgoCagliB//7v/oU5XLd
+VlkKhIaKT6YWEOR+1y/GioqF728rOfn3ySa6LcVFlH7/KHKG8RwEWdgm89vHBEK9
+Vu+/cIPfm4q63li0wjQnJTP/HHCLSkmuOgBwOU7TjwsuqAPM1gPTBKAy/RHBMgIj
+omZduP0zoMm/8BWgQqQmqA/hgOk31Su+oQHGZKoQtZr6YR+OLnjOFBzaTmGGb/HO
+2L3qAify+M10w18EgxidGANWqU8Q5A4ZmVvZN96Q/mU5hpOpV67rDMJxQ0uSZEYB
+kx+FL4N+WKwejfo9Y17Tw+YCo5FsQOtikaVY6I2HPCcL+cg3tkVxlNVhtZaRSry1
+Y9/S9H5cMAgxhYsM89qASkC3MuZkNRSuzsMtAT/P7yfBBK5Z7g==
+=cOUI
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 34d020fd9c29..69df9a44f050 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 08 Apr 2023 16:09:57 +0000
+Sat, 08 Apr 2023 22:10:01 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 431f710240b1..0ae3274e9976 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 227221eed730..e22827ffa20e 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/ec2-ami-tools-1.5.7 b/metadata/md5-cache/app-admin/ec2-ami-tools-1.5.7
index 2b419e158013..c5e10e4304f4 100644
--- a/metadata/md5-cache/app-admin/ec2-ami-tools-1.5.7
+++ b/metadata/md5-cache/app-admin/ec2-ami-tools-1.5.7
@@ -6,8 +6,8 @@ HOMEPAGE=https://aws.amazon.com/en/tools/
 INHERIT=ruby-single
 KEYWORDS=~amd64 ~x86
 LICENSE=Amazon || ( Ruby GPL-2 )
-RDEPEND=|| ( dev-lang/ruby:2.7 ) virtual/rubygems virtual/ruby-ssl net-misc/rsync net-misc/curl
+RDEPEND=|| ( ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ) virtual/ruby-ssl net-misc/rsync net-misc/curl
 SLOT=0
 SRC_URI=http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools-1.5.7.zip
-_eclasses_=ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30
+_eclasses_=ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30
 _md5_=95b801c107d75f21353354ba75b7df07
diff --git a/metadata/md5-cache/app-admin/helm-3.10.1 b/metadata/md5-cache/app-admin/helm-3.10.1
deleted file mode 100644
index 1c91cc9df922..000000000000
--- a/metadata/md5-cache/app-admin/helm-3.10.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Package Manager
-EAPI=8
-HOMEPAGE=https://github.com/helm/helm https://helm.sh
-INHERIT=bash-completion-r1 go-module
-KEYWORDS=~amd64 ~arm64 ~loong ~riscv
-LICENSE=Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 ISC MIT ZLIB
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/helm/helm/archive/v3.10.1.tar.gz -> k8s-helm-3.10.1.tar.gz https://dev.gentoo.org/~williamh/dist/helm-3.10.1-deps.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	f9700c7efec1fd4955363169e9930c1c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=369be47a14de2a1f3b2188e933b8840e
diff --git a/metadata/md5-cache/app-admin/helm-3.9.4 b/metadata/md5-cache/app-admin/helm-3.9.4
deleted file mode 100644
index 61c3d69695d1..000000000000
--- a/metadata/md5-cache/app-admin/helm-3.9.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Package Manager
-EAPI=8
-HOMEPAGE=https://github.com/helm/helm https://helm.sh
-INHERIT=bash-completion-r1 go-module
-KEYWORDS=amd64 ~arm64 ~riscv
-LICENSE=Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 ISC MIT ZLIB
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/helm/helm/archive/v3.9.4.tar.gz -> k8s-helm-3.9.4.tar.gz https://dev.gentoo.org/~williamh/dist/helm-3.9.4-deps.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	f9700c7efec1fd4955363169e9930c1c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b7d18742aca2cb4053e95b9e299b02d5
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 014ffdd5c8aa..074fb094070b 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/advancecomp-2.4 b/metadata/md5-cache/app-arch/advancecomp-2.4
deleted file mode 100644
index 7eca0a4602b3..000000000000
--- a/metadata/md5-cache/app-arch/advancecomp-2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=app-arch/bzip2:= sys-libs/zlib:=
-DESCRIPTION=Recompress ZIP, PNG and MNG, considerably improving compression
-EAPI=8
-HOMEPAGE=https://www.advancemame.it/comp-readme.html https://github.com/amadvance/advancecomp/
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86
-LICENSE=GPL-2+ Apache-2.0 LGPL-2.1+ MIT
-RDEPEND=app-arch/bzip2:= sys-libs/zlib:=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/amadvance/advancecomp/releases/download/v2.4/advancecomp-2.4.tar.gz
-_md5_=0347f074d67ab64755d54539bc3b0eb9
diff --git a/metadata/md5-cache/app-arch/advancecomp-2.5 b/metadata/md5-cache/app-arch/advancecomp-2.5
index 491118de0ac5..445cb98d37a1 100644
--- a/metadata/md5-cache/app-arch/advancecomp-2.5
+++ b/metadata/md5-cache/app-arch/advancecomp-2.5
@@ -3,10 +3,10 @@ DEPEND=app-arch/bzip2:= sys-libs/zlib:=
 DESCRIPTION=Recompress ZIP, PNG and MNG, considerably improving compression
 EAPI=8
 HOMEPAGE=https://www.advancemame.it/comp-readme.html https://github.com/amadvance/advancecomp/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86
 LICENSE=GPL-2+ Apache-2.0 LGPL-2.1+ MIT
 RDEPEND=app-arch/bzip2:= sys-libs/zlib:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/amadvance/advancecomp/releases/download/v2.5/advancecomp-2.5.tar.gz
-_md5_=380bcab7b595353799284058d8a4cc07
+_md5_=449d91b464a1b6f09b34d6fb101d0690
diff --git a/metadata/md5-cache/app-arch/bzip3-1.1.8 b/metadata/md5-cache/app-arch/bzip3-1.1.8
deleted file mode 100644
index 40282e54c3e3..000000000000
--- a/metadata/md5-cache/app-arch/bzip3-1.1.8
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=A better and stronger spiritual successor to BZip2
-EAPI=8
-HOMEPAGE=https://github.com/kspalaiologos/bzip3
-INHERIT=toolchain-funcs
-KEYWORDS=amd64 arm64 ~loong ~x86
-LICENSE=LGPL-3+
-SLOT=0
-SRC_URI=https://github.com/kspalaiologos/bzip3/releases/download/1.1.8/bzip3-1.1.8.tar.xz
-_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6d73ebf4dde557b72343977901882e77
diff --git a/metadata/md5-cache/app-arch/bzip3-1.2.2 b/metadata/md5-cache/app-arch/bzip3-1.2.2
deleted file mode 100644
index 0bf770434a9b..000000000000
--- a/metadata/md5-cache/app-arch/bzip3-1.2.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=A better and stronger spiritual successor to BZip2
-EAPI=8
-HOMEPAGE=https://github.com/kspalaiologos/bzip3
-INHERIT=toolchain-funcs
-KEYWORDS=amd64 arm64 ~loong ~x86
-LICENSE=LGPL-3+
-SLOT=0
-SRC_URI=https://github.com/kspalaiologos/bzip3/releases/download/1.2.2/bzip3-1.2.2.tar.xz
-_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=53170b5154ba1196fb89a08613ee8a43
diff --git a/metadata/md5-cache/app-arch/bzip3-1.2.3 b/metadata/md5-cache/app-arch/bzip3-1.2.3
deleted file mode 100644
index 5e72e3c0cb96..000000000000
--- a/metadata/md5-cache/app-arch/bzip3-1.2.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=A better and stronger spiritual successor to BZip2
-EAPI=8
-HOMEPAGE=https://github.com/kspalaiologos/bzip3
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~arm64 ~loong ~x86
-LICENSE=LGPL-3+
-SLOT=0
-SRC_URI=https://github.com/kspalaiologos/bzip3/releases/download/1.2.3/bzip3-1.2.3.tar.xz
-_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bb18d89673f920a9eee70bd754a15a3c
diff --git a/metadata/md5-cache/app-arch/bzip3-1.3.0 b/metadata/md5-cache/app-arch/bzip3-1.3.0
index 92547f49c99a..ac35fb69491e 100644
--- a/metadata/md5-cache/app-arch/bzip3-1.3.0
+++ b/metadata/md5-cache/app-arch/bzip3-1.3.0
@@ -3,9 +3,9 @@ DESCRIPTION=A better and stronger spiritual successor to BZip2
 EAPI=8
 HOMEPAGE=https://github.com/kspalaiologos/bzip3
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~arm64 ~loong ~x86
+KEYWORDS=amd64 arm64 ~loong ~x86
 LICENSE=LGPL-3+
 SLOT=0
 SRC_URI=https://github.com/kspalaiologos/bzip3/releases/download/1.3.0/bzip3-1.3.0.tar.xz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bb18d89673f920a9eee70bd754a15a3c
+_md5_=53170b5154ba1196fb89a08613ee8a43
diff --git a/metadata/md5-cache/app-arch/libarchive-3.6.1-r1 b/metadata/md5-cache/app-arch/libarchive-3.6.1-r1
deleted file mode 100644
index d7f3f0d64e5f..000000000000
--- a/metadata/md5-cache/app-arch/libarchive-3.6.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=verify-sig? ( <sec-keys/openpgp-keys-libarchive-20221209 ) 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 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) blake2? ( app-crypt/libb2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.2.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( virtual/os-headers e2fsprogs? ( sys-fs/e2fsprogs[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=Multi-format archive and compression library
-EAPI=8
-HOMEPAGE=https://www.libarchive.org/
-INHERIT=autotools multilib-minimal toolchain-funcs verify-sig
-IUSE=acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD BSD-2 BSD-4 public-domain
-RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) blake2? ( app-crypt/libb2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.2.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/13
-SRC_URI=https://www.libarchive.de/downloads/libarchive-3.6.1.tar.xz verify-sig? ( https://www.libarchive.de/downloads/libarchive-3.6.1.tar.xz.asc )
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=f0e384d238ad521d590be26336233865
diff --git a/metadata/md5-cache/app-arch/libarchive-3.6.2-r1 b/metadata/md5-cache/app-arch/libarchive-3.6.2-r1
index 5263bf8e7186..52e6b5106319 100644
--- a/metadata/md5-cache/app-arch/libarchive-3.6.2-r1
+++ b/metadata/md5-cache/app-arch/libarchive-3.6.2-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.libarchive.org/ https://github.com/libarchive/libarchive/
 INHERIT=multilib-minimal toolchain-funcs verify-sig
 IUSE=acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2 BSD-4 public-domain
 RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) blake2? ( app-crypt/libb2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.2.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/13
 SRC_URI=https://www.libarchive.de/downloads/libarchive-3.6.2.tar.xz verify-sig? ( https://www.libarchive.de/downloads/libarchive-3.6.2.tar.xz.asc )
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=654338f77ad80b4784edfe6d7835ca2d
+_md5_=9394d8c95e41369c922be3ba9fae6b84
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index b4d25ae7c0fb..8bb48b34d159 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/gvim-9.0.1000 b/metadata/md5-cache/app-editors/gvim-9.0.1000
index 66aef63c9088..c353a186dc4d 100644
--- a/metadata/md5-cache/app-editors/gvim-9.0.1000
+++ b/metadata/md5-cache/app-editors/gvim-9.0.1000
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/autoconf virtual/pkgconfig lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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? ( sys-devel/gettext )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=~app-editors/vim-core-9.0.1000 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
+DEPEND=~app-editors/vim-core-9.0.1000 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
 DESCRIPTION=GUI version of the Vim text editor
 EAPI=8
 HOMEPAGE=https://www.vim.org https://github.com/vim/vim
@@ -9,10 +9,10 @@ IUSE=acl aqua crypt cscope debug lua minimal motif netbeans nls perl python rack
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
-RDEPEND=~app-editors/vim-core-9.0.1000 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
+RDEPEND=~app-editors/vim-core-9.0.1000 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit 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 ) ) aqua? ( !motif )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v9.0.1000.tar.gz -> vim-9.0.1000.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.1000-patches.tar.bz2
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ee236a35d53972d847be2151c4261efb
diff --git a/metadata/md5-cache/app-editors/gvim-9.0.1157 b/metadata/md5-cache/app-editors/gvim-9.0.1157
index feb3540b3dec..ad0d37c5c2d9 100644
--- a/metadata/md5-cache/app-editors/gvim-9.0.1157
+++ b/metadata/md5-cache/app-editors/gvim-9.0.1157
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/autoconf virtual/pkgconfig lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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? ( sys-devel/gettext )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=~app-editors/vim-core-9.0.1157 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
+DEPEND=~app-editors/vim-core-9.0.1157 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
 DESCRIPTION=GUI version of the Vim text editor
 EAPI=8
 HOMEPAGE=https://www.vim.org https://github.com/vim/vim
@@ -9,10 +9,10 @@ IUSE=acl aqua crypt cscope debug lua minimal motif netbeans nls perl python rack
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
-RDEPEND=~app-editors/vim-core-9.0.1157 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
+RDEPEND=~app-editors/vim-core-9.0.1157 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit 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 ) ) aqua? ( !motif )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v9.0.1157.tar.gz -> vim-9.0.1157.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.1000-patches.tar.bz2
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ee236a35d53972d847be2151c4261efb
diff --git a/metadata/md5-cache/app-editors/gvim-9.0.1363 b/metadata/md5-cache/app-editors/gvim-9.0.1363
index 34d87b118018..f91fb24adc17 100644
--- a/metadata/md5-cache/app-editors/gvim-9.0.1363
+++ b/metadata/md5-cache/app-editors/gvim-9.0.1363
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/autoconf virtual/pkgconfig lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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? ( sys-devel/gettext )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=~app-editors/vim-core-9.0.1363 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) x11-base/xorg-proto
+DEPEND=~app-editors/vim-core-9.0.1363 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) x11-base/xorg-proto
 DESCRIPTION=GUI version of the Vim text editor
 EAPI=8
 HOMEPAGE=https://www.vim.org https://github.com/vim/vim
@@ -9,10 +9,10 @@ IUSE=acl aqua crypt cscope debug lua minimal motif netbeans nls perl python rack
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
-RDEPEND=~app-editors/vim-core-9.0.1363 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
+RDEPEND=~app-editors/vim-core-9.0.1363 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit 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 ) ) aqua? ( !motif )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v9.0.1363.tar.gz -> vim-9.0.1363.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.1000-patches.tar.bz2
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a52ee67997106204e4372df6bd3fc698
diff --git a/metadata/md5-cache/app-editors/gvim-9.0.1403 b/metadata/md5-cache/app-editors/gvim-9.0.1403
index e2bf0c28fa37..8474b9a47c14 100644
--- a/metadata/md5-cache/app-editors/gvim-9.0.1403
+++ b/metadata/md5-cache/app-editors/gvim-9.0.1403
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/autoconf virtual/pkgconfig lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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? ( sys-devel/gettext )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=~app-editors/vim-core-9.0.1403 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) x11-base/xorg-proto
+DEPEND=~app-editors/vim-core-9.0.1403 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) x11-base/xorg-proto
 DESCRIPTION=GUI version of the Vim text editor
 EAPI=8
 HOMEPAGE=https://www.vim.org https://github.com/vim/vim
@@ -9,10 +9,10 @@ IUSE=acl aqua crypt cscope debug lua minimal motif netbeans nls perl python rack
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
-RDEPEND=~app-editors/vim-core-9.0.1403 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
+RDEPEND=~app-editors/vim-core-9.0.1403 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit 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 ) ) aqua? ( !motif )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v9.0.1403.tar.gz -> vim-9.0.1403.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.1000-patches.tar.bz2
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a52ee67997106204e4372df6bd3fc698
diff --git a/metadata/md5-cache/app-editors/gvim-9999 b/metadata/md5-cache/app-editors/gvim-9999
index 261d8f2c3bfe..1aca798b5245 100644
--- a/metadata/md5-cache/app-editors/gvim-9999
+++ b/metadata/md5-cache/app-editors/gvim-9999
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/autoconf virtual/pkgconfig lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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? ( sys-devel/gettext ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
+DEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
 DESCRIPTION=GUI version of the Vim text editor
 EAPI=8
 HOMEPAGE=https://www.vim.org https://github.com/vim/vim
@@ -9,9 +9,9 @@ IUSE=acl aqua crypt cscope debug lua minimal motif netbeans nls perl python rack
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 PROPERTIES=live
-RDEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
+RDEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit 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 ) ) aqua? ( !motif )
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8b1334c8e92f6b18469ab414bc3a572d
diff --git a/metadata/md5-cache/app-editors/mousepad-0.5.10 b/metadata/md5-cache/app-editors/mousepad-0.5.10
deleted file mode 100644
index c338efe5159a..000000000000
--- a/metadata/md5-cache/app-editors/mousepad-0.5.10
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.52 >=x11-libs/gtk+-3.22:3 >=x11-libs/gtksourceview-4.0.0:4
-DESCRIPTION=GTK+-based editor for the Xfce Desktop Environment
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/apps/mousepad/start https://gitlab.xfce.org/apps/mousepad/
-INHERIT=gnome2-utils xdg-utils
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.52 >=x11-libs/gtk+-3.22:3 >=x11-libs/gtksourceview-4.0.0:4
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/mousepad/0.5/mousepad-0.5.10.tar.bz2
-_eclasses_=gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2eff6c25de9d0cc2780c9d5b25e269cb
diff --git a/metadata/md5-cache/app-editors/mousepad-0.6.0 b/metadata/md5-cache/app-editors/mousepad-0.6.0
index 2b387912e902..e07324759416 100644
--- a/metadata/md5-cache/app-editors/mousepad-0.6.0
+++ b/metadata/md5-cache/app-editors/mousepad-0.6.0
@@ -5,10 +5,10 @@ DESCRIPTION=GTK+-based editor for the Xfce Desktop Environment
 EAPI=8
 HOMEPAGE=https://docs.xfce.org/apps/mousepad/start https://gitlab.xfce.org/apps/mousepad/
 INHERIT=gnome2-utils xdg-utils
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.56.2 >=x11-libs/gtk+-3.22:3 >=x11-libs/gtksourceview-4.0.0:4
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/mousepad/0.6/mousepad-0.6.0.tar.bz2
 _eclasses_=gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9cb06db13082acda7315b674ee6cf41c
+_md5_=8c44a3d9c875e05929ee0733166e9649
diff --git a/metadata/md5-cache/app-editors/vim-9.0.1000 b/metadata/md5-cache/app-editors/vim-9.0.1000
index c56ec0eb68f7..8d6bcc53a7ca 100644
--- a/metadata/md5-cache/app-editors/vim-9.0.1000
+++ b/metadata/md5-cache/app-editors/vim-9.0.1000
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/autoconf lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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? ( sys-devel/gettext )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1000 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1000 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=8
 HOMEPAGE=https://www.vim.org https://github.com/vim/vim
@@ -9,9 +9,9 @@ IUSE=X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinu
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
-RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1000 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1000 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit 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 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v9.0.1000.tar.gz -> vim-9.0.1000.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.1000-patches.tar.bz2
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=60044aa2038a39b6e9dbc6af76bfc4fe
diff --git a/metadata/md5-cache/app-editors/vim-9.0.1157 b/metadata/md5-cache/app-editors/vim-9.0.1157
index 88752629fb9d..90b844a38f61 100644
--- a/metadata/md5-cache/app-editors/vim-9.0.1157
+++ b/metadata/md5-cache/app-editors/vim-9.0.1157
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/autoconf lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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? ( sys-devel/gettext )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1157 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1157 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=8
 HOMEPAGE=https://www.vim.org https://github.com/vim/vim
@@ -9,9 +9,9 @@ IUSE=X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinu
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
-RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1157 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1157 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit 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 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v9.0.1157.tar.gz -> vim-9.0.1157.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.1000-patches.tar.bz2
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=60044aa2038a39b6e9dbc6af76bfc4fe
diff --git a/metadata/md5-cache/app-editors/vim-9.0.1363 b/metadata/md5-cache/app-editors/vim-9.0.1363
index 376a6d54b34d..68879f6fe53f 100644
--- a/metadata/md5-cache/app-editors/vim-9.0.1363
+++ b/metadata/md5-cache/app-editors/vim-9.0.1363
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/autoconf lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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? ( sys-devel/gettext )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1363 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1363 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=8
 HOMEPAGE=https://www.vim.org https://github.com/vim/vim
@@ -9,9 +9,9 @@ IUSE=X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinu
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
-RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1363 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1363 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit 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 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v9.0.1363.tar.gz -> vim-9.0.1363.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.1000-patches.tar.bz2
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=34fd949d6ba567f5b4ed19bdfca36062
diff --git a/metadata/md5-cache/app-editors/vim-9.0.1403 b/metadata/md5-cache/app-editors/vim-9.0.1403
index 1bf47137e771..b5091b08b5cf 100644
--- a/metadata/md5-cache/app-editors/vim-9.0.1403
+++ b/metadata/md5-cache/app-editors/vim-9.0.1403
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/autoconf lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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? ( sys-devel/gettext )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1403 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1403 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=8
 HOMEPAGE=https://www.vim.org https://github.com/vim/vim
@@ -9,9 +9,9 @@ IUSE=X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinu
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
-RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1403 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1403 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit 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 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v9.0.1403.tar.gz -> vim-9.0.1403.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.1000-patches.tar.bz2
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=34fd949d6ba567f5b4ed19bdfca36062
diff --git a/metadata/md5-cache/app-editors/vim-9999 b/metadata/md5-cache/app-editors/vim-9999
index a933083260bf..796968da52e8 100644
--- a/metadata/md5-cache/app-editors/vim-9999
+++ b/metadata/md5-cache/app-editors/vim-9999
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/autoconf lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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? ( sys-devel/gettext ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9999 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9999 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=8
 HOMEPAGE=https://www.vim.org https://github.com/vim/vim
@@ -9,8 +9,8 @@ IUSE=X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinu
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 PROPERTIES=live
-RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9999 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9999 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit 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 ) ) vim-pager? ( !minimal )
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=34fd949d6ba567f5b4ed19bdfca36062
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index b75187bde185..322371ebc28c 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/ddskk-17.1 b/metadata/md5-cache/app-emacs/ddskk-17.1
index b5ba6c397291..dde425a24300 100644
--- a/metadata/md5-cache/app-emacs/ddskk-17.1
+++ b/metadata/md5-cache/app-emacs/ddskk-17.1
@@ -7,9 +7,9 @@ INHERIT=elisp ruby-single vcs-snapshot
 IUSE=ruby
 KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3+
-RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 ) virtual/rubygems ) >=app-editors/emacs-25.3:*
+RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ) ) >=app-editors/emacs-25.3:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/skk-dev/ddskk/archive/ddskk-17.1_Neppu.tar.gz -> ddskk-17.1.tar.gz
-_eclasses_=elisp	4885a6bf2026d3a2d5b9789f3b76d1f3	elisp-common	1d6e8d43be4713f04a441f721d890d48	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
+_eclasses_=elisp	4885a6bf2026d3a2d5b9789f3b76d1f3	elisp-common	1d6e8d43be4713f04a441f721d890d48	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
 _md5_=572fa3bc0e6182cbabbe9930f00ec6bd
diff --git a/metadata/md5-cache/app-emacs/ddskk-17.1-r1 b/metadata/md5-cache/app-emacs/ddskk-17.1-r1
index 5d2c2a73fad9..249e8c00e73c 100644
--- a/metadata/md5-cache/app-emacs/ddskk-17.1-r1
+++ b/metadata/md5-cache/app-emacs/ddskk-17.1-r1
@@ -7,9 +7,9 @@ INHERIT=elisp ruby-single vcs-snapshot
 IUSE=ruby
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3+
-RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 ) virtual/rubygems ) >=app-editors/emacs-25.3:*
+RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ) ) >=app-editors/emacs-25.3:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/skk-dev/ddskk/archive/ddskk-17.1_Neppu.tar.gz -> ddskk-17.1.tar.gz
-_eclasses_=elisp	4885a6bf2026d3a2d5b9789f3b76d1f3	elisp-common	1d6e8d43be4713f04a441f721d890d48	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
+_eclasses_=elisp	4885a6bf2026d3a2d5b9789f3b76d1f3	elisp-common	1d6e8d43be4713f04a441f721d890d48	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
 _md5_=fdb41b03b881cf4afbd166763504a8da
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index b8e8a11e631d..058e48230236 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/afflib-3.7.20 b/metadata/md5-cache/app-forensics/afflib-3.7.20
index fa9c54caf92b..6ec4a77e8424 100644
--- a/metadata/md5-cache/app-forensics/afflib-3.7.20
+++ b/metadata/md5-cache/app-forensics/afflib-3.7.20
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/sshock/AFFLIBv3/
 INHERIT=autotools python-single-r1
 IUSE=fuse ncurses python qemu readline s3 static-libs threads python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~hppa ppc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=dev-libs/expat sys-libs/zlib:= fuse? ( sys-fs/fuse:0 ) dev-libs/openssl:= ncurses? ( sys-libs/ncurses:= ) 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 ) python_single_target_python3_9? ( dev-python/cython[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cython[python_targets_python3_11(-)] ) ) readline? ( sys-libs/readline:= ) s3? ( net-misc/curl )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/sshock/AFFLIBv3/archive/v3.7.20.tar.gz -> afflib-3.7.20.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e382546fcd0094094415a2fff11e4fc8
+_md5_=58d3d41f500191184eff1a040c9839ca
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 18434c14a72e..02f492f581e8 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/skk-jisyo-999999 b/metadata/md5-cache/app-i18n/skk-jisyo-999999
index 772d294b9562..e315c9f8fcaf 100644
--- a/metadata/md5-cache/app-i18n/skk-jisyo-999999
+++ b/metadata/md5-cache/app-i18n/skk-jisyo-999999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=|| ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems app-i18n/skktools app-alternatives/awk cdb? ( || ( dev-db/tinycdb dev-db/cdb ) )
+DEPEND=|| ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) app-i18n/skktools app-alternatives/awk cdb? ( || ( dev-db/tinycdb dev-db/cdb ) )
 DESCRIPTION=Jisyo (dictionary) files for the SKK Japanese-input software
 EAPI=8
 HOMEPAGE=http://openlab.ring.gr.jp/skk/dic.html
@@ -9,5 +9,5 @@ IUSE=cdb ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_target
 LICENSE=CC-BY-SA-3.0 GPL-2+ public-domain unicode
 PROPERTIES=live
 SLOT=0
-_eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30
+_eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30
 _md5_=27da236a951b0cb26ed50550737e2d0f
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index eef7466ee0ac..2f1b22c61b7b 100644
--- a/metadata/md5-cache/app-metrics/Manifest.gz
+++ b/metadata/md5-cache/app-metrics/Manifest.gz
diff --git a/metadata/md5-cache/app-metrics/carbonapi-booking-0.3.0 b/metadata/md5-cache/app-metrics/carbonapi-booking-0.3.0
new file mode 100644
index 000000000000..f45ed61cf487
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/carbonapi-booking-0.3.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=install unpack
+DESCRIPTION=High-performance Graphite front-end, Booking.com fork
+EAPI=8
+HOMEPAGE=https://github.com/bookingcom/carbonapi
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=acct-group/carbon acct-user/carbon
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/bookingcom/carbonapi/archive/v0.3.0.tar.gz -> carbonapi-booking-0.3.0.tar.gz
+_eclasses_=go-module	f9700c7efec1fd4955363169e9930c1c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=21d84e52342488439c2ac24f668ca9f7
diff --git a/metadata/md5-cache/app-metrics/go-carbon-0.17.1 b/metadata/md5-cache/app-metrics/go-carbon-0.17.1
new file mode 100644
index 000000000000..5cd0e8ed90ce
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/go-carbon-0.17.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=install unpack
+DESCRIPTION=Golang implementation of Graphite/Carbon server
+EAPI=8
+HOMEPAGE=https://github.com/go-graphite/go-carbon
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=MIT Apache-2.0
+RDEPEND=acct-group/carbon acct-user/carbon
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/go-graphite/go-carbon/archive/v0.17.1.tar.gz -> go-carbon-0.17.1.tar.gz
+_eclasses_=go-module	f9700c7efec1fd4955363169e9930c1c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=90c4c7e6a4630b13f5b81ed475d7bee7
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index e13370363b41..18d1d5cce093 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/tmate-2.4.0-r2 b/metadata/md5-cache/app-misc/tmate-2.4.0-r2
index 0e05d1aae080..1c65449ba384 100644
--- a/metadata/md5-cache/app-misc/tmate-2.4.0-r2
+++ b/metadata/md5-cache/app-misc/tmate-2.4.0-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://tmate.io/
 INHERIT=autotools
 IUSE=debug
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv ~x86
 LICENSE=ISC BSD BSD-2
 RDEPEND=dev-libs/libevent dev-libs/msgpack:= dev-libs/openssl:= >=net-libs/libssh-0.6.0 sys-libs/zlib sys-libs/libutempter
 SLOT=0
 SRC_URI=https://github.com/tmate-io/tmate/archive/2.4.0.tar.gz -> tmate-2.4.0.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=867f8ebf66a6a28ef665f9356df0d097
+_md5_=4218d81e42b3f587481adbd5c6712e2a
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index e4cb9746dbf9..16df17734d6c 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/ledger-3.2.1-r1 b/metadata/md5-cache/app-office/ledger-3.2.1-r1
deleted file mode 100644
index f0355705b000..000000000000
--- a/metadata/md5-cache/app-office/ledger-3.2.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=dev-libs/boost:=[python?] dev-libs/gmp:0= dev-libs/mpfr:0= python? ( python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/cheetah3:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/cheetah3:=[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/cheetah3:=[python_targets_python3_11(-)] ) 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 ) ) dev-libs/utfcpp doc? ( dev-texlive/texlive-fontsrecommended sys-apps/texinfo virtual/texi2dvi )
-DESCRIPTION=Double-entry accounting system with a command-line reporting interface
-EAPI=8
-HOMEPAGE=https://www.ledger-cli.org/
-INHERIT=bash-completion-r1 check-reqs cmake python-single-r1
-IUSE=debug doc python python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 arm arm64 ~riscv x86
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[python?] dev-libs/gmp:0= dev-libs/mpfr:0= python? ( python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/cheetah3:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/cheetah3:=[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/cheetah3:=[python_targets_python3_11(-)] ) 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 ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ledger/ledger/archive/v3.2.1.tar.gz -> ledger-3.2.1.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1bdfa70a649092fb2219bb82db5c7512
diff --git a/metadata/md5-cache/app-office/ledger-3.3.1 b/metadata/md5-cache/app-office/ledger-3.3.1
index c1bfae219cea..af08afe228c1 100644
--- a/metadata/md5-cache/app-office/ledger-3.3.1
+++ b/metadata/md5-cache/app-office/ledger-3.3.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.ledger-cli.org/
 INHERIT=bash-completion-r1 check-reqs cmake python-single-r1
 IUSE=debug doc python python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=dev-libs/boost:=[python?] dev-libs/gmp:0= dev-libs/mpfr:0= python? ( python_single_target_python3_9? ( dev-libs/boost:=[python_targets_python3_9(-)] dev-python/cheetah3:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python_targets_python3_10(-)] dev-python/cheetah3:=[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python_targets_python3_11(-)] dev-python/cheetah3:=[python_targets_python3_11(-)] ) 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 ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ledger/ledger/archive/v3.3.1.tar.gz -> ledger-3.3.1.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=82de63aeca265f91615821b027141a91
+_md5_=ee8f8400638e29ca5d1acff5cc58c164
diff --git a/metadata/md5-cache/app-office/ledger-3.3.2 b/metadata/md5-cache/app-office/ledger-3.3.2
new file mode 100644
index 000000000000..563536acc194
--- /dev/null
+++ b/metadata/md5-cache/app-office/ledger-3.3.2
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=dev-libs/boost:=[python?] dev-libs/gmp:0= dev-libs/mpfr:0= python? ( python_single_target_python3_9? ( dev-libs/boost:=[python_targets_python3_9(-)] dev-python/cheetah3:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python_targets_python3_10(-)] dev-python/cheetah3:=[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python_targets_python3_11(-)] dev-python/cheetah3:=[python_targets_python3_11(-)] ) 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 ) ) dev-libs/utfcpp doc? ( app-text/texlive[extra] sys-apps/texinfo virtual/texi2dvi )
+DESCRIPTION=Double-entry accounting system with a command-line reporting interface
+EAPI=8
+HOMEPAGE=https://www.ledger-cli.org/
+INHERIT=bash-completion-r1 check-reqs cmake python-single-r1
+IUSE=debug doc python python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[python?] dev-libs/gmp:0= dev-libs/mpfr:0= python? ( python_single_target_python3_9? ( dev-libs/boost:=[python_targets_python3_9(-)] dev-python/cheetah3:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python_targets_python3_10(-)] dev-python/cheetah3:=[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python_targets_python3_11(-)] dev-python/cheetah3:=[python_targets_python3_11(-)] ) 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/ledger/ledger/archive/v3.3.2.tar.gz -> ledger-3.3.2.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=82de63aeca265f91615821b027141a91
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 580b9fc41fc9..46bca0bbf830 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/eix-0.36.5 b/metadata/md5-cache/app-portage/eix-0.36.5
deleted file mode 100644
index 189e94a065b7..000000000000
--- a/metadata/md5-cache/app-portage/eix-0.36.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= )
-DESCRIPTION=Search and query ebuilds
-EAPI=8
-HOMEPAGE=https://github.com/vaeth/eix/
-INHERIT=autotools bash-completion-r1 tmpfiles
-IUSE=debug doc nls sqlite
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
-SLOT=0
-SRC_URI=https://github.com/vaeth/eix/releases/download/v0.36.5/eix-0.36.5.tar.xz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6df3a064b163ea0f4e80b0caa3100d7a
diff --git a/metadata/md5-cache/app-portage/eix-0.36.6 b/metadata/md5-cache/app-portage/eix-0.36.6
index 80f0bde5d9cb..13d8d1b5ac1a 100644
--- a/metadata/md5-cache/app-portage/eix-0.36.6
+++ b/metadata/md5-cache/app-portage/eix-0.36.6
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/vaeth/eix/
 INHERIT=autotools bash-completion-r1 tmpfiles
 IUSE=debug doc nls sqlite
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.36.6/eix-0.36.6.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d7693533ca4300c1a8c8ea1af107c4c5
+_md5_=cbbb5e69ed2e593cae8c51e4de37c410
diff --git a/metadata/md5-cache/app-portage/gemato-19.0 b/metadata/md5-cache/app-portage/gemato-19.0
deleted file mode 100644
index 19366e5da13e..000000000000
--- a/metadata/md5-cache/app-portage/gemato-19.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=app-crypt/gnupg-2.2.20-r1 dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( gpg? ( >=app-crypt/gnupg-2.2.20-r1 dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) pretty-log? ( dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Stand-alone Manifest generation & verification tool
-EAPI=8
-HOMEPAGE=https://github.com/projg2/gemato/ https://pypi.org/project/gemato/
-INHERIT=distutils-r1
-IUSE=+gpg pretty-log tools test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=gpg? ( >=app-crypt/gnupg-2.2.20-r1 dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) pretty-log? ( dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/projg2/gemato/archive/v19.0.tar.gz -> gemato-19.0.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	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_=115e0f5025b4eaed000bc39665a33e01
diff --git a/metadata/md5-cache/app-portage/gemato-20.0 b/metadata/md5-cache/app-portage/gemato-20.0
deleted file mode 100644
index 97b258cdb229..000000000000
--- a/metadata/md5-cache/app-portage/gemato-20.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=app-crypt/gnupg-2.2.20-r1 dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( gpg? ( >=app-crypt/gnupg-2.2.20-r1 dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) pretty-log? ( dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Stand-alone Manifest generation & verification tool
-EAPI=8
-HOMEPAGE=https://github.com/projg2/gemato/ https://pypi.org/project/gemato/
-INHERIT=distutils-r1
-IUSE=+gpg pretty-log tools test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=gpg? ( >=app-crypt/gnupg-2.2.20-r1 dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) pretty-log? ( dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/projg2/gemato/archive/v20.0.tar.gz -> gemato-20.0.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	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_=be07855d08b6ee46af932240cef57600
diff --git a/metadata/md5-cache/app-portage/gemato-20.1 b/metadata/md5-cache/app-portage/gemato-20.1
index 4437d5b03926..81d818aee6ce 100644
--- a/metadata/md5-cache/app-portage/gemato-20.1
+++ b/metadata/md5-cache/app-portage/gemato-20.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/projg2/gemato/ https://pypi.org/project/gemato/
 INHERIT=distutils-r1
 IUSE=+gpg pretty-log tools test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=gpg? ( >=app-crypt/gnupg-2.2.20-r1 dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) pretty-log? ( dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/projg2/gemato/archive/v20.1.tar.gz -> gemato-20.1.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	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_=be07855d08b6ee46af932240cef57600
+_md5_=115e0f5025b4eaed000bc39665a33e01
diff --git a/metadata/md5-cache/app-portage/gentoopm-0.4 b/metadata/md5-cache/app-portage/gentoopm-0.4
deleted file mode 100644
index 4666e48a34f1..000000000000
--- a/metadata/md5-cache/app-portage/gentoopm-0.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( || ( >=sys-apps/pkgcore-0.9.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-apps/portage-2.1.10.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) 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_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A common interface to Gentoo package managers
-EAPI=8
-HOMEPAGE=https://github.com/projg2/gentoopm/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 hppa ~mips ~ppc64 ~sparc x86 ~x64-macos
-LICENSE=BSD-2
-PDEPEND=app-eselect/eselect-package-manager
-RDEPEND=|| ( >=sys-apps/pkgcore-0.9.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-apps/portage-2.1.10.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) 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_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/projg2/gentoopm/archive/v0.4.tar.gz -> gentoopm-0.4.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	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_=d2648e09e157c2d7413a3a2c7f4ffda7
diff --git a/metadata/md5-cache/app-portage/gentoopm-0.5.0 b/metadata/md5-cache/app-portage/gentoopm-0.5.0
index e1565004e7f7..8fcd1e4ebe52 100644
--- a/metadata/md5-cache/app-portage/gentoopm-0.5.0
+++ b/metadata/md5-cache/app-portage/gentoopm-0.5.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/projg2/gentoopm/ https://pypi.org/project/gentoopm/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 hppa ~mips ~ppc64 ~riscv ~sparc x86 ~x64-macos
 LICENSE=BSD-2
 PDEPEND=app-eselect/eselect-package-manager
 RDEPEND=|| ( >=sys-apps/pkgcore-0.12.19[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-apps/portage-2.1.10.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/projg2/gentoopm/archive/v0.5.0.tar.gz -> gentoopm-0.5.0.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	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_=f4b52180fbf66690cec6a2fcd2643401
+_md5_=f9b2226ad0972029fba059299931ebaf
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.8.2 b/metadata/md5-cache/app-portage/gpyutils-0.8.2
deleted file mode 100644
index 588956098aa2..000000000000
--- a/metadata/md5-cache/app-portage/gpyutils-0.8.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=app-portage/gentoopm-0.3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=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/flit_core-3.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Utitilies for maintaining Python packages
-EAPI=8
-HOMEPAGE=https://github.com/projg2/gpyutils/ https://pypi.org/project/gpyutils/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=app-portage/gentoopm-0.3.2[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 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/projg2/gpyutils/archive/v0.8.2.tar.gz -> gpyutils-0.8.2.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	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_=ddf8f53d82423ec3ff021ecf99482b51
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.8.3-r1 b/metadata/md5-cache/app-portage/gpyutils-0.8.3-r1
deleted file mode 100644
index 217c52eb1cf9..000000000000
--- a/metadata/md5-cache/app-portage/gpyutils-0.8.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=app-portage/gentoopm-0.3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=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/flit_core-3.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Utitilies for maintaining Python packages
-EAPI=8
-HOMEPAGE=https://github.com/projg2/gpyutils/ https://pypi.org/project/gpyutils/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=app-portage/gentoopm-0.3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[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 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/projg2/gpyutils/archive/v0.8.3.tar.gz -> gpyutils-0.8.3.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	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_=2a196d5d21667f31c501285dd8557541
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.8.4 b/metadata/md5-cache/app-portage/gpyutils-0.8.4
index 7e0e1389fa22..211669f5456e 100644
--- a/metadata/md5-cache/app-portage/gpyutils-0.8.4
+++ b/metadata/md5-cache/app-portage/gpyutils-0.8.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/projg2/gpyutils/ https://pypi.org/project/gpyutils/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=app-portage/gentoopm-0.3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[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 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/projg2/gpyutils/archive/v0.8.4.tar.gz -> gpyutils-0.8.4.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	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_=2a196d5d21667f31c501285dd8557541
+_md5_=ac6227a8c42818b569fb1aedb6ca8421
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-34 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-34
deleted file mode 100644
index dfbb105f02bf..000000000000
--- a/metadata/md5-cache/app-portage/mgorny-dev-scripts-34
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Handy scripts for ebuild development and more
-EAPI=8
-HOMEPAGE=https://github.com/projg2/mgorny-dev-scripts/
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos
-LICENSE=BSD-2
-RDEPEND=app-portage/gentoolkit app-portage/portage-utils dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils !dev-util/pkgdiff
-SLOT=0
-SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v34.tar.gz -> mgorny-dev-scripts-34.tar.gz
-_md5_=9563b43b92eaffad2e0c1dd873627c00
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-35 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-35
deleted file mode 100644
index 2278e683eb9d..000000000000
--- a/metadata/md5-cache/app-portage/mgorny-dev-scripts-35
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Handy scripts for ebuild development and more
-EAPI=8
-HOMEPAGE=https://github.com/projg2/mgorny-dev-scripts/
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
-LICENSE=BSD-2
-RDEPEND=app-portage/gentoolkit app-portage/portage-utils dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils !dev-util/pkgdiff
-SLOT=0
-SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v35.tar.gz -> mgorny-dev-scripts-35.tar.gz
-_md5_=72b7ec5a83d2547d1cb405290b5e1201
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-36 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-36
deleted file mode 100644
index 67d03ef294ab..000000000000
--- a/metadata/md5-cache/app-portage/mgorny-dev-scripts-36
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Handy scripts for ebuild development and more
-EAPI=8
-HOMEPAGE=https://github.com/projg2/mgorny-dev-scripts/
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
-LICENSE=BSD-2
-RDEPEND=app-portage/gentoolkit app-portage/portage-utils dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils !dev-util/pkgdiff
-SLOT=0
-SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v36.tar.gz -> mgorny-dev-scripts-36.tar.gz
-_md5_=72b7ec5a83d2547d1cb405290b5e1201
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-37 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-37
index 81a455117efd..5b92999cbf79 100644
--- a/metadata/md5-cache/app-portage/mgorny-dev-scripts-37
+++ b/metadata/md5-cache/app-portage/mgorny-dev-scripts-37
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Handy scripts for ebuild development and more
 EAPI=8
 HOMEPAGE=https://github.com/projg2/mgorny-dev-scripts/
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=app-portage/gentoolkit app-portage/portage-utils dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils
 SLOT=0
 SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v37.tar.gz -> mgorny-dev-scripts-37.tar.gz
-_md5_=b629f9355f58e115c31af9795edbaf43
+_md5_=3146ad09b52963c0bb37be739f9f24fc
diff --git a/metadata/md5-cache/app-portage/pycargoebuild-0.6.1 b/metadata/md5-cache/app-portage/pycargoebuild-0.6.1
deleted file mode 100644
index 9f0940efbc98..000000000000
--- a/metadata/md5-cache/app-portage/pycargoebuild-0.6.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) 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_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A generator for Rust/Cargo ebuilds written in Python
-EAPI=8
-HOMEPAGE=https://github.com/projg2/pycargoebuild/ https://pypi.org/project/pycargoebuild/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) 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_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/projg2/pycargoebuild/archive/v0.6.1.tar.gz -> pycargoebuild-0.6.1.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	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_=b56cf99b5d29085901e60a8444abcfd2
diff --git a/metadata/md5-cache/app-portage/pycargoebuild-0.6.2 b/metadata/md5-cache/app-portage/pycargoebuild-0.6.2
deleted file mode 100644
index e55eb6c47b0c..000000000000
--- a/metadata/md5-cache/app-portage/pycargoebuild-0.6.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) 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_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A generator for Rust/Cargo ebuilds written in Python
-EAPI=8
-HOMEPAGE=https://github.com/projg2/pycargoebuild/ https://pypi.org/project/pycargoebuild/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) 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_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/projg2/pycargoebuild/archive/v0.6.2.tar.gz -> pycargoebuild-0.6.2.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	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_=f4688bdc0fdc7705fe7400184ef2deba
diff --git a/metadata/md5-cache/app-portage/pycargoebuild-0.6.3 b/metadata/md5-cache/app-portage/pycargoebuild-0.6.3
index 49408a8e5260..a14cac5aa60b 100644
--- a/metadata/md5-cache/app-portage/pycargoebuild-0.6.3
+++ b/metadata/md5-cache/app-portage/pycargoebuild-0.6.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/projg2/pycargoebuild/ https://pypi.org/project/pycargoebuild/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
 LICENSE=MIT
 RDEPEND=dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) 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_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/projg2/pycargoebuild/archive/v0.6.3.tar.gz -> pycargoebuild-0.6.3.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	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_=252076b00b67bfdf4613ee34b7e7f2ce
+_md5_=b68a03c1eca393a9666f5bc171f2fad7
diff --git a/metadata/md5-cache/app-portage/smart-live-rebuild-1.4.0 b/metadata/md5-cache/app-portage/smart-live-rebuild-1.4.0
deleted file mode 100644
index 10f13db11cef..000000000000
--- a/metadata/md5-cache/app-portage/smart-live-rebuild-1.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=app-portage/gentoopm-0.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) 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_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Check live packages for updates and emerge them as necessary
-EAPI=8
-HOMEPAGE=https://github.com/projg2/smart-live-rebuild/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 hppa ~mips ~ppc64 ~sparc x86 ~x64-macos
-LICENSE=BSD-2
-RDEPEND=>=app-portage/gentoopm-0.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) 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_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/projg2/smart-live-rebuild/archive/v1.4.0.tar.gz -> smart-live-rebuild-1.4.0.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	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_=895faf79a40b59542cfc74221b212a9f
diff --git a/metadata/md5-cache/app-portage/smart-live-rebuild-1.4.1 b/metadata/md5-cache/app-portage/smart-live-rebuild-1.4.1
index 3f10c16d98e5..d663a8e6d0e0 100644
--- a/metadata/md5-cache/app-portage/smart-live-rebuild-1.4.1
+++ b/metadata/md5-cache/app-portage/smart-live-rebuild-1.4.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/projg2/smart-live-rebuild/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 hppa ~mips ~ppc64 ~riscv ~sparc x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=>=app-portage/gentoopm-0.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) 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_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/projg2/smart-live-rebuild/archive/v1.4.1.tar.gz -> smart-live-rebuild-1.4.1.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	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_=916c3a3695f9dac096fcf8ffb9c12c6b
+_md5_=c8795f24798576f9768ccd29570f155c
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 871ec27b2aac..ec10772e94cf 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r3 b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r3
index 9509bf77333e..a1d8e3655601 100644
--- a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r3
+++ b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r3
@@ -6,9 +6,9 @@ INHERIT=ruby-single
 IUSE=ruby
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=>=app-text/build-docbook-catalog-1.1 ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 ) virtual/rubygems )
+RDEPEND=>=app-text/build-docbook-catalog-1.1 ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook/docbook-xsl-1.79.1.tar.bz2
-_eclasses_=ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30
+_eclasses_=ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30
 _md5_=9bbf6a5b7752bd87620940121aeb256a
diff --git a/metadata/md5-cache/app-text/xmlformat-1.04 b/metadata/md5-cache/app-text/xmlformat-1.04
index 0bd24577f8d5..24014a1834ee 100644
--- a/metadata/md5-cache/app-text/xmlformat-1.04
+++ b/metadata/md5-cache/app-text/xmlformat-1.04
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install test
-DEPEND=dev-lang/perl ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 dev-lang/ruby:3.2 ) virtual/rubygems )
+DEPEND=dev-lang/perl ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ( dev-lang/ruby:3.2 virtual/rubygems[ruby_targets_ruby32(-)] ) ) )
 DESCRIPTION=Reformat XML documents to your custom style
 EAPI=7
 HOMEPAGE=http://www.kitebird.com/software/xmlformat/
@@ -7,8 +7,8 @@ INHERIT=edo ruby-single
 IUSE=doc ruby
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=xmlformat
-RDEPEND=dev-lang/perl ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 dev-lang/ruby:3.2 ) virtual/rubygems )
+RDEPEND=dev-lang/perl ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ( dev-lang/ruby:3.2 virtual/rubygems[ruby_targets_ruby32(-)] ) ) )
 SLOT=0
 SRC_URI=http://www.kitebird.com/software/xmlformat/xmlformat-1.04.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30
 _md5_=c1b33ddf7887434b398b2a84cbd8e1fd
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 9ae5e1424e64..77449109c2b3 100644
--- a/metadata/md5-cache/app-vim/Manifest.gz
+++ b/metadata/md5-cache/app-vim/Manifest.gz
diff --git a/metadata/md5-cache/app-vim/exheres-syntax-20090310 b/metadata/md5-cache/app-vim/exheres-syntax-20201115
index 37cc83d42f28..01e375069a8b 100644
--- a/metadata/md5-cache/app-vim/exheres-syntax-20090310
+++ b/metadata/md5-cache/app-vim/exheres-syntax-20201115
@@ -1,13 +1,13 @@
-DEFINED_PHASES=install postinst postrm
+DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: exheres format highlighting
-EAPI=6
+EAPI=8
 HOMEPAGE=https://www.exherbo.org/
 INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-SRC_URI=https://dev.exherbo.org/~ahf/pub/software/releases/exheres-syntax/exheres-syntax-20090310.tar.bz2
+SRC_URI=https://dev.exherbo.org/distfiles/exheres-syntax/exheres-syntax-20201115.tar.xz
 _eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=f77857d5b56964ead1fd59063f6eb9ab
+_md5_=1194dfa9b88db294e170795691716048
diff --git a/metadata/md5-cache/app-vim/exheres-syntax-99999999 b/metadata/md5-cache/app-vim/exheres-syntax-99999999
index afda28e31c34..309e1a1553f1 100644
--- a/metadata/md5-cache/app-vim/exheres-syntax-99999999
+++ b/metadata/md5-cache/app-vim/exheres-syntax-99999999
@@ -1,7 +1,8 @@
-DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: exheres format highlighting
-EAPI=6
+EAPI=8
 HOMEPAGE=https://www.exherbo.org/
 INHERIT=vim-plugin git-r3
 LICENSE=vim
@@ -9,4 +10,4 @@ PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 _eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=df0558ee58c9818e05a5ab52fb62b57a
+_md5_=c3d22bdaa85f57ef432f469a2f1ae9ce
diff --git a/metadata/md5-cache/app-vim/fugitive-3.7 b/metadata/md5-cache/app-vim/fugitive-3.7
new file mode 100644
index 000000000000..cbc86d412d6c
--- /dev/null
+++ b/metadata/md5-cache/app-vim/fugitive-3.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: a git wrapper for vim
+EAPI=8
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos
+LICENSE=vim
+RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/tpope/vim-fugitive/archive/v3.7.tar.gz -> fugitive-3.7.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=99af4e0f0bdd7d2b86f1e1768e15d64d
diff --git a/metadata/md5-cache/app-vim/fugitive-9999 b/metadata/md5-cache/app-vim/fugitive-9999
index e5a0e7f691b0..378be139da3b 100644
--- a/metadata/md5-cache/app-vim/fugitive-9999
+++ b/metadata/md5-cache/app-vim/fugitive-9999
@@ -1,8 +1,8 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=install postinst postrm unpack
+DEFINED_PHASES=install postinst postrm prepare unpack
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a git wrapper for vim
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/
 INHERIT=vim-plugin git-r3
 LICENSE=vim
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 _eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=0ae2ff45231ee7de6c97530b2224df66
+_md5_=99af4e0f0bdd7d2b86f1e1768e15d64d
diff --git a/metadata/md5-cache/app-vim/vim-flake8-1.7 b/metadata/md5-cache/app-vim/vim-flake8-1.7
new file mode 100644
index 000000000000..018a60dc4a64
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vim-flake8-1.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: runs the currently open file through flake8
+EAPI=8
+HOMEPAGE=https://github.com/nvie/vim-flake8
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/flake8 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/nvie/vim-flake8/archive/1.7.tar.gz -> vim-flake8-1.7.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
+_md5_=bb41cc41f2e1fe1a123048bfdd028d01
diff --git a/metadata/md5-cache/app-vim/vimclojure-2.3.6-r4 b/metadata/md5-cache/app-vim/vimclojure-2.3.6-r4
index 70a54e5f9370..db0aca5e5203 100644
--- a/metadata/md5-cache/app-vim/vimclojure-2.3.6-r4
+++ b/metadata/md5-cache/app-vim/vimclojure-2.3.6-r4
@@ -4,10 +4,10 @@ DESCRIPTION=vim plugin: Clojure syntax highlighting, filetype and indent setting
 EAPI=8
 HOMEPAGE=https://github.com/vim-scripts/VimClojure
 INHERIT=vim-plugin
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-lang/clojure || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/VimClojure/archive/2.3.6.tar.gz -> vimclojure-2.3.6.tar.gz
 _eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	92ea4186891b666b0970fa1d713d64fa
-_md5_=fd785b9b6f8bbea09af041840eb43683
+_md5_=64938558f56cf06b399f06885d5c9de8
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 87bad1e6bfaf..1db513bf7dd2 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/irrlicht-mt-1.9.0.10 b/metadata/md5-cache/dev-games/irrlicht-mt-1.9.0.10
new file mode 100644
index 000000000000..ea07fd56d8ac
--- /dev/null
+++ b/metadata/md5-cache/dev-games/irrlicht-mt-1.9.0.10
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-games/irrlicht-mt-headers-1.9.0.10 media-libs/libpng:0= sys-libs/zlib media-libs/libjpeg-turbo virtual/opengl x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm x11-base/xorg-proto
+DESCRIPTION=Minetest's fork of dev-games/irrlicht
+EAPI=8
+HOMEPAGE=https://github.com/minetest/irrlicht
+INHERIT=cmake
+KEYWORDS=~amd64 ~riscv
+LICENSE=ZLIB
+RDEPEND=~dev-games/irrlicht-mt-headers-1.9.0.10 media-libs/libpng:0= sys-libs/zlib media-libs/libjpeg-turbo virtual/opengl x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm
+SLOT=0
+SRC_URI=https://github.com/minetest/irrlicht/archive/refs/tags/1.9.0mt10.tar.gz -> irrlicht-mt-1.9.0.10.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=977028e8705aed938fd8736caf6d46ac
diff --git a/metadata/md5-cache/dev-games/irrlicht-mt-headers-1.9.0.10 b/metadata/md5-cache/dev-games/irrlicht-mt-headers-1.9.0.10
new file mode 100644
index 000000000000..20ddd3cce387
--- /dev/null
+++ b/metadata/md5-cache/dev-games/irrlicht-mt-headers-1.9.0.10
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Header files for Minetest's fork of dev-games/irrlicht
+EAPI=8
+HOMEPAGE=https://github.com/minetest/irrlicht
+KEYWORDS=~amd64 ~riscv
+LICENSE=ZLIB
+RDEPEND=!<dev-games/irrlicht-mt-1.9.0.4-r1
+SLOT=0
+SRC_URI=https://github.com/minetest/irrlicht/archive/refs/tags/1.9.0mt10.tar.gz -> irrlicht-mt-1.9.0.10.tar.gz
+_md5_=43e4f28946fae694688354a8edb0e239
diff --git a/metadata/md5-cache/dev-libs/FBGEMM-2023.02.10 b/metadata/md5-cache/dev-libs/FBGEMM-2023.02.10
index be33e1cde065..3a2987491732 100644
--- a/metadata/md5-cache/dev-libs/FBGEMM-2023.02.10
+++ b/metadata/md5-cache/dev-libs/FBGEMM-2023.02.10
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytorch/FBGEMM/archive/03b2046676707da64504e898490ab46104d4682a.tar.gz -> FBGEMM-2023.02.10.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4916556f352aaeca19318de566adb6ff
+_md5_=882985fe3cc94f39db993a5adb87fe36
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 91be68417331..448bb79211af 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/clhpp-2.0.19 b/metadata/md5-cache/dev-libs/clhpp-2.0.19
deleted file mode 100644
index a7b5a71b6b37..000000000000
--- a/metadata/md5-cache/dev-libs/clhpp-2.0.19
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/opencl >=dev-util/opencl-headers-2022.09.30
-DESCRIPTION=Khronos OpenCL C++ bindings
-EAPI=8
-HOMEPAGE=https://github.com/KhronosGroup/OpenCL-CLHPP/
-INHERIT=cmake ruby-ng
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30
-KEYWORDS=amd64 x86
-LICENSE=Khronos-CLHPP
-RDEPEND=virtual/opencl
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/OpenCL-CLHPP/archive/refs/tags/v2022.09.30.tar.gz -> clhpp-2.0.19.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e9143d462689b3539bb320e2f4accb85
diff --git a/metadata/md5-cache/dev-libs/librelp-1.11.0 b/metadata/md5-cache/dev-libs/librelp-1.11.0
index 9419eb505fc4..8af9067b8c31 100644
--- a/metadata/md5-cache/dev-libs/librelp-1.11.0
+++ b/metadata/md5-cache/dev-libs/librelp-1.11.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.rsyslog.com/librelp/
 INHERIT=autotools python-any-r1
 IUSE=debug doc +ssl +gnutls openssl static-libs test
-KEYWORDS=~amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv sparc x86
 LICENSE=GPL-3+ doc? ( FDL-1.3 )
 RDEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:= ) openssl? ( dev-libs/openssl:= ) )
 REQUIRED_USE=ssl? ( ^^ ( gnutls openssl ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.5.1
 SRC_URI=https://download.rsyslog.com/librelp/librelp-1.11.0.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3818843123ea187513ccdc0d42b020a9
+_md5_=0f53c14099ddd2625b37716858f18729
diff --git a/metadata/md5-cache/dev-libs/libutf8proc-2.7.0 b/metadata/md5-cache/dev-libs/libutf8proc-2.7.0
index 59bad54ac21b..a3916d258043 100644
--- a/metadata/md5-cache/dev-libs/libutf8proc-2.7.0
+++ b/metadata/md5-cache/dev-libs/libutf8proc-2.7.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( =app-i18n/unicode-data-14.0* || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems )
+BDEPEND=test? ( =app-i18n/unicode-data-14.0* || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) )
 DEFINED_PHASES=compile install prepare test
 DESCRIPTION=A clean C Library for processing UTF-8 Unicode data
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/2.7.0
 SRC_URI=https://github.com/JuliaStrings/utf8proc/archive/v2.7.0.tar.gz -> libutf8proc-2.7.0.tar.gz cjk? ( https://dev.gentoo.org/~hattya/distfiles/libutf8proc-EastAsianWidth-14.0.0.xz )
-_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=25934c92abd3fbed1ed5a0a8ea71a5fc
diff --git a/metadata/md5-cache/dev-libs/libutf8proc-2.8.0 b/metadata/md5-cache/dev-libs/libutf8proc-2.8.0
index 595a8b280d18..5556e73c3d07 100644
--- a/metadata/md5-cache/dev-libs/libutf8proc-2.8.0
+++ b/metadata/md5-cache/dev-libs/libutf8proc-2.8.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( =app-i18n/unicode-data-15.0* || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems )
+BDEPEND=test? ( =app-i18n/unicode-data-15.0* || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) )
 DEFINED_PHASES=compile install prepare test
 DESCRIPTION=A clean C Library for processing UTF-8 Unicode data
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/2.8.0
 SRC_URI=https://github.com/JuliaStrings/utf8proc/archive/v2.8.0.tar.gz -> libutf8proc-2.8.0.tar.gz cjk? ( https://dev.gentoo.org/~hattya/distfiles/libutf8proc-EastAsianWidth-15.0.0.xz )
-_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=39726db43c8dd4796db3ee5c72c61c65
diff --git a/metadata/md5-cache/dev-libs/libvterm-0.3.1 b/metadata/md5-cache/dev-libs/libvterm-0.3.1
new file mode 100644
index 000000000000..87f66910254c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libvterm-0.3.1
@@ -0,0 +1,10 @@
+BDEPEND=dev-lang/perl sys-devel/libtool
+DEFINED_PHASES=compile install
+DESCRIPTION=An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator
+EAPI=8
+HOMEPAGE=https://www.leonerd.org.uk/code/libvterm/
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://www.leonerd.org.uk/code/libvterm/libvterm-0.3.1.tar.gz
+_md5_=16bfd821987c93a5b2492920f34c7739
diff --git a/metadata/md5-cache/dev-libs/opencl-icd-loader-2022.09.30 b/metadata/md5-cache/dev-libs/opencl-icd-loader-2022.09.30
deleted file mode 100644
index c2e12685bdd3..000000000000
--- a/metadata/md5-cache/dev-libs/opencl-icd-loader-2022.09.30
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!dev-libs/ocl-icd >=dev-util/opencl-headers-2022.09.30
-DESCRIPTION=Official Khronos OpenCL ICD Loader
-EAPI=8
-HOMEPAGE=https://github.com/KhronosGroup/OpenCL-ICD-Loader
-INHERIT=cmake-multilib
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=!dev-libs/ocl-icd
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/v2022.09.30.tar.gz -> opencl-icd-loader-2022.09.30.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=554b0f0f14fb1dcfbcc02cad472fa427
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index e616a64dc599..0ecd05402d64 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/calver-2022.06.26 b/metadata/md5-cache/dev-python/calver-2022.06.26
index c1e8aa130bb7..ee2510388f06 100644
--- a/metadata/md5-cache/dev-python/calver-2022.06.26
+++ b/metadata/md5-cache/dev-python/calver-2022.06.26
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/di/calver/ https://pypi.org/project/calver/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) 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_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/di/calver/archive/2022.06.26.tar.gz -> calver-2022.06.26.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	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_=f6570fc3aa4de6637855e0deb867aee3
+_md5_=f82d7234107cdb24c7ea290e7036cc6f
diff --git a/metadata/md5-cache/dev-python/hatchling-1.14.0 b/metadata/md5-cache/dev-python/hatchling-1.14.0
index 81bf51a7d3c2..d3671490d616 100644
--- a/metadata/md5-cache/dev-python/hatchling-1.14.0
+++ b/metadata/md5-cache/dev-python/hatchling-1.14.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/hatchling/ https://github.com/pypa/hatch/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/editables-0.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.10.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/trove-classifiers[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) 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_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/hatch/archive/hatchling-v1.14.0.tar.gz -> hatch-hatchling-v1.14.0.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	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_=453725a2d366a4369a8d5ca7b82106f2
+_md5_=94faf1c181977120fa206811f4f51429
diff --git a/metadata/md5-cache/dev-python/trove-classifiers-2023.3.9 b/metadata/md5-cache/dev-python/trove-classifiers-2023.3.9
index f4500102b656..60fc4376d689 100644
--- a/metadata/md5-cache/dev-python/trove-classifiers-2023.3.9
+++ b/metadata/md5-cache/dev-python/trove-classifiers-2023.3.9
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pypa/trove-classifiers/ https://pypi.org/project/trove-classifiers/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) 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_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/t/trove-classifiers/trove-classifiers-2023.3.9.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=acdcc1a0c0e874eeae625db6f690c392
+_md5_=b641e485cd55fe06d6396e0356db70cb
diff --git a/metadata/md5-cache/dev-python/ytmusicapi-0.25.1 b/metadata/md5-cache/dev-python/ytmusicapi-1.0.0
index bfe95cb0c847..420391c6fbd4 100644
--- a/metadata/md5-cache/dev-python/ytmusicapi-0.25.1
+++ b/metadata/md5-cache/dev-python/ytmusicapi-1.0.0
@@ -10,6 +10,6 @@ LICENSE=MIT
 RDEPEND=dev-python/requests[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 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/y/ytmusicapi/ytmusicapi-0.25.1.tar.gz
+SRC_URI=https://files.pythonhosted.org/packages/source/y/ytmusicapi/ytmusicapi-1.0.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=eb5bee540e093608539e8e256631930a
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 76db2d902414..da30a0d48537 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/ffi-1.15.5-r1 b/metadata/md5-cache/dev-ruby/ffi-1.15.5-r1
index f6880d74c92b..5876a585a0fc 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.15.5-r1
+++ b/metadata/md5-cache/dev-ruby/ffi-1.15.5-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/v1.15.5.tar.gz -> ffi-git-1.15.5.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=aed141864c2052b2ab5e174a12f34a5f
+_md5_=ffd9008bc511d438aaf8cb060a84258b
diff --git a/metadata/md5-cache/dev-ruby/http-5.1.0 b/metadata/md5-cache/dev-ruby/http-5.1.0
index 5f47ce93223c..020b9a63772b 100644
--- a/metadata/md5-cache/dev-ruby/http-5.1.0
+++ b/metadata/md5-cache/dev-ruby/http-5.1.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( =dev-ruby/addressable-2*[ruby_targets_ruby27(-)] >=dev-ruby/addressable-2.8[ruby_targets_ruby27(-)] =dev-ruby/http-cookie-1*[ruby_targets_ruby27(-)] >=dev-ruby/http-form_data-2.2:2[ruby_targets_ruby27(-)] >=dev-ruby/llhttp-ffi-0.4.0:0/0.4[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/addressable-2*[ruby_targets_ruby30(-)] >=dev-ruby/addressable-2.8[ruby_targets_ruby30(-)] =dev-ruby/http-cookie-1*[ruby_targets_ruby30(-)] >=dev-ruby/http-form_data-2.2:2[ruby_targets_ruby30(-)] >=dev-ruby/llhttp-ffi-0.4.0:0/0.4[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( =dev-ruby/addressable-2*[ruby_targets_ruby31(-)] >=dev-ruby/addressable-2.8[ruby_targets_ruby31(-)] =dev-ruby/http-cookie-1*[ruby_targets_ruby31(-)] >=dev-ruby/http-form_data-2.2:2[ruby_targets_ruby31(-)] >=dev-ruby/llhttp-ffi-0.4.0:0/0.4[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( =dev-ruby/certificate_authority-1*[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( =dev-ruby/certificate_authority-1*[ruby_targets_ruby30(-)] dev-ruby/rspec-its[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( =dev-ruby/certificate_authority-1*[ruby_targets_ruby31(-)] dev-ruby/rspec-its[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( =dev-ruby/addressable-2*[ruby_targets_ruby27(-)] >=dev-ruby/addressable-2.8[ruby_targets_ruby27(-)] =dev-ruby/http-cookie-1*[ruby_targets_ruby27(-)] >=dev-ruby/http-form_data-2.2:2[ruby_targets_ruby27(-)] >=dev-ruby/llhttp-ffi-0.4.0:0/0.4[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/addressable-2*[ruby_targets_ruby30(-)] >=dev-ruby/addressable-2.8[ruby_targets_ruby30(-)] =dev-ruby/http-cookie-1*[ruby_targets_ruby30(-)] >=dev-ruby/http-form_data-2.2:2[ruby_targets_ruby30(-)] >=dev-ruby/llhttp-ffi-0.4.0:0/0.4[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( =dev-ruby/addressable-2*[ruby_targets_ruby31(-)] >=dev-ruby/addressable-2.8[ruby_targets_ruby31(-)] =dev-ruby/http-cookie-1*[ruby_targets_ruby31(-)] >=dev-ruby/http-form_data-2.2:2[ruby_targets_ruby31(-)] >=dev-ruby/llhttp-ffi-0.4.0:0/0.4[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( =dev-ruby/certificate_authority-1*[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] dev-ruby/webrick[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( =dev-ruby/certificate_authority-1*[ruby_targets_ruby30(-)] dev-ruby/rspec-its[ruby_targets_ruby30(-)] dev-ruby/webrick[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( =dev-ruby/certificate_authority-1*[ruby_targets_ruby31(-)] dev-ruby/rspec-its[ruby_targets_ruby31(-)] dev-ruby/webrick[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=An easy-to-use client library for making requests from Ruby
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/http-5.1.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=db9d97db6b49a3cdc1f4c31f13f41b2f
+_md5_=11338c35d356838465cf46859ee7ebb9
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 78d3e8804c72..d064f1372e09 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.27.1 b/metadata/md5-cache/dev-util/gitlab-cli-1.27.1
new file mode 100644
index 000000000000..131e3142c184
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gitlab-cli-1.27.1
@@ -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.27.1/gitlab-cli-v1.27.1.tar.bz2 -> gitlab-cli-1.27.1.tar.bz2 https://dev.gentoo.org/~williamh/dist/gitlab-cli-1.27.1-deps.tar.xz
+_eclasses_=go-module	f9700c7efec1fd4955363169e9930c1c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=fc301a73a20b31e55f0255b7a98dd3e4
diff --git a/metadata/md5-cache/dev-util/opencl-headers-2022.09.30 b/metadata/md5-cache/dev-util/opencl-headers-2022.09.30
deleted file mode 100644
index 0f2a2b67be5a..000000000000
--- a/metadata/md5-cache/dev-util/opencl-headers-2022.09.30
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Unified C language headers for the OpenCL API
-EAPI=8
-HOMEPAGE=https://github.com/KhronosGroup/OpenCL-Headers
-INHERIT=cmake
-IUSE=test
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/OpenCL-Headers/archive/refs/tags/v2022.09.30.tar.gz -> opencl-headers-2022.09.30.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3b340b3ecb11abdf2ad130e461d0b6a6
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 21c276f3d5ee..a627510a9d1e 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/pre-commit-3.2.2 b/metadata/md5-cache/dev-vcs/pre-commit-3.2.2
new file mode 100644
index 000000000000..d2d09fbd511e
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/pre-commit-3.2.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_single_target_python3_9? ( dev-python/pytest-env[python_targets_python3_9(-)] dev-python/re-assert[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pytest-env[python_targets_python3_10(-)] dev-python/re-assert[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pytest-env[python_targets_python3_11(-)] dev-python/re-assert[python_targets_python3_11(-)] ) sys-apps/coreutils[-multicall] ) test? ( dev-vcs/git python_single_target_python3_9? ( >=dev-python/cfgv-2.0.0[python_targets_python3_9(-)] >=dev-python/identify-1.0.0[python_targets_python3_9(-)] >=dev-python/nodeenv-0.11.1[python_targets_python3_9(-)] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)] >=dev-python/virtualenv-20.10.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/cfgv-2.0.0[python_targets_python3_10(-)] >=dev-python/identify-1.0.0[python_targets_python3_10(-)] >=dev-python/nodeenv-0.11.1[python_targets_python3_10(-)] >=dev-python/pyyaml-5.1[python_targets_python3_10(-)] >=dev-python/virtualenv-20.10.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/cfgv-2.0.0[python_targets_python3_11(-)] >=dev-python/identify-1.0.0[python_targets_python3_11(-)] >=dev-python/nodeenv-0.11.1[python_targets_python3_11(-)] >=dev-python/pyyaml-5.1[python_targets_python3_11(-)] >=dev-python/virtualenv-20.10.0[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.2.1[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] >=dev-python/setuptools-67.2.0[python_targets_python3_11(-)] >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=A framework for managing and maintaining multi-language Git pre-commit hooks
+EAPI=8
+HOMEPAGE=https://pre-commit.com/
+INHERIT=distutils-r1
+IUSE=test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-vcs/git python_single_target_python3_9? ( >=dev-python/cfgv-2.0.0[python_targets_python3_9(-)] >=dev-python/identify-1.0.0[python_targets_python3_9(-)] >=dev-python/nodeenv-0.11.1[python_targets_python3_9(-)] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)] >=dev-python/virtualenv-20.10.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/cfgv-2.0.0[python_targets_python3_10(-)] >=dev-python/identify-1.0.0[python_targets_python3_10(-)] >=dev-python/nodeenv-0.11.1[python_targets_python3_10(-)] >=dev-python/pyyaml-5.1[python_targets_python3_10(-)] >=dev-python/virtualenv-20.10.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/cfgv-2.0.0[python_targets_python3_11(-)] >=dev-python/identify-1.0.0[python_targets_python3_11(-)] >=dev-python/nodeenv-0.11.1[python_targets_python3_11(-)] >=dev-python/pyyaml-5.1[python_targets_python3_11(-)] >=dev-python/virtualenv-20.10.0[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pre-commit/pre-commit/archive/refs/tags/v3.2.2.tar.gz -> pre-commit-3.2.2.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=2906be26e949049ba9b4e4a701348181
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.14.2-r1 b/metadata/md5-cache/dev-vcs/subversion-1.14.2-r1
index 0315bc58e45c..89eca0b7adbb 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.14.2-r1
+++ b/metadata/md5-cache/dev-vcs/subversion-1.14.2-r1
@@ -1,6 +1,6 @@
-BDEPEND=virtual/pkgconfig !!<sys-apps/sandbox-1.6 doc? ( app-doc/doxygen ) kwallet? ( kde-frameworks/kdelibs4support:5 ) nls? ( sys-devel/gettext ) perl? ( dev-lang/swig ) ruby? ( dev-lang/swig ) test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+BDEPEND=virtual/pkgconfig !!<sys-apps/sandbox-1.6 doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) perl? ( dev-lang/swig ) ruby? ( dev-lang/swig ) test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.5:1 >=dev-libs/apr-util-1.5:1 dev-libs/expat dev-libs/libutf8proc:= >=net-libs/serf-1.3.4 sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) gnome-keyring? ( dev-libs/glib:2 app-crypt/libsecret sys-apps/dbus ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) java? ( >=virtual/jdk-1.8:* ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.5:1 >=dev-libs/apr-util-1.5:1 dev-libs/expat dev-libs/libutf8proc:= >=net-libs/serf-1.3.4 sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) gnome-keyring? ( dev-libs/glib:2 app-crypt/libsecret sys-apps/dbus ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) ) sasl? ( dev-libs/cyrus-sasl ) java? ( >=virtual/jdk-1.8:* ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Advanced version control system
 EAPI=7
 HOMEPAGE=https://subversion.apache.org/
@@ -8,9 +8,9 @@ INHERIT=autotools bash-completion-r1 db-use depend.apache flag-o-matic java-pkg-
 IUSE=apache2 berkdb debug doc extras gnome-keyring java kwallet nls perl plaintext-password-storage ruby sasl test apache2 java
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0 BSD MIT BSD-2 FSFAP unicode
-RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.5:1 >=dev-libs/apr-util-1.5:1 dev-libs/expat dev-libs/libutf8proc:= >=net-libs/serf-1.3.4 sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) gnome-keyring? ( dev-libs/glib:2 app-crypt/libsecret sys-apps/dbus ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( acct-group/apache acct-user/apache www-servers/apache[apache2_modules_dav] ) !apache2? ( acct-group/svnusers acct-user/svn ) java? ( >=virtual/jre-1.8:* ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.5:1 >=dev-libs/apr-util-1.5:1 dev-libs/expat dev-libs/libutf8proc:= >=net-libs/serf-1.3.4 sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) gnome-keyring? ( dev-libs/glib:2 app-crypt/libsecret sys-apps/dbus ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) ruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( acct-group/apache acct-user/apache www-servers/apache[apache2_modules_dav] ) !apache2? ( acct-group/svnusers acct-user/svn ) java? ( >=virtual/jre-1.8:* ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.14.2.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	depend.apache	416d1c5005c5f4594e79812fb7323f0d	eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=67c0a57c95870e63dce5c6ac37237ec6
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	depend.apache	416d1c5005c5f4594e79812fb7323f0d	eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=21dccb3fb7824416749b74eca3de5448
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 3e6aece7da2b..cc9dbe1326f0 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/xboing-2.4-r4 b/metadata/md5-cache/games-arcade/xboing-2.4-r4
index 1f7597be760b..ee7e7876b485 100644
--- a/metadata/md5-cache/games-arcade/xboing-2.4-r4
+++ b/metadata/md5-cache/games-arcade/xboing-2.4-r4
@@ -11,4 +11,4 @@ RDEPEND=acct-group/gamestat x11-libs/libX11 x11-libs/libXpm
 SLOT=0
 SRC_URI=http://www.techrescue.org/xboing/xboing2.4.tar.gz mirror://gentoo/xboing-2.4-debian.patch.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=342679b13b1873f52173c8b4737597db
+_md5_=6a4ce5f474b9e5115d341ba254f4895b
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 070629373bde..6b6da1cc53ad 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-22.08.3 b/metadata/md5-cache/kde-apps/kross-interpreters-22.08.3
index c25a996cbf9b..45b3e428be2c 100644
--- a/metadata/md5-cache/kde-apps/kross-interpreters-22.08.3
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-22.08.3
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.96.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-frameworks/kross-5.96.0:5 || ( dev-lang/ruby:2.7 ) virtual/rubygems dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-frameworks/kross-5.96.0:5 || ( ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ) dev-qt/qtcore:5
 DESCRIPTION=Kross interpreter plugins for programming languages
 EAPI=8
 HOMEPAGE=https://apps.kde.org/
@@ -9,8 +9,8 @@ INHERIT=ecm gear.kde.org ruby-single
 IUSE=debug
 KEYWORDS=amd64 arm64 ~riscv x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-frameworks/kross-5.96.0:5 || ( dev-lang/ruby:2.7 ) virtual/rubygems || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-frameworks/kross-5.96.0:5 || ( ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/22.08.3/src/kross-interpreters-22.08.3.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	ecm	15862358f80ef4da6fd9d7dde64e9148	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gear.kde.org	46a3a684cf1499799618bf7194102e69	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	ecm	15862358f80ef4da6fd9d7dde64e9148	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gear.kde.org	46a3a684cf1499799618bf7194102e69	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5337fb46ca17eb9a884b95bcbc93a1b8
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-22.12.3 b/metadata/md5-cache/kde-apps/kross-interpreters-22.12.3
index 205079119a35..eb68b1f19a64 100644
--- a/metadata/md5-cache/kde-apps/kross-interpreters-22.12.3
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-22.12.3
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.101.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-frameworks/kross-5.101.0:5 || ( dev-lang/ruby:2.7 ) virtual/rubygems dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-frameworks/kross-5.101.0:5 || ( ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ) dev-qt/qtcore:5
 DESCRIPTION=Kross interpreter plugins for programming languages
 EAPI=8
 HOMEPAGE=https://apps.kde.org/
@@ -9,8 +9,8 @@ INHERIT=ecm gear.kde.org ruby-single
 IUSE=debug
 KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-frameworks/kross-5.101.0:5 || ( dev-lang/ruby:2.7 ) virtual/rubygems || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-frameworks/kross-5.101.0:5 || ( ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/22.12.3/src/kross-interpreters-22.12.3.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	ecm	15862358f80ef4da6fd9d7dde64e9148	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gear.kde.org	46a3a684cf1499799618bf7194102e69	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	ecm	15862358f80ef4da6fd9d7dde64e9148	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gear.kde.org	46a3a684cf1499799618bf7194102e69	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a09877ad8f37994b278efdb67a9cb221
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 614c5abff30d..afac2848f1a7 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/encodings-1.0.7 b/metadata/md5-cache/media-fonts/encodings-1.0.7
index f88ffd26de5d..c69d27ebec95 100644
--- a/metadata/md5-cache/media-fonts/encodings-1.0.7
+++ b/metadata/md5-cache/media-fonts/encodings-1.0.7
@@ -4,9 +4,9 @@ DESCRIPTION=X.Org font encodings
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/encodings
 INHERIT=font xorg-3
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/encodings-1.0.7.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=b3aee8b9e4ac7ec419653debfb09b7e9
+_md5_=c89417729e162d4baf5b2ac92b9c792a
diff --git a/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.4
index 97687d67ff78..7f57e03ffcf6 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/adobe-100dpi
 INHERIT=xorg-3
 IUSE=nls X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-100dpi-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=987b79ea9a03d8ec65f611a3a65b406c
+_md5_=f58f63853a9afbc2b78f7db4f29987be
diff --git a/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.4
index 9bd487e7f0ee..e27e9a541097 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/adobe-75dpi
 INHERIT=xorg-3
 IUSE=nls X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-75dpi-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=cae872fe3ac9419f4f8cca1963618395
+_md5_=7a7f0caba895839eed1b01c965ed3a7a
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.5 b/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.5
index 4fea7f8558d9..a36122e9284c 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.5
+++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/adobe-utopia-100dpi
 INHERIT=xorg-3
 IUSE=nls X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-utopia-100dpi-1.0.5.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=f27782b623cb51eec7e9a790d0c4ac32
+_md5_=5379fe25b3028b30d9b7ad9743242131
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.5 b/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.5
index 357c92823312..ffcee9277630 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.5
+++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/adobe-utopia-75dpi
 INHERIT=xorg-3
 IUSE=nls X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-utopia-75dpi-1.0.5.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=73d6b07b2ac4aec7a770b700b9678328
+_md5_=0753094722a8794c0f856164fdcb51d5
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.5 b/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.5
index e617798c1646..b0298588cc52 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.5
+++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/adobe-utopia-type1
 INHERIT=xorg-3
 IUSE=X
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-utopia-type1-1.0.5.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=c338267b0da44df3084d5eaf004b4cfe
+_md5_=109e9fd2ae66563f18b157feb69e94da
diff --git a/metadata/md5-cache/media-fonts/font-alias-1.0.5 b/metadata/md5-cache/media-fonts/font-alias-1.0.5
index 2791f43cfdc3..572d72ff172e 100644
--- a/metadata/md5-cache/media-fonts/font-alias-1.0.5
+++ b/metadata/md5-cache/media-fonts/font-alias-1.0.5
@@ -4,9 +4,9 @@ DESCRIPTION=X.Org font aliases
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/alias
 INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-alias-1.0.5.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=fb5ece14767449e6300312c998c36bc6
+_md5_=7ace4c0a185db0b43e9ab5a8faf2e08c
diff --git a/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.4
index 9e446d8a1d9b..a3706ebfff6e 100644
--- a/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/arabic-misc
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-arabic-misc-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=2286dc4bb8a158c5985d7416144a4fec
+_md5_=2ff5d0a6c9dff783849d9f21f51f9672
diff --git a/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.4
index 82d131ce44fe..d95b10cc223b 100644
--- a/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bh-100dpi
 INHERIT=xorg-3
 IUSE=nls X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=public-domain
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-100dpi-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=1e9d1cf9743e1c4a369cb95feb5c5761
+_md5_=b33ce09871ea2e32f54227deabb32404
diff --git a/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.4
index 68ab71015289..9ed552c27780 100644
--- a/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bh-75dpi
 INHERIT=xorg-3
 IUSE=nls X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=public-domain
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-75dpi-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=624d3aef41ea832c5a1446cbf8569d75
+_md5_=83cdc330f09a18995d0c4cc271ec4be1
diff --git a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.4
index 4ed1be01d295..4be4f73c928d 100644
--- a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bh-lucidatypewriter-100dpi
 INHERIT=xorg-3
 IUSE=nls X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=public-domain
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=442631c4d3473e90846c5104f6dc8001
+_md5_=8085537756214d30c28a950be757e2a2
diff --git a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.4
index 14eddd7c7636..8fe06608d5bd 100644
--- a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bh-lucidatypewriter-75dpi
 INHERIT=xorg-3
 IUSE=nls X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=public-domain
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=03440656af0a54e8b202c8c779d1c763
+_md5_=c608cb87ab1d424cc5fc6ef5d6416f4c
diff --git a/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.4 b/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.4
index 2bf8fafdda2c..a16ff674bbf7 100644
--- a/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bh-ttf
 INHERIT=xorg-3
 IUSE=X
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=bh-luxi
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-ttf-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=df7c51089652a4caf1723280adbe9590
+_md5_=b44522daaf9705d24db8231c964b2594
diff --git a/metadata/md5-cache/media-fonts/font-bh-type1-1.0.4 b/metadata/md5-cache/media-fonts/font-bh-type1-1.0.4
index a67499cbdd64..f9d3dc719b3d 100644
--- a/metadata/md5-cache/media-fonts/font-bh-type1-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-bh-type1-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bh-type1
 INHERIT=xorg-3
 IUSE=X
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=bh-luxi
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-type1-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=10cdfdf4037f69b24c8298d28c16e111
+_md5_=82b5b1073f9988a7de8da402bf535d89
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.4
index 9434a43de3f5..23113ed01269 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bitstream-100dpi
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-100dpi-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=61a3781d6777dd36bc1b9920be760431
+_md5_=7ea3ea7d17ccaa9da876cd6ab411a35a
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.4
index e890de617e3b..e004cf414934 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bitstream-75dpi
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-75dpi-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=e5ce64710af8ccf9e9059bd0db60cf8c
+_md5_=24b34d2a5f32da29d4f7256f36fad98d
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.4 b/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.4
index bcee054e98a4..001047f33843 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bitstream-type1
 INHERIT=xorg-3
 IUSE=X
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-type1-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=c8526a3289360a3793c4bf5af80dc4cb
+_md5_=6ee4e0d2b15fb3829fdc8a0f1587a3fa
diff --git a/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.4 b/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.4
index 2d48f3ef17ae..3b9a7e60cfc5 100644
--- a/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/cronyx-cyrillic
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-cronyx-cyrillic-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=8993705fce647ab45c9fa3b263a4edbb
+_md5_=3055f4f08002265878784fa6afcc1a78
diff --git a/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.4
index f0e30150d94d..629ea4d2c373 100644
--- a/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/cursor-misc
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-cursor-misc-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=3ad1428fdb9f4a4be4ad92541d867a57
+_md5_=8e448bd845a4c440124ab195894b0240
diff --git a/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.4
index b8ef07968dfd..e49ca8672601 100644
--- a/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/daewoo-misc
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-daewoo-misc-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=3287b1f05abbf0046495f17dc4432ae3
+_md5_=300d995ed37f3ec4e82f2c98badebddf
diff --git a/metadata/md5-cache/media-fonts/font-dec-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-dec-misc-1.0.4
index a936066f701c..d4ecc4114453 100644
--- a/metadata/md5-cache/media-fonts/font-dec-misc-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-dec-misc-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/dec-misc
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-dec-misc-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=8745fbf1e12d2de5c76591cd1c444022
+_md5_=3c773d4bb1fa486432467e4afedd998f
diff --git a/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.4 b/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.4
index 3d36d699fae2..6ca06f353095 100644
--- a/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/ibm-type1
 INHERIT=xorg-3
 IUSE=X
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-ibm-type1-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=5c006a5bf99233d3f9f7d79bfe8b9e18
+_md5_=3222c5080e72bdc046e37a1b09e37ae0
diff --git a/metadata/md5-cache/media-fonts/font-isas-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-isas-misc-1.0.4
index c34b57bf8f18..10d204c1ab5c 100644
--- a/metadata/md5-cache/media-fonts/font-isas-misc-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-isas-misc-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/isas-misc
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-isas-misc-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=0c430baadda46d5f0eb8e861deb7f885
+_md5_=c59d781aa18c9063df470e70a99904b0
diff --git a/metadata/md5-cache/media-fonts/font-jis-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-jis-misc-1.0.4
index f10d27435703..4deb068f84d3 100644
--- a/metadata/md5-cache/media-fonts/font-jis-misc-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-jis-misc-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/jis-misc
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-jis-misc-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=a47b45c807b05fee2783b1c81213b7d6
+_md5_=b9ca8709454fe8319239875b7d5480c8
diff --git a/metadata/md5-cache/media-fonts/font-micro-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-micro-misc-1.0.4
index 89a8d9fd6728..fff448d562a3 100644
--- a/metadata/md5-cache/media-fonts/font-micro-misc-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-micro-misc-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/micro-misc
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=public-domain
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-micro-misc-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=c6900568b2e7395235883ed91ab035c5
+_md5_=76cc23e7d206aaacf483c6e8cdda705e
diff --git a/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.4 b/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.4
index c1e0b64cfda5..220e3edd9832 100644
--- a/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/misc-cyrillic
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-misc-cyrillic-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=53b5bc420f2bf4bc6c6cc1957516f2ca
+_md5_=5c6834724310e5947b134c6b7a7a94d9
diff --git a/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.5 b/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.5
index 07f5810809bd..d68280493eba 100644
--- a/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.5
+++ b/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/misc-ethiopic
 INHERIT=xorg-3
 IUSE=X
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-misc-ethiopic-1.0.5.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=bd018ea5d402b70516013d62b52efcdb
+_md5_=87b3eef7a29e27056f4269718be6c1c8
diff --git a/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.4 b/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.4
index 24da75e44fe1..06eaa6273787 100644
--- a/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/misc-meltho
 INHERIT=xorg-3
 IUSE=X
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-misc-meltho-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=0cc75138d983edad5622007532f0503e
+_md5_=2223010ce86d2092bb1f2996a82fcf1f
diff --git a/metadata/md5-cache/media-fonts/font-misc-misc-1.1.3 b/metadata/md5-cache/media-fonts/font-misc-misc-1.1.3
index af9f9c8c4d4e..d501ec19e425 100644
--- a/metadata/md5-cache/media-fonts/font-misc-misc-1.1.3
+++ b/metadata/md5-cache/media-fonts/font-misc-misc-1.1.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/misc-misc
 INHERIT=xorg-3
 IUSE=nls X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-misc-misc-1.1.3.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=bd1b4014888a0f6811bb5fb8e64c3ded
+_md5_=d531246a67836cb824abb29f9af448e3
diff --git a/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.4
index 4ed25266f11a..7fae9dca38f1 100644
--- a/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/mutt-misc
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-mutt-misc-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=a9fb08779af895c9e0c72c29484ac0d1
+_md5_=ef1e02215ad28e12f38ef8d340d6a854
diff --git a/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.3 b/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.3
index 8e1b81e7c507..fa1318034f1e 100644
--- a/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.3
+++ b/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/schumacher-misc
 INHERIT=xorg-3
 IUSE=nls X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-schumacher-misc-1.1.3.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=5d44ed745bbeeae6602d2f33a1d246c9
+_md5_=ab81ab91eb75a6575873671b7f987c7f
diff --git a/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.5 b/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.5
index 017dd7883175..aab73fed9d26 100644
--- a/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.5
+++ b/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/screen-cyrillic
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-screen-cyrillic-1.0.5.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=6d4b137334dcd4a3e06a9f626337964c
+_md5_=9f3c27fdff90bc400fc2ec3d560075c4
diff --git a/metadata/md5-cache/media-fonts/font-sony-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-sony-misc-1.0.4
index d8bf619ee011..39c29383d01b 100644
--- a/metadata/md5-cache/media-fonts/font-sony-misc-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-sony-misc-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/sony-misc
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-sony-misc-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=2904b5356b89e88c9a6158e767451b9a
+_md5_=d68b0ab43a4497dd0f5c3e71a30d89ad
diff --git a/metadata/md5-cache/media-fonts/font-sun-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-sun-misc-1.0.4
index dafb2871daf0..16c70605cc36 100644
--- a/metadata/md5-cache/media-fonts/font-sun-misc-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-sun-misc-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/sun-misc
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-sun-misc-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=4de90485b70e1570cc5341069048130f
+_md5_=5451fe43fb2fea894563bdd3a248a754
diff --git a/metadata/md5-cache/media-fonts/font-util-1.4.0 b/metadata/md5-cache/media-fonts/font-util-1.4.0
index e10168741556..313f5e9e1818 100644
--- a/metadata/md5-cache/media-fonts/font-util-1.4.0
+++ b/metadata/md5-cache/media-fonts/font-util-1.4.0
@@ -4,9 +4,9 @@ DESCRIPTION=X.Org font utilities
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/util
 INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-util-1.4.0.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=27a5b09012c12043ab43f4b3d31d2389
+_md5_=5b8fafce5885a8c378b6e8f9eb604c85
diff --git a/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.4 b/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.4
index 0dbb3afa4c7e..7d02ca88ad32 100644
--- a/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/winitzki-cyrillic
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=0ec3baa19d62b7b06a84a5a415c4b0e3
+_md5_=20d1f36a5221c4f9f6a3bbef7c638e04
diff --git a/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.5 b/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.5
index 4f3210ea3ad3..44a3a4e27d23 100644
--- a/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.5
+++ b/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/xfree86-type1
 INHERIT=xorg-3
 IUSE=X
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-xfree86-type1-1.0.5.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=2d3c32abb043115a42407e465d5548db
+_md5_=4f3389ef8305f5d4875197742f68f57e
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index f584ecd1e476..805d9b4282a7 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/ristretto-0.12.4 b/metadata/md5-cache/media-gfx/ristretto-0.12.4
deleted file mode 100644
index 04d0820d280c..000000000000
--- a/metadata/md5-cache/media-gfx/ristretto-0.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool virtual/pkgconfig sys-devel/gettext
-DEFINED_PHASES=postinst postrm
-DEPEND=>=dev-libs/glib-2.56:2 media-libs/libexif:0= sys-apps/file x11-libs/cairo:0 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.16:0= >=xfce-base/libxfce4util-4.16:0= >=xfce-base/xfconf-4.12.1:0=
-DESCRIPTION=A fast and lightweight picture viewer for Xfce
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/apps/ristretto/start
-INHERIT=xdg-utils
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.56:2 media-libs/libexif:0= sys-apps/file x11-libs/cairo:0 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.16:0= >=xfce-base/libxfce4util-4.16:0= >=xfce-base/xfconf-4.12.1:0=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/ristretto/0.12/ristretto-0.12.4.tar.bz2
-_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2d56288feaf4415a4cb42772388ad0dc
diff --git a/metadata/md5-cache/media-gfx/ristretto-0.13.0 b/metadata/md5-cache/media-gfx/ristretto-0.13.0
index 458a7db6e4f1..af389ba650ce 100644
--- a/metadata/md5-cache/media-gfx/ristretto-0.13.0
+++ b/metadata/md5-cache/media-gfx/ristretto-0.13.0
@@ -5,10 +5,10 @@ DESCRIPTION=A fast and lightweight picture viewer for Xfce
 EAPI=8
 HOMEPAGE=https://docs.xfce.org/apps/ristretto/start https://gitlab.xfce.org/apps/ristretto/
 INHERIT=xdg-utils
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.56:2 media-libs/libexif:0= sys-apps/file x11-libs/cairo:0 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.16:0= >=xfce-base/libxfce4util-4.16:0= >=xfce-base/xfconf-4.12.1:0=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/ristretto/0.13/ristretto-0.13.0.tar.bz2
 _eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1343f3bf73565b9ed2a517c2bf377520
+_md5_=2240b7646abe7dbe3526e97d6bd7d3e6
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 4d3ed56c8dc6..6ca42c61b8c3 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/openh264-2.3.1-r1 b/metadata/md5-cache/media-libs/openh264-2.3.1-r1
index ebcdc95b895d..223b1ce2ca62 100644
--- a/metadata/md5-cache/media-libs/openh264-2.3.1-r1
+++ b/metadata/md5-cache/media-libs/openh264-2.3.1-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.openh264.org/ https://github.com/cisco/openh264
 INHERIT=toolchain-funcs multilib-minimal
 IUSE=cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin test utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=BSD
 RESTRICT=bindist !test? ( test )
 SLOT=0/7
 SRC_URI=https://github.com/cisco/openh264/archive/refs/tags/v2.3.1.tar.gz -> openh264-2.3.1.tar.gz https://github.com/mozilla/gmp-api/archive/3a01c086d1b0394238ff1b5ad22e76022830625a.tar.gz -> gmp-api-Firefox39-3a01c086d1b0394238ff1b5ad22e76022830625a.tar.gz
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c36315f2d29915ded93b3641b88fbaa3
+_md5_=f5aaf48a652c12b73220b44b093443d7
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index a56a4f6a26af..b77676b0a406 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/easyeffects-7.0.3 b/metadata/md5-cache/media-sound/easyeffects-7.0.3
new file mode 100644
index 000000000000..ad649c9c3391
--- /dev/null
+++ b/metadata/md5-cache/media-sound/easyeffects-7.0.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/appstream-glib dev-util/desktop-file-utils dev-util/itstool sys-devel/gettext 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 pretend test
+DEPEND=dev-cpp/nlohmann_json dev-cpp/tbb >=dev-libs/glib-2.56:2 dev-libs/libfmt >=dev-libs/libsigc++-3.0.6:3 >=gui-libs/gtk-4.10.0:4 >=gui-libs/libadwaita-1.2.0:1 media-libs/libbs2b >=media-libs/libebur128-1.2.0 media-libs/libsndfile >=media-libs/lilv-0.22 >=media-libs/lv2-1.18.2 media-libs/rnnoise media-libs/rubberband[ladspa] media-libs/speex media-libs/speexdsp >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.41 sci-libs/gsl:= sci-libs/fftw:3.0 media-libs/libsamplerate
+DESCRIPTION=Limiter, auto volume and many other plugins for PipeWire applications
+EAPI=8
+HOMEPAGE=https://github.com/wwmm/easyeffects
+INHERIT=gnome2-utils meson toolchain-funcs
+IUSE=calf +doc mda-lv2 zamaudio
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-cpp/nlohmann_json dev-cpp/tbb >=dev-libs/glib-2.56:2 dev-libs/libfmt >=dev-libs/libsigc++-3.0.6:3 >=gui-libs/gtk-4.10.0:4 >=gui-libs/libadwaita-1.2.0:1 media-libs/libbs2b >=media-libs/libebur128-1.2.0 media-libs/libsndfile >=media-libs/lilv-0.22 >=media-libs/lv2-1.18.2 media-libs/rnnoise media-libs/rubberband[ladspa] media-libs/speex media-libs/speexdsp >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.41 sci-libs/gsl:= sci-libs/fftw:3.0 >=media-libs/lsp-plugins-1.1.24[lv2] sys-apps/dbus calf? ( >=media-plugins/calf-0.90.1[lv2] ) doc? ( gnome-extra/yelp ) mda-lv2? ( media-plugins/mda-lv2 ) zamaudio? ( media-plugins/zam-plugins )
+SLOT=0
+SRC_URI=https://github.com/wwmm/easyeffects/archive/v7.0.3.tar.gz -> easyeffects-7.0.3.tar.gz
+_eclasses_=gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=0a8979c0986c935a1ad145e291d3ca48
diff --git a/metadata/md5-cache/media-sound/hydrogen-1.2.0 b/metadata/md5-cache/media-sound/hydrogen-1.2.0
index 4f86e7a28c80..bbf6a4aaa2c1 100644
--- a/metadata/md5-cache/media-sound/hydrogen-1.2.0
+++ b/metadata/md5-cache/media-sound/hydrogen-1.2.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( dev-libs/libtar ) doc? ( dev-texlive/texlive-fontutils ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) dev-qt/qttest:5
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( dev-libs/libtar ) doc? ( dev-texlive/texlive-fontutils ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) dev-qt/qttest:5
 DESCRIPTION=Advanced drum machine
 EAPI=8
 HOMEPAGE=http://www.hydrogen-music.org/
@@ -9,9 +9,9 @@ INHERIT=cmake xdg
 IUSE=alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 ZLIB
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( dev-libs/libtar ) doc? ( dev-texlive/texlive-fontutils ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( dev-libs/libtar ) doc? ( dev-texlive/texlive-fontutils ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio )
 REQUIRED_USE=lash? ( alsa )
 SLOT=0
 SRC_URI=https://github.com/hydrogen-music/hydrogen/archive/1.2.0.tar.gz -> hydrogen-1.2.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6c2d49aadb1f88add22b3df7f40361fe
+_md5_=1201fdca8b9d84eab9a895ddf183c25d
diff --git a/metadata/md5-cache/media-sound/hydrogen-9999 b/metadata/md5-cache/media-sound/hydrogen-9999
index cc95f66117f8..f1a3565cf61f 100644
--- a/metadata/md5-cache/media-sound/hydrogen-9999
+++ b/metadata/md5-cache/media-sound/hydrogen-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( dev-libs/libtar ) doc? ( dev-texlive/texlive-fontutils ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) dev-qt/qttest:5
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( dev-libs/libtar ) doc? ( dev-texlive/texlive-fontutils ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) dev-qt/qttest:5
 DESCRIPTION=Advanced drum machine
 EAPI=8
 HOMEPAGE=http://www.hydrogen-music.org/
@@ -9,8 +9,8 @@ INHERIT=cmake xdg git-r3
 IUSE=alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio
 LICENSE=GPL-2 ZLIB
 PROPERTIES=live
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( dev-libs/libtar ) doc? ( dev-texlive/texlive-fontutils ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( dev-libs/libtar ) doc? ( dev-texlive/texlive-fontutils ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio )
 REQUIRED_USE=lash? ( alsa )
 SLOT=0
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6c2d49aadb1f88add22b3df7f40361fe
+_md5_=1201fdca8b9d84eab9a895ddf183c25d
diff --git a/metadata/md5-cache/media-sound/upmpdcli-1.7.2 b/metadata/md5-cache/media-sound/upmpdcli-1.7.2
index 89a786b98036..220858b970ca 100644
--- a/metadata/md5-cache/media-sound/upmpdcli-1.7.2
+++ b/metadata/md5-cache/media-sound/upmpdcli-1.7.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.lesbonscomptes.com/upmpdcli/index.html
 INHERIT=autotools systemd
 IUSE=thirdparty
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/jsoncpp media-libs/libmpdclient net-libs/libmicrohttpd net-libs/libupnpp acct-group/upmpdcli acct-user/upmpdcli app-misc/recoll thirdparty? ( dev-python/requests )
 SLOT=0
 SRC_URI=https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.7.2.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=644bcc66cd3ad6c0f96aba6a19ae4ee8
+_md5_=b6b47be3657b2b3b0b849255e401deae
diff --git a/metadata/md5-cache/media-sound/upmpdcli-1.6.3 b/metadata/md5-cache/media-sound/upmpdcli-1.7.7
index 7205688dadd3..6287740655c6 100644
--- a/metadata/md5-cache/media-sound/upmpdcli-1.6.3
+++ b/metadata/md5-cache/media-sound/upmpdcli-1.7.7
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.lesbonscomptes.com/upmpdcli/index.html
 INHERIT=autotools systemd
 IUSE=thirdparty
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/jsoncpp media-libs/libmpdclient net-libs/libmicrohttpd net-libs/libupnpp acct-group/upmpdcli acct-user/upmpdcli app-misc/recoll thirdparty? ( dev-python/requests )
 SLOT=0
-SRC_URI=https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.6.3.tar.gz
+SRC_URI=https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.7.7.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b6b47be3657b2b3b0b849255e401deae
+_md5_=644bcc66cd3ad6c0f96aba6a19ae4ee8
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 596589e1eb62..254e6d1f6ff0 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/parole-4.16.0 b/metadata/md5-cache/media-video/parole-4.16.0
deleted file mode 100644
index d40b56f58694..000000000000
--- a/metadata/md5-cache/media-video/parole-4.16.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/glib-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 sys-apps/dbus >=x11-libs/gtk+-3.20:3 x11-libs/libX11 >=xfce-base/libxfce4ui-4.11:=[gtk3(+)] >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7 ) taglib? ( >=media-libs/taglib-1.6:0= ) x11-base/xorg-proto
-DESCRIPTION=A simple Xfce4 media player using GStreamer
-EAPI=7
-HOMEPAGE=https://docs.xfce.org/apps/parole/start
-INHERIT=xdg-utils
-IUSE=libnotify taglib
-KEYWORDS=amd64 ~mips x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 sys-apps/dbus >=x11-libs/gtk+-3.20:3 x11-libs/libX11 >=xfce-base/libxfce4ui-4.11:=[gtk3(+)] >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7 ) taglib? ( >=media-libs/taglib-1.6:0= ) media-plugins/gst-plugins-meta:1.0
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/parole/4.16/parole-4.16.0.tar.bz2
-_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=617547cda66ba98af29705c0f16706b6
diff --git a/metadata/md5-cache/media-video/parole-4.18.0 b/metadata/md5-cache/media-video/parole-4.18.0
index 6c0433af0260..c677e02bdc6c 100644
--- a/metadata/md5-cache/media-video/parole-4.18.0
+++ b/metadata/md5-cache/media-video/parole-4.18.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/apps/parole/start https://gitlab.xfce.org/apps/parole/
 INHERIT=xdg-utils
 IUSE=libnotify taglib
-KEYWORDS=~amd64 ~mips ~x86
+KEYWORDS=amd64 ~mips x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.38:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 sys-apps/dbus >=x11-libs/gtk+-3.20:3 x11-libs/libX11 >=xfce-base/libxfce4ui-4.11:=[gtk3(+)] >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7 ) taglib? ( >=media-libs/taglib-1.6:0= ) media-plugins/gst-plugins-meta:1.0
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/parole/4.18/parole-4.18.0.tar.bz2
 _eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8e498aa354ba481766768ec3587ba9c4
+_md5_=42773c453f4b40fb9456d7669409ff36
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index ed9ab557733b..5c30e0d19c00 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.99.4 b/metadata/md5-cache/net-analyzer/tcpdump-4.99.4
new file mode 100644
index 000000000000..c29113d0222c
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/tcpdump-4.99.4
@@ -0,0 +1,17 @@
+BDEPEND=drop-root? ( virtual/pkgconfig ) verify-sig? ( sec-keys/openpgp-keys-tcpdump ) 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 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install postinst prepare test unpack
+DEPEND=>=net-libs/libpcap-1.10.1 drop-root? ( acct-group/pcap acct-user/pcap sys-libs/libcap-ng ) smi? ( net-libs/libsmi ) ssl? ( >=dev-libs/openssl-0.9.6m:= ) suid? ( acct-group/pcap acct-user/pcap ) test? ( dev-lang/perl )
+DESCRIPTION=A tool for network monitoring and data acquisition
+EAPI=8
+HOMEPAGE=https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump
+INHERIT=autotools verify-sig
+IUSE=+drop-root +smi +ssl +samba suid test verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=net-libs/libpcap-1.10.1 drop-root? ( acct-group/pcap acct-user/pcap sys-libs/libcap-ng ) smi? ( net-libs/libsmi ) ssl? ( >=dev-libs/openssl-0.9.6m:= ) suid? ( acct-group/pcap acct-user/pcap )
+REQUIRED_USE=test? ( samba )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.tcpdump.org/release/tcpdump-4.99.4.tar.gz verify-sig? ( https://www.tcpdump.org/release/tcpdump-4.99.4.tar.gz.sig )
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=1834a6a008448612f32dd761889f0728
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.4.0 b/metadata/md5-cache/net-analyzer/zabbix-6.4.0
index cae3d823225a..f3a03395feca 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.4.0
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.4.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.zabbix.com/
 INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
 IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
@@ -14,4 +14,4 @@ RESTRICT=test strip
 SLOT=0/6.4
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.0.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.4.0-go-deps.tar.xz )
 _eclasses_=go-module	f9700c7efec1fd4955363169e9930c1c	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=33a048596fcccf3bfd46f4fd45e87ec6
+_md5_=db11d917da5f7f812530bd5a6ad31dd6
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 5afc87b58313..8a5730b0c87f 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/resolv_wrapper-1.1.7 b/metadata/md5-cache/net-dns/resolv_wrapper-1.1.7
deleted file mode 100644
index 8390a25d390f..000000000000
--- a/metadata/md5-cache/net-dns/resolv_wrapper-1.1.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-util/cmocka net-libs/socket_wrapper ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Wrapper for DNS name resolving or DNS faking
-EAPI=7
-HOMEPAGE=https://cwrap.org/resolv_wrapper.html
-INHERIT=cmake-multilib
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=BSD
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://ftp.samba.org/pub/cwrap/resolv_wrapper-1.1.7.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c4d613719e7c296e580b3d5f76b1ebb1
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index db8fd905ce5f..6db40cabd135 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libnpupnp-5.0.0 b/metadata/md5-cache/net-libs/libnpupnp-5.0.0
deleted file mode 100644
index 941c67e5bca6..000000000000
--- a/metadata/md5-cache/net-libs/libnpupnp-5.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=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 install prepare
-DEPEND=dev-libs/expat net-libs/libmicrohttpd net-misc/curl
-DESCRIPTION=A C++ base UPnP library, derived from Portable UPnP, a.k.a libupnp
-EAPI=8
-HOMEPAGE=https://framagit.org/medoc92/npupnp
-INHERIT=autotools
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-libs/expat net-libs/libmicrohttpd net-misc/curl
-SLOT=0
-SRC_URI=https://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-5.0.0.tar.gz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0df472303e4fc06d71e2e7758369ec92
diff --git a/metadata/md5-cache/net-libs/libnpupnp-5.0.1 b/metadata/md5-cache/net-libs/libnpupnp-5.0.1
index fb9b57916baf..d14e2b06d9eb 100644
--- a/metadata/md5-cache/net-libs/libnpupnp-5.0.1
+++ b/metadata/md5-cache/net-libs/libnpupnp-5.0.1
@@ -5,10 +5,10 @@ DESCRIPTION=A C++ base UPnP library, derived from Portable UPnP, a.k.a libupnp
 EAPI=8
 HOMEPAGE=https://framagit.org/medoc92/npupnp
 INHERIT=autotools
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/expat net-libs/libmicrohttpd net-misc/curl
 SLOT=0
 SRC_URI=https://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-5.0.1.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=cacdd62a1afc30e2211bc68037e5b5d4
+_md5_=0df472303e4fc06d71e2e7758369ec92
diff --git a/metadata/md5-cache/net-libs/libpcap-1.10.4 b/metadata/md5-cache/net-libs/libpcap-1.10.4
new file mode 100644
index 000000000000..6ab5d80770e4
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libpcap-1.10.4
@@ -0,0 +1,16 @@
+BDEPEND=app-alternatives/yacc sys-devel/flex dbus? ( virtual/pkgconfig ) verify-sig? ( sec-keys/openpgp-keys-tcpdump ) 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 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) remote? ( virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=A system-independent library for user-level network packet capture
+EAPI=8
+HOMEPAGE=https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap
+INHERIT=autotools multilib-minimal verify-sig
+IUSE=bluetooth dbus netlink rdma remote static-libs test usb yydebug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) remote? ( virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.tcpdump.org/release/libpcap-1.10.4.tar.gz verify-sig? ( https://www.tcpdump.org/release/libpcap-1.10.4.tar.gz.sig )
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=0ed011ab200493e453dab885922912ad
diff --git a/metadata/md5-cache/net-libs/libpcap-9999 b/metadata/md5-cache/net-libs/libpcap-9999
index 851287c2ccde..a53416c92231 100644
--- a/metadata/md5-cache/net-libs/libpcap-9999
+++ b/metadata/md5-cache/net-libs/libpcap-9999
@@ -12,4 +12,4 @@ RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bc271f9e76ee3f2a76c5cbf2d99cb8d2
+_md5_=0ed011ab200493e453dab885922912ad
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.5 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.5
index 6b9f821ab3ee..4d5c7e8ea2fa 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.38.5
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.5
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=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/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=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/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
 DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
 DESCRIPTION=Open source web browser engine
@@ -14,5 +14,5 @@ REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua w
 RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7464bcf1605570c22e8a44a33748edca
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.5-r410 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.5-r410
index 8e99f5b61284..e9cf5f785049 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.38.5-r410
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.5-r410
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=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/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=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/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
 DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
 DESCRIPTION=Open source web browser engine
@@ -14,5 +14,5 @@ REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua w
 RESTRICT=test
 SLOT=4.1/0
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a8b1a9ba387e0b6874af9c2da7f525d2
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.5-r500 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.5-r500
index e065b117f237..923bbb42ea56 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.38.5-r500
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.5-r500
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=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/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=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/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
 DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] gui-libs/gtk:4 >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
 DESCRIPTION=Open source web browser engine
@@ -14,5 +14,5 @@ REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua w
 RESTRICT=test
 SLOT=5/0
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5da962dce106ba78b8cdc3c092fa315e
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.40.0 b/metadata/md5-cache/net-libs/webkit-gtk-2.40.0
index 9d20e730b99a..d1d28c656e9b 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.40.0
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.40.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=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/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 dev-util/unifdef >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=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/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 dev-util/unifdef >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
 DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=media-libs/libepoxy-1.4.0 >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.70.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) media-libs/mesa media-libs/libglvnd wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
 DESCRIPTION=Open source web browser engine
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( aqua wayland X )
 RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.40.0.tar.xz
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=74524d6880d3e76c74d96e951bf5789e
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.40.0-r410 b/metadata/md5-cache/net-libs/webkit-gtk-2.40.0-r410
index 59c5f40a0f27..87c11d688dbb 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.40.0-r410
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.40.0-r410
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=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/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 dev-util/unifdef >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=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/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 dev-util/unifdef >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
 DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=media-libs/libepoxy-1.4.0 >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.70.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) media-libs/mesa media-libs/libglvnd wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
 DESCRIPTION=Open source web browser engine
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( aqua wayland X )
 RESTRICT=test
 SLOT=4.1/0
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.40.0.tar.xz
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=097a3e9fc473c3216031d42763e19332
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.40.0-r600 b/metadata/md5-cache/net-libs/webkit-gtk-2.40.0-r600
index 7e815753adb9..ea62e59281e6 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.40.0-r600
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.40.0-r600
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=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/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 dev-util/unifdef >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=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/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 dev-util/unifdef >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
 DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] gui-libs/gtk:4 >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=media-libs/libepoxy-1.4.0 >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.70.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) media-libs/mesa media-libs/libglvnd wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
 DESCRIPTION=Open source web browser engine
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( aqua wayland X )
 RESTRICT=test
 SLOT=6/0
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.40.0.tar.xz
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=23638f4d0a10024b8637e63ce052ba0f
diff --git a/metadata/md5-cache/net-libs/xrootd-5.4.3-r1 b/metadata/md5-cache/net-libs/xrootd-5.4.3-r1
deleted file mode 100644
index f230ce9924a9..000000000000
--- a/metadata/md5-cache/net-libs/xrootd-5.4.3-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen[dot] virtual/latex-base python? ( dev-python/sphinx ) ) python? ( python_single_target_python3_9? ( dev-python/pip[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pip[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pip[python_targets_python3_11(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=acct-group/xrootd acct-user/xrootd dev-libs/openssl:0= sys-libs/zlib virtual/libcrypt:= fuse? ( sys-fs/fuse:0= ) http? ( net-misc/curl:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2:2= ) 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 ) ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd:= ) test-suite? ( dev-util/cppunit )
-DESCRIPTION=Extended ROOT remote file server
-EAPI=8
-HOMEPAGE=https://xrootd.slac.stanford.edu/
-INHERIT=cmake python-single-r1
-IUSE=doc examples fuse http kerberos +libxml2 python readline +server systemd test-suite python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-3
-RDEPEND=acct-group/xrootd acct-user/xrootd dev-libs/openssl:0= sys-libs/zlib virtual/libcrypt:= fuse? ( sys-fs/fuse:0= ) http? ( net-misc/curl:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2:2= ) 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 ) ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd:= ) test-suite? ( dev-util/cppunit ) dev-lang/perl
-REQUIRED_USE=http? ( kerberos ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) test-suite? ( server )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://xrootd.slac.stanford.edu/download/v5.4.3/xrootd-5.4.3.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=93b8ea7b1d25a42f49c173d4d3a5fe24
diff --git a/metadata/md5-cache/net-libs/xrootd-5.4.3-r2 b/metadata/md5-cache/net-libs/xrootd-5.4.3-r2
index 2d06d6c75a57..a758d1d00147 100644
--- a/metadata/md5-cache/net-libs/xrootd-5.4.3-r2
+++ b/metadata/md5-cache/net-libs/xrootd-5.4.3-r2
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-doc/doxygen[dot] virtual/latex-base python? ( dev-python/sphinx ) ) python? ( 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 ) test? ( >=dev-python/pytest-7.1.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( dev-util/cppunit ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-doc/doxygen[dot] virtual/latex-base python? ( dev-python/sphinx ) ) python? ( 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/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.1.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( dev-util/cppunit ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=acct-group/xrootd acct-user/xrootd dev-libs/openssl:0= sys-libs/zlib virtual/libcrypt:= fuse? ( sys-fs/fuse:0= ) http? ( net-misc/curl:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2:2= ) python? ( 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 ) ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd:= )
 DESCRIPTION=Extended ROOT remote file server
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://xrootd.slac.stanford.edu/download/v5.4.3/xrootd-5.4.3.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	distutils-r1	05bcfd9823be251f6e9f211ca285094e	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fa78e24eb52ce49d2cb1b1599b657dff
+_md5_=b855c67adb539501db24b324d6661c03
diff --git a/metadata/md5-cache/net-libs/xrootd-5.5.0 b/metadata/md5-cache/net-libs/xrootd-5.5.0
deleted file mode 100644
index 3c92285df35b..000000000000
--- a/metadata/md5-cache/net-libs/xrootd-5.5.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python? ( python_single_target_python3_9? ( dev-python/pip[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pip[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pip[python_targets_python3_11(-)] ) ) test? ( dev-util/cppunit ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( app-doc/doxygen media-gfx/graphviz virtual/latex-base python? ( dev-python/sphinx ) )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=acct-group/xrootd acct-user/xrootd dev-libs/openssl:0= net-libs/davix sys-libs/zlib virtual/libcrypt:= fuse? ( sys-fs/fuse:0= ) http? ( net-misc/curl:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2:2= ) 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 ) ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=Extended ROOT remote file server
-EAPI=8
-HOMEPAGE=https://xrootd.slac.stanford.edu/
-INHERIT=cmake docs python-single-r1
-IUSE=examples fuse http kerberos +libxml2 python readline +server systemd test doc python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-3
-RDEPEND=acct-group/xrootd acct-user/xrootd dev-libs/openssl:0= net-libs/davix sys-libs/zlib virtual/libcrypt:= fuse? ( sys-fs/fuse:0= ) http? ( net-misc/curl:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2:2= ) 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 ) ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd:= ) dev-lang/perl
-REQUIRED_USE=http? ( kerberos ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) test? ( server )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://xrootd.slac.stanford.edu/download/v5.5.0/xrootd-5.5.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	docs	7b9e167549c44efa7994614f33ba6d7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=06277970f3913ee61d29a1c2748ce783
diff --git a/metadata/md5-cache/net-libs/xrootd-5.5.2 b/metadata/md5-cache/net-libs/xrootd-5.5.2
deleted file mode 100644
index 4e5208e763c7..000000000000
--- a/metadata/md5-cache/net-libs/xrootd-5.5.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python? ( python_single_target_python3_9? ( dev-python/pip[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pip[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pip[python_targets_python3_11(-)] ) ) test? ( dev-util/cppunit ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( app-doc/doxygen media-gfx/graphviz virtual/latex-base python? ( dev-python/sphinx ) )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=acct-group/xrootd acct-user/xrootd dev-libs/openssl:0= net-libs/davix sys-libs/zlib virtual/libcrypt:= fuse? ( sys-fs/fuse:0= ) http? ( net-misc/curl:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2:2= ) 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 ) ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=Extended ROOT remote file server
-EAPI=8
-HOMEPAGE=https://xrootd.slac.stanford.edu/
-INHERIT=cmake docs python-single-r1
-IUSE=examples fuse http kerberos +libxml2 python readline +server systemd test doc python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-3
-RDEPEND=acct-group/xrootd acct-user/xrootd dev-libs/openssl:0= net-libs/davix sys-libs/zlib virtual/libcrypt:= fuse? ( sys-fs/fuse:0= ) http? ( net-misc/curl:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2:2= ) 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 ) ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd:= ) dev-lang/perl
-REQUIRED_USE=http? ( kerberos ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) test? ( server )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://xrootd.slac.stanford.edu/download/v5.5.2/xrootd-5.5.2.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	docs	7b9e167549c44efa7994614f33ba6d7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0c837b82f72baf53487bd4847e0f7510
diff --git a/metadata/md5-cache/net-libs/xrootd-5.5.4 b/metadata/md5-cache/net-libs/xrootd-5.5.4
deleted file mode 100644
index 682636d52522..000000000000
--- a/metadata/md5-cache/net-libs/xrootd-5.5.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python? ( python_single_target_python3_9? ( dev-python/pip[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pip[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pip[python_targets_python3_11(-)] ) ) test? ( dev-util/cppunit ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( app-doc/doxygen media-gfx/graphviz virtual/latex-base python? ( dev-python/sphinx ) )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=acct-group/xrootd acct-user/xrootd dev-libs/openssl:0= net-libs/davix sys-libs/zlib virtual/libcrypt:= fuse? ( sys-fs/fuse:0= ) http? ( net-misc/curl:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2:2= ) 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 ) ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=Extended ROOT remote file server
-EAPI=8
-HOMEPAGE=https://xrootd.slac.stanford.edu/
-INHERIT=cmake docs python-single-r1
-IUSE=examples fuse http kerberos +libxml2 python readline +server systemd test doc python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-3
-RDEPEND=acct-group/xrootd acct-user/xrootd dev-libs/openssl:0= net-libs/davix sys-libs/zlib virtual/libcrypt:= fuse? ( sys-fs/fuse:0= ) http? ( net-misc/curl:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2:2= ) 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 ) ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd:= ) dev-lang/perl
-REQUIRED_USE=http? ( kerberos ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) test? ( server )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://xrootd.slac.stanford.edu/download/v5.5.4/xrootd-5.5.4.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	docs	7b9e167549c44efa7994614f33ba6d7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0c837b82f72baf53487bd4847e0f7510
diff --git a/metadata/md5-cache/net-libs/xrootd-5.5.4-r1 b/metadata/md5-cache/net-libs/xrootd-5.5.4-r1
new file mode 100644
index 000000000000..f5de99681514
--- /dev/null
+++ b/metadata/md5-cache/net-libs/xrootd-5.5.4-r1
@@ -0,0 +1,17 @@
+BDEPEND=python? ( 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/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.1.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( dev-util/cppunit ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( app-doc/doxygen media-gfx/graphviz virtual/latex-base python? ( dev-python/sphinx ) )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=acct-group/xrootd acct-user/xrootd dev-libs/openssl:0= net-libs/davix sys-libs/zlib virtual/libcrypt:= fuse? ( sys-fs/fuse:0= ) http? ( net-misc/curl:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2:2= ) python? ( 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 ) ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=Extended ROOT remote file server
+EAPI=8
+HOMEPAGE=https://xrootd.slac.stanford.edu/
+INHERIT=cmake docs distutils-r1
+IUSE=examples fuse http kerberos +libxml2 python readline +server systemd test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3
+RDEPEND=acct-group/xrootd acct-user/xrootd dev-libs/openssl:0= net-libs/davix sys-libs/zlib virtual/libcrypt:= fuse? ( sys-fs/fuse:0= ) http? ( net-misc/curl:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2:2= ) python? ( 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 ) ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd:= ) dev-lang/perl
+REQUIRED_USE=http? ( kerberos ) python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) test? ( server )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://xrootd.slac.stanford.edu/download/v5.5.4/xrootd-5.5.4.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	distutils-r1	05bcfd9823be251f6e9f211ca285094e	docs	7b9e167549c44efa7994614f33ba6d7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=0719e2a2bfb9f84a6840a3a9a0d47330
diff --git a/metadata/md5-cache/net-libs/xrootd-ceph-5.5.2 b/metadata/md5-cache/net-libs/xrootd-ceph-5.5.2
deleted file mode 100644
index 62d34ab3f6a6..000000000000
--- a/metadata/md5-cache/net-libs/xrootd-ceph-5.5.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-util/cppunit ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~net-libs/xrootd-5.5.2 sys-cluster/ceph
-DESCRIPTION=xrootd OSS plug-in for interfacing with Ceph storage platform
-EAPI=8
-HOMEPAGE=https://xrootd.slac.stanford.edu/
-INHERIT=cmake
-IUSE=test
-KEYWORDS=~amd64 ~amd64-linux
-LICENSE=LGPL-3+
-RDEPEND=~net-libs/xrootd-5.5.2 sys-cluster/ceph
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/xrootd/xrootd-ceph/archive/refs/tags/v5.5.2.tar.gz -> xrootd-ceph-5.5.2.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f78f7027e20c675201b0e00e08a110c1
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index c0409f561f32..968e401fe67f 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/electrum-4.3.2-r1 b/metadata/md5-cache/net-misc/electrum-4.3.2-r1
deleted file mode 100644
index 850e6c572256..000000000000
--- a/metadata/md5-cache/net-misc/electrum-4.3.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pyaes[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycryptodome[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses?] ) <dev-libs/libsecp256k1-0.2 >=dev-python/aiohttp-socks-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses] ) ) >=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[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses?] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=User friendly Bitcoin client
-EAPI=8
-HOMEPAGE=https://electrum.org/ https://github.com/spesmilo/electrum/
-INHERIT=distutils-r1 xdg-utils
-IUSE=cli ncurses qrcode +qt5 test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses?] ) <dev-libs/libsecp256k1-0.2 >=dev-python/aiohttp-socks-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses] ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses?] )
-REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/spesmilo/electrum/archive/4.3.2.tar.gz -> electrum-4.3.2.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=84a9ba138f184afca63feb36dc466436
diff --git a/metadata/md5-cache/net-misc/electrum-4.3.3-r1 b/metadata/md5-cache/net-misc/electrum-4.3.3-r1
deleted file mode 100644
index d7ed75ad8d49..000000000000
--- a/metadata/md5-cache/net-misc/electrum-4.3.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pyaes[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycryptodome[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses?] ) <dev-libs/libsecp256k1-0.2 >=dev-python/aiohttp-socks-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses] ) ) >=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[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses?] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=User friendly Bitcoin client
-EAPI=8
-HOMEPAGE=https://electrum.org/ https://github.com/spesmilo/electrum/
-INHERIT=distutils-r1 xdg-utils
-IUSE=cli ncurses qrcode +qt5 test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses?] ) <dev-libs/libsecp256k1-0.2 >=dev-python/aiohttp-socks-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses] ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses?] )
-REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/spesmilo/electrum/archive/4.3.3.tar.gz -> electrum-4.3.3.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3379a939d49fd520e98774a1a5e40cc2
diff --git a/metadata/md5-cache/net-misc/electrum-4.3.4 b/metadata/md5-cache/net-misc/electrum-4.3.4
index 107ec891193a..f3d3503b7331 100644
--- a/metadata/md5-cache/net-misc/electrum-4.3.4
+++ b/metadata/md5-cache/net-misc/electrum-4.3.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://electrum.org/ https://github.com/spesmilo/electrum/
 INHERIT=distutils-r1 xdg-utils
 IUSE=cli ncurses qrcode +qt5 test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ncurses?] ) <dev-libs/libsecp256k1-0.2 >=dev-python/aiohttp-socks-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bitstring[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dnspython-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pbkdf2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PySocks[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/qrcode[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ncurses? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ncurses] ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ncurses?] )
 REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spesmilo/electrum/archive/4.3.4.tar.gz -> electrum-4.3.4.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=baf8822476d7f4eb923a0c0a00baa7bb
+_md5_=e4536cfbfc4c8aa4f5800223f6111193
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 4f293bc61f5d..718b9c0c2d25 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/hplip-plugin-3.22.10 b/metadata/md5-cache/net-print/hplip-plugin-3.22.10
index d6dc2ad73370..7e44283a3372 100644
--- a/metadata/md5-cache/net-print/hplip-plugin-3.22.10
+++ b/metadata/md5-cache/net-print/hplip-plugin-3.22.10
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing/plugins
 INHERIT=unpacker
 IUSE=orblite
-KEYWORDS=~amd64 ~arm arm64 ~x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=hplip-plugin
 RDEPEND=~net-print/hplip-3.22.10 virtual/udev orblite? ( media-gfx/sane-backends >=sys-libs/glibc-2.26 virtual/libusb:0 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://developers.hp.com/sites/default/files/hplip-3.22.10-plugin.run
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5
-_md5_=055c75b42cf209ae1091d045d3c2a9f4
+_md5_=08fd5e68f2013663d54ca1de7ce47daf
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 3682ad5d627c..2bb6f7f0879b 100644
--- a/metadata/md5-cache/sci-biology/Manifest.gz
+++ b/metadata/md5-cache/sci-biology/Manifest.gz
diff --git a/metadata/md5-cache/sci-biology/pysam-0.21.0 b/metadata/md5-cache/sci-biology/pysam-0.21.0
index df49ef494718..7ead104cf5d7 100644
--- a/metadata/md5-cache/sci-biology/pysam-0.21.0
+++ b/metadata/md5-cache/sci-biology/pysam-0.21.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pysam-developers/pysam/archive/v0.21.0.tar.gz -> pysam-0.21.0.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	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_=39158fb80a347de0c5d385834986487f
+_md5_=d2f337ee806641d85739cd55c8698806
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 8ba8f3b430ab..3ccfd1d3dd93 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.11.2 b/metadata/md5-cache/sci-mathematics/z3-4.11.2
deleted file mode 100644
index 10ec0223cdfe..000000000000
--- a/metadata/md5-cache/sci-mathematics/z3-4.11.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen[dot] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=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 ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=An efficient theorem prover
-EAPI=8
-HOMEPAGE=https://github.com/Z3Prover/z3/
-INHERIT=cmake-multilib java-pkg-opt-2 python-single-r1
-IUSE=doc examples gmp isabelle java python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 java python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 arm arm64 ~loong ~ppc ppc64 ~riscv sparc x86
-LICENSE=MIT
-RDEPEND=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 ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0/4.11
-SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.11.2.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0485c6d91f3ccec13f25dde19032be98
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.12.0 b/metadata/md5-cache/sci-mathematics/z3-4.12.0
deleted file mode 100644
index 00b33261c932..000000000000
--- a/metadata/md5-cache/sci-mathematics/z3-4.12.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen[dot] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=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 ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=An efficient theorem prover
-EAPI=8
-HOMEPAGE=https://github.com/Z3Prover/z3/
-INHERIT=cmake-multilib java-pkg-opt-2 python-single-r1
-IUSE=doc examples gmp isabelle java python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 java python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=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 ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0/4.12
-SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.12.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=63b1e460a1688e0b61a30ffe902a194f
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.12.1 b/metadata/md5-cache/sci-mathematics/z3-4.12.1
index 841ec9e24fe7..87e4d8f38701 100644
--- a/metadata/md5-cache/sci-mathematics/z3-4.12.1
+++ b/metadata/md5-cache/sci-mathematics/z3-4.12.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/Z3Prover/z3/
 INHERIT=cmake-multilib java-pkg-opt-2 python-single-r1
 IUSE=doc examples gmp isabelle java python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 java python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~loong ~ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=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 ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0/4.12
 SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.12.1.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=63b1e460a1688e0b61a30ffe902a194f
+_md5_=0485c6d91f3ccec13f25dde19032be98
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index b4f63411df92..0f67df30dd26 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/gr-0.72.0 b/metadata/md5-cache/sci-visualization/gr-0.72.0
new file mode 100644
index 000000000000..40fb0b5f5fae
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/gr-0.72.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtgui:5 media-libs/fontconfig media-libs/glfw media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/qhull:= net-libs/zeromq sys-libs/zlib virtual/opengl x11-libs/agg x11-libs/libX11 x11-libs/libXt cairo? ( x11-libs/cairo ) ffmpeg? ( media-video/ffmpeg:= ) postscript? ( app-text/ghostscript-gpl ) tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype )
+DESCRIPTION=Universal framework for cross-platform visualization applications
+EAPI=8
+HOMEPAGE=https://gr-framework.org/
+INHERIT=cmake
+IUSE=cairo ffmpeg postscript tiff truetype
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-qt/qtgui:5 media-libs/fontconfig media-libs/glfw media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/qhull:= net-libs/zeromq sys-libs/zlib virtual/opengl x11-libs/agg x11-libs/libX11 x11-libs/libXt cairo? ( x11-libs/cairo ) ffmpeg? ( media-video/ffmpeg:= ) postscript? ( app-text/ghostscript-gpl ) tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype )
+REQUIRED_USE=cairo? ( truetype )
+SLOT=0
+SRC_URI=https://github.com/sciapp/gr/archive/v0.72.0.tar.gz -> gr-0.72.0.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=091f2c1c4d92022125192723f72514c4
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 10e5909e018b..5c7be837a177 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/servicelog-1.1.16 b/metadata/md5-cache/sys-apps/servicelog-1.1.16
index 0018409bcf60..4259912e8eab 100644
--- a/metadata/md5-cache/sys-apps/servicelog-1.1.16
+++ b/metadata/md5-cache/sys-apps/servicelog-1.1.16
@@ -5,10 +5,10 @@ DESCRIPTION=Provides utilities for logging service-related events
 EAPI=8
 HOMEPAGE=https://github.com/power-ras/servicelog
 INHERIT=autotools
-KEYWORDS=~ppc ~ppc64
+KEYWORDS=ppc ppc64
 LICENSE=GPL-2+
 RDEPEND=sys-libs/libservicelog virtual/logger
 SLOT=0
 SRC_URI=https://github.com/power-ras/servicelog/archive/v1.1.16.tar.gz -> servicelog-1.1.16.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=dfde27278aeac8f215364bfaa633d5d3
+_md5_=00383b48be4174499e6900ee2821b2a8
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 83106d4d2c45..8fb547112b76 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.26.3 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.26.3
new file mode 100644
index 000000000000..c7a4a2e1761a
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.26.3
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install unpack
+DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
+DESCRIPTION=Kubernetes API server
+EAPI=8
+HOMEPAGE=https://kubernetes.io
+INHERIT=bash-completion-r1 go-module systemd
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.3.tar.gz -> kubernetes-1.26.3.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	f9700c7efec1fd4955363169e9930c1c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=4cd4947a68a2a8004bd2a53e2d46b9ee
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.26.3 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.26.3
new file mode 100644
index 000000000000..057bccfe26c5
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.26.3
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=8
+HOMEPAGE=https://kubernetes.io
+INHERIT=go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.3.tar.gz -> kubernetes-1.26.3.tar.gz
+_eclasses_=go-module	f9700c7efec1fd4955363169e9930c1c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=72c01f80663487d145745735cb43ad55
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.26.3 b/metadata/md5-cache/sys-cluster/kube-proxy-1.26.3
new file mode 100644
index 000000000000..7cfce1025ce9
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.26.3
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Kubernetes Proxy service
+EAPI=8
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+INHERIT=go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=net-firewall/conntrack-tools
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.3.tar.gz -> kubernetes-1.26.3.tar.gz
+_eclasses_=go-module	f9700c7efec1fd4955363169e9930c1c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=4d07d6e6a85f4283214166e3e03bd6da
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.26.3 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.26.3
new file mode 100644
index 000000000000..53d3d8973615
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.26.3
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
+DESCRIPTION=Kubernetes Scheduler
+EAPI=8
+HOMEPAGE=https://kubernetes.io
+INHERIT=go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.3.tar.gz -> kubernetes-1.26.3.tar.gz
+_eclasses_=go-module	f9700c7efec1fd4955363169e9930c1c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=27109a0647e998e2663cfeb27fd9d8df
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.26.3 b/metadata/md5-cache/sys-cluster/kubeadm-1.26.3
new file mode 100644
index 000000000000..d9b8a37da493
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.26.3
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
+EAPI=8
+HOMEPAGE=https://kubernetes.io
+INHERIT=bash-completion-r1 go-module
+IUSE=hardened selinux
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=app-containers/cri-tools selinux? ( sec-policy/selinux-kubernetes )
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.3.tar.gz -> kubernetes-1.26.3.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	f9700c7efec1fd4955363169e9930c1c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=9134c716e4a64b1e49b242943c6f147a
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.26.3 b/metadata/md5-cache/sys-cluster/kubectl-1.26.3
new file mode 100644
index 000000000000..0616e09bd372
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.26.3
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=8
+HOMEPAGE=https://kubernetes.io
+INHERIT=bash-completion-r1 go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.3.tar.gz -> kubernetes-1.26.3.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	f9700c7efec1fd4955363169e9930c1c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=8d7568fac85c8036aac1e62b6f4ea63f
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.26.3 b/metadata/md5-cache/sys-cluster/kubelet-1.26.3
new file mode 100644
index 000000000000..2ff7fa65c6bf
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.26.3
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.19 >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Kubernetes Node Agent
+EAPI=8
+HOMEPAGE=https://kubernetes.io
+INHERIT=go-module systemd
+IUSE=hardened selinux
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=selinux? ( sec-policy/selinux-kubernetes )
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.26.3.tar.gz -> kubernetes-1.26.3.tar.gz
+_eclasses_=go-module	f9700c7efec1fd4955363169e9930c1c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=5af1a3c3e2ecac0c7e0ebb16fbfff2da
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index ca6412785102..6eb6bfbead9f 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/gcc-11.3.1_p20230407 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20230407
new file mode 100644
index 000000000000..e824752a7ade
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20230407
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=11
+SRC_URI=mirror://gcc/snapshots/11-20230407/gcc-11-20230407.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-8.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-2.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	6606f693903d22cae31ee15130264389	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=4ef0d5aa26969e62e27873f2cf54366d
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 3ecfb820afdb..c5be7b3e035d 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.47.0 b/metadata/md5-cache/sys-fs/e2fsprogs-1.47.0
index 57d6dbb47ed5..e4e99f1e24e0 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.47.0
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.47.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 INHERIT=flag-o-matic multilib-minimal systemd toolchain-funcs udev usr-ldscript
 IUSE=cron fuse nls static-libs test +tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 BSD
 RDEPEND=!sys-libs/e2fsprogs-libs cron? ( sys-fs/lvm2[lvm] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) tools? ( sys-apps/util-linux )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.47.0/e2fsprogs-1.47.0.tar.xz
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960
-_md5_=275dcac1fe3cf67507bd804461fb6d10
+_md5_=9f25ad52685ae74fad2b05383fe83a1f
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 420a1dc883fc..23cf0baa0873 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r1 b/metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r1
deleted file mode 100644
index bf0bd9e55a3d..000000000000
--- a/metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=small utility to wait for an arbitrary process to exit
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~zzam/wait_on_pid/
-INHERIT=toolchain-funcs
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/wait_on_pid-0.0.2.tar.bz2 https://dev.gentoo.org/~zzam/wait_on_pid/wait_on_pid-0.0.2.tar.bz2
-_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8ee453028bc150f6c5be6a2a7824ecd5
diff --git a/metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r2 b/metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r2
index 8768264ba220..563883a96a4a 100644
--- a/metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r2
+++ b/metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r2
@@ -3,9 +3,9 @@ DESCRIPTION=Small utility to wait for an arbitrary process to exit
 EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~zzam/wait_on_pid/
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/wait_on_pid-0.0.2.tar.bz2 https://dev.gentoo.org/~zzam/wait_on_pid/wait_on_pid-0.0.2.tar.bz2
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3f67d9ca7820096e876b7339216fd37b
+_md5_=32ba5fa23bfeefc079184af81fa47b75
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 0b84c6795f92..3992821c3f0e 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/h2o-2.2.6-r1 b/metadata/md5-cache/www-servers/h2o-2.2.6-r1
index 6a17bcc935c5..f9a4b36bdfd2 100644
--- a/metadata/md5-cache/www-servers/h2o-2.2.6-r1
+++ b/metadata/md5-cache/www-servers/h2o-2.2.6-r1
@@ -1,6 +1,6 @@
 BDEPEND=libh2o? ( virtual/pkgconfig ) mruby? ( sys-devel/bison virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-3.20.5 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=acct-group/h2o acct-user/h2o dev-lang/perl !sci-libs/libh2o sys-libs/zlib libh2o? ( dev-libs/libuv ) dev-libs/openssl:0= mruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems || ( dev-libs/onigmo dev-libs/oniguruma ) )
+DEPEND=acct-group/h2o acct-user/h2o dev-lang/perl !sci-libs/libh2o sys-libs/zlib libh2o? ( dev-libs/libuv ) dev-libs/openssl:0= mruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) || ( dev-libs/onigmo dev-libs/oniguruma ) )
 DESCRIPTION=H2O - the optimized HTTP/1, HTTP/2 server
 EAPI=8
 HOMEPAGE=https://h2o.examp1e.net/
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=acct-group/h2o acct-user/h2o dev-lang/perl !sci-libs/libh2o sys-libs/zlib libh2o? ( dev-libs/libuv ) dev-libs/openssl:0=
 SLOT=0
 SRC_URI=https://github.com/h2o/h2o/archive/v2.2.6.tar.gz -> h2o-2.2.6.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	ssl-cert	33f6c352c602e87ceda767a86f3b7131	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	ssl-cert	33f6c352c602e87ceda767a86f3b7131	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6c32a8a933c2684d7d27e7d9ba289cf2
diff --git a/metadata/md5-cache/www-servers/h2o-9999 b/metadata/md5-cache/www-servers/h2o-9999
index dda3a2fcead7..85aa5eb7ec3d 100644
--- a/metadata/md5-cache/www-servers/h2o-9999
+++ b/metadata/md5-cache/www-servers/h2o-9999
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=acct-group/h2o acct-user/h2o dev-lang/perl dev-libs/openssl:0= !sci-libs/libh2o sys-libs/libcap sys-libs/zlib libh2o? ( app-arch/brotli dev-libs/libuv ) mruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems || ( dev-libs/onigmo dev-libs/oniguruma ) sys-devel/bison )
+DEPEND=acct-group/h2o acct-user/h2o dev-lang/perl dev-libs/openssl:0= !sci-libs/libh2o sys-libs/libcap sys-libs/zlib libh2o? ( app-arch/brotli dev-libs/libuv ) mruby? ( || ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ) || ( dev-libs/onigmo dev-libs/oniguruma ) sys-devel/bison )
 DESCRIPTION=H2O - the optimized HTTP/1, HTTP/2 server
 EAPI=8
 HOMEPAGE=https://h2o.examp1e.net/
@@ -10,5 +10,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=acct-group/h2o acct-user/h2o dev-lang/perl dev-libs/openssl:0= !sci-libs/libh2o sys-libs/libcap sys-libs/zlib libh2o? ( app-arch/brotli dev-libs/libuv )
 SLOT=0
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	ssl-cert	33f6c352c602e87ceda767a86f3b7131	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	ssl-cert	33f6c352c602e87ceda767a86f3b7131	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=89459786a074db47ad63f6f8645f5021
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index bd81c533faa0..7fe230bc60ad 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/cairo-1.17.8 b/metadata/md5-cache/x11-libs/cairo-1.17.8
index be892619794f..994f2d37d2b0 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.17.8
+++ b/metadata/md5-cache/x11-libs/cairo-1.17.8
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo
 INHERIT=meson-multilib
 IUSE=X aqua debug +glib gtk-doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=>=dev-libs/lzo-2.06-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2[png,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pixman-0.36[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] debug? ( sys-libs/binutils-libs:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/cairo/cairo/-/archive/1.17.8/cairo-1.17.8.tar.bz2
 _eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=70f4ddd45283137a1a4f32845be191e6
+_md5_=832607cc2a201fbab4caac6e17c1e095
diff --git a/metadata/md5-cache/x11-libs/libXaw-1.0.15 b/metadata/md5-cache/x11-libs/libXaw-1.0.15
index bae218251aa8..5252082c98c9 100644
--- a/metadata/md5-cache/x11-libs/libXaw-1.0.15
+++ b/metadata/md5-cache/x11-libs/libXaw-1.0.15
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXaw
 INHERIT=xorg-3
 IUSE=deprecated abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXpm-3.5.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXaw-1.0.15.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=3ee00b209ffb9a769e4ea53dbed675fb
+_md5_=89f2938210b1a56ec9480aceb031f991
diff --git a/metadata/md5-cache/x11-libs/libgxim-0.5.0 b/metadata/md5-cache/x11-libs/libgxim-0.5.0
index c35c11d410f4..db597f73fde1 100644
--- a/metadata/md5-cache/x11-libs/libgxim-0.5.0
+++ b/metadata/md5-cache/x11-libs/libgxim-0.5.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 dev-lang/ruby:3.2 ) virtual/rubygems dev-util/glib-utils dev-util/intltool sys-devel/autoconf-archive sys-devel/gettext virtual/pkgconfig test? ( dev-libs/check ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+BDEPEND=|| ( ( dev-lang/ruby:3.0 virtual/rubygems[ruby_targets_ruby30(-)] ) ( dev-lang/ruby:2.7 virtual/rubygems[ruby_targets_ruby27(-)] ) ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ( dev-lang/ruby:3.2 virtual/rubygems[ruby_targets_ruby32(-)] ) ) dev-util/glib-utils dev-util/intltool sys-devel/autoconf-archive sys-devel/gettext virtual/pkgconfig test? ( dev-libs/check ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-apps/dbus virtual/libintl x11-libs/gtk+:2 x11-libs/libX11
 DESCRIPTION=GObject-based XIM protocol library
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-apps/dbus virtual/libintl x11-lib
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/tagoh/libgxim/downloads/libgxim-0.5.0.tar.bz2
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=0dff647d8da51e282e8301128df8b8ac
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 0e117dd76311..8d6dc39d05eb 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/qt5ct-1.5 b/metadata/md5-cache/x11-misc/qt5ct-1.5
deleted file mode 100644
index ac5e9d9161db..000000000000
--- a/metadata/md5-cache/x11-misc/qt5ct-1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 dev-qt/qtpaths:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5=[dbus] dev-qt/qtwidgets:5
-DESCRIPTION=Qt5 configuration tool, similar to qtconfig for Qt4
-EAPI=8
-HOMEPAGE=https://sourceforge.net/projects/qt5ct/
-INHERIT=cmake
-KEYWORDS=amd64 ~arm ~ppc64 x86
-LICENSE=BSD-2
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5=[dbus] dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://download.sourceforge.net/qt5ct/qt5ct-1.5.tar.bz2
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bdd93c3f0ad8378c99312f60f0fc9a59
diff --git a/metadata/md5-cache/x11-misc/qt5ct-1.6 b/metadata/md5-cache/x11-misc/qt5ct-1.6
deleted file mode 100644
index 5f912f599cc3..000000000000
--- a/metadata/md5-cache/x11-misc/qt5ct-1.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 dev-qt/qtpaths:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5=[dbus] dev-qt/qtwidgets:5
-DESCRIPTION=Qt5 configuration tool, similar to qtconfig for Qt4
-EAPI=8
-HOMEPAGE=https://sourceforge.net/projects/qt5ct/
-INHERIT=cmake
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5=[dbus] dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://download.sourceforge.net/qt5ct/qt5ct-1.6.tar.bz2
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=43f2686ac231078f8f4e3d445a1467ea
diff --git a/metadata/md5-cache/x11-misc/qt5ct-1.7 b/metadata/md5-cache/x11-misc/qt5ct-1.7
index dd2e54304c2a..9caed56989bc 100644
--- a/metadata/md5-cache/x11-misc/qt5ct-1.7
+++ b/metadata/md5-cache/x11-misc/qt5ct-1.7
@@ -5,10 +5,10 @@ DESCRIPTION=Qt5 configuration tool, similar to qtconfig for Qt4
 EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/qt5ct/
 INHERIT=cmake
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=BSD-2
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5=[dbus] dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://download.sourceforge.net/qt5ct/qt5ct-1.7.tar.bz2
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=43f2686ac231078f8f4e3d445a1467ea
+_md5_=55508fbdacc8f6605eaca4794e79a10f
diff --git a/metadata/md5-cache/x11-misc/xbitmaps-1.1.3 b/metadata/md5-cache/x11-misc/xbitmaps-1.1.3
index d8d241d6b777..776763912625 100644
--- a/metadata/md5-cache/x11-misc/xbitmaps-1.1.3
+++ b/metadata/md5-cache/x11-misc/xbitmaps-1.1.3
@@ -4,9 +4,9 @@ DESCRIPTION=X.Org bitmaps data
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/data/xbitmaps
 INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/data/xbitmaps-1.1.3.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=ea95be51d06d073d26a9850c9efb3523
+_md5_=3dec4db3028e814cc49e4f5c4f2f3025
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.38 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.38
index 2856b16c689b..23a0cbfbe3f4 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.38
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.38
@@ -4,9 +4,9 @@ DESCRIPTION=X keyboard configuration database
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
 INHERIT=meson python-any-r1
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.38.tar.xz
 _eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=13df0a7c0886912d226405fdf8c25554
+_md5_=38de4cf7122e7f4d5069fcbf2bce8813
diff --git a/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.8 b/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.8
index daf35d39be7d..63b066195d5c 100644
--- a/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.8
+++ b/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.8
@@ -3,8 +3,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Old Imake-related build files
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/cf
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/util/xorg-cf-files-1.0.8.tar.xz
-_md5_=64a2d9feb5027d8579fc9f4c0911f535
+_md5_=8177e1fee8d3ce0af8b4bf643311eaa8
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 8e689f283aba..c3e58d00a305 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/xcursor-themes-1.0.7 b/metadata/md5-cache/x11-themes/xcursor-themes-1.0.7
index 51907b00a67f..a4486b268a47 100644
--- a/metadata/md5-cache/x11-themes/xcursor-themes-1.0.7
+++ b/metadata/md5-cache/x11-themes/xcursor-themes-1.0.7
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org cursor themes: whiteglass, redglass and handhelds
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/data/xcursor-themes
 INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXcursor
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/data/xcursor-themes-1.0.7.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=33ce73f7ebed2c20bff4c731c2f0e738
+_md5_=88b5a4f5e38007c081735e60a7375540
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 6fb1b1bfd496..b1fc72baddf0 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/xfce4-panel-4.18.3 b/metadata/md5-cache/xfce-base/xfce4-panel-4.18.3
index 5b775bbbd443..ec765473c71d 100644
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.18.3
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.18.3
@@ -6,11 +6,11 @@ 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
+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
+_md5_=dff325ea44d71eb2b0abe373e8d646ce
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index d0dd0c6192e3..9959c34365cc 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15493 BLAKE2B ec5ea168778a79b147975de4177e6e700a7d37e6ee037cb43e8a2fb5109fe7703b6271a466b25edb7a1f6a61aa9467b69f02382396560dc259c3acdd5e880f30 SHA512 24314abdcaad22302e8e4885bab38f0250026f6284cc14fc2d6d81378bea47d1c1e985134c2fc0d63a8bc88f3563b53ea9e7b90d1e24f24b6733a9cc9fe4c83a
-TIMESTAMP 2023-04-08T16:10:00Z
+TIMESTAMP 2023-04-08T22:10:03Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQxkdhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQx5jtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD9ow//Z6Dyw59uIwQKZqQJRq3ltUKmvYdyXZ7s6gyi8IWcQf1iZOYSPhcW3hNf
-RsnF+/jUE0CSvUTsSRjfOXMNWnoqKVwficnsdrSHWo/kE+mYolwq6KDLuRKWNV/1
-2Auzm88ciiONlZaI7OJsxW9JJwkSr8LsYuvfesxBK0YU1VX1bps3XXhhaGfHrIRU
-znWFT7o+2Ca4j182PEgra3Gpm/mJU3x/HfDs9XQaUXMQF70RREGraNlaF28EVSS2
-/Chg5oBtd93ISDMJoGc/5dur1vSIXibgwz/JjcMBXaTeMoIiQVZ+xLSxeIocUS5O
-yitybRWBflFnvQseLSatoOpzZMbhVe1WODASX5+9oC1LyxNfgkn2VSAyGnvc6oRz
-xz+HY6i5gayKgOjbM1kEBMIDf0Rb1Fq8y7fyWwBeCVlHdBKA+v8dqMc290wVnlwM
-I95TvJy4NHCVZP/90ym/qmAzjIb48EN2/9eWoRBhrGeBGYLbBgcn8ZOgE6z5axuO
-1jyjuzjtQc+ZUTY75HZDiGVOTTm/+plVQMsc0YmmBRVSSk08yHDF4e1yPt3ep7Js
-JMGxj2UglcbXbVm/XvGrioQHBGY9dXg9iN+NSjN0/SRde248FnqvLuAohCc0aMtF
-NFZ67HtgBlqLrwIBE+0NSEw9If4uJ7pO+3AJOu+aq+X3krbERBI=
-=HvSB
+klA1SQ/9F+WhxeHxbB4iXPmF5jNORwnRvlIjO+ntBWLAxcXyO+Mb/MNfy7ZCQ8Us
+fQG0g8CViED8KdfcgxYWgS/x2ERFzmeDstIgcDWJO6DVYnaZ7g5VoEYchCMAvqsd
+9ZeMnOkOIaQ+mMBWgz6yzTfiHGAnQPmZ15jgm/4cdpbzs6gBzIRGI9oO0fADvWbd
+ShybkDptpYzF3XXC2GFJC593m7aIEpBM5W786DuR+0WKuv29MviDInVlqAKCTh+6
+rKrsYjDWgXKpJEgWrz+YEGsmaLHGzJqJLMSRS4eejfGBNLaQV72md18loChNMsHI
+uWFjA0ScFkVxwv+2XbPab+AP/2bFzCv+4PTj6KbptPIqRLa/KKMOYw6sk4e1PjHm
+KaxTYmY5kiyY840R4nsTC84o4T44aJCSmf65H1s2LKsAYoqF1M0+wB2ixlksfzZP
+uwhCbKZmZTHpW+gSoLCHxOCm0Jw4FlA6jm6Kdm/SkVgfanl+eR9l+ITL1fbDpMvN
+9rhuLOVMrD375uL/hGhotlvQcmFlytS1SnDGeg3fMiyNg/yz3A75eKZODwNNLPEp
+0XUeOhwoi2PgiPzFxb8IoJ0DftADcczzoXCzFanbhahKYdS9jeQAtkI27IEu0VQv
+jogh0i23drBLVwhB0MytfL6jieohXl5kB2KFJDy0JH/GwBcDP5o=
+=1wd7
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 34d020fd9c29..69df9a44f050 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 08 Apr 2023 16:09:57 +0000
+Sat, 08 Apr 2023 22:10:01 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 51dd5c5f8b7e..70f62a5815ae 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Apr  8 04:09:57 PM UTC 2023
+Sat Apr  8 10:10:00 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index ea3711185622..90d3a0642345 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 08 Apr 2023 16:15:01 +0000
+Sat, 08 Apr 2023 22:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index a93d74bb2c2e..991403dd093f 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-6755bd99fdbd856900136accfb1664afe50506d7 1680966466 2023-04-08T15:07:46+00:00
+d2e56b2be6857b00765f13e293665231c7f42e69 1680990631 2023-04-08T21:50:31+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index d99607763c9e..e1b5017ad928 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1680970201 Sat 08 Apr 2023 04:10:01 PM UTC
+1680991801 Sat 08 Apr 2023 10:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 34d020fd9c29..e7c21668ac2c 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 08 Apr 2023 16:09:57 +0000
+Sat, 08 Apr 2023 22:10:00 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 1429b18f05a8..710c1a9e4cf2 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index a5f5ec47e5b8..ffc01044815b 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -6,8 +6,11 @@ DIST tcpdump-4.99.2.tar.gz 1897480 BLAKE2B be13fbf493478270c8ebc034a3c1467907a00
 DIST tcpdump-4.99.2.tar.gz.sig 442 BLAKE2B 011c93803a1c339f9ce46dedb8e3420d77c5362575061c9b852647d8e8de6936079150240b444f660a84b9e45337960b8878e7c4de1f4e6ad2fff16225811d24 SHA512 33704e9b2ece65ca8a1fbf8234088e561f132a561ac859da32c7fb4d4caaeabd9a4b50ac8f939e48c18e672dade9393c7e56bc838ec8ac9828be5360e99e5692
 DIST tcpdump-4.99.3.tar.gz 1901814 BLAKE2B 8e8adda6df40f3a79cbeb80bd01d43834e0b3ec44c8227bda2260b43ea0852f76beb02199120cca16adae0d793841cf684e7e276e520f49479a1b04ab1dc4821 SHA512 e1442e923d89f367cfe403dc460d0d46e19a241470d56b30b7a411bedd8d21a78c428f20ffe725cbb4fa5068f7dcc5c93d206e1a8d53feb9bccc6f0cda8bf0f9
 DIST tcpdump-4.99.3.tar.gz.sig 442 BLAKE2B 97dbac4534f9b9daf0ab89d6a230835690737827330d4a6f15e7450bd8aed24af2bc097bf41511bb40534687623ffe63fb766c5e344ce66483c9dd5f34427155 SHA512 a7dfd95c11fa9066740552acc9ebfa1c674ba9242dfb6dddf27658845245b8677b4c2da392cfe1447f32b929e108e9ff5326a94cdc0be9502a05e0efc15a5934
+DIST tcpdump-4.99.4.tar.gz 1903612 BLAKE2B f100e10774574ef04a770bc30d4e2d06fd0f1f16a7b2c88848be6e8290cc4838666ff378d9f78fdc418f4ffab9716a11214edc3588c292cb5ff39636cd7cfd2d SHA512 cb51e19574707d07c0de90dd4c301955897f2c9f2a69beb7162c08f59189f55625346d1602c8d66ab2b4c626ea4b0df1f08ed8734d2d7f536d0a7840c2d6d8df
+DIST tcpdump-4.99.4.tar.gz.sig 442 BLAKE2B 2ee35036d86f643b378591c0eb93d8a0f08cb2f0e3638bde25515d550b40fef1bf0eb6c876d4d6512fa795041b0703954ca884c646c4af8771b4bc4049e7609a SHA512 bec395f0f595a37121bc144bac133f3fb31c6c1007cdadf061e4437d6fe2406c0cb0d5b68b5c63e03b932c783bfb58f0af0b7e8a58bb81beb9de6a0d681620e8
 EBUILD tcpdump-4.99.1-r1.ebuild 2381 BLAKE2B ff478905635a0873ef9c13e27716e4eff5eb733fc4984904458e8400898161474a33aea7aacf3b0b108feb98e283af845e1be8e2a66d36ca9e046fe123833372 SHA512 1ff9d8b7ccd4929d61d48d1f2b7cb5cf2055bfeccd91634664be803d337cad8e5a412dce88ae59a9c26deb6c6bf0ae88197d9152e79b57db3f5dfbd9c1e82349
 EBUILD tcpdump-4.99.2.ebuild 2146 BLAKE2B fbe007af365c3d9438939fe17f8f903660f07edf994f9341b79f61d10912f89a256f3421e525ea8866fca106f18b2ff55687910263f9be7f6acee60d0736e8df SHA512 8f4b54c4660cdb10f2b4be882161cd3b5a17c56e5603ef059f1a2c4c3580faa0917d264f8152538dbc2bb8e32d7fb9448da4041147985cc73657b26d9aa1ed3a
 EBUILD tcpdump-4.99.3.ebuild 2115 BLAKE2B 37bda3fe4cd04cb8fd791544687481366b4d0f4b1fb191ba5db84ef18e245a5bcc5dc08dd4c64762181414f9496defa0dc1c12205bccbf5dc0b1daa68ab83ff6 SHA512 3948eee9b67e478a3f79c6239e5bc38dd62b421880f61dbe063d8ef7ec92d1a1dbfec0679634bab4153e2f34fbf91856620eef283334cfc645956c4107e105b8
+EBUILD tcpdump-4.99.4.ebuild 2122 BLAKE2B faf5926fb5ce40c6e7357664dd142c8ae74c892a9c059500e85a81e7db977d8ba3638d3d4fa4837da758f9bd1dc6a04b200fcee9c9a4c037593a0f72e0c6541c SHA512 9a15c2c766c1fb8471545b6aa5988596e166b4f0a7d0b12dcafdf2cc2cf99037f54ef9ce2e9bd11235840451598a3a2f81557e3fdc057b13147ec8412e03cdfb
 EBUILD tcpdump-9999.ebuild 2122 BLAKE2B faf5926fb5ce40c6e7357664dd142c8ae74c892a9c059500e85a81e7db977d8ba3638d3d4fa4837da758f9bd1dc6a04b200fcee9c9a4c037593a0f72e0c6541c SHA512 9a15c2c766c1fb8471545b6aa5988596e166b4f0a7d0b12dcafdf2cc2cf99037f54ef9ce2e9bd11235840451598a3a2f81557e3fdc057b13147ec8412e03cdfb
 MISC metadata.xml 593 BLAKE2B 7b4608973227459d0700d2f402e583a8cad512ca898287c2b32c71f42f6674a2c27cdc94d60e4af6fbe0df1478b8c2a2e0832d249adefbb7768ca1db0f3650b4 SHA512 45196d5f82e8bd5b26e2327a9a85ff7e49daabc5f396d7183a8cd6f3fbabef0d84014e355aa257c861487570f695ec07698e783624447d8d5120a03bbcf0fcd3
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.4.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.4.ebuild
new file mode 100644
index 000000000000..8d03b876b291
--- /dev/null
+++ b/net-analyzer/tcpdump/tcpdump-4.99.4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A tool for network monitoring and data acquisition"
+HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
+	inherit verify-sig
+
+	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="+drop-root +smi +ssl +samba suid test"
+REQUIRED_USE="test? ( samba )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=net-libs/libpcap-1.10.1
+	drop-root? (
+		acct-group/pcap
+		acct-user/pcap
+		sys-libs/libcap-ng
+	)
+	smi? ( net-libs/libsmi )
+	ssl? (
+		>=dev-libs/openssl-0.9.6m:=
+	)
+	suid? (
+		acct-group/pcap
+		acct-user/pcap
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-lang/perl
+	)
+"
+BDEPEND="drop-root? ( virtual/pkgconfig )"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-libdir.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable samba smb) \
+		$(use_with drop-root cap-ng) \
+		$(use_with drop-root chroot '') \
+		$(use_with smi) \
+		$(use_with ssl crypto "${ESYSROOT}/usr") \
+		$(usex drop-root "--with-user=pcap" "")
+}
+
+src_test() {
+	if [[ ${EUID} -ne 0 ]] || ! use drop-root ; then
+		emake check
+	else
+		ewarn "If you want to run the test suite, make sure you either"
+		ewarn "set FEATURES=userpriv or set USE=-drop-root"
+	fi
+}
+
+src_install() {
+	dosbin tcpdump
+	doman tcpdump.1
+	dodoc *.awk
+	dodoc CHANGES CREDITS README.md
+
+	if use suid ; then
+		fowners root:pcap /usr/sbin/tcpdump
+		fperms 4110 /usr/sbin/tcpdump
+	fi
+}
+
+pkg_postinst() {
+	use suid && elog "To let normal users run tcpdump, add them to the pcap group."
+}
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index d8445632a9ab..611dca30a647 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -60,6 +60,6 @@ EBUILD zabbix-6.2.6.ebuild 10207 BLAKE2B 083d2f1350ad83bd6011a28dba9229a1403f2fa
 EBUILD zabbix-6.2.7.ebuild 10208 BLAKE2B d70477439d64051a0398205cce5ec3f5b47fbb198d04b065597d303ec14ff2b9bdbabbfc570fc62dacd94c4971c3d4142673b117f81dcfa9f3137a853b02fe51 SHA512 0a5210f2ddd059fe0894ac644158fa7cdbe13c67dceb925573d724084104d56414fa50fa5db48e0c12a1ebe8556c7699f3f3cca3028d02c88f227e950d2eb6d6
 EBUILD zabbix-6.2.8.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
 EBUILD zabbix-6.2.9.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
-EBUILD zabbix-6.4.0.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
+EBUILD zabbix-6.4.0.ebuild 10207 BLAKE2B 083d2f1350ad83bd6011a28dba9229a1403f2fa5b2f92559a8bdeb32a7c6b7cc167ad8d64dfae717dee251cd9de696607dd5adc21626409e019e28c7d307dcc2 SHA512 76e6db0eb214a0fb87326f2b96093bab7f70de7b1f6b66c25d559da1db704f08653d31e2dfa3671bab180eb54d088edf8512992e4a9f20d75752d0562e6d21bc
 EBUILD zabbix-6.4.1.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
 MISC metadata.xml 1655 BLAKE2B 46ab1f5adaff6069890380b23a6edaf8f0f7380ffc4a320f17df52f2e59867bdcf09633d9c6e242434919d3512d557c2f623d2826b1453424c43dc0b0ee0a262 SHA512 62e5a8853c13dac034360bd1a7b61987b548641b76860f05a8f75181b8d8029e06bc9cbf136d42836e714cf0c193b04a589d214a7864d607bf93dd97066f1a70
diff --git a/net-analyzer/zabbix/zabbix-6.4.0.ebuild b/net-analyzer/zabbix/zabbix-6.4.0.ebuild
index f3edadcff0ce..21333f63c79d 100644
--- a/net-analyzer/zabbix/zabbix-6.4.0.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.4.0.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 5f84e448a2b5..864360e6f512 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/resolv_wrapper/Manifest b/net-dns/resolv_wrapper/Manifest
index 65ded0f6c9e5..3476e9983b93 100644
--- a/net-dns/resolv_wrapper/Manifest
+++ b/net-dns/resolv_wrapper/Manifest
@@ -1,5 +1,3 @@
-DIST resolv_wrapper-1.1.7.tar.gz 45148 BLAKE2B d1b860187bfa3be6eadd848abc458d5c9e3c4c4048a70b37d7548caf2604bda51f8a3606487fb95d682ab39e06f63f29b85de981ae32527997799fa5d72befab SHA512 531a7734f40d8a7cb3da4618eebbb4530657ad2cdcf3c1cd48f3ae1dcf55fc003205e44745fc3f70704060ae0c6a2516919c61fd10223ff56d90a47a3c59b3c0
 DIST resolv_wrapper-1.1.8.tar.gz 38051 BLAKE2B f9f4dee2d83a66d4efe911b9fc55ff1e06ad13fc876652416ce2c0cfa877d1be6b590bd322ad6b642a30a8d352bb3148ee79b5c1999b7ceedd338b711239cc34 SHA512 64cb722b3530b5669de1eba379ca4a577b505ac4be624d63a3988b16df2e3082489f48db099cba256dded9483ae913144b9a5c0c6e01af20da0709bd79c461c4
-EBUILD resolv_wrapper-1.1.7.ebuild 777 BLAKE2B 76225dee6b0a3ec4fbc081ca0603d1f6b30c9bb40a28f005240b2a8667c94f7b93cc0ba12e7a115d309d162fe83679bde87932e14441e79eb00d60e40f76b574 SHA512 6d3e6c95e448ed2165c255c3cb6607d119e5bd73c593e021c151a0961f72fc81ae3f2b87a19d982b04b184d137774533f644f2a5ca7c26895b462dccafdb6ea7
 EBUILD resolv_wrapper-1.1.8.ebuild 777 BLAKE2B 9ed24d507031dd2abe789d621caec0a5daa37383c4d66e1c6436112bed6b3639f331654c300db9be4e6af8ce42f7e6f2c1ae8d437766ddd90a729cc429bf7c73 SHA512 030bd3094bd540b7c9b4e1872b0b66209cd846bc51dc42880e63a09889eb7e1bd854e53c63d0c52f4ea1423527c7f5999eda271b7b8a780b4be246e86f35d800
 MISC metadata.xml 250 BLAKE2B e398673dd1a3522ccddb89a82a53fc2578d8e0777ec46f889d01d618609a22958d91699beef513c7912799e0e8ff985200f7c67bba941235da25c24cd4b48f09 SHA512 16834c3cbecd0dd5a9c8c311d2b8ebc63d8cd72c5891498f4f0048988993c104aadd4e24e632bf54071c11f810716432e89e4afab029555875f9f52794daa6e9
diff --git a/net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild b/net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild
deleted file mode 100644
index e04f7644e5e2..000000000000
--- a/net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Wrapper for DNS name resolving or DNS faking"
-HOMEPAGE="https://cwrap.org/resolv_wrapper.html"
-SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? (
-		dev-util/cmocka
-		net-libs/socket_wrapper
-	)"
-
-# Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340)
-# Because of this we cannot use cmake-multilib_src_configure() here.
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
-		-DUNIT_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 197d61336bec..8a7171140373 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libnpupnp/Manifest b/net-libs/libnpupnp/Manifest
index 7bdd1f69434e..bf317c908585 100644
--- a/net-libs/libnpupnp/Manifest
+++ b/net-libs/libnpupnp/Manifest
@@ -1,5 +1,3 @@
-DIST libnpupnp-5.0.0.tar.gz 545368 BLAKE2B a0b83186df66ff5608a7d579d3653028497ce92536ea85abc03c73134046c4f55ad31fb849c7231cf7842a424e4f408747f7da3769aae441499fd7ec7ae2544f SHA512 325be49f64d901e67aaf3893ac91f21523e81b1810c717f70a40486dde65080620ffa38f622ec785475b181f84a6d51fad89a86e709a9bd5554f278b90ae92f9
 DIST libnpupnp-5.0.1.tar.gz 553258 BLAKE2B 141967e60a4776b6470dc55d2b0736e17281c671d7f102aee9553ff48d66833ec0c97d405427161989130f6cac21c90c2663f945e6c69c317de710a08e84627a SHA512 2a8cd7c1f2bd710a9b72d69dde56b2e5094ef1b6282239377f7fd15e0a6d9f85218f5b95ec17dabc678897f2d597cf7bf800890524762488c0e6fcc315a8cef7
-EBUILD libnpupnp-5.0.0.ebuild 850 BLAKE2B ef0c518353ca869a56e171b36f11063acaa153a44711c460e37f77e25304aeccf961c6c8f69a20806f860711399c0514f1316876fcf38979ac7837d7ec15e973 SHA512 41dfed61f5fc31eae948fa457d9b660d6af76c2b129ebca47a14e7b9bc7d2a02c054abb87dcb50365fca0e55198a26d7a8c359f24c844ad0acf540386e584031
-EBUILD libnpupnp-5.0.1.ebuild 852 BLAKE2B d7f52fb82134a5ce8488bb3c1c2aecc1bb45b4f04bdc1538b5612637d358491af9d62c74597ca98aa0938a589ad99ab78663c321c1fc5364043ee728faeacbd4 SHA512 a0ec2060419d6d691eb674f79ba8edb0510cc3834755d0bb7b0a04efc085c5e1e88296e3e2fe289d013853ad35a2a6c96abf29a4f9e7029b5dedf77f13765dad
+EBUILD libnpupnp-5.0.1.ebuild 850 BLAKE2B ef0c518353ca869a56e171b36f11063acaa153a44711c460e37f77e25304aeccf961c6c8f69a20806f860711399c0514f1316876fcf38979ac7837d7ec15e973 SHA512 41dfed61f5fc31eae948fa457d9b660d6af76c2b129ebca47a14e7b9bc7d2a02c054abb87dcb50365fca0e55198a26d7a8c359f24c844ad0acf540386e584031
 MISC metadata.xml 536 BLAKE2B 10f40312537ef0896c90f23ff327c320fd6c983227f182b46fa2d2d3bbe83044894f07449c9c119c5aa89dc8a889405f14437c0a84c6c52d0116818f9d169d39 SHA512 82d22e0273ed07ff51ce763851f8ea0070e10f6665763543cf96518ab9ef53005c88588cfe3f94855da74a17eae68118d263f12478f0928aca4cad6cce849677
diff --git a/net-libs/libnpupnp/libnpupnp-5.0.0.ebuild b/net-libs/libnpupnp/libnpupnp-5.0.0.ebuild
deleted file mode 100644
index f1e07f46c8cb..000000000000
--- a/net-libs/libnpupnp/libnpupnp-5.0.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A C++ base UPnP library, derived from Portable UPnP, a.k.a libupnp"
-HOMEPAGE="https://framagit.org/medoc92/npupnp"
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-libs/expat
-	net-libs/libmicrohttpd
-	net-misc/curl
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-client \
-		--enable-debug \
-		--enable-device \
-		--enable-gena \
-		--enable-ipv6 \
-		--enable-optssdp \
-		--enable-reuseaddr \
-		--enable-soap \
-		--enable-ssdp \
-		--enable-tools \
-		--enable-webserver
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libnpupnp/libnpupnp-5.0.1.ebuild b/net-libs/libnpupnp/libnpupnp-5.0.1.ebuild
index 9990fede9a9f..f1e07f46c8cb 100644
--- a/net-libs/libnpupnp/libnpupnp-5.0.1.ebuild
+++ b/net-libs/libnpupnp/libnpupnp-5.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-libs/expat
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 5aa03a1579d7..a2e0d6de7ff7 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -7,8 +7,11 @@ DIST libpcap-1.10.2.tar.gz 951063 BLAKE2B f8280c8e12065b4d86e451df8504c834da9c94
 DIST libpcap-1.10.2.tar.gz.sig 442 BLAKE2B c470ff70e58c13dfd1a6d72a00d83883515b9ca63e1561b3acbb75d744b043726df9b8dcb70dfa5ea1c0fa54624a407364d85e83fd3ec4dfd605aa401f5351df SHA512 122bf14c2525a05b2781f6d7bc029d73bcf4584c184220b9f9716def327cc0521ec78d658ad58bdf8a9cd9415ab9ad4d1d24ed1880db25ace6a01a93786bcc5e
 DIST libpcap-1.10.3.tar.gz 951869 BLAKE2B 3614042f7d8cd5a25221f52d2ed09f9f44643cdc0901ff21041ddb7ba85193c667036f7d989c8b59e6e205d630e062da46533110914dd287013a9ff80b31e97f SHA512 57bc07cbc8c326e203ce10ce1eb9f55760fc33320718d8643c65a68949334291877dffcf19af5f61eb9b4eda2d8ffe7bacee38363d2d6536cc85ae81c851684d
 DIST libpcap-1.10.3.tar.gz.sig 442 BLAKE2B 30f0053bc05564fd06aeac751d85eb4838c55c783a0eed450f4de238391c87b8915378f4dc679a14276c9e5e17e9bc74b861241a0a0e86bb22dc2680552f43db SHA512 dc5ae51a96f9dfc570009a5c711a1e4eca012e99d6eb7af3b35c5636199b3273e92a657fdf85688650c093cc9b6c435ba1e9b84100469b2604b8d3125613b4ab
+DIST libpcap-1.10.4.tar.gz 952153 BLAKE2B 05a7eafc1e1817f7844008db89d8fb10cd2525c22f7ee6c9e3d582b14229412f38ccced5e9d80a96dd459ef9eab12eccb5c1dd4978ddc9f66267469212005e4c SHA512 1f6d6ddd07dae7c557054cb246437ecdaf39d579592a5a6bdf1144eea6cb5a779ac4ca647cfed11ec1b0bb18efc63b845444e497070bacefaaed19a5787ae5e1
+DIST libpcap-1.10.4.tar.gz.sig 442 BLAKE2B d0eb5da9a57003848b24d458e50a201d0bb8876a12e63f6627bf9dc1a784e780610cd0c858243cc75a63999b40bc64507b078777ae844ede7c07eef9f4f9e0d5 SHA512 34aa401c2e162d708c61b78b445af2fe4ddc0e57de9124b5cc3a05679ffbc3834088160f83892d827e25c65b33313fe71aa73c2de09935d387252ab315ca5ee1
 EBUILD libpcap-1.10.1-r2.ebuild 2927 BLAKE2B 1a4024dd0a7109b98e4af91fde9c60eceaa519b7fd23c14f24cf3509b89c6275e33b2681dc795e34604ebfb08f65b389eaf6932e35ad611de0d6419cc9343758 SHA512 3f5d60f071b61dad9f9fa0695f7b8706ee6675a2b8a3e864f6cb511d2caf3ddbc997fbec4f555bfe1703da5bbe879623aab15325639e7ce529e122603dd1857a
 EBUILD libpcap-1.10.2.ebuild 2393 BLAKE2B 25557edcd034e83df4ec0d63636774e52c8c02f10bc88082e218721e9e33541e7609ecf6356c65cd73adc060dbe8ba6b67dd648d5f07f4ef81ca4a82e5d3030d SHA512 813925973f46a57f620018d657666d6e36889a592f31c8d2e61941e5e6b09edb1bf1be256c4bfacebd7d76b46d8d501ee48f58a12e64c24b7377bf710a570d8f
 EBUILD libpcap-1.10.3.ebuild 2391 BLAKE2B 39db7d77a94ddda6cb05c8cc619121c17c1ce5d5e03c434a3c0f8b0305869049b67d9f857d761aa33f067ce22293ab1589debebfbeb674e2d4da406e5c76b00d SHA512 b9b425c72a2caa5946b234f0ca885c9e51cae5eb35b798d22362366a0f7e12757e49691bec35201e1881841fe605f07282e9433865fc3fea9adbb228e229f98b
-EBUILD libpcap-9999.ebuild 2393 BLAKE2B 25557edcd034e83df4ec0d63636774e52c8c02f10bc88082e218721e9e33541e7609ecf6356c65cd73adc060dbe8ba6b67dd648d5f07f4ef81ca4a82e5d3030d SHA512 813925973f46a57f620018d657666d6e36889a592f31c8d2e61941e5e6b09edb1bf1be256c4bfacebd7d76b46d8d501ee48f58a12e64c24b7377bf710a570d8f
+EBUILD libpcap-1.10.4.ebuild 2399 BLAKE2B 378880215fe65a1f1a79563887c8d7cce979cf2ae85e04e791afdd8d258212f3be1f825c4e79110f0926eb0f10509ae815221cd7f00b77bb09949ecc0aa7ef5b SHA512 47fb528c03588b0f8a2c07144254370fd91fd9c4e8c0a0868507907424835f09b595cf8f1fb4a32a5e85701c78f80e31da028c2d7f03a7f0dd9092459c4823dd
+EBUILD libpcap-9999.ebuild 2399 BLAKE2B 378880215fe65a1f1a79563887c8d7cce979cf2ae85e04e791afdd8d258212f3be1f825c4e79110f0926eb0f10509ae815221cd7f00b77bb09949ecc0aa7ef5b SHA512 47fb528c03588b0f8a2c07144254370fd91fd9c4e8c0a0868507907424835f09b595cf8f1fb4a32a5e85701c78f80e31da028c2d7f03a7f0dd9092459c4823dd
 MISC metadata.xml 811 BLAKE2B d3c9d3d8ed42bb512b1d1608076d19ee7f3d3f06f5c622bfbe2f4ea1326397bd03fb480f4c01caf8c367b58a3f466f0b94b5e94b14c9d66cc7cbbde3c70651ec SHA512 bbef3e91d4958ec7070871f176aef2934e15d6bb45a45249dbd903b7dc108931c48df691df5810ad0e95c6bca2be707f88646b79b0d42a4a3c8966b6d0918dfb
diff --git a/net-libs/libpcap/libpcap-1.10.4.ebuild b/net-libs/libpcap/libpcap-1.10.4.ebuild
new file mode 100644
index 000000000000..a229dbe01d7e
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.10.4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="A system-independent library for user-level network packet capture"
+HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
+	inherit verify-sig
+
+	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="bluetooth dbus netlink rdma remote static-libs test usb yydebug"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+	remote? ( virtual/libcrypt:=[${MULTILIB_USEDEP}] )
+	rdma? ( sys-cluster/rdma-core )
+	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-alternatives/yacc
+	sys-devel/flex
+	dbus? ( virtual/pkgconfig )
+"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
+fi
+
+src_prepare() {
+	default
+
+	if ! [[ -f VERSION ]]; then
+		echo ${PV} > VERSION || die
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# bug #884275
+	export LEX=flex
+
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable bluetooth) \
+		$(use_enable dbus) \
+		$(use_enable rdma) \
+		$(use_enable remote) \
+		$(use_enable usb) \
+		$(use_enable yydebug) \
+		$(use_with netlink libnl) \
+		--enable-ipv6
+}
+
+multilib_src_compile() {
+	emake all shared
+	use test && emake testprogs
+}
+
+multilib_src_test() {
+	testprogs/findalldevstest || die
+}
+
+multilib_src_install_all() {
+	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
+
+	# remove static libraries (--disable-static does not work)
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -exec rm {} + || die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+
+	# We need this to build pppd on G/FBSD systems
+	if [[ "${USERLAND}" == "BSD" ]]; then
+		insinto /usr/include
+		doins pcap-int.h portability.h
+	fi
+}
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index 9bda8d87fb64..a229dbe01d7e 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="BSD"
diff --git a/net-libs/xrootd-ceph/Manifest b/net-libs/xrootd-ceph/Manifest
index 42e05fa699e9..d90ab6fe319e 100644
--- a/net-libs/xrootd-ceph/Manifest
+++ b/net-libs/xrootd-ceph/Manifest
@@ -1,8 +1,6 @@
 AUX xrootd-ceph-5.4.0_no-werror.patch 537 BLAKE2B c07404d729e6b8328c849125b543d2d31df51c05d97dd7481c39762c5b32a20b6e9715afdd9db448d90b06be15b6207021bf1c213593c8c2046304c4c284e312 SHA512 1418e185a6c799ebf9d4eb97044055cba3afdfd8f742f08e34f6cea8a01f795cf538a7a3ec1b387e9cbdba01776bbad27d83f8c58898c3f128d369c342830ce9
 DIST xrootd-ceph-5.4.3.tar.gz 82057 BLAKE2B 3ca2a812e6a55d696c1336b28114e9d4ec46c18d764ab8966533e150bb7e3a040c58a957c73adfd4f79038b82ebafcc3b09eae2d7b06aba41e36ce94c36ac3fe SHA512 b1065cf55d3918eef5083ebd1737139a761a28e4cc41cd2b796e2a0157d7a86850e643cecd89aeef89419485397676ac7040df5a5e2e9f7405d26320dbe1c9e3
-DIST xrootd-ceph-5.5.2.tar.gz 82023 BLAKE2B 50976230f0832b7065cf73c2eaf57e4455788ce3d10b471183ce6735befd88791952702cc25dcc53a54b6458f75a9c816cc420e610e95485c0fa9c9027ae47f5 SHA512 cfa425d84ba065b92868f493f3dd72597bcfddbcc4a5d91cd75b440b4adce2a8cebfe448bd9747a07717819862bb231829d6ffbffeb6cc80e3491e8bb36c274a
 DIST xrootd-ceph-5.5.4.tar.gz 82015 BLAKE2B cfd2ec0151bfb7113954a7bab4f522984b0692700a2cd141c7039418d528693bf45e65308395a8eacf4e1a5b34389fc3c0b83f0575af132730103376bc8e07fc SHA512 59cc73505e8cb8ec9e43b30f3773872458257c3c463919337ef97e77de928378803719300f191877d54c1d67dbf45b54aa115ebc9bbac0f64acf51f4e7c23cc5
 EBUILD xrootd-ceph-5.4.3.ebuild 930 BLAKE2B 3e9e600166da09de8b7834638d9c4dbf0188a1b0843198d1e3074bf7a57686f82323a27b9331482e2b0178fc1550435cf233f4d9adf0b95c7a0ad19867297a10 SHA512 cab7ccd34c1ea2097480b33de8b6884279f15d3f23f73e4f6144af63d05771bb7401d0f3a40887639e29b6b49af88fff406937b81c1034a87a57bde915afe62b
-EBUILD xrootd-ceph-5.5.2.ebuild 931 BLAKE2B c048e3c4b0492c2467ab124aeab665a81b22d2051b51a1bccc090f9c2b7f4280430b39719d626dbaeed0bd1a983a55fa7b827f90c57feb716d6ed4e32f603280 SHA512 7aaef26e87d7e11a16c6b8b23417a452ff5de903a0d2de443f7b9d9493e3ef7c579ef49b2522f03eb705976ff406addd7fa2472b7a1c77b5585016becfd975e6
 EBUILD xrootd-ceph-5.5.4.ebuild 931 BLAKE2B c048e3c4b0492c2467ab124aeab665a81b22d2051b51a1bccc090f9c2b7f4280430b39719d626dbaeed0bd1a983a55fa7b827f90c57feb716d6ed4e32f603280 SHA512 7aaef26e87d7e11a16c6b8b23417a452ff5de903a0d2de443f7b9d9493e3ef7c579ef49b2522f03eb705976ff406addd7fa2472b7a1c77b5585016becfd975e6
 MISC metadata.xml 580 BLAKE2B b962435892e924eb2df46bdfc27d96a7fc38f1d222c83c8fb23a0b171fd9cc979b09b306f39cf5f240b292fa493db3def90879541ca3060378b25c028081aed4 SHA512 9a53d67bd49dde3e990285fafef71d8f47d756be58ff9b945f3482c6aa0925c6543ada86b5694a659462e541848e0ec901adbae2c4ee628c8e494c598ca24783
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-5.5.2.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-5.5.2.ebuild
deleted file mode 100644
index ef04b6db3238..000000000000
--- a/net-libs/xrootd-ceph/xrootd-ceph-5.5.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="xrootd OSS plug-in for interfacing with Ceph storage platform"
-HOMEPAGE="https://xrootd.slac.stanford.edu/"
-SRC_URI="https://github.com/xrootd/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="~net-libs/xrootd-${PV}
-	sys-cluster/ceph"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-util/cppunit )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.4.0_no-werror.patch
-)
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrdCeph.*-$(ver_cut 1)\.so
-	/usr/lib.*/libXrdCephTests\.so"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index 9943d98c23d8..05a5bf38f208 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -8,13 +8,8 @@ AUX xrootd-5.4.3-python_tests_py3.patch 4491 BLAKE2B 61e3eb0e10de6e746b1447c7a1d
 AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef83050d5d4e23904abc2b0b9577f8a5888c875c34bf736cf4072b6684a91ca6ad8cd90fe9a2ba9 SHA512 60ab5b6d77cf79437960044bf201127c8adf5134e7f61a18dcccd2e474a4e41eda971e3ada71dea987716080fb308af98a5237bab2a0b82f50f932ff59e3fdea
 AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955
 DIST xrootd-5.4.3.tar.gz 3182127 BLAKE2B ed3f6a943167eafb5f6d7f78ca34f44c9a18b5ed672a4e622acb1e6e6997bd21756a30bf24f0b799ab4f16e7e1fb3f61a042f4e5e00f965b898fc5a287bf995a SHA512 189ec8e20901fd07093494187502e031a60d4ade22af33067313fad7a1bf6a6feb5c5d9d59d3a86d13a6a767e5a93cf4836da02e9cae11c81ccac07199898d72
-DIST xrootd-5.5.0.tar.gz 3227490 BLAKE2B 3d9c0ab859f95d6e651ae98dc132ade389f9981a20c738798bc2079a5470d766cd882df326359ccd4777389e15bf064537e6d4f7f653fbb5fe251b019b4ca5fd SHA512 d13d76be54eacc097363cd1c06448f87bffdd32c81eaad12b4c3321be31c7b221ef34b1bf5da50ee5128d9682e13dc670554317c29c13607c246c781a1fefffe
-DIST xrootd-5.5.2.tar.gz 3236018 BLAKE2B 033a9698b60d839fb683aab22172d3cbd6e0d8041b64270a8c3045f0504d3ef7941ad439dcaf85fa16303cb1e2dfcecbbf7d2de1145ef3f1ae96c5099b08fe2b SHA512 7e8691d8df5dd0047702d9a4785b1fc3c5487210044de7f448e555cf89d170feee16899419fbc45d09d95751129b04c262600ab81f33703f5a28bef789071f3d
 DIST xrootd-5.5.4.tar.gz 3241021 BLAKE2B 505890ab7dbd0530d3c42390c9a6858cf0c8b53d42631b3bed615cb9b7c4d738bb791d26e625b010fef79f57291eb8bcd653ec629d240df92d37c12c973210f8 SHA512 1bf8fec3e20950e1dfbb5a7914c2f2b1d7d1fc1ce6b419dda129bb6cfb083ae674a14732b7b7330dee2287635749d91f8ee7e16badd71c723d189a1a44c309dd
-EBUILD xrootd-5.4.3-r1.ebuild 3236 BLAKE2B 9dc93e947832d1126f1690bab7630778fb37d737d188d204b44596da97b5a7b1baf4a8bbe16b6ffbdcda3d54cd37c60f8712de2a63416a1a8fadc4e9a581e370 SHA512 5d672ed76e470c57e16f09f475a9b6b675ccf8f2ca6b6659ac5bea6ba98553c72fc04b27e1c8539915a567e9fbc62a2a4b0602c64d7e23cd84235007b213e3df
-EBUILD xrootd-5.4.3-r2.ebuild 4627 BLAKE2B b91619cb8bd8d0b7e4f6a23f918df462b04a93182bd42ddca33ca312e2f2ff50f2976d9f3d2da95162c7430436653754a112c545df6e640632fa8625ba2ecb58 SHA512 056567b9a7d14374721ce563bc1221f65eb8eaf199dcc5fdda6c07f93f6680ff39b116b6753d3c2a4c8112c0e90992eec86e6699190bea8ff854a2dd5b11f78f
+EBUILD xrootd-5.4.3-r2.ebuild 4627 BLAKE2B c3820362346a32f41c9a9afe447854211af4a2015e3e0950b98e18e6346ec9ec7528ae3ec7cef8be29dbaf069a9188dce4fad2a31023c87cb82cef709dc03c03 SHA512 705bd4e6189c67a0b7f31dc96241b086145268a13113826292ab6b00fdf739c497c67cb00033f5f42181f51dcc0476bf816fc5daf2dbace16d14c989fecd8589
 EBUILD xrootd-5.4.3.ebuild 3186 BLAKE2B 39211730f3cf2da1f616c3cb88e0fbe5449b534fdb9612c47f919537162fb1cb14e4a225feeeed6b51428ae51c7550d31a875b71a0c1b5b3ee3b12e2cd474f26 SHA512 3ab16277df556260c833c1a60cb47c964ffefa7cef623aba61038d73be6959f2dbae41f2ccef28e95274472d0995a840347128fb38d4e5d8f171af709d8267f2
-EBUILD xrootd-5.5.0.ebuild 3210 BLAKE2B 890177297f6618994a88de72f4c20678db458822e7ec596d1c07b2a263b6c58e3b6f5134a268e4fba2b07802a20e77ec772515379423bb4b5b85619be078ad6c SHA512 91c87c4304b2bc47f98f53d9483cd427d28667726ddf93f97a0955d0c88f152f19d911b440a69aa53b7eec2223cb387062db8411acad0760847c3f53e7ccf075
-EBUILD xrootd-5.5.2.ebuild 3243 BLAKE2B 6f7846e62497051dbe5ce3bde4f8cdaf2e8a3171ba572f6d9529eaa4e00c444d147456dd4954b9fdc4080f51dbbdc53d862b5c1d963bac07c525dfa984582915 SHA512 8b274457af21ab750e49256c9115c470c023a1486002e3e4ecaeb9a1a5713bac7d9fc8fca6283db0c0a60aca0e8ea300a4b47ad3401b57e1385b9d762190391a
-EBUILD xrootd-5.5.4.ebuild 3243 BLAKE2B 6f7846e62497051dbe5ce3bde4f8cdaf2e8a3171ba572f6d9529eaa4e00c444d147456dd4954b9fdc4080f51dbbdc53d862b5c1d963bac07c525dfa984582915 SHA512 8b274457af21ab750e49256c9115c470c023a1486002e3e4ecaeb9a1a5713bac7d9fc8fca6283db0c0a60aca0e8ea300a4b47ad3401b57e1385b9d762190391a
-MISC metadata.xml 1126 BLAKE2B 9bacae6f9c9e281863060fc5cad1f6e882c7c017bb35b5c87bdfeaa85b5aafcae6c5e9babc04f869be29a6e1d9707871118e8b922eb36ab3d5a67f8849fb9ce7 SHA512 c542a70cee2b7cd8b5ecaee7e25d6c1d37f24918daf039f0e9d4519d08719eb54103096d356d3fa8a7a6b4cefee86ad4ad1cfc4ab11c26d9df66de73170cf8bf
+EBUILD xrootd-5.5.4-r1.ebuild 4748 BLAKE2B 8f79e55faa53023dafe99665fde9df7c2001bc6802182dc7368ac21938c4324d75f916776c0ab74ba35ae917467159850ab22c47d316ec25c8f0de2e86fc8f9e SHA512 6201c640e26cd23d94388381ccb4b4d3a58d9265bbe999190c5a3dba7e0c9091260f792cabe78f2cbece1c8c28f308a9e45038a71afc1f879090167bab372e49
+MISC metadata.xml 1035 BLAKE2B c81c606529973beb7936c49a35eff0a91bde2c604b4d0cea3a91cdb7aff0aeeba15ae6e9c6913897272e6f76c811427b920514d73280b2c0f13e4d035f4c5b3c SHA512 df74f8ac010f34a63e16979a5c3a222119f9c9b201f0a83b8b8f20bf3b5d102ad1ccdedfdd557a599701fbe234c42b1bb5ec34384445f428a40716ba2c1a6ae2
diff --git a/net-libs/xrootd/metadata.xml b/net-libs/xrootd/metadata.xml
index 9305cd64fd69..dae43a78f13c 100644
--- a/net-libs/xrootd/metadata.xml
+++ b/net-libs/xrootd/metadata.xml
@@ -18,6 +18,5 @@
     <flag name="http">Enable http protocol support</flag>
     <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for XML parsing (preferred) instead of bundled tinyxml</flag>
     <flag name="server">Install xrootd server and related plug-ins</flag>
-    <flag name="test-suite">Install additional components useful for testing xrootd</flag>
   </use>
 </pkgmetadata>
diff --git a/net-libs/xrootd/xrootd-5.4.3-r1.ebuild b/net-libs/xrootd/xrootd-5.4.3-r1.ebuild
deleted file mode 100644
index 744c2fed9672..000000000000
--- a/net-libs/xrootd/xrootd-5.4.3-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Upstream does not support the building of Python bindings
-# via CMake for more than one implementation at a time.
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="Extended ROOT remote file server"
-HOMEPAGE="https://xrootd.slac.stanford.edu/"
-SRC_URI="https://xrootd.slac.stanford.edu/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples fuse http kerberos +libxml2 python readline +server systemd test-suite"
-
-# No actual build-time test suite
-RESTRICT="test"
-
-CDEPEND="acct-group/xrootd
-	acct-user/xrootd
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	virtual/libcrypt:=
-	fuse? ( sys-fs/fuse:0= )
-	http? ( net-misc/curl:= )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2:2= )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	systemd? ( sys-apps/systemd:= )
-	test-suite? ( dev-util/cppunit )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	doc? (
-		app-doc/doxygen[dot]
-		virtual/latex-base
-		python? ( dev-python/sphinx )
-	)
-	python? ( $(python_gen_cond_dep 'dev-python/pip[${PYTHON_USEDEP}]') )
-"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-"
-REQUIRED_USE="
-	http? ( kerberos )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test-suite? ( server )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.8.3-crc32.patch
-	"${FILESDIR}"/${PN}-5.4.3-no_automagic.patch
-)
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so
-	/usr/lib.*/libXrdClTests\.so"
-
-pkg_setup() {
-	use python && python_setup
-}
-
-# FIXME: support xrdec - currently only builds against bundled isa-l
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_FUSE=$(usex fuse)
-		-DENABLE_HTTP=$(usex http)
-		-DENABLE_KRB5=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_READLINE=$(usex readline)
-		-DENABLE_TESTS=$(usex test-suite)
-		-DENABLE_VOMS=no
-		-DFORCE_ENABLED=yes
-		-DPIP_OPTIONS="--ignore-installed" # bug 861452
-		-DXRDCL_ONLY=$(usex server "no" "yes")
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		doxygen Doxyfile || die
-		if use python; then
-			emake -C bindings/python/docs html
-		fi
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doxydoc/html/. )
-	dodoc docs/ReleaseNotes.txt
-	cmake_src_install
-	find "${D}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
-
-	# base configs
-	insinto /etc/xrootd
-	doins packaging/common/*.cfg
-
-	fowners root:xrootd /etc/xrootd
-	keepdir /var/log/xrootd
-	fowners xrootd:xrootd /var/log/xrootd
-
-	if use server; then
-		local i
-		for i in cmsd frm_purged frm_xfrd xrootd; do
-			newinitd "${FILESDIR}"/${i}.initd ${i}
-		done
-		# all daemons MUST use single master config file
-		newconfd "${FILESDIR}"/xrootd.confd xrootd
-	fi
-
-	if use python; then
-		python_optimize "${D}/$(python_get_sitedir)"
-
-		if use doc; then
-			docinto python
-			docompress -x "/usr/share/doc/${PF}/python/html"
-			dodoc -r bindings/python/docs/build/html
-		fi
-		if use examples; then
-			docinto python
-			dodoc -r bindings/python/examples
-		fi
-	fi
-}
diff --git a/net-libs/xrootd/xrootd-5.4.3-r2.ebuild b/net-libs/xrootd/xrootd-5.4.3-r2.ebuild
index 5b19756c4d84..fd1b2bdf0993 100644
--- a/net-libs/xrootd/xrootd-5.4.3-r2.ebuild
+++ b/net-libs/xrootd/xrootd-5.4.3-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_PEP571="setuptools"
+DISTUTILS_USE_PEP517="setuptools"
 
 inherit cmake distutils-r1
 
diff --git a/net-libs/xrootd/xrootd-5.5.0.ebuild b/net-libs/xrootd/xrootd-5.5.0.ebuild
deleted file mode 100644
index 8d3b8f9f1431..000000000000
--- a/net-libs/xrootd/xrootd-5.5.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Upstream does not support the building of Python bindings
-# via CMake for more than one implementation at a time.
-PYTHON_COMPAT=( python3_{9..11} )
-DOCS_BUILDER="doxygen"
-DOCS_DEPEND="
-	media-gfx/graphviz
-	virtual/latex-base
-	python? ( dev-python/sphinx )
-"
-
-inherit cmake docs python-single-r1
-
-DESCRIPTION="Extended ROOT remote file server"
-HOMEPAGE="https://xrootd.slac.stanford.edu/"
-SRC_URI="https://xrootd.slac.stanford.edu/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples fuse http kerberos +libxml2 python readline +server systemd test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="acct-group/xrootd
-	acct-user/xrootd
-	dev-libs/openssl:0=
-	net-libs/davix
-	sys-libs/zlib
-	virtual/libcrypt:=
-	fuse? ( sys-fs/fuse:0= )
-	http? ( net-misc/curl:= )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2:2= )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	python? ( $(python_gen_cond_dep 'dev-python/pip[${PYTHON_USEDEP}]') )
-	test? ( dev-util/cppunit )
-"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-"
-REQUIRED_USE="
-	http? ( kerberos )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( server )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.8.3-crc32.patch
-	"${FILESDIR}"/${PN}-5.4.3-no_automagic.patch
-)
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so
-	/usr/lib.*/libXrdClTests\.so"
-
-pkg_setup() {
-	use python && python_setup
-}
-
-# FIXME: support xrdec - currently only builds against bundled isa-l
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_FUSE=$(usex fuse)
-		-DENABLE_HTTP=$(usex http)
-		-DENABLE_KRB5=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_READLINE=$(usex readline)
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_VOMS=no
-		-DFORCE_ENABLED=yes
-		-DPIP_OPTIONS="--ignore-installed" # bug 861452
-		-DXRDCL_ONLY=$(usex server "no" "yes")
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	docs_compile
-
-	# secondary documentation for python bindings
-	if use python && use doc; then
-		emake -C bindings/python/docs html
-	fi
-}
-
-src_install() {
-	dodoc docs/ReleaseNotes.txt
-	cmake_src_install
-	find "${ED}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
-
-	# base configs
-	insinto /etc/xrootd
-	doins packaging/common/*.cfg
-
-	fowners root:xrootd /etc/xrootd
-	keepdir /var/log/xrootd
-	fowners xrootd:xrootd /var/log/xrootd
-
-	if use server; then
-		local i
-		for i in cmsd frm_purged frm_xfrd xrootd; do
-			newinitd "${FILESDIR}"/${i}.initd ${i}
-		done
-		# all daemons MUST use single master config file
-		newconfd "${FILESDIR}"/xrootd.confd xrootd
-	fi
-
-	if use python; then
-		python_optimize "${D}/$(python_get_sitedir)"
-
-		if use doc; then
-			docinto python
-			docompress -x "/usr/share/doc/${PF}/python/html"
-			dodoc -r bindings/python/docs/build/html
-		fi
-		if use examples; then
-			docinto python
-			dodoc -r bindings/python/examples
-		fi
-	fi
-}
diff --git a/net-libs/xrootd/xrootd-5.5.2.ebuild b/net-libs/xrootd/xrootd-5.5.4-r1.ebuild
index aabea613b0cf..ea3bc8cea605 100644
--- a/net-libs/xrootd/xrootd-5.5.2.ebuild
+++ b/net-libs/xrootd/xrootd-5.5.4-r1.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=8
 
-# Upstream does not support the building of Python bindings
-# via CMake for more than one implementation at a time.
 PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517="setuptools"
 DOCS_BUILDER="doxygen"
 DOCS_DEPEND="
 	media-gfx/graphviz
@@ -13,7 +13,7 @@ DOCS_DEPEND="
 	python? ( dev-python/sphinx )
 "
 
-inherit cmake docs python-single-r1
+inherit cmake docs distutils-r1
 
 DESCRIPTION="Extended ROOT remote file server"
 HOMEPAGE="https://xrootd.slac.stanford.edu/"
@@ -23,6 +23,7 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples fuse http kerberos +libxml2 python readline +server systemd test"
+
 RESTRICT="!test? ( test )"
 
 CDEPEND="acct-group/xrootd
@@ -41,7 +42,11 @@ CDEPEND="acct-group/xrootd
 "
 DEPEND="${CDEPEND}"
 BDEPEND="
-	python? ( $(python_gen_cond_dep 'dev-python/pip[${PYTHON_USEDEP}]') )
+	python? (
+		${PYTHON_DEPS}
+		${DISTUTILS_DEPS}
+		test? ( >=dev-python/pytest-7.1.2[${PYTHON_USEDEP}] )
+	)
 	test? ( dev-util/cppunit )
 "
 RDEPEND="${CDEPEND}
@@ -55,6 +60,8 @@ REQUIRED_USE="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.8.3-crc32.patch
+	"${FILESDIR}"/${PN}-5.4.3-cmake_no_python.patch
+	"${FILESDIR}"/${PN}-5.4.3-python_tests_py3.patch
 )
 
 # xrootd plugins are not intended to be linked with,
@@ -67,36 +74,75 @@ pkg_setup() {
 	use python && python_setup
 }
 
+src_prepare() {
+	cmake_src_prepare
+
+	if use python; then
+		pushd "${S}"/bindings/python > /dev/null || die
+		distutils-r1_src_prepare
+		popd > /dev/null || die
+	fi
+}
+
 # FIXME: support xrdec - currently only builds against bundled isa-l
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex libxml2 "no" "yes")
+		-DCMAKE_DISABLE_FIND_PACKAGE_systemd=$(usex systemd "no" "yes")
 		-DENABLE_FUSE=$(usex fuse)
 		-DENABLE_HTTP=$(usex http)
 		-DENABLE_KRB5=$(usex kerberos)
+		-DENABLE_MACAROONS=no
 		-DENABLE_PYTHON=$(usex python)
 		-DENABLE_READLINE=$(usex readline)
-		-DENABLE_MACAROONS=no
 		-DENABLE_SCITOKENS=no
 		-DENABLE_TESTS=$(usex test)
 		-DENABLE_VOMS=no
 		-DFORCE_ENABLED=yes
-		-DPIP_OPTIONS="--ignore-installed" # bug 861452
 		-DXRDCL_ONLY=$(usex server "no" "yes")
 	)
 	cmake_src_configure
+
+	if use python; then
+		pushd "${BUILD_DIR}"/bindings/python > /dev/null || die
+		distutils-r1_src_configure
+		popd > /dev/null || die
+	fi
 }
 
 src_compile() {
 	cmake_src_compile
-	docs_compile
+	if use python; then
+		pushd "${BUILD_DIR}"/bindings/python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
 
+	docs_compile
 	# secondary documentation for python bindings
 	if use python && use doc; then
 		emake -C bindings/python/docs html
 	fi
 }
 
+python_test() {
+	epytest
+}
+
+src_test() {
+	pushd "${BUILD_DIR}/tests" > /dev/null || die
+	# There are more tests but since these are ones currently run by upstream in their CI,
+	# let's follow their example.
+	./common/test-runner ./XrdClTests/libXrdClTests.so "All Tests/UtilsTest/" || die
+	./common/test-runner ./XrdClTests/libXrdClTests.so "All Tests/SocketTest/" || die
+	./common/test-runner ./XrdClTests/libXrdClTests.so "All Tests/PollerTest/" || die
+	popd > /dev/null || die
+
+	# Python tests currently require manual configuration and start-up of an xrootd server.
+	# TODO: get this to run properly.
+	#use python && distutils-r1_src_test
+}
+
 src_install() {
 	dodoc docs/ReleaseNotes.txt
 	cmake_src_install
@@ -120,7 +166,9 @@ src_install() {
 	fi
 
 	if use python; then
-		python_optimize "${D}/$(python_get_sitedir)"
+		pushd "${BUILD_DIR}"/bindings/python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
 
 		if use doc; then
 			docinto python
@@ -132,4 +180,11 @@ src_install() {
 			dodoc -r bindings/python/examples
 		fi
 	fi
+
+	if use test; then
+		for f in test-runner xrdshmap; do
+			rm "${ED}"/usr/bin/${f} || die "Failed to remove test helper ${f} from installed tree"
+		done
+		rm "${ED}"/usr/$(get_libdir)/libXrdClTest*.so || die "Failed to remove test libraries from installed tree"
+	fi
 }
diff --git a/net-libs/xrootd/xrootd-5.5.4.ebuild b/net-libs/xrootd/xrootd-5.5.4.ebuild
deleted file mode 100644
index aabea613b0cf..000000000000
--- a/net-libs/xrootd/xrootd-5.5.4.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Upstream does not support the building of Python bindings
-# via CMake for more than one implementation at a time.
-PYTHON_COMPAT=( python3_{9..11} )
-DOCS_BUILDER="doxygen"
-DOCS_DEPEND="
-	media-gfx/graphviz
-	virtual/latex-base
-	python? ( dev-python/sphinx )
-"
-
-inherit cmake docs python-single-r1
-
-DESCRIPTION="Extended ROOT remote file server"
-HOMEPAGE="https://xrootd.slac.stanford.edu/"
-SRC_URI="https://xrootd.slac.stanford.edu/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples fuse http kerberos +libxml2 python readline +server systemd test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="acct-group/xrootd
-	acct-user/xrootd
-	dev-libs/openssl:0=
-	net-libs/davix
-	sys-libs/zlib
-	virtual/libcrypt:=
-	fuse? ( sys-fs/fuse:0= )
-	http? ( net-misc/curl:= )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2:2= )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	python? ( $(python_gen_cond_dep 'dev-python/pip[${PYTHON_USEDEP}]') )
-	test? ( dev-util/cppunit )
-"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-"
-REQUIRED_USE="
-	http? ( kerberos )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( server )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.8.3-crc32.patch
-)
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so
-	/usr/lib.*/libXrdClTests\.so"
-
-pkg_setup() {
-	use python && python_setup
-}
-
-# FIXME: support xrdec - currently only builds against bundled isa-l
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex libxml2 "no" "yes")
-		-DENABLE_FUSE=$(usex fuse)
-		-DENABLE_HTTP=$(usex http)
-		-DENABLE_KRB5=$(usex kerberos)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_READLINE=$(usex readline)
-		-DENABLE_MACAROONS=no
-		-DENABLE_SCITOKENS=no
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_VOMS=no
-		-DFORCE_ENABLED=yes
-		-DPIP_OPTIONS="--ignore-installed" # bug 861452
-		-DXRDCL_ONLY=$(usex server "no" "yes")
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	docs_compile
-
-	# secondary documentation for python bindings
-	if use python && use doc; then
-		emake -C bindings/python/docs html
-	fi
-}
-
-src_install() {
-	dodoc docs/ReleaseNotes.txt
-	cmake_src_install
-	find "${ED}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
-
-	# base configs
-	insinto /etc/xrootd
-	doins packaging/common/*.cfg
-
-	fowners root:xrootd /etc/xrootd
-	keepdir /var/log/xrootd
-	fowners xrootd:xrootd /var/log/xrootd
-
-	if use server; then
-		local i
-		for i in cmsd frm_purged frm_xfrd xrootd; do
-			newinitd "${FILESDIR}"/${i}.initd ${i}
-		done
-		# all daemons MUST use single master config file
-		newconfd "${FILESDIR}"/xrootd.confd xrootd
-	fi
-
-	if use python; then
-		python_optimize "${D}/$(python_get_sitedir)"
-
-		if use doc; then
-			docinto python
-			docompress -x "/usr/share/doc/${PF}/python/html"
-			dodoc -r bindings/python/docs/build/html
-		fi
-		if use examples; then
-			docinto python
-			dodoc -r bindings/python/examples
-		fi
-	fi
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 78f46f798b11..a1936f8af122 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 3bd7271abf74..fd0317b38ce3 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,7 +1,3 @@
-DIST electrum-4.3.2.gh.tar.gz 5460546 BLAKE2B b2367116aef2a2a76dca30a635188bcd99f0fdd46ce6e8c5a2d6608fbb8f0a58e88b8352c5db92b7c8709f7bbc420fc1860204aca1efc2f2c4be2c788bfa1909 SHA512 dfb137e01ca6e511fb5ac70c34dcb01f36bdb209d7d290bd53c8fa5f95783f346898478d6e58435b241928dfe05ff46455e2e587520d47892c66b3198ab89c82
-DIST electrum-4.3.3.gh.tar.gz 5511225 BLAKE2B dd7700d185ad1d8d58c609a3b388fc4764eca68eb20bb2254046daa5faa5e790fe31a61536ab086a6f632f42346cf22121a3b85b85ae1d45ab8f59ad49e66455 SHA512 33e357d49a0839b269bf8eb5a617b9a866a85a4953a109a382930718ce204a36a93638be1d9111ca9a5349f0aed496e86f5f2b43ffa8b1ce6683c50a8b76ec6c
 DIST electrum-4.3.4.gh.tar.gz 5512701 BLAKE2B a57e3ffddacfd5c63dc7f5cb59bbfe06323e7c8ab708d49e1301356fdcc0204e8126894c3c4b6dd790bd8e64cabc84a410592ea94b361cc553d4dcaa5921f50e SHA512 dc821cbda2e95853627b141292da5a07d8a672cfaabb0b160c67b3020442416593136984b42bf021f815e22671fbded67e6d2dee95e4e46f63e5c9a8fe01ebc9
-EBUILD electrum-4.3.2-r1.ebuild 2201 BLAKE2B 9bc29a9211f8b40705773c73171100f22eb15bcda782de906c2a96bbbce7f6ee1ef94989e9cae497d545cb4e99f3bb10b84e9c3c4bcc2508af754a2701f5588d SHA512 02b4bef98a04a8b3241bb215497419514dff37337d37f264fa15221abd5df98dd00625c8a8ea77846e0c975da3a37503da52f12b9ea94e61de5969d57f4a4221
-EBUILD electrum-4.3.3-r1.ebuild 2203 BLAKE2B 0bd9463b4fdbf597b84cf7db14abb3c80f69dbf222f356d1ea739e6328602a90290af0e5c827f56d52491bd69fc0af9e9e23826e50735a30ec736d8c87694838 SHA512 e007ec263357681c50efcac76389371e0de386e07da03ef4bdd941a44f9ba60d88a4a335b194677d0f1a67c1ab031cdafea122f6d60f89f4ab3d4dda262076ea
-EBUILD electrum-4.3.4.ebuild 2792 BLAKE2B b15769c678ad2c11f76749e85048eb6edcf903657f6cb8de99c8d5f57775a558af4557f00e72061374f549375dc56d3ce7ec630deab1c3db130f26ab327ed3e8 SHA512 2af35ec3024905c2858a46b83282e926f63242c48b0c11906b1508a826493b340bed801fc447ffde8d86360426c7ce365417fdeaa9df67dc08456680623b2789
+EBUILD electrum-4.3.4.ebuild 2790 BLAKE2B 3c03880a358ce1b0e789ff52d8bedda54989e7df280ad3d98d73b17892197db3c8157df47a83755a9a123e65181085834693d08f1c8ede4f57639bdee56f7333 SHA512 605d6b16e52cfdcd8b84f2bae143bd5e1ad7ac756756ba9a4cd08b817a1b7fc3ce4a7fd3fb999edc938870c582fb5bdd4ab01029699cf5bddb0ece72ee5e994a
 MISC metadata.xml 637 BLAKE2B ec4a0e57a1a11fa3a430c40b317e9a857b4128c7815fcd9fabe44adf85c47985325f4df3da9476b19f687026a145c7abf16a6a1ef6c8e25dd217732cdf77a076 SHA512 599ade68d31da44232ab7f520f0b9c054e7a26757aa7eed4f06350487d6c7c1dfc12bf2ba3dbddeb8ef8e8f0b67d093b91999cec422b3a5ea6dfadc9acf2fbc1
diff --git a/net-misc/electrum/electrum-4.3.2-r1.ebuild b/net-misc/electrum/electrum-4.3.2-r1.ebuild
deleted file mode 100644
index 7dae01a5ebe4..000000000000
--- a/net-misc/electrum/electrum-4.3.2-r1.ebuild
+++ /dev/null
@@ -1,95 +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_{9..10} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="
-	https://electrum.org/
-	https://github.com/spesmilo/electrum/
-"
-SRC_URI="
-	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cli ncurses qrcode +qt5"
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	<dev-libs/libsecp256k1-0.2
-	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.22*[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/bitstring[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-"
-BDEPEND="
-	test? (
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# use backwards-compatible cryptodome API
-	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
-
-	# make qdarkstyle dep optional
-	sed -i -e '/qdarkstyle/d' contrib/requirements/requirements.txt || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-4.3.3-r1.ebuild b/net-misc/electrum/electrum-4.3.3-r1.ebuild
deleted file mode 100644
index b6b87e979a15..000000000000
--- a/net-misc/electrum/electrum-4.3.3-r1.ebuild
+++ /dev/null
@@ -1,95 +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_{9..10} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="
-	https://electrum.org/
-	https://github.com/spesmilo/electrum/
-"
-SRC_URI="
-	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli ncurses qrcode +qt5"
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	<dev-libs/libsecp256k1-0.2
-	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.22*[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/bitstring[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-"
-BDEPEND="
-	test? (
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# use backwards-compatible cryptodome API
-	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
-
-	# make qdarkstyle dep optional
-	sed -i -e '/qdarkstyle/d' contrib/requirements/requirements.txt || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-4.3.4.ebuild b/net-misc/electrum/electrum-4.3.4.ebuild
index eed810484cf7..b2dd93e1a839 100644
--- a/net-misc/electrum/electrum-4.3.4.ebuild
+++ b/net-misc/electrum/electrum-4.3.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cli ncurses qrcode +qt5"
 REQUIRED_USE="|| ( cli ncurses qt5 )"
 
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index c37f7c075b52..f97010dad915 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index 6e549f998a0f..133b36b188fd 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST hplip-3.22.10-plugin.run 11494258 BLAKE2B c9cca80349af4f04f1b1d055083fea451d079a08179fe29fb8ca056c76a36847a58cdc526080d16620a7ab7b8650ccc46f15b3a63447964a6f6006e54b316905 SHA512 dfedc343898fb7b9e951de9a09578627b208f7d0652666eb05d5926ad3ec220bd049d6bee1fb211c72f2e484925e48a665c3133aeeca9d19032fd95e0c3711fa
 DIST hplip-3.22.6-plugin.run 11493966 BLAKE2B 9346625c665c25c5c065462269fba4764ef6728a5a351fc0ca81d5fbd3af41185d18cbee88bc9ae0c40909ed1dd412c5f53486676daf0459b79a612c7d65c257 SHA512 6eafe71f88a012bc95ecdf5bf70756e08074208964183b057f299167030b9d228c934c08955c400333b88b46d7d55ed25eb0792a8ed24b4df97a61dddca64585
-EBUILD hplip-plugin-3.22.10.ebuild 1486 BLAKE2B 5820316791b85343ff151c42af06badbe690c3e1cb4bbfa4f9c90e706fd984b2cf11a14f62d758bf4c3f1c82c5de443d1adea463410d9b7912c24292910f8f73 SHA512 04f74d31dc8844609fe88f01a6f8a377d5da04865cc3bb2d541b1d25b8103662648c29c878a1e690c88470764196e1d65ea84ae652b70e8fdce9519e67e8ea14
+EBUILD hplip-plugin-3.22.10.ebuild 1483 BLAKE2B c75f0e9c64e2f71916ec9b8a67b41faefffee00cce74e3ab2df526b271b90b26cd20ccbd0549cd43e0362f33650158b17334a063260a65734cf673ef8e9606d4 SHA512 166432f69b79f75c142db0febcb91cdccb9ecea2a98bf1a9afd6f10cc5ee52b357fd21772ededa54dcb6842400b34368659cfca51af33578c4cc292c58a5099c
 EBUILD hplip-plugin-3.22.6.ebuild 1484 BLAKE2B 5011c142fc0b59a7c7f6e3df3d4acc72ae2b2b9e429657f6522bbd4262ffa443e725808b488920612f9c55589d1f27c9a00ded514b0683ef700a04db562cf2bf SHA512 9607c6e5aa0ba7d8135465f3f4b9af86232d1c7e4302a11a584165fd7de9d316d89979217565ca276dee021fd9450801dbe29cce1078b3c801840214c8111256
 MISC metadata.xml 523 BLAKE2B 396a3e3f19f1929ac628fd3301f7de077e34d80b88f0f65dd4035a55b8ff16be6a89dc94b47085dafc7a8a2def19353aa52996a12e51e94154a61ba1329f8c91 SHA512 9d5abebbd6fdac76142c70aa911c4ac55eb5388fd39e010d72e8e6253f51a7924eda2a675cd8ce3475fea76b307805644cf8f7140b265e66b4fcd65a8546fd96
diff --git a/net-print/hplip-plugin/hplip-plugin-3.22.10.ebuild b/net-print/hplip-plugin/hplip-plugin-3.22.10.ebuild
index 58cb1caf77f7..2574deffcb94 100644
--- a/net-print/hplip-plugin/hplip-plugin-3.22.10.ebuild
+++ b/net-print/hplip-plugin/hplip-plugin-3.22.10.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
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="hplip-plugin"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="orblite"
 # License does not allow us to redistribute the "source" package
 RESTRICT="mirror"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 080c00fc0d0f..fb27d8f79f01 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 9eacbb138d8d..ea5a4d3c7ed4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,17 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2023-04-08)
+# Long obsolete part of KDE Plasma (merged back into kwin).
+# Removal on 2023-08-22
+kde-plasma/kwayland-server
+
+# John Helmert III <ajak@gentoo.org> (2023-04-08)
+# i3-gaps has been meregd into upstream i3. Use x11-wm/i3 instead.
+# See also: https://github.com/i3/i3/issues/3724
+# Removal on 2023-05-08.
+x11-wm/i3-gaps
+
 # Volkmar W. Pogatzki <gentoo@pogatzki.net> (2023-04-09)
 # Numerous vulnerabilities, bug #825486.
 # Nothing depends on it. Removal on 2023-05-09
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index e3b08021eb63..24ff6683a159 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -6096,7 +6096,6 @@ net-libs/xrootd:fuse - Enable the sys-fs/fuse filesystem driver
 net-libs/xrootd:http - Enable http protocol support
 net-libs/xrootd:libxml2 - Use dev-libs/libxml2 for XML parsing (preferred) instead of bundled tinyxml
 net-libs/xrootd:server - Install xrootd server and related plug-ins
-net-libs/xrootd:test-suite - Install additional components useful for testing xrootd
 net-libs/zeromq:drafts - Build draft API, which may change at any time without any notice, and is therefore not recommended for normal use.
 net-libs/zeromq:libbsd - Use strlcpy() from dev-libs/libbsd instead of internal implementation.
 net-libs/zeromq:pgm - Build PGM (Pragmatic General Multicast)extention, a protocol for reliable multicast transport of data over IP networks.
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index e1df1b8a6ad9..fbf7c03b0357 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/pysam/Manifest b/sci-biology/pysam/Manifest
index 931d51cf12e1..4a490595f41b 100644
--- a/sci-biology/pysam/Manifest
+++ b/sci-biology/pysam/Manifest
@@ -1,4 +1,5 @@
+AUX pysam-0.21.0-cython-3.patch 946 BLAKE2B 6b74b084d4f0308a77266c748209a91aa23fc0f51635b45bb2e47efc7d1e2f4a67993305d0f12c74964add24ec49ebb8b56bff720aec065a76257bda5a677cdb SHA512 763bee599547059dfff39f7ae087402dfca67acabc048012663d6cd792c605d6dc07210f777d22e9373c086cd9cd468e7ae3060a501962157ba5f6971c8033a1
 DIST pysam-0.21.0.gh.tar.gz 3842829 BLAKE2B 83db290ec0bae71106276ed4f1721292c0d2fa55053c7451f0a8a79619b1c4d8444b99293ac5d8051bfb0b59e984e32a89798bab091e3a019b7c2a3fb7414d1c SHA512 b2ac986b6a352df1d2066a224d710648a88d8ad44273623a89ae0f4bb2645b00f0d0e1685c8ccedfd379259255957e653f3c3199621ac1d4c26098f538b6bfa7
-EBUILD pysam-0.21.0.ebuild 1591 BLAKE2B 2b0673c61cb83eaeba7b05ad325d0f61de530b1c8de0a2e2cb0e7399f8b1ba0d7489160086d7264056c675b4e8785fcb79cdd0a9f9506bc4e57a36ea65121b25 SHA512 47d3101651a21e6d59fba0641d76ac34dfe608b267ba726fddbdab2aaa25dd5be6bf51bc707fc4c19b6e9e0222fa0419368b5d4b70a168cfec4c0666429ce114
+EBUILD pysam-0.21.0.ebuild 1744 BLAKE2B d6211a396810673da6392e4377a412bc6886c5eb9d5ad45ae85b278ae9d2202c4a706186b64ae3b1ae88fc0b32c532dad494bf69757b3c66dbf96e7001b48d2a SHA512 41be02962a1af5463dcc4ca98ec2af0e6986ec8d8a8101b813954754865c95d75f5f8a0ae20d3c76465475aa94e30fade45734931221eea01ab05cb7746acfce
 EBUILD pysam-9999.ebuild 1709 BLAKE2B b7297d21abf0e581c5c2d8a72a7e6805cb5f96f6e878cc979fc0f5a34e57bdd25a2f50abaa9ee10040559e66ee42d3a24696a7093103658175b27858acaac95c SHA512 7e7a782243897a89a3539b3eb79ccd0790c6b0afcf79453526c30371f867faaf8eca6454e64d3bea250ff13753ff400fe5ff3352c080c85285cafa2346e3564a
 MISC metadata.xml 442 BLAKE2B e3d339868a09d8930ff6d83f414f8166ed283a66d83d5b0fed0031024db151b17b1347f5e015f2b9c2152a041e2beb70696362be9b4e3fc225078bc5c520ad58 SHA512 4b1d08c5524e1bb04129e0d38f0584654b34979024afd2cf15bd482654ca8fac9c82e6db0661f7370f9fefa6949f1291ba3c18a9dca5d5041bd6f76554fa33c7
diff --git a/sci-biology/pysam/files/pysam-0.21.0-cython-3.patch b/sci-biology/pysam/files/pysam-0.21.0-cython-3.patch
new file mode 100644
index 000000000000..303a4fb0dcdc
--- /dev/null
+++ b/sci-biology/pysam/files/pysam-0.21.0-cython-3.patch
@@ -0,0 +1,24 @@
+From 17bb13dcfdb56ac238458dcef23fe01893a892e9 Mon Sep 17 00:00:00 2001
+From: John Marshall <jmarshall@hey.com>
+Date: Sat, 8 Apr 2023 11:00:46 +1200
+Subject: [PATCH] Remove incorrect type annotation
+
+The annotation already in pysam/libcbcf.pyi is correct.
+Fixes #1179 as reopened on April 6th.
+---
+ pysam/libcbcf.pyx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pysam/libcbcf.pyx b/pysam/libcbcf.pyx
+index 8c088af2..8ecfe5f3 100644
+--- a/pysam/libcbcf.pyx
++++ b/pysam/libcbcf.pyx
+@@ -3479,7 +3479,7 @@ cdef class VariantRecordSample(object):
+         return bcf_format_get_alleles(self)
+ 
+     @alleles.setter
+-    def alleles(self, value: tuple):
++    def alleles(self, value):
+         # Sets the genotype, supply a tuple of alleles to set.
+         # The supplied alleles need to be defined in the correspoding pysam.libcbcf.VariantRecord
+         # The genotype is reset when an empty tuple, None or (None,) is supplied
diff --git a/sci-biology/pysam/pysam-0.21.0.ebuild b/sci-biology/pysam/pysam-0.21.0.ebuild
index 588cd1bc4f1b..77292ed29613 100644
--- a/sci-biology/pysam/pysam-0.21.0.ebuild
+++ b/sci-biology/pysam/pysam-0.21.0.ebuild
@@ -31,6 +31,12 @@ distutils_enable_tests pytest
 
 DISTUTILS_IN_SOURCE_BUILD=1
 
+PATCHES=(
+	# backport
+	# https://github.com/pysam-developers/pysam/commit/17bb13dcfdb56ac238458dcef23fe01893a892e9
+	"${FILESDIR}"/${P}-cython-3.patch
+)
+
 EPYTEST_DESELECT=(
 	# only work with bundled htslib
 	'tests/tabix_test.py::TestRemoteFileHTTP'
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 92293b853826..7df6d14c0dfc 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index c740c9551495..c58a06a270a6 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,7 +1,3 @@
-DIST z3-4.11.2.tar.gz 5428273 BLAKE2B 85fe5b94c5bfaeaca5b1dfe42fe9763a278c414955a9aed45abbb3e60c366a86bcdcd7c3bdcf27cc67bc10c76700069d548cb1e27ccf3286c8c6eccfa9d492d1 SHA512 be2573d38c0e50b46fcb025d50335e016769fdeab3c26f5dc2a13102fae889d23039258ea8d38de3f53daa4cf073704d8639ac291e781a74633194adedaae21a
-DIST z3-4.12.0.tar.gz 5468532 BLAKE2B 229e8fb19cfb377f3ec9a728254c913a582ee16cfafaa8eb66683df01fc8320b527e493fe692fa85029360f6065d5a068ccbf337cdaf4b8f492ac8a2c3674063 SHA512 53a51c8304fa4356d13293f68b14d9d9eef57a0771c6698d38aea5fac62c4e52c41ff003cb6d771a32645d2aa4ef59be5f792f2efbee927d06ac8280094976e5
 DIST z3-4.12.1.tar.gz 5470095 BLAKE2B 8840b2c3bea5ae409f52bd2db931f7c0d88f86e154c2bf7d1bed34a0c7b72a5596a20467259f37ad9cae3c7e24d2e04ddebe8dd539a2e1a1ed6445d59b6cef28 SHA512 031fba9cc000a8da0025f95fa3f1c7519071d1b7775b377ff3192c505bb4c7e3d267da246c9ae68c940224e055a3c30571d2c0d7fbb042ec9a3d5849543a385c
-EBUILD z3-4.11.2.ebuild 2598 BLAKE2B 11ed8b0481fd1b020907a8dfa31b23210a292d5f9fda1c472709138686f9c072b7ad3392849d7e4b18e3ea69b778c97579099cb738ca0e7dcece73a0ecaed94a SHA512 fd0e47c7015b77c7fe8d9256b94ef5508e97e3d0d4f8eb20ad4932614829b73221af30841d521a32d50ab341c39dcdec07a27ebe3c968c227d75a4769b254a24
-EBUILD z3-4.12.0.ebuild 2604 BLAKE2B b19844adc8eb2155fe1b203a3bcae36b339033a9771b0685f709d0e1695e2a537adb54dcdc3afaa03259c9dfb91b20fd4511a957dea9a46d6c1ebf20e939dd84 SHA512 de65594b85e908e228a8f3f69d1da65201e8509623d93597516593b8bd5ffd70948af3245bbe0ace3c7516c861f7676efce0dff97c19839e9df0180f5da2af7a
-EBUILD z3-4.12.1.ebuild 2604 BLAKE2B b19844adc8eb2155fe1b203a3bcae36b339033a9771b0685f709d0e1695e2a537adb54dcdc3afaa03259c9dfb91b20fd4511a957dea9a46d6c1ebf20e939dd84 SHA512 de65594b85e908e228a8f3f69d1da65201e8509623d93597516593b8bd5ffd70948af3245bbe0ace3c7516c861f7676efce0dff97c19839e9df0180f5da2af7a
+EBUILD z3-4.12.1.ebuild 2598 BLAKE2B 11ed8b0481fd1b020907a8dfa31b23210a292d5f9fda1c472709138686f9c072b7ad3392849d7e4b18e3ea69b778c97579099cb738ca0e7dcece73a0ecaed94a SHA512 fd0e47c7015b77c7fe8d9256b94ef5508e97e3d0d4f8eb20ad4932614829b73221af30841d521a32d50ab341c39dcdec07a27ebe3c968c227d75a4769b254a24
 MISC metadata.xml 1800 BLAKE2B 26b4fd829e8daf66cfb19f61afffe9535099260732b3856c400881e68dbc4c2ffe88ff57f3a23449a2259696f23969c6502d4f3432b9cafc2e89e99167c94b90 SHA512 92f05bb1617630c16801ae5ea4215436c4d5dde6890d1a9e90c81f8ce1cddf101b73e016d1ec67eb41ccb4b59753547e6d08ac6a70a5b2d3dc792dc9fba13166
diff --git a/sci-mathematics/z3/z3-4.11.2.ebuild b/sci-mathematics/z3/z3-4.11.2.ebuild
deleted file mode 100644
index 2144f15912a8..000000000000
--- a/sci-mathematics/z3/z3-4.11.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake-multilib java-pkg-opt-2 python-single-r1
-
-DESCRIPTION="An efficient theorem prover"
-HOMEPAGE="https://github.com/Z3Prover/z3/"
-SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
-S=${WORKDIR}/z3-${P}
-
-SLOT="0/$(ver_cut 1-2)"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv sparc x86"
-IUSE="doc examples gmp isabelle java python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:0=[cxx(+),${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	java? ( >=virtual/jdk-1.8 )
-"
-BDEPEND="
-	doc? ( app-doc/doxygen[dot] )
-"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	cmake_src_prepare
-	java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DZ3_USE_LIB_GMP=$(usex gmp)
-		-DZ3_ENABLE_EXAMPLE_TARGETS=OFF
-		-DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc)
-		-DZ3_BUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
-		-DZ3_BUILD_JAVA_BINDINGS=$(multilib_native_usex java)
-		-DZ3_INCLUDE_GIT_DESCRIBE=OFF
-		-DZ3_INCLUDE_GIT_HASH=OFF
-	)
-
-	multilib_is_native_abi && use java && mycmakeargs+=( -DJAVA_HOME="$(java-config -g JAVA_HOME )" )
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	cmake_build test-z3
-	set -- "${BUILD_DIR}"/test-z3 /a
-	echo "${@}" >&2
-	"${@}" || die
-}
-
-multilib_src_install_all() {
-	dodoc README.md
-	use examples && dodoc -r examples
-	use python && python_optimize
-
-	if use isabelle; then
-		insinto /usr/share/Isabelle/contrib/${P}/etc
-		newins - settings <<-EOF
-			Z3_COMPONENT="\$COMPONENT"
-			Z3_HOME="${EPREFIX}/usr/bin"
-			Z3_SOLVER="${EPREFIX}/usr/bin/z3"
-			Z3_REMOTE_SOLVER="z3"
-			Z3_VERSION="${PV}"
-			Z3_INSTALLED="yes"
-			Z3_NON_COMMERCIAL="yes"
-		EOF
-	fi
-}
-
-pkg_postinst() {
-	if use isabelle; then
-		if [[ -f ${ROOT}/etc/isabelle/components ]]; then
-			sed -e "/contrib\/${PN}-[0-9.]*/d" \
-				-i "${ROOT}/etc/isabelle/components" || die
-			cat <<-EOF >> "${ROOT}/etc/isabelle/components" || die
-				contrib/${P}
-			EOF
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use isabelle; then
-		if [[ ! ${REPLACING_VERSIONS} ]]; then
-			if [[ -f "${ROOT}/etc/isabelle/components" ]]; then
-				# Note: this sed should only match the version of this ebuild
-				# Which is what we want as we do not want to remove the line
-				# of a new Isabelle component being installed during an upgrade.
-				sed -e "/contrib\/${P}/d" \
-					-i "${ROOT}/etc/isabelle/components" || die
-			fi
-		fi
-	fi
-}
diff --git a/sci-mathematics/z3/z3-4.12.0.ebuild b/sci-mathematics/z3/z3-4.12.0.ebuild
deleted file mode 100644
index 56bcff6924d7..000000000000
--- a/sci-mathematics/z3/z3-4.12.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake-multilib java-pkg-opt-2 python-single-r1
-
-DESCRIPTION="An efficient theorem prover"
-HOMEPAGE="https://github.com/Z3Prover/z3/"
-SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
-S=${WORKDIR}/z3-${P}
-
-SLOT="0/$(ver_cut 1-2)"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="doc examples gmp isabelle java python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:0=[cxx(+),${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	java? ( >=virtual/jdk-1.8 )
-"
-BDEPEND="
-	doc? ( app-doc/doxygen[dot] )
-"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	cmake_src_prepare
-	java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DZ3_USE_LIB_GMP=$(usex gmp)
-		-DZ3_ENABLE_EXAMPLE_TARGETS=OFF
-		-DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc)
-		-DZ3_BUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
-		-DZ3_BUILD_JAVA_BINDINGS=$(multilib_native_usex java)
-		-DZ3_INCLUDE_GIT_DESCRIBE=OFF
-		-DZ3_INCLUDE_GIT_HASH=OFF
-	)
-
-	multilib_is_native_abi && use java && mycmakeargs+=( -DJAVA_HOME="$(java-config -g JAVA_HOME )" )
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	cmake_build test-z3
-	set -- "${BUILD_DIR}"/test-z3 /a
-	echo "${@}" >&2
-	"${@}" || die
-}
-
-multilib_src_install_all() {
-	dodoc README.md
-	use examples && dodoc -r examples
-	use python && python_optimize
-
-	if use isabelle; then
-		insinto /usr/share/Isabelle/contrib/${P}/etc
-		newins - settings <<-EOF
-			Z3_COMPONENT="\$COMPONENT"
-			Z3_HOME="${EPREFIX}/usr/bin"
-			Z3_SOLVER="${EPREFIX}/usr/bin/z3"
-			Z3_REMOTE_SOLVER="z3"
-			Z3_VERSION="${PV}"
-			Z3_INSTALLED="yes"
-			Z3_NON_COMMERCIAL="yes"
-		EOF
-	fi
-}
-
-pkg_postinst() {
-	if use isabelle; then
-		if [[ -f ${ROOT}/etc/isabelle/components ]]; then
-			sed -e "/contrib\/${PN}-[0-9.]*/d" \
-				-i "${ROOT}/etc/isabelle/components" || die
-			cat <<-EOF >> "${ROOT}/etc/isabelle/components" || die
-				contrib/${P}
-			EOF
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use isabelle; then
-		if [[ ! ${REPLACING_VERSIONS} ]]; then
-			if [[ -f "${ROOT}/etc/isabelle/components" ]]; then
-				# Note: this sed should only match the version of this ebuild
-				# Which is what we want as we do not want to remove the line
-				# of a new Isabelle component being installed during an upgrade.
-				sed -e "/contrib\/${P}/d" \
-					-i "${ROOT}/etc/isabelle/components" || die
-			fi
-		fi
-	fi
-}
diff --git a/sci-mathematics/z3/z3-4.12.1.ebuild b/sci-mathematics/z3/z3-4.12.1.ebuild
index 56bcff6924d7..2144f15912a8 100644
--- a/sci-mathematics/z3/z3-4.12.1.ebuild
+++ b/sci-mathematics/z3/z3-4.12.1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/z3-${P}
 
 SLOT="0/$(ver_cut 1-2)"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv sparc x86"
 IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 10bc2f048a75..ac90e9fe1830 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gr/Manifest b/sci-visualization/gr/Manifest
index 5d83664812fc..e3f534a9d8b8 100644
--- a/sci-visualization/gr/Manifest
+++ b/sci-visualization/gr/Manifest
@@ -1,4 +1,6 @@
 AUX gr-0.53.0-musl.patch 797 BLAKE2B 4eb48a510b19a23cc4c82e0f81a1f9753c96f0554edecf4a4163b17be9505e8c8d0710f9c97c49dadb84fefe69cab27a3bfbb6cfe04b97b0d9a260b6e4042fe5 SHA512 5080806ed0598d404a380c3d8fe10207dd3fc1245b76992c341261f43b9727a82f7ebd85e582c606d6ccaf72eb04a57d21ccc0168e5c19b6b37cb2b265fa0018
 DIST gr-0.53.0.tar.gz 19267451 BLAKE2B bd243fac9df6222c4b9e3591adfcd1d37dd41628719bd7be7ab385402f0f97e21f3eb23df3ae5d2ed3e43df2b3d83ff66f4e0b478d717772b57dce5885a98721 SHA512 49eee39fd4abd62d6794a16eb023688a525f6906054610dccd85c1b7b0bed9b198d923834cbf661099f753ec40b383a911c295f781420aeead712c5712583c80
+DIST gr-0.72.0.tar.gz 9064921 BLAKE2B 92f531cd308c8bcec0f36fd57b1aeddfeb555ae4ceb1a394276f37ae515d1b5172ef775d0b33d6aa429ac46021194a4327646a486112032722121c01885c6bfa SHA512 cb04cff65649c4f688c07afaa6959ba08f88f6f9d0935bbd7b29bf58dab2a114609ea45d9849a1acc5bbd0feab4083d692a4364ada653dcbfe7f99e2594d9a42
 EBUILD gr-0.53.0-r2.ebuild 2094 BLAKE2B a90f89e4b6986277d5e298bbe7a021e3848b49d5b67cbf7212b6db063efe16d9019d730be9002e6ee5dbc29320ee0229c1fa5c91cf5504e30436c4bb32107da9 SHA512 57951e4a4edd1b8465c4174e0d231ac2d57cd85691dfc128a7b1c4d0efd6006d6587065e2cd0e21985dc45e679408b84673ac6e6f349f5c8f296d638b4753059
+EBUILD gr-0.72.0.ebuild 2133 BLAKE2B 24fb5d37658380122e574f9df10e8f2906d238fa9655cfbf6a3f0b19c84a104a2066e53c8c5a1acc3ac8e9c83d46afec7413297f58d1e9b59ad17b05c14b080c SHA512 4df978354e3fa3cca217a22bdc75e9a92b3fe15bad3b3825c67aa05ea9f98ada927d2581b54308bf142a94c838543735a259afbf90432e496d8333e02985c99c
 MISC metadata.xml 261 BLAKE2B e57c0c3e4a59fdb630d23ae9d96afed10307c5308bace0cf58c22f41cbbf22fc82c5cd0d041800498570b1490a39f6c47547acfbb2766e21735820ae1c39bf8f SHA512 212dbdf6e688804621cd0ee28e47d3b9696182fe4850a87569e0727e5e811b7c4193807c2ecec65005e1689d4c0ba2c88fb67b29cc89928649e23d23a94d724b
diff --git a/sci-visualization/gr/gr-0.72.0.ebuild b/sci-visualization/gr/gr-0.72.0.ebuild
new file mode 100644
index 000000000000..0db230abd6ba
--- /dev/null
+++ b/sci-visualization/gr/gr-0.72.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Universal framework for cross-platform visualization applications"
+HOMEPAGE="https://gr-framework.org/"
+SRC_URI="https://github.com/sciapp/gr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cairo ffmpeg postscript tiff truetype"
+
+DEPEND="
+	dev-qt/qtgui:5
+	media-libs/fontconfig
+	media-libs/glfw
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/qhull:=
+	net-libs/zeromq
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/agg
+	x11-libs/libX11
+	x11-libs/libXt
+	cairo? ( x11-libs/cairo )
+	ffmpeg? ( media-video/ffmpeg:= )
+	postscript? ( app-text/ghostscript-gpl )
+	tiff? ( media-libs/tiff:= )
+	truetype? ( media-libs/freetype )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.53.0-musl.patch"
+)
+
+REQUIRED_USE="cairo? ( truetype )"
+
+src_configure() {
+	use cairo || mycmakeargs+=( -DCAIRO_LIBRARY= )
+	use postscript || mycmakeargs+=( -DGS_LIBRARY= )
+	use ffmpeg || mycmakeargs+=( -DFFMPEG_INCLUDE_DIR= )
+	use truetype || mycmakeargs+=( -DFREETYPE_LIBRARY= )
+	use tiff || mycmakeargs+=( -DTIFF_LIBRARY= )
+
+	# todo: X11 automagic
+
+	mycmakeargs+=( -DCMAKE_INSTALL_PREFIX=/usr/gr )
+	mycmakeargs+=( -DCMAKE_INSTALL_LIBDIR=lib )
+	#
+	# I need to have a serious conversation with upstream.
+	# * The main consumer of this package is dev-lang/julia.
+	# * If I patch gr to install in standard locations, julia does
+	#   not find it anymore.
+	# * I can't patch julia, since the corresponding scripts are
+	#   downloaded at runtime from its package registry ...
+	# * See bug 882619 in addition.
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	find "${ED}" -name '*.a' -delete
+
+	echo "GRDIR=/usr/gr" > "${T}/99gr"
+	echo "LDPATH=/usr/gr/$(get_libdir)" >> "${T}/99gr"
+	doenvd "${T}/99gr"
+
+	[[ -f "${ED}/usr/gr/bin/gksqt" ]] && dosym ../gr/bin/gksqt /usr/bin/gksqt
+
+	elog "${P} relies on the environment variable GRDIR. If you want to use it in a running shell,"
+	elog "e.g. with dev-lang/julia, then run \"source /etc/profile\" first."
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 7b174883a71d..fb53b4187a1a 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/servicelog/Manifest b/sys-apps/servicelog/Manifest
index 2dd1c79f699c..e61b64bc4f41 100644
--- a/sys-apps/servicelog/Manifest
+++ b/sys-apps/servicelog/Manifest
@@ -1,5 +1,5 @@
 DIST servicelog-1.1.15.tar.gz 29097 BLAKE2B a2ae131305ce466999536fca6734c006eafe70d8be16c5a8465f6ceb7ffb53cd06d82fe7229275f4e71ffddf7a572a214591aed59a6345f81c3f65dbe205cd1e SHA512 5d5142aeb947133fb8ae77d5021790ab530d4614a8becf018342e1feeded2f64302343189d4bd4d684b096888aad6f45e08861404bcc5437abeac078fbbb7ac6
 DIST servicelog-1.1.16.tar.gz 33068 BLAKE2B 281f15aecaafb246c9a6b40f377aa5087f2b3fdd28f217e7f26aa19f30e66c03b0a795f7eedf14d27b49ae36c81b4bdba9b0f9108a2a7a3a18051e35b8ec8a71 SHA512 127329cd04cbcc83ea95614aff441e8efb5ba10c1befbf13ad9ed7fc2ca88f11b6390c2ed7843df7e56b848fb0066d85c0bf17e60b22885ed4266661012b34a0
 EBUILD servicelog-1.1.15.ebuild 514 BLAKE2B 6c442aae127d952781ab50d1f460266b5f1e402bd68b1c0a3c446925d3d78d26d6b2b986a81d39d401c2e5eafee173085d89d249307f651c24941223abe5ee54 SHA512 64cd20c23a344df40306dfaf59b0278ee47519cbcd8fe11ba00768c798144efb1a755e480d4fcc5bcbba710001e548ab1290427e5a11b10286713526f46292a3
-EBUILD servicelog-1.1.16.ebuild 516 BLAKE2B 8fbc4fb15d8ed80e76933cee9730bf097a007db56edf6315e3d67dd66d25b29c40ef8b9c60af2718b6c1b8ec84c100f13417f0162f651f184fcff7435759a530 SHA512 26b33b52748301a84f7af7074666a235cf9567022e7d0c03d1cc3fbac2dbc03aa483f4fa4aa65ef6dd2053d55bddc9d9643a364478656f6469abfbdac2cac2cb
+EBUILD servicelog-1.1.16.ebuild 514 BLAKE2B 89d6b7ef12929cc5d036427ff60c9247f000e35c5ca3544b893353c6144b170fe6015fa7d33462a26fc4db38afe597b664943746798c8de0eb4a83ea63fe4c0b SHA512 5721f443bdcb7ffdc7b41d9be9791eeecf57c2e5df0fecb06cf9fc7e86c12e298f34cbbc42cdcd306fa92228245608927974421b17c6d485a78c3211c14a6602
 MISC metadata.xml 342 BLAKE2B 555acb5327797eabb9018b645dca7e16c6377c3933aeb11f471596546cd215c1f063cad12c0862b0815571f91c8393658e7da27d99904097076f6bdb139421c6 SHA512 2787bf57b15a440993c487a8fe4cf9602665a3753f1e6cd389bbed46c99095ee5ba551cb3b1d320e06247e3ae5c55f866b7f77b1515cfb21ddb44479b28bfdec
diff --git a/sys-apps/servicelog/servicelog-1.1.16.ebuild b/sys-apps/servicelog/servicelog-1.1.16.ebuild
index 90da4a3e02d8..a70e9fa93aca 100644
--- a/sys-apps/servicelog/servicelog-1.1.16.ebuild
+++ b/sys-apps/servicelog/servicelog-1.1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~ppc ~ppc64"
+KEYWORDS="ppc ppc64"
 
 DEPEND="
 	sys-libs/libservicelog
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 9b3216d5b87a..2709ff6f8b4f 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 028e443ef9fb..4141f2cb4729 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -5,8 +5,10 @@ DIST kubernetes-1.23.17.tar.gz 38135738 BLAKE2B 18661ca95d518ede1b8f08ec380bdb46
 DIST kubernetes-1.24.11.tar.gz 37867002 BLAKE2B 3972a049b1549cb1ed147763f09d20b656243814a91d701a1171c171a19721aef2b8393121160edbd75e6f11978b355ce8e97ef6e9d007634428753d7cc1499e SHA512 ceaa5ca883d208e8f80d4d2628195256df697ce5ebedf2524af7cd94ffd783c055c47797cf76f6d4893e2392b652a89f55999251feda196b96b9df4c27215adc
 DIST kubernetes-1.25.7.tar.gz 38169376 BLAKE2B d324e823be2efc3d19892313ed2a7daa0a3c1384f4f03e18a703f63f32609e1a594a8fd3fc49cb78330848fd42ae1d629339a967ab973e73ddff2be8c6a1eb73 SHA512 d164496df03223cab4d1754ab42f88f0e5d5cc95e1e5995442183aa739d583078c6b7ea1febdc92e2bf8b76820857cd8973d8364f452c2e576b7168a32578419
 DIST kubernetes-1.26.2.tar.gz 38192706 BLAKE2B ca14778ab5a1d1bdfb935d80eea269adb0414b5613d8e70b9c790711a284b79c8f89cdd22af73b9127fbf9f036b0aa317fbd97bc1df735aead0903d951fe5f4a SHA512 c14f3ba25ae3608ca8d28ab75c2f6a3636970d5851ef1c09259d6be4bce17af131f9adcc0be8e51f4197dc16650461bac8faae7b7ef24f899c1a0ad193ed0a6b
+DIST kubernetes-1.26.3.tar.gz 38215855 BLAKE2B 1bc1b4e9aeebc41e3e7a519f097b886d0cdede91f0cbbabc7c26db1c75d87220f2e8a5aa5ac85ad0c01486abd5806e74d2b09aa1a0281364b70417d3daea503e SHA512 7a8aa29ea282aec99046d231d4c6756e36ba74eca4c2300b3b1f5a1362d211ffe712957746044168b254ba7332e324e341a2e4d56be7bb6a58de953fa630ac14
 EBUILD kube-apiserver-1.23.17.ebuild 991 BLAKE2B bb3c113feb47d485aea4a430d91bb49a6de635a79d9d6313f1c0e4c6ccdd1136854ca631057352ad222c882d7f03ce0a3870875ea5b88379819b57b0712cb806 SHA512 d63508cd414eaf712aeb1e6ffae629289bf8a27b533faa547260ab6060a100f62bb6370d8ffdaa3f40bb680d137185b78ff49d20c023f37f95720c980f8c2849
 EBUILD kube-apiserver-1.24.11.ebuild 993 BLAKE2B f6fa68cba4436ed9491bc8a65918f2406542f8bf35a7eb04cf70fa65717d3bc8f570ee4e5d1591209a2dcd71898060f2a18e63eba5edcda2cfeb141c92c86aac SHA512 745d5ffff353ff250f13a86e903a262ec8585353354664135cd3bf60f52b6bc79b66e61d918b98d6e4a6d6d7ca797dba90ca645e47b35b6181bf9c1d08404d76
 EBUILD kube-apiserver-1.25.7.ebuild 991 BLAKE2B 27a5563d75bb7c818335c8d019b63c2371a7c72d679bb237d79cc699ffd7e5f4f5f11a4197cdd086c4162d2af3fcb5c252a4effcd2fdc7ddf95fc0c1c2784946 SHA512 4dcce5a68b1f97d9f13191677fb21324317f38d5b4b2f15d4514b83ea96e097d5bbe86260c1f8ad462373d234cbe361ef9e2b3b615ee4cb86d984b83b5acddd8
 EBUILD kube-apiserver-1.26.2.ebuild 991 BLAKE2B 27a5563d75bb7c818335c8d019b63c2371a7c72d679bb237d79cc699ffd7e5f4f5f11a4197cdd086c4162d2af3fcb5c252a4effcd2fdc7ddf95fc0c1c2784946 SHA512 4dcce5a68b1f97d9f13191677fb21324317f38d5b4b2f15d4514b83ea96e097d5bbe86260c1f8ad462373d234cbe361ef9e2b3b615ee4cb86d984b83b5acddd8
+EBUILD kube-apiserver-1.26.3.ebuild 992 BLAKE2B b30918ad020cf26fb16d4a528e860370101cbf1086cc02c843a87b91fe5d85c8ae4adfdc35eb4001f680679ee9c63a6ebcf9dda01641add837ce84da66eebd34 SHA512 0459c3a30a6633a367fd69c421e7566080994cbade440ee438b91f628c4acc7b68c00c273a027eb01850df32a80cfa33cad678559661e06893b08098ee1cb726
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.26.3.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.26.3.ebuild
new file mode 100644
index 000000000000..467da4d39d0b
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.26.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.19"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 374bf3d8ed66..bfb0e5c8af2c 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -5,8 +5,10 @@ DIST kubernetes-1.23.17.tar.gz 38135738 BLAKE2B 18661ca95d518ede1b8f08ec380bdb46
 DIST kubernetes-1.24.11.tar.gz 37867002 BLAKE2B 3972a049b1549cb1ed147763f09d20b656243814a91d701a1171c171a19721aef2b8393121160edbd75e6f11978b355ce8e97ef6e9d007634428753d7cc1499e SHA512 ceaa5ca883d208e8f80d4d2628195256df697ce5ebedf2524af7cd94ffd783c055c47797cf76f6d4893e2392b652a89f55999251feda196b96b9df4c27215adc
 DIST kubernetes-1.25.7.tar.gz 38169376 BLAKE2B d324e823be2efc3d19892313ed2a7daa0a3c1384f4f03e18a703f63f32609e1a594a8fd3fc49cb78330848fd42ae1d629339a967ab973e73ddff2be8c6a1eb73 SHA512 d164496df03223cab4d1754ab42f88f0e5d5cc95e1e5995442183aa739d583078c6b7ea1febdc92e2bf8b76820857cd8973d8364f452c2e576b7168a32578419
 DIST kubernetes-1.26.2.tar.gz 38192706 BLAKE2B ca14778ab5a1d1bdfb935d80eea269adb0414b5613d8e70b9c790711a284b79c8f89cdd22af73b9127fbf9f036b0aa317fbd97bc1df735aead0903d951fe5f4a SHA512 c14f3ba25ae3608ca8d28ab75c2f6a3636970d5851ef1c09259d6be4bce17af131f9adcc0be8e51f4197dc16650461bac8faae7b7ef24f899c1a0ad193ed0a6b
+DIST kubernetes-1.26.3.tar.gz 38215855 BLAKE2B 1bc1b4e9aeebc41e3e7a519f097b886d0cdede91f0cbbabc7c26db1c75d87220f2e8a5aa5ac85ad0c01486abd5806e74d2b09aa1a0281364b70417d3daea503e SHA512 7a8aa29ea282aec99046d231d4c6756e36ba74eca4c2300b3b1f5a1362d211ffe712957746044168b254ba7332e324e341a2e4d56be7bb6a58de953fa630ac14
 EBUILD kube-controller-manager-1.23.17.ebuild 988 BLAKE2B d78d11bccea71b741539d4b4a0d97378f86b3db26dae9a768db40488f4c8b72d72057c8f165b62a536c2240f9a432f1d0fd0f98ab35883810a22358b210ddc66 SHA512 9a0e44f6fdc267eb3c7a1d9f0ea0ca7374d677a3f96a8e155c10a50b99ea4f5991b51b6479acbf7c47e4bbcd1fd118f20c30bdad9886e398cc8dbaf3b0f460b6
 EBUILD kube-controller-manager-1.24.11.ebuild 990 BLAKE2B 92eed848da224757f008ce11565aba6967fbc82d5fcc5b3354db6f2bb6e75f3f4150b7ba352f4b3e8ff52100d81973ae417a89c58dbb5b8b8cb4dbe4fccb4a80 SHA512 51603722a1ad80474366a31c81f2ab9f4e4c679e1dafa9e64442f9de0c004e3f10e5f1f980e7ee2ed95308dc6f37425689d9e3daf14b79eab9469e4d63743f57
 EBUILD kube-controller-manager-1.25.7.ebuild 988 BLAKE2B c0ef8c338ce9b85ea7f875158058fb09f6946862f32983f478638842b4b30e5eb43c5f82f0799f3f47491f19fba4475e9ca29b5630ef5e0b91bc4da472951c5a SHA512 02b9a4c1b5d8d0c4eb4ce3de6a2fcf99ca6d08c3b6bd51574f717a123ffd2499d77905af5a501f32df9b06ebf12e9757d87a61942fd9bb1b8210083321311b97
 EBUILD kube-controller-manager-1.26.2.ebuild 988 BLAKE2B c0ef8c338ce9b85ea7f875158058fb09f6946862f32983f478638842b4b30e5eb43c5f82f0799f3f47491f19fba4475e9ca29b5630ef5e0b91bc4da472951c5a SHA512 02b9a4c1b5d8d0c4eb4ce3de6a2fcf99ca6d08c3b6bd51574f717a123ffd2499d77905af5a501f32df9b06ebf12e9757d87a61942fd9bb1b8210083321311b97
+EBUILD kube-controller-manager-1.26.3.ebuild 989 BLAKE2B 7000dabd11b273b370c7f0b6b607962579e796d3de369f251df983f8b30a4db21e2e84fed99de11ff5530d1b58a5ef9d89fcf6040556adda9cb91bb230368067 SHA512 81a3f57b5495aedbb4f305dc476b15685461347393441d2c99f59759e24655dcd615299eb8ac7af87d46887f1c7a46a072350d1e0cfdbbedd0ea2677424c0e8d
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.26.3.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.26.3.ebuild
new file mode 100644
index 000000000000..c4863b6e8840
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.26.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.19"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 9874343d3d88..b2d512760613 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -5,8 +5,10 @@ DIST kubernetes-1.23.17.tar.gz 38135738 BLAKE2B 18661ca95d518ede1b8f08ec380bdb46
 DIST kubernetes-1.24.11.tar.gz 37867002 BLAKE2B 3972a049b1549cb1ed147763f09d20b656243814a91d701a1171c171a19721aef2b8393121160edbd75e6f11978b355ce8e97ef6e9d007634428753d7cc1499e SHA512 ceaa5ca883d208e8f80d4d2628195256df697ce5ebedf2524af7cd94ffd783c055c47797cf76f6d4893e2392b652a89f55999251feda196b96b9df4c27215adc
 DIST kubernetes-1.25.7.tar.gz 38169376 BLAKE2B d324e823be2efc3d19892313ed2a7daa0a3c1384f4f03e18a703f63f32609e1a594a8fd3fc49cb78330848fd42ae1d629339a967ab973e73ddff2be8c6a1eb73 SHA512 d164496df03223cab4d1754ab42f88f0e5d5cc95e1e5995442183aa739d583078c6b7ea1febdc92e2bf8b76820857cd8973d8364f452c2e576b7168a32578419
 DIST kubernetes-1.26.2.tar.gz 38192706 BLAKE2B ca14778ab5a1d1bdfb935d80eea269adb0414b5613d8e70b9c790711a284b79c8f89cdd22af73b9127fbf9f036b0aa317fbd97bc1df735aead0903d951fe5f4a SHA512 c14f3ba25ae3608ca8d28ab75c2f6a3636970d5851ef1c09259d6be4bce17af131f9adcc0be8e51f4197dc16650461bac8faae7b7ef24f899c1a0ad193ed0a6b
+DIST kubernetes-1.26.3.tar.gz 38215855 BLAKE2B 1bc1b4e9aeebc41e3e7a519f097b886d0cdede91f0cbbabc7c26db1c75d87220f2e8a5aa5ac85ad0c01486abd5806e74d2b09aa1a0281364b70417d3daea503e SHA512 7a8aa29ea282aec99046d231d4c6756e36ba74eca4c2300b3b1f5a1362d211ffe712957746044168b254ba7332e324e341a2e4d56be7bb6a58de953fa630ac14
 EBUILD kube-proxy-1.23.17.ebuild 903 BLAKE2B f323a3ea9643d938ada5cc32708db2afe505a41b22b2b4cdf50ae1c8857fc1bbbdc94c8f76a8b74bb215f9ea78c05786fd29826e2bfc841af209c75026ec095a SHA512 6db32a0169b384b05a4034473d3d1a5e46cb3edaa1cc06359b6a8b262384944e667dd970062dd923541fc3d7f4015fa84243a16510f690fc0824406139141f1f
 EBUILD kube-proxy-1.24.11.ebuild 905 BLAKE2B 7e89200da172e73843babec97cb9b2022d280ffbedfb295e5d280f623f26a0eaf8f29a68d1828c76c933e51c7e333ef10193612a0300bbc752be72d624161ca9 SHA512 19bb1f3e56b65de0345656c3cc82092f8f0fc97bcfa80acbdfc8fa830790b0df55d8c862e2ed41471042560a81bad7b6323d87fce631d4f3f58d8f7b54a9be7e
 EBUILD kube-proxy-1.25.7.ebuild 903 BLAKE2B 1aa153095ce5f8bb28c12717c62936aac24b73b7e0780a4736c59a9c7c7a492c1c3bfc15343575bd4243c02a44ba2c73ec78fa064feed192c2410df575bae4af SHA512 cb2e2a9c28cce3b178ff30e08da842a75e8dee62c72d1243c503824ed180a31f5e27c76c885c248f2760e5ba1a7a009bf30d8706bbdbd07a609914a5b924f07d
 EBUILD kube-proxy-1.26.2.ebuild 903 BLAKE2B 1aa153095ce5f8bb28c12717c62936aac24b73b7e0780a4736c59a9c7c7a492c1c3bfc15343575bd4243c02a44ba2c73ec78fa064feed192c2410df575bae4af SHA512 cb2e2a9c28cce3b178ff30e08da842a75e8dee62c72d1243c503824ed180a31f5e27c76c885c248f2760e5ba1a7a009bf30d8706bbdbd07a609914a5b924f07d
+EBUILD kube-proxy-1.26.3.ebuild 904 BLAKE2B abb12e72e4582a9d56311cfa78e81df9abce2ba772cd4f20465f18b66c0c1d1a0531fec677f06467342a5c20725f0f9fe3e5f83ef736893f15cd5bc3af85fc31 SHA512 6dba638ed80bbc7454392f06b79c056c2edbb12ed94dd46883942ecd448ad53c0e13faf56c6ea5d9be4cbf35ab935f0e062657edbe2bc2da0b2582b28dda8867
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.26.3.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.26.3.ebuild
new file mode 100644
index 000000000000..c2bf8bb7da7f
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.26.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools"
+BDEPEND=">=dev-lang/go-1.19"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 93b7f12c504a..1e7562e7bf9c 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -5,8 +5,10 @@ DIST kubernetes-1.23.17.tar.gz 38135738 BLAKE2B 18661ca95d518ede1b8f08ec380bdb46
 DIST kubernetes-1.24.11.tar.gz 37867002 BLAKE2B 3972a049b1549cb1ed147763f09d20b656243814a91d701a1171c171a19721aef2b8393121160edbd75e6f11978b355ce8e97ef6e9d007634428753d7cc1499e SHA512 ceaa5ca883d208e8f80d4d2628195256df697ce5ebedf2524af7cd94ffd783c055c47797cf76f6d4893e2392b652a89f55999251feda196b96b9df4c27215adc
 DIST kubernetes-1.25.7.tar.gz 38169376 BLAKE2B d324e823be2efc3d19892313ed2a7daa0a3c1384f4f03e18a703f63f32609e1a594a8fd3fc49cb78330848fd42ae1d629339a967ab973e73ddff2be8c6a1eb73 SHA512 d164496df03223cab4d1754ab42f88f0e5d5cc95e1e5995442183aa739d583078c6b7ea1febdc92e2bf8b76820857cd8973d8364f452c2e576b7168a32578419
 DIST kubernetes-1.26.2.tar.gz 38192706 BLAKE2B ca14778ab5a1d1bdfb935d80eea269adb0414b5613d8e70b9c790711a284b79c8f89cdd22af73b9127fbf9f036b0aa317fbd97bc1df735aead0903d951fe5f4a SHA512 c14f3ba25ae3608ca8d28ab75c2f6a3636970d5851ef1c09259d6be4bce17af131f9adcc0be8e51f4197dc16650461bac8faae7b7ef24f899c1a0ad193ed0a6b
+DIST kubernetes-1.26.3.tar.gz 38215855 BLAKE2B 1bc1b4e9aeebc41e3e7a519f097b886d0cdede91f0cbbabc7c26db1c75d87220f2e8a5aa5ac85ad0c01486abd5806e74d2b09aa1a0281364b70417d3daea503e SHA512 7a8aa29ea282aec99046d231d4c6756e36ba74eca4c2300b3b1f5a1362d211ffe712957746044168b254ba7332e324e341a2e4d56be7bb6a58de953fa630ac14
 EBUILD kube-scheduler-1.23.17.ebuild 961 BLAKE2B 4737ab433f0f13b64b59dd9f28aa8aa52d4902faa40e73dea042bcc205317247e74919c89af7137a250c95577d5c46a878c420801e9cb3b2074c730c44e3b722 SHA512 e45033e454248fc5f75634dfe6ae2fb851c20fe1f0ca8df8dd592bbb5e26b32ac35ea3a9cd17d6f9d0149d9900a30151b0ad3e144c41524f117a26411f2e7c89
 EBUILD kube-scheduler-1.24.11.ebuild 963 BLAKE2B fafedf71e3dd0935060f9dfba79dab3daaeb4931e24eeb90b054ba734ad0d0709c984a9705ac3582e0b2b94120dca7da6ce237c2e4dcef90e95dcc39350c9867 SHA512 d1ff91ec5189ca994d09074cd0bb8208bb704ed595fcf9d7ee4a1d3a2d8176c184dab79afdbd902728949f0ef98acde2f0c2b2de548c671bd077bbfdf1545b0f
 EBUILD kube-scheduler-1.25.7.ebuild 961 BLAKE2B 1bf7855312c5044b5ea261baf2f35689b20e5009609e9a57b85aeaab0704502c152652128206c1e938f32f6b8171d1f639eb5e84956949142954963182540d97 SHA512 deab86ef065c7c468bacac9587f44fdefca43a44d7a5badea823d512ad74e90b960d607ea2deb943cf7335479b46ffe1ab5b3262b8f97f52935dcab6060d5976
 EBUILD kube-scheduler-1.26.2.ebuild 961 BLAKE2B 1bf7855312c5044b5ea261baf2f35689b20e5009609e9a57b85aeaab0704502c152652128206c1e938f32f6b8171d1f639eb5e84956949142954963182540d97 SHA512 deab86ef065c7c468bacac9587f44fdefca43a44d7a5badea823d512ad74e90b960d607ea2deb943cf7335479b46ffe1ab5b3262b8f97f52935dcab6060d5976
+EBUILD kube-scheduler-1.26.3.ebuild 962 BLAKE2B a2e246d283872bb91cf2db3ed38d5758d244a6b48fb2815b732659dc9132a04920d3349bda2828dd508ac00770e15655494e2e35c837ee890a1b124e238b2216 SHA512 8550424b4a34bcd3207de78e045b6c63b6859d8910b578a84f01b0d1b1c40c5fec79f770ee92685e660807422380bfdaf25c25310e9a3af24c45f46bbba3a1ef
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.26.3.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.26.3.ebuild
new file mode 100644
index 000000000000..b9b95df178b2
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.26.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.19"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 29c4c2d94795..09242db82086 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -2,8 +2,10 @@ DIST kubernetes-1.23.17.tar.gz 38135738 BLAKE2B 18661ca95d518ede1b8f08ec380bdb46
 DIST kubernetes-1.24.11.tar.gz 37867002 BLAKE2B 3972a049b1549cb1ed147763f09d20b656243814a91d701a1171c171a19721aef2b8393121160edbd75e6f11978b355ce8e97ef6e9d007634428753d7cc1499e SHA512 ceaa5ca883d208e8f80d4d2628195256df697ce5ebedf2524af7cd94ffd783c055c47797cf76f6d4893e2392b652a89f55999251feda196b96b9df4c27215adc
 DIST kubernetes-1.25.7.tar.gz 38169376 BLAKE2B d324e823be2efc3d19892313ed2a7daa0a3c1384f4f03e18a703f63f32609e1a594a8fd3fc49cb78330848fd42ae1d629339a967ab973e73ddff2be8c6a1eb73 SHA512 d164496df03223cab4d1754ab42f88f0e5d5cc95e1e5995442183aa739d583078c6b7ea1febdc92e2bf8b76820857cd8973d8364f452c2e576b7168a32578419
 DIST kubernetes-1.26.2.tar.gz 38192706 BLAKE2B ca14778ab5a1d1bdfb935d80eea269adb0414b5613d8e70b9c790711a284b79c8f89cdd22af73b9127fbf9f036b0aa317fbd97bc1df735aead0903d951fe5f4a SHA512 c14f3ba25ae3608ca8d28ab75c2f6a3636970d5851ef1c09259d6be4bce17af131f9adcc0be8e51f4197dc16650461bac8faae7b7ef24f899c1a0ad193ed0a6b
+DIST kubernetes-1.26.3.tar.gz 38215855 BLAKE2B 1bc1b4e9aeebc41e3e7a519f097b886d0cdede91f0cbbabc7c26db1c75d87220f2e8a5aa5ac85ad0c01486abd5806e74d2b09aa1a0281364b70417d3daea503e SHA512 7a8aa29ea282aec99046d231d4c6756e36ba74eca4c2300b3b1f5a1362d211ffe712957746044168b254ba7332e324e341a2e4d56be7bb6a58de953fa630ac14
 EBUILD kubeadm-1.23.17.ebuild 964 BLAKE2B b561fc8ed08d0d6858cbd26f3b2e8bd1ca1d4d8ca516ed2355252a645eb5d8a908be16cdbc3c1db6320b1e659d905f6ef34862368d6d6eb4c1d58f10c36667ed SHA512 6523aa8b36f424e9d5ed78eb138266248198d88509ea8f4a79adbbf8ac191429d3315c3e1e54a52b01b40cc40d2a4c34cb099f4c3c236310a27dc716dd4f88b3
 EBUILD kubeadm-1.24.11.ebuild 966 BLAKE2B db15d79a99cda7d4af9bc1e0ddbf91e17d2f94db50e62e60f45ed4b15ae70ccb8efee7df7b1f2aacce9a5bc7a60f58b852300b2eb80d44a5d28985a4bd223916 SHA512 58f98a1dd45ede91842e09d53d5f8c9c1c98f11e531b22db61abe3abfba4c2b005f255cf0fae6963546caf582dcaee7c9c0afc1ac585025c9cbe46d0a7337bc8
 EBUILD kubeadm-1.25.7.ebuild 964 BLAKE2B 98417244686292bceab7268358757606d233d5b17f1cff311969993ee9f7a78c80449dd0bc3a22e08eabba9fa1a9e9865edfaaa158103dc7df9211a60a3b8ee3 SHA512 9f7348c3c1a7a1f16a523af7243b08570102e953c692aed930ecbfd2307577eb2f0cb61f3df6dfb5ab79fd162bad6c1f2b430ac6d1ba013d2b1f05c5c6e31e79
 EBUILD kubeadm-1.26.2.ebuild 964 BLAKE2B 98417244686292bceab7268358757606d233d5b17f1cff311969993ee9f7a78c80449dd0bc3a22e08eabba9fa1a9e9865edfaaa158103dc7df9211a60a3b8ee3 SHA512 9f7348c3c1a7a1f16a523af7243b08570102e953c692aed930ecbfd2307577eb2f0cb61f3df6dfb5ab79fd162bad6c1f2b430ac6d1ba013d2b1f05c5c6e31e79
+EBUILD kubeadm-1.26.3.ebuild 965 BLAKE2B c7e336fce62d7c2d996efd34456f6bde2eaad7cec7a87e07cb6d565791f69d138c04c9d4f0f30ec1a144024ee7ec0b788b66fb2189c08df6053274ab18afb9c9 SHA512 169e04f793eebc40f6d4427c2d0f7698b1ac9c3002172e70750c27fc27f81ea310d3ab7818abe093b02c283ba47061725c40855d58af86e8c0f682d92a8d019d
 MISC metadata.xml 918 BLAKE2B 487a711e9aebe9d4d8f2c3a03664990aa544a4c0b969dbb60d10ebf42ca64cb9b21f822f92e774f3a813b409d5df905c8ecf02f186218f925a69f70b2960d53c SHA512 392d1cdf4179bc2aa14598e41e38e364518f0c71c34d61280729ae2cdab37c247112b48fcea58c792f6f7148e3979dfbff174bac3a3a00b7084168332112f5d3
diff --git a/sys-cluster/kubeadm/kubeadm-1.26.3.ebuild b/sys-cluster/kubeadm/kubeadm-1.26.3.ebuild
new file mode 100644
index 000000000000..f9b83313a772
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.26.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened selinux"
+
+BDEPEND=">=dev-lang/go-1.19"
+RDEPEND="app-containers/cri-tools
+	selinux? ( sec-policy/selinux-kubernetes )"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 1e93dd81beeb..300a0206437f 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -2,8 +2,10 @@ DIST kubernetes-1.23.17.tar.gz 38135738 BLAKE2B 18661ca95d518ede1b8f08ec380bdb46
 DIST kubernetes-1.24.11.tar.gz 37867002 BLAKE2B 3972a049b1549cb1ed147763f09d20b656243814a91d701a1171c171a19721aef2b8393121160edbd75e6f11978b355ce8e97ef6e9d007634428753d7cc1499e SHA512 ceaa5ca883d208e8f80d4d2628195256df697ce5ebedf2524af7cd94ffd783c055c47797cf76f6d4893e2392b652a89f55999251feda196b96b9df4c27215adc
 DIST kubernetes-1.25.7.tar.gz 38169376 BLAKE2B d324e823be2efc3d19892313ed2a7daa0a3c1384f4f03e18a703f63f32609e1a594a8fd3fc49cb78330848fd42ae1d629339a967ab973e73ddff2be8c6a1eb73 SHA512 d164496df03223cab4d1754ab42f88f0e5d5cc95e1e5995442183aa739d583078c6b7ea1febdc92e2bf8b76820857cd8973d8364f452c2e576b7168a32578419
 DIST kubernetes-1.26.2.tar.gz 38192706 BLAKE2B ca14778ab5a1d1bdfb935d80eea269adb0414b5613d8e70b9c790711a284b79c8f89cdd22af73b9127fbf9f036b0aa317fbd97bc1df735aead0903d951fe5f4a SHA512 c14f3ba25ae3608ca8d28ab75c2f6a3636970d5851ef1c09259d6be4bce17af131f9adcc0be8e51f4197dc16650461bac8faae7b7ef24f899c1a0ad193ed0a6b
+DIST kubernetes-1.26.3.tar.gz 38215855 BLAKE2B 1bc1b4e9aeebc41e3e7a519f097b886d0cdede91f0cbbabc7c26db1c75d87220f2e8a5aa5ac85ad0c01486abd5806e74d2b09aa1a0281364b70417d3daea503e SHA512 7a8aa29ea282aec99046d231d4c6756e36ba74eca4c2300b3b1f5a1362d211ffe712957746044168b254ba7332e324e341a2e4d56be7bb6a58de953fa630ac14
 EBUILD kubectl-1.23.17.ebuild 873 BLAKE2B bdf194ecbbefd3bb2ca9d14f09bce834fef192cfd798874b515a2b62970cc52ec4b48b2f33de47226df23f51d14c62a3dea5993cade3832df6911873519b9289 SHA512 534c63d9c75e81335cdd24335e68ba85bb59fa6acf6fc952e5b5671905bd37a68158a0b2a41c11d962698ac26e0cfce2882bceaf48bd04c85c08bcc2420bd928
 EBUILD kubectl-1.24.11.ebuild 875 BLAKE2B 562c1b24345307c6ad28ddc28a12b75b7a46b2f19906fa58c9a8898d286cecd402fd71148453583603f58c4bd534111bd492234090d1539ec4c4340b3c42092b SHA512 8e0c708f7fa34b4d4ce68af1f1c88e53fdd54875aca71b79c7af9c00a08f2b29ddb302a3159ee5b6975400b7fc4f51ac3b9e33b3e34fdce66f9f36e1b4ae7e30
 EBUILD kubectl-1.25.7.ebuild 873 BLAKE2B b4e63afdf9235f8890d11764f0779540685f007f4a5a1db4c319a8a66d6308549fa764624d99170088c7f82fab9e82173f04f18303b33272bbbc08764be86738 SHA512 9931017dc27ff974a94bff3ee60b3741e24bac819a38ead32d68d96ff08a04a113b22752f9f4076f7b850f7f3c0ca1790c362b89c31963e07617241c1903f602
 EBUILD kubectl-1.26.2.ebuild 873 BLAKE2B b4e63afdf9235f8890d11764f0779540685f007f4a5a1db4c319a8a66d6308549fa764624d99170088c7f82fab9e82173f04f18303b33272bbbc08764be86738 SHA512 9931017dc27ff974a94bff3ee60b3741e24bac819a38ead32d68d96ff08a04a113b22752f9f4076f7b850f7f3c0ca1790c362b89c31963e07617241c1903f602
+EBUILD kubectl-1.26.3.ebuild 874 BLAKE2B eadc263a13607118043c218d4d69d8e2c6a01c19719358af019dfe15ca396b2bc8e1be4e49855ffbc6f4cd9eb43f5bd7c9d8e60ed45d85ade7c833e04008e30d SHA512 8d82593d7820ae864a3db4f64b139ffac451793a51eb8939901acdaf20f3c0c72b712314fc12c52cfe29556fbf98efc77c5f3a5dfcd09415bbd7152f01f0e923
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kubectl/kubectl-1.26.3.ebuild b/sys-cluster/kubectl/kubectl-1.26.3.ebuild
new file mode 100644
index 000000000000..0a6d3b7c65b8
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.26.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+BDEPEND=">=dev-lang/go-1.19"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index f4c60e83429d..8b95141e8108 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -7,8 +7,10 @@ DIST kubernetes-1.23.17.tar.gz 38135738 BLAKE2B 18661ca95d518ede1b8f08ec380bdb46
 DIST kubernetes-1.24.11.tar.gz 37867002 BLAKE2B 3972a049b1549cb1ed147763f09d20b656243814a91d701a1171c171a19721aef2b8393121160edbd75e6f11978b355ce8e97ef6e9d007634428753d7cc1499e SHA512 ceaa5ca883d208e8f80d4d2628195256df697ce5ebedf2524af7cd94ffd783c055c47797cf76f6d4893e2392b652a89f55999251feda196b96b9df4c27215adc
 DIST kubernetes-1.25.7.tar.gz 38169376 BLAKE2B d324e823be2efc3d19892313ed2a7daa0a3c1384f4f03e18a703f63f32609e1a594a8fd3fc49cb78330848fd42ae1d629339a967ab973e73ddff2be8c6a1eb73 SHA512 d164496df03223cab4d1754ab42f88f0e5d5cc95e1e5995442183aa739d583078c6b7ea1febdc92e2bf8b76820857cd8973d8364f452c2e576b7168a32578419
 DIST kubernetes-1.26.2.tar.gz 38192706 BLAKE2B ca14778ab5a1d1bdfb935d80eea269adb0414b5613d8e70b9c790711a284b79c8f89cdd22af73b9127fbf9f036b0aa317fbd97bc1df735aead0903d951fe5f4a SHA512 c14f3ba25ae3608ca8d28ab75c2f6a3636970d5851ef1c09259d6be4bce17af131f9adcc0be8e51f4197dc16650461bac8faae7b7ef24f899c1a0ad193ed0a6b
+DIST kubernetes-1.26.3.tar.gz 38215855 BLAKE2B 1bc1b4e9aeebc41e3e7a519f097b886d0cdede91f0cbbabc7c26db1c75d87220f2e8a5aa5ac85ad0c01486abd5806e74d2b09aa1a0281364b70417d3daea503e SHA512 7a8aa29ea282aec99046d231d4c6756e36ba74eca4c2300b3b1f5a1362d211ffe712957746044168b254ba7332e324e341a2e4d56be7bb6a58de953fa630ac14
 EBUILD kubelet-1.23.17.ebuild 1030 BLAKE2B 2f095479576a6107be2e30997068dea5a578d867463af5e046900d639256a1dfc5a586f8b6b8ccc122a7fec975b8857588c7cbce18fec688e5b388571afe6112 SHA512 0883f415ca5dafb5287c2f0a98b1eaab87d869a39ee335162a3655bd80393ecae0d81b676d8f6b0e32f77d6a821d774316eecd5bca57ba2fb0b1aec0e655f7f8
 EBUILD kubelet-1.24.11.ebuild 1032 BLAKE2B e9a9609c579c9c1e095e92c163311b71ae588dec6174f6f8c9ef3d7a060437e8903ba06cb0e494e5d7e976705c9900bda126a22799e7e243158d142ee32d3383 SHA512 cdb13abfd4a4bd0787ee8e54a1f03cf002d5aecafda79294e5789be3704b04561111cd4dfecb2b90c036202dc9e65faf85014fc67e8e5f3cee555bfae2a80423
 EBUILD kubelet-1.25.7.ebuild 1030 BLAKE2B 2f979623733f7f34b8f562572e1ac9b39c67d0ddb72ea366abd2e8eb7dc9fbbf655707374c479fdeb183739f06ed75bcf00732ab58eaed86db7c7c1db9ff10ef SHA512 0efd37f41d1e79af8e7febd651e532e17b3c04b1462d016131d4d5f75766928ed7b43bbef7a7728a3af4b0e6a948684ac63bc054794d2f6cfa32bbaddd46aa90
 EBUILD kubelet-1.26.2.ebuild 1030 BLAKE2B 2f979623733f7f34b8f562572e1ac9b39c67d0ddb72ea366abd2e8eb7dc9fbbf655707374c479fdeb183739f06ed75bcf00732ab58eaed86db7c7c1db9ff10ef SHA512 0efd37f41d1e79af8e7febd651e532e17b3c04b1462d016131d4d5f75766928ed7b43bbef7a7728a3af4b0e6a948684ac63bc054794d2f6cfa32bbaddd46aa90
+EBUILD kubelet-1.26.3.ebuild 1031 BLAKE2B 81a7dec1302b00fbd5be0fc2233fccd5af6186c06dafaf423d26bb21b9c5c5c19a9152d0fc8f4765820f6d60ea8833d1eae21e1cf1cc81a9fd2315990592b665 SHA512 c81bbb12cce15e01cfba4f219c4578bf2a4deb8f775cf8b07b1763c1552cf05191bc5358453d1d9f381d13a63c999b5c6ac082e51e0fef6b82309e4d44656e93
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kubelet/kubelet-1.26.3.ebuild b/sys-cluster/kubelet/kubelet-1.26.3.ebuild
new file mode 100644
index 000000000000..ea082c4400a5
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.26.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened selinux"
+
+BDEPEND=">=dev-lang/go-1.19"
+RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 076e656c76d7..8c3fbf39a860 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 7e625905a3c2..bdcc365f488e 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -18,6 +18,7 @@ DIST gcc-11-20230120.tar.xz 76201244 BLAKE2B 07bc819dad3e2ee3747f09f43fd73a4263f
 DIST gcc-11-20230303.tar.xz 76131828 BLAKE2B ad73cf9b11f4a70be922ebc2a934e8d5f863582ebb662fe74c71b5880c9d6617cc80233456bde70a7867d788fa1f72262f1ef069f23ff85a423c5eede3e7d3c7 SHA512 3b310b87f7d7423a727f2348038add5b76f923b0baf528d061e45a1030eefb538f4175866dc6e7e70852a794de0ab62798965ea1e574bfe62ccae35fe4b2b00b
 DIST gcc-11-20230324.tar.xz 76152596 BLAKE2B 39540946ca30791a66d8e5273ebd658bbd3d542c4a215850039e7070951b3bedb2550ede0c10bb1620d24ea5f05f79b737ceb9ae8e372fad692ae7102d1467e5 SHA512 9ba29007e9baf05c0a02024b3b1130f8a850a06b3e8c9452368dcd3f75b026a9bb66649acebfa1c6c68e82f969c8e5a10aa01f917c88b1e5c9ab46574193af33
 DIST gcc-11-20230331.tar.xz 76150736 BLAKE2B cdc47fffcbc06f99d5abc9321bff172d157cf0ba8a8508282703152b40005c6efcb0a2f58262ca63ee211a89b0ea571bd5a5463810bb11e381e953544e283ac9 SHA512 24a6db4bed4c3a8b79c1860083d4b5537ba5751484c48170f7b5d352aa3bb3434ef1409291425678dbdd1b0a246abe1bb5ead9135324776143efe42e80100d56
+DIST gcc-11-20230407.tar.xz 76144188 BLAKE2B 4a08a2387664e758331af7cc34387ea0ad449f1a46f0e6a51c92b279319b34221b22cf0cc426fe0406b0d8161042c3e229d202c4dbdad87c87dcf8f5ae5a70b9 SHA512 647ab458cd995698f126b13e3ee7ee6b94996c52c469d0e27e59d8cf371f99dbe902a591b8c911612d80aacf3e819aa183970980f1890424eb9f36d8f4d5911d
 DIST gcc-11.4.0-musl-patches-2.tar.xz 4308 BLAKE2B a2335e155fc57816fed822a648e0eaefafcba9d04e1ad0fd7baeea5a694ab6f5e3c1678cb406f2a1bd17bab25cb01699d032713a1ccf337948dfda2093844607 SHA512 17b84f907cb1bd763873655e6f35fd3ed55a40b602b70a626f04f83b4cc89c6261db1661de78d4d969187a8c56e9f6305b742515a3836b962248a21df0df5d0c
 DIST gcc-11.4.0-patches-3.tar.xz 15200 BLAKE2B a393df941a2a31164f477d6bc0032e28319e8f0bd87200eb453708f85aa8c0bf5d67e733ee7b75cf6d14743e18cc941cee1b77a8247f8c5683d17a98cbeb280f SHA512 6f6096d95c7c62780d1070097739882393a8df5172c3a5ae811a8d4d1c98a0cd14a34f3f7e95410c8f210aec434330ac3b8876c688faeb130d7bb8fa3333ece9
 DIST gcc-11.4.0-patches-7.tar.xz 14416 BLAKE2B 3ebf62cba04cac8830a93a99d11c21347c38891db3a81493a10e02e8b7af0c86389ffbede50672dfe1189a77a67b832f8f97a1d95d43eff11db131a143b1d03d SHA512 41e2ed1ccf6d3631accccdab057877c79c99eb1b3c32f9d35628bca6c633c4f8dadb1d7f93bed2e4d7ff9f36cc9e46ea00f0e57e8af64b2e5f4b3b01285c6da3
@@ -55,6 +56,7 @@ EBUILD gcc-11.3.1_p20230120-r1.ebuild 1334 BLAKE2B ff7ec5997af15e5cc40d4834d7795
 EBUILD gcc-11.3.1_p20230303.ebuild 1342 BLAKE2B ecc9d9330e1f8bc22ae14a6db3373d684ee7ece46e746d5fe08b93ae6f241e9e46c4d5ed38ab8e6fa786ff2f6539178bb8957be9e42521a8476a925ed7cc2481 SHA512 5a438419050f8de2d3f670cb5e4bdff6af2bafe734a62cd1aa9e386df4b26ab52f60e321a2ef4556c96c6b05e71afd4b7b030e89ce6650b5a152bc2027d67cd2
 EBUILD gcc-11.3.1_p20230324.ebuild 1345 BLAKE2B dbf14399b8d9b80bdd50107db3af6537d6e191a6192fbe3425eb3226cd02fd1328ae165bcd6ee61393a97b55b5b04419b9eeb21283ba0f2c6fe46c95555a10dc SHA512 546c13ec6b2e54e214ed805ab7109a919d0c1c3ebde9eac58e20d0aea637d484f55b95c763dbecbf13c97a0bc21b520206616d9ec123725daa051830bfe655db
 EBUILD gcc-11.3.1_p20230331.ebuild 1345 BLAKE2B dbf14399b8d9b80bdd50107db3af6537d6e191a6192fbe3425eb3226cd02fd1328ae165bcd6ee61393a97b55b5b04419b9eeb21283ba0f2c6fe46c95555a10dc SHA512 546c13ec6b2e54e214ed805ab7109a919d0c1c3ebde9eac58e20d0aea637d484f55b95c763dbecbf13c97a0bc21b520206616d9ec123725daa051830bfe655db
+EBUILD gcc-11.3.1_p20230407.ebuild 1345 BLAKE2B dbf14399b8d9b80bdd50107db3af6537d6e191a6192fbe3425eb3226cd02fd1328ae165bcd6ee61393a97b55b5b04419b9eeb21283ba0f2c6fe46c95555a10dc SHA512 546c13ec6b2e54e214ed805ab7109a919d0c1c3ebde9eac58e20d0aea637d484f55b95c763dbecbf13c97a0bc21b520206616d9ec123725daa051830bfe655db
 EBUILD gcc-11.4.9999.ebuild 1315 BLAKE2B 45a8f481e0c08e5274d1797e421431e898753fce22426a1b2a1f4fd23c4dd44bed5f15da4c67f1c108b25d8393683fef631f998b8b524aa0d356be04625c0562 SHA512 fc4d8913f2aeed856b123a4545655813fe20544d841feca5121f85291a2aec99c770d845b14ce936c2fb14b5b9b1cd85166190ec657528bcb1710c7b48385c16
 EBUILD gcc-12.2.0.ebuild 1482 BLAKE2B 2e6d0e7c9c332e0caa1dcfce636dd4593a8ed65c31c397eb508fe5d6505083c94ad79c82ae86b350b353349f8c4958fa90247b4dada40e5562a136179c363815 SHA512 f29ab909099a08b0a0a1c1f981c2a5395b511a5c36174e24ecfad096c8697489d2fede4248a05ea54f35cd75cab1646465bfa7e068a8f33acd10a89a83f05998
 EBUILD gcc-12.2.1_p20230121-r1.ebuild 1476 BLAKE2B 108f19cabfc3a958c6d61ad2c8ad0955ffc474e9f76ede125dc25c4f94c4d2b692ad9a79b0124657a6d64852cf5beea420d5ec3ecc7ad652573d3fad6f7569cf SHA512 3a8e8b8ef072b6f0f29cc3a2a8215aa97845f4ed84a528eec5de3b61ba2a07628b049029969d64aa86fea60d1e601c3725b16f3f1ab976d17f6695aed418d312
diff --git a/sys-devel/gcc/gcc-11.3.1_p20230407.ebuild b/sys-devel/gcc/gcc-11.3.1_p20230407.ebuild
new file mode 100644
index 000000000000..a30fa066e31c
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.3.1_p20230407.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="8"
+PATCH_GCC_VER="11.4.0"
+MUSL_VER="2"
+MUSL_GCC_VER="11.4.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+	BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 53f2be1ac908..24255f58d50c 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index db6ce6781444..dc5cd459bb20 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -7,5 +7,5 @@ DIST e2fsprogs-1.47.0.tar.xz 7059372 BLAKE2B 84f58b05a9f0e14e1a66c6e5171ff23b022
 EBUILD e2fsprogs-1.46.5-r3.ebuild 4401 BLAKE2B 925f540d8b21482abea0b9db6e4c9c0697df29a33b7cabe85159b8cd4354d7453be25b8056957e65ab9bda1f576cd786ff969843f4e23a3611f0101591507f08 SHA512 9f34a974b65c59722afac7328307b32e6bb8aea0cf605c4b0b8c1a78993e7e158211ed0f35d1cfa0b9f71937315243d935e6a930b12a5798e3876cd96023e0bf
 EBUILD e2fsprogs-1.46.5-r4.ebuild 4373 BLAKE2B a694162dfdf49f233a05eb8a778f004fbe2b7fe72f54ccc8df42078b1c5ea6580d563d1f56d69b3daf30db66841464a80da2ef30627dd55bc89c2dc8b72efcfa SHA512 a3a353e8d88fb23c6741a6165cddf9faa534230163d2fcba7174c25b62def4d6838783b70bfbbde1ea49de083253e2c72af1dfabf0df1093799c7f864c7f937c
 EBUILD e2fsprogs-1.46.6.ebuild 4385 BLAKE2B e47d2e171f330aa12c4317d58492d9c0840140d7763a4df87cbc43c2e23faf9472f40110c6d45d9536331591e6c4969f410c50d2932f7b065abadb76a2a76973 SHA512 0c50777260571930ae96350620d87babca84e16435742512edb97e6de0889cb9a3a0feab53fac149067d93d46e116ddc6df0c2b759bc54cc5389b79e2a1b7067
-EBUILD e2fsprogs-1.47.0.ebuild 4390 BLAKE2B b9c1ba8ae8b9dba80925295866d588dc1eb0862260069124e02bd1df96f199b7c6abfcef3192b138bb33b55719ad72ed92c9c511f799dd10005c4abe022e01a5 SHA512 fcbd5f649c8fb55ac76ce7b54b1fbb6cbae81cc58c8067e53ac071b7664a8e13ce65523b187fec8c51515c79996a9979840fc7bf1fe6f4a66c6cb1ab96d2f1d3
+EBUILD e2fsprogs-1.47.0.ebuild 4389 BLAKE2B cd3690e767adadc98a91cf211fb4048470d58605feeaa0710377ef258ffcf3241225fb2d61853d68946ef9071374afdb5025b876c110c370153dead321afe222 SHA512 1424528d7ec0dbe4711b43ae92baab7144d99ef5f549cd609d6e038b1bce44caaa3e86bec46cd5237f669dcf2a4f9f2948b3866ee17933d46c871f846e80b09a
 MISC metadata.xml 781 BLAKE2B 966522db6501509fbe12c1f896e6f59ffcb2a9dc0980b6086213383894df169dfdadce5cc6c37de5016bb5e96db6565f937183c5e78fad1bb6c15d6c964aec92 SHA512 5d2a09fb1027344f3ed7c24afa49af06a26c5c813f49e8b5614ce629360d1b0252ad93a360d9bd189fa3aa6027b7afceea8ce9fb0fe67f57546d54c348fed74f
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild
index 61e26f241880..54e19e3f629f 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index c4f286acfe24..8a2c7b8510e7 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/wait_on_pid/Manifest b/sys-process/wait_on_pid/Manifest
index 8df4c79006e2..48c2a6914339 100644
--- a/sys-process/wait_on_pid/Manifest
+++ b/sys-process/wait_on_pid/Manifest
@@ -1,4 +1,3 @@
 DIST wait_on_pid-0.0.2.tar.bz2 7139 BLAKE2B 65eacf82ecd6310ced3d70c7480632f08d1464d80ac7321a22211f26e6f837e0daec844b43f4c56d94b1229da93150eabca55774c77d40b6a137c8690847dd08 SHA512 22e3481736b90b1b3152dc5c07e766892d42de199669909752fcbcfcd94ec9c3a143d1474c9533cf3494931e19e4ab63f7f4dcef7fffe7e2ac3d803c22852e72
-EBUILD wait_on_pid-0.0.2-r1.ebuild 563 BLAKE2B 5b3947280ee58243d409a518e4fa82acce532df0a3f009cec0039f4af7d7a478828fceb7a65709c8959ba131826be844928c0ba2308daec0535385cd15205a1f SHA512 d5c2c74fc926aa8547901c847265295607ce525077b90ea8106b9677aefbb16644f1735a54eecdfad549b28c75d8ec4cd36e3f58b8312d5b27ffd53483a30e54
-EBUILD wait_on_pid-0.0.2-r2.ebuild 535 BLAKE2B 192215c282d707045de5796ccba144df8cae8719944c630efe4f3943726ecb0b74ee0f461f132ecef84d012332e64f368f533417389c2ce7f6f1cbfbc0159592 SHA512 fcd107ffbf84764406e97b7e5ca52e22cb6aeb0fe1416bd92c150445f6fce417eddb2d1ad59891983021e828b7e95fb18ae6534ca0c1ee91322823a2a1429d30
+EBUILD wait_on_pid-0.0.2-r2.ebuild 533 BLAKE2B 98c42e892e096293a2b949f12a5d125b7ac1b0de2ca2c53a3a18d5ab347410641a0bff1999a5107053f0a04f792e44e3064aad433700dc749f26c81b0ec54973 SHA512 8edfe4f8ddedc8afc9f04198c4e16103012e52fd10be94354cc0d12fd48d526e08137bf58f46c72841874ba538f09db39acc465468b9af95beb434869ca01868
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sys-process/wait_on_pid/wait_on_pid-0.0.2-r1.ebuild b/sys-process/wait_on_pid/wait_on_pid-0.0.2-r1.ebuild
deleted file mode 100644
index acaf4578f147..000000000000
--- a/sys-process/wait_on_pid/wait_on_pid-0.0.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="small utility to wait for an arbitrary process to exit"
-HOMEPAGE="https://dev.gentoo.org/~zzam/wait_on_pid/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~zzam/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_install() {
-	default
-	dobin wait_on_pid
-}
diff --git a/sys-process/wait_on_pid/wait_on_pid-0.0.2-r2.ebuild b/sys-process/wait_on_pid/wait_on_pid-0.0.2-r2.ebuild
index 07d1a663ec02..5723957b9dad 100644
--- a/sys-process/wait_on_pid/wait_on_pid-0.0.2-r2.ebuild
+++ b/sys-process/wait_on_pid/wait_on_pid-0.0.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~zzam/${PN}/${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux"
 
 src_prepare() {
 	default
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index ec50d752603d..2b5e2183fcdb 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 60951000a34e..cc195363e6f0 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -3,6 +3,6 @@ AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0
 DIST cairo-1.17.6.tar.bz2 43700076 BLAKE2B 05ac766d33e9bdfc5df0347e9a80611554d64886715d1620fbe6f05f36f0134e46e1e6107738d260b380fab5ef2ac609922dce9ebcac01234710d8e2a76e9724 SHA512 1537b34ca49b853f4f60a7ceac0c1b878e7e2874f1ca3a37ab6ccbb704a37872314447016ad07b82312b302bb6df86b71265232a802ccdb9fb8cd18f211ff185
 DIST cairo-1.17.8.tar.bz2 43730163 BLAKE2B 6089b3488425c577ad70896bb82eaad1d26cbbb38b4b38902d1eaf82a47c11170a2b0f0a6439e2cf0efa53db1f49ed74d801f7023de25d381d17e26a185a7bf9 SHA512 86d59c60c0436dde1cced60f11774e08bc483b3310faa066f9cb1cd60e64c4b7d61a27d1f5d4781187b1a3839c7b3e490a7503d09f25dbdcd5be21290f066cf8
 EBUILD cairo-1.17.6-r1.ebuild 2374 BLAKE2B 9f1428010f734e2d902feec3ef187cd954b7e90a3f770cc63dd6a9310709e44c99a949ad7e00566a738df53ef33cf28952ed5ae770cb2240908e0d59e2571fbe SHA512 879083cbf4ff217a41739e1f5654d2f4370f77f6028f46aa51d70d9791553c31337bbe626bc60ce0127c23ef3ac68066d42c190f8acc019e14dabb5f502b2652
-EBUILD cairo-1.17.8.ebuild 2797 BLAKE2B 4885918692c25d9f9061dcc42bffab3fc144311e47c0df5c88dbe00e77513c837f27649b151c8382dbcaf496f76e30440b1d5f9ad4a2d4772d2a676fed4273e2 SHA512 2ff1c3d352bbb8b5ff4ce375eabd32d42f49f4e42a92095e83df2a24f991951c75161da9395e8a6980b9e770e03b261925aa1c1b89f479c14915a181e59da691
+EBUILD cairo-1.17.8.ebuild 2796 BLAKE2B 1863ef67f61f0515d519e29a7b9b6370c2be3c1897f435da5562b23baa4e27ea8f6106102c190e7feff0b5b7722163d8a360100a532170591ef752bbb954c4fc SHA512 240fa4bcc91e30da6ea0e8d13d36c4a3bc9daee5615505be3fb0d0fb9e45457ea3590e2e34310527d8e143a13d67617a42dc837ff875c07d4eff6b79c3cf3759
 EBUILD cairo-9999.ebuild 2695 BLAKE2B 77008265dbae681086744ed2b2d9186a361bd8f187219d3e6e680bf894721aca99e9752a3e9cc99b42e4f5d984173ab4e661d2af1a741e477c52b2de2fcc1886 SHA512 d45274ec4a45a87c4c0618a2d3221bf2d98f3dad0c0647ae0311fe15a95b8cb9cb211ad3b7aa2c0be083772e9fcef9a4cd6cfcc6153289f1ae707a615a18bee4
 MISC metadata.xml 484 BLAKE2B 44ea5fe06e0b252b5d0cf71ccf53f76ca6f1f29432886ac0a66af9df19ed72358b91c6ff399ba418d051b5fa5380ff281647ffd050f1471578699ddfa87085ab SHA512 a575a5e6f807ac4527dbcf62e6e4a70c0e6012a6b52d7772ab167ffc29a55718bd35e52b1d0bf61be89ed82f38959e63e7ef198e7b2c1f48889df9dd2c4c8988
diff --git a/x11-libs/cairo/cairo-1.17.8.ebuild b/x11-libs/cairo/cairo-1.17.8.ebuild
index 83732d84ed81..cbd5c327f61c 100644
--- a/x11-libs/cairo/cairo-1.17.8.ebuild
+++ b/x11-libs/cairo/cairo-1.17.8.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest
index 6eda4adda952..57c6e44a1dfd 100644
--- a/x11-libs/libXaw/Manifest
+++ b/x11-libs/libXaw/Manifest
@@ -1,5 +1,5 @@
 DIST libXaw-1.0.14.tar.bz2 690994 BLAKE2B 9beaf5ad47b300b3bd57c85ce4c54996db824cb10377472bab8b4ec446458ce162b21e19c4e3ed8d48f10d0bddb695509e73d3274326bdd59916dfbb3c63120e SHA512 29d1c151369523ae6cb418e636b0b7b39ccccc35462a0b394dbeb46d5b6d780badd2eb872a55d9fbba1ee1af034e76c0463f40f8d8a7be2c336d08b3b1bf81d4
 DIST libXaw-1.0.15.tar.xz 589832 BLAKE2B a176b59fbbd7555e7ec2f114a31e9ed804c0ee9e2f7f0efc1ed836caa280947bbe1c66dc4b5155f983a91b649a6303730377b5203d17dcd6af8dfdfa51e7784c SHA512 8edbf280b7b24b9040c291545053c1251d6af7e7f56da43a6065a1848245863eb52bdfc28c2f18dbb6597a4064394a44f4df5d8596a1a467549ccc9ce50a7821
 EBUILD libXaw-1.0.14.ebuild 884 BLAKE2B 376a003a6262cb0d01b0d0640c398f57198166f96e85edebd16636c2527bb66d26f65a5a884884c06ce48f7b65ab14f546a808bf7cf45d5c47b66155ddbe6e66 SHA512 f5c48e4791a5d413691f377cb15d5d6a52cb1c39e8580ce0ce9cda12967b943cb6ebfbe4d35fb1964c497dbfaa54f18aa752d27ff55c2cb77503bbc58344dde4
-EBUILD libXaw-1.0.15.ebuild 910 BLAKE2B 9ea1aab62187f30d760db40873fe19219b282b5e08c8400bf150b9c8993cff5fb000ae9149f0757f665bb07cc77975b769497c1f27c7478081afbc2e439e354d SHA512 3feac6b8462801623c49fe40732de8cae654bf76c413c085f42750ab0ef0b4281e19e3b33bfb3b026a86548549144f68778c889c617cd81e98269d4d021cd7c2
+EBUILD libXaw-1.0.15.ebuild 909 BLAKE2B d68e11ef6155bd2899f7d695f03c8df56e91fbf6859440836a44c1c83151b32226171d69c138a45134f62da29d6688653f7a4b2c84648d4c6604ead42c967f98 SHA512 02bb7c204acc6d499971927b38d0fc7f1c3836a8110f8317258f6f7d4c240d36c1a4d4169da877f27b5f608be2970e537384a14388749fea688f28d7027b1407
 MISC metadata.xml 422 BLAKE2B b5d0b66e0f4638f8e8969f8fe1c02f4d83195f11529b266e2f79f18b71f2407102545a4e55b318c4a0957cbf00570586626a9a8ce3cda99bc463c0246ed7bcce SHA512 56d9ac54daf5febd8fc3df76ce86974b6ab37130bdb80d84ad07b59d985d6d1337afff0b36bafadad9ba464e7cbd45a7d6f71f697be3b66f9db907b317d9c2a8
diff --git a/x11-libs/libXaw/libXaw-1.0.15.ebuild b/x11-libs/libXaw/libXaw-1.0.15.ebuild
index d1a50dc63924..58449f4cdb2f 100644
--- a/x11-libs/libXaw/libXaw-1.0.15.ebuild
+++ b/x11-libs/libXaw/libXaw-1.0.15.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xaw library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="deprecated"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 0f6da1bf2d2b..f24ec6273aa1 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest
index 974211de20a8..c17b020a4007 100644
--- a/x11-misc/qt5ct/Manifest
+++ b/x11-misc/qt5ct/Manifest
@@ -1,7 +1,3 @@
-DIST qt5ct-1.5.tar.bz2 81089 BLAKE2B 8bf02a6c53c68f30e0647ff7c40c9d80044cbf914ee13f9e7f13ad6424e5cf73b9460af70ea484d498bfb693e8f8b018f7e32cac6205ffa2dba05930c6d0610c SHA512 fc16c7849a89aa8ee9480162888294638bc01f83b89d86c978397e58f6da4360cf07b9f558635b8a5b13bd10d18f3ad49663fe8a76183da9ae55aac23230b1e5
-DIST qt5ct-1.6.tar.bz2 85354 BLAKE2B 74c8976005cfedb65da25d7229014ab22b97bfc7ad5a0cb1a2263bf272cc4b4c9f9f3542913c16f45af84e27e9e093c86ce7f6bbafc646caeb8b7259dcc3ae3d SHA512 10172c664eaf573aa998a64c654c99a27400a47d52fc4b3691f2d1108d5a4df20d2d5c9a9235c52708759ed2be267d1bec9a792bfedb6e472f3cfe9ee1eced0c
 DIST qt5ct-1.7.tar.bz2 85464 BLAKE2B fc39d489a0e1e2cb8e0caeb587ea9dd434dca4adefcc788fe3936a6f7bbc3c55b22072915580e1b0376d0b37433b59e355e220f3dc280a0de2d2600a37df237a SHA512 97f1afc137e750abbb8c4e442cb6e09d2aa0c4979de2117ea644d484e1f7489bec144332814aae961bfaa5f8ac9ddf027c7a665274a65aef26fc4bf7c45610c0
-EBUILD qt5ct-1.5.ebuild 940 BLAKE2B c9d55db36f480fc0aa359bf733b934c7a0fd8d645efea1da67eabaa2613e0e7f22e566462394aa76527487c9fa85dcb5cda8ae801d13de4caabb2107e316aa8f SHA512 a4be1beff438936fa9f71722d3411530ced007a26d127185e65c4ca08564532aeb332c740f407c7a282a152e5e54b8427e0226aa3491c2ce87b702850d874924
-EBUILD qt5ct-1.6.ebuild 942 BLAKE2B 430de3983c05894a3d0cb03f52f2c397e994dcc67fa9b6ce89b3b8a59f835f4291e61cd0565eb3ea04c57168f038ad85f8868d040e4f90b11d86ec1862e5e9d7 SHA512 f787d160cfc93ea181722a785e3b9b2e925c5c824822bcd2c24b40509da6617463b1121c90de3e25b3e0c5497c769f7f48a4bc5971282ccc2fac534f45267159
-EBUILD qt5ct-1.7.ebuild 942 BLAKE2B 430de3983c05894a3d0cb03f52f2c397e994dcc67fa9b6ce89b3b8a59f835f4291e61cd0565eb3ea04c57168f038ad85f8868d040e4f90b11d86ec1862e5e9d7 SHA512 f787d160cfc93ea181722a785e3b9b2e925c5c824822bcd2c24b40509da6617463b1121c90de3e25b3e0c5497c769f7f48a4bc5971282ccc2fac534f45267159
+EBUILD qt5ct-1.7.ebuild 940 BLAKE2B be980603e619c1cfe6e03097c22b1ea91a980a1831ab54e7ac38dccf6f1fdb375bce7c8bd53e1a1ada78d352437fdfe6c6c3753a31aa7e63bb2b1c6e0ce09adb SHA512 c201d72b130955333cdeb4ebbd6d0f61bc8258656812f277a04f7d7f5058a530a7e34b2e114165403dbc6eeb78677f2f61d0229fed1708d25a34eb1b67d9644d
 MISC metadata.xml 482 BLAKE2B fac0c00072791bfee45fe52707734e35a18e58f21704b6897bc315ffbd4db50f2fcc058586d04c2459d39d040cd55ef3bd328b12d66c9b35f61cf985462f4d2a SHA512 6c0a13ee72cfdb1415899864758870c837adc76471358ec61aa661348caf4dccad6398a0f25a1e4bd638b7d01eeee484b7350726c0626cf991db7cd32ccc518c
diff --git a/x11-misc/qt5ct/qt5ct-1.5.ebuild b/x11-misc/qt5ct/qt5ct-1.5.ebuild
deleted file mode 100644
index ee2fded801ce..000000000000
--- a/x11-misc/qt5ct/qt5ct-1.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4"
-HOMEPAGE="https://sourceforge.net/projects/qt5ct/"
-SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5=[dbus]
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	dev-qt/qtpaths:5
-"
-
-src_install() {
-	cmake_src_install
-
-	newenvd - 98qt5ct <<< 'QT_QPA_PLATFORMTHEME=qt5ct'
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		ewarn "qt5ct configuration won't be applied to the currently running sessions."
-		ewarn "Please relogin."
-	fi
-	if ! has_version 'dev-qt/qtsvg:5'; then
-		elog
-		elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'."
-		elog
-	fi
-}
diff --git a/x11-misc/qt5ct/qt5ct-1.6.ebuild b/x11-misc/qt5ct/qt5ct-1.6.ebuild
deleted file mode 100644
index dac5f4a047cf..000000000000
--- a/x11-misc/qt5ct/qt5ct-1.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4"
-HOMEPAGE="https://sourceforge.net/projects/qt5ct/"
-SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5=[dbus]
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	dev-qt/qtpaths:5
-"
-
-src_install() {
-	cmake_src_install
-
-	newenvd - 98qt5ct <<< 'QT_QPA_PLATFORMTHEME=qt5ct'
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		ewarn "qt5ct configuration won't be applied to the currently running sessions."
-		ewarn "Please relogin."
-	fi
-	if ! has_version 'dev-qt/qtsvg:5'; then
-		elog
-		elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'."
-		elog
-	fi
-}
diff --git a/x11-misc/qt5ct/qt5ct-1.7.ebuild b/x11-misc/qt5ct/qt5ct-1.7.ebuild
index dac5f4a047cf..8be1a39d4b3c 100644
--- a/x11-misc/qt5ct/qt5ct-1.7.ebuild
+++ b/x11-misc/qt5ct/qt5ct-1.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 
 RDEPEND="
 	dev-qt/qtconcurrent:5
diff --git a/x11-misc/xbitmaps/Manifest b/x11-misc/xbitmaps/Manifest
index 0185921b4d6a..f36b856d09cd 100644
--- a/x11-misc/xbitmaps/Manifest
+++ b/x11-misc/xbitmaps/Manifest
@@ -1,5 +1,5 @@
 DIST xbitmaps-1.1.2.tar.bz2 129435 BLAKE2B eff2f1e2efbabf447cbe98db09f81db96dc1442d4cce01b570774fb4e3e7323a40385d7821685724a9d9c69219528da980b2ecf01b0d3b822be8879e4d7f3e9c SHA512 eed5e2fce9fc6c532984e6ed1262e440591e311ca6c61a7fe7a5c877df84bfc2d7aff388fb9c894fc098785b8e5352f0bd7c918252247a040cf123874847450d
 DIST xbitmaps-1.1.3.tar.xz 109772 BLAKE2B e5ffeed910131fafe7346bc26920dc27a9ef55b069a36cc969183cc7b02a732a781e1fd295ec2577fbb472efc566f18aa2d534e18e94d4a8abc66db0177bd26e SHA512 b9a7340385fcce2dcd0204f14a462685b14b72ff58f3ec53cd76695bef2b02af902bdac809622dcb27fd4075d5ba13587b5d059530aff502cd5288d161352814
 EBUILD xbitmaps-1.1.2-r1.ebuild 671 BLAKE2B 83521f2dcd6ce6562c5c0531ac3ef54488267548c34134be2691ef08e5fc7a486407f4329885c7a01567297c78f33e959a82f4ca1243e85bb2c77c550bac3fc2 SHA512 c5d30a306a38bce69475e6f2af4a69bc94244b50182efaab8c043dd9f468d8ae07412a417c2fe7cd7c6f917f20527b5504fa6681ec030aa3f5905ac4b228f45f
-EBUILD xbitmaps-1.1.3.ebuild 567 BLAKE2B 593974e57a0d44e5522e46a94ef2a1fc3544d86f6624720559ebf32fb10a82099af10a5b47f8949ae6d7ba669141ccd14010f1e6d6aa8400050d8f7e6b3641b9 SHA512 98bd2e537e91ba4772178a311d45d650c6f59b81cfb2172fda4c1d9866ffc2df242c79341d6d3786abf9e0a2e5bbd62660cab0ab14c9b178e92134414d9ddc66
+EBUILD xbitmaps-1.1.3.ebuild 566 BLAKE2B 9fb8016cc1637a0ac7d19a48b6f6b5ca2562310450724660880c23d6d8b9130f7e9e916706c87ddda61944e41e597349476caaa33f238754298d52b22227e6fd SHA512 ae54793c3b2da9bef81cf53b42aaaa37565275ef5b5b62ec48bc6e34b55b7ab13ee9e327f5e586f4cf3bfd0e3bfabc15b8b8723bda74e52f7bca8649ad55a745
 MISC metadata.xml 322 BLAKE2B ebf88c647c8d6a49be6116a66d6c6b9e5a0609752c31d0ef96daedc9064b57fb25051f0e02dc171c20afe78b050d6c8f4218c2408003feff98275576a7265853 SHA512 a3e122f01de815db03f2cd96d588e0b37313e224e837356affd162825ceddcebc62c435f0d0beb378fa8eaabdf41b2a5fac6f2ad5d7105bae1a12ffe55e14712
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild
index b6fa6ac3dfab..c97258a5c7f5 100644
--- a/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild
@@ -8,7 +8,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="X.Org bitmaps data"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 # there is nothing to compile for this package, all its contents are produced by
 # configure. the only make job that matters is make install
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 23b84ea1afe3..ba2bc474d0c7 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,6 +1,6 @@
 DIST xkeyboard-config-2.37.tar.xz 879744 BLAKE2B 58cc62d48a857b0935bfe7415b4a28921d02218402ca0125e8644be04a14f897e357a224fed12f9a85c6d147b4fa659241004bf49ac16c19b7f5fceb2b6d3295 SHA512 3b2da77996d48bf7b6a5f5784bbcb62070ba6ab8eabb6f255d1addd7fa58080a329464010050e894c9acc901e42e3669333db2966140c78802efb8a86620ac0e
 DIST xkeyboard-config-2.38.tar.xz 884988 BLAKE2B 058543eb04917c785bbb02b5a11a2492c4ad3e1910e764f476e04fd2405e4c158d7e4942da00693efc683a39dd9fe11e55003c1c9ce10cc802744e98ebcd269d SHA512 20848a5a10cfa58265518add796fd97ddd2e39e7a87b18170cd9ebc3ec87268e92641f2cd8aaed1ed80cdbe3801b65a8a916321ffc20a419511b3d2a85b0dd2a
 EBUILD xkeyboard-config-2.37.ebuild 1030 BLAKE2B 588df3178d21a49dba7aea0dd2548e5bfca82a577312c48e3c4801cb0336304a8703f25180723b3568ee78204b021bbdb5b94ba2cf9281a4700a1395194e4582 SHA512 15a1e6710515c6bf31bb5e066116dbf88efa74fdbd2cea110388443fcfa2d179ec2a0105c04308d42336cd94c3b1ea37aa4cebece873a304230716b79467f159
-EBUILD xkeyboard-config-2.38.ebuild 1031 BLAKE2B a4000fae0fba83b6d7794cc495dfdaf9a8171576a9623e88bafcb8873025d3c97017c9df2d34a42a5792280b84b97d5fb7fc029fb7876763a9e564562638b528 SHA512 d02831659d744380d4f3fb8e3ea5ceac19ac76691ec5b4d570de818f1d409d546f5fdfcc67fa5d3267a98eac288304dd5017f67aa2796d19e3b56c3dda0b11c2
+EBUILD xkeyboard-config-2.38.ebuild 1030 BLAKE2B 588df3178d21a49dba7aea0dd2548e5bfca82a577312c48e3c4801cb0336304a8703f25180723b3568ee78204b021bbdb5b94ba2cf9281a4700a1395194e4582 SHA512 15a1e6710515c6bf31bb5e066116dbf88efa74fdbd2cea110388443fcfa2d179ec2a0105c04308d42336cd94c3b1ea37aa4cebece873a304230716b79467f159
 EBUILD xkeyboard-config-9999.ebuild 1038 BLAKE2B 16968cc62920ac7c11aed1a2d1a34d84ae1c8e6fd90f539cbb893b948718263c575128f1cebe00f8f86fc8ef282a10769eda2ca8a2f3f1784f7d48617bac1e88 SHA512 0f968e419291bf5f1a64dad2870aa6efabc33e662fddcf437899b4edef2969ba6be4a2aa1ff7a0a2742dab65c17b35b585cdbf9be43fa6420e466ec410c4b67c
 MISC metadata.xml 442 BLAKE2B 3e7e6564b3aa17ef958ae6aed94b6d28156d743ad2782b0c2c08429adff128a7a7ea549e2f5fcece91cdc0f498d341790d0694b193dae16b60a63966bbb581b8 SHA512 0c32c580abc07b3141fa3b9137eba130654e0701b4c9e49be10a801c5c068d67881a74dc0e5d45dc34e8964364e0516bbc5e1b854ae0d7d8ff12bf1ec1ec2986
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.38.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.38.ebuild
index 0a52208700cb..1441c0c806cd 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.38.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.38.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 7aa9276635f3..f1e6bcde2d3a 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -3,5 +3,5 @@ DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 219911bf7fb690776
 DIST xorg-cf-files-1.0.7.tar.bz2 345575 BLAKE2B 62ca33673b65cccb4c33c9bc138fac768862d3fd2a8e35d875b4a7af7938df3a2d1437bcb9661c8b84c69a73f60e5ae4a2bf58a003987dcd9293a3a948c97531 SHA512 0dd73b9db9fc16bddc94ef23f11434be6ea2f8e0c7bc5ef3c3bfe6749e13843f88d397eed9f980bbbe9e74147172326bd3c3ccb7adedc9150302756e4b07191e
 DIST xorg-cf-files-1.0.8.tar.xz 290280 BLAKE2B b822839f2effa091d7e60aa82e0356dc6770116566d9c78a6c0915b8f9e89eb4a3bf78a3bd5380607b3b3e4c1670fb1c6ef0b3ac8ca342cfc1ef141a925c927d SHA512 cc633af889cd82346c3098df9185245c21aa9db7484343f8be9719f6e0b1fc0a9b09afb13b9b864668aa51944f2da797bbe896c807f629e89fc91506e6e63fb9
 EBUILD xorg-cf-files-1.0.7-r1.ebuild 2004 BLAKE2B 1a0f5259763e1ccc38882b12924b8142fe007479f6bc46def7c7394096893740ce23a32a4cbfd891f06eb12c34dcc743a154dae2853b21e632b69be72488b7c6 SHA512 f350610b4819fce39c94ade96e140406fde15467bfd80afaa73dc5fb27f7efd9d767050741a3eda0557f7bbddaa45f39dd6e638e2db875db151de47db389ea74
-EBUILD xorg-cf-files-1.0.8.ebuild 1799 BLAKE2B 95286232ca384046f3892d8cbf6e0152726d0c58e3bbda8c27078c6cfda72b7b9bc59e997e665d612b5e253b50586c9115d572469227a44cdde7ea1190ca609e SHA512 a3ea2c1e2a4deb74241a405f4fb05dd06c36fbeb82ef06bc1499e8f3422ad6ff2a31a364c50fe1417da18e3861a1c8ad0d82e2fcefde17f7f5d1c4d79c46957b
+EBUILD xorg-cf-files-1.0.8.ebuild 1798 BLAKE2B 04808b5975fd8089aa3a6a4226a8951a989a3132928283cd1670be5416bd0b35cf31c6ddeb1ea47e0f4d8638cc4c024274ff83ff9734c3d5920a13c0d8b17007 SHA512 8fff577342b8afb5589994fe79f3d93061f3205ae4691b3d545d7488d0dd16aa9af0db47d12a575219ff56cbffcf87e1774dbe8d37056833822cbe6a432ef98a
 MISC metadata.xml 334 BLAKE2B bfeac5f26d8a7b4b290924b5fcc1e4e2c7663978d74891fdfed46698b5940a42a12b7aaa03bb66d990313754aec756c67185005916bd44a802689ebc4b9452e5 SHA512 e2d7b04dda68d9435374c1726a10cf23ce02a400c71156ac84d544b908c69d40a232b0fef925f205292b74b56a84f0fd2d64b4a6e76e718546dd2a169838633a
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
index 7d9184360342..09fcb176fc4a 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 6d23b014e999..7a1e53a82b04 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/xcursor-themes/Manifest b/x11-themes/xcursor-themes/Manifest
index 2006fad7bc55..5f303b7985b3 100644
--- a/x11-themes/xcursor-themes/Manifest
+++ b/x11-themes/xcursor-themes/Manifest
@@ -1,5 +1,5 @@
 DIST xcursor-themes-1.0.6.tar.bz2 2363089 BLAKE2B faf6041152d9b42f37ab4d9691f4f11c6b5be52f968f57f88348c0630fb5d5f42ee866ba7ee6072bb4b5ff9121ac36bf49a524b3ceee7e069707dec72767e723 SHA512 2ad3586a5571a5ddc0001187362b54b839644916164834213af98e58698044aec4392dd6e1e42f1794fda85c8fedf259b09214a9636bd0e71a1629c710f198d3
 DIST xcursor-themes-1.0.7.tar.xz 1490616 BLAKE2B d759f4ad2cfa50feace45aef1a3f0e0b561e48ad7c4d47e1f36bee26ad1c95a52aacce989ab6e4127d5a3412948fa08ef0129cc60d0788c19d0b52cb1fde0346 SHA512 910925dd17c576028ae0d9dfe5683888648b941806b53cd9ff74ed18ff2de537664b07ab4c647a55290aeba37f6051f322b29e8ecd54f348e32abe2ccea1c902
 EBUILD xcursor-themes-1.0.6-r1.ebuild 380 BLAKE2B 4893daf7b83baf9843b6b27b5f0dbaaefb230be37e6f635a3f6d03be9c95933a0483fca86ebc8fddd1a70f117c60b200eb535a4c7cde6b51d3a9add5fc23f6d2 SHA512 d5aff60632b60438c982716ae1e41fa25f3c2d08a40db8b1fde997a7c36676362a2f5365b61f71b0c1a88c6d9d33e400304721db442c9331795b40c375d92901
-EBUILD xcursor-themes-1.0.7.ebuild 406 BLAKE2B b874af234751fdff78ae8ec0d09eb7682d18919c6af9cb3db64860055366e45b272f6fb503a0d1a8312c398e6c99dae4b33ebcce948d64315c931610ba160bf5 SHA512 0b2d81154d94008b46613bc79f4c8b775a0c6bd0b72911ff510a531143dbe0ecea0241b71c648abb5d239c7222d0451418da61d655213c919e248d1602986387
+EBUILD xcursor-themes-1.0.7.ebuild 405 BLAKE2B f4bb3dc0a50e74f15282380d792c97b9adac6ca2214c2c9daeae2595f7ae06a50b6f9de1c084a6e47997436cf8c5bf6525def5fd1e12f474e8b8ecc18b0d618e SHA512 8c7c63f3295221ed635b571523322f481db54825b56147077243ecf9dd820cd15ba4b2dc9908fb5b91379797392c9a02d3221ab96366fda2a2eb7190578fc4e6
 MISC metadata.xml 322 BLAKE2B 0e8fc67edc246490dfff50c55f15f2187a1eb9d8b94bf84c6e6d9c8958beb050774c9b75310d1074fedff06a9ea89f363406dc7dce431e4b1048f74fb38f77b3 SHA512 9c3ea6d90bdc383209572f66e92222d0c5df0e49e2038086e95735f4595afef882f737012cda33a379101c4b84d346bc14bdc952de18bb451c057fb14e4c6d48
diff --git a/x11-themes/xcursor-themes/xcursor-themes-1.0.7.ebuild b/x11-themes/xcursor-themes/xcursor-themes-1.0.7.ebuild
index 56b6cde6c88f..7be2a1f6c4a6 100644
--- a/x11-themes/xcursor-themes/xcursor-themes-1.0.7.ebuild
+++ b/x11-themes/xcursor-themes/xcursor-themes-1.0.7.ebuild
@@ -8,7 +8,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="X.Org cursor themes: whiteglass, redglass and handhelds"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 BDEPEND="
 	x11-apps/xcursorgen
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 22ed28cbd958..e289fe948b5e 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index a9a69c6a694b..c4abcd2ebc4c 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -4,7 +4,7 @@ DIST xfce4-panel-4.18.3.tar.bz2 1452647 BLAKE2B 40545b13fa0b8d7178fc9753cb3b1b00
 DIST xfce4-panel-4.19.0.tar.bz2 1485117 BLAKE2B a70654a1d8633f04310a1a9fb8554254de2f272f6fbbfede3c709a9bdc9b7d6138d5ab26ea83ccc75c9152ee0fb9d2ce7e7b174ace6369eb7d60e14db0828cec SHA512 a1c3c5f535581332c1b5e93bfecabae32cbe610d168f4452bed321466b73e4ca9ca09ca2e7c7f54cb82fe45a6102022bb30f77b57841a9bba03809b703bddf91
 DIST xfce4-panel-4.19.1.tar.bz2 2087777 BLAKE2B 9be568832d6bc56fcecaf6eff2a907b64cc2b7f9fa51f18109c18300b9cb9cd7044d64b2b89d28ede409be3d4cd026274c543db7892ea128a1ce52679d62cccc SHA512 f22673e3a8785283a4179bf3a7791f2b14b9d5e87efffdc822ad61b24cca827517a15f0484392255ef04aeac99b5d4722bf347d14981340d4d86d7b47700883d
 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.18.3.ebuild 1591 BLAKE2B 1b829d2d980a006c1432717dcdcc2a51abf4be7a595b7b42a578b2efddd2ea1de5cbca345bd06392ee5de76b7a51250c731260027443bc75ff49ce2e91de0de1 SHA512 cbee99e86b3067a2b41d2f7e6efa76677378bfa016f71d798013d3436835019a6df8d59d2ff01222dc1b8b74c852ee365ad22e0bfa1a4321bb68cf7ec607310f
 EBUILD xfce4-panel-4.19.0.ebuild 1826 BLAKE2B 0a8407966507b07e8c34073d3c88e8d46f713b8e5bf24a14a007a3f51e108468b1eefe1aac65f7b45321480debfe371bd19bec2951f2a01cde3c59354a83a46b SHA512 f20c5910fc8c732e3db02ae9f57a5f58356bfec42767d9943f6deee803ebdaee414553f202fd3fb1f7f18c1100ef5a7350b040485de633dba73c92b68f7cdb88
 EBUILD xfce4-panel-4.19.1-r1.ebuild 1943 BLAKE2B bf3055aba3ce74c0a00b002b6c2346ff111a397de31fbfd6779a38b98a3ea4f5d8899df0b4b39508329c2087c4b339892f301dc0beac971c77cc70a7a73efcb8 SHA512 1a04a997afb423f744044be5d1b4155ac41250d40c20d519ad7728b5bb3d6b1b8af753d0eed4fac4c7a508253d082df075db9e28e62d90a7b1c89f743f675e15
 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
index 7d772282a7b2..14e0d75b4118 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.18.3.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.18.3.ebuild
@@ -14,7 +14,7 @@ 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"
+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 )"