gentoo auto-resync : 07:02:2024 - 03:59:02

author: V3n3RiX <venerix@koprulu.sector> 2024-02-07 03:59:02 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2024-02-07 03:59:02 +0000
commit: 632aa90c53a31517c5d2259537aadc192434a332 (patch)
tree: d466e8c0d3bf25eda998e2f04dc4872de416d117
parent: 6bdf113f9fe24f179ee150bada14098e20e87476 (diff)
158 files changed, 1192 insertions, 1383 deletions
diff --git a/Manifest b/Manifest
index 0f6fc6a40731..954f96a5ac24 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29748 BLAKE2B 185b55fd9d857b7793b9bb53063ad21dbedac062a1987ecc3bea2ef03bfeae42c5b6b913cd582a5da9e9315ce80bb5e0d5b0cda686b6141ee71bf081e985a70e SHA512 559246cdcd284c2d8fdeb2ad2c954095f385c508c68d89284c5a58ed6da365180bb94249e4e151a3cbf6bb4dae0718997419e93aea659715d93c535d2ec82e00
-TIMESTAMP 2024-02-06T21:10:05Z
+MANIFEST Manifest.files.gz 29746 BLAKE2B 57f232c44e40a694e222c4c0a33aea796919252cd1d48d1fb1bda225241e0b413bd7872d9b734e673e0246577ef100289ff7426e4f75bf046c94c5abe1aadc3a SHA512 a92084acacfdb381692ef3daa3f7dbb05aac065d3912883c5b2b990f0b0d5f34635d530f550eef14d9b01b4ba691971afee6354f916da753ad7c8b21f94d2942
+TIMESTAMP 2024-02-07T03:10:12Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmXCoC1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmXC9JRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCtoBAAsvrQUd4/THXJ1TlsIQ5hFoSv2GTpkGl7PKmXtLcbFL/3J0UyUNzHFvkM
-FqFcXzQ36GgNROnHpZ3wiKaywhNtHsEJe48nTP9icf9FyNG4lvx5mZgk/5nLZWU8
-u/yFiyUfeV5d6IONbcuYMrXQZjeYkjVXRdvq65Feh7VaYbne37KmffILjpH6fyCD
-jhDGlj2RpsC0AYY4k/kWq0nDlzq4NQmzUchBZhZuabye0FBx9nbNquTtOxNsnKbc
-W6U0drXC15yyu97Zc269pmqTP8x4CaIwXRZ1W7mDMfQpPbTUF1zcW5YW+4fPB11e
-g6JU0DiQpGhA+v57Ghb6ebRDJC+v9sUNsGvAEoPJkXW8mag+f8Cp7yy3JZxkTFp5
-8NiGQcqukhh/JNuNgL5WKh/dlgcVlIij3JmgnGXyuVmxNTu/JWA3nLtiW/Qp1pUL
-S7sJq/4xJHN1oj0fsmQh+a2ji1ZPSBm7Kpz9m7LdU1OTKvLw+zXqsSfEKCAkf0ff
-is5SIl+Hccqip9GWHRuqvyqt6Bc33P1YqVTZDrd0jPsoGMSjk586Xz717Z0G9qvD
-MztpDSM9nq34z9rhjtI42YJ9C6izjA7Ne0rP3Xcalf0PTxIEQcSNRuhZTWT6Oo5w
-zBx4sqd4sEmrGTJiiy2q7lL8iPth0lkjKKLcw8F/JbS/nAMFyzQ=
-=wfnV
+klAa2g/+KXz/XK5vZyH+WOg0znFGU0nhWwH8hCG1wx2gqKps/HHizeWCOBjj/71O
+YGJ4L/thCVox05otIQIQ0UlOlTDraiHpZiTtFpj7usG0UEf2NAifVpmsl9NiHYhx
+L100+5PDUwhSxzU9s2I+QIZjY6vZdgR+g2SWA1S7J5LrOK0PVhCmpxlznWFEx6tE
+8lbh7K7FNlzRQsHmH/YzCoRyKQTBxXf23zr/bVUdz+m+neT6GbLI23ezx/30zs/h
+n6+PaRItGk4KJANe1V86e0Hj+o0c1v0xOUjjj3uTV2UgM3FrU0nmK4h9O2pYAG54
+QMoB9s3a5pMzQ2HyEb90YfrYGfjAAy6lJO4lCKeBa7em+m9/C00IGYnKus2pFhO4
+hNSiAmOlNNu80c6aD3vd5ErCIZRZMXRWwh066mF8AjcUxUwCEMXyiVZDt+xjxMxU
+OHJ9k0Q34VKjqd2a7WWYl9O6MCTUNxXvPlctGmnemKcPdnHZUobjtrD9K9x55VuL
+7fMUui5Im/NzWH0ZUl9pLXxt+3pyogaLGzENSfSNkN7GuVbB1znE2a9eyuMjekdO
+nRS0PJT61pnzsM9oasmOHZnQ0H7+zqUeNhKUoAMkwAXDUjCOIyOgCbsHgaKltqi8
+YwXqH3KkK/yIgFhKnp692MnepQw4iT+TSeMix7sx5/qs/UQF0Vs=
+=Qy3r
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index f4a7a4adaf0a..ef12243b99ae 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 3c0e8811bf91..4006f847f088 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index e37059f5e673..2f8329456eff 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -8,5 +8,6 @@ AUX bzip2-1.0.8-saneso.patch 463 BLAKE2B 83c5a905dbb3dd6481abe7ad7f57f9ce5c5cac8
 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
 DIST bzip2-1.0.8.tar.gz.sig 310 BLAKE2B 0d702dcb19f7738da9f05ee9d719f5cd3653540365e78db143404e599ea54bc6f9d5e6a38cdf5cdd3c6550243d34266343467c6b1db9d5d3c134f9353b00f395 SHA512 4a4a3fa0ec1c10a704b9870e8e629fd007cca55184423c6bfc3049a702fb41e4aeb73bfe9ca7442c27d32d278f1f34f27523a6be67d35b37896acdded12bf40d
 EBUILD bzip2-1.0.8-r4.ebuild 3551 BLAKE2B faa39850794cf91b33067cb90ea0c9113d65b01610f8a9025bd9018a221d9ecc5ea32d3f42c66b01e52ba131dedec34b78c7eba198108e63da9f5fde22f4c351 SHA512 a655dd1c0bdbbbea98a88cf3d235b08a7b3b47bc527858443a9a3024a58a5e5f4acab440f53f36bdc2c3d9827de2ad4b4f42606604b4ca36eb9208c2d482ec5c
+EBUILD bzip2-1.0.8-r5.ebuild 3519 BLAKE2B 5893d920489ff1fec5afd4e2496d0d77819a6aef7cf02cc22d0d80b76bc131436e1bae0d4dfcafe319d2db2a3262454155327ab705f145ec640777fdf41e4e9f SHA512 4c87ab6b72c0a1a98af0ccee6fd673dd6aa3ad1e22899255852b7a967ae844f3b9a60ee6b28f9b239e05bb406ff02b59a20538a68139f0a2dbc43763cb0d2787
 EBUILD bzip2-9999.ebuild 1382 BLAKE2B 03246514a2ea9a7123145072068f0b3ca0092d8d87a769ef4b01966e77d79029203a1fb8b4692d1024cf9727b596231f1926b77b978e509d23ecf3d012b19d8b SHA512 5c4a20ea3691e4641e3db5b79f9f65e554f893dacafa980e2beb62f790a6c104d4b39586b9a6e81e4b34abead9045df114182321445cd86ebcbd15235f97e774
 MISC metadata.xml 384 BLAKE2B e74083bed23efd0279d23ea4f9fc048a9a0c253d48757f74a6c0044f5ca6a6b4cb86908db25d42f304b72a8dbf4c3627371ad6ab69aeab9267e8eb21c2053898 SHA512 c358db6bdaabfa401452ceaa8f85298b75ae00e5f7f189768741b4c74ed123be79405c03c7b94707db29b7d60710c441d089c10fa511262ad5a88cd106fb54f4
diff --git a/app-arch/bzip2/bzip2-1.0.8-r5.ebuild b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
new file mode 100644
index 000000000000..5a099bc96f1d
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
+#      (since we're building shared libs) ...
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bzip2.gpg
+inherit toolchain-funcs multilib multilib-minimal verify-sig
+
+DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
+HOMEPAGE="https://sourceware.org/bzip2/"
+SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
+
+LICENSE="BZIP2"
+SLOT="0/1" # subslot = SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
+IUSE="static static-libs"
+
+BDEPEND="
+	verify-sig? ( sec-keys/openpgp-keys-bzip2 )
+"
+PDEPEND="
+	app-alternatives/bzip2
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.0.8-saneso.patch
+	"${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
+	"${FILESDIR}"/${PN}-1.0.6-progress.patch
+	"${FILESDIR}"/${PN}-1.0.3-no-test.patch
+	"${FILESDIR}"/${PN}-1.0.8-mingw.patch #393573
+	"${FILESDIR}"/${PN}-1.0.8-out-of-tree-build.patch
+)
+
+DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
+HTML_DOCS=( manual.html )
+
+src_prepare() {
+	default
+
+	# - Use right man path
+	# - Generate symlinks instead of hardlinks
+	# - pass custom variables to control libdir
+	sed -i \
+		-e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
+		-e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
+		-e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
+		Makefile || die
+}
+
+bemake() {
+	emake \
+		VPATH="${S}" \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		"$@"
+}
+
+multilib_src_compile() {
+	bemake -f "${S}"/Makefile-libbz2_so all
+	# Make sure we link against the shared lib #504648
+	ln -s libbz2.so.${PV} libbz2.so || die
+	bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')"
+}
+
+multilib_src_test() {
+	cp "${S}"/sample* "${BUILD_DIR}" || die
+	bemake -f "${S}"/Makefile check
+}
+
+multilib_src_install() {
+	into /usr
+
+	# Install the shared lib manually.  We install:
+	#  .x.x.x - standard shared lib behavior
+	#  .x.x   - SONAME some distros use #338321
+	#  .x     - SONAME Gentoo uses
+	dolib.so libbz2.so.${PV}
+	local v
+	for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
+		dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
+	done
+
+	use static-libs && dolib.a libbz2.a
+
+	if multilib_is_native_abi ; then
+		dobin bzip2recover$(get_exeext)
+		into /
+		newbin bzip2$(get_exeext) bzip2-reference$(get_exeext)
+	fi
+}
+
+multilib_src_install_all() {
+	# `make install` doesn't cope with out-of-tree builds, nor with
+	# installing just non-binaries, so handle things ourselves.
+	insinto /usr/include
+	doins bzlib.h
+	into /usr
+	dobin bz{diff,grep,more}
+	doman bz{diff,grep,more}.1
+	newman bzip2.1 bzip2-reference.1
+
+	dosym bzdiff /usr/bin/bzcmp
+	dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
+
+	dosym bzmore /usr/bin/bzless
+	dosym bzmore.1 /usr/share/man/man1/bzless.1
+
+	dosym bzip2-reference.1 /usr/share/man/man1/bzip2recover.1
+	local x
+	for x in bz{e,f}grep ; do
+		dosym bzgrep /usr/bin/${x}
+		dosym bzgrep.1 /usr/share/man/man1/${x}.1
+	done
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	# ensure to preserve the symlinks before app-alternatives/bzip2
+	# is installed
+	local x
+	for x in bzip2 bunzip2 bzcat; do
+		if [[ ! -h ${EROOT}/bin/${x} ]]; then
+			ln -s bzip2-reference$(get_exeext) "${EROOT}/bin/${x}$(get_exeext)" || die
+		fi
+	done
+}
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index f7913d6b8d7c..46d8b4040536 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -5,7 +5,7 @@ DIST xz-5.4.6.tar.gz.sig 566 BLAKE2B 808f1b5e2a17729f36a05ba88a9c00210cda2afa029
 DIST xz-5.5.1alpha.tar.gz 3020057 BLAKE2B 1a2106b9e43cb06ddde0f8a9fc86754fe2d335367035ec3349d34da5511496af0d1270cd42ce2c1c3324af74092c0eea3663746ec98195d0db449d5754253c0f SHA512 dbd164353012c9ff5ee3e776709704fcbc6e9f644fff52c75846653ca4a26b6dce1a2a5fe1663c3fc8674f99aa67a1a806eeac44cb978246223688c8c105fcf1
 DIST xz-5.5.1alpha.tar.gz.sig 566 BLAKE2B 760946fd09eccd0a221d117cc1f5b656aba5bbbfa911d987fd93c54d9905a1e51dd8c24b6927cc97dda344f2efa774b556e6919bdf0b298fa6370ac8d3a56f76 SHA512 714f07b510a4a8ff0d533e6278cd25f8ed407b3c84b6172ce9d4e9fc2dfe8b0be9849eb008ee3b7ac900f34f85946336277a2700dc5133c6dcae144b8aba6dd7
 EBUILD xz-utils-5.4.5.ebuild 3955 BLAKE2B a0b903cd6906fb604362fcc9e8aa44249946baac062438b3fd8a1901bb5fdf18d789eb1ac073894b047726849d75a6e8e48d0f955f5b22527339b780e1cfed5f SHA512 2ff0ca2035261185db82c72117bfb0ad3c5bc9dc957bf8625076def51d5010f491a76ae161084fdd2b50536882be49565c3f1185d001299dde456cedcc77d3ee
-EBUILD xz-utils-5.4.6.ebuild 3967 BLAKE2B abb9dc12fd8c3540bfe66e377e0ea23be4cf22cfc8f5a0aeae9eb65f4f1decf77866fd062767a47487eeb1b2fa6f354c110cb7ff2ab6a073daeb21098f9ede83 SHA512 ed3192004e5e4ca0e211e49c269500bbfe432e78e5e59931dd30e249c4fd4c1e325fae0bc0c5b67593330dff223e8ecbe152a7dc4ed9efc4adcda1004a671f1a
-EBUILD xz-utils-5.5.1_alpha.ebuild 3989 BLAKE2B ab98171ba3f60a65b5ee43577787447b1815b79796611e51bc46191bd0ff3bb8f53693101a2b51b20242e96f1016acc06373f7b2f8925d1aecc4e28ee33ee004 SHA512 fd3efb8645332aca6d6d2f5fe7e21f094740e9ea36c9f1787f021145cdb3d113cf7f9f6400b465284648ea89c7b7ae8b4d0ae2fedab6c6ffbb621364aca13940
-EBUILD xz-utils-9999.ebuild 3989 BLAKE2B ab98171ba3f60a65b5ee43577787447b1815b79796611e51bc46191bd0ff3bb8f53693101a2b51b20242e96f1016acc06373f7b2f8925d1aecc4e28ee33ee004 SHA512 fd3efb8645332aca6d6d2f5fe7e21f094740e9ea36c9f1787f021145cdb3d113cf7f9f6400b465284648ea89c7b7ae8b4d0ae2fedab6c6ffbb621364aca13940
+EBUILD xz-utils-5.4.6-r1.ebuild 3890 BLAKE2B edf6f6dbe6de85a8f6ea1c708736cc19d81d45d40dcd6f420ce84fe840a66649ade7f9063b5c1d06288d49504fe34d65db2262574f681c9185e9c6e25da73311 SHA512 5443da7658b6b692f8147b74db1720e6f355926374e2a2954f01ec84043c8a3a124d9d3dacaddb287eafe7affd61fd7d48c43806c0cd58cbb6181539272d0222
+EBUILD xz-utils-5.5.1_alpha.ebuild 3912 BLAKE2B 268f9126361ec7bbadad246598686453203ff9ee8f88d3f0d52dd1349602b07e1a56e24b8ce52b6ad512992e6b72840d6caf081474bf9664fac938284c31123d SHA512 291bfc73857662e5761221fea29b3183a0cbb6d31d65444f527479183b29f5815b0bf8a5f56cb8facbcff611ef9186b318ff83c6717bac39b4fcf8ab674cd534
+EBUILD xz-utils-9999.ebuild 3912 BLAKE2B 268f9126361ec7bbadad246598686453203ff9ee8f88d3f0d52dd1349602b07e1a56e24b8ce52b6ad512992e6b72840d6caf081474bf9664fac938284c31123d SHA512 291bfc73857662e5761221fea29b3183a0cbb6d31d65444f527479183b29f5815b0bf8a5f56cb8facbcff611ef9186b318ff83c6717bac39b4fcf8ab674cd534
 MISC metadata.xml 748 BLAKE2B fe48d0e6b5aac2c843670597f0daa0202af709c27fe81889da8e4ef6877e35b30009b72831bc737b1078954b6494b508fa1b59305fdaf795db8801d20d9a0638 SHA512 6e64f0053489389818430808acb32cc1d3b33013978adf4952fbf57ab555e0710a106623ac1eb67405f1dd91c33397c5c70bddc9c5015878f280266b29b4e189
diff --git a/app-arch/xz-utils/xz-utils-5.4.6.ebuild b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
index 10993a19d076..15cea9ec02c1 100644
--- a/app-arch/xz-utils/xz-utils-5.4.6.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs
 
 if [[ ${PV} == 9999 ]] ; then
 	# Per tukaani.org, git.tukaani.org is a mirror of github and
@@ -123,12 +123,6 @@ multilib_src_compile() {
 	fi
 }
 
-multilib_src_install() {
-	default
-
-	gen_usr_ldscript -a lzma
-}
-
 multilib_src_install_all() {
 	find "${ED}" -type f -name '*.la' -delete || die
 
diff --git a/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild b/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild
index 1ce7c6d3d900..8283f1a12b3e 100644
--- a/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs
 
 if [[ ${PV} == 9999 ]] ; then
 	# Per tukaani.org, git.tukaani.org is a mirror of github and
@@ -123,12 +123,6 @@ multilib_src_compile() {
 	fi
 }
 
-multilib_src_install() {
-	default
-
-	gen_usr_ldscript -a lzma
-}
-
 multilib_src_install_all() {
 	find "${ED}" -type f -name '*.la' -delete || die
 
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index 1ce7c6d3d900..8283f1a12b3e 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs
 
 if [[ ${PV} == 9999 ]] ; then
 	# Per tukaani.org, git.tukaani.org is a mirror of github and
@@ -123,12 +123,6 @@ multilib_src_compile() {
 	fi
 }
 
-multilib_src_install() {
-	default
-
-	gen_usr_ldscript -a lzma
-}
-
 multilib_src_install_all() {
 	find "${ED}" -type f -name '*.la' -delete || die
 
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 89edae028733..3a466b1bd3d9 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -1,4 +1,5 @@
 AUX zstd-1.5.4-no-find-valgrind.patch 596 BLAKE2B 28c5bcc005511703833fc73b2f11ee7a42a69c5e762e71c269265c42585fe4cf167a4bdba4f0e36e8e0e7a61e01e0f992c9417690bc879978d575823aa5e1884 SHA512 ad6cd84fde1a4f29710ecffe40854a8bbad0b1428000a57d706b221411675e2d79958c940dc955ec27020cfb7c9a14b7ac84cfe15759a5d07552d46f94b7df88
 DIST zstd-1.5.5.tar.gz 2368543 BLAKE2B 7680e27a0adacfb809d9fc81e06d3f99bf74df30374d3b5cb2d58f667dd1b7d5c41697e608592709e17c0e32277f20a6d615edee409b5d7cdcb15da2799a2350 SHA512 99109ec0e07fa65c2101c9cb36be56b672bbd0ee69d265f924718e61f9192ae8385c8d9e4d0c318be9edfa6d849fd3d60e5f164fa120961449429ea3c5dab6b6
+EBUILD zstd-1.5.5-r1.ebuild 1647 BLAKE2B 87ccfc6b9d86af3d6126ff156aef53fc35f658ae75f038d8eda0c1ed013fe5174bb09197320491c8be8b9680cf6e85ce20863944f0f8bcbd07702751ec8d4692 SHA512 4f5fa4d59486e7222e092ed5170d0cd27e6dc700153ef4866e6405f2f7735b814aa3ca2fee4ed793fcff628f7bd7855f3879230e6e806ad5b3fce82358e4952b
 EBUILD zstd-1.5.5.ebuild 1752 BLAKE2B 924a18dc1a55ef5cf84e6be528328a96026074420e53ed58de0e2cf28edb479f6d2d046d79667719f70d18f6352216d7235ec0cb2f39ee2ec14b5649dd95ba07 SHA512 15acfd70664a12cdac98695b71e1c8a77bb6ae04c938a4ac6b443886793d977d27742337f0a017fdac8b68811fe2c1d93884df3c2387b5045bbc20f6a70f7b98
 MISC metadata.xml 302 BLAKE2B 66692581b8918a23bab99bb3b0909702327c1acf2b7f8ec2fbfdf74ff75a8f178ce1140e0a9d46b64983dfe9529134db842a5a60a86b7fcbbd5db88e844d136d SHA512 097c09d06824c85919b21bc841c791851b1a7d1a6c6d16a26bbe9bed9dfb1522cacdd2b430b8ff51762fb73b388d88ec679d46570b2e56b36352ea2cf20e46f6
diff --git a/app-arch/zstd/zstd-1.5.5-r1.ebuild b/app-arch/zstd/zstd-1.5.5-r1.ebuild
new file mode 100644
index 000000000000..0b0fac3c180d
--- /dev/null
+++ b/app-arch/zstd/zstd-1.5.5-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/"
+SRC_URI="https://github.com/facebook/zstd/releases/download/v${PV}/${P}.tar.gz"
+S="${WORKDIR}"/${P}/build/meson
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+lzma lz4 static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	lzma? ( app-arch/xz-utils )
+	lz4? ( app-arch/lz4:= )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+
+MESON_PATCHES=(
+	# Workaround until Valgrind bugfix lands
+	"${FILESDIR}"/${PN}-1.5.4-no-find-valgrind.patch
+)
+
+PATCHES=(
+)
+
+src_prepare() {
+	cd "${WORKDIR}"/${P} || die
+	default
+
+	cd "${S}" || die
+	eapply "${MESON_PATCHES[@]}"
+}
+
+multilib_src_configure() {
+	local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local
+
+	# This replaces the no-find-valgrind patch once bugfix lands in a meson
+	# release + we can BDEPEND on it (https://github.com/mesonbuild/meson/pull/11372)
+	cat >> ${native_file} <<-EOF || die
+	[binaries]
+	valgrind='valgrind-falseified'
+	EOF
+
+	local emesonargs=(
+		-Ddefault_library=$(multilib_native_usex static-libs both shared)
+
+		$(meson_native_true bin_programs)
+		$(meson_native_true bin_contrib)
+		$(meson_use test bin_tests)
+
+		$(meson_native_use_feature zlib)
+		$(meson_native_use_feature lzma)
+		$(meson_native_use_feature lz4)
+
+		--native-file "${native_file}"
+	)
+
+	meson_src_configure
+}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index aa4698d67bbd..6836b4bb64db 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/eclass-manpages/Manifest b/app-doc/eclass-manpages/Manifest
index ec6ddc6dc4a0..cf505e760766 100644
--- a/app-doc/eclass-manpages/Manifest
+++ b/app-doc/eclass-manpages/Manifest
@@ -1,8 +1,10 @@
 DIST eclass-manpages-20230601.tar.xz 423088 BLAKE2B 35ef9f3fad733d6aa363c2808de8e6cc8936f1c965c7181b55cd955c8e3bcc339af7ac070302f220002e77011adf05e9904f38d29f832f7640f3cdc11f4f0a8f SHA512 5ff2dfca210b14a448472d6ea55ae5b321541e09124c74ff43392eea48dab06b22fbad9a7b62b80d5b67f9d07e1055bcca29eb03f77b899be886ada078e2df1f
 DIST eclass-manpages-20230624.tar.xz 420244 BLAKE2B 867d215a89f7f92e7b9ed9ce52e70e42609bcd038e98074c9d0e6327e227bc010ea4d4fbd19e21d18635138a668cfc98492b3fdcf66bbe9960252474c14fd193 SHA512 c0df42ab7648337643de4bc9c204212e0a3563cea689ef8f8e507964bd88a69f0703d7f93c0f3e54dc333b7689c9eeba7dd0ea8525161a88b2605a26c8834e77
 DIST eclass-manpages-20230919.tar.xz 432712 BLAKE2B d3b478f9c8ae26d9b0cbddb016861d59af58ff57ffed2e6c5abf423523c33317d1b37167b37925893d068838b1c7509514c51b60b98dfbeda631f8ba7641b8bd SHA512 1e07da85179f04172200b94e5cf5a21d04787fce800ceae83322554d5eb37cdc6073099d5ee5f12e04bbf967de40f63b01321dcb5ac4995e3c2503a94407c2d2
+DIST eclass-manpages-20240207.tar.xz 446596 BLAKE2B 5d9698a72586a2a33149f02fb70958d44dc20524de104c5c3f3f306d9e3f0f9a027b4365f5426cd261628c5561599a25b325fe2cd63999aaacc19be8c8cb8094 SHA512 a94d0da7110a8cdfbac4e7a469ca304f6ed454513294f573edd52cda5de56dc2e78589aa7458804971ba1a92a4c6ec814ec97b78bc7ded0643cb419478975022
 EBUILD eclass-manpages-20230601.ebuild 759 BLAKE2B f8374a8491136b96a4a94943efd94c48c378a0dd45bb16af56c675efaa277c16b5fc91e9d59b952d852bc4de2cbbf2005ee32c10ec88015981a632ec582bb098 SHA512 b6167142c15cdf5a603c7ace12028e03846931bbdaf6cf7a269d295796c5cdbcc88ef0e070ed0edb9e094d280e44dc78568a19f43eaa03dd3648ae8feb2ed201
 EBUILD eclass-manpages-20230624.ebuild 759 BLAKE2B f8374a8491136b96a4a94943efd94c48c378a0dd45bb16af56c675efaa277c16b5fc91e9d59b952d852bc4de2cbbf2005ee32c10ec88015981a632ec582bb098 SHA512 b6167142c15cdf5a603c7ace12028e03846931bbdaf6cf7a269d295796c5cdbcc88ef0e070ed0edb9e094d280e44dc78568a19f43eaa03dd3648ae8feb2ed201
 EBUILD eclass-manpages-20230919.ebuild 759 BLAKE2B f8374a8491136b96a4a94943efd94c48c378a0dd45bb16af56c675efaa277c16b5fc91e9d59b952d852bc4de2cbbf2005ee32c10ec88015981a632ec582bb098 SHA512 b6167142c15cdf5a603c7ace12028e03846931bbdaf6cf7a269d295796c5cdbcc88ef0e070ed0edb9e094d280e44dc78568a19f43eaa03dd3648ae8feb2ed201
+EBUILD eclass-manpages-20240207.ebuild 759 BLAKE2B 98523f13a4ea7f6374d0158a31770e762e973a4599942a323860533420dfc7f50dd4049a6a0087f39038b0b8da9fe7cf6b96bca1cd10d653f441a021ece058c5 SHA512 51e1ce822b6569eea0dd0b58c980b6794d6a3e19e2b08bfd6c4efdb1ff1174eb9b11a68dbb749994d30246c0a105029b3b66077819452a7dee5a2f9fc7bdc9a1
 EBUILD eclass-manpages-99999999.ebuild 717 BLAKE2B 539cacbb1e30897fcf7217eb7420273a11e342eb19ce270d6ded5f25a7dbab87cb6719cff57d4a63bf78d58dcaec565bdbca41f4689c5ee557adb09f60be6376 SHA512 b1a601332d1b82808a698d463026dc093a1afd93d93ef2845ff71773b79c4f12c6925f8b90101cda725e5b6c479c230aaf0d15fe8767e05648689dd9d1fcb0fb
 MISC metadata.xml 546 BLAKE2B 3fcaa67cd9ba2aebeae79ad37612fda556b7e42ec1692293d26201e82b7101cc8894e3fa8ed9acb4026fa0eb7e9c54ae6919872cd8e61c0f0d63ae3a323206b0 SHA512 6fb2a7db8da921bc6d3b22444ed401ef73c2a2d25ca4e4170234763ec98a108a63d05167660ce4e173d4e9604053269c04a66d617897045b2482b3febbc7e33c
diff --git a/app-doc/eclass-manpages/eclass-manpages-20240207.ebuild b/app-doc/eclass-manpages/eclass-manpages-20240207.ebuild
new file mode 100644
index 000000000000..83b196078ae7
--- /dev/null
+++ b/app-doc/eclass-manpages/eclass-manpages-20240207.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Instructions to make a dist tarball:
+# git clone https://github.com/projg2/eclass-to-manpage.git
+# cd eclass-to-manpage
+# make dist ECLASSDIR=~/g/eclass/
+
+DESCRIPTION="Collection of Gentoo eclass manpages"
+HOMEPAGE="https://github.com/projg2/eclass-to-manpage"
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# Keep the keywords stable. No need to change to ~arch.
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+BDEPEND="sys-apps/gawk"
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 2ec50718daf5..75a71a932222 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/levee/Manifest b/app-editors/levee/Manifest
index 7f33dc114a92..921c43b2bcdb 100644
--- a/app-editors/levee/Manifest
+++ b/app-editors/levee/Manifest
@@ -5,5 +5,5 @@ DIST levee-3.5a.tar.gz 67733 BLAKE2B 291b502a8c9581c2c0f2ca6714c17c86692067d5de6
 DIST levee-4.0-patches.tar.xz 12292 BLAKE2B b5ff5dbd4e9a5be0aab747ca557cd4e8235057a23ad9f10ec6aad921c4cb5da3086315162dcd0a6db97102cfc573da5ae13e4ca4738cb5875f0bf6f32ae244b2 SHA512 fe8c9f781e63b1b800e754ffda5322a266a51e905e105b5f4b2e604f3ec922f9bf5fb6657b89f290c4ecff80f7bcdce88a2c03cac3082dc5c4d70e23b10bd931
 DIST levee-4.0.tar.bz2 80596 BLAKE2B c38325a04cadb78e2961d26dff605943ccc8214232ce9bf3fb61bf7ee8f91b1e6a43631326e21e38be73d8917a290d92790cc9bc2a4ca7b186b740674fbc5f8f SHA512 7551963018674431167ee2635dccfed1648268c33ec3ae1f11c0ced89dcba280ae1f6d3ab678ad4ba8331e0928b47f6c5953758da7516bae10df9e3edd65c22c
 EBUILD levee-3.5a.ebuild 990 BLAKE2B 26529e9977e343637952e9e9e715a5418ca139895d05d35d1fa055e3b9733ca0a2f74dc36ace7b5568133bbef16bd5caf6269127846dfc31b9576cc28f938c55 SHA512 d7a058077e27950121a79e2c827afe440a0f28785664c077b5a6336bc1ccdc341b6aaf9933792488d8333d6f8cdb497a5088ff3f91df009958334a570b737d73
-EBUILD levee-4.0.ebuild 1165 BLAKE2B 9f1742f3b3db46c7a8b57a3a93f183f5715cd505af398eef1f3d9ca505e0d69b101cc0bbd73aea99dc946f45e352a14bd90fc7db25b272cbaca973611f41148d SHA512 16498317bae775cc690f64493e6b23136b5ab492fbf52d5b3ab954cdcc23d7f05303fdac40d0892b214f33ed2c25c2d9abdb7bb00c6050cd65bce9c01f2228fa
+EBUILD levee-4.0.ebuild 1172 BLAKE2B 5b54fa3dd5636ee1a59d241a6f89d0104595ee0b6b4f3e7808cef23e62a8fe949a0c50637e6bcf8a2a8dbf99a915478331773d7ccc2eb090c26bd7cda4f61566 SHA512 dc67d84504c0251fb9d5bf94c299370e0ee961565b0a31300300ae5c479c2ecf10f46987bf43f9ab8683540c7e439b28c64c26113ba2d03bb84d558b4d1c7960
 MISC metadata.xml 242 BLAKE2B c20b015cb3be883d9faecc16d540b477b33c4c60ffb374cc4e85e584bee424dda903e69517686d9836542115cf1468043764402cb34d5d7da383be93f92acd88 SHA512 aad2f2e7f629e1d008638bc9fab674d98efbf08a468b9d9aaba41c15447d0eb9f2cf4d40c25023571734d9a6cb1e2bdfc20bbd9beff1ad231651a00e7e509c8e
diff --git a/app-editors/levee/levee-4.0.ebuild b/app-editors/levee/levee-4.0.ebuild
index 6c279b3e38c1..e45cd0871d9c 100644
--- a/app-editors/levee/levee-4.0.ebuild
+++ b/app-editors/levee/levee-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.
 
 LICENSE="levee"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	!app-text/lv
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index d3d338b32f07..61a33f429de5 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/raspberrypi-utils/Manifest b/dev-embedded/raspberrypi-utils/Manifest
index 1ba07409f848..ff4b73ab41f9 100644
--- a/dev-embedded/raspberrypi-utils/Manifest
+++ b/dev-embedded/raspberrypi-utils/Manifest
@@ -1,3 +1,3 @@
-DIST raspberrypi-utils-0_p20240115.tar.gz 122554 BLAKE2B 94c101a50a422f265b2ea87ab33d802f21b21c57b8693a7bdc407460ec6e230da390d9f8d3e5541cb7145c55a7c53766cb8fb36c565006b1ec371090a6a4777b SHA512 b411242a1f5055a6075ea487fa746ee2cdbf31eff61f115cf11c97efa57d0245feb30c786c7c1164c174828da774a5cf4a4792d9ae46518e1c43510f120e5c43
-EBUILD raspberrypi-utils-0_p20240115.ebuild 885 BLAKE2B d42361129b75f7596cf8968c2e1c2fb229707a45148071f5bd8a327ea2ebb4c591835e49f1692068e1ac12a0a03feac4fea30323620ad32dc226381d96ef2a60 SHA512 e36691f86fd9d5c7ac5d2257ebf5bff77ff1a6a6448b5d73270c8e750c56aa4f2a156f65d77de119a647f3fac3b1994c1752d4b66714290d731ef9739a82b100
+DIST raspberrypi-utils-0_p20240203.tar.gz 122695 BLAKE2B 178b84b5210ba47a51e9815710b05d3916981f5413986cefcdb621420c9e9ab33b67026ea95692c6aff900dd2c31302059eb39aae32267b88cf765a7575f8bed SHA512 bdbe47d87a4bcd0d37ea4567e95e41fbc8240f5ffbc805d4a1f576060535af13e272b262ddad87dac0f9ea43b8b2ff9092378e67de080bd651701435b4c67008
+EBUILD raspberrypi-utils-0_p20240203.ebuild 885 BLAKE2B fe77be9912a80fa068367e9668d875d8b2a71ce77fa73162c10e5b9704425fa6f618bfbbf212ac2e30f583b9567a0fb9836ac59f88a4a93a9d6495aba22a1f02 SHA512 f0ed87ab172ec2f8750e05f7833fa9bc78e09ee880d6b9b023c7beceeb37a3a7266cb4f2538d7a1312988d4e551862ae3476147a462a54576a375c05e9321042
 MISC metadata.xml 330 BLAKE2B e7285a8024f322ab0f8c8789bdfa2601c046c776c24c7e411ef9c5be424bd3000c2749d47e5cac3c0f5f870decd1106e019b279c229dc27de238cfad8f2e4979 SHA512 f0cd8ffa52484dc9ff84623ddf51d9f4c696c1d7cc357042bfae47b7da62eb94336703d038b1511138b40a0b545d96b4a4faa8e5b2787d0bcdac3b9259c883fc
diff --git a/dev-embedded/raspberrypi-utils/raspberrypi-utils-0_p20240115.ebuild b/dev-embedded/raspberrypi-utils/raspberrypi-utils-0_p20240203.ebuild
index 6f84f4cb186c..1c13aaaa6bdb 100644
--- a/dev-embedded/raspberrypi-utils/raspberrypi-utils-0_p20240115.ebuild
+++ b/dev-embedded/raspberrypi-utils/raspberrypi-utils-0_p20240203.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit bash-completion-r1 cmake
 
-COMMIT="32602f565c6cb854d1f2643b51a022991cea2b1b"
+COMMIT="1eb8c20dfa258c549139fae2b21185ac290051c5"
 
 DESCRIPTION="Raspberry Pi userspace utilities"
 HOMEPAGE="https://github.com/raspberrypi/utils"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index a6ce3a61edef..8fbeebb5963d 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 67d2af7ce56f..4d09c14dd8a9 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -125,6 +125,7 @@ DIST rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz 181803248 BLAKE2B cd007830f5
 DIST rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B d19edec415037449fa52b80a804fb505767803a805943d0acf1a9216964d7ec7ca108b3b578621f10c23c37cf71decac0a1451c49525d2d7850d52f18e883b95 SHA512 b00a20e466125faec270ffdddd3f96f07133488aa1c9e2e706e0408f3d7ad350812b2b5831226c77657bc5a8d4fc55e5bd13085ea9e33fab88e32b469f9c2179
 DIST rust-1.74.1-s390x-unknown-linux-gnu.tar.xz 200997424 BLAKE2B 31ba7d46ffc5388b5ebd4be9b2c74873ebaf6a8301d5211823a0677492de4e2ed0562971e41a3825dcbfe4311588091ce062fe1432ed441eb736d64c73f5f0c5 SHA512 76bfe267e4b6b59b823f29be175e9c63102f2dc5df060b9b7b5bca2a883c57c113416c531c9fcbf3ceaea0b8955ef864f572e64604b4b816c8e3b3d8d68c7ac1
 DIST rust-1.74.1-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 6ea21dedc092abab913973752e6875f6b5a437ea4107d6245d2104c443c8af0f4af64d06211305968fc14ed15a628cee6a5b86701a1da42fcb2ea5afd166bfa9 SHA512 e155a6e7936f649eba413fbb07516e21216fdf9183f02eaef040002e2ccaaedbb399003b00dded7d7b54507182296a54455eeeee4b0ab48aae77e7939678a233
+DIST rust-1.74.1-sparc64-unknown-linux-gnu.tar.xz 56648912 BLAKE2B ca6b367c1f938e48686880b40eea92edc8e2f22668541de99318bff0812416f6fad02ac381785270bc212e43d578094ae3e34f8c59b648183620e1823de64bbc SHA512 617c1c222f8c2e50c90dfed81a64da8c3bc2079f926ab75d022e3e2fadf7cbda3893ced595ac8235c2e919a98ced5ee7f02163a9d165cff976190749c298e912
 DIST rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz 155438320 BLAKE2B e33ac5c6f913e0eba2f92d46fbac255ef3a06a77324cffb1994b713a1b114f008514fd4ad6d9e7fa2ee860e168d90c574b80769f585a6f1f36e0c57313056e82 SHA512 08fdce8c9b35ab30e67d7ba932a105edf3a8cddb618dc2e7c5928d01afd086018732dcb87d66d1cab4b1468bd6e0a516459e39beb0514f2b78dd418ce530ecaf
 DIST rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 5bcfcc084bb7c4e3e95fbd55a8a0d6b64565f50a64e203862b8607eeb6d74cb5d0a6e16b9100a96286b937452b87b56554235a39da2739e7c71933560dcee74f SHA512 e39b200fcef34fc359deb9b0c104853fd33714ca8c417274ff6e2aa5ed76dc98500365455edc4defb4f55172e33912674c2c657eaa40b3d8451e75b7a23b38ba
 DIST rust-1.74.1-x86_64-unknown-linux-musl.tar.xz 235698028 BLAKE2B e392e83b7ccade6cddff9c964162836552f90b8f3fd821348bfc0f72137f99e0c29a82b45c74893d22e0a42861c9413b29b97a85802737bfe363b1e694fd4e81 SHA512 8fb65ea5538c4a0865ac75561bb8df71d3703f1d4ed603f51752844f1bea02a9a52858587f3ee776a5ec27e793762a1b7c9cd845bceedd8a313d7ce2ad476ca1
@@ -136,5 +137,5 @@ DIST rust-src-1.74.1.tar.xz 2544036 BLAKE2B d95431b69f102782f51878ff73ce8802cac6
 EBUILD rust-bin-1.71.0.ebuild 6953 BLAKE2B 29cedf55007a31f3678c4588f5a0fd0149c9d2c895ca1ed468521b6fc9482e9fc4044845d4fc2605085af6b49cd0454da24c1b1955180e46b93065ca7d4a1b9d SHA512 98b6fd67f46aa885e1d1faa45450f11c6f8ad0cc99cb6c5e6c728bafdb4e012ef3bacaae2902593f4a0bef1ea010029a070d232139d837f97399dba109c468ae
 EBUILD rust-bin-1.71.1.ebuild 6946 BLAKE2B 4451a141a5857f1a479ab13283a0b03f722dae79a228ad56364fe957cf22f0d3db540f793f772bd10d89d02ee9014027aa51cae457c2ff0fc15f43372d198902 SHA512 eb710d1355f7985883061aa401d249b03c9011d9a0eca244907180e17f50fea33c9f73ee2bd5ba36259559cc9f84a11d7e24ed8ea76aec1a1a3a4b31fdc209b7
 EBUILD rust-bin-1.73.0.ebuild 7296 BLAKE2B 8d2e2ee3a6b077039a9656b6bf7c0529ecd52e37ab48bc37f2ecf3f3c05155f9b1732a289cf4540f96dfab423cbb3ffdb6029a2bc1db10fa46506e8ecc80f4aa SHA512 1f192b60e131d2d2eaf7490b8076001dc02e30d4f27890c5776f42cdcdd7c5d070c378384a72ad53dd7f9982dc97401449b66b3f577eadceaf1f478486dd6bf9
-EBUILD rust-bin-1.74.1.ebuild 7286 BLAKE2B 675304a969b3141bc03f20c652a621b67d39b273d397697c79dd5fc531de3fc82bba502bb66d8479ab60dda9a377a13f5dc8b696e4579522e9434c5e36ed2230 SHA512 adc899907d877b4a6476ad73d27560fbaf988d9affad1efb1a68ec9a3bc8f0f31adfaea30bf8241f10dfc71ae81c58d179537e919d127478deff03378019e642
+EBUILD rust-bin-1.74.1.ebuild 7291 BLAKE2B 753fa839b49efe9f6b73d5f93f359ddfaf75d4654240c253c51e23b7d75b447da58f9d51d0a751e7d7868ba14390fbd09091199a8f08cd75d57c3c8ed5d968a7 SHA512 38b34a0c8785792925b23adbaf0b26b597c5d61d2492d421b19a59b6617a147135ff4ff88e0db26c8c3066e803eeed9296cf39e31ca37351f20820600568cefd
 MISC metadata.xml 681 BLAKE2B 8826971e27f0332dac4d64d72030253f2f1743a2d6ca5c1c7ccb53d6d7b76758cc2529230d03db03c3e415478c34deb084a66966e542ca63ee4e73a064c2a1ff SHA512 a4ddffc0f3cc79ed9f7f9f871a813d5b6ec454ba3e69c2f36605a7882c1c8b2422221e4e82bd7b16ea9e3529019f5d023e948e5338b69774aff8201180092d92
diff --git a/dev-lang/rust-bin/rust-bin-1.74.1.ebuild b/dev-lang/rust-bin/rust-bin-1.74.1.ebuild
index 3ce571cfa5d9..ee46e6c096f0 100644
--- a/dev-lang/rust-bin/rust-bin-1.74.1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.74.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})
 	rust-src? ( ${MY_SRC_URI} )
 "
 # Keep this separate to allow easy commenting out if not yet built
-#SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.xz ) "
+SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.xz ) "
 #SRC_URI+=" mips? (
 #	abi_mips_o32? (
 #		big-endian?  ( ${GENTOO_BIN_BASEURI}/${MY_P}-mips-unknown-linux-gnu.tar.xz )
