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

llvm-core/clang-common: Remove old

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

 llvm-core/clang-common/Manifest                    |   8 -
 .../clang-common/clang-common-17.0.6-r9.ebuild     | 302 ------------------
 llvm-core/clang-common/clang-common-20.1.8.ebuild  | 315 -------------------
 llvm-core/clang-common/clang-common-21.1.5.ebuild  | 339 ---------------------
 llvm-core/clang-common/clang-common-21.1.6.ebuild  | 339 ---------------------
 llvm-core/clang-common/clang-common-21.1.7.ebuild  | 339 ---------------------
 .../clang-common-22.0.0_pre20251108.ebuild         | 338 --------------------
 .../clang-common-22.0.0_pre20251120.ebuild         | 338 --------------------
 8 files changed, 2318 deletions(-)

diff --git a/llvm-core/clang-common/Manifest b/llvm-core/clang-common/Manifest
index 51875c2578c2..5139f5848d4f 100644
--- a/llvm-core/clang-common/Manifest
+++ b/llvm-core/clang-common/Manifest
@@ -1,4 +1,3 @@
-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
@@ -11,14 +10,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-core/clang-common/clang-common-17.0.6-r9.ebuild 
b/llvm-core/clang-common/clang-common-17.0.6-r9.ebuild
deleted file mode 100644
index ad81812b1375..000000000000
--- a/llvm-core/clang-common/clang-common-17.0.6-r9.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 llvm.org multilib
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/";
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~arm64-macos 
~x64-macos"
-IUSE="
-       default-compiler-rt default-libcxx default-lld
-       bootstrap-prefix cet hardened llvm-libunwind
-"
-
-PDEPEND="
-       default-compiler-rt? (
-               llvm-runtimes/clang-runtime:${LLVM_MAJOR}[compiler-rt]
-               llvm-libunwind? ( llvm-runtimes/libunwind[static-libs] )
-               !llvm-libunwind? ( sys-libs/libunwind[static-libs] )
-       )
-       !default-compiler-rt? ( sys-devel/gcc )
-       default-libcxx? ( >=llvm-runtimes/libcxx-${PV}[static-libs] )
-       !default-libcxx? ( sys-devel/gcc )
-       default-lld? ( >=llvm-core/lld-${PV} )
-       !default-lld? ( sys-devel/binutils )
-"
-IDEPEND="
-       !default-compiler-rt? ( sys-devel/gcc-config )
-       !default-libcxx? ( sys-devel/gcc-config )
-"
-
-LLVM_COMPONENTS=( clang/utils )
-llvm.org_set_globals
-
-pkg_pretend() {
-       [[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
-
-       local flag missing_flags=()
-       for flag in default-{compiler-rt,libcxx,lld}; do
-               if ! use "${flag}" && has_version "llvm-core/clang[${flag}]"; 
then
-                       missing_flags+=( "${flag}" )
-               fi
-       done
-
-       if [[ ${missing_flags[@]} ]]; then
-               eerror "It seems that you have the following flags set on 
llvm-core/clang:"
-               eerror
-               eerror "  ${missing_flags[*]}"
-               eerror
-               eerror "The default runtimes are now set via flags on 
llvm-core/clang-common."
-               eerror "The build is being aborted to prevent breakage.  Please 
either set"
-               eerror "the respective flags on this ebuild, e.g.:"
-               eerror
-               eerror "  llvm-core/clang-common ${missing_flags[*]}"
-               eerror
-               eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
-               die "Mismatched defaults detected between llvm-core/clang and 
llvm-core/clang-common"
-       fi
-}
-
-_doclang_cfg() {
-       local triple="${1}"
-
-       local tool
-       for tool in ${triple}-clang{,++}; do
-               newins - "${tool}.cfg" <<-EOF
-                       # This configuration file is used by ${tool} driver.
-                       @gentoo-common.cfg
-                       @gentoo-common-ld.cfg
-               EOF
-               if [[ ${triple} == x86_64* ]]; then
-                       cat >> "${ED}/etc/clang/${tool}.cfg" <<-EOF || die
-                               @gentoo-cet.cfg
-                       EOF
-               fi
-       done
-
-       if use kernel_Darwin; then
-               cat >> "${ED}/etc/clang/${triple}-clang++.cfg" <<-EOF || die
-                       -lc++abi
-               EOF
-       fi
-
-       newins - "${triple}-clang-cpp.cfg" <<-EOF
-               # This configuration file is used by the ${triple}-clang-cpp 
driver.
-               @gentoo-common.cfg
-       EOF
-       if [[ ${triple} == x86_64* ]]; then
-               cat >> "${ED}/etc/clang/${triple}-clang-cpp.cfg" <<-EOF || die
-                       @gentoo-cet.cfg
-               EOF
-       fi
-
-       # Install symlinks for triples with other vendor strings since some
-       # programs insist on mangling the triple.
-       local vendor
-       for vendor in gentoo pc unknown; do
-               local vendor_triple="${triple%%-*}-${vendor}-${triple#*-*-}"
-               for tool in clang{,++,-cpp}; do
-                       if [[ ! -f 
"${ED}/etc/clang/${vendor_triple}-${tool}.cfg" ]]; then
-                               dosym "${triple}-${tool}.cfg" 
"/etc/clang/${vendor_triple}-${tool}.cfg"
-                       fi
-               done
-       done
-}
-
-doclang_cfg() {
-       local triple="${1}"
-
-       _doclang_cfg ${triple}
-
-       # LLVM may have different arch names in some cases. For example in x86
-       # profiles the triple uses i686, but llvm will prefer i386 if invoked
-       # with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
-       # be used if invoked through ${CHOST}-clang{,++,-cpp} though.
-       #
-       # To make sure the correct triples are installed,
-       # see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
-       # and compare with CHOST values in profiles.
-
-       local abi=${triple%%-*}
-       case ${abi} in
-               armv4l|armv4t|armv5tel|armv6j|armv7a)
-                       _doclang_cfg ${triple/${abi}/arm}
-                       ;;
-               i686)
-                       _doclang_cfg ${triple/${abi}/i386}
-                       ;;
-               sparc)
-                       _doclang_cfg ${triple/${abi}/sparcel}
-                       ;;
-               sparc64)
-                       _doclang_cfg ${triple/${abi}/sparcv9}
-                       ;;
-       esac
-}
-
-src_install() {
-       newbashcomp bash-autocomplete.sh clang
-
-       insinto /etc/clang
-       newins - gentoo-runtimes.cfg <<-EOF
-               # This file is initially generated by 
llvm-runtimes/clang-runtime.
-               # It is used to control the default runtimes using by clang.
-
-               --rtlib=$(usex default-compiler-rt compiler-rt libgcc)
-               --unwindlib=$(usex default-compiler-rt libunwind libgcc)
-               --stdlib=$(usex default-libcxx libc++ libstdc++)
-               -fuse-ld=$(usex default-lld lld bfd)
-       EOF
-
-       newins - gentoo-gcc-install.cfg <<-EOF
-               # This file is maintained by gcc-config.
-               # It is used to specify the selected GCC installation.
-       EOF
-
-       newins - gentoo-common.cfg <<-EOF
-               # This file contains flags common to clang, clang++ and 
clang-cpp.
-               @gentoo-runtimes.cfg
-               @gentoo-gcc-install.cfg
-               @gentoo-hardened.cfg
-               # bug #870001
-               -include "${EPREFIX}/usr/include/gentoo/maybe-stddefs.h"
-       EOF
-
-       # clang-cpp does not like link args being passed to it when directly
-       # invoked, so use a separate configuration file.
-       newins - gentoo-common-ld.cfg <<-EOF
-               # This file contains flags common to clang and clang++
-               @gentoo-hardened-ld.cfg
-       EOF
-
-       # Baseline hardening (bug #851111)
-       newins - gentoo-hardened.cfg <<-EOF
-               # Some of these options are added unconditionally, regardless of
-               # USE=hardened, for parity with sys-devel/gcc.
-               -Xarch_host -fstack-clash-protection
-               -Xarch_host -fstack-protector-strong
-               -fPIE
-               -include "${EPREFIX}/usr/include/gentoo/fortify.h"
-       EOF
-
-       newins - gentoo-cet.cfg <<-EOF
-               -Xarch_host -fcf-protection=$(usex cet full none)
-       EOF
-
-       if use kernel_Darwin; then
-               newins - gentoo-hardened-ld.cfg <<-EOF
-                       # There was -Wl,-z,relro here, but it's not supported 
on Mac
-                       # TODO: investigate whether -bind_at_load or 
-read_only_stubs will do the job
-               EOF
-       else
-               newins - gentoo-hardened-ld.cfg <<-EOF
-                       # Some of these options are added unconditionally, 
regardless of
-                       # USE=hardened, for parity with sys-devel/gcc.
-                       -Wl,-z,relro
-                       -Wl,-z,now
-               EOF
-       fi
-
-       dodir /usr/include/gentoo
-
-       cat >> "${ED}/usr/include/gentoo/maybe-stddefs.h" <<-EOF || die
-       /* __has_include is an extension, but it's fine, because this is only
-       for Clang anyway. */
-       #if defined __has_include && __has_include (<stdc-predef.h>) && 
!defined(__GLIBC__)
-       # include <stdc-predef.h>
-       #endif
-       EOF
-
-       local fortify_level=$(usex hardened 3 2)
-       # We have to do this because glibc's headers warn if F_S is set
-       # without optimization and that would at the very least be very noisy
-       # during builds and at worst trigger many -Werror builds.
-       cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
-       #ifdef __clang__
-       # pragma clang system_header
-       #endif
-       #ifndef _FORTIFY_SOURCE
-       # if defined(__has_feature)
-       #  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
-       # else
-       #  define __GENTOO_HAS_FEATURE(x) 0
-       # endif
-       #
-       # if defined(__STDC_HOSTED__) && __STDC_HOSTED__ == 1
-       #  define __GENTOO_NOT_FREESTANDING 1
-       # else
-       #  define __GENTOO_NOT_FREESTANDING 0
-       # endif
-       #
-       # if defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 && 
__GENTOO_NOT_FREESTANDING > 0
-       #  if !defined(__SANITIZE_ADDRESS__) && 
!__GENTOO_HAS_FEATURE(address_sanitizer) && 
!__GENTOO_HAS_FEATURE(memory_sanitizer)
-       #   define _FORTIFY_SOURCE ${fortify_level}
-       #  endif
-       # endif
-       # undef __GENTOO_HAS_FEATURE
-       # undef __GENTOO_NOT_FREESTANDING
-       #endif
-       EOF
-
-       if use hardened ; then
-               cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
-                       # Options below are conditional on USE=hardened.
-                       -D_GLIBCXX_ASSERTIONS
-
-                       # Analogue to GLIBCXX_ASSERTIONS
-                       # 
https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
-                       # 
https://libcxx.llvm.org/Hardening.html#using-hardened-mode
-                       -D_LIBCPP_ENABLE_ASSERTIONS=1
-               EOF
-
-               cat >> "${ED}/etc/clang/gentoo-hardened-ld.cfg" <<-EOF || die
-                       # Options below are conditional on USE=hardened.
-               EOF
-       fi
-
-       # We only install config files for supported ABIs because unprefixed 
tools
-       # might be used for crosscompilation where e.g. PIE may not be 
supported.
-       # See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug 
#912685.
-       local abi
-       for abi in $(get_all_abis); do
-               local abi_chost=$(get_abi_CHOST "${abi}")
-               doclang_cfg "${abi_chost}"
-       done
-
-       if use kernel_Darwin; then
-               cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-                       # Gentoo Prefix on Darwin
-                       -Wl,-search_paths_first
-                       -Wl,-rpath,${EPREFIX}/usr/lib
-                       -L ${EPREFIX}/usr/lib
-                       -isystem ${EPREFIX}/usr/include
-                       -isysroot ${EPREFIX}/MacOSX.sdk
-               EOF
-               if use bootstrap-prefix ; then
-                       # bootstrap-prefix is only set during stage2 of 
bootstrapping
-                       # Prefix, where EPREFIX is set to EPREFIX/tmp.
-                       # Here we need to point it at the future lib dir of the 
stage3's
-                       # EPREFIX.
-                       cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-                               -Wl,-rpath,${EPREFIX}/../usr/lib
-                       EOF
-               fi
-       fi
-}
-
-pkg_preinst() {
-       if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
-       then
-               local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
-               if [[ -n ${gcc_path} ]]; then
-                       cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
-                               --gcc-install-dir="${gcc_path%%:*}"
-                       EOF
-               fi
-       fi
-}

