9 files changed, 24 insertions, 18 deletions
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index c5a41dc29cea..12d2fcf5cb4c 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -183,10 +183,6 @@ dev-qt/qtbase -renderdoc
 # media-libs/roc-toolkit is not keyworded in most places
 media-video/pipewire -roc
 
-# Matt Jolly <kangie@gentoo.org> (2023-08-10)
-# nghttp3 has been tested to work on amd64
-net-misc/curl -nghttp3
-
 # Sam James <sam@gentoo.org> (2023-07-18)
 # dev-cpp/cppdap is not keyworded in most places
 dev-build/cmake -dap
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 42293449a3e3..4f02dbfb24b5 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -59,10 +59,6 @@ www-apps/hugo test
 # librttopo has not been stabalized on this arch yet
 dev-db/spatialite rttopo
 
-# Matt Jolly <kangie@gentoo.org> (2023-08-10)
-# net-libs/ngtcp2 is not marked stable
-net-misc/curl nghttp3
-
 # Sam James <sam@gentoo.org> (2023-05-15)
 # net-libs/rustls-ffi is not marked stable
 www-servers/apache apache2_modules_tls
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 8d11766e0f71..f19231c8aaae 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -336,10 +336,6 @@ sys-block/fio python gnuplot
 # The JIT feature only works on amd64 and x86.
 app-emulation/aranym jit
 
-# Craig Andrews <candrews@gentoo.org> (2019-10-08)
-# net-libs/nghttp3 net-libs/ngtcp2[ssl] are not available on all arches
-net-misc/curl nghttp3
-
 # Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
 # Moved from arch/powerpc/ppc64 as it applies to most architectures.
 sys-firmware/seabios debug
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index f954f68764b3..f63c5033acd6 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Sam James <sam@gentoo.org> (2025-03-17)
+# dev-util/babeltrace is not keyworded here
+dev-debug/gdb babeltrace
+
 # Ionen Wolkens <ionen@gentoo.org> (2025-03-10)
 # media-libs/libopenmpt is not keyworded here
 media-video/ffmpeg openmpt
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 530e1a1a93fb..86e3a16b1507 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,15 @@
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Joonas Niilola <juippis@gentoo.org> (2025-03-18)
+# llvm-17 stack not keyworded on mips, later versions are.
+# Spidermonkey still declares llvm-17 compat on other arches.
+dev-lang/spidermonkey llvm_slot_17
+
+# Sam James <sam@gentoo.org> (2025-03-17)
+# dev-util/babeltrace is not keyworded here
+dev-debug/gdb babeltrace
+
 # Ionen Wolkens <ionen@gentoo.org> (2025-03-10)
 # net-libs/rabbitmq-c is not keyworded here
 media-video/ffmpeg rabbitmq
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 63724affe507..3515d9dbdede 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -17,10 +17,6 @@ llvm-core/clang-runtime -offload
 # dev-libs/libunibreak is not keyworded
 media-libs/libass libunibreak
 
-# Matt Jolly <kangie@gentoo.org> (2024-08-14)
-# QUIC dependencies are not keyworded
-net-misc/curl http3 quic curl_quic_openssl curl_quic_ngtcp2
-
 # Sam James <sam@gentoo.org> (2024-05-19)
 # media-libs/jasper not yet keyworded here: https://bugs.gentoo.org/921559
 media-gfx/graphicsmagick jpeg2k
diff --git a/profiles/arch/riscv/package.use.force b/profiles/arch/riscv/package.use.force
index 729d74128fb6..a36ce5a37c9d 100644
--- a/profiles/arch/riscv/package.use.force
+++ b/profiles/arch/riscv/package.use.force
@@ -13,11 +13,12 @@ media-video/mpv -lua_single_target_luajit lua_single_target_lua5-1
 # luajit is currently not supported on riscv, so use lua instead
 app-editors/neovim lua_single_target_lua5-1
 
+# Michael Orlitzky <mjo@gentoo.org> (2025-03-17)
 # matoro <matoro_gentoo@matoro.tk> (2022-09-10)
-# GHC does not support native codegen for riscv at all.
+# GHC does not support native codegen for riscv until v9.12.
 # It gains LLVM codegen in 9.2, but we maintain a backport of this,
 # so force LLVM codegen in all versions.
-dev-lang/ghc llvm
+<dev-lang/ghc-9.12.1 llvm
 
 # we, kinda, need this on riscv ...
 llvm-core/llvm llvm_targets_RISCV
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 4f89ecfd4757..42ac85e4c742 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2025-03-17)
+# dev-util/babeltrace is not keyworded here
+dev-debug/gdb babeltrace
+
 # Sam James <sam@gentoo.org. (2025-01-14)
 # dev-cpp/benchmark is not yet keyworded here
 dev-libs/re2 benchmark
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 32defbe1684a..c7544ff4acef 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2025-03-17)
+# dev-util/babeltrace is not keyworded here
+dev-debug/gdb babeltrace
+
 # Ionen Wolkens <ionen@gentoo.org> (2025-03-10)
 # media-libs/libopenmpt is not keyworded here
 media-video/ffmpeg openmpt