gentoo auto-resync : 12:12:2024 - 02:01:23

47 files changed, 152 insertions, 170 deletions

diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 2bee87254d58..40a0bb8542cc 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -351,7 +351,7 @@ sys-block/thin-provisioning-tools test
 media-video/ffmpeg dav1d libaribb24 libtesseract
 
 # Andrey Utkin <andrey_utkin@gentoo.org> (2020-03-11)
-# USE=bpf depends on sys-devel/clang which is not keyworded on alpha.
+# USE=bpf depends on llvm-core/clang which is not keyworded on alpha.
 media-libs/libv4l bpf
 
 # Patrick McLean <chutzpah@gentoo.org> (2020-02-15)
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index 53ce21c2ffb6..96d56e664c34 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -180,7 +180,7 @@ d
 topal
 
 # Matt Turner <mattst88@gentoo.org> (2010-12-13)
-# We don't have sys-devel/llvm
+# We don't have llvm-core/llvm
 llvm
 
 # Matt Turner <mattst88@gentoo.org> (2012-05-27)
diff --git a/profiles/arch/amd64/package.use b/profiles/arch/amd64/package.use
index 2ba8e0388262..eb73ee985cec 100644
--- a/profiles/arch/amd64/package.use
+++ b/profiles/arch/amd64/package.use
@@ -24,11 +24,11 @@ sys-apps/memtest86+ bios64 uefi64
 
 # Theo Anderson <telans@posteo.de> (2021-03-06)
 # Enable 32-bit clang runtime to ease -m32 builds with non-GCC runtime
-sys-devel/clang-runtime abi_x86_32
-sys-libs/libcxxabi abi_x86_32
-sys-libs/libcxx abi_x86_32
-sys-libs/libomp abi_x86_32
-sys-libs/llvm-libunwind abi_x86_32
+llvm-core/clang-runtime abi_x86_32
+llvm-runtimes/libcxxabi abi_x86_32
+llvm-runtimes/libcxx abi_x86_32
+llvm-runtimes/openmp abi_x86_32
+llvm-runtimes/libunwind abi_x86_32
 
 # Mike Gilbert <floppym@gentoo.org> (2016-11-17)
 # Enable both efi and pc by default.
@@ -37,9 +37,9 @@ sys-boot/grub:2 grub_platforms_efi-64 grub_platforms_pc
 
 # Michał Górny <mgorny@gentoo.org> (2016-09-24)
 # Enable the GPU targets matching the default VIDEO_CARDS
-dev-ml/llvm-ocaml llvm_targets_AMDGPU llvm_targets_NVPTX
-sys-devel/clang llvm_targets_AMDGPU llvm_targets_NVPTX
-sys-devel/llvm llvm_targets_AMDGPU llvm_targets_NVPTX
+dev-ml/llvm llvm_targets_AMDGPU llvm_targets_NVPTX
+llvm-core/clang llvm_targets_AMDGPU llvm_targets_NVPTX
+llvm-core/llvm llvm_targets_AMDGPU llvm_targets_NVPTX
 
 # Doug Goldstein <cardoe@gentoo.org> (2012-10-29)
 # Enable the native arch as the default qemu target
diff --git a/profiles/arch/amd64/package.use.force b/profiles/arch/amd64/package.use.force
index 85659560a1e0..da5032b5b2ec 100644
--- a/profiles/arch/amd64/package.use.force
+++ b/profiles/arch/amd64/package.use.force
@@ -40,9 +40,9 @@ sys-apps/sandbox abi_x86_32
 
 # Michał Górny <mgorny@gentoo.org> (2016-09-24)
 # Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_X86
-sys-devel/clang llvm_targets_X86
-sys-devel/llvm llvm_targets_X86
+dev-ml/llvm llvm_targets_X86
+llvm-core/clang llvm_targets_X86
+llvm-core/llvm llvm_targets_X86
 
 # Diego Elio Pettenò <flameeyes@gmail.com> (2011-04-21)
 # The plugin is 32-bit only (and I'm not even sure if it works with
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index ab4369c02a60..96d6c2f79355 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -90,7 +90,7 @@ media-libs/libplacebo -libdovi
 # Only works on amd64 (and x32).
 dev-debug/gdb -cet
 sys-devel/binutils -cet
-sys-devel/clang-common -cet
+llvm-core/clang-common -cet
 sys-devel/gcc -cet
 sys-libs/binutils-libs -cet
 sys-libs/glibc -cet
@@ -142,8 +142,8 @@ media-libs/libplacebo -shaderc
 
 # Michał Górny <mgorny@gentoo.org> (2023-09-19)
 # dev-cpp/cpp-httplib is keyworded here.
-dev-debug/lldb -debuginfod
-sys-devel/llvm -debuginfod
+llvm-core/lldb -debuginfod
+llvm-core/llvm -debuginfod
 
 # Ionen Wolkens <ionen@gentoo.org> (2023-09-13)
 # media-gfx/renderdoc is keyworded here
@@ -186,11 +186,11 @@ dev-python/tables -cpudetection
 # Yiyang Wu <xgreenlandforwyy@gmail.com> (2023-01-27)
 # AMDGPU enablement depends on dev-libs/rocr-runtime, ~amd64 only
 # See also: https://bugs.gentoo.org/891499
-sys-libs/libomp -llvm_targets_AMDGPU
+llvm-runtimes/openmp -llvm_targets_AMDGPU
 
 # Michał Górny <mgorny@gentoo.org> (2023-01-24)
 # libomptarget is only supported on 64-bit architectures.
->=sys-libs/libomp-16.0.0_pre20230124 -offload
+>=llvm-runtimes/openmp-16.0.0_pre20230124 -offload
 
 # Sam James <sam@gentoo.org> (2022-12-11)
 # net-libs/rustls-ffi is keyworded here
@@ -272,11 +272,11 @@ net-misc/asterisk -blocks
 
 # Michał Górny <mgorny@gentoo.org> (2020-12-21)
 # Sanitizers supported on this architecture.