diff --git a/llvm-core/clang-common/clang-common-20.1.8.ebuild 
b/llvm-core/clang-common/clang-common-20.1.8.ebuild
deleted file mode 100644
index 75a529ca4b5c..000000000000
--- a/llvm-core/clang-common/clang-common-20.1.8.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 llvm.org multilib
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/";
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 
~arm64-macos ~x64-macos"
-IUSE="
-       default-compiler-rt default-libcxx default-lld
-       bootstrap-prefix cet hardened llvm-libunwind
-"
-
-PDEPEND="
-       default-compiler-rt? (
-               llvm-runtimes/clang-runtime:${LLVM_MAJOR}[compiler-rt]
-               llvm-libunwind? ( llvm-runtimes/libunwind[static-libs] )
-               !llvm-libunwind? ( sys-libs/libunwind[static-libs] )
-       )
-       !default-compiler-rt? ( sys-devel/gcc )
-       default-libcxx? ( >=llvm-runtimes/libcxx-${PV}[static-libs] )
-       !default-libcxx? ( sys-devel/gcc )
-       default-lld? ( >=llvm-core/lld-${PV} )
-       !default-lld? ( sys-devel/binutils )
-"
-# enforce flags on clang-runtime as well to aid transition
-PDEPEND+="
-       
llvm-runtimes/clang-runtime[default-compiler-rt(-)?,default-libcxx(-)?,default-lld(-)?,llvm-libunwind(-)?]
-"
-IDEPEND="
-       !default-compiler-rt? ( sys-devel/gcc-config )
-       !default-libcxx? ( sys-devel/gcc-config )
-"
-
-LLVM_COMPONENTS=( clang/utils )
-llvm.org_set_globals
-
-pkg_pretend() {
-       [[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
-
-       local flag missing_flags=()
-       for flag in default-{compiler-rt,libcxx,lld}; do
-               if ! use "${flag}" && has_version "llvm-core/clang[${flag}]"; 
then
-                       missing_flags+=( "${flag}" )
-               fi
-       done
-
-       if [[ ${missing_flags[@]} ]]; then
-               eerror "It seems that you have the following flags set on 
llvm-core/clang:"
-               eerror
-               eerror "  ${missing_flags[*]}"
-               eerror
-               eerror "The default runtimes are now set via flags on 
llvm-core/clang-common."
-               eerror "The build is being aborted to prevent breakage.  Please 
either set"
-               eerror "the respective flags on this ebuild, e.g.:"
-               eerror
-               eerror "  llvm-core/clang-common ${missing_flags[*]}"
-               eerror
-               eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
-               die "Mismatched defaults detected between llvm-core/clang and 
llvm-core/clang-common"
-       fi
-}
-
-_doclang_cfg() {
-       local triple="${1}"
-
-       local tool
-       for tool in ${triple}-clang{,++}; do
-               newins - "${tool}.cfg" <<-EOF
-                       # This configuration file is used by ${tool} driver.
-                       @gentoo-common.cfg
-                       @gentoo-common-ld.cfg
-               EOF
-               if [[ ${triple} == x86_64* ]]; then
-                       cat >> "${ED}/etc/clang/${tool}.cfg" <<-EOF || die
-                               @gentoo-cet.cfg
-                       EOF
-               fi
-       done
-
-       if use kernel_Darwin; then
-               cat >> "${ED}/etc/clang/${triple}-clang++.cfg" <<-EOF || die
-                       -lc++abi
-               EOF
-       fi
-
-       newins - "${triple}-clang-cpp.cfg" <<-EOF
-               # This configuration file is used by the ${triple}-clang-cpp 
driver.
-               @gentoo-common.cfg
-       EOF
-       if [[ ${triple} == x86_64* ]]; then
-               cat >> "${ED}/etc/clang/${triple}-clang-cpp.cfg" <<-EOF || die
-                       @gentoo-cet.cfg
-               EOF
-       fi
-
-       # Install symlinks for triples with other vendor strings since some
-       # programs insist on mangling the triple.
-       local vendor
-       for vendor in gentoo pc unknown; do
-               local vendor_triple="${triple%%-*}-${vendor}-${triple#*-*-}"
-               for tool in clang{,++,-cpp}; do
-                       if [[ ! -f 
"${ED}/etc/clang/${vendor_triple}-${tool}.cfg" ]]; then
-                               dosym "${triple}-${tool}.cfg" 
"/etc/clang/${vendor_triple}-${tool}.cfg"
-                       fi
-               done
-       done
-}
-
-doclang_cfg() {
-       local triple="${1}"
-
-       _doclang_cfg ${triple}
-
-       # LLVM may have different arch names in some cases. For example in x86
-       # profiles the triple uses i686, but llvm will prefer i386 if invoked
-       # with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
-       # be used if invoked through ${CHOST}-clang{,++,-cpp} though.
-       #
-       # To make sure the correct triples are installed,
-       # see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
-       # and compare with CHOST values in profiles.
-
-       local abi=${triple%%-*}
-       case ${abi} in
-               armv4l|armv4t|armv5tel|armv6j|armv7a)
-                       _doclang_cfg ${triple/${abi}/arm}
-                       ;;
-               i686)
-                       _doclang_cfg ${triple/${abi}/i386}
-                       ;;
-               sparc)
-                       _doclang_cfg ${triple/${abi}/sparcel}
-                       ;;
-               sparc64)
-                       _doclang_cfg ${triple/${abi}/sparcv9}
-                       ;;
-       esac
-}
-
-src_install() {
-       newbashcomp bash-autocomplete.sh clang
-
-       insinto /etc/clang
-       newins - gentoo-runtimes.cfg <<-EOF
-               # This file is initially generated by 
llvm-runtimes/clang-runtime.
-               # It is used to control the default runtimes using by clang.
-
-               --rtlib=$(usex default-compiler-rt compiler-rt libgcc)
-               --unwindlib=$(usex default-compiler-rt libunwind libgcc)
-               --stdlib=$(usex default-libcxx libc++ libstdc++)
-               -fuse-ld=$(usex default-lld lld bfd)
-       EOF
-
-       newins - gentoo-gcc-install.cfg <<-EOF
-               # This file is maintained by gcc-config.
-               # It is used to specify the selected GCC installation.
-       EOF
-
-       newins - gentoo-common.cfg <<-EOF
-               # This file contains flags common to clang, clang++ and 
clang-cpp.
-               @gentoo-runtimes.cfg
-               @gentoo-gcc-install.cfg
-               @gentoo-hardened.cfg
-               # bug #870001
-               -include "${EPREFIX}/usr/include/gentoo/maybe-stddefs.h"
-       EOF
-
-       # clang-cpp does not like link args being passed to it when directly
-       # invoked, so use a separate configuration file.
-       newins - gentoo-common-ld.cfg <<-EOF
-               # This file contains flags common to clang and clang++
-               @gentoo-hardened-ld.cfg
-       EOF
-
-       # Baseline hardening (bug #851111)
-       newins - gentoo-hardened.cfg <<-EOF
-               # Some of these options are added unconditionally, regardless of
-               # USE=hardened, for parity with sys-devel/gcc.
-               -Xarch_host -fstack-clash-protection
-               -Xarch_host -fstack-protector-strong
-               -fPIE
-               -include "${EPREFIX}/usr/include/gentoo/fortify.h"
-       EOF
-
-       newins - gentoo-cet.cfg <<-EOF
-               -Xarch_host -fcf-protection=$(usex cet full none)
-       EOF
-
-       if use kernel_Darwin; then
-               newins - gentoo-hardened-ld.cfg <<-EOF
-                       # There was -Wl,-z,relro here, but it's not supported 
on Mac
-                       # TODO: investigate whether -bind_at_load or 
-read_only_stubs will do the job
-               EOF
-       else
-               newins - gentoo-hardened-ld.cfg <<-EOF
-                       # Some of these options are added unconditionally, 
regardless of
-                       # USE=hardened, for parity with sys-devel/gcc.
-                       -Wl,-z,relro
-                       -Wl,-z,now
-               EOF
-       fi
-
-       dodir /usr/include/gentoo
-
-       cat >> "${ED}/usr/include/gentoo/maybe-stddefs.h" <<-EOF || die
-       /* __has_include is an extension, but it's fine, because this is only
-       for Clang anyway. */
-       #if defined __has_include && __has_include (<stdc-predef.h>) && 
!defined(__GLIBC__)
-       # include <stdc-predef.h>
-       #endif
-       EOF
-
-       local fortify_level=$(usex hardened 3 2)
-       # We have to do this because glibc's headers warn if F_S is set
-       # without optimization and that would at the very least be very noisy
-       # during builds and at worst trigger many -Werror builds.
-       cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
-       #ifdef __clang__
-       # pragma clang system_header
-       #endif
-       #ifndef _FORTIFY_SOURCE
-       # if defined(__has_feature)
-       #  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
-       # else
-       #  define __GENTOO_HAS_FEATURE(x) 0
-       # endif
-       #
-       # if !defined(__OPTIMIZE__) || __OPTIMIZE__ == 0
-       # elif !defined(__STDC_HOSTED__) || __STDC_HOSTED__ != 1
-       # elif defined(__SANITIZE_ADDRESS__)
-       # elif __GENTOO_HAS_FEATURE(address_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(hwaddress_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(memory_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(numerical_stability_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(realtime_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(thread_sanitizer)
-       # else
-       #  define _FORTIFY_SOURCE ${fortify_level}
-       # endif
-       #
-       # undef __GENTOO_HAS_FEATURE
-       #endif
-       EOF
-
-       # TODO: Maybe -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST for
-       # non-hardened?
-       if use hardened ; then
-               cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
-                       # Options below are conditional on USE=hardened.
-                       -Xarch_host -D_GLIBCXX_ASSERTIONS
-
-                       # Analogue to GLIBCXX_ASSERTIONS
-                       # 
https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
-                       # 
https://libcxx.llvm.org/Hardening.html#using-hardened-mode
-                       -Xarch_host 
-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE
-               EOF
-
-               cat >> "${ED}/etc/clang/gentoo-hardened-ld.cfg" <<-EOF || die
-                       # Options below are conditional on USE=hardened.
-               EOF
-       fi
-
-       # We only install config files for supported ABIs because unprefixed 
tools
-       # might be used for crosscompilation where e.g. PIE may not be 
supported.
-       # See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug 
#912685.
-       local abi
-       for abi in $(get_all_abis); do
-               local abi_chost=$(get_abi_CHOST "${abi}")
-               doclang_cfg "${abi_chost}"
-       done
-
-       if use kernel_Darwin; then
-               cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-                       # Gentoo Prefix on Darwin
-                       -Wl,-search_paths_first
-               EOF
-               if use bootstrap-prefix ; then
-                       # bootstrap-prefix is only set during stage2 of 
bootstrapping
-                       # Prefix, where EPREFIX is set to EPREFIX/tmp.
-                       # Here we need to point it at the future lib dir of the 
stage3's
-                       # EPREFIX.
-                       cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-                               -Wl,-rpath,${EPREFIX}/../usr/lib
-                               -Wl,-L,${EPREFIX}/../usr/lib
-                               -isystem ${EPREFIX}/../usr/include
-                       EOF
-               fi
-               # Using -Wl,-L instead of -L to trick compiler driver to put it
-               # after -isysroot's internal -L
-               cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-                       -Wl,-rpath,${EPREFIX}/usr/lib
-                       -Wl,-L,${EPREFIX}/usr/lib
-                       -isystem ${EPREFIX}/usr/include
-                       -isysroot ${EPREFIX}/MacOSX.sdk
-               EOF
-       fi
-}
-
-pkg_preinst() {
-       if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
-       then
-               local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
-               if [[ -n ${gcc_path} ]]; then
-                       cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
-                               --gcc-install-dir="${gcc_path%%:*}"
-                       EOF
-               fi
-       fi
-}

