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

91 files changed, 428 insertions, 395 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index cc9262589d9e..203480267d5d 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
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
diff --git a/profiles/base/package.use b/profiles/base/package.use
index 6a55f366e30f..92b4c57ef598 100644
--- a/profiles/base/package.use
+++ b/profiles/base/package.use
@@ -52,9 +52,9 @@ media-video/wireplumber lua_single_target_lua5-4
 
 # Michał Górny <mgorny@gentoo.org> (2016-09-24)
 # Enable the BPF target by default
-dev-ml/llvm-ocaml llvm_targets_BPF
-sys-devel/clang llvm_targets_BPF
-sys-devel/llvm llvm_targets_BPF
+dev-ml/llvm llvm_targets_BPF
+llvm-core/clang llvm_targets_BPF
+llvm-core/llvm llvm_targets_BPF
 
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (2012-07-27)
 # Modular X: Build the Xorg X server by default
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index c96a630265ed..ba9258292499 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -105,7 +105,7 @@ media-video/mpv lua_single_target_luajit
 
 # Sam James <sam@gentoo.org> (2022-02-11)
 # Always build with PIE-default, just like GCC.
-sys-devel/clang pie
+llvm-core/clang pie
 
 # Arthur Zamarin <arthurzam@gentoo.org> (2022-01-13)
 # Force to use installed openjdk{,-bin} for bootstrapping
@@ -121,26 +121,26 @@ dev-java/openjdk:21 system-bootstrap
 # potential, the increase of build time is a minor problem.  Users who
 # really insist of building a smaller system can un-force the flags
 # at their own responsibility. See bug #767700.
->=sys-devel/clang-13.0.1_rc llvm_targets_AArch64 llvm_targets_AMDGPU
->=sys-devel/clang-13.0.1_rc llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF
->=sys-devel/clang-13.0.1_rc llvm_targets_Hexagon llvm_targets_Lanai
->=sys-devel/clang-13.0.1_rc llvm_targets_MSP430 llvm_targets_Mips
->=sys-devel/clang-13.0.1_rc llvm_targets_NVPTX llvm_targets_PowerPC
->=sys-devel/clang-13.0.1_rc llvm_targets_RISCV llvm_targets_Sparc
->=sys-devel/clang-13.0.1_rc llvm_targets_SystemZ llvm_targets_WebAssembly
->=sys-devel/clang-13.0.1_rc llvm_targets_X86 llvm_targets_XCore
->=sys-devel/clang-14 llvm_targets_VE
->=sys-devel/clang-16 llvm_targets_LoongArch
->=sys-devel/llvm-13.0.1_rc llvm_targets_AArch64 llvm_targets_AMDGPU
->=sys-devel/llvm-13.0.1_rc llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF
->=sys-devel/llvm-13.0.1_rc llvm_targets_Hexagon llvm_targets_Lanai
->=sys-devel/llvm-13.0.1_rc llvm_targets_MSP430 llvm_targets_Mips
->=sys-devel/llvm-13.0.1_rc llvm_targets_NVPTX llvm_targets_PowerPC
->=sys-devel/llvm-13.0.1_rc llvm_targets_RISCV llvm_targets_Sparc
->=sys-devel/llvm-13.0.1_rc llvm_targets_SystemZ llvm_targets_WebAssembly
->=sys-devel/llvm-13.0.1_rc llvm_targets_X86 llvm_targets_XCore
->=sys-devel/llvm-14 llvm_targets_VE
->=sys-devel/llvm-16 llvm_targets_LoongArch
+>=llvm-core/clang-13.0.1_rc llvm_targets_AArch64 llvm_targets_AMDGPU
+>=llvm-core/clang-13.0.1_rc llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF
+>=llvm-core/clang-13.0.1_rc llvm_targets_Hexagon llvm_targets_Lanai
+>=llvm-core/clang-13.0.1_rc llvm_targets_MSP430 llvm_targets_Mips
+>=llvm-core/clang-13.0.1_rc llvm_targets_NVPTX llvm_targets_PowerPC
+>=llvm-core/clang-13.0.1_rc llvm_targets_RISCV llvm_targets_Sparc
+>=llvm-core/clang-13.0.1_rc llvm_targets_SystemZ llvm_targets_WebAssembly
+>=llvm-core/clang-13.0.1_rc llvm_targets_X86 llvm_targets_XCore
+>=llvm-core/clang-14 llvm_targets_VE
+>=llvm-core/clang-16 llvm_targets_LoongArch
+>=llvm-core/llvm-13.0.1_rc llvm_targets_AArch64 llvm_targets_AMDGPU
+>=llvm-core/llvm-13.0.1_rc llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF
+>=llvm-core/llvm-13.0.1_rc llvm_targets_Hexagon llvm_targets_Lanai
+>=llvm-core/llvm-13.0.1_rc llvm_targets_MSP430 llvm_targets_Mips
+>=llvm-core/llvm-13.0.1_rc llvm_targets_NVPTX llvm_targets_PowerPC
+>=llvm-core/llvm-13.0.1_rc llvm_targets_RISCV llvm_targets_Sparc
+>=llvm-core/llvm-13.0.1_rc llvm_targets_SystemZ llvm_targets_WebAssembly
+>=llvm-core/llvm-13.0.1_rc llvm_targets_X86 llvm_targets_XCore
+>=llvm-core/llvm-14 llvm_targets_VE
+>=llvm-core/llvm-16 llvm_targets_LoongArch
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
 # Upstream plans to drop libcrypt.so.1/crypt.h from glibc
@@ -217,7 +217,7 @@ net-misc/wget ssl
 # Michał Górny <mgorny@gentoo.org> (2020-01-12)
 # libcxxabi is the only supported option.  The support for libsupc++
 # is maintained for experts only.
-sys-libs/libcxx libcxxabi
+llvm-runtimes/libcxx libcxxabi
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2019-08-17)
 # USE=-cxx us a sure way to break native install as modern gcc
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 265fce604406..d6fe0a8e1bc9 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -155,7 +155,7 @@ sci-physics/root R
 dev-debug/gdb cet
 sys-devel/binutils cet
 sys-devel/binutils-hppa64 cet
-sys-devel/clang-common cet
+llvm-core/clang-common cet
 sys-devel/gcc cet
 sys-libs/binutils-libs cet
 sys-libs/glibc cet
@@ -338,7 +338,7 @@ sci-libs/vtk debug
 # 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
 
 # Joonas Niilola <juippis@gentoo.org> (2023-01-08)
 # Doesn't compile currently, bug #853094.
@@ -629,21 +629,21 @@ app-office/abiword ots
 # Mask the experimental targets in release ebuilds.
 # Note to self: remember to move still-applicable masks to the newer
 # version when master is bumped.
-<dev-ml/llvm-ocaml-16 llvm_targets_LoongArch
-<sys-devel/clang-16 llvm_targets_LoongArch
-<sys-devel/llvm-16 llvm_targets_LoongArch
-<dev-ml/llvm-ocaml-17 llvm_targets_ARC llvm_targets_CSKY
-<sys-devel/clang-17 llvm_targets_ARC llvm_targets_CSKY
-<sys-devel/llvm-17 llvm_targets_ARC llvm_targets_CSKY
-<dev-ml/llvm-ocaml-17 llvm_targets_DirectX
-<sys-devel/clang-17 llvm_targets_DirectX
-<sys-devel/llvm-17 llvm_targets_DirectX
-<dev-ml/llvm-ocaml-17 llvm_targets_M68k llvm_targets_SPIRV
-<sys-devel/clang-17 llvm_targets_M68k llvm_targets_SPIRV
-<sys-devel/llvm-17 llvm_targets_M68k llvm_targets_SPIRV
-<dev-ml/llvm-ocaml-17 llvm_targets_Xtensa
-<sys-devel/clang-17 llvm_targets_Xtensa
-<sys-devel/llvm-17 llvm_targets_Xtensa
+<dev-ml/llvm-16 llvm_targets_LoongArch
+<llvm-core/clang-16 llvm_targets_LoongArch
+<llvm-core/llvm-16 llvm_targets_LoongArch
+<dev-ml/llvm-17 llvm_targets_ARC llvm_targets_CSKY
+<llvm-core/clang-17 llvm_targets_ARC llvm_targets_CSKY
+<llvm-core/llvm-17 llvm_targets_ARC llvm_targets_CSKY
+<dev-ml/llvm-17 llvm_targets_DirectX
+<llvm-core/clang-17 llvm_targets_DirectX
+<llvm-core/llvm-17 llvm_targets_DirectX
+<dev-ml/llvm-17 llvm_targets_M68k llvm_targets_SPIRV
+<llvm-core/clang-17 llvm_targets_M68k llvm_targets_SPIRV
+<llvm-core/llvm-17 llvm_targets_M68k llvm_targets_SPIRV
+<dev-ml/llvm-17 llvm_targets_Xtensa
+<llvm-core/clang-17 llvm_targets_Xtensa
+<llvm-core/llvm-17 llvm_targets_Xtensa
 
 # Joonas Niilola <juippis@gentoo.org> (2020-09-23)
 # Highly experimental, may cause breakages when updating. Use with
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 8a628cb5abaa..41aab147d74e 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-12-11)
+# dev-db/firebird last-rites preparation
+firebird
+
 # Robin H. Johnson <robbat2@gentoo.org> (2024-11-17)
 # bug 943698
 # Poor upstream code quality, unmaintained upstream;
diff --git a/profiles/categories b/profiles/categories
index f7f5996e1810..eb23eea4aeee 100644
--- a/profiles/categories
+++ b/profiles/categories
@@ -88,6 +88,8 @@ kde-apps
 kde-frameworks
 kde-misc
 kde-plasma
