Move {sys-devel → llvm-core}/llvm

Signed-off-by: Michał Górny <mgorny@gentoo.org>

42 files changed, 57 insertions, 56 deletions

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 7ec2d8101504..2108df51e585 100644
--- a/profiles/arch/amd64/package.use
+++ b/profiles/arch/amd64/package.use
@@ -39,7 +39,7 @@ sys-boot/grub:2 grub_platforms_efi-64 grub_platforms_pc
 # Enable the GPU targets matching the default VIDEO_CARDS
 dev-ml/llvm-ocaml llvm_targets_AMDGPU llvm_targets_NVPTX
 llvm-core/clang llvm_targets_AMDGPU llvm_targets_NVPTX
-sys-devel/llvm 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 799c6355f972..adcb7251ce13 100644
--- a/profiles/arch/amd64/package.use.force
+++ b/profiles/arch/amd64/package.use.force
@@ -42,7 +42,7 @@ sys-apps/sandbox abi_x86_32
 # Force the host target to avoid dependency hell
 dev-ml/llvm-ocaml llvm_targets_X86
 llvm-core/clang llvm_targets_X86
-sys-devel/llvm 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 c4e8ddbff093..96d6c2f79355 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -143,7 +143,7 @@ media-libs/libplacebo -shaderc
 # Michał Górny <mgorny@gentoo.org> (2023-09-19)
 # dev-cpp/cpp-httplib is keyworded here.
 llvm-core/lldb -debuginfod
-sys-devel/llvm -debuginfod
+llvm-core/llvm -debuginfod
 
 # Ionen Wolkens <ionen@gentoo.org> (2023-09-13)
 # media-gfx/renderdoc is keyworded here
@@ -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/arm/package.use.force b/profiles/arch/arm/package.use.force
index a3c6f6ef557d..6078ea244a85 100644
--- a/profiles/arch/arm/package.use.force
+++ b/profiles/arch/arm/package.use.force
@@ -18,4 +18,4 @@ dev-lang/rust llvm_targets_ARM
 # Force the host target to avoid dependency hell
 dev-ml/llvm-ocaml llvm_targets_ARM
 llvm-core/clang llvm_targets_ARM
-sys-devel/llvm llvm_targets_ARM
+llvm-core/llvm llvm_targets_ARM
diff --git a/profiles/arch/arm64/package.use.force b/profiles/arch/arm64/package.use.force
index 66dbfc0736a9..27fa09ae9bf7 100644
--- a/profiles/arch/arm64/package.use.force
+++ b/profiles/arch/arm64/package.use.force
@@ -42,4 +42,4 @@ dev-lang/rust llvm_targets_AArch64
 # Force the host target to avoid dependency hell
 dev-ml/llvm-ocaml llvm_targets_AArch64
 llvm-core/clang llvm_targets_AArch64
-sys-devel/llvm llvm_targets_AArch64
+llvm-core/llvm llvm_targets_AArch64
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index a398f74a9490..5f9726c41987 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -125,7 +125,7 @@ media-libs/libplacebo shaderc
 # Michał Górny <mgorny@gentoo.org> (2023-09-19)
 # dev-cpp/cpp-httplib is barely keyworded anywhere.
 llvm-core/lldb debuginfod
-sys-devel/llvm debuginfod
+llvm-core/llvm debuginfod
 
 # Ionen Wolkens <ionen@gentoo.org> (2023-09-13)
 # media-gfx/renderdoc currently has few keywords
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index 4621f9bd8d2f..a61c98914043 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -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 37d947d340bc..16eca7f362da 100644
--- a/profiles/arch/loong/package.use.force
+++ b/profiles/arch/loong/package.use.force
@@ -30,7 +30,7 @@ media-video/mpv lua_single_target_lua5-1 -lua_single_target_luajit
 dev-lang/rust llvm_targets_LoongArch
 dev-ml/llvm-ocaml llvm_targets_LoongArch
 llvm-core/clang llvm_targets_LoongArch
-sys-devel/llvm 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 41d3de0b5b7b..109e82008ce7 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -153,7 +153,7 @@ dev-util/librnp man
 # Michał Górny <mgorny@gentoo.org> (2023-09-19)
 # dev-cpp/cpp-httplib is keyworded here.
 llvm-core/lldb -debuginfod
-sys-devel/llvm -debuginfod
+llvm-core/llvm -debuginfod
 
 # WANG Xuerui <xen0n@gentoo.org> (2023-09-10)
 # Revdeps of dev-python/ujson which is masked.