diff --git a/llvm-core/clang-common/clang-common-21.1.5.ebuild 
b/llvm-core/clang-common/clang-common-21.1.5.ebuild
deleted file mode 100644
index 20df295eca0a..000000000000
--- a/llvm-core/clang-common/clang-common-21.1.5.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 elisp-common llvm.org multilib
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/";
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 
~arm64-macos ~x64-macos"
-IUSE="
-       default-compiler-rt default-libcxx default-lld
-       bootstrap-prefix cet emacs hardened llvm-libunwind
-"
-
-PDEPEND="
-       default-compiler-rt? (
-               llvm-runtimes/clang-runtime:${LLVM_MAJOR}[compiler-rt]
-               llvm-libunwind? ( llvm-runtimes/libunwind[static-libs] )
-               !llvm-libunwind? ( sys-libs/libunwind[static-libs] )
-       )
-       !default-compiler-rt? ( sys-devel/gcc )
-       default-libcxx? ( >=llvm-runtimes/libcxx-${PV}[static-libs] )
-       !default-libcxx? ( sys-devel/gcc )
-       default-lld? ( >=llvm-core/lld-${PV} )
-       !default-lld? ( sys-devel/binutils )
-"
-# enforce flags on clang-runtime as well to aid transition
-PDEPEND+="
-       
llvm-runtimes/clang-runtime[default-compiler-rt(-)?,default-libcxx(-)?,default-lld(-)?,llvm-libunwind(-)?]
-       emacs? ( >=app-editors/emacs-26.3:* )
-"
-IDEPEND="
-       !default-compiler-rt? ( sys-devel/gcc-config )
-       !default-libcxx? ( sys-devel/gcc-config )
-"
-BDEPEND="
-       emacs? ( >=app-editors/emacs-26.3:* )
-"
-
-LLVM_COMPONENTS=( clang/utils clang/tools/clang-format )
-llvm.org_set_globals
-
-SITEFILE="50clang-gentoo.el"
-
-pkg_pretend() {
-       [[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
-
-       local flag missing_flags=()
-       for flag in default-{compiler-rt,libcxx,lld}; do
-               if ! use "${flag}" && has_version "llvm-core/clang[${flag}]"; 
then
-                       missing_flags+=( "${flag}" )
-               fi
-       done
-
-       if [[ ${missing_flags[@]} ]]; then
-               eerror "It seems that you have the following flags set on 
llvm-core/clang:"
-               eerror
-               eerror "  ${missing_flags[*]}"
-               eerror
-               eerror "The default runtimes are now set via flags on 
llvm-core/clang-common."
-               eerror "The build is being aborted to prevent breakage.  Please 
either set"
-               eerror "the respective flags on this ebuild, e.g.:"
-               eerror
-               eerror "  llvm-core/clang-common ${missing_flags[*]}"
-               eerror
-               eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
-               die "Mismatched defaults detected between llvm-core/clang and 
llvm-core/clang-common"
-       fi
-}
-
-_doclang_cfg() {
-       local triple="${1}"
-
-       local tool
-       for tool in ${triple}-clang{,++}; do
-               newins - "${tool}.cfg" <<-EOF
-                       # This configuration file is used by ${tool} driver.
-                       @gentoo-common.cfg
-                       @gentoo-common-ld.cfg
-               EOF
-               if [[ ${triple} == x86_64* ]]; then
-                       cat >> "${ED}/etc/clang/${tool}.cfg" <<-EOF || die
-                               @gentoo-cet.cfg
-                       EOF
-               fi
-       done
-
-       if use kernel_Darwin; then
-               cat >> "${ED}/etc/clang/${triple}-clang++.cfg" <<-EOF || die
-                       -lc++abi
-               EOF
-       fi
-
-       newins - "${triple}-clang-cpp.cfg" <<-EOF
-               # This configuration file is used by the ${triple}-clang-cpp 
driver.
-               @gentoo-common.cfg
-       EOF
-       if [[ ${triple} == x86_64* ]]; then
-               cat >> "${ED}/etc/clang/${triple}-clang-cpp.cfg" <<-EOF || die
-                       @gentoo-cet.cfg
-               EOF
-       fi
-
-       # Install symlinks for triples with other vendor strings since some
-       # programs insist on mangling the triple.
-       local vendor
-       for vendor in gentoo pc unknown; do
-               local vendor_triple="${triple%%-*}-${vendor}-${triple#*-*-}"
-               for tool in clang{,++,-cpp}; do
-                       if [[ ! -f 
"${ED}/etc/clang/${vendor_triple}-${tool}.cfg" ]]; then
-                               dosym "${triple}-${tool}.cfg" 
"/etc/clang/${vendor_triple}-${tool}.cfg"
-                       fi
-               done
-       done
-}
-
-doclang_cfg() {
-       local triple="${1}"
-
-       _doclang_cfg ${triple}
-
-       # LLVM may have different arch names in some cases. For example in x86
-       # profiles the triple uses i686, but llvm will prefer i386 if invoked
-       # with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
-       # be used if invoked through ${CHOST}-clang{,++,-cpp} though.
-       #
-       # To make sure the correct triples are installed,
-       # see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
-       # and compare with CHOST values in profiles.
-
-       local abi=${triple%%-*}
-       case ${abi} in
-               armv4l|armv4t|armv5tel|armv6j|armv7a)
-                       _doclang_cfg ${triple/${abi}/arm}
-                       ;;
-               i686)
-                       _doclang_cfg ${triple/${abi}/i386}
-                       ;;
-               sparc)
-                       _doclang_cfg ${triple/${abi}/sparcel}
-                       ;;
-               sparc64)
-                       _doclang_cfg ${triple/${abi}/sparcv9}
-                       ;;
-       esac
-}
-
-src_compile() {
-       default
-       use emacs && elisp-compile ../tools/clang-format/clang-format.el
-}
-
-src_install() {
-       newbashcomp bash-autocomplete.sh clang
-
-       insinto /etc/clang
-       newins - gentoo-runtimes.cfg <<-EOF
-               # This file is initially generated by 
llvm-runtimes/clang-runtime.
-               # It is used to control the default runtimes using by clang.
-
-               --rtlib=$(usex default-compiler-rt compiler-rt libgcc)
-               --unwindlib=$(usex default-compiler-rt libunwind libgcc)
-               --stdlib=$(usex default-libcxx libc++ libstdc++)
-               -fuse-ld=$(usex default-lld lld bfd)
-       EOF
-
-       newins - gentoo-gcc-install.cfg <<-EOF
-               # This file is maintained by gcc-config.
-               # It is used to specify the selected GCC installation.
-       EOF
-
-       newins - gentoo-common.cfg <<-EOF
-               # This file contains flags common to clang, clang++ and 
clang-cpp.
-               @gentoo-runtimes.cfg
-               @gentoo-gcc-install.cfg
-               @gentoo-hardened.cfg
-               # bug #870001
-               -include "${EPREFIX}/usr/include/gentoo/maybe-stddefs.h"
-       EOF
-
-       # clang-cpp does not like link args being passed to it when directly
-       # invoked, so use a separate configuration file.
-       newins - gentoo-common-ld.cfg <<-EOF
-               # This file contains flags common to clang and clang++
-               @gentoo-hardened-ld.cfg
-       EOF
-
-       # Baseline hardening (bug #851111)
-       newins - gentoo-hardened.cfg <<-EOF
-               # Some of these options are added unconditionally, regardless of
-               # USE=hardened, for parity with sys-devel/gcc.
-               -Xarch_host -fstack-clash-protection
-               -Xarch_host -fstack-protector-strong
-               -fPIE
-               -include "${EPREFIX}/usr/include/gentoo/fortify.h"
-       EOF
-
-       newins - gentoo-cet.cfg <<-EOF
-               -Xarch_host -fcf-protection=$(usex cet full none)
-       EOF
-
-       if use kernel_Darwin; then
-               newins - gentoo-hardened-ld.cfg <<-EOF
-                       # There was -Wl,-z,relro here, but it's not supported 
on Mac
-                       # TODO: investigate whether -bind_at_load or 
-read_only_stubs will do the job
-               EOF
-       else
-               newins - gentoo-hardened-ld.cfg <<-EOF
-                       # Some of these options are added unconditionally, 
regardless of
-                       # USE=hardened, for parity with sys-devel/gcc.
-                       -Wl,-z,relro
-                       -Wl,-z,now
-               EOF
-       fi
-
-       dodir /usr/include/gentoo
-
-       cat >> "${ED}/usr/include/gentoo/maybe-stddefs.h" <<-EOF || die
-       /* __has_include is an extension, but it's fine, because this is only
-       for Clang anyway. */
-       #if defined __has_include && __has_include (<stdc-predef.h>) && 
!defined(__GLIBC__)
-       # include <stdc-predef.h>
-       #endif
-       EOF
-
-       local fortify_level=$(usex hardened 3 2)
-       # We have to do this because glibc's headers warn if F_S is set
-       # without optimization and that would at the very least be very noisy
-       # during builds and at worst trigger many -Werror builds.
-       cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
-       #ifdef __clang__
-       # pragma clang system_header
-       #endif
-       #ifndef _FORTIFY_SOURCE
-       # if defined(__has_feature)
-       #  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
-       # else
-       #  define __GENTOO_HAS_FEATURE(x) 0
-       # endif
-       #
-       # if !defined(__OPTIMIZE__) || __OPTIMIZE__ == 0
-       # elif !defined(__STDC_HOSTED__) || __STDC_HOSTED__ != 1
-       # elif defined(__SANITIZE_ADDRESS__)
-       # elif __GENTOO_HAS_FEATURE(address_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(hwaddress_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(memory_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(numerical_stability_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(realtime_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(thread_sanitizer)
-       # else
-       #  define _FORTIFY_SOURCE ${fortify_level}
-       # endif
-       #
-       # undef __GENTOO_HAS_FEATURE
-       #endif
-       EOF
-
-       # TODO: Maybe -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST for
-       # non-hardened?
-       if use hardened ; then
-               cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
-                       # Options below are conditional on USE=hardened.
-                       -Xarch_host -D_GLIBCXX_ASSERTIONS
-
-                       # Analogue to GLIBCXX_ASSERTIONS
-                       # 
https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
-                       # 
https://libcxx.llvm.org/Hardening.html#using-hardened-mode
-                       -Xarch_host 
-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE
-               EOF
-
-               cat >> "${ED}/etc/clang/gentoo-hardened-ld.cfg" <<-EOF || die
-                       # Options below are conditional on USE=hardened.
-               EOF
-       fi
-
-       # We only install config files for supported ABIs because unprefixed 
tools
-       # might be used for crosscompilation where e.g. PIE may not be 
supported.
-       # See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug 
#912685.
-       local abi
-       for abi in $(get_all_abis); do
-               local abi_chost=$(get_abi_CHOST "${abi}")
-               doclang_cfg "${abi_chost}"
-       done
-
-       if use kernel_Darwin; then
-               cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-                       # Gentoo Prefix on Darwin
-                       -Wl,-search_paths_first
-               EOF
-               if use bootstrap-prefix ; then
-                       # bootstrap-prefix is only set during stage2 of 
bootstrapping
-                       # Prefix, where EPREFIX is set to EPREFIX/tmp.
-                       # Here we need to point it at the future lib dir of the 
stage3's
-                       # EPREFIX.
-                       cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-                               -Wl,-rpath,${EPREFIX}/../usr/lib
-                               -Wl,-L,${EPREFIX}/../usr/lib
-                               -isystem ${EPREFIX}/../usr/include
-                       EOF
-               fi
-               # Using -Wl,-L instead of -L to trick compiler driver to put it
-               # after -isysroot's internal -L
-               cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-                       -Wl,-rpath,${EPREFIX}/usr/lib
-                       -Wl,-L,${EPREFIX}/usr/lib
-                       -isystem ${EPREFIX}/usr/include
-                       -isysroot ${EPREFIX}/MacOSX.sdk
-               EOF
-       fi
-
-       if use emacs ; then
-               elisp-install clang ../tools/clang-format/clang-format.{el,elc}
-               elisp-make-site-file "${SITEFILE}" clang
-       fi
-}
-
-pkg_preinst() {
-       if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
-       then
-               local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
-               if [[ -n ${gcc_path} ]]; then
-                       cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
-                               --gcc-install-dir="${gcc_path%%:*}"
-                       EOF
-               fi
-       fi
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-}

