gentoo auto-resync : 01:09:2024 - 12:01:15

32 files changed, 513 insertions, 82 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 28dfc8d77579..cb64c0d5a49d 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 8e1702715801..cfcdc43cdfa4 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -3,5 +3,5 @@ AUX appstream-1.0.0-disable-Werror-flags.patch 1297 BLAKE2B e8b9bc262d39332f5390
 DIST AppStream-0.16.4.tar.xz 2570176 BLAKE2B ac051b846fd1c7b0cbb3429e0b4c3f81027cddb35ee6bcd5e9d38a09d937abcc37ac4908f68ec55404ae852fd146b4e749832d3ac96443458e86cfe506a6fed4 SHA512 e3a9fc423fe5a2baaaa002871566f320ecd6dbd3a01ab24221afe9b93a69e9afb6bed6d7772c434376501803dc7b2c80b79eda849fcaf4748f9f24a5908a22a8
 DIST AppStream-1.0.3.tar.xz 2644220 BLAKE2B cd7aa28b49c23229ee48b9a69e57a08244f81115e23525695e463930d2296daf80b5c7bb098c89726c220caec8c3e072fd85d77ac808e96c5cf2ff0488ba4ba1 SHA512 9b70d965966d55dbcc6a62d85525fdd5990a28abb1d94b2df91ab1549c24ce9c40d95e2d761c2f24e0c61fe5b74ab6a1f829dda387a8282aa9dff9198dc9610d
 EBUILD appstream-0.16.4.ebuild 1934 BLAKE2B 2dbde137dd2c95e6e089689c3edc870f8385ba970670eec759dd34641570db9df8f6432cceb382267a8a3b38da40f8569310ad277b602622b4d5f6ede091803e SHA512 69fadebe2dba03287672884a454a7c2838f88b7a8b722ae75bac41a41188a690193bc7257ee7fffd7f8e537e665e56b1a6c145622d16c6b8ac99a4d52bb0f0d9
-EBUILD appstream-1.0.3.ebuild 1929 BLAKE2B 4f284995bbb1c13573be71d9f1fe2533faf65010dc7ee7bc9f10043a2629d5c8924468191fd9c1e34d00b91758060f675575251105424fc7b4e28ec1d2325988 SHA512 9c7492c57695b80a83e2c04634e4fca30079bcbc8b92a5af2b1cf188ef1ae43aaf5926f507cdbad2f1e1e9c3ed7fd0f0a30aa53b4eb49b17a5b81f3d50083049
+EBUILD appstream-1.0.3.ebuild 1928 BLAKE2B 99ad7939ced92273d48186bb44ed5da285be90f460e0e73d6ed014b3d15320e9cefb31b7c5b443462ce19df33d783eb2bf9f2c8ca4180f1c29bfd149045ed54c SHA512 5967c4a939004aee622ed05e72e556dd09286603630e36941fa586831073ce2c0250f47319ed5226d515585dd029bee5f30bb1351951f418023ad355ac71273e
 MISC metadata.xml 400 BLAKE2B c9855a1e3650a66c8b42fb9055d6de0aa0575ed86bb1e8695d112f2e7cdfbd5f55d6805dfeb0ed19c3354ee3cda8208fd8a4adf4e8313e791493fa1730fb32d9 SHA512 9723ac7481f748429bddde7579b81c7db2dfad2ecd5150c1c4023843c5ef47e02ce41ff43508437ae60ba427a072d09e8d46a6e6b82fc946ea3af71dd71c52f2
diff --git a/dev-libs/appstream/appstream-1.0.3.ebuild b/dev-libs/appstream/appstream-1.0.3.ebuild
index e59ebce431a1..ebdc7cc182ef 100644
--- a/dev-libs/appstream/appstream-1.0.3.ebuild
+++ b/dev-libs/appstream/appstream-1.0.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	MY_PN="AppStream"
 	SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
diff --git a/dev-libs/c-blosc2/Manifest b/dev-libs/c-blosc2/Manifest
index 3988c3858aa1..823116c69aec 100644
--- a/dev-libs/c-blosc2/Manifest
+++ b/dev-libs/c-blosc2/Manifest
@@ -1,5 +1,5 @@
 DIST c-blosc2-2.14.4.gh.tar.gz 3155712 BLAKE2B 1af67562150b7b0b87fa076114bab0cccfbd12417c13dfae4fbd40e15531ed54f3a315588ac81b15e137f0272ac6c610c48205608be0b9e98ce44218dd200a27 SHA512 4173c7b0cf4f0399a3d36c987d265aacf766f54dc871ca87ebd98d4ecd4fbd24d4b923ffb2d0b59bda359e1fbba29f088d78816d375904b1945e8c40c29dccce
 DIST c-blosc2-2.15.1.gh.tar.gz 3203267 BLAKE2B 0009afc8e9357a9d9787a60ee549bb21d68e952ca076f529add0f67500f2055a43463b3d612b600197579fd640b937024070508cb92b911d77e8ff4d8c7f16e5 SHA512 56e7395297ce8e336b2e881bf4dae169268ef19328bae8c037aa297696f723196f65eb3f66c03728d1c6492b768e17ad586f8aae29c9033b571f736d391e9ab9
 EBUILD c-blosc2-2.14.4.ebuild 1494 BLAKE2B 89662d85966e7b009317421e30a3cb6a62ee18b480ab37df6544b2c215f67e80b30bd0bcd45a8b48b9d0beeb62781ec08751fe85e3f787b18a3b60ee0ceb15a5 SHA512 1aa7edc8a34b13c63c3affe3c0e27bc11a43d00da6138deaee69c71a1db8569a9e33bd98e38a3028e0b7651aa8fc8f0089c9bcc1e009cc10c7f2cb723612fc3c
-EBUILD c-blosc2-2.15.1.ebuild 1496 BLAKE2B 15d789135a69969e357448c39cf3040fc3b50afc4b2b2fc857f44ee327b35935f211c5b42607c1fde45e38604d212a7a17139dd251bb79a00b959572153af037 SHA512 c7ccc6dc3c3f6b38cd306c6092b668b2b7fd9a6f48182912202a56b546b59a9788c9b4762d8bd4e6744da54b0bfe2f34dd664ed5b78faa70c078bd339611ba8b
+EBUILD c-blosc2-2.15.1.ebuild 1495 BLAKE2B 6f056c411b8554b908a5fe4a9e495269ce222cf841d06836c497d3507b6a5dca9774d35a1d4762c275bc8a0fa9f7a68710cde58b5cd89b75ee67a258179634af SHA512 79bb93387f87427ae3568dfbee8f7c3eb2896195f127dd0f1e34dee5139f66905ce7d88b7914a3dc26b49a2430bb32d148755e150e51285b1b759a53dd8f9f9c
 MISC metadata.xml 327 BLAKE2B 5fafd7f688780e7c5479d492da4943b9a95122d5c64e36e4415fe69a708f983f9463824981d771424c1c75f7236a159ef843738a0b31430ccd572770fbc5a74e SHA512 9d2aa06eb8e144bafe1c65b9c7704993633f9e1db629d77209e8c832e09de34c641d9f588cf208d8f5f65ff489c56f1e01ef573213439ba99678601d6a790ee0
diff --git a/dev-libs/c-blosc2/c-blosc2-2.15.1.ebuild b/dev-libs/c-blosc2/c-blosc2-2.15.1.ebuild
index d6c89088cb4f..cb6cc74043db 100644
--- a/dev-libs/c-blosc2/c-blosc2-2.15.1.ebuild
+++ b/dev-libs/c-blosc2/c-blosc2-2.15.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/4"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test +zlib +zstd"
 REQUIRED_USE="test? ( zlib zstd )"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index 89cf9943d988..85a200704cbb 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -1,4 +1,4 @@
 DIST cryptopp890.zip 9288053 BLAKE2B 95fe0585cff826587a301dd3df863c39cba889d407bb70ae7b35a4f9a0f7f5fef83b1c65cb95923a05f8ae91f18ed20e88738e8bb081a3f9c8c49c2d67d44ecc SHA512 903970c4c0312272e93bae0cc3477be66b273dd38c9329fda9f7157ec44e247a3bc16b9d2b4ad625f258af0eaf2dc2c4210d4d14829b455f180983859a5c4b41
 DIST cryptopp890.zip.sig 659 BLAKE2B 741ec10a01a444573fbcf749258e26461ff131935fede8f47b3f2dd8c51f3b43a9af894e0e31f9ad925baf451bdd747b7e22cc8b178992e4190bba503f9bf648 SHA512 4891cf446a47000453884f36f4f8db2da254e11b573c02690fd5e1de604f01498a479847a732abaf0f75b1cdf3cd5bc104f6be240d0de6c7184a3651c674ac95