@@ -30,7 +30,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="stable"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt"
 
 DEPEND=""
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 84042922acfd..0f2c0d38adb6 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index fae70be89f7f..34223ebc75d6 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -3,4 +3,5 @@ AUX libpcre-8.45-fix-stack-size-detection.patch 651 BLAKE2B 35eea87eecdf5041bf6d
 DIST pcre-8.45.tar.bz2 1578809 BLAKE2B 3954e08cf3c67a5e2249bf72f8d4c1a90fe7a098fffa5a0a06d0d665d07899027cfd632eab2757fcf2b1b9b413a43d5c484c8e52d05b7ca113b3bbbc4dd3bb29 SHA512 91bff52eed4a2dfc3f3bfdc9c672b88e7e2ffcf3c4b121540af8a4ae8c1ce05178430aa6b8000658b9bb7b4252239357250890e20ceb84b79cdfcde05154061a
 EBUILD libpcre-8.45-r1.ebuild 2524 BLAKE2B 1aa96f5fd6603c0d18237a8a02538978d2494bc40bb0e080f5d9d81ebd692f7a2f6dbc63e928278934bd58734638113a4fc773538c6ca766560dfc7e6dc74247 SHA512 73442e994e49d47c04c76f16ef7204602acd596f88b402d8e8d18c8737134732d793c19752a2b5dbff96614ca3fadf5bbf935bba3e32f3021d3c593d61cdc515
 EBUILD libpcre-8.45-r2.ebuild 2529 BLAKE2B 4b056dba5cf00c02786260e2d235072cc522ae09804a9b91811e850aa55b127ed4e93c71d057e720fd07407b7cd9ba8e910856ecb918491c0c78670af92d267f SHA512 3919d3a882d11f9c4c92dc1cd79f514e3afcf9c727d4c846123c8d7891171545675ad2a065912ac4b82bdb2291a616303232fb02769702763b9907e8b7b4a46d
+EBUILD libpcre-8.45-r3.ebuild 2724 BLAKE2B 0079704ee1a6f0fc9d2380eec5bcd70303f1712c59fb225df660d0af2bda1e9a884397d753dc61bee8fae533234277e782dacc49f0e73b8cc2a37c94ae8cb67a SHA512 0432414d01d51bcd15072e9d69a4fe67781274bb36d4b00dcb7027f8d5ce1d7555ea59af720b891825e8b9e2311a2fa19c3b676f56550d1fb20095cb424c25a5
 MISC metadata.xml 1063 BLAKE2B c20c54462582bcffd5927643186e1ffbf49679a49490a53970f236f0bcd74fc8813233425ad4a642933ce60d224bb93457cb55fd12106b660a78902c45e11563 SHA512 8c2239d0176c9b79c162538824edead567ba4b51b9567c6edaa01af6ab1d4b2162867e134b40cc10c6c4d599e72c362beed3f9f6ed2a837a13a57cecff2f987a
diff --git a/dev-libs/libpcre/libpcre-8.45-r3.ebuild b/dev-libs/libpcre/libpcre-8.45-r3.ebuild
new file mode 100644
index 000000000000..006e23369ba2
--- /dev/null
+++ b/dev-libs/libpcre/libpcre-8.45-r3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal preserve-libs
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="http://www.pcre.org/"
+MY_P="pcre-${PV/_rc/-RC}"
+if [[ ${PV} != *_rc* ]] ; then
+	# Only the final releases are available here.
+	SRC_URI="
+		mirror://sourceforge/pcre/${MY_P}.tar.bz2
+		https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2
+		ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2
+	"
+else
+	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="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 ~x64-solaris"
+IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline static-libs unicode valgrind zlib"
+REQUIRED_USE="
+	readline? ( !libedit )
+	libedit? ( !readline )
+"
+
+RDEPEND="
+	bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )
+	libedit? ( dev-libs/libedit )
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="
+	${RDEPEND}
+	valgrind? ( dev-debug/valgrind )
+"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pcre-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.45-fix-stack-size-detection.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
+
+	# We do a full autoreconf because:
+	# - the software is end of life and never getting new dist tarballs
+	# - it uses a frankensteined "2.4.6.42-b88ce-dirty" libtool, which
+	#   means elibtoolize can't find patches to apply
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(multilib_native_use_enable bzip2 pcregrep-libbz2)
+		$(use_enable cxx cpp)
+		$(use_enable jit)
+		$(use_enable jit pcregrep-jit)
+		$(use_enable pcre16)
+		$(use_enable pcre32)
+		$(multilib_native_use_enable libedit pcretest-libedit)
+		$(multilib_native_use_enable readline pcretest-libreadline)
+		$(use_enable static-libs static)
+		$(use_enable unicode utf)
+		$(use_enable unicode unicode-properties)
+		$(multilib_native_use_enable valgrind)
+		$(multilib_native_use_enable zlib pcregrep-libz)
+
+		--enable-pcre8
+		--enable-shared
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
+		install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/libpcre.so.0
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libpcre.so.0
+}
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index dfd74c00eaab..7874172d4fe6 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -5,5 +5,6 @@ DIST pcre2-10.42.tar.bz2.sig 310 BLAKE2B 2125d7e23f7e75847573e3caeb8d55da5d8e0df
 DIST pcre2-10.43-RC1.tar.bz2 1901289 BLAKE2B 94ba878ed7a02d359d094daa22517c645b5d660dfab4ce65e9f56c1750abb56280dc0be05b6f675d12891bf9fa857ba7339d9e703b0360d72ee746afcecc6dba SHA512 2b33a50fbff0f7832d40682e7a43bef301016d8a8d74d838f1ab473f09a19c5ea98dcf73cdfa4cda4a01968e50930bb2fc40948c0e4e9c43d9762ee3dd0b1fc7
 DIST pcre2-10.43-RC1.tar.bz2.sig 310 BLAKE2B 4bfaf5209fbeb89fbc0f134921d18d15b35ef24503b910de7d0a420fbfc84831ddd79f8f61fe8a12776eb154e264ac7ff4f55d548a1e1c0ae8f53c32a4ba90e1 SHA512 09b9166f4edc6fc0d4cab66bcc572d9b081ceda3398c510348fab7746c520c4b607c26e13937e45cf3d27e0a94eefca2dddaf4210d2a754c277f1837b9a7f96d
 EBUILD libpcre2-10.42-r1.ebuild 2554 BLAKE2B 029cb4de0eedb460178d31381099e357a9638b3e0832950209e5952b63d494f05ac9da2efb875c1c0887d8d97d862cce784e1309dd458adbcbddff8c961884dc SHA512 9225c0894edc026422e1769755aeb35bd6eaaad1e47a3a953345409d48d089319f03b6b19ec0de683ab5809f8a9e1034eca3694f067dd44835d29721160f59ad
-EBUILD libpcre2-10.43_rc1.ebuild 2450 BLAKE2B 614d532cbc0135e9ab682518f58c5269e1862da4d2e2e18ca763983baaee9560cae6ed8986d92ca3db2e897ce0e8408f14762a3326a868ce9f9aec391d58d242 SHA512 5cff53024bc1e8e36a2a9f1e21f65868453ad6728d3830216100b8532c6540479aec7e13d8c1c02357c68d471ef73ebd978479bcbeeaa1f3730ac7aa9fd29c8d
+EBUILD libpcre2-10.42-r2.ebuild 2482 BLAKE2B 133aa4deea9999a7d284e3cc8a9d20100fe5c6f9c09e081205956f7c4fdde6d92f7a5c9fac6fd70cd783cc79140327c065c31bfbed769b3efb7510426cf60ab3 SHA512 e0c78e55cb3fc94ce16b47c8489e3ad1028d651ab3debc7598992c2a108560867e1f8c2fc3367c6e293ebd65bbe1a461ba57ef43d90de1f0711d5190a9018ca0
+EBUILD libpcre2-10.43_rc1.ebuild 2370 BLAKE2B 4a2e4ee825b115c1fbd6097bef3d7e1b0bdce0e859426ac96303c8a8c03ace47bf117da502bf1eb551ea2d3265fddc13fc33e01d4b877e1821a2044c7c0867ac SHA512 fa6394bca05a3584b2dfc78db1d7200c0f9aa62e108f6f5b1f8734f263d98ef07c04d9ef7afbd726d97c29a00f26e9c1ba0efdba23ecf3e5251eaa4d8b1554a8
 MISC metadata.xml 1088 BLAKE2B 4adc3d90d0a974c796b33195448d4a1ebaefef89f76137b3501fb2d35a05cbc78d2131742110737720d32ff239cc5c8a5df694330362a261cbbf5da3a0a285ef SHA512 d01ea4e26b1335c2fea7fb39c489411b72e777f6e4173adedb782387f34b6197fab65723071811fa9e69708909ae49091f7467cb0254b669a3d1a8320dccab16
diff --git a/dev-libs/libpcre2/libpcre2-10.42-r2.ebuild b/dev-libs/libpcre2/libpcre2-10.42-r2.ebuild
new file mode 100644
index 000000000000..881a0b37bcba
--- /dev/null
+++ b/dev-libs/libpcre2/libpcre2-10.42-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/philiphazel.asc
+inherit libtool multilib-minimal verify-sig
+
+MY_P="pcre2-${PV/_rc/-RC}"
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="https://www.pcre.org/"
+if [[ ${PV} != *_rc* ]] ; then
+	# Only the final releases are available here.
+	SRC_URI="https://github.com/PCRE2Project/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2
+		https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2
+		verify-sig? ( https://github.com/PCRE2Project/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2.sig )"
+else
+	SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0/3" # libpcre2-posix.so version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="bzip2 +jit libedit +pcre16 +pcre32 +readline static-libs unicode valgrind zlib"
+REQUIRED_USE="?? ( libedit readline )"
+
+RDEPEND="
+	bzip2? ( app-arch/bzip2 )
+	libedit? ( dev-libs/libedit )
+	readline? ( sys-libs/readline:= )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${RDEPEND}
+	valgrind? ( dev-debug/valgrind )
+"
+BDEPEND="
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-philiphazel )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pcre2-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.10-000-Fix-multilib.patch
+)
+
+src_prepare() {
+	default
+
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-pcre2-8
+		--enable-shared
+		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
+		$(multilib_native_use_enable libedit pcre2test-libedit)
+		$(multilib_native_use_enable readline pcre2test-libreadline)
+		$(multilib_native_use_enable valgrind)
+		$(multilib_native_use_enable zlib pcre2grep-libz)
+		$(use_enable jit)
+		$(use_enable jit pcre2grep-jit)
+		$(use_enable pcre16 pcre2-16)
+		$(use_enable pcre32 pcre2-32)
+		$(use_enable static-libs static)
+		$(use_enable unicode)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
+}
+
+multilib_src_test() {
+	emake check VERBOSE=yes
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
+		install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libpcre2/libpcre2-10.43_rc1.ebuild b/dev-libs/libpcre2/libpcre2-10.43_rc1.ebuild
index f12355bd6b9e..426be94c00e7 100644
--- a/dev-libs/libpcre2/libpcre2-10.43_rc1.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.43_rc1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/philiphazel.asc
-inherit libtool multilib-minimal usr-ldscript verify-sig
+inherit libtool multilib-minimal verify-sig
 
 MY_P="pcre2-${PV/_rc/-RC}"
 
@@ -85,7 +85,6 @@ multilib_src_install() {
 		DESTDIR="${D}" \
 		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
 		install
-	multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix pcre2-8
 }
 
 multilib_src_install_all() {
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 402e8e8a0c72..be9b751b4c14 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 7a463a041707..b1a81d9e357a 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -3,5 +3,5 @@ DIST qtbase-5.15.12-gentoo-kde-1.tar.xz 330700 BLAKE2B d58eb3c12e4eaec9087bdf21e
 DIST qtbase-5.15.12-gentoo-kde-3.tar.xz 333328 BLAKE2B f4b281098c142aeff32349a207c312de6b40057768c7732533923ddfc7db393352739a9c8b7af6a562268d2fed0397c5d5eb96a85ad376c97e7b8e51a2b962cb SHA512 6d5a826569793ae7e49f6f789d138290346be94976d3aa2c5526be9ada5dd85ffaa789422f4bedaaa6a76178e87978937be425d5f75fcce41d45726d02912c7a
 DIST qtbase-everywhere-opensource-src-5.15.12.tar.xz 50840192 BLAKE2B da758bdc13a63e8856486476733d6e9ed0bd22aa29d0d575f25a7d2ac90d0bae0d789875c747f9b16ec72941101fdf54abb64036c0fc2f0f467811bd32c7f8d9 SHA512 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888
 EBUILD qtcore-5.15.12-r1.ebuild 4302 BLAKE2B c0f7bc71204dbcf688d402433e2eaa41eb00514eb10ec1110ca63f3a32dc5c6c8ca6fd1c378c6f49f7cdc701655541a0c2d0bb88331699360bdad7f3a353efd1 SHA512 2c1315230ea0f6d6844a6414cf903d5a3ed575cf96c4aab1d898bdc87ca4ffffd936fb674684b4abdb62a8b0b13b430e563ae2f2ea3853a0133fde5d523771fe
-EBUILD qtcore-5.15.12-r2.ebuild 4308 BLAKE2B ad56285ff4ec4f3e4d773e18f9c89c4659d731ce05c3b30dbbb3a8c174a3a7a3bd4eea7da6443344fe3bd9908cfd1305d764489f868192d8d6bbee8f2d2e3cee SHA512 d03f88847bef8866aeac4b15d8a296041f0d005341f2e0c611d48948bd5e0d439c5e083197c70aca53284533f22ba41ddc72f92c1f295c8b8b08b16140fdcb0d
+EBUILD qtcore-5.15.12-r2.ebuild 4307 BLAKE2B f1ea956295a528b9c555c402143cc2b34ef980c9c3a0f3e5ce55bd55a99c8aaeea921a22661a6461f9e92e0c52a4f8cb39bfb00a873d457638e04540beeb3e58 SHA512 6efcc9521c65fa35eb2a6177402129513a3dbbffbc625c37ec140e4dd101a6433cebed7e22a3e518036235c2c551f0fe3966f5c5a54f24017896716f6716fc43
 MISC metadata.xml 594 BLAKE2B 0cefc88e620290c30db5f52e6804c43541617009ba05cc517a5c8b1c4039be9af9991e6e5b893577da3df52a83b70bd9f07a8061c518e9b52fdfdeb93a7df17f SHA512 73036ec739b85ea13025828f2526bce9d9fa6a3db3578925e4a4294be92a15dbe0f3af4db206690e3e786237312b3a23cb028a15abdd216e251db849a381a5be
diff --git a/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild b/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
index e87062d2038e..cd3c18608ad8 100644
--- a/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=3
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index d6e96cdb8772..73e47ed250dc 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -2,6 +2,6 @@ DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797f
 DIST qtbase-5.15.12-gentoo-kde-1.tar.xz 330700 BLAKE2B d58eb3c12e4eaec9087bdf21ead08d4574fb7ce958b8453703f0b00efd27a4624329bbdf53e2c17d548e4791f7180bb3c0f68f0f3da4bc638c03622609d4df37 SHA512 f9519252a4b0451afae454155637f795688a8c9d8d40e03677430a7b887aa52d04996d93665e7068e41c8f7db428fdef933d4b8b342ea05847fffa5ddd82d1de
 DIST qtbase-5.15.12-gentoo-kde-3.tar.xz 333328 BLAKE2B f4b281098c142aeff32349a207c312de6b40057768c7732533923ddfc7db393352739a9c8b7af6a562268d2fed0397c5d5eb96a85ad376c97e7b8e51a2b962cb SHA512 6d5a826569793ae7e49f6f789d138290346be94976d3aa2c5526be9ada5dd85ffaa789422f4bedaaa6a76178e87978937be425d5f75fcce41d45726d02912c7a
 DIST qtbase-everywhere-opensource-src-5.15.12.tar.xz 50840192 BLAKE2B da758bdc13a63e8856486476733d6e9ed0bd22aa29d0d575f25a7d2ac90d0bae0d789875c747f9b16ec72941101fdf54abb64036c0fc2f0f467811bd32c7f8d9 SHA512 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888
-EBUILD qtgui-5.15.12-r1.ebuild 3992 BLAKE2B 84045f08b85fbcef5a57b2a9da5dfecf224a96b345b030319347b7bf68debcf6d5c0c1b473d0381f69f6efe894d81d4fa2a2c5d6336266a7bc9c63de31be69e6 SHA512 09671d1a2c22047d9e139e79876370606b0c6174a7ac75108e5a02adcbc14c2cbd95115a251f0f0fd3ad75618e4702a69b49535b10f13491991bfd0e9f16b964
+EBUILD qtgui-5.15.12-r1.ebuild 3991 BLAKE2B 93f1bab7cb14c93cbdf8f4b0af2ab4f5b7923a1bf1905affc64cad7f35ae56841512ec8b7735693e8e26101501e1f26976c0787e17f7f29caacb0b681a6b23b8 SHA512 8a25e92b4175d12f120122bee1494105bacfd933f1ebaaaa0048c10fbec95c3e229f923dd059add849fe5779b7346a2d707cfe6095174ecf675860909bcb0c04
 EBUILD qtgui-5.15.12.ebuild 3986 BLAKE2B 4684e0f9b5971170b81cbc45668057ad6f1dfa595445590d1676e9379b7a8c9bf0e087db79eeaf3257c34e14f4fb64fe67a10c8a20ab9459fa5464d35dd4cdb4 SHA512 fc9b5b6b2b401afc96296e813fa337a093a60c748d9e633bb7b616dac4c7f48f46ce9558f3e7d189dfc5a1f61d74b37c6c80535326eb4fe61db3f7b45f27c91c
 MISC metadata.xml 1283 BLAKE2B 2d4873f1b7011f5766810866933cd897a68a89d93183b93c19008b9b956aa10e882ebc061f0a86c81d68308bb267d28f324f2cddc52b55d94c4201a7b97ce889 SHA512 551b643e0dec5fcfd934029e36f35d8e14479e7d426dc74d4b48522c6e06d989ae70db7c4cd0a67594551916ec59036f3d1db91afa929e454614a947464ed19c
diff --git a/dev-qt/qtgui/qtgui-5.15.12-r1.ebuild b/dev-qt/qtgui/qtgui-5.15.12-r1.ebuild
index 0ffe18a81fe1..bb940e5b463a 100644
--- a/dev-qt/qtgui/qtgui-5.15.12-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.12-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=3
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index b64b2c1ee484..c469d7ee8c10 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,7 +1,7 @@
 DIST qtwayland-5.15.12-gentoo-kde-1.tar.xz 48548 BLAKE2B 706547b35251116550b7d838df489f770a58140b2ece34e22cf5cd13929fa801d9a057a38f66a34c47321e1c0958049774928a68f859082ad3664acee0f1bb73 SHA512 756edb0657580c3d65d6e4bb74e3ab31c326f2f25bf501c2761e8b3e538287792955c91c0e57e32d8a04c31577546481673bdd14f1abdc2aa28513edba3a670e
 DIST qtwayland-everywhere-opensource-src-5.15.12.tar.xz 569180 BLAKE2B 456b02d061ef6c57237463dd7b8387e4c6353648af0475a6ff6036ab2438417ecd3c60a8f3429aa52a98e9d213c0097fa3189602657611ae3657a2a520eb8c71 SHA512 acd78018665db3d0d77a84bb80ce7dbb65a33e0e813c3308e09a27195df204029b5e580f353eae2536e6fdde249aa34411e37f4f1663f7645448d96c9df67a66
 DIST qtwayland-everywhere-src-6.6.1.tar.xz 1127148 BLAKE2B 8eb11f5f7f200a6d548577089732a533318d6120a7498dcb258183b5e0fd444541e03b59e730018cab15a612f8a31dd7b51275899271d62173eb1962a70198d3 SHA512 7f6533754daad7a2804ddddcd5139608c2b8f1ef92ae8a238c1ed4fc41c8a3ee532da0b2e57266d07d4d39d1ec6c83eca487c73788a108af30035b0dae262c76
-EBUILD qtwayland-5.15.12-r1.ebuild 1220 BLAKE2B 242495aedae55f8841f0b8ef9fab0dfc31be2640780231ec7f38932da38545091920711371778e5ac2d050bd923be2617c3b9b759449a4f3a4b92f0a314d9f0a SHA512 eb594ce8f52da2543f8c269881bfe1ecf4527d346caf5c6922fd7ed9619e07a225318834e661982bcadf01f09ca919b41f955b71579903e450468b7433e39e34
+EBUILD qtwayland-5.15.12-r1.ebuild 1219 BLAKE2B 6498b4ebb7ecaef01dbd44bc0f0433049f69a8022c42d648f958b51d7fb3c984c0684f39ee44b1b101cf1488125f17ccfb4e7f4aabe45b1f94ab89fc8fbe3dbb SHA512 7f6cdf7895b2dd9084315d5c3e2eaafe053ac4a01efc7d1da467f8ec8c220ad9a6d2d998d813861722c216ff4a8085f0ab1e2d8673b20e0f8ea1412ba168305d
 EBUILD qtwayland-5.15.12.ebuild 1209 BLAKE2B 3aaca329c62f7f1636c4d6129a342b691ee8d15c509bc4515aef3dfc0d90a57c6a5cca1fbea1a12a942d244d19bd48efea89a6cd19fdaa1690213c71a37252e5 SHA512 b37a8c24734da053f013a6be33d8502bac1e31a1005e4118101b65ad81d050bf2731159462d9c4d565ce945257b1ab5d3b670e1b96bef2f7524a37e4632bcbaa
 EBUILD qtwayland-6.6.1.ebuild 992 BLAKE2B c982eed008a1789a4a3ecffa98559e0bc93a1cbcb1d83bcd648b786c1a7f3b6ca46e4e9d0d7a1aec326bc52b0e585db841e34daa72ec5b4ab6b31c3d53a54310 SHA512 b852d6388af5d83bdc6f8f8fa139200f89c854dbc7fc55d6c292052e1c5e14b9bc055cebd71e7ea1bccc6ef7d73e28461c4fcbd8acc89829a57408876759085c
 EBUILD qtwayland-6.6.9999.ebuild 993 BLAKE2B 191010fad490a0eaef31456cddcec7fa50e91edea0b1655e0605e8d260026bad17d95b22fbde64c42444e2959c8cdaa7916647714f97ff6d21af5f59c9b4e26b SHA512 177204c0e4502111d726a3ebc3ca0f8ac0086a5e8f7fe5dcaa99202de5ea5f1144b0c1e18b69a0fa68ba5b833fc314b9f3e56a222e1c4637bd62e9ec5c46b46e
diff --git a/dev-qt/qtwayland/qtwayland-5.15.12-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.15.12-r1.ebuild
index c9d27b00e9e9..510f5ca2ecff 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.12-r1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.12-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 8742486ba6a3..96ca9593ca09 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -2,6 +2,6 @@ DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797f
 DIST qtbase-5.15.12-gentoo-kde-1.tar.xz 330700 BLAKE2B d58eb3c12e4eaec9087bdf21ead08d4574fb7ce958b8453703f0b00efd27a4624329bbdf53e2c17d548e4791f7180bb3c0f68f0f3da4bc638c03622609d4df37 SHA512 f9519252a4b0451afae454155637f795688a8c9d8d40e03677430a7b887aa52d04996d93665e7068e41c8f7db428fdef933d4b8b342ea05847fffa5ddd82d1de
 DIST qtbase-5.15.12-gentoo-kde-3.tar.xz 333328 BLAKE2B f4b281098c142aeff32349a207c312de6b40057768c7732533923ddfc7db393352739a9c8b7af6a562268d2fed0397c5d5eb96a85ad376c97e7b8e51a2b962cb SHA512 6d5a826569793ae7e49f6f789d138290346be94976d3aa2c5526be9ada5dd85ffaa789422f4bedaaa6a76178e87978937be425d5f75fcce41d45726d02912c7a
 DIST qtbase-everywhere-opensource-src-5.15.12.tar.xz 50840192 BLAKE2B da758bdc13a63e8856486476733d6e9ed0bd22aa29d0d575f25a7d2ac90d0bae0d789875c747f9b16ec72941101fdf54abb64036c0fc2f0f467811bd32c7f8d9 SHA512 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888
-EBUILD qtwidgets-5.15.12-r1.ebuild 1209 BLAKE2B 5f3481e48d954a289bbc702a050662069285ae38a2c4343f42ac1298a20984c425e321e921c5f5d366b6882e6c4d9305aa17484e0aa3674a739a70793230a55b SHA512 07736f7253706a417c70cde822320c0ea68676bc9a2e05f29535b24b63d7422a07a7effd228e2f839de548553b59b9ace678d08d359b65155983e3c445dd42e3
+EBUILD qtwidgets-5.15.12-r1.ebuild 1208 BLAKE2B fbb092bfcbcc705714ffb2202ea5c3ece4c6ae00b5ad767ab7e4e613e45206ca29bca44404c8faaf0045a1e74d87ec630b54c92f1c72994066e32a83f603b505 SHA512 c485c94ca9e2309c22f2cf95e56d88ea1add5205422b0ad2794f9305398dbbee2ceb2a62d7ba43695b9e2916c8764a8bd89c31953575731d23e9ec2db5289aee
 EBUILD qtwidgets-5.15.12.ebuild 1203 BLAKE2B a016f5345d4c3ab3646c0691cb01f6ac89e0ca868df6f5f647fa13f5ca83fec419bda09c70fb5370311b5b944110da2c6f655d8684f552d7dd9a5d3c70d02d43 SHA512 0089a95556c7be2213d647e186fdf14571d42ab67a335edfcc733754212b454e2e598efb5c7c945a4b307ea7be46aed87f625980e899720d51975a3f4abd2be6
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.12-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.12-r1.ebuild
index ce06e17144ba..651a88cec6e1 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.12-r1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.12-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=3
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 3e1d3c61bf16..12938b8fd016 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 51dfe9f0e3cf..d97dca40b897 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 06 Feb 2024 21:10:01 +0000
+Wed, 07 Feb 2024 03:10:08 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 0ff053334ed6..70934655a79a 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 565188 BLAKE2B 35f53a7f251713df50fcb7686e05bd9d32b5212c332acfb4f78810cfda409c59230202499f72410dca6d258aada2515c2e918fad341cbf357376890fc5ded7c1 SHA512 fad70ec1cb0f5ab8ebcba04d8007ecba54af8d22cd82a30f9a41b2ab8881ca037e0bb21c2fed295cb035a2ed0547d37975ced7975eba62e289894d58e57cb379
-TIMESTAMP 2024-02-06T21:10:04Z
+TIMESTAMP 2024-02-07T03:10:11Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmXCoCxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmXC9JNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA7Ew//Z1q8I5zbj35A+ZLjY5aOIB34fpdwDDOdK/y1lQ5iO5bPkGXkd/AfvJfG
-wY3QJOfNX+9d2gCJcao8M1EtZOUwUEhJU+KJrVtaQvYO0xdA/6yiNHacPV6vvUyD
-wc8hbxmS8ATgmOB0lmYXvNICVTB2JuanUmNCXWZqLJVR64fJYsSJHzm88yuaCAAH
-Wf8fmqqp+fuHI5nNP8oeNF73/kBi1N+zvpFcnL/Bp6yaCev52IeObTiePVraeF0Y
-qOdHKHTXeF5fTiszBVm+BOEJTuOdN3JDtcnWGeGlB0Sy0WAqhd950lGkBjveahqd
-rTV2buNLEuZCNoT2vSMdLbjU+WPaul6rD3CeXgMe+iIYffQYGLU3OTuLy4j/0EKL
-L3Zr6/e4cX/+xv2AhXie6jknZRIY8uQn7b8qgZyscZYpD2tyEOelcma4aG657xAe
-uVgDWFHh4dEVhSVYoZd+efkhlFv0y79PshF+s+Vr81jOf01qJW/IvJS5uoUw6/Oa
-1L10Bqt+B48QI5KsdwYgC4cwSMCnT5jpVEPILkxFzZP+NmoMpcZRTRHOfrqyo5K2
-VQypR5lOs5NGMa75itJbJHBnKblu2sN26P0G5OHyz6XKTLpGgq9GHlkYRqqOthlM
-HrdE2HhuIJLULyueTBskOWZuuy8qNSxokeYXAkF5XGcD2qAbPKM=
-=eacb
+klBmlQ//bQgTZTf9+wEP2k9cL8YXSLZRF8xIygFbVV8kovqeVYCaJYfjx7SsXF/9
+qRyAyp2ksN/dPHt6kBRJL7BylwrLy0btbs9v68lyJrgj1w/Yy4ZfldHbguRjIlae
+v+DWjzCfvQ0wlDtY8XW/+hy++pcq7i50C3X04vq94s9Z5TVybEr40nJR1GWlNbin
+z8EW8GswIbSmuujRNpkzUXfFxufzeLxVw695I6X339HcflqbyrDMf+4xJi3Lp3n+
+zNZw/FOrmLk/VCZTei7NxjQDHYRqrECeYeflR5xdpkGDAKf6s/HJmTjRusy4Tw22
+sXnjqy8IF1vDVSLjXI1A8oRU/TP7iB9HZChEldCkOzHJkXDJyXEpoo6vvC4SbP7p
+tm/yTCD0lVn5Xwm2ZbyJjLz2s+3VgAme6O8o2wVOryvq1cJ4ba5EQHJoFwx+E8+5
+gGveNDxss0ygD1l0c+aZUtrX0aSKMRbJ/Wszlf4Tsz0VLDwaJJAA7DRn0rEH0Okg
+a6PCQERjf4KVSPs+76PAYT70yPprC8s11pI26TQ9yqsmLvVPwYTrD/NBXzngwNZM
+1LUFJY3GR1zCnQUaqfjtxzGq3Y4zDjIuNWI38HKMnctolAz1I2O49hJpv8mKksss
+eqYoDUS94K/kOpExCTlXueodggl61GPUacmNBopj1Px7d9ySt2g=
+=gM62
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 51dfe9f0e3cf..d97dca40b897 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 06 Feb 2024 21:10:01 +0000
+Wed, 07 Feb 2024 03:10:08 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 418482a0131b..4dac520b80ff 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 15cb64f54d58..d5431e7fd427 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/bzip2-1.0.8-r5 b/metadata/md5-cache/app-arch/bzip2-1.0.8-r5
new file mode 100644
index 000000000000..a050dbf06852
--- /dev/null
+++ b/metadata/md5-cache/app-arch/bzip2-1.0.8-r5
@@ -0,0 +1,14 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-bzip2 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DESCRIPTION=A high-quality data compressor used extensively by Gentoo Linux
+EAPI=7
+HOMEPAGE=https://sourceware.org/bzip2/
+INHERIT=toolchain-funcs multilib multilib-minimal verify-sig
+IUSE=static static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos
+LICENSE=BZIP2
+PDEPEND=app-alternatives/bzip2
+SLOT=0/1
+SRC_URI=https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz verify-sig? ( https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz.sig )
+_eclasses_=multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_md5_=ec27f69aa3049bfbb2c6aa728a7ad0e6
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.4.6 b/metadata/md5-cache/app-arch/xz-utils-5.4.6-r1
index 5c66af2e0713..a9283a5e9c63 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.4.6
+++ b/metadata/md5-cache/app-arch/xz-utils-5.4.6-r1
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
 DESCRIPTION=Utils for managing LZMA compressed files
 EAPI=8
 HOMEPAGE=https://tukaani.org/xz/
-INHERIT=flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript verify-sig
-IUSE=doc +extra-filters pgo nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
+INHERIT=flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs verify-sig
+IUSE=doc +extra-filters pgo nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=public-domain LGPL-2.1+ GPL-2+
 SLOT=0
 SRC_URI=https://github.com/tukaani-project/xz/releases/download/v5.4.6/xz-5.4.6.tar.gz mirror://sourceforge/lzmautils/xz-5.4.6.tar.gz https://tukaani.org/xz/xz-5.4.6.tar.gz verify-sig? ( https://github.com/tukaani-project/xz/releases/download/v5.4.6/xz-5.4.6.tar.gz.sig https://tukaani.org/xz/xz-5.4.6.tar.gz.sig )
-_eclasses_=flag-o-matic	b2b07efa51009704f88173b2c7feab47	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=7b03602989691bba3afc68cfe4a4ad87
+_eclasses_=flag-o-matic	b2b07efa51009704f88173b2c7feab47	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_md5_=e4994b4a7b21255b4203ab16b23e6e3c
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.5.1_alpha b/metadata/md5-cache/app-arch/xz-utils-5.5.1_alpha
index 3bb52e8ccd64..801eeb7869ad 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.5.1_alpha
+++ b/metadata/md5-cache/app-arch/xz-utils-5.5.1_alpha
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
 DESCRIPTION=Utils for managing LZMA compressed files
 EAPI=8
 HOMEPAGE=https://tukaani.org/xz/
-INHERIT=flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript verify-sig
-IUSE=doc +extra-filters pgo nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
+INHERIT=flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs verify-sig
+IUSE=doc +extra-filters pgo nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
 LICENSE=public-domain LGPL-2.1+ GPL-2+ doc? ( CC-BY-SA-4.0 )
 SLOT=0
 SRC_URI=https://github.com/tukaani-project/xz/releases/download/v5.5.1alpha/xz-5.5.1alpha.tar.gz mirror://sourceforge/lzmautils/xz-5.5.1alpha.tar.gz https://tukaani.org/xz/xz-5.5.1alpha.tar.gz verify-sig? ( https://github.com/tukaani-project/xz/releases/download/v5.5.1alpha/xz-5.5.1alpha.tar.gz.sig https://tukaani.org/xz/xz-5.5.1alpha.tar.gz.sig )
-_eclasses_=flag-o-matic	b2b07efa51009704f88173b2c7feab47	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=78e00898f54e217a68eb7ec6817442dc
+_eclasses_=flag-o-matic	b2b07efa51009704f88173b2c7feab47	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_md5_=5da2c909ec1dcf00c859653812bafd1f
diff --git a/metadata/md5-cache/app-arch/xz-utils-9999 b/metadata/md5-cache/app-arch/xz-utils-9999
index 4d8daab56060..0c98d5b9abf8 100644
--- a/metadata/md5-cache/app-arch/xz-utils-9999
+++ b/metadata/md5-cache/app-arch/xz-utils-9999
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
 DESCRIPTION=Utils for managing LZMA compressed files
 EAPI=8
 HOMEPAGE=https://tukaani.org/xz/
-INHERIT=flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript git-r3 autotools
-IUSE=doc +extra-filters pgo nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+INHERIT=flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs git-r3 autotools
+IUSE=doc +extra-filters pgo nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=public-domain LGPL-2.1+ GPL-2+ doc? ( CC-BY-SA-4.0 )
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	b2b07efa51009704f88173b2c7feab47	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9
-_md5_=78e00898f54e217a68eb7ec6817442dc
+_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	b2b07efa51009704f88173b2c7feab47	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=5da2c909ec1dcf00c859653812bafd1f
diff --git a/metadata/md5-cache/app-arch/zstd-1.5.5-r1 b/metadata/md5-cache/app-arch/zstd-1.5.5-r1
new file mode 100644
index 000000000000..9934afb94bc4
--- /dev/null
+++ b/metadata/md5-cache/app-arch/zstd-1.5.5-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-build/meson-1.2.1 app-alternatives/ninja dev-build/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4:= ) zlib? ( sys-libs/zlib )
+DESCRIPTION=zstd fast compression library
+EAPI=8
+HOMEPAGE=https://facebook.github.io/zstd/
+INHERIT=meson-multilib
+IUSE=+lzma lz4 static-libs test 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=|| ( BSD GPL-2 )
+RDEPEND=lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4:= ) zlib? ( sys-libs/zlib )
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=https://github.com/facebook/zstd/releases/download/v1.5.5/zstd-1.5.5.tar.gz
+_eclasses_=meson	e322276188f86eacb29ae081ba5485c8	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=24c2741227a4f42fc54a6ad53a3dbd43
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 6072735b92ff..c80292125a3a 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
diff --git a/metadata/md5-cache/app-doc/eclass-manpages-20240207 b/metadata/md5-cache/app-doc/eclass-manpages-20240207
new file mode 100644
index 000000000000..2e8ab0163b27
--- /dev/null
+++ b/metadata/md5-cache/app-doc/eclass-manpages-20240207
@@ -0,0 +1,10 @@
+BDEPEND=sys-apps/gawk
+DEFINED_PHASES=install
+DESCRIPTION=Collection of Gentoo eclass manpages
+EAPI=8
+HOMEPAGE=https://github.com/projg2/eclass-to-manpage
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/app-doc/eclass-manpages/eclass-manpages-20240207.tar.xz
+_md5_=151cfacde16338571e9ddd29550b8343
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index acef4bbf0685..2bbb7dd13a91 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/levee-4.0 b/metadata/md5-cache/app-editors/levee-4.0
index 362accc49623..d571c897bdbf 100644
--- a/metadata/md5-cache/app-editors/levee-4.0
+++ b/metadata/md5-cache/app-editors/levee-4.0
@@ -5,10 +5,10 @@ DESCRIPTION=Really tiny vi clone, for things like rescue disks
 EAPI=8
 HOMEPAGE=https://www.pell.portland.or.us/~orc/Code/levee/
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=levee
 RDEPEND=!app-text/lv sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://www.pell.portland.or.us/~orc/Code/levee/levee-4.0.tar.bz2 https://dev.gentoo.org/~sam/distfiles/app-editors/levee/levee-4.0-patches.tar.xz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a952bdb63a72bd7dd421a70a8753a2cc