-sys-libs/compiler-rt-sanitizers -asan -dfsan -lsan -msan -hwasan -tsan
-sys-libs/compiler-rt-sanitizers -ubsan -safestack -cfi -scudo
-sys-libs/compiler-rt-sanitizers -gwp-asan
-sys-libs/compiler-rt-sanitizers -libfuzzer -memprof -orc -profile -xray
-sys-libs/compiler-rt-sanitizers -ctx-profile -nsan -rtsan
+llvm-runtimes/compiler-rt-sanitizers -asan -dfsan -lsan -msan -hwasan -tsan
+llvm-runtimes/compiler-rt-sanitizers -ubsan -safestack -cfi -scudo
+llvm-runtimes/compiler-rt-sanitizers -gwp-asan
+llvm-runtimes/compiler-rt-sanitizers -libfuzzer -memprof -orc -profile -xray
+llvm-runtimes/compiler-rt-sanitizers -ctx-profile -nsan -rtsan
 
 # Sam James <sam@gentoo.org> (2020-10-24)
 # asm redc is only available on amd64,
@@ -522,7 +522,7 @@ dev-qt/qtscript -jit
 >=media-video/mplayer-1.0_rc4_p20101219 -bluray
 
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (2010-11-28)
-# sys-devel/llvm is keyworded on amd64
+# llvm-core/llvm is keyworded on amd64
 media-libs/mesa -llvm
 
 # Jean-Noël Rivasseau <elvanor@gentoo.org> (2009-09-23)
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index e51faa8535fb..92113854904c 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -62,7 +62,7 @@ dev-python/nbval -doc
 # Yiyang Wu <xgreenlandforwyy@gmail.com> (2023-01-27)
 # AMDGPU enablement depends on dev-libs/rocr-runtime, ~amd64 only
 # See also: https://bugs.gentoo.org/891499
-sys-libs/libomp llvm_targets_AMDGPU
+llvm-runtimes/openmp llvm_targets_AMDGPU
 
 # Sam James <sam@gentoo.org> (2022-12-11)
 # net-libs/rustls-ffi is not yet marked stable
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index 653012d0161f..26f4c994030f 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -70,10 +70,6 @@
 # libvirt is supported on amd64
 -libvirt
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2017-05-26)
-# dev-db/firebird is keyworded ~amd64
--firebird
-
 # Mike Gilbert <floppym@gentoo.org> (2014-10-19)
 # Requires the following packages to be keyworded/stable:
 # sys-libs/libapparmor
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index 237e247f299f..29ee34a86394 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -12,10 +12,6 @@ hip
 # sci-libs/mkl is not stable, needs online registration to even run pkg_setup
 mkl
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2017-05-26)
-# dev-db/firebird is keyworded ~amd64
-firebird
-
 # Michał Górny <mgorny@gentoo.org> (2017-05-20)
 # The modern versions of CUDA SDK are not suitable for stabilization.
 cuda
diff --git a/profiles/arch/arm/package.use.force b/profiles/arch/arm/package.use.force
index 9fe795360fe9..e895ba22c4ad 100644
--- a/profiles/arch/arm/package.use.force
+++ b/profiles/arch/arm/package.use.force
@@ -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
 
 # matoro <matoro_gentoo@matoro.tk> (2022-08-31)
@@ -16,6 +16,6 @@ dev-lang/rust llvm_targets_ARM
 
 # Michał Górny <mgorny@gentoo.org> (2016-09-24)
 # Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_ARM
-sys-devel/clang llvm_targets_ARM
-sys-devel/llvm llvm_targets_ARM
+dev-ml/llvm llvm_targets_ARM
+llvm-core/clang llvm_targets_ARM
+llvm-core/llvm llvm_targets_ARM
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 2f1328c1dff0..7b488ff6a966 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -222,10 +222,10 @@ app-text/enchant voikko
 
 # Michał Górny <mgorny@gentoo.org> (2020-12-21)
 # Sanitizers supported on this architecture.
-sys-libs/compiler-rt-sanitizers -asan -lsan
-sys-libs/compiler-rt-sanitizers -ubsan -cfi -scudo
-sys-libs/compiler-rt-sanitizers -profile -xray
->=sys-libs/compiler-rt-sanitizers-16 -gwp-asan -libfuzzer -orc
+llvm-runtimes/compiler-rt-sanitizers -asan -lsan
+llvm-runtimes/compiler-rt-sanitizers -ubsan -cfi -scudo
+llvm-runtimes/compiler-rt-sanitizers -profile -xray
+>=llvm-runtimes/compiler-rt-sanitizers-16 -gwp-asan -libfuzzer -orc
 
 # Rick Farina <zerochaos@gentoo.org> (2020-12-18)
 # net-wireless/libxtrx et all needs testing
diff --git a/profiles/arch/arm64/package.use.force b/profiles/arch/arm64/package.use.force
index 71950c18e41a..bd26d13e42e5 100644
--- a/profiles/arch/arm64/package.use.force
+++ b/profiles/arch/arm64/package.use.force
@@ -40,6 +40,6 @@ dev-lang/rust llvm_targets_AArch64
 
 # Michał Górny <mgorny@gentoo.org> (2016-09-24)
 # Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_AArch64
-sys-devel/clang llvm_targets_AArch64
-sys-devel/llvm llvm_targets_AArch64
+dev-ml/llvm llvm_targets_AArch64
+llvm-core/clang llvm_targets_AArch64
+llvm-core/llvm llvm_targets_AArch64
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index dcfc80695b9c..3dea816eccc2 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -120,7 +120,7 @@ dev-lang/ruby -jit
 
 # Michał Górny <mgorny@gentoo.org> (2023-01-24)
 # libomptarget is only supported on 64-bit architectures.