-EBUILD crypto++-8.9.0.ebuild 1879 BLAKE2B 36f7d3d907669e9769c7d5a2d883a617cd59e89e82992b5e9249391d78d176dc8b73ceae138b96c7b60395e816f84577c0a56fdd2f0cb062d6822c04f67a4a0b SHA512 d2c379e358738ed66e3e34bbf2440c1b17f74f35889af401af66dafc80aa594cdee5577ddb7b0cb3988a6b8901a7aacd97e038e09b170f60540fbd0fcd485cb5
+EBUILD crypto++-8.9.0.ebuild 2081 BLAKE2B bcbc5d559b4437568a1de65ebb0316a935ef9751dc0660b719de6de4a61318300e8dc7ec69130336bee1e73b0bc1aa94c4c617b4a09d012f5cc5ead03e24d816 SHA512 a0c1533450d3867f9f39eb6d6cce3c530392e4b6b0b9cbafb6b129343050a7d8f982a2368feb57ae69eee359ba2f1b3862229f1b097ea202ceb3d141e7e8d3e4
 MISC metadata.xml 389 BLAKE2B 1692481cca4df20d3d3459216b271ff68ffd88a10119c492962ed243a61e4c753ad86a62c49ea1fa77368aaa86efaab630b2927f344aa9475a0d74131ab1f33a SHA512 99ebfde5f21ce008d2ae4f0d30333e611dc652a49f5cc56f720d9dee780d0aabaaa4556d9d89ea622fa6afa3a085247c32fca1965df6a186267ceecf62538c73
diff --git a/dev-libs/crypto++/crypto++-8.9.0.ebuild b/dev-libs/crypto++/crypto++-8.9.0.ebuild
index f8876e39738b..ff53d102d69b 100644
--- a/dev-libs/crypto++/crypto++-8.9.0.ebuild
+++ b/dev-libs/crypto++/crypto++-8.9.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
@@ -10,7 +10,11 @@ DESCRIPTION="C++ class library of cryptographic schemes"
 HOMEPAGE="https://cryptopp.com"
 SRC_URI="
 	https://www.cryptopp.com/cryptopp${PV//.}.zip