+llvm-core
+llvm-runtimes
 lxde-base
 lxqt-base
 mail-client
diff --git a/profiles/default/linux/amd64/17.1/clang/package.use.force b/profiles/default/linux/amd64/17.1/clang/package.use.force
index f01a7a3572a2..94a8a1b3c014 100644
--- a/profiles/default/linux/amd64/17.1/clang/package.use.force
+++ b/profiles/default/linux/amd64/17.1/clang/package.use.force
@@ -1,16 +1,16 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # in a multilib profile we need multilib madness
 dev-libs/libffi abi_x86_32 abi_x86_64
 dev-libs/libxml2 abi_x86_32 abi_x86_64
-sys-devel/clang abi_x86_32 abi_x86_64
-sys-devel/clang-runtime abi_x86_32 abi_x86_64
-sys-devel/llvm abi_x86_32 abi_x86_64
-sys-libs/compiler-rt abi_x86_32 abi_x86_64
-sys-libs/libcxxabi abi_x86_32 abi_x86_64
-sys-libs/libcxx abi_x86_32 abi_x86_64
+llvm-core/clang abi_x86_32 abi_x86_64
+llvm-core/clang-runtime abi_x86_32 abi_x86_64
+llvm-core/llvm abi_x86_32 abi_x86_64
+llvm-runtimes/compiler-rt abi_x86_32 abi_x86_64
+llvm-runtimes/libcxxabi abi_x86_32 abi_x86_64
+llvm-runtimes/libcxx abi_x86_32 abi_x86_64
 sys-libs/libunwind abi_x86_32 abi_x86_64
-sys-libs/llvm-libunwind abi_x86_32 abi_x86_64
+llvm-runtimes/libunwind abi_x86_32 abi_x86_64
 sys-libs/ncurses abi_x86_32 abi_x86_64
 sys-libs/zlib abi_x86_32 abi_x86_64
diff --git a/profiles/default/linux/amd64/17.1/systemd/clang/package.use.force b/profiles/default/linux/amd64/17.1/systemd/clang/package.use.force
index 6d2600fecd08..94a8a1b3c014 100644
--- a/profiles/default/linux/amd64/17.1/systemd/clang/package.use.force
+++ b/profiles/default/linux/amd64/17.1/systemd/clang/package.use.force
@@ -1,16 +1,16 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # in a multilib profile we need multilib madness
 dev-libs/libffi abi_x86_32 abi_x86_64
 dev-libs/libxml2 abi_x86_32 abi_x86_64
-sys-devel/clang abi_x86_32 abi_x86_64
-sys-devel/clang-runtime abi_x86_32 abi_x86_64
-sys-devel/llvm abi_x86_32 abi_x86_64
-sys-libs/compiler-rt abi_x86_32 abi_x86_64
-sys-libs/libcxxabi abi_x86_32 abi_x86_64
-sys-libs/libcxx abi_x86_32 abi_x86_64
+llvm-core/clang abi_x86_32 abi_x86_64
+llvm-core/clang-runtime abi_x86_32 abi_x86_64
+llvm-core/llvm abi_x86_32 abi_x86_64
+llvm-runtimes/compiler-rt abi_x86_32 abi_x86_64
+llvm-runtimes/libcxxabi abi_x86_32 abi_x86_64
+llvm-runtimes/libcxx abi_x86_32 abi_x86_64
 sys-libs/libunwind abi_x86_32 abi_x86_64
-sys-libs/llvm-libunwind abi_x86_32 abi_x86_64
+llvm-runtimes/libunwind abi_x86_32 abi_x86_64
 sys-libs/ncurses abi_x86_32 abi_x86_64
 sys-libs/zlib abi_x86_32 abi_x86_64
diff --git a/profiles/default/linux/amd64/23.0/llvm/package.use.force b/profiles/default/linux/amd64/23.0/llvm/package.use.force
index 9c85ebdab0d8..79ccb3fa5786 100644
--- a/profiles/default/linux/amd64/23.0/llvm/package.use.force
+++ b/profiles/default/linux/amd64/23.0/llvm/package.use.force
@@ -1,17 +1,17 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # in a multilib profile we need multilib madness
 dev-libs/libffi abi_x86_32 abi_x86_64
 dev-libs/libxml2 abi_x86_32 abi_x86_64
-sys-devel/clang abi_x86_32 abi_x86_64
-sys-devel/clang-runtime abi_x86_32 abi_x86_64
-sys-devel/llvm abi_x86_32 abi_x86_64
-sys-libs/compiler-rt abi_x86_32 abi_x86_64
-sys-libs/libcxxabi abi_x86_32 abi_x86_64
-sys-libs/libcxx abi_x86_32 abi_x86_64
+llvm-core/clang abi_x86_32 abi_x86_64
+llvm-core/clang-runtime abi_x86_32 abi_x86_64
+llvm-core/llvm abi_x86_32 abi_x86_64
+llvm-runtimes/compiler-rt abi_x86_32 abi_x86_64
+llvm-runtimes/libcxxabi abi_x86_32 abi_x86_64
+llvm-runtimes/libcxx abi_x86_32 abi_x86_64
 sys-libs/libunwind abi_x86_32 abi_x86_64
-sys-libs/llvm-libunwind abi_x86_32 abi_x86_64
+llvm-runtimes/libunwind abi_x86_32 abi_x86_64
 sys-libs/ncurses abi_x86_32 abi_x86_64
 sys-libs/zlib abi_x86_32 abi_x86_64
 
diff --git a/profiles/default/linux/amd64/23.0/split-usr/llvm/package.use.force b/profiles/default/linux/amd64/23.0/split-usr/llvm/package.use.force
index 9c85ebdab0d8..79ccb3fa5786 100644
--- a/profiles/default/linux/amd64/23.0/split-usr/llvm/package.use.force
+++ b/profiles/default/linux/amd64/23.0/split-usr/llvm/package.use.force
@@ -1,17 +1,17 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # in a multilib profile we need multilib madness
 dev-libs/libffi abi_x86_32 abi_x86_64
 dev-libs/libxml2 abi_x86_32 abi_x86_64
-sys-devel/clang abi_x86_32 abi_x86_64
-sys-devel/clang-runtime abi_x86_32 abi_x86_64
-sys-devel/llvm abi_x86_32 abi_x86_64
-sys-libs/compiler-rt abi_x86_32 abi_x86_64
-sys-libs/libcxxabi abi_x86_32 abi_x86_64
-sys-libs/libcxx abi_x86_32 abi_x86_64
+llvm-core/clang abi_x86_32 abi_x86_64
+llvm-core/clang-runtime abi_x86_32 abi_x86_64
+llvm-core/llvm abi_x86_32 abi_x86_64
+llvm-runtimes/compiler-rt abi_x86_32 abi_x86_64
+llvm-runtimes/libcxxabi abi_x86_32 abi_x86_64
+llvm-runtimes/libcxx abi_x86_32 abi_x86_64
 sys-libs/libunwind abi_x86_32 abi_x86_64
-sys-libs/llvm-libunwind abi_x86_32 abi_x86_64
+llvm-runtimes/libunwind abi_x86_32 abi_x86_64
 sys-libs/ncurses abi_x86_32 abi_x86_64
 sys-libs/zlib abi_x86_32 abi_x86_64
 
diff --git a/profiles/default/linux/arm/23.0/musl/package.use.stable.mask b/profiles/default/linux/arm/23.0/musl/package.use.stable.mask
index 785b52ceb864..98637fdb6a26 100644
--- a/profiles/default/linux/arm/23.0/musl/package.use.stable.mask
+++ b/profiles/default/linux/arm/23.0/musl/package.use.stable.mask
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License, v2
 
 # Sam James <sam@gentoo.org> (2024-06-16)
-# Avoid pulling in sys-libs/compiler-rt-sanitizers which fails to build
+# Avoid pulling in llvm-runtimes/compiler-rt-sanitizers which fails to build
 # See bug #928936.
-sys-devel/clang-runtime sanitize
+llvm-core/clang-runtime sanitize
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2024-03-20)
 # Does not compile with musl-1.2.4
diff --git a/profiles/default/linux/mips/17.0/use.mask b/profiles/default/linux/mips/17.0/use.mask
index 40a63a664ee2..6866abff5c5b 100644
--- a/profiles/default/linux/mips/17.0/use.mask
+++ b/profiles/default/linux/mips/17.0/use.mask
@@ -2,6 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # Matt Turner <mattst88@gentoo.org> (2010-12-13)
-# We don't have sys-devel/llvm
+# We don't have llvm-core/llvm
 llvm
 llvm-libunwind
diff --git a/profiles/default/linux/package.use.force b/profiles/default/linux/package.use.force
new file mode 100644
index 000000000000..155c529b4d30
--- /dev/null
+++ b/profiles/default/linux/package.use.force
@@ -0,0 +1,6 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Matt Turner <mattst88@gentoo.org> (2024-12-11)
+# Forced on to avoid potential breakage.
+virtual/opengl X
diff --git a/profiles/default/linux/ppc/23.0/musl/package.use.mask b/profiles/default/linux/ppc/23.0/musl/package.use.mask
index c7d54156ade0..5f4d239a760a 100644
--- a/profiles/default/linux/ppc/23.0/musl/package.use.mask
+++ b/profiles/default/linux/ppc/23.0/musl/package.use.mask
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # Sam James <sam@gentoo.org> (2024-06-16)
-# Avoid pulling in sys-libs/compiler-rt-sanitizers which fails to build
+# Avoid pulling in llvm-runtimes/compiler-rt-sanitizers which fails to build
 # See bug #928936.