->=sys-libs/libomp-16.0.0_pre20230124 -offload
+>=llvm-runtimes/openmp-16.0.0_pre20230124 -offload
 
 # Florian Schmaus <flow@gentoo.org> (2022-11-23)
 # avoid larger deptree, bug #882593
@@ -242,11 +242,11 @@ app-text/enchant voikko
 
 # Michał Górny <mgorny@gentoo.org> (2020-12-21)
 # Sanitizers supported on this architecture.
-sys-libs/compiler-rt-sanitizers -asan -dfsan -lsan -msan -hwasan -tsan
-sys-libs/compiler-rt-sanitizers -ubsan -safestack -cfi -scudo
-sys-libs/compiler-rt-sanitizers -gwp-asan -shadowcallstack
-sys-libs/compiler-rt-sanitizers -libfuzzer -profile -xray -rtsan
->=sys-libs/compiler-rt-sanitizers-16 -orc
+llvm-runtimes/compiler-rt-sanitizers -asan -dfsan -lsan -msan -hwasan -tsan
+llvm-runtimes/compiler-rt-sanitizers -ubsan -safestack -cfi -scudo
+llvm-runtimes/compiler-rt-sanitizers -gwp-asan -shadowcallstack
+llvm-runtimes/compiler-rt-sanitizers -libfuzzer -profile -xray -rtsan
+>=llvm-runtimes/compiler-rt-sanitizers-16 -orc
 
 # Roy Bamford <neddyseagoon@gentoo.org> (2020-12-07)
 # media-libs/liblastfm fails to build with tests Bug #758896
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 5cdc13f04e33..5f9726c41987 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -124,8 +124,8 @@ media-libs/libplacebo shaderc
 
 # Michał Górny <mgorny@gentoo.org> (2023-09-19)
 # dev-cpp/cpp-httplib is barely keyworded anywhere.
-dev-debug/lldb debuginfod
-sys-devel/llvm debuginfod
+llvm-core/lldb debuginfod
+llvm-core/llvm debuginfod
 
 # Ionen Wolkens <ionen@gentoo.org> (2023-09-13)
 # media-gfx/renderdoc currently has few keywords
@@ -159,7 +159,7 @@ dev-python/tables cpudetection
 
 # Michał Górny <mgorny@gentoo.org> (2023-01-24)
 # libomptarget is only supported on 64-bit architectures.
->=sys-libs/libomp-16.0.0_pre20230124 offload
+>=llvm-runtimes/openmp-16.0.0_pre20230124 offload
 
 # Sam James <sam@gentoo.org> (2022-12-11)
 # Unkeyworded dependencies
@@ -172,7 +172,7 @@ media-video/ffmpeg qsv
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2022-12-01)
 # Only supported on ppc64le.
-sys-devel/clang ieee-long-double
+llvm-core/clang ieee-long-double
 sys-devel/gcc ieee-long-double
 
 # Mike Gilbert <floppym@gentoo.org> (2022-10-16)
@@ -263,11 +263,11 @@ net-misc/asterisk blocks
 
 # Michał Górny <mgorny@gentoo.org> (2020-12-21)
 # Mask all sanitizers by default, unmask on arches supporting them.
-sys-libs/compiler-rt-sanitizers asan dfsan lsan msan hwasan tsan
-sys-libs/compiler-rt-sanitizers ubsan safestack cfi scudo
-sys-libs/compiler-rt-sanitizers shadowcallstack gwp-asan
-sys-libs/compiler-rt-sanitizers libfuzzer memprof orc profile xray
-sys-libs/compiler-rt-sanitizers ctx-profile nsan rtsan
+llvm-runtimes/compiler-rt-sanitizers asan dfsan lsan msan hwasan tsan
+llvm-runtimes/compiler-rt-sanitizers ubsan safestack cfi scudo
+llvm-runtimes/compiler-rt-sanitizers shadowcallstack gwp-asan
+llvm-runtimes/compiler-rt-sanitizers libfuzzer memprof orc profile xray
+llvm-runtimes/compiler-rt-sanitizers ctx-profile nsan rtsan
 
 # Sam James <sam@gentoo.org> (2020-10-24)
 # asm redc is only available on amd64,
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index fb453f1da688..e0e59eeea995 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -48,9 +48,7 @@ big-endian
 libvirt
 
 # Michael Orlitzky <mjo@gentoo.org> (2017-01-07)
-# The dev-db/firebird and dev-db/oracle-instantclient* packages
-# only support amd64 and x86.
-firebird
+# dev-db/oracle-instantclient* only supports amd64 and x86.
 oci8
 
 # cuda/NVENC only works on amd64/arm64
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index c727a2e5bb19..952dcb32f062 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -82,7 +82,7 @@ dev-lang/php capstone
 x11-base/xwayland libei
 
 # James Le Cuirot (2023-12-12)
-# USE=bpf depends on sys-devel/clang which is not keyworded on hppa
+# USE=bpf depends on llvm-core/clang which is not keyworded on hppa
 media-libs/libv4l bpf
 
 # Leonardo Hernández Hernández <leohdz172@proton.me> (2023-11-15)
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index 2a84e7167144..a61c98914043 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -33,7 +33,7 @@ bluetooth
 pipewire
 
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2021-04-01)
-# sys-libs/llvm-libunwind not supported on HPPA.
+# llvm-runtimes/libunwind not supported on HPPA.
 llvm-libunwind
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-11-12)
@@ -84,7 +84,7 @@ connman
 vaapi
 
 # Jeroen Roovers <jer@gentoo.org> (2014-12-24)
-# sys-devel/clang has not been ported to HPPA
+# llvm-core/clang has not been ported to HPPA
 clang
 
 # Jeroen Roovers <jer@gentoo.org> (2014-11-07)
@@ -98,7 +98,7 @@ luajittex
 systemtap
 
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (2013-11-10)
-# sys-devel/llvm is not keyworded, bug #320221
+# llvm-core/llvm is not keyworded, bug #320221
 llvm
 
 # Jeroen Roovers <jer@gentoo.org> (2013-08-22)