+_md5_=b806b621469117bd94b4837eadead2e0
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index e9ee2be4d96c..dd637e15c6e4 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/raspberrypi-utils-0_p20240115 b/metadata/md5-cache/dev-embedded/raspberrypi-utils-0_p20240203
index 967524daba49..0bd26baf8b5d 100644
--- a/metadata/md5-cache/dev-embedded/raspberrypi-utils-0_p20240115
+++ b/metadata/md5-cache/dev-embedded/raspberrypi-utils-0_p20240203
@@ -9,6 +9,6 @@ KEYWORDS=~arm ~arm64
 LICENSE=BSD
 RDEPEND=sys-apps/dtc !media-libs/raspberrypi-userland !media-libs/raspberrypi-userland-bin
 SLOT=0
-SRC_URI=https://github.com/raspberrypi/utils/archive/32602f565c6cb854d1f2643b51a022991cea2b1b.tar.gz -> raspberrypi-utils-0_p20240115.tar.gz
+SRC_URI=https://github.com/raspberrypi/utils/archive/1eb8c20dfa258c549139fae2b21185ac290051c5.tar.gz -> raspberrypi-utils-0_p20240203.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	b2b07efa51009704f88173b2c7feab47	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ab4159d8c9afb1259ce54da01a5fb923
+_md5_=4f8d4ef5a671c22d0c34f30ddb1cb849
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index d27d70d56501..f99815a4844d 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.74.1 b/metadata/md5-cache/dev-lang/rust-bin-1.74.1
index 31a6e5093d00..44dfb05fc96d 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.74.1
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.74.1
@@ -5,12 +5,12 @@ EAPI=8
 HOMEPAGE=https://www.rust-lang.org/
 INHERIT=multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
 IUSE=big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=amd64 ~arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4
 RDEPEND=>=app-eselect/eselect-rust-20190311 dev-libs/openssl sys-apps/lsb-release sys-devel/gcc:*
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 RESTRICT=strip
 SLOT=stable
-SRC_URI=abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.74.1-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-i686-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.74.1-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.74.1-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.74.1-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.74.1-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( big-endian? ( https://static.rust-lang.org/dist/rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.asc ) ) !big-endian? ( https://static.rust-lang.org/dist/rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.74.1-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-s390x-unknown-linux-gnu.tar.xz.asc ) ) loong? ( https://static.rust-lang.org/dist/rust-1.74.1-loongarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-loongarch64-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2023-12-07/rust-src-1.74.1.tar.xz )
+SRC_URI=abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.74.1-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-i686-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.74.1-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.74.1-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.74.1-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.74.1-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( big-endian? ( https://static.rust-lang.org/dist/rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.asc ) ) !big-endian? ( https://static.rust-lang.org/dist/rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.74.1-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-s390x-unknown-linux-gnu.tar.xz.asc ) ) loong? ( https://static.rust-lang.org/dist/rust-1.74.1-loongarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.74.1-loongarch64-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2023-12-07/rust-src-1.74.1.tar.xz ) sparc? ( https://dev.gentoo.org/~sam/distfiles/dev-lang/rust-bin/rust-1.74.1-sparc64-unknown-linux-gnu.tar.xz )
 _eclasses_=multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	rust-toolchain	ab72acc17f5dea7b8fadd410d34b798c	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=68fbfe18e020cc4ec7656a2e8fd3f1da
+_md5_=a6cbe968b31c197b6d018476ff16434f
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index ccd8e8b5724b..29ab8f400bf7 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/libpcre-8.45-r3 b/metadata/md5-cache/dev-libs/libpcre-8.45-r3
new file mode 100644
index 000000000000..bdd8cc407381
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libpcre-8.45-r3
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:= ) valgrind? ( dev-debug/valgrind )
+DESCRIPTION=Perl-compatible regular expression library
+EAPI=8
+HOMEPAGE=http://www.pcre.org/
+INHERIT=autotools multilib-minimal preserve-libs
+IUSE=bzip2 +cxx +jit libedit pcre16 pcre32 +readline static-libs unicode valgrind 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:= )
+REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
+SLOT=3
+SRC_URI=mirror://sourceforge/pcre/pcre-8.45.tar.bz2 https://ftp.pcre.org/pub/pcre/pcre-8.45.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.45.tar.bz2
+_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=4aee701c0dea39a5a8d0d7a7f24ed96a
diff --git a/metadata/md5-cache/dev-libs/libpcre2-10.42-r2 b/metadata/md5-cache/dev-libs/libpcre2-10.42-r2
new file mode 100644
index 000000000000..825992a9f897
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libpcre2-10.42-r2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-philiphazel ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=bzip2? ( app-arch/bzip2 ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:= ) zlib? ( sys-libs/zlib ) valgrind? ( dev-debug/valgrind )
+DESCRIPTION=Perl-compatible regular expression library
+EAPI=7
+HOMEPAGE=https://www.pcre.org/
+INHERIT=libtool multilib-minimal verify-sig
+IUSE=bzip2 +jit libedit +pcre16 +pcre32 +readline static-libs unicode valgrind 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 verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=bzip2? ( app-arch/bzip2 ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:= ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=?? ( libedit readline )
+SLOT=0/3
+SRC_URI=https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2 https://ftp.pcre.org/pub/pcre/pcre2-10.42.tar.bz2 verify-sig? ( https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2.sig )
+_eclasses_=libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_md5_=1689cdcebf84602e84a350dd5914efd3
diff --git a/metadata/md5-cache/dev-libs/libpcre2-10.43_rc1 b/metadata/md5-cache/dev-libs/libpcre2-10.43_rc1
index 8e1fef190f63..ee6f059b521a 100644
--- a/metadata/md5-cache/dev-libs/libpcre2-10.43_rc1
+++ b/metadata/md5-cache/dev-libs/libpcre2-10.43_rc1
@@ -4,12 +4,12 @@ DEPEND=bzip2? ( app-arch/bzip2 ) libedit? ( dev-libs/libedit ) readline? ( sys-l
 DESCRIPTION=Perl-compatible regular expression library
 EAPI=7
 HOMEPAGE=https://www.pcre.org/
-INHERIT=libtool multilib-minimal usr-ldscript verify-sig
-IUSE=bzip2 +jit libedit +pcre16 +pcre32 +readline static-libs unicode valgrind 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 split-usr verify-sig
+INHERIT=libtool multilib-minimal verify-sig
+IUSE=bzip2 +jit libedit +pcre16 +pcre32 +readline static-libs unicode valgrind 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 verify-sig
 LICENSE=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:= ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=?? ( libedit readline )
 SLOT=0/3
 SRC_URI=https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.43-RC1/pcre2-10.43-RC1.tar.bz2 https://ftp.pcre.org/pub/pcre/pcre2-10.43-RC1.tar.bz2 verify-sig? ( https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.43-RC1/pcre2-10.43-RC1.tar.bz2.sig )
-_eclasses_=libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=153042611af6e792d747558648d2e69a
+_eclasses_=libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_md5_=2f4f6d222fcd9e094c2e38eacef2fccd
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 7f88d8434b83..c2ec9f4858d3 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.12-r2 b/metadata/md5-cache/dev-qt/qtcore-5.15.12-r2
index e8060a248130..7a460a673aae 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.12-r2
+++ b/metadata/md5-cache/dev-qt/qtcore-5.15.12-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=linux-info flag-o-matic toolchain-funcs qt5-build
 IUSE=icu old-kernel debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) !<dev-qt/designer-5.15.12:5 !<dev-qt/qt3d-5.15.12:5 !<dev-qt/qtbluetooth-5.15.12:5 !<dev-qt/qtcharts-5.15.12:5 !<dev-qt/qtconcurrent-5.15.12:5 !<dev-qt/qtdatavis3d-5.15.12:5 !<dev-qt/qtdbus-5.15.12:5 !<dev-qt/qtdeclarative-5.15.12:5 !<dev-qt/qtgamepad-5.15.12:5 !<dev-qt/qtgraphicaleffects-5.15.12:5 !<dev-qt/qtgui-5.15.12:5 !<dev-qt/qthelp-5.15.12:5 !<dev-qt/qtimageformats-5.15.12:5 !<dev-qt/qtlocation-5.15.12:5 !<dev-qt/qtmultimedia-5.15.12:5 !<dev-qt/qtnetwork-5.15.12:5 !<dev-qt/qtnetworkauth-5.15.12:5 !<dev-qt/qtopengl-5.15.12:5 !<dev-qt/qtpositioning-5.15.12:5 !<dev-qt/qtprintsupport-5.15.12:5 !<dev-qt/qtquickcontrols-5.15.12:5 !<dev-qt/qtquickcontrols2-5.15.12:5 !<dev-qt/qtquicktimeline-5.15.12:5 !<dev-qt/qtscript-5.15.12:5 !<dev-qt/qtscxml-5.15.12:5 !<dev-qt/qtsensors-5.15.12:5 !<dev-qt/qtserialbus-5.15.12:5 !<dev-qt/qtserialport-5.15.12:5 !<dev-qt/qtspeech-5.15.12:5 !<dev-qt/qtsql-5.15.12:5 !<dev-qt/qtsvg-5.15.12:5 !<dev-qt/qttest-5.15.12:5 !<dev-qt/qtvirtualkeyboard-5.15.12:5 !<dev-qt/qtwayland-5.15.12:5 !<dev-qt/qtwebchannel-5.15.12:5 !<dev-qt/qtwebengine-5.15.12:5 !<dev-qt/qtwebsockets-5.15.12:5 !<dev-qt/qtwebview-5.15.12:5 !<dev-qt/qtwidgets-5.15.12:5 !<dev-qt/qtx11extras-5.15.12:5 !<dev-qt/qtxml-5.15.12:5 !<dev-qt/qtxmlpatterns-5.15.12:5
 RESTRICT=test
 SLOT=5/5.15.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.12/submodules/qtbase-everywhere-opensource-src-5.15.12.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.12-gentoo-kde-3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-5.tar.xz
 _eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	b2b07efa51009704f88173b2c7feab47	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	c161db79c008040ab24e2978c6c077af	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5
-_md5_=482fc1e46940d6ed92b1f88d95e0b7c3
+_md5_=a55ea97e9ab2a703b9dcc26238081860
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.12-r1 b/metadata/md5-cache/dev-qt/qtgui-5.15.12-r1
index 033987fedb75..35702c628a5f 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.12-r1
+++ b/metadata/md5-cache/dev-qt/qtgui-5.15.12-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=accessibility dbus egl eglfs evdev gles2-only ibus jpeg +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( =dev-qt/qtwayland-5.15.12* )
 RDEPEND=dev-libs/glib:2 =dev-qt/qtcore-5.15.12*:5= dev-util/gtk-update-icon-cache media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= sys-libs/zlib:= accessibility? ( app-accessibility/at-spi2-core:2 ) dbus? ( =dev-qt/qtdbus-5.15.12* ) eglfs? ( media-libs/mesa[gbm(+)] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) jpeg? ( media-libs/libjpeg-turbo:= ) gles2-only? ( media-libs/libglvnd ) !gles2-only? ( media-libs/libglvnd[X] ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( =dev-qt/qtnetwork-5.15.12* ) udev? ( virtual/libudev:= ) vnc? ( =dev-qt/qtnetwork-5.15.12* ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=5/5.15.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.12/submodules/qtbase-everywhere-opensource-src-5.15.12.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.12-gentoo-kde-3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-5.tar.xz
 _eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	b2b07efa51009704f88173b2c7feab47	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	c161db79c008040ab24e2978c6c077af	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5
-_md5_=716727b9bffa48d108fe9208549c6ac0
+_md5_=539efc8f13c182629655b8567584ae51
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.12-r1 b/metadata/md5-cache/dev-qt/qtwayland-5.15.12-r1
index aada6bd37122..9b03825101c9 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.15.12-r1
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.15.12-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtwayland https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=compositor vulkan debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.12*:5= =dev-qt/qtgui-5.15.12*:5=[egl,libinput,vulkan=] media-libs/libglvnd x11-libs/libxkbcommon compositor? ( =dev-qt/qtdeclarative-5.15.12*:5= )
 RESTRICT=test
 SLOT=5/5.15.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.12/submodules/qtwayland-everywhere-opensource-src-5.15.12.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwayland-5.15.12-gentoo-kde-1.tar.xz
 _eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	b2b07efa51009704f88173b2c7feab47	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	c161db79c008040ab24e2978c6c077af	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5
-_md5_=4da57fa29285759fa1067fd325a76be0
+_md5_=cd85d871d1d7a526cfb9637697773c35
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.12-r1 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.12-r1
index 4b51968bbdd0..63f7389a83d6 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.15.12-r1
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.15.12-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=dbus gles2-only gtk +png +X debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.12*:5= =dev-qt/qtgui-5.15.12*:5=[gles2-only=,png=,X?] dbus? ( =dev-qt/qtdbus-5.15.12* ) gtk? ( dev-libs/glib:2 =dev-qt/qtgui-5.15.12*:5=[dbus] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango )
 REQUIRED_USE=gtk? ( dbus )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.12/submodules/qtbase-everywhere-opensource-src-5.15.12.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.12-gentoo-kde-3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-5.tar.xz
 _eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	b2b07efa51009704f88173b2c7feab47	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	c161db79c008040ab24e2978c6c077af	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5
-_md5_=99eca746adb7b57a6670fca1810b4246
+_md5_=ba74670b945d61b84b8de95b55f73037
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index da26e1c96ada..f06694737e63 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/iptables-1.8.9-r1 b/metadata/md5-cache/net-firewall/iptables-1.8.9-r2
index 593fc46770fc..8721e9f20421 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.8.9-r1
+++ b/metadata/md5-cache/net-firewall/iptables-1.8.9-r2
@@ -5,8 +5,8 @@ DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
 EAPI=8
 HOMEPAGE=https://www.netfilter.org/projects/iptables/
 IDEPEND=>=app-eselect/eselect-iptables-20220320
-INHERIT=systemd toolchain-funcs autotools flag-o-matic usr-ldscript
-IUSE=conntrack netlink nftables pcap static-libs test split-usr
+INHERIT=systemd toolchain-funcs autotools flag-o-matic
+IUSE=conntrack netlink nftables pcap static-libs test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) netlink? ( net-libs/libnfnetlink ) nftables? ( >=net-libs/libmnl-1.0:= >=net-libs/libnftnl-1.1.6:= ) pcap? ( net-libs/libpcap ) nftables? ( net-misc/ethertypes ) !<net-firewall/ebtables-2.0.11-r1 !<net-firewall/arptables-0.0.5-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=test? ( conntrack nftables )
 RESTRICT=!test? ( test )
 SLOT=0/1.8.3
 SRC_URI=https://www.netfilter.org/projects/iptables/files/iptables-1.8.9.tar.xz
-_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	b2b07efa51009704f88173b2c7feab47	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9
-_md5_=cb9e43409ee7ee07413986c6844fbe00
+_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	b2b07efa51009704f88173b2c7feab47	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=05065e0cce5e61329933de6504848116
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 645c569622f6..f9a85b6b8dd2 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/dhcpcd-10.0.6-r1 b/metadata/md5-cache/net-misc/dhcpcd-10.0.6-r1
index 06cbc7657e88..c0c3a4f51dca 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-10.0.6-r1
+++ b/metadata/md5-cache/net-misc/dhcpcd-10.0.6-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/
 INHERIT=systemd toolchain-funcs
 IUSE=debug +embedded ipv6 privsep +udev
-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=BSD-2 BSD ISC MIT
 RDEPEND=udev? ( virtual/udev ) privsep? ( acct-group/dhcpcd acct-user/dhcpcd )
 SLOT=0
 SRC_URI=https://github.com/NetworkConfiguration/dhcpcd/releases/download/v10.0.6/dhcpcd-10.0.6.tar.xz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=95ddd4ba1151e098158b7b36007bf8f5
+_md5_=057e3aaf6eb4c20c77b11c225a23daa0
diff --git a/metadata/md5-cache/net-misc/openssh-contrib-9.3_p1 b/metadata/md5-cache/net-misc/openssh-contrib-9.3_p1
deleted file mode 100644
index e1773b5e9971..000000000000
--- a/metadata/md5-cache/net-misc/openssh-contrib-9.3_p1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-build/autoconf virtual/pkgconfig || ( >=sys-devel/gcc-config-2.6 >=sys-devel/clang-toolchain-symlinks-14-r1:14 >=sys-devel/clang-toolchain-symlinks-15-r1:15 >=sys-devel/clang-toolchain-symlinks-16-r1:* ) verify-sig? ( sec-keys/openpgp-keys-openssh ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=configure install postinst preinst prepare pretend test unpack
-DEPEND=!net-misc/openssh acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0= ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) virtual/os-headers kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) static? ( audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] ) virtual/libcrypt:=[static-libs(+)] >=sys-libs/zlib-1.2.3:=[static-libs(+)] )
-DESCRIPTION=Port of OpenBSD's free SSH release with HPN/SCTP/X509 patches
-EAPI=8
-HOMEPAGE=https://www.openssh.com/
-INHERIT=user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
-IUSE=abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss verify-sig
-LICENSE=BSD GPL-2
-RDEPEND=!net-misc/openssh acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0= ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) pam? ( >=sys-auth/pambase-20081028 ) !prefix? ( sys-apps/shadow ) X? ( x11-apps/xauth )
-REQUIRED_USE=hpn? ( ssl ) ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !sctp ssl !xmss ) xmss? ( ssl ) test? ( ssl ) test? ( !xmss )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-9.3p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.3p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-AES-CTR-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-PeakTput-15.2.diff https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.3_p1-hpn-15.2-glue.patch.xz ) X509? ( https://roumenpetrov.info/openssh/x509-14.1.1/openssh-9.3p1+x509-14.1.1.diff.gz https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.3_p1-X509-glue-14.1.1.patch.xz hpn? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.3_p1-hpn-15.2-X509-14.1.1-glue.patch.xz ) ) verify-sig? ( mirror://openbsd/OpenSSH/portable/openssh-9.3p1.tar.gz.asc )
-_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	b2b07efa51009704f88173b2c7feab47	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	b56d0c9c20fc5b553f13c8ae165a10a5	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=b797c93f8e02ea631b77d6b0b6c73720
diff --git a/metadata/md5-cache/net-misc/openssh-contrib-9.4_p1-r1 b/metadata/md5-cache/net-misc/openssh-contrib-9.4_p1-r1
deleted file mode 100644
index bd81b1e158ef..000000000000
--- a/metadata/md5-cache/net-misc/openssh-contrib-9.4_p1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-build/autoconf virtual/pkgconfig || ( >=sys-devel/gcc-config-2.6 >=sys-devel/clang-toolchain-symlinks-14-r1:14 >=sys-devel/clang-toolchain-symlinks-15-r1:15 >=sys-devel/clang-toolchain-symlinks-16-r1:* ) verify-sig? ( sec-keys/openpgp-keys-openssh ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=configure install postinst preinst prepare pretend test unpack
-DEPEND=!net-misc/openssh acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:= ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0= ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) virtual/os-headers kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) static? ( audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] ) virtual/libcrypt:=[static-libs(+)] >=sys-libs/zlib-1.2.3:=[static-libs(+)] )
-DESCRIPTION=Port of OpenBSD's free SSH release with HPN/X509 patches
-EAPI=8
-HOMEPAGE=https://www.openssh.com/
-INHERIT=user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
-IUSE=abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test X X509 xmss verify-sig
-KEYWORDS=~amd64
-LICENSE=BSD GPL-2
-RDEPEND=!net-misc/openssh acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:= ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0= ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) pam? ( >=sys-auth/pambase-20081028 ) !prefix? ( sys-apps/shadow ) X? ( x11-apps/xauth )
-REQUIRED_USE=hpn? ( ssl ) ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( ssl !xmss ) xmss? ( ssl ) test? ( ssl ) test? ( !xmss )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-9.4p1.tar.gz hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-PeakTput-15.2.diff https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.3_p2-hpn-15.2-glue.patch.xz ) X509? ( https://roumenpetrov.info/openssh/x509-14.2.1/openssh-9.4p1+x509-14.2.1.diff.gz https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.4_p1-X509-glue-14.2.1.patch.xz hpn? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.4_p1-hpn-15.2-X509-14.2-glue.patch.xz ) ) verify-sig? ( mirror://openbsd/OpenSSH/portable/openssh-9.4p1.tar.gz.asc )
-_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	b2b07efa51009704f88173b2c7feab47	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	b56d0c9c20fc5b553f13c8ae165a10a5	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=6bef9e47118b4ebd0813835b770efd05
diff --git a/metadata/md5-cache/net-misc/openssh-contrib-9.3_p2 b/metadata/md5-cache/net-misc/openssh-contrib-9.6_p1
index 9dbc43bc6f53..c5ee48c81964 100644
--- a/metadata/md5-cache/net-misc/openssh-contrib-9.3_p2
+++ b/metadata/md5-cache/net-misc/openssh-contrib-9.6_p1
@@ -1,4 +1,4 @@
-BDEPEND=dev-build/autoconf virtual/pkgconfig || ( >=sys-devel/gcc-config-2.6 >=sys-devel/clang-toolchain-symlinks-14-r1:14 >=sys-devel/clang-toolchain-symlinks-15-r1:15 >=sys-devel/clang-toolchain-symlinks-16-r1:* ) verify-sig? ( sec-keys/openpgp-keys-openssh ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
+BDEPEND=dev-build/autoconf virtual/pkgconfig || ( >=sys-devel/gcc-config-2.6 >=sys-devel/clang-toolchain-symlinks-16-r1:* >=sys-devel/clang-toolchain-symlinks-15-r1:15 ) verify-sig? ( sec-keys/openpgp-keys-openssh ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
 DEFINED_PHASES=configure install postinst preinst prepare pretend test unpack
 DEPEND=!net-misc/openssh acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:= ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0= ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) virtual/os-headers kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) static? ( audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] ) virtual/libcrypt:=[static-libs(+)] >=sys-libs/zlib-1.2.3:=[static-libs(+)] )
 DESCRIPTION=Port of OpenBSD's free SSH release with HPN/X509 patches
