diff --git a/app-admin/ananicy-cpp/ananicy-cpp-1.1.1-r3.ebuild b/app-admin/ananicy-cpp/ananicy-cpp-1.1.1-r3.ebuild
index d7d09bf64c..6c2e115cee 100644
--- a/app-admin/ananicy-cpp/ananicy-cpp-1.1.1-r3.ebuild
+++ b/app-admin/ananicy-cpp/ananicy-cpp-1.1.1-r3.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 
 DEPEND="
 	>=dev-build/cmake-3.17
-	clang? ( >=sys-devel/clang-10 )
+	clang? ( >=llvm-core/clang-10 )
 	${RDEPEND}
 "
 
diff --git a/app-editors/neovide/neovide-0.12.2.ebuild b/app-editors/neovide/neovide-0.12.2.ebuild
index 532627275e..c7318c82f9 100644
--- a/app-editors/neovide/neovide-0.12.2.ebuild
+++ b/app-editors/neovide/neovide-0.12.2.ebuild
@@ -451,7 +451,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-build/gn
 	dev-util/bindgen
-	sys-devel/clang
+	llvm-core/clang
 "
 
 # rust does not use *FLAGS from make.conf, silence portage warning
diff --git a/dev-lang/odin/odin-2024.08.ebuild b/dev-lang/odin/odin-2024.08.ebuild
index 7f1fc8e7c0..91ac07fb36 100644
--- a/dev-lang/odin/odin-2024.08.ebuild
+++ b/dev-lang/odin/odin-2024.08.ebuild
@@ -27,7 +27,7 @@ KEYWORDS="~amd64"
 
 RDEPEND="
 $(llvm_gen_dep "
-sys-devel/clang:${LLVM_SLOT}=
+llvm-core/clang:${LLVM_SLOT}=
 sys-devel/llvm:${LLVM_SLOT}=
 ")
 "
diff --git a/dev-lang/odin/odin-2024.09.ebuild b/dev-lang/odin/odin-2024.09.ebuild
index 7f1fc8e7c0..91ac07fb36 100644
--- a/dev-lang/odin/odin-2024.09.ebuild
+++ b/dev-lang/odin/odin-2024.09.ebuild
@@ -27,7 +27,7 @@ KEYWORDS="~amd64"
 
 RDEPEND="
 $(llvm_gen_dep "
-sys-devel/clang:${LLVM_SLOT}=
+llvm-core/clang:${LLVM_SLOT}=
 sys-devel/llvm:${LLVM_SLOT}=
 ")
 "
diff --git a/dev-lang/swift/swift-5.10.1-r1.ebuild b/dev-lang/swift/swift-5.10.1-r1.ebuild
index 836a5dba4b..9124e9732b 100644
--- a/dev-lang/swift/swift-5.10.1-r1.ebuild
+++ b/dev-lang/swift/swift-5.10.1-r1.ebuild
@@ -90,7 +90,7 @@ BDEPEND="
 	>=sys-libs/ncurses-6
 	>=sys-libs/zlib-1.3
 	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}=
+		llvm-core/clang:${LLVM_SLOT}=
 		sys-devel/lld:${LLVM_SLOT}=
 	')
 	dev-lang/python
diff --git a/dev-lang/swift/swift-5.10.1-r2.ebuild b/dev-lang/swift/swift-5.10.1-r2.ebuild
index a5ffbd7bc4..ab2923b7b0 100644
--- a/dev-lang/swift/swift-5.10.1-r2.ebuild
+++ b/dev-lang/swift/swift-5.10.1-r2.ebuild
@@ -92,7 +92,7 @@ BDEPEND="
 	>=sys-libs/ncurses-6
 	>=sys-libs/zlib-1.3
 	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}=
+		llvm-core/clang:${LLVM_SLOT}=
 		sys-devel/lld:${LLVM_SLOT}=
 	')
 	dev-lang/python
diff --git a/dev-lang/swift/swift-5.10.1.ebuild b/dev-lang/swift/swift-5.10.1.ebuild
index a7e882f9f6..3479811434 100644
--- a/dev-lang/swift/swift-5.10.1.ebuild
+++ b/dev-lang/swift/swift-5.10.1.ebuild
@@ -86,7 +86,7 @@ BDEPEND="
 	>=dev-util/patchelf-0.18
 	>=dev-vcs/git-2.39
 	>=sys-apps/coreutils-9
-	>=sys-devel/clang-15
+	>=llvm-core/clang-15
 	>=sys-devel/lld-15
 	>=sys-libs/ncurses-6
 	>=sys-libs/zlib-1.3