diff --git a/profiles/arch/loong/package.use.force b/profiles/arch/loong/package.use.force
index 4953c56c5fa4..f1f01cb659f3 100644
--- a/profiles/arch/loong/package.use.force
+++ b/profiles/arch/loong/package.use.force
@@ -28,9 +28,9 @@ media-video/mpv lua_single_target_lua5-1 -lua_single_target_luajit
 # Some packages are not fully ported yet, but preemptively added so we won't
 # have to revisit later.
 dev-lang/rust llvm_targets_LoongArch
-dev-ml/llvm-ocaml llvm_targets_LoongArch
-sys-devel/clang llvm_targets_LoongArch
-sys-devel/llvm llvm_targets_LoongArch
+dev-ml/llvm llvm_targets_LoongArch
+llvm-core/clang llvm_targets_LoongArch
+llvm-core/llvm llvm_targets_LoongArch
 
 # WANG Xuerui <xen0n@gentoo.org> (2022-04-24)
 # Force-enable experimental-loong on packages; we're loong.
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index 1e5ffa7fd1be..109e82008ce7 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -152,8 +152,8 @@ dev-util/librnp man
 
 # Michał Górny <mgorny@gentoo.org> (2023-09-19)
 # dev-cpp/cpp-httplib is keyworded here.
-dev-debug/lldb -debuginfod
-sys-devel/llvm -debuginfod
+llvm-core/lldb -debuginfod
+llvm-core/llvm -debuginfod
 
 # WANG Xuerui <xen0n@gentoo.org> (2023-09-10)
 # Revdeps of dev-python/ujson which is masked.
@@ -332,13 +332,13 @@ media-plugins/gst-plugins-meta libvisual
 # Profile: https://reviews.llvm.org/D154405 (LLVM 17 since 20230706)
 # XRay: https://reviews.llvm.org/D140727 (LLVM 17 since 20230714)
 # libFuzzer: https://reviews.llvm.org/D140601 (LLVM 17 since 20230718)
->=sys-libs/compiler-rt-sanitizers-15 -asan
->=sys-libs/compiler-rt-sanitizers-16 -lsan -safestack -scudo -tsan -ubsan
->=sys-libs/compiler-rt-sanitizers-17.0.0_pre20230630 -msan
->=sys-libs/compiler-rt-sanitizers-17.0.0_pre20230705 -dfsan
->=sys-libs/compiler-rt-sanitizers-17.0.0_pre20230717 -profile -xray
->sys-libs/compiler-rt-sanitizers-17.0.0_pre20230717 -libfuzzer
->=sys-libs/compiler-rt-sanitizers-19 -cfi
+>=llvm-runtimes/compiler-rt-sanitizers-15 -asan
+>=llvm-runtimes/compiler-rt-sanitizers-16 -lsan -safestack -scudo -tsan -ubsan
+>=llvm-runtimes/compiler-rt-sanitizers-17.0.0_pre20230630 -msan
+>=llvm-runtimes/compiler-rt-sanitizers-17.0.0_pre20230705 -dfsan
+>=llvm-runtimes/compiler-rt-sanitizers-17.0.0_pre20230717 -profile -xray
+>llvm-runtimes/compiler-rt-sanitizers-17.0.0_pre20230717 -libfuzzer
+>=llvm-runtimes/compiler-rt-sanitizers-19 -cfi
 
 # WANG Xuerui <xen0n@gentoo.org> (2022-07-08)
 # virtual/{jdk,jre} is not available on loong yet.
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask
index fdf21faab0c9..18462660235f 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -11,7 +11,7 @@ dev-python/pytest-services test
 dev-lang/python jit
 
 # James Le Cuirot (2023-12-12)
-# USE=bpf depends on sys-devel/clang which is not keyworded on m68k
+# USE=bpf depends on llvm-core/clang which is not keyworded on m68k
 media-libs/libv4l bpf
 
 # Violet Purcell <vimproved@inventati.org> (2023-10-12)
diff --git a/profiles/arch/mips/mips64/package.use.mask b/profiles/arch/mips/mips64/package.use.mask
index c06ddc3a2aa5..36deda11a73d 100644
--- a/profiles/arch/mips/mips64/package.use.mask
+++ b/profiles/arch/mips/mips64/package.use.mask
@@ -3,4 +3,4 @@
 
 # matoro <matoro_gentoo@matoro.tk> (2024-05-01)
 # Sanitizers supported on 64-bit mips only, #779742
-sys-libs/compiler-rt-sanitizers -dfsan -lsan -msan -tsan -cfi
+llvm-runtimes/compiler-rt-sanitizers -dfsan -lsan -msan -tsan -cfi
diff --git a/profiles/arch/mips/package.use.force b/profiles/arch/mips/package.use.force
index bc882ff72538..3d5be7f071c4 100644
--- a/profiles/arch/mips/package.use.force
+++ b/profiles/arch/mips/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # matoro <matoro_gentoo@matoro.tk> (2022-09-14)
@@ -7,6 +7,6 @@ dev-lang/rust llvm_targets_Mips
 
 # Michał Górny <mgorny@gentoo.org> (2016-09-24)
 # Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_Mips
-sys-devel/clang llvm_targets_Mips
-sys-devel/llvm llvm_targets_Mips
+dev-ml/llvm llvm_targets_Mips
+llvm-core/clang llvm_targets_Mips
+llvm-core/llvm llvm_targets_Mips
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index ff5e265339d7..e205a629b5c3 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -37,8 +37,8 @@ gnome-base/gvfs google test
 
 # Michał Górny <mgorny@gentoo.org> (2024-09-08)
 # libcxx is broken on mips, https://bugs.gentoo.org/939297#c2