-sys-devel/clang-runtime sanitize
+llvm-core/clang-runtime sanitize
 
 # Sam James <sam@gentoo.org> (2023-01-29)
 # Fails to build on combination of ppc* + musl because of mcontext.
diff --git a/profiles/default/linux/ppc/package.use.mask b/profiles/default/linux/ppc/package.use.mask
index eff2ddb9a45c..0cf7afa31fd2 100644
--- a/profiles/default/linux/ppc/package.use.mask
+++ b/profiles/default/linux/ppc/package.use.mask
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2024-08-06)
-# Requires sys-libs/libcxx.
+# Requires llvm-runtimes/libcxx.
 dev-cpp/benchmark libcxx
 
 # Mike Frysinger <vapier@gentoo.org> (2014-10-21)
diff --git a/profiles/default/linux/ppc64/package.use.mask b/profiles/default/linux/ppc64/package.use.mask
index eff2ddb9a45c..0cf7afa31fd2 100644
--- a/profiles/default/linux/ppc64/package.use.mask
+++ b/profiles/default/linux/ppc64/package.use.mask
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2024-08-06)
-# Requires sys-libs/libcxx.
+# Requires llvm-runtimes/libcxx.
 dev-cpp/benchmark libcxx
 
 # Mike Frysinger <vapier@gentoo.org> (2014-10-21)
diff --git a/profiles/default/linux/ppc64le/17.0/ieee-long-double/package.use.force b/profiles/default/linux/ppc64le/17.0/ieee-long-double/package.use.force
index f18919ca4db1..37ba6e98e11b 100644
--- a/profiles/default/linux/ppc64le/17.0/ieee-long-double/package.use.force
+++ b/profiles/default/linux/ppc64le/17.0/ieee-long-double/package.use.force
@@ -1,7 +1,7 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2022-12-04)
 # Hard requirement for this profile.
-sys-devel/clang ieee-long-double
+llvm-core/clang ieee-long-double
 sys-devel/gcc ieee-long-double
diff --git a/profiles/default/linux/ppc64le/17.0/ieee-long-double/package.use.mask b/profiles/default/linux/ppc64le/17.0/ieee-long-double/package.use.mask
index 81341caa198a..c11b1eb1bc17 100644
--- a/profiles/default/linux/ppc64le/17.0/ieee-long-double/package.use.mask
+++ b/profiles/default/linux/ppc64le/17.0/ieee-long-double/package.use.mask
@@ -1,7 +1,7 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2022-12-04)
 # We need it for ieee-long-double.
->=sys-devel/clang-15.0.5 -ieee-long-double
+>=llvm-core/clang-15.0.5 -ieee-long-double
 >=sys-devel/gcc-12 -ieee-long-double
diff --git a/profiles/default/linux/ppc64le/23.0/package.use.force b/profiles/default/linux/ppc64le/23.0/package.use.force
index f18919ca4db1..37ba6e98e11b 100644
--- a/profiles/default/linux/ppc64le/23.0/package.use.force
+++ b/profiles/default/linux/ppc64le/23.0/package.use.force
@@ -1,7 +1,7 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2022-12-04)
 # Hard requirement for this profile.
-sys-devel/clang ieee-long-double
+llvm-core/clang ieee-long-double
 sys-devel/gcc ieee-long-double
diff --git a/profiles/default/linux/ppc64le/23.0/package.use.mask b/profiles/default/linux/ppc64le/23.0/package.use.mask
index 81341caa198a..c11b1eb1bc17 100644
--- a/profiles/default/linux/ppc64le/23.0/package.use.mask
+++ b/profiles/default/linux/ppc64le/23.0/package.use.mask
@@ -1,7 +1,7 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2022-12-04)
 # We need it for ieee-long-double.
->=sys-devel/clang-15.0.5 -ieee-long-double
+>=llvm-core/clang-15.0.5 -ieee-long-double
 >=sys-devel/gcc-12 -ieee-long-double
diff --git a/profiles/default/linux/ppc64le/package.use.mask b/profiles/default/linux/ppc64le/package.use.mask
index eff2ddb9a45c..0cf7afa31fd2 100644
--- a/profiles/default/linux/ppc64le/package.use.mask
+++ b/profiles/default/linux/ppc64le/package.use.mask
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2024-08-06)
-# Requires sys-libs/libcxx.
+# Requires llvm-runtimes/libcxx.
 dev-cpp/benchmark libcxx
 
 # Mike Frysinger <vapier@gentoo.org> (2014-10-21)
diff --git a/profiles/default/linux/x86/23.0/i486/musl/package.use.mask b/profiles/default/linux/x86/23.0/i486/musl/package.use.mask
index 0f0f54b0e2d2..f383727ed9bf 100644
--- a/profiles/default/linux/x86/23.0/i486/musl/package.use.mask
+++ b/profiles/default/linux/x86/23.0/i486/musl/package.use.mask
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License, v2
 
 # Sam James <sam@gentoo.org> (2024-06-16)
-# Avoid pulling in sys-libs/compiler-rt-sanitizers which fails to build
+# Avoid pulling in llvm-runtimes/compiler-rt-sanitizers which fails to build
 # See bug #928936.
-sys-devel/clang-runtime sanitize
+llvm-core/clang-runtime sanitize
 
 # Ian Jordan <immoloism@gmail.com> (2024-05-20)
 # Does not compile with musl-1.2.4+
diff --git a/profiles/default/linux/x86/23.0/i686/musl/package.use.mask b/profiles/default/linux/x86/23.0/i686/musl/package.use.mask
index 0f0f54b0e2d2..f383727ed9bf 100644
--- a/profiles/default/linux/x86/23.0/i686/musl/package.use.mask
+++ b/profiles/default/linux/x86/23.0/i686/musl/package.use.mask
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License, v2
 
 # Sam James <sam@gentoo.org> (2024-06-16)
-# Avoid pulling in sys-libs/compiler-rt-sanitizers which fails to build
+# Avoid pulling in llvm-runtimes/compiler-rt-sanitizers which fails to build
 # See bug #928936.
-sys-devel/clang-runtime sanitize
+llvm-core/clang-runtime sanitize
 
 # Ian Jordan <immoloism@gmail.com> (2024-05-20)
 # Does not compile with musl-1.2.4+
diff --git a/profiles/features/big-endian/package.use.mask b/profiles/features/big-endian/package.use.mask
index 36f1a6524989..57cd68309a34 100644
--- a/profiles/features/big-endian/package.use.mask
+++ b/profiles/features/big-endian/package.use.mask
@@ -26,6 +26,7 @@ net-irc/quassel urlpreview
 kde-apps/kalarm pim
 dev-python/qtpy pyqt5
 gnome-base/gnome extras
+games-engines/scummvm vpx
 
 # matoro <matoro_gentoo@matoro.tk> (2023-11-16)
 # media-libs/libaom casualties
diff --git a/profiles/features/llvm/make.defaults b/profiles/features/llvm/make.defaults
index f36599c1e300..ffc23dbddd44 100644
--- a/profiles/features/llvm/make.defaults
+++ b/profiles/features/llvm/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # this is for now highly experimental -dilfridge
@@ -41,19 +41,19 @@ CXXSTDLIB="c++"
 # curl needed by cmake
 BOOTSTRAP_USE="${BOOTSTRAP_USE} ssl curl_ssl_openssl"
 
-# sys-devel/llvm
+# llvm-core/llvm
 BOOTSTRAP_USE="${BOOTSTRAP_USE} -binutils-plugin"
 
-# sys-devel/clang, sys-devel/clang-runtime, sys-libs/llvm-libunwind, sys-libs/libcxx, sys-libs/libcxxabi
+# llvm-core/clang, llvm-core/clang-runtime, llvm-runtimes/libunwind, llvm-runtimes/libcxx, llvm-runtimes/libcxxabi
 BOOTSTRAP_USE="${BOOTSTRAP_USE} compiler-rt clang libunwind"
 
-# sys-devel/clang
+# llvm-core/clang
 BOOTSTRAP_USE="${BOOTSTRAP_USE} default-compiler-rt default-lld default-libcxx llvm-libunwind"
 
-# sys-devel/clang-runtime
+# llvm-core/clang-runtime
 BOOTSTRAP_USE="${BOOTSTRAP_USE} libcxx -sanitize"
 
-# sys-libs/libcxxabi
+# llvm-runtimes/libcxxabi
 BOOTSTRAP_USE="${BOOTSTRAP_USE} libcxxabi"
 
 # llvm & clang: explicitly disable all extra targets, otherwise linking stage2 fails
diff --git a/profiles/features/llvm/package.use b/profiles/features/llvm/package.use
index b929e71ac461..cebefca7c186 100644
--- a/profiles/features/llvm/package.use
+++ b/profiles/features/llvm/package.use
@@ -1,14 +1,14 @@
 # Make static linking work by default for simple binaries (bug #892956)
-sys-libs/llvm-libunwind static-libs
+llvm-runtimes/libunwind static-libs
 
 # use lld by default
-sys-devel/llvm -binutils-plugin
+llvm-core/llvm -binutils-plugin
 
 # use all defaults
-sys-libs/compiler-rt clang
+llvm-runtimes/compiler-rt clang
 
 # disable sanitizers for now
-sys-devel/clang-runtime compiler-rt libcxx -sanitize
-# sys-libs/compiler-rt-sanitizers clang
+llvm-core/clang-runtime compiler-rt libcxx -sanitize
+# llvm-runtimes/compiler-rt-sanitizers clang
 
