diff --git a/app-admin/opensnitch-ebpf-module/opensnitch-ebpf-module-1.6.5.1.ebuild b/app-admin/opensnitch-ebpf-module/opensnitch-ebpf-module-1.6.5.1.ebuild
index bda801b41..ff0799863 100644
--- a/app-admin/opensnitch-ebpf-module/opensnitch-ebpf-module-1.6.5.1.ebuild
+++ b/app-admin/opensnitch-ebpf-module/opensnitch-ebpf-module-1.6.5.1.ebuild
@@ -33,8 +33,8 @@ DEPEND="
 
 BDEPEND="
 	sys-devel/bc
-	sys-devel/clang
-	sys-devel/llvm
+	llvm-core/clang
+	llvm-core/llvm
 "
 
 RESTRICT="strip test"
diff --git a/app-admin/opensnitch-ebpf-module/opensnitch-ebpf-module-1.6.6.ebuild b/app-admin/opensnitch-ebpf-module/opensnitch-ebpf-module-1.6.6.ebuild
index 53e4514f1..6473e0ead 100644
--- a/app-admin/opensnitch-ebpf-module/opensnitch-ebpf-module-1.6.6.ebuild
+++ b/app-admin/opensnitch-ebpf-module/opensnitch-ebpf-module-1.6.6.ebuild
@@ -33,8 +33,8 @@ DEPEND="
 
 BDEPEND="
 	sys-devel/bc
-	sys-devel/clang
-	sys-devel/llvm
+	llvm-core/clang
+	llvm-core/llvm
 "
 
 RESTRICT="strip test"
diff --git a/dev-python/pyinstaller/pyinstaller-3.6-r1.ebuild b/dev-python/pyinstaller/pyinstaller-3.6-r1.ebuild
index db51de85d..e69085fd6 100644
--- a/dev-python/pyinstaller/pyinstaller-3.6-r1.ebuild
+++ b/dev-python/pyinstaller/pyinstaller-3.6-r1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-python/pefile-2018.08.08[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	leak-detector? ( dev-libs/boehm-gc )
-	clang? ( sys-devel/clang )
+	clang? ( llvm-core/clang )
 	!clang? ( sys-devel/gcc )"
 
 src_install() {
diff --git a/dev-python/pyinstaller/pyinstaller-6.2.0.ebuild b/dev-python/pyinstaller/pyinstaller-6.2.0.ebuild
index 0cdb0f757..421302936 100644
--- a/dev-python/pyinstaller/pyinstaller-6.2.0.ebuild
+++ b/dev-python/pyinstaller/pyinstaller-6.2.0.ebuild
@@ -44,7 +44,7 @@ RDEPEND="${PYTHON_DEPS}
 "
 DEPEND="${RDEPEND}
 	leak-detector? ( dev-libs/boehm-gc )
-	clang? ( sys-devel/clang )
+	clang? ( llvm-core/clang )
 	!clang? ( sys-devel/gcc )"
 
 src_install() {
diff --git a/pentoo/pentoo-mobile/pentoo-mobile-2024.3.ebuild b/pentoo/pentoo-mobile/pentoo-mobile-2024.3.ebuild
index 1f7d0a151..8304d7f5c 100644
--- a/pentoo/pentoo-mobile/pentoo-mobile-2024.3.ebuild
+++ b/pentoo/pentoo-mobile/pentoo-mobile-2024.3.ebuild
@@ -36,5 +36,5 @@ PDEPEND="dev-util/frida-tools
 		app-pda/ideviceinstaller
 		app-pda/ifuse
 		app-pda/usbmuxd
-		pentoo-full? ( sys-devel/clang )
+		pentoo-full? ( llvm-core/clang )
 	)"
diff --git a/sys-devel/autofdo/autofdo-0.18.ebuild b/sys-devel/autofdo/autofdo-0.18.ebuild
index 52ba26814..d27e09484 100644
--- a/sys-devel/autofdo/autofdo-0.18.ebuild
+++ b/sys-devel/autofdo/autofdo-0.18.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND=">=sys-devel/llvm-5.0.1:*
+DEPEND=">=llvm-core/llvm-5.0.1:*
 	sys-devel/gcc:*"
 
 RDEPEND="${DEPEND}"
diff --git a/sys-devel/autofdo/autofdo-0.19.ebuild b/sys-devel/autofdo/autofdo-0.19.ebuild
index 751041501..fe1f2ec72 100644
--- a/sys-devel/autofdo/autofdo-0.19.ebuild
+++ b/sys-devel/autofdo/autofdo-0.19.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 #KEYWORDS="~amd64 ~x86"
 
-DEPEND=">=sys-devel/llvm-5.0.1:*
+DEPEND=">=llvm-core/llvm-5.0.1:*
 	sys-devel/gcc:*"
 
 RDEPEND="${DEPEND}"
diff --git a/sys-devel/autofdo/autofdo-9999.ebuild b/sys-devel/autofdo/autofdo-9999.ebuild
index bdb03cd72..ad2207e25 100644
--- a/sys-devel/autofdo/autofdo-9999.ebuild
+++ b/sys-devel/autofdo/autofdo-9999.ebuild
@@ -14,7 +14,7 @@ EGIT_BRANCH="fixissue55try3"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-DEPEND=">=sys-devel/llvm-5.0.1:*
+DEPEND=">=llvm-core/llvm-5.0.1:*
 	sys-devel/gcc:*"
 
 RDEPEND="${DEPEND}"