-sys-devel/clang-common default-libcxx
-sys-devel/clang-runtime libcxx
+llvm-core/clang-common default-libcxx
+llvm-core/clang-runtime libcxx
 
 # Hans de Graaff <graaff@gentoo.org> (2024-09-08)
 # Requires large parts of dev-ruby/rails to be keyworded
@@ -133,7 +133,7 @@ dev-lang/python jit
 
 # matoro <matoro_gentoo@matoro.tk> (2024-05-01)
 # Sanitizers supported on both 32-bit and 64-bit mips, #779742
-sys-libs/compiler-rt-sanitizers -asan -profile -ubsan -safestack -scudo -xray
+llvm-runtimes/compiler-rt-sanitizers -asan -profile -ubsan -safestack -scudo -xray
 
 # matoro <matoro_gentoo@matoro.tk> (2024-03-21)
 # Test suite is very fragile and doesn't even run on amd64.
@@ -341,7 +341,7 @@ dev-qt/qtchooser test
 dev-python/numpydoc test
 
 # Matthias Maier <tamiko@gentoo.org> (2014-12-24)
-# sys-devel/clang is not keyworded
+# llvm-core/clang is not keyworded
 app-text/doxygen clang
 
 # Ryan Hill <dirtyepic@gentoo.org> (2014-01-07)
diff --git a/profiles/arch/powerpc/package.use.force b/profiles/arch/powerpc/package.use.force
index 98041c695968..d9e962820714 100644
--- a/profiles/arch/powerpc/package.use.force
+++ b/profiles/arch/powerpc/package.use.force
@@ -20,6 +20,6 @@ dev-lang/rust llvm_targets_PowerPC
 
 # Michał Górny <mgorny@gentoo.org> (2016-09-24)
 # Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_PowerPC
-sys-devel/clang llvm_targets_PowerPC
-sys-devel/llvm llvm_targets_PowerPC
+dev-ml/llvm llvm_targets_PowerPC
+llvm-core/clang llvm_targets_PowerPC
+llvm-core/llvm llvm_targets_PowerPC
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 1c923c402fbd..fcea6adc04b5 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -284,8 +284,8 @@ app-forensics/sleuthkit java
 
 # Michał Górny <mgorny@gentoo.org> (2017-03-24)
 # libcxx fails to compile on ppc*, #595744.
-sys-devel/clang-common default-libcxx
-sys-devel/clang-runtime libcxx
+llvm-core/clang-common default-libcxx
+llvm-core/clang-runtime libcxx
 
 # James Le Cuirot <chewi@gentoo.org> (2016-12-14)
 # DOSBox + OpenGLide is untested on this arch.
diff --git a/profiles/arch/powerpc/ppc32/package.mask b/profiles/arch/powerpc/ppc32/package.mask
index 530aefd0b9d8..744217fe4d35 100644
--- a/profiles/arch/powerpc/ppc32/package.mask
+++ b/profiles/arch/powerpc/ppc32/package.mask
@@ -6,8 +6,8 @@
 >=dev-build/cmake-3.29
 
 # Sam James <sam@gentoo.org> (2024-03-23)
-# sys-libs/libomp does not support ppc32 (bug #907213).
-sys-libs/libomp
+# llvm-runtimes/openmp does not support ppc32 (bug #907213).
+llvm-runtimes/openmp
 
 # Sam James <sam@gentoo.org> (2023-05-06)
 # Broken bundled Eigen, fails to compile. See bug #865191.
@@ -16,5 +16,5 @@ sci-libs/pdal
 # Sergei Trofimovich <slyfox@gentoo.org> (2021-02-17)
 # Not ported to ppc32. See ALL_.*_SUPPORTED_ARCH
 # in compiler-rt/cmake/. Bug #708344
-sys-libs/compiler-rt
-sys-libs/compiler-rt-sanitizers
+llvm-runtimes/compiler-rt
+llvm-runtimes/compiler-rt-sanitizers
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index f52785da45fa..3e5dc29b25ef 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -36,8 +36,8 @@ dev-qt/qtmultimedia:6 qml
 media-gfx/graphicsmagick jpeg2k
 
 # Sam James <sam@gentoo.org> (2024-03-23)
-# sys-libs/libomp does not support ppc32 (bug #907213).
-sys-devel/clang-runtime openmp
+# llvm-runtimes/openmp does not support ppc32 (bug #907213).
+llvm-core/clang-runtime openmp
 
 # Matt Jolly <kangie@gentoo.org> (2024-03-02)
 # Fails tests, potential false negatives #911402
@@ -103,7 +103,7 @@ dev-util/diffoscope opendocument pascal pdf R
 
 # Sam James <sam@gentoo.org> (2022-11-19)
 # Fails to compile because of size, bug #829602.
-sys-devel/clang extra
+llvm-core/clang extra
 
 # Nowa Ammerlaan <nowa@gentoo.org> (2022-09-23)
 # The corresponding Qt5 modules are not keyworded on ppc, and we don't want to
@@ -175,8 +175,8 @@ dev-lang/php avif
 # Sam James <sam@gentoo.org> (2021-02-28)
 # compiler-rt* has no support for ppc32 (yet?)
 # bug #708344
-sys-devel/clang-runtime compiler-rt sanitize
-sys-devel/clang-common default-compiler-rt
+llvm-core/clang-runtime compiler-rt sanitize
+llvm-core/clang-common default-compiler-rt
 
 # Florian Schmaus <flo@geekplace.eu> (2020-12-03)
 # Rubber's testsuite depends on media-gfx/asymptote and
@@ -201,7 +201,7 @@ sys-block/tgt rbd
 dev-python/pyopengl test
 
 # Andrey Utkin <andrey_utkin@gentoo.org> (2020-03-11)
-# USE=bpf depends on sys-devel/clang which is not keyworded on ppc.
+# USE=bpf depends on llvm-core/clang which is not keyworded on ppc.
 media-libs/libv4l bpf
 
 # Matthew Thode <prometheanfire@gentoo.org> (2020-02-17)