-sys-libs/libcxx libcxxabi
+llvm-runtimes/libcxx libcxxabi
diff --git a/profiles/features/llvm/package.use.force b/profiles/features/llvm/package.use.force
index d081e137b403..a9959f2773fd 100644
--- a/profiles/features/llvm/package.use.force
+++ b/profiles/features/llvm/package.use.force
@@ -12,4 +12,4 @@ app-emulation/wine-vanilla mingw
 # default-libcxx in particular changes ABI so can't be toggled at-will, and other
 # profile settings expect it.
 # TODO: Make a profile without default-libcxx too?
-sys-devel/clang-common default-compiler-rt default-lld default-libcxx
+llvm-core/clang-common default-compiler-rt default-lld default-libcxx
diff --git a/profiles/features/llvm/packages b/profiles/features/llvm/packages
index 9536b85862f3..e70811e37285 100644
--- a/profiles/features/llvm/packages
+++ b/profiles/features/llvm/packages
@@ -1,11 +1,11 @@
 # now part of @system set
-*sys-devel/lld
-*sys-devel/llvm
-*sys-devel/clang
-*sys-libs/libcxx
-*sys-libs/libcxxabi
-*sys-libs/compiler-rt
-*sys-libs/llvm-libunwind
+*llvm-core/lld
+*llvm-core/llvm
+*llvm-core/clang
+*llvm-runtimes/libcxx
+*llvm-runtimes/libcxxabi
+*llvm-runtimes/compiler-rt
+*llvm-runtimes/libunwind
 
 # not needed with clang
 -*sys-devel/gcc
diff --git a/profiles/features/llvm/packages.build b/profiles/features/llvm/packages.build
index fd1e69e329e3..35e422a67562 100644
--- a/profiles/features/llvm/packages.build
+++ b/profiles/features/llvm/packages.build
@@ -1,11 +1,11 @@
 # will be pulled by stage1
-sys-libs/compiler-rt
-sys-libs/libcxxabi
-sys-libs/libcxx
-sys-devel/llvm
-sys-devel/lld
-sys-devel/clang
-sys-libs/llvm-libunwind
+llvm-runtimes/compiler-rt
+llvm-runtimes/libcxxabi
+llvm-runtimes/libcxx
+llvm-core/llvm
+llvm-core/lld
+llvm-core/clang
+llvm-runtimes/libunwind
 
 # remove gcc & friends
 -sys-devel/gcc
diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask
index 0440e25ba43a..0c4d83f9ea0c 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -16,7 +16,7 @@ gui-libs/neatvnc tracing
 gui-apps/wayvnc tracing
 
 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2024-08-06)
-# Requires sys-libs/libcxx.
+# Requires llvm-runtimes/libcxx.
 dev-cpp/benchmark libcxx
 
 # Nowa Ammerlaan <nowa@gentoo.org> (2024-07-25)
@@ -71,7 +71,7 @@ dev-qt/qtbase renderdoc
 dev-debug/gdb cet
 sys-devel/binutils cet
 sys-devel/binutils-hppa64 cet
-sys-devel/clang-common cet
+llvm-core/clang-common cet
 sys-devel/gcc cet
 sys-libs/binutils-libs cet
 sys-libs/glibc cet
@@ -209,7 +209,7 @@ sys-apps/util-linux nls
 # Sam James <sam@gentoo.org> (2021-11-07)
 # Disable some sanitizers for LLVM, see bug #753935
 # Needs libexecinfo on musl, not yet packaged
-sys-libs/compiler-rt-sanitizers gwp-asan
+llvm-runtimes/compiler-rt-sanitizers gwp-asan
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-03-19)
 # check does not work on musl, bug #713138
diff --git a/profiles/features/musl/package.use.stable.mask b/profiles/features/musl/package.use.stable.mask
index a903356e7e0b..1d29384ead55 100644
--- a/profiles/features/musl/package.use.stable.mask
+++ b/profiles/features/musl/package.use.stable.mask
@@ -3,7 +3,7 @@
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2024-03-07)
 # This doesn't work yet with musl-1.2.4, bug 906603
-sys-libs/compiler-rt-sanitizers msan
+llvm-runtimes/compiler-rt-sanitizers msan
 
 # Sam James <sam@gentoo.org> (2022-10-04)
 # libxcrypt migration isn't yet stable on musl.
diff --git a/profiles/info_pkgs b/profiles/info_pkgs
index 7b6b98e969d1..abc517fa4519 100644
--- a/profiles/info_pkgs
+++ b/profiles/info_pkgs
@@ -22,9 +22,9 @@ dev-lang/rust-bin
 app-misc/pax-utils
 sys-apps/sandbox
 dev-util/ccache
-sys-devel/clang
-sys-devel/llvm
-sys-devel/lld
+llvm-core/clang
+llvm-core/llvm
+llvm-core/lld
 sys-devel/gcc
 sys-devel/gcc-config
 dev-java/java-config
diff --git a/profiles/package.mask b/profiles/package.mask
index 14ec78426b68..3261eb258fec 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,19 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-12-11)
+# Build system needs someone really dedicated to put up with it.
+# Version completely outdated, way too many bugs to list here.
+# Removal on 2025-01-10
+dev-db/firebird
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-12-11)
+# Declared unmaintained by upstream, will be broken by akonadi-24.12.
+# Use app-text/marknote https://apps.kde.org/marknote/ as alternative,
+# importing existing notes is possible. Removal on 2025-01-10.
+app-text/kjots
+kde-apps/knotes
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-12-10)
 # KF5 Porting Aids removal; bugs 755956, 759778
 # Removal on 2025-01-09
diff --git a/profiles/prefix/darwin/macos/arch/arm64/package.use.force b/profiles/prefix/darwin/macos/arch/arm64/package.use.force
index 70cf505126a0..aad5e2426c8c 100644
--- a/profiles/prefix/darwin/macos/arch/arm64/package.use.force
+++ b/profiles/prefix/darwin/macos/arch/arm64/package.use.force
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Fabian Groffen <grobian@gentoo.org> (2020-12-31)
 # 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/prefix/darwin/macos/arch/ppc/package.use.force b/profiles/prefix/darwin/macos/arch/ppc/package.use.force
index 8b8c4b921435..316fe8fb4022 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/package.use.force
+++ b/profiles/prefix/darwin/macos/arch/ppc/package.use.force
@@ -7,6 +7,6 @@ sys-devel/gcc -pie
 
 # Fabian Groffen <grobian@gentoo.org> (2016-12-20)
 # 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/prefix/darwin/macos/arch/x64/package.use.force b/profiles/prefix/darwin/macos/arch/x64/package.use.force
index 5de42499068a..34bc46c08bb3 100644
--- a/profiles/prefix/darwin/macos/arch/x64/package.use.force
+++ b/profiles/prefix/darwin/macos/arch/x64/package.use.force
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Fabian Groffen <grobian@gentoo.org> (2016-12-20)
 # 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/prefix/darwin/macos/features/fsf-gcc-ld64/packages b/profiles/prefix/darwin/macos/features/fsf-gcc-ld64/packages
index 3fb8f4bcf792..a4c67015bcba 100644
--- a/profiles/prefix/darwin/macos/features/fsf-gcc-ld64/packages
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-ld64/packages
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # usage of FSF GCC, disabling Clang
 *sys-devel/gcc
 *sys-devel/gcc-config
--*sys-devel/clang
+-*llvm-core/clang
 -*sys-devel/gcc-apple
diff --git a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/packages b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/packages
index 0cd80b120bdf..5169b2e94354 100644
--- a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/packages
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/packages
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # usage of FSF GCC, disabling Clang, without binutils-apple (due to
@@ -7,5 +7,5 @@
 *sys-devel/gcc-config
 *sys-devel/native-cctools
 -*sys-devel/binutils-apple
--*sys-devel/clang
+-*llvm-core/clang
 -*sys-devel/gcc-apple
diff --git a/profiles/prefix/darwin/macos/package.use.force b/profiles/prefix/darwin/macos/package.use.force
index e5acd2f939e7..f8e77c53d262 100644
--- a/profiles/prefix/darwin/macos/package.use.force
+++ b/profiles/prefix/darwin/macos/package.use.force
@@ -7,7 +7,7 @@ sys-devel/gcc -default-znow
 
 # Jacob Floyd <cognifloyd@gmail.org> (2020-12-20)
 # Make sure we always use libcxxabi on macos prefix
-sys-libs/libcxx libcxxabi
+llvm-runtimes/libcxx libcxxabi
 
 # Fabian Groffen <grobian@gentoo.org> (2020-06-08)
 # Do NOT enable tinfo, it breaks ANYTHING existing, and it also breaks
diff --git a/profiles/prefix/darwin/macos/packages b/profiles/prefix/darwin/macos/packages
index cbc54b794388..94a197bf3262 100644
--- a/profiles/prefix/darwin/macos/packages
+++ b/profiles/prefix/darwin/macos/packages
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # macOS has LLVM/Clang as system compiler
 -*sys-devel/gcc
 -*sys-devel/gcc-config
-*sys-devel/clang
+*llvm-core/clang
diff --git a/profiles/releases/23.0/package.use b/profiles/releases/23.0/package.use
index c7d461f9ed5d..6cf759eb70d6 100644
--- a/profiles/releases/23.0/package.use
+++ b/profiles/releases/23.0/package.use
@@ -7,5 +7,5 @@
 #
 sys-devel/gcc zstd
 sys-devel/binutils zstd