diff --git a/profiles/arch/mips/package.use.force b/profiles/arch/mips/package.use.force
index 474060ebbe97..2f291f62f765 100644
--- a/profiles/arch/mips/package.use.force
+++ b/profiles/arch/mips/package.use.force
@@ -9,4 +9,4 @@ dev-lang/rust llvm_targets_Mips
 # Force the host target to avoid dependency hell
 dev-ml/llvm-ocaml llvm_targets_Mips
 llvm-core/clang llvm_targets_Mips
-sys-devel/llvm llvm_targets_Mips
+llvm-core/llvm llvm_targets_Mips
diff --git a/profiles/arch/powerpc/package.use.force b/profiles/arch/powerpc/package.use.force
index eb8be39c313f..534364aace37 100644
--- a/profiles/arch/powerpc/package.use.force
+++ b/profiles/arch/powerpc/package.use.force
@@ -22,4 +22,4 @@ dev-lang/rust llvm_targets_PowerPC
 # Force the host target to avoid dependency hell
 dev-ml/llvm-ocaml llvm_targets_PowerPC
 llvm-core/clang llvm_targets_PowerPC
-sys-devel/llvm llvm_targets_PowerPC
+llvm-core/llvm llvm_targets_PowerPC
diff --git a/profiles/arch/powerpc/ppc32/package.use.stable.mask b/profiles/arch/powerpc/ppc32/package.use.stable.mask
index 000ed45d577c..5e236f1eea1f 100644
--- a/profiles/arch/powerpc/ppc32/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.stable.mask
@@ -34,7 +34,7 @@ dev-ruby/kramdown unicode
 # Sam James <sam@gentoo.org> (2022-11-19)
 # Deps not stable on ppc
 llvm-core/clang-common default-lld
-sys-devel/llvm binutils-plugin z3 xar
+llvm-core/llvm binutils-plugin z3 xar
 
 # Sam James <sam@gentoo.org> (2022-07-27)
 # llvm-core/lld is not marked stable on ppc
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 c1605dd948c1..bfd8e56f9b7c 100644
--- a/profiles/arch/riscv/package.use
+++ b/profiles/arch/riscv/package.use
@@ -11,4 +11,4 @@ media-video/mpv soc
 # Enable the GPU targets matching the default VIDEO_CARDS
 dev-ml/llvm-ocaml llvm_targets_AMDGPU
 llvm-core/clang llvm_targets_AMDGPU
-sys-devel/llvm 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 58c6df233a15..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
+llvm-core/llvm llvm_targets_RISCV
 llvm-core/clang llvm_targets_RISCV
 dev-lang/rust llvm_targets_RISCV
diff --git a/profiles/arch/s390/s390x/package.use.force b/profiles/arch/s390/s390x/package.use.force
index 753e592acebf..9ffd60862e32 100644
--- a/profiles/arch/s390/s390x/package.use.force
+++ b/profiles/arch/s390/s390x/package.use.force
@@ -10,4 +10,4 @@ sys-auth/polkit duktape
 dev-ml/llvm-ocaml llvm_targets_SystemZ
 dev-lang/rust llvm_targets_SystemZ
 llvm-core/clang llvm_targets_SystemZ
-sys-devel/llvm llvm_targets_SystemZ
+llvm-core/llvm llvm_targets_SystemZ
diff --git a/profiles/arch/sparc/package.use b/profiles/arch/sparc/package.use
index 15b90c2832a0..f88e6966abff 100644
--- a/profiles/arch/sparc/package.use
+++ b/profiles/arch/sparc/package.use
@@ -5,7 +5,7 @@
 # Enable the GPU targets matching the default VIDEO_CARDS
 dev-ml/llvm-ocaml llvm_targets_AMDGPU
 llvm-core/clang llvm_targets_AMDGPU
-sys-devel/llvm 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 9874690b6d55..71ab3a85d27e 100644
--- a/profiles/arch/sparc/package.use.force
+++ b/profiles/arch/sparc/package.use.force
@@ -15,5 +15,5 @@ sys-auth/polkit duktape
 # Force the host target to avoid dependency hell
 dev-ml/llvm-ocaml llvm_targets_Sparc
 llvm-core/clang llvm_targets_Sparc
-sys-devel/llvm 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 6b42956a50e3..5ee9b7c1f83c 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -322,7 +322,7 @@ dev-cpp/eigen test
 # Deps not yet tested/keyworded.
 llvm-core/clang-common default-compiler-rt default-lld
 llvm-core/clang-runtime compiler-rt
-sys-devel/llvm z3
+llvm-core/llvm z3
 
 # Sam James <sam@gentoo.org> (2021-03-19)
 # On sparc, we have to force sys-apps/grep[libsigsegv]
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 6a7413d77534..c4b27fb3ac42 100644
--- a/profiles/arch/x86/package.use
+++ b/profiles/arch/x86/package.use
@@ -14,7 +14,7 @@ sys-apps/memtest86+ bios32
 # Enable the GPU targets matching the default VIDEO_CARDS
 dev-ml/llvm-ocaml llvm_targets_AMDGPU llvm_targets_NVPTX
 llvm-core/clang llvm_targets_AMDGPU llvm_targets_NVPTX
