commit:     9eb17cd3d6aa0c562e7fb5342c0494c4018f405d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 23 20:04:13 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Dec 23 20:07:13 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eb17cd3

llvm-runtimes/compiler-rt-sanitizers: Remove old

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

 llvm-runtimes/compiler-rt-sanitizers/Manifest      |   8 -
 .../compiler-rt-sanitizers-21.1.5.ebuild           | 237 ---------------------
 .../compiler-rt-sanitizers-21.1.6.ebuild           | 237 ---------------------
 .../compiler-rt-sanitizers-21.1.7.ebuild           | 237 ---------------------
 ...ompiler-rt-sanitizers-22.0.0_pre20251108.ebuild | 237 ---------------------
 ...ompiler-rt-sanitizers-22.0.0_pre20251120.ebuild | 237 ---------------------
 6 files changed, 1193 deletions(-)

diff --git a/llvm-runtimes/compiler-rt-sanitizers/Manifest 
b/llvm-runtimes/compiler-rt-sanitizers/Manifest
index 72dc29d74056..3e3516671b0f 100644
--- a/llvm-runtimes/compiler-rt-sanitizers/Manifest
+++ b/llvm-runtimes/compiler-rt-sanitizers/Manifest
@@ -4,7 +4,6 @@ DIST llvm-gentoo-patchset-17.0.6-r4.tar.xz 6636 BLAKE2B 
7b53f4b19e19b3493878ae9d
 DIST llvm-gentoo-patchset-18.1.8-r7.tar.xz 26644 BLAKE2B 
8d7bbbd363bd646fc139405a10f094aa314a19401fec7ba52e89ee200d304fc958e32886f607f59704a163ee2adf416be2756a9cda5a8394ce2bb9a2392a6f3f
 SHA512 
e534f49c1a0428a490ef718e668e2db3294da181a835953457d29b711b1b3a5821d42f6ae81cfdac39c58302dd868652827ea4a04bc3aa2c147ab5c0a4d58a26
 DIST llvm-gentoo-patchset-19.1.7-r1.tar.xz 2644 BLAKE2B 
c9648797628ae84f81bb66947367d58fe7add9bb28f1e50b509c3d3eab15b6b50e6f58812fd67ce63c57310f1a90b56b10fb5909223d9b24998b3d30909caf0a
 SHA512 
0ea8d8f86647cb28c443937b016b3cf46a2b921463815a85e32ab4488ef7368294a956f13c9b77f8fa70daeaa7bd165cb5975c3b4664ed6d11a6d24f11728d73
 DIST llvm-gentoo-patchset-20.1.8.tar.xz 2168 BLAKE2B 
ab44783c8d8b2f536192e801082f02769eb5bb092bb14d867df9fa854455e9d986ec1074605505c8b43b2cc0b0448474e3eaec3edd89e782922b5b232db9a6e2
 SHA512 
664018ac834fa0b8a9abc92d64facedc92d3f48818b72d7cdd28cb7c76234ca65c2a16b4d89b4fa5406d3ea97b1d326ae2b63fd5b21b4efa04b6f46f15014542
-DIST llvm-project-0875755f5275dc7a84b1aeb526b7822b47a733c9.tar.gz 254111698 
BLAKE2B 
16bd787e9af46837e6e2962d2f9bdd2a1d13b1ab6f4dcb1a428914cc2502b6430f79ee163b0d8ad5b6a9124162f262fa394265f8c52950100b543b7027df310c
 SHA512 
de107dd50b078d9f7e0f838b3e439e2012d6e4e14fcdd2438de344a11dd6b2542ee1efd029067fddf05b8eb9d97786f214ff199d1b6aabfd2e3459f9840bc497
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B 
f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5
 SHA512 
4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 
47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df
 SHA512 
fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 
95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d
 SHA512 
89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
@@ -17,14 +16,7 @@ DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 
1259ed7f9aca7b35e89d818bef
 DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 
4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd
 SHA512 
195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
 DIST llvm-project-20.1.8.src.tar.xz 147242952 BLAKE2B 
7657ac0b26acc5affb1bfc91b912ade3191c5d77f3979d5a80d5f6ce52f56a7d1c448bd257398390bf10838f02faa6f3ece37a7327cced69d165ec2e2e699316
 SHA512 
f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
 DIST llvm-project-20.1.8.src.tar.xz.sig 566 BLAKE2B 
85beedfcff1195a974fab2c667b9efd4b715b3480c1b44b1b887fe32c69f72aca0d3b8fb276c03b6cc5a866622f669047aeee5ccb976640b4008ccd31dce77a4
 SHA512 
d74369bdb4d1b82775161ea53c9c5f3a23ce810f4df5ff617123023f9d8ce720e7d6ecc9e17f8ebd39fd9e7a9de79560abdf2ffe73bcb907a43148d43665d619
-DIST llvm-project-21.1.5.src.tar.xz 158957032 BLAKE2B 
c056049214b18a17a3fd2dc86ae82121a821841002b8386b1fe35fc34f1f0faeb681f39880814e4a47f976b2744bfd2c4f1316156469c6b6a79c013d200dab30
 SHA512 
865ad44575c9288f06da8c48acbb60779f6c38aaf2ee85eac2002452f83892b704263f2ef51d3596abf06dccc1559f1d9dcdc89120363efd8ce1b1239ae83f6b
-DIST llvm-project-21.1.5.src.tar.xz.sig 119 BLAKE2B 
abf014908e981ea358ee38f6d1ef6c745ebbe51011fa7e83a514672bbad152fac92c95dd32a7b52a8d9c2a2a9ea1b44e447bb0bc5953f0f7bbd9ced34aa3c0cc
 SHA512 