diff --git a/profiles/arch/powerpc/ppc32/package.use.stable.mask b/profiles/arch/powerpc/ppc32/package.use.stable.mask
index 362847402c1c..5e236f1eea1f 100644
--- a/profiles/arch/powerpc/ppc32/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.stable.mask
@@ -33,11 +33,11 @@ dev-ruby/kramdown unicode
 
 # Sam James <sam@gentoo.org> (2022-11-19)
 # Deps not stable on ppc
-sys-devel/clang-common default-lld
-sys-devel/llvm binutils-plugin z3 xar
+llvm-core/clang-common default-lld
+llvm-core/llvm binutils-plugin z3 xar
 
 # Sam James <sam@gentoo.org> (2022-07-27)
-# sys-devel/lld is not marked stable on ppc
+# llvm-core/lld is not marked stable on ppc
 >=dev-lang/spidermonkey-78 lto
 
 # Sam James <sam@gentoo.org> (2022-05-11)
diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask b/profiles/arch/powerpc/ppc32/use.stable.mask
index 848b8db5a597..0b66533c82e3 100644
--- a/profiles/arch/powerpc/ppc32/use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/use.stable.mask
@@ -28,7 +28,7 @@ sasl
 ldap
 
 # Sam James <sam@gentoo.org> (2022-02-03)
-# sys-libs/llvm-libunwind isn't marked stable here
+# llvm-runtimes/libunwind isn't marked stable here
 llvm-libunwind
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-08-13)
diff --git a/profiles/arch/powerpc/ppc64/64le/package.use.mask b/profiles/arch/powerpc/ppc64/64le/package.use.mask
index 1d8e9ae06a16..583675b83988 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.use.mask
@@ -24,7 +24,7 @@ media-libs/libdvbcsa cpu_flags_ppc_altivec
 
 # Michał Górny <mgorny@gentoo.org> (2020-12-21)
 # Additional sanitizers supported on ppc64le.
-sys-libs/compiler-rt-sanitizers -xray
+llvm-runtimes/compiler-rt-sanitizers -xray
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-10-05)
 # criu is unmasked on little-endian ppc64
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 48a6950381da..92db0a506148 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -46,7 +46,7 @@ dev-python/nbval test
 
 # Michał Górny <mgorny@gentoo.org> (2023-01-24)
 # libomptarget is only supported on 64-bit architectures.
->=sys-libs/libomp-16.0.0_pre20230124 -offload
+>=llvm-runtimes/openmp-16.0.0_pre20230124 -offload
 
 # Niccolò Belli <niccolo.belli@linuxsystems.it> (2022-11-29)
 # media-libs/webrtc-audio-processing only has amd64, x86 and ppc64 keywords
@@ -104,10 +104,10 @@ dev-util/diffoscope haskell
 
 # Michał Górny <mgorny@gentoo.org> (2020-12-21)
 # Sanitizers supported on this architecture.
-sys-libs/compiler-rt-sanitizers -asan -lsan -msan -tsan
-sys-libs/compiler-rt-sanitizers -ubsan -scudo
-sys-libs/compiler-rt-sanitizers -profile
->=sys-libs/compiler-rt-sanitizers-19 -orc
+llvm-runtimes/compiler-rt-sanitizers -asan -lsan -msan -tsan
+llvm-runtimes/compiler-rt-sanitizers -ubsan -scudo
+llvm-runtimes/compiler-rt-sanitizers -profile
+>=llvm-runtimes/compiler-rt-sanitizers-19 -orc
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-25)
 # fwupd keyworded now on ppc64
diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
index 7a1c27c1b517..fe66cd25ca94 100644
--- a/profiles/arch/powerpc/use.mask
+++ b/profiles/arch/powerpc/use.mask
@@ -40,7 +40,7 @@ physfs
 opencl
 
 # Matt Turner <mattst88@gentoo.org> (2017-03-24)
-# We don't have sys-devel/llvm
+# We don't have llvm-core/llvm
 llvm
 video_cards_amdgpu
 video_cards_radeonsi
diff --git a/profiles/arch/riscv/package.use b/profiles/arch/riscv/package.use
index 3b760c2c75ac..dd7d9ebd37e6 100644
--- a/profiles/arch/riscv/package.use
+++ b/profiles/arch/riscv/package.use
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # James Le Cuirot <chewi@gentoo.org> (2023-12-16)
@@ -9,6 +9,6 @@ media-video/mpv soc
 
 # Yixun Lan <dlan@gentoo.org> (2021-07-20)
 # Enable the GPU targets matching the default VIDEO_CARDS
-dev-ml/llvm-ocaml llvm_targets_AMDGPU
-sys-devel/clang llvm_targets_AMDGPU
-sys-devel/llvm llvm_targets_AMDGPU
+dev-ml/llvm llvm_targets_AMDGPU
+llvm-core/clang llvm_targets_AMDGPU
+llvm-core/llvm llvm_targets_AMDGPU
diff --git a/profiles/arch/riscv/package.use.force b/profiles/arch/riscv/package.use.force
index b3abf820e9d2..8c21b8ef5111 100644
--- a/profiles/arch/riscv/package.use.force
+++ b/profiles/arch/riscv/package.use.force
@@ -25,6 +25,6 @@ app-editors/neovim lua_single_target_lua5-1
 dev-lang/ghc llvm
 
 # we, kinda, need this on riscv ...
-sys-devel/llvm llvm_targets_RISCV
-sys-devel/clang llvm_targets_RISCV
+llvm-core/llvm llvm_targets_RISCV
+llvm-core/clang llvm_targets_RISCV
 dev-lang/rust llvm_targets_RISCV
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 6d27d353fb2b..3ab87cd2b0e4 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -97,9 +97,9 @@ sys-block/tgt rbd
 
 # jinqiang zhang <peeweep@0x0.ee> (2023-03-27)
 # Sanitizers supported on riscv64.