diff --git a/llvm-core/clang-common/clang-common-21.1.6.ebuild 
b/llvm-core/clang-common/clang-common-21.1.6.ebuild
deleted file mode 100644
index 20df295eca0a..000000000000
--- a/llvm-core/clang-common/clang-common-21.1.6.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 elisp-common llvm.org multilib
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/";
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 
~arm64-macos ~x64-macos"
-IUSE="
-       default-compiler-rt default-libcxx default-lld
-       bootstrap-prefix cet emacs hardened llvm-libunwind
-"
-
-PDEPEND="
-       default-compiler-rt? (
-               llvm-runtimes/clang-runtime:${LLVM_MAJOR}[compiler-rt]
-               llvm-libunwind? ( llvm-runtimes/libunwind[static-libs] )
-               !llvm-libunwind? ( sys-libs/libunwind[static-libs] )
-       )
-       !default-compiler-rt? ( sys-devel/gcc )
-       default-libcxx? ( >=llvm-runtimes/libcxx-${PV}[static-libs] )
-       !default-libcxx? ( sys-devel/gcc )
-       default-lld? ( >=llvm-core/lld-${PV} )
-       !default-lld? ( sys-devel/binutils )
-"
-# enforce flags on clang-runtime as well to aid transition
-PDEPEND+="
-       
llvm-runtimes/clang-runtime[default-compiler-rt(-)?,default-libcxx(-)?,default-lld(-)?,llvm-libunwind(-)?]
-       emacs? ( >=app-editors/emacs-26.3:* )
-"
-IDEPEND="
-       !default-compiler-rt? ( sys-devel/gcc-config )
-       !default-libcxx? ( sys-devel/gcc-config )
-"
-BDEPEND="
-       emacs? ( >=app-editors/emacs-26.3:* )
-"
-
-LLVM_COMPONENTS=( clang/utils clang/tools/clang-format )
-llvm.org_set_globals
-
-SITEFILE="50clang-gentoo.el"
-
-pkg_pretend() {
-       [[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
-
-       local flag missing_flags=()
-       for flag in default-{compiler-rt,libcxx,lld}; do
-               if ! use "${flag}" && has_version "llvm-core/clang[${flag}]"; 
then
-                       missing_flags+=( "${flag}" )
-               fi
-       done
-
-       if [[ ${missing_flags[@]} ]]; then
-               eerror "It seems that you have the following flags set on 
llvm-core/clang:"
-               eerror
-               eerror "  ${missing_flags[*]}"
-               eerror
-               eerror "The default runtimes are now set via flags on 
llvm-core/clang-common."
-               eerror "The build is being aborted to prevent breakage.  Please 
either set"
-               eerror "the respective flags on this ebuild, e.g.:"
-               eerror
-               eerror "  llvm-core/clang-common ${missing_flags[*]}"
-               eerror
-               eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
-               die "Mismatched defaults detected between llvm-core/clang and 
llvm-core/clang-common"
-       fi
-}
-
-_doclang_cfg() {
-       local triple="${1}"
-
-       local tool
-       for tool in ${triple}-clang{,++}; do
-               newins - "${tool}.cfg" <<-EOF
-                       # This configuration file is used by ${tool} driver.
-                       @gentoo-common.cfg
-                       @gentoo-common-ld.cfg
-               EOF
-               if [[ ${triple} == x86_64* ]]; then
-                       cat >> "${ED}/etc/clang/${tool}.cfg" <<-EOF || die
-                               @gentoo-cet.cfg
-                       EOF
-               fi
-       done
-
-       if use kernel_Darwin; then
-               cat >> "${ED}/etc/clang/${triple}-clang++.cfg" <<-EOF || die
-                       -lc++abi
-               EOF
-       fi
-
-       newins - "${triple}-clang-cpp.cfg" <<-EOF
-               # This configuration file is used by the ${triple}-clang-cpp 
driver.
-               @gentoo-common.cfg
-       EOF
-       if [[ ${triple} == x86_64* ]]; then
-               cat >> "${ED}/etc/clang/${triple}-clang-cpp.cfg" <<-EOF || die
-                       @gentoo-cet.cfg
-               EOF
-       fi
-
-       # Install symlinks for triples with other vendor strings since some
-       # programs insist on mangling the triple.
-       local vendor
-       for vendor in gentoo pc unknown; do
-               local vendor_triple="${triple%%-*}-${vendor}-${triple#*-*-}"
-               for tool in clang{,++,-cpp}; do
-                       if [[ ! -f 
"${ED}/etc/clang/${vendor_triple}-${tool}.cfg" ]]; then
-                               dosym "${triple}-${tool}.cfg" 
"/etc/clang/${vendor_triple}-${tool}.cfg"
-                       fi
-               done
-       done
-}
-
-doclang_cfg() {
-       local triple="${1}"
-
-       _doclang_cfg ${triple}
-
-       # LLVM may have different arch names in some cases. For example in x86
-       # profiles the triple uses i686, but llvm will prefer i386 if invoked
-       # with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
-       # be used if invoked through ${CHOST}-clang{,++,-cpp} though.
-       #
-       # To make sure the correct triples are installed,
-       # see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
-       # and compare with CHOST values in profiles.
-
-       local abi=${triple%%-*}
-       case ${abi} in
-               armv4l|armv4t|armv5tel|armv6j|armv7a)
-                       _doclang_cfg ${triple/${abi}/arm}
-                       ;;
-               i686)
-                       _doclang_cfg ${triple/${abi}/i386}
-                       ;;
-               sparc)
-                       _doclang_cfg ${triple/${abi}/sparcel}
-                       ;;
-               sparc64)
-                       _doclang_cfg ${triple/${abi}/sparcv9}
-                       ;;
-       esac
-}
-
-src_compile() {
-       default
-       use emacs && elisp-compile ../tools/clang-format/clang-format.el
-}
-
-src_install() {
-       newbashcomp bash-autocomplete.sh clang
-
-       insinto /etc/clang
-       newins - gentoo-runtimes.cfg <<-EOF
-               # This file is initially generated by 
llvm-runtimes/clang-runtime.
-               # It is used to control the default runtimes using by clang.
-
-               --rtlib=$(usex default-compiler-rt compiler-rt libgcc)
-               --unwindlib=$(usex default-compiler-rt libunwind libgcc)
-               --stdlib=$(usex default-libcxx libc++ libstdc++)
-               -fuse-ld=$(usex default-lld lld bfd)
-       EOF
-
-       newins - gentoo-gcc-install.cfg <<-EOF
-               # This file is maintained by gcc-config.
-               # It is used to specify the selected GCC installation.
-       EOF
-
-       newins - gentoo-common.cfg <<-EOF
-               # This file contains flags common to clang, clang++ and 
clang-cpp.
-               @gentoo-runtimes.cfg
-               @gentoo-gcc-install.cfg
-               @gentoo-hardened.cfg
-               # bug #870001
-               -include "${EPREFIX}/usr/include/gentoo/maybe-stddefs.h"
-       EOF
-
-       # clang-cpp does not like link args being passed to it when directly
-       # invoked, so use a separate configuration file.
-       newins - gentoo-common-ld.cfg <<-EOF
-               # This file contains flags common to clang and clang++
-               @gentoo-hardened-ld.cfg
-       EOF
-
-       # Baseline hardening (bug #851111)
-       newins - gentoo-hardened.cfg <<-EOF
-               # Some of these options are added unconditionally, regardless of
-               # USE=hardened, for parity with sys-devel/gcc.
-               -Xarch_host -fstack-clash-protection
-               -Xarch_host -fstack-protector-strong
-               -fPIE
-               -include "${EPREFIX}/usr/include/gentoo/fortify.h"
-       EOF
-
-       newins - gentoo-cet.cfg <<-EOF
-               -Xarch_host -fcf-protection=$(usex cet full none)
-       EOF
-
-       if use kernel_Darwin; then
-               newins - gentoo-hardened-ld.cfg <<-EOF
-                       # There was -Wl,-z,relro here, but it's not supported 
on Mac
-                       # TODO: investigate whether -bind_at_load or 
-read_only_stubs will do the job
-               EOF
-       else
-               newins - gentoo-hardened-ld.cfg <<-EOF
-                       # Some of these options are added unconditionally, 
regardless of
-                       # USE=hardened, for parity with sys-devel/gcc.
-                       -Wl,-z,relro
-                       -Wl,-z,now
-               EOF
-       fi
-
-       dodir /usr/include/gentoo
-
-       cat >> "${ED}/usr/include/gentoo/maybe-stddefs.h" <<-EOF || die
-       /* __has_include is an extension, but it's fine, because this is only
-       for Clang anyway. */
-       #if defined __has_include && __has_include (<stdc-predef.h>) && 
!defined(__GLIBC__)
-       # include <stdc-predef.h>
-       #endif
-       EOF
-
-       local fortify_level=$(usex hardened 3 2)
-       # We have to do this because glibc's headers warn if F_S is set
-       # without optimization and that would at the very least be very noisy
-       # during builds and at worst trigger many -Werror builds.
-       cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
-       #ifdef __clang__
-       # pragma clang system_header
-       #endif
-       #ifndef _FORTIFY_SOURCE
-       # if defined(__has_feature)
-       #  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
-       # else
-       #  define __GENTOO_HAS_FEATURE(x) 0
-       # endif
-       #
-       # if !defined(__OPTIMIZE__) || __OPTIMIZE__ == 0
-       # elif !defined(__STDC_HOSTED__) || __STDC_HOSTED__ != 1
-       # elif defined(__SANITIZE_ADDRESS__)
-       # elif __GENTOO_HAS_FEATURE(address_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(hwaddress_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(memory_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(numerical_stability_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(realtime_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(thread_sanitizer)
-       # else
-       #  define _FORTIFY_SOURCE ${fortify_level}
-       # endif
-       #
-       # undef __GENTOO_HAS_FEATURE
-       #endif
-       EOF
-
-       # TODO: Maybe -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST for
-       # non-hardened?
-       if use hardened ; then
-               cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
-                       # Options below are conditional on USE=hardened.
-                       -Xarch_host -D_GLIBCXX_ASSERTIONS
-
-                       # Analogue to GLIBCXX_ASSERTIONS
-                       # 
https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
-                       # 
https://libcxx.llvm.org/Hardening.html#using-hardened-mode
-                       -Xarch_host 
-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE
-               EOF
-
-               cat >> "${ED}/etc/clang/gentoo-hardened-ld.cfg" <<-EOF || die
-                       # Options below are conditional on USE=hardened.
-               EOF
-       fi
-
-       # We only install config files for supported ABIs because unprefixed 
tools
-       # might be used for crosscompilation where e.g. PIE may not be 
supported.
-       # See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug 
#912685.
-       local abi
-       for abi in $(get_all_abis); do
-               local abi_chost=$(get_abi_CHOST "${abi}")
-               doclang_cfg "${abi_chost}"
-       done
-
-       if use kernel_Darwin; then
-               cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-                       # Gentoo Prefix on Darwin
-                       -Wl,-search_paths_first
-               EOF
-               if use bootstrap-prefix ; then
-                       # bootstrap-prefix is only set during stage2 of 
bootstrapping
-                       # Prefix, where EPREFIX is set to EPREFIX/tmp.
-                       # Here we need to point it at the future lib dir of the 
stage3's
-                       # EPREFIX.
-                       cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-                               -Wl,-rpath,${EPREFIX}/../usr/lib
-                               -Wl,-L,${EPREFIX}/../usr/lib
-                               -isystem ${EPREFIX}/../usr/include
-                       EOF
-               fi
-               # Using -Wl,-L instead of -L to trick compiler driver to put it
-               # after -isysroot's internal -L
-               cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-                       -Wl,-rpath,${EPREFIX}/usr/lib
-                       -Wl,-L,${EPREFIX}/usr/lib
-                       -isystem ${EPREFIX}/usr/include
-                       -isysroot ${EPREFIX}/MacOSX.sdk
-               EOF
-       fi
-
-       if use emacs ; then
-               elisp-install clang ../tools/clang-format/clang-format.{el,elc}
-               elisp-make-site-file "${SITEFILE}" clang
-       fi
-}
-
-pkg_preinst() {
-       if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
-       then
-               local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
-               if [[ -n ${gcc_path} ]]; then
-                       cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
-                               --gcc-install-dir="${gcc_path%%:*}"
-                       EOF
-               fi
-       fi
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-}