4e327c7d60525526ff3ac6ca58f1e753a57f841b88078a9bfe2a2ce91e4a5e17bcc52fd2f27f75801540610c1a56d57a3070243f13ad583e3526901b1f7be4a5
-DIST llvm-project-21.1.6.src.tar.xz 158947864 BLAKE2B 
eeda7b9903ef59319ad22e5e3a8b66a339cbbb7445ccb75fa09db6823371a22e9b66cb44c084fdeb16054f2e62a149f6e069d9726f269f667dbd6a631cb658c3
 SHA512 
f9e6c84828e40cb0a7894258b07240468a9d555c11496a1725bf959444362277a90ea822eeb8c9b51b3b7fecd4dd0b213a28a2f2effefbf43efdd21084d10afc
-DIST llvm-project-21.1.6.src.tar.xz.sig 119 BLAKE2B 
2e3de87f4adb181740cfc8a5f8de3e6f4090f50d2f0dfa2670b27c0a6dde296b399ee017b5f6220aa80581a16c81afb5c96454d69dac8ce246713570470956b8
 SHA512 
637cc9f778f8303e80985469c3102573a9cf6264093b1a83fb494e34b5cb444f76cbb7d6d497d44b05250d56e25ec27dd9df685e0b78b23bb71e4bcd05a8facf
-DIST llvm-project-21.1.7.src.tar.xz 158956584 BLAKE2B 
dc9738fdde764d520f0e6d615295133a96833935b38239ea2ec6dffe72558d01332905fa265a55eb105ab4c4f88f37d5b3427126b1f7c788dc266add581cdf25
 SHA512 
ae30a53ed929df979849f7433bf705bc3d540aa9e12a02a175eb2483d1a56f9ca1203c9b67795f6e84cf2407c28d46d5d5351b290d8735adb5206103fee6f379
-DIST llvm-project-21.1.7.src.tar.xz.sig 438 BLAKE2B 
be4808a0888b088df0be4edaa7d49361dee717508d4438ad09c18b00752cd7a14ef56f5f18e3e4306a9ace95d9da7ed6904c998eb8a386577f21049bf5b6c0ce
 SHA512 
d02b09c77abd537eb24d6d43470f962c80a9ec6ccc03ac0efc950d90dbdec5b94dd6abad18143890ff85cee2bdeb7bcf1dac2a576ffcab8ef053d8526417bdcc
 DIST llvm-project-21.1.8.src.tar.xz 158958576 BLAKE2B 
0d3d4ee920f8e5db50e98152616f16004c74df0e7313cc86d893428fb7b1c875109988a5e40ea6f2e5d0fef53c7bfe2fc2b69e84807f6eb440b03afa1b228a36
 SHA512 
cae4c44e7bf678071723da63ad5839491d717a7233e7f4791aa408207f3ea42f52de939ad15189b112c02a0770f1bb8d59bae6ad31ef53417a6eea7770fe52ab
 DIST llvm-project-21.1.8.src.tar.xz.sig 119 BLAKE2B 
cffc1825f5778a3e3c128ec3e856ff6ee50687319d621cdf42e895abf67e05cc51cb7493308e2b506ab60dbdbaca7aa75eb9f78d91d42c81f9682a36f4042e9d
 SHA512 
10f58eff58ed6e701d0f123b15e68c82ab8cbdf99b1c86c0d83e3b8553e90ea51055e30327e8e442ded57c8f503e2a2de9ee075e9c28b5ba815a0f8922f8671c
-DIST llvm-project-21c4c1502e3383988ba77eac75b13da7b9426957.tar.gz 254650569 
BLAKE2B 
aaa8fffbe3b8ddcffa232c6cd078d33efc0f23453fd79b2ae71a0760b35da2ad17ffaed95d99c2548904468767d9f95af2ca4a59245e1ddf51a6612bda61cda4
 SHA512 
40a97c53cf7825b5c1e6867df74fa22e3b786a2ec9bcb478e1af0e6a165c582316c3c75b12f4704227b8e95cce91ab110acb10f2d8f30bc82319d6af4d201956
 DIST llvm-project-8401a8d0be7671fb5089f850a34dc92ad4a2eb12.tar.gz 254694831 
BLAKE2B 
edac68e2b57124504262d68d1fabbb2161af023c2b9f96f304ce220e3d84249e2a2c1137c83bcfb15f6f082b68ef24a775150e5f435ec14d0f471c51ec438346
 SHA512 
a35f918fc3363df20fecac5820595060acd9fa0bce2cc3f696603192100a63ff4d31f6ba6ac98ad13f62b01c0789f3cce2ecbe4b9c0095d2bf02d2b24971d973
 DIST llvm-project-a3c8b090c37fb10e8c3aa6cd2e5644033cc8a0e4.tar.gz 256214859 
BLAKE2B 
9b0b94d84ce14b35bd90e1e7c4cb1c6acace5156d10345f56bb35945b8db28747c196eeec43011a98eaca008595950eefbe8a1ebda2871fd6d0bc3bd3012818a
 SHA512 
b26e7b5b1654f2004e6afa7e452f2e9b5623021ec97406f4c5d42ed26fa4532c5d904d276e5665c758a9310859ee274e06a6d6eb4371d7ccba99ce86b04264ea