-sys-libs/compiler-rt-sanitizers -asan -lsan
->=sys-libs/compiler-rt-sanitizers-19 -libfuzzer -hwasan -profile -tsan
->=sys-libs/compiler-rt-sanitizers-19 -ubsan -scudo
+llvm-runtimes/compiler-rt-sanitizers -asan -lsan
+>=llvm-runtimes/compiler-rt-sanitizers-19 -libfuzzer -hwasan -profile -tsan
+>=llvm-runtimes/compiler-rt-sanitizers-19 -ubsan -scudo
 
 # Yixun Lan <dlan@gentoo.org> (2023-02-16)
 # USE=java depend on virtual/jdk:1.8 which is not support on RISC-V
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index fce637692f94..34ee1fd0c2e9 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -78,7 +78,7 @@ dev-lang/php capstone
 x11-base/xwayland libei
 
 # James Le Cuirot (2023-12-12)
-# USE=bpf depends on sys-devel/clang which is not keyworded on s390
+# USE=bpf depends on llvm-core/clang which is not keyworded on s390
 media-libs/libv4l bpf
 
 # Michał Górny <mgorny@gentoo.org> (2023-10-15)
diff --git a/profiles/arch/s390/s390x/package.use.force b/profiles/arch/s390/s390x/package.use.force
index a91fe713a600..2f5d02582336 100644
--- a/profiles/arch/s390/s390x/package.use.force
+++ b/profiles/arch/s390/s390x/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (2022-06-18)
@@ -7,7 +7,7 @@ sys-auth/polkit duktape
 
 # Michał Górny <mgorny@gentoo.org> (2016-11-11)
 # Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_SystemZ
+dev-ml/llvm llvm_targets_SystemZ
 dev-lang/rust llvm_targets_SystemZ
-sys-devel/clang llvm_targets_SystemZ
-sys-devel/llvm llvm_targets_SystemZ
+llvm-core/clang llvm_targets_SystemZ
+llvm-core/llvm llvm_targets_SystemZ
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index 838c3ee29f1d..b47aa73348bd 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -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
 
 # Unmask the flag which corresponds to ARCH.
@@ -37,7 +37,7 @@ tpm
 emacs
 
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2021-04-01)
-# sys-libs/llvm-libunwind not supported on S390.
+# llvm-runtimes/libunwind not supported on S390.
 llvm-libunwind
 
 # Sam James <sam@gentoo.org> (2021-02-05)
diff --git a/profiles/arch/sparc/package.use b/profiles/arch/sparc/package.use
index 4babc96027fc..5b7f49cabf04 100644
--- a/profiles/arch/sparc/package.use
+++ b/profiles/arch/sparc/package.use
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (2016-09-24)
 # Enable the GPU targets matching the default VIDEO_CARDS
-dev-ml/llvm-ocaml llvm_targets_AMDGPU
-sys-devel/clang llvm_targets_AMDGPU
-sys-devel/llvm llvm_targets_AMDGPU
+dev-ml/llvm llvm_targets_AMDGPU
+llvm-core/clang llvm_targets_AMDGPU
+llvm-core/llvm llvm_targets_AMDGPU
 
 # Ben Kohler <bkohler@gentoo.org> (2019-09-03)
 # Enable SPARC OpenBoot support
diff --git a/profiles/arch/sparc/package.use.force b/profiles/arch/sparc/package.use.force
index f3be48ad126c..8468ce0df82b 100644
--- a/profiles/arch/sparc/package.use.force
+++ b/profiles/arch/sparc/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Sam James <sam@gentoo.org> (2022-06-25)
@@ -13,7 +13,7 @@ sys-auth/polkit duktape
 
 # Michał Górny <mgorny@gentoo.org> (2016-09-24)
 # Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_Sparc
-sys-devel/clang llvm_targets_Sparc
-sys-devel/llvm llvm_targets_Sparc
+dev-ml/llvm llvm_targets_Sparc
+llvm-core/clang llvm_targets_Sparc
+llvm-core/llvm llvm_targets_Sparc
 dev-lang/rust llvm_targets_Sparc
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index af8a79ba9143..5ee9b7c1f83c 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -236,7 +236,7 @@ app-admin/conky doc
 dev-util/pkgcheck emacs
 
 # Sam James <sam@gentoo.org> (2022-07-27)
-# sys-devel/lld is not keyworded on sparc
+# llvm-core/lld is not keyworded on sparc
 >=dev-lang/spidermonkey-78 lto
 >=dev-lang/spidermonkey-115 clang
 
@@ -245,7 +245,7 @@ dev-util/pkgcheck emacs
 net-misc/modemmanager qrtr
 
 # Sam James <sam@gentoo.org> (2022-06-25)
-# sys-devel/lld lacks sparc support right now
+# llvm-core/lld lacks sparc support right now
 dev-lang/rust wasm
 
 # Sam James <sam@gentoo.org> (2022-06-25)
@@ -320,9 +320,9 @@ dev-cpp/eigen test
 
 # Sam James <sam@gentoo.org> (2021-04-27)
 # Deps not yet tested/keyworded.
-sys-devel/clang-common default-compiler-rt default-lld
-sys-devel/clang-runtime compiler-rt
-sys-devel/llvm z3
+llvm-core/clang-common default-compiler-rt default-lld
+llvm-core/clang-runtime compiler-rt
+llvm-core/llvm z3
 
 # Sam James <sam@gentoo.org> (2021-03-19)
 # On sparc, we have to force sys-apps/grep[libsigsegv]
@@ -432,7 +432,7 @@ net-im/pidgin gstreamer
 x11-libs/qwt designer
 
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-15)
-# USE=bpf depends on sys-devel/clang which is not keyworded on sparc
+# USE=bpf depends on llvm-core/clang which is not keyworded on sparc
 media-libs/libv4l bpf
 
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-14)
@@ -551,7 +551,7 @@ xfce-base/xfwm4 xpresent
 
 # Michał Górny <mgorny@gentoo.org> (2017-03-23)
 # Most of clang runtimes are not supported here