diff --git a/dev-lang/swift/swift-6.0.1-r1.ebuild b/dev-lang/swift/swift-6.0.1-r1.ebuild
index 10d82cbce4..d9b7de4b7d 100644
--- a/dev-lang/swift/swift-6.0.1-r1.ebuild
+++ b/dev-lang/swift/swift-6.0.1-r1.ebuild
@@ -100,7 +100,7 @@ BDEPEND="
 		dev-lang/swift-bootstrap
 	)
 	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}=
+		llvm-core/clang:${LLVM_SLOT}=
 		sys-devel/lld:${LLVM_SLOT}=
 	')
 	dev-lang/python
diff --git a/dev-lang/swift/swift-6.0.1.ebuild b/dev-lang/swift/swift-6.0.1.ebuild
index fe5e94d93d..891f385658 100644
--- a/dev-lang/swift/swift-6.0.1.ebuild
+++ b/dev-lang/swift/swift-6.0.1.ebuild
@@ -99,7 +99,7 @@ BDEPEND="
 		>dev-lang/swift-${PV}:*
 	)
 	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}=
+		llvm-core/clang:${LLVM_SLOT}=
 		sys-devel/lld:${LLVM_SLOT}=
 	')
 	dev-lang/python
diff --git a/dev-lang/swift/swift-6.0.2.ebuild b/dev-lang/swift/swift-6.0.2.ebuild
index 10d82cbce4..d9b7de4b7d 100644
--- a/dev-lang/swift/swift-6.0.2.ebuild
+++ b/dev-lang/swift/swift-6.0.2.ebuild
@@ -100,7 +100,7 @@ BDEPEND="
 		dev-lang/swift-bootstrap
 	)
 	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}=
+		llvm-core/clang:${LLVM_SLOT}=
 		sys-devel/lld:${LLVM_SLOT}=
 	')
 	dev-lang/python
diff --git a/dev-libs/libsignal-ffi/libsignal-ffi-0.44.0-r1.ebuild b/dev-libs/libsignal-ffi/libsignal-ffi-0.44.0-r1.ebuild
index f189a660cf..d0f55f3239 100644
--- a/dev-libs/libsignal-ffi/libsignal-ffi-0.44.0-r1.ebuild
+++ b/dev-libs/libsignal-ffi/libsignal-ffi-0.44.0-r1.ebuild
@@ -26,7 +26,7 @@ KEYWORDS="~amd64"
 
 BDEPEND="
 	dev-libs/protobuf