diff --git a/llvm-core/clang-common/clang-common-21.1.7.ebuild 
b/llvm-core/clang-common/clang-common-21.1.7.ebuild
deleted file mode 100644
index 20df295eca0a..000000000000
--- a/llvm-core/clang-common/clang-common-21.1.7.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 elisp-common llvm.org multilib
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/";
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 
~arm64-macos ~x64-macos"
-IUSE="
-       default-compiler-rt default-libcxx default-lld
-       bootstrap-prefix cet emacs hardened llvm-libunwind
-"
-
-PDEPEND="
-       default-compiler-rt? (
-               llvm-runtimes/clang-runtime:${LLVM_MAJOR}[compiler-rt]
-               llvm-libunwind? ( llvm-runtimes/libunwind[static-libs] )
-               !llvm-libunwind? ( sys-libs/libunwind[static-libs] )
-       )
-       !default-compiler-rt? ( sys-devel/gcc )
-       default-libcxx? ( >=llvm-runtimes/libcxx-${PV}[static-libs] )
-       !default-libcxx? ( sys-devel/gcc )
-       default-lld? ( >=llvm-core/lld-${PV} )
-       !default-lld? ( sys-devel/binutils )
-"
-# enforce flags on clang-runtime as well to aid transition
-PDEPEND+="
-       
llvm-runtimes/clang-runtime[default-compiler-rt(-)?,default-libcxx(-)?,default-lld(-)?,llvm-libunwind(-)?]
-       emacs? ( >=app-editors/emacs-26.3:* )
-"
-IDEPEND="
-       !default-compiler-rt? ( sys-devel/gcc-config )
-       !default-libcxx? ( sys-devel/gcc-config )
-"
-BDEPEND="
-       emacs? ( >=app-editors/emacs-26.3:* )
-"
-
-LLVM_COMPONENTS=( clang/utils clang/tools/clang-format )
-llvm.org_set_globals
-
-SITEFILE="50clang-gentoo.el"
-
-pkg_pretend() {
-       [[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
-
-       local flag missing_flags=()
-       for flag in default-{compiler-rt,libcxx,lld}; do
-               if ! use "${flag}" && has_version "llvm-core/clang[${flag}]"; 
then
-                       missing_flags+=( "${flag}" )
-               fi
-       done
-
-       if [[ ${missing_flags[@]} ]]; then
-               eerror "It seems that you have the following flags set on 
llvm-core/clang:"
-               eerror
-               eerror "  ${missing_flags[*]}"
-               eerror
-               eerror "The default runtimes are now set via flags on 
llvm-core/clang-common."
-               eerror "The build is being aborted to prevent breakage.  Please 
either set"
-               eerror "the respective flags on this ebuild, e.g.:"
-               eerror
-               eerror "  llvm-core/clang-common ${missing_flags[*]}"
-               eerror
-               eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
-               die "Mismatched defaults detected between llvm-core/clang and 
llvm-core/clang-common"
-       fi
-}
-
-_doclang_cfg() {
-       local triple="${1}"
-
-       local tool
-       for tool in ${triple}-clang{,++}; do
-               newins - "${tool}.cfg" <<-EOF
-                       # This configuration file is used by ${tool} driver.
-                       @gentoo-common.cfg
-                       @gentoo-common-ld.cfg
-               EOF
-               if [[ ${triple} == x86_64* ]]; then
-                       cat >> "${ED}/etc/clang/${tool}.cfg" <<-EOF || die
-                               @gentoo-cet.cfg
-                       EOF
-               fi
-       done
-
-       if use kernel_Darwin; then
-               cat >> "${ED}/etc/clang/${triple}-clang++.cfg" <<-EOF || die
-                       -lc++abi
-               EOF
-       fi
-
-       newins - "${triple}-clang-cpp.cfg" <<-EOF
-               # This configuration file is used by the ${triple}-clang-cpp 
driver.
-               @gentoo-common.cfg
-       EOF
-       if [[ ${triple} == x86_64* ]]; then
-               cat >> "${ED}/etc/clang/${triple}-clang-cpp.cfg" <<-EOF || die
-                       @gentoo-cet.cfg
-               EOF
-       fi
-
-       # Install symlinks for triples with other vendor strings since some
-       # programs insist on mangling the triple.
-       local vendor
-       for vendor in gentoo pc unknown; do
-               local vendor_triple="${triple%%-*}-${vendor}-${triple#*-*-}"
-               for tool in clang{,++,-cpp}; do
-                       if [[ ! -f 
"${ED}/etc/clang/${vendor_triple}-${tool}.cfg" ]]; then
-                               dosym "${triple}-${tool}.cfg" 
"/etc/clang/${vendor_triple}-${tool}.cfg"
-                       fi
-               done
-       done
-}
-
-doclang_cfg() {
-       local triple="${1}"
-
-       _doclang_cfg ${triple}
-
-       # LLVM may have different arch names in some cases. For example in x86
-       # profiles the triple uses i686, but llvm will prefer i386 if invoked
-       # with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
-       # be used if invoked through ${CHOST}-clang{,++,-cpp} though.
-       #
-       # To make sure the correct triples are installed,
-       # see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
-       # and compare with CHOST values in profiles.
-
-       local abi=${triple%%-*}
-       case ${abi} in
-               armv4l|armv4t|armv5tel|armv6j|armv7a)
-                       _doclang_cfg ${triple/${abi}/arm}
-                       ;;
-               i686)
-                       _doclang_cfg ${triple/${abi}/i386}
-                       ;;
-               sparc)
-                       _doclang_cfg ${triple/${abi}/sparcel}
-                       ;;
-               sparc64)
-                       _doclang_cfg ${triple/${abi}/sparcv9}
-                       ;;
-       esac
-}
-
-src_compile() {
-       default
-       use emacs && elisp-compile ../tools/clang-format/clang-format.el
-}
-
-src_install() {
-       newbashcomp bash-autocomplete.sh clang
-
-       insinto /etc/clang
-       newins - gentoo-runtimes.cfg <<-EOF
-               # This file is initially generated by 
llvm-runtimes/clang-runtime.
-               # It is used to control the default runtimes using by clang.
-
-               --rtlib=$(usex default-compiler-rt compiler-rt libgcc)
-               --unwindlib=$(usex default-compiler-rt libunwind libgcc)
-               --stdlib=$(usex default-libcxx libc++ libstdc++)
-               -fuse-ld=$(usex default-lld lld bfd)
-       EOF
-
-       newins - gentoo-gcc-install.cfg <<-EOF
-               # This file is maintained by gcc-config.
-               # It is used to specify the selected GCC installation.
-       EOF
-
-       newins - gentoo-common.cfg <<-EOF
-               # This file contains flags common to clang, clang++ and 
clang-cpp.
-               @gentoo-runtimes.cfg
-               @gentoo-gcc-install.cfg
-               @gentoo-hardened.cfg
-               # bug #870001
-               -include "${EPREFIX}/usr/include/gentoo/maybe-stddefs.h"
-       EOF
-
-       # clang-cpp does not like link args being passed to it when directly
-       # invoked, so use a separate configuration file.
-       newins - gentoo-common-ld.cfg <<-EOF
-               # This file contains flags common to clang and clang++
-               @gentoo-hardened-ld.cfg
-       EOF
-
-       # Baseline hardening (bug #851111)
-       newins - gentoo-hardened.cfg <<-EOF
-               # Some of these options are added unconditionally, regardless of
-               # USE=hardened, for parity with sys-devel/gcc.
-               -Xarch_host -fstack-clash-protection
-               -Xarch_host -fstack-protector-strong
-               -fPIE
-               -include "${EPREFIX}/usr/include/gentoo/fortify.h"
-       EOF
-
-       newins - gentoo-cet.cfg <<-EOF
-               -Xarch_host -fcf-protection=$(usex cet full none)
-       EOF
-
-       if use kernel_Darwin; then
-               newins - gentoo-hardened-ld.cfg <<-EOF
-                       # There was -Wl,-z,relro here, but it's not supported 
on Mac
-                       # TODO: investigate whether -bind_at_load or 
-read_only_stubs will do the job
-               EOF
-       else
-               newins - gentoo-hardened-ld.cfg <<-EOF
-                       # Some of these options are added unconditionally, 
regardless of
-                       # USE=hardened, for parity with sys-devel/gcc.
-                       -Wl,-z,relro
-                       -Wl,-z,now
-               EOF
-       fi
-
-       dodir /usr/include/gentoo
-
-       cat >> "${ED}/usr/include/gentoo/maybe-stddefs.h" <<-EOF || die
-       /* __has_include is an extension, but it's fine, because this is only
-       for Clang anyway. */
-       #if defined __has_include && __has_include (<stdc-predef.h>) && 
!defined(__GLIBC__)
-       # include <stdc-predef.h>
-       #endif
-       EOF
-
-       local fortify_level=$(usex hardened 3 2)
-       # We have to do this because glibc's headers warn if F_S is set
-       # without optimization and that would at the very least be very noisy
-       # during builds and at worst trigger many -Werror builds.
-       cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
-       #ifdef __clang__
-       # pragma clang system_header
-       #endif
-       #ifndef _FORTIFY_SOURCE
-       # if defined(__has_feature)
-       #  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
-       # else
-       #  define __GENTOO_HAS_FEATURE(x) 0
-       # endif
-       #
-       # if !defined(__OPTIMIZE__) || __OPTIMIZE__ == 0
-       # elif !defined(__STDC_HOSTED__) || __STDC_HOSTED__ != 1
-       # elif defined(__SANITIZE_ADDRESS__)
-       # elif __GENTOO_HAS_FEATURE(address_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(hwaddress_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(memory_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(numerical_stability_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(realtime_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(thread_sanitizer)
-       # else
-       #  define _FORTIFY_SOURCE ${fortify_level}
-       # endif
-       #
-       # undef __GENTOO_HAS_FEATURE
-       #endif
-       EOF
-
-       # TODO: Maybe -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST for
-       # non-hardened?
-       if use hardened ; then
-               cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
-                       # Options below are conditional on USE=hardened.
-                       -Xarch_host -D_GLIBCXX_ASSERTIONS
-
-                       # Analogue to GLIBCXX_ASSERTIONS
-                       # 
https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
-                       # 
https://libcxx.llvm.org/Hardening.html#using-hardened-mode
-                       -Xarch_host 
-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE
-               EOF
-
-               cat >> "${ED}/etc/clang/gentoo-hardened-ld.cfg" <<-EOF || die
-                       # Options below are conditional on USE=hardened.
-               EOF
-       fi
-
-       # We only install config files for supported ABIs because unprefixed 
tools
-       # might be used for crosscompilation where e.g. PIE may not be 
supported.
-       # See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug 
#912685.
-       local abi
-       for abi in $(get_all_abis); do
-               local abi_chost=$(get_abi_CHOST "${abi}")
-               doclang_cfg "${abi_chost}"
-       done
-
-       if use kernel_Darwin; then
-               cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-                       # Gentoo Prefix on Darwin
-                       -Wl,-search_paths_first
-               EOF
-               if use bootstrap-prefix ; then
-                       # bootstrap-prefix is only set during stage2 of 
bootstrapping
-                       # Prefix, where EPREFIX is set to EPREFIX/tmp.
-                       # Here we need to point it at the future lib dir of the 
stage3's
-                       # EPREFIX.
-                       cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-                               -Wl,-rpath,${EPREFIX}/../usr/lib
-                               -Wl,-L,${EPREFIX}/../usr/lib
-                               -isystem ${EPREFIX}/../usr/include
-                       EOF
-               fi
-               # Using -Wl,-L instead of -L to trick compiler driver to put it
-               # after -isysroot's internal -L
-               cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-                       -Wl,-rpath,${EPREFIX}/usr/lib
-                       -Wl,-L,${EPREFIX}/usr/lib
-                       -isystem ${EPREFIX}/usr/include
-                       -isysroot ${EPREFIX}/MacOSX.sdk
-               EOF
-       fi
-
-       if use emacs ; then
-               elisp-install clang ../tools/clang-format/clang-format.{el,elc}
-               elisp-make-site-file "${SITEFILE}" clang
-       fi
-}
-
-pkg_preinst() {
-       if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
-       then
-               local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
-               if [[ -n ${gcc_path} ]]; then
-                       cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
-                               --gcc-install-dir="${gcc_path%%:*}"
-                       EOF
-               fi
-       fi
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-}