@@ -12,6 +12,6 @@ RDEPEND=!net-misc/openssh acct-group/sshd acct-user/sshd !static? ( audit? ( sys
 REQUIRED_USE=hpn? ( ssl ) ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( ssl !xmss ) xmss? ( ssl ) test? ( ssl ) test? ( !xmss )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-9.3p2.tar.gz hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-PeakTput-15.2.diff https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.3_p2-hpn-15.2-glue.patch.xz ) X509? ( https://roumenpetrov.info/openssh/x509-14.1.1/openssh-9.3p1+x509-14.1.1.diff.gz https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.3_p2-X509-glue-14.1.1.patch.xz hpn? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.3_p2-hpn-15.2-X509-14.1.1-glue.patch.xz ) ) verify-sig? ( mirror://openbsd/OpenSSH/portable/openssh-9.3p2.tar.gz.asc )
+SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-9.6p1.tar.gz hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-PeakTput-15.2.diff https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.6_p1-hpn-15.2-glue.patch.xz ) X509? ( https://roumenpetrov.info/openssh/x509-14.4.2/openssh-9.6p1+x509-14.4.2.diff.gz https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.6_p1-X509-glue-14.4.2.patch.xz hpn? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.6_p1-hpn-15.2-X509-14.4.2-glue.patch.xz ) ) verify-sig? ( mirror://openbsd/OpenSSH/portable/openssh-9.6p1.tar.gz.asc )
 _eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	b2b07efa51009704f88173b2c7feab47	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	b56d0c9c20fc5b553f13c8ae165a10a5	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=b309ac494401f2c2a340eb32c8e03efd
+_md5_=ab16ad57b5aefd5ee67fd8c9262ffd78
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 23d711816087..0210777d2fd3 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/lapack-3.12.0 b/metadata/md5-cache/sci-libs/lapack-3.12.0
index ae8dd14a8c11..e0036bf93f70 100644
--- a/metadata/md5-cache/sci-libs/lapack-3.12.0
+++ b/metadata/md5-cache/sci-libs/lapack-3.12.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.netlib.org/lapack/
 INHERIT=cmake fortran-2 python-any-r1
 IUSE=lapacke deprecated doc eselect-ldso test
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=!app-eselect/eselect-cblas virtual/fortran eselect-ldso? ( >=app-eselect/eselect-blas-0.2 >=app-eselect/eselect-lapack-0.2 ) doc? ( app-doc/blas-docs ) virtual/fortran
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Reference-LAPACK/lapack/archive/v3.12.0.tar.gz -> lapack-3.12.0.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	b2b07efa51009704f88173b2c7feab47	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8700ed95bda4ca996b4b91d90c6ac74e
+_md5_=b3fc7a4e155b8febd3e82c13b78c7400
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index d2d208a8025e..44e5ed24dd67 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/acl-2.3.2 b/metadata/md5-cache/sys-apps/acl-2.3.2-r1
index 9006ffc6b5f8..6bbeb419ed44 100644
--- a/metadata/md5-cache/sys-apps/acl-2.3.2
+++ b/metadata/md5-cache/sys-apps/acl-2.3.2-r1
@@ -4,12 +4,12 @@ DEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 DESCRIPTION=Access control list utilities, libraries, and headers
 EAPI=8
 HOMEPAGE=https://savannah.nongnu.org/projects/acl
-INHERIT=flag-o-matic libtool multilib-minimal usr-ldscript
-IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+INHERIT=flag-o-matic libtool multilib-minimal
+IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+ GPL-2
 RDEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=mirror://nongnu/acl/acl-2.3.2.tar.xz
-_eclasses_=flag-o-matic	b2b07efa51009704f88173b2c7feab47	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9
-_md5_=22563bd40438d4c2eff2df5dc254cdc4
+_eclasses_=flag-o-matic	b2b07efa51009704f88173b2c7feab47	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=5bb5cbc716fb5a8721c652fc085a09cc
diff --git a/metadata/md5-cache/sys-apps/attr-2.5.2 b/metadata/md5-cache/sys-apps/attr-2.5.2-r1
index 9682fdc8708a..f94af02a37d2 100644
--- a/metadata/md5-cache/sys-apps/attr-2.5.2
+++ b/metadata/md5-cache/sys-apps/attr-2.5.2-r1
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Extended attributes tools
 EAPI=8
 HOMEPAGE=https://savannah.nongnu.org/projects/attr
-INHERIT=multilib-minimal usr-ldscript libtool
-IUSE=debug nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+INHERIT=multilib-minimal libtool
+IUSE=debug nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=mirror://nongnu/attr/attr-2.5.2.tar.xz
-_eclasses_=libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9
-_md5_=82c61323e6a0742ba55fa3b0df0185f1
+_eclasses_=libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=3bcfb5f094122aeec38f127f57cb1036
diff --git a/metadata/md5-cache/sys-apps/attr-9999 b/metadata/md5-cache/sys-apps/attr-9999
index 214b14f52a0c..779883ea83a1 100644
--- a/metadata/md5-cache/sys-apps/attr-9999
+++ b/metadata/md5-cache/sys-apps/attr-9999
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Extended attributes tools
 EAPI=8
 HOMEPAGE=https://savannah.nongnu.org/projects/attr
-INHERIT=multilib-minimal usr-ldscript autotools git-r3
-IUSE=debug nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+INHERIT=multilib-minimal autotools git-r3
+IUSE=debug nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=LGPL-2.1+
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9
-_md5_=82c61323e6a0742ba55fa3b0df0185f1
+_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=3bcfb5f094122aeec38f127f57cb1036
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-254.9 b/metadata/md5-cache/sys-apps/systemd-utils-254.9-r1
index 08a1fe5dc9a2..be0aec48ce25 100644
--- a/metadata/md5-cache/sys-apps/systemd-utils-254.9
+++ b/metadata/md5-cache/sys-apps/systemd-utils-254.9-r1
@@ -4,8 +4,8 @@ DEPEND=elibc_musl? ( >=sys-libs/musl-1.2.3 ) selinux? ( sys-libs/libselinux:0= )
 DESCRIPTION=Utilities split out from systemd for OpenRC users
 EAPI=8
 HOMEPAGE=https://systemd.io/
-INHERIT=bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature python-single-r1 secureboot toolchain-funcs udev usr-ldscript
-IUSE=+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 secureboot split-usr
+INHERIT=bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature python-single-r1 secureboot toolchain-funcs udev
+IUSE=+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 secureboot
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=udev? ( >=sys-fs/udev-init-scripts-34 )
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( kernel-install tmpfiles sysusers udev ) boot? ( kernel-install
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v254.9.tar.gz -> systemd-stable-254.9.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-254.3.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	b2b07efa51009704f88173b2c7feab47	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	meson	e322276188f86eacb29ae081ba5485c8	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	042f4cc53680245bf99a84669b94155a	secureboot	4911adb593665638c76fbd4e70d451ac	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9
-_md5_=e66532495ff8253d1e2a41f841819de8
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	b2b07efa51009704f88173b2c7feab47	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	meson	e322276188f86eacb29ae081ba5485c8	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	042f4cc53680245bf99a84669b94155a	secureboot	4911adb593665638c76fbd4e70d451ac	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=0baf3ab9484a9abc307c212f4f059ef4
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.39.3-r1 b/metadata/md5-cache/sys-apps/util-linux-2.39.3-r2
index 62816e0557fa..ce0b258c919f 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.39.3-r1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.39.3-r2
@@ -4,8 +4,8 @@ DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/
 DESCRIPTION=Various useful Linux utilities
 EAPI=8
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux
-INHERIT=toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript pam python-r1 multilib-minimal multiprocessing systemd verify-sig
-IUSE=audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode split-usr python_targets_python3_10 python_targets_python3_11 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
+INHERIT=toolchain-funcs libtool flag-o-matic bash-completion-r1 pam python-r1 multilib-minimal multiprocessing systemd verify-sig
+IUSE=audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode python_targets_python3_10 python_targets_python3_11 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 ~arm64-macos
 LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) ) readline? ( sys-libs/readline:0= ) rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) udev? ( virtual/libudev:= ) ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/util-linux/v2.39/util-linux-2.39.3.tar.xz verify-sig? ( https://www.kernel.org/pub/linux/utils/util-linux/v2.39/util-linux-2.39.3.tar.sign )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	b2b07efa51009704f88173b2c7feab47	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=0ad735cc5ba8e61a426775011bb7c95a
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	b2b07efa51009704f88173b2c7feab47	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_md5_=16dc2743f4dd0cceeb9790a2ef6859a9
diff --git a/metadata/md5-cache/sys-apps/util-linux-9999 b/metadata/md5-cache/sys-apps/util-linux-9999
index 7fa3cd2effdd..4f0375a29410 100644
--- a/metadata/md5-cache/sys-apps/util-linux-9999
+++ b/metadata/md5-cache/sys-apps/util-linux-9999
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig nls? ( app-text/po4a sys-devel/gettext ) test? ( app-alternatives/bc ) dev-ruby/asciidoctor >=app-portage/elt-patches-20170815 virtual/pkgconfig sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
-DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) ) readline? ( sys-libs/readline:0= ) rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/os-headers acct-group/root
+DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) ) readline? ( sys-libs/readline:0= ) rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) udev? ( virtual/libudev:= ) ) virtual/os-headers acct-group/root
 DESCRIPTION=Various useful Linux utilities
 EAPI=8
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux
-INHERIT=toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript pam python-r1 multilib-minimal multiprocessing systemd autotools git-r3
-IUSE=audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode split-usr python_targets_python3_10 python_targets_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+INHERIT=toolchain-funcs libtool flag-o-matic bash-completion-r1 pam python-r1 multilib-minimal multiprocessing systemd autotools git-r3
+IUSE=audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode python_targets_python3_10 python_targets_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 PROPERTIES=live
-RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) ) readline? ( sys-libs/readline:0= ) rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill
+RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) ) readline? ( sys-libs/readline:0= ) rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) udev? ( virtual/libudev:= ) ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill
 REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) su? ( pam )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	b2b07efa51009704f88173b2c7feab47	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9
-_md5_=d772037ef962f1a226a9466a77d3750b
+_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	b2b07efa51009704f88173b2c7feab47	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=3473f8e7497c7ded63c4841626733083
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 292b66796320..771bcee16767 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
diff --git a/metadata/md5-cache/sys-boot/grub-2.12-r1 b/metadata/md5-cache/sys-boot/grub-2.12-r1
index dd62d3ba5898..6606c7e82231 100644
--- a/metadata/md5-cache/sys-boot/grub-2.12-r1
+++ b/metadata/md5-cache/sys-boot/grub-2.12-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/grub/
 INHERIT=bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs verify-sig
 IUSE=device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs grub_platforms_coreboot grub_platforms_efi-32 grub_platforms_efi-64 grub_platforms_emu grub_platforms_ieee1275 grub_platforms_loongson grub_platforms_multiboot grub_platforms_qemu grub_platforms_qemu-mips grub_platforms_pc grub_platforms_uboot grub_platforms_xen grub_platforms_xen-32 grub_platforms_xen-pvh verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )
 RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl2 ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:3 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) ) !sys-boot/grub:0 nls? ( sys-devel/gettext )
 REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) grub_platforms_ieee1275? ( fonts ) grub_platforms_loongson? ( fonts )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=2/2.12-r1
 SRC_URI=mirror://gnu/grub/grub-2.12.tar.xz verify-sig? ( mirror://gnu/grub/grub-2.12.tar.xz.sig ) fonts? ( mirror://gnu/unifont/unifont-15.0.06/unifont-15.0.06.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	b2b07efa51009704f88173b2c7feab47	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=ae01563ed13548b77443b1295349a0cd