diff --git 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.5.ebuild 
b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.5.ebuild
deleted file mode 100644
index 05fbb1293013..000000000000
--- a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.5.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..14} )
-inherit check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/";
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~x64-macos"
-IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
-# base targets
-IUSE+=" +ctx-profile +libfuzzer +memprof +orc +profile +xray"
-# sanitizer targets, keep in sync with config-ix.cmake
-# NB: ubsan, scudo deliberately match two entries
-SANITIZER_FLAGS=(
-       asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
-       shadowcallstack gwp-asan nsan rtsan
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-       || ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-       test? (
-               cfi? ( ubsan )
-               gwp-asan? ( scudo )
-       )
-"
-RESTRICT="
-       !clang? ( test )
-       !test? ( test )
-"
-
-DEPEND="
-       llvm-core/llvm:${LLVM_MAJOR}
-       virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-       clang? (
-               llvm-core/clang:${LLVM_MAJOR}
-               llvm-core/clang-linker-config:${LLVM_MAJOR}
-               llvm-runtimes/clang-rtlib-config:${LLVM_MAJOR}
-               llvm-runtimes/clang-stdlib-config:${LLVM_MAJOR}
-               llvm-runtimes/compiler-rt:${LLVM_MAJOR}
-       )
-       elibc_glibc? ( net-libs/libtirpc )
-       test? (
-               $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-               =llvm-core/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-       )
-       !test? (
-               ${PYTHON_DEPS}
-       )
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=(
-       llvm/include/llvm/ProfileData llvm/lib/Testing/Support third-party
-)
-llvm.org_set_globals
-
-python_check_deps() {
-       use test || return 0
-       python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-check_space() {
-       if use test; then
-               local CHECKREQS_DISK_BUILD=11G
-               check-reqs_pkg_pretend
-       fi
-}
-
-pkg_pretend() {
-       check_space
-}
-
-pkg_setup() {
-       check_space
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
-
-       local flag
-       for flag in "${SANITIZER_FLAGS[@]}"; do
-               if ! use "${flag}"; then
-                       local cmake_flag=${flag/-/_}
-                       sed -i -e 
"/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
-                               cmake/config-ix.cmake || die
-               fi
-       done
-
-       # TODO: fix these tests to be skipped upstream
-       if use asan && ! use profile; then
-               rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
-       fi
-       if use ubsan && ! use cfi; then
-               > test/cfi/CMakeLists.txt || die
-       fi
-       # hangs, sigh
-       rm test/tsan/getline_nohang.cpp || die
-
-       llvm.org_src_prepare
-}
-
-src_configure() {
-       llvm_prepend_path "${LLVM_MAJOR}"
-
-       # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-       use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-       # pre-set since we need to pass it to cmake
-       BUILD_DIR=${WORKDIR}/compiler-rt_build
-
-       if use clang; then
-               local -x CC=${CHOST}-clang-${LLVM_MAJOR}
-               local -x CXX=${CHOST}-clang++-${LLVM_MAJOR}
-               strip-unsupported-flags
-
-               # The full clang configuration might not be ready yet. Use the 
partial
-               # configuration files that are guaranteed to exist even during 
initial
-               # installations and upgrades.
-               local flags=(
-                       
--config="${ESYSROOT}"/etc/clang/"${LLVM_MAJOR}"/gentoo-{rtlib,stdlib,linker}.cfg
-               )
-               local -x CFLAGS="${CFLAGS} ${flags[@]}"
-               local -x CXXFLAGS="${CXXFLAGS} ${flags[@]}"
-               local -x LDFLAGS="${LDFLAGS} ${flags[@]}"
-       fi
-
-       local flag want_sanitizer=OFF
-       for flag in "${SANITIZER_FLAGS[@]}"; do
-               if use "${flag}"; then
-                       want_sanitizer=ON
-                       break
-               fi
-       done
-
-       local mycmakeargs=(
-               
-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-               # use a build dir structure consistent with install
-               # this makes it possible to easily deploy test-friendly clang
-               -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
-
-               -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-               # builtins & crt installed by llvm-runtimes/compiler-rt
-               -DCOMPILER_RT_BUILD_BUILTINS=OFF
-               -DCOMPILER_RT_BUILD_CRT=OFF
-               -DCOMPILER_RT_BUILD_CTX_PROFILE=$(usex ctx-profile)
-               -DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-               -DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
-               -DCOMPILER_RT_BUILD_ORC=$(usex orc)
-               -DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-               -DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
-               -DCOMPILER_RT_BUILD_XRAY=$(usex xray)
-
-               -DPython3_EXECUTABLE="${PYTHON}"
-       )
-
-       if use amd64; then
-               mycmakeargs+=(
-                       -DCAN_TARGET_i386=$(usex abi_x86_32)
-                       -DCAN_TARGET_x86_64=$(usex abi_x86_64)
-               )
-       fi
-
-       if use test; then
-               mycmakeargs+=(
-                       -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-                       -DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-                       # they are created during src_test()
-                       
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
-                       
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-               )
-
-               # same flags are passed for build & tests, so we need to strip
-               # them down to a subset supported by clang
-               CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
-               CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
-               strip-unsupported-flags
-       fi
-
-       if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-               mycmakeargs+=(
-                       # setting -isysroot is disabled with 
compiler-rt-prefix-paths.patch
-                       # this allows adding arm64 support using SDK in EPREFIX
-                       -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-                       # Set version based on the SDK in EPREFIX
-                       # This disables i386 for SDK >= 10.15
-                       # Will error if has_use tsan and SDK < 10.12
-                       -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath 
"${EPREFIX}/MacOSX.sdk" | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-                       # Use our libtool instead of looking it up with xcrun
-                       -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-               )
-       fi
-
-       cmake_src_configure
-
-       if use test; then
-               local sys_dest=( "${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/lib/* )
-               [[ ! -e ${sys_dest} ]] && die "Unable to find ${sys_dest}"
-               [[ ${#sys_dest[@]} -ne 1 ]] && die "Non-deterministic 
compiler-rt install: ${sys_dest[*]}"
-               local sys_dir=( 
"${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}/lib/${sys_dest##*/}" )
-               [[ ! -e ${sys_dir} ]] && die "${sys_dir} is missing"
-
-               # copy clang over since resource_dir is located relatively to 
binary
-               # therefore, we can put our new libraries in it
-               mkdir -p 
"${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include}
 || die
-               cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
-                       "${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
-               cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
-                       "${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
-               cp "${sys_dir}"/*builtins*.a "${sys_dest}/" || die
-               # we also need LLVMgold.so for gold-based tests
-               if [[ -f 
${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
-                       ln -s 
"${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
-                               
"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
-               fi
-       fi
-}
-
-src_test() {
-       # respect TMPDIR!
-       local -x LIT_PRESERVES_TMP=1
-       # disable sandbox to have it stop clobbering LD_PRELOAD
-       local -x SANDBOX_ON=0
-       # wipe LD_PRELOAD to make ASAN happy
-       local -x LD_PRELOAD=
-
-       cmake_build check-all
-}

diff --git 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.6.ebuild 
b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.6.ebuild
deleted file mode 100644
index 05fbb1293013..000000000000
--- a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.6.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..14} )
-inherit check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/";
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~x64-macos"
-IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
-# base targets
-IUSE+=" +ctx-profile +libfuzzer +memprof +orc +profile +xray"
-# sanitizer targets, keep in sync with config-ix.cmake
-# NB: ubsan, scudo deliberately match two entries
-SANITIZER_FLAGS=(
-       asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
-       shadowcallstack gwp-asan nsan rtsan
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-       || ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-       test? (
-               cfi? ( ubsan )
-               gwp-asan? ( scudo )
-       )
-"
-RESTRICT="
-       !clang? ( test )
-       !test? ( test )
-"
-
-DEPEND="
-       llvm-core/llvm:${LLVM_MAJOR}
-       virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-       clang? (
-               llvm-core/clang:${LLVM_MAJOR}
-               llvm-core/clang-linker-config:${LLVM_MAJOR}
-               llvm-runtimes/clang-rtlib-config:${LLVM_MAJOR}
-               llvm-runtimes/clang-stdlib-config:${LLVM_MAJOR}
-               llvm-runtimes/compiler-rt:${LLVM_MAJOR}
-       )
-       elibc_glibc? ( net-libs/libtirpc )
-       test? (
-               $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-               =llvm-core/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-       )
-       !test? (
-               ${PYTHON_DEPS}
-       )
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=(
-       llvm/include/llvm/ProfileData llvm/lib/Testing/Support third-party
-)
-llvm.org_set_globals
-
-python_check_deps() {
-       use test || return 0
-       python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-check_space() {
-       if use test; then
-               local CHECKREQS_DISK_BUILD=11G
-               check-reqs_pkg_pretend
-       fi
-}
-
-pkg_pretend() {
-       check_space
-}
-
-pkg_setup() {
-       check_space
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
-
-       local flag
-       for flag in "${SANITIZER_FLAGS[@]}"; do
-               if ! use "${flag}"; then
-                       local cmake_flag=${flag/-/_}
-                       sed -i -e 
"/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
-                               cmake/config-ix.cmake || die
-               fi
-       done
-
-       # TODO: fix these tests to be skipped upstream
-       if use asan && ! use profile; then
-               rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
-       fi
-       if use ubsan && ! use cfi; then
-               > test/cfi/CMakeLists.txt || die
-       fi
-       # hangs, sigh
-       rm test/tsan/getline_nohang.cpp || die
-
-       llvm.org_src_prepare
-}
-
-src_configure() {
-       llvm_prepend_path "${LLVM_MAJOR}"
-
-       # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-       use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-       # pre-set since we need to pass it to cmake
-       BUILD_DIR=${WORKDIR}/compiler-rt_build
-
-       if use clang; then
-               local -x CC=${CHOST}-clang-${LLVM_MAJOR}
-               local -x CXX=${CHOST}-clang++-${LLVM_MAJOR}
-               strip-unsupported-flags
-
-               # The full clang configuration might not be ready yet. Use the 
partial
-               # configuration files that are guaranteed to exist even during 
initial
-               # installations and upgrades.
-               local flags=(
-                       
--config="${ESYSROOT}"/etc/clang/"${LLVM_MAJOR}"/gentoo-{rtlib,stdlib,linker}.cfg
-               )
-               local -x CFLAGS="${CFLAGS} ${flags[@]}"
-               local -x CXXFLAGS="${CXXFLAGS} ${flags[@]}"
-               local -x LDFLAGS="${LDFLAGS} ${flags[@]}"
-       fi
-
-       local flag want_sanitizer=OFF
-       for flag in "${SANITIZER_FLAGS[@]}"; do
-               if use "${flag}"; then
-                       want_sanitizer=ON
-                       break
-               fi
-       done
-
-       local mycmakeargs=(
-               
-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-               # use a build dir structure consistent with install
-               # this makes it possible to easily deploy test-friendly clang
-               -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
-
-               -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-               # builtins & crt installed by llvm-runtimes/compiler-rt
-               -DCOMPILER_RT_BUILD_BUILTINS=OFF
-               -DCOMPILER_RT_BUILD_CRT=OFF
-               -DCOMPILER_RT_BUILD_CTX_PROFILE=$(usex ctx-profile)
-               -DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-               -DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
-               -DCOMPILER_RT_BUILD_ORC=$(usex orc)
-               -DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-               -DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
-               -DCOMPILER_RT_BUILD_XRAY=$(usex xray)
-
-               -DPython3_EXECUTABLE="${PYTHON}"
-       )
-
-       if use amd64; then
-               mycmakeargs+=(
-                       -DCAN_TARGET_i386=$(usex abi_x86_32)
-                       -DCAN_TARGET_x86_64=$(usex abi_x86_64)
-               )
-       fi
-
-       if use test; then
-               mycmakeargs+=(
-                       -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-                       -DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-                       # they are created during src_test()
-                       
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
-                       
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-               )
-
-               # same flags are passed for build & tests, so we need to strip
-               # them down to a subset supported by clang
-               CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
-               CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
-               strip-unsupported-flags
-       fi
-
-       if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-               mycmakeargs+=(
-                       # setting -isysroot is disabled with 
compiler-rt-prefix-paths.patch
-                       # this allows adding arm64 support using SDK in EPREFIX
-                       -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-                       # Set version based on the SDK in EPREFIX
-                       # This disables i386 for SDK >= 10.15
-                       # Will error if has_use tsan and SDK < 10.12
-                       -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath 
"${EPREFIX}/MacOSX.sdk" | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-                       # Use our libtool instead of looking it up with xcrun
-                       -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-               )
-       fi
-
-       cmake_src_configure
-
-       if use test; then
-               local sys_dest=( "${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/lib/* )
-               [[ ! -e ${sys_dest} ]] && die "Unable to find ${sys_dest}"
-               [[ ${#sys_dest[@]} -ne 1 ]] && die "Non-deterministic 
compiler-rt install: ${sys_dest[*]}"
-               local sys_dir=( 
"${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}/lib/${sys_dest##*/}" )
-               [[ ! -e ${sys_dir} ]] && die "${sys_dir} is missing"
-
-               # copy clang over since resource_dir is located relatively to 
binary
-               # therefore, we can put our new libraries in it
-               mkdir -p 
"${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include}
 || die
-               cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
-                       "${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
-               cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
-                       "${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
-               cp "${sys_dir}"/*builtins*.a "${sys_dest}/" || die
-               # we also need LLVMgold.so for gold-based tests
-               if [[ -f 
${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
-                       ln -s 
"${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
-                               
"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
-               fi
-       fi
-}
-
-src_test() {
-       # respect TMPDIR!
-       local -x LIT_PRESERVES_TMP=1
-       # disable sandbox to have it stop clobbering LD_PRELOAD
-       local -x SANDBOX_ON=0
-       # wipe LD_PRELOAD to make ASAN happy
-       local -x LD_PRELOAD=
-
-       cmake_build check-all
-}

diff --git 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.7.ebuild 
b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.7.ebuild
deleted file mode 100644
index 05fbb1293013..000000000000
--- a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.7.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..14} )
-inherit check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/";
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~x64-macos"
-IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
-# base targets
-IUSE+=" +ctx-profile +libfuzzer +memprof +orc +profile +xray"
-# sanitizer targets, keep in sync with config-ix.cmake
-# NB: ubsan, scudo deliberately match two entries
-SANITIZER_FLAGS=(
-       asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
-       shadowcallstack gwp-asan nsan rtsan
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-       || ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-       test? (
-               cfi? ( ubsan )
-               gwp-asan? ( scudo )
-       )
-"
-RESTRICT="
-       !clang? ( test )
-       !test? ( test )
-"
-
-DEPEND="
-       llvm-core/llvm:${LLVM_MAJOR}
-       virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-       clang? (
-               llvm-core/clang:${LLVM_MAJOR}
-               llvm-core/clang-linker-config:${LLVM_MAJOR}
-               llvm-runtimes/clang-rtlib-config:${LLVM_MAJOR}
-               llvm-runtimes/clang-stdlib-config:${LLVM_MAJOR}
-               llvm-runtimes/compiler-rt:${LLVM_MAJOR}
-       )
-       elibc_glibc? ( net-libs/libtirpc )
-       test? (
-               $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-               =llvm-core/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-       )
-       !test? (
-               ${PYTHON_DEPS}
-       )
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=(
-       llvm/include/llvm/ProfileData llvm/lib/Testing/Support third-party
-)
-llvm.org_set_globals
-
-python_check_deps() {
-       use test || return 0
-       python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-check_space() {
-       if use test; then
-               local CHECKREQS_DISK_BUILD=11G
-               check-reqs_pkg_pretend
-       fi
-}
-
-pkg_pretend() {
-       check_space
-}
-
-pkg_setup() {
-       check_space
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
-
-       local flag
-       for flag in "${SANITIZER_FLAGS[@]}"; do
-               if ! use "${flag}"; then
-                       local cmake_flag=${flag/-/_}
-                       sed -i -e 
"/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
-                               cmake/config-ix.cmake || die
-               fi
-       done
-
-       # TODO: fix these tests to be skipped upstream
-       if use asan && ! use profile; then
-               rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
-       fi
-       if use ubsan && ! use cfi; then
-               > test/cfi/CMakeLists.txt || die
-       fi
-       # hangs, sigh
-       rm test/tsan/getline_nohang.cpp || die
-
-       llvm.org_src_prepare
-}
-
-src_configure() {
-       llvm_prepend_path "${LLVM_MAJOR}"
-
-       # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-       use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-       # pre-set since we need to pass it to cmake
-       BUILD_DIR=${WORKDIR}/compiler-rt_build
-
-       if use clang; then
-               local -x CC=${CHOST}-clang-${LLVM_MAJOR}
-               local -x CXX=${CHOST}-clang++-${LLVM_MAJOR}
-               strip-unsupported-flags
-
-               # The full clang configuration might not be ready yet. Use the 
partial
-               # configuration files that are guaranteed to exist even during 
initial
-               # installations and upgrades.
-               local flags=(
-                       
--config="${ESYSROOT}"/etc/clang/"${LLVM_MAJOR}"/gentoo-{rtlib,stdlib,linker}.cfg
-               )
-               local -x CFLAGS="${CFLAGS} ${flags[@]}"
-               local -x CXXFLAGS="${CXXFLAGS} ${flags[@]}"
-               local -x LDFLAGS="${LDFLAGS} ${flags[@]}"
-       fi
-
-       local flag want_sanitizer=OFF
-       for flag in "${SANITIZER_FLAGS[@]}"; do
-               if use "${flag}"; then
-                       want_sanitizer=ON
-                       break
-               fi
-       done
-
-       local mycmakeargs=(
-               
-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-               # use a build dir structure consistent with install
-               # this makes it possible to easily deploy test-friendly clang
-               -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
-
-               -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-               # builtins & crt installed by llvm-runtimes/compiler-rt
-               -DCOMPILER_RT_BUILD_BUILTINS=OFF
-               -DCOMPILER_RT_BUILD_CRT=OFF
-               -DCOMPILER_RT_BUILD_CTX_PROFILE=$(usex ctx-profile)
-               -DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-               -DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
-               -DCOMPILER_RT_BUILD_ORC=$(usex orc)
-               -DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-               -DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
-               -DCOMPILER_RT_BUILD_XRAY=$(usex xray)
-
-               -DPython3_EXECUTABLE="${PYTHON}"
-       )
-
-       if use amd64; then
-               mycmakeargs+=(
-                       -DCAN_TARGET_i386=$(usex abi_x86_32)
-                       -DCAN_TARGET_x86_64=$(usex abi_x86_64)
-               )
-       fi
-
-       if use test; then
-               mycmakeargs+=(
-                       -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-                       -DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-                       # they are created during src_test()
-                       
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
-                       
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-               )
-
-               # same flags are passed for build & tests, so we need to strip
-               # them down to a subset supported by clang
-               CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
-               CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
-               strip-unsupported-flags
-       fi
-
-       if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-               mycmakeargs+=(
-                       # setting -isysroot is disabled with 
compiler-rt-prefix-paths.patch
-                       # this allows adding arm64 support using SDK in EPREFIX
-                       -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-                       # Set version based on the SDK in EPREFIX
-                       # This disables i386 for SDK >= 10.15
-                       # Will error if has_use tsan and SDK < 10.12
-                       -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath 
"${EPREFIX}/MacOSX.sdk" | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-                       # Use our libtool instead of looking it up with xcrun
-                       -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-               )
-       fi
-
-       cmake_src_configure
-
-       if use test; then
-               local sys_dest=( "${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/lib/* )
-               [[ ! -e ${sys_dest} ]] && die "Unable to find ${sys_dest}"
-               [[ ${#sys_dest[@]} -ne 1 ]] && die "Non-deterministic 
compiler-rt install: ${sys_dest[*]}"
-               local sys_dir=( 
"${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}/lib/${sys_dest##*/}" )
-               [[ ! -e ${sys_dir} ]] && die "${sys_dir} is missing"
-
-               # copy clang over since resource_dir is located relatively to 
binary
-               # therefore, we can put our new libraries in it
-               mkdir -p 
"${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include}
 || die
-               cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
-                       "${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
-               cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
-                       "${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
-               cp "${sys_dir}"/*builtins*.a "${sys_dest}/" || die
-               # we also need LLVMgold.so for gold-based tests
-               if [[ -f 
${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
-                       ln -s 
"${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
-                               
"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
-               fi
-       fi
-}
-
-src_test() {
-       # respect TMPDIR!
-       local -x LIT_PRESERVES_TMP=1
-       # disable sandbox to have it stop clobbering LD_PRELOAD
-       local -x SANDBOX_ON=0
-       # wipe LD_PRELOAD to make ASAN happy
-       local -x LD_PRELOAD=
-
-       cmake_build check-all
-}

diff --git 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-22.0.0_pre20251108.ebuild
 
b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-22.0.0_pre20251108.ebuild
deleted file mode 100644
index fa3b0d22fd43..000000000000
--- 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-22.0.0_pre20251108.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..14} )
-inherit check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/";
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-IUSE="+abi_x86_32 abi_x86_64 +clang +debug test"
-# base targets
-IUSE+=" +ctx-profile +libfuzzer +memprof +orc +profile +xray"
-# sanitizer targets, keep in sync with config-ix.cmake
-# NB: ubsan, scudo deliberately match two entries
-SANITIZER_FLAGS=(
-       asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
-       shadowcallstack gwp-asan nsan rtsan
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-       || ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-       test? (
-               cfi? ( ubsan )
-               gwp-asan? ( scudo )
-       )
-"
-RESTRICT="
-       !clang? ( test )
-       !test? ( test )
-"
-
-DEPEND="
-       llvm-core/llvm:${LLVM_MAJOR}
-       virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-       clang? (
-               llvm-core/clang:${LLVM_MAJOR}
-               llvm-core/clang-linker-config:${LLVM_MAJOR}
-               llvm-runtimes/clang-rtlib-config:${LLVM_MAJOR}
-               llvm-runtimes/clang-stdlib-config:${LLVM_MAJOR}
-               llvm-runtimes/compiler-rt:${LLVM_MAJOR}
-       )
-       elibc_glibc? ( net-libs/libtirpc )
-       test? (
-               $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-               =llvm-core/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-       )
-       !test? (
-               ${PYTHON_DEPS}
-       )
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=(
-       llvm/include/llvm/ProfileData llvm/lib/Testing/Support third-party
-)
-llvm.org_set_globals
-
-python_check_deps() {
-       use test || return 0
-       python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-check_space() {
-       if use test; then
-               local CHECKREQS_DISK_BUILD=11G
-               check-reqs_pkg_pretend
-       fi
-}
-
-pkg_pretend() {
-       check_space
-}
-
-pkg_setup() {
-       check_space
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
-
-       # builds freestanding code
-       filter-flags -fstack-protector*
-
-       local flag
-       for flag in "${SANITIZER_FLAGS[@]}"; do
-               if ! use "${flag}"; then
-                       local cmake_flag=${flag/-/_}
-                       sed -i -e 
"/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
-                               cmake/config-ix.cmake || die
-               fi
-       done
-
-       # TODO: fix these tests to be skipped upstream
-       if use asan && ! use profile; then
-               rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
-       fi
-       if use ubsan && ! use cfi; then
-               > test/cfi/CMakeLists.txt || die
-       fi
-
-       llvm.org_src_prepare
-}
-
-src_configure() {
-       llvm_prepend_path "${LLVM_MAJOR}"
-
-       # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-       use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-       # pre-set since we need to pass it to cmake
-       BUILD_DIR=${WORKDIR}/compiler-rt_build
-
-       if use clang; then
-               local -x CC=${CHOST}-clang-${LLVM_MAJOR}
-               local -x CXX=${CHOST}-clang++-${LLVM_MAJOR}
-               strip-unsupported-flags
-
-               # The full clang configuration might not be ready yet. Use the 
partial
-               # configuration files that are guaranteed to exist even during 
initial
-               # installations and upgrades.
-               local flags=(
-                       
--config="${ESYSROOT}"/etc/clang/"${LLVM_MAJOR}"/gentoo-{rtlib,stdlib,linker}.cfg
-               )
-               local -x CFLAGS="${CFLAGS} ${flags[@]}"
-               local -x CXXFLAGS="${CXXFLAGS} ${flags[@]}"
-               local -x LDFLAGS="${LDFLAGS} ${flags[@]}"
-       fi
-
-       local flag want_sanitizer=OFF
-       for flag in "${SANITIZER_FLAGS[@]}"; do
-               if use "${flag}"; then
-                       want_sanitizer=ON
-                       break
-               fi
-       done
-
-       local mycmakeargs=(
-               
-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-               # use a build dir structure consistent with install
-               # this makes it possible to easily deploy test-friendly clang
-               -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
-
-               -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-               # builtins & crt installed by llvm-runtimes/compiler-rt
-               -DCOMPILER_RT_BUILD_BUILTINS=OFF
-               -DCOMPILER_RT_BUILD_CRT=OFF
-               -DCOMPILER_RT_BUILD_CTX_PROFILE=$(usex ctx-profile)
-               -DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-               -DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
-               -DCOMPILER_RT_BUILD_ORC=$(usex orc)
-               -DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-               -DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
-               -DCOMPILER_RT_BUILD_XRAY=$(usex xray)
-
-               -DPython3_EXECUTABLE="${PYTHON}"
-       )
-
-       if use amd64; then
-               mycmakeargs+=(
-                       -DCAN_TARGET_i386=$(usex abi_x86_32)
-                       -DCAN_TARGET_x86_64=$(usex abi_x86_64)
-               )
-       fi
-
-       if use test; then
-               mycmakeargs+=(
-                       -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-                       -DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-                       # they are created during src_test()
-                       
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
-                       
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-               )
-
-               # same flags are passed for build & tests, so we need to strip
-               # them down to a subset supported by clang
-               CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
-               CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
-               strip-unsupported-flags
-       fi
-
-       if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-               mycmakeargs+=(
-                       # setting -isysroot is disabled with 
compiler-rt-prefix-paths.patch
-                       # this allows adding arm64 support using SDK in EPREFIX
-                       -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-                       # Set version based on the SDK in EPREFIX
-                       # This disables i386 for SDK >= 10.15
-                       # Will error if has_use tsan and SDK < 10.12
-                       -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath 
"${EPREFIX}/MacOSX.sdk" | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-                       # Use our libtool instead of looking it up with xcrun
-                       -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-               )
-       fi
-
-       cmake_src_configure
-
-       if use test; then
-               local sys_dest=( "${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/lib/* )
-               [[ ! -e ${sys_dest} ]] && die "Unable to find ${sys_dest}"
-               [[ ${#sys_dest[@]} -ne 1 ]] && die "Non-deterministic 
compiler-rt install: ${sys_dest[*]}"
-               local sys_dir=( 
"${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}/lib/${sys_dest##*/}" )
-               [[ ! -e ${sys_dir} ]] && die "${sys_dir} is missing"
-
-               # copy clang over since resource_dir is located relatively to 
binary
-               # therefore, we can put our new libraries in it
-               mkdir -p 
"${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include}
 || die
-               cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
-                       "${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
-               cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
-                       "${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
-               cp "${sys_dir}"/*builtins*.a "${sys_dest}/" || die
-               # we also need LLVMgold.so for gold-based tests
-               if [[ -f 
${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
-                       ln -s 
"${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
-                               
"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
-               fi
-       fi
-}
-
-src_test() {
-       # respect TMPDIR!
-       local -x LIT_PRESERVES_TMP=1
-       # disable sandbox to have it stop clobbering LD_PRELOAD
-       local -x SANDBOX_ON=0
-       # wipe LD_PRELOAD to make ASAN happy
-       local -x LD_PRELOAD=
-
-       cmake_build check-all
-}

diff --git 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-22.0.0_pre20251120.ebuild
 
b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-22.0.0_pre20251120.ebuild
deleted file mode 100644
index fa3b0d22fd43..000000000000
--- 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-22.0.0_pre20251120.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..14} )
-inherit check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/";
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-IUSE="+abi_x86_32 abi_x86_64 +clang +debug test"
-# base targets
-IUSE+=" +ctx-profile +libfuzzer +memprof +orc +profile +xray"
-# sanitizer targets, keep in sync with config-ix.cmake
-# NB: ubsan, scudo deliberately match two entries
-SANITIZER_FLAGS=(
-       asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
-       shadowcallstack gwp-asan nsan rtsan
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-       || ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-       test? (
-               cfi? ( ubsan )
-               gwp-asan? ( scudo )
-       )
-"
-RESTRICT="
-       !clang? ( test )
-       !test? ( test )
-"
-
-DEPEND="
-       llvm-core/llvm:${LLVM_MAJOR}
-       virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-       clang? (
-               llvm-core/clang:${LLVM_MAJOR}
-               llvm-core/clang-linker-config:${LLVM_MAJOR}
-               llvm-runtimes/clang-rtlib-config:${LLVM_MAJOR}
-               llvm-runtimes/clang-stdlib-config:${LLVM_MAJOR}
-               llvm-runtimes/compiler-rt:${LLVM_MAJOR}
-       )
-       elibc_glibc? ( net-libs/libtirpc )
-       test? (
-               $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-               =llvm-core/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-       )
-       !test? (
-               ${PYTHON_DEPS}
-       )
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=(
-       llvm/include/llvm/ProfileData llvm/lib/Testing/Support third-party
-)
-llvm.org_set_globals
-
-python_check_deps() {
-       use test || return 0
-       python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-check_space() {
-       if use test; then
-               local CHECKREQS_DISK_BUILD=11G
-               check-reqs_pkg_pretend
-       fi
-}
-
-pkg_pretend() {
-       check_space
-}
-
-pkg_setup() {
-       check_space
-       python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
-
-       # builds freestanding code
-       filter-flags -fstack-protector*
-
-       local flag
-       for flag in "${SANITIZER_FLAGS[@]}"; do
-               if ! use "${flag}"; then
-                       local cmake_flag=${flag/-/_}
-                       sed -i -e 
"/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
-                               cmake/config-ix.cmake || die
-               fi
-       done
-
-       # TODO: fix these tests to be skipped upstream
-       if use asan && ! use profile; then
-               rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
-       fi
-       if use ubsan && ! use cfi; then
-               > test/cfi/CMakeLists.txt || die
-       fi
-
-       llvm.org_src_prepare
-}
-
-src_configure() {
-       llvm_prepend_path "${LLVM_MAJOR}"
-
-       # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-       use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-       # pre-set since we need to pass it to cmake
-       BUILD_DIR=${WORKDIR}/compiler-rt_build
-
-       if use clang; then
-               local -x CC=${CHOST}-clang-${LLVM_MAJOR}
-               local -x CXX=${CHOST}-clang++-${LLVM_MAJOR}
-               strip-unsupported-flags
-
-               # The full clang configuration might not be ready yet. Use the 
partial
-               # configuration files that are guaranteed to exist even during 
initial
-               # installations and upgrades.
-               local flags=(
-                       
--config="${ESYSROOT}"/etc/clang/"${LLVM_MAJOR}"/gentoo-{rtlib,stdlib,linker}.cfg
-               )
-               local -x CFLAGS="${CFLAGS} ${flags[@]}"
-               local -x CXXFLAGS="${CXXFLAGS} ${flags[@]}"
-               local -x LDFLAGS="${LDFLAGS} ${flags[@]}"
-       fi
-
-       local flag want_sanitizer=OFF
-       for flag in "${SANITIZER_FLAGS[@]}"; do
-               if use "${flag}"; then
-                       want_sanitizer=ON
-                       break
-               fi
-       done
-
-       local mycmakeargs=(
-               
-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-               # use a build dir structure consistent with install
-               # this makes it possible to easily deploy test-friendly clang
-               -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
-
-               -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-               # builtins & crt installed by llvm-runtimes/compiler-rt
-               -DCOMPILER_RT_BUILD_BUILTINS=OFF
-               -DCOMPILER_RT_BUILD_CRT=OFF
-               -DCOMPILER_RT_BUILD_CTX_PROFILE=$(usex ctx-profile)
-               -DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-               -DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
-               -DCOMPILER_RT_BUILD_ORC=$(usex orc)
-               -DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-               -DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
-               -DCOMPILER_RT_BUILD_XRAY=$(usex xray)
-
-               -DPython3_EXECUTABLE="${PYTHON}"
-       )
-
-       if use amd64; then
-               mycmakeargs+=(
-                       -DCAN_TARGET_i386=$(usex abi_x86_32)
-                       -DCAN_TARGET_x86_64=$(usex abi_x86_64)
-               )
-       fi
-
-       if use test; then
-               mycmakeargs+=(
-                       -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-                       -DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-                       # they are created during src_test()
-                       
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
-                       
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-               )
-
-               # same flags are passed for build & tests, so we need to strip
-               # them down to a subset supported by clang
-               CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
-               CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
-               strip-unsupported-flags
-       fi
-
-       if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-               mycmakeargs+=(
-                       # setting -isysroot is disabled with 
compiler-rt-prefix-paths.patch
-                       # this allows adding arm64 support using SDK in EPREFIX
-                       -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-                       # Set version based on the SDK in EPREFIX
-                       # This disables i386 for SDK >= 10.15
-                       # Will error if has_use tsan and SDK < 10.12
-                       -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath 
"${EPREFIX}/MacOSX.sdk" | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-                       # Use our libtool instead of looking it up with xcrun
-                       -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-               )
-       fi
-
-       cmake_src_configure
-
-       if use test; then
-               local sys_dest=( "${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/lib/* )
-               [[ ! -e ${sys_dest} ]] && die "Unable to find ${sys_dest}"
-               [[ ${#sys_dest[@]} -ne 1 ]] && die "Non-deterministic 
compiler-rt install: ${sys_dest[*]}"
-               local sys_dir=( 
"${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}/lib/${sys_dest##*/}" )
-               [[ ! -e ${sys_dir} ]] && die "${sys_dir} is missing"
-
-               # copy clang over since resource_dir is located relatively to 
binary
-               # therefore, we can put our new libraries in it
-               mkdir -p 
"${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include}
 || die
-               cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
-                       "${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
-               cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
-                       "${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
-               cp "${sys_dir}"/*builtins*.a "${sys_dest}/" || die
-               # we also need LLVMgold.so for gold-based tests
-               if [[ -f 
${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
-                       ln -s 
"${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
-                               
"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
-               fi
-       fi
-}
-
-src_test() {
-       # respect TMPDIR!
-       local -x LIT_PRESERVES_TMP=1
-       # disable sandbox to have it stop clobbering LD_PRELOAD
-       local -x SANDBOX_ON=0
-       # wipe LD_PRELOAD to make ASAN happy
-       local -x LD_PRELOAD=
-
-       cmake_build check-all
-}


Reply via email to