Move {sys-libs → llvm-runtimes}/compiler-rt-sanitizers

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

52 files changed, 87 insertions, 86 deletions

diff --git a/app-forensics/aflplusplus/aflplusplus-4.21c.ebuild b/app-forensics/aflplusplus/aflplusplus-4.21c.ebuild
index 485eea325dfc..b9d7c3828eb7 100644
--- a/app-forensics/aflplusplus/aflplusplus-4.21c.ebuild
+++ b/app-forensics/aflplusplus/aflplusplus-4.21c.ebuild
@@ -89,6 +89,6 @@ src_install() {
 
 pkg_postinst() {
 	# TODO: Any others?
-	optfeature "fuzzing with AFL_USE_ASAN" sys-libs/compiler-rt-sanitizers[asan]
-	optfeature "fuzzing with AFL_USE_MSAN" sys-libs/compiler-rt-sanitizers[msan]
+	optfeature "fuzzing with AFL_USE_ASAN" llvm-runtimes/compiler-rt-sanitizers[asan]
+	optfeature "fuzzing with AFL_USE_MSAN" llvm-runtimes/compiler-rt-sanitizers[msan]
 }
diff --git a/app-forensics/aflplusplus/aflplusplus-4.30c.ebuild b/app-forensics/aflplusplus/aflplusplus-4.30c.ebuild
index a5990707e905..a53f138b9edc 100644
--- a/app-forensics/aflplusplus/aflplusplus-4.30c.ebuild
+++ b/app-forensics/aflplusplus/aflplusplus-4.30c.ebuild
@@ -92,6 +92,6 @@ src_install() {
 
 pkg_postinst() {
 	# TODO: Any others?
-	optfeature "fuzzing with AFL_USE_ASAN" sys-libs/compiler-rt-sanitizers[asan]
-	optfeature "fuzzing with AFL_USE_MSAN" sys-libs/compiler-rt-sanitizers[msan]
+	optfeature "fuzzing with AFL_USE_ASAN" llvm-runtimes/compiler-rt-sanitizers[asan]
+	optfeature "fuzzing with AFL_USE_MSAN" llvm-runtimes/compiler-rt-sanitizers[msan]
 }
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/llvm-runtimes/compiler-rt-sanitizers/Manifest
index 382faaff82df..382faaff82df 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/llvm-runtimes/compiler-rt-sanitizers/Manifest
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.7-r1.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.7-r1.ebuild
index afbab6009ce0..afbab6009ce0 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.7-r1.ebuild
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.7-r1.ebuild
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.6-r1.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.6-r1.ebuild
index 4affd9601cf0..4affd9601cf0 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.6-r1.ebuild
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.6-r1.ebuild
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.6-r1.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.6-r1.ebuild
index 8767e5c33010..8767e5c33010 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.6-r1.ebuild
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.6-r1.ebuild
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.8-r1.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.8-r1.ebuild
index efe21bdc59fd..efe21bdc59fd 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.8-r1.ebuild
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.8-r1.ebuild
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.8-r6.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.8-r6.ebuild
index fcff09fb2e3f..fcff09fb2e3f 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.8-r6.ebuild
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.8-r6.ebuild
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.4.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.4.ebuild
index 3d8d627e816b..3d8d627e816b 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.4.ebuild
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.4.ebuild
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.5.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.5.ebuild
index 24dcc0582eda..24dcc0582eda 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.5.ebuild
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.5.ebuild
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0.9999.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0.9999.ebuild
index 59a64398c9bc..59a64398c9bc 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0.9999.ebuild
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0.9999.ebuild
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20241207.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20241207.ebuild
index 59a64398c9bc..59a64398c9bc 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20241207.ebuild
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20241207.ebuild
diff --git a/sys-libs/compiler-rt-sanitizers/metadata.xml b/llvm-runtimes/compiler-rt-sanitizers/metadata.xml
index fcbc16ad14a3..fcbc16ad14a3 100644
--- a/sys-libs/compiler-rt-sanitizers/metadata.xml
+++ b/llvm-runtimes/compiler-rt-sanitizers/metadata.xml
diff --git a/mail-client/thunderbird/thunderbird-128.5.0.ebuild b/mail-client/thunderbird/thunderbird-128.5.0.ebuild
index 134c401b3065..95959e978ff3 100644
--- a/mail-client/thunderbird/thunderbird-128.5.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-128.5.0.ebuild
@@ -88,7 +88,7 @@ BDEPEND="${PYTHON_DEPS}
 		sys-devel/llvm:${LLVM_SLOT}
 		clang? (
 			sys-devel/lld:${LLVM_SLOT}
-			pgo? ( sys-libs/compiler-rt-sanitizers:${LLVM_SLOT}[profile] )
+			pgo? ( llvm-runtimes/compiler-rt-sanitizers:${LLVM_SLOT}[profile] )
 		)
 	')
 	app-alternatives/awk
@@ -204,8 +204,8 @@ llvm_check_deps() {
 	fi
 
 	if use pgo ; then
-		if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
-			einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" >&2
+		if ! has_version -b "=llvm-runtimes/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
+			einfo "=llvm-runtimes/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" >&2
 			einfo "Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
 			return 1
 		fi
diff --git a/mail-client/thunderbird/thunderbird-128.5.1.ebuild b/mail-client/thunderbird/thunderbird-128.5.1.ebuild
index eae1a0d31725..da132e02cf41 100644
--- a/mail-client/thunderbird/thunderbird-128.5.1.ebuild
+++ b/mail-client/thunderbird/thunderbird-128.5.1.ebuild
@@ -88,7 +88,7 @@ BDEPEND="${PYTHON_DEPS}
 		sys-devel/llvm:${LLVM_SLOT}
 		clang? (
 			sys-devel/lld:${LLVM_SLOT}
-			pgo? ( sys-libs/compiler-rt-sanitizers:${LLVM_SLOT}[profile] )
+			pgo? ( llvm-runtimes/compiler-rt-sanitizers:${LLVM_SLOT}[profile] )
 		)
 	')
 	app-alternatives/awk
@@ -204,8 +204,8 @@ llvm_check_deps() {
 	fi
 
 	if use pgo ; then
-		if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
-			einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" >&2
+		if ! has_version -b "=llvm-runtimes/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
+			einfo "=llvm-runtimes/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" >&2
 			einfo "Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
 			return 1
 		fi
diff --git a/media-gfx/libredwg/libredwg-0.13.2.ebuild b/media-gfx/libredwg/libredwg-0.13.2.ebuild
index 57215dfb3169..33c41174dd0d 100644
--- a/media-gfx/libredwg/libredwg-0.13.2.ebuild
+++ b/media-gfx/libredwg/libredwg-0.13.2.ebuild
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="|| (
 	sys-devel/gcc[sanitize]
-	sys-libs/compiler-rt-sanitizers[asan(-)]
+	llvm-runtimes/compiler-rt-sanitizers[asan(-)]
 	)
 	dev-vcs/git
 "
diff --git a/media-gfx/libredwg/libredwg-0.13.3.ebuild b/media-gfx/libredwg/libredwg-0.13.3.ebuild
index d29a75a7f99d..a1827a8c7b45 100644
--- a/media-gfx/libredwg/libredwg-0.13.3.ebuild
+++ b/media-gfx/libredwg/libredwg-0.13.3.ebuild
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="|| (
 	sys-devel/gcc[sanitize]
-	sys-libs/compiler-rt-sanitizers[asan(-)]
+	llvm-runtimes/compiler-rt-sanitizers[asan(-)]
 	)
 	dev-vcs/git
 "
diff --git a/media-gfx/libredwg/libredwg-0.13.ebuild b/media-gfx/libredwg/libredwg-0.13.ebuild
index 57215dfb3169..33c41174dd0d 100644
--- a/media-gfx/libredwg/libredwg-0.13.ebuild
+++ b/media-gfx/libredwg/libredwg-0.13.ebuild
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="|| (
 	sys-devel/gcc[sanitize]
-	sys-libs/compiler-rt-sanitizers[asan(-)]
+	llvm-runtimes/compiler-rt-sanitizers[asan(-)]
 	)
 	dev-vcs/git
 "
diff --git a/metadata/stabilization-groups/llvm.group b/metadata/stabilization-groups/llvm.group
index 2738a83cd172..5dc187217503 100644
--- a/metadata/stabilization-groups/llvm.group
+++ b/metadata/stabilization-groups/llvm.group
@@ -3,6 +3,7 @@ dev-ml/llvm-ocaml
 dev-python/clang-python
 dev-python/lit
 llvm-core/libclc
+llvm-runtimes/compiler-rt-sanitizers
 llvm-runtimes/libcxx
 llvm-runtimes/libcxxabi
 llvm-runtimes/libunwind
@@ -19,4 +20,3 @@ sys-devel/llvm-common
 sys-devel/llvm-toolchain-symlinks
 sys-devel/llvmgold
 sys-libs/compiler-rt
-sys-libs/compiler-rt-sanitizers
diff --git a/net-analyzer/gvm-libs/gvm-libs-22.11.0.ebuild b/net-analyzer/gvm-libs/gvm-libs-22.11.0.ebuild
index 4a1a8696879f..6f08ac076fc1 100644
--- a/net-analyzer/gvm-libs/gvm-libs-22.11.0.ebuild
+++ b/net-analyzer/gvm-libs/gvm-libs-22.11.0.ebuild
@@ -54,9 +54,9 @@ BDEPEND="
 pkg_setup() {
 	if tc-is-clang; then
 		local clang_major_version=$(clang-major-version);
-		if ! has_version "sys-libs/compiler-rt-sanitizers:${clang_major_version}[profile]"; then
-			eerror "Compiling this package with clang requires sys-libs/compiler-rt-sanitizers to be built with 'profile' USE flag enabled"
-			die "Clang detected, but sys-libs/compiler-rt-sanitizers not build with 'profile' USE flag enabled"
+		if ! has_version "llvm-runtimes/compiler-rt-sanitizers:${clang_major_version}[profile]"; then
+			eerror "Compiling this package with clang requires llvm-runtimes/compiler-rt-sanitizers to be built with 'profile' USE flag enabled"
+			die "Clang detected, but llvm-runtimes/compiler-rt-sanitizers not build with 'profile' USE flag enabled"
 		fi
 	fi
 }
diff --git a/net-analyzer/gvm-libs/gvm-libs-22.15.0.ebuild b/net-analyzer/gvm-libs/gvm-libs-22.15.0.ebuild
index 6eb7dab05f46..32fb4dbd8411 100644
--- a/net-analyzer/gvm-libs/gvm-libs-22.15.0.ebuild
+++ b/net-analyzer/gvm-libs/gvm-libs-22.15.0.ebuild
@@ -55,9 +55,9 @@ BDEPEND="
 pkg_setup() {
 	if tc-is-clang; then
 		local clang_major_version=$(clang-major-version);
-		if ! has_version "sys-libs/compiler-rt-sanitizers:${clang_major_version}[profile]"; then
-			eerror "Compiling this package with clang requires sys-libs/compiler-rt-sanitizers to be built with 'profile' USE flag enabled"
-			die "Clang detected, but sys-libs/compiler-rt-sanitizers not build with 'profile' USE flag enabled"
+		if ! has_version "llvm-runtimes/compiler-rt-sanitizers:${clang_major_version}[profile]"; then
+			eerror "Compiling this package with clang requires llvm-runtimes/compiler-rt-sanitizers to be built with 'profile' USE flag enabled"
+			die "Clang detected, but llvm-runtimes/compiler-rt-sanitizers not build with 'profile' USE flag enabled"
 		fi
 	fi
 }
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index bd113ace60ba..b6ea89af3f49 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -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,
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.mask b/profiles/arch/arm64/package.use.mask
index b23403b308dd..3dea816eccc2 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -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 c3283bd60a25..a321d57bdf09 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -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/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index 1e5ffa7fd1be..b9f87b088a70 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -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/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.mask b/profiles/arch/mips/package.use.mask
index ff5e265339d7..26c1108facfe 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -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.
diff --git a/profiles/arch/powerpc/ppc32/package.mask b/profiles/arch/powerpc/ppc32/package.mask
index 6e13258a705e..fde7dfbbe135 100644
--- a/profiles/arch/powerpc/ppc32/package.mask
+++ b/profiles/arch/powerpc/ppc32/package.mask
@@ -17,4 +17,4 @@ sci-libs/pdal
 # Not ported to ppc32. See ALL_.*_SUPPORTED_ARCH
 # in compiler-rt/cmake/. Bug #708344
 sys-libs/compiler-rt
-sys-libs/