-	$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}')
+	$(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}')
 "
 
 pkg_setup() {
diff --git a/dev-libs/libsignal-ffi/libsignal-ffi-0.51.0-r1.ebuild b/dev-libs/libsignal-ffi/libsignal-ffi-0.51.0-r1.ebuild
index 0d01d1599b..5b9a40e497 100644
--- a/dev-libs/libsignal-ffi/libsignal-ffi-0.51.0-r1.ebuild
+++ b/dev-libs/libsignal-ffi/libsignal-ffi-0.51.0-r1.ebuild
@@ -26,7 +26,7 @@ KEYWORDS="~amd64"
 
 BDEPEND="
 	dev-libs/protobuf
-	$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}')
+	$(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}')
 "
 
 pkg_setup() {
diff --git a/dev-libs/libsignal-ffi/libsignal-ffi-0.62.0.ebuild b/dev-libs/libsignal-ffi/libsignal-ffi-0.62.0.ebuild
index f189a660cf..d0f55f3239 100644
--- a/dev-libs/libsignal-ffi/libsignal-ffi-0.62.0.ebuild
+++ b/dev-libs/libsignal-ffi/libsignal-ffi-0.62.0.ebuild
@@ -26,7 +26,7 @@ KEYWORDS="~amd64"
 
 BDEPEND="
 	dev-libs/protobuf
-	$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}')
+	$(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}')
 "
 
 pkg_setup() {
diff --git a/dev-python/pyperscan/pyperscan-0.3.0.ebuild b/dev-python/pyperscan/pyperscan-0.3.0.ebuild
index 48edc32be9..f2f68592cc 100644
--- a/dev-python/pyperscan/pyperscan-0.3.0.ebuild
+++ b/dev-python/pyperscan/pyperscan-0.3.0.ebuild
@@ -107,7 +107,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/vectorscan:=
-	sys-devel/clang
+	llvm-core/clang
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-ruby/ruby-install/ruby-install-0.9.3.ebuild b/dev-ruby/ruby-install/ruby-install-0.9.3.ebuild
index 27cb8a5e4c..319efe0595 100644
--- a/dev-ruby/ruby-install/ruby-install-0.9.3.ebuild
+++ b/dev-ruby/ruby-install/ruby-install-0.9.3.ebuild
@@ -24,7 +24,7 @@ RDEPEND="${DEPEND}
 	app-arch/bzip2
 	app-arch/xz-utils
 	sys-devel/patch
-	|| ( >=sys-devel/gcc-4.2 sys-devel/clang )"
+	|| ( >=sys-devel/gcc-4.2 llvm-core/clang )"
 BDEPEND="test? ( dev-util/shunit2 )"
 
 # BUG: `make check` fails: https://github.com/postmodern/ruby-install/issues/442
diff --git a/games-engines/fs2_open/fs2_open-24.0.2-r1.ebuild b/games-engines/fs2_open/fs2_open-24.0.2-r1.ebuild
index db40c7ea8f..66a24ce09b 100644
--- a/games-engines/fs2_open/fs2_open-24.0.2-r1.ebuild
+++ b/games-engines/fs2_open/fs2_open-24.0.2-r1.ebuild
@@ -47,7 +47,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
-	clang? ( sys-devel/clang )
+	clang? ( llvm-core/clang )
 "
 PATCHES=(
 	"${FILESDIR}/${P}-deps-fix.patch"
diff --git a/gui-apps/xwayland-satellite/xwayland-satellite-0.5-r1.ebuild b/gui-apps/xwayland-satellite/xwayland-satellite-0.5-r1.ebuild
index 4ae7c14a42..56fb7818d6 100644
--- a/gui-apps/xwayland-satellite/xwayland-satellite-0.5-r1.ebuild
+++ b/gui-apps/xwayland-satellite/xwayland-satellite-0.5-r1.ebuild
@@ -129,7 +129,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
-	$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=')
+	$(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}=')
 "
 
 QA_FLAGS_IGNORED="usr/bin/${PN}"
diff --git a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.3-r3.ebuild b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.3-r3.ebuild
index 491f19d0c4..b1323e92b8 100644
--- a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.3-r3.ebuild
+++ b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.3-r3.ebuild
@@ -49,7 +49,7 @@ BDEPEND="
 	>=dev-libs/wayland-protocols-1.24
 	dev-libs/hyprland-protocols
 	virtual/pkgconfig
-	|| ( >=sys-devel/gcc-13:* >=sys-devel/clang-17:* )
+	|| ( >=sys-devel/gcc-13:* >=llvm-core/clang-17:* )
 "
 
 pkg_setup() {
@@ -61,7 +61,7 @@ pkg_setup() {
 		die "GCC version is too old to compile XDPH!"
 	elif tc-is-clang && ver_test $(clang-version) -lt 17 ; then
 		eerror "XDPH needs >=gcc-13 or >=clang-17 to compile."
-		eerror "Please upgrade Clang: emerge -v1 sys-devel/clang"
+		eerror "Please upgrade Clang: emerge -v1 llvm-core/clang"
 		die "Clang version is too old to compile XDPH!"
 	fi
 }
diff --git a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.8.ebuild b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.8.ebuild
index 1abdc90305..720fc9be60 100644
--- a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.8.ebuild
+++ b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.8.ebuild
@@ -49,7 +49,7 @@ BDEPEND="
 	>=dev-util/hyprwayland-scanner-0.4.2
 	dev-libs/hyprland-protocols
 	virtual/pkgconfig
-	|| ( >=sys-devel/gcc-13:* >=sys-devel/clang-17:* )
+	|| ( >=sys-devel/gcc-13:* >=llvm-core/clang-17:* )
 "
 
 pkg_setup() {
@@ -61,7 +61,7 @@ pkg_setup() {
 		die "GCC version is too old to compile XDPH!"
 	elif tc-is-clang && ver_test $(clang-version) -lt 17 ; then
 		eerror "XDPH needs >=gcc-13 or >=clang-17 to compile."
-		eerror "Please upgrade Clang: emerge -v1 sys-devel/clang"
+		eerror "Please upgrade Clang: emerge -v1 llvm-core/clang"
 		die "Clang version is too old to compile XDPH!"
 	fi
 }
diff --git a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
index 1abdc90305..720fc9be60 100644
--- a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
+++ b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
@@ -49,7 +49,7 @@ BDEPEND="
 	>=dev-util/hyprwayland-scanner-0.4.2
 	dev-libs/hyprland-protocols
 	virtual/pkgconfig
-	|| ( >=sys-devel/gcc-13:* >=sys-devel/clang-17:* )
+	|| ( >=sys-devel/gcc-13:* >=llvm-core/clang-17:* )
 "
 
 pkg_setup() {
@@ -61,7 +61,7 @@ pkg_setup() {
 		die "GCC version is too old to compile XDPH!"
 	elif tc-is-clang && ver_test $(clang-version) -lt 17 ; then
 		eerror "XDPH needs >=gcc-13 or >=clang-17 to compile."
-		eerror "Please upgrade Clang: emerge -v1 sys-devel/clang"
+		eerror "Please upgrade Clang: emerge -v1 llvm-core/clang"
 		die "Clang version is too old to compile XDPH!"
 	fi
 }
diff --git a/gui-wm/niri/niri-0.1.10.1.ebuild b/gui-wm/niri/niri-0.1.10.1.ebuild
index 9c56000ad3..8cc24b425f 100644
--- a/gui-wm/niri/niri-0.1.10.1.ebuild
+++ b/gui-wm/niri/niri-0.1.10.1.ebuild
@@ -48,7 +48,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 # Clang is required for bindgen
 BDEPEND="
-	screencast? ( $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}') )
+	screencast? ( $(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}') )
 "
 
 ECARGO_VENDOR="${WORKDIR}/vendor"
diff --git a/gui-wm/niri/niri-0.1.9-r1.ebuild b/gui-wm/niri/niri-0.1.9-r1.ebuild
index b9adbab1ed..a49ec20847 100644
--- a/gui-wm/niri/niri-0.1.9-r1.ebuild
+++ b/gui-wm/niri/niri-0.1.9-r1.ebuild
@@ -48,7 +48,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 # Clang is required for bindgen
 BDEPEND="
-	screencast? ( $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}') )
+	screencast? ( $(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}') )
 "
 
 ECARGO_VENDOR="${WORKDIR}/vendor"
diff --git a/media-gfx/qview/qview-5.0.ebuild b/media-gfx/qview/qview-5.0.ebuild
index efaa87c582..ea83b7b1fa 100644
--- a/media-gfx/qview/qview-5.0.ebuild
+++ b/media-gfx/qview/qview-5.0.ebuild
@@ -35,7 +35,7 @@ BDEPEND="
 
 src_configure() {
 	# https://github.com/jurplel/qView/issues/395
-	if tc-is-clang && has_version "sys-devel/clang:$(clang-major-version)[default-libcxx]" || is-flagq -stdlib=libc++
+	if tc-is-clang && has_version "llvm-core/clang:$(clang-major-version)[default-libcxx]" || is-flagq -stdlib=libc++
 	then
 		append-cxxflags -stdlib=libstdc++
 		append-ldflags -stdlib=libstdc++
diff --git a/media-video/wl-screenrec/wl-screenrec-0.1.6-r2.ebuild b/media-video/wl-screenrec/wl-screenrec-0.1.6-r2.ebuild
index 74da5b8ad6..79494a29e8 100644
--- a/media-video/wl-screenrec/wl-screenrec-0.1.6-r2.ebuild
+++ b/media-video/wl-screenrec/wl-screenrec-0.1.6-r2.ebuild
@@ -130,7 +130,7 @@ RESTRICT="test"
 
 BDEPEND="
 	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
+		llvm-core/clang:${LLVM_SLOT}
 	')
 "
 RDEPEND="
diff --git a/net-im/conduit/conduit-0.8.0-r1.ebuild b/net-im/conduit/conduit-0.8.0-r1.ebuild
index f3f419b330..20c771af03 100644
--- a/net-im/conduit/conduit-0.8.0-r1.ebuild
+++ b/net-im/conduit/conduit-0.8.0-r1.ebuild
@@ -444,7 +444,7 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="
 	rocksdb? (
-		sys-devel/clang
+		llvm-core/clang
 		virtual/pkgconfig
 	)
 "
diff --git a/net-im/conduit/conduit-0.9.0-r1.ebuild b/net-im/conduit/conduit-0.9.0-r1.ebuild
index 448faa0f9c..8f3ceb4b99 100644
--- a/net-im/conduit/conduit-0.9.0-r1.ebuild
+++ b/net-im/conduit/conduit-0.9.0-r1.ebuild
@@ -444,7 +444,7 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="
 	rocksdb? (
-		sys-devel/clang
+		llvm-core/clang
 		virtual/pkgconfig
 	)
 "
diff --git a/net-im/conduit/conduit-9999.ebuild b/net-im/conduit/conduit-9999.ebuild
index 39d63198d5..4027c69ded 100644
--- a/net-im/conduit/conduit-9999.ebuild
+++ b/net-im/conduit/conduit-9999.ebuild
@@ -55,7 +55,7 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="
 	rocksdb? (
-		sys-devel/clang
+		llvm-core/clang
 		virtual/pkgconfig
 	)
 "
diff --git a/sci-electronics/yosys/yosys-0.40-r1.ebuild b/sci-electronics/yosys/yosys-0.40-r1.ebuild
index 84ce65fb79..14db1186ae 100644
--- a/sci-electronics/yosys/yosys-0.40-r1.ebuild
+++ b/sci-electronics/yosys/yosys-0.40-r1.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64"
 RDEPEND="
 	dev-libs/boost
 	media-gfx/xdot
-	sys-devel/clang
+	llvm-core/clang
 "
 
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/bat-extras/bat-extras-2023.09.19-r2.ebuild b/sys-apps/bat-extras/bat-extras-2023.09.19-r2.ebuild
index 4fb76f0f25..1e42f6a543 100644
--- a/sys-apps/bat-extras/bat-extras-2023.09.19-r2.ebuild
+++ b/sys-apps/bat-extras/bat-extras-2023.09.19-r2.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	dev-vcs/git
 	sys-apps/eza
 	sys-apps/ripgrep
-	sys-devel/clang[extra(+)]
+	llvm-core/clang[extra(+)]
 	sys-libs/ncurses
 "
 
diff --git a/sys-apps/bat-extras/bat-extras-9999.ebuild b/sys-apps/bat-extras/bat-extras-9999.ebuild
index 4fb76f0f25..1e42f6a543 100644
--- a/sys-apps/bat-extras/bat-extras-9999.ebuild
+++ b/sys-apps/bat-extras/bat-extras-9999.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	dev-vcs/git
 	sys-apps/eza
 	sys-apps/ripgrep
-	sys-devel/clang[extra(+)]
+	llvm-core/clang[extra(+)]
 	sys-libs/ncurses
 "
 
diff --git a/sys-auth/hyprpolkitagent/hyprpolkitagent-0.1.1-r1.ebuild b/sys-auth/hyprpolkitagent/hyprpolkitagent-0.1.1-r1.ebuild
index 03c4465770..0a04da60ac 100644
--- a/sys-auth/hyprpolkitagent/hyprpolkitagent-0.1.1-r1.ebuild
+++ b/sys-auth/hyprpolkitagent/hyprpolkitagent-0.1.1-r1.ebuild
@@ -38,8 +38,8 @@ kg_setup() {
 		eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
 		die "GCC version is too old to compile Hyprland!"
 	elif tc-is-clang && ver_test $(clang-version) -lt 18 ; then
-		eerror "Hyprpolkitagent requires >=sys-devel/clang-18 to build"
-		eerror "Please upgrade Clang: emerge -v1 sys-devel/clang"
+		eerror "Hyprpolkitagent requires >=llvm-core/clang-18 to build"
+		eerror "Please upgrade Clang: emerge -v1 llvm-core/clang"
 		die "Clang version is too old to compile Hyprland!"
 	fi
 }
diff --git a/sys-boot/limine/limine-7.0.0.ebuild b/sys-boot/limine/limine-7.0.0.ebuild
index 73ea272148..6e2890cb72 100644
--- a/sys-boot/limine/limine-7.0.0.ebuild
+++ b/sys-boot/limine/limine-7.0.0.ebuild
@@ -19,7 +19,7 @@ BDEPEND="
 	app-alternatives/gzip
 	dev-lang/nasm
 	sys-apps/findutils
-	sys-devel/clang[${MY_LLVM_FLAGS}]
+	llvm-core/clang[${MY_LLVM_FLAGS}]
 	sys-devel/lld
 	sys-devel/llvm[${MY_LLVM_FLAGS}]
 
diff --git a/sys-boot/limine/limine-7.0.3.ebuild b/sys-boot/limine/limine-7.0.3.ebuild
index 73ea272148..6e2890cb72 100644
--- a/sys-boot/limine/limine-7.0.3.ebuild
+++ b/sys-boot/limine/limine-7.0.3.ebuild
@@ -19,7 +19,7 @@ BDEPEND="
 	app-alternatives/gzip
 	dev-lang/nasm
 	sys-apps/findutils
-	sys-devel/clang[${MY_LLVM_FLAGS}]
+	llvm-core/clang[${MY_LLVM_FLAGS}]
 	sys-devel/lld
 	sys-devel/llvm[${MY_LLVM_FLAGS}]
 
diff --git a/sys-boot/limine/limine-7.0.5.ebuild b/sys-boot/limine/limine-7.0.5.ebuild
index 73ea272148..6e2890cb72 100644
--- a/sys-boot/limine/limine-7.0.5.ebuild
+++ b/sys-boot/limine/limine-7.0.5.ebuild
@@ -19,7 +19,7 @@ BDEPEND="
 	app-alternatives/gzip
 	dev-lang/nasm
 	sys-apps/findutils
-	sys-devel/clang[${MY_LLVM_FLAGS}]
+	llvm-core/clang[${MY_LLVM_FLAGS}]
 	sys-devel/lld
 	sys-devel/llvm[${MY_LLVM_FLAGS}]
 
diff --git a/sys-boot/limine/limine-7.3.0.ebuild b/sys-boot/limine/limine-7.3.0.ebuild
index b2a359cdc0..4b619c10f0 100644
--- a/sys-boot/limine/limine-7.3.0.ebuild
+++ b/sys-boot/limine/limine-7.3.0.ebuild
@@ -19,7 +19,7 @@ BDEPEND="
 	app-alternatives/gzip
 	dev-lang/nasm
 	sys-apps/findutils
-	sys-devel/clang[${MY_LLVM_FLAGS}]
+	llvm-core/clang[${MY_LLVM_FLAGS}]
 	sys-devel/lld
 	sys-devel/llvm[${MY_LLVM_FLAGS}]
 
diff --git a/sys-boot/limine/limine-7.5.0.ebuild b/sys-boot/limine/limine-7.5.0.ebuild
index b2a359cdc0..4b619c10f0 100644
--- a/sys-boot/limine/limine-7.5.0.ebuild
+++ b/sys-boot/limine/limine-7.5.0.ebuild
@@ -19,7 +19,7 @@ BDEPEND="
 	app-alternatives/gzip
 	dev-lang/nasm
 	sys-apps/findutils
-	sys-devel/clang[${MY_LLVM_FLAGS}]
+	llvm-core/clang[${MY_LLVM_FLAGS}]
 	sys-devel/lld
 	sys-devel/llvm[${MY_LLVM_FLAGS}]
 
diff --git a/sys-boot/limine/limine-7.9.2.ebuild b/sys-boot/limine/limine-7.9.2.ebuild
index b2a359cdc0..4b619c10f0 100644
--- a/sys-boot/limine/limine-7.9.2.ebuild
+++ b/sys-boot/limine/limine-7.9.2.ebuild
@@ -19,7 +19,7 @@ BDEPEND="
 	app-alternatives/gzip
 	dev-lang/nasm
 	sys-apps/findutils
-	sys-devel/clang[${MY_LLVM_FLAGS}]
+	llvm-core/clang[${MY_LLVM_FLAGS}]
 	sys-devel/lld
 	sys-devel/llvm[${MY_LLVM_FLAGS}]
 
diff --git a/sys-boot/limine/limine-8.0.11.ebuild b/sys-boot/limine/limine-8.0.11.ebuild
index 8f7c11f6ae..3e244bbf5c 100644
--- a/sys-boot/limine/limine-8.0.11.ebuild
+++ b/sys-boot/limine/limine-8.0.11.ebuild
@@ -24,7 +24,7 @@ BDEPEND="
 	sys-apps/findutils
 	$(llvm_gen_dep "
 		sys-devel/llvm:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
-		sys-devel/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
+		llvm-core/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
 		sys-devel/lld:\${LLVM_SLOT}
 	")
 	cd-efi? ( sys-fs/mtools )
diff --git a/sys-boot/limine/limine-8.0.12.ebuild b/sys-boot/limine/limine-8.0.12.ebuild
index 8f7c11f6ae..3e244bbf5c 100644
--- a/sys-boot/limine/limine-8.0.12.ebuild
+++ b/sys-boot/limine/limine-8.0.12.ebuild
@@ -24,7 +24,7 @@ BDEPEND="
 	sys-apps/findutils
 	$(llvm_gen_dep "
 		sys-devel/llvm:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
-		sys-devel/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
+		llvm-core/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
 		sys-devel/lld:\${LLVM_SLOT}
 	")
 	cd-efi? ( sys-fs/mtools )
diff --git a/sys-boot/limine/limine-8.0.13.ebuild b/sys-boot/limine/limine-8.0.13.ebuild
index 8f7c11f6ae..3e244bbf5c 100644
--- a/sys-boot/limine/limine-8.0.13.ebuild
+++ b/sys-boot/limine/limine-8.0.13.ebuild
@@ -24,7 +24,7 @@ BDEPEND="
 	sys-apps/findutils
 	$(llvm_gen_dep "
 		sys-devel/llvm:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
-		sys-devel/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
+		llvm-core/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
 		sys-devel/lld:\${LLVM_SLOT}
 	")
 	cd-efi? ( sys-fs/mtools )
diff --git a/sys-boot/limine/limine-8.0.14.ebuild b/sys-boot/limine/limine-8.0.14.ebuild
index 8f7c11f6ae..3e244bbf5c 100644
--- a/sys-boot/limine/limine-8.0.14.ebuild
+++ b/sys-boot/limine/limine-8.0.14.ebuild
@@ -24,7 +24,7 @@ BDEPEND="
 	sys-apps/findutils
 	$(llvm_gen_dep "
 		sys-devel/llvm:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
-		sys-devel/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
+		llvm-core/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
 		sys-devel/lld:\${LLVM_SLOT}
 	")
 	cd-efi? ( sys-fs/mtools )
diff --git a/sys-boot/limine/limine-8.0.5.ebuild b/sys-boot/limine/limine-8.0.5.ebuild
index 4758f4e64b..08c977e254 100644
--- a/sys-boot/limine/limine-8.0.5.ebuild
+++ b/sys-boot/limine/limine-8.0.5.ebuild
@@ -19,7 +19,7 @@ BDEPEND="
 	app-alternatives/gzip
 	dev-lang/nasm
 	sys-apps/findutils
-	sys-devel/clang[${MY_LLVM_FLAGS}]
+	llvm-core/clang[${MY_LLVM_FLAGS}]
 	sys-devel/lld
 	sys-devel/llvm[${MY_LLVM_FLAGS}]
 
diff --git a/sys-boot/limine/limine-8.0.6.ebuild b/sys-boot/limine/limine-8.0.6.ebuild
index 8f7c11f6ae..3e244bbf5c 100644
--- a/sys-boot/limine/limine-8.0.6.ebuild
+++ b/sys-boot/limine/limine-8.0.6.ebuild
@@ -24,7 +24,7 @@ BDEPEND="
 	sys-apps/findutils
 	$(llvm_gen_dep "
 		sys-devel/llvm:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
-		sys-devel/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
+		llvm-core/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
 		sys-devel/lld:\${LLVM_SLOT}
 	")
 	cd-efi? ( sys-fs/mtools )
diff --git a/sys-boot/limine/limine-8.0.7.ebuild b/sys-boot/limine/limine-8.0.7.ebuild
index 8f7c11f6ae..3e244bbf5c 100644
--- a/sys-boot/limine/limine-8.0.7.ebuild
+++ b/sys-boot/limine/limine-8.0.7.ebuild
@@ -24,7 +24,7 @@ BDEPEND="
 	sys-apps/findutils
 	$(llvm_gen_dep "
 		sys-devel/llvm:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
-		sys-devel/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
+		llvm-core/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
 		sys-devel/lld:\${LLVM_SLOT}
 	")
 	cd-efi? ( sys-fs/mtools )
diff --git a/sys-boot/limine/limine-8.0.9.ebuild b/sys-boot/limine/limine-8.0.9.ebuild
index 8f7c11f6ae..3e244bbf5c 100644
--- a/sys-boot/limine/limine-8.0.9.ebuild
+++ b/sys-boot/limine/limine-8.0.9.ebuild
@@ -24,7 +24,7 @@ BDEPEND="
 	sys-apps/findutils
 	$(llvm_gen_dep "
 		sys-devel/llvm:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
-		sys-devel/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
+		llvm-core/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
 		sys-devel/lld:\${LLVM_SLOT}
 	")
 	cd-efi? ( sys-fs/mtools )
diff --git a/sys-boot/limine/limine-8.1.1.ebuild b/sys-boot/limine/limine-8.1.1.ebuild
index 8f7c11f6ae..3e244bbf5c 100644
--- a/sys-boot/limine/limine-8.1.1.ebuild
+++ b/sys-boot/limine/limine-8.1.1.ebuild
@@ -24,7 +24,7 @@ BDEPEND="
 	sys-apps/findutils
 	$(llvm_gen_dep "
 		sys-devel/llvm:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
-		sys-devel/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
+		llvm-core/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
 		sys-devel/lld:\${LLVM_SLOT}
 	")
 	cd-efi? ( sys-fs/mtools )
diff --git a/sys-boot/limine/limine-8.1.2.ebuild b/sys-boot/limine/limine-8.1.2.ebuild
index 8f7c11f6ae..3e244bbf5c 100644
--- a/sys-boot/limine/limine-8.1.2.ebuild
+++ b/sys-boot/limine/limine-8.1.2.ebuild
@@ -24,7 +24,7 @@ BDEPEND="
 	sys-apps/findutils
 	$(llvm_gen_dep "
 		sys-devel/llvm:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
-		sys-devel/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
+		llvm-core/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
 		sys-devel/lld:\${LLVM_SLOT}
 	")
 	cd-efi? ( sys-fs/mtools )
diff --git a/sys-boot/limine/limine-8.3.2.ebuild b/sys-boot/limine/limine-8.3.2.ebuild
index 8f7c11f6ae..3e244bbf5c 100644
--- a/sys-boot/limine/limine-8.3.2.ebuild
+++ b/sys-boot/limine/limine-8.3.2.ebuild
@@ -24,7 +24,7 @@ BDEPEND="
 	sys-apps/findutils
 	$(llvm_gen_dep "
 		sys-devel/llvm:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
-		sys-devel/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
+		llvm-core/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
 		sys-devel/lld:\${LLVM_SLOT}
 	")
 	cd-efi? ( sys-fs/mtools )
diff --git a/sys-boot/limine/limine-8.4.0.ebuild b/sys-boot/limine/limine-8.4.0.ebuild
index 8f7c11f6ae..3e244bbf5c 100644
--- a/sys-boot/limine/limine-8.4.0.ebuild
+++ b/sys-boot/limine/limine-8.4.0.ebuild
@@ -24,7 +24,7 @@ BDEPEND="
 	sys-apps/findutils
 	$(llvm_gen_dep "
 		sys-devel/llvm:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
-		sys-devel/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
+		llvm-core/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
 		sys-devel/lld:\${LLVM_SLOT}
 	")
 	cd-efi? ( sys-fs/mtools )
diff --git a/sys-boot/limine/limine-8.5.0.ebuild b/sys-boot/limine/limine-8.5.0.ebuild
index 8f7c11f6ae..3e244bbf5c 100644
--- a/sys-boot/limine/limine-8.5.0.ebuild
+++ b/sys-boot/limine/limine-8.5.0.ebuild
@@ -24,7 +24,7 @@ BDEPEND="
 	sys-apps/findutils
 	$(llvm_gen_dep "
 		sys-devel/llvm:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
-		sys-devel/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
+		llvm-core/clang:\${LLVM_SLOT}[${MY_LLVM_FLAGS}]
 		sys-devel/lld:\${LLVM_SLOT}
 	")
 	cd-efi? ( sys-fs/mtools )
diff --git a/www-plugins/firefoxpwa/firefoxpwa-2.12.4.ebuild b/www-plugins/firefoxpwa/firefoxpwa-2.12.4.ebuild
index c96a6fb952..059c748985 100644
--- a/www-plugins/firefoxpwa/firefoxpwa-2.12.4.ebuild
+++ b/www-plugins/firefoxpwa/firefoxpwa-2.12.4.ebuild
@@ -429,7 +429,7 @@ RDEPEND="${DEPEND}"
 BDEPEND="
 	lto? (
 		!custom-cflags? (
-			sys-devel/clang
+			llvm-core/clang
 			sys-devel/lld
 		)
 	)
diff --git a/www-plugins/firefoxpwa/firefoxpwa-2.12.5.ebuild b/www-plugins/firefoxpwa/firefoxpwa-2.12.5.ebuild
index c96a6fb952..059c748985 100644
--- a/www-plugins/firefoxpwa/firefoxpwa-2.12.5.ebuild
+++ b/www-plugins/firefoxpwa/firefoxpwa-2.12.5.ebuild
@@ -429,7 +429,7 @@ RDEPEND="${DEPEND}"
 BDEPEND="
 	lto? (
 		!custom-cflags? (
-			sys-devel/clang
+			llvm-core/clang
 			sys-devel/lld
 		)
 	)
diff --git a/www-plugins/firefoxpwa/firefoxpwa-2.13.1.ebuild b/www-plugins/firefoxpwa/firefoxpwa-2.13.1.ebuild
index c96a6fb952..059c748985 100644
--- a/www-plugins/firefoxpwa/firefoxpwa-2.13.1.ebuild
+++ b/www-plugins/firefoxpwa/firefoxpwa-2.13.1.ebuild
@@ -429,7 +429,7 @@ RDEPEND="${DEPEND}"
 BDEPEND="
 	lto? (
 		!custom-cflags? (
-			sys-devel/clang
+			llvm-core/clang
 			sys-devel/lld
 		)
 	)
diff --git a/x11-misc/i3status-rust/i3status-rust-0.33.1-r1.ebuild b/x11-misc/i3status-rust/i3status-rust-0.33.1-r1.ebuild
index 6e00995fc5..543011113d 100644
--- a/x11-misc/i3status-rust/i3status-rust-0.33.1-r1.ebuild
+++ b/x11-misc/i3status-rust/i3status-rust-0.33.1-r1.ebuild
@@ -404,7 +404,7 @@ DEPEND="dev-libs/openssl:=
 RDEPEND="${DEPEND}"
 BDEPEND="
 	virtual/pkgconfig
-	pipewire? ( sys-devel/clang )
+	pipewire? ( llvm-core/clang )
 "
 
 PATCHES="${FILESDIR}"/gitless-hash-and-date.patch