-sys-devel/llvm 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 9cee1b68360d..700ae620d828 100644
--- a/profiles/arch/x86/package.use.force
+++ b/profiles/arch/x86/package.use.force
@@ -37,4 +37,4 @@ dev-lang/rust llvm_targets_X86
 # Force the host target to avoid dependency hell
 dev-ml/llvm-ocaml llvm_targets_X86
 llvm-core/clang llvm_targets_X86
-sys-devel/llvm 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 7edc4aa9153e..294bc04d3bf6 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -93,7 +93,7 @@ media-libs/libplacebo -shaderc
 # Michał Górny <mgorny@gentoo.org> (2023-09-19)
 # dev-cpp/cpp-httplib is keyworded here.
 llvm-core/lldb -debuginfod
-sys-devel/llvm -debuginfod
+llvm-core/llvm -debuginfod
 
 # Jon Janzen <jon@jonjanzen.com> (2023-09-11)
 # librttopo has not been tested on this arch
@@ -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/base/package.use b/profiles/base/package.use
index 47630b1c84bd..1960babb2192 100644
--- a/profiles/base/package.use
+++ b/profiles/base/package.use
@@ -54,7 +54,7 @@ media-video/wireplumber lua_single_target_lua5-4
 # Enable the BPF target by default
 dev-ml/llvm-ocaml llvm_targets_BPF
 llvm-core/clang llvm_targets_BPF
-sys-devel/llvm 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 65c8f1300def..ba9258292499 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -131,16 +131,16 @@ dev-java/openjdk:21 system-bootstrap
 >=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
->=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/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
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 53c94bc29208..9652be31ad0d 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -631,19 +631,19 @@ app-office/abiword ots
 # version when master is bumped.
 <dev-ml/llvm-ocaml-16 llvm_targets_LoongArch
 <llvm-core/clang-16 llvm_targets_LoongArch
-<sys-devel/llvm-16 llvm_targets_LoongArch
+<llvm-core/llvm-16 llvm_targets_LoongArch
 <dev-ml/llvm-ocaml-17 llvm_targets_ARC llvm_targets_CSKY
 <llvm-core/clang-17 llvm_targets_ARC llvm_targets_CSKY
-<sys-devel/llvm-17 llvm_targets_ARC llvm_targets_CSKY
+<llvm-core/llvm-17 llvm_targets_ARC llvm_targets_CSKY
 <dev-ml/llvm-ocaml-17 llvm_targets_DirectX
 <llvm-core/clang-17 llvm_targets_DirectX
-<sys-devel/llvm-17 llvm_targets_DirectX
+<llvm-core/llvm-17 llvm_targets_DirectX
 <dev-ml/llvm-ocaml-17 llvm_targets_M68k llvm_targets_SPIRV
 <llvm-core/clang-17 llvm_targets_M68k llvm_targets_SPIRV
-<sys-devel/llvm-17 llvm_targets_M68k llvm_targets_SPIRV
+<llvm-core/llvm-17 llvm_targets_M68k llvm_targets_SPIRV
 <dev-ml/llvm-ocaml-17 llvm_targets_Xtensa
 <llvm-core/clang-17 llvm_targets_Xtensa
-<sys-devel/llvm-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/default/linux/amd64/17.1/clang/package.use.force b/profiles/default/linux/amd64/17.1/clang/package.use.force
index be6711396dfe..94a8a1b3c014 100644
--- a/profiles/default/linux/amd64/17.1/clang/package.use.force
+++ b/profiles/default/linux/amd64/17.1/clang/package.use.force
@@ -6,7 +6,7 @@ dev-libs/libffi abi_x86_32 abi_x86_64
 dev-libs/libxml2 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
-sys-devel/llvm 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
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 be6711396dfe..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
@@ -6,7 +6,7 @@ dev-libs/libffi abi_x86_32 abi_x86_64
 dev-libs/libxml2 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
-sys-devel/llvm 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
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 2955d8ae5d10..79ccb3fa5786 100644
--- a/profiles/default/linux/amd64/23.0/llvm/package.use.force
+++ b/profiles/default/linux/amd64/23.0/llvm/package.use.force
@@ -6,7 +6,7 @@ dev-libs/libffi abi_x86_32 abi_x86_64
 dev-libs/libxml2 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
-sys-devel/llvm 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
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 2955d8ae5d10..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
@@ -6,7 +6,7 @@ dev-libs/libffi abi_x86_32 abi_x86_64
 dev-libs/libxml2 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