-sys-devel/clang-runtime openmp sanitize
+llvm-core/clang-runtime openmp sanitize
 
 # Pacho Ramos <pacho@gentoo.org> (2017-02-04)
 # Missing keywords, bug #599572
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index c3222cbf6f28..63aa58094f43 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -247,7 +247,7 @@ opencl
 unwind
 
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (2013-11-10)
-# sys-devel/llvm is not keyworded, bug #320221
+# llvm-core/llvm is not keyworded, bug #320221
 llvm
 
 # sys-libs/libseccomp has not been ported to this arch yet #524148
diff --git a/profiles/arch/x86/package.use b/profiles/arch/x86/package.use
index 9a904c7bc993..0bbf0a8cbe80 100644
--- a/profiles/arch/x86/package.use
+++ b/profiles/arch/x86/package.use
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Ben Kohler <bkohler@gentoo.org> (2024-06-12)
@@ -12,9 +12,9 @@ sys-apps/memtest86+ bios32
 
 # Michał Górny <mgorny@gentoo.org> (2016-09-24)
 # Enable the GPU targets matching the default VIDEO_CARDS
-dev-ml/llvm-ocaml llvm_targets_AMDGPU llvm_targets_NVPTX
-sys-devel/clang llvm_targets_AMDGPU llvm_targets_NVPTX
-sys-devel/llvm llvm_targets_AMDGPU llvm_targets_NVPTX
+dev-ml/llvm llvm_targets_AMDGPU llvm_targets_NVPTX
+llvm-core/clang llvm_targets_AMDGPU llvm_targets_NVPTX
+llvm-core/llvm llvm_targets_AMDGPU llvm_targets_NVPTX
 
 # Doug Goldstein <cardoe@gentoo.org> (2012-10-29)
 # Enable the native arch as the default qemu target
diff --git a/profiles/arch/x86/package.use.force b/profiles/arch/x86/package.use.force
index 1cf0c69377b6..7e0f7b0c3508 100644
--- a/profiles/arch/x86/package.use.force
+++ b/profiles/arch/x86/package.use.force
@@ -35,6 +35,6 @@ dev-lang/rust llvm_targets_X86
 
 # Michał Górny <mgorny@gentoo.org> (2016-09-24)
 # Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_X86
-sys-devel/clang llvm_targets_X86
-sys-devel/llvm llvm_targets_X86
+dev-ml/llvm llvm_targets_X86
+llvm-core/clang llvm_targets_X86
+llvm-core/llvm llvm_targets_X86
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index a6c8ef16e947..294bc04d3bf6 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -92,8 +92,8 @@ media-libs/libplacebo -shaderc
 
 # Michał Górny <mgorny@gentoo.org> (2023-09-19)
 # dev-cpp/cpp-httplib is keyworded here.
-dev-debug/lldb -debuginfod
-sys-devel/llvm -debuginfod
+llvm-core/lldb -debuginfod
+llvm-core/llvm -debuginfod
 
 # Jon Janzen <jon@jonjanzen.com> (2023-09-11)
 # librttopo has not been tested on this arch
@@ -257,11 +257,11 @@ app-text/pdfpc gstreamer
 
 # Michał Górny <mgorny@gentoo.org> (2020-12-21)
 # Sanitizers supported on this architecture.
-sys-libs/compiler-rt-sanitizers -asan -lsan
-sys-libs/compiler-rt-sanitizers -ubsan -safestack -cfi -scudo
-sys-libs/compiler-rt-sanitizers -gwp-asan
-sys-libs/compiler-rt-sanitizers -profile
->=sys-libs/compiler-rt-sanitizers-16 -libfuzzer
+llvm-runtimes/compiler-rt-sanitizers -asan -lsan
+llvm-runtimes/compiler-rt-sanitizers -ubsan -safestack -cfi -scudo
+llvm-runtimes/compiler-rt-sanitizers -gwp-asan
+llvm-runtimes/compiler-rt-sanitizers -profile
+>=llvm-runtimes/compiler-rt-sanitizers-16 -libfuzzer
 
 # Thomas Deutschmann <whissi@gentoo.org> (2020-10-06)
 # - aesni plugin is supported on x86
@@ -523,7 +523,7 @@ www-client/links -suid
 >=media-video/mplayer-1.0_rc4_p20101219 -bluray
 
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (2010-11-28)
-# sys-devel/llvm is keyworded on x86
+# llvm-core/llvm is keyworded on x86
 media-libs/mesa -llvm
 
 # Jean-Noël Rivasseau <elvanor@gentoo.org> (2009-09-23)
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index 8d529a1f2c67..ef2340899495 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -41,7 +41,7 @@ virtual/notification-daemon kde
 
 # Matt Turner <mattst88@gentoo.org> (2024-07-14)
 # spirv-llvm-translator < 17 is not stable on x86.
-<dev-libs/libclc-17 spirv
+<llvm-core/libclc-17 spirv
 
 # Sam James <sam@gentoo.org> (2024-04-30)
 # sys-block/nbdkit is not yet marked stable here
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index 9c9ee57d55b3..e4fd6b676d83 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -64,10 +64,6 @@ webengine
 # libvirt is supported on x86
 -libvirt
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2017-05-26)
-# dev-db/firebird is keyworded ~x86
--firebird
-
 # Michał Górny <mgorny@gentoo.org> (2014-03-30)
 # PyPy is keyworded on this arch.
 -python_targets_pypy3
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 90b1e4500f31..5deb6e10b6cf 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -22,10 +22,6 @@ openvdb
 # sci-libs/mkl is not stable, needs online registration to even run pkg_setup
 mkl
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2017-05-26)
-# dev-db/firebird is keyworded ~x86
-firebird
-
 # Michał Górny <mgorny@gentoo.org> (2014-03-30)
 # PyPy is unstable on this arch.
 python_targets_pypy3