diff --git a/llvm-core/clang-common/clang-common-22.0.0_pre20251108.ebuild 
b/llvm-core/clang-common/clang-common-22.0.0_pre20251108.ebuild
deleted file mode 100644
index 163c1c4f6814..000000000000
--- a/llvm-core/clang-common/clang-common-22.0.0_pre20251108.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 elisp-common llvm.org multilib
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/";
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-IUSE="
-       default-compiler-rt default-libcxx default-lld
-       bootstrap-prefix cet emacs hardened llvm-libunwind
-"
-
-PDEPEND="
-       default-compiler-rt? (
-               llvm-runtimes/clang-runtime:${LLVM_MAJOR}[compiler-rt]
-               llvm-libunwind? ( llvm-runtimes/libunwind[static-libs] )
-               !llvm-libunwind? ( sys-libs/libunwind[static-libs] )
-       )
-       !default-compiler-rt? ( sys-devel/gcc )
-       default-libcxx? ( >=llvm-runtimes/libcxx-${PV}[static-libs] )
-       !default-libcxx? ( sys-devel/gcc )
-       default-lld? ( >=llvm-core/lld-${PV} )
-       !default-lld? ( sys-devel/binutils )
-"
-# enforce flags on clang-runtime as well to aid transition
-PDEPEND+="
-       
llvm-runtimes/clang-runtime[default-compiler-rt(-)?,default-libcxx(-)?,default-lld(-)?,llvm-libunwind(-)?]
-       emacs? ( >=app-editors/emacs-26.3:* )
-"
-IDEPEND="
-       !default-compiler-rt? ( sys-devel/gcc-config )
-       !default-libcxx? ( sys-devel/gcc-config )
-"
-BDEPEND="
-       emacs? ( >=app-editors/emacs-26.3:* )
-"
-
-LLVM_COMPONENTS=( clang/utils clang/tools/clang-format )
-llvm.org_set_globals
-
-SITEFILE="50clang-gentoo.el"
-
-pkg_pretend() {
-       [[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
-
-       local flag missing_flags=()
-       for flag in default-{compiler-rt,libcxx,lld}; do
-               if ! use "${flag}" && has_version "llvm-core/clang[${flag}]"; 
then
-                       missing_flags+=( "${flag}" )
-               fi
-       done
-
-       if [[ ${missing_flags[@]} ]]; then
-               eerror "It seems that you have the following flags set on 
llvm-core/clang:"
-               eerror
-               eerror "  ${missing_flags[*]}"
-               eerror
-               eerror "The default runtimes are now set via flags on 
llvm-core/clang-common."
-               eerror "The build is being aborted to prevent breakage.  Please 
either set"
-               eerror "the respective flags on this ebuild, e.g.:"
-               eerror
-               eerror "  llvm-core/clang-common ${missing_flags[*]}"
-               eerror
-               eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
-               die "Mismatched defaults detected between llvm-core/clang and 
llvm-core/clang-common"
-       fi
-}
-
-_doclang_cfg() {
-       local triple="${1}"
-
-       local tool
-       for tool in ${triple}-clang{,++}; do
-               newins - "${tool}.cfg" <<-EOF
-                       # This configuration file is used by ${tool} driver.
-                       @gentoo-common.cfg
-                       @gentoo-common-ld.cfg
-               EOF
-               if [[ ${triple} == x86_64* ]]; then
-                       cat >> "${ED}/etc/clang/${tool}.cfg" <<-EOF || die
-                               @gentoo-cet.cfg
-                       EOF
-               fi
-       done
-
-       if use kernel_Darwin; then
-               cat >> "${ED}/etc/clang/${triple}-clang++.cfg" <<-EOF || die
-                       -lc++abi
-               EOF
-       fi
-
-       newins - "${triple}-clang-cpp.cfg" <<-EOF
-               # This configuration file is used by the ${triple}-clang-cpp 
driver.
-               @gentoo-common.cfg
-       EOF
-       if [[ ${triple} == x86_64* ]]; then
-               cat >> "${ED}/etc/clang/${triple}-clang-cpp.cfg" <<-EOF || die
-                       @gentoo-cet.cfg
-               EOF
-       fi
-
-       # Install symlinks for triples with other vendor strings since some
-       # programs insist on mangling the triple.
-       local vendor
-       for vendor in gentoo pc unknown; do
-               local vendor_triple="${triple%%-*}-${vendor}-${triple#*-*-}"
-               for tool in clang{,++,-cpp}; do
-                       if [[ ! -f 
"${ED}/etc/clang/${vendor_triple}-${tool}.cfg" ]]; then
-                               dosym "${triple}-${tool}.cfg" 
"/etc/clang/${vendor_triple}-${tool}.cfg"
-                       fi
-               done
-       done
-}
-
-doclang_cfg() {
-       local triple="${1}"
-
-       _doclang_cfg ${triple}
-
-       # LLVM may have different arch names in some cases. For example in x86
-       # profiles the triple uses i686, but llvm will prefer i386 if invoked
-       # with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
-       # be used if invoked through ${CHOST}-clang{,++,-cpp} though.
-       #
-       # To make sure the correct triples are installed,
-       # see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
-       # and compare with CHOST values in profiles.
-
-       local abi=${triple%%-*}
-       case ${abi} in
-               armv4l|armv4t|armv5tel|armv6j|armv7a)
-                       _doclang_cfg ${triple/${abi}/arm}
-                       ;;
-               i686)
-                       _doclang_cfg ${triple/${abi}/i386}
-                       ;;
-               sparc)
-                       _doclang_cfg ${triple/${abi}/sparcel}
-                       ;;
-               sparc64)
-                       _doclang_cfg ${triple/${abi}/sparcv9}
-                       ;;
-       esac
-}
-
-src_compile() {
-       default
-       use emacs && elisp-compile ../tools/clang-format/clang-format.el
-}
-
-src_install() {
-       newbashcomp bash-autocomplete.sh clang
-
-       insinto /etc/clang
-       newins - gentoo-runtimes.cfg <<-EOF
-               # This file is initially generated by 
llvm-runtimes/clang-runtime.
-               # It is used to control the default runtimes using by clang.
-
-               --rtlib=$(usex default-compiler-rt compiler-rt libgcc)
-               --unwindlib=$(usex default-compiler-rt libunwind libgcc)
-               --stdlib=$(usex default-libcxx libc++ libstdc++)
-               -fuse-ld=$(usex default-lld lld bfd)
-       EOF
-
-       newins - gentoo-gcc-install.cfg <<-EOF
-               # This file is maintained by gcc-config.
-               # It is used to specify the selected GCC installation.
-       EOF
-
-       newins - gentoo-common.cfg <<-EOF
-               # This file contains flags common to clang, clang++ and 
clang-cpp.
-               @gentoo-runtimes.cfg
-               @gentoo-gcc-install.cfg
-               @gentoo-hardened.cfg
-               # bug #870001
-               -include "${EPREFIX}/usr/include/gentoo/maybe-stddefs.h"
-       EOF
-
-       # clang-cpp does not like link args being passed to it when directly
-       # invoked, so use a separate configuration file.
-       newins - gentoo-common-ld.cfg <<-EOF
-               # This file contains flags common to clang and clang++
-               @gentoo-hardened-ld.cfg
-       EOF
-
-       # Baseline hardening (bug #851111)
-       newins - gentoo-hardened.cfg <<-EOF
-               # Some of these options are added unconditionally, regardless of
-               # USE=hardened, for parity with sys-devel/gcc.
-               -Xarch_host -fstack-clash-protection
-               -Xarch_host -fstack-protector-strong
-               -fPIE
-               -include "${EPREFIX}/usr/include/gentoo/fortify.h"
-       EOF
-
-       newins - gentoo-cet.cfg <<-EOF
-               -Xarch_host -fcf-protection=$(usex cet full none)
-       EOF
-
-       if use kernel_Darwin; then
-               newins - gentoo-hardened-ld.cfg <<-EOF
-                       # There was -Wl,-z,relro here, but it's not supported 
on Mac
-                       # TODO: investigate whether -bind_at_load or 
-read_only_stubs will do the job
-               EOF
-       else
-               newins - gentoo-hardened-ld.cfg <<-EOF
-                       # Some of these options are added unconditionally, 
regardless of
-                       # USE=hardened, for parity with sys-devel/gcc.
-                       -Wl,-z,relro
-                       -Wl,-z,now
-               EOF
-       fi
-
-       dodir /usr/include/gentoo
-
-       cat >> "${ED}/usr/include/gentoo/maybe-stddefs.h" <<-EOF || die
-       /* __has_include is an extension, but it's fine, because this is only
-       for Clang anyway. */
-       #if defined __has_include && __has_include (<stdc-predef.h>) && 
!defined(__GLIBC__)
-       # include <stdc-predef.h>
-       #endif
-       EOF
-
-       local fortify_level=$(usex hardened 3 2)
-       # We have to do this because glibc's headers warn if F_S is set
-       # without optimization and that would at the very least be very noisy
-       # during builds and at worst trigger many -Werror builds.
-       cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
-       #ifdef __clang__
-       # pragma clang system_header
-       #endif
-       #ifndef _FORTIFY_SOURCE
-       # if defined(__has_feature)
-       #  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
-       # else
-       #  define __GENTOO_HAS_FEATURE(x) 0
-       # endif
-       #
-       # if !defined(__OPTIMIZE__) || __OPTIMIZE__ == 0
-       # elif !defined(__STDC_HOSTED__) || __STDC_HOSTED__ != 1
-       # elif defined(__SANITIZE_ADDRESS__)
-       # elif __GENTOO_HAS_FEATURE(address_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(hwaddress_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(memory_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(numerical_stability_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(realtime_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(thread_sanitizer)
-       # else
-       #  define _FORTIFY_SOURCE ${fortify_level}
-       # endif
-       #
-       # undef __GENTOO_HAS_FEATURE
-       #endif
-       EOF
-
-       # TODO: Maybe -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST for
-       # non-hardened?
-       if use hardened ; then
-               cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
-                       # Options below are conditional on USE=hardened.
-                       -Xarch_host -D_GLIBCXX_ASSERTIONS
-
-                       # Analogue to GLIBCXX_ASSERTIONS
-                       # 
https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
-                       # 
https://libcxx.llvm.org/Hardening.html#using-hardened-mode
-                       -Xarch_host 
-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE
-               EOF
-
-               cat >> "${ED}/etc/clang/gentoo-hardened-ld.cfg" <<-EOF || die
-                       # Options below are conditional on USE=hardened.
-               EOF
-       fi
-
-       # We only install config files for supported ABIs because unprefixed 
tools
-       # might be used for crosscompilation where e.g. PIE may not be 
supported.
-       # See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug 
#912685.
-       local abi
-       for abi in $(get_all_abis); do
-               local abi_chost=$(get_abi_CHOST "${abi}")
-               doclang_cfg "${abi_chost}"
-       done
-
-       if use kernel_Darwin; then
-               cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-                       # Gentoo Prefix on Darwin
-                       -Wl,-search_paths_first
-               EOF
-               if use bootstrap-prefix ; then
-                       # bootstrap-prefix is only set during stage2 of 
bootstrapping
-                       # Prefix, where EPREFIX is set to EPREFIX/tmp.
-                       # Here we need to point it at the future lib dir of the 
stage3's
-                       # EPREFIX.
-                       cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-                               -Wl,-rpath,${EPREFIX}/../usr/lib
-                               -Wl,-L,${EPREFIX}/../usr/lib
-                               -isystem ${EPREFIX}/../usr/include
-                       EOF
-               fi
-               # Using -Wl,-L instead of -L to trick compiler driver to put it
-               # after -isysroot's internal -L
-               cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-                       -Wl,-rpath,${EPREFIX}/usr/lib
-                       -Wl,-L,${EPREFIX}/usr/lib
-                       -isystem ${EPREFIX}/usr/include
-                       -isysroot ${EPREFIX}/MacOSX.sdk
-               EOF
-       fi
-
-       if use emacs ; then
-               elisp-install clang ../tools/clang-format/clang-format.{el,elc}
-               elisp-make-site-file "${SITEFILE}" clang
-       fi
-}
-
-pkg_preinst() {
-       if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
-       then
-               local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
-               if [[ -n ${gcc_path} ]]; then
-                       cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
-                               --gcc-install-dir="${gcc_path%%:*}"
-                       EOF
-               fi
-       fi
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-}