-sys-devel/llvm 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
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/features/llvm/make.defaults b/profiles/features/llvm/make.defaults
index 122896c05899..ffc23dbddd44 100644
--- a/profiles/features/llvm/make.defaults
+++ b/profiles/features/llvm/make.defaults
@@ -41,7 +41,7 @@ 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"
 
 # llvm-core/clang, llvm-core/clang-runtime, llvm-runtimes/libunwind, llvm-runtimes/libcxx, llvm-runtimes/libcxxabi
diff --git a/profiles/features/llvm/package.use b/profiles/features/llvm/package.use
index 1ec616227c46..cebefca7c186 100644
--- a/profiles/features/llvm/package.use
+++ b/profiles/features/llvm/package.use
@@ -2,7 +2,7 @@
 llvm-runtimes/libunwind static-libs
 
 # use lld by default
-sys-devel/llvm -binutils-plugin
+llvm-core/llvm -binutils-plugin
 
 # use all defaults
 llvm-runtimes/compiler-rt clang
diff --git a/profiles/features/llvm/packages b/profiles/features/llvm/packages
index 5388b6a50f3a..e70811e37285 100644
--- a/profiles/features/llvm/packages
+++ b/profiles/features/llvm/packages
@@ -1,6 +1,6 @@
 # now part of @system set
 *llvm-core/lld
-*sys-devel/llvm
+*llvm-core/llvm
 *llvm-core/clang
 *llvm-runtimes/libcxx
 *llvm-runtimes/libcxxabi
diff --git a/profiles/features/llvm/packages.build b/profiles/features/llvm/packages.build
index b8dd993d9fe9..35e422a67562 100644
--- a/profiles/features/llvm/packages.build
+++ b/profiles/features/llvm/packages.build
@@ -2,7 +2,7 @@
 llvm-runtimes/compiler-rt
 llvm-runtimes/libcxxabi
 llvm-runtimes/libcxx
-sys-devel/llvm
+llvm-core/llvm
 llvm-core/lld
 llvm-core/clang
 llvm-runtimes/libunwind
diff --git a/profiles/info_pkgs b/profiles/info_pkgs
index ddf12cdd1be2..abc517fa4519 100644
--- a/profiles/info_pkgs
+++ b/profiles/info_pkgs
@@ -23,7 +23,7 @@ app-misc/pax-utils
 sys-apps/sandbox
 dev-util/ccache
 llvm-core/clang
-sys-devel/llvm
+llvm-core/llvm
 llvm-core/lld
 sys-devel/gcc
 sys-devel/gcc-config
diff --git a/profiles/prefix/darwin/macos/arch/arm64/package.use.force b/profiles/prefix/darwin/macos/arch/arm64/package.use.force
index ced21e21bc86..7dfc8c26129c 100644
--- a/profiles/prefix/darwin/macos/arch/arm64/package.use.force
+++ b/profiles/prefix/darwin/macos/arch/arm64/package.use.force
@@ -5,4 +5,4 @@
 # Force the host target to avoid dependency hell
 dev-ml/llvm-ocaml llvm_targets_AArch64
 llvm-core/clang llvm_targets_AArch64
-sys-devel/llvm 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 4a9108b14c0b..0e5c1e628ffc 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/package.use.force
+++ b/profiles/prefix/darwin/macos/arch/ppc/package.use.force
@@ -9,4 +9,4 @@ sys-devel/gcc -pie
 # Force the host target to avoid dependency hell
 dev-ml/llvm-ocaml llvm_targets_PowerPC
 llvm-core/clang llvm_targets_PowerPC
-sys-devel/llvm 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 37a8d39cf5cd..27d8966fd9f8 100644
--- a/profiles/prefix/darwin/macos/arch/x64/package.use.force
+++ b/profiles/prefix/darwin/macos/arch/x64/package.use.force
@@ -5,4 +5,4 @@
 # Force the host target to avoid dependency hell
 dev-ml/llvm-ocaml llvm_targets_X86
 llvm-core/clang llvm_targets_X86
-sys-devel/llvm llvm_targets_X86
+llvm-core/llvm llvm_targets_X86
diff --git a/profiles/releases/23.0/package.use b/profiles/releases/23.0/package.use
index 7fe14cbc2301..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
+llvm-core/llvm zstd
 llvm-core/lld zstd
diff --git a/profiles/updates/4Q-2024 b/profiles/updates/4Q-2024
index a2e2e31a4e5f..26a199ba3409 100644
--- a/profiles/updates/4Q-2024
+++ b/profiles/updates/4Q-2024
@@ -79,3 +79,4 @@ 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