-sys-devel/llvm zstd
-sys-devel/lld zstd
+llvm-core/llvm zstd
+llvm-core/lld zstd
diff --git a/profiles/updates/4Q-2024 b/profiles/updates/4Q-2024
index d8e1f112588d..57bd3992b813 100644
--- a/profiles/updates/4Q-2024
+++ b/profiles/updates/4Q-2024
@@ -61,3 +61,24 @@ move dev-python/PyQtWebEngine dev-python/pyqtwebengine
 move dev-python/PyQt5-sip dev-python/pyqt5-sip
 move dev-python/PyQt5 dev-python/pyqt5
 move dev-python/PyQt6 dev-python/pyqt6
+move sys-libs/llvm-offload llvm-runtimes/offload
+move dev-libs/libclc llvm-core/libclc
+move sys-libs/llvm-libunwind llvm-runtimes/libunwind
+move sys-libs/libomp llvm-runtimes/openmp
+move sys-libs/libcxxabi llvm-runtimes/libcxxabi
+move sys-libs/libcxx llvm-runtimes/libcxx
+move sys-libs/compiler-rt-sanitizers llvm-runtimes/compiler-rt-sanitizers
+move sys-libs/compiler-rt llvm-runtimes/compiler-rt
+move sys-devel/clang-runtime llvm-core/clang-runtime
+move sys-devel/clang-toolchain-symlinks llvm-core/clang-toolchain-symlinks
+move sys-devel/clang-common llvm-core/clang-common
+move sys-devel/clang llvm-core/clang
+move dev-debug/lldb llvm-core/lldb
+move sys-devel/lld-toolchain-symlinks llvm-core/lld-toolchain-symlinks
+move sys-devel/lld llvm-core/lld
+move sys-devel/llvmgold llvm-core/llvmgold
+move sys-devel/llvm-toolchain-symlinks llvm-core/llvm-toolchain-symlinks
+move sys-devel/llvm-common llvm-core/llvm-common
+move sys-devel/llvm llvm-core/llvm
+move dev-ml/llvm-ocaml dev-ml/llvm
+move dev-python/clang-python dev-python/clang
diff --git a/profiles/use.desc b/profiles/use.desc
index 78dc60695051..92914bc79416 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -178,7 +178,7 @@ libsamplerate - Build with support for converting sample rates using libsamplera
 libwww - Add libwww support (General purpose WEB API)
 lirc - Add support for lirc (Linux's Infra-Red Remote Control)
 livecd - !!internal use only!! DO NOT SET THIS FLAG YOURSELF!, used during livecd building
-llvm-libunwind - Use sys-libs/llvm-libunwind instead of sys-libs/libunwind
+llvm-libunwind - Use llvm-runtimes/libunwind instead of sys-libs/libunwind
 lm-sensors - Add linux lm-sensors (hardware sensors) support
 lto - Enable Link-Time Optimization (LTO) to optimize the build
 lua - Enable Lua scripting support
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index faea131824de..16256c26a980 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1154,7 +1154,7 @@ app-text/dictd:minimal - Don't build server but dict client, dictzip and dictfmt
 app-text/docbook-sgml-utils:jadetex - Add support for processing tex files produced by the TeX backend of Jade
 app-text/docbook-xsl-ns-stylesheets:ruby - Install the Ruby-based dbtoepub script; requires an interpreter compatible with app-eselect/eselect-ruby.
 app-text/docbook-xsl-stylesheets:ruby - Install the Ruby-based dbtoepub script; requires an interpreter compatible with app-eselect/eselect-ruby.
-app-text/doxygen:clang - support for sys-devel/clang assisted parsing
+app-text/doxygen:clang - support for llvm-core/clang assisted parsing
 app-text/doxygen:dot - allow to create dot graphs using media-gfx/graphviz
 app-text/doxygen:doxysearch - build doxyindexer and doxysearch.cgi
 app-text/ebook-tools:lit2epub - Install lit2epub script
@@ -1327,7 +1327,7 @@ dev-build/cmake:dap - Build debugger for CMake with Debug Adapter Protocol suppo
 dev-build/muon:archive - Enable extracting wraps using app-arch/libarchive.
 dev-build/muon:libpkgconf - Enable looking up packages via dev-util/pkgconf.
 dev-cpp/benchmark:exceptions - Enable the use of exceptions in the benchmark library
-dev-cpp/benchmark:libcxx - Use sys-libs/libcxx instead of libstdc++ as the default stdlib
+dev-cpp/benchmark:libcxx - Use llvm-runtimes/libcxx instead of libstdc++ as the default stdlib
 dev-cpp/benchmark:libpfm - Enable dev-libs/libpfm support
 dev-cpp/benchmark:tools - Install some additional Python tools
 dev-cpp/eigen:adolc - Add test support for Adolc (sci-libs/adolc)
@@ -1347,7 +1347,7 @@ dev-cpp/eigen:spqr - Add test support for SPQR (sci-libs/spqr)
 dev-cpp/eigen:superlu - Add test support for SuperLU (sci-libs/superlu)
 dev-cpp/eigen:umfpack - Add test support for UMFPACK (sci-libs/umfpack)
 dev-cpp/glog:gflags - Use dev-cpp/gflags for flag parsing
-dev-cpp/glog:libunwind - Use libunwind library (sys-libs/libunwind or sys-libs/llvm-libunwind) instead of built-in fallback implementation for stack unwinding
+dev-cpp/glog:libunwind - Use libunwind library (sys-libs/libunwind or llvm-runtimes/libunwind) instead of built-in fallback implementation for stack unwinding
 dev-cpp/gtest:abseil - Build with functionality provided by dev-cpp/abseil-cpp and dev-libs/re2
 dev-cpp/jwt-cpp:picojson - Enable use of dev-cpp/picojson
 dev-cpp/libcmis:tools - Build client tool for testing and viewing features
@@ -1444,7 +1444,7 @@ dev-db/timescaledb:proprietary-extensions - Enable proprietary features/extensio
 dev-db/unixODBC:minimal - Disable bundled drivers and extra libraries (most users don't need these)
 dev-db/unixODBC:odbcmanual - Administrator, Internal Structure, Programmer and User documentation
 dev-debug/bpftrace:fuzzing - Build bpftrace for fuzzing
-dev-debug/bpftrace:lldb - Parse debug info usingdev-debug/lldb
+dev-debug/bpftrace:lldb - Parse debug info usingllvm-core/lldb
 dev-debug/dtrace:test-install - Install the testsuite for manual use. It is not suitable for automatic execution within the ebuild because it requires root privlieges.
 dev-debug/gdb:cet - Enable Intel Control-flow Enforcement Technology.
 dev-debug/gdb:debuginfod - Enable debuginfod support via dev-libs/elfutils libdebuginfod
@@ -1457,7 +1457,6 @@ dev-debug/gdb:sim - Build gdb's simulators for various hardware platforms. See h
 dev-debug/gdb:source-highlight - Enable listing highlighting via dev-util/source-highlight
 dev-debug/gdb:xml - Support parsing XML data files needed (at least) for cpu features, memory maps, and syscall tracing
 dev-debug/gdb:xxhash - Use dev-libs/xxhash to speed up internal hashing.
-dev-debug/lldb:debuginfod - Expose the transitive dependencies on net-misc/curl and dev-cpp/cpp-httplib) to match sys-devel/llvm.
 dev-debug/ltrace:elfutils - Use libdwfl from dev-libs/elfutils for frame unwinding support
 dev-debug/ltrace:unwind - Use sys-libs/libunwind for frame unwinding support
 dev-debug/strace:aio - Enable dev-libs/libaio support for tracing Asynchronous I/O operations
@@ -1782,7 +1781,7 @@ dev-lang/ghc:elfutils - Enable DWARF-based backtraces using dev-libs/elfutils.
 dev-lang/ghc:ghcbootstrap - Internal: Bootstrap GHC from an existing GHC installation.
 dev-lang/ghc:ghcmakebinary - Internal: Build binary friendly for redistribution.
 dev-lang/ghc:gmp - Use dev-libs/gmp for integer operations (works faster, but an external depend).
-dev-lang/ghc:llvm - Pull in dependencies for the sys-devel/llvm codegen backend.
+dev-lang/ghc:llvm - Pull in dependencies for the llvm-core/llvm codegen backend.
 dev-lang/ghc:numa - Enable NUMA thread balancing policy using sys-process/numactl.
 dev-lang/ghc:unregisterised - Create an unregisterised build in which only the C codegen backend will be available.
 dev-lang/gnat-gpl:ada - Build the ADA language (GNAT) frontend
@@ -2036,7 +2035,6 @@ dev-libs/libcec:udev - Enable detection of USB-CEC port by udev
 dev-libs/libcec:xrandr - Enable detection of active HDMI using xrandr extensions
 dev-libs/libcgroup:daemon - Install the configuration tools and init/config files.
 dev-libs/libcgroup:tools - Install the cgroup rules processing daemon and init/config files.
-dev-libs/libclc:spirv - Build SPIRV targets
 dev-libs/libdbusmenu:gtk - Enable support for GTK+2
 dev-libs/libdbusmenu:gtk3 - Enable support for GTK+3
 dev-libs/libdex:eventfd - Allow use of eventfd
@@ -2836,8 +2834,8 @@ dev-util/Tensile:client - Build and install tensile_client executable to run ben
 dev-util/babeltrace:elfutils - Build the dev-util/lttng-ust debug information filter component class
 dev-util/babeltrace:plugins - Build support for Babeltrace 2 Python plugins
 dev-util/bpftool:caps - Use sys-libs/libcap to enable unprivileged run support
-dev-util/bpftool:clang - Use sys-devel/clang instead of sys-devel/bpf-toolchain for BPF CO-RE support
-dev-util/bpftool:llvm - Use sys-devel/llvm instead of libbfd (sys-libs/binutils-libs) for JIT disassembly
+dev-util/bpftool:clang - Use llvm-core/clang instead of sys-devel/bpf-toolchain for BPF CO-RE support
+dev-util/bpftool:llvm - Use llvm-core/llvm instead of libbfd (sys-libs/binutils-libs) for JIT disassembly
 dev-util/breakpad:tools - Build tools
 dev-util/bugbite-cli:openssl - Use dev-libs/openssl as a crypto backend
 dev-util/buildbot:docker - Add support for worker docker command steps
@@ -2874,7 +2872,7 @@ dev-util/diffoscope:haskell - Use dev-lang/ghc
 dev-util/diffoscope:hdf5 - Use sci-libs/hdf5
 dev-util/diffoscope:hex - Use app-editors/vim-core
 dev-util/diffoscope:iso - Use app-cdr/cdrtools
-dev-util/diffoscope:llvm - Use sys-devel/llvm
+dev-util/diffoscope:llvm - Use llvm-core/llvm
 dev-util/diffoscope:opendocument - Use app-text/odt2txt
 dev-util/diffoscope:pascal - Use dev-lang/fpc
 dev-util/diffoscope:rpm - Use app-arch/rpm
@@ -2884,7 +2882,7 @@ dev-util/diffoscope:tar - Use app-arch/tar
 dev-util/diffoscope:tcpdump - Use net-analyzer/tcpdump
 dev-util/diffoscope:zip - Use app-arch/unzip
 dev-util/dropwatch:bfd - Add support for Binary File Descriptor
-dev-util/edi:clang - Provide integration with sys-devel/clang and dev-util/bear for autocompletion, inline errors and information about compilation units.
+dev-util/edi:clang - Provide integration with llvm-core/clang and dev-util/bear for autocompletion, inline errors and information about compilation units.
 dev-util/flatpak-builder:yaml - Use libyaml for yaml support
 dev-util/geany:vte - Enable Terminal support (x11-libs/vte)
 dev-util/geany-plugins:ctags - Enable ctags plugin
@@ -2900,7 +2898,7 @@ dev-util/geany-plugins:workbench - Enable workbench plugin
 dev-util/glade:gjs - Build catalog support for dev-libs/gjs widgets.
 dev-util/glade:webkit - Build catalog support for net-libs/webkit-gtk:4 widgets.
 dev-util/global:vim - Integrate the GNU GLOBAL source code tag system with Vim
-dev-util/gnome-builder:clang - Provide integration with sys-devel/clang for best possible C/C++ autocompletion, semantic highlighting, symbol resolving, and diagnostics support
+dev-util/gnome-builder:clang - Provide integration with llvm-core/clang for best possible C/C++ autocompletion, semantic highlighting, symbol resolving, and diagnostics support
 dev-util/gnome-builder:d-spy - Provide D-Bus debugging functionality via dev-debug/d-spy
 dev-util/gnome-builder:flatpak - Enable support for flatpak applications using sys-apps/flatpak
 dev-util/gnome-builder:git - Provide support for the Git version control system via dev-libs/libgit2-glib (such as setup of Git for New Project, direct cloning for Open Project and changed lines indicators in the editor gutter)
@@ -3196,8 +3194,11 @@ games-engines/scummvm:fluidsynth - compile with support for fluidsynth
 games-engines/scummvm:fribidi - Support for right-to-left languages via dev-libs/fribidi
 games-engines/scummvm:mpeg2 - enable mpeg2 codec for cutscenes
 games-engines/scummvm:net - enable cloud support via media-libs/sdl2-net
+games-engines/scummvm:openmpt - Enable mod/tracker music file support via media-libs/libopenmpt
+games-engines/scummvm:parport - Enable parallel port support via sys-libs/libieee1284
 games-engines/scummvm:sndio - Enable support for MIDI music using media-sound/sndio
 games-engines/scummvm:unsupported - enable unsupported and/or broken game engines (you're on your own)
+games-engines/scummvm:vpx - Enable VP8/VP9 codec support via media-libs/libvpx
 games-engines/scummvm-tools:tremor - Enable tremor, a fixed-point version of the Ogg Vorbis decoder
 games-engines/solarus:doc - Install doxygen developer documentation.
 games-fps/alienarena:vidmode - Link against x11-libs/libXxf86vm. Required for full-screen support.
@@ -3445,7 +3446,7 @@ gnustep-apps/sogo:sodium - Enable support for Argon2 password schemes using dev-
 gnustep-base/gnustep-back-art:xim - Enable X11 XiM input method
 gnustep-base/gnustep-back-cairo:xim - Enable X11 XiM input method
 gnustep-base/gnustep-back-xlib:xim - Enable X11 XiM input method
-gnustep-base/gnustep-make:libobjc2 - Enables use of the GNUstep Objective-C runtime (gnustep-base/libobjc2) with non-fragile ABI and sys-devel/clang compiler
+gnustep-base/gnustep-make:libobjc2 - Enables use of the GNUstep Objective-C runtime (gnustep-base/libobjc2) with non-fragile ABI and llvm-core/clang compiler
 gnustep-base/gnustep-make:native-exceptions - Enables use of the native Objective-C exception support (@try/@catch/@finally) built-in objective-c exceptions with compilers that support it
 gui-apps/foot:grapheme-clustering - Enable grapheme clustering support
 gui-apps/grim:jpeg - Enable JPEG support.
@@ -3716,6 +3717,68 @@ kde-plasma/plasma-workspace:screencast - Enable screencast portal using kde-plas
 kde-plasma/plasma-workspace:telemetry - Enable User Feedback control module for kde-plasma/systemsettings
 kde-plasma/plasma-workspace:wallpaper-metadata - Show metadata for image wallpaper plugin using kde-apps/libkexiv2
 kde-plasma/powerdevil:brightness-control - Enable screen brightness control using app-misc/ddcutil
+llvm-core/clang:extra - Build extra tools (clangd, clang-tidy and a few more)
+llvm-core/clang:ieee-long-double - Use accelerated 128-bit IEEE long double ABI (ppc64le only)
+llvm-core/clang:static-analyzer - Install the Clang static analyzer
+llvm-core/clang-common:bootstrap-prefix - !!internal use only!! DO NOT SET THIS FLAG YOURSELF!, used for bootstrapping Gentoo Prefix
+llvm-core/clang-common:cet - Enable support for control flow hijacking protection. On amd64, this provides Intel Control Flow Enforcement Technology (CET). Only provides benefits on newer CPUs. For Intel, the CPU must be at least as new as Tiger Lake. For AMD, it must be at least as new as Zen 3. This is harmless on older CPUs, but provides no benefit either.
+llvm-core/clang-common:default-compiler-rt - Use compiler-rt + libunwind instead of libgcc as the default rtlib for clang
+llvm-core/clang-common:default-libcxx - Use libc++ instead of libstdc++ as the default stdlib for clang
+llvm-core/clang-common:default-lld - Use lld as the default linker for clang
+llvm-core/clang-common:stricter - Default to stricter behavior known from newer clang versions, turning more warnings into errors
+llvm-core/clang-runtime:compiler-rt - Install llvm-runtimes/compiler-rt for -rtlib=compiler-rt
+llvm-core/clang-runtime:libcxx - Install llvm-runtimes/libcxx for -stdlib=libc++
+llvm-core/clang-runtime:offload - Install llvm-runtimes/offload for -fopenmp GPU offloading
+llvm-core/clang-runtime:openmp - Install llvm-runtimes/openmp for -fopenmp support
+llvm-core/clang-runtime:sanitize - Enable compiler-rt sanitizer (-fsanitize*) support
+llvm-core/clang-toolchain-symlinks:gcc-symlinks - Install symlinks for 'gcc' and 'g++' for extra compatibility.
+llvm-core/clang-toolchain-symlinks:multilib-symlinks - Install symlinks for all ABI CHOSTs. Note that this can result in gcc being overrode for native builds, as well as conflict with crossdev if used for the same targets.
+llvm-core/clang-toolchain-symlinks:native-symlinks - Install generic tool symlinks like 'cc' and 'c++', as well as ${CTARGET}-*. These symlinks are installed into slotted LLVM bindir, so they should not take precedence over symlinks installed into /usr/bin by sys-devel/gcc-config but they can be helpful for GCC-free setups.
+llvm-core/libclc:spirv - Build SPIRV targets
+llvm-core/lld-toolchain-symlinks:multilib-symlinks - Install symlinks for all ABI CHOSTs. Note that this can result in gcc being overrode for native builds, as well as conflict with crossdev if used for the same targets.
+llvm-core/lld-toolchain-symlinks:native-symlinks - Install generic 'ld' symlink, as well as ${CTARGET}-ld. These symlinks are installed into slotted LLVM bindir, so they should not take precedence over symlinks installed into /usr/bin by sys-devel/binutils-config but they can be helpful for binutils-free setups.
+llvm-core/lldb:debuginfod - Expose the transitive dependencies on net-misc/curl and dev-cpp/cpp-httplib) to match llvm-core/llvm.
+llvm-core/llvm:binutils-plugin - Build the binutils plugin
+llvm-core/llvm:debuginfod - Install llvm-debuginfod (requires net-misc/curl and dev-cpp/cpp-httplib)
+llvm-core/llvm:doc - Build and install the HTML documentation and regenerate the man pages
+llvm-core/llvm:exegesis - Enable performance counter support for llvm-exegesis tool that can be used to measure host machine instruction characteristics
+llvm-core/llvm:ncurses - Support querying terminal properties using ncurses' terminfo
+llvm-core/llvm:xar - Support dumping LLVM bitcode sections in Mach-O files (uses app-arch/xar)
+llvm-core/llvm:z3 - Enable support for sci-mathematics/z3 constraint solver
+llvm-core/llvm-toolchain-symlinks:multilib-symlinks - Install symlinks for all ABI CHOSTs. Note that this can result in gcc being overrode for native builds, as well as conflict with crossdev if used for the same targets.
+llvm-core/llvm-toolchain-symlinks:native-symlinks - Install generic tool symlinks like 'objdump' and 'ranlib', as well as ${CTARGET}-*. These symlinks are installed into slotted LLVM bindir, so they should not take precedence over symlinks installed into /usr/bin by sys-devel/binutils-config but they can be helpful for binutils-free setups.
+llvm-runtimes/compiler-rt:atomic-builtins - Compile atomic builtins into compiler-rt.builtins. This is needed on systems without GCC/libatomic, but requires using Clang to build.
+llvm-runtimes/compiler-rt:clang - Force building using installed clang (rather than the default CC/CXX).
+llvm-runtimes/compiler-rt-sanitizers:asan - Build Address Sanitizer runtime.
+llvm-runtimes/compiler-rt-sanitizers:cfi - Build Control Flow Integrity runtime.
+llvm-runtimes/compiler-rt-sanitizers:clang - Force building using installed clang (rather than the default CC/CXX).
+llvm-runtimes/compiler-rt-sanitizers:ctx-profile - Build ctx profiling runtime.
+llvm-runtimes/compiler-rt-sanitizers:dfsan - Build Data Flow Sanitizer runtime.
+llvm-runtimes/compiler-rt-sanitizers:gwp-asan - Build GWP-ASAN runtime.
+llvm-runtimes/compiler-rt-sanitizers:hwasan - Build Hardware ASAN runtime.
+llvm-runtimes/compiler-rt-sanitizers:libfuzzer - Build fuzzing runtime.
+llvm-runtimes/compiler-rt-sanitizers:lsan - Build Leak Sanitizer runtime.
+llvm-runtimes/compiler-rt-sanitizers:memprof - Build memory profiler runtime.
+llvm-runtimes/compiler-rt-sanitizers:msan - Build Memory Sanitizer runtime.
+llvm-runtimes/compiler-rt-sanitizers:nsan - Build Numerical Sanitizer runtime.
+llvm-runtimes/compiler-rt-sanitizers:orc - Build ORC runtime.
+llvm-runtimes/compiler-rt-sanitizers:profile - Build profiling runtime.
+llvm-runtimes/compiler-rt-sanitizers:rtsan - Build Realtime Sanitizer runtime.
+llvm-runtimes/compiler-rt-sanitizers:safestack - Build SafeStack runtime.
+llvm-runtimes/compiler-rt-sanitizers:scudo - Build Scudo Hardened Allocator.
+llvm-runtimes/compiler-rt-sanitizers:shadowcallstack - Build ShadowCallStack.
+llvm-runtimes/compiler-rt-sanitizers:tsan - Build Thread Sanitizer runtime.
+llvm-runtimes/compiler-rt-sanitizers:ubsan - Build Undefined Behavior Sanitizer runtime.
+llvm-runtimes/compiler-rt-sanitizers:xray - Build XRay runtime.
+llvm-runtimes/libcxx:clang - Force building using installed clang (rather than the default CC/CXX; required for testing).
+llvm-runtimes/libcxx:libcxxabi - Build on top of llvm-runtimes/libcxxabi instead of gcc's libsupc++ (avoids depending on gcc).
+llvm-runtimes/libcxxabi:clang - Force building using installed clang (rather than the default CC/CXX; required for testing).
+llvm-runtimes/libunwind:clang - Force building using installed clang (rather than the default CC/CXX; required for testing).
+llvm-runtimes/offload:ompt - Enable OpenMP Tools Interface support
+llvm-runtimes/openmp:gdb-plugin - Build OMPD GDB plugin
+llvm-runtimes/openmp:hwloc - Enable CPU affinity support via hwloc
+llvm-runtimes/openmp:offload - Support offloading OpenMP using libomptarget
+llvm-runtimes/openmp:ompt - Enable OpenMP Tools Interface support
 lxqt-base/liblxqt:backlight - Enable backlight control features.
 lxqt-base/lxqt-config:monitor - Build monitor settings tool
 lxqt-base/lxqt-config:touchpad - Build touchpad settings tool
@@ -4438,7 +4501,7 @@ media-libs/opusfile:fixed-point - Enable fixed-point arithmetic operations
 media-libs/opusfile:float - Enable floating point arithmetic operations
 media-libs/opusfile:http - Enable http connections
 media-libs/osl:gui - Build the osltoy binary (with Qt5)
-media-libs/osl:libcxx - Build against sys-libs/libcxx when using clang
+media-libs/osl:libcxx - Build against llvm-runtimes/libcxx when using clang
 media-libs/osl:nofma - Do not use Fuse-Multiply-Add operations
 media-libs/osl:optix - Add support for NVIDIA's OptiX Raytracing Engine
 media-libs/osl:partio - Use media-libs/partio
@@ -4884,7 +4947,7 @@ media-sound/supercollider:gpl3 - Build GPL-3 licensed code (recommended)
 media-sound/supercollider:server - Build with internal server
 media-sound/supercollider:vim - Enable the SCVIM user interface
 media-sound/supercollider:webengine - Enable the internal help system using QtWebengine
-media-sound/teamspeak-client:system-libcxx - Use sys-libs/libcxx instead of shipped libs.
+media-sound/teamspeak-client:system-libcxx - Use llvm-runtimes/libcxx instead of shipped libs.
 media-sound/teamspeak-client:system-quazip - Use dev-libs/quazip instead of shipped libs.
 media-sound/teamspeak-server:tsdns - Install TeamSpeaks own DNS service for handling multiple virtual servers.
 media-sound/upmpdcli:thirdparty - Enable streaming from Qobuz and Tidal external services
@@ -6878,6 +6941,7 @@ net-vpn/strongswan:strongswan_plugins_bypass-lan - Enable support for the bypass
 net-vpn/strongswan:strongswan_plugins_ccm - Enable support for the ccm plugin
 net-vpn/strongswan:strongswan_plugins_chapoly - Enable ChaCha20/Poly1305 AEAD implementation and ChaCha20 XOF plugin
 net-vpn/strongswan:strongswan_plugins_ctr - Enable support for the ctr plugin
+net-vpn/strongswan:strongswan_plugins_eap-radius - Enable EAP Radius plugin
 net-vpn/strongswan:strongswan_plugins_error-notify - Enable support for the error-notify plugin
 net-vpn/strongswan:strongswan_plugins_forecast - Enable multicast and broadcast forwarding plugin
 net-vpn/strongswan:strongswan_plugins_gcm - Enable support for the gcm plugin
@@ -7608,7 +7672,7 @@ sci-physics/root:fortran - Compile included Fortran programs
 sci-physics/root:gdml - Enable GDML writer and reader
 sci-physics/root:http - Enable http server support including but not limited to fastcgi support
 sci-physics/root:jupyter - Install dependencies to enable ROOT's C++ kernel in Jupyter notebooks
-sci-physics/root:libcxx - Build ROOT against sys-libs/libcxx
+sci-physics/root:libcxx - Build ROOT against llvm-runtimes/libcxx
 sci-physics/root:minuit - Build ROOT's internal versions of minuit (fortran) and minuit2 (C++)
 sci-physics/root:pythia6 - Build the interface for sci-physics/pythia version 6.x
 sci-physics/root:pythia8 - Build the interface for sci-physics/pythia version 8.x
@@ -8160,23 +8224,6 @@ sys-devel/binutils-hppa64:multitarget - Adds support to binutils for cross compi
 sys-devel/binutils-hppa64:pgo - Build binutils with Profile Guided Optimization (PGO) and LTO
 sys-devel/binutils-hppa64:plugins - Enable plugin support in tools
 sys-devel/bpf-toolchain:bin-symlinks - Symlink executables to usr/bin to be in default PATH (conflicts with crossdev bpf, and crossdev is preferable for a fully featured toolchain)
-sys-devel/clang:extra - Build extra tools (clangd, clang-tidy and a few more)
-sys-devel/clang:ieee-long-double - Use accelerated 128-bit IEEE long double ABI (ppc64le only)
-sys-devel/clang:static-analyzer - Install the Clang static analyzer
-sys-devel/clang-common:bootstrap-prefix - !!internal use only!! DO NOT SET THIS FLAG YOURSELF!, used for bootstrapping Gentoo Prefix
-sys-devel/clang-common:cet - Enable support for control flow hijacking protection. On amd64, this provides Intel Control Flow Enforcement Technology (CET). Only provides benefits on newer CPUs. For Intel, the CPU must be at least as new as Tiger Lake. For AMD, it must be at least as new as Zen 3. This is harmless on older CPUs, but provides no benefit either.
-sys-devel/clang-common:default-compiler-rt - Use compiler-rt + libunwind instead of libgcc as the default rtlib for clang
-sys-devel/clang-common:default-libcxx - Use libc++ instead of libstdc++ as the default stdlib for clang
-sys-devel/clang-common:default-lld - Use lld as the default linker for clang
-sys-devel/clang-common:stricter - Default to stricter behavior known from newer clang versions, turning more warnings into errors
-sys-devel/clang-runtime:compiler-rt - Install sys-libs/compiler-rt for -rtlib=compiler-rt
-sys-devel/clang-runtime:libcxx - Install sys-libs/libcxx for -stdlib=libc++
-sys-devel/clang-runtime:offload - Install sys-libs/llvm-offload for -fopenmp GPU offloading
-sys-devel/clang-runtime:openmp - Install sys-libs/libomp for -fopenmp support
-sys-devel/clang-runtime:sanitize - Enable compiler-rt sanitizer (-fsanitize*) support
-sys-devel/clang-toolchain-symlinks:gcc-symlinks - Install symlinks for 'gcc' and 'g++' for extra compatibility.
-sys-devel/clang-toolchain-symlinks:multilib-symlinks - Install symlinks for all ABI CHOSTs. Note that this can result in gcc being overrode for native builds, as well as conflict with crossdev if used for the same targets.
-sys-devel/clang-toolchain-symlinks:native-symlinks - Install generic tool symlinks like 'cc' and 'c++', as well as ${CTARGET}-*. These symlinks are installed into slotted LLVM bindir, so they should not take precedence over symlinks installed into /usr/bin by sys-devel/gcc-config but they can be helpful for GCC-free setups.
 sys-devel/crosstool-ng:dtc - Require sys-apps/dtc
 sys-devel/crosstool-ng:lzip - Require app-arch/lzip
 sys-devel/crosstool-ng:meson - Require dev-build/meson
@@ -8214,17 +8261,6 @@ sys-devel/gcc-apple:objc++ - Build support for the Objective C++ language
 sys-devel/gcc-config:cc-wrappers - Install and manage 'cc' and 'f77' wrappers in /usr/bin. Otherwise ignore them.
 sys-devel/gcc-config:native-symlinks - Install native symlinks like 'gcc' or 'g++' to /usr/bin. Otherwise keep only ${CTARGET}-gcc and friends.
 sys-devel/gettext:git - When running `autopoint`, use git to store the internal development files; this requires git at runtime, but will be faster/smaller than raw archives
-sys-devel/lld-toolchain-symlinks:multilib-symlinks - Install symlinks for all ABI CHOSTs. Note that this can result in gcc being overrode for native builds, as well as conflict with crossdev if used for the same targets.
-sys-devel/lld-toolchain-symlinks:native-symlinks - Install generic 'ld' symlink, as well as ${CTARGET}-ld. These symlinks are installed into slotted LLVM bindir, so they should not take precedence over symlinks installed into /usr/bin by sys-devel/binutils-config but they can be helpful for binutils-free setups.
-sys-devel/llvm:binutils-plugin - Build the binutils plugin
-sys-devel/llvm:debuginfod - Install llvm-debuginfod (requires net-misc/curl and dev-cpp/cpp-httplib)
-sys-devel/llvm:doc - Build and install the HTML documentation and regenerate the man pages
-sys-devel/llvm:exegesis - Enable performance counter support for llvm-exegesis tool that can be used to measure host machine instruction characteristics
-sys-devel/llvm:ncurses - Support querying terminal properties using ncurses' terminfo
-sys-devel/llvm:xar - Support dumping LLVM bitcode sections in Mach-O files (uses app-arch/xar)
-sys-devel/llvm:z3 - Enable support for sci-mathematics/z3 constraint solver
-sys-devel/llvm-toolchain-symlinks:multilib-symlinks - Install symlinks for all ABI CHOSTs. Note that this can result in gcc being overrode for native builds, as well as conflict with crossdev if used for the same targets.
-sys-devel/llvm-toolchain-symlinks:native-symlinks - Install generic tool symlinks like 'objdump' and 'ranlib', as well as ${CTARGET}-*. These symlinks are installed into slotted LLVM bindir, so they should not take precedence over symlinks installed into /usr/bin by sys-devel/binutils-config but they can be helpful for binutils-free setups.
 sys-devel/sparse:gtk - Build the test-inspect utility (requires x11-libs/gtk+:3)
 sys-devel/sparse:llvm - Build the sparse-llvm utility
 sys-devel/sparse:xml - Build the c2xml utility (requires dev-libs/libxml2)
@@ -8367,29 +8403,6 @@ sys-kernel/vanilla-kernel:initramfs - Build initramfs along with the kernel.
 sys-libs/binutils-libs:64-bit-bfd - Support 64-bit targets even on 32-bit hosts (is ignored on 64-bit hosts)
 sys-libs/binutils-libs:cet - Enable Intel Control-flow Enforcement Technology.
 sys-libs/binutils-libs:multitarget - Enable all possible targets in libbfd
-sys-libs/compiler-rt:atomic-builtins - Compile atomic builtins into compiler-rt.builtins. This is needed on systems without GCC/libatomic, but requires using Clang to build.
-sys-libs/compiler-rt:clang - Force building using installed clang (rather than the default CC/CXX).
-sys-libs/compiler-rt-sanitizers:asan - Build Address Sanitizer runtime.
-sys-libs/compiler-rt-sanitizers:cfi - Build Control Flow Integrity runtime.
-sys-libs/compiler-rt-sanitizers:clang - Force building using installed clang (rather than the default CC/CXX).
-sys-libs/compiler-rt-sanitizers:ctx-profile - Build ctx profiling runtime.
-sys-libs/compiler-rt-sanitizers:dfsan - Build Data Flow Sanitizer runtime.
-sys-libs/compiler-rt-sanitizers:gwp-asan - Build GWP-ASAN runtime.
-sys-libs/compiler-rt-sanitizers:hwasan - Build Hardware ASAN runtime.
-sys-libs/compiler-rt-sanitizers:libfuzzer - Build fuzzing runtime.
-sys-libs/compiler-rt-sanitizers:lsan - Build Leak Sanitizer runtime.
-sys-libs/compiler-rt-sanitizers:memprof - Build memory profiler runtime.
-sys-libs/compiler-rt-sanitizers:msan - Build Memory Sanitizer runtime.
-sys-libs/compiler-rt-sanitizers:nsan - Build Numerical Sanitizer runtime.
-sys-libs/compiler-rt-sanitizers:orc - Build ORC runtime.
-sys-libs/compiler-rt-sanitizers:profile - Build profiling runtime.
-sys-libs/compiler-rt-sanitizers:rtsan - Build Realtime Sanitizer runtime.
-sys-libs/compiler-rt-sanitizers:safestack - Build SafeStack runtime.
-sys-libs/compiler-rt-sanitizers:scudo - Build Scudo Hardened Allocator.
-sys-libs/compiler-rt-sanitizers:shadowcallstack - Build ShadowCallStack.
-sys-libs/compiler-rt-sanitizers:tsan - Build Thread Sanitizer runtime.
-sys-libs/compiler-rt-sanitizers:ubsan - Build Undefined Behavior Sanitizer runtime.
-sys-libs/compiler-rt-sanitizers:xray - Build XRay runtime.
 sys-libs/freeipmi:nagios - Install a nagios plugin to check sensors' status.
 sys-libs/freeipmi:without-root - Configure whether or not to check for root access in ipmi tools.
 sys-libs/gdbm:berkdb - enable compatibility layer for UNIX-like dbm and ndbm interfaces
@@ -8425,27 +8438,18 @@ sys-libs/libblockdev:nvme - Add nvme support via sys-libs/libnvme
 sys-libs/libblockdev:tools - Build tools
 sys-libs/libblockdev:vdo - Enable Virtual Data Optimizer support.
 sys-libs/libcap:tools - Install captree, which requires dev-lang/go
-sys-libs/libcxx:clang - Force building using installed clang (rather than the default CC/CXX; required for testing).
-sys-libs/libcxx:libcxxabi - Build on top of sys-libs/libcxxabi instead of gcc's libsupc++ (avoids depending on gcc).
-sys-libs/libcxxabi:clang - Force building using installed clang (rather than the default CC/CXX; required for testing).
 sys-libs/libnbd:fuse - Install the sys-fs/fuse powered nbdfuse.
 sys-libs/libnbd:go - Build bindings for dev-lang/go
 sys-libs/libnbd:uri-support - Enable nbd:// URI support via dev-libs/libxml2.
 sys-libs/libnvme:json - Support JSON output via dev-libs/json-c
 sys-libs/libnvme:keyutils - Add support for sys-apps/keyutils
 sys-libs/libnvme:uuid - UUID support via sys-apps/util-linux
-sys-libs/libomp:gdb-plugin - Build OMPD GDB plugin
-sys-libs/libomp:hwloc - Enable CPU affinity support via hwloc
-sys-libs/libomp:offload - Support offloading OpenMP using libomptarget
-sys-libs/libomp:ompt - Enable OpenMP Tools Interface support
 sys-libs/libseccomp:experimental-loong - Add experimental LoongArch patchset
 sys-libs/libunwind:debug-frame - Adds support for DWARF .debug_frame section: Use the information from this section if available
 sys-libs/libunwind:libatomic - Use libatomic instead of builtin atomic operations
 sys-libs/libxcrypt:compat - Build with compatibility interfaces for other crypt implementations
 sys-libs/libxcrypt:headers-only - Build and install only the headers.
 sys-libs/libxcrypt:system - Install as system libcrypt.so rather than to an alternate directory (will collide with sys-libs/glibc's version)
-sys-libs/llvm-libunwind:clang - Force building using installed clang (rather than the default CC/CXX; required for testing).
-sys-libs/llvm-offload:ompt - Enable OpenMP Tools Interface support
 sys-libs/minizip-ng:compat - Enable compatibility with sys-libs/zlib's USE=minizip
 sys-libs/minizip-ng:openssl - Use dev-libs/openssl for further encryption capabilities
 sys-libs/musl-nscd:minimal - Only installs the header files