diff --git a/llvm-core/clang-common/clang-common-22.0.0_pre20251120.ebuild 
b/llvm-core/clang-common/clang-common-22.0.0_pre20251120.ebuild
deleted file mode 100644
index 163c1c4f6814..000000000000
--- a/llvm-core/clang-common/clang-common-22.0.0_pre20251120.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 elisp-common llvm.org multilib
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/";
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-IUSE="
-       default-compiler-rt default-libcxx default-lld
-       bootstrap-prefix cet emacs hardened llvm-libunwind
-"
-
-PDEPEND="
-       default-compiler-rt? (
-               llvm-runtimes/clang-runtime:${LLVM_MAJOR}[compiler-rt]
-               llvm-libunwind? ( llvm-runtimes/libunwind[static-libs] )
-               !llvm-libunwind? ( sys-libs/libunwind[static-libs] )
-       )
-       !default-compiler-rt? ( sys-devel/gcc )
-       default-libcxx? ( >=llvm-runtimes/libcxx-${PV}[static-libs] )
-       !default-libcxx? ( sys-devel/gcc )
-       default-lld? ( >=llvm-core/lld-${PV} )
-       !default-lld? ( sys-devel/binutils )
-"
-# enforce flags on clang-runtime as well to aid transition
-PDEPEND+="
-       
llvm-runtimes/clang-runtime[default-compiler-rt(-)?,default-libcxx(-)?,default-lld(-)?,llvm-libunwind(-)?]
-       emacs? ( >=app-editors/emacs-26.3:* )
-"
-IDEPEND="
-       !default-compiler-rt? ( sys-devel/gcc-config )
-       !default-libcxx? ( sys-devel/gcc-config )
-"
-BDEPEND="
-       emacs? ( >=app-editors/emacs-26.3:* )
-"
-
-LLVM_COMPONENTS=( clang/utils clang/tools/clang-format )
-llvm.org_set_globals
-
-SITEFILE="50clang-gentoo.el"
-
-pkg_pretend() {
-       [[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
-
-       local flag missing_flags=()
-       for flag in default-{compiler-rt,libcxx,lld}; do
-               if ! use "${flag}" && has_version "llvm-core/clang[${flag}]"; 
then
-                       missing_flags+=( "${flag}" )
-               fi
-       done
-
-       if [[ ${missing_flags[@]} ]]; then
-               eerror "It seems that you have the following flags set on 
llvm-core/clang:"
-               eerror
-               eerror "  ${missing_flags[*]}"
-               eerror
-               eerror "The default runtimes are now set via flags on 
llvm-core/clang-common."
-               eerror "The build is being aborted to prevent breakage.  Please 
either set"
-               eerror "the respective flags on this ebuild, e.g.:"
-               eerror
-               eerror "  llvm-core/clang-common ${missing_flags[*]}"
-               eerror
-               eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
-               die "Mismatched defaults detected between llvm-core/clang and 
llvm-core/clang-common"
-       fi
-}
-
-_doclang_cfg() {
-       local triple="${1}"
-
-       local tool
-       for tool in ${triple}-clang{,++}; do
-               newins - "${tool}.cfg" <<-EOF
-                       # This configuration file is used by ${tool} driver.
-                       @gentoo-common.cfg
-                       @gentoo-common-ld.cfg
-               EOF
-               if [[ ${triple} == x86_64* ]]; then
-                       cat >> "${ED}/etc/clang/${tool}.cfg" <<-EOF || die
-                               @gentoo-cet.cfg
-                       EOF
-               fi
-       done
-
-       if use kernel_Darwin; then
-               cat >> "${ED}/etc/clang/${triple}-clang++.cfg" <<-EOF || die
-                       -lc++abi
-               EOF
-       fi
-
-       newins - "${triple}-clang-cpp.cfg" <<-EOF
-               # This configuration file is used by the ${triple}-clang-cpp 
driver.
-               @gentoo-common.cfg
-       EOF
-       if [[ ${triple} == x86_64* ]]; then
-               cat >> "${ED}/etc/clang/${triple}-clang-cpp.cfg" <<-EOF || die
-                       @gentoo-cet.cfg
-               EOF
-       fi
-
-       # Install symlinks for triples with other vendor strings since some
-       # programs insist on mangling the triple.
-       local vendor
-       for vendor in gentoo pc unknown; do
-               local vendor_triple="${triple%%-*}-${vendor}-${triple#*-*-}"
-               for tool in clang{,++,-cpp}; do
-                       if [[ ! -f 
"${ED}/etc/clang/${vendor_triple}-${tool}.cfg" ]]; then
-                               dosym "${triple}-${tool}.cfg" 
"/etc/clang/${vendor_triple}-${tool}.cfg"
-                       fi
-               done
-       done
-}
-
-doclang_cfg() {
-       local triple="${1}"
-
-       _doclang_cfg ${triple}
-
-       # LLVM may have different arch names in some cases. For example in x86
-       # profiles the triple uses i686, but llvm will prefer i386 if invoked
-       # with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
-       # be used if invoked through ${CHOST}-clang{,++,-cpp} though.
-       #
-       # To make sure the correct triples are installed,
-       # see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
-       # and compare with CHOST values in profiles.
-
-       local abi=${triple%%-*}
-       case ${abi} in
-               armv4l|armv4t|armv5tel|armv6j|armv7a)
-                       _doclang_cfg ${triple/${abi}/arm}
-                       ;;
-               i686)
-                       _doclang_cfg ${triple/${abi}/i386}
-                       ;;
-               sparc)
-                       _doclang_cfg ${triple/${abi}/sparcel}
-                       ;;
-               sparc64)
-                       _doclang_cfg ${triple/${abi}/sparcv9}
-                       ;;
-       esac
-}
-
-src_compile() {
-       default
-       use emacs && elisp-compile ../tools/clang-format/clang-format.el
-}
-
-src_install() {
-       newbashcomp bash-autocomplete.sh clang
-
-       insinto /etc/clang
-       newins - gentoo-runtimes.cfg <<-EOF
-               # This file is initially generated by 
llvm-runtimes/clang-runtime.
-               # It is used to control the default runtimes using by clang.
-
-               --rtlib=$(usex default-compiler-rt compiler-rt libgcc)
-               --unwindlib=$(usex default-compiler-rt libunwind libgcc)
-               --stdlib=$(usex default-libcxx libc++ libstdc++)
-               -fuse-ld=$(usex default-lld lld bfd)
-       EOF
-
-       newins - gentoo-gcc-install.cfg <<-EOF
-               # This file is maintained by gcc-config.
-               # It is used to specify the selected GCC installation.
-       EOF
-
-       newins - gentoo-common.cfg <<-EOF
-               # This file contains flags common to clang, clang++ and 
clang-cpp.
-               @gentoo-runtimes.cfg
-               @gentoo-gcc-install.cfg
-               @gentoo-hardened.cfg
-               # bug #870001
-               -include "${EPREFIX}/usr/include/gentoo/maybe-stddefs.h"
-       EOF
-
-       # clang-cpp does not like link args being passed to it when directly
-       # invoked, so use a separate configuration file.
-       newins - gentoo-common-ld.cfg <<-EOF
-               # This file contains flags common to clang and clang++
-               @gentoo-hardened-ld.cfg
-       EOF
-
-       # Baseline hardening (bug #851111)
-       newins - gentoo-hardened.cfg <<-EOF
-               # Some of these options are added unconditionally, regardless of
-               # USE=hardened, for parity with sys-devel/gcc.
-               -Xarch_host -fstack-clash-protection
-               -Xarch_host -fstack-protector-strong
-               -fPIE
-               -include "${EPREFIX}/usr/include/gentoo/fortify.h"
-       EOF
-
-       newins - gentoo-cet.cfg <<-EOF
-               -Xarch_host -fcf-protection=$(usex cet full none)
-       EOF
-
-       if use kernel_Darwin; then
-               newins - gentoo-hardened-ld.cfg <<-EOF
-                       # There was -Wl,-z,relro here, but it's not supported 
on Mac
-                       # TODO: investigate whether -bind_at_load or 
-read_only_stubs will do the job
-               EOF
-       else
-               newins - gentoo-hardened-ld.cfg <<-EOF
-                       # Some of these options are added unconditionally, 
regardless of
-                       # USE=hardened, for parity with sys-devel/gcc.
-                       -Wl,-z,relro
-                       -Wl,-z,now
-               EOF
-       fi
-
-       dodir /usr/include/gentoo
-
-       cat >> "${ED}/usr/include/gentoo/maybe-stddefs.h" <<-EOF || die
-       /* __has_include is an extension, but it's fine, because this is only
-       for Clang anyway. */
-       #if defined __has_include && __has_include (<stdc-predef.h>) && 
!defined(__GLIBC__)
-       # include <stdc-predef.h>
-       #endif
-       EOF
-
-       local fortify_level=$(usex hardened 3 2)
-       # We have to do this because glibc's headers warn if F_S is set
-       # without optimization and that would at the very least be very noisy
-       # during builds and at worst trigger many -Werror builds.
-       cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
-       #ifdef __clang__
-       # pragma clang system_header
-       #endif
-       #ifndef _FORTIFY_SOURCE
-       # if defined(__has_feature)
-       #  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
-       # else
-       #  define __GENTOO_HAS_FEATURE(x) 0
-       # endif
-       #
-       # if !defined(__OPTIMIZE__) || __OPTIMIZE__ == 0
-       # elif !defined(__STDC_HOSTED__) || __STDC_HOSTED__ != 1
-       # elif defined(__SANITIZE_ADDRESS__)
-       # elif __GENTOO_HAS_FEATURE(address_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(hwaddress_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(memory_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(numerical_stability_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(realtime_sanitizer)
-       # elif __GENTOO_HAS_FEATURE(thread_sanitizer)
-       # else
-       #  define _FORTIFY_SOURCE ${fortify_level}
-       # endif
-       #
-       # undef __GENTOO_HAS_FEATURE
-       #endif
-       EOF
-
-       # TODO: Maybe -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST for
-       # non-hardened?
-       if use hardened ; then
-               cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
-                       # Options below are conditional on USE=hardened.
-                       -Xarch_host -D_GLIBCXX_ASSERTIONS
-
-                       # Analogue to GLIBCXX_ASSERTIONS
-                       # 
https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
-                       # 
https://libcxx.llvm.org/Hardening.html#using-hardened-mode
-                       -Xarch_host 
-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE
-               EOF
-
-               cat >> "${ED}/etc/clang/gentoo-hardened-ld.cfg" <<-EOF || die
-                       # Options below are conditional on USE=hardened.
-               EOF
-       fi
-
-       # We only install config files for supported ABIs because unprefixed 
tools
-       # might be used for crosscompilation where e.g. PIE may not be 
supported.
-       # See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug 
#912685.
-       local abi
-       for abi in $(get_all_abis); do
-               local abi_chost=$(get_abi_CHOST "${abi}")
-               doclang_cfg "${abi_chost}"
-       done
-
-       if use kernel_Darwin; then
-               cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-                       # Gentoo Prefix on Darwin
-                       -Wl,-search_paths_first
-               EOF
-               if use bootstrap-prefix ; then
-                       # bootstrap-prefix is only set during stage2 of 
bootstrapping
-                       # Prefix, where EPREFIX is set to EPREFIX/tmp.
-                       # Here we need to point it at the future lib dir of the 
stage3's
-                       # EPREFIX.
-                       cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-                               -Wl,-rpath,${EPREFIX}/../usr/lib
-                               -Wl,-L,${EPREFIX}/../usr/lib
-                               -isystem ${EPREFIX}/../usr/include
-                       EOF
-               fi
-               # Using -Wl,-L instead of -L to trick compiler driver to put it
-               # after -isysroot's internal -L
-               cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-                       -Wl,-rpath,${EPREFIX}/usr/lib
-                       -Wl,-L,${EPREFIX}/usr/lib
-                       -isystem ${EPREFIX}/usr/include
-                       -isysroot ${EPREFIX}/MacOSX.sdk
-               EOF
-       fi
-
-       if use emacs ; then
-               elisp-install clang ../tools/clang-format/clang-format.{el,elc}
-               elisp-make-site-file "${SITEFILE}" clang
-       fi
-}
-
-pkg_preinst() {
-       if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
-       then
-               local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
-               if [[ -n ${gcc_path} ]]; then
-                       cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
-                               --gcc-install-dir="${gcc_path%%:*}"
-                       EOF
-               fi
-       fi
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-}

Reply via email to