-	verify-sig? ( https://cryptopp.com/cryptopp${PV//.}.zip.sig )
+	https://github.com/weidai11/cryptopp/releases/download/CRYPTOPP_${PV//./_}/cryptopp${PV//.}.zip
+	verify-sig? (
+		https://cryptopp.com/cryptopp${PV//.}.zip.sig
+		https://github.com/weidai11/cryptopp/releases/download/CRYPTOPP_${PV//./_}/cryptopp${PV//.}.zip.sig
+	)
 "
 
 S="${WORKDIR}"
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index e0b718c2c182..07118c8eaf83 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -6,9 +6,9 @@ DIST glib-2.78.3.tar.xz 5321388 BLAKE2B 6ef754b15e1ce4377eafdfc317025ac65c3d8010
 DIST glib-2.78.4.tar.xz 5331892 BLAKE2B ada7134597d7d863e581a2bb1097ac07a63b27b53309aadab5b1d3686327ee718ad8c5c07af3fce5cc12328e728fc2c4df5fd9e69f431fa00dc634062ef7f926 SHA512 6f3a06e10e7373a2dbf0688512de4126472fb73cbec488b7983b5ffecff09c64d7e1ca462f892e8f215d3d277d103ca802bad7ef0bd0f91edf26fc6ce67187b6
 DIST glib-2.78.6.tar.xz 5344808 BLAKE2B d16173794c4aa019459cf8c8c84d4107fb8393828f41ec6c631b9452890f34f9022ed848a543ed134fdb8a575faef6b941cea3e05de512eb1b7a99f7601a2485 SHA512 8d75f8fd77b6309215ca86a0c7648878efe11051f18b279840c137669017ea4066388f8682367e4ea3f154333d833c9dc28ccd4a66a91f0c3854a40a2838f8da
 DIST glib-2.80.4.tar.xz 5535760 BLAKE2B 1d2b301703b27a5c2def370e1d44b4f7b08a940969563ce9d8d7c38e5f0a32163b95523e09cedc4a57b2af84a57d63dc545abcb31b61a8066ef62ba396fb4f3c SHA512 efdc7dd1e0609b0f2d988a8cc8fd4a3fda96e8450832f905f7686f9063b727cb996e0e4e638aca62f60b76f9f04be62e089a615413e64cf298c7eef26e074570
-EBUILD glib-2.76.4.ebuild 11134 BLAKE2B e9bb6e07284892dc0297d3e0f5476802320ce7fe7b4b8206297ea6020b36865ac6f6ab5d85fbc50e6112f575188d8b203b3841367b3d995efa527b57d9fe059d SHA512 5cc15f6043708b6f8710f95e2d01201daf037565e15b97af381e34cfb9eebfa19c1f343dadb977310d3d393fe69ceed2b338f301f308447300be357a7ae27952
-EBUILD glib-2.78.3.ebuild 11134 BLAKE2B e9bb6e07284892dc0297d3e0f5476802320ce7fe7b4b8206297ea6020b36865ac6f6ab5d85fbc50e6112f575188d8b203b3841367b3d995efa527b57d9fe059d SHA512 5cc15f6043708b6f8710f95e2d01201daf037565e15b97af381e34cfb9eebfa19c1f343dadb977310d3d393fe69ceed2b338f301f308447300be357a7ae27952
-EBUILD glib-2.78.4-r1.ebuild 11379 BLAKE2B 985c405d528ddf65bed984c4df0c50dca24953e5ab61e1f4b7c64dd1a3cc77e132d7aaae0ae76ebc58c6df88151c464d941ee7bc8d6b12cf15ba3a4a76631df8 SHA512 a04e6db79b31064afd7fb016a1f5fa0226df76494d88ba78143232baf3756ec6c9102d02f6cc554bf1b2163eb0f22a164a8c2ca9f6013007b11638a6512671d0
-EBUILD glib-2.78.6.ebuild 11329 BLAKE2B ad844337f6316791db3b0736d8da475d9388cce4878ede90416c272334d774ab90f4ec2b1772ea015de9ff0d94d2c7c10d23266280516e8c26b47ef72ca6e24d SHA512 668e528c96a7b6529981a090388f6731840f555af13fdc402d3ff678e6d3f6d84733c19c84caed20a239a3ae1ec08acffc786bc56ffe7a5e623f5f13308e9a57
-EBUILD glib-2.80.4.ebuild 11456 BLAKE2B 4688873ac6e784e1ce43cdccdfee6b8708451b99078adf920d203afcae2e330866b889c5c3e75285c8f1a12cc9f1430466723b31061d6c42bfd8261cf769430d SHA512 4927c7c97724cf42ed8d8065bb2175f3d3f68e697d0710981ecb686b8e0bb967b351b4b9560f0850de92b1f1febd51d3f63f49909cd435f387267889be7e0fac
+EBUILD glib-2.76.4.ebuild 11152 BLAKE2B 96f91d82288d1df6d2cfa5ad89208611424c02728e347fb44bbd94b31ebeb3c20c14a2ea038ccc050f7aaa4ba583d436756622bc990152538385fb8ea1d2a5d4 SHA512 566bd34ad24f990325419371ec1e53a71843f48b4538acf55bf31fd6121249ad438cb36c6aadb429d133c68462275ff9285b83a8a9fc389d46d69f80faa93ede
+EBUILD glib-2.78.3.ebuild 11152 BLAKE2B 96f91d82288d1df6d2cfa5ad89208611424c02728e347fb44bbd94b31ebeb3c20c14a2ea038ccc050f7aaa4ba583d436756622bc990152538385fb8ea1d2a5d4 SHA512 566bd34ad24f990325419371ec1e53a71843f48b4538acf55bf31fd6121249ad438cb36c6aadb429d133c68462275ff9285b83a8a9fc389d46d69f80faa93ede
+EBUILD glib-2.78.4-r1.ebuild 11397 BLAKE2B 0fcc69f931312dd831f7dcc5bab1a48e2590a152746bf4031e03d31e16320ab831187dacf6828813bd10357d8951ede98fc695ae7bd7025529435199784eb43d SHA512 a6b7bb5cfc4ffae4260ba34280feb7b9b41283de1c5c6966f82876b4352d5f7001c132ab2c2290583c864bd49576bcac85215f9cfaef4e31d0728f8c08597e91
+EBUILD glib-2.78.6.ebuild 11347 BLAKE2B f709ea71a72351ae41fa3e8fb28eb228245eebbf822f8bd55fdbb4496f417f9fd65a9e276ba9961d3059558599d7019769f9c01acd97c720f9f42fd75b4b04e7 SHA512 490e5e2cdb5b98b7d06582ed433cae509efcd7765f3db2e3232c1b6a68a912c48915f75750fcac9183eb06fe5b5f9419ab7e867016626a71b8dc53ff82a983f9
+EBUILD glib-2.80.4.ebuild 11474 BLAKE2B 4a618ddb12f35a9c31f40399909053175a71bf1571e83728345673dbd60f72d85e290667908a17c0c846f936dd0c9aa703e4c965e62d2eda6a7769ae25d7f4fe SHA512 a7d4c0233fe032459f5d75fdbdc3615f35f113a82db6907497d36741379c9f5b47292d1a27355380a79c145d056e916eb7d07b967cfa3d5ea255fb43a626bcdd
 MISC metadata.xml 1499 BLAKE2B 5a75e3b360e4656fe9127f2dc3ba7e90df3eae0586a025b4eefc2317398e53815c98a8014ea6f0dd69ae8afdafa066eec61c18e9fa86d24c78a3f11404c2a7a8 SHA512 2b12c409bf16cf9e01e80c30a6707aac5b48ca4cdeac3852028c003c6cb2d50b5e82be73adeefb8341fd4f157e0f7d22505cebfc2ee0f6d64ca77a7d3cfa8271
diff --git a/dev-libs/glib/glib-2.76.4.ebuild b/dev-libs/glib/glib-2.76.4.ebuild
index f296a348fdf3..52b264f3f701 100644
--- a/dev-libs/glib/glib-2.76.4.ebuild
+++ b/dev-libs/glib/glib-2.76.4.ebuild
@@ -178,17 +178,7 @@ multilib_src_configure() {
 		#esac
 	#fi
 
-	local native_file="${T}"/meson.${CHOST}.ini.local
-	# Workaround for bug #938302
-	if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
-		cat >> ${native_file} <<-EOF || die
-		[binaries]
-		dtrace='stap-dtrace'
-		EOF
-	fi
-
 	local emesonargs=(
-		--native-file "${native_file}"
 		-Dbuildtype=$(usex debug debug plain)
 		-Ddefault_library=$(usex static-libs both shared)
 		-Druntime_dir="${EPREFIX}"/run
@@ -207,6 +197,17 @@ multilib_src_configure() {
 		$(meson_native_use_feature elf libelf)
 		-Dmultiarch=false
 	)
+
+	# Workaround for bug #938302
+	if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
+		local native_file="${T}"/meson.${CHOST}.ini.local
+		cat >> ${native_file} <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+		emesonargs+=( --native-file "${native_file}" )
+	fi
+
 	meson_src_configure
 }
 
diff --git a/dev-libs/glib/glib-2.78.3.ebuild b/dev-libs/glib/glib-2.78.3.ebuild
index f296a348fdf3..52b264f3f701 100644
--- a/dev-libs/glib/glib-2.78.3.ebuild
+++ b/dev-libs/glib/glib-2.78.3.ebuild
@@ -178,17 +178,7 @@ multilib_src_configure() {
 		#esac
 	#fi
 
-	local native_file="${T}"/meson.${CHOST}.ini.local
-	# Workaround for bug #938302
-	if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
-		cat >> ${native_file} <<-EOF || die
-		[binaries]
-		dtrace='stap-dtrace'
-		EOF
-	fi
-
 	local emesonargs=(
-		--native-file "${native_file}"
 		-Dbuildtype=$(usex debug debug plain)
 		-Ddefault_library=$(usex static-libs both shared)
 		-Druntime_dir="${EPREFIX}"/run
@@ -207,6 +197,17 @@ multilib_src_configure() {
 		$(meson_native_use_feature elf libelf)
 		-Dmultiarch=false
 	)
+
+	# Workaround for bug #938302
+	if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
+		local native_file="${T}"/meson.${CHOST}.ini.local
+		cat >> ${native_file} <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+		emesonargs+=( --native-file "${native_file}" )
+	fi
+
 	meson_src_configure
 }
 
diff --git a/dev-libs/glib/glib-2.78.4-r1.ebuild b/dev-libs/glib/glib-2.78.4-r1.ebuild
index 07caf94eb0dc..6ae0c3800fd5 100644
--- a/dev-libs/glib/glib-2.78.4-r1.ebuild
+++ b/dev-libs/glib/glib-2.78.4-r1.ebuild
@@ -187,17 +187,7 @@ multilib_src_configure() {
 		#esac
 	#fi
 
-	local native_file="${T}"/meson.${CHOST}.ini.local
-	# Workaround for bug #938302
-	if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
-		cat >> ${native_file} <<-EOF || die
-		[binaries]
-		dtrace='stap-dtrace'
-		EOF
-	fi
-
 	local emesonargs=(
-		--native-file "${native_file}"
 		$(meson_feature debug glib_debug)
 		-Ddefault_library=$(usex static-libs both shared)
 		-Druntime_dir="${EPREFIX}"/run
@@ -216,6 +206,17 @@ multilib_src_configure() {
 		$(meson_native_use_feature elf libelf)
 		-Dmultiarch=false
 	)
+
+	# Workaround for bug #938302
+	if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
+		local native_file="${T}"/meson.${CHOST}.ini.local
+		cat >> ${native_file} <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+		emesonargs+=( --native-file "${native_file}" )
+	fi
+
 	meson_src_configure
 }
 
diff --git a/dev-libs/glib/glib-2.78.6.ebuild b/dev-libs/glib/glib-2.78.6.ebuild
index 19ae0fc69d73..004b9796f159 100644
--- a/dev-libs/glib/glib-2.78.6.ebuild
+++ b/dev-libs/glib/glib-2.78.6.ebuild
@@ -186,17 +186,7 @@ multilib_src_configure() {
 		#esac
 	#fi
 
-	local native_file="${T}"/meson.${CHOST}.ini.local
-	# Workaround for bug #938302
-	if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
-		cat >> ${native_file} <<-EOF || die
-		[binaries]
-		dtrace='stap-dtrace'
-		EOF
-	fi
-
 	local emesonargs=(
-		--native-file "${native_file}"
 		$(meson_feature debug glib_debug)
 		-Ddefault_library=$(usex static-libs both shared)
 		-Druntime_dir="${EPREFIX}"/run
@@ -215,6 +205,17 @@ multilib_src_configure() {
 		$(meson_native_use_feature elf libelf)
 		-Dmultiarch=false
 	)
+
+	# Workaround for bug #938302
+	if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
+		local native_file="${T}"/meson.${CHOST}.ini.local
+		cat >> ${native_file} <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+		emesonargs+=( --native-file "${native_file}" )
+	fi
+
 	meson_src_configure
 }
 
diff --git a/dev-libs/glib/glib-2.80.4.ebuild b/dev-libs/glib/glib-2.80.4.ebuild
index 2d87ba9d7a69..79fbaf94dbc0 100644
--- a/dev-libs/glib/glib-2.80.4.ebuild
+++ b/dev-libs/glib/glib-2.80.4.ebuild
@@ -187,17 +187,7 @@ multilib_src_configure() {
 
 	use debug && EMESON_BUILD_TYPE=debug
 
-	local native_file="${T}"/meson.${CHOST}.ini.local
-	# Workaround for bug #938302
-	if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
-		cat >> ${native_file} <<-EOF || die
-		[binaries]
-		dtrace='stap-dtrace'
-		EOF
-	fi
-
 	local emesonargs=(
-		--native-file "${native_file}"
 		-Ddefault_library=$(usex static-libs both shared)
 		-Druntime_dir="${EPREFIX}"/run
 		$(meson_feature selinux)
@@ -216,6 +206,17 @@ multilib_src_configure() {
 		-Dmultiarch=false
 		$(meson_native_use_feature introspection)
 	)
+
+	# Workaround for bug #938302
+	if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
+		local native_file="${T}"/meson.${CHOST}.ini.local
+		cat >> ${native_file} <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+		emesonargs+=( --native-file "${native_file}" )
+	fi
+
 	meson_src_configure
 }
 
diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest
index ce695e07740c..4ecd2bf706ed 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -1,5 +1,5 @@
 AUX grantlee-0.3.0-nonfatal-warnings.patch 573 BLAKE2B 1e7ca46d955900e24597666e04b7e6eb60ef5c5bc6e77964721bbed93612bd5024a6935f297f0b888c93c78da71472ac0cc03d842dc04c61e3eafcc7d18b92f3 SHA512 903a1ece31f2ddce273188d29078fbd14fab064eb1a1242569a856b716d85e9a3eab99c348d691cc2b41c83a9e446934629dd211dbebed1e74ca8ab1a24d9ea9
 AUX grantlee-5.3.0-slot.patch 2262 BLAKE2B 8a876c6e19f426c3eaa6117672def327b57fada417e94a523e7c91b0d33bcb6c05d26ae0467463544e6f926014efa04fd78d9d9bd50ef84b0e48b8d24efcb37a SHA512 2e9f0bdb3fd493548944fdac879c6854d08ed27c3ef957f6a9d35d10fd0223b1794a01dcede28d639d3846dc5eb6c5bb86a0d82b0612020780e9735f60ba3546
 DIST grantlee-5.3.0.tar.gz 1176075 BLAKE2B a3418250845b39c4766dd19a1f423f18ca7393f675d0045477b345e589d5649f1cc332f9c228e9e9317bdf356992e533cfabe62bcfb50c40ffa38be9b5009013 SHA512 8018c92e1001e039243b4a22a790907b53bff21e062c7e3ee63d1e2de4ce7bccc4a7580fc4ec2e61dc2f7131ac336d46f76e2f03a7314c1547b8744842c0a02a
-EBUILD grantlee-5.3.0.ebuild 1122 BLAKE2B 9b3d9068501e987444697c3df6cb1fd1aefe6a821cceab3ec45d4e1efb1dc5ede09cc7e546bf1fc9d326de005169be419c284b54b4cab60079b26463f167cd23 SHA512 eea2f3af1c74c4d8bb3a9a8ffcc66a92248d0349002afed261a6317d7cec6b690b5118cd489dfbad7a89e46e698442be6a28089fa06de8cdb32940bec8ef0445
+EBUILD grantlee-5.3.0.ebuild 1124 BLAKE2B 2b9fa954e38adec96b6e6d5295d9385e7202339996b16f0b547bb53d5b9a3c213bb4f4a2f72eae64caf6798efb9483c06671ea1e85a3a443d8e8bd331118bbf6 SHA512 41db09bacf3d7f754f855534e671a86769ea26c40ea611a704885939e99ce390ff9b03fa2a28aca8e56ddfb02ab6a35fabbc7a3fe985316ea7eac540db369015
 MISC metadata.xml 332 BLAKE2B 655bf07600689b25f75cd8889d468ab092a861c8cd88c604a3d0411916ae29ab1508ebd7e296d0df1f037ab9cfad06b146cc2d0fe5d2d4d590d8a36e2de858ed SHA512 5837c62f635103c8ff77caf457916a32600134cd2d9333dc5389f92fa95fba39af867eac73df99fe59cd0c9a16388c6da890f25397986c8406e844aec66bf66b
diff --git a/dev-libs/grantlee/grantlee-5.3.0.ebuild b/dev-libs/grantlee/grantlee-5.3.0.ebuild
index e44ee2d5e392..47ba36990ff5 100644
--- a/dev-libs/grantlee/grantlee-5.3.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.3.0.ebuild
@@ -15,7 +15,7 @@ SLOT="5"
 KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="debug doc test"
 
-RESTRICT="!test? ( test )"
+RESTRICT="test" # bug 874627
 
 RDEPEND="
 	dev-qt/qtcore:5
diff --git a/dev-libs/kdiagram/Manifest b/dev-libs/kdiagram/Manifest
index 02a3ec11912a..0421f7fb7dd1 100644
--- a/dev-libs/kdiagram/Manifest
+++ b/dev-libs/kdiagram/Manifest
@@ -1,5 +1,5 @@
 DIST kdiagram-2.8.0.tar.xz 691044 BLAKE2B c7b3a4ba992192b34d8cda90bb50a495cb88f8456ca1109140841fd885b710ce1193868be148c25f813c2d26dd7365999bdd8572e66163f0d5d1a169afc3e448 SHA512 d981bce4feeb65038772125e5af1c096537ec87991fdb93d9a91dd5c9f089b1001647c8a63b209683a67b2d7b3aadeb7dd6279261eefaf6b6e046d0ab72723ec
 DIST kdiagram-3.0.1.tar.xz 693440 BLAKE2B b11698eb94392208233fc5da64bca5496cc9b91f5e603aee6e0fa896d2180c140ac988763b96078b9ffbc1baba94c82b158c483b6f9f6d31cfff188293e9ca98 SHA512 767c5ba0a4dfcc8b5a5bbf1c65b30bb391537024618b29ea5d5d09da04f85e2665cad60a7477e1cebeed0606e17c992cba0af7a89c76699063bb47e741ea8e20
 EBUILD kdiagram-2.8.0.ebuild 864 BLAKE2B 8cc04382f63e8a0c8c6fd396d6412179b24109ad5787e58dc95e9a9dfcc2d6ebe6d026b7ae5e5eb5d1e4e65e463b60c04ffbe13d5ddfb73bb40c5de3d8a54395 SHA512 7ba7dfe132fca80736ed06afb4a287f5ffa89a69e844946f21a7bdc6dc71b0e747fcb84ed141b7dbc0d9c08b9e7d1494183881a0910c267c9f414dd4d831115b
-EBUILD kdiagram-3.0.1.ebuild 805 BLAKE2B 05074faf25eff44e19264cb7464cabc06ebf4510901049d6f30e191ad9fab3b6b37a74e03795eb4946348d2888f88e947e8822453e7f84a11c50284b3cde6143 SHA512 caa21f6f6a779de3a575ab00cbc7b4378b25d54cc9f3f4cd172ce79f9ac123b8feab13c4a9b5b2ed7e2a6f7bbc646231a89ff9d6ea1e8cb3c2106743d6967a94
+EBUILD kdiagram-3.0.1.ebuild 804 BLAKE2B a5bd07b00d41c6f5919318d79905a0359197128cb21dfc6fdeabbff5628ad468d743234b75bcfef0c2e82202aa210af7b5ea1dce1ec132c308f0e18fa51b27aa SHA512 45d53fbcd1fe65637c8d4c2bdfbf1e11ba48861a1d14586477ac8f184d42265d6819b8d208c3e95a3e4a37eda4339a0947eced6193881fda65ec5073b41323b5
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-libs/kdiagram/kdiagram-3.0.1.ebuild b/dev-libs/kdiagram/kdiagram-3.0.1.ebuild
index 8ec47c4432e1..9cd4fc864203 100644
--- a/dev-libs/kdiagram/kdiagram-3.0.1.ebuild
+++ b/dev-libs/kdiagram/kdiagram-3.0.1.ebuild
@@ -17,7 +17,7 @@ https://www.kdab.com/development-resources/qt-tools/kd-chart/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2" # TODO CHECK
diff --git a/dev-libs/kirigami-addons/Manifest b/dev-libs/kirigami-addons/Manifest
index 67fb10252f3f..d2dc9807df9b 100644
--- a/dev-libs/kirigami-addons/Manifest
+++ b/dev-libs/kirigami-addons/Manifest
@@ -1,5 +1,5 @@
 DIST kirigami-addons-0.11.0.tar.xz 136692 BLAKE2B 26301176ddeaea3aec351207e82dc28a56e465aa6bc6d3bfd23b1feaa5d14cc0821a4c39fdf5eee3d134a8ed9bbcb5e503ee31d3864185c57bb0fcb788744f2d SHA512 f5a721eee6d0ebd37e67cdb5f89aba81136eb4ac23bc042b7d9bedd6a33f96f913353e1d83ec91e6997a8eea5e2834d9203eb7cd286eed1157149ecedeab6b89
 DIST kirigami-addons-1.4.0.tar.xz 1377508 BLAKE2B 2db4c7d704e30ad68d180ac97b8c1f4f005fddf4d52e9f4a82a460e3e0b267b6a7e018b198e4a628889aea1b38ca5a72e20a02a918e06f8b9a23277328d20d18 SHA512 f9c44436c0b5360fba702cb3ef0a5445d96f4fef023ad74db1ff07cdb362c41e8ab7bfd779cf021bae9578f9d07245ab56c80e243d1b6af70c5d12c5afcbc8b2
 EBUILD kirigami-addons-0.11.0-r1.ebuild 1301 BLAKE2B ee2397f463e16bb7e971ae127196d8b427bf9a5447be85bf840d788afc9fadec56be823bd2490b7487e40eedb141ead0022bf00fca96aee183e1f3928af84fc4 SHA512 4e4f3d3d24e92a1845fe2ffce7042da1b74077435474887ad5507b52e5dd0afff7926690c5e5235a8c8f7f891ce9edca1cfc2b4f66344d5e522728404e0f3d05
-EBUILD kirigami-addons-1.4.0.ebuild 1092 BLAKE2B c892828ed7e0adefc66a47c22705a28149e89c7678a8a2fe740a863d22eaced8e0f5d76bd3fd3b5c5baf05b803e38453c71b3d05fc8e8e85e98d8874ae1a1e6d SHA512 a23ce3801d73ece61e7ffa25e8b084178fbdafea094094768828d4175fed2f01ca4889e074f20c930dfe35110efee4f8278f887094e6e722e415a5ad1b3f88c2
+EBUILD kirigami-addons-1.4.0.ebuild 1091 BLAKE2B 12dce9b06cfc28bed3ec9598422663da58a8f6ab0848b3d8025eabfeeb414573c4fe962db68ba9556ddcce00d6fd74c3b36bbb5d1f6693ed90ccd49244f6c63c SHA512 52006af016109f654521d4b2d4177d882ea5732d5d30b297cde23d02ff5bcdefd6061fab7f8bb2ae30555aec4fa01b9c6b73575523d6ca255932dc37a67fcd89
 MISC metadata.xml 387 BLAKE2B a3de5c7143c2fd60eeb5e9dc854c8d9dcae39be83d5bc345b2227e323844867628335ffb9bfbc3dd0c5dfd5358c28f5f99d8564891c8b44e3424083da75d1140 SHA512 2b3921a511147eb3f47f42541e80788e7432d6b4496537e8b919ed83b627c29ad2b268134a88fd4d0f7690eebf782bfc13d1a122b40f571dbadc9c9af9858cd3
diff --git a/dev-libs/kirigami-addons/kirigami-addons-1.4.0.ebuild b/dev-libs/kirigami-addons/kirigami-addons-1.4.0.ebuild
index 87b191f14ac2..4cf8af4ffb92 100644
--- a/dev-libs/kirigami-addons/kirigami-addons-1.4.0.ebuild
+++ b/dev-libs/kirigami-addons/kirigami-addons-1.4.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Visual end user components for Kirigami-based applications"
diff --git a/dev-libs/ktextaddons/Manifest b/dev-libs/ktextaddons/Manifest
index 1d7670633cdd..c3f4c4e8de43 100644
--- a/dev-libs/ktextaddons/Manifest
+++ b/dev-libs/ktextaddons/Manifest
@@ -1,5 +1,5 @@
 DIST ktextaddons-1.2.1.tar.xz 392132 BLAKE2B 63a3dcbca0e49fab246f6a76266529e90ec73209e5dd2464884b9b0071867d10ff017b91faa321a8738e63c90c6bd6c4c8ad708a4a944595eba4a7f0aa4934d2 SHA512 44a0aa56a92594031576d2e37e7bc526444f64cebd9b5add8bd382e72fc30b222075bee4d61cc358da61f4db266cd0a339717bd9d90b21e38993371cb1408db9
 DIST ktextaddons-1.5.4.tar.xz 471052 BLAKE2B 9f2730d0e1f71606b60c2469bd06790a8a1fadd7e30526ed94125d8eb897a08be549ac05bd9af9651dadf5ef95fa71249c5802e40fce43f28c82c2cd8f121e04 SHA512 76829c265c68e374fc7012c270a0328bb9d724d78165f0bda8da126994a5eb692af0b66b93e1151af3fc3e1755bbedfabcae73b60bb47c871181d2d50530e243
 EBUILD ktextaddons-1.2.1.ebuild 1085 BLAKE2B 1957d45ad80a6bfd8edf0bb2dcbf190d15954fb87a5312caaf6ea2a06c0c72c508aa9d42dc9134d3b3bd10db8ad1425abe78a78fed472b29b6551ae9f28f05ec SHA512 b8ad187f2c16bb46ba617bf3d54f2405003f603066ee956183bba4315a213a7fca171c81076fb7e481e6d81302766951aad80dd693b40ef6282f71ec8d64a870
-EBUILD ktextaddons-1.5.4.ebuild 1192 BLAKE2B e6cbc23e140df299ff799bca3b1ee0e0b5aad326b0eeb3de1535b95bdb89ec77cb0b3e0fa35bd8adc32897412b88d8ef238a5cac8e13b042f87e7bb6e4a580b0 SHA512 be67057f36eb7515127bbec204e3b0230c7b6ce271b8122b7b2122856ed07a7f7d09f78541a3391b838b41a59c93e64830cd3e62ad70e868c0edfd82ce8f4746
+EBUILD ktextaddons-1.5.4.ebuild 1191 BLAKE2B 4501cc527c60634e33847036ab7f98466f74413ba4582e8ce319962018866e09a6ed5edc1b171c22a3577503744f8ebdfa43ee6c47764aac616f2e4c4bb52a66 SHA512 6ac61372a571819d819e7990415f4e8c98691794a789190b3a3855844dd395e100d0d6bdd4530ce6b74b98b34ab5b709afa90053334cc1c9e36b036d3265e286
 MISC metadata.xml 474 BLAKE2B 5ac8ffc46a5da22bb89002f8962745272bfa6060df178a1a784b22ad56bacaa92e32e3c421459c17b4054c4678ec1c173e6ff234bd3ad5b736208b64fd19f02e SHA512 479c76d5e955d8dfecdb44aafa0d4bfb1b62c951afbd98fece030da9076c2b7787d5435f8d2f66a1ebef918cd8e9e9f231370d45cec288deaaab729e975b09d7
diff --git a/dev-libs/ktextaddons/ktextaddons-1.5.4.ebuild b/dev-libs/ktextaddons/ktextaddons-1.5.4.ebuild
index 91e82c8d59c3..1e3555cac962 100644
--- a/dev-libs/ktextaddons/ktextaddons-1.5.4.ebuild
+++ b/dev-libs/ktextaddons/ktextaddons-1.5.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/libraries/ktextaddons"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 ~arm64"
 fi
 
 LICENSE="LGPL-2+"
diff --git a/dev-libs/kweathercore/Manifest b/dev-libs/kweathercore/Manifest
index 7c9abe5d9e15..12c716834ac8 100644
--- a/dev-libs/kweathercore/Manifest
+++ b/dev-libs/kweathercore/Manifest
@@ -2,6 +2,6 @@ DIST kweathercore-0.7.tar.xz 57016 BLAKE2B c9fb519e681b5570a60daf224b75f98616a40
 DIST kweathercore-0.8.0.tar.xz 76420 BLAKE2B ea0ec5ab24196ce5fa10811c9e54722606121a2176f354320b29121987905d9f6c25f1c332573d8cc2ee3c1bd324fd30d3c94644963431a77dcca3606487992a SHA512 eed813f528422969aed17b831bf6153e49595cf148bb9bda477acdf76d41922eededa55f312d075ccf7bece9e8291dddc0efc92713073fc3c99f438cc0844b69
 DIST kweathercore-24.08.0.tar.xz 75336 BLAKE2B 8ab1639cc1a35407b1ff8bf3fc210574e19a72b5e34fa60a0191b69f46eef22e3729bff9c1e5aa7eb524fa9ae71249f04f5325b4e8ab63fe9518e0bd7eab6612 SHA512 50379a36e2fc6a8ec8937f4e95caedb418891feb475530699f7931f12309d46a2f8da5c95ffd39e55a29b8e14b3b3d31af625c6a939f4805b0e45478772f78c5
 EBUILD kweathercore-0.7.ebuild 717 BLAKE2B 3497b846891a620e0a02ee25fbde872175b89c0aba89e5056de3668f4adc2f206173bf6d4fee86a911b5c85ff350de4a6452684c8ad58a12a7d47a29cffee063 SHA512 8d2da4651c7e8afc056167aa5c195a2b680d3d283f25a6ee53a4b473f1b998a1f88854ba266696f4c74d375df8d67f4639ff6492a15d0786d1ff83ff584b8752
-EBUILD kweathercore-0.8.0.ebuild 719 BLAKE2B 162f630880b5dd46b346424465f071abac3f928aa2b0b2cffeb61f13c2547d726506dca0ef6867682d54bdcdbc829a8a5e4dc283b2af0cefcd4808745eade60c SHA512 60007637bd6c1d0bfcd65d85ed4f11c45302dba4b38302a2e88bba65b65c10dbf549136b02cda3b18224982a92af116c1c9c431be765eb7bba710e33d6ad69a2
+EBUILD kweathercore-0.8.0.ebuild 718 BLAKE2B fb5303e1a6fb3f237db8215bf24831a1dec682f2d6892640acbb50e8661793edb32f5976f7adf0935a01bef4026d2977b5918f366de908cb9e3275c4c1fd57b2 SHA512 f8850100129b8a75a1d2f73ab195fcf88664ac2192857813d29cb983cfa438a2d89e5cd4234256baf54e3be3a53fc4099d927784e0e75145371050ad04c165b3
 EBUILD kweathercore-24.08.0.ebuild 677 BLAKE2B 46a727838e583d2737db96912e1f5f84f96d0c1a13766eb4e7819c0e9e83d8ed61637b934e8688e91d7031006e2d1ca0a87c86af28828eb92deccc1598dd7a8c SHA512 a255630a8c918a97844b99769bea80d2e2b96a96bfdd9b1cd64220ac240508c433b978b206bc825cc41f0269dea708ff9b124b9966b312bcfc74fb686699a84d
 MISC metadata.xml 384 BLAKE2B 67d34f806cf49bd1284a67a7624719b4d5bb33add29d6296f87564e3448ed673c50d6e4a2e6cba8ea7cc60ad7985838c8d3d24a7e8d3fcf5502d40851adb33cb SHA512 bc5196d60e89f50e5acac704e0e76e911cad6d9c1f2a44b9f15e38a435abaac50b706a3fbbe5ff5c114a5cfebac41d4e273042c9f8048cdfad43b630758e2b47
diff --git a/dev-libs/kweathercore/kweathercore-0.8.0.ebuild b/dev-libs/kweathercore/kweathercore-0.8.0.ebuild
index 54a4ceb5cc19..171f605d9258 100644
--- a/dev-libs/kweathercore/kweathercore-0.8.0.ebuild
+++ b/dev-libs/kweathercore/kweathercore-0.8.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for retrieval of weather information including forecasts an
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 fi
 LICENSE="LGPL-2+"
 SLOT="6"
diff --git a/dev-libs/libserialport/Manifest b/dev-libs/libserialport/Manifest
index 9617101f1573..ba19d79d0e13 100644
--- a/dev-libs/libserialport/Manifest
+++ b/dev-libs/libserialport/Manifest
@@ -1,5 +1,5 @@
 AUX libserialport-0.1.1-kernel-termiox.patch 1216 BLAKE2B bbb629086c2e21caf683df74d63abd4c706ac05a4906d8322d369ca491ad2421416ca6abb579ca8c2eff7f862557338ab9bd31bf0954d8b564b2c06c1fad4810 SHA512 12b99310a2072e9a3a5df61cc2b2121e9b7823caebd88d22a344a885ff777ad955787303b6148e0b803a605877136f357ce211dcfeeae4938538d146f679d992
 DIST libserialport-0.1.1.tar.gz 405251 BLAKE2B bc52d7b5303c123a28becde1e77451a921c2b6d5284ccfaca298d0535a793297d30e297109382a7266263530ac9a0e0b598ce8d1602e0700b43bda227f29a6b3 SHA512 7d379d1099173841e6d4df04c8c12dc6a4ebdfa0323ef35da6f3dea20db55d4f6ad81c1f6679f5aac7fe83270176428a817daa8627c336505335a07e06350a85
-EBUILD libserialport-0.1.1-r1.ebuild 904 BLAKE2B 665fe0f46b5a1a232954c08bc73d99b7f765258a2c9bf0111dfabb8ed88f36ef705fd2e2039283bde2b7de55747120b9285950c1564bde884a8b432b15231c9c SHA512 62644cc59336ceedc7b59105ab0e386d24d57f514bb3f77fb9b6c1e5fa51bf37eee6e12e69523b7f5c25a0a2036c74a1c5cd7714e29aa3ab1d8de2615f54ea1c
-EBUILD libserialport-9999.ebuild 696 BLAKE2B 28887f91aead3b5333fae835e5b3d442f0dd42d6636dab4e4118eecdced2b7832219c4a8e59e9882da6af5a4d3c9db060d240a1eb6d4eefd66c1f12007fbf7f0 SHA512 058be99b71f0127b26afd3eef4bc1da0ef7ad208d50caccac177622bb8f5dbb0f64e40353b4e53a257b6828cdc0357584ea0554234519d5901ec89ecb33ec4be
+EBUILD libserialport-0.1.1-r1.ebuild 924 BLAKE2B 0896482327e4811603ba6c1b5f7b3c5ce318816c8b9509c13c9cc284f576ce783da5a16eb29dab5e64465e0e0c96d61810a7f6841c6d14abad7439ac9e45f511 SHA512 d27aec752c9b95503fcb11ec8f821c45fd111212acc7e5bed60f7479ae64447b6521ec06996b8f3b10c3d82544ebb2aed8d4e7ced665b65f82c6c12154744eca
+EBUILD libserialport-9999.ebuild 716 BLAKE2B 3940c13a28c475d490c8d1f94e43c630950868cae1e86221a3e60a85a8b58d6103deec643281fa182dd33869a836430e172294ab820cfe6e53fbbc7f48af272b SHA512 c2357e1781349a00fe683838fe073c8722fb913923a19ae9fb40934e8e745d53f5e73ace380367ba24e85f6ffcacffed9cc99b57e96c01c5f1941101ba675165
 MISC metadata.xml 248 BLAKE2B 9858a97a2186d5b06e272fe28021e0e668897630d8b99023000e8e58e852e80e16b399d8f864b9dff6c9fda25e1519ac8b4331792a4b441be23922707c4ad6a9 SHA512 a1e8f757e473af3ab0ccf695f849dc91e1be877dd505d339bdd26e35a2cf7fb5ffd8f5bf34e933873a462023aecb0edbddefbbda455289279182059cd6c1b0e5
diff --git a/dev-libs/libserialport/libserialport-0.1.1-r1.ebuild b/dev-libs/libserialport/libserialport-0.1.1-r1.ebuild
index d66e76e13da1..cedf74a5353d 100644
--- a/dev-libs/libserialport/libserialport-0.1.1-r1.ebuild
+++ b/dev-libs/libserialport/libserialport-0.1.1-r1.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"
@@ -6,7 +6,7 @@ EAPI="8"
 inherit autotools
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	EGIT_REPO_URI="https://github.com/sigrokproject/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
diff --git a/dev-libs/libserialport/libserialport-9999.ebuild b/dev-libs/libserialport/libserialport-9999.ebuild
index e1d11628901a..1f0cccb8afa6 100644
--- a/dev-libs/libserialport/libserialport-9999.ebuild
+++ b/dev-libs/libserialport/libserialport-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	EGIT_REPO_URI="https://github.com/sigrokproject/${PN}.git"
 	inherit autotools git-r3
 else
 	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index c6c25dc06876..79eab984c83d 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -8,9 +8,12 @@ AUX nss-3.90.2-bmo-1885749-disable-ASM-C25519-on-non-X86_64.patch 1325 BLAKE2B c
 DIST nss-3.101-cacert-class1-class3.patch 21925 BLAKE2B 2b37f6b69e0541f31087ff0401b195c035f4b607865c4d29976e4ad2c8143321d65b41b996e922362e076aa8259304ed67b0c4a1f8df2fdfdb1d893319f5d5e7 SHA512 19438aefbb361881c1b4620d8b1b5e7d2bf5afb44900858d3728ff6999a792bf6fe073a11f591ab70461bee8c54fdfb097e4084b402842bc49d2139897de304d
 DIST nss-3.101.2.tar.gz 76462495 BLAKE2B 3a0dfd7aa68bc11f332decfc9cb7003b8d8fa6a9dad556ad736229d7d3847e68aeaf5b74e68989a0483bd1b9e2e3afd3bdf8df3d428ebc815eda9a255f5695aa SHA512 65ac338ee1b13ecc2b190f1ea39c987110a06f3b67610e094ffc1ef4117d487c34af1e11b90de0c28035bfc5cb10ca7996ed991d9afce7985973fabb48cd7ac8
 DIST nss-3.103.tar.gz 76470174 BLAKE2B 0d57ad2479f26d0ff8f3021b435ee936e82408e5f3f213804397934f1d01c2178f641247cfc84de36616eb92d06fb002fb77a4285ff84a86a3217e960d175475 SHA512 bc7680fc34d84de7953b27f1a220681f3f5c5a501a82be210ec6134894313f6a2c9bfcc350f4802152a5e3a1fc2defc74d700445ade338d6c86a923ac8b4dc75
+DIST nss-3.104-cacert-class1-class3.patch 22038 BLAKE2B 66e2dd47230d6aa58a767e35c9c069fa29f3111d470345e0f69486d1eead3cd1741939ac394f6b9b637e79a10d658cfb1a9da4387953b8968a9001bab94d4de0 SHA512 bafc4212e0e0ca3eb129a5b88767727159c6ec3da450c7625d0b282f82699378d64eaa2c3fecb72c61000ec9b6d3c24f20bc7defdac6edc673e0fbb26e0c1f7e
+DIST nss-3.104.tar.gz 76468542 BLAKE2B 78bce851b831aee0e105a4bf2f3ff965dda5dcefc0988272298596ecf1c0fa03eb2059b2cf261536fc221fb5a620c0397dd9c1a53cc13e5dd339981ac0f9d665 SHA512 ec6eb32847da544ff5a2947360d9343f9b2cfea83b86cb8d7fdbacd9d97329f02de4844084c4bcbc4ebceb666d7c23bd3aa1a73a092e10792742e7b9aa7b98e8
 DIST nss-3.90.2.tar.gz 72215444 BLAKE2B 74b8eebf5f053dcebd9c6e6ef17c6113ac42a01f910f4ba621dadb09739d5a6090d022800d2c3a4bc0c58413f03512ca611ead1098488d303f1ee1e4bca5c222 SHA512 048a0c0a06fef8cd9c363ac511b9d6125ec131a306c5e093525a937f9e8740f1a2163f274c9a3907ed38331b2fb99b22b528b5e89da1e186c9ba9473d959ef4a
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
 EBUILD nss-3.101.2.ebuild 11575 BLAKE2B ebce744715b64b196fe2f3fb7bf1acd5535d534669cf56e174006ac704df3583205c206eb17a9a8d3df366e25ec5e41f4399a32cbe13b241b490ca501b8114c1 SHA512 4250d45b0be68fed9ad50449ae40e413d7ce2ddbef27f7af8c4e74fddf7321a76ab938f9e810afc709e6534fb9bb14452688ca1331c7dd7b927f871337b5d35d
 EBUILD nss-3.103.ebuild 11677 BLAKE2B b3f61c385e5df37e6dc1d20f59ace309ed5ea4512f59bda56813c29d8a0a127ce652e45ff0e614a2840db44bfe0baab3ef7866b75cc12573921f9c7087ab2934 SHA512 3b41d19fe7e7101e7c77d5ec2be1406546ad170c74ad6196e70e41a0a8c2e891e6725a8fe3b5b0e34607c647660090a3851682182ae8336539a98c14412f22d6
+EBUILD nss-3.104.ebuild 11677 BLAKE2B 4b7d9f6b7730b7fd2e32478764720ec888d6c667c43ec4738569a8c622ac4ba9b4b59058bf99fb8f1c9c0f5dae2a37bac2a2c51a63a2fa4e3f0b6526c748064a SHA512 8c9fcced13c21bbdb143da59013a450c35c51e7dd5c680970a6e0391c3ce1c3f4405b49f10365cf4474d86d509d36c817f0bcaf3e815d5d44d3351573ec5fa30
 EBUILD nss-3.90.2-r1.ebuild 11718 BLAKE2B b683b2eb0dbad6c7d677290e91acafc69f4c1570d96e7b4beaa4befd4cd387468f9e3d40edf96b8ab1df7947e4f1417947c581a7af52385d943304571755472b SHA512 5fd76e57313eb49f97e85be7e74f4b1ca8549aa7388d41dbe995157027d7481afc667e9c0d415080864b82df73c809ab6862082bb96f8f7a6f55af6fc6bc6eba
 MISC metadata.xml 603 BLAKE2B 74c5a84f8a860b6a43731ed83cd40373187236de7add14ca33f3417eb0cfc165aa5df5308dca14b4664bcfe453e0f328988df4459af5781da4cbcb7bfc00e93d SHA512 9d7fb0be71d18ad1da440de047f4430bd3b50a8584d8dccd43e5e4cdf050f5c5cfeb34cd82ea617f2419ff092908becd1508eb7efcf54f3cca8c7f36af9517bb
diff --git a/dev-libs/nss/nss-3.104.ebuild b/dev-libs/nss/nss-3.104.ebuild
new file mode 100644
index 000000000000..4b2df22baf4f
--- /dev/null
+++ b/dev-libs/nss/nss-3.104.ebuild
@@ -0,0 +1,419 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.35"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~juippis/mozilla/patchsets/nss-3.104-cacert-class1-class3.patch )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="cacert test +utils cpu_flags_ppc_altivec cpu_flags_x86_avx2 cpu_flags_x86_sse3 cpu_flags_ppc_vsx"
+RESTRICT="!test? ( test )"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+RDEPEND="
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/nss-3.103-gentoo-fixes-add-pkgconfig-files.patch
+	"${FILESDIR}"/nss-3.21-gentoo-fixup-warnings.patch
+	"${FILESDIR}"/nss-3.87-use-clang-as-bgo892686.patch
+)
+
+src_prepare() {
+	default
+
+	if use cacert ; then
+		eapply -p2 "${DISTDIR}"/nss-3.104-cacert-class1-class3.patch
+	fi
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+
+	# Workaround make-4.4's change to sub-make, bmo#1800237, bgo#882069
+	sed -i -e "s/^CPU_TAG = _.*/CPU_TAG = _$(nssarch)/" Linux.mk || die
+
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		*86*-pc-solaris2*) echo "i86pc"   ;;
+		aarch64*)          echo "aarch64" ;;
+		hppa*)             echo "parisc"  ;;
+		i?86*)             echo "i686"    ;;
+		x86_64*)           echo "x86_64"  ;;
+		*)                 tc-arch ${t}   ;;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	# TODO: Port this to toolchain-funcs tc-get-ptr-size/tc-get-build-ptr-size
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -fno-lto -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file -S "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+		disable_ckbi=0
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export USE_SYSTEM_ZLIB=1
+	export ZLIB_LIBS=-lz
+	export ASFLAGS=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
+
+	export NSS_DISABLE_GTESTS=$(usex !test 1 0)
+
+	# Include exportable custom settings defined by users, #900915
+	# Two examples uses:
+	#   EXTRA_NSSCONF="MYONESWITCH=1"
+	#   EXTRA_NSSCONF="MYVALUE=0 MYOTHERVALUE=1 MYTHIRDVALUE=1"
+	# e.g.
+	#   EXTRA_NSSCONF="NSS_ALLOW_SSLKEYLOGFILE=0"
+	# or
+	#   EXTRA_NSSCONF="NSS_ALLOW_SSLKEYLOGFILE=0 NSS_ENABLE_WERROR=1"
+	# etc.
+	if [[ -n "${EXTRA_NSSCONF}" ]]; then
+		ewarn "EXTRA_NSSCONF applied, please disable custom settings before reporting bugs."
+		read -a myextranssconf <<< "${EXTRA_NSSCONF}"
+
+		for (( i=0; i<${#myextranssconf[@]}; i++ )); do
+			export "${myextranssconf[$i]}"
+			echo "exported ${myextranssconf[$i]}"
+		done
+	fi
+
+	# explicitly disable altivec/vsx if not requested
+	# https://bugs.gentoo.org/789114
+	case ${ARCH} in
+		ppc*)
+			use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
+			use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
+			;;
+	esac
+
+	use cpu_flags_x86_avx2 || export NSS_DISABLE_AVX2=1
+	use cpu_flags_x86_sse3 || export NSS_DISABLE_SSE3=1
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+			${buildbits-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+	done
+}
+
+multilib_src_test() {
+	einfo "Tests can take a *long* time, especially on a multilib system."
+	einfo "~10 minutes per lib configuration with only 'standard' tests,"
+	einfo "~40 minutes per lib configuration with 'full' tests. Bug #852755"
+
+	# https://www.linuxfromscratch.org/blfs/view/svn/postlfs/nss.html
+	# https://firefox-source-docs.mozilla.org/security/nss/legacy/nss_sources_building_testing/index.html#running_the_nss_test_suite
+	# https://www-archive.mozilla.org/projects/security/pki/nss/testnss_32.html (older)
+	export BUILD_OPT=1
+	export HOST="localhost"
+	export DOMSUF="localdomain"
+	export USE_IP=TRUE
+	export IP_ADDRESS="127.0.0.1"
+
+	# Only run the standard cycle instead of full, reducing testing time from 45 minutes to 15
+	# per lib implementation.
+	export NSS_CYCLES=standard
+
+	NSINSTALL="${PWD}/$(find -type f -name nsinstall)"
+
+	cd "${BUILD_DIR}"/tests || die
+	# Hack to get current objdir (prefixed dir where built binaries are)
+	# Without this, at least multilib tests go wrong when building the amd64 variant
+	# after x86.
+	local objdir=$(find "${BUILD_DIR}"/dist -maxdepth 1 -iname Linux* | rev | cut -d/ -f1 | rev)
+
+	# Can tweak to a subset of tests in future if we need to, but would prefer not
+	OBJDIR="${objdir}" DIST="${BUILD_DIR}/dist" MOZILLA_ROOT="${BUILD_DIR}" ./all.sh || die
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac,cmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/qcoro/Manifest b/dev-libs/qcoro/Manifest
index c9c28d813549..f068997cf232 100644
--- a/dev-libs/qcoro/Manifest
+++ b/dev-libs/qcoro/Manifest
@@ -1,3 +1,3 @@
 DIST qcoro-0.10.0.tar.gz 150114 BLAKE2B 8a552dc3a0e4a5963c7c9fd0638f336e6ad99491a54df3bb8ddaa6b0ee1fe8e4c6b7ffc26c25cef543e796c54bc4c625a0915755f4b538f489bc61fcd8310a6a SHA512 de2e55256d3c9d35fec3ef6dc78128801b70a5e5b8ff0f3a6f235dac17f349ea44207a7c9f35375215dbeea04cb67c3412d505d0a8a95f2b926775f804a02649
-EBUILD qcoro-0.10.0-r1.ebuild 1372 BLAKE2B 6cd531f2480de41f324fd253fde051c9bbe4a94f7575bedaaa5ac5c9dda81ccdc96cd50026576b8dad07cf40b8bcb18101aadd1dd4c9183e2b7d904bf2c28972 SHA512 45756603e72805423b991dc4847ba68eee9cd440dc566df6e6c0481f67adc69772ec20befedcb55e22cb80f0ca150dea327f339d5abfdee3e4508f0ba36c7882
+EBUILD qcoro-0.10.0-r1.ebuild 1371 BLAKE2B 736fe3e8e1a83498b7c3ac8a6a97dee5b87e40cdbb160e54540e62a9e825ac725ce062611052ff587065a9c7f97016a6f89cb690fc1a8c34b88b0837b7fbb6c1 SHA512 574d8c73ca050f8d9acf853a14ac9dddda6853bb2220433f8172c934b70a01215d3d71824fc624c08e0406169e9fbbdd05f17b389775ab9e205614f3387fab22
 MISC metadata.xml 652 BLAKE2B da89b36ab1d771a7dfe49965486249d246dde4345c1c1ad9bc44c5c8df5e2fe35ce15e958a50d3ac18d3fee3522a2a55aacff1bd83813a6366b610a8380ae9ac SHA512 2ac22873e29deffa7240ee98cc8e7e823bc1cea6fe2af03cc69dd5e5ec3faaaf69b61fadb4c1764dbf67815c62798487c03d01787a4d01eda26083f8eea72256
diff --git a/dev-libs/qcoro/qcoro-0.10.0-r1.ebuild b/dev-libs/qcoro/qcoro-0.10.0-r1.ebuild
index 2d6c10b669a2..69ef125af388 100644
--- a/dev-libs/qcoro/qcoro-0.10.0-r1.ebuild
+++ b/dev-libs/qcoro/qcoro-0.10.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/danvratil/${PN}"
 else
 	SRC_URI="https://github.com/danvratil/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="C++ Coroutine Library for Qt"
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index 94e5457a1a49..019f1644d70a 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -2,7 +2,7 @@ AUX wayland-1.23.0-c23-clang-fix.patch 4740 BLAKE2B fceae0f54e0d12c8c7651641294c
 DIST wayland-1.22.0.tar.xz 229544 BLAKE2B b0bb366e7f3494813d1574228ae5dd48eccde035120d6dd8709e3a24738681ab9dd9ba6a13924b6a35982d331fa8911fa7346911da9f618be9c9109da0288629 SHA512 fb1974efc8433e97254eb83fe28974198f2b4d8246418eb3d34ce657055461e0c97bc06dd52e5066ae91bbe05bac611dc49a0937ba226ac6388d5a47241efb12
 DIST wayland-1.23.0.tar.xz 237900 BLAKE2B efb80e3c67db7a707a6d2ea66e7a5132173550bc13fdff447925ec3d33bfba8131532f819d5ab0dd80924cb4339b58b7ca83d9e70a436cea8268167476355bd8 SHA512 9c525231a7ea3e68d3178230d476285a960d23e38571ac96d885f86c0588c52ef01460bff6833db5adb9456ce8db7b996613611187aac972736748ba91b8fd81
 EBUILD wayland-1.22.0.ebuild 1669 BLAKE2B dd25effa4c6a77f44fcf7d06249f0397da9e86186d73b4a2e06fa14decd9e9f9d1d358d43363dc6b8880467b60dab442872c45c4f4d44e2535521a1bdaedb804 SHA512 5e8d283cdf726f0f3ca414ec5c5c43567ef695e4aaec557ec905420f0002be46348f29be8321912b5c559f858c47040206a96019c72b77359dadb992eca23cb8
-EBUILD wayland-1.23.0-r1.ebuild 1733 BLAKE2B efb9c01cf3a5a28631e052142ae68918bd4c5c53902c10dd01dbf891725de39fe81a08621a1c5dc381444b335669333a60d722985f260090568ebb6de98de086 SHA512 fc004c1045afe56a50553f6476925597f357adfa4fe059033ac56b5b7c1a5a2dd64da04f5e6bd9c3bea1da8e7848b4392842cd119390e75ea7f589d5fc95978e
+EBUILD wayland-1.23.0-r1.ebuild 1732 BLAKE2B e325981cebc0d69d4b32ce27808f73b4ae5cbbcbd64d5313f0c69ab3ff9d8612bef8e63e110c1a8a9a15b018a9e303840187eee1a0d48728558d2e9d2225fd2e SHA512 3169ecef4c31a395546f7d4f7e3b8feb4d4c8dce1678bb149ece7abbe0739acd3e9cfcd02580d4ffd61ee5e5e55759edeaa38e02003726194922aa24821ae539
 EBUILD wayland-1.23.0.ebuild 1676 BLAKE2B 7c400568934443ab15f422950828d01cc0f7530a9b010f089e59ef3ac77d31f3541cd8cfe0d0f426dc27289fc90512f0ccaeb82f171c45104d8c21c815f8856c SHA512 9eae9e9da8564e15a3303eced89699701dcc1347e0177f3e2fdd95aca76d27ea969f0308ae3b59e2d79925dd1a03de086f5582f3cd4368510d26f87fa507988a
 EBUILD wayland-9999.ebuild 1676 BLAKE2B 7c400568934443ab15f422950828d01cc0f7530a9b010f089e59ef3ac77d31f3541cd8cfe0d0f426dc27289fc90512f0ccaeb82f171c45104d8c21c815f8856c SHA512 9eae9e9da8564e15a3303eced89699701dcc1347e0177f3e2fdd95aca76d27ea969f0308ae3b59e2d79925dd1a03de086f5582f3cd4368510d26f87fa507988a
 MISC metadata.xml 337 BLAKE2B af249efc25c3eadde73d0b49cba0e6c8a021fb4b7c9a0b96f27a4e71185c76f8ac7ff0b9efdfeadf2df324cfa578db3a73fc7bee8c249cba35d41e2145017e16 SHA512 771b226f8e16d8c570bc2ea89ee3c5176e1d0f2209afb3b2af5a9d19fbdc2037a411b84d546bea054449c8074fb0fb3c3726fb2692d084521c64cda60600c0b8
diff --git a/dev-libs/wayland/wayland-1.23.0-r1.ebuild b/dev-libs/wayland/wayland-1.23.0-r1.ebuild
index fc0f8eb2831b..e14f79317a73 100644
--- a/dev-libs/wayland/wayland-1.23.0-r1.ebuild
+++ b/dev-libs/wayland/wayland-1.23.0-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 inherit meson-multilib