+_md5_=d5c5489ec17e9f1dd4b70bb84fed3a40
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index efff954b3815..4d842c6e9a4d 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/libcap-2.69-r1 b/metadata/md5-cache/sys-libs/libcap-2.69-r1
new file mode 100644
index 000000000000..97a4215fa661
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcap-2.69-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/diffutils tools? ( dev-lang/go )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=pam? ( sys-libs/pam[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-kernel/linux-headers
+DESCRIPTION=POSIX 1003.1e capabilities
+EAPI=8
+HOMEPAGE=https://sites.google.com/site/fullycapable/
+INHERIT=multilib-minimal toolchain-funcs pam
+IUSE=pam static-libs 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2 BSD )
+PDEPEND=pam? ( sys-libs/pam[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.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.69.tar.xz
+_eclasses_=flag-o-matic	b2b07efa51009704f88173b2c7feab47	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	b56d0c9c20fc5b553f13c8ae165a10a5	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=50d784acaa11a2f722afa609c1a45528
diff --git a/metadata/md5-cache/sys-libs/pam-1.5.3-r1 b/metadata/md5-cache/sys-libs/pam-1.5.3-r1
new file mode 100644
index 000000000000..664661ad3655
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/pam-1.5.3-r1
@@ -0,0 +1,17 @@
+BDEPEND=app-alternatives/yacc dev-libs/libxslt app-alternatives/lex sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=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(-)?] >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( >=sys-process/audit-2.2.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(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nis? ( net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libtirpc-0.2.4-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Linux-PAM (Pluggable Authentication Modules)
+EAPI=8
+HOMEPAGE=https://github.com/linux-pam/linux-pam
+IDEPEND=filecaps? ( sys-libs/libcap )
+INHERIT=db-use fcaps flag-o-matic toolchain-funcs multilib-minimal
+IUSE=audit berkdb debug nis selinux +filecaps 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
+LICENSE=|| ( BSD GPL-2 )
+PDEPEND=>=sys-auth/pambase-20200616
+RDEPEND=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(-)?] >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( >=sys-process/audit-2.2.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(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nis? ( net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libtirpc-0.2.4-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=https://github.com/linux-pam/linux-pam/releases/download/v1.5.3/Linux-PAM-1.5.3.tar.xz https://github.com/linux-pam/linux-pam/releases/download/v1.5.3/Linux-PAM-1.5.3-docs.tar.xz
+_eclasses_=db-use	3807d3e43e20aaa6e4decedd2bb2db4c	fcaps	c0a086b957a1b183a8d136eabf02f191	flag-o-matic	b2b07efa51009704f88173b2c7feab47	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=58757fbbb0971b212d2586f5f3a85330
diff --git a/metadata/md5-cache/sys-libs/pam_wrapper-1.1.4-r3 b/metadata/md5-cache/sys-libs/pam_wrapper-1.1.4-r3
new file mode 100644
index 000000000000..333f8fb9631e
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/pam_wrapper-1.1.4-r3
@@ -0,0 +1,17 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=sys-libs/pam-1.5.3-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( dev-util/cmocka[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 tool to test PAM applications and PAM modules
+EAPI=8
+HOMEPAGE=https://cwrap.org/pam_wrapper.html
+INHERIT=cmake-multilib python-r1
+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 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=sys-libs/pam-1.5.3-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.samba.org/ftp/pub/cwrap/pam_wrapper-1.1.4.tar.gz https://ftp.samba.org/pub/cwrap/pam_wrapper-1.1.4.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	b2b07efa51009704f88173b2c7feab47	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=e6b66f33a2bf92e47ae15bae6d31a87b
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2023d b/metadata/md5-cache/sys-libs/timezone-data-2023d
index 87ba19bcafdc..ea13584d112e 100644
--- a/metadata/md5-cache/sys-libs/timezone-data-2023d
+++ b/metadata/md5-cache/sys-libs/timezone-data-2023d
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.iana.org/time-zones
 INHERIT=toolchain-funcs flag-o-matic
 IUSE=nls leaps-timezone zic-slim
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD public-domain
 RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
 SLOT=0
 SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2023d.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2023d.tar.gz
 _eclasses_=flag-o-matic	b2b07efa51009704f88173b2c7feab47	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=edabb0ba3c3209698c810d174036cb0e
+_md5_=6ede773e8358ff16b8666178386e7a11
diff --git a/metadata/md5-cache/sys-libs/zlib-1.3-r3 b/metadata/md5-cache/sys-libs/zlib-1.3-r4
index 5796b9c5e58b..73abb576065e 100644
--- a/metadata/md5-cache/sys-libs/zlib-1.3-r3
+++ b/metadata/md5-cache/sys-libs/zlib-1.3-r4
@@ -4,12 +4,12 @@ DEPEND=!sys-libs/zlib-ng[compat]
 DESCRIPTION=Standard (de)compression library
 EAPI=8
 HOMEPAGE=https://zlib.net/
-INHERIT=autotools edo multilib-minimal flag-o-matic usr-ldscript verify-sig
-IUSE=minizip static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
+INHERIT=autotools edo multilib-minimal flag-o-matic verify-sig
+IUSE=minizip static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=ZLIB
 RDEPEND=!sys-libs/zlib-ng[compat]
 SLOT=0/1
 SRC_URI=https://zlib.net/zlib-1.3.tar.xz https://zlib.net/fossils/zlib-1.3.tar.xz https://zlib.net/current/beta/zlib-1.3.tar.xz https://github.com/madler/zlib/releases/download/v1.3/zlib-1.3.tar.xz verify-sig? ( https://zlib.net/zlib-1.3.tar.xz.asc https://github.com/madler/zlib/releases/download/v1.3/zlib-1.3.tar.xz.asc )
-_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	b2b07efa51009704f88173b2c7feab47	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=07c18586f26de04f987b8860e2d73696
+_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	b2b07efa51009704f88173b2c7feab47	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_md5_=261f61fb0de7401c3642f6963f7c2692
diff --git a/metadata/md5-cache/sys-libs/zlib-1.3.1 b/metadata/md5-cache/sys-libs/zlib-1.3.1-r1
index 773ab280c08a..c0bcbfca182a 100644
--- a/metadata/md5-cache/sys-libs/zlib-1.3.1
+++ b/metadata/md5-cache/sys-libs/zlib-1.3.1-r1
@@ -4,12 +4,12 @@ DEPEND=!sys-libs/zlib-ng[compat]
 DESCRIPTION=Standard (de)compression library
 EAPI=8
 HOMEPAGE=https://zlib.net/
-INHERIT=autotools edo multilib-minimal flag-o-matic usr-ldscript verify-sig
-IUSE=minizip static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
+INHERIT=autotools edo multilib-minimal flag-o-matic verify-sig
+IUSE=minizip static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=ZLIB
 RDEPEND=!sys-libs/zlib-ng[compat]
 SLOT=0/1
 SRC_URI=https://zlib.net/zlib-1.3.1.tar.xz https://zlib.net/fossils/zlib-1.3.1.tar.xz https://zlib.net/current/beta/zlib-1.3.1.tar.xz https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.xz verify-sig? ( https://zlib.net/zlib-1.3.1.tar.xz.asc https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.xz.asc )
-_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	b2b07efa51009704f88173b2c7feab47	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=d5c82a9a2cd2f736a13c9ad5c19c16ef
+_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	b2b07efa51009704f88173b2c7feab47	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_md5_=d7fa94b961a8756e377012ed3685f6c6
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 19d077528a56..bf7a4a4fce48 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-525.147.05 b/metadata/md5-cache/x11-drivers/nvidia-drivers-525.147.05
index 602da1cf83bb..7a7ad9a52077 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-525.147.05
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-525.147.05
@@ -6,12 +6,12 @@ EAPI=8
 HOMEPAGE=https://www.nvidia.com/download/index.aspx
 IDEPEND=modules? ( sys-apps/kmod[tools] )
 INHERIT=desktop flag-o-matic linux-mod-r1 multilib readme.gentoo-r1 systemd toolchain-funcs unpacker user-info
-IUSE=+X abi_x86_32 abi_x86_64 kernel-open persistenced +static-libs +tools wayland dist-kernel modules-compress modules-sign +strip +modules
+IUSE=+X abi_x86_32 abi_x86_64 kernel-open persistenced powerd +static-libs +tools wayland dist-kernel modules-compress modules-sign +strip +modules
 KEYWORDS=-* amd64 ~arm64
 LICENSE=NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
-RDEPEND=acct-group/video X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) sys-libs/glibc X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 media-libs/libglvnd ) modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+RDEPEND=acct-group/video X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) sys-libs/glibc X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) powerd? ( sys-apps/dbus[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 media-libs/libglvnd ) modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 REQUIRED_USE=kernel-open? ( modules )
 SLOT=0/525
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/525.147.05/NVIDIA-Linux-x86_64-525.147.05.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/525.147.05/NVIDIA-Linux-aarch64-525.147.05.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-525.147.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-525.147.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-525.147.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-525.147.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-525.147.05.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-525.147.05.tar.xz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	b2b07efa51009704f88173b2c7feab47	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	137b318f89f77c2b66124fcc7790737a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f634537652dbc568e1512155c5d71ee3
+_md5_=75aed78f83c850edd6bdef93c97dd2ba
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-535.146.02 b/metadata/md5-cache/x11-drivers/nvidia-drivers-535.146.02
index 42502f119c31..732564d1e372 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-535.146.02
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-535.146.02
@@ -6,12 +6,12 @@ EAPI=8
 HOMEPAGE=https://www.nvidia.com/download/index.aspx
 IDEPEND=modules? ( sys-apps/kmod[tools] )
 INHERIT=desktop flag-o-matic linux-mod-r1 multilib readme.gentoo-r1 systemd toolchain-funcs unpacker user-info
-IUSE=+X abi_x86_32 abi_x86_64 kernel-open persistenced +static-libs +tools wayland dist-kernel modules-compress modules-sign +strip +modules
+IUSE=+X abi_x86_32 abi_x86_64 kernel-open persistenced powerd +static-libs +tools wayland dist-kernel modules-compress modules-sign +strip +modules
 KEYWORDS=-* amd64 ~arm64
 LICENSE=NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
-RDEPEND=acct-group/video X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) dev-libs/openssl:0/3 sys-libs/glibc X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 media-libs/libglvnd ) modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+RDEPEND=acct-group/video X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) dev-libs/openssl:0/3 sys-libs/glibc X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) powerd? ( sys-apps/dbus[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 media-libs/libglvnd ) modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 REQUIRED_USE=kernel-open? ( modules )
 SLOT=0/535
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/535.146.02/NVIDIA-Linux-x86_64-535.146.02.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/535.146.02/NVIDIA-Linux-aarch64-535.146.02.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-535.146.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-535.146.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-535.146.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-535.146.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-535.146.02.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-535.146.02.tar.xz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	b2b07efa51009704f88173b2c7feab47	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	137b318f89f77c2b66124fcc7790737a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=51a899c6ab3a46abded0981b6efb0a26
+_md5_=3287218b59f81fb737db9c75d2b6c2ed
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-535.154.05 b/metadata/md5-cache/x11-drivers/nvidia-drivers-535.154.05
index 98ed6260578d..cf96ea2b2f40 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-535.154.05
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-535.154.05
@@ -6,12 +6,12 @@ EAPI=8
 HOMEPAGE=https://www.nvidia.com/download/index.aspx
 IDEPEND=modules? ( sys-apps/kmod[tools] )
 INHERIT=desktop flag-o-matic linux-mod-r1 multilib readme.gentoo-r1 systemd toolchain-funcs unpacker user-info
-IUSE=+X abi_x86_32 abi_x86_64 kernel-open persistenced +static-libs +tools wayland dist-kernel modules-compress modules-sign +strip +modules
+IUSE=+X abi_x86_32 abi_x86_64 kernel-open persistenced powerd +static-libs +tools wayland dist-kernel modules-compress modules-sign +strip +modules
 KEYWORDS=-* amd64 ~arm64
 LICENSE=NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
-RDEPEND=acct-group/video X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) dev-libs/openssl:0/3 sys-libs/glibc X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 media-libs/libglvnd ) modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+RDEPEND=acct-group/video X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) dev-libs/openssl:0/3 sys-libs/glibc X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) powerd? ( sys-apps/dbus[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 media-libs/libglvnd ) modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 REQUIRED_USE=kernel-open? ( modules )
 SLOT=0/535
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/535.154.05/NVIDIA-Linux-x86_64-535.154.05.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/535.154.05/NVIDIA-Linux-aarch64-535.154.05.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-535.154.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-535.154.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-535.154.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-535.154.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-535.154.05.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-535.154.05.tar.xz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	b2b07efa51009704f88173b2c7feab47	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	137b318f89f77c2b66124fcc7790737a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=51a899c6ab3a46abded0981b6efb0a26
+_md5_=3287218b59f81fb737db9c75d2b6c2ed
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-535.43.25 b/metadata/md5-cache/x11-drivers/nvidia-drivers-535.43.25
index 6e72204b6fca..caa01f64b7c4 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-535.43.25
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-535.43.25
@@ -6,12 +6,12 @@ EAPI=8
 HOMEPAGE=https://developer.nvidia.com/vulkan-driver
 IDEPEND=modules? ( sys-apps/kmod[tools] )
 INHERIT=desktop flag-o-matic linux-mod-r1 multilib readme.gentoo-r1 systemd toolchain-funcs unpacker user-info
-IUSE=+X abi_x86_32 abi_x86_64 kernel-open persistenced +static-libs +tools wayland dist-kernel modules-compress modules-sign +strip +modules
+IUSE=+X abi_x86_32 abi_x86_64 kernel-open persistenced powerd +static-libs +tools wayland dist-kernel modules-compress modules-sign +strip +modules
 KEYWORDS=-* ~amd64
 LICENSE=NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
-RDEPEND=acct-group/video sys-libs/glibc dev-libs/openssl:0/3 X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) dev-libs/openssl:0/3 sys-libs/glibc X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 media-libs/libglvnd ) modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+RDEPEND=acct-group/video sys-libs/glibc dev-libs/openssl:0/3 X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) dev-libs/openssl:0/3 sys-libs/glibc X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) powerd? ( sys-apps/dbus[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 media-libs/libglvnd ) modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 REQUIRED_USE=kernel-open? ( modules )
 SLOT=0/vulkan
 SRC_URI=https://developer.nvidia.com/downloads/vulkan-beta-5354325-linux -> NVIDIA-Linux-x86_64-535.43.25.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-535.154.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-535.154.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-535.154.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-535.154.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-535.154.05.tar.bz2 https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/535.43.25.tar.gz -> open-gpu-kernel-modules-535.43.25.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	b2b07efa51009704f88173b2c7feab47	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	137b318f89f77c2b66124fcc7790737a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=7922b46c4ba60870186308a151b9dcac
+_md5_=4c5075ab4af2dd1dffd029f479f4a9a7
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-545.29.06-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-545.29.06-r1
index 4458641da5ce..238d7cdd31aa 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-545.29.06-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-545.29.06-r1
@@ -6,12 +6,12 @@ EAPI=8
 HOMEPAGE=https://www.nvidia.com/download/index.aspx
 IDEPEND=modules? ( sys-apps/kmod[tools] )
 INHERIT=desktop flag-o-matic linux-mod-r1 readme.gentoo-r1 systemd toolchain-funcs unpacker user-info
-IUSE=+X abi_x86_32 abi_x86_64 kernel-open persistenced +static-libs +tools wayland dist-kernel modules-compress modules-sign +strip +modules
+IUSE=+X abi_x86_32 abi_x86_64 kernel-open persistenced powerd +static-libs +tools wayland dist-kernel modules-compress modules-sign +strip +modules
 KEYWORDS=-* ~amd64 ~arm64
 LICENSE=NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
-RDEPEND=acct-group/video X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) dev-libs/openssl:0/3 sys-libs/glibc X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 ) modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+RDEPEND=acct-group/video X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) dev-libs/openssl:0/3 sys-libs/glibc X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) powerd? ( sys-apps/dbus[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 ) modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 REQUIRED_USE=kernel-open? ( modules )
 SLOT=0/545
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/545.29.06/NVIDIA-Linux-x86_64-545.29.06.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/545.29.06/NVIDIA-Linux-aarch64-545.29.06.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-545.29.06.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-545.29.06.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-545.29.06.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-545.29.06.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-545.29.06.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-545.29.06.tar.xz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	b2b07efa51009704f88173b2c7feab47	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	137b318f89f77c2b66124fcc7790737a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c1bb7c10298da2a7473d822583cc2e39
+_md5_=8a54edfc993a9e228de5d4d908f8cef3
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-550.40.07 b/metadata/md5-cache/x11-drivers/nvidia-drivers-550.40.07
index 73acd0ed5b71..658936e059db 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-550.40.07
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-550.40.07
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.nvidia.com/download/index.aspx
 IDEPEND=modules? ( sys-apps/kmod[tools] )
 INHERIT=desktop flag-o-matic linux-mod-r1 readme.gentoo-r1 systemd toolchain-funcs unpacker user-info
-IUSE=+X abi_x86_32 abi_x86_64 kernel-open persistenced +static-libs +tools wayland dist-kernel modules-compress modules-sign +strip +modules
+IUSE=+X abi_x86_32 abi_x86_64 kernel-open persistenced powerd +static-libs +tools wayland dist-kernel modules-compress modules-sign +strip +modules
 LICENSE=NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
-RDEPEND=acct-group/video X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) dev-libs/openssl:0/3 sys-libs/glibc X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 ) modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+RDEPEND=acct-group/video X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) dev-libs/openssl:0/3 sys-libs/glibc X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) powerd? ( sys-apps/dbus[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 ) modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 REQUIRED_USE=kernel-open? ( modules )
 SLOT=0/550
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/550.40.07/NVIDIA-Linux-x86_64-550.40.07.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/550.40.07/NVIDIA-Linux-aarch64-550.40.07.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-550.40.07.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-550.40.07.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-550.40.07.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-550.40.07.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-550.40.07.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-550.40.07.tar.xz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	b2b07efa51009704f88173b2c7feab47	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	137b318f89f77c2b66124fcc7790737a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=c74f54d54bf185067a81e22e4a7a64d0
+_md5_=18db2879c09d67575c2db70d5a8e7b2e
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 89721610f3bc..41af5533dfa6 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 16949 BLAKE2B cd9055618af6ff68432324109d64756551b40527ab2e699814ac8b08fef4d18250818aac5f7b9c8b6a74aa7cb612b290cae2465d28a099b0b37619ab0da00cb1 SHA512 8a7243f22930fa19f34f66674d3b6e42a2495a4c873451e997039ca3b0bff79a65b4a5d6230e347829bf0a81aaf2c8acab5b0767937586273ede5d40749f4ee9
-TIMESTAMP 2024-02-06T21:10:04Z
+TIMESTAMP 2024-02-07T03:10:11Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmXCoCxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmXC9JNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB95hAAqofvWnK28deqOtPMV27PBPpfVOtVhG5VL1SEbOHspjJHHhzjuhMZAyXc
-3TnsrDK2OowvQQl/6o5s5zqkChn/u7EhAb5smIqas9qSzQXuCc3m1zsLFSKjrEA3
-y37vH5G+gFbgwvoNcGedraFBNoZwSiqwpGrjN7XTpurCUZGgIC8opaESVHCLuu4Y
-FLd7FRlGNgm76G5fCffLzdsGrp+s/B/Aqx12qTRpA/paWbfulgWo0p8yAGCYQupg
-VaUtgl2DB3PBlb6U4K56EGwJmeoBB84tmNJm6zQa7+Q3k20BFh3wypOnrRMMwWuE
-gH6g6gW4xKCERl8WJ7uHRt9ZHj96CsjSNgKPHPsHEderfP7JcBRpxM9YkxoQHknx
-CFcd97e+FKFyCTkw6H8awZ5miFCzc6uJpmHrdcJP6m2v+jdaLZwcUcU1bMoJ3nFb
-D6YXjs9oz1YE4HIKgPysjpBeDFgQ+0d8ROcDeLVIIlbSuybqf55JznD7NJNjxDFX
-/gvJBZBhxDKZRglFASgaJoE4vH2NoQ5YLgkshizhf1qrAP9n4v9QgOdAgWcAjLy1
-9jzAaW9i4czhOIDkq1Kq6tTGhMHrsQC6Us54KE1i5H1mBLMZOSLqTM5EaY7QGwb6
-UWeA7+7zBfXu+n4dJxjywtw1nG3RJFbBH27IA1Zb5KUOoDVrm2Y=
-=Sgqz
+klDiFA/+P48FVfCTA4c/raPJ9L2rhK2if82J/iuQpinJUsOv9XSVol04gMsDf5Z3
+xi1ohLl759aiolEt2lNegUWIORXoRfJOJK20s9Pbsgdcs4wdSfrmlU5brb7vVcOP
+8LTreueqN9ZTm2Bt0Z7OriGpc2ZuDXgG8KIqRHP9BS3kHd2vmgjzJNm5EoEb56QU
+6o2L3mPUx95FKgStp1NsjGi8BlnLzMjmfz47OT9dq+CXprhym+XwDFYBlLTcidCi
+9yVZgDC0zR1HxGL2qcA1v2gLPE1+jiOm+ocQFRRU05d1SM47lLH/jn8HKte4haQS
+T1bTk7uogmr2eXczd5e5vrFMmIFnNJzhefnktdjPzLLnxnAlNxvb4y9UudG6djVI
+TXFcboi6huWEp38bJodeCU7mzCuLwfIBdMjrRJN173fGxmaQFV9ClhfLZvp+Sd+n
+Ddm+qgYLwYqbXOtO/wcEoEQ4fYlj0Axm6kp2NdIfa+Wo3nRVUK91GH30/7MsncWO
+yDIN9TPqF9BsCO72elRbxYD313gdeqw4Tk8+BhxNVtr7e954Adg0X5tu+oIJ3kMm
+4JmBSClrQYLorz0LctKueC/FgYyzXOS8dGljnzA9TD7rFbepGvRXGGxhzVT4wnkU
+vneG6TI3u88gJXGVizgtMVBajMgqoxXSGEd/XZpKz9AgAtn4LxY=
+=GIEO
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 51dfe9f0e3cf..d97dca40b897 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 06 Feb 2024 21:10:01 +0000
+Wed, 07 Feb 2024 03:10:08 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 8d096fb10dc4..452dd9139338 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Feb  6 09:10:00 PM UTC 2024
+Wed Feb  7 03:10:08 AM UTC 2024
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a4c5badb8ff1..289770415eff 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 06 Feb 2024 21:15:01 +0000
+Wed, 07 Feb 2024 03:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index e48b5995957e..89e00f0dfdb6 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-4710ed7ca00c3c26f72c0520a2afba6accdf6112 1707252777 2024-02-06T20:52:57+00:00
+1d31c1c2f2808bce35615c3b445c70deaa039032 1707272501 2024-02-07T02:21:41+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 5e410419f416..9965d22f12ca 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1707253801 Tue 06 Feb 2024 09:10:01 PM UTC
+1707275401 Wed 07 Feb 2024 03:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 51dfe9f0e3cf..d97dca40b897 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 06 Feb 2024 21:10:01 +0000
+Wed, 07 Feb 2024 03:10:08 +0000
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index f5741e8598e0..fe01ba59f5de 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 974dc916b0d5..c932b4c9516d 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -18,6 +18,6 @@ DIST iptables-1.8.8.tar.bz2 746985 BLAKE2B 0da021cc7313b86af331768904956dab3eee3
 DIST iptables-1.8.9.tar.xz 637848 BLAKE2B 37ba80be0ee7049c4d3ee5689b273b4d2cc6e6fb9ebb297e86976b5750f987f2ae4536013fe1749ae79b6989c241eaece3202019fafd47d842c7a4fe3e5093b1 SHA512 e367bf286135e39b7401e852de25c1ed06d44befdffd92ed1566eb2ae9704b48ac9196cb971f43c6c83c6ad4d910443d32064bcdf618cfcef6bcab113e31ff70
 EBUILD iptables-1.8.10.ebuild 4672 BLAKE2B 08a99d7350339256feceb818ddff4c4ddb9c3a50595fed8f2f0fe2d6fdcbc05187f3245c8615288bb6768b9465279100371b067a39d64c8ba0a41591db169e73 SHA512 a774e1fc76a501748cb8151b2cae33f6a219d7b673f3d0426355d66a12ff9994650255e6cc43b55a61297a4af6e5d674773b23ece20a15ee3e671b735e7b3c8d
 EBUILD iptables-1.8.8-r5.ebuild 4739 BLAKE2B 4345d633b233c0640035f83799013fb14ca2e1aa993472adbc2d730556f10b435609e1950791a5f914958d0464db227473ef36b3f37f10c734697ba1f6ff5152 SHA512 0a1f812081ce8a6481e64582a5ee1b1a7e4693d7728fed7c3f265b71e43334261e9694a8b0ccb06ff354f67e9cda729f7b2ad25c82cfcea47b72f427dbd165dc
-EBUILD iptables-1.8.9-r1.ebuild 4778 BLAKE2B 2cd36f6ecb97b15718e6bfa021f54942927988b6699503f2895119361c6f43b032dbc3cd37d39b3924ed8d637eb0431aa43b87efe6553d72549396d621e0731e SHA512 7a558d5d8937df2ee7e0aae9f49d56839a23ca15ba6e27451b659ebb0157121698cf5a03251aa69dfd66cb3047d3e1c099e4d602120163d5a08a996524845375
+EBUILD iptables-1.8.9-r2.ebuild 4681 BLAKE2B 7351c269b83c5cd41547e0bee5d5b55e0c1fe51ee316fb96b2db4c1689550db79970f3f8a2b20cba2fb4990157328f0115529a8fa467048cf1f6a03b648ee9fa SHA512 5003888f620e3fb68ba0b4bf482771607f0010274369ea25fed9cfe8ba8265c08421f099edb0b361f5f24fb95a408b9209e231336acda183b929c91f246d0d20
 EBUILD iptables-1.8.9.ebuild 4556 BLAKE2B 76c710543d3aaa744ea299126cb97ac793f7c7c382cadbaab6e378d4249901d65cc7eb0ab9bf95e0571fd6902c74f5b207b3a6b4297f67d22743d52eed5419a3 SHA512 73c363ceec2be0a032088a9ddcbf7b4c6abf0886f32d59fb20369f6a816f3e29025a938e5c9326d36e4032a8a2c2795c61e625556c7e4614021e3fec6378c258
 MISC metadata.xml 1466 BLAKE2B 7378fedb44c6e6d19e508a764ec997911f966beccd40b1f93096ad3343b7cd72f9ca129e67a666c54ca4382348a448597bd607197ffe6b94669d84306c81d127 SHA512 f89038980e81bfceaf872ff1938c47e8ad12060bbe9ff48e0e9ca9dd5acc0196b2261d2b22a156cbfd7be89d1d67448969d39ff9b28efb0896702760afa14842
diff --git a/net-firewall/iptables/iptables-1.8.9-r1.ebuild b/net-firewall/iptables/iptables-1.8.9-r2.ebuild
index 44f377b5bfab..1c867f287d83 100644
--- a/net-firewall/iptables/iptables-1.8.9-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.8.9-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit systemd toolchain-funcs autotools flag-o-matic usr-ldscript
+inherit systemd toolchain-funcs autotools flag-o-matic
 
 DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
 HOMEPAGE="https://www.netfilter.org/projects/iptables/"
@@ -131,9 +131,6 @@ src_install() {
 
 	systemd_dounit "${FILESDIR}"/systemd/ip{,6}tables-{re,}store.service
 
-	# Move important libs to /lib, bug #332175
-	gen_usr_ldscript -a ip{4,6}tc xtables
-
 	find "${ED}" -type f -name "*.la" -delete || die
 }
 
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 8ad63cc7c1ff..100542b72c2c 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 486b09d4645b..6809f5750a41 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -13,7 +13,7 @@ DIST dhcpcd-10.0.6.tar.xz 269392 BLAKE2B 4afd08cf7377b2262d33bf3f7ac503e081572a7
 DIST dhcpcd-9.5.1.tar.xz 258280 BLAKE2B 355a98d415253608e8f586809d41e7654c1973d956cb3951218e1ff8c928ee414aa1b9854180c78e975898d9eb0f4cb9cc0fe64eefd5690b371989093e1bcb5a SHA512 979c180743d3e01d1996033d42c5606792e3acaef4e600f0ea51c362643a5b2743c6dc2792314c3b66edfa99c3b98d17f46cf3421e2088b37804e6e2167037ee
 EBUILD dhcpcd-10.0.3.ebuild 4649 BLAKE2B e00e857c44168096c3530004d32bb62250681d686b17954b46bd6993f32ca963d4369ae79ee9d15afc90c53b9e1d7c3f71b2a819278c44e12b59d1cb08a8affb SHA512 3596770f90d6b49b1c677538cbe1b34b482a886a322050f664d90ec6851b839b3294a57144d8e7c1f93530db3e4120b95d11ded5c568162c6ac0510ec9dcbfdf
 EBUILD dhcpcd-10.0.5-r1.ebuild 4684 BLAKE2B a9f60400d1d3be191f47de793f49413d4d24fbeedd8e637d2a3beedfeaed5a123740323ba438319369845ca78b2771fe366e9f4edaa576716262d68064b76d99 SHA512 166a9f1999e7611a3bf39085a2499c9596e33d9cd35d09c1d1a94fbd5cf0770f994814e315ae2417e7469dd91b8a5c13abde2f12b03d77c909491b653fc95b13
-EBUILD dhcpcd-10.0.6-r1.ebuild 4875 BLAKE2B 7fd497885874b79cc9480a2251392310c72bcc4c96c4fe8c01cf3cf7a706a047c4b987707c1f8e4b7563913b1fc581c3ca9584b46e237d25ec94103a77e345e9 SHA512 23319bee435063f20edfdaab58b9a04d388841fa5faf449367705eeb205bf619ea8f46b41c5e3a3981d4c2d7b996be4d8398025ea4da4582b5ea476e0ec8ad30
+EBUILD dhcpcd-10.0.6-r1.ebuild 4874 BLAKE2B 7d6cf19cd8cd9183a1d373372c3f2cef5338a98ceb95457b69ff1f0165f0f5e33465d3aca203a5e5c44722cd12ccccc6353cc580b5219055230de5091f6eb219 SHA512 af060355f679965ae45bdc378028464735c88374ddda41b8bbcac80ef3231b6dc571d50a4d093aa2be0af4247245987117de01e67a0998f0cacfdb2a9470ec3a
 EBUILD dhcpcd-10.0.6.ebuild 4825 BLAKE2B 770a30abb6aa31c7c980f9ae97f53ee6390e9aa2f147c2290daf1e3b0202e7ad9c366fbf389e464b0766e8d1a42ecfc643c0e11ad55490d587f039c0def60f56 SHA512 ea7aaa97d18efecb1abbb2ad4b969138e5b4c0b46b772d1c2b5ecc9a8ae844fd320831b9a7eadd03178daa70324a23e3e6f73a3cb36929364776a5f62ee75939
 EBUILD dhcpcd-9.5.1.ebuild 4610 BLAKE2B e74ed2bcac66ce60354b6a1d5fe606b91c87057db2e23dd31fd1035aa5ab05042053c62d04b406c5ff9c1b96a2e196a60a8df699c7755319ca50a58f627e684e SHA512 88976827203f49c28d45cb0dfd65b1f71e881e53c617e3cc131f6886197cfcc50dfaa6d0d1a2e6e678e12f9964aa50f70d102475bcbcc9431e6d5f4c98c5120b
 EBUILD dhcpcd-9999.ebuild 4825 BLAKE2B 770a30abb6aa31c7c980f9ae97f53ee6390e9aa2f147c2290daf1e3b0202e7ad9c366fbf389e464b0766e8d1a42ecfc643c0e11ad55490d587f039c0def60f56 SHA512 ea7aaa97d18efecb1abbb2ad4b969138e5b4c0b46b772d1c2b5ecc9a8ae844fd320831b9a7eadd03178daa70324a23e3e6f73a3cb36929364776a5f62ee75939
diff --git a/net-misc/dhcpcd/dhcpcd-10.0.6-r1.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.6-r1.ebuild
index a2031cba5efc..cd313329537c 100644
--- a/net-misc/dhcpcd/dhcpcd-10.0.6-r1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-10.0.6-r1.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
 
-	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"
 fi
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
diff --git a/net-misc/openssh-contrib/Manifest b/net-misc/openssh-contrib/Manifest
index 876b46d13bfb..1d38222208e5 100644
--- a/net-misc/openssh-contrib/Manifest
+++ b/net-misc/openssh-contrib/Manifest
@@ -11,39 +11,27 @@ AUX openssh-9.0_p1-X509-uninitialized-delay.patch 321 BLAKE2B 19bff0fc7ecdc6350f
 AUX openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch 514 BLAKE2B d0dadfc57736cd4d2b04e46f5c0f6d5a1db1cfc7ee70d32afaa0f65269b82e66a72c46d33c9cbf7237f541a0485b25669cd2f4b34393e3a3ef0c9b4334092fe5 SHA512 f8badde54501340bde275951bc1cf653919bec02c760bf771308f10697b9ad2a483e30ae74ad124a737341f5c64657ab193a4d7fdf2baf24029b9447099da04b
 AUX openssh-9.3_p1-openssl-version-compat-check.patch 2588 BLAKE2B 635e9d4e0ca515d4da190075371b85b5c1885fd7d9b621d6f21399be0faf0be96e5e31875611392386b897f74087d75a00203a74c9f9ecf0be447bf354fcf4a2 SHA512 a27afa1b07a47f0ecf74d30ca85e7b4f8c79857c8019d274aeaed88b81149ce6241fd16f1023f14dbdc701e8c9d8671f6aadda2e21d620a47af8778b8531b991
 AUX openssh-9.3_p2-zlib-1.3.patch 671 BLAKE2B 44a974e83faaee7336898227bc6f14ff4ab6e8e91e2d8f61d22f45b4d73e57a79b505143620d3a910c6e7cea91ab406e10ffcf23a802f447843f5c2836e37c34 SHA512 d2e5992c783b46b4859501aa32aa7b0acc5ec9e512589e18faebfa8660c52a3ad9ffa3d5a4cd5ba9a5fadb7ab86e51c32714dd23325054b05fa07194bd86f7d7
+AUX openssh-9.6_p1-hpn-version.patch 552 BLAKE2B 4fccbb5239b9e856b01c796216ef73aaeeee0676cafc9274d225047b0196d26601073d06c8bb443361cdf89229fb052b6760273facec3e505d2bf80135f15235 SHA512 46dc0cf3bf94237d582f1c363723f22e0bbf6c435f649776766690d2595f07012e2e65a3e73f1c18dbe564885e690ce1449c3e6bf63778fe4220b4c897928f9c
 AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe
 AUX sshd-r1.initd 2675 BLAKE2B 47e87cec2d15b90aae362ce0c8e8ba08dada9ebc244e28be1fe67d24deb00675d3d9b8fef40def8a9224a3e2d15ab717574a3d837e099133c1cf013079588b55 SHA512 257d6437162b76c4a3a648ecc5d4739ca7eaa60b192fde91422c6c05d0de6adfa9635adc24d57dc3da6beb92b1b354ffe8fddad3db453efb610195d5509a4e27
 AUX sshd.pam_include.2 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391af5769798e0b0185f0a588bc089d229c76138fd2db39fbe6bd33924f0d53e0513074d9c2d7abf88dcb78 SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c
 AUX sshd.service.1 298 BLAKE2B 7a4f2e2656096b09a8b435d393ea9b0a7bd10a2a9f0e9d9cf49b9ae9600cccfb19a64e09f4cf718e8054fc997f21656f609eb3af15ee2e3576531a88b5709842 SHA512 efc936ca412999e3b1acabe6cf4e87c033fe468cede1c3c499499e252cf7cdeca0841e5e1862ebe316ff3f4bf758fba674f08d081b403713e154b6bbc37da365
 AUX sshd.socket 136 BLAKE2B 22e218c831fc384a3151ef97c391253738fa9002e20cf4628c6fe3d52d4b0ac3b957da58f816950669d0a6f8f2786251c6dfc31bbb863f837a3f52631341dc2e SHA512 4d31d373b7bdae917dc0cf05418c71d4743e98e354aefcf055f88f55c9c644a5a0e0e605dbb8372c1b98d17c0ea1c8c0fee27d38ab8dbe23c7e420a6a78c6d42
 AUX sshd_at.service.1 163 BLAKE2B b5c77d69e3860d365ba96a5b2fe14514bda9425e170fc7f324dcaf95fb02756ef9c5c2658904e812232f40fac9a3c2f4abf61b9129038bde66bb7d3a992d2606 SHA512 fbfe0aed3a5e99f15dc68838975cc49a206d697fb3549d8b31db25617dc7b7b8dd2397d865d89f305d5da391cd56a69277c2215c4335fccb4dd6a9b95ba34e2f
-DIST openssh-8_5_P1-hpn-AES-CTR-15.2.diff 30096 BLAKE2B f0c020dd2403806c79d4c37a019996d275655b04997301e247f5c4dd7fad35d12b3b7c25afb1b078d915ef2a4ae02f736f0aec9ba2a8c56a405d7ca303bcadf7 SHA512 4c2dbf99a9b5953fdb955f700272bbaeaa025f108a8860d2190197962b849f8385327af82c4d6a3a130a7fba35a74a8ec9437d642867601acb29817c49632a8f
 DIST openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 51428 BLAKE2B 370b88a7da7f148bf5a4d445f05cf593b486e9df53bba027e2e179726f534b68cf9d94edd6e53024e0b6ff5f20e568727bc9d26c94d0d415603602a80d3ad241 SHA512 2d8d887901164b33b2799ff3ec72e86a39ae4a1696e52bcee0872dbae7772fcc534351e6e7f87126ee71b164c74e9091350f14b782f4b242a09f09b4f50d047a
 DIST openssh-8_5_P1-hpn-PeakTput-15.2.diff 2429 BLAKE2B 849bf3c313719ab7a25c75e82d5dc5ac98365a038b2a66fe58d01eae5b20c7777258b94b5830e799d6909e75c69753cda05a910f3bdab9606fb7d5efa68e05f1 SHA512 c4a56fab55fabd1d902d45f235b603708d43f969920e45c9a57e557dccfa9cade2ec61f26d1ace938f6f73e79f17b12f119b5aea9166cbda8e3435b910500914
-DIST openssh-9.3_p1-X509-glue-14.1.1.patch.xz 936 BLAKE2B f1716ff7801a27aa2aad06f1cca2ca6988eef65fb0ddcbde483e5c9205506ca40b658f5c8c40b2625afb38ff9b56e40831eadcf751c8ee1c11f69ec559f3c147 SHA512 dace01bcf22b625cd00e18ce019b0be31b6f47f714845f3ebb98ebee41b4db0a769fa09cab63ea17536a7106ec90f2b15f87696ae49fa6f6e31bad94ae09719d
-DIST openssh-9.3_p1-hpn-15.2-X509-14.1.1-glue.patch.xz 6224 BLAKE2B 47c7054648e8d795b0d9e563d8313242c917df8a3620a60cff2d77f9ae8482cec861244e0f1433f711922f0704b775b7183284960a3baa48a27b99979ad7ffa3 SHA512 728cf2586bcc9480afe71b5106e2286b925857a9e04dce79f744b36cbe3ec2844ac5b4a6bd4b64117f32ad1b04c0943b9d6f935eee826202871588ed9a167387
-DIST openssh-9.3_p1-hpn-15.2-glue.patch.xz 5044 BLAKE2B 73205bd8f702612df7cb6f29e8b353df854428974dc20d5938033157da64418317f326ab8118893dc47173cd871dc7654a3e3ed601289744560becc98729cd3f SHA512 343b77109158b9af5d8d57f4ac7968bce8277fa3b4dcaa19b76593620fbddbfa832bd76c0da52e12179fe5f391f9fef67e7af51b138ab8cc69a8a6471b6a3909
-DIST openssh-9.3_p2-X509-glue-14.1.1.patch.xz 116132 BLAKE2B 7e2b5aa4569a27943cb701dccbca8224e64130a4bce46ce8ba7978a93d3a410fe46957694475fafd51177dbbefa28fc613d9bf69aa436541b03e83dc9b9497ba SHA512 df67a40f27c8af029c3d84e44bd74115e16bfe98efc039bd1f5661c22c5ab1213c2970a80c017775e828f6c5b4e2e815eff28c745888b0dba1ef6c259943ba20
-DIST openssh-9.3_p2-hpn-15.2-X509-14.1.1-glue.patch.xz 5056 BLAKE2B aea1d9dd10abb5dd85d304fb4a415c5fb8b237dd82d8f39c092622d85b51751336f18bff5feb80e9a165e171b92eeeef471272210d926327a649961eb640cb8b SHA512 6d384ad9b3bebc4b90550e089b6c3c8d2959880a2510bea5bd7d723dd831815929dbf67a882105f22b3dd2eef6ed82dea89343175499a57d8e0f6b56ec6abfd6
 DIST openssh-9.3_p2-hpn-15.2-glue.patch.xz 4728 BLAKE2B 9e3c04a289d0a94b03b871027f4f8476e3981602f5a2d9ac8a8602e08d01248a72c48126ff53a174c8dc95f6bd8608ba75bbc74f5eb427e4ecbe7c7794c7c200 SHA512 bb42d001f89b8eb3a5af813d4c526548e13467deeb2811384b473e61c86e6e766aabb9652867953c0f979533ea70111145c424298f11df4faf05e43fb8b1f439
-DIST openssh-9.3p1+x509-14.1.1.diff.gz 1221335 BLAKE2B 9203fbb6955fe44ebd7ed031245a90b8df7e149a6ad3205097ffd5d2d7655a0e6b8cd2e20d7f7216fbc6d3e8bd0a1453f3fc028f04e96c0f244ad0772a0e30ab SHA512 8a1036d680d25f99e1a24ea77a2c303e807c0f5c5323043684da9fcc9ff603f80384688935a654cc97216f84f85f00f590dc35d2ee2b1f0fb169f8b427559b2d
-DIST openssh-9.3p1-sctp-1.2.patch.xz 6836 BLAKE2B d12394ecaa7eca6e0b3590cea83b71537edc3230bc5f7b2992a06a67c77247cc4156be0ba151038a5baee1c3f105f76f1917cc5aad08d1aadadfd6e56858781b SHA512 ba5af014e5b825bf4a57368416a15c6e56afd355780e4c5eab44a396c3f4276ac4d813c5c15b83f3b8edf4763855221743796c038433b292fda9417f0b274a71
-DIST openssh-9.3p1.tar.gz 1856839 BLAKE2B 45578edf98bba3d23c7cefe60d8a7d3079e7c6676459f7422ace7a2461ab96943fbcadb478633a80f40bc098f2435722850b563714adb78b14922be53cb5753d SHA512 087ff6fe5f6caab4c6c3001d906399e02beffad7277280f11187420c2939fd4befdcb14643862a657ce4cad2f115b82a0a1a2c99df6ee54dcd76b53647637c19
-DIST openssh-9.3p1.tar.gz.asc 833 BLAKE2B e6533d64b117a400b76b90f71fa856d352dea57d91e4e89fa375429403ac0734cc0a2f075bc58c6bb4f40a8f9776735aa36bdb0bbf3880a2115cea787633e48b SHA512 6222378eb24a445c6c1db255392b405f5369b1af0e92f558d4ba05b0d83ab0d084cb8f4b91d7ae8636f333d970638a6635e2bc7af885135dd34992d87f2ef1f4
-DIST openssh-9.3p2.tar.gz 1835850 BLAKE2B 38f8d4ada263112b318fafccabf0a33a004d8290a867434004eb3d37127c9bdabe6e0225fca9d6d68fb54338fec81dcc9313ca7c91d3a033311db44174dc9f6f SHA512 15b8c57aa120186f1d1c3c2b8dc6ffd26733e12f755a6b0a4255d9ec1815a61506275ff5723b4ac029e44bc2ad22852ac36e1101f292348fbfa79aa1a4cd3f35
-DIST openssh-9.3p2.tar.gz.asc 833 BLAKE2B cfba3867d7f97cb2c904bd3ae111bd63e8a050464b66e3f3f22390839a153d57ef5819182f8ad99a6b520f27881143552dc64fccfc33dcc0483ffe1ef33a5a47 SHA512 759e512a36a3a62264803b517298a65c83e1daebd9867e28ea1ca4999c38539368815ccda86540a4f5d45fa79c539d8242995ba55f2918baf2a7404c105e337a
-DIST openssh-9.4_p1-X509-glue-14.2.1.patch.xz 904 BLAKE2B 64dd3f145858d7d6b6625fa565a882f7ab43faf78233a2a78b7b13fc1d417ae67c675bebc09dd1343b3504af0c2c47a1fda6ac77a11238e1d2dabcdd394253e9 SHA512 542263bae6135c0493a16c63526da6b98cc425e01f2a1e332156bca4d3d7c7e91cfe1cd86f32c5f67097275eeb543b356faacad665c2a36c22843e2e00d19e10
-DIST openssh-9.4_p1-hpn-15.2-X509-14.2-glue.patch.xz 5144 BLAKE2B 324dff4cccc027825b8400225cf322a6882caca30aa567a1bea405142ff9f9ed143b837ef8082011342ae6d22033c22e34499f930d0b9ca1e3c241cac7c15e99 SHA512 e63b2187d3f210ce897b6696b02a364f4f212c1290f7b9bbcceeb15325555427254c54366b7da059ce3cf99e595457e69d8edff4fcb7c18021c7530dea1df4bb
-DIST openssh-9.4p1+x509-14.2.1.diff.gz 1221969 BLAKE2B 67b06648aafd849fdcb4c54c4a841c46b6a97d53d7ebdefe6110aba7a0877833ebb2a8d22a1e51a748051f889ba08cc1501ea0e9e221fef2f5c0e8caad170983 SHA512 d90dc7bde008ab793d9f85f1b4b0687f1d084fdf2fc6cfd229748424ddcc4664f558be44fee73d72e88bc99e03a5dd1ec57138a82f77b82e0f65d14bd3ef545a
-DIST openssh-9.4p1.tar.gz 1845094 BLAKE2B d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53 SHA512 0aaedeced7dbc70419c7245eb0e9db4ef570e0e7739b890ebae04d56da5fe8d147e8e150f3c943f60730976569e3ac6cc8da62ec7e2a78e2ef47d295ca0b1d25
-DIST openssh-9.4p1.tar.gz.asc 833 BLAKE2B 95eedd9356766e5d0ea1261da3dc4c7869f054b418c626fb35815a0aa655b1ddbf54436b437d98c4344b05c9196c8fa1f592eac07b3ccf08bd3e980f8b6955af SHA512 983b4ebaa3b98e70831ce686cb503270926c065163a2510eef0c5102ef50b6e665b889ee15ea8c0bd7c4bbddb19270f036e1d554a8212ef2c292f9c682c8631a
 DIST openssh-9.5_p1-X509-glue-14.3.patch.xz 788 BLAKE2B 641c9936639a7629f6ae82d56f48b9dd39e58087024fe04259e2be5aef3b484a3f8ba6c91e603dd4f80d03c92490ee85cbaccff1e40e4f7ee1064c4a1ac9f191 SHA512 8f9255e3f8a682d7c82125a6064cdd8a80616e4b699a4c101515f15af7185a6b0b98efa246e0ed97a278f377ea616daf2dd98d0dc479c24d1ac3a76c12cd97ec
 DIST openssh-9.5_p1-hpn-15.2-X509-14.3-glue.patch.xz 5132 BLAKE2B 82a30622e67fab233591f6b30c634f2f8383eda77de163b6139ca9892c0485d8f174901e5e6788f6c911e0859e563ac6a9022e99099507f76a59908770474e78 SHA512 697b2ce1b2b0aa1bcf95b76b3bc79de7d8793a3c2975bc3bfb23a64fd3a9133df9fd0831848f9388b21f7f1fd597824b221d45b9380ee26beb60040596386d61
 DIST openssh-9.5p1+x509-14.3.diff.gz 1224337 BLAKE2B f695711eeab6b40a8660ac897961068738cb5941c799243888d5a90f56cf4b308803dd88d3d97d7932a72b82ebc269e20c7d142076fb3b03def1245491da0497 SHA512 a7798e2a40a81df882911c485fa240584713135df59c6dab720597b6ef60ecfac85ebd595983d7c5ce8625b758eeb777fe1462845976a2674cad339dadc0719a
 DIST openssh-9.5p1.tar.gz 1843001 BLAKE2B 55dbb0a2792b0046c943a19ca0966660e6e378e77856e94823a1bbbafaa0da94357403765c4c028aebf6543049a0f9bbe0019629be3f92cdadfac1be56def796 SHA512 e183fdf7477fd986215b889eea4a945d71385e35305746ccb164e757ecc28166f429c70890a237d8ef4cdcae5132935ba2ecb3b2a658eb73a6afcf6f42277b9c
 DIST openssh-9.5p1.tar.gz.asc 833 BLAKE2B abec3d14d9a880008db202be00ed446ccc0a98ce77c16a9e6d6492feac07c8f3284f9cd24f6ee1d904a55f9f23d5cce8a716916975c179a38ef6bde1d36e0acf SHA512 2b6de653420ba02eb99c7e6fba09af3bacfe9c701f3dfc3c94f41a3539c0414954fc5c64cce63c488c5ccd5d4ddb42d3f2184ff7f323342c885c47bf7d426ca1
-EBUILD openssh-contrib-9.3_p1.ebuild 19039 BLAKE2B 94e389a38544fe3f686118d09c1109b8f1c50b370759dc09546b5b10923c11b00ece2ed15d366f716d354877e836ec6cf4c1ae4e2e0413211a4b436aa486fecd SHA512 97fe43612d979ca2cdffa15227f9ae24baaa23f76956a2077c3a7f8bb2a28fa9fc0602c633bbd949795bd77c8b56b4a3fc39e0ffaf13c5f189b5699334ec8a25
-EBUILD openssh-contrib-9.3_p2.ebuild 17972 BLAKE2B abef8c6237fe9346b1256ce01816632416bf6f1f3e556ccca6ebc2297936254fa6d09e32c22d556e2b356061569ccf3667a09c2f1c184c4816e342c7966a4d0f SHA512 0ef78eec7f698c86c0602695f12cdf85bd7d39517c16a9635fbb9d26062f9e14d2c1375ada78f46a27f217f788286081616912607eab55592a323c9d2ca603bd
-EBUILD openssh-contrib-9.4_p1-r1.ebuild 17918 BLAKE2B 3d06e530ffbfe6e8286c2b2b9973a1a55d964f1b8871fc743341c37b998c3d2476a65fd0516f41055c1ff007c05fd3226e56f4a560dfe1e753308d6dc8573ad3 SHA512 27b1351c93f942d154309eb8a52670c1fdcb92bac89c03bd023eca35a2d7833f11878918ea3e3cfb349d576fbe9b1695e9895f33af7a9b4511965ea54900d279
+DIST openssh-9.6_p1-X509-glue-14.4.2.patch.xz 1516 BLAKE2B 49f1d100e1b84f051aee599547562bab17b313d097b9b16b7c3ad94fb76e31b04fc101b1824f011507033e9c5744ee0207cb751865576f92501bc442076afe8b SHA512 a09bd2ed9b9d0edfa691c2f99699261c17c9441e188ba870c1f2ceff28817af979a29a7b5c1bbfe9fbeb343241cc00b232099791cc30d665700fcbebdae07139
+DIST openssh-9.6_p1-hpn-15.2-X509-14.4.2-glue.patch.xz 5472 BLAKE2B a92ca0746cd48b1580e0a73dcae5d6e141988d3239d09a2f07de376833d14ca2434185b5fdb444fb6821da9ff75ce0c63c86404299e977d3c86050d3a116fc47 SHA512 2690f158bf1f5d1512f80c9c8d86006339a461a0bf229e41c62b75d28a9b45cb5392680fbb633415c27c3abfaa1906c170cd1d18679a2be81a1367361fd98afa
+DIST openssh-9.6_p1-hpn-15.2-glue.patch.xz 5028 BLAKE2B 74970dc9f244eea2e35270c9abe67bdf0f05a3ddb33ffe6ce54056ade3fbec2abe9cb60e92ea889b01be7429dfd754f2986b175cdb014aab721421e1a4952c87 SHA512 1edafed18b1fd5d64844a3d121aacbf38dcde2b90adc9b4533f3192f1335365736e9cfd82f7c847980c9b1c1b72ee39470b38d6758b3a8f5ed59796d5005492b
+DIST openssh-9.6p1+x509-14.4.2.diff.gz 1243845 BLAKE2B 19ed0e174d06f4722b0f244e2c41098422fec88372d77e7c64bed2c00f4d4842b8f517d3f49958febd7a640f0582497fcaf64774fd0a04fbdc8c06b7f0ce5311 SHA512 247a088bbe7fe2bced0ec6e7f3d1fc34c3b81ce43ade9312a769c4495c7adf60d8a9ad2afb25e52fdea2f60888330de05375fbe24cd5b86a2f173e160ddb7bb8
+DIST openssh-9.6p1.tar.gz 1857862 BLAKE2B dd7f6747fe89f7b386be4faaf7fc43398a9bf439e45608ae61c2126cf8743c64ef7b5af45c75e9007b0bda525f8809261ca0f2fc47ce60177ba769a5324719dd SHA512 0ebf81e39914c3a90d7777a001ec7376a94b37e6024baf3e972c58f0982b7ddef942315f5e01d56c00ff95603b4a20ee561ab918ecc55511df007ac138160509
+DIST openssh-9.6p1.tar.gz.asc 833 BLAKE2B 9363d02f85457aa90069020827306a2f49d8406e32f5ee1d231844648dd2ffa02fa9b7325b8677a11e46a0ba0d9ffc86d9c989435d691a02f5354a956c49f9f9 SHA512 aec5a5bd6ce480a8e5b5879dc55f8186aec90fe61f085aa92ad7d07f324574aa781be09c83b7443a32848d091fd44fb12c1842d49cee77afc351e550ffcc096d
 EBUILD openssh-contrib-9.5_p1.ebuild 17863 BLAKE2B 812d2a7f5adbf44f002532c491e3832946b9c79fb639bea59dce09333cc3bb3c277564c34b4d015b8a7ed6c39cd1f84183e9fac976ebf4a631dea053cc81d3c2 SHA512 25ba6ff44cd06a8188e92c8dd7f6c9985f2dd55bd6f9999849f0ece7068602b184cf3a472cd8b8028abfac726818bfdd55cb9c63768937fa65b8a400fcde57a0
+EBUILD openssh-contrib-9.6_p1.ebuild 17817 BLAKE2B 46035746ddbc1d8648f8bebd820bc05546945bb648c451c144caf3a794f8e07e0660223f63c7a7042956201aa895de1192642db1400275fa724fdbbde5d04daf SHA512 d27da5969af231b409acd38b49c60a81316524db41cc8725b7f80c7d8c9c636c498427f1853575c17af2e71f1684614d4d1158bc87bbdecaed9da05b44222003
 MISC metadata.xml 2975 BLAKE2B 068d52ba2e5de0b696e7fe995e4c2a041206a59258f24704ca3a72fe1d85323c2aad7899f055b48a4045d6303491822c59f2b86b85fc428a26f8259ea583796a SHA512 83fef701188c00af53382b5099fc2ebf83c903c3edefc3d2cf6deb0a667c0d0d9531c18728eef9b5b703903d31fbdb55a68e5b76890ea090bc1d79fef3ae6b89
diff --git a/net-misc/openssh-contrib/files/openssh-9.6_p1-hpn-version.patch b/net-misc/openssh-contrib/files/openssh-9.6_p1-hpn-version.patch
new file mode 100644
index 000000000000..95a69815b822
--- /dev/null
+++ b/net-misc/openssh-contrib/files/openssh-9.6_p1-hpn-version.patch
@@ -0,0 +1,13 @@
+diff --git a/kex.c b/kex.c
+index 34808b5c..88d7ccac 100644
+--- a/kex.c
++++ b/kex.c
+@@ -1205,7 +1205,7 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms,
+ 	if (version_addendum != NULL && *version_addendum == '\0')
+ 		version_addendum = NULL;
+ 	if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%s%s%s\r\n",
+-	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
++	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
+ 	    version_addendum == NULL ? "" : " ",
+ 	    version_addendum == NULL ? "" : version_addendum)) != 0) {
+ 		oerrno = errno;
diff --git a/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild b/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild
deleted file mode 100644
index 19a0942bb7d5..000000000000
--- a/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild
+++ /dev/null
@@ -1,532 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
-
-# Make it more portable between straight releases
-# and _p? releases.
-MY_P=${P/-contrib/}
-PARCH=${MY_P/_}
-
-# PV to USE for HPN patches
-#HPN_PV="${PV^^}"
-HPN_PV="8.5_P1"
-
-HPN_VER="15.2"
-HPN_PATCHES=(
-	openssh-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
-	openssh-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff
-	openssh-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff
-)
-HPN_GLUE_PATCH="openssh-9.3_p1-hpn-${HPN_VER}-glue.patch"
-HPN_PATCH_DIR="HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}"
-
-SCTP_VER="1.2"
-SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
-
-X509_VER="14.1.1"
-X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
-X509_GLUE_PATCH="openssh-${PV}-X509-glue-${X509_VER}.patch"
-X509_HPN_GLUE_PATCH="openssh-9.3_p1-hpn-${HPN_VER}-X509-${X509_VER}-glue.patch"
-
-DESCRIPTION="Port of OpenBSD's free SSH release with HPN/SCTP/X509 patches"
-HOMEPAGE="https://www.openssh.com/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )}
-	${HPN_VER:+hpn? (
-		$(printf "mirror://sourceforge/project/hpnssh/Patches/${HPN_PATCH_DIR}/%s\n" "${HPN_PATCHES[@]}")
-		https://dev.gentoo.org/~chutzpah/dist/openssh/${HPN_GLUE_PATCH}.xz
-	)}
-	${X509_VER:+X509? (
-		https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH}
-		https://dev.gentoo.org/~chutzpah/dist/openssh/${X509_GLUE_PATCH}.xz
-		${HPN_VER:+hpn? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${X509_HPN_GLUE_PATCH}.xz )}
-	)}
-	verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc )
-"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssh.org.asc
-S="${WORKDIR}/${PARCH}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-#KEYWORDS="~amd64"
-# Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	hpn? ( ssl )
-	ldns? ( ssl )
-	pie? ( !static )
-	static? ( !kerberos !pam )
-	X509? ( !sctp ssl !xmss )
-	xmss? ( ssl  )
-	test? ( ssl )
-"
-
-# tests currently fail with XMSS
-REQUIRED_USE+="test? ( !xmss )"
-
-LIB_DEPEND="
-	audit? ( sys-process/audit[static-libs(+)] )
-	ldns? (
-		net-libs/ldns[static-libs(+)]
-		net-libs/ldns[ecdsa(+),ssl(+)]
-	)
-	libedit? ( dev-libs/libedit:=[static-libs(+)] )
-	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
-	security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] )
-	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
-	ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] )
-	virtual/libcrypt:=[static-libs(+)]
-	>=sys-libs/zlib-1.2.3:=[static-libs(+)]
-"
-RDEPEND="
-	!net-misc/openssh
-	acct-group/sshd
-	acct-user/sshd
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( sys-libs/pam )
-	kerberos? ( virtual/krb5 )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) )
-	static? ( ${LIB_DEPEND} )
-"
-RDEPEND="${RDEPEND}
-	pam? ( >=sys-auth/pambase-20081028 )
-	!prefix? ( sys-apps/shadow )
-	X? ( x11-apps/xauth )
-"
-# Weird dep construct for newer gcc-config for bug #872416
-BDEPEND="
-	dev-build/autoconf
-	virtual/pkgconfig
-	|| (
-		>=sys-devel/gcc-config-2.6
-		>=sys-devel/clang-toolchain-symlinks-14-r1:14
-		>=sys-devel/clang-toolchain-symlinks-15-r1:15
-		>=sys-devel/clang-toolchain-symlinks-16-r1:*
-	)
-	verify-sig? ( sec-keys/openpgp-keys-openssh )
-"
-
-PATCHES=(
-	"${FILESDIR}/openssh-7.9_p1-include-stdlib.patch"
-	"${FILESDIR}/openssh-8.7_p1-GSSAPI-dns.patch" #165444 integrated into gsskex
-	"${FILESDIR}/openssh-6.7_p1-openssl-ignore-status.patch"
-	"${FILESDIR}/openssh-7.5_p1-disable-conch-interop-tests.patch"
-	"${FILESDIR}/openssh-8.0_p1-fix-putty-tests.patch"
-	"${FILESDIR}/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch"
-	"${FILESDIR}/openssh-8.9_p1-allow-ppoll_time64.patch" #834019
-	"${FILESDIR}/openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch" #834044
-	"${FILESDIR}/openssh-9.3_p1-openssl-version-compat-check.patch"
-	"${FILESDIR}/openssh-9.3_p2-zlib-1.3.patch" #912767
-)
-
-pkg_pretend() {
-	# this sucks, but i'd rather have people unable to `emerge -u openssh`
-	# than not be able to log in to their server any more
-	local missing=()
-	check_feature() { use "${1}" && [[ -z ${!2} ]] && missing+=( "${1}" ); }
-	check_feature hpn HPN_VER
-	check_feature sctp SCTP_PATCH
-	check_feature X509 X509_PATCH
-	if [[ ${#missing[@]} -ne 0 ]] ; then
-		eerror "Sorry, but this version does not yet support features"
-		eerror "that you requested: ${missing[*]}"
-		eerror "Please mask ${PF} for now and check back later:"
-		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
-		die "Missing requested third party patch."
-	fi
-
-	# Make sure people who are using tcp wrappers are notified of its removal. #531156
-	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
-		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
-		ewarn "you're trying to use it.  Update your ${EROOT}/etc/hosts.{allow,deny} please."
-	fi
-}
-
-src_unpack() {
-	default
-
-	# We don't have signatures for HPN, X509, so we have to write this ourselves
-	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${PARCH}.tar.gz{,.asc}
-}
-
-src_prepare() {
-	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
-		pathnames.h || die
-
-	# don't break .ssh/authorized_keys2 for fun
-	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
-	eapply -- "${PATCHES[@]}"
-
-	[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
-
-	local PATCHSET_VERSION_MACROS=()
-
-	if use X509 ; then
-		pushd "${WORKDIR}" &>/dev/null || die
-		eapply "${WORKDIR}/${X509_GLUE_PATCH}"
-		popd &>/dev/null || die
-
-		eapply "${WORKDIR}"/${X509_PATCH%.*}
-		eapply "${FILESDIR}/openssh-9.0_p1-X509-uninitialized-delay.patch"
-
-		# We need to patch package version or any X.509 sshd will reject our ssh client
-		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
-		# error
-		einfo "Patching package version for X.509 patch set ..."
-		sed -i \
-			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
-			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
-
-		einfo "Patching version.h to expose X.509 patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
-	fi
-
-	if use sctp ; then
-		eapply "${WORKDIR}"/${SCTP_PATCH%.*}
-
-		einfo "Patching version.h to expose SCTP patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE/a #define SSH_SCTP        \"-sctp-${SCTP_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in SCTP patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
-
-		einfo "Disabling known failing test (cfgparse) caused by SCTP patch ..."
-		sed -i \
-			-e "/\t\tcfgparse \\\/d" \
-			"${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
-	fi
-
-	if use hpn ; then
-		local hpn_patchdir="${T}/openssh-${PV}-hpn${HPN_VER}"
-		mkdir "${hpn_patchdir}" || die
-		cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die
-		pushd "${hpn_patchdir}" &>/dev/null || die
-		eapply "${WORKDIR}/${HPN_GLUE_PATCH}"
-		use X509 && eapply "${WORKDIR}/${X509_HPN_GLUE_PATCH}"
-		use sctp && eapply "${FILESDIR}"/openssh-8.5_p1-hpn-${HPN_VER}-sctp-glue.patch
-		popd &>/dev/null || die
-
-		eapply "${hpn_patchdir}"
-
-		use X509 || eapply "${FILESDIR}/openssh-8.6_p1-hpn-version.patch"
-
-		einfo "Patching Makefile.in for HPN patch set ..."
-		sed -i \
-			-e "/^LIBS=/ s/\$/ -lpthread/" \
-			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
-
-		einfo "Patching version.h to expose HPN patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER//./v}\"" \
-			"${S}"/version.h || die "Failed to sed-in HPN patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
-
-		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
-			# Before re-enabling, check https://bugs.gentoo.org/354113#c6
-			# and be sure to have tested it.
-			einfo "Disabling known non-working MT AES cipher per default ..."
-
-			cat > "${T}"/disable_mtaes.conf <<- EOF
-
-			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
-			# and therefore disabled per default.
-			DisableMTAES yes
-			EOF
-			sed -i \
-				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
-				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
-
-			sed -i \
-				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
-				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
-		fi
-	fi
-
-	if use X509 || use sctp || use hpn ; then
-		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
-		sed -i \
-			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
-			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
-
-		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
-		sed -i \
-			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
-			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
-
-		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
-		sed -i \
-			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
-			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
-	fi
-
-	eapply_user #473004
-
-	# These tests are currently incompatible with PORTAGE_TMPDIR/sandbox
-	sed -e '/\t\tpercent \\/ d' \
-		-i regress/Makefile || die
-
-	tc-export PKG_CONFIG
-	local sed_args=(
-		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
-		# Disable fortify flags ... our gcc does this for us
-		-e 's:-D_FORTIFY_SOURCE=2::'
-	)
-
-	# _XOPEN_SOURCE causes header conflicts on Solaris
-	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
-		-e 's/-D_XOPEN_SOURCE//'
-	)
-	sed -i "${sed_args[@]}" configure{.ac,} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	addwrite /dev/ptmx
-
-	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
-	use static && append-ldflags -static
-	use xmss && append-cflags -DWITH_XMSS
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# Solaris' glob.h doesn't have things like GLOB_TILDE, configure
-		# doesn't check for this, so force the replacement to be put in
-		# place
-		append-cppflags -DBROKEN_GLOB
-	fi
-
-	# use replacement, RPF_ECHO_ON doesn't exist here
-	[[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no
-
-	local myconf=(
-		--with-ldflags="${LDFLAGS}"
-		--disable-strip
-		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-		--sysconfdir="${EPREFIX}"/etc/ssh
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
-		--datadir="${EPREFIX}"/usr/share/openssh
-		--with-privsep-path="${EPREFIX}"/var/empty
-		--with-privsep-user=sshd
-		--with-hardening
-		$(use_with audit audit linux)
-		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
-		# We apply the sctp patch conditionally, so can't pass --without-sctp
-		# unconditionally else we get unknown flag warnings.
-		$(use sctp && use_with sctp)
-		$(use_with ldns)
-		$(use_with libedit)
-		$(use_with pam)
-		$(use_with pie)
-		$(use_with selinux)
-		$(usex X509 '' "$(use_with security-key security-key-builtin)")
-		$(use_with ssl openssl)
-		$(use_with ssl ssl-engine)
-	)
-
-	if use elibc_musl; then
-		# musl defines bogus values for UTMP_FILE and WTMP_FILE
-		# https://bugs.gentoo.org/753230
-		myconf+=( --disable-utmp --disable-wtmp )
-	fi
-
-	# Workaround for Clang 15 miscompilation with -fzero-call-used-regs=all
-	# bug #869839 (https://github.com/llvm/llvm-project/issues/57692)
-	tc-is-clang && myconf+=( --without-hardening )
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	local tests=( compat-tests )
-	local shell=$(egetshell "${UID}")
-	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
-		ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
-		ewarn "user, so we will run a subset only."
-		tests+=( interop-tests )
-	else
-		tests+=( tests )
-	fi
-
-	local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1
-	mkdir -p "${HOME}"/.ssh || die
-	emake -j1 "${tests[@]}" </dev/null
-}
-
-# Gentoo tweaks to default config files.
-tweak_ssh_configs() {
-	local locale_vars=(
-		# These are language variables that POSIX defines.
-		# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
-		LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
-
-		# These are the GNU extensions.
-		# https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
-		LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
-	)
-
-	dodir /etc/ssh/ssh_config.d /etc/ssh/sshd_config.d
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config || die
-	Include "${EPREFIX}/etc/ssh/ssh_config.d/*.conf"
-	EOF
-	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config || die
-	Include "${EPREFIX}/etc/ssh/sshd_config.d/*.conf"
-	EOF
-
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die
-	# Send locale environment variables (bug #367017)
-	SendEnv ${locale_vars[*]}
-
-	# Send COLORTERM to match TERM (bug #658540)
-	SendEnv COLORTERM
-	EOF
-
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo-security.conf || die
-	RevokedHostKeys "${EPREFIX}/etc/ssh/ssh_revoked_hosts"
-	EOF
-
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_revoked_hosts || die
-	# https://github.blog/2023-03-23-we-updated-our-rsa-ssh-host-key/
-	ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
-	EOF
-
-	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die
-	# Allow client to pass locale environment variables (bug #367017)
-	AcceptEnv ${locale_vars[*]}
-
-	# Allow client to pass COLORTERM to match TERM (bug #658540)
-	AcceptEnv COLORTERM
-	EOF
-
-	if use pam ; then
-		cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die
-		UsePAM yes
-		# This interferes with PAM.
-		PasswordAuthentication no
-		# PAM can do its own handling of MOTD.
-		PrintMotd no
-		PrintLastLog no
-		EOF
-	fi
-
-	if use livecd ; then
-		cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-livecd.conf || die
-		# Allow root login with password on livecds.
-		PermitRootLogin Yes
-		EOF
-	fi
-}
-
-src_install() {
-	emake install-nokeys DESTDIR="${D}"
-	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd-r1.initd sshd
-	newconfd "${FILESDIR}"/sshd-r1.confd sshd
-
-	if use pam; then
-		newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-	fi
-
-	tweak_ssh_configs
-
-	doman contrib/ssh-copy-id.1
-	dodoc CREDITS OVERVIEW README* TODO sshd_config
-	use hpn && dodoc HPN-README
-	use X509 || dodoc ChangeLog
-
-	diropts -m 0700
-	dodir /etc/skel/.ssh
-	rmdir "${ED}"/var/empty || die
-
-	systemd_dounit "${FILESDIR}"/sshd.socket
-	systemd_newunit "${FILESDIR}"/sshd.service.1 sshd.service
-	systemd_newunit "${FILESDIR}"/sshd_at.service.1 'sshd@.service'
-}
-
-pkg_preinst() {
-	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then
-		show_ssl_warning=1
-	fi
-}
-
-pkg_postinst() {
-	local old_ver
-	for old_ver in ${REPLACING_VERSIONS}; do
-		if ver_test "${old_ver}" -lt "5.8_p1"; then
-			elog "Starting with openssh-5.8p1, the server will default to a newer key"
-			elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
-			elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
-		fi
-		if ver_test "${old_ver}" -lt "7.0_p1"; then
-			elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
-			elog "Make sure to update any configs that you might have.  Note that xinetd might"
-			elog "be an alternative for you as it supports USE=tcpd."
-		fi
-		if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518
-			elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
-			elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
-			elog "adding to your sshd_config or ~/.ssh/config files:"
-			elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
-			elog "You should however generate new keys using rsa or ed25519."
-
-			elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
-			elog "to 'prohibit-password'.  That means password auth for root users no longer works"
-			elog "out of the box.  If you need this, please update your sshd_config explicitly."
-		fi
-		if ver_test "${old_ver}" -lt "7.6_p1"; then
-			elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
-			elog "Furthermore, rsa keys with less than 1024 bits will be refused."
-		fi
-		if ver_test "${old_ver}" -lt "7.7_p1"; then
-			elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
-			elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
-			elog "if you need to authenticate against LDAP."
-			elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
-		fi
-		if ver_test "${old_ver}" -lt "8.2_p1"; then
-			ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you"
-			ewarn "will not be able to establish new sessions. Restarting sshd over a ssh"
-			ewarn "connection is generally safe."
-		fi
-		if ver_test "${old_ver}" -lt "9.2_p1-r1" && systemd_is_booted; then
-			ewarn "From openssh-9.2_p1-r1 the supplied systemd unit file defaults to"
-			ewarn "'Restart=on-failure', which causes the service to automatically restart if it"
-			ewarn "terminates with an unclean exit code or signal. This feature is useful for most users,"
-			ewarn "but it can increase the vulnerability of the system in the event of a future exploit."
-			ewarn "If you have a web-facing setup or are concerned about security, it is recommended to"
-			ewarn "set 'Restart=no' in your sshd unit file."
-		fi
-	done
-
-	if [[ -n ${show_ssl_warning} ]]; then
-		elog "Be aware that by disabling openssl support in openssh, the server and clients"
-		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
-		elog "and update all clients/servers that utilize them."
-	fi
-
-	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
-		elog ""
-		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
-		elog "and therefore disabled at runtime per default."
-		elog "Make sure your sshd_config is up to date and contains"
-		elog ""
-		elog "  DisableMTAES yes"
-		elog ""
-		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
-		elog ""
-	fi
-}
diff --git a/net-misc/openssh-contrib/openssh-contrib-9.3_p2.ebuild b/net-misc/openssh-contrib/openssh-contrib-9.3_p2.ebuild
deleted file mode 100644
index e85108222e01..000000000000
--- a/net-misc/openssh-contrib/openssh-contrib-9.3_p2.ebuild
+++ /dev/null
@@ -1,507 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
-
-# Make it more portable between straight releases
-# and _p? releases.
-MY_P=${P/-contrib/}
-PARCH=${MY_P/_}
-
-# PV to USE for HPN patches
-#HPN_PV="${PV^^}"
-HPN_PV="8.5_P1"
-
-HPN_VER="15.2"
-HPN_PATCHES=(
-	openssh-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
-	openssh-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff
-)
-HPN_GLUE_PATCH="openssh-9.3_p2-hpn-${HPN_VER}-glue.patch"
-HPN_PATCH_DIR="HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}"
-
-X509_VER="14.1.1"
-X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
-X509_PATCH="${X509_PATCH/p2/p1}"
-X509_GLUE_PATCH="openssh-${PV}-X509-glue-${X509_VER}.patch"
-X509_HPN_GLUE_PATCH="${MY_P}-hpn-${HPN_VER}-X509-${X509_VER}-glue.patch"
-
-DESCRIPTION="Port of OpenBSD's free SSH release with HPN/X509 patches"
-HOMEPAGE="https://www.openssh.com/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	${HPN_VER:+hpn? (
-		$(printf "mirror://sourceforge/project/hpnssh/Patches/${HPN_PATCH_DIR}/%s\n" "${HPN_PATCHES[@]}")
-		https://dev.gentoo.org/~chutzpah/dist/openssh/${HPN_GLUE_PATCH}.xz
-	)}
-	${X509_VER:+X509? (
-		https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH}
-		https://dev.gentoo.org/~chutzpah/dist/openssh/${X509_GLUE_PATCH}.xz
-		${HPN_VER:+hpn? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${X509_HPN_GLUE_PATCH}.xz )}
-	)}
-	verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc )
-"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssh.org.asc
-S="${WORKDIR}/${PARCH}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-# Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test X X509 xmss"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	hpn? ( ssl )
-	ldns? ( ssl )
-	pie? ( !static )
-	static? ( !kerberos !pam )
-	X509? ( ssl !xmss )
-	xmss? ( ssl  )
-	test? ( ssl )
-"
-
-# tests currently fail with XMSS
-REQUIRED_USE+="test? ( !xmss )"
-
-LIB_DEPEND="
-	audit? ( sys-process/audit[static-libs(+)] )
-	ldns? (
-		net-libs/ldns[static-libs(+)]
-		net-libs/ldns[ecdsa(+),ssl(+)]
-	)
-	libedit? ( dev-libs/libedit:=[static-libs(+)] )
-	security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] )
-	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
-	ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] )
-	virtual/libcrypt:=[static-libs(+)]
-	>=sys-libs/zlib-1.2.3:=[static-libs(+)]
-"
-RDEPEND="
-	!net-misc/openssh
-	acct-group/sshd
-	acct-user/sshd
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( sys-libs/pam )
-	kerberos? ( virtual/krb5 )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) )
-	static? ( ${LIB_DEPEND} )
-"
-RDEPEND="${RDEPEND}
-	pam? ( >=sys-auth/pambase-20081028 )
-	!prefix? ( sys-apps/shadow )
-	X? ( x11-apps/xauth )
-"
-# Weird dep construct for newer gcc-config for bug #872416
-BDEPEND="
-	dev-build/autoconf
-	virtual/pkgconfig
-	|| (
-		>=sys-devel/gcc-config-2.6
-		>=sys-devel/clang-toolchain-symlinks-14-r1:14
-		>=sys-devel/clang-toolchain-symlinks-15-r1:15
-		>=sys-devel/clang-toolchain-symlinks-16-r1:*
-	)
-	verify-sig? ( sec-keys/openpgp-keys-openssh )
-"
-
-PATCHES=(
-	"${FILESDIR}/openssh-7.9_p1-include-stdlib.patch"
-	"${FILESDIR}/openssh-8.7_p1-GSSAPI-dns.patch" #165444 integrated into gsskex
-	"${FILESDIR}/openssh-6.7_p1-openssl-ignore-status.patch"
-	"${FILESDIR}/openssh-7.5_p1-disable-conch-interop-tests.patch"
-	"${FILESDIR}/openssh-8.0_p1-fix-putty-tests.patch"
-	"${FILESDIR}/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch"
-	"${FILESDIR}/openssh-8.9_p1-allow-ppoll_time64.patch" #834019
-	"${FILESDIR}/openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch" #834044
-	"${FILESDIR}/openssh-9.3_p1-openssl-version-compat-check.patch"
-	"${FILESDIR}/openssh-9.3_p2-zlib-1.3.patch" #912767
-)
-
-pkg_pretend() {
-	# this sucks, but i'd rather have people unable to `emerge -u openssh`
-	# than not be able to log in to their server any more
-	local missing=()
-	check_feature() { use "${1}" && [[ -z ${!2} ]] && missing+=( "${1}" ); }
-	check_feature hpn HPN_VER
-	check_feature X509 X509_PATCH
-	if [[ ${#missing[@]} -ne 0 ]] ; then
-		eerror "Sorry, but this version does not yet support features"
-		eerror "that you requested: ${missing[*]}"
-		eerror "Please mask ${PF} for now and check back later:"
-		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
-		die "Missing requested third party patch."
-	fi
-
-	# Make sure people who are using tcp wrappers are notified of its removal. #531156
-	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
-		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
-		ewarn "you're trying to use it.  Update your ${EROOT}/etc/hosts.{allow,deny} please."
-	fi
-}
-
-src_unpack() {
-	default
-
-	# We don't have signatures for HPN, X509, so we have to write this ourselves
-	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${PARCH}.tar.gz{,.asc}
-}
-
-src_prepare() {
-	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
-		pathnames.h || die
-
-	# don't break .ssh/authorized_keys2 for fun
-	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
-	eapply -- "${PATCHES[@]}"
-
-	[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
-
-	local PATCHSET_VERSION_MACROS=()
-
-	if use X509 ; then
-		pushd "${WORKDIR}" &>/dev/null || die
-		eapply "${WORKDIR}/${X509_GLUE_PATCH}"
-		popd &>/dev/null || die
-
-		eapply "${WORKDIR}"/${X509_PATCH%.*}
-		eapply "${FILESDIR}/openssh-9.0_p1-X509-uninitialized-delay.patch"
-
-		# We need to patch package version or any X.509 sshd will reject our ssh client
-		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
-		# error
-		einfo "Patching package version for X.509 patch set ..."
-		sed -i \
-			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
-			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
-
-		einfo "Patching version.h to expose X.509 patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
-	fi
-
-	if use hpn ; then
-		local hpn_patchdir="${T}/openssh-${PV}-hpn${HPN_VER}"
-		mkdir "${hpn_patchdir}" || die
-		cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die
-		pushd "${hpn_patchdir}" &>/dev/null || die
-		eapply "${WORKDIR}/${HPN_GLUE_PATCH}"
-		use X509 && eapply "${WORKDIR}/${X509_HPN_GLUE_PATCH}"
-		popd &>/dev/null || die
-
-		eapply "${hpn_patchdir}"
-
-		use X509 || eapply "${FILESDIR}/openssh-8.6_p1-hpn-version.patch"
-
-		einfo "Patching Makefile.in for HPN patch set ..."
-		sed -i \
-			-e "/^LIBS=/ s/\$/ -lpthread/" \
-			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
-
-		einfo "Patching version.h to expose HPN patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER//./v}\"" \
-			"${S}"/version.h || die "Failed to sed-in HPN patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
-
-		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
-			# Before re-enabling, check https://bugs.gentoo.org/354113#c6
-			# and be sure to have tested it.
-			einfo "Disabling known non-working MT AES cipher per default ..."
-
-			cat > "${T}"/disable_mtaes.conf <<- EOF
-
-			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
-			# and therefore disabled per default.
-			DisableMTAES yes
-			EOF
-			sed -i \
-				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
-				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
-
-			sed -i \
-				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
-				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
-		fi
-	fi
-
-	if use X509 || use hpn ; then
-		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
-		sed -i \
-			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
-			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
-
-		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
-		sed -i \
-			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
-			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
-
-		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
-		sed -i \
-			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
-			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
-	fi
-
-	eapply_user #473004
-
-	# These tests are currently incompatible with PORTAGE_TMPDIR/sandbox
-	sed -e '/\t\tpercent \\/ d' \
-		-i regress/Makefile || die
-
-	tc-export PKG_CONFIG
-	local sed_args=(
-		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
-		# Disable fortify flags ... our gcc does this for us
-		-e 's:-D_FORTIFY_SOURCE=2::'
-	)
-
-	# _XOPEN_SOURCE causes header conflicts on Solaris
-	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
-		-e 's/-D_XOPEN_SOURCE//'
-	)
-	sed -i "${sed_args[@]}" configure{.ac,} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	addwrite /dev/ptmx
-
-	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
-	use static && append-ldflags -static
-	use xmss && append-cflags -DWITH_XMSS
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# Solaris' glob.h doesn't have things like GLOB_TILDE, configure
-		# doesn't check for this, so force the replacement to be put in
-		# place
-		append-cppflags -DBROKEN_GLOB
-	fi
-
-	# use replacement, RPF_ECHO_ON doesn't exist here
-	[[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no
-
-	local myconf=(
-		--with-ldflags="${LDFLAGS}"
-		--disable-strip
-		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-		--sysconfdir="${EPREFIX}"/etc/ssh
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
-		--datadir="${EPREFIX}"/usr/share/openssh
-		--with-privsep-path="${EPREFIX}"/var/empty
-		--with-privsep-user=sshd
-		--with-hardening
-		$(use_with audit audit linux)
-		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
-		$(use_with ldns)
-		$(use_with libedit)
-		$(use_with pam)
-		$(use_with pie)
-		$(use_with selinux)
-		$(usex X509 '' "$(use_with security-key security-key-builtin)")
-		$(use_with ssl openssl)
-		$(use_with ssl ssl-engine)
-	)
-
-	if use elibc_musl; then
-		# musl defines bogus values for UTMP_FILE and WTMP_FILE
-		# https://bugs.gentoo.org/753230
-		myconf+=( --disable-utmp --disable-wtmp )
-	fi
-
-	# Workaround for Clang 15 miscompilation with -fzero-call-used-regs=all
-	# bug #869839 (https://github.com/llvm/llvm-project/issues/57692)
-	tc-is-clang && myconf+=( --without-hardening )
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	local tests=( compat-tests )
-	local shell=$(egetshell "${UID}")
-	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
-		ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
-		ewarn "user, so we will run a subset only."
-		tests+=( interop-tests )
-	else
-		tests+=( tests )
-	fi
-
-	local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1
-	mkdir -p "${HOME}"/.ssh || die
-	emake -j1 "${tests[@]}" </dev/null
-}
-
-# Gentoo tweaks to default config files.
-tweak_ssh_configs() {
-	local locale_vars=(
-		# These are language variables that POSIX defines.
-		# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
-		LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
-
-		# These are the GNU extensions.
-		# https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
-		LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
-	)
-
-	dodir /etc/ssh/ssh_config.d /etc/ssh/sshd_config.d
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config || die
-	Include "${EPREFIX}/etc/ssh/ssh_config.d/*.conf"
-	EOF
-	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config || die
-	Include "${EPREFIX}/etc/ssh/sshd_config.d/*.conf"
-	EOF
-
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die
-	# Send locale environment variables (bug #367017)
-	SendEnv ${locale_vars[*]}
-
-	# Send COLORTERM to match TERM (bug #658540)
-	SendEnv COLORTERM
-	EOF
-
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo-security.conf || die
-	RevokedHostKeys "${EPREFIX}/etc/ssh/ssh_revoked_hosts"
-	EOF
-
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_revoked_hosts || die
-	# https://github.blog/2023-03-23-we-updated-our-rsa-ssh-host-key/
-	ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
-	EOF
-
-	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die
-	# Allow client to pass locale environment variables (bug #367017)
-	AcceptEnv ${locale_vars[*]}
-
-	# Allow client to pass COLORTERM to match TERM (bug #658540)
-	AcceptEnv COLORTERM
-	EOF
-
-	if use pam ; then
-		cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die
-		UsePAM yes
-		# This interferes with PAM.
-		PasswordAuthentication no
-		# PAM can do its own handling of MOTD.
-		PrintMotd no
-		PrintLastLog no
-		EOF
-	fi
-
-	if use livecd ; then
-		cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-livecd.conf || die
-		# Allow root login with password on livecds.
-		PermitRootLogin Yes
-		EOF
-	fi
-}
-
-src_install() {
-	emake install-nokeys DESTDIR="${D}"
-	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd-r1.initd sshd
-	newconfd "${FILESDIR}"/sshd-r1.confd sshd
-
-	if use pam; then
-		newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-	fi
-
-	tweak_ssh_configs
-
-	doman contrib/ssh-copy-id.1
-	dodoc CREDITS OVERVIEW README* TODO sshd_config
-	use hpn && dodoc HPN-README
-	use X509 || dodoc ChangeLog
-
-	diropts -m 0700
-	dodir /etc/skel/.ssh
-	rmdir "${ED}"/var/empty || die
-
-	systemd_dounit "${FILESDIR}"/sshd.socket
-	systemd_newunit "${FILESDIR}"/sshd.service.1 sshd.service
-	systemd_newunit "${FILESDIR}"/sshd_at.service.1 'sshd@.service'
-}
-
-pkg_preinst() {
-	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then
-		show_ssl_warning=1
-	fi
-}
-
-pkg_postinst() {
-	local old_ver
-	for old_ver in ${REPLACING_VERSIONS}; do
-		if ver_test "${old_ver}" -lt "5.8_p1"; then
-			elog "Starting with openssh-5.8p1, the server will default to a newer key"
-			elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
-			elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
-		fi
-		if ver_test "${old_ver}" -lt "7.0_p1"; then
-			elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
-			elog "Make sure to update any configs that you might have.  Note that xinetd might"
-			elog "be an alternative for you as it supports USE=tcpd."
-		fi
-		if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518
-			elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
-			elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
-			elog "adding to your sshd_config or ~/.ssh/config files:"
-			elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
-			elog "You should however generate new keys using rsa or ed25519."
-
-			elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
-			elog "to 'prohibit-password'.  That means password auth for root users no longer works"
-			elog "out of the box.  If you need this, please update your sshd_config explicitly."
-		fi
-		if ver_test "${old_ver}" -lt "7.6_p1"; then
-			elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
-			elog "Furthermore, rsa keys with less than 1024 bits will be refused."
-		fi
-		if ver_test "${old_ver}" -lt "7.7_p1"; then
-			elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
-			elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
-			elog "if you need to authenticate against LDAP."
-			elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
-		fi
-		if ver_test "${old_ver}" -lt "8.2_p1"; then
-			ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you"
-			ewarn "will not be able to establish new sessions. Restarting sshd over a ssh"
-			ewarn "connection is generally safe."
-		fi
-		if ver_test "${old_ver}" -lt "9.2_p1-r1" && systemd_is_booted; then
-			ewarn "From openssh-9.2_p1-r1 the supplied systemd unit file defaults to"
-			ewarn "'Restart=on-failure', which causes the service to automatically restart if it"
-			ewarn "terminates with an unclean exit code or signal. This feature is useful for most users,"
-			ewarn "but it can increase the vulnerability of the system in the event of a future exploit."
-			ewarn "If you have a web-facing setup or are concerned about security, it is recommended to"
-			ewarn "set 'Restart=no' in your sshd unit file."
-		fi
-	done
-
-	if [[ -n ${show_ssl_warning} ]]; then
-		elog "Be aware that by disabling openssl support in openssh, the server and clients"
-		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
-		elog "and update all clients/servers that utilize them."
-	fi
-
-	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
-		elog ""
-		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
-		elog "and therefore disabled at runtime per default."
-		elog "Make sure your sshd_config is up to date and contains"
-		elog ""
-		elog "  DisableMTAES yes"
-		elog ""
-		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
-		elog ""
-	fi
-}
diff --git a/net-misc/openssh-contrib/openssh-contrib-9.4_p1-r1.ebuild b/net-misc/openssh-contrib/openssh-contrib-9.6_p1.ebuild
index 80175aaaaf80..4f323c2a427c 100644
--- a/net-misc/openssh-contrib/openssh-contrib-9.4_p1-r1.ebuild
+++ b/net-misc/openssh-contrib/openssh-contrib-9.6_p1.ebuild
@@ -19,10 +19,10 @@ HPN_PATCHES=(
 	openssh-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
 	openssh-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff
 )
-HPN_GLUE_PATCH="openssh-9.3_p2-hpn-${HPN_VER}-glue.patch"
+HPN_GLUE_PATCH="openssh-9.6_p1-hpn-${HPN_VER}-glue.patch"
 HPN_PATCH_DIR="HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}"
 
-X509_VER="14.2.1"
+X509_VER="14.4.2"
 X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
 X509_PATCH="${X509_PATCH/p2/p1}"
 X509_GLUE_PATCH="openssh-${PV}-X509-glue-${X509_VER}.patch"
@@ -104,9 +104,8 @@ BDEPEND="
 	virtual/pkgconfig
 	|| (
 		>=sys-devel/gcc-config-2.6
-		>=sys-devel/clang-toolchain-symlinks-14-r1:14
-		>=sys-devel/clang-toolchain-symlinks-15-r1:15
 		>=sys-devel/clang-toolchain-symlinks-16-r1:*
+		>=sys-devel/clang-toolchain-symlinks-15-r1:15
 	)
 	verify-sig? ( sec-keys/openpgp-keys-openssh )
 "
@@ -119,7 +118,6 @@ PATCHES=(
 	"${FILESDIR}/openssh-8.0_p1-fix-putty-tests.patch"
 	"${FILESDIR}/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch"
 	"${FILESDIR}/openssh-8.9_p1-allow-ppoll_time64.patch" #834019
-	"${FILESDIR}/openssh-9.3_p2-zlib-1.3.patch" #912767
 )
 
 pkg_pretend() {
@@ -199,7 +197,7 @@ src_prepare() {
 
 		eapply "${hpn_patchdir}"
 
-		use X509 || eapply "${FILESDIR}/openssh-8.6_p1-hpn-version.patch"
+		use X509 || eapply "${FILESDIR}/openssh-9.6_p1-hpn-version.patch"
 
 		einfo "Patching Makefile.in for HPN patch set ..."
 		sed -i \
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index edf3405ebbde..cc2c45d0776a 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 30d7bfd4eb6c..0cb8582d6f5b 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Ionen Wolkens <ionen@gentoo.org> (2024-02-07)
+# nvidia-powerd is only available for arm64 in 550+
+<x11-drivers/nvidia-drivers-550 powerd
+
 # Alexander Tsoy <alexander@tsoy.me> (2024-01-31)
 # Supports 64-bit NEON
 media-libs/zita-resampler -cpu_flags_arm_neon
diff --git a/profiles/arches.desc b/profiles/arches.desc
index 814592ed9298..965e36c6c0c1 100644
--- a/profiles/arches.desc
+++ b/profiles/arches.desc
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file specifies keyword level for profiles
@@ -36,6 +36,7 @@ riscv-linux	testing
 x86-linux	testing
 arm64-macos	testing
 ppc-macos	testing
+x86-macos	testing
 x64-macos	testing
 x64-solaris	testing
 
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0af3f951e8e2..412098528246 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -8750,6 +8750,7 @@ x11-base/xwayland:unwind - Enable libunwind usage for backtraces
 x11-base/xwayland:xcsecurity - Build Security extension
 x11-drivers/nvidia-drivers:kernel-open - Use the open source variant of drivers (Turing/Ampere+ GPUs only, aka GTX 1650+, experimental)
 x11-drivers/nvidia-drivers:persistenced - Install the persistence daemon for keeping devices state when unused (e.g. for headless)
+x11-drivers/nvidia-drivers:powerd - Install the NVIDIA dynamic boost support daemon (only useful with specific laptops, ignore if unsure)
 x11-drivers/nvidia-drivers:static-libs - Install the XNVCtrl static library for accessing sensors and other features
 x11-drivers/nvidia-drivers:tools - Install additional tools such as nvidia-settings
 x11-drivers/xf86-video-geode:ztv - Enable building the V4L2 ZTV driver
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index ae98613f8462..14b5bd03ca76 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index be7ef057a52d..fc408726225a 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -3,5 +3,5 @@ DIST lapack-3.11.tar.gz 7723909 BLAKE2B b3f8ec8cd439d790ba5869b8b071fe924a4ac533
 DIST lapack-3.12.0.tar.gz 7933607 BLAKE2B dafb1f9a717f2cbc00a26f8cff2c7a1ebb720714fe6d7bd5fabb511a2f4af317165814340864c9d601e4e16c7762f643fbbafc058170ebcdc6529a9b4f2d70b6 SHA512 f8f3c733a0221be0b3f5618235408ac59cbd4e5f1c4eab5f509b831a6ec6a9ef14b8849aa6ea10810df1aff90186ca454d15e9438d1dd271c2449d42d3da9dda
 EBUILD lapack-3.10.1.ebuild 2984 BLAKE2B f290299c23d29e927d96cbb42b6f19fa5fa8a74bfcb40628220e0f080d60e9d94ecc0d7126acaf8753c9cbd94c5bd4ea55c986e3fef2f698a2d7a64757564201 SHA512 5f415f31998581ef18eaae12ad2bc59a023405327d0fb60aeb632c42ecd19ee9301020c0e4bfacafd72958ba65254dbdfe63d0f7c123e3848d2d7e8694c80823
 EBUILD lapack-3.11.ebuild 3292 BLAKE2B 6ff66cf01537913eb1aae2ea5b0e68dedaeededf9b548157df543ee12769e106eb83b27abcbf9825162ec407f5ac520218c6b6ed0e8cc1469cedbdcd081a2f9a SHA512 edcb4a18b722013837605908f30f5155670de57692d375bb7eafcd1dce2008853bd10191d36a3571177437a14c7d333419f83d185714ec1523153447cdfe47f7
-EBUILD lapack-3.12.0.ebuild 3403 BLAKE2B dc6afd09bf76c3f5a307b25fd41ab7fced727bf2ef86af094bd1be26eeab36ab125a9468276af59337c5b39386074392f1d017aab6c73a7ba6fef09d750810e4 SHA512 bc0024b1c267dbdb9054f026306c01fb473668963620e7fcc03eed4da5bc5519cc95aee53d28401de25e84f2d146bf045b99a291b3556c4462bbfb0d9f8e1168
+EBUILD lapack-3.12.0.ebuild 3402 BLAKE2B 4103b444c332ff86f5a5dbe3fbc7077252bee10fcc42113555adb873e363616831ff08b5b36cdd4a3f9be193d981203ef1f26a9adc0c20cd8faa58cfc6ab72c4 SHA512 b3ed0fa4d97dc92ce7cc9fc3efb637ebad30c16fd114d89e7300e84489eb893151fa18e55abdad0d07ef842a561476c2d3d245caff268e2bece841fdaac22940
 MISC metadata.xml 1583 BLAKE2B 8db26f3744a6ee5f88f7ad37e749843eb8b63cd11af4182dd9d6408a854a5b060a651abd5f2f2098252a38b68b34c464a99f9654be9e6cba8f444eff23e4e297 SHA512 d8e8eb140e1a05f297b9e6edcc9aeb48e958baa7741be2a693ea4fca1a6d3f66a60d72c4c61e2dac8b8efd6210daf10ea9350fdbcfbaf801ac6366d0025ad2ca
diff --git a/sci-libs/lapack/lapack-3.12.0.ebuild b/sci-libs/lapack/lapack-3.12.0.ebuild
index 505568329166..db09c93034a9 100644
--- a/sci-libs/lapack/lapack-3.12.0.ebuild
+++ b/sci-libs/lapack/lapack-3.12.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos"
 # TODO: static-libs 64bit-index
 IUSE="lapacke deprecated doc eselect-ldso test"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e79c7b4ac35c..59c8e4462d4b 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index b11a9c7f9b92..637074e8de6c 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -2,5 +2,5 @@ AUX acl-2.3.1-musl-1.2.4-lfs64-fix.patch 1028 BLAKE2B 3ce13de7ee1f58b7fd1c39ca9b
 DIST acl-2.3.1.tar.xz 355676 BLAKE2B 15e81e8159ddb21ef0c262bef3101c0b6fa546738a2ab74c01ccc21fd1c3dc8ab6aaf84a06dee6da22291f3ca4feeffa60c7d11bfac1ab770a6ec28e1f1655e0 SHA512 7d02f05d17305f8587ab485395b00c7fdb8e44c1906d0d04b70a43a3020803e8b2b8c707abb6147f794867dfa87bd51769c2d3e11a3db55ecbd2006a6e6231dc
 DIST acl-2.3.2.tar.xz 371680 BLAKE2B 9f2abfddcd403df2c716c05f02a1b52453613d10948dc58a65b9ef41b44e37db6de99fb22dcfc4f6f0fb5d0319c939da61bd4e0fba2cdb5643e8087ecd34eeac SHA512 c2d061dbfd28c00cecbc1ae614d67f3138202bf4d39b383f2df4c6a8b10b830f33acec620fb211f268478737dde4037d338a5823af445253cb088c48a135099b
 EBUILD acl-2.3.1-r2.ebuild 1951 BLAKE2B af49c5dff0ec7e53fdc1f8671eab74fe88184b3a22e62beef1e4a9db1ffe8268ccffca52f9e2f4981862d21da0553c4dece14422bd4201d2df8f37a4c0ab416a SHA512 fff12fef1da544137734a8c524b0f812cb7c353b94ce5e82f35bb266c65300923d5c7dd17f95c30606f673cd23500891246c5b2595ac7589e3fe76564315b456
-EBUILD acl-2.3.2.ebuild 1379 BLAKE2B 20a7fbc8b342726d0ff42fdebc93d18833470f65e998e9698a02b4c2a1ff6ffac27147f27422afbb914ff9fe4c2a5fd03d7d63121070f1ebb08d5740c5f469c8 SHA512 a86bf381a230f885b30a5832a00ac9ebe6803c8b4ddd09c1951e632d31c205f1c1c8b584c7963903f8931bc0538812924f2c5811ba3f525628a26e25306d6321
+EBUILD acl-2.3.2-r1.ebuild 1278 BLAKE2B cbacdd9ea411196be2fe89d4fb24291a6e50905eecc55e2c75dd0f75278bee705082ea29569cdefccbfff7b3e7402a58ed089d20217d782c17bfba5d9bf15146 SHA512 2edc2c2832c978ca160b845939f1121fed68f5d9fbeec687900219e2a491762f81aea4c2074f23c53f762bd2fb4bfdbad06f6842b9cbd584f2d23e930fef8887
 MISC metadata.xml 345 BLAKE2B b168c40ceb66cfacdb1fbe9b5031705f5c3249afeb872163663564dac2ea85e6fa857804831a80b4c44323223b417a24a156d27f8231396d5b090e44a0dc9288 SHA512 e0cbeec10fb47ace3d0fd3c1ba8a5a0bba02345a3e0df30aa82777507fb6ab75f2705b06e7635a00406d2b0839bc41d0a9fafcd8926844e1d9877b8cf2ed6f78
diff --git a/sys-apps/acl/acl-2.3.2.ebuild b/sys-apps/acl/acl-2.3.2-r1.ebuild
index 1143bebd9578..83ade1a687c9 100644
--- a/sys-apps/acl/acl-2.3.2.ebuild
+++ b/sys-apps/acl/acl-2.3.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic libtool multilib-minimal usr-ldscript
+inherit flag-o-matic libtool multilib-minimal
 
 DESCRIPTION="Access control list utilities, libraries, and headers"
 HOMEPAGE="https://savannah.nongnu.org/projects/acl"
@@ -48,13 +48,6 @@ multilib_src_test() {
 	multilib_is_native_abi && default
 }
 
-multilib_src_install() {
-	default
-
-	# Move shared libs to /
-	gen_usr_ldscript -a acl
-}
-
 multilib_src_install_all() {
 	if ! use static-libs ; then
 		find "${ED}" -type f -name "*.la" -delete || die
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index 97148bc78968..78af3ac68bd9 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -3,6 +3,6 @@ AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f
 DIST attr-2.5.1.tar.xz 318188 BLAKE2B 876dcbd802ea79b7851640f208820ffdfb73dc46065af673037c6dd50ad2af158f9f74b34cf45728baf9d0cc5572b40c3f102aa2907245a877db0d3879e38f04 SHA512 9e5555260189bb6ef2440c76700ebb813ff70582eb63d446823874977307d13dfa3a347dfae619f8866943dfa4b24ccf67dadd7e3ea2637239fdb219be5d2932
 DIST attr-2.5.2.tar.xz 334180 BLAKE2B cf26348c3a96622e4f62493ac7655e14b6580d36a5784ef4c3750178856eceabd33192fd58516be21c8aa1ad41d56c024ad440ef4bc922bed8f7a4984ea16c63 SHA512 f587ea544effb7cfed63b3027bf14baba2c2dbe3a9b6c0c45fc559f7e8cb477b3e9a4a826eae30f929409468c50d11f3e7dc6d2500f41e1af8662a7e96a30ef3
 EBUILD attr-2.5.1-r2.ebuild 2365 BLAKE2B 25f73132b6c1e92a6786474718cf399e5e1958be5b63d455e85d6e466febcab161c4787fda2e35958b55c90999a11d1378805197f5bc21895681ceaf489cebae SHA512 1f81875d8338e9df204cfc75b5c12d3e40fc3c782c2105bf8d02bc2e3b99455303bb99cff2da44bdfd1a20c3146bd1e2c13866f27c70da9b6ed620cc95d9234b
-EBUILD attr-2.5.2.ebuild 1569 BLAKE2B 030fb32e6d92e176d411ca3ffcae4f8ef7f2899efa15f26a8467495145be833fd8c75b493b385293e4d2493ea2b9c1861b17a47bf60463d243a1dc7da0370d35 SHA512 9c9e430773fc3a24abfed98bd9eb8ecdfce577a3334bb1ba41e48defc3ff2297842e2cab278d2328a43bca5480a9e852a736fdfdaa08d6344e0fc32b9301e474
-EBUILD attr-9999.ebuild 1569 BLAKE2B 030fb32e6d92e176d411ca3ffcae4f8ef7f2899efa15f26a8467495145be833fd8c75b493b385293e4d2493ea2b9c1861b17a47bf60463d243a1dc7da0370d35 SHA512 9c9e430773fc3a24abfed98bd9eb8ecdfce577a3334bb1ba41e48defc3ff2297842e2cab278d2328a43bca5480a9e852a736fdfdaa08d6344e0fc32b9301e474
+EBUILD attr-2.5.2-r1.ebuild 1426 BLAKE2B bc876babca1c006bac117c2c0c1fbdc2ce178963e302c6dd50541fe79e6360efb0aed20398ac01f1773f652180f967d4ae1b87ec1312d361555e52d380ac8051 SHA512 61effca67ce3d0496d29d1a989eca3fba11d277649613462adf2aa098ea241eb9802befc59181555ae2ae3e27ff990b408c61b9cfca28a4c812f36ae9981f24a
+EBUILD attr-9999.ebuild 1426 BLAKE2B bc876babca1c006bac117c2c0c1fbdc2ce178963e302c6dd50541fe79e6360efb0aed20398ac01f1773f652180f967d4ae1b87ec1312d361555e52d380ac8051 SHA512 61effca67ce3d0496d29d1a989eca3fba11d277649613462adf2aa098ea241eb9802befc59181555ae2ae3e27ff990b408c61b9cfca28a4c812f36ae9981f24a
 MISC metadata.xml 389 BLAKE2B e857460e11e0ea047e3cc0a9ee3f02e9271dc01d12d82fc9412348dc2fd1173fc5ed2c12a9c4de5cb7098eb2de2a78f6865ef88148179f67121a92c04eb509e9 SHA512 ae5a0d549f4226808931af6479c023d6d02a7f40c8eed053e534061458bd3e7a1921bbb24bf4a8f5f02816f66ca6e17b9774c00b3063ffaf2adba7e2a921dd00
diff --git a/sys-apps/attr/attr-2.5.2.ebuild b/sys-apps/attr/attr-2.5.2-r1.ebuild
index 0c5a2dce3464..8aac35056b3e 100644
--- a/sys-apps/attr/attr-2.5.2.ebuild
+++ b/sys-apps/attr/attr-2.5.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit multilib-minimal usr-ldscript
+inherit multilib-minimal
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
@@ -53,11 +53,6 @@ multilib_src_configure() {
 multilib_src_install() {
 	emake DESTDIR="${D}" install
 
-	if multilib_is_native_abi; then
-		# We install attr into /bin, so we need the shared lib with it
-		gen_usr_ldscript -a attr
-	fi
-
 	# Add a wrapper until people upgrade.
 	# TODO: figure out when this was added & when we can drop it!
 	insinto /usr/include/attr
diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-9999.ebuild
index 0c5a2dce3464..8aac35056b3e 100644
--- a/sys-apps/attr/attr-9999.ebuild
+++ b/sys-apps/attr/attr-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit multilib-minimal usr-ldscript
+inherit multilib-minimal
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
@@ -53,11 +53,6 @@ multilib_src_configure() {
 multilib_src_install() {
 	emake DESTDIR="${D}" install
 
-	if multilib_is_native_abi; then
-		# We install attr into /bin, so we need the shared lib with it
-		gen_usr_ldscript -a attr
-	fi
-
 	# Add a wrapper until people upgrade.
 	# TODO: figure out when this was added & when we can drop it!
 	insinto /usr/include/attr
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index ef3b7b3821e2..cdb2c2f691d8 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -12,5 +12,5 @@ DIST systemd-stable-254.9.tar.gz 14423806 BLAKE2B ab39c0a00b8451b24b40e39f4bf7ec
 EBUILD systemd-utils-254.5-r2.ebuild 13438 BLAKE2B 62053032c87e27db1ce64ab57c21d59305a681dd79fbeac3c88aef4b29c5dab0f98370a94d2e000ae3a742c9211291e6b6e469b95e3f3fc052942099ecf38921 SHA512 81b918ca31103c1953d92b3c6b9d8bac19c56ad4be59173a4a447e78e2ac7eb1c8789198fc6c33156d024370e94f5c39c8a91d01f17fcf4d28162bdaa7d1270e
 EBUILD systemd-utils-254.7.ebuild 13438 BLAKE2B 62053032c87e27db1ce64ab57c21d59305a681dd79fbeac3c88aef4b29c5dab0f98370a94d2e000ae3a742c9211291e6b6e469b95e3f3fc052942099ecf38921 SHA512 81b918ca31103c1953d92b3c6b9d8bac19c56ad4be59173a4a447e78e2ac7eb1c8789198fc6c33156d024370e94f5c39c8a91d01f17fcf4d28162bdaa7d1270e
 EBUILD systemd-utils-254.8.ebuild 13438 BLAKE2B 62053032c87e27db1ce64ab57c21d59305a681dd79fbeac3c88aef4b29c5dab0f98370a94d2e000ae3a742c9211291e6b6e469b95e3f3fc052942099ecf38921 SHA512 81b918ca31103c1953d92b3c6b9d8bac19c56ad4be59173a4a447e78e2ac7eb1c8789198fc6c33156d024370e94f5c39c8a91d01f17fcf4d28162bdaa7d1270e
-EBUILD systemd-utils-254.9.ebuild 13446 BLAKE2B 61a389ac353a77e2673c5b1fd23d37099f7dc4491aef107d63668821b794517e7768af5e90c5d69aeb3fa1cd8c9b5e5ded1e1ab28d1a70cdd7d86c5ed85b465c SHA512 85754bbe69776963fe34d9cefb097d8b95c997ff642408b419288fbc6e2a675e81f34190be6e061473803bab74a99aaf2945ec896ea257451fca9d2fc040e27e
+EBUILD systemd-utils-254.9-r1.ebuild 13406 BLAKE2B 449e1933a2ab091466acbea019572d098881f55333200cbfcde87e58a7fed83fd4775f10eb2a60033f3fa1c654f6b7ffde11ab9545877a556aef7165a4a2e5f0 SHA512 ecb864a2f00ba37d696a53be92e04a7d57862ec519f9bb0b756e5493e3cc2da92265889cef95f215eb8945942214a937758e62979e3181954db1f1a8feb310cb
 MISC metadata.xml 888 BLAKE2B b799e1d62a1208dbbec1a1cfb47592b069d5c79cb18efffef922c72b0d61e30938d26c6f4e0d3951f9c327601dd71de14062dad0a47e6b84a61b1a8b125f1a6b SHA512 6debd964f9c127ba4332e0c0b86e506d3cf10cbe3cd45442bf7955b16e790a9eccdd928d473b3722b11b4a75d34fe5bb91f4867a5dc92e786ba73d9ec3f54712
diff --git a/sys-apps/systemd-utils/systemd-utils-254.9.ebuild b/sys-apps/systemd-utils/systemd-utils-254.9-r1.ebuild
index 0f7730c67c88..e0ac974de10f 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.9.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.9-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..12} )
 QA_PKGCONFIG_VERSION=$(ver_cut 1)
 
 inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
-inherit python-single-r1 secureboot toolchain-funcs udev usr-ldscript
+inherit python-single-r1 secureboot toolchain-funcs udev
 
 DESCRIPTION="Utilities split out from systemd for OpenRC users"
 HOMEPAGE="https://systemd.io/"
@@ -494,7 +494,6 @@ multilib_src_install() {
 	fi
 	if use udev; then
 		meson_install --no-rebuild --tags libudev
-		gen_usr_ldscript -a udev
 		insinto "/usr/$(get_libdir)/pkgconfig"
 		doins src/libudev/libudev.pc
 	fi
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index a357ce2a8f02..a3414d76027e 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -14,6 +14,6 @@ DIST util-linux-2.39.3.tar.sign 833 BLAKE2B 433b9ad6e97d9e2ffbd516addf8406587d00
 DIST util-linux-2.39.3.tar.xz 8526168 BLAKE2B cd7b2b3c820e920d4a6ecd46fd807e018fc8e54439292f5e62c5f6863dd0f2505df3ec02c470d9be255a437c6ee8e4077908ac78d19a0d1273854d99eb571df0 SHA512 a2de1672f06ca5d2d431db1265a8499808770c3781019ec4a3a40170df4685826d8e3ca120841dcc5df4681ca8c935a993317bd0dc70465b21bf8e0efef65afa
 EBUILD util-linux-2.38.1-r3.ebuild 10652 BLAKE2B ffce17852c9c268991be22e76eb9beef14331968f5b8cef20b336a0c58c71b76dd04b757181a31ff5c9f3caf01a48f09dde91d32ee5af1fff0bd2a1d6a5a5a86 SHA512 fe76840ce7d4d37416e51370c1788af1356c8f978683aee5a8d90a240e65905fab1aea7ca3811032f5f4f23d773971ff0614df20215183a12f9f6a1d2caaf7ed
 EBUILD util-linux-2.39.2-r1.ebuild 10950 BLAKE2B 2be9d6b75028e7e0a1d6e08ae1d03abba6e359b3be8bbbe27cb2863b0d435f4a48e50a2428b78cd3fe46fd3517a36c71c11ba7ea197a3a9878f866f1a75c4261 SHA512 8845c504ebcf28031a9239ba26cc2d9ec03538cd92782ca72ebc402a06673a0a424a5d01de457e82cd49f942888f953756576de7751f396aa9a3def79d95f3f9
-EBUILD util-linux-2.39.3-r1.ebuild 10954 BLAKE2B 9244cb6b8928210b1d08c3a044f51245775a9bb7f0f3719976418be1d54e19541a2a29e0d2a3ee5d1aab414a87a7eb97fa123198463cc4039b6f766fb5346042 SHA512 ddfaa770ab53ddb577204d15e1299c3347602a155d0f6eb98be14a4ab733e0d15c2af63cb845d7af9674634688be571c85fbd5f3ac646f4c52e9174d9b8f5034
-EBUILD util-linux-9999.ebuild 10482 BLAKE2B ada4654d66dac470020c274948442fd531e5221005e0c01f4864c9acfb330b465382656ef1b0152cab1afe0bf815219ca6ecb0fe2056496b1d533fe0373c0b38 SHA512 e95f952e501cb0aa9b8699a5ef13eb43732571f221b2bb6e2f522ae83cc858d2b0276af9c83d67c684d27390e599534bcdfdf5adf188a88fac4e1accf4ffe197
+EBUILD util-linux-2.39.3-r2.ebuild 10824 BLAKE2B 1c84b199627cf7c1286d57814158d7235e2c6977b377e08be3bc8999e75a91c1dbbf486b250724f5fb244019040a9797594feff28e42ea4cdd23b7d19e83dfdd SHA512 72df7f6ab7b8b3382db709d0762ecfe24670776cdaee4f88ff3965f3c4b2c12f3292ff799f24054901c7668f44e2cfef442b3a683500cfdfe77c09f4e54e535b
+EBUILD util-linux-9999.ebuild 10471 BLAKE2B 00c7b828d20666fa23bbc289766af5170ee8cacd9afa37b9ee7570d2e5f91d29b1a92276df50d74eeabbf5b528b024cb3a3d5bb91f0de8f70f61eebec561a517 SHA512 696e6acf62b7ace446ccca46ba05d94a23f4aa80fbb21cf6c06f3f3a75e3afea88c819791a5e8bcd06a2bec0624c88a13edd41497dbf6776b354ba99c87c2f5a
 MISC metadata.xml 1553 BLAKE2B 1c4a18f6d91be4c90bf2505745cae42f6d249a1295c6a46fc1b8ea08297842b4d3a2aa232e679a167af9fef26730ed71f651b2f71b58cbfe66bd7a5cd3743c3b SHA512 e01d390c983ac47b9a6684f70b11cc796cde1355ae7d4c12406b3d6fc5b0897a9471720844e74fceee1648f4c7d685e6b12f157adc1ad951506acefb7441635c
diff --git a/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild
index 6d2aa61d4365..bea51fe15f33 100644
--- a/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
 
-inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
 	pam python-r1 multilib-minimal multiprocessing systemd
 
 MY_PV="${PV/_/-}"
@@ -356,11 +356,6 @@ multilib_src_install() {
 
 	# This needs to be called AFTER python_install call, bug #689190
 	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi ; then
-		# Need the libs in /
-		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
-	fi
 }
 
 multilib_src_install_all() {
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index d7b81f31df52..f0f5f21353c8 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
 
-inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
 	pam python-r1 multilib-minimal multiprocessing systemd
 
 MY_PV="${PV/_/-}"
@@ -55,8 +55,10 @@ RDEPEND="
 	rtas? ( sys-libs/librtas )
 	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
 	slang? ( sys-libs/slang )
-	!build? ( systemd? ( sys-apps/systemd ) )
-	udev? ( virtual/libudev:= )
+	!build? (
+		systemd? ( sys-apps/systemd )
+		udev? ( virtual/libudev:= )
+	)
 "
 BDEPEND="
 	virtual/pkgconfig
@@ -213,8 +215,6 @@ multilib_src_configure() {
 		$(multilib_native_use_enable suid makeinstall-setuid)
 		$(multilib_native_use_with readline)
 		$(multilib_native_use_with slang)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with udev)
 		$(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
 		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
 		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
@@ -228,6 +228,18 @@ multilib_src_configure() {
 		$(use_with selinux)
 	)
 
+	if use build ; then
+		myeconfargs+=(
+			--without-systemd
+			--without-udev
+		)
+	else
+		myeconfargs+=(
+			$(multilib_native_use_with systemd)
+			$(multilib_native_use_with udev)
+		)
+	fi
+
 	if multilib_is_native_abi ; then
 		myeconfargs+=(
 			--disable-chfn-chsh
@@ -334,11 +346,6 @@ multilib_src_install() {
 
 	# This needs to be called AFTER python_install call, bug #689190
 	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi ; then
-		# Need the libs in /
-		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
-	fi
 }
 
 multilib_src_install_all() {
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 23ddfdfeba60..c53d73ee8d1b 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 993d7377698e..cfe89fe8ef28 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -11,6 +11,6 @@ DIST grub-2.12.tar.xz.sig 566 BLAKE2B 9b77fe53041b99f1196743aa6d9fc9c727b17c6512
 DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
 DIST unifont-15.0.06.pcf.gz 1358322 BLAKE2B 81811e3de390ca35d1a2dc1f1dee73464e97f44907ba522c218ba9c5e39ca3c9d767552780a257a97c156eb623c17786d9c0d2b67786d61df5ca33a1e10db7ca SHA512 0a28a406629c604f5cbf51f501528239a7ed50d19f93ea505bc5bdc72639e4b926b03f4b8782a5733041f7cdb4aebb9948ac7cfd5a8ad9a0fe309944e595517b
 EBUILD grub-2.06-r9.ebuild 9054 BLAKE2B 319c2521ec892ff5bf1fe5a7403d6d211d6e5689cc84b2f2fc07dd589a6656bb43b556c6d0c75196f3ec189779ee24c466b35c2a2814d28cd6fe17cee1010d7f SHA512 49ad42a3f365cc0bcab5e87a9b79fa4652b7acf7cf92414e2cfa662de75edf8b2b6a6c9728f777c2d8a3ccd03a44175fedb1e16822b803b28bb6bfa8f879c9b1
-EBUILD grub-2.12-r1.ebuild 9292 BLAKE2B b0cee0d129659c8e588cd8c815f46f59314104644adfc71d08658ae3dd88ef84fc0e7fd12ed52ac49c0c784c00e6a630fc2f3117e576a708dcf9dc31ecd57f02 SHA512 01c61cf55cc9bf264e1018d92a504f80aa25e12f6b4c923b4826c752c37eb3fd023715abff5e4ec8f9b43a18946a6a21021c1a57785b59b0acdb60643f11cdd0
+EBUILD grub-2.12-r1.ebuild 9291 BLAKE2B 2ab372ba3acd9fca65058b36324758b783ba039dc258c974676602e03ef94c6420e16293212ada2ad55afb0501f4547a6fc6b9bf0de6bcb581c43729868282c5 SHA512 5935d28159f8d042e3eeca0133c586516be9d24641944f6124deff9fa7a9425026628c60115fc132e05e694b9181e292fb81610ae67170b7541b55d2141ee019
 EBUILD grub-9999.ebuild 9057 BLAKE2B 3abe84df8372062601a916cc9df89cce9ecb1154e7413c752a4204cd3c7c6fe759d8406fdcb20241c0d465e9f5779444ee4990deca27b1c8e337e17bcaffbd6c SHA512 80796ef0e3501a2bd2d265e6bd7769ae5b49c184cb7e00e02de235f6bcb9842530471013d2c175f138f86483a09bc8f41c741675b24a7246e1add0b22f44e243
 MISC metadata.xml 986 BLAKE2B 7c03fac1bf235c1d82e435926c5a9079a21eb16e9937c0ac4e6297bc2f129bc9022efa11c099df07fd9e3b6c47a13246e25ae1c4cc390878ead82394c9b9ed11 SHA512 eb62f4b746c87bf2756669d57e76e60f24cea493948b19429a45e52d02fc1a501b4465ba52940757409258f7ad0ceef0e0f473aeb80cbd9b693b866ae015f13c
diff --git a/sys-boot/grub/grub-2.12-r1.ebuild b/sys-boot/grub/grub-2.12-r1.ebuild
index 4841cdc866db..4cfcc97a992b 100644
--- a/sys-boot/grub/grub-2.12-r1.ebuild
+++ b/sys-boot/grub/grub-2.12-r1.ebuild
@@ -55,7 +55,7 @@ if [[ ${PV} != 9999 ]]; then
 		S=${WORKDIR}/${P%_*}
 	fi
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-danielkiper )"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index ea8734c7e109..ddae5e557112 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 95625224b030..d7e619e563ba 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -1,5 +1,6 @@
 AUX libcap-2.62-ignore-RAISE_SETFCAP-install-failures.patch 724 BLAKE2B 39b2924071c9c6b1ffba3acf2fbeea6196c20da175ed4a5ddd6fac5375d604df3823bf183c36da6eb03e1b9cd918d107fd7e5b30f2f3746ce17b589a77f3dec5 SHA512 11ca33d7f1a352cce9dad179be415b6282efdbb9049a92ba945cbfbee2b6c263af39adb3a93f62e5077d9b33e0f098f9125362432bd333601345d8c3671d40bd
 DIST libcap-2.69.tar.xz 189200 BLAKE2B 94d1fef7666a1c383a8b96f1f6092bd242164631532868b628d2f5de71b42a371d041a978ef7fbadfee3eeb433165444995d1078cd790275bc0433a7875a697e SHA512 647c307dc451517da9d089495ab959b4a6fbbe41c79f4e1e9bb663569dad630ead0c2e413dfb393319e3ea14dc9848c81b392107fe3382ce1813d278c3394a7f
+EBUILD libcap-2.69-r1.ebuild 2188 BLAKE2B c090d7a6d384cb1e0298b57eb3ff5ff36912b6dc68995058df2cd12a30b83e9ebbfb37738f248e67e57c68baf2ea3f2f5d1572d4d093b9c56db47f6289d6f28f SHA512 ec9fb399a62a915d2626835e0edfdcea841642ea93d4f0531294832b29bee000f973e96659a8bdebf96c6b541b3c67d5add8edc25acc1fe1ec12d39e6e925e6f
 EBUILD libcap-2.69.ebuild 2243 BLAKE2B 429e44f61da99bdf3ca07e0282a191fff0db4c4c572850e6815a28cf1e6cb36b1ff571986ce1a5f048e089fb3f46a986edd3dc5501addf790e717670a91d9c04 SHA512 4ccc020e0b500fc7f4616e4499e69cb1bcc4eff8d1958c48a07ef0be4c67034b37be35b1ec3fce9d7a066847bd30abf6ac5dfbf6f173cddcbf0ba34f1e777d4b
 EBUILD libcap-9999.ebuild 2251 BLAKE2B f18956d67d59dfb12654b0f6f8b1e607ac993318ba52722dc3c45bb922c42e530daf1f3c8eb3174c72817f98085fe7757eb0aba151c0540143accf41bceb49c1 SHA512 3ee464d81cdc2243d5289f64e390c886d9b70a10120a19eceb75d017ca467e0f2cc99a40107115d249146c27dbb8d2f22df72910dfc330058e6b580a1fd8ca1c
 MISC metadata.xml 438 BLAKE2B b5260cc84a3fe6b992bb6218846c738af296522d7a467337c05a6240fd07fc9d6cece779bd9fcf24a11486a70874e17acae8182647d307a31cf43e1c19c3a2d3 SHA512 fa3713dcf6b7bb2ea6d4c2fdefc05e92ae345c76a6187ebcb40dab8c4ce0148650a8301f236efcb8cf53fff25730977a385578dbaa160b800159c6d6abbf37a9
diff --git a/sys-libs/libcap/libcap-2.69-r1.ebuild b/sys-libs/libcap/libcap-2.69-r1.ebuild
new file mode 100644
index 000000000000..ee91b8f42d9c
--- /dev/null
+++ b/sys-libs/libcap/libcap-2.69-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal toolchain-funcs pam
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/libcap/libcap.git"
+else
+	SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="POSIX 1003.1e capabilities"
+HOMEPAGE="https://sites.google.com/site/fullycapable/"
+
+# it's available under either of the licenses
+LICENSE="|| ( GPL-2 BSD )"
+SLOT="0"
+IUSE="pam static-libs tools"
+
+# While the build system optionally uses gperf, we don't DEPEND on it because
+# the build automatically falls back when it's unavailable.  #604802
+PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )"
+DEPEND="${PDEPEND}
+	sys-kernel/linux-headers"
+BDEPEND="
+	sys-apps/diffutils
+	tools? ( dev-lang/go )"
+
+QA_FLAGS_IGNORED="sbin/captree" # go binaries don't use LDFLAGS
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.62-ignore-RAISE_SETFCAP-install-failures.patch
+)
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+run_emake() {
+	local args=(
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		RANLIB="$(tc-getRANLIB)"
+		exec_prefix="${EPREFIX}"
+		lib_prefix="${EPREFIX}/usr"
+		lib="$(get_libdir)"
+		prefix="${EPREFIX}/usr"
+		PAM_CAP="$(usex pam yes no)"
+		DYNAMIC=yes
+		GOLANG="$(multilib_native_usex tools yes no)"
+	)
+	emake "${args[@]}" "$@"
+}
+
+src_configure() {
+	tc-export_build_env BUILD_CC
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	run_emake
+}
+
+multilib_src_test() {
+	run_emake test
+}
+
+multilib_src_install() {
+	# no configure, needs explicit install line #444724#c3
+	run_emake DESTDIR="${D}" install
+
+	if ! use static-libs ; then
+		rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.a || die
+	fi
+
+	# install pam plugins ourselves
+	rm -rf "${ED}"/usr/$(get_libdir)/security || die
+
+	if use pam ; then
+		dopammod pam_cap/pam_cap.so
+		dopamsecurity '' pam_cap/capability.conf
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc CHANGELOG README doc/capability.md
+}
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 845831b976f1..ce6ebbbc198a 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,5 +1,6 @@
 AUX pam-1.5.3-termios.patch 913 BLAKE2B 3fdb9c6320c56fd2c10b76b58700263a1c190dde4a62bb33fdfe2e59e2aebedffe87bd14fb7f02ca9c3df8f9ca21af13a1e5b42cd4eb0b112bb03f311e975288 SHA512 c432af010b188ff8a3f1fb08cc7e68b12651f8a2592fa43c5aec8c60e938c04a62ae67bc0fdb6704df3ec39aa3b40a56c1abbf07e0e5105a7b7ca4af7e44c715
 DIST Linux-PAM-1.5.3-docs.tar.xz 466340 BLAKE2B 6bade3c63ebe6b6ca7a86d7385850bb87bf1d6526add3ac5aad140533516c1d27b594a17d09c4127ff985c42e6c571618785d6b2a2913e6575678c4dcf947dc0 SHA512 a9082823da88e0054d74e13aef872519ced5fbef25c8cc1a7e3a99160f835aa09c9ef701b6ec507acd3b540da0019288424bb4c8ebd828181ea90450db1494a9
 DIST Linux-PAM-1.5.3.tar.xz 1020076 BLAKE2B 362c939f3afc343e6f4e78e7f6ba6f7a9c6ee0a9948bb5a4fc34cecfd29e9fa974082534d4ceedd04d8d3e34c7b3ef43d2a07ba5f41d26da04ec8330fc3790fb SHA512 af88e8c1b6a9b737ffaffff7dd9ed8eec996d1fbb5804fb76f590bed66d8a1c2c6024a534d7a7b6d18496b300f3d6571a08874cf406cd2e8cea1d5eff49c136a
+EBUILD pam-1.5.3-r1.ebuild 4442 BLAKE2B f0cd9ae58e1c315fb9d9b92ec07cd2f9bde6a4bbd86bbb54920c2b32f659760eea3f3cfc56d6e217dfa6da921a2ebac4b5123d505dfc49bc1bbcae600d8e15f7 SHA512 ad05e3e1cb6f7908499a2d59b35fbcd8f20223c86a28e2c8b0f5c97a433bddc5a0e5e4767e51441bc65f76bf8dbabc167de92c2c0ad75fe6f545dbbd3bb159c7
 EBUILD pam-1.5.3.ebuild 4487 BLAKE2B df92ac6e275d0e1b5c881eeca87a10aade04fcfe7f4db37d7da72ace5c878be0858272a5eba57da2237662b674f8e7eb8c810cb2e48c1bf41944dccdddc86b87 SHA512 0fee84d5efab16672b8cbb2eee4802b2d12020ca6b07186f1510f05467dfebfbaf627733fcb67eb2cf04acb5f935ce5ebe26e467e17d349e57b17f8065438272
 MISC metadata.xml 846 BLAKE2B e236bd8c7a53097d96164d9063d1dbb9372cef4ec92731dc43df6731cc7f4fc2935aeeb2e069b6da1d4bce3f1cc6a657e0361208581da615f3f41ec72c02261e SHA512 e2e28deadb2c941f8fa31447ec20c95ccb340d638f8b1e742a89ccc2dbb3c8d88e764f750d6e13c5a6320a612d6f2447689c02862a5e897919d1e9bca7857089
diff --git a/sys-libs/pam/pam-1.5.3-r1.ebuild b/sys-libs/pam/pam-1.5.3-r1.ebuild
new file mode 100644
index 000000000000..8f176361a930
--- /dev/null
+++ b/sys-libs/pam/pam-1.5.3-r1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="Linux-${PN^^}-${PV}"
+
+# Avoid QA warnings
+# Can reconsider w/ EAPI 8 and IDEPEND, bug #810979
+TMPFILES_OPTIONAL=1
+
+inherit db-use fcaps flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
+HOMEPAGE="https://github.com/linux-pam/linux-pam"
+SRC_URI="
+	https://github.com/linux-pam/linux-pam/releases/download/v${PV}/${MY_P}.tar.xz
+	https://github.com/linux-pam/linux-pam/releases/download/v${PV}/${MY_P}-docs.tar.xz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit berkdb debug nis selinux"
+
+BDEPEND="
+	app-alternatives/yacc
+	dev-libs/libxslt
+	app-alternatives/lex
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+DEPEND="
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
+	audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] )
+	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	nis? (
+		net-libs/libnsl:=[${MULTILIB_USEDEP}]
+		>=net-libs/libtirpc-0.2.4-r2:=[${MULTILIB_USEDEP}]
+	)
+"
+RDEPEND="${DEPEND}"
+PDEPEND=">=sys-auth/pambase-20200616"
+
+PATCHES=(
+	"${FILESDIR}/${P}-termios.patch"
+)
+
+src_prepare() {
+	default
+	touch ChangeLog || die
+}
+
+multilib_src_configure() {
+	# Do not let user's BROWSER setting mess us up, bug #549684
+	unset BROWSER
+
+	# This whole weird has_version libxcrypt block can go once
+	# musl systems have libxcrypt[system] if we ever make
+	# that mandatory. See bug #867991.
+	if use elibc_musl && ! has_version sys-libs/libxcrypt[system] ; then
+		# Avoid picking up symbol-versioned compat symbol on musl systems
+		export ac_cv_search_crypt_gensalt_rn=no
+
+		# Need to avoid picking up the libxcrypt headers which define
+		# CRYPT_GENSALT_IMPLEMENTS_AUTO_ENTROPY.
+		cp "${ESYSROOT}"/usr/include/crypt.h "${T}"/crypt.h || die
+		append-cppflags -I"${T}"
+	fi
+
+	local myconf=(
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		--with-db-uniquename=-$(db_findver sys-libs/db)
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog
+		--enable-securedir="${EPREFIX}"/$(get_libdir)/security
+		--includedir="${EPREFIX}"/usr/include/security
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--enable-pie
+		--enable-unix
+		--disable-prelude
+		--disable-doc
+		--disable-regenerate-docu
+		--disable-static
+		--disable-Werror
+		# TODO: wire this up now it's more useful as of 1.5.3
+		--disable-econf
+
+		# TODO: add elogind support
+		# lastlog is enabled again for now by us until logind support
+		# is handled. Even then, disabling lastlog will probably need
+		# a news item.
+		--disable-logind
+		--enable-lastlog
+
+		$(use_enable audit)
+		$(use_enable berkdb db)
+		$(use_enable debug)
+		$(use_enable nis)
+		$(use_enable selinux)
+		--enable-isadir='.' # bug #464016
+	)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake sepermitlockdir="/run/sepermit"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install \
+		sepermitlockdir="/run/sepermit"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	# tmpfiles.eclass is impossible to use because
+	# there is the pam -> tmpfiles -> systemd -> pam dependency loop
+	dodir /usr/lib/tmpfiles.d
+
+	cat ->>  "${D}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}.conf <<-_EOF_
+		d /run/faillock 0755 root root
+	_EOF_
+	use selinux && cat ->>  "${D}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}-selinux.conf <<-_EOF_
+		d /run/sepermit 0755 root root
+	_EOF_
+
+	local page
+
+	for page in doc/man/*.{3,5,8} modules/*/*.{5,8} ; do
+		doman ${page}
+	done
+}
+
+pkg_postinst() {
+	ewarn "Some software with pre-loaded PAM libraries might experience"
+	ewarn "warnings or failures related to missing symbols and/or versions"
+	ewarn "after any update. While unfortunate this is a limit of the"
+	ewarn "implementation of PAM and the software, and it requires you to"
+	ewarn "restart the software manually after the update."
+	ewarn ""
+	ewarn "You can get a list of such software running a command like"
+	ewarn "  lsof / | grep -E -i 'del.*libpam\\.so'"
+	ewarn ""
+	ewarn "Alternatively, simply reboot your system."
+
+	# The pam_unix module needs to check the password of the user which requires
+	# read access to /etc/shadow only.
+	fcaps cap_dac_override sbin/unix_chkpwd
+}
diff --git a/sys-libs/pam_wrapper/Manifest b/sys-libs/pam_wrapper/Manifest
index 3f199ebe76b2..0651126ab889 100644
--- a/sys-libs/pam_wrapper/Manifest
+++ b/sys-libs/pam_wrapper/Manifest
@@ -1,4 +1,5 @@
 AUX pam_wrapper-1.1.4-tests-import.patch 767 BLAKE2B 65ce88028190bbbd3aacdf0a3af7591ebe90e4c24fb3502ef631ee8b126377cc6fe2a8a124658d5624e569235c9d48751e1f8142dbb87f5179d6017647991f3c SHA512 420704520ef5e4d6e1a5f4fca64619ab29765e9a5ddd347d1fc5427664e212695b6c19d7c15fe787f7375570378a261fab99c2b345ff7e96f3a7aaaf35e51939
 DIST pam_wrapper-1.1.4.tar.gz 170882 BLAKE2B fa0a789f6fd6f809c7ef80e354e886b5f1f0b4212060dc0e388a44701e4a1f49635b8f47344156ad65cd273660e3b0a806480c37875a830e2f5d8e56c4ec0818 SHA512 3b68dc6d7815707d74d1340facd9c2de4dff3934402ac2c2632371b39c41a75744434744ed7308e157be03a03a941405638cadb6f34995de56fb1f5f45d37de2
 EBUILD pam_wrapper-1.1.4-r2.ebuild 2010 BLAKE2B ef4899552b056ad449715435c4c63af45850b7cbaf77b1a67cb6d26b951be40d9554ae7b1f9d9f83ee94cc9c813dad24860d18da494166debfd63a4f6e47c05c SHA512 c88b8893bba01151a9bb3315538ae437eb34e4b6cf66351dca2ebbcbfddba014a601424a87a55d1be00ab1538929f29d212cc35e0605e1010decf3446218089c
+EBUILD pam_wrapper-1.1.4-r3.ebuild 2017 BLAKE2B 2635a3dbd0b51989e46d3695f63123b68c89758b8b3840b61b4021eecc7e99124e6d3cb3e9f17f92327dd3dae2231ed898df4fcf1b638a2221cfdd453730cacb SHA512 9d294b598a814f8243e64ce5e22076c806304969bb2dfb5600606548d48c55fd84dc5e27db82ee87559ad4e1a58049abb15899ead515975e0db3e28fc92a8998
 MISC metadata.xml 250 BLAKE2B e398673dd1a3522ccddb89a82a53fc2578d8e0777ec46f889d01d618609a22958d91699beef513c7912799e0e8ff985200f7c67bba941235da25c24cd4b48f09 SHA512 16834c3cbecd0dd5a9c8c311d2b8ebc63d8cd72c5891498f4f0048988993c104aadd4e24e632bf54071c11f810716432e89e4afab029555875f9f52794daa6e9
diff --git a/sys-libs/pam_wrapper/pam_wrapper-1.1.4-r3.ebuild b/sys-libs/pam_wrapper/pam_wrapper-1.1.4-r3.ebuild
new file mode 100644
index 000000000000..7804b800ce5d
--- /dev/null
+++ b/sys-libs/pam_wrapper/pam_wrapper-1.1.4-r3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake-multilib python-r1
+
+DESCRIPTION="A tool to test PAM applications and PAM modules"
+HOMEPAGE="https://cwrap.org/pam_wrapper.html"
+SRC_URI="
+	https://www.samba.org/ftp/pub/cwrap/${P}.tar.gz
+	https://ftp.samba.org/pub/cwrap/${P}.tar.gz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Require newer PAM so we know where it's located, bug #825078
+RDEPEND="
+	${PYTHON_DEPS}
+	>=sys-libs/pam-1.5.3-r1:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka[${MULTILIB_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.4-tests-import.patch
+)
+
+multilib_src_configure() {
+	configure_for_python() {
+		local mycmakeargs=( -DUNIT_TESTING=OFF )
+		cmake_src_configure
+	}
+
+	if multilib_is_native_abi ; then
+		# Build the Pythons for each version (but only for the native ABI)
+		# bug #737468
+		python_foreach_impl configure_for_python
+	fi
+
+	# Do the regular build now
+	local mycmakeargs=(
+		-DUNIT_TESTING=$(usex test)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Python{Libs,Interp,SiteLibs}=ON
+	)
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		python_foreach_impl cmake_src_compile
+	fi
+
+	# Compile the "proper" version without Python last
+	cmake_src_compile
+}
+
+multilib_src_test() {
+	cmake_src_test
+
+	# Fails b/c of sandbox?
+	#python_test() {
+	#	local -x PYTHONPATH="${BUILD_DIR}/src/python/python3:${PYTHONPATH}"
+	#	elog "${PYTHONPATH}"
+	#	${EPYTHON} "${S}"/tests/pypamtest_test.py || die "Tests failed with ${EPYTHON}"
+	#}
+
+	#if multilib_is_native_abi ; then
+	#	python_foreach_impl python_test
+	#fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		python_foreach_impl cmake_src_install
+	fi
+
+	# Install the "proper" version without Python last
+	cmake_src_install
+}
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 106c7c8e54f8..dc002157fc80 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -5,6 +5,6 @@ DIST tzdata2023c.tar.gz 443902 BLAKE2B 8a50aa5f338565d86b8fa5428c138b251bd8dcc3e
 DIST tzdata2023d.tar.gz 449767 BLAKE2B b79be37a8a258745d162a575c795ee6476b4fa5f6d2f7b562d9431a238eca276a1747a983778291184fc6e40a0c1f5e6284d41290fd6d1d3bd3118bda83f426e SHA512 81832b2d738c28cecbcb3906cc07568c5ae574adc9de35b25d4bf613581c92d471d67213b4261a56f0ec02efcf211b4e298b7e1dc367c972e726b0a2e9498df4
 DIST tzdata2024a.tar.gz 451270 BLAKE2B 5ec49bbce704411a1d8b3f018b0d8f6c7de24c5600e0cb6c61a7ee29b4a49b1e502d23b40bce6584ea0aa9b66327321608cbabb994071ec4ca2b3a496aa2d621 SHA512 1f09f1b2327cc9e1afc7e9045e83ee3377918dafe1bee2f282b6991828d03b3c70a4d3a17f9207dfb1361bb25bc214a8922a756e84fa114e9ba476226db57236
 EBUILD timezone-data-2023c-r1.ebuild 5320 BLAKE2B e7bb8b3bebb6905690232f2fe238ef7f234c2052cac3d33091a5d924448e9b389f0a167e4f27936c05c527ca553bad36694c1da67c8cd2b0b02fb90176ed9f7a SHA512 113218d4b499a5bdece7fc4241e48d4bd63fe3a1cea9d4ae8f3726d32615901dd0bc5587cdfdfd6a13a75337c84bbff3193aaab7c359b994e48a3099bf298c4f
-EBUILD timezone-data-2023d.ebuild 5275 BLAKE2B 4e1607c4d189f16e1748b4e5726b9c66138834259f37be50a71509bf9574b4353edfbc1a85ea11aa818b9d2dfc22656f4a5590899e5118b0d1d75d5e00b5f3bd SHA512 1c46e78290f1fb3191de085b1ef560da005f334b0e03fea4cf31a2661d932a63300e3d7ad34dfb9420d8f049fb89b4fb0dec3fcc104e6723aec48819113f4972
+EBUILD timezone-data-2023d.ebuild 5274 BLAKE2B f105cd30b039b31e3ca213711c65db387c730135503b8a5633db29ab1d61eebe4e26457326e16269a5735087a77c6c1386304b15c905b338655347e98fccf3fa SHA512 606844ea9605847a3c0ca6fa03cc5151443634fd8c475e9b0a6a4dd936c2ac2dbc012978a6d67d29cdf08f14cdcafff5fe633b5f6e41b9e08e0c17fda8f0c5e7
 EBUILD timezone-data-2024a.ebuild 5282 BLAKE2B e27c6baa5e5824019426ce1c941d0f801e7e1191e3da989d275fd1797e0510859653fbe792b763f31bc2d90fce477a5ebda8e28642b5576ff594a2c696a82665 SHA512 844a6b7800ed758de9f251665de5be9f24d8599eea66be82b26ede14188cd82a9f837dd97ddd6d2a663826b6c8c7c15b322909717b32e6398a79511c2fca0cc5
 MISC metadata.xml 807 BLAKE2B 24b09c4228c232b607e6e6c165a20e364136d77aa970e72c70124636a038cd3b672bad16ddd68c0b75373be6a09f969e59bc38f7e451bb2869cd46c521e2ca82 SHA512 0b95b32d79651493a04032f175f3320d8975cea714b43fa56aa528f10f51a7c52b58a934828f98a770855485af6f8db048bd2bfa3010802cff8c26ae05bb16e2
diff --git a/sys-libs/timezone-data/timezone-data-2023d.ebuild b/sys-libs/timezone-data/timezone-data-2023d.ebuild
index 2e6109489b5f..92d625f298e2 100644
--- a/sys-libs/timezone-data/timezone-data-2023d.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2023d.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${MY_DATA_VER
 
 LICENSE="BSD public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="nls leaps-timezone zic-slim"
 
 DEPEND="nls? ( virtual/libintl )"
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 8645a1ab92b1..326764dec111 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -11,6 +11,6 @@ DIST zlib-1.3.1.tar.xz.asc 235 BLAKE2B b135336ef55a0c4b8e219e760bbe04bad082c4052
 DIST zlib-1.3.tar.xz 1295740 BLAKE2B 5fe0f32339267348a313f23a21e9588bdb180b7415be303c85f5f169444d019e5f176ef7322f6e64297c360acc2a6041c50e2f66d1860e5c392d8970990f176a SHA512 3868ac4da5842dd36c9dad794930675b9082ce15cbd099ddb79c0f6bd20a24aa8f33a123f378f26fe0ae02d91f31f2994dccaac565cedeaffed7b315e6ded2a2
 DIST zlib-1.3.tar.xz.asc 235 BLAKE2B 5fe6ce952699a19e848d0a6e6c3622f934340068fdcd29afb35c74f3c8ae66d04de644800d10b38c743bb2f4852ba28f1a97313cb0e6e6f9b804cbca5289ebbb SHA512 8f3ce5c21938d6abc7e121d2939648a0ce2dc01a8ab4eb001d44eb159935dd0b4f5b5e371b3ecfc0ceb23689e2cefe002065968908503cde15b1bba08aff9db6
 EBUILD zlib-1.3-r2.ebuild 4621 BLAKE2B 58c6f3a494919167a0314e47c3af83ba2aad965c4180e6943455a87500e88a5d51473903e0d0addf3b0282ac189115f38dee8816ca1984ab81e1938e418f708a SHA512 3a50e51a9b293fe802f4bb359631ba28d5262ce8a7dc0e6ca79abf8360fce6ab9cdaeea901c40d93113da3c99d0db912c356ab741314a34d6bf2d6475e23b926
-EBUILD zlib-1.3-r3.ebuild 4405 BLAKE2B 7f12a09d0fdd0f586bba579c6b5f08a44a0a55f03c9dbca3439120842b57b5c06ece2299e2bd8b16bf23bb0914b783acc2d9f86a282f732f9ffecbb3023fa8d4 SHA512 246cbf349c516d0bc4d5026ebf26c90dacf4bc831d9c828b98a0a70b92cef63b5efe978bf5ea9b63a7eff008feb48b3b7ebc850fdd5c6d1b474e4f25a5fa59f2
-EBUILD zlib-1.3.1.ebuild 4327 BLAKE2B ecc4e1669c0f146e06d958ebd265e4416b85b2924e152b4183cf3407056a06f945dfba05f60c7fc0136ada1b46b194401027a7bb67dbe91cc5e7df4dcdfc4cd0 SHA512 9547b96b1a324f5fc1c767c6a6e9ca538dcba7ce8b897db894de1d77b736703d9a8f437c7184fa53183451b342764d0f89590aae316f420f1ce82dc7e3895dad
+EBUILD zlib-1.3-r4.ebuild 4367 BLAKE2B b6b3d5ef1a56eff65c3430c5cf0b93ded7065d7ea050a806419d954590df74a3a46098a96aca71cf558e6f99535d10a8dd9fd39425d7a9422818f40f5c363e96 SHA512 8cffd0c46e698ab5cc67d57b8004d17735a4a2386326cc7cc0cae4b1d824c576fa552c5f9dd238b7b0e12d5c6e51b30b1bc8c983ccca92c25b7bb9bbf7903296
+EBUILD zlib-1.3.1-r1.ebuild 4289 BLAKE2B 6f136a0b8239eaa7e02a7349d3e103cad06d45019ed38a73c578165c48c4f55fd0fea4a485ba5720ac676ecded74d5dc42284b778befd6c5515189fc3c99710c SHA512 90980a978da7066870ccd8fe8e8a0e9765c6dd790f2a1b0ec3a78e497ee5121ed0378290509be7e8eecce974cd43edd0eb3da4fc3f68f40d97858080851a6dcf
 MISC metadata.xml 494 BLAKE2B a4a57a4153aefc189e407bcb8ce84f7c94581cc66967f69097087da7e6ff48d2de683b919fb00445d095c47ef39d31e01590f8c989ce0e5e01474e73ee2a0565 SHA512 a7e0160c127b3c2a6afe99e95992d9dbd017061303759c299ec38800efd6a9e11a35ae850c23c77c09c8833cd9d61ac1267f6becadf9c22437ee35e4304400c9
diff --git a/sys-libs/zlib/zlib-1.3-r3.ebuild b/sys-libs/zlib/zlib-1.3-r4.ebuild
index 1c7cc6d899c1..5ec332438f41 100644
--- a/sys-libs/zlib/zlib-1.3-r3.ebuild
+++ b/sys-libs/zlib/zlib-1.3-r4.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Worth keeping an eye on 'develop' branch upstream for possible backports.
 AUTOTOOLS_AUTO_DEPEND="no"
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/madler.asc
-inherit autotools edo multilib-minimal flag-o-matic usr-ldscript verify-sig
+inherit autotools edo multilib-minimal flag-o-matic verify-sig
 
 DESCRIPTION="Standard (de)compression library"
 HOMEPAGE="https://zlib.net/"
@@ -145,7 +145,6 @@ multilib_src_install() {
 
 		*)
 			emake install DESTDIR="${D}" LDCONFIG=:
-			gen_usr_ldscript -a z
 
 			;;
 	esac
diff --git a/sys-libs/zlib/zlib-1.3.1.ebuild b/sys-libs/zlib/zlib-1.3.1-r1.ebuild
index f12a76540f6e..fb44717aca45 100644
--- a/sys-libs/zlib/zlib-1.3.1.ebuild
+++ b/sys-libs/zlib/zlib-1.3.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Worth keeping an eye on 'develop' branch upstream for possible backports.
 AUTOTOOLS_AUTO_DEPEND="no"
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/madler.asc
-inherit autotools edo multilib-minimal flag-o-matic usr-ldscript verify-sig
+inherit autotools edo multilib-minimal flag-o-matic verify-sig
 
 DESCRIPTION="Standard (de)compression library"
 HOMEPAGE="https://zlib.net/"
@@ -142,7 +142,6 @@ multilib_src_install() {
 
 		*)
 			emake install DESTDIR="${D}" LDCONFIG=:
-			gen_usr_ldscript -a z
 
 			;;
 	esac
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 11ef7d3fea59..f0dcc993d0b4 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index b728e97f4512..3ee0961118ad 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -77,10 +77,10 @@ DIST nvidia-xconfig-550.40.07.tar.bz2 111172 BLAKE2B bfa5deedbb521ac60424aed72f1
 DIST open-gpu-kernel-modules-535.43.25.tar.gz 12789260 BLAKE2B ae095390b4bdef6d0ca504783e93d3228e3cc0d4b05549e39107037a1db888b2bb628fb8b1cdb9a44982d9dc1096f6c3dd73962c59be0a0a4c15bff77ca7189a SHA512 a5ec4e5f8b78abb83d43fa1697c24e1ecbcb24097417ccb31a46b326ac76f90da2470476c2e9be3117b531916bedc4eae1ed264e7e8cb88cff0a00550422e993
 EBUILD nvidia-drivers-390.157.ebuild 14621 BLAKE2B 1220d88746beb2785b85ad587ceb26d11e9955ef95512d4f29a1f7d065396841848b9f1e6531e2c30da01fc63612e5d3167a244f5175205a932454e47499a4a1 SHA512 632aca465943c7b4fbdf8627854a6fe952195fbb997b050d8c0a5d141af18e9eac7b9ad2664d5c59aa2c9238416cd36525518a030451ed778a88b37cb3fc707f
 EBUILD nvidia-drivers-470.223.02.ebuild 15481 BLAKE2B ac510b8084054dc907baa82c4a7b895164bd00721b171ceee6edfefaffc2d7132454977c142cb9cac81bcd5a58db4f0f9bd1a29c0ee7f659ed3073d3d9e2b497 SHA512 86a24c43c1923999973ca53e6f52eeb0eaa7344ba6db8b999e66b623fd5b26557070d53a3e3979967164171ba01d0de30d471fbb6f0b423f32ea6c57817a9325
-EBUILD nvidia-drivers-525.147.05.ebuild 17505 BLAKE2B b1284ee68dca813963df8aae31f8a3317a0c4ecfd144875b671274ad05eb4fec0f79a33453b4c90939e44ee3bacee8c79054befaa649e8a21de3968bf7bc70cb SHA512 6e60a53583f87c238ba7f7e7e8b11d73bfda12f04fa804a235ef06babcb0d3ef0a2ce73a09147cdc2b1feab68feb6a0ad75ef3a688e836e1517c10c4710a0bd5
-EBUILD nvidia-drivers-535.146.02.ebuild 17714 BLAKE2B efa44a7746fa1098ece6862a082a68e9481bd7ebde19045d3b1e509ac23c79ed332840d354ed750bcb0ff9a36bf8e5ecbcad797eca0f3f18ae311bff76d94eca SHA512 ac2eed2b1a25d5f62831e848d01bc5f19e4811e26ea79df025c8d8eb5be550964c8865b2dfaa370b920f9de58aefe332a3f55f91eea70a88439080953134aa81
-EBUILD nvidia-drivers-535.154.05.ebuild 17714 BLAKE2B efa44a7746fa1098ece6862a082a68e9481bd7ebde19045d3b1e509ac23c79ed332840d354ed750bcb0ff9a36bf8e5ecbcad797eca0f3f18ae311bff76d94eca SHA512 ac2eed2b1a25d5f62831e848d01bc5f19e4811e26ea79df025c8d8eb5be550964c8865b2dfaa370b920f9de58aefe332a3f55f91eea70a88439080953134aa81
-EBUILD nvidia-drivers-535.43.25.ebuild 17518 BLAKE2B 2bd491b13644583901cc1fdf92d82fa26bedce19d856cf35f575dadc04946d63045c28f3d05b940c0f8c0882a1470749a3087bcbf74e74a62195a34a999d32dc SHA512 3427fdff2d2328635aa58ba8509d3c9e04048a2ac1d0bc2e1438a11c0ddf6a2b8e8d859c22d8fec7eebd9eebaa14e2d53ef6e0bd00ba6e876974c75ae34c360a
-EBUILD nvidia-drivers-545.29.06-r1.ebuild 16945 BLAKE2B a02f4bfc330085699592a082b5ce8b3096cc4e622db40b213b70696cb4dc05f1dd6ec3d1a95b1c60e6296d6733a8f4475b96076ab0c9d47f3ebda3fa4d009878 SHA512 417bc499a58bf28967ac783b8ad7fc3432f152f3e6aaef84b28fce27958fec5d42a441353031895827cdcdc15655a8af79cc79471b11ba4fff199cde5c2fa20d
-EBUILD nvidia-drivers-550.40.07.ebuild 16607 BLAKE2B c146f4a27784ddab7e7a0e47c4d780e50f87ed83263d22baf61626ab98933f01f730ee0055e89e46a921b76228d8210a4b420386cf1368dd55026a46a95788c2 SHA512 efdbe70a49e06f226991b4b0a5b9c11fff676e64f2c3352f3577b276ace3350da543dbb0e58101dac5798e0749aca386ede787cabd0b623ed9dbce425bfed8a3
-MISC metadata.xml 1276 BLAKE2B 9fd18d8984ae4440f9623426edea81096b3aef9e591737d45f434848a24d50bda3ea6fa14fa412a9a59404b6256f00147b1a4650cf5f7a1a1445363fd844b522 SHA512 e46e21f95ea3b84dae5dee6bd2fa61efa4df7ebbf9ecb8033d5d590ad05c1343119822a50a156c3a46fcec5fbd1977cb6d6fc74c32e64ac4e8ded9760f09d91c
+EBUILD nvidia-drivers-525.147.05.ebuild 17620 BLAKE2B ef5e419e6bb516db7920d4e5f96a4b979f76fc4d4bd0bf71fdab5a6213c2a8e194cd67c3732362fcc2b9c36152d95f721ea9d327f3648a0e20ad81b20f7e5841 SHA512 6eb505eea3aa2850a5b1dea1255ad8dc94ca740fbcec808bc48478454a3a21bee4a27272c9e90414a62c780248f39a917e7b5a12031c52f8ebcfa88f2dc2edb6
+EBUILD nvidia-drivers-535.146.02.ebuild 17829 BLAKE2B 5f4509b2bc6ae39bfc350141d7097130e1aaf8d035dd5eab34fc4f1efadee2fad966290fe6410a2fa19bceee759901d34ff2fd7bf017f61c5770416dc0876209 SHA512 76b70b7652fa8ac5ecba9a677b42767c52e3f1ff4a6d2658922b1a46543d3f9cbc050303b367b4a2f1367ed138dfab69c723c4f9dde7ea7cdf77623600841d54
+EBUILD nvidia-drivers-535.154.05.ebuild 17829 BLAKE2B 5f4509b2bc6ae39bfc350141d7097130e1aaf8d035dd5eab34fc4f1efadee2fad966290fe6410a2fa19bceee759901d34ff2fd7bf017f61c5770416dc0876209 SHA512 76b70b7652fa8ac5ecba9a677b42767c52e3f1ff4a6d2658922b1a46543d3f9cbc050303b367b4a2f1367ed138dfab69c723c4f9dde7ea7cdf77623600841d54
+EBUILD nvidia-drivers-535.43.25.ebuild 17633 BLAKE2B 8a7f849a8e74691d160db3c62fe09ba9b90ef8f7037346007962ba272c80d09876b571bbb7a0b92c8e8f01853ab66997bd5e0c73aca324324ddd2a51a202de64 SHA512 f200e9235c319b1f1ba12f543d97bd655c8885d5a55b9afda3fdc4f5f1c62ef34dfee9f3d57bdb818e0d58205bad2a685c61e9ac026eab8af629d4f106357bb9
+EBUILD nvidia-drivers-545.29.06-r1.ebuild 17061 BLAKE2B eafa0a5730e54c2abc4c7e296d77bfefb171e45353c3c9f8ae8ce5d666c83414d748f76d6c1123f132e4f52365377a6f9a972893be211198e53d82b9ad1803a6 SHA512 243b42179f4612dec4808030dac634c4056a6d9b616600d9876835efc366b2bba9aca150e1534e4cf4508997896b60df867c653c107c80e82bf4fb46a226bd36
+EBUILD nvidia-drivers-550.40.07.ebuild 16698 BLAKE2B f36f5d6a01d0e3918a06b1f8ca6bd89492a0b09f74bdc876e3cdcfb9c7b0c9752c01a6d5d0c58c8d5dfa5742624597978a1c5b162fef6b009ec992b0e5f37212 SHA512 b6835a05db65dcf67e5223ad643578b289d1bd91e45c8a7e228f38f6f570ea1ce511b5840a2c09b5e7e31f9461b2dc32c5aacf9baa998515977eb19b4b386b86
+MISC metadata.xml 1407 BLAKE2B c0d284fde68808892e17edbb2b1e43b059388306eae874276d4a3f336a5dc2a41cc025a834466b2ad96112b550e0bc0f759f683bd6c58ba64a41cbc8ddebd92f SHA512 39be6982c1177961706ba6426861752339373241c959fd06504e314c9f0313677ff7c7341e7d9fb41cad2b768b99f6474e087b9813016d33cd6a9c77567c50cb
diff --git a/x11-drivers/nvidia-drivers/metadata.xml b/x11-drivers/nvidia-drivers/metadata.xml
index a8ee1dd7baee..8a3bfb5d3a1b 100644
--- a/x11-drivers/nvidia-drivers/metadata.xml
+++ b/x11-drivers/nvidia-drivers/metadata.xml
@@ -12,6 +12,7 @@
 	<use>
 		<flag name="kernel-open">Use the open source variant of drivers (Turing/Ampere+ GPUs only, aka GTX 1650+, experimental)</flag>
 		<flag name="persistenced">Install the persistence daemon for keeping devices state when unused (e.g. for headless)</flag>
+		<flag name="powerd">Install the NVIDIA dynamic boost support daemon (only useful with specific laptops, ignore if unsure)</flag>
 		<flag name="static-libs">Install the XNVCtrl static library for accessing sensors and other features</flag>
 		<flag name="tools">Install additional tools such as nvidia-settings</flag>
 	</use>
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05.ebuild
index 3b43c86bcab8..8b874970372b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05.ebuild
@@ -25,7 +25,7 @@ S=${WORKDIR}
 LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
 SLOT="0/${PV%%.*}"
 KEYWORDS="-* amd64 ~arm64"
-IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced +static-libs +tools wayland"
+IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced powerd +static-libs +tools wayland"
 REQUIRED_USE="kernel-open? ( modules )"
 
 COMMON_DEPEND="
@@ -57,6 +57,7 @@ RDEPEND="
 		x11-libs/libX11[abi_x86_32(-)?]
 		x11-libs/libXext[abi_x86_32(-)?]
 	)
+	powerd? ( sys-apps/dbus[abi_x86_32(-)?] )
 	wayland? (
 		gui-libs/egl-gbm
 		>=gui-libs/egl-wayland-1.1.10
@@ -153,7 +154,8 @@ src_prepare() {
 	sed 's/__USER__/nvpd/' \
 		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
 		> "${T}"/nvidia-persistenced.service || die
-	use !amd64 || sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
+	use !powerd || # file is missing on arm64 (masked)
+		sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
 
 	# use alternative vulkan icd option if USE=-X (bug #909181)
 	use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die
@@ -267,6 +269,7 @@ src_install() {
 	local skip_modules=(
 		$(usev !X "nvfbc vdpau xdriver")
 		$(usev !modules gsp)
+		$(usev !powerd powerd)
 		installer nvpd # handled separately / built from source
 	)
 	local skip_types=(
@@ -410,7 +413,7 @@ documentation that is installed alongside this README."
 	dobin nvidia-bug-report.sh
 
 	# MODULE:powerd extras
-	if use amd64; then
+	if use powerd; then
 		newinitd "${FILESDIR}"/nvidia-powerd.initd nvidia-powerd #923117
 		systemd_dounit systemd/system/nvidia-powerd.service
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild
index 38ad82d3c314..bde3618ee96a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild
@@ -25,7 +25,7 @@ S=${WORKDIR}
 LICENSE="NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
 SLOT="0/${PV%%.*}"
 KEYWORDS="-* amd64 ~arm64"
-IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced +static-libs +tools wayland"
+IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced powerd +static-libs +tools wayland"
 REQUIRED_USE="kernel-open? ( modules )"
 
 COMMON_DEPEND="
@@ -58,6 +58,7 @@ RDEPEND="
 		x11-libs/libX11[abi_x86_32(-)?]
 		x11-libs/libXext[abi_x86_32(-)?]
 	)
+	powerd? ( sys-apps/dbus[abi_x86_32(-)?] )
 	wayland? (
 		gui-libs/egl-gbm
 		>=gui-libs/egl-wayland-1.1.10
@@ -156,7 +157,8 @@ src_prepare() {
 	sed 's/__USER__/nvpd/' \
 		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
 		> "${T}"/nvidia-persistenced.service || die
-	use !amd64 || sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
+	use !powerd || # file is missing on arm64 (masked)
+		sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
 
 	# use alternative vulkan icd option if USE=-X (bug #909181)
 	use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die
@@ -272,6 +274,7 @@ src_install() {
 	local skip_modules=(
 		$(usev !X "nvfbc vdpau xdriver")
 		$(usev !modules gsp)
+		$(usev !powerd powerd)
 		installer nvpd # handled separately / built from source
 	)
 	local skip_types=(
@@ -417,7 +420,7 @@ documentation that is installed alongside this README."
 	dobin nvidia-bug-report.sh
 
 	# MODULE:powerd extras
-	if use amd64; then
+	if use powerd; then
 		newinitd "${FILESDIR}"/nvidia-powerd.initd nvidia-powerd #923117
 		systemd_dounit systemd/system/nvidia-powerd.service
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.154.05.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.154.05.ebuild
index 38ad82d3c314..bde3618ee96a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.154.05.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.154.05.ebuild
@@ -25,7 +25,7 @@ S=${WORKDIR}
 LICENSE="NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
 SLOT="0/${PV%%.*}"
 KEYWORDS="-* amd64 ~arm64"
-IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced +static-libs +tools wayland"
+IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced powerd +static-libs +tools wayland"
 REQUIRED_USE="kernel-open? ( modules )"
 
 COMMON_DEPEND="
@@ -58,6 +58,7 @@ RDEPEND="
 		x11-libs/libX11[abi_x86_32(-)?]
 		x11-libs/libXext[abi_x86_32(-)?]
 	)
+	powerd? ( sys-apps/dbus[abi_x86_32(-)?] )
 	wayland? (
 		gui-libs/egl-gbm
 		>=gui-libs/egl-wayland-1.1.10
@@ -156,7 +157,8 @@ src_prepare() {
 	sed 's/__USER__/nvpd/' \
 		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
 		> "${T}"/nvidia-persistenced.service || die
-	use !amd64 || sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
+	use !powerd || # file is missing on arm64 (masked)
+		sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
 
 	# use alternative vulkan icd option if USE=-X (bug #909181)
 	use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die
@@ -272,6 +274,7 @@ src_install() {
 	local skip_modules=(
 		$(usev !X "nvfbc vdpau xdriver")
 		$(usev !modules gsp)
+		$(usev !powerd powerd)
 		installer nvpd # handled separately / built from source
 	)
 	local skip_types=(
@@ -417,7 +420,7 @@ documentation that is installed alongside this README."
 	dobin nvidia-bug-report.sh
 
 	# MODULE:powerd extras
-	if use amd64; then
+	if use powerd; then
 		newinitd "${FILESDIR}"/nvidia-powerd.initd nvidia-powerd #923117
 		systemd_dounit systemd/system/nvidia-powerd.service
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.25.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.25.ebuild
index e2d7f3fdf148..4615a52cdb63 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.25.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.25.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}
 LICENSE="NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
 SLOT="0/vulkan"
 KEYWORDS="-* ~amd64"
-IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced +static-libs +tools wayland"
+IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced powerd +static-libs +tools wayland"
 REQUIRED_USE="kernel-open? ( modules )"
 
 COMMON_DEPEND="
@@ -61,6 +61,7 @@ RDEPEND="
 		x11-libs/libX11[abi_x86_32(-)?]
 		x11-libs/libXext[abi_x86_32(-)?]
 	)
+	powerd? ( sys-apps/dbus[abi_x86_32(-)?] )
 	wayland? (
 		gui-libs/egl-gbm
 		>=gui-libs/egl-wayland-1.1.10
@@ -154,7 +155,8 @@ src_prepare() {
 	sed 's/__USER__/nvpd/' \
 		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
 		> "${T}"/nvidia-persistenced.service || die
-	use !amd64 || sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
+	use !powerd || # file is missing on arm64 (masked)
+		sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
 
 	# use alternative vulkan icd option if USE=-X (bug #909181)
 	use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die
@@ -270,6 +272,7 @@ src_install() {
 	local skip_modules=(
 		$(usev !X "nvfbc vdpau xdriver")
 		$(usev !modules gsp)
+		$(usev !powerd powerd)
 		installer nvpd # handled separately / built from source
 	)
 	local skip_types=(
@@ -415,7 +418,7 @@ documentation that is installed alongside this README."
 	dobin nvidia-bug-report.sh
 
 	# MODULE:powerd extras
-	if use amd64; then
+	if use powerd; then
 		newinitd "${FILESDIR}"/nvidia-powerd.initd nvidia-powerd #923117
 		systemd_dounit systemd/system/nvidia-powerd.service
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-545.29.06-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-545.29.06-r1.ebuild
index 59fb67e327b0..441694459f04 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-545.29.06-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-545.29.06-r1.ebuild
@@ -25,7 +25,7 @@ S=${WORKDIR}
 LICENSE="NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
 SLOT="0/${PV%%.*}"
 KEYWORDS="-* ~amd64 ~arm64"
-IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced +static-libs +tools wayland"
+IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced powerd +static-libs +tools wayland"
 REQUIRED_USE="kernel-open? ( modules )"
 
 COMMON_DEPEND="
@@ -58,6 +58,7 @@ RDEPEND="
 		x11-libs/libX11[abi_x86_32(-)?]
 		x11-libs/libXext[abi_x86_32(-)?]
 	)
+	powerd? ( sys-apps/dbus[abi_x86_32(-)?] )
 	wayland? (
 		gui-libs/egl-gbm
 		>=gui-libs/egl-wayland-1.1.10
@@ -147,7 +148,8 @@ src_prepare() {
 	sed 's/__USER__/nvpd/' \
 		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
 		> "${T}"/nvidia-persistenced.service || die
-	use !amd64 || sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
+	use !powerd || # file is missing on arm64 (masked)
+		sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die4
 
 	# use alternative vulkan icd option if USE=-X (bug #909181)
 	use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die
@@ -254,6 +256,7 @@ src_install() {
 	local skip_modules=(
 		$(usev !X "nvfbc vdpau xdriver")
 		$(usev !modules gsp)
+		$(usev !powerd powerd)
 		installer nvpd # handled separately / built from source
 	)
 	local skip_types=(
@@ -399,7 +402,7 @@ documentation that is installed alongside this README."
 	dobin nvidia-bug-report.sh
 
 	# MODULE:powerd extras
-	if use amd64; then
+	if use powerd; then
 		newinitd "${FILESDIR}"/nvidia-powerd.initd nvidia-powerd #923117
 		systemd_dounit systemd/system/nvidia-powerd.service
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.07.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.07.ebuild
index e52744d51ff0..b3877e204635 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.07.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.07.ebuild
@@ -26,7 +26,7 @@ LICENSE="NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
 SLOT="0/${PV%%.*}"
 # not keywording betas
 #KEYWORDS="-* ~amd64 ~arm64"
-IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced +static-libs +tools wayland"
+IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced powerd +static-libs +tools wayland"
 REQUIRED_USE="kernel-open? ( modules )"
 
 COMMON_DEPEND="
@@ -59,6 +59,7 @@ RDEPEND="
 		x11-libs/libX11[abi_x86_32(-)?]
 		x11-libs/libXext[abi_x86_32(-)?]
 	)
+	powerd? ( sys-apps/dbus[abi_x86_32(-)?] )
 	wayland? (
 		gui-libs/egl-gbm
 		>=gui-libs/egl-wayland-1.1.10
@@ -140,7 +141,7 @@ src_prepare() {
 	sed 's/__USER__/nvpd/' \
 		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
 		> "${T}"/nvidia-persistenced.service || die
-	use !amd64 || sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
+	sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
 
 	# use alternative vulkan icd option if USE=-X (bug #909181)
 	use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die
@@ -247,6 +248,7 @@ src_install() {
 	local skip_modules=(
 		$(usev !X "nvfbc vdpau xdriver")
 		$(usev !modules gsp)
+		$(usev !powerd powerd)
 		installer nvpd # handled separately / built from source
 	)
 	local skip_types=(
@@ -392,10 +394,13 @@ documentation that is installed alongside this README."
 	dobin nvidia-bug-report.sh
 
 	# MODULE:powerd extras
-	insinto /usr/share/dbus-1/system.d
-	doins nvidia-dbus.conf
-	newinitd "${FILESDIR}"/nvidia-powerd.initd nvidia-powerd #923117
-	systemd_dounit systemd/system/nvidia-powerd.service
+	if use powerd; then
+		newinitd "${FILESDIR}"/nvidia-powerd.initd nvidia-powerd #923117
+		systemd_dounit systemd/system/nvidia-powerd.service
+
+		insinto /usr/share/dbus-1/system.d
+		doins nvidia-dbus.conf
+	fi
 
 	# symlink non-versioned so nvidia-settings can use it even if misdetected
 	dosym nvidia-application-profiles-${PV}-key-documentation \
author	V3n3RiX <venerix@koprulu.sector>	2024-02-07 03:59:02 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2024-02-07 03:59:02 +0000
commit	632aa90c53a31517c5d2259537aadc192434a332 (patch)
tree	d466e8c0d3bf25eda998e2f04dc4872de416d117
parent	6bdf113f9fe24f179ee150bada14098e20e87476 (diff)